aboutsummaryrefslogtreecommitdiffhomepage
path: root/stream
diff options
context:
space:
mode:
authorGravatar wm4 <wm4@nowhere>2014-10-25 20:07:44 +0200
committerGravatar wm4 <wm4@nowhere>2014-10-25 20:18:22 +0200
commit9b45b48c466765b6491778709a1c52e061480f76 (patch)
tree5f5c7715d91d5d8e6814105abc1cd330394ab1df /stream
parent423a7de67625749a7563ddbd1094091dee7b40ae (diff)
Drop libquvi support
No development activity (or even any sign of life) for almost a year. A replacement based on youtube-dl will probably be provided before the next mpv release. Ask on the IRC channel if you want to test. Simplify the Lua check too: libquvi linking against a different Lua version than mpv was a frequent issue, but with libquvi gone, no direct dependency uses Lua, and such a clash is rather unlikely.
Diffstat (limited to 'stream')
-rw-r--r--stream/resolve/resolve.h53
-rw-r--r--stream/resolve/resolve_quvi.c118
-rw-r--r--stream/resolve/resolve_quvi9.c163
3 files changed, 0 insertions, 334 deletions
diff --git a/stream/resolve/resolve.h b/stream/resolve/resolve.h
deleted file mode 100644
index 3a5358a99e..0000000000
--- a/stream/resolve/resolve.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * This file is part of MPlayer.
- *
- * MPlayer is free software; you can redistribute it and/or modify
- * 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.
- *
- * MPlayer 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with MPlayer; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifndef MP_RESOLVE_H
-#define MP_RESOLVE_H
-
-struct mpv_global;
-
-struct mp_resolve_result {
- char *url;
- char *title;
-
- struct mp_resolve_src **srcs;
- int num_srcs;
-
- double start_time;
-
- struct mp_resolve_sub **subs;
- int num_subs;
-
- struct playlist *playlist;
-};
-
-struct mp_resolve_src {
- char *url; // can be NULL; otherwise it's the exact video URL
- char *encid; // indicates quality level, contents are libquvi specific
-};
-
-struct mp_resolve_sub {
- char *url;
- char *data;
- char *lang;
-};
-
-struct mp_resolve_result *mp_resolve_quvi(const char *url,
- struct mpv_global *global);
-
-#endif
diff --git a/stream/resolve/resolve_quvi.c b/stream/resolve/resolve_quvi.c
deleted file mode 100644
index 837496081a..0000000000
--- a/stream/resolve/resolve_quvi.c
+++ /dev/null
@@ -1,118 +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 General Public License as published by
- * the Free Software Foundation; either version 2 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with mpv; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#include <quvi/quvi.h>
-
-#include "talloc.h"
-#include "common/global.h"
-#include "common/msg.h"
-#include "options/options.h"
-#include "resolve.h"
-
-static void add_source(struct mp_resolve_result *res, const char *url,
- const char *encid)
-{
- struct mp_resolve_src *src = talloc_ptrtype(res, src);
- *src = (struct mp_resolve_src) {
- .url = talloc_strdup(src, url),
- .encid = talloc_strdup(src, encid),
- };
- MP_TARRAY_APPEND(res, res->srcs, res->num_srcs, src);
-}
-
-struct mp_resolve_result *mp_resolve_quvi(const char *url,
- struct mpv_global *global)
-{
- QUVIcode rc;
- bool mp_url = false;
-
- quvi_t q;
- rc = quvi_init(&q);
- if (rc != QUVI_OK)
- return NULL;
-
- if (!strncmp(url, "mp_", 3)) {
- url += 3;
- mp_url = true;
- }
-
- // Don't try to use quvi on an URL that's not directly supported, since
- // quvi will do a network access anyway in order to check for HTTP
- // redirections etc.
- // The documentation says this will fail on "shortened" URLs.
- if (quvi_supported(q, (char *)url) != QUVI_OK) {
- quvi_close(&q);
- return NULL;
- }
-
- struct MPOpts *opts = global->opts;
- struct mp_log *log = mp_log_new(NULL, global->log, "quvi");
-
- mp_info(log, "Checking URL...\n");
-
- const char *req_format = opts->quvi_format ? opts->quvi_format : "best";
-
- // Can use quvi_query_formats() to get a list of formats like this:
- // "fmt05_240p|fmt18_360p|fmt34_360p|fmt35_480p|fmt43_360p|fmt44_480p"
- // (This example is youtube specific.)
- // That call requires an extra net access. quvi_next_media_url() doesn't
- // seem to do anything useful. So we can't really do anything useful
- // except pass through the user's format setting.
- quvi_setopt(q, QUVIOPT_FORMAT, req_format);
-
- quvi_media_t m;
- rc = quvi_parse(q, (char *)url, &m);
- if (rc != QUVI_OK) {
- mp_err(log, "%s\n", quvi_strerror(q, rc));
- quvi_close(&q);
- talloc_free(log);
- return NULL;
- }
-
- struct mp_resolve_result *result
- = talloc_zero(NULL, struct mp_resolve_result);
-
- char *val;
-
- if (quvi_getprop(m, QUVIPROP_MEDIAURL, &val) == QUVI_OK) {
- if (mp_url)
- result->url = talloc_asprintf(result, "mp_%s", val);
- else
- result->url = talloc_strdup(result, val);
- }
-
- if (quvi_getprop(m, QUVIPROP_PAGETITLE, &val) == QUVI_OK)
- result->title = talloc_strdup(result, val);
-
- quvi_parse_close(&m);
- quvi_close(&q);
-
- if (!result->url) {
- talloc_free(result);
- result = NULL;
- }
-
- // Useful for quvi-format cycling
- add_source(result, NULL, "default");
- add_source(result, NULL, "best");
- if (strcmp(req_format, "best") != 0 && strcmp(req_format, "default") != 0)
- add_source(result, NULL, req_format);
-
- talloc_free(log);
- return result;
-}
diff --git a/stream/resolve/resolve_quvi9.c b/stream/resolve/resolve_quvi9.c
deleted file mode 100644
index 7776b7d393..0000000000
--- a/stream/resolve/resolve_quvi9.c
+++ /dev/null
@@ -1,163 +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 General Public License as published by
- * the Free Software Foundation; either version 2 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with mpv. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <stdbool.h>
-#include <assert.h>
-#include <locale.h>
-
-#include <quvi.h>
-
-#include "talloc.h"
-#include "common/global.h"
-#include "common/msg.h"
-#include "options/options.h"
-#include "common/playlist.h"
-#include "resolve.h"
-
-static bool mp_quvi_ok(quvi_t q, struct mp_log *log)
-{
- if (!quvi_ok(q)) {
- mp_err(log, "%s\n", quvi_errmsg(q));
- return false;
- }
- return true;
-}
-
-struct mp_resolve_result *mp_resolve_quvi(const char *url,
- struct mpv_global *global)
-{
- struct mp_log *log = mp_log_new(NULL, global->log, "quvi");
- struct MPOpts *opts = global->opts;
- int mode = QUVI_SUPPORTS_MODE_OFFLINE;
-
- quvi_t q = quvi_new();
- if (!quvi_ok(q)) {
- mp_err(log, "%s\n", quvi_errmsg(q));
-
- quvi_free(q);
- talloc_free(log);
- return NULL;
- }
-
- struct mp_resolve_result *res = talloc_zero(NULL, struct mp_resolve_result);
-
- if (quvi_supports(q, url, mode, QUVI_SUPPORTS_TYPE_PLAYLIST)) {
- mp_info(log, "Checking playlist...\n");
- quvi_playlist_t qp = quvi_playlist_new(q, url);
- if (mp_quvi_ok(q, log)) {
- res->playlist = talloc_zero(res, struct playlist);
- while (quvi_playlist_media_next(qp)) {
- char *entry = NULL;
- quvi_playlist_get(qp, QUVI_PLAYLIST_MEDIA_PROPERTY_URL, &entry);
- if (entry)
- playlist_add_file(res->playlist, entry);
- }
- }
- quvi_playlist_free(qp);
- }
-
- if (quvi_supports(q, url, mode, QUVI_SUPPORTS_TYPE_MEDIA)) {
- mp_info(log, "Checking URL...\n");
- quvi_media_t media = quvi_media_new(q, url);
- if (mp_quvi_ok(q, log)) {
- char *format = opts->quvi_format ? opts->quvi_format : "best";
- bool use_default = strcmp(format, "default") == 0;
- if (!use_default)
- quvi_media_stream_select(media, format);
-
- char *val = NULL;
- quvi_media_get(media, QUVI_MEDIA_STREAM_PROPERTY_URL, &val);
- res->url = talloc_strdup(res, val);
-
- val = NULL;
- quvi_media_get(media, QUVI_MEDIA_PROPERTY_TITLE, &val);
- res->title = talloc_strdup(res, val);
-
- double start = 0;
- quvi_media_get(media, QUVI_MEDIA_PROPERTY_START_TIME_MS, &start);
- res->start_time = start / 1000.0;
-
- quvi_media_stream_reset(media);
- while (quvi_media_stream_next(media)) {
- char *entry = NULL, *id = NULL;
- quvi_media_get(media, QUVI_MEDIA_STREAM_PROPERTY_URL, &entry);
- quvi_media_get(media, QUVI_MEDIA_STREAM_PROPERTY_ID, &id);
- if (entry) {
- struct mp_resolve_src *src = talloc_ptrtype(res, src);
- *src = (struct mp_resolve_src) {
- .url = talloc_strdup(src, entry),
- .encid = talloc_strdup(src, id),
- };
- MP_TARRAY_APPEND(res, res->srcs, res->num_srcs, src);
- talloc_steal(res->srcs, src);
- }
- }
-
- }
- quvi_media_free(media);
- }
-
- if (opts->quvi_fetch_subtitles && quvi_supports(q, url, mode, QUVI_SUPPORTS_TYPE_SUBTITLE)) {
- mp_info(log, "Getting subtitles...\n");
- quvi_subtitle_t qsub = quvi_subtitle_new(q, url);
- if (mp_quvi_ok(q, log)) {
- while (1) {
- quvi_subtitle_type_t qst = quvi_subtitle_type_next(qsub);
- if (!qst)
- break;
- while (1) {
- quvi_subtitle_lang_t qsl = quvi_subtitle_lang_next(qst);
- if (!qsl)
- break;
- char *lang;
- quvi_subtitle_lang_get(qsl, QUVI_SUBTITLE_LANG_PROPERTY_ID,
- &lang);
- // Let quvi convert the subtitle to SRT.
- quvi_subtitle_export_t qse =
- quvi_subtitle_export_new(qsl, "srt");
- if (mp_quvi_ok(q, log)) {
- const char *subdata = quvi_subtitle_export_data(qse);
- struct mp_resolve_sub *sub = talloc_ptrtype(res, sub);
- *sub = (struct mp_resolve_sub) {
- .lang = talloc_strdup(sub, lang),
- .data = talloc_strdup(sub, subdata),
- };
- MP_TARRAY_APPEND(res, res->subs, res->num_subs, sub);
- talloc_steal(res->subs, sub);
- }
- quvi_subtitle_export_free(qse);
- }
- }
- }
- quvi_subtitle_free(qsub);
- }
-
- quvi_free(q);
- talloc_free(log);
-
- if (!res->url && (!res->playlist || !res->playlist->first)) {
- talloc_free(res);
- res = NULL;
- }
-
- // libkdecore calls setlocale(LC_ALL, ""), which breaks basic C string
- // processing functions. libkdecore can be loaded by libproxy, which is
- // used by libquvi9. This is a rather dirty workaround to reset locales.
- setlocale(LC_ALL, "C");
-
- return res;
-}