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

avcodec/wmaprodec: unbreak XMA mono decoding

Browse Source 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
This commit is contained in:
Paul B Mahol
2017-01-20 13:47:44 +01:00
parent cab0f3abc5
commit 96fe4432f5
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/wmaprodec.c
View File

@@ -1755,6 +1755,7 @@ static int xma_decode_packet(AVCodecContext *avctx, void *data,
if (got_stream_frame_ptr) { if (got_stream_frame_ptr) {
memcpy(&s->samples[s->current_stream * 2 + 0][s->offset[s->current_stream] * 512], memcpy(&s->samples[s->current_stream * 2 + 0][s->offset[s->current_stream] * 512],
s->frames[s->current_stream]->extended_data[0], 512 * 4); s->frames[s->current_stream]->extended_data[0], 512 * 4);
if (avctx->channels > 1)
memcpy(&s->samples[s->current_stream * 2 + 1][s->offset[s->current_stream] * 512], memcpy(&s->samples[s->current_stream * 2 + 1][s->offset[s->current_stream] * 512],
s->frames[s->current_stream]->extended_data[1], 512 * 4); s->frames[s->current_stream]->extended_data[1], 512 * 4);
s->offset[s->current_stream]++; s->offset[s->current_stream]++;
@@ -1794,7 +1795,7 @@ static int xma_decode_packet(AVCodecContext *avctx, void *data,
s->xma[i].skip_packets = FFMAX(0, s->xma[i].skip_packets - 1); s->xma[i].skip_packets = FFMAX(0, s->xma[i].skip_packets - 1);
} }
for (i = 0; i < avctx->channels / 2; i++) { for (i = 0; i < (avctx->channels + 1) / 2; i++) {
offset = FFMIN(offset, s->offset[i]); offset = FFMIN(offset, s->offset[i]);
} }
@@ -1803,12 +1804,14 @@ static int xma_decode_packet(AVCodecContext *avctx, void *data,
if ((bret = ff_get_buffer(avctx, frame, 0)) < 0) if ((bret = ff_get_buffer(avctx, frame, 0)) < 0)
return bret; return bret;
for (i = 0; i < avctx->channels / 2; i++) { for (i = 0; i < (avctx->channels + 1) / 2; i++) {
memcpy(frame->extended_data[i * 2 + 0], s->samples[i * 2 + 0], frame->nb_samples * 4); memcpy(frame->extended_data[i * 2 + 0], s->samples[i * 2 + 0], frame->nb_samples * 4);
if (avctx->channels > 1)
memcpy(frame->extended_data[i * 2 + 1], s->samples[i * 2 + 1], frame->nb_samples * 4); memcpy(frame->extended_data[i * 2 + 1], s->samples[i * 2 + 1], frame->nb_samples * 4);
s->offset[i] -= offset; s->offset[i] -= offset;
if (s->offset[i]) { if (s->offset[i]) {
memmove(s->samples[i * 2 + 0], s->samples[i * 2 + 0] + frame->nb_samples, s->offset[i] * 4 * 512); memmove(s->samples[i * 2 + 0], s->samples[i * 2 + 0] + frame->nb_samples, s->offset[i] * 4 * 512);
if (avctx->channels > 1)
memmove(s->samples[i * 2 + 1], s->samples[i * 2 + 1] + frame->nb_samples, s->offset[i] * 4 * 512); memmove(s->samples[i * 2 + 1], s->samples[i * 2 + 1] + frame->nb_samples, s->offset[i] * 4 * 512);
} }
} }