generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Move writing of frame to the output bitstream to a separate function.

Browse Source 
Originally committed as revision 25994 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Justin Ruggles 2010-12-14 14:53:13 +00:00
parent 084f5c5afe
commit 67d979fede
1 changed files with 28 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
libavcodec/ac3enc.c
View File

@ -914,10 +914,8 @@ static int compute_bit_allocation(AC3EncodeContext *s,
/** /**
* Write the AC-3 frame header to the output bitstream. * Write the AC-3 frame header to the output bitstream.
*/ */
static void output_frame_header(AC3EncodeContext *s, unsigned char *frame) static void output_frame_header(AC3EncodeContext *s)
{ {
init_put_bits(&s->pb, frame, AC3_MAX_CODED_FRAME_SIZE);
put_bits(&s->pb, 16, 0x0b77); /* frame header */ put_bits(&s->pb, 16, 0x0b77); /* frame header */
put_bits(&s->pb, 16, 0); /* crc1: will be filled later */ put_bits(&s->pb, 16, 0); /* crc1: will be filled later */
put_bits(&s->pb, 2, s->bit_alloc.sr_code); put_bits(&s->pb, 2, s->bit_alloc.sr_code);
@ -1294,6 +1292,32 @@ static void output_frame_end(AC3EncodeContext *s)
} }
/**
* Write the frame to the output bitstream.
*/
static void output_frame(AC3EncodeContext *s,
unsigned char *frame,
uint8_t exp_strategy[AC3_MAX_BLOCKS][AC3_MAX_CHANNELS],
uint8_t encoded_exp[AC3_MAX_BLOCKS][AC3_MAX_CHANNELS][AC3_MAX_COEFS],
uint8_t bap[AC3_MAX_BLOCKS][AC3_MAX_CHANNELS][AC3_MAX_COEFS],
int32_t mdct_coef[AC3_MAX_BLOCKS][AC3_MAX_CHANNELS][AC3_MAX_COEFS],
int8_t exp_shift[AC3_MAX_BLOCKS][AC3_MAX_CHANNELS])
{
int blk;
init_put_bits(&s->pb, frame, AC3_MAX_CODED_FRAME_SIZE);
output_frame_header(s);
for (blk = 0; blk < AC3_MAX_BLOCKS; blk++) {
output_audio_block(s, exp_strategy[blk], encoded_exp[blk],
bap[blk], mdct_coef[blk], exp_shift[blk], blk);
}
output_frame_end(s);
}
/** /**
* Encode a single AC-3 frame. * Encode a single AC-3 frame.
*/ */
@ -1302,7 +1326,6 @@ static int ac3_encode_frame(AVCodecContext *avctx,
{ {
AC3EncodeContext *s = avctx->priv_data; AC3EncodeContext *s = avctx->priv_data;
const int16_t *samples = data; const int16_t *samples = data;
int blk;
int16_t planar_samples[AC3_MAX_CHANNELS][AC3_BLOCK_SIZE+AC3_FRAME_SIZE]; int16_t planar_samples[AC3_MAX_CHANNELS][AC3_BLOCK_SIZE+AC3_FRAME_SIZE];
int32_t mdct_coef[AC3_MAX_BLOCKS][AC3_MAX_CHANNELS][AC3_MAX_COEFS]; int32_t mdct_coef[AC3_MAX_BLOCKS][AC3_MAX_CHANNELS][AC3_MAX_COEFS];
uint8_t exp[AC3_MAX_BLOCKS][AC3_MAX_CHANNELS][AC3_MAX_COEFS]; uint8_t exp[AC3_MAX_BLOCKS][AC3_MAX_CHANNELS][AC3_MAX_COEFS];
@ -1323,14 +1346,7 @@ static int ac3_encode_frame(AVCodecContext *avctx,
compute_bit_allocation(s, bap, encoded_exp, exp_strategy, frame_bits); compute_bit_allocation(s, bap, encoded_exp, exp_strategy, frame_bits);
output_frame_header(s, frame); output_frame(s, frame, exp_strategy, encoded_exp, bap, mdct_coef, exp_shift);
for (blk = 0; blk < AC3_MAX_BLOCKS; blk++) {
output_audio_block(s, exp_strategy[blk], encoded_exp[blk],
bap[blk], mdct_coef[blk], exp_shift[blk], blk);
}
output_frame_end(s);
return s->frame_size; return s->frame_size;
} }