virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

cook: move samples_per_frame from COOKSubpacket to where it is used

Browse Source
This commit is contained in:
Justin Ruggles 2012-10-21 14:43:02 -04:00
parent 7efbba2e36
commit 8f173ef019
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavcodec/cook.c
View File

@ -72,7 +72,6 @@ typedef struct {
int size; int size;
int num_channels; int num_channels;
int cookversion; int cookversion;
int samples_per_frame;
int subbands; int subbands;
int js_subband_start; int js_subband_start;
int js_vlc_bits; int js_vlc_bits;
@ -1025,7 +1024,6 @@ static void dump_cook_context(COOKContext *q)
PRINT("bit_rate", q->avctx->bit_rate); PRINT("bit_rate", q->avctx->bit_rate);
PRINT("sample_rate", q->avctx->sample_rate); PRINT("sample_rate", q->avctx->sample_rate);
PRINT("samples_per_channel", q->subpacket[0].samples_per_channel); PRINT("samples_per_channel", q->subpacket[0].samples_per_channel);
PRINT("samples_per_frame", q->subpacket[0].samples_per_frame);
PRINT("subbands", q->subpacket[0].subbands); PRINT("subbands", q->subpacket[0].subbands);
PRINT("js_subband_start", q->subpacket[0].js_subband_start); PRINT("js_subband_start", q->subpacket[0].js_subband_start);
PRINT("log2_numvector_size", q->subpacket[0].log2_numvector_size); PRINT("log2_numvector_size", q->subpacket[0].log2_numvector_size);
@ -1047,6 +1045,7 @@ static av_cold int cook_decode_init(AVCodecContext *avctx)
int extradata_size = avctx->extradata_size; int extradata_size = avctx->extradata_size;
int s = 0; int s = 0;
unsigned int channel_mask = 0; unsigned int channel_mask = 0;
int samples_per_frame;
int ret; int ret;
q->avctx = avctx; q->avctx = avctx;
@ -1073,7 +1072,7 @@ static av_cold int cook_decode_init(AVCodecContext *avctx)
Swap to right endianness so we don't need to care later on. */ Swap to right endianness so we don't need to care later on. */
if (extradata_size >= 8) { if (extradata_size >= 8) {
q->subpacket[s].cookversion = bytestream_get_be32(&edata_ptr); q->subpacket[s].cookversion = bytestream_get_be32(&edata_ptr);
q->subpacket[s].samples_per_frame = bytestream_get_be16(&edata_ptr); samples_per_frame = bytestream_get_be16(&edata_ptr);
q->subpacket[s].subbands = bytestream_get_be16(&edata_ptr); q->subpacket[s].subbands = bytestream_get_be16(&edata_ptr);
extradata_size -= 8; extradata_size -= 8;
} }
@ -1085,7 +1084,7 @@ static av_cold int cook_decode_init(AVCodecContext *avctx)
} }
/* Initialize extradata related variables. */ /* Initialize extradata related variables. */
q->subpacket[s].samples_per_channel = q->subpacket[s].samples_per_frame / avctx->channels; q->subpacket[s].samples_per_channel = samples_per_frame / avctx->channels;
q->subpacket[s].bits_per_subpacket = avctx->block_align * 8; q->subpacket[s].bits_per_subpacket = avctx->block_align * 8;
/* Initialize default data states. */ /* Initialize default data states. */
@ -1142,7 +1141,7 @@ static av_cold int cook_decode_init(AVCodecContext *avctx)
q->subpacket[s].js_subband_start; q->subpacket[s].js_subband_start;
q->subpacket[s].joint_stereo = 1; q->subpacket[s].joint_stereo = 1;
q->subpacket[s].num_channels = 2; q->subpacket[s].num_channels = 2;
q->subpacket[s].samples_per_channel = q->subpacket[s].samples_per_frame >> 1; q->subpacket[s].samples_per_channel = samples_per_frame >> 1;
if (q->subpacket[s].samples_per_channel > 256) { if (q->subpacket[s].samples_per_channel > 256) {
q->subpacket[s].log2_numvector_size = 6; q->subpacket[s].log2_numvector_size = 6;
@ -1151,7 +1150,7 @@ static av_cold int cook_decode_init(AVCodecContext *avctx)
q->subpacket[s].log2_numvector_size = 7; q->subpacket[s].log2_numvector_size = 7;
} }
} else } else
q->subpacket[s].samples_per_channel = q->subpacket[s].samples_per_frame; q->subpacket[s].samples_per_channel = samples_per_frame;
break; break;
default: default: