2014-07-14 23:49:02 +00:00
|
|
|
/*
|
2015-04-13 07:36:54 +00:00
|
|
|
* This file is part of mpv.
|
2014-07-14 23:49:02 +00:00
|
|
|
*
|
2015-04-13 07:36:54 +00:00
|
|
|
* mpv is free software; you can redistribute it and/or modify
|
2014-07-14 23:49:02 +00:00
|
|
|
* it under the terms of the GNU General Public License as published by
|
|
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
|
|
* (at your option) any later version.
|
|
|
|
*
|
2015-04-13 07:36:54 +00:00
|
|
|
* mpv is distributed in the hope that it will be useful,
|
2014-07-14 23:49:02 +00:00
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU General Public License along
|
2015-04-13 07:36:54 +00:00
|
|
|
* with mpv. If not, see <http://www.gnu.org/licenses/>.
|
2014-07-14 23:49:02 +00:00
|
|
|
*/
|
2015-04-13 07:36:54 +00:00
|
|
|
|
2014-07-14 23:49:02 +00:00
|
|
|
#include "config.h"
|
|
|
|
|
2017-10-10 13:51:16 +00:00
|
|
|
#if !HAVE_GPL
|
|
|
|
#error GPL only
|
|
|
|
#endif
|
|
|
|
|
2014-07-14 23:49:02 +00:00
|
|
|
#include <stdlib.h>
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <string.h>
|
|
|
|
#include <errno.h>
|
|
|
|
#include <assert.h>
|
|
|
|
|
2019-09-13 13:35:23 +00:00
|
|
|
#ifdef __linux__
|
|
|
|
#include <linux/cdrom.h>
|
|
|
|
#include <scsi/sg.h>
|
|
|
|
#include <sys/types.h>
|
|
|
|
#include <sys/stat.h>
|
|
|
|
#include <sys/ioctl.h>
|
|
|
|
#endif
|
|
|
|
|
2014-07-14 23:49:02 +00:00
|
|
|
#include <dvdnav/dvdnav.h>
|
2019-09-13 13:35:23 +00:00
|
|
|
#include <libavutil/common.h>
|
|
|
|
#include <libavutil/intreadwrite.h>
|
2014-07-14 23:49:02 +00:00
|
|
|
|
2014-09-25 21:54:58 +00:00
|
|
|
#include "osdep/io.h"
|
|
|
|
|
2014-07-14 23:49:02 +00:00
|
|
|
#include "options/options.h"
|
|
|
|
#include "common/msg.h"
|
|
|
|
#include "input/input.h"
|
2016-09-08 19:46:48 +00:00
|
|
|
#include "options/m_config.h"
|
2014-09-25 21:54:58 +00:00
|
|
|
#include "options/path.h"
|
2014-07-14 23:49:02 +00:00
|
|
|
#include "osdep/timer.h"
|
|
|
|
#include "stream.h"
|
|
|
|
#include "demux/demux.h"
|
|
|
|
#include "video/out/vo.h"
|
|
|
|
|
|
|
|
#define TITLE_MENU -1
|
|
|
|
#define TITLE_LONGEST -2
|
|
|
|
|
|
|
|
struct priv {
|
|
|
|
dvdnav_t *dvdnav; // handle to libdvdnav stuff
|
|
|
|
char *filename; // path
|
|
|
|
unsigned int duration; // in milliseconds
|
|
|
|
int mousex, mousey;
|
|
|
|
int title;
|
|
|
|
uint32_t spu_clut[16];
|
|
|
|
bool spu_clut_valid;
|
|
|
|
bool had_initial_vts;
|
|
|
|
|
|
|
|
int dvd_speed;
|
|
|
|
|
|
|
|
int track;
|
|
|
|
char *device;
|
|
|
|
|
2016-09-08 19:46:48 +00:00
|
|
|
struct dvd_opts *opts;
|
2014-07-14 23:49:02 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
#define DNE(e) [e] = # e
|
|
|
|
static const char *const mp_dvdnav_events[] = {
|
|
|
|
DNE(DVDNAV_BLOCK_OK),
|
|
|
|
DNE(DVDNAV_NOP),
|
|
|
|
DNE(DVDNAV_STILL_FRAME),
|
|
|
|
DNE(DVDNAV_SPU_STREAM_CHANGE),
|
|
|
|
DNE(DVDNAV_AUDIO_STREAM_CHANGE),
|
|
|
|
DNE(DVDNAV_VTS_CHANGE),
|
|
|
|
DNE(DVDNAV_CELL_CHANGE),
|
|
|
|
DNE(DVDNAV_NAV_PACKET),
|
|
|
|
DNE(DVDNAV_STOP),
|
|
|
|
DNE(DVDNAV_HIGHLIGHT),
|
|
|
|
DNE(DVDNAV_SPU_CLUT_CHANGE),
|
|
|
|
DNE(DVDNAV_HOP_CHANNEL),
|
|
|
|
DNE(DVDNAV_WAIT),
|
|
|
|
};
|
|
|
|
|
|
|
|
#define LOOKUP_NAME(array, i) \
|
|
|
|
(((i) >= 0 && (i) < MP_ARRAY_SIZE(array)) ? array[(i)] : "?")
|
|
|
|
|
2019-09-13 13:35:23 +00:00
|
|
|
static void dvd_set_speed(stream_t *stream, char *device, unsigned speed)
|
|
|
|
{
|
|
|
|
#if defined(__linux__) && defined(SG_IO) && defined(GPCMD_SET_STREAMING)
|
2024-03-20 02:23:23 +00:00
|
|
|
int fd;
|
|
|
|
unsigned char buffer[28];
|
|
|
|
unsigned char cmd[12];
|
|
|
|
struct sg_io_hdr sghdr;
|
|
|
|
struct stat st;
|
|
|
|
|
|
|
|
memset(&st, 0, sizeof(st));
|
|
|
|
|
|
|
|
if (stat(device, &st) == -1) return;
|
|
|
|
|
|
|
|
if (!S_ISBLK(st.st_mode)) return; /* not a block device */
|
|
|
|
|
|
|
|
switch (speed) {
|
|
|
|
case 0: /* don't touch speed setting */
|
|
|
|
return;
|
|
|
|
case -1: /* restore default value */
|
|
|
|
MP_INFO(stream, "Restoring DVD speed... ");
|
|
|
|
break;
|
|
|
|
default: /* limit to <speed> KB/s */
|
|
|
|
// speed < 100 is multiple of DVD single speed (1350KB/s)
|
|
|
|
if (speed < 100)
|
|
|
|
speed *= 1350;
|
|
|
|
MP_INFO(stream, "Limiting DVD speed to %dKB/s... ", speed);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
memset(&sghdr, 0, sizeof(sghdr));
|
|
|
|
sghdr.interface_id = 'S';
|
|
|
|
sghdr.timeout = 5000;
|
|
|
|
sghdr.dxfer_direction = SG_DXFER_TO_DEV;
|
|
|
|
sghdr.dxfer_len = sizeof(buffer);
|
|
|
|
sghdr.dxferp = buffer;
|
|
|
|
sghdr.cmd_len = sizeof(cmd);
|
|
|
|
sghdr.cmdp = cmd;
|
|
|
|
|
|
|
|
memset(cmd, 0, sizeof(cmd));
|
|
|
|
cmd[0] = GPCMD_SET_STREAMING;
|
|
|
|
cmd[10] = sizeof(buffer);
|
|
|
|
|
|
|
|
memset(buffer, 0, sizeof(buffer));
|
|
|
|
/* first sector 0, last sector 0xffffffff */
|
|
|
|
AV_WB32(buffer + 8, 0xffffffff);
|
|
|
|
if (speed == -1)
|
|
|
|
buffer[0] = 4; /* restore default */
|
|
|
|
else {
|
|
|
|
/* <speed> kilobyte */
|
|
|
|
AV_WB32(buffer + 12, speed);
|
|
|
|
AV_WB32(buffer + 20, speed);
|
|
|
|
}
|
|
|
|
/* 1 second */
|
|
|
|
AV_WB16(buffer + 18, 1000);
|
|
|
|
AV_WB16(buffer + 26, 1000);
|
|
|
|
|
|
|
|
fd = open(device, O_RDWR | O_NONBLOCK | O_CLOEXEC);
|
|
|
|
if (fd == -1) {
|
|
|
|
MP_INFO(stream, "Couldn't open DVD device for writing, changing DVD speed needs write access.\n");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (ioctl(fd, SG_IO, &sghdr) < 0)
|
|
|
|
MP_INFO(stream, "failed\n");
|
|
|
|
else
|
|
|
|
MP_INFO(stream, "successful\n");
|
|
|
|
|
|
|
|
close(fd);
|
2019-09-13 13:35:23 +00:00
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
|
|
|
// Check if this is likely to be an .ifo or similar file.
|
|
|
|
static int dvd_probe(const char *path, const char *ext, const char *sig)
|
|
|
|
{
|
|
|
|
if (!bstr_case_endswith(bstr0(path), bstr0(ext)))
|
|
|
|
return false;
|
|
|
|
|
|
|
|
FILE *temp = fopen(path, "rb");
|
|
|
|
if (!temp)
|
|
|
|
return false;
|
|
|
|
|
|
|
|
bool r = false;
|
|
|
|
|
|
|
|
char data[50];
|
|
|
|
|
|
|
|
assert(strlen(sig) <= sizeof(data));
|
|
|
|
|
|
|
|
if (fread(data, 50, 1, temp) == 1) {
|
|
|
|
if (memcmp(data, sig, strlen(sig)) == 0)
|
|
|
|
r = true;
|
|
|
|
}
|
|
|
|
|
|
|
|
fclose(temp);
|
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
2019-10-02 22:22:18 +00:00
|
|
|
/**
|
|
|
|
* \brief mp_dvdnav_lang_from_aid() returns the language corresponding to audio id 'aid'
|
|
|
|
* \param stream: - stream pointer
|
|
|
|
* \param sid: physical subtitle id
|
|
|
|
* \return 0 on error, otherwise language id
|
|
|
|
*/
|
|
|
|
static int mp_dvdnav_lang_from_aid(stream_t *stream, int aid)
|
|
|
|
{
|
|
|
|
uint8_t lg;
|
|
|
|
uint16_t lang;
|
|
|
|
struct priv *priv = stream->priv;
|
|
|
|
|
|
|
|
if (aid < 0)
|
|
|
|
return 0;
|
|
|
|
lg = dvdnav_get_audio_logical_stream(priv->dvdnav, aid & 0x7);
|
|
|
|
if (lg == 0xff)
|
|
|
|
return 0;
|
|
|
|
lang = dvdnav_audio_stream_to_lang(priv->dvdnav, lg);
|
|
|
|
if (lang == 0xffff)
|
|
|
|
return 0;
|
|
|
|
return lang;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* \brief mp_dvdnav_lang_from_sid() returns the language corresponding to subtitle id 'sid'
|
|
|
|
* \param stream: - stream pointer
|
|
|
|
* \param sid: physical subtitle id
|
|
|
|
* \return 0 on error, otherwise language id
|
|
|
|
*/
|
|
|
|
static int mp_dvdnav_lang_from_sid(stream_t *stream, int sid)
|
|
|
|
{
|
|
|
|
uint8_t k;
|
|
|
|
uint16_t lang;
|
|
|
|
struct priv *priv = stream->priv;
|
|
|
|
if (sid < 0)
|
|
|
|
return 0;
|
|
|
|
for (k = 0; k < 32; k++)
|
|
|
|
if (dvdnav_get_spu_logical_stream(priv->dvdnav, k) == sid)
|
|
|
|
break;
|
|
|
|
if (k == 32)
|
|
|
|
return 0;
|
|
|
|
lang = dvdnav_spu_stream_to_lang(priv->dvdnav, k);
|
|
|
|
if (lang == 0xffff)
|
|
|
|
return 0;
|
|
|
|
return lang;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* \brief mp_dvdnav_number_of_subs() returns the count of available subtitles
|
|
|
|
* \param stream: - stream pointer
|
|
|
|
* \return 0 on error, something meaningful otherwise
|
|
|
|
*/
|
|
|
|
static int mp_dvdnav_number_of_subs(stream_t *stream)
|
|
|
|
{
|
|
|
|
struct priv *priv = stream->priv;
|
|
|
|
uint8_t lg, k, n = 0;
|
|
|
|
|
|
|
|
for (k = 0; k < 32; k++) {
|
|
|
|
lg = dvdnav_get_spu_logical_stream(priv->dvdnav, k);
|
|
|
|
if (lg == 0xff)
|
|
|
|
continue;
|
|
|
|
if (lg >= n)
|
|
|
|
n = lg + 1;
|
|
|
|
}
|
|
|
|
return n;
|
|
|
|
}
|
|
|
|
|
2019-11-07 14:28:50 +00:00
|
|
|
static int fill_buffer(stream_t *s, void *buf, int max_len)
|
2014-07-14 23:49:02 +00:00
|
|
|
{
|
|
|
|
struct priv *priv = s->priv;
|
|
|
|
dvdnav_t *dvdnav = priv->dvdnav;
|
|
|
|
|
2019-11-07 14:37:18 +00:00
|
|
|
if (max_len < 2048) {
|
|
|
|
MP_FATAL(s, "Short read size. Data corruption will follow. Please "
|
|
|
|
"provide a patch.\n");
|
2014-07-14 23:49:02 +00:00
|
|
|
return -1;
|
2019-11-07 14:37:18 +00:00
|
|
|
}
|
2014-07-14 23:49:02 +00:00
|
|
|
|
|
|
|
while (1) {
|
|
|
|
int len = -1;
|
|
|
|
int event = DVDNAV_NOP;
|
|
|
|
if (dvdnav_get_next_block(dvdnav, buf, &event, &len) != DVDNAV_STATUS_OK)
|
|
|
|
{
|
|
|
|
MP_ERR(s, "Error getting next block from DVD %d (%s)\n",
|
|
|
|
event, dvdnav_err_to_string(dvdnav));
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
if (event != DVDNAV_BLOCK_OK) {
|
|
|
|
const char *name = LOOKUP_NAME(mp_dvdnav_events, event);
|
2019-10-02 22:22:18 +00:00
|
|
|
MP_TRACE(s, "DVDNAV: event %s (%d).\n", name, event);
|
2014-07-14 23:49:02 +00:00
|
|
|
}
|
|
|
|
switch (event) {
|
|
|
|
case DVDNAV_BLOCK_OK:
|
|
|
|
return len;
|
2015-08-03 21:40:41 +00:00
|
|
|
case DVDNAV_STOP:
|
2014-07-14 23:49:02 +00:00
|
|
|
return 0;
|
|
|
|
case DVDNAV_NAV_PACKET: {
|
|
|
|
pci_t *pnavpci = dvdnav_get_current_nav_pci(dvdnav);
|
|
|
|
uint32_t start_pts = pnavpci->pci_gi.vobu_s_ptm;
|
|
|
|
MP_TRACE(s, "start pts = %"PRIu32"\n", start_pts);
|
|
|
|
break;
|
|
|
|
}
|
2015-08-03 21:40:41 +00:00
|
|
|
case DVDNAV_STILL_FRAME:
|
|
|
|
dvdnav_still_skip(dvdnav);
|
2014-07-14 23:49:02 +00:00
|
|
|
return 0;
|
2015-08-03 21:40:41 +00:00
|
|
|
case DVDNAV_WAIT:
|
|
|
|
dvdnav_wait_skip(dvdnav);
|
2014-07-14 23:49:02 +00:00
|
|
|
return 0;
|
2015-08-03 21:40:41 +00:00
|
|
|
case DVDNAV_HIGHLIGHT:
|
2014-07-14 23:49:02 +00:00
|
|
|
break;
|
|
|
|
case DVDNAV_VTS_CHANGE: {
|
|
|
|
int tit = 0, part = 0;
|
|
|
|
dvdnav_vts_change_event_t *vts_event =
|
|
|
|
(dvdnav_vts_change_event_t *)s->buffer;
|
|
|
|
MP_INFO(s, "DVDNAV, switched to title: %d\n",
|
|
|
|
vts_event->new_vtsN);
|
|
|
|
if (!priv->had_initial_vts) {
|
|
|
|
// dvdnav sends an initial VTS change before any data; don't
|
|
|
|
// cause a blocking wait for the player, because the player in
|
|
|
|
// turn can't initialize the demuxer without data.
|
|
|
|
priv->had_initial_vts = true;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (dvdnav_current_title_info(dvdnav, &tit, &part) == DVDNAV_STATUS_OK)
|
|
|
|
{
|
|
|
|
MP_VERBOSE(s, "DVDNAV, NEW TITLE %d\n", tit);
|
2015-08-03 21:40:41 +00:00
|
|
|
if (priv->title > 0 && tit != priv->title)
|
2014-07-14 23:49:02 +00:00
|
|
|
MP_WARN(s, "Requested title not found\n");
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
case DVDNAV_CELL_CHANGE: {
|
|
|
|
dvdnav_cell_change_event_t *ev = (dvdnav_cell_change_event_t *)buf;
|
|
|
|
|
|
|
|
if (ev->pgc_length)
|
|
|
|
priv->duration = ev->pgc_length / 90;
|
|
|
|
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
case DVDNAV_SPU_CLUT_CHANGE: {
|
|
|
|
memcpy(priv->spu_clut, buf, 16 * sizeof(uint32_t));
|
|
|
|
priv->spu_clut_valid = true;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int control(stream_t *stream, int cmd, void *arg)
|
|
|
|
{
|
|
|
|
struct priv *priv = stream->priv;
|
|
|
|
dvdnav_t *dvdnav = priv->dvdnav;
|
2019-10-02 22:22:18 +00:00
|
|
|
int tit, part;
|
2014-07-14 23:49:02 +00:00
|
|
|
|
|
|
|
switch (cmd) {
|
2019-10-02 22:22:18 +00:00
|
|
|
case STREAM_CTRL_GET_NUM_CHAPTERS: {
|
|
|
|
if (dvdnav_current_title_info(dvdnav, &tit, &part) != DVDNAV_STATUS_OK)
|
|
|
|
break;
|
|
|
|
if (dvdnav_get_number_of_parts(dvdnav, tit, &part) != DVDNAV_STATUS_OK)
|
|
|
|
break;
|
|
|
|
if (!part)
|
|
|
|
break;
|
|
|
|
*(unsigned int *)arg = part;
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
case STREAM_CTRL_GET_CHAPTER_TIME: {
|
|
|
|
double *ch = arg;
|
|
|
|
int chapter = *ch;
|
|
|
|
if (dvdnav_current_title_info(dvdnav, &tit, &part) != DVDNAV_STATUS_OK)
|
|
|
|
break;
|
|
|
|
uint64_t *parts = NULL, duration = 0;
|
|
|
|
int n = dvdnav_describe_title_chapters(dvdnav, tit, &parts, &duration);
|
|
|
|
if (!parts)
|
|
|
|
break;
|
|
|
|
if (chapter < 0 || chapter + 1 > n)
|
|
|
|
break;
|
|
|
|
*ch = chapter > 0 ? parts[chapter - 1] / 90000.0 : 0;
|
|
|
|
free(parts);
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
case STREAM_CTRL_GET_TIME_LENGTH: {
|
2014-07-14 23:49:02 +00:00
|
|
|
if (priv->duration) {
|
|
|
|
*(double *)arg = (double)priv->duration / 1000.0;
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
2019-10-02 22:22:18 +00:00
|
|
|
case STREAM_CTRL_GET_ASPECT_RATIO: {
|
|
|
|
uint8_t ar = dvdnav_get_video_aspect(dvdnav);
|
|
|
|
*(double *)arg = !ar ? 4.0 / 3.0 : 16.0 / 9.0;
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
case STREAM_CTRL_GET_CURRENT_TIME: {
|
|
|
|
double tm;
|
|
|
|
tm = dvdnav_get_current_time(dvdnav) / 90000.0f;
|
|
|
|
if (tm != -1) {
|
|
|
|
*(double *)arg = tm;
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
case STREAM_CTRL_GET_NUM_TITLES: {
|
|
|
|
int32_t num_titles = 0;
|
|
|
|
if (dvdnav_get_number_of_titles(dvdnav, &num_titles) != DVDNAV_STATUS_OK)
|
|
|
|
break;
|
|
|
|
*((unsigned int*)arg)= num_titles;
|
|
|
|
return STREAM_OK;
|
|
|
|
}
|
|
|
|
case STREAM_CTRL_GET_TITLE_LENGTH: {
|
|
|
|
int t = *(double *)arg;
|
|
|
|
int32_t num_titles = 0;
|
|
|
|
if (dvdnav_get_number_of_titles(dvdnav, &num_titles) != DVDNAV_STATUS_OK)
|
|
|
|
break;
|
|
|
|
if (t < 0 || t >= num_titles)
|
|
|
|
break;
|
|
|
|
uint64_t duration = 0;
|
|
|
|
uint64_t *parts = NULL;
|
|
|
|
dvdnav_describe_title_chapters(dvdnav, t + 1, &parts, &duration);
|
|
|
|
if (!parts)
|
|
|
|
break;
|
|
|
|
free(parts);
|
|
|
|
*(double *)arg = duration / 90000.0;
|
|
|
|
return STREAM_OK;
|
|
|
|
}
|
|
|
|
case STREAM_CTRL_GET_CURRENT_TITLE: {
|
|
|
|
if (dvdnav_current_title_info(dvdnav, &tit, &part) != DVDNAV_STATUS_OK)
|
|
|
|
break;
|
|
|
|
*((unsigned int *) arg) = tit - 1;
|
|
|
|
return STREAM_OK;
|
|
|
|
}
|
|
|
|
case STREAM_CTRL_SET_CURRENT_TITLE: {
|
|
|
|
int title = *((unsigned int *) arg);
|
|
|
|
if (dvdnav_title_play(priv->dvdnav, title + 1) != DVDNAV_STATUS_OK)
|
|
|
|
break;
|
|
|
|
stream_drop_buffers(stream);
|
|
|
|
return STREAM_OK;
|
|
|
|
}
|
|
|
|
case STREAM_CTRL_SEEK_TO_TIME: {
|
dvd: try to improve seeking
libdvdnav is garbage. Seeking by time is incredibly inexact, which is in
part due to the fact that it does not use the DVD seek tables. Instead,
it assumes CBR for certain ranges within the DVD, which makes especially
small seeks unreliable.
I have no good fix for this, other than hacking libdvdnav (I'd rather
prefer to remove mpv DVD support completely than doing this). So here's
a shitty hack that tries to workaround these problems. A basic
observation is that seeking in VLC seems to work quite well; however it
seems to be based on seeking by blocks (unless there is a subtle "trick"
I didn't see in the source code). mpv usually seeks by timestamps, so
this is not an option for us. However, we can pretend we are doing this
in the DVD layer.
The previous commit added a way to pass through relative seeks. This
commit uses the relative seek. STREAM_CTRL_SEEK_TO_TIME is backwards
compatible (there's still dvdread and bluray), so most code is about
extracing the relative seek information and turning it into a block
seek.
(Another way would have been using SEEK_FACTOR stuff, but that would
probably make for a less reliable way to handle this situation.)
Additionally, if a hr-seek is done, add an offset by 10 seconds. As long
as the error done by libdvdnav is not worse, this should help with hr-
seeks - although it makes them much slower.
2015-01-19 20:25:30 +00:00
|
|
|
double *args = arg;
|
|
|
|
double d = args[0]; // absolute target timestamp
|
2016-02-28 18:14:23 +00:00
|
|
|
int flags = args[1]; // from SEEK_* flags (demux.h)
|
dvd: try to improve seeking
libdvdnav is garbage. Seeking by time is incredibly inexact, which is in
part due to the fact that it does not use the DVD seek tables. Instead,
it assumes CBR for certain ranges within the DVD, which makes especially
small seeks unreliable.
I have no good fix for this, other than hacking libdvdnav (I'd rather
prefer to remove mpv DVD support completely than doing this). So here's
a shitty hack that tries to workaround these problems. A basic
observation is that seeking in VLC seems to work quite well; however it
seems to be based on seeking by blocks (unless there is a subtle "trick"
I didn't see in the source code). mpv usually seeks by timestamps, so
this is not an option for us. However, we can pretend we are doing this
in the DVD layer.
The previous commit added a way to pass through relative seeks. This
commit uses the relative seek. STREAM_CTRL_SEEK_TO_TIME is backwards
compatible (there's still dvdread and bluray), so most code is about
extracing the relative seek information and turning it into a block
seek.
(Another way would have been using SEEK_FACTOR stuff, but that would
probably make for a less reliable way to handle this situation.)
Additionally, if a hr-seek is done, add an offset by 10 seconds. As long
as the error done by libdvdnav is not worse, this should help with hr-
seeks - although it makes them much slower.
2015-01-19 20:25:30 +00:00
|
|
|
if (flags & SEEK_HR)
|
|
|
|
d -= 10; // fudge offset; it's a hack, because fuck libdvd*
|
2014-07-14 23:49:02 +00:00
|
|
|
int64_t tm = (int64_t)(d * 90000);
|
|
|
|
if (tm < 0)
|
|
|
|
tm = 0;
|
|
|
|
if (priv->duration && tm >= (priv->duration * 90))
|
|
|
|
tm = priv->duration * 90 - 1;
|
dvd: try to improve seeking
libdvdnav is garbage. Seeking by time is incredibly inexact, which is in
part due to the fact that it does not use the DVD seek tables. Instead,
it assumes CBR for certain ranges within the DVD, which makes especially
small seeks unreliable.
I have no good fix for this, other than hacking libdvdnav (I'd rather
prefer to remove mpv DVD support completely than doing this). So here's
a shitty hack that tries to workaround these problems. A basic
observation is that seeking in VLC seems to work quite well; however it
seems to be based on seeking by blocks (unless there is a subtle "trick"
I didn't see in the source code). mpv usually seeks by timestamps, so
this is not an option for us. However, we can pretend we are doing this
in the DVD layer.
The previous commit added a way to pass through relative seeks. This
commit uses the relative seek. STREAM_CTRL_SEEK_TO_TIME is backwards
compatible (there's still dvdread and bluray), so most code is about
extracing the relative seek information and turning it into a block
seek.
(Another way would have been using SEEK_FACTOR stuff, but that would
probably make for a less reliable way to handle this situation.)
Additionally, if a hr-seek is done, add an offset by 10 seconds. As long
as the error done by libdvdnav is not worse, this should help with hr-
seeks - although it makes them much slower.
2015-01-19 20:25:30 +00:00
|
|
|
uint32_t pos, len;
|
|
|
|
if (dvdnav_get_position(dvdnav, &pos, &len) != DVDNAV_STATUS_OK)
|
2014-07-14 23:49:02 +00:00
|
|
|
break;
|
2016-02-28 18:14:23 +00:00
|
|
|
MP_VERBOSE(stream, "seek to PTS %f (%"PRId64")\n", d, tm);
|
|
|
|
if (dvdnav_time_search(dvdnav, tm) != DVDNAV_STATUS_OK)
|
|
|
|
break;
|
2014-07-14 23:49:02 +00:00
|
|
|
stream_drop_buffers(stream);
|
|
|
|
d = dvdnav_get_current_time(dvdnav) / 90000.0f;
|
|
|
|
MP_VERBOSE(stream, "landed at: %f\n", d);
|
dvd: try to improve seeking
libdvdnav is garbage. Seeking by time is incredibly inexact, which is in
part due to the fact that it does not use the DVD seek tables. Instead,
it assumes CBR for certain ranges within the DVD, which makes especially
small seeks unreliable.
I have no good fix for this, other than hacking libdvdnav (I'd rather
prefer to remove mpv DVD support completely than doing this). So here's
a shitty hack that tries to workaround these problems. A basic
observation is that seeking in VLC seems to work quite well; however it
seems to be based on seeking by blocks (unless there is a subtle "trick"
I didn't see in the source code). mpv usually seeks by timestamps, so
this is not an option for us. However, we can pretend we are doing this
in the DVD layer.
The previous commit added a way to pass through relative seeks. This
commit uses the relative seek. STREAM_CTRL_SEEK_TO_TIME is backwards
compatible (there's still dvdread and bluray), so most code is about
extracing the relative seek information and turning it into a block
seek.
(Another way would have been using SEEK_FACTOR stuff, but that would
probably make for a less reliable way to handle this situation.)
Additionally, if a hr-seek is done, add an offset by 10 seconds. As long
as the error done by libdvdnav is not worse, this should help with hr-
seeks - although it makes them much slower.
2015-01-19 20:25:30 +00:00
|
|
|
if (dvdnav_get_position(dvdnav, &pos, &len) == DVDNAV_STATUS_OK)
|
|
|
|
MP_VERBOSE(stream, "block: %lu\n", (unsigned long)pos);
|
2014-07-14 23:49:02 +00:00
|
|
|
return STREAM_OK;
|
|
|
|
}
|
2019-10-02 22:22:18 +00:00
|
|
|
case STREAM_CTRL_GET_NUM_ANGLES: {
|
|
|
|
uint32_t curr, angles;
|
|
|
|
if (dvdnav_get_angle_info(dvdnav, &curr, &angles) != DVDNAV_STATUS_OK)
|
|
|
|
break;
|
|
|
|
*(int *)arg = angles;
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
case STREAM_CTRL_GET_ANGLE: {
|
|
|
|
uint32_t curr, angles;
|
|
|
|
if (dvdnav_get_angle_info(dvdnav, &curr, &angles) != DVDNAV_STATUS_OK)
|
|
|
|
break;
|
|
|
|
*(int *)arg = curr;
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
case STREAM_CTRL_SET_ANGLE: {
|
|
|
|
uint32_t curr, angles;
|
|
|
|
int new_angle = *(int *)arg;
|
|
|
|
if (dvdnav_get_angle_info(dvdnav, &curr, &angles) != DVDNAV_STATUS_OK)
|
|
|
|
break;
|
|
|
|
if (new_angle > angles || new_angle < 1)
|
|
|
|
break;
|
|
|
|
if (dvdnav_angle_change(dvdnav, new_angle) != DVDNAV_STATUS_OK)
|
|
|
|
return 1;
|
2019-12-11 16:23:39 +00:00
|
|
|
break;
|
2019-10-02 22:22:18 +00:00
|
|
|
}
|
|
|
|
case STREAM_CTRL_GET_LANG: {
|
|
|
|
struct stream_lang_req *req = arg;
|
|
|
|
int lang = 0;
|
|
|
|
switch (req->type) {
|
|
|
|
case STREAM_AUDIO:
|
|
|
|
lang = mp_dvdnav_lang_from_aid(stream, req->id);
|
|
|
|
break;
|
|
|
|
case STREAM_SUB:
|
|
|
|
lang = mp_dvdnav_lang_from_sid(stream, req->id);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (!lang)
|
|
|
|
break;
|
|
|
|
snprintf(req->name, sizeof(req->name), "%c%c", lang >> 8, lang);
|
|
|
|
return STREAM_OK;
|
|
|
|
}
|
|
|
|
case STREAM_CTRL_GET_DVD_INFO: {
|
|
|
|
struct stream_dvd_info_req *req = arg;
|
|
|
|
memset(req, 0, sizeof(*req));
|
|
|
|
req->num_subs = mp_dvdnav_number_of_subs(stream);
|
2024-03-17 17:21:09 +00:00
|
|
|
static_assert(sizeof(uint32_t) == sizeof(unsigned int), "");
|
2019-10-02 22:22:18 +00:00
|
|
|
memcpy(req->palette, priv->spu_clut, sizeof(req->palette));
|
|
|
|
return STREAM_OK;
|
|
|
|
}
|
|
|
|
case STREAM_CTRL_GET_DISC_NAME: {
|
|
|
|
const char *volume = NULL;
|
|
|
|
if (dvdnav_get_title_string(dvdnav, &volume) != DVDNAV_STATUS_OK)
|
|
|
|
break;
|
|
|
|
if (!volume || !volume[0])
|
|
|
|
break;
|
|
|
|
*(char**)arg = talloc_strdup(NULL, volume);
|
|
|
|
return STREAM_OK;
|
|
|
|
}
|
2014-07-14 23:49:02 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return STREAM_UNSUPPORTED;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void stream_dvdnav_close(stream_t *s)
|
|
|
|
{
|
|
|
|
struct priv *priv = s->priv;
|
|
|
|
dvdnav_close(priv->dvdnav);
|
|
|
|
priv->dvdnav = NULL;
|
|
|
|
if (priv->dvd_speed)
|
|
|
|
dvd_set_speed(s, priv->filename, -1);
|
|
|
|
if (priv->filename)
|
|
|
|
free(priv->filename);
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct priv *new_dvdnav_stream(stream_t *stream, char *filename)
|
|
|
|
{
|
|
|
|
struct priv *priv = stream->priv;
|
|
|
|
const char *title_str;
|
|
|
|
|
|
|
|
if (!filename)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
if (!(priv->filename = strdup(filename)))
|
|
|
|
return NULL;
|
|
|
|
|
2016-09-08 19:46:48 +00:00
|
|
|
priv->dvd_speed = priv->opts->speed;
|
2014-07-14 23:49:02 +00:00
|
|
|
dvd_set_speed(stream, priv->filename, priv->dvd_speed);
|
|
|
|
|
|
|
|
if (dvdnav_open(&(priv->dvdnav), priv->filename) != DVDNAV_STATUS_OK) {
|
|
|
|
free(priv->filename);
|
|
|
|
priv->filename = NULL;
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!priv->dvdnav)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
dvdnav_set_readahead_flag(priv->dvdnav, 1);
|
|
|
|
if (dvdnav_set_PGC_positioning_flag(priv->dvdnav, 1) != DVDNAV_STATUS_OK)
|
|
|
|
MP_ERR(stream, "stream_dvdnav, failed to set PGC positioning\n");
|
|
|
|
/* report the title?! */
|
|
|
|
dvdnav_get_title_string(priv->dvdnav, &title_str);
|
|
|
|
|
|
|
|
return priv;
|
|
|
|
}
|
|
|
|
|
2016-09-08 19:46:48 +00:00
|
|
|
static int open_s_internal(stream_t *stream)
|
2014-07-14 23:49:02 +00:00
|
|
|
{
|
|
|
|
struct priv *priv, *p;
|
|
|
|
priv = p = stream->priv;
|
|
|
|
char *filename;
|
|
|
|
|
2016-09-08 19:46:48 +00:00
|
|
|
p->opts = mp_get_config_group(stream, stream->global, &dvd_conf);
|
|
|
|
|
2014-07-14 23:49:02 +00:00
|
|
|
if (p->device && p->device[0])
|
|
|
|
filename = p->device;
|
2016-09-08 19:46:48 +00:00
|
|
|
else if (p->opts->device && p->opts->device[0])
|
|
|
|
filename = p->opts->device;
|
2014-07-14 23:49:02 +00:00
|
|
|
else
|
|
|
|
filename = DEFAULT_DVD_DEVICE;
|
|
|
|
if (!new_dvdnav_stream(stream, filename)) {
|
|
|
|
MP_ERR(stream, "Couldn't open DVD device: %s\n",
|
|
|
|
filename);
|
stream, demux: redo origin policy thing
mpv has a very weak and very annoying policy that determines whether a
playlist should be used or not. For example, if you play a remote
playlist, you usually don't want it to be able to read local filesystem
entries. (Although for a media player the impact is small I guess.)
It's weak and annoying as in that it does not prevent certain cases
which could be interpreted as bad in some cases, such as allowing
playlists on the local filesystem to reference remote URLs. It probably
barely makes sense, but we just want to exclude some other "definitely
not a good idea" things, all while playlists generally just work, so
whatever.
The policy is:
- from the command line anything is played
- local playlists can reference anything except "unsafe" streams
("unsafe" means special stream inputs like libavfilter graphs)
- remote playlists can reference only remote URLs
- things like "memory://" and archives are "transparent" to this
This commit does... something. It replaces the weird stream flags with a
slightly clearer "origin" value, which is now consequently passed down
and used everywhere. It fixes some deviations from the described policy.
I wanted to force archives to reference only content within them, but
this would probably have been more complicated (or required different
abstractions), and I'm too lazy to figure it out, so archives are now
"transparent" (playlists within archives behave the same outside).
There may be a lot of bugs in this.
This is unfortunately a very noisy commit because:
- every stream open call now needs to pass the origin
- so does every demuxer open call (=> params param. gets mandatory)
- most stream were changed to provide the "origin" value
- the origin value needed to be passed along in a lot of places
- I was too lazy to split the commit
Fixes: #7274
2019-12-20 08:41:42 +00:00
|
|
|
return STREAM_ERROR;
|
2014-07-14 23:49:02 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (p->track == TITLE_LONGEST) { // longest
|
|
|
|
dvdnav_t *dvdnav = priv->dvdnav;
|
|
|
|
uint64_t best_length = 0;
|
|
|
|
int best_title = -1;
|
|
|
|
int32_t num_titles;
|
|
|
|
if (dvdnav_get_number_of_titles(dvdnav, &num_titles) == DVDNAV_STATUS_OK) {
|
2017-03-29 01:16:11 +00:00
|
|
|
MP_VERBOSE(stream, "List of available titles:\n");
|
2014-07-14 23:49:02 +00:00
|
|
|
for (int n = 1; n <= num_titles; n++) {
|
|
|
|
uint64_t *parts = NULL, duration = 0;
|
|
|
|
dvdnav_describe_title_chapters(dvdnav, n, &parts, &duration);
|
|
|
|
if (parts) {
|
|
|
|
if (duration > best_length) {
|
|
|
|
best_length = duration;
|
|
|
|
best_title = n;
|
|
|
|
}
|
2017-03-29 01:16:11 +00:00
|
|
|
if (duration > 90000) { // arbitrarily ignore <1s titles
|
|
|
|
char *time = mp_format_time(duration / 90000, false);
|
|
|
|
MP_VERBOSE(stream, "title: %3d duration: %s\n",
|
|
|
|
n - 1, time);
|
|
|
|
talloc_free(time);
|
|
|
|
}
|
2014-07-14 23:49:02 +00:00
|
|
|
free(parts);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
p->track = best_title - 1;
|
|
|
|
MP_INFO(stream, "Selecting title %d.\n", p->track);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (p->track >= 0) {
|
|
|
|
priv->title = p->track;
|
|
|
|
if (dvdnav_title_play(priv->dvdnav, p->track + 1) != DVDNAV_STATUS_OK) {
|
|
|
|
MP_FATAL(stream, "dvdnav_stream, couldn't select title %d, error '%s'\n",
|
|
|
|
p->track, dvdnav_err_to_string(priv->dvdnav));
|
|
|
|
return STREAM_UNSUPPORTED;
|
|
|
|
}
|
|
|
|
} else {
|
2015-06-26 21:37:23 +00:00
|
|
|
MP_FATAL(stream, "DVD menu support has been removed.\n");
|
|
|
|
return STREAM_ERROR;
|
2014-07-14 23:49:02 +00:00
|
|
|
}
|
2016-09-08 19:46:48 +00:00
|
|
|
if (p->opts->angle > 1)
|
|
|
|
dvdnav_angle_change(priv->dvdnav, p->opts->angle);
|
2014-07-14 23:49:02 +00:00
|
|
|
|
|
|
|
stream->fill_buffer = fill_buffer;
|
|
|
|
stream->control = control;
|
|
|
|
stream->close = stream_dvdnav_close;
|
2019-10-02 22:22:18 +00:00
|
|
|
stream->demuxer = "+disc";
|
2014-07-14 23:49:02 +00:00
|
|
|
stream->lavf_type = "mpeg";
|
|
|
|
|
|
|
|
return STREAM_OK;
|
|
|
|
}
|
|
|
|
|
2016-09-08 19:46:48 +00:00
|
|
|
static int open_s(stream_t *stream)
|
|
|
|
{
|
|
|
|
struct priv *priv = talloc_zero(stream, struct priv);
|
|
|
|
stream->priv = priv;
|
|
|
|
|
|
|
|
bstr title, bdevice;
|
|
|
|
bstr_split_tok(bstr0(stream->path), "/", &title, &bdevice);
|
|
|
|
|
|
|
|
priv->track = TITLE_LONGEST;
|
|
|
|
|
|
|
|
if (bstr_equals0(title, "longest") || bstr_equals0(title, "first")) {
|
|
|
|
priv->track = TITLE_LONGEST;
|
|
|
|
} else if (bstr_equals0(title, "menu")) {
|
|
|
|
priv->track = TITLE_MENU;
|
|
|
|
} else if (title.len) {
|
|
|
|
bstr rest;
|
2017-03-29 01:14:39 +00:00
|
|
|
priv->track = bstrtoll(title, &rest, 10);
|
2016-09-08 19:46:48 +00:00
|
|
|
if (rest.len) {
|
|
|
|
MP_ERR(stream, "number expected: '%.*s'\n", BSTR_P(rest));
|
|
|
|
return STREAM_ERROR;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
priv->device = bstrto0(priv, bdevice);
|
|
|
|
|
|
|
|
return open_s_internal(stream);
|
|
|
|
}
|
|
|
|
|
2014-07-14 23:49:02 +00:00
|
|
|
const stream_info_t stream_info_dvdnav = {
|
|
|
|
.name = "dvdnav",
|
|
|
|
.open = open_s,
|
|
|
|
.protocols = (const char*const[]){ "dvd", "dvdnav", NULL },
|
stream, demux: redo origin policy thing
mpv has a very weak and very annoying policy that determines whether a
playlist should be used or not. For example, if you play a remote
playlist, you usually don't want it to be able to read local filesystem
entries. (Although for a media player the impact is small I guess.)
It's weak and annoying as in that it does not prevent certain cases
which could be interpreted as bad in some cases, such as allowing
playlists on the local filesystem to reference remote URLs. It probably
barely makes sense, but we just want to exclude some other "definitely
not a good idea" things, all while playlists generally just work, so
whatever.
The policy is:
- from the command line anything is played
- local playlists can reference anything except "unsafe" streams
("unsafe" means special stream inputs like libavfilter graphs)
- remote playlists can reference only remote URLs
- things like "memory://" and archives are "transparent" to this
This commit does... something. It replaces the weird stream flags with a
slightly clearer "origin" value, which is now consequently passed down
and used everywhere. It fixes some deviations from the described policy.
I wanted to force archives to reference only content within them, but
this would probably have been more complicated (or required different
abstractions), and I'm too lazy to figure it out, so archives are now
"transparent" (playlists within archives behave the same outside).
There may be a lot of bugs in this.
This is unfortunately a very noisy commit because:
- every stream open call now needs to pass the origin
- so does every demuxer open call (=> params param. gets mandatory)
- most stream were changed to provide the "origin" value
- the origin value needed to be passed along in a lot of places
- I was too lazy to split the commit
Fixes: #7274
2019-12-20 08:41:42 +00:00
|
|
|
.stream_origin = STREAM_ORIGIN_UNSAFE,
|
2014-07-14 23:49:02 +00:00
|
|
|
};
|
2014-09-25 21:54:58 +00:00
|
|
|
|
|
|
|
static bool check_ifo(const char *path)
|
|
|
|
{
|
|
|
|
if (strcasecmp(mp_basename(path), "video_ts.ifo"))
|
|
|
|
return false;
|
|
|
|
|
|
|
|
return dvd_probe(path, ".ifo", "DVDVIDEO-VMG");
|
|
|
|
}
|
|
|
|
|
|
|
|
static int ifo_dvdnav_stream_open(stream_t *stream)
|
|
|
|
{
|
2016-09-08 19:46:48 +00:00
|
|
|
struct priv *priv = talloc_zero(stream, struct priv);
|
2014-09-25 21:54:58 +00:00
|
|
|
stream->priv = priv;
|
2016-09-08 19:46:48 +00:00
|
|
|
|
2016-12-04 22:15:31 +00:00
|
|
|
if (!stream->access_references)
|
|
|
|
goto unsupported;
|
|
|
|
|
2016-09-08 19:46:48 +00:00
|
|
|
priv->track = TITLE_LONGEST;
|
2014-09-25 21:54:58 +00:00
|
|
|
|
|
|
|
char *path = mp_file_get_path(priv, bstr0(stream->url));
|
|
|
|
if (!path)
|
|
|
|
goto unsupported;
|
|
|
|
|
|
|
|
// We allow the path to point to a directory containing VIDEO_TS/, a
|
|
|
|
// directory containing VIDEO_TS.IFO, or that file itself.
|
|
|
|
if (!check_ifo(path)) {
|
|
|
|
// On UNIX, just assume the filename is always uppercase.
|
2015-05-09 13:26:47 +00:00
|
|
|
char *npath = mp_path_join(priv, path, "VIDEO_TS.IFO");
|
2014-09-25 21:54:58 +00:00
|
|
|
if (!check_ifo(npath)) {
|
2015-05-09 13:26:47 +00:00
|
|
|
npath = mp_path_join(priv, path, "VIDEO_TS/VIDEO_TS.IFO");
|
2014-09-25 21:54:58 +00:00
|
|
|
if (!check_ifo(npath))
|
|
|
|
goto unsupported;
|
|
|
|
}
|
|
|
|
path = npath;
|
|
|
|
}
|
|
|
|
|
|
|
|
priv->device = bstrto0(priv, mp_dirname(path));
|
|
|
|
|
|
|
|
MP_INFO(stream, ".IFO detected. Redirecting to dvd://\n");
|
2016-09-08 19:46:48 +00:00
|
|
|
return open_s_internal(stream);
|
2014-09-25 21:54:58 +00:00
|
|
|
|
|
|
|
unsupported:
|
|
|
|
talloc_free(priv);
|
|
|
|
stream->priv = NULL;
|
|
|
|
return STREAM_UNSUPPORTED;
|
|
|
|
}
|
|
|
|
|
|
|
|
const stream_info_t stream_info_ifo_dvdnav = {
|
2017-02-02 17:24:27 +00:00
|
|
|
.name = "ifo_dvdnav",
|
2014-09-25 21:54:58 +00:00
|
|
|
.open = ifo_dvdnav_stream_open,
|
|
|
|
.protocols = (const char*const[]){ "file", "", NULL },
|
stream, demux: redo origin policy thing
mpv has a very weak and very annoying policy that determines whether a
playlist should be used or not. For example, if you play a remote
playlist, you usually don't want it to be able to read local filesystem
entries. (Although for a media player the impact is small I guess.)
It's weak and annoying as in that it does not prevent certain cases
which could be interpreted as bad in some cases, such as allowing
playlists on the local filesystem to reference remote URLs. It probably
barely makes sense, but we just want to exclude some other "definitely
not a good idea" things, all while playlists generally just work, so
whatever.
The policy is:
- from the command line anything is played
- local playlists can reference anything except "unsafe" streams
("unsafe" means special stream inputs like libavfilter graphs)
- remote playlists can reference only remote URLs
- things like "memory://" and archives are "transparent" to this
This commit does... something. It replaces the weird stream flags with a
slightly clearer "origin" value, which is now consequently passed down
and used everywhere. It fixes some deviations from the described policy.
I wanted to force archives to reference only content within them, but
this would probably have been more complicated (or required different
abstractions), and I'm too lazy to figure it out, so archives are now
"transparent" (playlists within archives behave the same outside).
There may be a lot of bugs in this.
This is unfortunately a very noisy commit because:
- every stream open call now needs to pass the origin
- so does every demuxer open call (=> params param. gets mandatory)
- most stream were changed to provide the "origin" value
- the origin value needed to be passed along in a lot of places
- I was too lazy to split the commit
Fixes: #7274
2019-12-20 08:41:42 +00:00
|
|
|
.stream_origin = STREAM_ORIGIN_UNSAFE,
|
2014-09-25 21:54:58 +00:00
|
|
|
};
|