From 56a9d2b44e976adc23472901d936a696364ea80e Mon Sep 17 00:00:00 2001 From: Justin Ruggles Date: Thu, 18 Oct 2012 17:14:59 -0400 Subject: [PATCH 1/5] atrac3: move the 'version' field from ATRAC3Context to where it is used --- libavcodec/atrac3.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libavcodec/atrac3.c b/libavcodec/atrac3.c index 40f2a6d15f..0d1bc145e1 100644 --- a/libavcodec/atrac3.c +++ b/libavcodec/atrac3.c @@ -113,7 +113,6 @@ typedef struct ATRAC3Context { //@} //@{ /** extradata */ - int version; int delay; int scrambled_stream; int frame_factor; @@ -854,6 +853,7 @@ static int atrac3_decode_frame(AVCodecContext *avctx, void *data, static av_cold int atrac3_decode_init(AVCodecContext *avctx) { int i, ret; + int version; const uint8_t *edata_ptr = avctx->extradata; ATRAC3Context *q = avctx->priv_data; static VLC_TYPE atrac3_vlc_table[4096][2]; @@ -885,7 +885,7 @@ static av_cold int atrac3_decode_init(AVCodecContext *avctx) /* setup */ q->samples_per_frame = SAMPLES_PER_FRAME * avctx->channels; - q->version = 4; + version = 4; q->delay = 0x88E; q->coding_mode = q->coding_mode ? JOINT_STEREO : STEREO; q->scrambled_stream = 0; @@ -900,7 +900,7 @@ static av_cold int atrac3_decode_init(AVCodecContext *avctx) } } else if (avctx->extradata_size == 10) { /* Parse the extradata, RM format. */ - q->version = bytestream_get_be32(&edata_ptr); + version = bytestream_get_be32(&edata_ptr); q->samples_per_frame = bytestream_get_be16(&edata_ptr); q->delay = bytestream_get_be16(&edata_ptr); q->coding_mode = bytestream_get_be16(&edata_ptr); @@ -914,8 +914,8 @@ static av_cold int atrac3_decode_init(AVCodecContext *avctx) /* Check the extradata */ - if (q->version != 4) { - av_log(avctx, AV_LOG_ERROR, "Version %d != 4.\n", q->version); + if (version != 4) { + av_log(avctx, AV_LOG_ERROR, "Version %d != 4.\n", version); return AVERROR_INVALIDDATA; } From 64ebbb8f89d15dddf7c3318b6ef33c9288b2be15 Mon Sep 17 00:00:00 2001 From: Justin Ruggles Date: Thu, 18 Oct 2012 22:42:21 -0400 Subject: [PATCH 2/5] atrac3: move the 'delay' field from ATRAC3Context to where it is used --- libavcodec/atrac3.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/libavcodec/atrac3.c b/libavcodec/atrac3.c index 0d1bc145e1..0645ab1ac5 100644 --- a/libavcodec/atrac3.c +++ b/libavcodec/atrac3.c @@ -113,7 +113,6 @@ typedef struct ATRAC3Context { //@} //@{ /** extradata */ - int delay; int scrambled_stream; int frame_factor; //@} @@ -853,7 +852,7 @@ static int atrac3_decode_frame(AVCodecContext *avctx, void *data, static av_cold int atrac3_decode_init(AVCodecContext *avctx) { int i, ret; - int version; + int version, delay; const uint8_t *edata_ptr = avctx->extradata; ATRAC3Context *q = avctx->priv_data; static VLC_TYPE atrac3_vlc_table[4096][2]; @@ -886,7 +885,7 @@ static av_cold int atrac3_decode_init(AVCodecContext *avctx) /* setup */ q->samples_per_frame = SAMPLES_PER_FRAME * avctx->channels; version = 4; - q->delay = 0x88E; + delay = 0x88E; q->coding_mode = q->coding_mode ? JOINT_STEREO : STEREO; q->scrambled_stream = 0; @@ -902,7 +901,7 @@ static av_cold int atrac3_decode_init(AVCodecContext *avctx) /* Parse the extradata, RM format. */ version = bytestream_get_be32(&edata_ptr); q->samples_per_frame = bytestream_get_be16(&edata_ptr); - q->delay = bytestream_get_be16(&edata_ptr); + delay = bytestream_get_be16(&edata_ptr); q->coding_mode = bytestream_get_be16(&edata_ptr); q->samples_per_channel = q->samples_per_frame / avctx->channels; q->scrambled_stream = 1; @@ -926,9 +925,9 @@ static av_cold int atrac3_decode_init(AVCodecContext *avctx) return AVERROR_INVALIDDATA; } - if (q->delay != 0x88E) { + if (delay != 0x88E) { av_log(avctx, AV_LOG_ERROR, "Unknown amount of delay %x != 0x88E.\n", - q->delay); + delay); return AVERROR_INVALIDDATA; } From cdd0e0de816d3667b5bd069ac05d1faf40153782 Mon Sep 17 00:00:00 2001 From: Justin Ruggles Date: Thu, 18 Oct 2012 22:45:48 -0400 Subject: [PATCH 3/5] atrac3: use AVCodecContext.block_align instead of keeping a private copy --- libavcodec/atrac3.c | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/libavcodec/atrac3.c b/libavcodec/atrac3.c index 0645ab1ac5..76f2b22070 100644 --- a/libavcodec/atrac3.c +++ b/libavcodec/atrac3.c @@ -95,8 +95,6 @@ typedef struct ATRAC3Context { int samples_per_channel; int samples_per_frame; - int bits_per_frame; - int bytes_per_frame; ChannelUnit *units; //@} //@{ @@ -723,7 +721,7 @@ static int decode_frame(AVCodecContext *avctx, const uint8_t *databuf, if (q->coding_mode == JOINT_STEREO) { /* channel coupling mode */ /* decode Sound Unit 1 */ - init_get_bits(&q->gb,databuf,q->bits_per_frame); + init_get_bits(&q->gb, databuf, avctx->block_align * 8); ret = decode_channel_sound_unit(q, &q->gb, q->units, out_samples[0], 0, JOINT_STEREO); @@ -733,26 +731,26 @@ static int decode_frame(AVCodecContext *avctx, const uint8_t *databuf, /* Framedata of the su2 in the joint-stereo mode is encoded in * reverse byte order so we need to swap it first. */ if (databuf == q->decoded_bytes_buffer) { - uint8_t *ptr2 = q->decoded_bytes_buffer + q->bytes_per_frame - 1; + uint8_t *ptr2 = q->decoded_bytes_buffer + avctx->block_align - 1; ptr1 = q->decoded_bytes_buffer; - for (i = 0; i < q->bytes_per_frame / 2; i++, ptr1++, ptr2--) + for (i = 0; i < avctx->block_align / 2; i++, ptr1++, ptr2--) FFSWAP(uint8_t, *ptr1, *ptr2); } else { - const uint8_t *ptr2 = databuf + q->bytes_per_frame - 1; - for (i = 0; i < q->bytes_per_frame; i++) + const uint8_t *ptr2 = databuf + avctx->block_align - 1; + for (i = 0; i < avctx->block_align; i++) q->decoded_bytes_buffer[i] = *ptr2--; } /* Skip the sync codes (0xF8). */ ptr1 = q->decoded_bytes_buffer; for (i = 4; *ptr1 == 0xF8; i++, ptr1++) { - if (i >= q->bytes_per_frame) + if (i >= avctx->block_align) return AVERROR_INVALIDDATA; } /* set the bitstream reader at the start of the second Sound Unit*/ - init_get_bits(&q->gb, ptr1, q->bits_per_frame); + init_get_bits(&q->gb, ptr1, avctx->block_align * 8); /* Fill the Weighting coeffs delay buffer */ memmove(q->weighting_delay, &q->weighting_delay[2], 4 * sizeof(int)); @@ -783,8 +781,8 @@ static int decode_frame(AVCodecContext *avctx, const uint8_t *databuf, for (i = 0; i < avctx->channels; i++) { /* Set the bitstream reader at the start of a channel sound unit. */ init_get_bits(&q->gb, - databuf + i * q->bytes_per_frame / avctx->channels, - q->bits_per_frame / avctx->channels); + databuf + i * avctx->block_align / avctx->channels, + avctx->block_align * 8 / avctx->channels); ret = decode_channel_sound_unit(q, &q->gb, &q->units[i], out_samples[i], i, q->coding_mode); @@ -861,8 +859,6 @@ static av_cold int atrac3_decode_init(AVCodecContext *avctx) /* Take data from the AVCodecContext (RM container). */ q->sample_rate = avctx->sample_rate; q->bit_rate = avctx->bit_rate; - q->bits_per_frame = avctx->block_align * 8; - q->bytes_per_frame = avctx->block_align; if (avctx->channels <= 0 || avctx->channels > 2) { av_log(avctx, AV_LOG_ERROR, "Channel configuration error!\n"); @@ -889,11 +885,11 @@ static av_cold int atrac3_decode_init(AVCodecContext *avctx) q->coding_mode = q->coding_mode ? JOINT_STEREO : STEREO; q->scrambled_stream = 0; - if (q->bytes_per_frame != 96 * avctx->channels * q->frame_factor && - q->bytes_per_frame != 152 * avctx->channels * q->frame_factor && - q->bytes_per_frame != 192 * avctx->channels * q->frame_factor) { + if (avctx->block_align != 96 * avctx->channels * q->frame_factor && + avctx->block_align != 152 * avctx->channels * q->frame_factor && + avctx->block_align != 192 * avctx->channels * q->frame_factor) { av_log(avctx, AV_LOG_ERROR, "Unknown frame/channel/frame_factor " - "configuration %d/%d/%d\n", q->bytes_per_frame, + "configuration %d/%d/%d\n", avctx->block_align, avctx->channels, q->frame_factor); return AVERROR_INVALIDDATA; } From 7c1f93afe6b03efc356442f748cb6daede8688ea Mon Sep 17 00:00:00 2001 From: Justin Ruggles Date: Thu, 18 Oct 2012 22:48:45 -0400 Subject: [PATCH 4/5] atrac3: remove unused ATRAC3Context field, samples_per_channel --- libavcodec/atrac3.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libavcodec/atrac3.c b/libavcodec/atrac3.c index 76f2b22070..e23ff9847e 100644 --- a/libavcodec/atrac3.c +++ b/libavcodec/atrac3.c @@ -92,7 +92,6 @@ typedef struct ATRAC3Context { int coding_mode; int bit_rate; int sample_rate; - int samples_per_channel; int samples_per_frame; ChannelUnit *units; @@ -870,7 +869,7 @@ static av_cold int atrac3_decode_init(AVCodecContext *avctx) /* Parse the extradata, WAV format */ av_log(avctx, AV_LOG_DEBUG, "[0-1] %d\n", bytestream_get_le16(&edata_ptr)); // Unknown value always 1 - q->samples_per_channel = bytestream_get_le32(&edata_ptr); + edata_ptr += 4; // samples per channel q->coding_mode = bytestream_get_le16(&edata_ptr); av_log(avctx, AV_LOG_DEBUG,"[8-9] %d\n", bytestream_get_le16(&edata_ptr)); //Dupe of coding mode @@ -899,7 +898,6 @@ static av_cold int atrac3_decode_init(AVCodecContext *avctx) q->samples_per_frame = bytestream_get_be16(&edata_ptr); delay = bytestream_get_be16(&edata_ptr); q->coding_mode = bytestream_get_be16(&edata_ptr); - q->samples_per_channel = q->samples_per_frame / avctx->channels; q->scrambled_stream = 1; } else { From a2664c91fba15a1307f676ffad511f8f86fb3a27 Mon Sep 17 00:00:00 2001 From: Justin Ruggles Date: Thu, 18 Oct 2012 22:50:40 -0400 Subject: [PATCH 5/5] atrac3: move the 'samples_per_frame' field from ATRAC3Context to where it is used --- libavcodec/atrac3.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/libavcodec/atrac3.c b/libavcodec/atrac3.c index e23ff9847e..3a6d4e84d6 100644 --- a/libavcodec/atrac3.c +++ b/libavcodec/atrac3.c @@ -92,7 +92,6 @@ typedef struct ATRAC3Context { int coding_mode; int bit_rate; int sample_rate; - int samples_per_frame; ChannelUnit *units; //@} @@ -849,7 +848,7 @@ static int atrac3_decode_frame(AVCodecContext *avctx, void *data, static av_cold int atrac3_decode_init(AVCodecContext *avctx) { int i, ret; - int version, delay; + int version, delay, samples_per_frame; const uint8_t *edata_ptr = avctx->extradata; ATRAC3Context *q = avctx->priv_data; static VLC_TYPE atrac3_vlc_table[4096][2]; @@ -878,7 +877,7 @@ static av_cold int atrac3_decode_init(AVCodecContext *avctx) bytestream_get_le16(&edata_ptr)); // Unknown always 0 /* setup */ - q->samples_per_frame = SAMPLES_PER_FRAME * avctx->channels; + samples_per_frame = SAMPLES_PER_FRAME * avctx->channels; version = 4; delay = 0x88E; q->coding_mode = q->coding_mode ? JOINT_STEREO : STEREO; @@ -895,7 +894,7 @@ static av_cold int atrac3_decode_init(AVCodecContext *avctx) } else if (avctx->extradata_size == 10) { /* Parse the extradata, RM format. */ version = bytestream_get_be32(&edata_ptr); - q->samples_per_frame = bytestream_get_be16(&edata_ptr); + samples_per_frame = bytestream_get_be16(&edata_ptr); delay = bytestream_get_be16(&edata_ptr); q->coding_mode = bytestream_get_be16(&edata_ptr); q->scrambled_stream = 1; @@ -912,10 +911,10 @@ static av_cold int atrac3_decode_init(AVCodecContext *avctx) return AVERROR_INVALIDDATA; } - if (q->samples_per_frame != SAMPLES_PER_FRAME && - q->samples_per_frame != SAMPLES_PER_FRAME * 2) { + if (samples_per_frame != SAMPLES_PER_FRAME && + samples_per_frame != SAMPLES_PER_FRAME * 2) { av_log(avctx, AV_LOG_ERROR, "Unknown amount of samples per frame %d.\n", - q->samples_per_frame); + samples_per_frame); return AVERROR_INVALIDDATA; }