mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-17 03:35:21 +00:00
Code Issues 1 Projects Releases Wiki Activity

avaudenc: Properly handle planar audio formats with more than AV_NUM_DATA_POINTERS channels

Browse source
This commit is contained in:
Sebastian Dröge 2012-12-12 13:04:54 +00:00
parent 1bec18edce
commit cb9e40ff4c
1 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
ext/libav/gstavaudenc.c
View file

@ -396,20 +396,24 @@ gst_ffmpegaudenc_encode_audio (GstFFMpegAudEnc * ffmpegaudenc,
nsamples = frame.nb_samples = in_size / info->bpf; nsamples = frame.nb_samples = in_size / info->bpf;
channels = info->channels; channels = info->channels;
frame.data[0] = g_malloc (in_size); if (info->channels > AV_NUM_DATA_POINTERS) {
frame.linesize[0] = in_size / channels; frame.extended_data = g_new (uint8_t *, info->channels);
for (i = 1; i < channels; i++) { } else {
frame.data[i] = frame.data[i - 1] + frame.linesize[0]; frame.extended_data = frame.data;
frame.linesize[i] = frame.linesize[0];
} }
frame.extended_data[0] = g_malloc (in_size);
frame.linesize[0] = in_size / channels;
for (i = 1; i < channels; i++)
frame.extended_data[i] = frame.extended_data[i - 1] + frame.linesize[0];
switch (info->finfo->width) { switch (info->finfo->width) {
case 8:{ case 8:{
const guint8 *idata = (const guint8 *) audio_in; const guint8 *idata = (const guint8 *) audio_in;
for (i = 0; i < nsamples; i++) { for (i = 0; i < nsamples; i++) {
for (j = 0; j < channels; j++) { for (j = 0; j < channels; j++) {
((guint8 *) frame.data[j])[i] = idata[j]; ((guint8 *) frame.extended_data[j])[i] = idata[j];
} }
idata += channels; idata += channels;
} }
@ -420,7 +424,7 @@ gst_ffmpegaudenc_encode_audio (GstFFMpegAudEnc * ffmpegaudenc,
for (i = 0; i < nsamples; i++) { for (i = 0; i < nsamples; i++) {
for (j = 0; j < channels; j++) { for (j = 0; j < channels; j++) {
((guint16 *) frame.data[j])[i] = idata[j]; ((guint16 *) frame.extended_data[j])[i] = idata[j];
} }
idata += channels; idata += channels;
} }
@ -431,7 +435,7 @@ gst_ffmpegaudenc_encode_audio (GstFFMpegAudEnc * ffmpegaudenc,
for (i = 0; i < nsamples; i++) { for (i = 0; i < nsamples; i++) {
for (j = 0; j < channels; j++) { for (j = 0; j < channels; j++) {
((guint32 *) frame.data[j])[i] = idata[j]; ((guint32 *) frame.extended_data[j])[i] = idata[j];
} }
idata += channels; idata += channels;
} }
@ -443,7 +447,7 @@ gst_ffmpegaudenc_encode_audio (GstFFMpegAudEnc * ffmpegaudenc,
for (i = 0; i < nsamples; i++) { for (i = 0; i < nsamples; i++) {
for (j = 0; j < channels; j++) { for (j = 0; j < channels; j++) {
((guint64 *) frame.data[j])[i] = idata[j]; ((guint64 *) frame.extended_data[j])[i] = idata[j];
} }
idata += channels; idata += channels;
} }
@ -457,6 +461,7 @@ gst_ffmpegaudenc_encode_audio (GstFFMpegAudEnc * ffmpegaudenc,
} else { } else {
frame.data[0] = audio_in; frame.data[0] = audio_in;
frame.extended_data = frame.data;
frame.linesize[0] = in_size; frame.linesize[0] = in_size;
frame.nb_samples = in_size / info->bpf; frame.nb_samples = in_size / info->bpf;
} }
@ -464,6 +469,8 @@ gst_ffmpegaudenc_encode_audio (GstFFMpegAudEnc * ffmpegaudenc,
res = avcodec_encode_audio2 (ctx, &pkt, &frame, have_data); res = avcodec_encode_audio2 (ctx, &pkt, &frame, have_data);
if (planar && info->channels > 1) if (planar && info->channels > 1)
g_free (frame.data[0]); g_free (frame.data[0]);
if (frame.extended_data != frame.data)
g_free (frame.extended_data);
if (res < 0) { if (res < 0) {
char error_str[128] = { 0, }; char error_str[128] = { 0, };