2009-05-08 21:51:13 +00:00
|
|
|
/*
|
2015-04-13 07:36:54 +00:00
|
|
|
* This file is part of mpv.
|
2009-05-08 21:51:13 +00:00
|
|
|
*
|
demux_mf, stream_mf: change license to LGPL
cehoyos, who did not agree to the relicensing, added bcb5c78ce3. If
there was copyright, we consider it gone, because the table changed. It
does not map file extension to a FourCC anymore, and codecs.conf is
gone. The new mapping is a libavcodec codec name (happens to be the same
as the file extension).
The same applies to commits 60ecafec, b749836b, 5b3e3be1. None of these
authors were contacted. These were before the code was replaced with a
table (in d0326807). The parts outside of demux_mf.c were removed a long
time ago. Like in the previous comment, we don't think any copyright
applies at least to the new code (at least after the FourCC removal).
iive authored 0aa37a0d, which is probably still left in some form, and
makes demux_mf.c "LGPL 3 or later".
stream_avdevice.c (unrelated) has been marked as LGPL before.
2017-06-24 11:19:51 +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 3 of the License, or (at your option) any later version.
|
2009-05-08 21:51:13 +00:00
|
|
|
*
|
2015-04-13 07:36:54 +00:00
|
|
|
* mpv is distributed in the hope that it will be useful,
|
2009-05-08 21:51:13 +00:00
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
demux_mf, stream_mf: change license to LGPL
cehoyos, who did not agree to the relicensing, added bcb5c78ce3. If
there was copyright, we consider it gone, because the table changed. It
does not map file extension to a FourCC anymore, and codecs.conf is
gone. The new mapping is a libavcodec codec name (happens to be the same
as the file extension).
The same applies to commits 60ecafec, b749836b, 5b3e3be1. None of these
authors were contacted. These were before the code was replaced with a
table (in d0326807). The parts outside of demux_mf.c were removed a long
time ago. Like in the previous comment, we don't think any copyright
applies at least to the new code (at least after the FourCC removal).
iive authored 0aa37a0d, which is probably still left in some form, and
makes demux_mf.c "LGPL 3 or later".
stream_avdevice.c (unrelated) has been marked as LGPL before.
2017-06-24 11:19:51 +00:00
|
|
|
* GNU Lesser General Public License for more details.
|
2009-05-08 21:51:13 +00:00
|
|
|
*
|
demux_mf, stream_mf: change license to LGPL
cehoyos, who did not agree to the relicensing, added bcb5c78ce3. If
there was copyright, we consider it gone, because the table changed. It
does not map file extension to a FourCC anymore, and codecs.conf is
gone. The new mapping is a libavcodec codec name (happens to be the same
as the file extension).
The same applies to commits 60ecafec, b749836b, 5b3e3be1. None of these
authors were contacted. These were before the code was replaced with a
table (in d0326807). The parts outside of demux_mf.c were removed a long
time ago. Like in the previous comment, we don't think any copyright
applies at least to the new code (at least after the FourCC removal).
iive authored 0aa37a0d, which is probably still left in some form, and
makes demux_mf.c "LGPL 3 or later".
stream_avdevice.c (unrelated) has been marked as LGPL before.
2017-06-24 11:19:51 +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/>.
|
|
|
|
*
|
|
|
|
* The parts making this file LGPL v3 (instead of v2.1 or later) are:
|
|
|
|
* 0aa37a0db23c allow autodetection of pictures type when using mf://@fil...
|
|
|
|
* (iive agreed to LGPL v3+ only.)
|
|
|
|
* Once these changes are not relevant to for copyright anymore (e.g. because
|
|
|
|
* they have been removed), this file will change to LGPLv2.1+.
|
2009-05-08 21:51:13 +00:00
|
|
|
*/
|
2002-02-06 20:15:36 +00:00
|
|
|
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <stdlib.h>
|
2014-07-10 06:28:03 +00:00
|
|
|
#include <strings.h>
|
2002-02-06 20:15:36 +00:00
|
|
|
#include <unistd.h>
|
|
|
|
#include <sys/types.h>
|
|
|
|
#include <sys/stat.h>
|
|
|
|
|
2012-02-03 07:05:11 +00:00
|
|
|
#include "osdep/io.h"
|
|
|
|
|
2016-01-11 18:03:40 +00:00
|
|
|
#include "mpv_talloc.h"
|
2013-12-17 01:39:45 +00:00
|
|
|
#include "common/msg.h"
|
2014-06-10 20:48:11 +00:00
|
|
|
#include "options/options.h"
|
2016-09-06 18:09:56 +00:00
|
|
|
#include "options/m_config.h"
|
2014-12-29 22:09:50 +00:00
|
|
|
#include "options/path.h"
|
|
|
|
#include "misc/ctype.h"
|
2002-02-06 20:15:36 +00:00
|
|
|
|
2007-03-15 18:36:36 +00:00
|
|
|
#include "stream/stream.h"
|
2012-11-09 00:06:43 +00:00
|
|
|
#include "demux.h"
|
2002-02-06 20:15:36 +00:00
|
|
|
#include "stheader.h"
|
2014-12-22 11:54:18 +00:00
|
|
|
#include "codec_tags.h"
|
2002-02-06 20:15:36 +00:00
|
|
|
|
2013-11-11 17:48:31 +00:00
|
|
|
#define MF_MAX_FILE_SIZE (1024 * 1024 * 256)
|
2012-11-16 18:12:56 +00:00
|
|
|
|
2014-12-29 22:09:50 +00:00
|
|
|
typedef struct mf {
|
|
|
|
struct mp_log *log;
|
2015-12-23 20:58:01 +00:00
|
|
|
struct sh_stream *sh;
|
2014-12-29 22:09:50 +00:00
|
|
|
int curr_frame;
|
|
|
|
int nr_of_files;
|
|
|
|
char **names;
|
|
|
|
// optional
|
|
|
|
struct stream **streams;
|
|
|
|
} mf_t;
|
|
|
|
|
|
|
|
|
|
|
|
static void mf_add(mf_t *mf, const char *fname)
|
|
|
|
{
|
|
|
|
char *entry = talloc_strdup(mf, fname);
|
|
|
|
MP_TARRAY_APPEND(mf, mf->names, mf->nr_of_files, entry);
|
|
|
|
}
|
|
|
|
|
|
|
|
static mf_t *open_mf_pattern(void *talloc_ctx, struct mp_log *log, char *filename)
|
|
|
|
{
|
|
|
|
int error_count = 0;
|
|
|
|
int count = 0;
|
|
|
|
|
|
|
|
mf_t *mf = talloc_zero(talloc_ctx, mf_t);
|
|
|
|
mf->log = log;
|
|
|
|
|
|
|
|
if (filename[0] == '@') {
|
|
|
|
FILE *lst_f = fopen(filename + 1, "r");
|
|
|
|
if (lst_f) {
|
|
|
|
char *fname = talloc_size(mf, 512);
|
|
|
|
while (fgets(fname, 512, lst_f)) {
|
|
|
|
/* remove spaces from end of fname */
|
|
|
|
char *t = fname + strlen(fname) - 1;
|
|
|
|
while (t > fname && mp_isspace(*t))
|
|
|
|
*(t--) = 0;
|
|
|
|
if (!mp_path_exists(fname)) {
|
|
|
|
mp_verbose(log, "file not found: '%s'\n", fname);
|
|
|
|
} else {
|
|
|
|
mf_add(mf, fname);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
fclose(lst_f);
|
|
|
|
|
|
|
|
mp_info(log, "number of files: %d\n", mf->nr_of_files);
|
|
|
|
goto exit_mf;
|
|
|
|
}
|
|
|
|
mp_info(log, "%s is not indirect filelist\n", filename + 1);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (strchr(filename, ',')) {
|
|
|
|
mp_info(log, "filelist: %s\n", filename);
|
|
|
|
bstr bfilename = bstr0(filename);
|
|
|
|
|
|
|
|
while (bfilename.len) {
|
|
|
|
bstr bfname;
|
|
|
|
bstr_split_tok(bfilename, ",", &bfname, &bfilename);
|
|
|
|
char *fname2 = bstrdup0(mf, bfname);
|
|
|
|
|
|
|
|
if (!mp_path_exists(fname2))
|
|
|
|
mp_verbose(log, "file not found: '%s'\n", fname2);
|
|
|
|
else {
|
|
|
|
mf_add(mf, fname2);
|
|
|
|
}
|
|
|
|
talloc_free(fname2);
|
|
|
|
}
|
|
|
|
mp_info(log, "number of files: %d\n", mf->nr_of_files);
|
|
|
|
|
|
|
|
goto exit_mf;
|
|
|
|
}
|
|
|
|
|
|
|
|
char *fname = talloc_size(mf, strlen(filename) + 32);
|
|
|
|
|
|
|
|
if (!strchr(filename, '%')) {
|
|
|
|
strcpy(fname, filename);
|
|
|
|
if (!strchr(filename, '*'))
|
|
|
|
strcat(fname, "*");
|
|
|
|
|
|
|
|
mp_info(log, "search expr: %s\n", fname);
|
|
|
|
|
|
|
|
glob_t gg;
|
|
|
|
if (glob(fname, 0, NULL, &gg)) {
|
|
|
|
talloc_free(mf);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (int i = 0; i < gg.gl_pathc; i++) {
|
|
|
|
if (mp_path_isdir(gg.gl_pathv[i]))
|
|
|
|
continue;
|
|
|
|
mf_add(mf, gg.gl_pathv[i]);
|
|
|
|
}
|
|
|
|
mp_info(log, "number of files: %d\n", mf->nr_of_files);
|
|
|
|
globfree(&gg);
|
|
|
|
goto exit_mf;
|
|
|
|
}
|
|
|
|
|
|
|
|
mp_info(log, "search expr: %s\n", filename);
|
|
|
|
|
|
|
|
while (error_count < 5) {
|
|
|
|
sprintf(fname, filename, count++);
|
|
|
|
if (!mp_path_exists(fname)) {
|
|
|
|
error_count++;
|
|
|
|
mp_verbose(log, "file not found: '%s'\n", fname);
|
|
|
|
} else {
|
|
|
|
mf_add(mf, fname);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
mp_info(log, "number of files: %d\n", mf->nr_of_files);
|
|
|
|
|
|
|
|
exit_mf:
|
|
|
|
return mf;
|
|
|
|
}
|
|
|
|
|
|
|
|
static mf_t *open_mf_single(void *talloc_ctx, struct mp_log *log, char *filename)
|
|
|
|
{
|
|
|
|
mf_t *mf = talloc_zero(talloc_ctx, mf_t);
|
|
|
|
mf->log = log;
|
|
|
|
mf_add(mf, filename);
|
|
|
|
return mf;
|
|
|
|
}
|
|
|
|
|
2016-02-28 18:14:23 +00:00
|
|
|
static void demux_seek_mf(demuxer_t *demuxer, double seek_pts, int flags)
|
2013-08-22 17:13:29 +00:00
|
|
|
{
|
2013-11-11 17:48:31 +00:00
|
|
|
mf_t *mf = demuxer->priv;
|
2016-02-28 18:14:23 +00:00
|
|
|
int newpos = seek_pts * mf->sh->codec->fps;
|
2013-11-11 17:48:31 +00:00
|
|
|
if (flags & SEEK_FACTOR)
|
2016-02-28 18:14:23 +00:00
|
|
|
newpos = seek_pts * (mf->nr_of_files - 1);
|
2013-11-11 17:48:31 +00:00
|
|
|
if (newpos < 0)
|
|
|
|
newpos = 0;
|
|
|
|
if (newpos >= mf->nr_of_files)
|
2014-07-29 22:23:16 +00:00
|
|
|
newpos = mf->nr_of_files;
|
2013-11-11 17:48:31 +00:00
|
|
|
mf->curr_frame = newpos;
|
2002-02-06 20:15:36 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// return value:
|
|
|
|
// 0 = EOF or no stream found
|
|
|
|
// 1 = successfully read a packet
|
2013-07-11 17:17:51 +00:00
|
|
|
static int demux_mf_fill_buffer(demuxer_t *demuxer)
|
|
|
|
{
|
2012-11-16 18:12:56 +00:00
|
|
|
mf_t *mf = demuxer->priv;
|
|
|
|
if (mf->curr_frame >= mf->nr_of_files)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
struct stream *entry_stream = NULL;
|
|
|
|
if (mf->streams)
|
|
|
|
entry_stream = mf->streams[mf->curr_frame];
|
|
|
|
struct stream *stream = entry_stream;
|
2013-03-19 00:54:45 +00:00
|
|
|
if (!stream) {
|
|
|
|
char *filename = mf->names[mf->curr_frame];
|
|
|
|
if (filename)
|
2013-12-21 19:36:45 +00:00
|
|
|
stream = stream_open(filename, demuxer->global);
|
2013-03-19 00:54:45 +00:00
|
|
|
}
|
2012-11-16 18:12:56 +00:00
|
|
|
|
|
|
|
if (stream) {
|
|
|
|
stream_seek(stream, 0);
|
2013-06-11 10:16:42 +00:00
|
|
|
bstr data = stream_read_complete(stream, NULL, MF_MAX_FILE_SIZE);
|
2012-11-16 18:12:56 +00:00
|
|
|
if (data.len) {
|
|
|
|
demux_packet_t *dp = new_demux_packet(data.len);
|
2014-09-16 16:11:00 +00:00
|
|
|
if (dp) {
|
|
|
|
memcpy(dp->buffer, data.start, data.len);
|
2016-01-12 22:48:19 +00:00
|
|
|
dp->pts = mf->curr_frame / mf->sh->codec->fps;
|
2014-09-16 16:11:00 +00:00
|
|
|
dp->keyframe = true;
|
demux: remove weird tripple-buffering for the sh_stream list
The demuxer infrastructure was originally single-threaded. To make it
suitable for multithreading (specifically, demuxing and decoding on
separate threads), some sort of tripple-buffering was introduced. There
are separate "struct demuxer" allocations. The demuxer thread sets the
state on d_thread. If anything changes, the state is copied to d_buffer
(the copy is protected by a lock), and the decoder thread is notified.
Then the decoder thread copies the state from d_buffer to d_user (again
while holding a lock). This avoids the need for locking in the
demuxer/decoder code itself (only demux.c needs an internal, "invisible"
lock.)
Remove the streams/num_streams fields from this tripple-buffering
schema. Move them to the internal struct, and protect them with the
internal lock. Use accessors for read access outside of demux.c.
Other than replacing all field accesses with accessors, this separates
allocating and adding sh_streams. This is needed to avoid race
conditions. Before this change, this was awkwardly handled by first
initializing the sh_stream, and then sending a stream change event. Now
the stream is allocated, then initialized, and then declared as
immutable and added (at which point it becomes visible to the decoder
thread immediately).
This change is useful for PR #2626. And eventually, we should probably
get entirely of the tripple buffering, and this makes a nice first step.
2015-12-23 20:44:53 +00:00
|
|
|
demux_add_packet(mf->sh, dp);
|
2014-09-16 16:11:00 +00:00
|
|
|
}
|
2012-11-16 18:12:56 +00:00
|
|
|
}
|
|
|
|
talloc_free(data.start);
|
|
|
|
}
|
|
|
|
|
2013-03-19 00:54:45 +00:00
|
|
|
if (stream && stream != entry_stream)
|
2012-11-16 18:12:56 +00:00
|
|
|
free_stream(stream);
|
2002-02-06 20:15:36 +00:00
|
|
|
|
2012-11-16 18:12:56 +00:00
|
|
|
mf->curr_frame++;
|
|
|
|
return 1;
|
2002-02-06 20:15:36 +00:00
|
|
|
}
|
|
|
|
|
2013-02-24 16:23:38 +00:00
|
|
|
// map file extension/type to a codec name
|
2009-03-21 19:46:13 +00:00
|
|
|
|
2007-11-17 17:27:30 +00:00
|
|
|
static const struct {
|
2013-11-11 17:48:31 +00:00
|
|
|
const char *type;
|
|
|
|
const char *codec;
|
2007-11-17 17:27:30 +00:00
|
|
|
} type2format[] = {
|
2013-11-11 17:48:31 +00:00
|
|
|
{ "bmp", "bmp" },
|
|
|
|
{ "dpx", "dpx" },
|
|
|
|
{ "j2c", "jpeg2000" },
|
|
|
|
{ "j2k", "jpeg2000" },
|
|
|
|
{ "jp2", "jpeg2000" },
|
|
|
|
{ "jpc", "jpeg2000" },
|
|
|
|
{ "jpeg", "mjpeg" },
|
|
|
|
{ "jpg", "mjpeg" },
|
|
|
|
{ "jps", "mjpeg" },
|
|
|
|
{ "jls", "ljpeg" },
|
|
|
|
{ "thm", "mjpeg" },
|
|
|
|
{ "db", "mjpeg" },
|
|
|
|
{ "pcx", "pcx" },
|
|
|
|
{ "png", "png" },
|
|
|
|
{ "pns", "png" },
|
|
|
|
{ "ptx", "ptx" },
|
|
|
|
{ "tga", "targa" },
|
|
|
|
{ "tif", "tiff" },
|
|
|
|
{ "tiff", "tiff" },
|
|
|
|
{ "sgi", "sgi" },
|
|
|
|
{ "sun", "sunrast" },
|
|
|
|
{ "ras", "sunrast" },
|
|
|
|
{ "rs", "sunrast" },
|
|
|
|
{ "ra", "sunrast" },
|
|
|
|
{ "im1", "sunrast" },
|
|
|
|
{ "im8", "sunrast" },
|
|
|
|
{ "im24", "sunrast" },
|
|
|
|
{ "im32", "sunrast" },
|
|
|
|
{ "sunras", "sunrast" },
|
|
|
|
{ "xbm", "xbm" },
|
|
|
|
{ "pam", "pam" },
|
|
|
|
{ "pbm", "pbm" },
|
|
|
|
{ "pgm", "pgm" },
|
|
|
|
{ "pgmyuv", "pgmyuv" },
|
|
|
|
{ "ppm", "ppm" },
|
|
|
|
{ "pnm", "ppm" },
|
|
|
|
{ "gif", "gif" }, // usually handled by demux_lavf
|
|
|
|
{ "pix", "brender_pix" },
|
|
|
|
{ "exr", "exr" },
|
|
|
|
{ "pic", "pictor" },
|
|
|
|
{ "xface", "xface" },
|
|
|
|
{ "xwd", "xwd" },
|
|
|
|
{0}
|
2007-11-17 17:27:30 +00:00
|
|
|
};
|
|
|
|
|
2014-06-10 20:48:11 +00:00
|
|
|
static const char *probe_format(mf_t *mf, char *type, enum demux_check check)
|
2012-11-16 18:12:56 +00:00
|
|
|
{
|
2013-07-12 19:58:11 +00:00
|
|
|
if (check > DEMUX_CHECK_REQUEST)
|
2013-02-24 15:31:43 +00:00
|
|
|
return NULL;
|
2014-06-10 20:48:11 +00:00
|
|
|
char *org_type = type;
|
2012-11-16 18:12:56 +00:00
|
|
|
if (!type || !type[0]) {
|
|
|
|
char *p = strrchr(mf->names[0], '.');
|
|
|
|
if (p)
|
|
|
|
type = p + 1;
|
|
|
|
}
|
2013-07-12 19:58:11 +00:00
|
|
|
for (int i = 0; type2format[i].type; i++) {
|
|
|
|
if (type && strcasecmp(type, type2format[i].type) == 0)
|
|
|
|
return type2format[i].codec;
|
2012-11-16 18:12:56 +00:00
|
|
|
}
|
2013-07-12 19:58:11 +00:00
|
|
|
if (check == DEMUX_CHECK_REQUEST) {
|
2014-06-10 20:48:11 +00:00
|
|
|
if (!org_type) {
|
2013-12-21 19:24:20 +00:00
|
|
|
MP_ERR(mf, "file type was not set! (try --mf-type=ext)\n");
|
2013-11-11 17:48:31 +00:00
|
|
|
} else {
|
2013-12-21 19:24:20 +00:00
|
|
|
MP_ERR(mf, "--mf-type set to an unknown codec!\n");
|
2013-07-12 19:58:11 +00:00
|
|
|
}
|
2012-11-16 18:12:56 +00:00
|
|
|
}
|
2013-07-12 19:58:11 +00:00
|
|
|
return NULL;
|
2012-11-16 18:12:56 +00:00
|
|
|
}
|
2003-01-28 22:00:57 +00:00
|
|
|
|
2013-11-11 17:48:31 +00:00
|
|
|
static int demux_open_mf(demuxer_t *demuxer, enum demux_check check)
|
2013-07-11 18:08:12 +00:00
|
|
|
{
|
2013-11-11 17:48:31 +00:00
|
|
|
mf_t *mf;
|
|
|
|
|
|
|
|
if (strncmp(demuxer->stream->url, "mf://", 5) == 0 &&
|
2017-02-02 17:24:27 +00:00
|
|
|
demuxer->stream->info && strcmp(demuxer->stream->info->name, "mf") == 0)
|
|
|
|
{
|
2013-12-21 19:24:20 +00:00
|
|
|
mf = open_mf_pattern(demuxer, demuxer->log, demuxer->stream->url + 5);
|
2017-02-02 17:24:27 +00:00
|
|
|
} else {
|
2013-12-21 19:24:20 +00:00
|
|
|
mf = open_mf_single(demuxer, demuxer->log, demuxer->stream->url);
|
2013-11-11 18:20:37 +00:00
|
|
|
int bog = 0;
|
|
|
|
MP_TARRAY_APPEND(mf, mf->streams, bog, demuxer->stream);
|
2013-11-11 17:48:31 +00:00
|
|
|
}
|
2013-07-12 19:58:11 +00:00
|
|
|
|
2013-11-11 17:48:31 +00:00
|
|
|
if (!mf || mf->nr_of_files < 1)
|
|
|
|
goto error;
|
2006-02-14 09:34:30 +00:00
|
|
|
|
2016-09-06 18:09:56 +00:00
|
|
|
double mf_fps;
|
|
|
|
char *mf_type;
|
|
|
|
mp_read_option_raw(demuxer->global, "mf-fps", &m_option_type_double, &mf_fps);
|
|
|
|
mp_read_option_raw(demuxer->global, "mf-type", &m_option_type_string, &mf_type);
|
|
|
|
|
2014-12-22 11:54:18 +00:00
|
|
|
const char *codec = mp_map_mimetype_to_video_codec(demuxer->stream->mime_type);
|
2016-09-06 18:09:56 +00:00
|
|
|
if (!codec || (mf_type && mf_type[0]))
|
|
|
|
codec = probe_format(mf, mf_type, check);
|
|
|
|
talloc_free(mf_type);
|
2013-11-11 17:48:31 +00:00
|
|
|
if (!codec)
|
|
|
|
goto error;
|
2003-01-28 22:00:57 +00:00
|
|
|
|
2013-11-11 17:48:31 +00:00
|
|
|
mf->curr_frame = 0;
|
2002-02-06 20:15:36 +00:00
|
|
|
|
2013-11-11 17:48:31 +00:00
|
|
|
// create a new video stream header
|
demux: remove weird tripple-buffering for the sh_stream list
The demuxer infrastructure was originally single-threaded. To make it
suitable for multithreading (specifically, demuxing and decoding on
separate threads), some sort of tripple-buffering was introduced. There
are separate "struct demuxer" allocations. The demuxer thread sets the
state on d_thread. If anything changes, the state is copied to d_buffer
(the copy is protected by a lock), and the decoder thread is notified.
Then the decoder thread copies the state from d_buffer to d_user (again
while holding a lock). This avoids the need for locking in the
demuxer/decoder code itself (only demux.c needs an internal, "invisible"
lock.)
Remove the streams/num_streams fields from this tripple-buffering
schema. Move them to the internal struct, and protect them with the
internal lock. Use accessors for read access outside of demux.c.
Other than replacing all field accesses with accessors, this separates
allocating and adding sh_streams. This is needed to avoid race
conditions. Before this change, this was awkwardly handled by first
initializing the sh_stream, and then sending a stream change event. Now
the stream is allocated, then initialized, and then declared as
immutable and added (at which point it becomes visible to the decoder
thread immediately).
This change is useful for PR #2626. And eventually, we should probably
get entirely of the tripple buffering, and this makes a nice first step.
2015-12-23 20:44:53 +00:00
|
|
|
struct sh_stream *sh = demux_alloc_sh_stream(STREAM_VIDEO);
|
2016-01-12 22:48:19 +00:00
|
|
|
struct mp_codec_params *c = sh->codec;
|
2002-02-06 20:15:36 +00:00
|
|
|
|
2016-01-12 22:48:19 +00:00
|
|
|
c->codec = codec;
|
|
|
|
c->disp_w = 0;
|
|
|
|
c->disp_h = 0;
|
2016-09-06 18:09:56 +00:00
|
|
|
c->fps = mf_fps;
|
2016-08-19 12:19:46 +00:00
|
|
|
c->reliable_fps = true;
|
2002-02-06 20:15:36 +00:00
|
|
|
|
2015-12-23 20:58:01 +00:00
|
|
|
demux_add_sh_stream(demuxer, sh);
|
|
|
|
|
|
|
|
mf->sh = sh;
|
2013-11-11 17:48:31 +00:00
|
|
|
demuxer->priv = (void *)mf;
|
|
|
|
demuxer->seekable = true;
|
2017-06-20 11:57:58 +00:00
|
|
|
demuxer->duration = mf->nr_of_files / mf->sh->codec->fps;
|
2002-02-06 20:15:36 +00:00
|
|
|
|
2013-11-11 17:48:31 +00:00
|
|
|
return 0;
|
2012-11-16 18:12:56 +00:00
|
|
|
|
|
|
|
error:
|
2013-11-11 17:48:31 +00:00
|
|
|
return -1;
|
2002-02-06 20:15:36 +00:00
|
|
|
}
|
2002-04-24 15:36:07 +00:00
|
|
|
|
2013-11-11 17:48:31 +00:00
|
|
|
static void demux_close_mf(demuxer_t *demuxer)
|
|
|
|
{
|
2002-04-24 15:36:07 +00:00
|
|
|
}
|
2005-08-05 19:57:47 +00:00
|
|
|
|
2008-01-13 16:00:39 +00:00
|
|
|
const demuxer_desc_t demuxer_desc_mf = {
|
2013-07-11 18:08:12 +00:00
|
|
|
.name = "mf",
|
2013-07-12 20:12:02 +00:00
|
|
|
.desc = "image files (mf)",
|
2013-07-11 18:08:12 +00:00
|
|
|
.fill_buffer = demux_mf_fill_buffer,
|
|
|
|
.open = demux_open_mf,
|
|
|
|
.close = demux_close_mf,
|
|
|
|
.seek = demux_seek_mf,
|
2005-08-05 19:57:47 +00:00
|
|
|
};
|