diff options
-rw-r--r-- | DOCS/interface-changes.rst | 2 | ||||
-rw-r--r-- | DOCS/man/input.rst | 39 | ||||
-rw-r--r-- | demux/demux.c | 3 | ||||
-rw-r--r-- | demux/demux.h | 1 | ||||
-rw-r--r-- | demux/demux_disc.c | 379 | ||||
-rw-r--r-- | demux/demux_lavf.c | 20 | ||||
-rw-r--r-- | options/parse_commandline.c | 35 | ||||
-rw-r--r-- | player/command.c | 145 | ||||
-rw-r--r-- | player/configfiles.c | 5 | ||||
-rw-r--r-- | stream/stream.h | 21 | ||||
-rw-r--r-- | stream/stream_bluray.c | 105 | ||||
-rw-r--r-- | stream/stream_cdda.c | 32 | ||||
-rw-r--r-- | stream/stream_dvdnav.c | 205 | ||||
-rw-r--r-- | wscript_build.py | 1 |
14 files changed, 25 insertions, 968 deletions
diff --git a/DOCS/interface-changes.rst b/DOCS/interface-changes.rst index 75a81998fc..8fccb23e29 100644 --- a/DOCS/interface-changes.rst +++ b/DOCS/interface-changes.rst @@ -80,6 +80,8 @@ Interface changes and `--macos-title-bar-appearance`. - The default for `--vulkan-async-compute` has changed to `yes` from `no` with the move to libplacebo as the back-end for vulkan rendering. + - Remove "disc-titles", "disc-title", "disc-title-list", and "angle" + properties. dvd:// does not support title ranges anymore. --- mpv 0.29.0 --- - drop --opensles-sample-rate, as --audio-samplerate should be used if desired - drop deprecated --videotoolbox-format, --ff-aid, --ff-vid, --ff-sid, diff --git a/DOCS/man/input.rst b/DOCS/man/input.rst index 2b483a4f05..43fb868db1 100644 --- a/DOCS/man/input.rst +++ b/DOCS/man/input.rst @@ -1182,8 +1182,6 @@ Property list ``media-title`` If the currently played file has a ``title`` tag, use that. - Otherwise, if the media type is DVD, return the volume ID of DVD. - Otherwise, return the ``filename`` property. ``file-format`` @@ -1296,40 +1294,6 @@ Property list Current MKV edition number. Setting this property to a different value will restart playback. The number of the first edition is 0. -``disc-titles`` - Number of BD/DVD titles. - - This has a number of sub-properties. Replace ``N`` with the 0-based edition - index. - - ``disc-titles/count`` - Number of titles. - - ``disc-titles/id`` - Title ID as integer. Currently, this is the same as the title index. - - ``disc-titles/length`` - Length in seconds. Can be unavailable in a number of cases (currently - it works for libdvdnav only). - - When querying the property with the client API using ``MPV_FORMAT_NODE``, - or with Lua ``mp.get_property_native``, this will return a mpv_node with - the following contents: - - :: - - MPV_FORMAT_NODE_ARRAY - MPV_FORMAT_NODE_MAP (for each edition) - "id" MPV_FORMAT_INT64 - "length" MPV_FORMAT_DOUBLE - -``disc-title-list`` - List of BD/DVD titles. - -``disc-title`` (RW) - Current BD/DVD title number. Writing works only for ``dvdnav://`` and - ``bd://`` (and aliases for these). - ``chapters`` Number of chapters. @@ -1369,9 +1333,6 @@ Property list "title" MPV_FORMAT_STRING "default" MPV_FORMAT_FLAG -``angle`` (RW) - Current DVD angle. - ``metadata`` Metadata key/value pairs. diff --git a/demux/demux.c b/demux/demux.c index d55c670d19..b1f7ca0105 100644 --- a/demux/demux.c +++ b/demux/demux.c @@ -57,7 +57,6 @@ extern const demuxer_desc_t demuxer_desc_mf; extern const demuxer_desc_t demuxer_desc_matroska; extern const demuxer_desc_t demuxer_desc_lavf; extern const demuxer_desc_t demuxer_desc_playlist; -extern const demuxer_desc_t demuxer_desc_disc; extern const demuxer_desc_t demuxer_desc_rar; extern const demuxer_desc_t demuxer_desc_libarchive; extern const demuxer_desc_t demuxer_desc_null; @@ -68,7 +67,6 @@ extern const demuxer_desc_t demuxer_desc_timeline; * libraries and demuxers requiring binary support. */ const demuxer_desc_t *const demuxer_list[] = { - &demuxer_desc_disc, &demuxer_desc_edl, &demuxer_desc_cue, &demuxer_desc_rawaudio, @@ -2357,7 +2355,6 @@ static struct demuxer *open_given_type(struct mpv_global *global, .access_references = opts->access_references, .events = DEMUX_EVENT_ALL, .duration = -1, - .extended_ctrls = stream->extended_ctrls, }; demuxer->seekable = stream->seekable; diff --git a/demux/demux.h b/demux/demux.h index 1cc740589a..2bb81526ab 100644 --- a/demux/demux.h +++ b/demux/demux.h @@ -32,7 +32,6 @@ enum demux_ctrl { DEMUXER_CTRL_SWITCHED_TRACKS = 1, - DEMUXER_CTRL_RESYNC, DEMUXER_CTRL_IDENTIFY_PROGRAM, DEMUXER_CTRL_STREAM_CTRL, DEMUXER_CTRL_GET_READER_STATE, diff --git a/demux/demux_disc.c b/demux/demux_disc.c deleted file mode 100644 index e5c63cea17..0000000000 --- a/demux/demux_disc.c +++ /dev/null @@ -1,379 +0,0 @@ -/* - * This file is part of mpv. - * - * mpv is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * mpv 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 - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with mpv. If not, see <http://www.gnu.org/licenses/>. - */ - -#include <string.h> -#include <math.h> -#include <assert.h> - -#include "common/common.h" -#include "common/msg.h" - -#include "stream/stream.h" -#include "video/mp_image.h" -#include "demux.h" -#include "stheader.h" - -#include "video/csputils.h" - -struct priv { - struct demuxer *slave; - // streams[slave_stream_index] == our_stream - struct sh_stream **streams; - int num_streams; - // This contains each DVD sub stream, or NULL. Needed because DVD packets - // can come arbitrarily late in the MPEG stream, so the slave demuxer - // might add the streams only later. - struct sh_stream *dvd_subs[32]; - // Used to rewrite the raw MPEG timestamps to playback time. - double base_time; // playback display start time of current segment - double base_dts; // packet DTS that maps to base_time - double last_dts; // DTS of previously demuxed packet - bool seek_reinit; // needs reinit after seek - - bool is_dvd, is_cdda; -}; - -// If the timestamp difference between subsequent packets is this big, assume -// a reset. It should be big enough to account for 1. low video framerates and -// large audio frames, and 2. bad interleaving. -#define DTS_RESET_THRESHOLD 5.0 - -static void reselect_streams(demuxer_t *demuxer) -{ - struct priv *p = demuxer->priv; - int num_slave = demux_get_num_stream(p->slave); - for (int n = 0; n < MPMIN(num_slave, p->num_streams); n++) { - if (p->streams[n]) { - demuxer_select_track(p->slave, demux_get_stream(p->slave, n), - MP_NOPTS_VALUE, demux_stream_is_selected(p->streams[n])); - } - } -} - -static void get_disc_lang(struct stream *stream, struct sh_stream *sh, bool dvd) -{ - struct stream_lang_req req = {.type = sh->type, .id = sh->demuxer_id}; - if (dvd && sh->type == STREAM_SUB) - req.id = req.id & 0x1F; // mpeg ID to index - stream_control(stream, STREAM_CTRL_GET_LANG, &req); - if (req.name[0]) - sh->lang = talloc_strdup(sh, req.name); -} - -static void add_dvd_streams(demuxer_t *demuxer) -{ - struct priv *p = demuxer->priv; - struct stream *stream = demuxer->stream; - if (!p->is_dvd) - return; - struct stream_dvd_info_req info; - if (stream_control(stream, STREAM_CTRL_GET_DVD_INFO, &info) > 0) { - for (int n = 0; n < MPMIN(32, info.num_subs); n++) { - struct sh_stream *sh = demux_alloc_sh_stream(STREAM_SUB); - sh->demuxer_id = n + 0x20; - sh->codec->codec = "dvd_subtitle"; - get_disc_lang(stream, sh, true); - // p->streams _must_ match with p->slave->streams, so we can't add - // it yet - it has to be done when the real stream appears, which - // could be right on start, or any time later. - p->dvd_subs[n] = sh; - - // emulate the extradata - struct mp_csp_params csp = MP_CSP_PARAMS_DEFAULTS; - struct mp_cmat cmatrix; - mp_get_csp_matrix(&csp, &cmatrix); - - char *s = talloc_strdup(sh, ""); - s = talloc_asprintf_append(s, "palette: "); - for (int i = 0; i < 16; i++) { - int color = info.palette[i]; - int y[3] = {(color >> 16) & 0xff, (color >> 8) & 0xff, color & 0xff}; - int c[3]; - mp_map_fixp_color(&cmatrix, 8, y, 8, c); - color = (c[2] << 16) | (c[1] << 8) | c[0]; - - if (i != 0) - s = talloc_asprintf_append(s, ", "); - s = talloc_asprintf_append(s, "%06x", color); - } - s = talloc_asprintf_append(s, "\n"); - - sh->codec->extradata = s; - sh->codec->extradata_size = strlen(s); - - demux_add_sh_stream(demuxer, sh); - } - } -} - -static void add_streams(demuxer_t *demuxer) -{ - struct priv *p = demuxer->priv; - - for (int n = p->num_streams; n < demux_get_num_stream(p->slave); n++) { - struct sh_stream *src = demux_get_stream(p->slave, n); - if (src->type == STREAM_SUB) { - struct sh_stream *sub = NULL; - if (src->demuxer_id >= 0x20 && src->demuxer_id <= 0x3F) - sub = p->dvd_subs[src->demuxer_id - 0x20]; - if (sub) { - assert(p->num_streams == n); // directly mapped - MP_TARRAY_APPEND(p, p->streams, p->num_streams, sub); - continue; - } - } - struct sh_stream *sh = demux_alloc_sh_stream(src->type); - assert(p->num_streams == n); // directly mapped - MP_TARRAY_APPEND(p, p->streams, p->num_streams, sh); - // Copy all stream fields that might be relevant - *sh->codec = *src->codec; - sh->demuxer_id = src->demuxer_id; - if (src->type == STREAM_VIDEO) { - double ar; - if (stream_control(demuxer->stream, STREAM_CTRL_GET_ASPECT_RATIO, &ar) - == STREAM_OK) - { - struct mp_image_params f = {.w = src->codec->disp_w, - .h = src->codec->disp_h}; - mp_image_params_set_dsize(&f, 1728 * ar, 1728); - sh->codec->par_w = f.p_w; - sh->codec->par_h = f.p_h; - } - } - get_disc_lang(demuxer->stream, sh, p->is_dvd); - demux_add_sh_stream(demuxer, sh); - } - reselect_streams(demuxer); -} - -static void d_seek(demuxer_t *demuxer, double seek_pts, int flags) -{ - struct priv *p = demuxer->priv; - - if (p->is_cdda) { - demux_seek(p->slave, seek_pts, flags); - return; - } - - if (flags & SEEK_FACTOR) { - double tmp = 0; - stream_control(demuxer->stream, STREAM_CTRL_GET_TIME_LENGTH, &tmp); - seek_pts *= tmp; - } - - MP_VERBOSE(demuxer, "seek to: %f\n", seek_pts); - - double seek_arg[] = {seek_pts, flags}; - stream_control(demuxer->stream, STREAM_CTRL_SEEK_TO_TIME, seek_arg); - demux_control(p->slave, DEMUXER_CTRL_RESYNC, NULL); - - p->seek_reinit = true; -} - -static void reset_pts(demuxer_t *demuxer) -{ - struct priv *p = demuxer->priv; - - double base; - if (stream_control(demuxer->stream, STREAM_CTRL_GET_CURRENT_TIME, &base) < 1) - base = 0; - - MP_VERBOSE(demuxer, "reset to time: %f\n", base); - - p->base_dts = p->last_dts = MP_NOPTS_VALUE; - p->base_time = base; - p->seek_reinit = false; -} - -static int d_fill_buffer(demuxer_t *demuxer) -{ - struct priv *p = demuxer->priv; - - struct demux_packet *pkt = demux_read_any_packet(p->slave); - if (!pkt) - return 0; - - demux_update(p->slave); - - if (p->seek_reinit) - reset_pts(demuxer); - - add_streams(demuxer); - if (pkt->stream >= p->num_streams) { // out of memory? - talloc_free(pkt); - return 0; - } - - struct sh_stream *sh = p->streams[pkt->stream]; - if (!demux_stream_is_selected(sh)) { - talloc_free(pkt); - return 1; - } - - if (p->is_cdda) { - demux_add_packet(sh, pkt); - return 1; - } - - MP_TRACE(demuxer, "ipts: %d %f %f\n", sh->type, pkt->pts, pkt->dts); - - if (sh->type == STREAM_SUB) { - if (p->base_dts == MP_NOPTS_VALUE) - MP_WARN(demuxer, "subtitle packet along PTS reset\n"); - } else if (pkt->dts != MP_NOPTS_VALUE) { - // Use the very first DTS to rebase the start time of the MPEG stream - // to the playback time. - if (p->base_dts == MP_NOPTS_VALUE) - p->base_dts = pkt->dts; - - if (p->last_dts == MP_NOPTS_VALUE) - p->last_dts = pkt->dts; - - if (fabs(p->last_dts - pkt->dts) >= DTS_RESET_THRESHOLD) { - MP_WARN(demuxer, "PTS discontinuity: %f->%f\n", p->last_dts, pkt->dts); - p->base_time += p->last_dts - p->base_dts; - p->base_dts = pkt->dts - pkt->duration; - } - p->last_dts = pkt->dts; - } - - if (p->base_dts != MP_NOPTS_VALUE) { - double delta = -p->base_dts + p->base_time; - if (pkt->pts != MP_NOPTS_VALUE) - pkt->pts += delta; - if (pkt->dts != MP_NOPTS_VALUE) - pkt->dts += delta; - } - - MP_TRACE(demuxer, "opts: %d %f %f\n", sh->type, pkt->pts, pkt->dts); - - demux_add_packet(sh, pkt); - return 1; -} - -static void add_stream_chapters(struct demuxer *demuxer) -{ - int num = 0; - if (stream_control(demuxer->stream, STREAM_CTRL_GET_NUM_CHAPTERS, &num) < 1) - return; - for (int n = 0; n < num; n++) { - double p = n; - if (stream_control(demuxer->stream, STREAM_CTRL_GET_CHAPTER_TIME, &p) < 1) - continue; - demuxer_add_chapter(demuxer, "", p, 0); - } -} - -static int d_open(demuxer_t *demuxer, enum demux_check check) -{ - struct priv *p = demuxer->priv = talloc_zero(demuxer, struct priv); - - if (check != DEMUX_CHECK_FORCE) - return -1; - - struct demuxer_params params = { - .force_format = "+lavf", - .does_not_own_stream = true, - }; - - struct stream *cur = demuxer->stream; - const char *sname = ""; - if (cur->info) - sname = cur->info->name; - - p->is_cdda = strcmp(sname, "cdda") == 0; - p->is_dvd = strcmp(sname, "dvd") == 0 || - strcmp(sname, "ifo") == 0 || - strcmp(sname, "dvdnav") == 0 || - strcmp(sname, "ifo_dvdnav") == 0; - - if (p->is_cdda) - params.force_format = "+rawaudio"; - - char *t = NULL; - stream_control(demuxer->stream, STREAM_CTRL_GET_DISC_NAME, &t); - if (t) { - mp_tags_set_str(demuxer->metadata, "TITLE", t); - talloc_free(t); - } - - // Initialize the playback time. We need to read _some_ data to get the - // correct stream-layer time (at least with libdvdnav). - stream_peek(demuxer->stream, 1); - reset_pts(demuxer); - - p->slave = demux_open(demuxer->stream, ¶ms, demuxer->global); - if (!p->slave) - return -1; - - // So that we don't miss initial packets of delayed subtitle streams. - demux_set_stream_autoselect(p->slave, true); - - // With cache enabled, the stream can be seekable. This causes demux_lavf.c - // (actually libavformat/mpegts.c) to seek sometimes when reading a packet. - // It does this to seek back a bit in case the current file position points - // into the middle of a packet. - if (!p->is_cdda) { - demuxer->stream->seekable = false; - - // Can be seekable even if the stream isn't. - demuxer->seekable = true; - } - - add_dvd_streams(demuxer); - add_streams(demuxer); - add_stream_chapters(demuxer); - - double len; - if (stream_control(demuxer->stream, STREAM_CTRL_GET_TIME_LENGTH, &len) >= 1) - demuxer->duration = len; - - demuxer->extended_ctrls = true; - - return 0; -} - -static void d_close(demuxer_t *demuxer) -{ - struct priv *p = demuxer->priv; - demux_free(p->slave); -} - -static int d_control(demuxer_t *demuxer, int cmd, void *arg) -{ - struct priv *p = demuxer->priv; - - switch (cmd) { - case DEMUXER_CTRL_RESYNC: - demux_flush(p->slave); - break; // relay to slave demuxer - case DEMUXER_CTRL_SWITCHED_TRACKS: - reselect_streams(demuxer); - return CONTROL_OK; - } - return demux_control(p->slave, cmd, arg); -} - -const demuxer_desc_t demuxer_desc_disc = { - .name = "disc", - .desc = "CD/DVD/BD wrapper", - .fill_buffer = d_fill_buffer, - .open = d_open, - .close = d_close, - .seek = d_seek, - .control = d_control, -}; diff --git a/demux/demux_lavf.c b/demux/demux_lavf.c index 8ec856d0c8..5d6c2725dc 100644 --- a/demux/demux_lavf.c +++ b/demux/demux_lavf.c @@ -213,6 +213,7 @@ typedef struct lavf_priv { int cur_program; char *mime_type; double seek_delay; + bool optical_crap_hack; struct demux_lavf_opts *opts; double mf_fps; @@ -1056,6 +1057,13 @@ static int demux_open_lavf(demuxer_t *demuxer, enum demux_check check) "broken as well.\n"); } + double len = -1; + if (stream_control(priv->stream, STREAM_CTRL_OPTICAL_CRAP_HACK1, &len) > 0) { + priv->optical_crap_hack = true; + demuxer->duration = len; + demuxer->seekable = true; + } + return 0; } @@ -1120,6 +1128,13 @@ static void demux_seek_lavf(demuxer_t *demuxer, double seek_pts, int flags) int avsflags = 0; int64_t seek_pts_av = 0; + if (priv->optical_crap_hack) { + if (flags & SEEK_FACTOR) + seek_pts = seek_pts * demuxer->duration; + stream_control(priv->stream, STREAM_CTRL_OPTICAL_CRAP_HACK2, &seek_pts); + return; + } + if (!(flags & SEEK_FORWARD)) avsflags = AVSEEK_FLAG_BACKWARD; @@ -1234,11 +1249,6 @@ redo: return CONTROL_OK; } - case DEMUXER_CTRL_RESYNC: - stream_drop_buffers(priv->stream); - avio_flush(priv->avfc->pb); - avformat_flush(priv->avfc); - return CONTROL_OK; case DEMUXER_CTRL_REPLACE_STREAM: if (priv->own_stream) free_stream(priv->stream); diff --git a/options/parse_commandline.c b/options/parse_commandline.c index d2eb01966c..711f1f1df5 100644 --- a/options/parse_commandline.c +++ b/options/parse_commandline.c @@ -218,43 +218,8 @@ int m_config_parse_mp_command_line(m_config_t *config, struct playlist *files, } else { // filename void *tmp = talloc_new(NULL); - bstr file = p.arg; char *file0 = bstrdup0(tmp, p.arg); -#if HAVE_GPL - // expand DVD filename entries like dvd://1-3 into component titles - if (bstr_startswith0(file, "dvd://")) { - int offset = 6; - char *splitpos = strstr(file0 + offset, "-"); - if (splitpos != NULL) { - char *endpos; - int start_title = strtol(file0 + offset, &endpos, 10); - int end_title; - //entries like dvd://-2 imply start at title 1 - if (start_title < 0) { - end_title = abs(start_title); - start_title = 1; - } else - end_title = strtol(splitpos + 1, &endpos, 10); - - #define dvd_range(a) (a >= 0 && a < 255) - if (dvd_range(start_title) && dvd_range(end_title) - && (start_title < end_title)) { - for (int j = start_title; j <= end_title; j++) { - char *f = talloc_asprintf(tmp, "dvd://%d%s", j, - endpos); - playlist_add_file(files, f); - } - } else - MP_ERR(config, "Invalid play entry %s\n", file0); - - } else // dvd:// or dvd://x entry - playlist_add_file(files, file0); - } else { - process_non_option(files, file0); - } -#else process_non_option(files, file0); -#endif talloc_free(tmp); } } diff --git a/player/command.c b/player/command.c index 0dc9e9a8b9..13b5fb74df 100644 --- a/player/command.c +++ b/player/command.c @@ -901,39 +901,6 @@ static int mp_property_playback_time(void *ctx, struct m_property *prop, return property_time(action, arg, get_playback_time(mpctx)); } -/// Current BD/DVD title (RW) -static int mp_property_disc_title(void *ctx, struct m_property *prop, - int action, void *arg) -{ - MPContext *mpctx = ctx; - struct demuxer *d = mpctx->demuxer; - if (!d || !d->extended_ctrls) - return M_PROPERTY_UNAVAILABLE; - unsigned int title = -1; - switch (action) { - case M_PROPERTY_GET: - if (demux_stream_control(d, STREAM_CTRL_GET_CURRENT_TITLE, &title) < 0) - return M_PROPERTY_UNAVAILABLE; - *(int*)arg = title; - return M_PROPERTY_OK; - case M_PROPERTY_GET_TYPE: - *(struct m_option *)arg = (struct m_option){ - .type = CONF_TYPE_INT, - .flags = M_OPT_MIN, - .min = -1, - }; - return M_PROPERTY_OK; - case M_PROPERTY_SET: - title = *(int*)arg; - if (demux_stream_control(d, STREAM_CTRL_SET_CURRENT_TITLE, &title) < 0) - return M_PROPERTY_NOT_IMPLEMENTED; - if (!mpctx->stop_play) - mpctx->stop_play = PT_CURRENT_ENTRY; - return M_PROPERTY_OK; - } - return M_PROPERTY_NOT_IMPLEMENTED; -} - /// Current chapter (RW) static int mp_property_chapter(void *ctx, struct m_property *prop, int action, void *arg) @@ -1216,53 +1183,6 @@ static int property_list_editions(void *ctx, struct m_property *prop, get_edition_entry, mpctx); } -/// Number of titles in BD/DVD -static int mp_property_disc_titles(void *ctx, struct m_property *prop, - int action, void *arg) -{ - MPContext *mpctx = ctx; - struct demuxer *demuxer = mpctx->demuxer; - unsigned int num_titles; - if (!demuxer || !demuxer->extended_ctrls || - demux_stream_control(demuxer, STREAM_CTRL_GET_NUM_TITLES, - &num_titles) < 1) - return M_PROPERTY_UNAVAILABLE; - return m_property_int_ro(action, arg, num_titles); -} - -static int get_disc_title_entry(int item, int action, void *arg, void *ctx) -{ - struct MPContext *mpctx = ctx; - struct demuxer *demuxer = mpctx->demuxer; - - double len = item; - if (demux_stream_control(demuxer, STREAM_CTRL_GET_TITLE_LENGTH, &len) < 1) - len = -1; - - struct m_sub_property props[] = { - {"id", SUB_PROP_INT(item)}, - {"length", {.type = CONF_TYPE_TIME}, {.time = len}, - .unavailable = len < 0}, - {0} - }; - - return m_property_read_sub(props, action, arg); -} - -static int mp_property_list_disc_titles(void *ctx, struct m_property *prop, - int action, void *arg) -{ - MPContext *mpctx = ctx; - struct demuxer *demuxer = mpctx->demuxer; - unsigned int num_titles; - if (!demuxer || !demuxer->extended_ctrls || - demux_stream_control(demuxer, STREAM_CTRL_GET_NUM_TITLES, - &num_titles) < 1) - return M_PROPERTY_UNAVAILABLE; - return m_property_read_list(action, arg, num_titles, - get_disc_title_entry, mpctx); -} - /// Number of chapters in file static int mp_property_chapters(void *ctx, struct m_property *prop, int action, void *arg) @@ -1286,67 +1206,6 @@ static int mp_property_editions(void *ctx, struct m_property *prop, return m_property_int_ro(action, arg, demuxer->num_editions); } -/// Current dvd angle (RW) -static int mp_property_angle(void *ctx, struct m_property *prop, - int action, void *arg) -{ - MPContext *mpctx = ctx; - struct demuxer *demuxer = mpctx->demuxer; - if (!demuxer || !demuxer->extended_ctrls) - return M_PROPERTY_UNAVAILABLE; - - int ris, angles = -1, angle = 1; - - ris = demux_stream_control(demuxer, STREAM_CTRL_GET_NUM_ANGLES, &angles); - if (ris == STREAM_UNSUPPORTED) - return M_PROPERTY_UNAVAILABLE; - - ris = demux_stream_control(demuxer, STREAM_CTRL_GET_ANGLE, &angle); - if (ris == STREAM_UNSUPPORTED) - return -1; - - if (angle < 0 || angles <= 1) - return M_PROPERTY_UNAVAILABLE; - - switch (action) { - case M_PROPERTY_GET: - *(int *) arg = angle; - return M_PROPERTY_OK; - case M_PROPERTY_PRINT: { - *(char **) arg = talloc_asprintf(NULL, "%d/%d", angle, angles); - return M_PROPERTY_OK; - } - case M_PROPERTY_SET: - angle = *(int *)arg; - if (angle < 0 || angle > angles) - return M_PROPERTY_ERROR; - - demux_flush(demuxer); - ris = demux_stream_control(demuxer, STREAM_CTRL_SET_ANGLE, &angle); - if (ris == STREAM_OK) { - demux_control(demuxer, DEMUXER_CTRL_RESYNC, NULL); - demux_flush(demuxer); - } - - reset_audio_state(mpctx); - reset_video_state(mpctx); - mp_wakeup_core(mpctx); - - return ris == STREAM_OK ? M_PROPERTY_OK : M_PROPERTY_ERROR; - case M_PROPERTY_GET_TYPE: { - struct m_option opt = { - .type = CONF_TYPE_INT, - .flags = CONF_RANGE, - .min = 1, - .max = angles, - }; - *(struct m_option *)arg = opt; - return M_PROPERTY_OK; - } - } - return M_PROPERTY_NOT_IMPLEMENTED; -} - static int get_tag_entry(int item, int action, void *arg, void *ctx) { struct mp_tags *tags = ctx; @@ -3774,13 +3633,10 @@ static const struct m_property mp_properties_base[] = { {"audio-pts", mp_property_audio_pts}, {"playtime-remaining", mp_property_playtime_remaining}, {"playback-time", mp_property_playback_time}, - {"disc-title", mp_property_disc_title}, {"chapter", mp_property_chapter}, {"edition", mp_property_edition}, - {"disc-titles", mp_property_disc_titles}, {"chapters", mp_property_chapters}, {"editions", mp_property_editions}, - {"angle", mp_property_angle}, {"metadata", mp_property_metadata}, {"filtered-metadata", mp_property_filtered_metadata}, {"chapter-metadata", mp_property_chapter_metadata}, @@ -3808,7 +3664,6 @@ static const struct m_property mp_properties_base[] = { {"chapter-list", mp_property_list_chapters}, {"track-list", property_list_tracks}, {"edition-list", property_list_editions}, - {"disc-title-list", mp_property_list_disc_titles}, {"playlist", mp_property_playlist}, {"playlist-pos", mp_property_playlist_pos}, diff --git a/player/configfiles.c b/player/configfiles.c index 8a7e6d7111..6657693ec5 100644 --- a/player/configfiles.c +++ b/player/configfiles.c @@ -174,11 +174,6 @@ static char *mp_get_playback_resume_config_filename(struct MPContext *mpctx, realpath = mp_path_join(tmp, cwd, fname); } } - if (bstr_startswith0(bfname, "dvd://") && opts->dvd_opts && opts->dvd_opts->device) - realpath = talloc_asprintf(tmp, "%s - %s", realpath, opts->dvd_opts->device); - if ((bstr_startswith0(bfname, "br://") || bstr_startswith0(bfname, "bd://") || - bstr_startswith0(bfname, "bluray://")) && opts->bluray_device) - realpath = talloc_asprintf(tmp, "%s - %s", realpath, opts->bluray_device); uint8_t md5[16]; av_md5_sum(md5, realpath, strlen(realpath)); char *conf = talloc_strdup(tmp, ""); diff --git a/stream/stream.h b/stream/stream.h index 971560f492..c575db4a10 100644 --- a/stream/stream.h +++ b/stream/stream.h @@ -63,6 +63,10 @@ enum stream_ctrl { STREAM_CTRL_HAS_AVSEEK, STREAM_CTRL_GET_METADATA, + // Garbage compatibility for obnoxious users + STREAM_CTRL_OPTICAL_CRAP_HACK1, + STREAM_CTRL_OPTICAL_CRAP_HACK2, + // TV STREAM_CTRL_TV_SET_SCAN, STREAM_CTRL_SET_TV_FREQ, @@ -80,23 +84,6 @@ enum stream_ctrl { STREAM_CTRL_DVB_GET_CHANNEL_NAME, STREAM_CTRL_DVB_STEP_CHANNEL, - // Optical discs - STREAM_CTRL_GET_TIME_LENGTH, - STREAM_CTRL_GET_DVD_INFO, - STREAM_CTRL_GET_DISC_NAME, - STREAM_CTRL_GET_NUM_CHAPTERS, - STREAM_CTRL_GET_CURRENT_TIME, - STREAM_CTRL_GET_CHAPTER_TIME, - STREAM_CTRL_SEEK_TO_TIME, - STREAM_CTRL_GET_ASPECT_RATIO, - STREAM_CTRL_GET_NUM_ANGLES, - STREAM_CTRL_GET_ANGLE, - STREAM_CTRL_SET_ANGLE, - STREAM_CTRL_GET_NUM_TITLES, - STREAM_CTRL_GET_TITLE_LENGTH, // double* (in: title number, out: len) - STREAM_CTRL_GET_LANG, - STREAM_CTRL_GET_CURRENT_TITLE, - STREAM_CTRL_SET_CURRENT_TITLE, }; struct stream_lang_req { diff --git a/stream/stream_bluray.c b/stream/stream_bluray.c index f26420b56d..10562d6af4 100644 --- a/stream/stream_bluray.c +++ b/stream/stream_bluray.c @@ -175,119 +175,19 @@ static int bluray_stream_control(stream_t *s, int cmd, void *arg) struct bluray_priv_s *b = s->priv; switch (cmd) { - case STREAM_CTRL_GET_NUM_CHAPTERS: { - const BLURAY_TITLE_INFO *ti = b->title_info; - if (!ti) - return STREAM_UNSUPPORTED; - *((unsigned int *) arg) = ti->chapter_count; - return STREAM_OK; - } - case STREAM_CTRL_GET_CHAPTER_TIME: { - const BLURAY_TITLE_INFO *ti = b->title_info; - if (!ti) - return STREAM_UNSUPPORTED; - int chapter = *(double *)arg; - double time = MP_NOPTS_VALUE; - if (chapter >= 0 || chapter < ti->chapter_count) - time = BD_TIME_TO_MP(ti->chapters[chapter].start); - if (time == MP_NOPTS_VALUE) - return STREAM_ERROR; - *(double *)arg = time; - return STREAM_OK; - } - case STREAM_CTRL_SET_CURRENT_TITLE: { - const uint32_t title = *((unsigned int*)arg); - if (title >= b->num_titles || !play_title(b, title)) - return STREAM_UNSUPPORTED; - b->current_title = title; - return STREAM_OK; |