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

openh264dec: The codec can only do baseline so simplify the code a bit

Browse source 
and declare this also on the srcpad caps.

With baseline profile there are no B-frames or frame reordering.
This commit is contained in:
Sebastian Dröge 2014-10-03 17:22:23 +03:00
parent bc8e1465dc
commit 518d84c148
1 changed files with 4 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
ext/openh264/gstopenh264dec.cpp
View file

@ -86,7 +86,7 @@ GST_STATIC_PAD_TEMPLATE ("sink",
GST_PAD_SINK,
GST_PAD_ALWAYS,
GST_STATIC_CAPS
("video/x-h264, stream-format=(string)byte-stream, alignment=(string)au"));
("video/x-h264, stream-format=(string)byte-stream, alignment=(string)au,profile=(string){constrained-baseline,baseline}"));
static GstStaticPadTemplate gst_openh264dec_src_template =
GST_STATIC_PAD_TEMPLATE ("src",
@ -252,32 +252,6 @@ gst_openh264dec_reset (GstVideoDecoder * decoder, gboolean hard)
return TRUE;
}
static GstVideoCodecFrame *
get_oldest_pts_frame (GstVideoDecoder * decoder)
{
GList *frames, *l;
GstVideoCodecFrame *oldest = NULL;
frames = gst_video_decoder_get_frames (decoder);
for (l = frames; l; l = l->next) {
GstVideoCodecFrame *tmp = (GstVideoCodecFrame *) l->data;
if (tmp->pts != GST_CLOCK_TIME_NONE &&
(oldest == NULL || oldest->pts > tmp->pts))
oldest = tmp;
}
if (oldest)
gst_video_codec_frame_ref (oldest);
else
oldest = gst_video_decoder_get_oldest_frame (decoder);
g_list_foreach (frames, (GFunc) gst_video_codec_frame_unref, NULL);
g_list_free (frames);
return oldest;
}
static GstFlowReturn
gst_openh264dec_handle_frame (GstVideoDecoder * decoder,
GstVideoCodecFrame * frame)
@ -338,8 +312,9 @@ gst_openh264dec_handle_frame (GstVideoDecoder * decoder,
/* FIXME: openh264 has no way for us to get a connection
* between the input and output frames, we just have to
* guess based on the input */
frame = get_oldest_pts_frame (decoder);
* guess based on the input. Fortunately openh264 can
* only do baseline profile. */
frame = gst_video_decoder_get_oldest_frame (decoder);
if (!frame) {
/* Can only happen in finish() */
return GST_FLOW_EOS;