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

avaudenc: Some minor cleanup

Browse source
This commit is contained in:
Sebastian Dröge 2012-11-20 10:55:55 +01:00
parent 3ffbb6ff94
commit f4acd40767
2 changed files with 4 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
ext/libav/gstavaudenc.c
View file

@ -51,7 +51,6 @@ enum
{ {
PROP_0, PROP_0,
PROP_BIT_RATE, PROP_BIT_RATE,
PROP_BUFSIZE,
PROP_RTP_PAYLOAD_SIZE, PROP_RTP_PAYLOAD_SIZE,
}; };
@ -344,7 +343,7 @@ gst_ffmpegaudenc_set_format (GstAudioEncoder * encoder, GstAudioInfo * info)
static GstFlowReturn static GstFlowReturn
gst_ffmpegaudenc_encode_audio (GstFFMpegAudEnc * ffmpegaudenc, gst_ffmpegaudenc_encode_audio (GstFFMpegAudEnc * ffmpegaudenc,
guint8 * audio_in, guint in_size, guint max_size) guint8 * audio_in, guint in_size)
{ {
AVCodecContext *ctx; AVCodecContext *ctx;
gint res; gint res;
@ -356,10 +355,7 @@ gst_ffmpegaudenc_encode_audio (GstFFMpegAudEnc * ffmpegaudenc,
ctx = ffmpegaudenc->context; ctx = ffmpegaudenc->context;
/* We need to provide at least ffmpegs minimal buffer size */ GST_LOG_OBJECT (ffmpegaudenc, "encoding buffer ");
GST_LOG_OBJECT (ffmpegaudenc, "encoding buffer of max size %d", max_size);
if (ffmpegaudenc->buffer_size != max_size)
ffmpegaudenc->buffer_size = max_size;
memset (&pkt, 0, sizeof (pkt)); memset (&pkt, 0, sizeof (pkt));
memset (&frame, 0, sizeof (frame)); memset (&frame, 0, sizeof (frame));
@ -401,7 +397,6 @@ gst_ffmpegaudenc_handle_frame (GstAudioEncoder * encoder, GstBuffer * inbuf)
GstFFMpegAudEnc *ffmpegaudenc; GstFFMpegAudEnc *ffmpegaudenc;
gsize size; gsize size;
GstFlowReturn ret; GstFlowReturn ret;
gint out_size;
guint8 *in_data; guint8 *in_data;
GstMapInfo map; GstMapInfo map;
@ -411,20 +406,16 @@ gst_ffmpegaudenc_handle_frame (GstAudioEncoder * encoder, GstBuffer * inbuf)
goto not_negotiated; goto not_negotiated;
inbuf = gst_buffer_ref (inbuf); inbuf = gst_buffer_ref (inbuf);
size = gst_buffer_get_size (inbuf);
GST_DEBUG_OBJECT (ffmpegaudenc, GST_DEBUG_OBJECT (ffmpegaudenc,
"Received time %" GST_TIME_FORMAT ", duration %" GST_TIME_FORMAT "Received time %" GST_TIME_FORMAT ", duration %" GST_TIME_FORMAT
", size %" G_GSIZE_FORMAT, GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (inbuf)), ", size %" G_GSIZE_FORMAT, GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (inbuf)),
GST_TIME_ARGS (GST_BUFFER_DURATION (inbuf)), size); GST_TIME_ARGS (GST_BUFFER_DURATION (inbuf)), gst_buffer_get_size (inbuf));
/* 4 times the input size should be big enough... */
out_size = size * 4;
gst_buffer_map (inbuf, &map, GST_MAP_READ); gst_buffer_map (inbuf, &map, GST_MAP_READ);
in_data = map.data; in_data = map.data;
size = map.size; size = map.size;
ret = gst_ffmpegaudenc_encode_audio (ffmpegaudenc, in_data, size, out_size); ret = gst_ffmpegaudenc_encode_audio (ffmpegaudenc, in_data, size);
gst_buffer_unmap (inbuf, &map); gst_buffer_unmap (inbuf, &map);
gst_buffer_unref (inbuf); gst_buffer_unref (inbuf);
@ -469,8 +460,6 @@ gst_ffmpegaudenc_set_property (GObject * object,
case PROP_BIT_RATE: case PROP_BIT_RATE:
ffmpegaudenc->bitrate = g_value_get_int (value); ffmpegaudenc->bitrate = g_value_get_int (value);
break; break;
case PROP_BUFSIZE:
break;
case PROP_RTP_PAYLOAD_SIZE: case PROP_RTP_PAYLOAD_SIZE:
ffmpegaudenc->rtp_payload_size = g_value_get_int (value); ffmpegaudenc->rtp_payload_size = g_value_get_int (value);
break; break;
@ -495,9 +484,6 @@ gst_ffmpegaudenc_get_property (GObject * object,
g_value_set_int (value, ffmpegaudenc->bitrate); g_value_set_int (value, ffmpegaudenc->bitrate);
break; break;
break; break;
case PROP_BUFSIZE:
g_value_set_int (value, ffmpegaudenc->buffer_size);
break;
case PROP_RTP_PAYLOAD_SIZE: case PROP_RTP_PAYLOAD_SIZE:
g_value_set_int (value, ffmpegaudenc->rtp_payload_size); g_value_set_int (value, ffmpegaudenc->rtp_payload_size);
break; break;

1
ext/libav/gstavaudenc.h
View file

@ -41,7 +41,6 @@ struct _GstFFMpegAudEnc
/* cache */ /* cache */
gint bitrate; gint bitrate;
gint buffer_size;
gint rtp_payload_size; gint rtp_payload_size;
/* other settings are copied over straight, /* other settings are copied over straight,