FaSTTUBe/GST-Tensordecoder-ov_ep
37
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

playbin2: move marshaller to screenshot

Browse Source 
Move the marshaller for the convert_frame signal to the screenshot file in
preparation for moving it to playsink.

See #620279
This commit is contained in:
Wim Taymans 2010-06-05 11:02:24 +02:00
parent afcf3a3517
commit 3cf75c34d3
3 changed files with 43 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
gst/playback/gstplaybin2.c
View File

@ -232,6 +232,7 @@
#include "gstplayback.h" #include "gstplayback.h"
#include "gstplaysink.h" #include "gstplaysink.h"
#include "gstfactorylists.h" #include "gstfactorylists.h"
#include "gstscreenshot.h"
#include "gstinputselector.h" #include "gstinputselector.h"
#include "gstsubtitleoverlay.h" #include "gstsubtitleoverlay.h"
@ -568,38 +569,6 @@ if (id) { \
id = 0; \ id = 0; \
} }
static void
gst_play_marshal_BUFFER__BOXED (GClosure * closure,
GValue * return_value G_GNUC_UNUSED,
guint n_param_values,
const GValue * param_values,
gpointer invocation_hint G_GNUC_UNUSED, gpointer marshal_data)
{
typedef GstBuffer *(*GMarshalFunc_OBJECT__BOXED) (gpointer data1,
gpointer arg_1, gpointer data2);
register GMarshalFunc_OBJECT__BOXED callback;
register GCClosure *cc = (GCClosure *) closure;
register gpointer data1, data2;
GstBuffer *v_return;
g_return_if_fail (return_value != NULL);
g_return_if_fail (n_param_values == 2);
if (G_CCLOSURE_SWAP_DATA (closure)) {
data1 = closure->data;
data2 = g_value_peek_pointer (param_values + 0);
} else {
data1 = g_value_peek_pointer (param_values + 0);
data2 = closure->data;
}
callback =
(GMarshalFunc_OBJECT__BOXED) (marshal_data ? marshal_data : cc->callback);
v_return = callback (data1, g_value_get_boxed (param_values + 1), data2);
gst_value_take_buffer (return_value, v_return);
}
static GType static GType
gst_play_bin_get_type (void) gst_play_bin_get_type (void)
{ {
@ -2441,8 +2410,8 @@ _playsink_sink_event_probe_cb (GstPad * pad, GstEvent * event,
if (format != GST_FORMAT_TIME) if (format != GST_FORMAT_TIME)
data->group->selector[data->type].group_start_accum = GST_CLOCK_TIME_NONE; data->group->selector[data->type].group_start_accum = GST_CLOCK_TIME_NONE;
else if (!GST_CLOCK_TIME_IS_VALID (data->group->selector[data->type]. else if (!GST_CLOCK_TIME_IS_VALID (data->group->selector[data->
group_start_accum)) type].group_start_accum))
data->group->selector[data->type].group_start_accum = segment->accum; data->group->selector[data->type].group_start_accum = segment->accum;
} else if (GST_EVENT_TYPE (event) == GST_EVENT_FLUSH_STOP) { } else if (GST_EVENT_TYPE (event) == GST_EVENT_FLUSH_STOP) {
gst_segment_init (&data->playbin->segments[index], GST_FORMAT_UNDEFINED); gst_segment_init (&data->playbin->segments[index], GST_FORMAT_UNDEFINED);
@ -2974,8 +2943,8 @@ autoplug_continue_cb (GstElement * element, GstPad * pad, GstCaps * caps,
GstPad *text_sinkpad = NULL; GstPad *text_sinkpad = NULL;
text_sink = text_sink =
(group->playbin->text_sink) ? gst_object_ref (group->playbin-> (group->playbin->text_sink) ? gst_object_ref (group->
text_sink) : NULL; playbin->text_sink) : NULL;
if (text_sink) if (text_sink)
text_sinkpad = gst_element_get_static_pad (text_sink, "sink"); text_sinkpad = gst_element_get_static_pad (text_sink, "sink");

32
gst/playback/gstscreenshot.c
View File

@ -26,6 +26,38 @@
#include "gstscreenshot.h" #include "gstscreenshot.h"
void
gst_play_marshal_BUFFER__BOXED (GClosure * closure,
GValue * return_value G_GNUC_UNUSED,
guint n_param_values,
const GValue * param_values,
gpointer invocation_hint G_GNUC_UNUSED, gpointer marshal_data)
{
typedef GstBuffer *(*GMarshalFunc_OBJECT__BOXED) (gpointer data1,
gpointer arg_1, gpointer data2);
register GMarshalFunc_OBJECT__BOXED callback;
register GCClosure *cc = (GCClosure *) closure;
register gpointer data1, data2;
GstBuffer *v_return;
g_return_if_fail (return_value != NULL);
g_return_if_fail (n_param_values == 2);
if (G_CCLOSURE_SWAP_DATA (closure)) {
data1 = closure->data;
data2 = g_value_peek_pointer (param_values + 0);
} else {
data1 = g_value_peek_pointer (param_values + 0);
data2 = closure->data;
}
callback =
(GMarshalFunc_OBJECT__BOXED) (marshal_data ? marshal_data : cc->callback);
v_return = callback (data1, g_value_get_boxed (param_values + 1), data2);
gst_value_take_buffer (return_value, v_return);
}
static void static void
feed_fakesrc (GstElement * src, GstBuffer * buf, GstPad * pad, gpointer data) feed_fakesrc (GstElement * src, GstBuffer * buf, GstPad * pad, gpointer data)
{ {

6
gst/playback/gstscreenshot.h
View File

@ -24,6 +24,12 @@
G_BEGIN_DECLS G_BEGIN_DECLS
void gst_play_marshal_BUFFER__BOXED (GClosure * closure,
GValue * return_value G_GNUC_UNUSED,
guint n_param_values,
const GValue * param_values,
gpointer invocation_hint G_GNUC_UNUSED, gpointer marshal_data);
GstBuffer * gst_play_frame_conv_convert (GstBuffer *buf, GstCaps *to); GstBuffer * gst_play_frame_conv_convert (GstBuffer *buf, GstCaps *to);
G_END_DECLS G_END_DECLS