[Ffmpeg-devel] [PATCH] FLV common header.

[Aurelien Jacobs]

On Tue, 5 Dec 2006 14:15:31 -0800
Allan Hsu <allan at counterpop.net> wrote:

> 
> On Dec 5, 2006, at 10:04 AM, Michael Niedermayer wrote:
> 
> [...]
> >>              st->codec->codec_type = CODEC_TYPE_VIDEO;
> >> -            switch(flags & 0xF){
> >> -            case 2: st->codec->codec_id = CODEC_ID_FLV1; break;
> >> -            case 3: st->codec->codec_id = CODEC_ID_FLASHSV; break;
> >> -            case 4:
> >> +            switch(flags & FLV_VIDEO_CODECID_MASK){
> >> +            case FLV_CODECID_H263: st->codec->codec_id =  
> >> CODEC_ID_FLV1; break;
> >> +            case FLV_CODECID_SCREEN: st->codec->codec_id =  
> >> CODEC_ID_FLASHSV; break;
> >
> > please align these like:
> >
> >             case FLV_CODECID_H263  : st->codec->codec_id =  
> > CODEC_ID_FLV1   ; break;
> >             case FLV_CODECID_SCREEN: st->codec->codec_id =  
> > CODEC_ID_FLASHSV; break;
> >
> > same for the other similar code
> >
> >
> > [...]
> >
> >> +enum {
> >> +    FLV_CODECID_PCM_BE = 0,
> >> +    FLV_CODECID_ADPCM = 1 << FLV_AUDIO_CODECID_OFFSET,
> >> +    FLV_CODECID_MP3 = 2 << FLV_AUDIO_CODECID_OFFSET,
> >> +    FLV_CODECID_PCM_LE = 3 << FLV_AUDIO_CODECID_OFFSET,
> >> +    FLV_CODECID_NELLYMOSER_8HZ_MONO = 5 << FLV_AUDIO_CODECID_OFFSET,
> >> +    FLV_CODECID_NELLYMOSER = 6 << FLV_AUDIO_CODECID_OFFSET
> >
> > please align these like:
> >
> >    FLV_CODECID_ADPCM               = 1 << FLV_AUDIO_CODECID_OFFSET,
> >    FLV_CODECID_MP3                 = 2 << FLV_AUDIO_CODECID_OFFSET,
> >    FLV_CODECID_PCM_LE              = 3 << FLV_AUDIO_CODECID_OFFSET,
> >    FLV_CODECID_NELLYMOSER_8HZ_MONO = 5 << FLV_AUDIO_CODECID_OFFSET,
> >    FLV_CODECID_NELLYMOSER          = 6 << FLV_AUDIO_CODECID_OFFSET
> >
> > makes them look much nicer, same for all the others
> >
> >
> > except these the patch is ok
> [...]
> 
> Here's the patch with your suggested alignment changes, as well as a  
> few more replacements of hardcoded values with values from the common  
> header that I missed in previous patches.

Applied with some tiny changes, such as removal of some no more useful
comments as in:

-        flags = 2; // choose h263
+        flags = FLV_CODECID_H263; // choose h263
                                   ^^^^^^^^^^^^^^^ comment removed

Aurel