Mirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv.git synced 2025-12-28 05:33:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

stream: implement get_protocols method for stream_lavf

Browse Source 
Previously, all stream protocols were a static list in mpv. This is okay
for own builtin stuff, but for protocols that depend on ffmpeg it's not
so great. Support for certain protocols may or may not be enabled in a
user's ffmpeg and the protocol list that mpv generates should ideally
match this. Fix this by implementing a get_protocols method for
stream_lavf that will have different results depending on the ffmpeg mpv
is built against. We keep the safe and unsafe protocols separation. The
former is essentially a whitelist. Any protocol that is found in ffmpeg
but is not in the safe whitelist is considered unsafe. In the stream
list, ffmpeg is moved to the bottom so any possible protocols that are
added in the future don't automatically take precedence over any builtin
mpv ones.
This commit is contained in:
Dudemanguy
2024-05-15 19:22:32 -05:00
parent 406301f23d
commit f921b64ed7
5 changed files with 136 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

102
stream/stream_lavf.c
View File

@@ -238,6 +238,96 @@ void mp_setup_av_network_options(AVDictionary **dict, const char *target_fmt,
talloc_free(temp);
}
#define PROTO(...) (const char *[]){__VA_ARGS__, NULL}
// List of safe protocols and their aliases
static const char **safe_protos[] = {
PROTO("data"),
PROTO("gopher"),
PROTO("gophers"),
PROTO("http", "dav", "webdav"),
PROTO("httpproxy"),
PROTO("https", "davs", "webdavs"),
PROTO("ipfs"),
PROTO("ipns"),
PROTO("mmsh", "mms", "mmshttp"),
PROTO("mmst"),
PROTO("rist"),
PROTO("rtmp"),
PROTO("rtmpe"),
PROTO("rtmps"),
PROTO("rtmpt"),
PROTO("rtmpte"),
PROTO("rtmpts"),
PROTO("rtp"),
PROTO("srt"),
PROTO("srtp"),
NULL,
};
static char **get_safe_protocols(void)
{
int num = 0;
char **protocols = NULL;
char **ffmpeg_demuxers = mp_get_lavf_demuxers();
char **ffmpeg_protos = mp_get_lavf_protocols();
for (int i = 0; ffmpeg_protos[i]; i++) {
for (int j = 0; safe_protos[j]; j++) {
if (strcmp(ffmpeg_protos[i], safe_protos[j][0]) != 0)
continue;
for (int k = 0; safe_protos[j][k]; k++)
MP_TARRAY_APPEND(NULL, protocols, num, talloc_strdup(protocols, safe_protos[j][k]));
break;
}
}
// rtsp is a demuxer not protocol in ffmpeg so it is handled separately
for (int i = 0; ffmpeg_demuxers[i]; i++) {
if (strcmp("rtsp", ffmpeg_demuxers[i]) == 0) {
MP_TARRAY_APPEND(NULL, protocols, num, talloc_strdup(protocols, "rtsp"));
MP_TARRAY_APPEND(NULL, protocols, num, talloc_strdup(protocols, "rtsps"));
break;
}
}
MP_TARRAY_APPEND(NULL, protocols, num, NULL);
talloc_free(ffmpeg_demuxers);
talloc_free(ffmpeg_protos);
return protocols;
}
static char **get_unsafe_protocols(void)
{
int num = 0;
char **protocols = NULL;
char **safe_protocols = get_safe_protocols();
char **ffmpeg_protos = mp_get_lavf_protocols();
for (int i = 0; ffmpeg_protos[i]; i++) {
bool safe_protocol = false;
for (int j = 0; safe_protocols[j]; j++) {
if (strcmp(ffmpeg_protos[i], safe_protocols[j]) == 0) {
safe_protocol = true;
break;
}
}
if (!safe_protocol)
MP_TARRAY_APPEND(NULL, protocols, num, talloc_strdup(protocols, ffmpeg_protos[i]));
}
MP_TARRAY_APPEND(NULL, protocols, num, talloc_strdup(protocols, "ffmpeg"));
MP_TARRAY_APPEND(NULL, protocols, num, talloc_strdup(protocols, "lavf"));
MP_TARRAY_APPEND(NULL, protocols, num, NULL);
talloc_free(ffmpeg_protos);
talloc_free(safe_protocols);
return protocols;
}
// Escape http URLs with unescaped, invalid characters in them.
// libavformat's http protocol does not do this, and a patch to add this
// in a 100% safe case (spaces only) was rejected.
@@ -431,12 +521,7 @@ done:
const stream_info_t stream_info_ffmpeg = {
.name = "ffmpeg",
.open = open_f,
.protocols = (const char *const[]){
"rtmp", "rtsp", "rtsps", "http", "https", "mms", "mmst", "mmsh", "mmshttp",
"rtp", "httpproxy", "rtmpe", "rtmps", "rtmpt", "rtmpte", "rtmpts", "srt",
"rist", "srtp", "gopher", "gophers", "data", "ipfs", "ipns", "dav",
"davs", "webdav", "webdavs",
NULL },
.get_protocols = get_safe_protocols,
.can_write = true,
.stream_origin = STREAM_ORIGIN_NET,
};
@@ -448,10 +533,7 @@ const stream_info_t stream_info_ffmpeg = {
const stream_info_t stream_info_ffmpeg_unsafe = {
.name = "ffmpeg",
.open = open_f,
.protocols = (const char *const[]){
"lavf", "ffmpeg", "udp", "ftp", "tcp", "tls", "unix", "sftp", "md5",
"concat", "smb",
NULL },
.get_protocols = get_unsafe_protocols,
.stream_origin = STREAM_ORIGIN_UNSAFE,
.can_write = true,
};