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

video: start porting some base classes

Browse source
This commit is contained in:
Wim Taymans 2011-10-04 14:27:32 +02:00
parent be20e84e39
commit 6b59788bb1
6 changed files with 126 additions and 115 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
gst-libs/gst/video/gstbasevideocodec.c
View file

@ -45,16 +45,36 @@ static void gst_base_video_codec_finalize (GObject * object);
static GstStateChangeReturn gst_base_video_codec_change_state (GstElement * static GstStateChangeReturn gst_base_video_codec_change_state (GstElement *
element, GstStateChange transition); element, GstStateChange transition);
static GstElementClass *parent_class = NULL;
GST_BOILERPLATE (GstBaseVideoCodec, gst_base_video_codec, GstElement, static void gst_base_video_codec_class_init (GstBaseVideoCodecClass * klass);
GST_TYPE_ELEMENT); static void gst_base_video_codec_init (GstBaseVideoCodec * dec,
GstBaseVideoCodecClass * klass);
static void GType
gst_base_video_codec_base_init (gpointer g_class) gst_base_video_codec_get_type (void)
{ {
GST_DEBUG_CATEGORY_INIT (basevideocodec_debug, "basevideocodec", 0, static volatile gsize base_video_codec_type = 0;
"Base Video Codec");
if (g_once_init_enter (&base_video_codec_type)) {
GType _type;
static const GTypeInfo base_video_codec_info = {
sizeof (GstBaseVideoCodecClass),
NULL,
NULL,
(GClassInitFunc) gst_base_video_codec_class_init,
NULL,
NULL,
sizeof (GstBaseVideoCodec),
0,
(GInstanceInitFunc) gst_base_video_codec_init,
};
_type = g_type_register_static (GST_TYPE_ELEMENT,
"GstBaseVideoCodec", &base_video_codec_info, G_TYPE_FLAG_ABSTRACT);
g_once_init_leave (&base_video_codec_type, _type);
}
return base_video_codec_type;
} }
static void static void
@ -69,6 +89,9 @@ gst_base_video_codec_class_init (GstBaseVideoCodecClass * klass)
gobject_class->finalize = gst_base_video_codec_finalize; gobject_class->finalize = gst_base_video_codec_finalize;
element_class->change_state = gst_base_video_codec_change_state; element_class->change_state = gst_base_video_codec_change_state;
GST_DEBUG_CATEGORY_INIT (basevideocodec_debug, "basevideocodec", 0,
"Base Video Codec");
} }
static void static void
@ -109,7 +132,7 @@ gst_base_video_codec_reset (GstBaseVideoCodec * base_video_codec)
GST_BASE_VIDEO_CODEC_STREAM_LOCK (base_video_codec); GST_BASE_VIDEO_CODEC_STREAM_LOCK (base_video_codec);
for (g = base_video_codec->frames; g; g = g_list_next (g)) { for (g = base_video_codec->frames; g; g = g_list_next (g)) {
gst_base_video_codec_free_frame ((GstVideoFrame *) g->data); gst_base_video_codec_free_frame ((GstVideoFrameState *) g->data);
} }
g_list_free (base_video_codec->frames); g_list_free (base_video_codec->frames);
base_video_codec->frames = NULL; base_video_codec->frames = NULL;
@ -168,12 +191,12 @@ gst_base_video_codec_change_state (GstElement * element,
return ret; return ret;
} }
GstVideoFrame * GstVideoFrameState *
gst_base_video_codec_new_frame (GstBaseVideoCodec * base_video_codec) gst_base_video_codec_new_frame (GstBaseVideoCodec * base_video_codec)
{ {
GstVideoFrame *frame; GstVideoFrameState *frame;
frame = g_slice_new0 (GstVideoFrame); frame = g_slice_new0 (GstVideoFrameState);
GST_BASE_VIDEO_CODEC_STREAM_LOCK (base_video_codec); GST_BASE_VIDEO_CODEC_STREAM_LOCK (base_video_codec);
frame->system_frame_number = base_video_codec->system_frame_number; frame->system_frame_number = base_video_codec->system_frame_number;
@ -184,7 +207,7 @@ gst_base_video_codec_new_frame (GstBaseVideoCodec * base_video_codec)
} }
void void
gst_base_video_codec_free_frame (GstVideoFrame * frame) gst_base_video_codec_free_frame (GstVideoFrameState * frame)
{ {
g_return_if_fail (frame != NULL); g_return_if_fail (frame != NULL);
@ -202,5 +225,5 @@ gst_base_video_codec_free_frame (GstVideoFrame * frame)
if (frame->coder_hook_destroy_notify && frame->coder_hook) if (frame->coder_hook_destroy_notify && frame->coder_hook)
frame->coder_hook_destroy_notify (frame->coder_hook); frame->coder_hook_destroy_notify (frame->coder_hook);
g_slice_free (GstVideoFrame, frame); g_slice_free (GstVideoFrameState, frame);
} }

8
gst-libs/gst/video/gstbasevideocodec.h
View file

@ -83,7 +83,7 @@ G_BEGIN_DECLS
#define GST_BASE_VIDEO_CODEC_STREAM_UNLOCK(codec) g_static_rec_mutex_unlock (&GST_BASE_VIDEO_CODEC (codec)->stream_lock) #define GST_BASE_VIDEO_CODEC_STREAM_UNLOCK(codec) g_static_rec_mutex_unlock (&GST_BASE_VIDEO_CODEC (codec)->stream_lock)
typedef struct _GstVideoState GstVideoState; typedef struct _GstVideoState GstVideoState;
typedef struct _GstVideoFrame GstVideoFrame; typedef struct _GstVideoFrameState GstVideoFrameState;
typedef struct _GstBaseVideoCodec GstBaseVideoCodec; typedef struct _GstBaseVideoCodec GstBaseVideoCodec;
typedef struct _GstBaseVideoCodecClass GstBaseVideoCodecClass; typedef struct _GstBaseVideoCodecClass GstBaseVideoCodecClass;
@ -108,7 +108,7 @@ struct _GstVideoState
}; };
struct _GstVideoFrame struct _GstVideoFrameState
{ {
GstClockTime decode_timestamp; GstClockTime decode_timestamp;
GstClockTime presentation_timestamp; GstClockTime presentation_timestamp;
@ -180,8 +180,8 @@ struct _GstBaseVideoCodecClass
GType gst_base_video_codec_get_type (void); GType gst_base_video_codec_get_type (void);
GstVideoFrame * gst_base_video_codec_new_frame (GstBaseVideoCodec *base_video_codec); GstVideoFrameState * gst_base_video_codec_new_frame (GstBaseVideoCodec *base_video_codec);
void gst_base_video_codec_free_frame (GstVideoFrame *frame); void gst_base_video_codec_free_frame (GstVideoFrameState *frame);
G_END_DECLS G_END_DECLS

150
gst-libs/gst/video/gstbasevideodecoder.c
View file

@ -167,21 +167,14 @@ gst_base_video_decoder_get_field_timestamp (GstBaseVideoDecoder *
base_video_decoder, int field_offset); base_video_decoder, int field_offset);
static guint64 gst_base_video_decoder_get_field_duration (GstBaseVideoDecoder * static guint64 gst_base_video_decoder_get_field_duration (GstBaseVideoDecoder *
base_video_decoder, int n_fields); base_video_decoder, int n_fields);
static GstVideoFrame *gst_base_video_decoder_new_frame (GstBaseVideoDecoder * static GstVideoFrameState *gst_base_video_decoder_new_frame (GstBaseVideoDecoder
base_video_decoder); * base_video_decoder);
static void gst_base_video_decoder_clear_queues (GstBaseVideoDecoder * dec); static void gst_base_video_decoder_clear_queues (GstBaseVideoDecoder * dec);
GST_BOILERPLATE (GstBaseVideoDecoder, gst_base_video_decoder, #define gst_base_video_decoder_parent_class parent_class
GstBaseVideoCodec, GST_TYPE_BASE_VIDEO_CODEC); G_DEFINE_TYPE (GstBaseVideoDecoder, gst_base_video_decoder,
GST_TYPE_BASE_VIDEO_CODEC);
static void
gst_base_video_decoder_base_init (gpointer g_class)
{
GST_DEBUG_CATEGORY_INIT (basevideodecoder_debug, "basevideodecoder", 0,
"Base Video Decoder");
}
static void static void
gst_base_video_decoder_class_init (GstBaseVideoDecoderClass * klass) gst_base_video_decoder_class_init (GstBaseVideoDecoderClass * klass)
@ -196,11 +189,13 @@ gst_base_video_decoder_class_init (GstBaseVideoDecoderClass * klass)
gstelement_class->change_state = gstelement_class->change_state =
GST_DEBUG_FUNCPTR (gst_base_video_decoder_change_state); GST_DEBUG_FUNCPTR (gst_base_video_decoder_change_state);
GST_DEBUG_CATEGORY_INIT (basevideodecoder_debug, "basevideodecoder", 0,
"Base Video Decoder");
} }
static void static void
gst_base_video_decoder_init (GstBaseVideoDecoder * base_video_decoder, gst_base_video_decoder_init (GstBaseVideoDecoder * base_video_decoder)
GstBaseVideoDecoderClass * klass)
{ {
GstPad *pad; GstPad *pad;
@ -212,8 +207,6 @@ gst_base_video_decoder_init (GstBaseVideoDecoder * base_video_decoder,
GST_DEBUG_FUNCPTR (gst_base_video_decoder_chain)); GST_DEBUG_FUNCPTR (gst_base_video_decoder_chain));
gst_pad_set_event_function (pad, gst_pad_set_event_function (pad,
GST_DEBUG_FUNCPTR (gst_base_video_decoder_sink_event)); GST_DEBUG_FUNCPTR (gst_base_video_decoder_sink_event));
gst_pad_set_setcaps_function (pad,
GST_DEBUG_FUNCPTR (gst_base_video_decoder_sink_setcaps));
gst_pad_set_query_function (pad, gst_pad_set_query_function (pad,
GST_DEBUG_FUNCPTR (gst_base_video_decoder_sink_query)); GST_DEBUG_FUNCPTR (gst_base_video_decoder_sink_query));
@ -314,8 +307,8 @@ gst_base_video_decoder_sink_setcaps (GstPad * pad, GstCaps * caps)
} }
if (ret) { if (ret) {
gst_buffer_replace (&GST_BASE_VIDEO_CODEC (base_video_decoder)-> gst_buffer_replace (&GST_BASE_VIDEO_CODEC (base_video_decoder)->state.
state.codec_data, NULL); codec_data, NULL);
gst_caps_replace (&GST_BASE_VIDEO_CODEC (base_video_decoder)->state.caps, gst_caps_replace (&GST_BASE_VIDEO_CODEC (base_video_decoder)->state.caps,
NULL); NULL);
GST_BASE_VIDEO_CODEC (base_video_decoder)->state = state; GST_BASE_VIDEO_CODEC (base_video_decoder)->state = state;
@ -404,6 +397,15 @@ gst_base_video_decoder_sink_event (GstPad * pad, GstEvent * event)
GST_EVENT_TYPE_NAME (event)); GST_EVENT_TYPE_NAME (event));
switch (GST_EVENT_TYPE (event)) { switch (GST_EVENT_TYPE (event)) {
case GST_EVENT_CAPS:
{
GstCaps *caps;
gst_event_parse_caps (event, &caps);
ret = gst_base_video_decoder_sink_setcaps (pad, caps);
gst_event_unref (event);
break;
}
case GST_EVENT_EOS: case GST_EVENT_EOS:
{ {
GstFlowReturn flow_ret; GstFlowReturn flow_ret;
@ -427,66 +429,52 @@ gst_base_video_decoder_sink_event (GstPad * pad, GstEvent * event)
GST_BASE_VIDEO_CODEC_STREAM_UNLOCK (base_video_decoder); GST_BASE_VIDEO_CODEC_STREAM_UNLOCK (base_video_decoder);
break; break;
} }
case GST_EVENT_NEWSEGMENT: case GST_EVENT_SEGMENT:
{ {
gboolean update; GstSegment seg;
double rate, arate;
GstFormat format;
gint64 start;
gint64 stop;
gint64 pos;
GstSegment *segment = &GST_BASE_VIDEO_CODEC (base_video_decoder)->segment; GstSegment *segment = &GST_BASE_VIDEO_CODEC (base_video_decoder)->segment;
GST_BASE_VIDEO_CODEC_STREAM_LOCK (base_video_decoder); GST_BASE_VIDEO_CODEC_STREAM_LOCK (base_video_decoder);
gst_event_parse_new_segment_full (event, &update, &rate, gst_event_copy_segment (event, &seg);
&arate, &format, &start, &stop, &pos);
if (format == GST_FORMAT_TIME) { if (seg.format == GST_FORMAT_TIME) {
GST_DEBUG_OBJECT (base_video_decoder, GST_DEBUG_OBJECT (base_video_decoder,
"received TIME NEW_SEGMENT %" GST_TIME_FORMAT "received TIME SEGMENT %" GST_SEGMENT_FORMAT, &seg);
" -- %" GST_TIME_FORMAT ", pos %" GST_TIME_FORMAT
", rate %g, applied_rate %g",
GST_TIME_ARGS (start), GST_TIME_ARGS (stop), GST_TIME_ARGS (pos),
rate, arate);
} else { } else {
GstFormat dformat = GST_FORMAT_TIME; GstFormat dformat = GST_FORMAT_TIME;
gint64 start;
GST_DEBUG_OBJECT (base_video_decoder, GST_DEBUG_OBJECT (base_video_decoder,
"received NEW_SEGMENT %" G_GINT64_FORMAT "received SEGMENT %" GST_SEGMENT_FORMAT, &seg);
" -- %" G_GINT64_FORMAT ", time %" G_GINT64_FORMAT
", rate %g, applied_rate %g", start, stop, pos, rate, arate);
/* handle newsegment as a result from our legacy simple seeking */ /* handle newsegment as a result from our legacy simple seeking */
/* note that initial 0 should convert to 0 in any case */ /* note that initial 0 should convert to 0 in any case */
if (base_video_decoder->do_byte_time && if (base_video_decoder->do_byte_time &&
gst_pad_query_convert (GST_BASE_VIDEO_CODEC_SINK_PAD gst_pad_query_convert (GST_BASE_VIDEO_CODEC_SINK_PAD
(base_video_decoder), GST_FORMAT_BYTES, start, &dformat, (base_video_decoder), GST_FORMAT_BYTES, seg.start, dformat,
&start)) { &start)) {
/* best attempt convert */ /* best attempt convert */
/* as these are only estimates, stop is kept open-ended to avoid /* as these are only estimates, stop is kept open-ended to avoid
* premature cutting */ * premature cutting */
GST_DEBUG_OBJECT (base_video_decoder, GST_DEBUG_OBJECT (base_video_decoder,
"converted to TIME start %" GST_TIME_FORMAT, "converted to TIME start %" GST_TIME_FORMAT,
GST_TIME_ARGS (start)); GST_TIME_ARGS (seg.start));
pos = start; seg.start = start;
stop = GST_CLOCK_TIME_NONE; seg.stop = GST_CLOCK_TIME_NONE;
seg.time = start;
/* replace event */ /* replace event */
gst_event_unref (event); gst_event_unref (event);
event = gst_event_new_new_segment_full (update, rate, arate, event = gst_event_new_segment (&seg);
GST_FORMAT_TIME, start, stop, pos);
} else { } else {
GST_BASE_VIDEO_CODEC_STREAM_UNLOCK (base_video_decoder); GST_BASE_VIDEO_CODEC_STREAM_UNLOCK (base_video_decoder);
goto newseg_wrong_format; goto newseg_wrong_format;
} }
} }
if (!update) { gst_base_video_decoder_flush (base_video_decoder, FALSE);
gst_base_video_decoder_flush (base_video_decoder, FALSE);
}
base_video_decoder->timestamp_offset = start; base_video_decoder->timestamp_offset = seg.start;
gst_segment_set_newsegment_full (segment, *segment = seg;
update, rate, arate, format, start, stop, pos);
ret = gst_base_video_decoder_push_src_event (base_video_decoder, event); ret = gst_base_video_decoder_push_src_event (base_video_decoder, event);
GST_BASE_VIDEO_CODEC_STREAM_UNLOCK (base_video_decoder); GST_BASE_VIDEO_CODEC_STREAM_UNLOCK (base_video_decoder);
@ -565,13 +553,12 @@ gst_base_video_decoder_do_seek (GstBaseVideoDecoder * dec, GstEvent * event)
} }
memcpy (&seek_segment, &codec->segment, sizeof (seek_segment)); memcpy (&seek_segment, &codec->segment, sizeof (seek_segment));
gst_segment_set_seek (&seek_segment, rate, format, flags, start_type, gst_segment_do_seek (&seek_segment, rate, format, flags, start_type,
start_time, end_type, end_time, NULL); start_time, end_type, end_time, NULL);
start_time = seek_segment.last_stop; start_time = seek_segment.position;
format = GST_FORMAT_BYTES;
if (!gst_pad_query_convert (codec->sinkpad, GST_FORMAT_TIME, start_time, if (!gst_pad_query_convert (codec->sinkpad, GST_FORMAT_TIME, start_time,
&format, &start)) { GST_FORMAT_BYTES, &start)) {
GST_DEBUG_OBJECT (dec, "conversion failed"); GST_DEBUG_OBJECT (dec, "conversion failed");
return FALSE; return FALSE;
} }
@ -630,9 +617,9 @@ gst_base_video_decoder_src_event (GstPad * pad, GstEvent * event)
/* ... though a non-time seek can be aided as well */ /* ... though a non-time seek can be aided as well */
/* First bring the requested format to time */ /* First bring the requested format to time */
tformat = GST_FORMAT_TIME; tformat = GST_FORMAT_TIME;
if (!(res = gst_pad_query_convert (pad, format, cur, &tformat, &tcur))) if (!(res = gst_pad_query_convert (pad, format, cur, tformat, &tcur)))
goto convert_error; goto convert_error;
if (!(res = gst_pad_query_convert (pad, format, stop, &tformat, &tstop))) if (!(res = gst_pad_query_convert (pad, format, stop, tformat, &tstop)))
goto convert_error; goto convert_error;
/* then seek with time on the peer */ /* then seek with time on the peer */
@ -647,12 +634,13 @@ gst_base_video_decoder_src_event (GstPad * pad, GstEvent * event)
} }
case GST_EVENT_QOS: case GST_EVENT_QOS:
{ {
GstQOSType type;
gdouble proportion; gdouble proportion;
GstClockTimeDiff diff; GstClockTimeDiff diff;
GstClockTime timestamp; GstClockTime timestamp;
GstClockTime duration; GstClockTime duration;
gst_event_parse_qos (event, &proportion, &diff, &timestamp); gst_event_parse_qos (event, &type, &proportion, &diff, &timestamp);
GST_OBJECT_LOCK (base_video_decoder); GST_OBJECT_LOCK (base_video_decoder);
GST_BASE_VIDEO_CODEC (base_video_decoder)->proportion = proportion; GST_BASE_VIDEO_CODEC (base_video_decoder)->proportion = proportion;
@ -750,7 +738,7 @@ gst_base_video_decoder_src_query (GstPad * pad, GstQuery * query)
/* and convert to the final format */ /* and convert to the final format */
gst_query_parse_position (query, &format, NULL); gst_query_parse_position (query, &format, NULL);
if (!(res = gst_pad_query_convert (pad, GST_FORMAT_TIME, time, if (!(res = gst_pad_query_convert (pad, GST_FORMAT_TIME, time,
&format, &value))) format, &value)))
break; break;
gst_query_set_position (query, format, value); gst_query_set_position (query, format, value);
@ -775,11 +763,11 @@ gst_base_video_decoder_src_query (GstPad * pad, GstQuery * query)
format = GST_FORMAT_BYTES; format = GST_FORMAT_BYTES;
if (gst_pad_query_peer_duration (GST_BASE_VIDEO_CODEC_SINK_PAD (dec), if (gst_pad_query_peer_duration (GST_BASE_VIDEO_CODEC_SINK_PAD (dec),
&format, &value)) { format, &value)) {
GST_LOG_OBJECT (dec, "upstream size %" G_GINT64_FORMAT, value); GST_LOG_OBJECT (dec, "upstream size %" G_GINT64_FORMAT, value);
format = GST_FORMAT_TIME; format = GST_FORMAT_TIME;
if (gst_pad_query_convert (GST_BASE_VIDEO_CODEC_SINK_PAD (dec), if (gst_pad_query_convert (GST_BASE_VIDEO_CODEC_SINK_PAD (dec),
GST_FORMAT_BYTES, value, &format, &value)) { GST_FORMAT_BYTES, value, format, &value)) {
gst_query_set_duration (query, GST_FORMAT_TIME, value); gst_query_set_duration (query, GST_FORMAT_TIME, value);
res = TRUE; res = TRUE;
} }
@ -1083,7 +1071,7 @@ gst_base_video_decoder_flush_decode (GstBaseVideoDecoder * dec)
while (walk) { while (walk) {
GList *next; GList *next;
GstVideoFrame *frame = (GstVideoFrame *) (walk->data); GstVideoFrameState *frame = (GstVideoFrameState *) (walk->data);
GstBuffer *buf = frame->sink_buffer; GstBuffer *buf = frame->sink_buffer;
GST_DEBUG_OBJECT (dec, "decoding frame %p, ts %" GST_TIME_FORMAT, GST_DEBUG_OBJECT (dec, "decoding frame %p, ts %" GST_TIME_FORMAT,
@ -1144,9 +1132,9 @@ gst_base_video_decoder_flush_parse (GstBaseVideoDecoder * dec)
/* now we can process frames */ /* now we can process frames */
GST_DEBUG_OBJECT (dec, "checking frames"); GST_DEBUG_OBJECT (dec, "checking frames");
while (dec->parse_gather) { while (dec->parse_gather) {
GstVideoFrame *frame; GstVideoFrameState *frame;
frame = (GstVideoFrame *) (dec->parse_gather->data); frame = (GstVideoFrameState *) (dec->parse_gather->data);
/* remove from the gather list */ /* remove from the gather list */
dec->parse_gather = dec->parse_gather =
g_list_delete_link (dec->parse_gather, dec->parse_gather); g_list_delete_link (dec->parse_gather, dec->parse_gather);
@ -1170,7 +1158,7 @@ gst_base_video_decoder_flush_parse (GstBaseVideoDecoder * dec)
GST_BUFFER_SIZE (buf), GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (buf)), GST_BUFFER_SIZE (buf), GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (buf)),
GST_TIME_ARGS (GST_BUFFER_DURATION (buf))); GST_TIME_ARGS (GST_BUFFER_DURATION (buf)));
/* should be already, but let's be sure */ /* should be already, but let's be sure */
buf = gst_buffer_make_metadata_writable (buf); buf = gst_buffer_make_writable (buf);
/* avoid stray DISCONT from forward processing, /* avoid stray DISCONT from forward processing,
* which have no meaning in reverse pushing */ * which have no meaning in reverse pushing */
GST_BUFFER_FLAG_UNSET (buf, GST_BUFFER_FLAG_DISCONT); GST_BUFFER_FLAG_UNSET (buf, GST_BUFFER_FLAG_DISCONT);
@ -1339,10 +1327,10 @@ gst_base_video_decoder_change_state (GstElement * element,
return ret; return ret;
} }
static GstVideoFrame * static GstVideoFrameState *
gst_base_video_decoder_new_frame (GstBaseVideoDecoder * base_video_decoder) gst_base_video_decoder_new_frame (GstBaseVideoDecoder * base_video_decoder)
{ {
GstVideoFrame *frame; GstVideoFrameState *frame;
GST_BASE_VIDEO_CODEC_STREAM_LOCK (base_video_decoder); GST_BASE_VIDEO_CODEC_STREAM_LOCK (base_video_decoder);
frame = frame =
@ -1368,7 +1356,7 @@ gst_base_video_decoder_new_frame (GstBaseVideoDecoder * base_video_decoder)
/** /**
* gst_base_video_decoder_finish_frame: * gst_base_video_decoder_finish_frame:
* @base_video_decoder: a #GstBaseVideoDecoder * @base_video_decoder: a #GstBaseVideoDecoder
* @frame: a decoded #GstVideoFrame * @frame: a decoded #GstVideoFrameState
* *
* @frame should have a valid decoded data buffer, whose metadata fields * @frame should have a valid decoded data buffer, whose metadata fields
* are then appropriately set according to frame data and pushed downstream. * are then appropriately set according to frame data and pushed downstream.
@ -1379,7 +1367,7 @@ gst_base_video_decoder_new_frame (GstBaseVideoDecoder * base_video_decoder)
*/ */
GstFlowReturn GstFlowReturn
gst_base_video_decoder_finish_frame (GstBaseVideoDecoder * base_video_decoder, gst_base_video_decoder_finish_frame (GstBaseVideoDecoder * base_video_decoder,
GstVideoFrame * frame) GstVideoFrameState * frame)
{ {
GstVideoState *state = &GST_BASE_VIDEO_CODEC (base_video_decoder)->state; GstVideoState *state = &GST_BASE_VIDEO_CODEC (base_video_decoder)->state;
GstBuffer *src_buffer; GstBuffer *src_buffer;
@ -1402,7 +1390,7 @@ gst_base_video_decoder_finish_frame (GstBaseVideoDecoder * base_video_decoder,
/* Push all pending events that arrived before this frame */ /* Push all pending events that arrived before this frame */
for (l = base_video_decoder->base_video_codec.frames; l; l = l->next) { for (l = base_video_decoder->base_video_codec.frames; l; l = l->next) {
GstVideoFrame *tmp = l->data; GstVideoFrameState *tmp = l->data;
if (tmp->events) { if (tmp->events) {
GList *k; GList *k;
@ -1486,7 +1474,7 @@ gst_base_video_decoder_finish_frame (GstBaseVideoDecoder * base_video_decoder,
goto done; goto done;
} }
src_buffer = gst_buffer_make_metadata_writable (frame->src_buffer); src_buffer = gst_buffer_make_writable (frame->src_buffer);
frame->src_buffer = NULL; frame->src_buffer = NULL;
GST_BUFFER_FLAG_UNSET (src_buffer, GST_BUFFER_FLAG_DELTA_UNIT); GST_BUFFER_FLAG_UNSET (src_buffer, GST_BUFFER_FLAG_DELTA_UNIT);
@ -1600,7 +1588,7 @@ done:
/** /**
* gst_base_video_decoder_finish_frame: * gst_base_video_decoder_finish_frame:
* @base_video_decoder: a #GstBaseVideoDecoder * @base_video_decoder: a #GstBaseVideoDecoder
* @n_bytes: an encoded #GstVideoFrame * @n_bytes: an encoded #GstVideoFrameState
* *
* Removes next @n_bytes of input data and adds it to currently parsed frame. * Removes next @n_bytes of input data and adds it to currently parsed frame.
*/ */
@ -1734,7 +1722,7 @@ gst_base_video_decoder_have_frame (GstBaseVideoDecoder * base_video_decoder)
static GstFlowReturn static GstFlowReturn
gst_base_video_decoder_have_frame_2 (GstBaseVideoDecoder * base_video_decoder) gst_base_video_decoder_have_frame_2 (GstBaseVideoDecoder * base_video_decoder)
{ {
GstVideoFrame *frame = base_video_decoder->current_frame; GstVideoFrameState *frame = base_video_decoder->current_frame;
GstBaseVideoDecoderClass *base_video_decoder_class; GstBaseVideoDecoderClass *base_video_decoder_class;
GstFlowReturn ret = GST_FLOW_OK; GstFlowReturn ret = GST_FLOW_OK;
@ -1844,9 +1832,9 @@ gst_base_video_decoder_set_sync_point (GstBaseVideoDecoder * base_video_decoder)
* gst_base_video_decoder_get_oldest_frame: * gst_base_video_decoder_get_oldest_frame:
* @base_video_decoder: a #GstBaseVideoDecoder * @base_video_decoder: a #GstBaseVideoDecoder
* *
* Returns: oldest pending unfinished #GstVideoFrame. * Returns: oldest pending unfinished #GstVideoFrameState.
*/ */
GstVideoFrame * GstVideoFrameState *
gst_base_video_decoder_get_oldest_frame (GstBaseVideoDecoder * gst_base_video_decoder_get_oldest_frame (GstBaseVideoDecoder *
base_video_decoder) base_video_decoder)
{ {
@ -1858,7 +1846,7 @@ gst_base_video_decoder_get_oldest_frame (GstBaseVideoDecoder *
if (g == NULL) if (g == NULL)
return NULL; return NULL;
return (GstVideoFrame *) (g->data); return (GstVideoFrameState *) (g->data);
} }
/** /**
@ -1866,19 +1854,19 @@ gst_base_video_decoder_get_oldest_frame (GstBaseVideoDecoder *
* @base_video_decoder: a #GstBaseVideoDecoder * @base_video_decoder: a #GstBaseVideoDecoder
* @frame_number: system_frame_number of a frame * @frame_number: system_frame_number of a frame
* *
* Returns: pending unfinished #GstVideoFrame identified by @frame_number. * Returns: pending unfinished #GstVideoFrameState identified by @frame_number.
*/ */
GstVideoFrame * GstVideoFrameState *
gst_base_video_decoder_get_frame (GstBaseVideoDecoder * base_video_decoder, gst_base_video_decoder_get_frame (GstBaseVideoDecoder * base_video_decoder,
int frame_number) int frame_number)
{ {
GList *g; GList *g;
GstVideoFrame *frame = NULL; GstVideoFrameState *frame = NULL;
GST_BASE_VIDEO_CODEC_STREAM_LOCK (base_video_decoder); GST_BASE_VIDEO_CODEC_STREAM_LOCK (base_video_decoder);
for (g = g_list_first (GST_BASE_VIDEO_CODEC (base_video_decoder)->frames); for (g = g_list_first (GST_BASE_VIDEO_CODEC (base_video_decoder)->frames);
g; g = g_list_next (g)) { g; g = g_list_next (g)) {
GstVideoFrame *tmp = g->data; GstVideoFrameState *tmp = g->data;
if (frame->system_frame_number == frame_number) { if (frame->system_frame_number == frame_number) {
frame = tmp; frame = tmp;
@ -1986,7 +1974,7 @@ gst_base_video_decoder_alloc_src_buffer (GstBaseVideoDecoder *
/** /**
* gst_base_video_decoder_alloc_src_frame: * gst_base_video_decoder_alloc_src_frame:
* @base_video_decoder: a #GstBaseVideoDecoder * @base_video_decoder: a #GstBaseVideoDecoder
* @frame: a #GstVideoFrame * @frame: a #GstVideoFrameState
* *
* Helper function that uses gst_pad_alloc_buffer_and_set_caps * Helper function that uses gst_pad_alloc_buffer_and_set_caps
* to allocate a buffer to hold a video frame for @base_video_decoder's * to allocate a buffer to hold a video frame for @base_video_decoder's
@ -1997,7 +1985,7 @@ gst_base_video_decoder_alloc_src_buffer (GstBaseVideoDecoder *
*/ */
GstFlowReturn GstFlowReturn
gst_base_video_decoder_alloc_src_frame (GstBaseVideoDecoder * gst_base_video_decoder_alloc_src_frame (GstBaseVideoDecoder *
base_video_decoder, GstVideoFrame * frame) base_video_decoder, GstVideoFrameState * frame)
{ {
GstFlowReturn flow_ret; GstFlowReturn flow_ret;
GstVideoState *state = &GST_BASE_VIDEO_CODEC (base_video_decoder)->state; GstVideoState *state = &GST_BASE_VIDEO_CODEC (base_video_decoder)->state;
@ -2029,7 +2017,7 @@ gst_base_video_decoder_alloc_src_frame (GstBaseVideoDecoder *
/** /**
* gst_base_video_decoder_get_max_decode_time: * gst_base_video_decoder_get_max_decode_time:
* @base_video_decoder: a #GstBaseVideoDecoder * @base_video_decoder: a #GstBaseVideoDecoder
* @frame: a #GstVideoFrame * @frame: a #GstVideoFrameState
* *
* Determines maximum possible decoding time for @frame that will * Determines maximum possible decoding time for @frame that will
* allow it to decode and arrive in time (as determined by QoS messages). * allow it to decode and arrive in time (as determined by QoS messages).
@ -2040,7 +2028,7 @@ gst_base_video_decoder_alloc_src_frame (GstBaseVideoDecoder *
*/ */
GstClockTimeDiff GstClockTimeDiff
gst_base_video_decoder_get_max_decode_time (GstBaseVideoDecoder * gst_base_video_decoder_get_max_decode_time (GstBaseVideoDecoder *
base_video_decoder, GstVideoFrame * frame) base_video_decoder, GstVideoFrameState * frame)
{ {
GstClockTimeDiff deadline; GstClockTimeDiff deadline;
GstClockTime earliest_time; GstClockTime earliest_time;

14
gst-libs/gst/video/gstbasevideodecoder.h
View file

@ -142,7 +142,7 @@ struct _GstBaseVideoDecoder
/* ... being tracked here; /* ... being tracked here;
* only available during parsing */ * only available during parsing */
/* FIXME remove and add parameter to method */ /* FIXME remove and add parameter to method */
GstVideoFrame *current_frame; GstVideoFrameState *current_frame;
/* events that should apply to the current frame */ /* events that should apply to the current frame */
GList *current_frame_events; GList *current_frame_events;
/* relative offset of input data */ /* relative offset of input data */
@ -233,7 +233,7 @@ struct _GstBaseVideoDecoderClass
GstFlowReturn (*finish) (GstBaseVideoDecoder *coder); GstFlowReturn (*finish) (GstBaseVideoDecoder *coder);
GstFlowReturn (*handle_frame) (GstBaseVideoDecoder *coder, GstVideoFrame *frame); GstFlowReturn (*handle_frame) (GstBaseVideoDecoder *coder, GstVideoFrameState *frame);
/*< private >*/ /*< private >*/
@ -247,9 +247,9 @@ struct _GstBaseVideoDecoderClass
void gst_base_video_decoder_class_set_capture_pattern (GstBaseVideoDecoderClass *klass, void gst_base_video_decoder_class_set_capture_pattern (GstBaseVideoDecoderClass *klass,
guint32 mask, guint32 pattern); guint32 mask, guint32 pattern);
GstVideoFrame *gst_base_video_decoder_get_frame (GstBaseVideoDecoder *coder, GstVideoFrameState *gst_base_video_decoder_get_frame (GstBaseVideoDecoder *coder,
int frame_number); int frame_number);
GstVideoFrame *gst_base_video_decoder_get_oldest_frame (GstBaseVideoDecoder *coder); GstVideoFrameState *gst_base_video_decoder_get_oldest_frame (GstBaseVideoDecoder *coder);
void gst_base_video_decoder_add_to_frame (GstBaseVideoDecoder *base_video_decoder, void gst_base_video_decoder_add_to_frame (GstBaseVideoDecoder *base_video_decoder,
int n_bytes); int n_bytes);
@ -260,13 +260,13 @@ void gst_base_video_decoder_set_sync_point (GstBaseVideoDecoder *bas
gboolean gst_base_video_decoder_set_src_caps (GstBaseVideoDecoder *base_video_decoder); gboolean gst_base_video_decoder_set_src_caps (GstBaseVideoDecoder *base_video_decoder);
GstBuffer *gst_base_video_decoder_alloc_src_buffer (GstBaseVideoDecoder * base_video_decoder); GstBuffer *gst_base_video_decoder_alloc_src_buffer (GstBaseVideoDecoder * base_video_decoder);
GstFlowReturn gst_base_video_decoder_alloc_src_frame (GstBaseVideoDecoder *base_video_decoder, GstFlowReturn gst_base_video_decoder_alloc_src_frame (GstBaseVideoDecoder *base_video_decoder,
GstVideoFrame *frame); GstVideoFrameState *frame);
GstVideoState *gst_base_video_decoder_get_state (GstBaseVideoDecoder *base_video_decoder); GstVideoState *gst_base_video_decoder_get_state (GstBaseVideoDecoder *base_video_decoder);
GstClockTimeDiff gst_base_video_decoder_get_max_decode_time ( GstClockTimeDiff gst_base_video_decoder_get_max_decode_time (
GstBaseVideoDecoder *base_video_decoder, GstBaseVideoDecoder *base_video_decoder,
GstVideoFrame *frame); GstVideoFrameState *frame);
GstFlowReturn gst_base_video_decoder_finish_frame (GstBaseVideoDecoder *base_video_decoder, GstFlowReturn gst_base_video_decoder_finish_frame (GstBaseVideoDecoder *base_video_decoder,
GstVideoFrame *frame); GstVideoFrameState *frame);
GType gst_base_video_decoder_get_type (void); GType gst_base_video_decoder_get_type (void);

14
gst-libs/gst/video/gstbasevideoencoder.c
View file

@ -705,7 +705,7 @@ gst_base_video_encoder_chain (GstPad * pad, GstBuffer * buf)
{ {
GstBaseVideoEncoder *base_video_encoder; GstBaseVideoEncoder *base_video_encoder;
GstBaseVideoEncoderClass *klass; GstBaseVideoEncoderClass *klass;
GstVideoFrame *frame; GstVideoFrameState *frame;
GstFlowReturn ret = GST_FLOW_OK; GstFlowReturn ret = GST_FLOW_OK;
base_video_encoder = GST_BASE_VIDEO_ENCODER (gst_pad_get_parent (pad)); base_video_encoder = GST_BASE_VIDEO_ENCODER (gst_pad_get_parent (pad));
@ -825,7 +825,7 @@ gst_base_video_encoder_change_state (GstElement * element,
/** /**
* gst_base_video_encoder_finish_frame: * gst_base_video_encoder_finish_frame:
* @base_video_encoder: a #GstBaseVideoEncoder * @base_video_encoder: a #GstBaseVideoEncoder
* @frame: an encoded #GstVideoFrame * @frame: an encoded #GstVideoFrameState
* *
* @frame must have a valid encoded data buffer, whose metadata fields * @frame must have a valid encoded data buffer, whose metadata fields
* are then appropriately set according to frame data or no buffer at * are then appropriately set according to frame data or no buffer at
@ -837,7 +837,7 @@ gst_base_video_encoder_change_state (GstElement * element,
*/ */
GstFlowReturn GstFlowReturn
gst_base_video_encoder_finish_frame (GstBaseVideoEncoder * base_video_encoder, gst_base_video_encoder_finish_frame (GstBaseVideoEncoder * base_video_encoder,
GstVideoFrame * frame) GstVideoFrameState * frame)
{ {
GstFlowReturn ret = GST_FLOW_OK; GstFlowReturn ret = GST_FLOW_OK;
GstBaseVideoEncoderClass *base_video_encoder_class; GstBaseVideoEncoderClass *base_video_encoder_class;
@ -853,7 +853,7 @@ gst_base_video_encoder_finish_frame (GstBaseVideoEncoder * base_video_encoder,
/* Push all pending events that arrived before this frame */ /* Push all pending events that arrived before this frame */
for (l = base_video_encoder->base_video_codec.frames; l; l = l->next) { for (l = base_video_encoder->base_video_codec.frames; l; l = l->next) {
GstVideoFrame *tmp = l->data; GstVideoFrameState *tmp = l->data;
if (tmp->events) { if (tmp->events) {
GList *k; GList *k;
@ -1041,9 +1041,9 @@ gst_base_video_encoder_set_latency_fields (GstBaseVideoEncoder *
* gst_base_video_encoder_get_oldest_frame: * gst_base_video_encoder_get_oldest_frame:
* @base_video_encoder: a #GstBaseVideoEncoder * @base_video_encoder: a #GstBaseVideoEncoder
* *
* Returns: oldest unfinished pending #GstVideoFrame * Returns: oldest unfinished pending #GstVideoFrameState
*/ */
GstVideoFrame * GstVideoFrameState *
gst_base_video_encoder_get_oldest_frame (GstBaseVideoEncoder * gst_base_video_encoder_get_oldest_frame (GstBaseVideoEncoder *
base_video_encoder) base_video_encoder)
{ {
@ -1055,7 +1055,7 @@ gst_base_video_encoder_get_oldest_frame (GstBaseVideoEncoder *
if (g == NULL) if (g == NULL)
return NULL; return NULL;
return (GstVideoFrame *) (g->data); return (GstVideoFrameState *) (g->data);
} }
/* FIXME there could probably be more of these; /* FIXME there could probably be more of these;

8
gst-libs/gst/video/gstbasevideoencoder.h
View file

@ -150,13 +150,13 @@ struct _GstBaseVideoEncoderClass
GstVideoState *state); GstVideoState *state);
GstFlowReturn (*handle_frame) (GstBaseVideoEncoder *coder, GstFlowReturn (*handle_frame) (GstBaseVideoEncoder *coder,
GstVideoFrame *frame); GstVideoFrameState *frame);
gboolean (*reset) (GstBaseVideoEncoder *coder); gboolean (*reset) (GstBaseVideoEncoder *coder);
GstFlowReturn (*finish) (GstBaseVideoEncoder *coder); GstFlowReturn (*finish) (GstBaseVideoEncoder *coder);
GstFlowReturn (*shape_output) (GstBaseVideoEncoder *coder, GstFlowReturn (*shape_output) (GstBaseVideoEncoder *coder,
GstVideoFrame *frame); GstVideoFrameState *frame);
gboolean (*event) (GstBaseVideoEncoder *coder, gboolean (*event) (GstBaseVideoEncoder *coder,
GstEvent *event); GstEvent *event);
@ -170,9 +170,9 @@ GType gst_base_video_encoder_get_type (void);
const GstVideoState* gst_base_video_encoder_get_state (GstBaseVideoEncoder *coder); const GstVideoState* gst_base_video_encoder_get_state (GstBaseVideoEncoder *coder);
GstVideoFrame* gst_base_video_encoder_get_oldest_frame (GstBaseVideoEncoder *coder); GstVideoFrameState* gst_base_video_encoder_get_oldest_frame (GstBaseVideoEncoder *coder);
GstFlowReturn gst_base_video_encoder_finish_frame (GstBaseVideoEncoder *base_video_encoder, GstFlowReturn gst_base_video_encoder_finish_frame (GstBaseVideoEncoder *base_video_encoder,
GstVideoFrame *frame); GstVideoFrameState *frame);
void gst_base_video_encoder_set_latency (GstBaseVideoEncoder *base_video_encoder, void gst_base_video_encoder_set_latency (GstBaseVideoEncoder *base_video_encoder,
GstClockTime min_latency, GstClockTime max_latency); GstClockTime min_latency, GstClockTime max_latency);