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

fdkaacenc: Implement flush function

Browse source 
The internal fdk encoder always produces 1024 bytes even with no input,
so special care should be taken to not drain it twice.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1515>
This commit is contained in:
Vivia Nikolaidou 2020-08-14 19:57:30 +03:00
parent 5d4ab18ced
commit dc58065dfb
2 changed files with 28 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
ext/fdkaac/gstfdkaacenc.c
View file

@ -92,6 +92,7 @@ static GstFlowReturn gst_fdkaacenc_handle_frame (GstAudioEncoder * enc,
GstBuffer * in_buf); GstBuffer * in_buf);
static GstCaps *gst_fdkaacenc_get_caps (GstAudioEncoder * enc, static GstCaps *gst_fdkaacenc_get_caps (GstAudioEncoder * enc,
GstCaps * filter); GstCaps * filter);
static void gst_fdkaacenc_flush (GstAudioEncoder * enc);
G_DEFINE_TYPE (GstFdkAacEnc, gst_fdkaacenc, GST_TYPE_AUDIO_ENCODER); G_DEFINE_TYPE (GstFdkAacEnc, gst_fdkaacenc, GST_TYPE_AUDIO_ENCODER);
@ -146,9 +147,12 @@ gst_fdkaacenc_stop (GstAudioEncoder * enc)
GST_DEBUG_OBJECT (self, "stop"); GST_DEBUG_OBJECT (self, "stop");
if (self->enc) if (self->enc) {
aacEncClose (&self->enc); aacEncClose (&self->enc);
self->enc = NULL;
}
self->is_drained = TRUE;
return TRUE; return TRUE;
} }
@ -199,10 +203,11 @@ gst_fdkaacenc_set_format (GstAudioEncoder * enc, GstAudioInfo * info)
AACENC_InfoStruct enc_info = { 0 }; AACENC_InfoStruct enc_info = { 0 };
gint bitrate; gint bitrate;
if (self->enc) { if (self->enc && !self->is_drained) {
/* drain */ /* drain */
gst_fdkaacenc_handle_frame (enc, NULL); gst_fdkaacenc_handle_frame (enc, NULL);
aacEncClose (&self->enc); aacEncClose (&self->enc);
self->is_drained = TRUE;
} }
allowed_caps = gst_pad_get_allowed_caps (GST_AUDIO_ENCODER_SRC_PAD (self)); allowed_caps = gst_pad_get_allowed_caps (GST_AUDIO_ENCODER_SRC_PAD (self));
@ -457,6 +462,10 @@ gst_fdkaacenc_handle_frame (GstAudioEncoder * enc, GstBuffer * inbuf)
in_el_sizes = 0; in_el_sizes = 0;
in_desc.numBufs = 0; in_desc.numBufs = 0;
} }
/* We unset is_drained even if there's no inbuf. Basically this is a
* workaround for aacEncEncode always producing 1024 bytes even without any
* input, thus messing up with the base class counting */
self->is_drained = FALSE;
in_desc.bufferIdentifiers = &in_id; in_desc.bufferIdentifiers = &in_id;
in_desc.bufs = (void *) &imap.data; in_desc.bufs = (void *) &imap.data;
@ -517,11 +526,26 @@ out:
return ret; return ret;
} }
static void
gst_fdkaacenc_flush (GstAudioEncoder * enc)
{
GstFdkAacEnc *self = GST_FDKAACENC (enc);
GstAudioInfo *info = gst_audio_encoder_get_audio_info (enc);
aacEncClose (&self->enc);
self->enc = NULL;
self->is_drained = TRUE;
if (GST_AUDIO_INFO_IS_VALID (info))
gst_fdkaacenc_set_format (enc, info);
}
static void static void
gst_fdkaacenc_init (GstFdkAacEnc * self) gst_fdkaacenc_init (GstFdkAacEnc * self)
{ {
self->bitrate = DEFAULT_BITRATE; self->bitrate = DEFAULT_BITRATE;
self->enc = NULL; self->enc = NULL;
self->is_drained = TRUE;
gst_audio_encoder_set_drainable (GST_AUDIO_ENCODER (self), TRUE); gst_audio_encoder_set_drainable (GST_AUDIO_ENCODER (self), TRUE);
} }
@ -541,6 +565,7 @@ gst_fdkaacenc_class_init (GstFdkAacEncClass * klass)
base_class->set_format = GST_DEBUG_FUNCPTR (gst_fdkaacenc_set_format); base_class->set_format = GST_DEBUG_FUNCPTR (gst_fdkaacenc_set_format);
base_class->getcaps = GST_DEBUG_FUNCPTR (gst_fdkaacenc_get_caps); base_class->getcaps = GST_DEBUG_FUNCPTR (gst_fdkaacenc_get_caps);
base_class->handle_frame = GST_DEBUG_FUNCPTR (gst_fdkaacenc_handle_frame); base_class->handle_frame = GST_DEBUG_FUNCPTR (gst_fdkaacenc_handle_frame);
base_class->flush = GST_DEBUG_FUNCPTR (gst_fdkaacenc_flush);
g_object_class_install_property (object_class, PROP_BITRATE, g_object_class_install_property (object_class, PROP_BITRATE,
g_param_spec_int ("bitrate", g_param_spec_int ("bitrate",

1
ext/fdkaac/gstfdkaacenc.h
View file

@ -50,6 +50,7 @@ struct _GstFdkAacEnc {
guint outbuf_size, samples_per_frame; guint outbuf_size, samples_per_frame;
gboolean need_reorder; gboolean need_reorder;
const GstAudioChannelPosition *aac_positions; const GstAudioChannelPosition *aac_positions;
gboolean is_drained;
}; };
struct _GstFdkAacEncClass { struct _GstFdkAacEncClass {