index 48a539dc2daa89dc8d4e1234d75c34dae9e4b70c..a53019f9fd41dcdede6b7e670281c04c88423d94 100644 (file)
--- a/ext/dvdread/dvdreadsrc.c
+++ b/ext/dvdread/dvdreadsrc.c
ARG_ANGLE
};
-static GstElementDetails gst_dvd_read_src_details = {
- "DVD Source",
- "Source/File/DVD",
- "Access a DVD title/chapter/angle using libdvdread",
- "Erik Walthinsen <omega@cse.ogi.edu>",
-};
-
static GstStaticPadTemplate srctemplate = GST_STATIC_PAD_TEMPLATE ("src",
GST_PAD_SRC,
GST_PAD_ALWAYS,
gst_element_class_add_pad_template (element_class,
gst_static_pad_template_get (&srctemplate));
- gst_element_class_set_details (element_class, &gst_dvd_read_src_details);
+ gst_element_class_set_details_simple (element_class, "DVD Source",
+ "Source/File/DVD",
+ "Access a DVD title/chapter/angle using libdvdread",
+ "Erik Walthinsen <omega@cse.ogi.edu>");
}
static void
g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_DEVICE,
g_param_spec_string ("device", "Device",
- "DVD device location", NULL, G_PARAM_READWRITE));
+ "DVD device location", NULL,
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_TITLE,
g_param_spec_int ("title", "title", "title",
- 1, 999, 1, G_PARAM_READWRITE));
+ 1, 999, 1, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_CHAPTER,
g_param_spec_int ("chapter", "chapter", "chapter",
- 1, 999, 1, G_PARAM_READWRITE));
+ 1, 999, 1, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_ANGLE,
g_param_spec_int ("angle", "angle", "angle",
- 1, 999, 1, G_PARAM_READWRITE));
+ 1, 999, 1, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
gstbasesrc_class->start = GST_DEBUG_FUNCPTR (gst_dvd_read_src_start);
gstbasesrc_class->stop = GST_DEBUG_FUNCPTR (gst_dvd_read_src_stop);
{
GstStructure *s;
gchar lang_code[3] = { '\0', '\0', '\0' }, *t;
+ pgc_t *pgc0;
gint title_set_nr;
gint num_titles;
+ gint pgn0, pgc0_id;
gint i;
/* make sure our title number is valid */
s = gst_structure_new ("application/x-gst-dvd",
"event", G_TYPE_STRING, "dvd-lang-codes", NULL);
+ /* so we can filter out invalid/unused streams (same for all chapters) */
+ cur_title_get_chapter_pgc (src, 0, &pgn0, &pgc0_id, &pgc0);
+
/* audio */
for (i = 0; i < src->vts_file->vtsi_mat->nr_of_vts_audio_streams; i++) {
- const audio_attr_t *a = &src->vts_file->vtsi_mat->vts_audio_attr[i];
+ const audio_attr_t *a;
+
+ /* audio stream present? */
+ if (pgc0 != NULL && (pgc0->audio_control[i] & 0x8000) == 0)
+ continue;
+
+ a = &src->vts_file->vtsi_mat->vts_audio_attr[i];
t = g_strdup_printf ("audio-%d-format", i);
gst_structure_set (s, t, G_TYPE_INT, (int) a->audio_format, NULL);
/* subtitle */
for (i = 0; i < src->vts_file->vtsi_mat->nr_of_vts_subp_streams; i++) {
- const subp_attr_t *u = &src->vts_file->vtsi_mat->vts_subp_attr[i];
+ const subp_attr_t *u;
+
+ /* subpicture stream present? */
+ if (pgc0 != NULL && (pgc0->subp_control[i] & 0x80000000) == 0)
+ continue;
+
+ u = &src->vts_file->vtsi_mat->vts_subp_attr[i];
if (u->type) {
t = g_strdup_printf ("subtitle-%d-language", i);
GST_ELEMENT_ERROR (src, RESOURCE, OPEN_READ,
(_("Could not open DVD title %d. Interactive titles are not supported "
"by this element"), title_set_nr),
- ("Commands-only PGC, not supported, use dvdnavsrc"));
+ ("Commands-only PGC, not supported, use rsndvdbin"));
return FALSE;
}
}
if (pgc->cell_playback[cell].block_type != BLOCK_TYPE_ANGLE_BLOCK)
return (cell + 1);
- while (pgc->cell_playback[cell].block_mode == BLOCK_MODE_LAST_CELL)
+ while (pgc->cell_playback[cell].block_mode != BLOCK_MODE_LAST_CELL)
++cell;
- return cell + 1; /* really +1? (tpm) */
+ return cell + 1;
}
/* Returns true if the pack is a NAV pack */
static gboolean
-gst_dvd_read_src_is_nav_pack (const guint8 * data)
+gst_dvd_read_src_is_nav_pack (const guint8 * data, gint lbn, dsi_t * dsi_pack)
{
if (GST_READ_UINT32_BE (data + 0x26) != 0x000001BF)
return FALSE;
if (GST_READ_UINT16_BE (data + 0x404) != 0x03fa)
return FALSE;
+ /* Read the DSI packet into the provided struct and check it */
+ navRead_DSI (dsi_pack, (unsigned char *) data + DSI_START_BYTE);
+ if (lbn != dsi_pack->dsi_gi.nv_pck_lbn)
+ return FALSE;
+
return TRUE;
}
static gint
gst_dvd_read_src_get_sector_from_time (GstDvdReadSrc * src, GstClockTime ts)
{
- gint sector, i, j;
+ gint sector, j;
- if (src->vts_tmapt == NULL || src->vts_tmapt->nr_of_tmaps == 0)
+ if (src->vts_tmapt == NULL || src->vts_tmapt->nr_of_tmaps < src->ttn)
return -1;
sector = 0;
- for (i = 0; i < src->vts_tmapt->nr_of_tmaps; ++i) {
- for (j = 0; j < src->vts_tmapt->tmap[i].nr_of_entries; ++j) {
- GstClockTime entry_time;
+ for (j = 0; j < src->vts_tmapt->tmap[src->ttn - 1].nr_of_entries; ++j) {
+ GstClockTime entry_time;
- entry_time = src->vts_tmapt->tmap[i].tmu * (j + 1) * GST_SECOND;
- if (entry_time <= ts) {
- sector = src->vts_tmapt->tmap[i].map_ent[j] & 0x7fffffff;
- }
- if (entry_time >= ts) {
- return sector;
- }
+ entry_time = src->vts_tmapt->tmap[src->ttn - 1].tmu * (j + 1) * GST_SECOND;
+ if (entry_time <= ts) {
+ sector = src->vts_tmapt->tmap[src->ttn - 1].map_ent[j] & 0x7fffffff;
+ }
+ if (entry_time >= ts) {
+ return sector;
}
}
GstBuffer ** p_buf)
{
GstBuffer *buf;
+ GstSegment *seg;
guint8 oneblock[DVD_VIDEO_LB_LEN];
dsi_t dsi_pack;
- guint next_vobu, next_ilvu_start, cur_output_size;
+ guint next_vobu, cur_output_size;
gint len;
+ gint retries;
+ gint64 next_time;
+
+ seg = &(GST_BASE_SRC (src)->segment);
/* playback by cell in this pgc, starting at the cell for our chapter */
if (new_seek)
if (src->cur_cell >= src->last_cell) {
/* advance to next chapter */
- if (src->chapter == (src->num_chapters - 1))
+ if (src->chapter == (src->num_chapters - 1) ||
+ (seg->format == chapter_format && seg->stop != -1 &&
+ src->chapter == (seg->stop - 1))) {
+ GST_DEBUG_OBJECT (src, "end of chapter segment");
goto eos;
+ }
GST_INFO_OBJECT (src, "end of chapter %d, switch to next",
src->chapter + 1);
/* we loop until we're out of this cell */
src->cur_pack = src->cur_pgc->cell_playback[src->cur_cell].first_sector;
src->new_cell = FALSE;
+ GST_DEBUG_OBJECT (src, "Starting new cell %d @ pack %d", src->cur_cell,
+ src->cur_pack);
}
if (src->cur_pack >= src->cur_pgc->cell_playback[src->cur_cell].last_sector) {
src->new_cell = TRUE;
- GST_LOG_OBJECT (src, "Beyond last sector, go to next cell");
+ GST_LOG_OBJECT (src, "Beyond last sector for cell %d, going to next cell",
+ src->cur_cell);
return GST_DVD_READ_AGAIN;
}
/* read NAV packet */
+ retries = 0;
nav_retry:
+ retries++;
len = DVDReadBlocks (src->dvd_title, src->cur_pack, 1, oneblock);
- if (len == 0)
+ if (len != 1)
goto read_error;
- if (!gst_dvd_read_src_is_nav_pack (oneblock)) {
+ if (!gst_dvd_read_src_is_nav_pack (oneblock, src->cur_pack, &dsi_pack)) {
+ GST_LOG_OBJECT (src, "Skipping nav packet @ pack %d", src->cur_pack);
src->cur_pack++;
- goto nav_retry;
- }
- /* parse the contained dsi packet */
- navRead_DSI (&dsi_pack, &oneblock[DSI_START_BYTE]);
- g_assert (src->cur_pack == dsi_pack.dsi_gi.nv_pck_lbn);
+ if (retries < 2000) {
+ goto nav_retry;
+ } else {
+ GST_LOG_OBJECT (src, "No nav packet @ pack %d after 2000 blocks",
+ src->cur_pack);
+ goto read_error;
+ }
+ }
/* determine where we go next. These values are the ones we
* mostly care about */
- next_ilvu_start = src->cur_pack + dsi_pack.sml_agli.data[angle].address;
- cur_output_size = dsi_pack.dsi_gi.vobu_ea;
+ cur_output_size = dsi_pack.dsi_gi.vobu_ea + 1;
/* If we're not at the end of this cell, we can determine the next
* VOBU to display using the VOBU_SRI information section of the
if (dsi_pack.vobu_sri.next_vobu != SRI_END_OF_CELL) {
next_vobu = src->cur_pack + (dsi_pack.vobu_sri.next_vobu & 0x7fffffff);
} else {
- next_vobu = src->cur_pack + cur_output_size + 1;
+ next_vobu = src->cur_pgc->cell_playback[src->cur_cell].last_sector + 1;
}
g_assert (cur_output_size < 1024);
- ++src->cur_pack;
/* create the buffer (TODO: use buffer pool?) */
buf = gst_buffer_new_and_alloc (cur_output_size * DVD_VIDEO_LB_LEN);
+ GST_LOG_OBJECT (src, "Going to read %u sectors @ pack %d", cur_output_size,
+ src->cur_pack);
+
/* read in and output cursize packs */
len = DVDReadBlocks (src->dvd_title, src->cur_pack, cur_output_size,
GST_BUFFER_DATA (buf));
*p_buf = buf;
+ GST_LOG_OBJECT (src, "Read %u sectors", cur_output_size);
+
src->cur_pack = next_vobu;
- GST_LOG_OBJECT (src, "Read %u sectors", cur_output_size);
+ next_time = GST_BUFFER_TIMESTAMP (buf);
+ if (GST_CLOCK_TIME_IS_VALID (next_time) && seg->format == GST_FORMAT_TIME &&
+ GST_CLOCK_TIME_IS_VALID (seg->stop) &&
+ next_time > seg->stop + 5 * GST_SECOND) {
+ GST_DEBUG_OBJECT (src, "end of TIME segment");
+ goto eos;
+ }
return GST_DVD_READ_OK;
/* ERRORS */
eos:
{
- GST_INFO_OBJECT (src, "last chapter done - EOS");
+ GST_INFO_OBJECT (src, "Reached end-of-segment/stream - EOS");
return GST_DVD_READ_EOS;
}
read_error:
}
}
+/* we don't cache the result on purpose */
+static gboolean
+gst_dvd_read_descrambler_available (void)
+{
+ GModule *module;
+ gpointer sym;
+ gsize res;
+
+ module = g_module_open ("libdvdcss", 0);
+ if (module != NULL) {
+ res = g_module_symbol (module, "dvdcss_open", &sym);
+ g_module_close (module);
+ } else {
+ res = FALSE;
+ }
+
+ return res;
+}
+
static GstFlowReturn
gst_dvd_read_src_create (GstPushSrc * pushsrc, GstBuffer ** p_buf)
{
if (src->need_newsegment) {
gst_pad_push_event (srcpad,
gst_event_new_new_segment (FALSE, 1.0, GST_FORMAT_BYTES,
- src->cur_pack * DVD_VIDEO_LB_LEN, -1, 0));
+ (gint64) src->cur_pack * DVD_VIDEO_LB_LEN, -1, 0));
src->need_newsegment = FALSE;
}
switch (res) {
case GST_DVD_READ_ERROR:{
- GST_ELEMENT_ERROR (src, RESOURCE, READ, (NULL), (NULL));
+ /* FIXME: figure out a way to detect if scrambling is the problem */
+ if (!gst_dvd_read_descrambler_available ()) {
+ GST_ELEMENT_ERROR (src, RESOURCE, READ,
+ (_("Could not read DVD. This may be because the DVD is encrypted "
+ "and a DVD decryption library is not installed.")), (NULL));
+ } else {
+ GST_ELEMENT_ERROR (src, RESOURCE, READ, (_("Could not read DVD.")),
+ (NULL));
+ }
return GST_FLOW_ERROR;
}
case GST_DVD_READ_EOS:{
- GST_INFO_OBJECT (src, "Reached EOS");
return GST_FLOW_UNEXPECTED;
}
case GST_DVD_READ_OK:{
return FALSE;
}
- if ((flags & GST_SEEK_FLAG_SEGMENT) != 0) {
- GST_DEBUG_OBJECT (src, "segment seek not supported");
- return FALSE;
- }
-
- if ((flags & GST_SEEK_FLAG_FLUSH) == 0) {
- GST_DEBUG_OBJECT (src, "can only do flushing seeks at the moment");
- return FALSE;
- }
-
if (end_type != GST_SEEK_TYPE_NONE) {
- GST_DEBUG_OBJECT (src, "end seek type not supported");
- return FALSE;
+ if ((format != chapter_format && format != GST_FORMAT_TIME) ||
+ end_type != GST_SEEK_TYPE_SET) {
+ GST_DEBUG_OBJECT (src, "end seek type not supported");
+ return FALSE;
+ }
}
if (cur_type != GST_SEEK_TYPE_SET) {
} else {
/* byte format */
src->cur_pack = s->last_stop / DVD_VIDEO_LB_LEN;
- if ((src->cur_pack * DVD_VIDEO_LB_LEN) != s->last_stop) {
+ if (((gint64) src->cur_pack * DVD_VIDEO_LB_LEN) != s->last_stop) {
GST_LOG_OBJECT (src, "rounded down offset %" G_GINT64_FORMAT " => %"
G_GINT64_FORMAT, s->last_stop,
(gint64) src->cur_pack * DVD_VIDEO_LB_LEN);
switch (format) {
case GST_FORMAT_BYTES:{
- val = src->cur_pack * DVD_VIDEO_LB_LEN;
+ val = (gint64) src->cur_pack * DVD_VIDEO_LB_LEN;
break;
}
default:{
static gchar **
gst_dvd_read_src_uri_get_protocols (void)
{
- static gchar *protocols[] = { "dvd", NULL };
+ static gchar *protocols[] = { (gchar *) "dvd", NULL };
return protocols;
}
GST_DEBUG ("binding text domain %s to locale dir %s", GETTEXT_PACKAGE,
LOCALEDIR);
bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
+ bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
#endif /* ENABLE_NLS */
if (!gst_element_register (plugin, "dvdreadsrc", GST_RANK_SECONDARY,