mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-09-30 15:52:32 +00:00
resindvd: Update the base source copy
This breaks seamless segment updates, causing deadlocks, to be fixed in subsequent commits.
This commit is contained in:
parent
454539a10e
commit
3e72e7b48b
7 changed files with 947 additions and 727 deletions
|
@ -8,7 +8,6 @@ libresindvd_la_SOURCES = \
|
||||||
rsnaudiomunge.c \
|
rsnaudiomunge.c \
|
||||||
rsndec.c \
|
rsndec.c \
|
||||||
rsnbasesrc.c \
|
rsnbasesrc.c \
|
||||||
rsnpushsrc.c \
|
|
||||||
rsnstreamselector.c \
|
rsnstreamselector.c \
|
||||||
resindvdsrc.c \
|
resindvdsrc.c \
|
||||||
gstmpegdesc.c \
|
gstmpegdesc.c \
|
||||||
|
@ -30,7 +29,6 @@ noinst_HEADERS = resindvdbin.h \
|
||||||
rsnaudiomunge.h \
|
rsnaudiomunge.h \
|
||||||
rsndec.h \
|
rsndec.h \
|
||||||
rsnbasesrc.h \
|
rsnbasesrc.h \
|
||||||
rsnpushsrc.h \
|
|
||||||
rsnstreamselector.h \
|
rsnstreamselector.h \
|
||||||
resindvdsrc.h \
|
resindvdsrc.h \
|
||||||
gstmpegdefs.h \
|
gstmpegdefs.h \
|
||||||
|
|
|
@ -97,8 +97,8 @@ static GstFormat chapter_format;
|
||||||
|
|
||||||
static void rsn_dvdsrc_register_extra (GType rsn_dvdsrc_type);
|
static void rsn_dvdsrc_register_extra (GType rsn_dvdsrc_type);
|
||||||
|
|
||||||
GST_BOILERPLATE_FULL (resinDvdSrc, rsn_dvdsrc, RsnPushSrc,
|
GST_BOILERPLATE_FULL (resinDvdSrc, rsn_dvdsrc, RsnBaseSrc,
|
||||||
RSN_TYPE_PUSH_SRC, rsn_dvdsrc_register_extra);
|
RSN_TYPE_BASE_SRC, rsn_dvdsrc_register_extra);
|
||||||
|
|
||||||
static gboolean read_vts_info (resinDvdSrc * src);
|
static gboolean read_vts_info (resinDvdSrc * src);
|
||||||
|
|
||||||
|
@ -139,7 +139,9 @@ static void rsn_dvdsrc_check_nav_blocks (resinDvdSrc * src);
|
||||||
static void rsn_dvdsrc_schedule_nav_cb (resinDvdSrc * src,
|
static void rsn_dvdsrc_schedule_nav_cb (resinDvdSrc * src,
|
||||||
RsnDvdPendingNav * next_nav);
|
RsnDvdPendingNav * next_nav);
|
||||||
|
|
||||||
static GstFlowReturn rsn_dvdsrc_create (RsnPushSrc * psrc, GstBuffer ** buf);
|
static gboolean rsn_dvdsrc_check_get_range (RsnBaseSrc * src);
|
||||||
|
static GstFlowReturn rsn_dvdsrc_create (RsnBaseSrc * bsrc, guint64 offset,
|
||||||
|
guint length, GstBuffer ** buf);
|
||||||
static gboolean rsn_dvdsrc_src_event (RsnBaseSrc * basesrc, GstEvent * event);
|
static gboolean rsn_dvdsrc_src_event (RsnBaseSrc * basesrc, GstEvent * event);
|
||||||
static gboolean rsn_dvdsrc_src_query (RsnBaseSrc * basesrc, GstQuery * query);
|
static gboolean rsn_dvdsrc_src_query (RsnBaseSrc * basesrc, GstQuery * query);
|
||||||
|
|
||||||
|
@ -205,12 +207,10 @@ rsn_dvdsrc_class_init (resinDvdSrcClass * klass)
|
||||||
GObjectClass *gobject_class;
|
GObjectClass *gobject_class;
|
||||||
GstElementClass *gstelement_class;
|
GstElementClass *gstelement_class;
|
||||||
RsnBaseSrcClass *gstbasesrc_class;
|
RsnBaseSrcClass *gstbasesrc_class;
|
||||||
RsnPushSrcClass *gstpush_src_class;
|
|
||||||
|
|
||||||
gobject_class = (GObjectClass *) klass;
|
gobject_class = (GObjectClass *) klass;
|
||||||
gstelement_class = (GstElementClass *) klass;
|
gstelement_class = (GstElementClass *) klass;
|
||||||
gstbasesrc_class = GST_BASE_SRC_CLASS (klass);
|
gstbasesrc_class = RSN_BASE_SRC_CLASS (klass);
|
||||||
gstpush_src_class = GST_PUSH_SRC_CLASS (klass);
|
|
||||||
|
|
||||||
gobject_class->finalize = rsn_dvdsrc_finalize;
|
gobject_class->finalize = rsn_dvdsrc_finalize;
|
||||||
gobject_class->set_property = rsn_dvdsrc_set_property;
|
gobject_class->set_property = rsn_dvdsrc_set_property;
|
||||||
|
@ -229,7 +229,9 @@ rsn_dvdsrc_class_init (resinDvdSrcClass * klass)
|
||||||
GST_DEBUG_FUNCPTR (rsn_dvdsrc_prepare_seek);
|
GST_DEBUG_FUNCPTR (rsn_dvdsrc_prepare_seek);
|
||||||
gstbasesrc_class->do_seek = GST_DEBUG_FUNCPTR (rsn_dvdsrc_do_seek);
|
gstbasesrc_class->do_seek = GST_DEBUG_FUNCPTR (rsn_dvdsrc_do_seek);
|
||||||
|
|
||||||
gstpush_src_class->create = GST_DEBUG_FUNCPTR (rsn_dvdsrc_create);
|
gstbasesrc_class->check_get_range =
|
||||||
|
GST_DEBUG_FUNCPTR (rsn_dvdsrc_check_get_range);
|
||||||
|
gstbasesrc_class->create = GST_DEBUG_FUNCPTR (rsn_dvdsrc_create);
|
||||||
|
|
||||||
g_object_class_install_property (gobject_class, ARG_DEVICE,
|
g_object_class_install_property (gobject_class, ARG_DEVICE,
|
||||||
g_param_spec_string ("device", "Device", "DVD device location",
|
g_param_spec_string ("device", "Device", "DVD device location",
|
||||||
|
@ -258,7 +260,7 @@ rsn_dvdsrc_init (resinDvdSrc * rsndvdsrc, resinDvdSrcClass * gclass)
|
||||||
rsndvdsrc->branching = FALSE;
|
rsndvdsrc->branching = FALSE;
|
||||||
rsndvdsrc->still_cond = g_cond_new ();
|
rsndvdsrc->still_cond = g_cond_new ();
|
||||||
|
|
||||||
rsn_base_src_set_format (GST_BASE_SRC (rsndvdsrc), GST_FORMAT_TIME);
|
gst_base_src_set_format (RSN_BASE_SRC (rsndvdsrc), GST_FORMAT_TIME);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
@ -597,7 +599,7 @@ rsn_dvdsrc_do_still (resinDvdSrc * src, int duration)
|
||||||
gboolean cmds_changed;
|
gboolean cmds_changed;
|
||||||
GstStructure *s;
|
GstStructure *s;
|
||||||
GstEvent *seg_event;
|
GstEvent *seg_event;
|
||||||
GstSegment *segment = &(GST_BASE_SRC (src)->segment);
|
GstSegment *segment = &(RSN_BASE_SRC (src)->segment);
|
||||||
|
|
||||||
if (src->in_still_state == FALSE) {
|
if (src->in_still_state == FALSE) {
|
||||||
GST_DEBUG_OBJECT (src, "**** Start STILL FRAME. Duration %d ****",
|
GST_DEBUG_OBJECT (src, "**** Start STILL FRAME. Duration %d ****",
|
||||||
|
@ -630,11 +632,11 @@ rsn_dvdsrc_do_still (resinDvdSrc * src, int duration)
|
||||||
/* Now, send the events. We need to drop the dvd lock while doing so,
|
/* Now, send the events. We need to drop the dvd lock while doing so,
|
||||||
* and then check after if we got flushed */
|
* and then check after if we got flushed */
|
||||||
g_mutex_unlock (src->dvd_lock);
|
g_mutex_unlock (src->dvd_lock);
|
||||||
gst_pad_push_event (GST_BASE_SRC_PAD (src), still_event);
|
gst_pad_push_event (RSN_BASE_SRC_PAD (src), still_event);
|
||||||
gst_pad_push_event (GST_BASE_SRC_PAD (src), seg_event);
|
gst_pad_push_event (RSN_BASE_SRC_PAD (src), seg_event);
|
||||||
if (hl_event) {
|
if (hl_event) {
|
||||||
GST_LOG_OBJECT (src, "Sending highlight event before still");
|
GST_LOG_OBJECT (src, "Sending highlight event before still");
|
||||||
gst_pad_push_event (GST_BASE_SRC_PAD (src), hl_event);
|
gst_pad_push_event (RSN_BASE_SRC_PAD (src), hl_event);
|
||||||
}
|
}
|
||||||
if (cmds_changed)
|
if (cmds_changed)
|
||||||
rsn_dvdsrc_send_commands_changed (src);
|
rsn_dvdsrc_send_commands_changed (src);
|
||||||
|
@ -743,7 +745,7 @@ rsn_dvdsrc_do_still (resinDvdSrc * src, int duration)
|
||||||
segment->start + (GST_SECOND * duration));
|
segment->start + (GST_SECOND * duration));
|
||||||
|
|
||||||
g_mutex_unlock (src->dvd_lock);
|
g_mutex_unlock (src->dvd_lock);
|
||||||
gst_pad_push_event (GST_BASE_SRC_PAD (src), still_event);
|
gst_pad_push_event (RSN_BASE_SRC_PAD (src), still_event);
|
||||||
g_mutex_lock (src->dvd_lock);
|
g_mutex_lock (src->dvd_lock);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1093,7 +1095,7 @@ rsn_dvdsrc_step (resinDvdSrc * src, gboolean have_dvd_lock)
|
||||||
g_mutex_unlock (src->dvd_lock);
|
g_mutex_unlock (src->dvd_lock);
|
||||||
GST_DEBUG_OBJECT (src, "Sending highlight event - button %d",
|
GST_DEBUG_OBJECT (src, "Sending highlight event - button %d",
|
||||||
src->active_button);
|
src->active_button);
|
||||||
gst_pad_push_event (GST_BASE_SRC_PAD (src), hl_event);
|
gst_pad_push_event (RSN_BASE_SRC_PAD (src), hl_event);
|
||||||
g_mutex_lock (src->dvd_lock);
|
g_mutex_lock (src->dvd_lock);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1226,11 +1228,20 @@ rsn_dvdsrc_prepare_next_block (resinDvdSrc * src, gboolean have_dvd_lock)
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
static GstFlowReturn
|
static gboolean
|
||||||
rsn_dvdsrc_create (RsnPushSrc * psrc, GstBuffer ** outbuf)
|
rsn_dvdsrc_check_get_range (RsnBaseSrc * src)
|
||||||
{
|
{
|
||||||
resinDvdSrc *src = RESINDVDSRC (psrc);
|
/* ResinDVD never operates in pull mode. There might be
|
||||||
GstSegment *segment = &(GST_BASE_SRC (src)->segment);
|
* a reason to in the future though? */
|
||||||
|
return FALSE;
|
||||||
|
}
|
||||||
|
|
||||||
|
static GstFlowReturn
|
||||||
|
rsn_dvdsrc_create (RsnBaseSrc * bsrc, guint64 offset,
|
||||||
|
guint length, GstBuffer ** outbuf)
|
||||||
|
{
|
||||||
|
resinDvdSrc *src = RESINDVDSRC (bsrc);
|
||||||
|
GstSegment *segment = &(RSN_BASE_SRC (src)->segment);
|
||||||
GstFlowReturn ret;
|
GstFlowReturn ret;
|
||||||
GstEvent *streams_event = NULL;
|
GstEvent *streams_event = NULL;
|
||||||
GstEvent *clut_event = NULL;
|
GstEvent *clut_event = NULL;
|
||||||
|
@ -1281,26 +1292,30 @@ rsn_dvdsrc_create (RsnPushSrc * psrc, GstBuffer ** outbuf)
|
||||||
* we change segment */
|
* we change segment */
|
||||||
if (streams_event) {
|
if (streams_event) {
|
||||||
GST_LOG_OBJECT (src, "Pushing stream layout event");
|
GST_LOG_OBJECT (src, "Pushing stream layout event");
|
||||||
gst_pad_push_event (GST_BASE_SRC_PAD (src), streams_event);
|
gst_pad_push_event (RSN_BASE_SRC_PAD (src), streams_event);
|
||||||
}
|
}
|
||||||
if (clut_event) {
|
if (clut_event) {
|
||||||
GST_LOG_OBJECT (src, "Pushing clut event");
|
GST_LOG_OBJECT (src, "Pushing clut event");
|
||||||
gst_pad_push_event (GST_BASE_SRC_PAD (src), clut_event);
|
gst_pad_push_event (RSN_BASE_SRC_PAD (src), clut_event);
|
||||||
}
|
}
|
||||||
/* Out of band events */
|
/* Out of band events */
|
||||||
if (spu_select_event) {
|
if (spu_select_event) {
|
||||||
GST_LOG_OBJECT (src, "Pushing spu_select event");
|
GST_LOG_OBJECT (src, "Pushing spu_select event");
|
||||||
gst_pad_push_event (GST_BASE_SRC_PAD (src), spu_select_event);
|
gst_pad_push_event (RSN_BASE_SRC_PAD (src), spu_select_event);
|
||||||
}
|
}
|
||||||
if (audio_select_event) {
|
if (audio_select_event) {
|
||||||
GST_LOG_OBJECT (src, "Pushing audio_select event");
|
GST_LOG_OBJECT (src, "Pushing audio_select event");
|
||||||
gst_pad_push_event (GST_BASE_SRC_PAD (src), audio_select_event);
|
gst_pad_push_event (RSN_BASE_SRC_PAD (src), audio_select_event);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (src->need_segment) {
|
if (src->need_segment) {
|
||||||
/* Seamless segment update */
|
/* Seamless segment update */
|
||||||
GstEvent *seek;
|
GstEvent *seek;
|
||||||
|
|
||||||
|
g_print ("Starting seamless segment update to %" GST_TIME_FORMAT " -> %"
|
||||||
|
GST_TIME_FORMAT " VOBU %" GST_TIME_FORMAT "\n",
|
||||||
|
GST_TIME_ARGS (src->cur_start_ts), GST_TIME_ARGS (src->cur_end_ts),
|
||||||
|
GST_TIME_ARGS (src->cur_vobu_base_ts));
|
||||||
seek = gst_event_new_seek (segment->rate, rsndvd_format,
|
seek = gst_event_new_seek (segment->rate, rsndvd_format,
|
||||||
GST_SEEK_FLAG_NONE, GST_SEEK_TYPE_NONE, -1, GST_SEEK_TYPE_NONE, -1);
|
GST_SEEK_FLAG_NONE, GST_SEEK_TYPE_NONE, -1, GST_SEEK_TYPE_NONE, -1);
|
||||||
gst_element_send_event (GST_ELEMENT (src), seek);
|
gst_element_send_event (GST_ELEMENT (src), seek);
|
||||||
|
@ -1341,7 +1356,7 @@ rsn_dvdsrc_create (RsnPushSrc * psrc, GstBuffer ** outbuf)
|
||||||
if (highlight_event) {
|
if (highlight_event) {
|
||||||
GST_LOG_OBJECT (src, "Pushing highlight event with TS %" GST_TIME_FORMAT,
|
GST_LOG_OBJECT (src, "Pushing highlight event with TS %" GST_TIME_FORMAT,
|
||||||
GST_TIME_ARGS (GST_EVENT_TIMESTAMP (highlight_event)));
|
GST_TIME_ARGS (GST_EVENT_TIMESTAMP (highlight_event)));
|
||||||
gst_pad_push_event (GST_BASE_SRC_PAD (src), highlight_event);
|
gst_pad_push_event (RSN_BASE_SRC_PAD (src), highlight_event);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (angles_msg) {
|
if (angles_msg) {
|
||||||
|
@ -1690,7 +1705,7 @@ rsn_dvdsrc_handle_navigation_event (resinDvdSrc * src, GstEvent * event)
|
||||||
if (hl_event) {
|
if (hl_event) {
|
||||||
GST_DEBUG_OBJECT (src, "Sending highlight change event - button: %d",
|
GST_DEBUG_OBJECT (src, "Sending highlight change event - button: %d",
|
||||||
src->active_button);
|
src->active_button);
|
||||||
gst_pad_push_event (GST_BASE_SRC_PAD (src), hl_event);
|
gst_pad_push_event (RSN_BASE_SRC_PAD (src), hl_event);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Send ourselves a seek event to wake everything up and flush */
|
/* Send ourselves a seek event to wake everything up and flush */
|
||||||
|
@ -1728,7 +1743,7 @@ rsn_dvdsrc_handle_navigation_event (resinDvdSrc * src, GstEvent * event)
|
||||||
if (hl_event) {
|
if (hl_event) {
|
||||||
GST_DEBUG_OBJECT (src, "Sending highlight change event - button: %d",
|
GST_DEBUG_OBJECT (src, "Sending highlight change event - button: %d",
|
||||||
src->active_button);
|
src->active_button);
|
||||||
gst_pad_push_event (GST_BASE_SRC_PAD (src), hl_event);
|
gst_pad_push_event (RSN_BASE_SRC_PAD (src), hl_event);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (cmds_changed)
|
if (cmds_changed)
|
||||||
|
@ -2132,7 +2147,7 @@ rsn_dvdsrc_enqueue_nav_block (resinDvdSrc * src, GstBuffer * nav_buf,
|
||||||
GstClockTime ts)
|
GstClockTime ts)
|
||||||
{
|
{
|
||||||
RsnDvdPendingNav *pend_nav = g_new0 (RsnDvdPendingNav, 1);
|
RsnDvdPendingNav *pend_nav = g_new0 (RsnDvdPendingNav, 1);
|
||||||
GstSegment *seg = &(GST_BASE_SRC (src)->segment);
|
GstSegment *seg = &(RSN_BASE_SRC (src)->segment);
|
||||||
|
|
||||||
pend_nav->buffer = gst_buffer_ref (nav_buf);
|
pend_nav->buffer = gst_buffer_ref (nav_buf);
|
||||||
pend_nav->ts = ts;
|
pend_nav->ts = ts;
|
||||||
|
@ -2325,13 +2340,13 @@ rsn_dvdsrc_src_event (RsnBaseSrc * basesrc, GstEvent * event)
|
||||||
GST_DEBUG_OBJECT (src, "%s seek event",
|
GST_DEBUG_OBJECT (src, "%s seek event",
|
||||||
src->flushing_seek ? "flushing" : "non-flushing");
|
src->flushing_seek ? "flushing" : "non-flushing");
|
||||||
|
|
||||||
res = GST_BASE_SRC_CLASS (parent_class)->event (basesrc, event);
|
res = RSN_BASE_SRC_CLASS (parent_class)->event (basesrc, event);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
default:
|
default:
|
||||||
GST_LOG_OBJECT (src, "handling %s event", GST_EVENT_TYPE_NAME (event));
|
GST_LOG_OBJECT (src, "handling %s event", GST_EVENT_TYPE_NAME (event));
|
||||||
|
|
||||||
res = GST_BASE_SRC_CLASS (parent_class)->event (basesrc, event);
|
res = RSN_BASE_SRC_CLASS (parent_class)->event (basesrc, event);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2463,11 +2478,11 @@ rsn_dvdsrc_src_query (RsnBaseSrc * basesrc, GstQuery * query)
|
||||||
if (nq_type != GST_NAVIGATION_QUERY_INVALID)
|
if (nq_type != GST_NAVIGATION_QUERY_INVALID)
|
||||||
res = rsn_dvdsrc_handle_navigation_query (src, nq_type, query);
|
res = rsn_dvdsrc_handle_navigation_query (src, nq_type, query);
|
||||||
else
|
else
|
||||||
res = GST_BASE_SRC_CLASS (parent_class)->query (basesrc, query);
|
res = RSN_BASE_SRC_CLASS (parent_class)->query (basesrc, query);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
default:
|
default:
|
||||||
res = GST_BASE_SRC_CLASS (parent_class)->query (basesrc, query);
|
res = RSN_BASE_SRC_CLASS (parent_class)->query (basesrc, query);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2511,7 +2526,7 @@ rsn_dvdsrc_prepare_seek (RsnBaseSrc * bsrc, GstEvent * event,
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Let basesrc handle other formats for now. FIXME: Implement angle */
|
/* Let basesrc handle other formats for now. FIXME: Implement angle */
|
||||||
ret = GST_BASE_SRC_CLASS (parent_class)->prepare_seek_segment (bsrc,
|
ret = RSN_BASE_SRC_CLASS (parent_class)->prepare_seek_segment (bsrc,
|
||||||
event, segment);
|
event, segment);
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
|
|
|
@ -21,7 +21,7 @@
|
||||||
|
|
||||||
#include <gst/gst.h>
|
#include <gst/gst.h>
|
||||||
|
|
||||||
#include "rsnpushsrc.h"
|
#include "rsnbasesrc.h"
|
||||||
|
|
||||||
#include "_stdint.h"
|
#include "_stdint.h"
|
||||||
|
|
||||||
|
@ -46,7 +46,7 @@ typedef struct _resinDvdSrcClass resinDvdSrcClass;
|
||||||
|
|
||||||
struct _resinDvdSrc
|
struct _resinDvdSrc
|
||||||
{
|
{
|
||||||
RsnPushSrc parent;
|
RsnBaseSrc parent;
|
||||||
|
|
||||||
gboolean faststart;
|
gboolean faststart;
|
||||||
|
|
||||||
|
@ -147,7 +147,7 @@ struct _resinDvdSrc
|
||||||
|
|
||||||
struct _resinDvdSrcClass
|
struct _resinDvdSrcClass
|
||||||
{
|
{
|
||||||
RsnPushSrcClass parent_class;
|
RsnBaseSrcClass parent_class;
|
||||||
};
|
};
|
||||||
|
|
||||||
GType rsn_dvdsrc_get_type (void);
|
GType rsn_dvdsrc_get_type (void);
|
||||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -28,33 +28,32 @@
|
||||||
* send seeks to themselves.
|
* send seeks to themselves.
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
#ifndef __RSN_BASE_SRC_H__
|
||||||
#ifndef __GST_BASE_SRC_H__
|
#define __RSN_BASE_SRC_H__
|
||||||
#define __GST_BASE_SRC_H__
|
|
||||||
|
|
||||||
#include <gst/gst.h>
|
#include <gst/gst.h>
|
||||||
|
|
||||||
G_BEGIN_DECLS
|
G_BEGIN_DECLS
|
||||||
|
|
||||||
#define RSN_TYPE_BASE_SRC (rsn_base_src_get_type())
|
#define RSN_TYPE_BASE_SRC (gst_base_src_get_type())
|
||||||
#define GST_BASE_SRC(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),RSN_TYPE_BASE_SRC,RsnBaseSrc))
|
#define RSN_BASE_SRC(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),RSN_TYPE_BASE_SRC,RsnBaseSrc))
|
||||||
#define GST_BASE_SRC_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass),RSN_TYPE_BASE_SRC,RsnBaseSrcClass))
|
#define RSN_BASE_SRC_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass),RSN_TYPE_BASE_SRC,RsnBaseSrcClass))
|
||||||
#define GST_BASE_SRC_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), RSN_TYPE_BASE_SRC, RsnBaseSrcClass))
|
#define RSN_BASE_SRC_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), RSN_TYPE_BASE_SRC, RsnBaseSrcClass))
|
||||||
#define GST_IS_BASE_SRC(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj),RSN_TYPE_BASE_SRC))
|
#define GST_IS_BASE_SRC(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj),RSN_TYPE_BASE_SRC))
|
||||||
#define GST_IS_BASE_SRC_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),RSN_TYPE_BASE_SRC))
|
#define GST_IS_BASE_SRC_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),RSN_TYPE_BASE_SRC))
|
||||||
#define GST_BASE_SRC_CAST(obj) ((RsnBaseSrc *)(obj))
|
#define RSN_BASE_SRC_CAST(obj) ((RsnBaseSrc *)(obj))
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* RsnBaseSrcFlags:
|
* RsnBaseSrcFlags:
|
||||||
* @GST_BASE_SRC_STARTED: has source been started
|
* @RSN_BASE_SRC_STARTED: has source been started
|
||||||
* @GST_BASE_SRC_FLAG_LAST: offset to define more flags
|
* @RSN_BASE_SRC_FLAG_LAST: offset to define more flags
|
||||||
*
|
*
|
||||||
* The #GstElement flags that a basesrc element may have.
|
* The #GstElement flags that a basesrc element may have.
|
||||||
*/
|
*/
|
||||||
typedef enum {
|
typedef enum {
|
||||||
GST_BASE_SRC_STARTED = (GST_ELEMENT_FLAG_LAST << 0),
|
RSN_BASE_SRC_STARTED = (GST_ELEMENT_FLAG_LAST << 0),
|
||||||
/* padding */
|
/* padding */
|
||||||
GST_BASE_SRC_FLAG_LAST = (GST_ELEMENT_FLAG_LAST << 2)
|
RSN_BASE_SRC_FLAG_LAST = (GST_ELEMENT_FLAG_LAST << 2)
|
||||||
} RsnBaseSrcFlags;
|
} RsnBaseSrcFlags;
|
||||||
|
|
||||||
typedef struct _RsnBaseSrc RsnBaseSrc;
|
typedef struct _RsnBaseSrc RsnBaseSrc;
|
||||||
|
@ -62,12 +61,12 @@ typedef struct _RsnBaseSrcClass RsnBaseSrcClass;
|
||||||
typedef struct _RsnBaseSrcPrivate RsnBaseSrcPrivate;
|
typedef struct _RsnBaseSrcPrivate RsnBaseSrcPrivate;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* GST_BASE_SRC_PAD:
|
* RSN_BASE_SRC_PAD:
|
||||||
* @obj: base source instance
|
* @obj: base source instance
|
||||||
*
|
*
|
||||||
* Gives the pointer to the #GstPad object of the element.
|
* Gives the pointer to the #GstPad object of the element.
|
||||||
*/
|
*/
|
||||||
#define GST_BASE_SRC_PAD(obj) (GST_BASE_SRC_CAST (obj)->srcpad)
|
#define RSN_BASE_SRC_PAD(obj) (RSN_BASE_SRC_CAST (obj)->srcpad)
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -80,31 +79,31 @@ struct _RsnBaseSrc {
|
||||||
GstElement element;
|
GstElement element;
|
||||||
|
|
||||||
/*< protected >*/
|
/*< protected >*/
|
||||||
GstPad *srcpad;
|
GstPad *srcpad;
|
||||||
|
|
||||||
/* available to subclass implementations */
|
/* available to subclass implementations */
|
||||||
/* MT-protected (with LIVE_LOCK) */
|
/* MT-protected (with LIVE_LOCK) */
|
||||||
GMutex *live_lock;
|
GMutex *live_lock;
|
||||||
GCond *live_cond;
|
GCond *live_cond;
|
||||||
gboolean is_live;
|
gboolean is_live;
|
||||||
gboolean live_running;
|
gboolean live_running;
|
||||||
|
|
||||||
/* MT-protected (with LOCK) */
|
/* MT-protected (with LOCK) */
|
||||||
gint blocksize; /* size of buffers when operating push based */
|
gint blocksize; /* size of buffers when operating push based */
|
||||||
gboolean can_activate_push; /* some scheduling properties */
|
gboolean can_activate_push; /* some scheduling properties */
|
||||||
GstActivateMode pad_mode;
|
GstActivateMode pad_mode;
|
||||||
gboolean seekable;
|
gboolean seekable; /* not used anymore */
|
||||||
gboolean random_access;
|
gboolean random_access;
|
||||||
|
|
||||||
GstClockID clock_id; /* for syncing */
|
GstClockID clock_id; /* for syncing */
|
||||||
GstClockTime end_time;
|
GstClockTime end_time;
|
||||||
|
|
||||||
/* MT-protected (with STREAM_LOCK) */
|
/* MT-protected (with STREAM_LOCK) */
|
||||||
GstSegment segment;
|
GstSegment segment;
|
||||||
gboolean need_newsegment;
|
gboolean need_newsegment;
|
||||||
|
|
||||||
guint64 offset; /* current offset in the resource, unused */
|
guint64 offset; /* current offset in the resource, unused */
|
||||||
guint64 size; /* total size of the resource, unused */
|
guint64 size; /* total size of the resource, unused */
|
||||||
|
|
||||||
gint num_buffers;
|
gint num_buffers;
|
||||||
gint num_buffers_left;
|
gint num_buffers_left;
|
||||||
|
@ -133,32 +132,32 @@ struct _RsnBaseSrc {
|
||||||
* @start: Start processing. Subclasses should open resources and prepare
|
* @start: Start processing. Subclasses should open resources and prepare
|
||||||
* to produce data.
|
* to produce data.
|
||||||
* @stop: Stop processing. Subclasses should use this to close resources.
|
* @stop: Stop processing. Subclasses should use this to close resources.
|
||||||
* @get_times: Given a buffer, return the start and stop time when it
|
* @get_times: Given a buffer, return the start and stop time when it
|
||||||
* should be pushed out. The base class will sync on the clock using
|
* should be pushed out. The base class will sync on the clock using
|
||||||
* these times.
|
* these times.
|
||||||
* @get_size: Return the total size of the resource, in the configured format.
|
* @get_size: Return the total size of the resource, in the configured format.
|
||||||
* @is_seekable: Check if the source can seek
|
* @is_seekable: Check if the source can seek
|
||||||
* @unlock: Unlock any pending access to the resource. Subclasses should
|
* @unlock: Unlock any pending access to the resource. Subclasses should
|
||||||
* unblock any blocked function ASAP
|
* unblock any blocked function ASAP
|
||||||
* @unlock_stop: Clear the previous unlock request. Subclasses should clear
|
* @unlock_stop: Clear the previous unlock request. Subclasses should clear
|
||||||
* any state they set during unlock(), such as clearing command queues.
|
* any state they set during unlock(), such as clearing command queues.
|
||||||
* @event: Override this to implement custom event handling.
|
* @event: Override this to implement custom event handling.
|
||||||
* @create: Ask the subclass to create a buffer with offset and size.
|
* @create: Ask the subclass to create a buffer with offset and size.
|
||||||
* @do_seek: Perform seeking on the resource to the indicated segment.
|
* @do_seek: Perform seeking on the resource to the indicated segment.
|
||||||
* @prepare_seek_segment: Prepare the GstSegment that will be passed to the
|
* @prepare_seek_segment: Prepare the GstSegment that will be passed to the
|
||||||
* do_seek vmethod for executing a seek request. Sub-classes should override
|
* do_seek vmethod for executing a seek request. Sub-classes should override
|
||||||
* this if they support seeking in formats other than the configured native
|
* this if they support seeking in formats other than the configured native
|
||||||
* format. By default, it tries to convert the seek arguments to the
|
* format. By default, it tries to convert the seek arguments to the
|
||||||
* configured native format and prepare a segment in that format.
|
* configured native format and prepare a segment in that format.
|
||||||
* Since: 0.10.13
|
* Since: 0.10.13
|
||||||
* @query: Handle a requested query.
|
* @query: Handle a requested query.
|
||||||
* @check_get_range: Check whether the source would support pull-based
|
* @check_get_range: Check whether the source would support pull-based
|
||||||
* operation if it were to be opened now. This vfunc is optional, but
|
* operation if it were to be opened now. This vfunc is optional, but
|
||||||
* should be implemented if possible to avoid unnecessary start/stop
|
* should be implemented if possible to avoid unnecessary start/stop
|
||||||
* cycles. The default implementation will open and close the resource
|
* cycles. The default implementation will open and close the resource
|
||||||
* to find out whether get_range is supported, and that is usually
|
* to find out whether get_range is supported, and that is usually
|
||||||
* undesirable.
|
* undesirable.
|
||||||
* @fixate: Called during negotation if caps need fixating. Implement instead of
|
* @fixate: Called during negotiation if caps need fixating. Implement instead of
|
||||||
* setting a fixate function on the source pad.
|
* setting a fixate function on the source pad.
|
||||||
*
|
*
|
||||||
* Subclasses can override any of the available virtual methods or not, as
|
* Subclasses can override any of the available virtual methods or not, as
|
||||||
|
@ -205,7 +204,7 @@ struct _RsnBaseSrcClass {
|
||||||
|
|
||||||
/* ask the subclass to create a buffer with offset and size */
|
/* ask the subclass to create a buffer with offset and size */
|
||||||
GstFlowReturn (*create) (RsnBaseSrc *src, guint64 offset, guint size,
|
GstFlowReturn (*create) (RsnBaseSrc *src, guint64 offset, guint size,
|
||||||
GstBuffer **buf);
|
GstBuffer **buf);
|
||||||
|
|
||||||
/* additions that change padding... */
|
/* additions that change padding... */
|
||||||
/* notify subclasses of a seek */
|
/* notify subclasses of a seek */
|
||||||
|
@ -221,37 +220,40 @@ struct _RsnBaseSrcClass {
|
||||||
* undesirable. */
|
* undesirable. */
|
||||||
gboolean (*check_get_range) (RsnBaseSrc *src);
|
gboolean (*check_get_range) (RsnBaseSrc *src);
|
||||||
|
|
||||||
/* called if, in negotation, caps need fixating */
|
/* called if, in negotiation, caps need fixating */
|
||||||
void (*fixate) (RsnBaseSrc *src, GstCaps *caps);
|
void (*fixate) (RsnBaseSrc *src, GstCaps *caps);
|
||||||
|
|
||||||
/* Clear any pending unlock request, as we succeeded in unlocking */
|
/* Clear any pending unlock request, as we succeeded in unlocking */
|
||||||
gboolean (*unlock_stop) (RsnBaseSrc *src);
|
gboolean (*unlock_stop) (RsnBaseSrc *src);
|
||||||
|
|
||||||
/* Prepare the segment on which to perform do_seek(), converting to the
|
/* Prepare the segment on which to perform do_seek(), converting to the
|
||||||
* current basesrc format. */
|
* current basesrc format. */
|
||||||
gboolean (*prepare_seek_segment) (RsnBaseSrc *src, GstEvent *seek,
|
gboolean (*prepare_seek_segment) (RsnBaseSrc *src, GstEvent *seek,
|
||||||
GstSegment *segment);
|
GstSegment *segment);
|
||||||
|
|
||||||
/*< private >*/
|
/*< private >*/
|
||||||
gpointer _gst_reserved[GST_PADDING_LARGE - 6];
|
gpointer _gst_reserved[GST_PADDING_LARGE - 6];
|
||||||
};
|
};
|
||||||
|
|
||||||
GType rsn_base_src_get_type (void);
|
GType gst_base_src_get_type (void);
|
||||||
|
|
||||||
GstFlowReturn rsn_base_src_wait_playing (RsnBaseSrc *src);
|
GstFlowReturn gst_base_src_wait_playing (RsnBaseSrc *src);
|
||||||
|
|
||||||
void rsn_base_src_set_live (RsnBaseSrc *src, gboolean live);
|
void gst_base_src_set_live (RsnBaseSrc *src, gboolean live);
|
||||||
gboolean rsn_base_src_is_live (RsnBaseSrc *src);
|
gboolean gst_base_src_is_live (RsnBaseSrc *src);
|
||||||
|
|
||||||
void rsn_base_src_set_format (RsnBaseSrc *src, GstFormat format);
|
void gst_base_src_set_format (RsnBaseSrc *src, GstFormat format);
|
||||||
|
|
||||||
gboolean rsn_base_src_query_latency (RsnBaseSrc *src, gboolean * live,
|
gboolean gst_base_src_query_latency (RsnBaseSrc *src, gboolean * live,
|
||||||
GstClockTime * min_latency,
|
GstClockTime * min_latency,
|
||||||
GstClockTime * max_latency);
|
GstClockTime * max_latency);
|
||||||
|
|
||||||
void rsn_base_src_set_do_timestamp (RsnBaseSrc *src, gboolean live);
|
void gst_base_src_set_blocksize (RsnBaseSrc *src, gulong blocksize);
|
||||||
gboolean rsn_base_src_get_do_timestamp (RsnBaseSrc *src);
|
gulong gst_base_src_get_blocksize (RsnBaseSrc *src);
|
||||||
|
|
||||||
|
void gst_base_src_set_do_timestamp (RsnBaseSrc *src, gboolean timestamp);
|
||||||
|
gboolean gst_base_src_get_do_timestamp (RsnBaseSrc *src);
|
||||||
|
|
||||||
G_END_DECLS
|
G_END_DECLS
|
||||||
|
|
||||||
#endif /* __GST_BASE_SRC_H__ */
|
#endif /* __RSN_BASE_SRC_H__ */
|
||||||
|
|
|
@ -1,101 +0,0 @@
|
||||||
/* GStreamer
|
|
||||||
* Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu>
|
|
||||||
* 2000,2005 Wim Taymans <wim@fluendo.com>
|
|
||||||
*
|
|
||||||
* gstpushsrc.c:
|
|
||||||
*
|
|
||||||
* This library is free software; you can redistribute it and/or
|
|
||||||
* modify it under the terms of the GNU Library General Public
|
|
||||||
* License as published by the Free Software Foundation; either
|
|
||||||
* version 2 of the License, or (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This library is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* Library General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Library General Public
|
|
||||||
* License along with this library; if not, write to the
|
|
||||||
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
||||||
* Boston, MA 02111-1307, USA.
|
|
||||||
*/
|
|
||||||
|
|
||||||
/*
|
|
||||||
*
|
|
||||||
* This is a temporary copy of GstBaseSrc/GstPushSrc for the resin
|
|
||||||
* DVD components, to work around a deadlock with source elements that
|
|
||||||
* send seeks to themselves.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifdef HAVE_CONFIG_H
|
|
||||||
# include "config.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include <stdlib.h>
|
|
||||||
#include <string.h>
|
|
||||||
|
|
||||||
#include "rsnpushsrc.h"
|
|
||||||
#include <gst/gstmarshal.h>
|
|
||||||
|
|
||||||
GST_DEBUG_CATEGORY_STATIC (rsn_push_src_debug);
|
|
||||||
#define GST_CAT_DEFAULT rsn_push_src_debug
|
|
||||||
|
|
||||||
#define _do_init(type) \
|
|
||||||
GST_DEBUG_CATEGORY_INIT (rsn_push_src_debug, "pushsrc", 0, \
|
|
||||||
"pushsrc element");
|
|
||||||
|
|
||||||
GST_BOILERPLATE_FULL (RsnPushSrc, rsn_push_src, RsnBaseSrc, RSN_TYPE_BASE_SRC,
|
|
||||||
_do_init);
|
|
||||||
|
|
||||||
static gboolean rsn_push_src_check_get_range (RsnBaseSrc * src);
|
|
||||||
static GstFlowReturn rsn_push_src_create (RsnBaseSrc * bsrc, guint64 offset,
|
|
||||||
guint length, GstBuffer ** ret);
|
|
||||||
|
|
||||||
static void
|
|
||||||
rsn_push_src_base_init (gpointer g_class)
|
|
||||||
{
|
|
||||||
/* nop */
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
rsn_push_src_class_init (RsnPushSrcClass * klass)
|
|
||||||
{
|
|
||||||
RsnBaseSrcClass *gstbasesrc_class = (RsnBaseSrcClass *) klass;
|
|
||||||
|
|
||||||
gstbasesrc_class->create = GST_DEBUG_FUNCPTR (rsn_push_src_create);
|
|
||||||
gstbasesrc_class->check_get_range =
|
|
||||||
GST_DEBUG_FUNCPTR (rsn_push_src_check_get_range);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
rsn_push_src_init (RsnPushSrc * pushsrc, RsnPushSrcClass * klass)
|
|
||||||
{
|
|
||||||
/* nop */
|
|
||||||
}
|
|
||||||
|
|
||||||
static gboolean
|
|
||||||
rsn_push_src_check_get_range (RsnBaseSrc * src)
|
|
||||||
{
|
|
||||||
/* a pushsrc can by default never operate in pull mode override
|
|
||||||
* if you want something different. */
|
|
||||||
return FALSE;
|
|
||||||
}
|
|
||||||
|
|
||||||
static GstFlowReturn
|
|
||||||
rsn_push_src_create (RsnBaseSrc * bsrc, guint64 offset, guint length,
|
|
||||||
GstBuffer ** ret)
|
|
||||||
{
|
|
||||||
GstFlowReturn fret;
|
|
||||||
RsnPushSrc *src;
|
|
||||||
RsnPushSrcClass *pclass;
|
|
||||||
|
|
||||||
src = GST_PUSH_SRC (bsrc);
|
|
||||||
pclass = GST_PUSH_SRC_GET_CLASS (src);
|
|
||||||
if (pclass->create)
|
|
||||||
fret = pclass->create (src, ret);
|
|
||||||
else
|
|
||||||
fret = GST_FLOW_ERROR;
|
|
||||||
|
|
||||||
return fret;
|
|
||||||
}
|
|
|
@ -1,76 +0,0 @@
|
||||||
/* GStreamer
|
|
||||||
* Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu>
|
|
||||||
* 2000 Wim Taymans <wtay@chello.be>
|
|
||||||
* 2005 Wim Taymans <wim@fluendo.com>
|
|
||||||
*
|
|
||||||
* gstpushsrc.h:
|
|
||||||
*
|
|
||||||
* This library is free software; you can redistribute it and/or
|
|
||||||
* modify it under the terms of the GNU Library General Public
|
|
||||||
* License as published by the Free Software Foundation; either
|
|
||||||
* version 2 of the License, or (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This library is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* Library General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Library General Public
|
|
||||||
* License along with this library; if not, write to the
|
|
||||||
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
||||||
* Boston, MA 02111-1307, USA.
|
|
||||||
*/
|
|
||||||
|
|
||||||
/*
|
|
||||||
*
|
|
||||||
* This is a temporary copy of GstBaseSrc/GstPushSrc for the resin
|
|
||||||
* DVD components, to work around a deadlock with source elements that
|
|
||||||
* send seeks to themselves.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
#ifndef __GST_PUSH_SRC_H__
|
|
||||||
#define __GST_PUSH_SRC_H__
|
|
||||||
|
|
||||||
#include <gst/gst.h>
|
|
||||||
#include "rsnbasesrc.h"
|
|
||||||
|
|
||||||
G_BEGIN_DECLS
|
|
||||||
|
|
||||||
#define RSN_TYPE_PUSH_SRC (rsn_push_src_get_type())
|
|
||||||
#define GST_PUSH_SRC(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),RSN_TYPE_PUSH_SRC,RsnPushSrc))
|
|
||||||
#define GST_PUSH_SRC_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass),RSN_TYPE_PUSH_SRC,RsnPushSrcClass))
|
|
||||||
#define GST_PUSH_SRC_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), RSN_TYPE_PUSH_SRC, RsnPushSrcClass))
|
|
||||||
#define GST_IS_PUSH_SRC(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj),RSN_TYPE_PUSH_SRC))
|
|
||||||
#define GST_IS_PUSH_SRC_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),RSN_TYPE_PUSH_SRC))
|
|
||||||
|
|
||||||
typedef struct _RsnPushSrc RsnPushSrc;
|
|
||||||
typedef struct _RsnPushSrcClass RsnPushSrcClass;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* RsnPushSrc:
|
|
||||||
* @parent: the parent base source object.
|
|
||||||
*
|
|
||||||
* The opaque #RsnPushSrc data structure.
|
|
||||||
*/
|
|
||||||
struct _RsnPushSrc {
|
|
||||||
RsnBaseSrc parent;
|
|
||||||
|
|
||||||
/*< private >*/
|
|
||||||
gpointer _gst_reserved[GST_PADDING];
|
|
||||||
};
|
|
||||||
|
|
||||||
struct _RsnPushSrcClass {
|
|
||||||
RsnBaseSrcClass parent_class;
|
|
||||||
|
|
||||||
/* ask the subclass to create a buffer */
|
|
||||||
GstFlowReturn (*create) (RsnPushSrc *src, GstBuffer **buf);
|
|
||||||
|
|
||||||
/*< private >*/
|
|
||||||
gpointer _gst_reserved[GST_PADDING];
|
|
||||||
};
|
|
||||||
|
|
||||||
GType rsn_push_src_get_type(void);
|
|
||||||
|
|
||||||
G_END_DECLS
|
|
||||||
|
|
||||||
#endif /* __GST_PUSH_SRC_H__ */
|
|
Loading…
Reference in a new issue