mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 06:54:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

ffenc: Make sure to always provide large enough buffers

Browse source 
For audio always add the minimum ffmpeg buffer size, for video
use the same weird buffer size as they use in ffmpeg.c:
width*height*6 + 200

Also make setting of the buffer-size property a no-op.

Fixes bug #593651.
This commit is contained in:
Sebastian Dröge 2009-10-01 16:44:22 +02:00
parent 3a96bed6e6
commit c914f08b40
1 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
ext/ffmpeg/gstffmpegenc.c
View file

@ -642,13 +642,20 @@ gst_ffmpegenc_setcaps (GstPad * pad, GstCaps * caps)
static void static void
ffmpegenc_setup_working_buf (GstFFMpegEnc * ffmpegenc) ffmpegenc_setup_working_buf (GstFFMpegEnc * ffmpegenc)
{ {
guint wanted_size =
ffmpegenc->context->width * ffmpegenc->context->height * 6 +
FF_MIN_BUFFER_SIZE;
/* Above is the buffer size used by ffmpeg/ffmpeg.c */
if (ffmpegenc->working_buf == NULL || if (ffmpegenc->working_buf == NULL ||
ffmpegenc->working_buf_size != ffmpegenc->buffer_size) { ffmpegenc->working_buf_size != wanted_size) {
if (ffmpegenc->working_buf) if (ffmpegenc->working_buf)
g_free (ffmpegenc->working_buf); g_free (ffmpegenc->working_buf);
ffmpegenc->working_buf_size = ffmpegenc->buffer_size; ffmpegenc->working_buf_size = wanted_size;
ffmpegenc->working_buf = g_malloc (ffmpegenc->working_buf_size); ffmpegenc->working_buf = g_malloc (ffmpegenc->working_buf_size);
} }
ffmpegenc->buffer_size = wanted_size;
} }
static GstFlowReturn static GstFlowReturn
@ -742,6 +749,8 @@ gst_ffmpegenc_encode_audio (GstFFMpegEnc * ffmpegenc, guint8 * audio_in,
audio_out = GST_BUFFER_DATA (outbuf); audio_out = GST_BUFFER_DATA (outbuf);
GST_LOG_OBJECT (ffmpegenc, "encoding buffer of max size %d", max_size); GST_LOG_OBJECT (ffmpegenc, "encoding buffer of max size %d", max_size);
if (ffmpegenc->buffer_size != max_size)
ffmpegenc->buffer_size = max_size;
res = avcodec_encode_audio (ctx, audio_out, max_size, (short *) audio_in); res = avcodec_encode_audio (ctx, audio_out, max_size, (short *) audio_in);
@ -849,8 +858,9 @@ gst_ffmpegenc_chain_audio (GstPad * pad, GstBuffer * inbuf)
ctx->sample_rate); ctx->sample_rate);
duration -= (timestamp - ffmpegenc->adapter_ts); duration -= (timestamp - ffmpegenc->adapter_ts);
/* 4 times the input size should be big enough... */ /* 4 times the input size plus the minimal buffer size
out_size = MAX (frame_bytes * 4, FF_MIN_BUFFER_SIZE); * should be big enough... */
out_size = frame_bytes * 4 + FF_MIN_BUFFER_SIZE;
ret = gst_ffmpegenc_encode_audio (ffmpegenc, in_data, out_size, ret = gst_ffmpegenc_encode_audio (ffmpegenc, in_data, out_size,
timestamp, duration, ffmpegenc->discont); timestamp, duration, ffmpegenc->discont);
@ -878,6 +888,9 @@ gst_ffmpegenc_chain_audio (GstPad * pad, GstBuffer * inbuf)
if (coded_bps) if (coded_bps)
out_size *= coded_bps; out_size *= coded_bps;
/* We need to provide at least ffmpegs minimal buffer size */
out_size += FF_MIN_BUFFER_SIZE;
in_data = (guint8 *) GST_BUFFER_DATA (inbuf); in_data = (guint8 *) GST_BUFFER_DATA (inbuf);
ret = gst_ffmpegenc_encode_audio (ffmpegenc, in_data, out_size, ret = gst_ffmpegenc_encode_audio (ffmpegenc, in_data, out_size,
timestamp, duration, discont); timestamp, duration, discont);
@ -1038,7 +1051,6 @@ gst_ffmpegenc_set_property (GObject * object,
ffmpegenc->me_method = g_value_get_enum (value); ffmpegenc->me_method = g_value_get_enum (value);
break; break;
case ARG_BUFSIZE: case ARG_BUFSIZE:
ffmpegenc->buffer_size = g_value_get_ulong (value);
break; break;
case ARG_RTP_PAYLOAD_SIZE: case ARG_RTP_PAYLOAD_SIZE:
ffmpegenc->rtp_payload_size = g_value_get_ulong (value); ffmpegenc->rtp_payload_size = g_value_get_ulong (value);