Commit ba415398 authored by jbr's avatar jbr

cosmetics: blank lines, remove some comments

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@9955 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent aaad3f94
...@@ -129,7 +129,6 @@ static const uint8_t ac3_default_coeffs[8][5][2] = { ...@@ -129,7 +129,6 @@ static const uint8_t ac3_default_coeffs[8][5][2] = {
typedef struct { typedef struct {
int acmod; int acmod;
int dsurmod; int dsurmod;
int blksw[AC3_MAX_CHANNELS]; int blksw[AC3_MAX_CHANNELS];
int dithflag[AC3_MAX_CHANNELS]; int dithflag[AC3_MAX_CHANNELS];
int dither_all; int dither_all;
...@@ -199,7 +198,6 @@ typedef struct { ...@@ -199,7 +198,6 @@ typedef struct {
AVCodecContext *avctx; ///< parent context AVCodecContext *avctx; ///< parent context
} AC3DecodeContext; } AC3DecodeContext;
/*********** BEGIN INIT HELPER FUNCTIONS ***********/
/** /**
* Generate a Kaiser-Bessel Derived Window. * Generate a Kaiser-Bessel Derived Window.
*/ */
...@@ -318,7 +316,6 @@ static int ac3_decode_init(AVCodecContext *avctx) ...@@ -318,7 +316,6 @@ static int ac3_decode_init(AVCodecContext *avctx)
return 0; return 0;
} }
/*********** END INIT FUNCTIONS ***********/
/** /**
* Parses the 'sync info' and 'bit stream info' from the AC-3 bitstream. * Parses the 'sync info' and 'bit stream info' from the AC-3 bitstream.
...@@ -506,7 +503,6 @@ static int get_transform_coeffs_ch(AC3DecodeContext *ctx, int ch_index, mant_gro ...@@ -506,7 +503,6 @@ static int get_transform_coeffs_ch(AC3DecodeContext *ctx, int ch_index, mant_gro
start = ctx->startmant[ch_index]; start = ctx->startmant[ch_index];
end = ctx->endmant[ch_index]; end = ctx->endmant[ch_index];
for (i = start; i < end; i++) { for (i = start; i < end; i++) {
tbap = bap[i]; tbap = bap[i];
switch (tbap) { switch (tbap) {
...@@ -955,7 +951,6 @@ static int ac3_parse_audio_block(AC3DecodeContext *ctx, int blk) ...@@ -955,7 +951,6 @@ static int ac3_parse_audio_block(AC3DecodeContext *ctx, int blk)
} }
bit_alloc_stages[ch] = FFMAX(bit_alloc_stages[ch], 2); bit_alloc_stages[ch] = FFMAX(bit_alloc_stages[ch], 2);
} }
for (ch = !ctx->cplinu; ch <= nfchans; ch++) { for (ch = !ctx->cplinu; ch <= nfchans; ch++) {
if (ctx->deltbae[ch] == DBA_NEW) {/*channel delta offset, len and bit allocation */ if (ctx->deltbae[ch] == DBA_NEW) {/*channel delta offset, len and bit allocation */
ctx->deltnseg[ch] = get_bits(gb, 3); ctx->deltnseg[ch] = get_bits(gb, 3);
...@@ -1004,6 +999,7 @@ static int ac3_parse_audio_block(AC3DecodeContext *ctx, int blk) ...@@ -1004,6 +999,7 @@ static int ac3_parse_audio_block(AC3DecodeContext *ctx, int blk)
while(skipl--) while(skipl--)
skip_bits(gb, 8); skip_bits(gb, 8);
} }
/* unpack the transform coefficients /* unpack the transform coefficients
* * this also uncouples channels if coupling is in use. * * this also uncouples channels if coupling is in use.
*/ */
...@@ -1096,8 +1092,6 @@ static int ac3_decode_frame(AVCodecContext * avctx, void *data, int *data_size, ...@@ -1096,8 +1092,6 @@ static int ac3_decode_frame(AVCodecContext * avctx, void *data, int *data_size,
} }
ctx->out_channels = avctx->channels; ctx->out_channels = avctx->channels;
//av_log(avctx, AV_LOG_INFO, "channels = %d \t bit rate = %d \t sampling rate = %d \n", avctx->channels, avctx->bit_rate * 1000, avctx->sample_rate);
//Parse the Audio Blocks. //Parse the Audio Blocks.
for (blk = 0; blk < NB_BLOCKS; blk++) { for (blk = 0; blk < NB_BLOCKS; blk++) {
if (ac3_parse_audio_block(ctx, blk)) { if (ac3_parse_audio_block(ctx, blk)) {
...@@ -1133,4 +1127,3 @@ AVCodec ac3_decoder = { ...@@ -1133,4 +1127,3 @@ AVCodec ac3_decoder = {
.close = ac3_decode_end, .close = ac3_decode_end,
.decode = ac3_decode_frame, .decode = ac3_decode_frame,
}; };
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment