mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-10-05 18:22:23 +00:00
Code Issues 1 Projects Releases Wiki Activity

flvdemux: Answer bitrate queries from upstream

Browse source 
If upstream (such as queue2 in urisourcebin) asks for our bitrate, check if we
have stored audio/video bitrates, and use them.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/merge_requests/596>
This commit is contained in:
Edward Hervey 2020-05-20 10:46:45 +02:00 committed by Sebastian Dröge
parent e8282661b6
commit 5dd3643d94
2 changed files with 61 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
gst/flv/gstflvdemux.c
View file

@ -107,6 +107,8 @@ static gboolean flv_demux_handle_seek_push (GstFlvDemux * demux,
static gboolean gst_flv_demux_handle_seek_pull (GstFlvDemux * demux,
GstEvent * event, gboolean seeking);
static gboolean gst_flv_demux_sink_query (GstPad * pad, GstObject * parent,
GstQuery * query);
static gboolean gst_flv_demux_query (GstPad * pad, GstObject * parent,
GstQuery * query);
static gboolean gst_flv_demux_src_event (GstPad * pad, GstObject * parent,
@ -372,11 +374,13 @@ gst_flv_demux_parse_metadata_item (GstFlvDemux * demux, GstByteReader * reader,
} else if (!strcmp (tag_name, "framerate")) {
demux->framerate = d;
} else if (!strcmp (tag_name, "audiodatarate")) {
demux->audio_bitrate = (guint) (d * 1024);
gst_tag_list_add (demux->audio_tags, GST_TAG_MERGE_REPLACE,
GST_TAG_NOMINAL_BITRATE, (guint) (d * 1024), NULL);
GST_TAG_NOMINAL_BITRATE, demux->audio_bitrate, NULL);
} else if (!strcmp (tag_name, "videodatarate")) {
demux->video_bitrate = (guint) (d * 1024);
gst_tag_list_add (demux->video_tags, GST_TAG_MERGE_REPLACE,
GST_TAG_NOMINAL_BITRATE, (guint) (d * 1024), NULL);
GST_TAG_NOMINAL_BITRATE, demux->video_bitrate, NULL);
} else {
GST_INFO_OBJECT (demux, "Tag \'%s\' not handled", tag_name);
}
@ -2055,6 +2059,9 @@ gst_flv_demux_cleanup (GstFlvDemux * demux)
demux->filepositions = NULL;
}
demux->video_bitrate = 0;
demux->audio_bitrate = 0;
gst_flv_demux_clear_tags (demux);
}
@ -3282,6 +3289,54 @@ gst_flv_demux_sink_event (GstPad * pad, GstObject * parent, GstEvent * event)
return ret;
}
static gboolean
gst_flv_demux_sink_query (GstPad * pad, GstObject * parent, GstQuery * query)
{
GstFlvDemux *demux;
gboolean ret = FALSE;
demux = GST_FLV_DEMUX (parent);
switch (GST_QUERY_TYPE (query)) {
case GST_QUERY_BITRATE:
{
guint total_bitrate = 0;
if (demux->audio_pad) {
if (!demux->audio_bitrate) {
GST_DEBUG_OBJECT (demux,
"Have audio pad but no audio bitrate, can't answer BITRATE query");
break;
}
total_bitrate = demux->audio_bitrate;
}
if (demux->video_pad) {
if (!demux->video_bitrate) {
GST_DEBUG_OBJECT (demux,
"Have video pad but no video bitrate, can't answer BITRATE query");
break;
}
total_bitrate += demux->video_bitrate;
}
GST_DEBUG_OBJECT (demux,
"bitrate query. total_bitrate:%" G_GUINT32_FORMAT, total_bitrate);
if (total_bitrate) {
/* Padding of 2kbit/s for container overhead */
gst_query_set_bitrate (query, total_bitrate + 2048);
ret = TRUE;
}
break;
}
default:
ret = gst_pad_query_default (pad, parent, query);
break;
}
return ret;
}
static gboolean
gst_flv_demux_src_event (GstPad * pad, GstObject * parent, GstEvent * event)
{
@ -3655,6 +3710,8 @@ gst_flv_demux_init (GstFlvDemux * demux)
GST_DEBUG_FUNCPTR (gst_flv_demux_sink_activate));
gst_pad_set_activatemode_function (demux->sinkpad,
GST_DEBUG_FUNCPTR (gst_flv_demux_sink_activate_mode));
gst_pad_set_query_function (demux->sinkpad,
GST_DEBUG_FUNCPTR (gst_flv_demux_sink_query));
gst_element_add_pad (GST_ELEMENT (demux), demux->sinkpad);

2
gst/flv/gstflvdemux.h
View file

@ -106,6 +106,7 @@ struct _GstFlvDemux
GstClockTime audio_start;
guint32 last_audio_pts;
GstClockTime audio_time_offset;
guint32 audio_bitrate;
/* Video infos */
guint32 w;
@ -123,6 +124,7 @@ struct _GstFlvDemux
guint32 last_video_dts;
GstClockTime video_time_offset;
gdouble framerate;
guint32 video_bitrate;
gboolean random_access;
gboolean need_header;