mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-23 16:50:47 +00:00
Code Issues 1 Projects Releases Wiki Activity

avaudenc: Remember how many samples the codec consumed for telling the base class

Browse source
This commit is contained in:
Sebastian Dröge 2015-06-30 19:59:54 +02:00
parent 30a4a28793
commit 1dcdeb977c
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ext/libav/gstavaudenc.c
View file

@ -450,6 +450,7 @@ gst_ffmpegaudenc_encode_audio (GstFFMpegAudEnc * ffmpegaudenc,
AVPacket *pkt; AVPacket *pkt;
AVFrame *frame = ffmpegaudenc->frame; AVFrame *frame = ffmpegaudenc->frame;
gboolean planar; gboolean planar;
gint nsamples = -1;
enc = GST_AUDIO_ENCODER (ffmpegaudenc); enc = GST_AUDIO_ENCODER (ffmpegaudenc);
@ -474,7 +475,7 @@ gst_ffmpegaudenc_encode_audio (GstFFMpegAudEnc * ffmpegaudenc,
planar = av_sample_fmt_is_planar (ffmpegaudenc->context->sample_fmt); planar = av_sample_fmt_is_planar (ffmpegaudenc->context->sample_fmt);
if (planar && info->channels > 1) { if (planar && info->channels > 1) {
gint channels, nsamples; gint channels;
gint i, j; gint i, j;
nsamples = frame->nb_samples = in_size / info->bpf; nsamples = frame->nb_samples = in_size / info->bpf;
@ -555,7 +556,7 @@ gst_ffmpegaudenc_encode_audio (GstFFMpegAudEnc * ffmpegaudenc,
frame->data[0] = audio_in; frame->data[0] = audio_in;
frame->extended_data = frame->data; 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 = nsamples = in_size / info->bpf;
frame->buf[0] = frame->buf[0] =
av_buffer_create (NULL, 0, buffer_info_free, buffer_info, 0); av_buffer_create (NULL, 0, buffer_info_free, buffer_info, 0);
} }
@ -597,7 +598,7 @@ gst_ffmpegaudenc_encode_audio (GstFFMpegAudEnc * ffmpegaudenc,
but we have no way to know AFAICT */ but we have no way to know AFAICT */
ret = gst_audio_encoder_finish_frame (enc, outbuf, -1); ret = gst_audio_encoder_finish_frame (enc, outbuf, -1);
} else { } else {
ret = gst_audio_encoder_finish_frame (enc, outbuf, frame->nb_samples); ret = gst_audio_encoder_finish_frame (enc, outbuf, nsamples);
} }
} else { } else {
GST_LOG_OBJECT (ffmpegaudenc, "no output produced"); GST_LOG_OBJECT (ffmpegaudenc, "no output produced");