virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
Code Issues Releases Activity

ffmpeg: Fix planar audio input.

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-03-14 06:12:38 +01:00
parent 6968a7d193
commit 7230116000
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
ffmpeg.c
View File

@ -1130,9 +1130,16 @@ static void do_audio_out(AVFormatContext *s, OutputStream *ost,
AVCodecContext *dec = ist->st->codec; AVCodecContext *dec = ist->st->codec;
int osize = av_get_bytes_per_sample(enc->sample_fmt); int osize = av_get_bytes_per_sample(enc->sample_fmt);
int isize = av_get_bytes_per_sample(dec->sample_fmt); int isize = av_get_bytes_per_sample(dec->sample_fmt);
uint8_t *buf = decoded_frame->data[0]; uint8_t *buf[AV_NUM_DATA_POINTERS];
int size = decoded_frame->nb_samples * dec->channels * isize; int size = decoded_frame->nb_samples * dec->channels * isize;
int planes = av_sample_fmt_is_planar(dec->sample_fmt) ? dec->channels : 1;
int64_t allocated_for_size = size; int64_t allocated_for_size = size;
int i;
av_assert0(planes <= AV_NUM_DATA_POINTERS);
for(i=0; i<planes; i++)
buf[i]= decoded_frame->data[i];
need_realloc: need_realloc:
audio_buf_size = (allocated_for_size + isize * dec->channels - 1) / (isize * dec->channels); audio_buf_size = (allocated_for_size + isize * dec->channels - 1) / (isize * dec->channels);
@ -1229,7 +1236,8 @@ need_realloc:
if (byte_delta < 0) { if (byte_delta < 0) {
byte_delta = FFMAX(byte_delta, -size); byte_delta = FFMAX(byte_delta, -size);
size += byte_delta; size += byte_delta;
buf -= byte_delta; for (i=0; i<planes; i++)
buf[i] -= byte_delta/planes;
av_log(NULL, AV_LOG_VERBOSE, "discarding %d audio samples\n", av_log(NULL, AV_LOG_VERBOSE, "discarding %d audio samples\n",
-byte_delta / (isize * dec->channels)); -byte_delta / (isize * dec->channels));
if (!size) if (!size)
@ -1244,9 +1252,12 @@ need_realloc:
} }
ist->is_start = 0; ist->is_start = 0;
generate_silence(input_tmp, dec->sample_fmt, byte_delta); for (i=0; i<planes; i++) {
memcpy(input_tmp + byte_delta, buf, size); uint8_t *t = input_tmp + i*((byte_delta + size)/planes);
buf = input_tmp; generate_silence(t, dec->sample_fmt, byte_delta/planes);
memcpy(t + byte_delta/planes, buf[i], size/planes);
buf[i] = t;
}
size += byte_delta; size += byte_delta;
av_log(NULL, AV_LOG_VERBOSE, "adding %d audio samples of silence\n", idelta); av_log(NULL, AV_LOG_VERBOSE, "adding %d audio samples of silence\n", idelta);
} }
@ -1266,14 +1277,14 @@ need_realloc:
if (ost->audio_resample || ost->audio_channels_mapped) { if (ost->audio_resample || ost->audio_channels_mapped) {
buftmp = audio_buf; buftmp = audio_buf;
size_out = swr_convert(ost->swr, ( uint8_t*[]){buftmp}, audio_buf_size / (enc->channels * osize), size_out = swr_convert(ost->swr, ( uint8_t*[]){buftmp}, audio_buf_size / (enc->channels * osize),
(const uint8_t*[]){buf }, size / (dec->channels * isize)); buf, size / (dec->channels * isize));
if (size_out < 0) { if (size_out < 0) {
av_log(NULL, AV_LOG_FATAL, "swr_convert failed\n"); av_log(NULL, AV_LOG_FATAL, "swr_convert failed\n");
exit_program(1); exit_program(1);
} }
size_out = size_out * enc->channels * osize; size_out = size_out * enc->channels * osize;
} else { } else {
buftmp = buf; buftmp = buf[0];
size_out = size; size_out = size;
} }