[FFmpeg-soc] [soc]: r3015 - in eac3: TODO ac3dec.c checkout.sh eac3dec.c
jbr
subversion at mplayerhq.hu
Tue Aug 5 02:19:28 CEST 2008
Author: jbr
Date: Tue Aug 5 02:19:28 2008
New Revision: 3015
Log:
always capitalize and hyphenate the words 'AC-3' and 'E-AC-3'
Modified:
eac3/TODO
eac3/ac3dec.c
eac3/checkout.sh
eac3/eac3dec.c
Modified: eac3/TODO
==============================================================================
--- eac3/TODO (original)
+++ eac3/TODO Tue Aug 5 02:19:28 2008
@@ -16,15 +16,15 @@ Features:
* Dependent Streams (more than 6 channels)
- We do not currently have any samples which use dependent streams.
-* Mixed AC3 and EAC3
- - Blu-ray uses AC3 for the independent stream, interleaved with
- E-AC3 dependent stream(s) for extra channels.
+* Mixed AC-3 and E-AC-3
+ - Blu-ray uses AC-3 for the independent stream, interleaved with
+ E-AC-3 dependent stream(s) for extra channels.
* Adaptive Hybrid Transform (w/ GAQ and VQ)
- Works for the 2 samples we have which utilize it.
* Reduced Sample Rates
- - E-AC3 has the ability to use 1/2 sample rates
+ - E-AC-3 has the ability to use 1/2 sample rates
(16kHz,22.05kHz,24kHz), but the specification does not say how to
handle them (if at all) in the bit allocation. It is probably
similar to RealAudio DolbyNet, but we need a sample to test.
Modified: eac3/ac3dec.c
==============================================================================
--- eac3/ac3dec.c (original)
+++ eac3/ac3dec.c Tue Aug 5 02:19:28 2008
@@ -1,7 +1,7 @@
/*
* AC-3 Audio Decoder
* This code was developed as part of Google Summer of Code 2006.
- * E-AC3 support was added as part of Google Summer of Code 2007.
+ * E-AC-3 support was added as part of Google Summer of Code 2007.
*
* Copyright (c) 2006 Kartikey Mahendra BHATT (bhattkm at gmail dot com).
* Copyright (c) 2007-2008 Bartlomiej Wolowiec <bartek.wolowiec at gmail.com>
@@ -274,7 +274,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)
{
@@ -866,7 +866,7 @@ static int decode_audio_block(AC3DecodeC
av_log(s->avctx, AV_LOG_ERROR, "new coupling strategy must be present in block 0\n");
return -1;
} else {
- /* for AC3, copy coupling use strategy from last block */
+ /* for AC-3, copy coupling use strategy from last block */
s->cpl_in_use[blk] = s->cpl_in_use[blk-1];
}
}
@@ -1015,7 +1015,7 @@ static int decode_audio_block(AC3DecodeC
}
s->snr_offset[ch] = snr;
- /* fast gain (normal AC3 only) */
+ /* fast gain (normal AC-3 only) */
if (!s->eac3) {
int prev = s->fast_gain[ch];
s->fast_gain[ch] = ff_ac3_fast_gain_tab[get_bits(gbc, 3)];
@@ -1029,7 +1029,7 @@ static int decode_audio_block(AC3DecodeC
return -1;
}
- /* fast gain (E-AC3 only) */
+ /* fast gain (E-AC-3 only) */
if(s->eac3) {
if (s->fast_gain_syntax && get_bits1(gbc)) {
for (ch = !cpl_in_use; ch <= s->channels; ch++) {
@@ -1045,7 +1045,7 @@ static int decode_audio_block(AC3DecodeC
}
}
- /* E-AC3 to AC3 converter SNR offset */
+ /* E-AC-3 to AC-3 converter SNR offset */
if (s->eac3 && s->frame_type == EAC3_FRAME_TYPE_INDEPENDENT &&
get_bits1(gbc)) {
skip_bits(gbc, 10); // skip converter snr offset
Modified: eac3/checkout.sh
==============================================================================
--- eac3/checkout.sh (original)
+++ eac3/checkout.sh Tue Aug 5 02:19:28 2008
@@ -8,7 +8,7 @@ svn checkout svn://svn.mplayerhq.hu/ffmp
echo "patching ffmpeg"
cd ffmpeg
patch -p0 <../ffmpeg.patch
-echo "copying the E-AC3 files to ffmpeg/libavcodec"
+echo "copying the E-AC-3 files to ffmpeg/libavcodec"
for i in $FILES; do
rm -f libavcodec/$i
ln -s ../../$i libavcodec/$i
Modified: eac3/eac3dec.c
==============================================================================
--- eac3/eac3dec.c (original)
+++ eac3/eac3dec.c Tue Aug 5 02:19:28 2008
@@ -1,5 +1,5 @@
/*
- * EAC3 decoder
+ * E-AC-3 decoder
* Copyright (c) 2007 Bartlomiej Wolowiec <bartek.wolowiec at gmail.com>
*
* This file is part of FFmpeg.
@@ -154,7 +154,7 @@ static int parse_bsi(AC3DecodeContext *s
int i, blk;
GetBitContext *gbc = &s->gbc;
- /* an E-AC3 stream can have multiple independent streams which the
+ /* an E-AC-3 stream can have multiple independent streams which the
application can select from. each independent stream can also contain
dependent streams which are used to add or replace channels. */
if (s->frame_type == EAC3_FRAME_TYPE_DEPENDENT) {
@@ -176,9 +176,9 @@ static int parse_bsi(AC3DecodeContext *s
}
if (s->bit_alloc_params.sr_code == EAC3_SR_CODE_REDUCED) {
- /* The E-AC3 specification does not tell how to handle reduced sample
+ /* The E-AC-3 specification does not tell how to handle reduced sample
rates in bit allocation. The best assumption would be that it is
- handled like AC3 DolbyNet, but we cannot be sure until we have a
+ handled like AC-3 DolbyNet, but we cannot be sure until we have a
sample which utilizes this feature. */
ff_eac3_log_missing_feature(s->avctx, "Reduced Sampling Rates");
return -1;
@@ -306,7 +306,7 @@ static int parse_bsi(AC3DecodeContext *s
skip_bits1(gbc); //converter synchronization flag
}
- /* original frame size code if this stream was converted from AC3 */
+ /* original frame size code if this stream was converted from AC-3 */
if (s->frame_type == EAC3_FRAME_TYPE_AC3_CONVERT &&
(s->num_blocks == 6 || get_bits1(gbc))) {
skip_bits(gbc, 6); // skip Frame size code
@@ -411,7 +411,7 @@ static int parse_audfrm(AC3DecodeContext
s->exp_strategy[blk][s->lfe_ch] = get_bits1(gbc);
}
}
- /* original exponent strategies if this stream was converted from AC3 */
+ /* original exponent strategies if this stream was converted from AC-3 */
if (s->frame_type == EAC3_FRAME_TYPE_INDEPENDENT &&
(s->num_blocks == 6 || get_bits1(gbc))) {
for (ch = 1; ch <= s->fbw_channels; ch++) {
More information about the FFmpeg-soc
mailing list