[FFmpeg-devel] [PATCH 07/11] Remove unused ff_ac3_parse_header_full function.

[Janne Grunau]

On Tue, Jan 25, 2011 at 10:16:54AM -0500, Justin Ruggles wrote:
> On 01/24/2011 08:29 PM, Diego Elio Petten? wrote:
> 
> > ---
> >  libavcodec/ac3_parser.c |   29 -----------------------------
> >  libavcodec/ac3_parser.h |   11 -----------
> >  2 files changed, 0 insertions(+), 40 deletions(-)
> > 
> > diff --git a/libavcodec/ac3_parser.c b/libavcodec/ac3_parser.c
> > index b844ec3..00aa372 100644
> > --- a/libavcodec/ac3_parser.c
> > +++ b/libavcodec/ac3_parser.c
> > @@ -128,35 +128,6 @@ int ff_ac3_parse_header(GetBitContext *gbc, AC3HeaderInfo *hdr)
> >      return 0;
> >  }
> >  
> > -int ff_ac3_parse_header_full(GetBitContext *gbc, AC3HeaderInfo *hdr){
> > -    int ret, i;
> > -    ret = ff_ac3_parse_header(gbc, hdr);
> > -    if(!ret){
> > -        if(hdr->bitstream_id>10){
> > -            /* Enhanced AC-3 */
> > -            skip_bits(gbc, 5); // skip bitstream id
> > -
> > -            /* skip dialog normalization and compression gain */
> > -            for (i = 0; i < (hdr->channel_mode ? 1 : 2); i++) {
> > -                skip_bits(gbc, 5); // skip dialog normalization
> > -                if (get_bits1(gbc)) {
> > -                    skip_bits(gbc, 8); //skip Compression gain word
> > -                }
> > -            }
> > -            /* dependent stream channel map */
> > -            if (hdr->frame_type == EAC3_FRAME_TYPE_DEPENDENT && get_bits1(gbc)) {
> > -                    hdr->channel_map = get_bits(gbc, 16); //custom channel map
> > -                    return 0;
> > -            }
> > -        }
> > -        //default channel map based on acmod and lfeon
> > -        hdr->channel_map = ff_eac3_default_chmap[hdr->channel_mode];
> > -        if(hdr->lfe_on)
> > -            hdr->channel_map |= AC3_CHMAP_LFE;
> > -    }
> > -    return ret;
> > -}
> > -
> >  static int ac3_sync(uint64_t state, AACAC3ParseContext *hdr_info,
> >          int *need_next_header, int *new_frame_start)
> >  {
> > diff --git a/libavcodec/ac3_parser.h b/libavcodec/ac3_parser.h
> > index 2f4a2ee..50b70b0 100644
> > --- a/libavcodec/ac3_parser.h
> > +++ b/libavcodec/ac3_parser.h
> > @@ -38,15 +38,4 @@
> >   */
> >  int ff_ac3_parse_header(GetBitContext *gbc, AC3HeaderInfo *hdr);
> >  
> > -/**
> > - * Parse AC-3 frame header and sets channel_map
> > - * Parse the header up to the lfeon (channel_map in E-AC-3)
> > - * element, which is the first 52, 54 or 104 bits depending
> > - * on the audio coding mode.
> > - * @param[in]  gbc BitContext containing the first 54 bits of the frame.
> > - * @param[out] hdr Pointer to struct where header info is written.
> > - * @return value returned by ff_ac3_parse_header
> > - */
> > -int ff_ac3_parse_header_full(GetBitContext *gbc, AC3HeaderInfo *hdr);
> > -
> >  #endif /* AVCODEC_AC3_PARSER_H */
> 
> 
> E-AC-3 dependent stream parsing and decoding has still not been
> implemented and will need this, but I'm ok with removing it for now.
> Once someone shows me an E-AC-3 file with a dependent stream that's not
> just the Dolby demo I might resurrect it.

queued

Janne