index 0eba950af87276ffaa76b113986c38a622abc90f..9877f072478a54ebfc40cbc443d3e767ce40411a 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,
{
GstElementClass *element_class = GST_ELEMENT_CLASS (g_class);
- gst_element_class_add_pad_template (element_class,
- gst_static_pad_template_get (&srctemplate));
+ gst_element_class_add_static_pad_template (element_class, &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);
*p_first_cell = pgc->program_map[pgn - 1] - 1;
if (chapter == (src->num_chapters - 1)) {
- *p_last_cell = pgc->nr_of_cells;
+ *p_last_cell = pgc->nr_of_cells - 1;
} else {
pgn_next_ch = src->vts_ptt_srpt->title[src->ttn - 1].ptt[chapter + 1].pgn;
*p_last_cell = pgc->program_map[pgn_next_ch - 1] - 1;
}
+
+ GST_DEBUG_OBJECT (src, "Chapter %d bounds: %d %d (within %d cells)",
+ chapter, *p_first_cell, *p_last_cell, pgc->nr_of_cells);
}
static gboolean
/* subtitle */
for (i = 0; i < src->vts_file->vtsi_mat->nr_of_vts_subp_streams; i++) {
const subp_attr_t *u;
+ const video_attr_t *v;
+ gint sid;
/* subpicture stream present? */
if (pgc0 != NULL && (pgc0->subp_control[i] & 0x80000000) == 0)
continue;
u = &src->vts_file->vtsi_mat->vts_subp_attr[i];
+ v = &src->vts_file->vtsi_mat->vts_video_attr;
+
+ sid = i;
+ if (pgc0 != NULL) {
+ if (v->display_aspect_ratio == 0) /* 4:3 */
+ sid = (pgc0->subp_control[i] >> 24) & 0x1f;
+ else if (v->display_aspect_ratio == 3) /* 16:9 */
+ sid = (pgc0->subp_control[i] >> 8) & 0x1f;
+ }
if (u->type) {
- t = g_strdup_printf ("subtitle-%d-language", i);
+ t = g_strdup_printf ("subtitle-%d-language", sid);
lang_code[0] = (u->lang_code >> 8) & 0xff;
lang_code[1] = u->lang_code & 0xff;
gst_structure_set (s, t, G_TYPE_STRING, lang_code, NULL);
}
GST_INFO_OBJECT (src, "[%02d] Subtitle %02d: lang='%s', type=%d",
- src->title + 1, i, lang_code, u->type);
+ src->title + 1, sid, lang_code, u->type);
}
src->title_lang_event_pending =
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 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);
/* 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 + 1;
/* If we're not at the end of this cell, we can determine the next
*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) {
return GST_BASE_SRC_CLASS (parent_class)->event (GST_BASE_SRC (src), event);
}
+static void
+gst_dvd_read_src_get_sector_bounds (GstDvdReadSrc * src, gint * first,
+ gint * last)
+{
+ gint c1, c2, tmp;
+ cur_title_get_chapter_bounds (src, 0, &c1, &tmp);
+ cur_title_get_chapter_bounds (src, src->num_chapters - 1, &tmp, &c2);
+ *first = src->cur_pgc->cell_playback[c1].first_sector;
+ *last = src->cur_pgc->cell_playback[c2].last_sector;
+}
+
static gboolean
gst_dvd_read_src_do_seek (GstBaseSrc * basesrc, GstSegment * s)
{
old = src->cur_pack;
if (s->format == sector_format) {
+ gint first, last;
+ gst_dvd_read_src_get_sector_bounds (src, &first, &last);
+ GST_DEBUG_OBJECT (src, "Format is sector, seeking to %" G_GINT64_FORMAT,
+ s->last_stop);
src->cur_pack = s->last_stop;
+ if (src->cur_pack < first)
+ src->cur_pack = first;
+ if (src->cur_pack > last)
+ src->cur_pack = last;
} else if (s->format == GST_FORMAT_TIME) {
gint sector;
+ GST_DEBUG_OBJECT (src, "Format is time");
sector = gst_dvd_read_src_get_sector_from_time (src, s->last_stop);
src->cur_pack = sector;
} else {
/* byte format */
+ gint first, last;
+ gst_dvd_read_src_get_sector_bounds (src, &first, &last);
+ GST_DEBUG_OBJECT (src, "Format is byte");
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);
}
+ src->cur_pack += first;
}
if (!gst_dvd_read_src_goto_sector (src, src->angle)) {
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:{
gst_dvd_read_src_goto_sector (GstDvdReadSrc * src, int angle)
{
gint seek_to = src->cur_pack;
- gint chapter, sectors, next, cur, i;
+ gint chapter, next, cur, i;
/* retrieve position */
src->cur_pack = 0;
+ GST_DEBUG_OBJECT (src, "Goto sector %d, angle %d, within %d chapters",
+ seek_to, angle, src->num_chapters);
+
for (i = 0; i < src->num_chapters; i++) {
gint c1, c2;
cur_title_get_chapter_bounds (src, i, &c1, &c2);
+ GST_DEBUG_OBJECT (src, " Looking in chapter %d, bounds: %d %d", i, c1, c2);
for (next = cur = c1; cur < c2;) {
- if (next != cur) {
- sectors =
- src->cur_pgc->cell_playback[cur].last_sector -
- src->cur_pgc->cell_playback[cur].first_sector;
- if (src->cur_pack + sectors > seek_to) {
- chapter = i;
- goto done;
- }
- src->cur_pack += sectors;
+ gint first = src->cur_pgc->cell_playback[cur].first_sector;
+ gint last = src->cur_pgc->cell_playback[cur].last_sector;
+ GST_DEBUG_OBJECT (src, "Cell %d sector bounds: %d %d", cur, first, last);
+ /* seeking to 0 should end up at first chapter in any case */
+ if ((seek_to >= first && seek_to <= last) || (seek_to == 0 && i == 0)) {
+ GST_DEBUG_OBJECT (src, "Seek target found in chapter %d", i);
+ chapter = i;
+ goto done;
}
cur = next;
if (src->cur_pgc->cell_playback[cur].block_type == BLOCK_TYPE_ANGLE_BLOCK)
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,