virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-07-16 22:42:38 +02:00
Code Issues Releases Activity

Merge commit 'a2664c91fba15a1307f676ffad511f8f86fb3a27'

Browse Source 
* commit 'a2664c91fba15a1307f676ffad511f8f86fb3a27':
  atrac3: move the 'samples_per_frame' field from ATRAC3Context to where it is used
  atrac3: remove unused ATRAC3Context field, samples_per_channel
  atrac3: use AVCodecContext.block_align instead of keeping a private copy
  atrac3: move the 'delay' field from ATRAC3Context to where it is used
  atrac3: move the 'version' field from ATRAC3Context to where it is used

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2012-10-23 12:41:02 +02:00
parent dcb0d1193a a2664c91fb
commit 8748472f39
1 changed files with 28 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
libavcodec/atrac3.c
View File

@ -93,11 +93,7 @@ typedef struct ATRAC3Context {
int coding_mode; int coding_mode;
int bit_rate; int bit_rate;
int sample_rate; int sample_rate;
int samples_per_channel;
int samples_per_frame;
int bits_per_frame;
int bytes_per_frame;
ChannelUnit *units; ChannelUnit *units;
//@} //@}
//@{ //@{
@ -114,8 +110,6 @@ typedef struct ATRAC3Context {
//@} //@}
//@{ //@{
/** extradata */ /** extradata */
int version;
int delay;
int scrambled_stream; int scrambled_stream;
int frame_factor; int frame_factor;
//@} //@}
@ -726,7 +720,7 @@ static int decode_frame(AVCodecContext *avctx, const uint8_t *databuf,
if (q->coding_mode == JOINT_STEREO) { if (q->coding_mode == JOINT_STEREO) {
/* channel coupling mode */ /* channel coupling mode */
/* decode Sound Unit 1 */ /* 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, ret = decode_channel_sound_unit(q, &q->gb, q->units, out_samples[0], 0,
JOINT_STEREO); JOINT_STEREO);
@ -736,26 +730,26 @@ static int decode_frame(AVCodecContext *avctx, const uint8_t *databuf,
/* Framedata of the su2 in the joint-stereo mode is encoded in /* Framedata of the su2 in the joint-stereo mode is encoded in
* reverse byte order so we need to swap it first. */ * reverse byte order so we need to swap it first. */
if (databuf == q->decoded_bytes_buffer) { 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; 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); FFSWAP(uint8_t, *ptr1, *ptr2);
} else { } else {
const uint8_t *ptr2 = databuf + q->bytes_per_frame - 1; const uint8_t *ptr2 = databuf + avctx->block_align - 1;
for (i = 0; i < q->bytes_per_frame; i++) for (i = 0; i < avctx->block_align; i++)
q->decoded_bytes_buffer[i] = *ptr2--; q->decoded_bytes_buffer[i] = *ptr2--;
} }
/* Skip the sync codes (0xF8). */ /* Skip the sync codes (0xF8). */
ptr1 = q->decoded_bytes_buffer; ptr1 = q->decoded_bytes_buffer;
for (i = 4; *ptr1 == 0xF8; i++, ptr1++) { for (i = 4; *ptr1 == 0xF8; i++, ptr1++) {
if (i >= q->bytes_per_frame) if (i >= avctx->block_align)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
/* set the bitstream reader at the start of the second Sound Unit*/ /* 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 */ /* Fill the Weighting coeffs delay buffer */
memmove(q->weighting_delay, &q->weighting_delay[2], 4 * sizeof(int)); memmove(q->weighting_delay, &q->weighting_delay[2], 4 * sizeof(int));
@ -786,8 +780,8 @@ static int decode_frame(AVCodecContext *avctx, const uint8_t *databuf,
for (i = 0; i < avctx->channels; i++) { for (i = 0; i < avctx->channels; i++) {
/* Set the bitstream reader at the start of a channel sound unit. */ /* Set the bitstream reader at the start of a channel sound unit. */
init_get_bits(&q->gb, init_get_bits(&q->gb,
databuf + i * q->bytes_per_frame / avctx->channels, databuf + i * avctx->block_align / avctx->channels,
q->bits_per_frame / avctx->channels); avctx->block_align * 8 / avctx->channels);
ret = decode_channel_sound_unit(q, &q->gb, &q->units[i], ret = decode_channel_sound_unit(q, &q->gb, &q->units[i],
out_samples[i], i, q->coding_mode); out_samples[i], i, q->coding_mode);
@ -855,6 +849,7 @@ static int atrac3_decode_frame(AVCodecContext *avctx, void *data,
static av_cold int atrac3_decode_init(AVCodecContext *avctx) static av_cold int atrac3_decode_init(AVCodecContext *avctx)
{ {
int i, ret; int i, ret;
int version, delay, samples_per_frame;
const uint8_t *edata_ptr = avctx->extradata; const uint8_t *edata_ptr = avctx->extradata;
ATRAC3Context *q = avctx->priv_data; ATRAC3Context *q = avctx->priv_data;
static VLC_TYPE atrac3_vlc_table[4096][2]; static VLC_TYPE atrac3_vlc_table[4096][2];
@ -863,8 +858,6 @@ static av_cold int atrac3_decode_init(AVCodecContext *avctx)
/* Take data from the AVCodecContext (RM container). */ /* Take data from the AVCodecContext (RM container). */
q->sample_rate = avctx->sample_rate; q->sample_rate = avctx->sample_rate;
q->bit_rate = avctx->bit_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) { if (avctx->channels <= 0 || avctx->channels > 2) {
av_log(avctx, AV_LOG_ERROR, "Channel configuration error!\n"); av_log(avctx, AV_LOG_ERROR, "Channel configuration error!\n");
@ -876,7 +869,7 @@ static av_cold int atrac3_decode_init(AVCodecContext *avctx)
/* Parse the extradata, WAV format */ /* Parse the extradata, WAV format */
av_log(avctx, AV_LOG_DEBUG, "[0-1] %d\n", av_log(avctx, AV_LOG_DEBUG, "[0-1] %d\n",
bytestream_get_le16(&edata_ptr)); // Unknown value always 1 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); q->coding_mode = bytestream_get_le16(&edata_ptr);
av_log(avctx, AV_LOG_DEBUG,"[8-9] %d\n", av_log(avctx, AV_LOG_DEBUG,"[8-9] %d\n",
bytestream_get_le16(&edata_ptr)); //Dupe of coding mode bytestream_get_le16(&edata_ptr)); //Dupe of coding mode
@ -885,27 +878,26 @@ static av_cold int atrac3_decode_init(AVCodecContext *avctx)
bytestream_get_le16(&edata_ptr)); // Unknown always 0 bytestream_get_le16(&edata_ptr)); // Unknown always 0
/* setup */ /* setup */
q->samples_per_frame = SAMPLES_PER_FRAME * avctx->channels; samples_per_frame = SAMPLES_PER_FRAME * avctx->channels;
q->version = 4; version = 4;
q->delay = 0x88E; delay = 0x88E;
q->coding_mode = q->coding_mode ? JOINT_STEREO : STEREO; q->coding_mode = q->coding_mode ? JOINT_STEREO : STEREO;
q->scrambled_stream = 0; q->scrambled_stream = 0;
if (q->bytes_per_frame != 96 * avctx->channels * q->frame_factor && if (avctx->block_align != 96 * avctx->channels * q->frame_factor &&
q->bytes_per_frame != 152 * avctx->channels * q->frame_factor && avctx->block_align != 152 * avctx->channels * q->frame_factor &&
q->bytes_per_frame != 192 * 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 " 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); avctx->channels, q->frame_factor);
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
} else if (avctx->extradata_size == 10) { } else if (avctx->extradata_size == 10) {
/* Parse the extradata, RM format. */ /* 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); 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->coding_mode = bytestream_get_be16(&edata_ptr);
q->samples_per_channel = q->samples_per_frame / avctx->channels;
q->scrambled_stream = 1; q->scrambled_stream = 1;
} else { } else {
@ -915,21 +907,21 @@ static av_cold int atrac3_decode_init(AVCodecContext *avctx)
/* Check the extradata */ /* Check the extradata */
if (q->version != 4) { if (version != 4) {
av_log(avctx, AV_LOG_ERROR, "Version %d != 4.\n", q->version); av_log(avctx, AV_LOG_ERROR, "Version %d != 4.\n", version);
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
if (q->samples_per_frame != SAMPLES_PER_FRAME && if (samples_per_frame != SAMPLES_PER_FRAME &&
q->samples_per_frame != SAMPLES_PER_FRAME * 2) { samples_per_frame != SAMPLES_PER_FRAME * 2) {
av_log(avctx, AV_LOG_ERROR, "Unknown amount of samples per frame %d.\n", av_log(avctx, AV_LOG_ERROR, "Unknown amount of samples per frame %d.\n",
q->samples_per_frame); samples_per_frame);
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
if (q->delay != 0x88E) { if (delay != 0x88E) {
av_log(avctx, AV_LOG_ERROR, "Unknown amount of delay %x != 0x88E.\n", av_log(avctx, AV_LOG_ERROR, "Unknown amount of delay %x != 0x88E.\n",
q->delay); delay);
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }