[FFmpeg-cvslog] r14523 - in trunk: libavcodec/aac_ac3_parser.c libavcodec/aac_ac3_parser.h libavcodec/ac3.c libavcodec/ac3.h libavcodec/ac3_parser.c libavcodec/ac3_parser.h libavcodec/ac3dec.c libavcodec/ac3dec.h libavcodec/ac3dec_data.c libavcodec/ac3dec_data.h libavcodec/ac3enc.c libavcodec/ac3tab.c libavcodec/ac3tab.h libavcodec/resample.c libavformat/mpegenc.c libavformat/rmenc.c

jbr subversion
Sun Aug 3 18:42:33 CEST 2008


Author: jbr
Date: Sun Aug  3 18:42:32 2008
New Revision: 14523

Log:
cosmetics: make all references to AC-3 capitalized and hyphenated

Modified:
   trunk/libavcodec/aac_ac3_parser.c
   trunk/libavcodec/aac_ac3_parser.h
   trunk/libavcodec/ac3.c
   trunk/libavcodec/ac3.h
   trunk/libavcodec/ac3_parser.c
   trunk/libavcodec/ac3_parser.h
   trunk/libavcodec/ac3dec.c
   trunk/libavcodec/ac3dec.h
   trunk/libavcodec/ac3dec_data.c
   trunk/libavcodec/ac3dec_data.h
   trunk/libavcodec/ac3enc.c
   trunk/libavcodec/ac3tab.c
   trunk/libavcodec/ac3tab.h
   trunk/libavcodec/resample.c
   trunk/libavformat/mpegenc.c
   trunk/libavformat/rmenc.c

Modified: trunk/libavcodec/aac_ac3_parser.c
==============================================================================
--- trunk/libavcodec/aac_ac3_parser.c	(original)
+++ trunk/libavcodec/aac_ac3_parser.c	Sun Aug  3 18:42:32 2008
@@ -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 @@ get_next:
 
     /* 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 ||

Modified: trunk/libavcodec/aac_ac3_parser.h
==============================================================================
--- trunk/libavcodec/aac_ac3_parser.h	(original)
+++ trunk/libavcodec/aac_ac3_parser.h	Sun Aug  3 18:42:32 2008
@@ -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.
  *

Modified: trunk/libavcodec/ac3.c
==============================================================================
--- trunk/libavcodec/ac3.c	(original)
+++ trunk/libavcodec/ac3.c	Sun Aug  3 18:42:32 2008
@@ -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 @@ void ff_ac3_bit_alloc_calc_bap(int16_t *
     } 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,

Modified: trunk/libavcodec/ac3.h
==============================================================================
--- trunk/libavcodec/ac3.h	(original)
+++ trunk/libavcodec/ac3.h	Sun Aug  3 18:42:32 2008
@@ -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 */

Modified: trunk/libavcodec/ac3_parser.c
==============================================================================
--- trunk/libavcodec/ac3_parser.c	(original)
+++ trunk/libavcodec/ac3_parser.c	Sun Aug  3 18:42:32 2008
@@ -1,5 +1,5 @@
 /*
- * AC3 parser
+ * AC-3 parser
  * Copyright (c) 2003 Fabrice Bellard.
  * Copyright (c) 2003 Michael Niedermayer.
  *

Modified: trunk/libavcodec/ac3_parser.h
==============================================================================
--- trunk/libavcodec/ac3_parser.h	(original)
+++ trunk/libavcodec/ac3_parser.h	Sun Aug  3 18:42:32 2008
@@ -1,5 +1,5 @@
 /*
- * AC3 parser prototypes
+ * AC-3 parser prototypes
  * Copyright (c) 2003 Fabrice Bellard.
  * Copyright (c) 2003 Michael Niedermayer.
  *

Modified: trunk/libavcodec/ac3dec.c
==============================================================================
--- trunk/libavcodec/ac3dec.c	(original)
+++ trunk/libavcodec/ac3dec.c	Sun Aug  3 18:42:32 2008
@@ -228,7 +228,7 @@ static av_cold int ac3_decode_init(AVCod
 /**
  * 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 @@ static int ac3_parse_header(AC3DecodeCon
 }
 
 /**
- * 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)
 {

Modified: trunk/libavcodec/ac3dec.h
==============================================================================
--- trunk/libavcodec/ac3dec.h	(original)
+++ trunk/libavcodec/ac3dec.h	Sun Aug  3 18:42:32 2008
@@ -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 <bartek.wolowiec at gmail.com>
  *
  * 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

Modified: trunk/libavcodec/ac3dec_data.c
==============================================================================
--- trunk/libavcodec/ac3dec_data.c	(original)
+++ trunk/libavcodec/ac3dec_data.c	Sun Aug  3 18:42:32 2008
@@ -1,5 +1,5 @@
 /*
- * AC3 and E-AC3 decoder tables
+ * AC-3 and E-AC-3 decoder tables
  * Copyright (c) 2007 Bartlomiej Wolowiec <bartek.wolowiec at gmail.com>
  *
  * 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"

Modified: trunk/libavcodec/ac3dec_data.h
==============================================================================
--- trunk/libavcodec/ac3dec_data.h	(original)
+++ trunk/libavcodec/ac3dec_data.h	Sun Aug  3 18:42:32 2008
@@ -1,5 +1,5 @@
 /*
- * AC3 and E-AC3 decoder tables
+ * AC-3 and E-AC-3 decoder tables
  * Copyright (c) 2007 Bartlomiej Wolowiec <bartek.wolowiec at gmail.com>
  *
  * This file is part of FFmpeg.

Modified: trunk/libavcodec/ac3enc.c
==============================================================================
--- trunk/libavcodec/ac3enc.c	(original)
+++ trunk/libavcodec/ac3enc.c	Sun Aug  3 18:42:32 2008
@@ -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 @@ static av_cold int AC3_encode_init(AVCod
     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 @@ static inline int asym_quant(int c, int 
     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],

Modified: trunk/libavcodec/ac3tab.c
==============================================================================
--- trunk/libavcodec/ac3tab.c	(original)
+++ trunk/libavcodec/ac3tab.c	Sun Aug  3 18:42:32 2008
@@ -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 @@ const uint16_t ff_ac3_bitrate_tab[19] = 
     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] = {

Modified: trunk/libavcodec/ac3tab.h
==============================================================================
--- trunk/libavcodec/ac3tab.h	(original)
+++ trunk/libavcodec/ac3tab.h	Sun Aug  3 18:42:32 2008
@@ -1,5 +1,5 @@
 /*
- * AC3 tables
+ * AC-3 tables
  * Copyright (c) 2000, 2001, 2002 Fabrice Bellard.
  *
  * This file is part of FFmpeg.

Modified: trunk/libavcodec/resample.c
==============================================================================
--- trunk/libavcodec/resample.c	(original)
+++ trunk/libavcodec/resample.c	Sun Aug  3 18:42:32 2008
@@ -154,7 +154,7 @@ ReSampleContext *audio_resample_init(int
         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.
  */

Modified: trunk/libavformat/mpegenc.c
==============================================================================
--- trunk/libavformat/mpegenc.c	(original)
+++ trunk/libavformat/mpegenc.c	Sun Aug  3 18:42:32 2008
@@ -234,7 +234,7 @@ static int put_system_header(AVFormatCon
 
                 id = stream->id;
                 if (id < 0xc0) {
-                    /* special case for private streams (AC3 use that) */
+                    /* special case for private streams (AC-3 uses that) */
                     if (private_stream_coded)
                         continue;
                     private_stream_coded = 1;
@@ -581,7 +581,7 @@ static int get_packet_payload_size(AVFor
         }
 
         if (stream->id < 0xc0) {
-            /* AC3/LPCM private data header */
+            /* AC-3/LPCM private data header */
             buf_index += 4;
             if (stream->id >= 0xa0) {
                 int n;
@@ -906,7 +906,7 @@ static int flush_packet(AVFormatContext 
                 put_byte(ctx->pb, stream->lpcm_header[1]);
                 put_byte(ctx->pb, stream->lpcm_header[2]);
             } else if (id >= 0x40) {
-                /* AC3 */
+                /* AC-3 */
                 put_byte(ctx->pb, nb_frames);
                 put_be16(ctx->pb, trailer_size+1);
             }

Modified: trunk/libavformat/rmenc.c
==============================================================================
--- trunk/libavformat/rmenc.c	(original)
+++ trunk/libavformat/rmenc.c	Sun Aug  3 18:42:32 2008
@@ -185,7 +185,7 @@ static void rv10_write_header(AVFormatCo
             case 8000:
                 fscode = 3;
             }
-            put_be16(s, fscode); /* codec additional info, for AC3, seems
+            put_be16(s, fscode); /* codec additional info, for AC-3, seems
                                      to be a frequency code */
             /* special hack to compensate rounding errors... */
             if (coded_frame_size == 557)
@@ -325,7 +325,7 @@ static int rm_write_audio(AVFormatContex
 
     write_packet_header(s, stream, size, !!(flags & PKT_FLAG_KEY));
 
-    /* for AC3, the words seems to be reversed */
+    /* for AC-3, the words seem to be reversed */
     for(i=0;i<size;i+=2) {
         buf1[i] = buf[i+1];
         buf1[i+1] = buf[i];




More information about the ffmpeg-cvslog mailing list