# HG changeset patch # User jbr # Date 1217781752 0 # Node ID 1a93d3bbe3ee73d5a7b7b8cd34cb6569780d1ecb # Parent 856df346b5368cc24acf89a37ba18b514c304521 cosmetics: make all references to AC-3 capitalized and hyphenated diff -r 856df346b536 -r 1a93d3bbe3ee aac_ac3_parser.c --- a/aac_ac3_parser.c Sun Aug 03 13:11:14 2008 +0000 +++ b/aac_ac3_parser.c Sun Aug 03 16:42:32 2008 +0000 @@ -1,5 +1,5 @@ /* - * Common AAC and AC3 parser + * Common AAC and AC-3 parser * Copyright (c) 2003 Fabrice Bellard. * Copyright (c) 2003 Michael Niedermayer. * @@ -71,7 +71,7 @@ /* update codec info */ avctx->sample_rate = s->sample_rate; - /* allow downmixing to stereo (or mono for AC3) */ + /* allow downmixing to stereo (or mono for AC-3) */ if(avctx->request_channels > 0 && avctx->request_channels < s->channels && (avctx->request_channels <= 2 || diff -r 856df346b536 -r 1a93d3bbe3ee aac_ac3_parser.h --- a/aac_ac3_parser.h Sun Aug 03 13:11:14 2008 +0000 +++ b/aac_ac3_parser.h Sun Aug 03 16:42:32 2008 +0000 @@ -1,5 +1,5 @@ /* - * Common AAC and AC3 parser prototypes + * Common AAC and AC-3 parser prototypes * Copyright (c) 2003 Fabrice Bellard. * Copyright (c) 2003 Michael Niedermayer. * diff -r 856df346b536 -r 1a93d3bbe3ee ac3.c --- a/ac3.c Sun Aug 03 13:11:14 2008 +0000 +++ b/ac3.c Sun Aug 03 16:42:32 2008 +0000 @@ -1,5 +1,5 @@ /* - * Common code between AC3 encoder and decoder + * Common code between the AC-3 encoder and decoder * Copyright (c) 2000 Fabrice Bellard. * * This file is part of FFmpeg. @@ -21,7 +21,7 @@ /** * @file ac3.c - * Common code between AC3 encoder and decoder. + * Common code between the AC-3 encoder and decoder. */ #include "avcodec.h" @@ -197,7 +197,7 @@ } while (end > band_start_tab[j++]); } -/* AC3 bit allocation. The algorithm is the one described in the AC3 +/* AC-3 bit allocation. The algorithm is the one described in the AC-3 spec. */ void ac3_parametric_bit_allocation(AC3BitAllocParameters *s, uint8_t *bap, int8_t *exp, int start, int end, diff -r 856df346b536 -r 1a93d3bbe3ee ac3.h --- a/ac3.h Sun Aug 03 13:11:14 2008 +0000 +++ b/ac3.h Sun Aug 03 16:42:32 2008 +0000 @@ -1,5 +1,5 @@ /* - * Common code between AC3 encoder and decoder + * Common code between the AC-3 encoder and decoder * Copyright (c) 2000, 2001, 2002 Fabrice Bellard. * * This file is part of FFmpeg. @@ -21,7 +21,7 @@ /** * @file ac3.h - * Common code between AC3 encoder and decoder. + * Common code between the AC-3 encoder and decoder. */ #ifndef FFMPEG_AC3_H @@ -32,7 +32,7 @@ #define AC3_MAX_CODED_FRAME_SIZE 3840 /* in bytes */ #define AC3_MAX_CHANNELS 6 /* including LFE channel */ -#define NB_BLOCKS 6 /* number of PCM blocks inside an AC3 frame */ +#define NB_BLOCKS 6 /* number of PCM blocks inside an AC-3 frame */ #define AC3_FRAME_SIZE (NB_BLOCKS * 256) /* exponent encoding strategy */ diff -r 856df346b536 -r 1a93d3bbe3ee ac3_parser.c --- a/ac3_parser.c Sun Aug 03 13:11:14 2008 +0000 +++ b/ac3_parser.c Sun Aug 03 16:42:32 2008 +0000 @@ -1,5 +1,5 @@ /* - * AC3 parser + * AC-3 parser * Copyright (c) 2003 Fabrice Bellard. * Copyright (c) 2003 Michael Niedermayer. * diff -r 856df346b536 -r 1a93d3bbe3ee ac3_parser.h --- a/ac3_parser.h Sun Aug 03 13:11:14 2008 +0000 +++ b/ac3_parser.h Sun Aug 03 16:42:32 2008 +0000 @@ -1,5 +1,5 @@ /* - * AC3 parser prototypes + * AC-3 parser prototypes * Copyright (c) 2003 Fabrice Bellard. * Copyright (c) 2003 Michael Niedermayer. * diff -r 856df346b536 -r 1a93d3bbe3ee ac3dec.c --- a/ac3dec.c Sun Aug 03 13:11:14 2008 +0000 +++ b/ac3dec.c Sun Aug 03 16:42:32 2008 +0000 @@ -228,7 +228,7 @@ /** * Parse the 'sync info' and 'bit stream info' from the AC-3 bitstream. * GetBitContext within AC3DecodeContext must point to - * start of the synchronized ac3 bitstream. + * the start of the synchronized AC-3 bitstream. */ static int ac3_parse_header(AC3DecodeContext *s) { @@ -268,7 +268,7 @@ } /** - * Common function to parse AC3 or E-AC3 frame header + * Common function to parse AC-3 or E-AC-3 frame header */ static int parse_frame_header(AC3DecodeContext *s) { diff -r 856df346b536 -r 1a93d3bbe3ee ac3dec.h --- a/ac3dec.h Sun Aug 03 13:11:14 2008 +0000 +++ b/ac3dec.h Sun Aug 03 16:42:32 2008 +0000 @@ -1,5 +1,5 @@ /* - * Common code between AC3 and E-AC3 decoder + * Common code between the AC-3 and E-AC-3 decoders * Copyright (c) 2007 Bartlomiej Wolowiec * * This file is part of FFmpeg. @@ -21,7 +21,7 @@ /** * @file ac3.h - * Common code between AC3 and E-AC3 decoder. + * Common code between the AC-3 and E-AC-3 decoders. */ #ifndef FFMPEG_AC3DEC_H diff -r 856df346b536 -r 1a93d3bbe3ee ac3dec_data.c --- a/ac3dec_data.c Sun Aug 03 13:11:14 2008 +0000 +++ b/ac3dec_data.c Sun Aug 03 16:42:32 2008 +0000 @@ -1,5 +1,5 @@ /* - * AC3 and E-AC3 decoder tables + * AC-3 and E-AC-3 decoder tables * Copyright (c) 2007 Bartlomiej Wolowiec * * This file is part of FFmpeg. @@ -21,7 +21,7 @@ /** * @file ac3dec_data.c - * tables taken directly from AC3 spec. + * tables taken directly from the AC-3 spec. */ #include "ac3dec_data.h" diff -r 856df346b536 -r 1a93d3bbe3ee ac3dec_data.h --- a/ac3dec_data.h Sun Aug 03 13:11:14 2008 +0000 +++ b/ac3dec_data.h Sun Aug 03 16:42:32 2008 +0000 @@ -1,5 +1,5 @@ /* - * AC3 and E-AC3 decoder tables + * AC-3 and E-AC-3 decoder tables * Copyright (c) 2007 Bartlomiej Wolowiec * * This file is part of FFmpeg. diff -r 856df346b536 -r 1a93d3bbe3ee ac3enc.c --- a/ac3enc.c Sun Aug 03 13:11:14 2008 +0000 +++ b/ac3enc.c Sun Aug 03 16:42:32 2008 +0000 @@ -1,5 +1,5 @@ /* - * The simplest AC3 encoder + * The simplest AC-3 encoder * Copyright (c) 2000 Fabrice Bellard. * * This file is part of FFmpeg. @@ -21,7 +21,7 @@ /** * @file ac3enc.c - * The simplest AC3 encoder. + * The simplest AC-3 encoder. */ //#define DEBUG //#define DEBUG_BITALLOC @@ -705,7 +705,7 @@ return 0; } -/* output the AC3 frame header */ +/* output the AC-3 frame header */ static void output_frame_header(AC3EncodeContext *s, unsigned char *frame) { init_put_bits(&s->pb, frame, AC3_MAX_CODED_FRAME_SIZE); @@ -772,7 +772,7 @@ return v & ((1 << qbits)-1); } -/* Output one audio block. There are NB_BLOCKS audio blocks in one AC3 +/* Output one audio block. There are NB_BLOCKS audio blocks in one AC-3 frame */ static void output_audio_block(AC3EncodeContext *s, uint8_t exp_strategy[AC3_MAX_CHANNELS], diff -r 856df346b536 -r 1a93d3bbe3ee ac3tab.c --- a/ac3tab.c Sun Aug 03 13:11:14 2008 +0000 +++ b/ac3tab.c Sun Aug 03 16:42:32 2008 +0000 @@ -1,5 +1,5 @@ /* - * AC3 tables + * AC-3 tables * copyright (c) 2001 Fabrice Bellard * * This file is part of FFmpeg. @@ -21,7 +21,7 @@ /** * @file ac3tab.c - * tables taken directly from AC3 spec. + * tables taken directly from the AC-3 spec. */ #include "ac3tab.h" @@ -88,7 +88,7 @@ 160, 192, 224, 256, 320, 384, 448, 512, 576, 640 }; -/* AC3 MDCT window */ +/* AC-3 MDCT window */ /* MDCT window */ const int16_t ff_ac3_window[256] = { diff -r 856df346b536 -r 1a93d3bbe3ee ac3tab.h --- a/ac3tab.h Sun Aug 03 13:11:14 2008 +0000 +++ b/ac3tab.h Sun Aug 03 16:42:32 2008 +0000 @@ -1,5 +1,5 @@ /* - * AC3 tables + * AC-3 tables * Copyright (c) 2000, 2001, 2002 Fabrice Bellard. * * This file is part of FFmpeg. diff -r 856df346b536 -r 1a93d3bbe3ee resample.c --- a/resample.c Sun Aug 03 13:11:14 2008 +0000 +++ b/resample.c Sun Aug 03 16:42:32 2008 +0000 @@ -154,7 +154,7 @@ s->filter_channels = s->output_channels; /* - * ac3 output is the only case where filter_channels could be greater than 2. + * AC-3 output is the only case where filter_channels could be greater than 2. * input channels can't be greater than 2, so resample the 2 channels and then * expand to 6 channels after the resampling. */