mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-06 23:48:53 +00:00
Code Issues 1 Projects Releases Wiki Activity

basevideoencoder: Use new force-keyunit event API from gst-plugins-base

Browse source
This commit is contained in:
Sebastian Dröge 2011-11-29 09:31:11 +01:00
parent 77db7e5780
commit 11b2dea82d
1 changed files with 16 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
omx/gstbasevideoencoder.c
View file

@ -520,18 +520,15 @@ gst_base_video_encoder_sink_eventfunc (GstBaseVideoEncoder * base_video_encoder,
} }
case GST_EVENT_CUSTOM_DOWNSTREAM: case GST_EVENT_CUSTOM_DOWNSTREAM:
{ {
const GstStructure *s; if (gst_video_event_is_force_key_unit (event)) {
s = gst_event_get_structure (event);
if (gst_structure_has_name (s, "GstForceKeyUnit")) {
GST_OBJECT_LOCK (base_video_encoder); GST_OBJECT_LOCK (base_video_encoder);
base_video_encoder->force_keyframe = TRUE;
if (!gst_structure_get_boolean (s, "all-headers",
&base_video_encoder->force_keyframe_headers))
base_video_encoder->force_keyframe_headers = FALSE;
GST_DEBUG_OBJECT (base_video_encoder, "GstForceKeyUnit, all-headers %d", base_video_encoder->force_keyframe = TRUE;
gst_video_event_parse_downstream_force_key_unit (event, NULL, NULL,
NULL, &base_video_encoder->force_keyframe_headers, NULL);
GST_DEBUG_OBJECT (base_video_encoder,
"force-keyunit event, all-headers %d",
base_video_encoder->force_keyframe_headers); base_video_encoder->force_keyframe_headers);
GST_OBJECT_UNLOCK (base_video_encoder); GST_OBJECT_UNLOCK (base_video_encoder);
gst_event_unref (event); gst_event_unref (event);
@ -610,20 +607,16 @@ gst_base_video_encoder_src_event (GstPad * pad, GstEvent * event)
switch (GST_EVENT_TYPE (event)) { switch (GST_EVENT_TYPE (event)) {
case GST_EVENT_CUSTOM_UPSTREAM: case GST_EVENT_CUSTOM_UPSTREAM:
{ {
const GstStructure *s; if (gst_video_event_is_force_key_unit (event)) {
s = gst_event_get_structure (event);
if (gst_structure_has_name (s, "GstForceKeyUnit")) {
GST_OBJECT_LOCK (base_video_encoder); GST_OBJECT_LOCK (base_video_encoder);
base_video_encoder->force_keyframe = TRUE; base_video_encoder->force_keyframe = TRUE;
if (!gst_structure_get_boolean (s, "all-headers", gst_video_event_parse_upstream_force_key_unit (event, NULL,
&base_video_encoder->force_keyframe_headers)) &base_video_encoder->force_keyframe_headers, NULL);
base_video_encoder->force_keyframe_headers = FALSE;
GST_OBJECT_UNLOCK (base_video_encoder); GST_OBJECT_UNLOCK (base_video_encoder);
gst_event_unref (event); gst_event_unref (event);
GST_DEBUG_OBJECT (base_video_encoder, "GstForceKeyUnit, all-headers %d", GST_DEBUG_OBJECT (base_video_encoder,
"force-keyunit event, all-headers %d",
base_video_encoder->force_keyframe_headers); base_video_encoder->force_keyframe_headers);
ret = TRUE; ret = TRUE;
} else { } else {
@ -913,13 +906,10 @@ gst_base_video_encoder_finish_frame (GstBaseVideoEncoder * base_video_encoder,
(base_video_encoder)->segment, GST_FORMAT_TIME, (base_video_encoder)->segment, GST_FORMAT_TIME,
frame->presentation_timestamp); frame->presentation_timestamp);
ev = gst_event_new_custom (GST_EVENT_CUSTOM_DOWNSTREAM, /* FIXME: Use the correct count */
gst_structure_new ("GstForceKeyUnit", NULL)); ev = gst_video_event_new_downstream_force_key_unit
(frame->presentation_timestamp, stream_time, running_time,
gst_structure_set (ev->structure, base_video_encoder->force_keyframe_headers, 0);
"timestamp", G_TYPE_UINT64, frame->presentation_timestamp,
"stream-time", G_TYPE_UINT64, stream_time,
"running-time", G_TYPE_UINT64, running_time, NULL);
gst_pad_push_event (GST_BASE_VIDEO_CODEC_SRC_PAD (base_video_encoder), ev); gst_pad_push_event (GST_BASE_VIDEO_CODEC_SRC_PAD (base_video_encoder), ev);