highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

alac: use AVPacket fields directly in alac_decode_frame()

Browse Source
This commit is contained in:
Justin Ruggles 2012-07-09 13:30:03 -04:00
parent 7a206eb32f
commit 5138ff143f
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/alac.c
View File

@ -291,8 +291,6 @@ static void interleave_stereo_24(int32_t *buffer[MAX_CHANNELS],
static int alac_decode_frame(AVCodecContext *avctx, void *data, static int alac_decode_frame(AVCodecContext *avctx, void *data,
int *got_frame_ptr, AVPacket *avpkt) int *got_frame_ptr, AVPacket *avpkt)
{ {
const uint8_t *inbuffer = avpkt->data;
int input_buffer_size = avpkt->size;
ALACContext *alac = avctx->priv_data; ALACContext *alac = avctx->priv_data;
int channels; int channels;
@ -303,7 +301,7 @@ static int alac_decode_frame(AVCodecContext *avctx, void *data,
uint8_t interlacing_leftweight; uint8_t interlacing_leftweight;
int i, ch, ret; int i, ch, ret;
init_get_bits(&alac->gb, inbuffer, input_buffer_size * 8); init_get_bits(&alac->gb, avpkt->data, avpkt->size * 8);
channels = get_bits(&alac->gb, 3) + 1; channels = get_bits(&alac->gb, 3) + 1;
if (channels != avctx->channels) { if (channels != avctx->channels) {
@ -457,13 +455,14 @@ static int alac_decode_frame(AVCodecContext *avctx, void *data,
break; break;
} }
if (input_buffer_size * 8 - get_bits_count(&alac->gb) > 8) if (avpkt->size * 8 - get_bits_count(&alac->gb) > 8)
av_log(avctx, AV_LOG_ERROR, "Error : %d bits left\n", input_buffer_size * 8 - get_bits_count(&alac->gb)); av_log(avctx, AV_LOG_ERROR, "Error : %d bits left\n",
avpkt->size * 8 - get_bits_count(&alac->gb));
*got_frame_ptr = 1; *got_frame_ptr = 1;
*(AVFrame *)data = alac->frame; *(AVFrame *)data = alac->frame;
return input_buffer_size; return avpkt->size;
} }
static av_cold int alac_decode_close(AVCodecContext *avctx) static av_cold int alac_decode_close(AVCodecContext *avctx)