2013-06-27 15:21:46 +00:00
|
|
|
/*
|
|
|
|
* This file is part of mpv.
|
|
|
|
*
|
Relicense some non-MPlayer source files to LGPL 2.1 or later
This covers source files which were added in mplayer2 and mpv times
only, and where all code is covered by LGPL relicensing agreements.
There are probably more files to which this applies, but I'm being
conservative here.
A file named ao_sdl.c exists in MPlayer too, but the mpv one is a
complete rewrite, and was added some time after the original ao_sdl.c
was removed. The same applies to vo_sdl.c, for which the SDL2 API is
radically different in addition (MPlayer supports SDL 1.2 only).
common.c contains only code written by me. But common.h is a strange
case: although it originally was named mp_common.h and exists in MPlayer
too, by now it contains only definitions written by uau and me. The
exceptions are the CONTROL_ defines - thus not changing the license of
common.h yet.
codec_tags.c contained once large tables generated from MPlayer's
codecs.conf, but all of these tables were removed.
From demux_playlist.c I'm removing a code fragment from someone who was
not asked; this probably could be done later (see commit 15dccc37).
misc.c is a bit complicated to reason about (it was split off mplayer.c
and thus contains random functions out of this file), but actually all
functions have been added post-MPlayer. Except get_relative_time(),
which was written by uau, but looks similar to 3 different versions of
something similar in each of the Unix/win32/OSX timer source files. I'm
not sure what that means in regards to copyright, so I've just moved it
into another still-GPL source file for now.
screenshot.c once had some minor parts of MPlayer's vf_screenshot.c, but
they're all gone.
2016-01-19 17:36:06 +00:00
|
|
|
* 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.
|
2013-06-27 15:21:46 +00:00
|
|
|
*
|
|
|
|
* 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
|
Relicense some non-MPlayer source files to LGPL 2.1 or later
This covers source files which were added in mplayer2 and mpv times
only, and where all code is covered by LGPL relicensing agreements.
There are probably more files to which this applies, but I'm being
conservative here.
A file named ao_sdl.c exists in MPlayer too, but the mpv one is a
complete rewrite, and was added some time after the original ao_sdl.c
was removed. The same applies to vo_sdl.c, for which the SDL2 API is
radically different in addition (MPlayer supports SDL 1.2 only).
common.c contains only code written by me. But common.h is a strange
case: although it originally was named mp_common.h and exists in MPlayer
too, by now it contains only definitions written by uau and me. The
exceptions are the CONTROL_ defines - thus not changing the license of
common.h yet.
codec_tags.c contained once large tables generated from MPlayer's
codecs.conf, but all of these tables were removed.
From demux_playlist.c I'm removing a code fragment from someone who was
not asked; this probably could be done later (see commit 15dccc37).
misc.c is a bit complicated to reason about (it was split off mplayer.c
and thus contains random functions out of this file), but actually all
functions have been added post-MPlayer. Except get_relative_time(),
which was written by uau, but looks similar to 3 different versions of
something similar in each of the Unix/win32/OSX timer source files. I'm
not sure what that means in regards to copyright, so I've just moved it
into another still-GPL source file for now.
screenshot.c once had some minor parts of MPlayer's vf_screenshot.c, but
they're all gone.
2016-01-19 17:36:06 +00:00
|
|
|
* GNU Lesser General Public License for more details.
|
2013-06-27 15:21:46 +00:00
|
|
|
*
|
Relicense some non-MPlayer source files to LGPL 2.1 or later
This covers source files which were added in mplayer2 and mpv times
only, and where all code is covered by LGPL relicensing agreements.
There are probably more files to which this applies, but I'm being
conservative here.
A file named ao_sdl.c exists in MPlayer too, but the mpv one is a
complete rewrite, and was added some time after the original ao_sdl.c
was removed. The same applies to vo_sdl.c, for which the SDL2 API is
radically different in addition (MPlayer supports SDL 1.2 only).
common.c contains only code written by me. But common.h is a strange
case: although it originally was named mp_common.h and exists in MPlayer
too, by now it contains only definitions written by uau and me. The
exceptions are the CONTROL_ defines - thus not changing the license of
common.h yet.
codec_tags.c contained once large tables generated from MPlayer's
codecs.conf, but all of these tables were removed.
From demux_playlist.c I'm removing a code fragment from someone who was
not asked; this probably could be done later (see commit 15dccc37).
misc.c is a bit complicated to reason about (it was split off mplayer.c
and thus contains random functions out of this file), but actually all
functions have been added post-MPlayer. Except get_relative_time(),
which was written by uau, but looks similar to 3 different versions of
something similar in each of the Unix/win32/OSX timer source files. I'm
not sure what that means in regards to copyright, so I've just moved it
into another still-GPL source file for now.
screenshot.c once had some minor parts of MPlayer's vf_screenshot.c, but
they're all gone.
2016-01-19 17:36:06 +00:00
|
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
|
|
* License along with mpv. If not, see <http://www.gnu.org/licenses/>.
|
2013-06-27 15:21:46 +00:00
|
|
|
*/
|
|
|
|
|
2019-06-19 14:48:46 +00:00
|
|
|
#include "common/common.h"
|
2013-06-27 15:21:46 +00:00
|
|
|
#include "stream.h"
|
|
|
|
|
|
|
|
struct priv {
|
|
|
|
bstr data;
|
|
|
|
};
|
|
|
|
|
2019-11-07 14:28:50 +00:00
|
|
|
static int fill_buffer(stream_t *s, void *buffer, int len)
|
2013-06-27 15:21:46 +00:00
|
|
|
{
|
|
|
|
struct priv *p = s->priv;
|
|
|
|
bstr data = p->data;
|
|
|
|
if (s->pos < 0 || s->pos > data.len)
|
|
|
|
return 0;
|
2019-10-30 14:53:03 +00:00
|
|
|
len = MPMIN(len, data.len - s->pos);
|
2013-06-27 15:21:46 +00:00
|
|
|
memcpy(buffer, data.start + s->pos, len);
|
|
|
|
return len;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int seek(stream_t *s, int64_t newpos)
|
|
|
|
{
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2019-11-07 14:54:34 +00:00
|
|
|
static int64_t get_size(stream_t *s)
|
2013-06-27 15:21:46 +00:00
|
|
|
{
|
|
|
|
struct priv *p = s->priv;
|
2019-11-07 14:54:34 +00:00
|
|
|
return p->data.len;
|
2013-06-27 15:21:46 +00:00
|
|
|
}
|
|
|
|
|
2019-09-28 22:45:41 +00:00
|
|
|
static int open2(stream_t *stream, struct stream_open_args *args)
|
2013-06-27 15:21:46 +00:00
|
|
|
{
|
|
|
|
stream->fill_buffer = fill_buffer;
|
|
|
|
stream->seek = seek;
|
2014-05-24 12:04:09 +00:00
|
|
|
stream->seekable = true;
|
2019-11-07 14:54:34 +00:00
|
|
|
stream->get_size = get_size;
|
2013-06-27 15:21:46 +00:00
|
|
|
|
|
|
|
struct priv *p = talloc_zero(stream, struct priv);
|
|
|
|
stream->priv = p;
|
|
|
|
|
|
|
|
// Initial data
|
|
|
|
bstr data = bstr0(stream->url);
|
2016-04-20 16:00:20 +00:00
|
|
|
bool use_hex = bstr_eatstart0(&data, "hex://");
|
|
|
|
if (!use_hex)
|
|
|
|
bstr_eatstart0(&data, "memory://");
|
2019-06-19 14:48:46 +00:00
|
|
|
|
2019-09-28 22:45:41 +00:00
|
|
|
if (args->special_arg)
|
|
|
|
data = *(bstr *)args->special_arg;
|
2019-06-19 14:48:46 +00:00
|
|
|
|
|
|
|
p->data = bstrdup(stream, data);
|
2013-06-27 15:21:46 +00:00
|
|
|
|
2017-07-10 23:59:21 +00:00
|
|
|
if (use_hex && !bstr_decode_hex(stream, p->data, &p->data)) {
|
2016-04-20 16:00:20 +00:00
|
|
|
MP_FATAL(stream, "Invalid data.\n");
|
|
|
|
return STREAM_ERROR;
|
|
|
|
}
|
|
|
|
|
2013-06-27 15:21:46 +00:00
|
|
|
return STREAM_OK;
|
|
|
|
}
|
|
|
|
|
|
|
|
const stream_info_t stream_info_memory = {
|
stream: fix url_options field, make protocols field not fixed length
The way the url_options field was handled was not entirely sane: it's
actually a flexible array member, so it points to garbage for streams
which do not initialize this member (it just points to the data right
after the struct, which is garbage in theory and practice). This was
not actually a problem, since the field is only used if priv_size is
set (due to how this stuff is used). But it doesn't allow setting
priv_size only, which might be useful in some cases.
Also, make the protocols array not a fixed size array. Most stream
implementations have only 1 protocol prefix, but stream_lavf.c has
over 10 (whitelists ffmpeg protocols). The high size of the fixed
size protocol array wastes space, and it is _still_ annoying to
add new prefixes to stream_lavf (have to bump the maximum length),
so make it arbitrary length.
The two changes (plus some more cosmetic changes) arte conflated into
one, because it was annoying going over all the stream implementations.
2013-08-25 20:49:27 +00:00
|
|
|
.name = "memory",
|
2019-06-19 14:48:46 +00:00
|
|
|
.open2 = open2,
|
2016-04-20 16:00:20 +00:00
|
|
|
.protocols = (const char*const[]){ "memory", "hex", NULL },
|
2013-06-27 15:21:46 +00:00
|
|
|
};
|
2019-06-19 14:48:46 +00:00
|
|
|
|
2019-12-23 10:03:44 +00:00
|
|
|
// The data is copied.
|
|
|
|
// Caller may need to set stream.stream_origin correctly.
|
2019-06-19 14:48:46 +00:00
|
|
|
struct stream *stream_memory_open(struct mpv_global *global, void *data, int len)
|
|
|
|
{
|
|
|
|
assert(len >= 0);
|
|
|
|
|
2019-09-28 22:45:41 +00:00
|
|
|
struct stream_open_args sargs = {
|
|
|
|
.global = global,
|
|
|
|
.url = "memory://",
|
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
|
|
|
.flags = STREAM_READ | STREAM_SILENT | STREAM_ORIGIN_DIRECT,
|
2019-09-28 22:45:41 +00:00
|
|
|
.sinfo = &stream_info_memory,
|
|
|
|
.special_arg = &(bstr){data, len},
|
|
|
|
};
|
|
|
|
|
2019-06-19 14:48:46 +00:00
|
|
|
struct stream *s = NULL;
|
2019-09-28 22:45:41 +00:00
|
|
|
stream_create_with_args(&sargs, &s);
|
2019-06-19 14:48:46 +00:00
|
|
|
MP_HANDLE_OOM(s);
|
|
|
|
return s;
|
|
|
|
}
|