mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-31 11:32:38 +00:00
Code Issues 1 Projects Releases Wiki Activity

ffenc: pass the input size to the encoder

Browse source 
Pass the input buffer size to the encoder instead of the expected output size.
This is needed to make fixed input/output encoder work.
This commit is contained in:
Wim Taymans 2010-10-05 19:22:28 +02:00
parent a0e36128c2
commit 7d531c06bb
1 changed files with 12 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
ext/ffmpeg/gstffmpegenc.c
View file

@ -839,8 +839,8 @@ gst_ffmpegenc_chain_video (GstPad * pad, GstBuffer * inbuf)
static GstFlowReturn static GstFlowReturn
gst_ffmpegenc_encode_audio (GstFFMpegEnc * ffmpegenc, guint8 * audio_in, gst_ffmpegenc_encode_audio (GstFFMpegEnc * ffmpegenc, guint8 * audio_in,
guint max_size, GstClockTime timestamp, GstClockTime duration, guint in_size, guint max_size, GstClockTime timestamp,
gboolean discont) GstClockTime duration, gboolean discont)
{ {
GstBuffer *outbuf; GstBuffer *outbuf;
AVCodecContext *ctx; AVCodecContext *ctx;
@ -850,14 +850,15 @@ gst_ffmpegenc_encode_audio (GstFFMpegEnc * ffmpegenc, guint8 * audio_in,
ctx = ffmpegenc->context; ctx = ffmpegenc->context;
outbuf = gst_buffer_new_and_alloc (max_size); /* We need to provide at least ffmpegs minimal buffer size */
outbuf = gst_buffer_new_and_alloc (max_size + FF_MIN_BUFFER_SIZE);
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) if (ffmpegenc->buffer_size != max_size)
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, in_size, (short *) audio_in);
if (res < 0) { if (res < 0) {
GST_ERROR_OBJECT (ffmpegenc, "Failed to encode buffer: %d", res); GST_ERROR_OBJECT (ffmpegenc, "Failed to encode buffer: %d", res);
@ -999,11 +1000,11 @@ 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 plus the minimal buffer size /* 4 times the input size should be big enough... */
* should be big enough... */ out_size = frame_bytes * 4;
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, frame_bytes, out_size,
timestamp, duration, ffmpegenc->discont); timestamp, duration, ffmpegenc->discont);
gst_adapter_flush (ffmpegenc->adapter, frame_bytes); gst_adapter_flush (ffmpegenc->adapter, frame_bytes);
@ -1021,19 +1022,16 @@ gst_ffmpegenc_chain_audio (GstPad * pad, GstBuffer * inbuf)
} else { } else {
/* we have no frame_size, feed the encoder all the data and expect a fixed /* we have no frame_size, feed the encoder all the data and expect a fixed
* output size */ * output size */
int coded_bps = av_get_bits_per_sample (oclass->in_plugin->id) / 8; int coded_bps = av_get_bits_per_sample (oclass->in_plugin->id);
GST_LOG_OBJECT (ffmpegenc, "coded bps %d, osize %d", coded_bps, osize); GST_LOG_OBJECT (ffmpegenc, "coded bps %d, osize %d", coded_bps, osize);
out_size = size / osize; out_size = size / osize;
if (coded_bps) if (coded_bps)
out_size *= coded_bps; out_size = (out_size * coded_bps) / 8;
/* 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, size, out_size,
timestamp, duration, discont); timestamp, duration, discont);
gst_buffer_unref (inbuf); gst_buffer_unref (inbuf);