*
* This program 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
#include <sys/stat.h>
#endif
+#ifdef __APPLE__
+#include <sys/stat.h>
+#include <sys/param.h>
+#include <sys/ucred.h>
+#include <sys/mount.h>
+#endif
+
#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_demux.h> /* demux_t */
#include <vlc_input.h> /* Seekpoints, chapters */
+#include <vlc_atomic.h>
#include <vlc_dialog.h> /* BD+/AACS warnings */
#include <vlc_vout.h> /* vout_PutSubpicture / subpicture_t */
+#include <vlc_url.h> /* vlc_path2uri */
#include <libbluray/bluray.h>
#include <libbluray/keys.h>
typedef struct bluray_overlay_t
{
- VLC_GC_MEMBERS
-
+ atomic_flag released_once;
vlc_mutex_t lock;
subpicture_t *p_pic;
OverlayStatus status;
int i_audio_stream; /* Selected audio stream. -1 if default */
int i_video_stream;
stream_t *p_parser;
+
+ /* Used to store bluray disc path */
+ char *psz_bd_path;
};
struct subpicture_updater_sys_t
demux_t *p_demux = (demux_t*)object;
demux_sys_t *p_sys;
- char bd_path[PATH_MAX] = { '\0' };
const char *error_msg = NULL;
if (strcmp(p_demux->psz_access, "bluray")) {
TAB_INIT( p_sys->i_title, p_sys->pp_title );
- /* store current bd_path */
+ /* store current bd path */
if (p_demux->psz_file) {
- strncpy(bd_path, p_demux->psz_file, sizeof(bd_path));
- bd_path[PATH_MAX - 1] = '\0';
+ p_sys->psz_bd_path = strndup(p_demux->psz_file, strlen(p_demux->psz_file));
}
#if defined (HAVE_MNTENT_H) && defined (HAVE_SYS_STAT_H)
/* If we're passed a block device, try to convert it to the mount point. */
struct stat st;
- if ( !stat (bd_path, &st)) {
+ if ( !stat (p_sys->psz_bd_path, &st)) {
if (S_ISBLK (st.st_mode)) {
FILE* mtab = setmntent ("/proc/self/mounts", "r");
struct mntent* m;
struct mntent mbuf;
char buf [8192];
+ /* bd path may be a symlink (e.g. /dev/dvd -> /dev/sr0), so make
+ * sure we look up the real device */
+ char* bd_device = realpath(p_sys->psz_bd_path, NULL);
while ((m = getmntent_r (mtab, &mbuf, buf, sizeof(buf))) != NULL) {
- if (!strcmp (m->mnt_fsname, bd_path)) {
- strncpy (bd_path, m->mnt_dir, sizeof(bd_path));
- bd_path[sizeof(bd_path) - 1] = '\0';
+ if (!strcmp (m->mnt_fsname, (bd_device == NULL ? p_sys->psz_bd_path : bd_device))) {
+ p_sys->psz_bd_path = strndup(m->mnt_dir, strlen(m->mnt_dir));
break;
}
}
+ free(bd_device);
endmntent (mtab);
}
}
#endif /* HAVE_MNTENT_H && HAVE_SYS_STAT_H */
- p_sys->bluray = bd_open(bd_path, NULL);
+#ifdef __APPLE__
+ /* If we're passed a block device, try to convert it to the mount point. */
+ struct stat st;
+ if ( !stat (p_sys->psz_bd_path, &st)) {
+ if (S_ISBLK (st.st_mode)) {
+ struct statfs mbuf[128];
+ int fs_count;
+
+ if ( (fs_count = getfsstat (NULL, 0, MNT_NOWAIT)) > 0 ) {
+ getfsstat (mbuf, fs_count * sizeof(mbuf[0]), MNT_NOWAIT);
+ for ( int i = 0; i < fs_count; ++i) {
+ if (!strcmp (mbuf[i].f_mntfromname, p_sys->psz_bd_path)) {
+ p_sys->psz_bd_path = strndup(mbuf[i].f_mntonname, strlen(mbuf[i].f_mntonname));
+ }
+ }
+ }
+ }
+ }
+#endif
+ p_sys->bluray = bd_open(p_sys->psz_bd_path, NULL);
if (!p_sys->bluray) {
free(p_sys);
return VLC_EGENERIC;
goto error;
}
if (!disc_info->aacs_handled) {
+#ifdef BD_AACS_CORRUPTED_DISC
+ if (disc_info->aacs_error_code) {
+ switch (disc_info->aacs_error_code) {
+ case BD_AACS_CORRUPTED_DISC:
+ error_msg = _("BluRay Disc is corrupted.");
+ break;
+ case BD_AACS_NO_CONFIG:
+ error_msg = _("Missing AACS configuration file!");
+ break;
+ case BD_AACS_NO_PK:
+ error_msg = _("No valid processing key found in AACS config file.");
+ break;
+ case BD_AACS_NO_CERT:
+ error_msg = _("No valid host certificate found in AACS config file.");
+ break;
+ case BD_AACS_CERT_REVOKED:
+ error_msg = _("AACS Host certificate revoked.");
+ break;
+ case BD_AACS_MMC_FAILED:
+ error_msg = _("AACS MMC failed.");
+ break;
+ }
+ goto error;
+ }
+#else
error_msg = _("Your system AACS decoding library does not work. "
"Missing keys?");
goto error;
+#endif /* BD_AACS_CORRUPTED_DISC */
}
}
vlc_input_title_Delete(p_sys->pp_title[i]);
TAB_CLEAN( p_sys->i_title, p_sys->pp_title );
+ free(p_sys->psz_bd_path);
free(p_sys);
}
if ( likely(p_pair != NULL) ) {
p_pair->i_id = p_fmt->i_id;
p_pair->p_es = p_es;
- msg_Err( p_out->p_sys->p_demux, "Adding ES %d", p_fmt->i_id );
+ msg_Info( p_out->p_sys->p_demux, "Adding ES %d", p_fmt->i_id );
vlc_array_append(&p_sys->es, p_pair);
}
}
vlc_mutex_unlock(&p_overlay->lock);
}
+static void blurayCleanOverlayStruct(bluray_overlay_t *);
+
static void subpictureUpdaterDestroy(subpicture_t *p_subpic)
{
- vlc_gc_decref(p_subpic->updater.p_sys->p_overlay);
+ blurayCleanOverlayStruct(p_subpic->updater.p_sys->p_overlay);
}
/*****************************************************************************
/*****************************************************************************
* libbluray overlay handling:
*****************************************************************************/
-static void blurayCleanOverayStruct(gc_object_t *p_gc)
+static void blurayCleanOverlayStruct(bluray_overlay_t *p_overlay)
{
- bluray_overlay_t *p_overlay = vlc_priv(p_gc, bluray_overlay_t);
-
+ if (!atomic_flag_test_and_set(&p_overlay->released_once))
+ return;
/*
* This will be called when destroying the picture.
* Don't delete it again from here!
if (p_sys->p_overlays[i] != NULL) {
vout_FlushSubpictureChannel(p_sys->p_vout,
p_sys->p_overlays[i]->p_pic->i_channel);
- vlc_gc_decref(p_sys->p_overlays[i]);
+ blurayCleanOverlayStruct(p_sys->p_overlays[i]);
p_sys->p_overlays[i] = NULL;
}
}
p_sys->p_overlays[ov->plane] = NULL;
return;
}
- vlc_gc_init(p_sys->p_overlays[ov->plane], blurayCleanOverayStruct);
- /* Incrementing refcounter: vout + demux */
- vlc_gc_incref(p_sys->p_overlays[ov->plane]);
+ /* two references: vout + demux */
+ p_sys->p_overlays[ov->plane]->released_once = ATOMIC_FLAG_INIT;
p_upd_sys->p_overlay = p_sys->p_overlays[ov->plane];
subpicture_updater_t updater = {
.pf_destroy = subpictureUpdaterDestroy,
.p_sys = p_upd_sys,
};
+ vlc_mutex_init(&p_sys->p_overlays[ov->plane]->lock);
p_sys->p_overlays[ov->plane]->p_pic = subpicture_New(&updater);
p_sys->p_overlays[ov->plane]->p_pic->i_original_picture_width = ov->w;
p_sys->p_overlays[ov->plane]->p_pic->i_original_picture_height = ov->h;
// 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);
+ if (meta->thumb_count > 0 && meta->thumbnails)
+ {
+ char *psz_thumbpath;
+ if( asprintf( &psz_thumbpath, "%s" DIR_SEP "BDMV" DIR_SEP "META" DIR_SEP "DL" DIR_SEP "%s",
+ p_sys->psz_bd_path, meta->thumbnails[0].path ) > 0 )
+ {
+ char *psz_thumburl = vlc_path2uri( psz_thumbpath, "file" );
+ if( unlikely(psz_thumburl == NULL) )
+ return VLC_ENOMEM;
+
+ vlc_meta_SetArtURL( p_meta, psz_thumburl );
+ free( psz_thumburl );
+ }
+ free( psz_thumbpath );
}
return VLC_SUCCESS;
{
demux_sys_t *p_sys = p_demux->p_sys;
- block_t *p_block = block_New(p_demux, NB_TS_PACKETS * (int64_t)BD_TS_PACKET_SIZE);
+ block_t *p_block = block_Alloc(NB_TS_PACKETS * (int64_t)BD_TS_PACKET_SIZE);
if (!p_block) {
return -1;
}
projects / vlc / blobdiff