April 2007 - ffmpeg-cvslog - lists.ffmpeg.org

r8212 - trunk/libavformat/movenc.c
by subversion＠mplayerhq.hu 17 May '07

17 May '07

Author: bcoudurier Date: Sun Mar 4 02:48:06 2007 New Revision: 8212 Modified: trunk/libavformat/movenc.c Log: deobfuscate, clearly split mov case Modified: trunk/libavformat/movenc.c ============================================================================== --- trunk/libavformat/movenc.c (original) +++ trunk/libavformat/movenc.c Sun Mar 4 02:48:06 2007 @@ -341,11 +341,16 @@ static int mov_write_audio_tag(ByteIOCon put_be16(pb, 0); /* Revision level */ put_be32(pb, 0); /* Reserved */ - put_be16(pb, track->mode == MODE_MOV ? track->enc->channels : 2); /* Number of channels */ - /* FIXME 8 bit for 'raw ' in mov */ - put_be16(pb, 16); /* Reserved */ + if (track->mode == MODE_MOV) { + put_be16(pb, track->enc->channels); + put_be16(pb, 16); /* FIXME 8 bit for 'raw ' in mov */ + put_be16(pb, track->audio_vbr ? -2 : 0); /* compression ID */ + } else { /* reserved for mp4/3gp */ + put_be16(pb, 2); + put_be16(pb, 16); + put_be16(pb, 0); + } - put_be16(pb, track->mode == MODE_MOV && track->audio_vbr ? -2 : 0); /* compression ID */ put_be16(pb, 0); /* packet size (= 0) */ put_be16(pb, track->timescale); /* Time scale */ put_be16(pb, 0); /* Reserved */

4 7

r8715 - in trunk/libavformat: asf.c utils.c
by subversion＠mplayerhq.hu 02 May '07

02 May '07

Author: benoit Date: Thu Apr 12 10:11:33 2007 New Revision: 8715 Modified: trunk/libavformat/asf.c trunk/libavformat/utils.c Log: DVR-MS probe audio format patch by John Donaghy \ johnfdonaghy chez gmail dot com / Original thread: date: 03/13/2007 04:56 PM subject: [Ffmpeg-devel] [PATCH] DVR-MS probe audio format - was DVR-MS bug (MP2 decoding) Modified: trunk/libavformat/asf.c ============================================================================== --- trunk/libavformat/asf.c (original) +++ trunk/libavformat/asf.c Thu Apr 12 10:11:33 2007 @@ -195,7 +195,7 @@ static int asf_read_header(AVFormatConte uint64_t total_size; unsigned int tag1; int64_t pos1, pos2; - int test_for_ext_stream_audio; + int test_for_ext_stream_audio, is_dvr_ms_audio=0; pos1 = url_ftell(pb); @@ -241,6 +241,7 @@ static int asf_read_header(AVFormatConte get_guid(pb, &g); if (!memcmp(&g, &ext_stream_audio_stream, sizeof(GUID))) { type = CODEC_TYPE_AUDIO; + is_dvr_ms_audio=1; get_guid(pb, &g); get_le32(pb); get_le32(pb); @@ -253,6 +254,12 @@ static int asf_read_header(AVFormatConte st->codec->codec_type = type; if (type == CODEC_TYPE_AUDIO) { get_wav_header(pb, st->codec, type_specific_size); + if (is_dvr_ms_audio) { + // codec_id and codec_tag are unreliable in dvr_ms + // files. Set them later by probing stream. + st->codec->codec_id = CODEC_ID_NONE; + st->codec->codec_tag = 0; + } st->need_parsing = 1; /* We have to init the frame size at some point .... */ pos2 = url_ftell(pb); Modified: trunk/libavformat/utils.c ============================================================================== --- trunk/libavformat/utils.c (original) +++ trunk/libavformat/utils.c Thu Apr 12 10:11:33 2007 @@ -1641,6 +1641,20 @@ static int try_decode_frame(AVStream *st return ret; } +static int set_codec_from_probe_data(AVStream *st, AVProbeData *pd, int score) +{ + AVInputFormat *fmt; + fmt = av_probe_input_format2(pd, 1, &score); + + if (fmt) { + if (strncmp(fmt->name, "mp3", 3) == 0) + st->codec->codec_id = CODEC_ID_MP3; + else if (strncmp(fmt->name, "ac3", 3) == 0) + st->codec->codec_id = CODEC_ID_AC3; + } + return fmt; +} + /* absolute maximum size we read until we abort */ #define MAX_READ_SIZE 5000000 @@ -1662,6 +1676,8 @@ int av_find_stream_info(AVFormatContext offset_t old_offset = url_ftell(&ic->pb); int64_t codec_info_duration[MAX_STREAMS]={0}; int codec_info_nb_frames[MAX_STREAMS]={0}; + AVProbeData probe_data[MAX_STREAMS]; + int codec_identified[MAX_STREAMS]={0}; duration_error = av_mallocz(MAX_STREAMS * sizeof(*duration_error)); if (!duration_error) return AVERROR_NOMEM; @@ -1687,6 +1703,7 @@ int av_find_stream_info(AVFormatContext last_dts[i]= AV_NOPTS_VALUE; } + memset(probe_data, 0, sizeof(probe_data)); count = 0; read_size = 0; ppktl = &ic->packet_buffer; @@ -1702,6 +1719,9 @@ int av_find_stream_info(AVFormatContext break; if(st->parser && st->parser->parser->split && !st->codec->extradata) break; + if (st->codec->codec_type == CODEC_TYPE_AUDIO && + st->codec->codec_id == CODEC_ID_NONE) + break; } if (i == ic->nb_streams) { /* NOTE: if the format has no header, then we need to read @@ -1787,6 +1807,13 @@ int av_find_stream_info(AVFormatContext } if(last == AV_NOPTS_VALUE || duration_count[index]<=1) last_dts[pkt->stream_index]= pkt->dts; + + if (st->codec->codec_id == CODEC_ID_NONE) { + AVProbeData *pd = &(probe_data[st->index]); + pd->buf = av_realloc(pd->buf, pd->buf_size+pkt->size); + memcpy(pd->buf+pd->buf_size, pkt->data, pkt->size); + pd->buf_size += pkt->size; + } } if(st->parser && st->parser->parser->split && !st->codec->extradata){ int i= st->parser->parser->split(st->codec, pkt->data, pkt->size); @@ -1866,12 +1893,28 @@ int av_find_stream_info(AVFormatContext } } }else if(st->codec->codec_type == CODEC_TYPE_AUDIO) { + if (st->codec->codec_id == CODEC_ID_NONE) { + codec_identified[st->index] = set_codec_from_probe_data(st, &(probe_data[st->index]), 0); + if (codec_identified[st->index]) { + st->need_parsing = 1; + } + } if(!st->codec->bits_per_sample) st->codec->bits_per_sample= av_get_bits_per_sample(st->codec->codec_id); } } av_estimate_timings(ic, old_offset); + + for(i=0;i<ic->nb_streams;i++) { + st = ic->streams[i]; + if (codec_identified[st->index]) { + av_read_frame_flush(ic); + av_seek_frame(ic, st->index, 0.0, 0); + url_fseek(&ic->pb, ic->data_offset, SEEK_SET); + } + } + #if 0 /* correct DTS for b frame streams with no timestamps */ for(i=0;i<ic->nb_streams;i++) { @@ -1898,6 +1941,9 @@ int av_find_stream_info(AVFormatContext #endif av_free(duration_error); + for(i=0;i<MAX_STREAMS;i++){ + av_freep(&(probe_data[i].buf)); + } return ret; }

4 9

r8861 - trunk/libavformat/asf.c
by subversion＠mplayerhq.hu 30 Apr '07

30 Apr '07

Author: benoit Date: Mon Apr 30 17:56:11 2007 New Revision: 8861 Log: use asf stream information to set bitrate patch by Zuxy Meng zuxy dot meng chez gmail tod com reference thread: [Ffmpeg-devel] Third Try: Set bit_rate for asf format Modified: trunk/libavformat/asf.c Modified: trunk/libavformat/asf.c ============================================================================== --- trunk/libavformat/asf.c (original) +++ trunk/libavformat/asf.c Mon Apr 30 17:56:11 2007 @@ -145,8 +145,10 @@ static int asf_read_header(AVFormatConte int size, i; int64_t gsize; AVRational dar[128]; + uint32_t bitrate[128]; memset(dar, 0, sizeof(dar)); + memset(bitrate, 0, sizeof(bitrate)); get_guid(pb, &g); if (memcmp(&g, &asf_header, sizeof(GUID))) @@ -421,13 +423,13 @@ static int asf_read_header(AVFormatConte } } else if (!memcmp(&g, &ext_stream_header, sizeof(GUID))) { int ext_len, payload_ext_ct, stream_ct; - uint32_t ext_d; + uint32_t ext_d, leak_rate, stream_num; int64_t pos_ex_st; pos_ex_st = url_ftell(pb); get_le64(pb); // starttime get_le64(pb); // endtime - get_le32(pb); // leak-datarate + leak_rate = get_le32(pb); // leak-datarate get_le32(pb); // bucket-datasize get_le32(pb); // init-bucket-fullness get_le32(pb); // alt-leak-datarate @@ -435,12 +437,15 @@ static int asf_read_header(AVFormatConte get_le32(pb); // alt-init-bucket-fullness get_le32(pb); // max-object-size get_le32(pb); // flags (reliable,seekable,no_cleanpoints?,resend-live-cleanpoints, rest of bits reserved) - get_le16(pb); // stream-num + stream_num = get_le16(pb); // stream-num get_le16(pb); // stream-language-id-index get_le64(pb); // avg frametime in 100ns units stream_ct = get_le16(pb); //stream-name-count payload_ext_ct = get_le16(pb); //payload-extension-system-count + if (stream_num < 128) + bitrate[stream_num] = leak_rate; + for (i=0; i<stream_ct; i++){ get_le16(pb); ext_len = get_le16(pb); @@ -504,8 +509,11 @@ static int asf_read_header(AVFormatConte for(i=0; i<128; i++){ int stream_num= asf->asfid2avid[i]; - if(stream_num>=0 && dar[i].num>0 && dar[i].den>0){ + if(stream_num>=0){ AVCodecContext *codec= s->streams[stream_num]->codec; + if (!codec->bit_rate) + codec->bit_rate = bitrate[i]; + if (dar[i].num > 0 && dar[i].den > 0) av_reduce(&codec->sample_aspect_ratio.num, &codec->sample_aspect_ratio.den, dar[i].num, dar[i].den, INT_MAX);

1 0

r8860 - trunk/libavformat/mpeg.c
by subversion＠mplayerhq.hu 30 Apr '07

30 Apr '07

Author: diego Date: Mon Apr 30 11:46:11 2007 New Revision: 8860 Log: Fix loop condition so it can be run through more than once. patch by Wolfram Gloger, wmglo dent.med.uni-muenchen de reference: [Ffmpeg-devel] buffer underflow messages from the output_example.c Modified: trunk/libavformat/mpeg.c Modified: trunk/libavformat/mpeg.c ============================================================================== --- trunk/libavformat/mpeg.c (original) +++ trunk/libavformat/mpeg.c Mon Apr 30 11:46:11 2007 @@ -1028,9 +1028,10 @@ static int remove_decoded_packets(AVForm for(i=0; i<ctx->nb_streams; i++){ AVStream *st = ctx->streams[i]; StreamInfo *stream = st->priv_data; - PacketDesc *pkt_desc= stream->predecode_packet; + PacketDesc *pkt_desc; - while(pkt_desc && scr > pkt_desc->dts){ //FIXME > vs >= + while((pkt_desc= stream->predecode_packet) + && scr > pkt_desc->dts){ //FIXME > vs >= if(stream->buffer_index < pkt_desc->size || stream->predecode_packet == stream->premux_packet){ av_log(ctx, AV_LOG_ERROR,

1 0

r8859 - trunk/libavformat/mpeg.c
by subversion＠mplayerhq.hu 30 Apr '07

30 Apr '07

Author: diego Date: Mon Apr 30 11:43:29 2007 New Revision: 8859 Log: more detailed error message for buffer underflow patch by Wolfram Gloger, wmglo dent.med.uni-muenchen de Modified: trunk/libavformat/mpeg.c Modified: trunk/libavformat/mpeg.c ============================================================================== --- trunk/libavformat/mpeg.c (original) +++ trunk/libavformat/mpeg.c Mon Apr 30 11:43:29 2007 @@ -1033,7 +1033,9 @@ static int remove_decoded_packets(AVForm while(pkt_desc && scr > pkt_desc->dts){ //FIXME > vs >= if(stream->buffer_index < pkt_desc->size || stream->predecode_packet == stream->premux_packet){ - av_log(ctx, AV_LOG_ERROR, "buffer underflow\n"); + av_log(ctx, AV_LOG_ERROR, + "buffer underflow i=%d bufi=%d size=%d\n", + i, stream->buffer_index, pkt_desc->size); break; } stream->buffer_index -= pkt_desc->size;

1 0

r8858 - trunk/libavcodec/h264.c
by subversion＠mplayerhq.hu 29 Apr '07

29 Apr '07

Author: gpoirier Date: Mon Apr 30 01:18:39 2007 New Revision: 8858 Log: prevent going out of the buffer if the nal size does not fit in the buffer. Patch by Mean % fixounet A free P fr % Original thread: Date: Apr 29, 2007 2:00 PM Subject: Re: [Ffmpeg-devel] [patch] h264.c, dont go beyond buffer in h264_decode_nal_unit Modified: trunk/libavcodec/h264.c Modified: trunk/libavcodec/h264.c ============================================================================== --- trunk/libavcodec/h264.c (original) +++ trunk/libavcodec/h264.c Mon Apr 30 01:18:39 2007 @@ -8122,7 +8122,7 @@ static int decode_nal_units(H264Context nalsize = 0; for(i = 0; i < h->nal_length_size; i++) nalsize = (nalsize << 8) | buf[buf_index++]; - if(nalsize <= 1 || nalsize > buf_size){ + if(nalsize <= 1 || (nalsize+buf_index > buf_size)){ if(nalsize == 1){ buf_index++; continue;

1 0

r8857 - trunk/libavcodec/mpegaudio.c
by subversion＠mplayerhq.hu 29 Apr '07

29 Apr '07

Author: alex Date: Sun Apr 29 15:25:32 2007 New Revision: 8857 Log: check for channels<=0 and print a reasonable error message Modified: trunk/libavcodec/mpegaudio.c Modified: trunk/libavcodec/mpegaudio.c ============================================================================== --- trunk/libavcodec/mpegaudio.c (original) +++ trunk/libavcodec/mpegaudio.c Sun Apr 29 15:25:32 2007 @@ -70,8 +70,10 @@ static int MPA_encode_init(AVCodecContex int i, v, table; float a; - if (channels > 2) + if (channels <= 0 || channels > 2){ + av_log(avctx, AV_LOG_ERROR, "encoding %d channel(s) is not allowed in mp2\n", channels); return -1; + } bitrate = bitrate / 1000; s->nb_channels = channels; s->freq = freq;

1 0

r8856 - in trunk: Changelog MAINTAINERS libavcodec/Makefile libavcodec/allcodecs.c libavcodec/avcodec.h libavcodec/ptx.c
by subversion＠mplayerhq.hu 29 Apr '07

29 Apr '07

Author: ivo Date: Sun Apr 29 11:37:07 2007 New Revision: 8856 Log: add V.Flash PTX decoder Added: trunk/libavcodec/ptx.c Modified: trunk/Changelog trunk/MAINTAINERS trunk/libavcodec/Makefile trunk/libavcodec/allcodecs.c trunk/libavcodec/avcodec.h Modified: trunk/Changelog ============================================================================== --- trunk/Changelog (original) +++ trunk/Changelog Sun Apr 29 11:37:07 2007 @@ -81,6 +81,7 @@ version <next> - Bethsoft VID demuxer and video decoder - CRYO APC demuxer - Atrac3 decoder +- V.Flash PTX decoder version 0.4.9-pre1: Modified: trunk/MAINTAINERS ============================================================================== --- trunk/MAINTAINERS (original) +++ trunk/MAINTAINERS Sun Apr 29 11:37:07 2007 @@ -152,6 +152,7 @@ Codecs: msvideo1.c Mike Melanson nuv.c Reimar Doeffinger oggtheora.c Mans Rullgard + ptx.c Ivo van Poorten qdm2.c, qdm2data.h Roberto Togni qdrw.c Kostya Shishkov qpeg.c Kostya Shishkov Modified: trunk/libavcodec/Makefile ============================================================================== --- trunk/libavcodec/Makefile (original) +++ trunk/libavcodec/Makefile Sun Apr 29 11:37:07 2007 @@ -116,6 +116,7 @@ OBJS-$(CONFIG_MSZH_DECODER) + OBJS-$(CONFIG_NUV_DECODER) += nuv.o rtjpeg.o OBJS-$(CONFIG_PNG_DECODER) += png.o OBJS-$(CONFIG_PNG_ENCODER) += png.o +OBJS-$(CONFIG_PTX_DECODER) += ptx.o OBJS-$(CONFIG_QDM2_DECODER) += qdm2.o OBJS-$(CONFIG_QDRAW_DECODER) += qdrw.o OBJS-$(CONFIG_QPEG_DECODER) += qpeg.o Modified: trunk/libavcodec/allcodecs.c ============================================================================== --- trunk/libavcodec/allcodecs.c (original) +++ trunk/libavcodec/allcodecs.c Sun Apr 29 11:37:07 2007 @@ -116,6 +116,7 @@ void avcodec_register_all(void) REGISTER_ENCODER(PGMYUV, pgmyuv); REGISTER_ENCDEC (PNG, png); REGISTER_ENCODER(PPM, ppm); + REGISTER_DECODER(PTX, ptx); REGISTER_DECODER(QDRAW, qdraw); REGISTER_DECODER(QPEG, qpeg); REGISTER_DECODER(QTRLE, qtrle); Modified: trunk/libavcodec/avcodec.h ============================================================================== --- trunk/libavcodec/avcodec.h (original) +++ trunk/libavcodec/avcodec.h Sun Apr 29 11:37:07 2007 @@ -162,6 +162,7 @@ enum CodecID { CODEC_ID_SGI, CODEC_ID_C93, CODEC_ID_BETHSOFTVID, + CODEC_ID_PTX, /* various PCM "codecs" */ CODEC_ID_PCM_S16LE= 0x10000, @@ -2321,6 +2322,7 @@ extern AVCodec mszh_decoder; extern AVCodec nuv_decoder; extern AVCodec oggvorbis_decoder; extern AVCodec png_decoder; +extern AVCodec ptx_decoder; extern AVCodec qdm2_decoder; extern AVCodec qdraw_decoder; extern AVCodec qpeg_decoder; Added: trunk/libavcodec/ptx.c ============================================================================== --- (empty file) +++ trunk/libavcodec/ptx.c Sun Apr 29 11:37:07 2007 @@ -0,0 +1,119 @@ +/* + * V.Flash PTX (.ptx) image decoder + * Copyright (c) 2007 Ivo van Poorten + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + */ + +#include "avcodec.h" + +typedef struct PTXContext { + AVFrame picture; +} PTXContext; + +static int ptx_init(AVCodecContext *avctx) { + PTXContext *s = avctx->priv_data; + + avcodec_get_frame_defaults((AVFrame*)&s->picture); + avctx->coded_frame= (AVFrame*)&s->picture; + s->picture.data[0] = NULL; + + return 0; +} + +static int ptx_decode_frame(AVCodecContext *avctx, void *data, int *data_size, + uint8_t *buf, int buf_size) { + PTXContext * const s = avctx->priv_data; + AVFrame *picture = data; + AVFrame * const p = (AVFrame *)&s->picture; + unsigned int offset, w, h, y, stride, bytes_per_pixel; + uint8_t *ptr; + + offset = AV_RL16(buf); + w = AV_RL16(buf+8); + h = AV_RL16(buf+10); + bytes_per_pixel = AV_RL16(buf+12) >> 3; + + if (bytes_per_pixel != 2) { + av_log(avctx, AV_LOG_ERROR, "image format is not rgb15, please report on ffmpeg-users mailing list\n"); + return -1; + } + + avctx->pix_fmt = PIX_FMT_RGB555; + + if (offset != 0x2c) + av_log(avctx, AV_LOG_WARNING, "offset != 0x2c, untested due to lack of sample files\n"); + + buf += offset; + + if (p->data[0]) + avctx->release_buffer(avctx, p); + + if (avcodec_check_dimensions(avctx, w, h)) + return -1; + if (w != avctx->width || h != avctx->height) + avcodec_set_dimensions(avctx, w, h); + if (avctx->get_buffer(avctx, p) < 0) { + av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); + return -1; + } + + p->pict_type = FF_I_TYPE; + + ptr = p->data[0]; + stride = p->linesize[0]; + + for (y=0; y<h; y++) { +#ifdef WORDS_BIGENDIAN + unsigned int x; + for (x=0; x<w*bytes_per_pixel; x+=bytes_per_pixel) + ST16(ptr+x, AV_RL16(buf+x)); +#else + memcpy(ptr, buf, w*bytes_per_pixel); +#endif + ptr += stride; + buf += w*bytes_per_pixel; + } + + *picture = *(AVFrame *)&s->picture; + *data_size = sizeof(AVPicture); + + return offset + w*h*bytes_per_pixel; +} + +static int ptx_end(AVCodecContext *avctx) { + PTXContext *s = avctx->priv_data; + + if(s->picture.data[0]) + avctx->release_buffer(avctx, &s->picture); + + return 0; +} + +AVCodec ptx_decoder = { + "ptx", + CODEC_TYPE_VIDEO, + CODEC_ID_PTX, + sizeof(PTXContext), + ptx_init, + NULL, + ptx_end, + ptx_decode_frame, + 0, + NULL +};

1 0

r8855 - trunk/libavformat/avformat.h
by subversion＠mplayerhq.hu 28 Apr '07

28 Apr '07

Author: bcoudurier Date: Sat Apr 28 15:07:52 2007 New Revision: 8855 Log: fix AVStream documentation: clarify start_time, start_time and duration are actually in stream base Modified: trunk/libavformat/avformat.h Modified: trunk/libavformat/avformat.h ============================================================================== --- trunk/libavformat/avformat.h (original) +++ trunk/libavformat/avformat.h Sat Apr 28 15:07:52 2007 @@ -306,11 +306,9 @@ typedef struct AVStream { /** quality, as it has been removed from AVCodecContext and put in AVVideoFrame * MN:dunno if thats the right place, for it */ float quality; - /** decoding: position of the first frame of the component, in - AV_TIME_BASE fractional seconds. */ + /** decoding: pts of the first frame of the stream, in stream time base. */ int64_t start_time; - /** decoding: duration of the stream, in AV_TIME_BASE fractional - seconds. */ + /** decoding: duration of the stream, in stream time base. */ int64_t duration; char language[4]; /** ISO 639 3-letter language code (empty string if undefined) */

1 0

r8854 - trunk/MAINTAINERS
by subversion＠mplayerhq.hu 27 Apr '07

27 Apr '07

Author: kostya Date: Sat Apr 28 04:53:32 2007 New Revision: 8854 Log: Register myself as DCA maintainer Modified: trunk/MAINTAINERS Modified: trunk/MAINTAINERS ============================================================================== --- trunk/MAINTAINERS (original) +++ trunk/MAINTAINERS Sat Apr 28 04:53:32 2007 @@ -116,6 +116,7 @@ Codecs: cljr Alex Beregszaszi cook.c, cookdata.h Benjamin Larsson cscd.c Reimar Doeffinger + dca.c Kostya Shishkov dnxhddec.c Baptiste Coudurier dpcm.c Mike Melanson dxa.c Kostya Shishkov

1 0