Skip to content

V
vlc
Commit 153b4e11 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files
Options

Bluray: changing the module type from access to access_demux 

Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent 7a150da5
Hide whitespace changes
Inline Side-by-side
Showing with 177 additions and 119 deletions
modules/access/bluray.c
View file @ 153b4e11
/*****************************************************************************
* bluray.c: Blu-ray disc support plugin
*****************************************************************************
* Copyright (C) 2010 VideoLAN, VLC authors and libbluray AUTHORS
* Copyright © 2010-2011 VideoLAN, VLC authors and libbluray AUTHORS
*
* Authors: Jean-Baptiste Kempf <jb@videolan.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
......@@ -22,21 +24,17 @@
# include "config.h"
#endif
#ifdef HAVE_SYS_STAT_H
# include <sys/stat.h>
#endif
#include <assert.h>
#include <limits.h>
#include <limits.h> /* PATH_MAX */
#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_access.h>
#include <vlc_messages.h>
#include <vlc_input.h>
#include <vlc_dialog.h>
#include <vlc_demux.h> /* demux_t */
#include <vlc_input.h> /* Seekpoints, chapters */
#include <vlc_dialog.h> /* BD+/AACS warnings */
#include <libbluray/bluray.h>
#include <libbluray/meta_data.h>
/*****************************************************************************
* Module descriptor
......@@ -55,83 +53,91 @@ vlc_module_begin ()
set_category( CAT_INPUT )
set_subcategory( SUBCAT_INPUT_ACCESS )
set_capability( "access", 60 )
set_capability( "access_demux", 200)
add_integer( "bluray-caching", 1000,
CACHING_TEXT, CACHING_LONGTEXT, true )
add_shortcut( "bluray" )
add_shortcut( "file" )
add_shortcut( "bluray", "file" )
set_callbacks( blurayOpen, blurayClose )
vlc_module_end ()
/*****************************************************************************
* Local prototypes
*****************************************************************************/
struct access_sys_t
struct demux_sys_t
{
BLURAY *bluray; /* */
BLURAY *bluray;
/* Titles */
unsigned int i_title;
unsigned int i_longest_title;
input_title_t **pp_title;
unsigned int i_title;
unsigned int i_longest_title;
input_title_t **pp_title;
/* caching */
int i_bd_delay;
int i_bd_delay;
/* TS stream */
stream_t *p_parser;
};
static ssize_t blurayRead (access_t *, uint8_t *, size_t);
static int bluraySeek (access_t *, uint64_t);
static int blurayControl(access_t *, int, va_list);
static int blurayInitTitles(access_t *p_access );
static int bluraySetTitle(access_t *p_access, int i_title);
/*****************************************************************************
* Local prototypes
*****************************************************************************/
static int blurayControl(demux_t *, int, va_list);
static int blurayDemux (demux_t *);
static int blurayInitTitles(demux_t *p_demux );
static int bluraySetTitle(demux_t *p_demux, int i_title);
#define FROM_TICKS(a) (a*CLOCK_FREQ / INT64_C(90000))
#define TO_TICKS(a) (a*INT64_C(90000)/CLOCK_FREQ)
#define CUR_LENGTH p_sys->pp_title[p_demux->info.i_title]->i_length
/*****************************************************************************
* blurayOpen: module init function
*****************************************************************************/
static int blurayOpen( vlc_object_t *object )
{
access_t *p_access = (access_t*)object;
demux_t *p_demux = (demux_t*)object;
demux_sys_t *p_sys;
access_sys_t *p_sys;
char *pos_title;
int i_title = -1;
char bd_path[PATH_MAX];
if( strcmp( p_access->psz_access, "bluray" ) ) {
if (strcmp(p_demux->psz_access, "bluray")) {
// TODO BDMV support, once we figure out what to do in libbluray
return VLC_EGENERIC;
}
/* init access fields */
access_InitFields(p_access);
/* register callback function for communication */
ACCESS_SET_CALLBACKS(blurayRead, NULL, blurayControl, bluraySeek);
p_access->p_sys = p_sys = malloc(sizeof(access_sys_t));
/* */
p_demux->p_sys = p_sys = malloc(sizeof(*p_sys));
if (unlikely(!p_sys)) {
return VLC_ENOMEM;
}
p_sys->p_parser = NULL;
/* init demux info fields */
p_demux->info.i_update = 0;
p_demux->info.i_title = 0;
p_demux->info.i_seekpoint = 0;
TAB_INIT( p_sys->i_title, p_sys->pp_title );
/* store current bd_path */
strncpy(bd_path, p_access->psz_location, sizeof(bd_path));
strncpy(bd_path, p_demux->psz_file, sizeof(bd_path));
bd_path[PATH_MAX - 1] = '\0';
p_sys->bluray = bd_open(bd_path, NULL);
if ( !p_sys->bluray ) {
if (!p_sys->bluray) {
free(p_sys);
return VLC_EGENERIC;
}
/* Warning the user about AACS/BD+ */
const BLURAY_DISC_INFO *disc_info = bd_get_disc_info(p_sys->bluray);
msg_Dbg (p_access, "First play: %i, Top menu: %i\n"
"HDMV Titles: %i, BDJ Titles: %i, Other: %i",
msg_Info(p_demux, "First play: %i, Top menu: %i\n"
"HDMV Titles: %i, BD-J Titles: %i, Other: %i",
disc_info->first_play_supported, disc_info->top_menu_supported,
disc_info->num_hdmv_titles, disc_info->num_bdj_titles,
disc_info->num_unsupported_titles);
......@@ -139,14 +145,14 @@ static int blurayOpen( vlc_object_t *object )
/* AACS */
if (disc_info->aacs_detected) {
if (!disc_info->libaacs_detected) {
dialog_Fatal (p_access, _("Blu-Ray error"),
dialog_Fatal (p_demux, _("Blu-Ray error"),
_("This Blu-Ray Disc needs a library for AACS decoding, "
"and your system does not have it."));
blurayClose(object);
return VLC_EGENERIC;
}
if (!disc_info->aacs_handled) {
dialog_Fatal (p_access, _("Blu-Ray error"),
dialog_Fatal (p_demux, _("Blu-Ray error"),
_("Your system AACS decoding library does not work. "
"Missing keys?"));
blurayClose(object);
......@@ -157,14 +163,14 @@ static int blurayOpen( vlc_object_t *object )
/* BD+ */
if (disc_info->bdplus_detected) {
if (!disc_info->libbdplus_detected) {
dialog_Fatal (p_access, _("Blu-Ray error"),
dialog_Fatal (p_demux, _("Blu-Ray error"),
_("This Blu-Ray Disc needs a library for BD+ decoding, "
"and your system does not have it."));
blurayClose(object);
return VLC_EGENERIC;
}
if (!disc_info->bdplus_handled) {
dialog_Fatal (p_access, _("Blu-Ray error"),
dialog_Fatal (p_demux, _("Blu-Ray error"),
_("Your system BD+ decoding library does not work. "
"Missing configuration?"));
blurayClose(object);
......@@ -173,26 +179,35 @@ static int blurayOpen( vlc_object_t *object )
}
/* Get titles and chapters */
if (blurayInitTitles(p_access) != VLC_SUCCESS) {
if (blurayInitTitles(p_demux) != VLC_SUCCESS) {
blurayClose(object);
return VLC_EGENERIC;
}
/* get title request */
if ( (pos_title = strrchr(bd_path, ':')) ) {
if ((pos_title = strrchr(bd_path, ':'))) {
/* found character ':' for title information */
*(pos_title++) = '\0';
i_title = atoi(pos_title);
}
/* set start title number */
if ( bluraySetTitle(p_access, i_title) != VLC_SUCCESS ) {
msg_Err( p_access, "Could not set the title %d", i_title );
if (bluraySetTitle(p_demux, i_title) != VLC_SUCCESS) {
msg_Err( p_demux, "Could not set the title %d", i_title );
blurayClose(object);
return VLC_EGENERIC;
}
p_sys->i_bd_delay = var_InheritInteger(p_access, "bluray-caching");
p_sys->i_bd_delay = var_InheritInteger(p_demux, "bluray-caching");
p_sys->p_parser = stream_DemuxNew(p_demux, "ts", p_demux->out);
if (!p_sys->p_parser) {
msg_Err(p_demux, "Failed to create TS demuxer");
blurayClose(object);
return VLC_EGENERIC;
}
p_demux->pf_control = blurayControl;
p_demux->pf_demux = blurayDemux;
return VLC_SUCCESS;
}
......@@ -203,8 +218,11 @@ static int blurayOpen( vlc_object_t *object )
*****************************************************************************/
static void blurayClose( vlc_object_t *object )
{
access_t *p_access = (access_t*)object;
access_sys_t *p_sys = p_access->p_sys;
demux_t *p_demux = (demux_t*)object;
demux_sys_t *p_sys = p_demux->p_sys;
if (p_sys->p_parser)
stream_Delete(p_sys->p_parser);
/* Titles */
for (unsigned int i = 0; i < p_sys->i_title; i++)
......@@ -217,12 +235,13 @@ static void blurayClose( vlc_object_t *object )
free(p_sys);
}
static int blurayInitTitles(access_t *p_access )
static int blurayInitTitles(demux_t *p_demux )
{
access_sys_t *p_sys = p_access->p_sys;
demux_sys_t *p_sys = p_demux->p_sys;
/* get and set the titles */
unsigned i_title = bd_get_titles(p_sys->bluray, TITLES_RELEVANT, 0);
unsigned i_title = bd_get_titles(p_sys->bluray, TITLES_RELEVANT, 60);
int64_t duration = 0;
for (unsigned int i = 0; i < i_title; i++) {
......@@ -233,7 +252,7 @@ static int blurayInitTitles(access_t *p_access )
BLURAY_TITLE_INFO *title_info = bd_get_title_info(p_sys->bluray, i, 0);
if (!title_info)
break;
t->i_length = title_info->duration * CLOCK_FREQ / INT64_C(90000);
t->i_length = FROM_TICKS(title_info->duration);
if (t->i_length > duration) {
duration = t->i_length;
......@@ -242,7 +261,7 @@ static int blurayInitTitles(access_t *p_access )
for ( unsigned int j = 0; j < title_info->chapter_count; j++) {
seekpoint_t *s = vlc_seekpoint_New();
if( !s )
if (!s)
break;
s->i_time_offset = title_info->chapters[j].offset;
......@@ -254,32 +273,32 @@ static int blurayInitTitles(access_t *p_access )
return VLC_SUCCESS;
}
/*****************************************************************************
* bluraySetTitle: select new BD title
*****************************************************************************/
static int bluraySetTitle(access_t *p_access, int i_title)
static int bluraySetTitle(demux_t *p_demux, int i_title)
{
access_sys_t *p_sys = p_access->p_sys;
demux_sys_t *p_sys = p_demux->p_sys;
/* Looking for the main title, ie the longest duration */
if (i_title == -1)
if (i_title < 0)
i_title = p_sys->i_longest_title;
else if ((unsigned)i_title > p_sys->i_title)
return VLC_EGENERIC;
msg_Dbg( p_access, "Selecting Title %i", i_title);
msg_Dbg( p_demux, "Selecting Title %i", i_title);
/* Select Blu-Ray title */
if ( bd_select_title(p_access->p_sys->bluray, i_title) == 0 ) {
msg_Err( p_access, "cannot select bd title '%d'", p_access->info.i_title);
if (bd_select_title(p_demux->p_sys->bluray, i_title) == 0 ) {
msg_Err(p_demux, "cannot select bd title '%d'", p_demux->info.i_title);
return VLC_EGENERIC;
}
/* read title length and init some values */
p_access->info.i_title = i_title;
p_access->info.i_size = bd_get_title_size(p_sys->bluray);
p_access->info.i_pos = 0;
p_access->info.b_eof = false;
p_access->info.i_seekpoint = 0;
p_access->info.i_update |= INPUT_UPDATE_TITLE | INPUT_UPDATE_SEEKPOINT;
/* read title info and init some values */
p_demux->info.i_title = i_title;
p_demux->info.i_seekpoint = 0;
p_demux->info.i_update |= INPUT_UPDATE_TITLE | INPUT_UPDATE_SEEKPOINT;
return VLC_SUCCESS;
}
......@@ -288,46 +307,45 @@ static int bluraySetTitle(access_t *p_access, int i_title)
/*****************************************************************************
* blurayControl: handle the controls
*****************************************************************************/
static int blurayControl(access_t *p_access, int query, va_list args)
static int blurayControl(demux_t *p_demux, int query, va_list args)
{
access_sys_t *p_sys = p_access->p_sys;
demux_sys_t *p_sys = p_demux->p_sys;
bool *pb_bool;
int64_t *pi_64;
switch (query) {
case ACCESS_CAN_SEEK:
case ACCESS_CAN_FASTSEEK:
case ACCESS_CAN_PAUSE:
case ACCESS_CAN_CONTROL_PACE:
case DEMUX_CAN_SEEK:
case DEMUX_CAN_PAUSE:
case DEMUX_CAN_CONTROL_PACE:
pb_bool = (bool*)va_arg( args, bool * );
*pb_bool = true;
break;
case ACCESS_GET_PTS_DELAY:
case DEMUX_GET_PTS_DELAY:
pi_64 = (int64_t*)va_arg( args, int64_t * );
*pi_64 = p_sys->i_bd_delay;
break;
case ACCESS_SET_PAUSE_STATE:
case DEMUX_SET_PAUSE_STATE:
/* Nothing to do */
break;
case ACCESS_SET_TITLE:
case DEMUX_SET_TITLE:
{
int i_title = (int)va_arg( args, int );
if( bluraySetTitle( p_access, i_title ) != VLC_SUCCESS )
if (bluraySetTitle(p_demux, i_title) != VLC_SUCCESS)
return VLC_EGENERIC;
break;
}
case ACCESS_SET_SEEKPOINT:
case DEMUX_SET_SEEKPOINT:
{
int i_chapter = (int)va_arg( args, int );
bd_seek_chapter( p_sys->bluray, i_chapter );
p_access->info.i_update = INPUT_UPDATE_SEEKPOINT;
p_demux->info.i_update = INPUT_UPDATE_SEEKPOINT;
break;
}
case ACCESS_GET_TITLE_INFO:
case DEMUX_GET_TITLE_INFO:
{
input_title_t ***ppp_title = (input_title_t***)va_arg( args, input_title_t*** );
int *pi_int = (int*)va_arg( args, int* );
......@@ -346,56 +364,96 @@ static int blurayControl(access_t *p_access, int query, va_list args)
return VLC_SUCCESS;
}
case ACCESS_SET_PRIVATE_ID_STATE:
case ACCESS_GET_CONTENT_TYPE:
case ACCESS_GET_META:
return VLC_EGENERIC;
default:
msg_Warn( p_access, "unimplemented query (%d) in control", query );
return VLC_EGENERIC;
}
case DEMUX_GET_LENGTH:
{
int64_t *pi_length = (int64_t*)va_arg(args, int64_t *);
*pi_length = CUR_LENGTH;
return VLC_SUCCESS;
}
case DEMUX_SET_TIME:
{
int64_t i_time = (int64_t)va_arg(args, int64_t);
bd_seek_time(p_sys->bluray, TO_TICKS(i_time));
return VLC_SUCCESS;
}
case DEMUX_GET_TIME:
{
int64_t *pi_time = (int64_t*)va_arg(args, int64_t *);
*pi_time = (int64_t)FROM_TICKS(bd_tell_time(p_sys->bluray));
return VLC_SUCCESS;
}
return VLC_SUCCESS;
}
case DEMUX_GET_POSITION:
{
double *pf_position = (double*)va_arg( args, double * );
*pf_position = (double)FROM_TICKS(bd_tell_time(p_sys->bluray))/CUR_LENGTH;
return VLC_SUCCESS;
}
case DEMUX_SET_POSITION:
{
double f_position = (double)va_arg(args, double);
bd_seek_time(p_sys->bluray, TO_TICKS(f_position*CUR_LENGTH));
return VLC_SUCCESS;
}
case DEMUX_GET_META:
{
struct meta_dl *meta = bd_get_meta(p_sys->bluray);
vlc_meta_t *p_meta = (vlc_meta_t *) va_arg (args, vlc_meta_t*);
if (!EMPTY_STR(meta->di_name)) vlc_meta_SetTitle(p_meta, meta->di_name);
/*****************************************************************************
* bluraySeek: seek to the given position
*****************************************************************************/
static int bluraySeek(access_t *p_access, uint64_t position)
{
access_sys_t *p_sys = p_access->p_sys;
if (!EMPTY_STR(meta->language_code)) vlc_meta_AddExtra(p_meta, "Language", meta->language_code);
if (!EMPTY_STR(meta->filename)) vlc_meta_AddExtra(p_meta, "Filename", meta->filename);
if (!EMPTY_STR(meta->di_alternative)) vlc_meta_AddExtra(p_meta, "Alternative", meta->di_alternative);
p_access->info.i_pos = bd_seek(p_sys->bluray, position);
p_access->info.b_eof = false;
// if (meta->di_set_number > 0) vlc_meta_SetTrackNum(p_meta, meta->di_set_number);
// if (meta->di_num_sets > 0) vlc_meta_AddExtra(p_meta, "Discs numbers in Set", meta->di_num_sets);
if (meta->thumb_count > 0 && meta->thumbnails) {
vlc_meta_SetArtURL(p_meta, meta->thumbnails[0].path);
}
return VLC_SUCCESS;
}
case DEMUX_CAN_RECORD:
case DEMUX_GET_FPS:
case DEMUX_SET_GROUP:
case DEMUX_HAS_UNSUPPORTED_META:
case DEMUX_GET_ATTACHMENTS:
return VLC_EGENERIC;
default:
msg_Warn( p_demux, "unimplemented query (%d) in control", query );
return VLC_EGENERIC;
}
return VLC_SUCCESS;
}
/*****************************************************************************
* blurayRead: read BD data into buffer
*****************************************************************************/
static ssize_t blurayRead(access_t *p_access, uint8_t *data, size_t size)
#define BD_TS_PACKET_SIZE (192)
#define NB_TS_PACKETS (200)
static int blurayDemux(demux_t *p_demux)
{
access_sys_t *p_sys = p_access->p_sys;
int nread;
demux_sys_t *p_sys = p_demux->p_sys;
if (p_access->info.b_eof) {
return 0;
block_t *p_block = block_New(p_demux, NB_TS_PACKETS * (int64_t)BD_TS_PACKET_SIZE);
if (!p_block) {
return -1;
}
/* read data into buffer with given length */
nread = bd_read(p_sys->bluray, data, size);
if( nread == 0 ) {
p_access->info.b_eof = true;
}
else if( nread > 0 ) {
p_access->info.i_pos += nread;
int nread = bd_read(p_sys->bluray, p_block->p_buffer,
NB_TS_PACKETS * BD_TS_PACKET_SIZE);
if (nread < 0) {
block_Release(p_block);
return nread;
}
return nread;
}
p_block->i_buffer = nread;
stream_DemuxSend( p_sys->p_parser, p_block );
return 1;
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment