virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-08 13:22:53 +02:00
Code Issues Releases Activity

remove redundant context variable

Browse Source 
Originally committed as revision 12642 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Justin Ruggles 2008-03-31 00:29:52 +00:00
parent c23a0ac8da
commit 42ceeb5f3c
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libavcodec/flacenc.c
View File

@ -102,7 +102,6 @@ typedef struct FlacEncodeContext {
int ch_code; int ch_code;
int samplerate; int samplerate;
int sr_code[2]; int sr_code[2];
int blocksize;
int max_framesize; int max_framesize;
uint32_t frame_count; uint32_t frame_count;
FlacFrame frame; FlacFrame frame;
@ -136,8 +135,8 @@ static void write_streaminfo(FlacEncodeContext *s, uint8_t *header)
init_put_bits(&pb, header, FLAC_STREAMINFO_SIZE); init_put_bits(&pb, header, FLAC_STREAMINFO_SIZE);
/* streaminfo metadata block */ /* streaminfo metadata block */
put_bits(&pb, 16, s->blocksize); put_bits(&pb, 16, s->avctx->frame_size);
put_bits(&pb, 16, s->blocksize); put_bits(&pb, 16, s->avctx->frame_size);
put_bits(&pb, 24, 0); put_bits(&pb, 24, 0);
put_bits(&pb, 24, s->max_framesize); put_bits(&pb, 24, s->max_framesize);
put_bits(&pb, 20, s->samplerate); put_bits(&pb, 20, s->samplerate);
@ -351,12 +350,10 @@ static av_cold int flac_encode_init(AVCodecContext *avctx)
avctx->frame_size); avctx->frame_size);
return -1; return -1;
} }
s->blocksize = avctx->frame_size;
} else { } else {
s->blocksize = select_blocksize(s->samplerate, s->options.block_time_ms); s->avctx->frame_size = select_blocksize(s->samplerate, s->options.block_time_ms);
avctx->frame_size = s->blocksize;
} }
av_log(avctx, AV_LOG_DEBUG, " block size: %d\n", s->blocksize); av_log(avctx, AV_LOG_DEBUG, " block size: %d\n", s->avctx->frame_size);
/* set LPC precision */ /* set LPC precision */
if(avctx->lpc_coeff_precision > 0) { if(avctx->lpc_coeff_precision > 0) {
@ -375,9 +372,9 @@ static av_cold int flac_encode_init(AVCodecContext *avctx)
/* set maximum encoded frame size in verbatim mode */ /* set maximum encoded frame size in verbatim mode */
if(s->channels == 2) { if(s->channels == 2) {
s->max_framesize = 14 + ((s->blocksize * 33 + 7) >> 3); s->max_framesize = 14 + ((s->avctx->frame_size * 33 + 7) >> 3);
} else { } else {
s->max_framesize = 14 + (s->blocksize * s->channels * 2); s->max_framesize = 14 + (s->avctx->frame_size * s->channels * 2);
} }
streaminfo = av_malloc(FLAC_STREAMINFO_SIZE); streaminfo = av_malloc(FLAC_STREAMINFO_SIZE);
@ -401,7 +398,7 @@ static void init_frame(FlacEncodeContext *s)
frame = &s->frame; frame = &s->frame;
for(i=0; i<16; i++) { for(i=0; i<16; i++) {
if(s->blocksize == flac_blocksizes[i]) { if(s->avctx->frame_size == flac_blocksizes[i]) {
frame->blocksize = flac_blocksizes[i]; frame->blocksize = flac_blocksizes[i];
frame->bs_code[0] = i; frame->bs_code[0] = i;
frame->bs_code[1] = 0; frame->bs_code[1] = 0;
@ -409,7 +406,7 @@ static void init_frame(FlacEncodeContext *s)
} }
} }
if(i == 16) { if(i == 16) {
frame->blocksize = s->blocksize; frame->blocksize = s->avctx->frame_size;
if(frame->blocksize <= 256) { if(frame->blocksize <= 256) {
frame->bs_code[0] = 6; frame->bs_code[0] = 6;
frame->bs_code[1] = frame->blocksize-1; frame->bs_code[1] = frame->blocksize-1;
@ -1440,7 +1437,6 @@ static int flac_encode_frame(AVCodecContext *avctx, uint8_t *frame,
s = avctx->priv_data; s = avctx->priv_data;
s->blocksize = avctx->frame_size;
init_frame(s); init_frame(s);
copy_samples(s, samples); copy_samples(s, samples);