[FFmpeg-cvslog] r20601 - in trunk/libavformat: ffmdec.c ffmenc.c

[Jai Menon]

On Mon, Dec 14, 2009 at 1:06 PM, Baptiste Coudurier
<baptiste.coudurier at gmail.com> wrote:
> On 12/13/09 11:34 PM, Jai Menon wrote:
>>
>> On Tue, Nov 24, 2009 at 9:24 PM, darkshikari<subversion at mplayerhq.hu>
>> ?wrote:
>>>
>>> Author: darkshikari
>>> Date: Tue Nov 24 16:54:17 2009
>>> New Revision: 20601
>>>
>>> Log:
>>> Update ffserver to include all basic x264 parameters in .ffm files.
>>>
>>> Modified:
>>> ? trunk/libavformat/ffmdec.c
>>> ? trunk/libavformat/ffmenc.c
>>>
>>> Modified: trunk/libavformat/ffmdec.c
>>>
>>> ==============================================================================
>>> --- trunk/libavformat/ffmdec.c ?Tue Nov 24 16:49:34 2009 ? ? ? ?(r20600)
>>> +++ trunk/libavformat/ffmdec.c ?Tue Nov 24 16:54:17 2009 ? ? ? ?(r20601)
>>> @@ -336,6 +336,19 @@ static int ffm_read_header(AVFormatConte
>>> ? ? ? ? ? ? codec->rc_buffer_aggressivity = av_int2dbl(get_be64(pb));
>>> ? ? ? ? ? ? codec->codec_tag = get_be32(pb);
>>> ? ? ? ? ? ? codec->thread_count = get_byte(pb);
>>> + ? ? ? ? ? ?codec->coder_type = get_be32(pb);
>>> + ? ? ? ? ? ?codec->me_cmp = get_be32(pb);
>>> + ? ? ? ? ? ?codec->partitions = get_be32(pb);
>>> + ? ? ? ? ? ?codec->me_subpel_quality = get_be32(pb);
>>> + ? ? ? ? ? ?codec->me_range = get_be32(pb);
>>> + ? ? ? ? ? ?codec->keyint_min = get_be32(pb);
>>> + ? ? ? ? ? ?codec->scenechange_threshold = get_be32(pb);
>>> + ? ? ? ? ? ?codec->b_frame_strategy = get_be32(pb);
>>> + ? ? ? ? ? ?codec->qcompress = av_int2dbl(get_be64(pb));
>>> + ? ? ? ? ? ?codec->qblur = av_int2dbl(get_be64(pb));
>>> + ? ? ? ? ? ?codec->max_qdiff = get_be32(pb);
>>> + ? ? ? ? ? ?codec->refs = get_be32(pb);
>>> + ? ? ? ? ? ?codec->directpred = get_be32(pb);
>>> ? ? ? ? ? ? break;
>>> ? ? ? ? case CODEC_TYPE_AUDIO:
>>> ? ? ? ? ? ? codec->sample_rate = get_be32(pb);
>>>
>>> Modified: trunk/libavformat/ffmenc.c
>>>
>>> ==============================================================================
>>> --- trunk/libavformat/ffmenc.c ?Tue Nov 24 16:49:34 2009 ? ? ? ?(r20600)
>>> +++ trunk/libavformat/ffmenc.c ?Tue Nov 24 16:54:17 2009 ? ? ? ?(r20601)
>>> @@ -154,6 +154,19 @@ static int ffm_write_header(AVFormatCont
>>> ? ? ? ? ? ? put_be64(pb, av_dbl2int(codec->rc_buffer_aggressivity));
>>> ? ? ? ? ? ? put_be32(pb, codec->codec_tag);
>>> ? ? ? ? ? ? put_byte(pb, codec->thread_count);
>>> + ? ? ? ? ? ?put_be32(pb, codec->coder_type);
>>> + ? ? ? ? ? ?put_be32(pb, codec->me_cmp);
>>> + ? ? ? ? ? ?put_be32(pb, codec->partitions);
>>> + ? ? ? ? ? ?put_be32(pb, codec->me_subpel_quality);
>>> + ? ? ? ? ? ?put_be32(pb, codec->me_range);
>>> + ? ? ? ? ? ?put_be32(pb, codec->keyint_min);
>>> + ? ? ? ? ? ?put_be32(pb, codec->scenechange_threshold);
>>> + ? ? ? ? ? ?put_be32(pb, codec->b_frame_strategy);
>>> + ? ? ? ? ? ?put_be64(pb, av_dbl2int(codec->qcompress));
>>> + ? ? ? ? ? ?put_be64(pb, av_dbl2int(codec->qblur));
>>> + ? ? ? ? ? ?put_be32(pb, codec->max_qdiff);
>>> + ? ? ? ? ? ?put_be32(pb, codec->refs);
>>> + ? ? ? ? ? ?put_be32(pb, codec->directpred);
>>> ? ? ? ? ? ? break;
>>> ? ? ? ? case CODEC_TYPE_AUDIO:
>>> ? ? ? ? ? ? put_be32(pb, codec->sample_rate);
>>
>> Also, quick question : doesn't this mean that when creating a feed
>> with ffmpeg-svn, one cannot use older builds/ffmpeg0.5 demuxer at the
>> other end? Shouldn't we document this breakage somewhere?
>>
>
> I don't think it broke anything. FFM packets are 4096 bytes, and were padded
> before.

Ah, thanks, I missed that part. Sorry for the noise.

-- 
Jai Menon