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: change license to LGPL
As usual, the history of these files is a bit murky. It starts with the
initial commit. (At which some development had already been done,
according to the AUTHORS and ChangeLog files at the time, we should be
but covered with relicensing agreements, though.) then it goes on with
complete lack of modularization, which was cleaned up later (cd68e161).
As usual, we don't consider the copyright of the stuff that has been
moved out cleanly.
There were also contributions to generic code by people who could not be
reached or who did not agree to the relicensing, but this was all
removed.
The only patches that we could not relicense and which were still in the
current code in some form are from Dénes Balatoni: 422b0d2a, 32937181.
We could not reach him, so commits f34e1a0d and 18905298 remove his
additions. It still leaves the demux_control() declaration itself, but
we don't consider it copyrightable. It's basically an idiom that existed
in MPlayer before that change, applied to the demuxer struct. (We even
went as far as making sure to remove all DEMUXER_CTRLs the original
author added.)
Commit be54f481 might be a bit of a corner case, but this was rewritten,
and we consider the old copyright removed long ago.
2017-06-20 12:09:46 +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.
|
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: change license to LGPL
As usual, the history of these files is a bit murky. It starts with the
initial commit. (At which some development had already been done,
according to the AUTHORS and ChangeLog files at the time, we should be
but covered with relicensing agreements, though.) then it goes on with
complete lack of modularization, which was cleaned up later (cd68e161).
As usual, we don't consider the copyright of the stuff that has been
moved out cleanly.
There were also contributions to generic code by people who could not be
reached or who did not agree to the relicensing, but this was all
removed.
The only patches that we could not relicense and which were still in the
current code in some form are from Dénes Balatoni: 422b0d2a, 32937181.
We could not reach him, so commits f34e1a0d and 18905298 remove his
additions. It still leaves the demux_control() declaration itself, but
we don't consider it copyrightable. It's basically an idiom that existed
in MPlayer before that change, applied to the demuxer struct. (We even
went as far as making sure to remove all DEMUXER_CTRLs the original
author added.)
Commit be54f481 might be a bit of a corner case, but this was rewritten,
and we consider the old copyright removed long ago.
2017-06-20 12:09:46 +00:00
|
|
|
* GNU Lesser General Public License for more details.
|
2009-05-08 21:51:13 +00:00
|
|
|
*
|
demux: change license to LGPL
As usual, the history of these files is a bit murky. It starts with the
initial commit. (At which some development had already been done,
according to the AUTHORS and ChangeLog files at the time, we should be
but covered with relicensing agreements, though.) then it goes on with
complete lack of modularization, which was cleaned up later (cd68e161).
As usual, we don't consider the copyright of the stuff that has been
moved out cleanly.
There were also contributions to generic code by people who could not be
reached or who did not agree to the relicensing, but this was all
removed.
The only patches that we could not relicense and which were still in the
current code in some form are from Dénes Balatoni: 422b0d2a, 32937181.
We could not reach him, so commits f34e1a0d and 18905298 remove his
additions. It still leaves the demux_control() declaration itself, but
we don't consider it copyrightable. It's basically an idiom that existed
in MPlayer before that change, applied to the demuxer struct. (We even
went as far as making sure to remove all DEMUXER_CTRLs the original
author added.)
Commit be54f481 might be a bit of a corner case, but this was rewritten,
and we consider the old copyright removed long ago.
2017-06-20 12:09:46 +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/>.
|
2009-05-08 21:51:13 +00:00
|
|
|
*/
|
2001-02-24 20:28:24 +00:00
|
|
|
|
2001-04-23 03:42:17 +00:00
|
|
|
#include <stdio.h>
|
|
|
|
#include <stdlib.h>
|
2001-11-27 00:42:39 +00:00
|
|
|
#include <string.h>
|
2011-08-20 17:25:43 +00:00
|
|
|
#include <assert.h>
|
2001-08-01 09:14:02 +00:00
|
|
|
#include <unistd.h>
|
2016-09-06 18:09:56 +00:00
|
|
|
#include <limits.h>
|
2014-07-16 20:40:21 +00:00
|
|
|
#include <pthread.h>
|
2001-08-01 09:14:02 +00:00
|
|
|
|
2014-03-28 11:38:42 +00:00
|
|
|
#include <math.h>
|
|
|
|
|
2001-08-01 09:14:02 +00:00
|
|
|
#include <sys/types.h>
|
|
|
|
#include <sys/stat.h>
|
2001-02-24 20:28:24 +00:00
|
|
|
|
2001-07-21 22:37:55 +00:00
|
|
|
#include "config.h"
|
2016-09-06 18:09:56 +00:00
|
|
|
#include "options/m_config.h"
|
|
|
|
#include "options/m_option.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"
|
2013-12-21 19:24:20 +00:00
|
|
|
#include "common/global.h"
|
2014-10-19 21:32:34 +00:00
|
|
|
#include "osdep/threads.h"
|
2001-07-21 22:37:55 +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"
|
Rewrite ordered chapters and timeline stuff
This uses a different method to piece segments together. The old
approach basically changes to a new file (with a new start offset) any
time a segment ends. This meant waiting for audio/video end on segment
end, and then changing to the new segment all at once. It had a very
weird impact on the playback core, and some things (like truly gapless
segment transitions, or frame backstepping) just didn't work.
The new approach adds the demux_timeline pseudo-demuxer, which presents
an uniform packet stream from the many segments. This is pretty similar
to how ordered chapters are implemented everywhere else. It also reminds
of the FFmpeg concat pseudo-demuxer.
The "pure" version of this approach doesn't work though. Segments can
actually have different codec configurations (different extradata), and
subtitles are most likely broken too. (Subtitles have multiple corner
cases which break the pure stream-concatenation approach completely.)
To counter this, we do two things:
- Reinit the decoder with each segment. We go as far as allowing
concatenating files with completely different codecs for the sake
of EDL (which also uses the timeline infrastructure). A "lighter"
approach would try to make use of decoder mechanism to update e.g.
the extradata, but that seems fragile.
- Clip decoded data to segment boundaries. This is equivalent to
normal playback core mechanisms like hr-seek, but now the playback
core doesn't need to care about these things.
These two mechanisms are equivalent to what happened in the old
implementation, except they don't happen in the playback core anymore.
In other words, the playback core is completely relieved from timeline
implementation details. (Which honestly is exactly what I'm trying to
do here. I don't think ordered chapter behavior deserves improvement,
even if it's bad - but I want to get it out from the playback core.)
There is code duplication between audio and video decoder common code.
This is awful and could be shareable - but this will happen later.
Note that the audio path has some code to clip audio frames for the
purpose of codec preroll/gapless handling, but it's not shared as
sharing it would cause more pain than it would help.
2016-02-15 20:04:07 +00:00
|
|
|
#include "timeline.h"
|
2001-07-21 22:37:55 +00:00
|
|
|
#include "stheader.h"
|
2015-05-19 19:36:52 +00:00
|
|
|
#include "cue.h"
|
2002-03-15 15:53:11 +00:00
|
|
|
|
2005-08-05 19:57:47 +00:00
|
|
|
// Demuxer list
|
EDL: add support for new EDL file format
The timeline code previously added to support Matroska ordered
chapters allows constructing a playback timeline from segments picked
from multiple source files. Add support for a new EDL format to make
this machinery available for use with file formats other than Matroska
and in a manner easier to use than creating files with ordered
chapters.
Unlike the old -edl option which specifies an additional file with
edits to apply to the video file given as the main argument, the new
EDL format is used by giving only the EDL file as the file to play;
that file then contains the filename(s) to use as source files where
actual video segments come from. Filename paths in the EDL file are
ignored. Currently the source files are only searched for in the
directory of the EDL file; support for a search path option will
likely be added in the future.
Format of the EDL files
The first line in the file must be "mplayer EDL file, version 2".
The rest of the lines belong to one of these classes:
1) lines specifying source files
2) empty lines
3) lines specifying timeline segments.
Lines beginning with '<' specify source files. These lines first
contain an identifier used to refer to the source file later, then the
filename separated by whitespace. The identifier must start with a
letter. Filenames that start or end with whitespace or contain
newlines are not supported.
On other lines '#' characters delimit comments. Lines that contain
only whitespace after comments have been removed are ignored.
Timeline segments must appear in the file in chronological order. Each
segment has the following information associated with it:
- duration
- output start time
- output end time (= output start time + duration)
- source id (specifies the file the content of the segment comes from)
- source start time (timestamp in the source file)
- source end time (= source start time + duration)
The output timestamps must form a continuous timeline from 0 to the
end of the last segment, such that each new segment starts from the
time the previous one ends at. Source files and times may change
arbitrarily between segments.
The general format for lines specifying timeline segments is
[output time info] source_id [source time info]
source_id must be an identifier defined on a '<' line. Both the time
info parts consists of zero or more of the following elements:
1) timestamp
2) -timestamp
3) +duration
4) *
5) -*
, where "timestamp" and "duration" are decimal numbers (computations
are done with nanosecond precision). Whitespace around "+" and "-" is
optional. 1) and 2) specify start and end time of the segment on
output or source side. 3) specifies duration; the semantics are the
same whether this appears on output or source side. 4) and 5) are
ignored on the output side (they're always implicitly assumed). On the
source side 4) specifies that the segment starts where the previous
segment _using this source_ ended; if there was no previous segment
time 0 is used. 5) specifies that the segment ends where the next
segment using this source starts.
Redundant information may be omitted. It will be filled in using the
following rules:
- output start for first segment is 0
- two of [output start, output end, duration] imply third
- two of [source start, source end, duration] imply third
- output start = output end of previous segment
- output end = output start of next segment
- if "*", source start = source end of earlier segment
- if "-*", source end = source start of a later segment
As a special rule, a last zero-duration segment without a source
specification may appear. This will produce no corresponding segment
in the resulting timeline, but can be used as syntax to specify the
end time of the timeline (with effect equal to adding -time on the
previous line).
Examples:
----- begin -----
mplayer EDL file, version 2
< id1 filename
0 id1 123
100 id1 456
200 id1 789
300
----- end -----
All segments come from the source file "filename". First segment
(output time 0-100) comes from time 123-223, second 456-556, third
789-889.
----- begin -----
mplayer EDL file, version 2
< f filename
f 60-120
f 600-660
f 30- 90
----- end -----
Play first seconds 60-120 from the file, then 600-660, then 30-90.
----- begin -----
mplayer EDL file, version 2
< id1 filename1
< id2 filename2
+10 id1 *
+10 id2 *
+10 id1 *
+10 id2 *
+10 id1 *
+10 id2 *
----- end -----
This plays time 0-10 from filename1, then 0-10 from filename1, then
10-20 from filename1, then 10-20 from filename2, then 20-30 from
filename1, then 20-30 from filename2.
----- begin -----
mplayer EDL file, version 2
< t1 filename1
< t2 filename2
t1 * +2 # segment 1
+2 t2 100 # segment 2
t1 * # segment 3
t2 *-* # segment 4
t1 3 -* # segment 5
+0.111111 t2 102.5 # segment 6
7.37 t1 5 +1 # segment 7
----- end -----
This rather pathological example illustrates the rules for filling in
implied data. All the values can be determined by recursively applying
the rules given above, and the full end result is this:
+2 0-2 t1 0-2 # segment 1
+2 2-4 t2 100-102 # segment 2
+0.758889 4-4.758889 t1 2-2.758889 # segment 3
+0.5 4.4758889-5.258889 t2 102-102.5 # segment 4
+2 5.258889-7.258889 t1 3-5 # segment 5
+0.111111 7.258889-7.37 t2 102.5-102.611111 # segment 6
+1 7.37-8.37 t1 5-6 # segment 7
2011-02-14 11:05:35 +00:00
|
|
|
extern const struct demuxer_desc demuxer_desc_edl;
|
2012-01-01 16:45:24 +00:00
|
|
|
extern const struct demuxer_desc demuxer_desc_cue;
|
2008-01-13 16:00:39 +00:00
|
|
|
extern const demuxer_desc_t demuxer_desc_rawaudio;
|
|
|
|
extern const demuxer_desc_t demuxer_desc_rawvideo;
|
|
|
|
extern const demuxer_desc_t demuxer_desc_tv;
|
|
|
|
extern const demuxer_desc_t demuxer_desc_mf;
|
|
|
|
extern const demuxer_desc_t demuxer_desc_matroska;
|
|
|
|
extern const demuxer_desc_t demuxer_desc_lavf;
|
2013-08-25 18:40:21 +00:00
|
|
|
extern const demuxer_desc_t demuxer_desc_playlist;
|
2014-07-14 23:49:02 +00:00
|
|
|
extern const demuxer_desc_t demuxer_desc_disc;
|
2015-03-24 20:29:09 +00:00
|
|
|
extern const demuxer_desc_t demuxer_desc_rar;
|
stream: libarchive wrapper for reading compressed archives
This works similar to the existing .rar support, but uses libarchive.
libarchive supports a number of formats, including zip and (most of)
rar.
Unfortunately, seeking does not work too well. Most libarchive readers
do not support seeking, so it's emulated by skipping data until the
target position. On backwards seek, the file is reopened. This works
fine on a local machine (and if the file is not too large), but will
perform not so well over network connection.
This is disabled by default for now. One reason is that we try
libarchive on every file we open, before trying libavformat, and I'm not
sure if I trust libarchive that much yet. Another reason is that this
breaks multivolume rar support. While libarchive supports seeking in
rar, and (probably) supports multivolume archive, our support of
libarchive (probably) does not. I don't care about multivolume rar, but
vocal users do.
2015-08-16 22:55:26 +00:00
|
|
|
extern const demuxer_desc_t demuxer_desc_libarchive;
|
2016-03-04 22:51:55 +00:00
|
|
|
extern const demuxer_desc_t demuxer_desc_null;
|
Rewrite ordered chapters and timeline stuff
This uses a different method to piece segments together. The old
approach basically changes to a new file (with a new start offset) any
time a segment ends. This meant waiting for audio/video end on segment
end, and then changing to the new segment all at once. It had a very
weird impact on the playback core, and some things (like truly gapless
segment transitions, or frame backstepping) just didn't work.
The new approach adds the demux_timeline pseudo-demuxer, which presents
an uniform packet stream from the many segments. This is pretty similar
to how ordered chapters are implemented everywhere else. It also reminds
of the FFmpeg concat pseudo-demuxer.
The "pure" version of this approach doesn't work though. Segments can
actually have different codec configurations (different extradata), and
subtitles are most likely broken too. (Subtitles have multiple corner
cases which break the pure stream-concatenation approach completely.)
To counter this, we do two things:
- Reinit the decoder with each segment. We go as far as allowing
concatenating files with completely different codecs for the sake
of EDL (which also uses the timeline infrastructure). A "lighter"
approach would try to make use of decoder mechanism to update e.g.
the extradata, but that seems fragile.
- Clip decoded data to segment boundaries. This is equivalent to
normal playback core mechanisms like hr-seek, but now the playback
core doesn't need to care about these things.
These two mechanisms are equivalent to what happened in the old
implementation, except they don't happen in the playback core anymore.
In other words, the playback core is completely relieved from timeline
implementation details. (Which honestly is exactly what I'm trying to
do here. I don't think ordered chapter behavior deserves improvement,
even if it's bad - but I want to get it out from the playback core.)
There is code duplication between audio and video decoder common code.
This is awful and could be shareable - but this will happen later.
Note that the audio path has some code to clip audio frames for the
purpose of codec preroll/gapless handling, but it's not shared as
sharing it would cause more pain than it would help.
2016-02-15 20:04:07 +00:00
|
|
|
extern const demuxer_desc_t demuxer_desc_timeline;
|
2005-08-05 19:57:47 +00:00
|
|
|
|
2008-01-28 16:03:22 +00:00
|
|
|
/* Please do not add any new demuxers here. If you want to implement a new
|
2008-01-28 22:09:21 +00:00
|
|
|
* demuxer, add it to libavformat, except for wrappers around external
|
|
|
|
* libraries and demuxers requiring binary support. */
|
2008-01-28 16:03:22 +00:00
|
|
|
|
2008-04-12 15:51:08 +00:00
|
|
|
const demuxer_desc_t *const demuxer_list[] = {
|
2014-07-14 23:49:02 +00:00
|
|
|
&demuxer_desc_disc,
|
EDL: add support for new EDL file format
The timeline code previously added to support Matroska ordered
chapters allows constructing a playback timeline from segments picked
from multiple source files. Add support for a new EDL format to make
this machinery available for use with file formats other than Matroska
and in a manner easier to use than creating files with ordered
chapters.
Unlike the old -edl option which specifies an additional file with
edits to apply to the video file given as the main argument, the new
EDL format is used by giving only the EDL file as the file to play;
that file then contains the filename(s) to use as source files where
actual video segments come from. Filename paths in the EDL file are
ignored. Currently the source files are only searched for in the
directory of the EDL file; support for a search path option will
likely be added in the future.
Format of the EDL files
The first line in the file must be "mplayer EDL file, version 2".
The rest of the lines belong to one of these classes:
1) lines specifying source files
2) empty lines
3) lines specifying timeline segments.
Lines beginning with '<' specify source files. These lines first
contain an identifier used to refer to the source file later, then the
filename separated by whitespace. The identifier must start with a
letter. Filenames that start or end with whitespace or contain
newlines are not supported.
On other lines '#' characters delimit comments. Lines that contain
only whitespace after comments have been removed are ignored.
Timeline segments must appear in the file in chronological order. Each
segment has the following information associated with it:
- duration
- output start time
- output end time (= output start time + duration)
- source id (specifies the file the content of the segment comes from)
- source start time (timestamp in the source file)
- source end time (= source start time + duration)
The output timestamps must form a continuous timeline from 0 to the
end of the last segment, such that each new segment starts from the
time the previous one ends at. Source files and times may change
arbitrarily between segments.
The general format for lines specifying timeline segments is
[output time info] source_id [source time info]
source_id must be an identifier defined on a '<' line. Both the time
info parts consists of zero or more of the following elements:
1) timestamp
2) -timestamp
3) +duration
4) *
5) -*
, where "timestamp" and "duration" are decimal numbers (computations
are done with nanosecond precision). Whitespace around "+" and "-" is
optional. 1) and 2) specify start and end time of the segment on
output or source side. 3) specifies duration; the semantics are the
same whether this appears on output or source side. 4) and 5) are
ignored on the output side (they're always implicitly assumed). On the
source side 4) specifies that the segment starts where the previous
segment _using this source_ ended; if there was no previous segment
time 0 is used. 5) specifies that the segment ends where the next
segment using this source starts.
Redundant information may be omitted. It will be filled in using the
following rules:
- output start for first segment is 0
- two of [output start, output end, duration] imply third
- two of [source start, source end, duration] imply third
- output start = output end of previous segment
- output end = output start of next segment
- if "*", source start = source end of earlier segment
- if "-*", source end = source start of a later segment
As a special rule, a last zero-duration segment without a source
specification may appear. This will produce no corresponding segment
in the resulting timeline, but can be used as syntax to specify the
end time of the timeline (with effect equal to adding -time on the
previous line).
Examples:
----- begin -----
mplayer EDL file, version 2
< id1 filename
0 id1 123
100 id1 456
200 id1 789
300
----- end -----
All segments come from the source file "filename". First segment
(output time 0-100) comes from time 123-223, second 456-556, third
789-889.
----- begin -----
mplayer EDL file, version 2
< f filename
f 60-120
f 600-660
f 30- 90
----- end -----
Play first seconds 60-120 from the file, then 600-660, then 30-90.
----- begin -----
mplayer EDL file, version 2
< id1 filename1
< id2 filename2
+10 id1 *
+10 id2 *
+10 id1 *
+10 id2 *
+10 id1 *
+10 id2 *
----- end -----
This plays time 0-10 from filename1, then 0-10 from filename1, then
10-20 from filename1, then 10-20 from filename2, then 20-30 from
filename1, then 20-30 from filename2.
----- begin -----
mplayer EDL file, version 2
< t1 filename1
< t2 filename2
t1 * +2 # segment 1
+2 t2 100 # segment 2
t1 * # segment 3
t2 *-* # segment 4
t1 3 -* # segment 5
+0.111111 t2 102.5 # segment 6
7.37 t1 5 +1 # segment 7
----- end -----
This rather pathological example illustrates the rules for filling in
implied data. All the values can be determined by recursively applying
the rules given above, and the full end result is this:
+2 0-2 t1 0-2 # segment 1
+2 2-4 t2 100-102 # segment 2
+0.758889 4-4.758889 t1 2-2.758889 # segment 3
+0.5 4.4758889-5.258889 t2 102-102.5 # segment 4
+2 5.258889-7.258889 t1 3-5 # segment 5
+0.111111 7.258889-7.37 t2 102.5-102.611111 # segment 6
+1 7.37-8.37 t1 5-6 # segment 7
2011-02-14 11:05:35 +00:00
|
|
|
&demuxer_desc_edl,
|
2012-01-01 16:45:24 +00:00
|
|
|
&demuxer_desc_cue,
|
2008-04-12 15:51:08 +00:00
|
|
|
&demuxer_desc_rawaudio,
|
|
|
|
&demuxer_desc_rawvideo,
|
2013-07-16 11:28:28 +00:00
|
|
|
#if HAVE_TV
|
2008-04-12 15:51:08 +00:00
|
|
|
&demuxer_desc_tv,
|
2013-07-07 23:40:13 +00:00
|
|
|
#endif
|
2008-04-12 15:51:08 +00:00
|
|
|
&demuxer_desc_matroska,
|
stream: libarchive wrapper for reading compressed archives
This works similar to the existing .rar support, but uses libarchive.
libarchive supports a number of formats, including zip and (most of)
rar.
Unfortunately, seeking does not work too well. Most libarchive readers
do not support seeking, so it's emulated by skipping data until the
target position. On backwards seek, the file is reopened. This works
fine on a local machine (and if the file is not too large), but will
perform not so well over network connection.
This is disabled by default for now. One reason is that we try
libarchive on every file we open, before trying libavformat, and I'm not
sure if I trust libarchive that much yet. Another reason is that this
breaks multivolume rar support. While libarchive supports seeking in
rar, and (probably) supports multivolume archive, our support of
libarchive (probably) does not. I don't care about multivolume rar, but
vocal users do.
2015-08-16 22:55:26 +00:00
|
|
|
#if HAVE_LIBARCHIVE
|
|
|
|
&demuxer_desc_libarchive,
|
|
|
|
#endif
|
2015-03-24 20:29:09 +00:00
|
|
|
&demuxer_desc_rar,
|
2008-04-12 15:51:08 +00:00
|
|
|
&demuxer_desc_lavf,
|
2013-08-12 18:40:39 +00:00
|
|
|
&demuxer_desc_mf,
|
2013-08-25 18:40:21 +00:00
|
|
|
&demuxer_desc_playlist,
|
2016-03-04 22:51:55 +00:00
|
|
|
&demuxer_desc_null,
|
2008-04-12 15:51:08 +00:00
|
|
|
NULL
|
2005-08-05 19:57:47 +00:00
|
|
|
};
|
|
|
|
|
2016-09-06 18:09:56 +00:00
|
|
|
struct demux_opts {
|
|
|
|
int max_bytes;
|
2017-10-21 17:26:33 +00:00
|
|
|
int max_bytes_bw;
|
2016-09-06 18:09:56 +00:00
|
|
|
double min_secs;
|
|
|
|
int force_seekable;
|
|
|
|
double min_secs_cache;
|
2016-12-04 22:15:31 +00:00
|
|
|
int access_references;
|
2017-10-21 17:26:33 +00:00
|
|
|
int seekable_cache;
|
2016-09-06 18:09:56 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
#define OPT_BASE_STRUCT struct demux_opts
|
|
|
|
|
|
|
|
const struct m_sub_options demux_conf = {
|
|
|
|
.opts = (const struct m_option[]){
|
|
|
|
OPT_DOUBLE("demuxer-readahead-secs", min_secs, M_OPT_MIN, .min = 0),
|
|
|
|
OPT_INTRANGE("demuxer-max-bytes", max_bytes, 0, 0, INT_MAX),
|
2017-10-21 17:26:33 +00:00
|
|
|
OPT_INTRANGE("demuxer-max-back-bytes", max_bytes_bw, 0, 0, INT_MAX),
|
2016-09-06 18:09:56 +00:00
|
|
|
OPT_FLAG("force-seekable", force_seekable, 0),
|
|
|
|
OPT_DOUBLE("cache-secs", min_secs_cache, M_OPT_MIN, .min = 0),
|
2016-12-04 22:15:31 +00:00
|
|
|
OPT_FLAG("access-references", access_references, 0),
|
2017-10-21 17:26:33 +00:00
|
|
|
OPT_FLAG("demuxer-seekable-cache", seekable_cache, 0),
|
2016-09-06 18:09:56 +00:00
|
|
|
{0}
|
|
|
|
},
|
|
|
|
.size = sizeof(struct demux_opts),
|
|
|
|
.defaults = &(const struct demux_opts){
|
|
|
|
.max_bytes = 400 * 1024 * 1024,
|
2017-10-21 17:26:33 +00:00
|
|
|
.max_bytes_bw = 0,
|
2016-09-06 18:09:56 +00:00
|
|
|
.min_secs = 1.0,
|
|
|
|
.min_secs_cache = 10.0,
|
2016-12-04 22:15:31 +00:00
|
|
|
.access_references = 1,
|
2016-09-06 18:09:56 +00:00
|
|
|
},
|
|
|
|
};
|
|
|
|
|
2014-07-16 20:40:21 +00:00
|
|
|
struct demux_internal {
|
|
|
|
struct mp_log *log;
|
|
|
|
|
|
|
|
// The demuxer runs potentially in another thread, so we keep two demuxer
|
|
|
|
// structs; the real demuxer can access the shadow struct only.
|
|
|
|
// Since demuxer and user threads both don't use locks, a third demuxer
|
|
|
|
// struct d_buffer is used to copy data between them in a synchronized way.
|
|
|
|
struct demuxer *d_thread; // accessed by demuxer impl. (producer)
|
|
|
|
struct demuxer *d_user; // accessed by player (consumer)
|
|
|
|
struct demuxer *d_buffer; // protected by lock; used to sync d_user/thread
|
|
|
|
|
|
|
|
// The lock protects the packet queues (struct demux_stream), d_buffer,
|
2016-03-09 23:06:13 +00:00
|
|
|
// and the fields below.
|
2014-07-16 20:40:21 +00:00
|
|
|
pthread_mutex_t lock;
|
|
|
|
pthread_cond_t wakeup;
|
|
|
|
pthread_t thread;
|
|
|
|
|
|
|
|
// -- All the following fields are protected by lock.
|
|
|
|
|
|
|
|
bool thread_terminate;
|
|
|
|
bool threading;
|
|
|
|
void (*wakeup_cb)(void *ctx);
|
|
|
|
void *wakeup_cb_ctx;
|
|
|
|
|
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 **streams;
|
|
|
|
int num_streams;
|
|
|
|
|
|
|
|
int events;
|
|
|
|
|
2014-07-16 20:40:21 +00:00
|
|
|
bool warned_queue_overflow;
|
2014-07-18 13:08:38 +00:00
|
|
|
bool last_eof; // last actual global EOF status
|
|
|
|
bool eof; // whether we're in EOF state (reset for retry)
|
player: redo how stream caching and pausing on low cache works
Add the --cache-secs option, which literally overrides the value of
--demuxer-readahead-secs if the stream cache is active. The default
value is very high (10 seconds), which means it can act as network
cache.
Remove the old behavior of trying to pause once the byte cache runs
low. Instead, do something similar wit the demuxer cache. The nice
thing is that we can guess how many seconds of video it has cached,
and we can make better decisions. But for now, apply a relatively
naive heuristic: if the cache is below 0.5 secs, pause, and wait
until at least 2 secs are available.
Note that due to timestamp reordering, the estimated cached duration
of video might be inaccurate, depending on the file format. If the
file format has DTS, it's easy, otherwise the duration will seemingly
jump back and forth.
2014-08-26 23:13:20 +00:00
|
|
|
bool idle;
|
2014-07-16 20:40:21 +00:00
|
|
|
bool autoselect;
|
2014-08-16 15:07:36 +00:00
|
|
|
double min_secs;
|
2015-08-05 21:41:29 +00:00
|
|
|
int max_bytes;
|
2017-10-21 17:26:33 +00:00
|
|
|
int max_bytes_bw;
|
|
|
|
int seekable_cache;
|
2014-07-16 20:40:21 +00:00
|
|
|
|
player: improve instant track switching
When switching tracks, we normally have the problem that data gets lost
due to readahead buffering. (Which in turn is because we're stubborn and
instruct the demuxers to discard data on unselected streams.) The
demuxer layer has a hack that re-reads discarded buffered data if a
stream is enabled mid-stream, so track switching will seem instant.
A somewhat similar problem is when all tracks of an external files were
disabled - when enabling the first track, we have to seek to the target
position.
Handle these with the same mechanism. Pass the "current time" to the
demuxer's stream switch function, and let the demuxer figure out what to
do. The demuxer will issue a refresh seek (if possible) to update the
new stream, or will issue a "normal" seek if there was no active stream
yet.
One case that changes is when a video/audio stream is enabled on an
external file with only a subtitle stream active, and the demuxer does
not support rrefresh seeks. This is a fuzzy case, because subtitles are
sparse, and the demuxer might have skipped large amounts of data. We
used to seek (and send the subtitle decoder some subtitle packets
twice). This case is sort of obscure and insane, and the fix would be
questionable, so we simply don't care.
Should mostly fix #3392.
2016-08-06 13:47:04 +00:00
|
|
|
// Set if we know that we are at the start of the file. This is used to
|
|
|
|
// avoid a redundant initial seek after enabling streams. We could just
|
|
|
|
// allow it, but to avoid buggy seeking affecting normal playback, we don't.
|
|
|
|
bool initial_state;
|
|
|
|
|
2014-08-06 17:25:37 +00:00
|
|
|
bool tracks_switched; // thread needs to inform demuxer of this
|
|
|
|
|
2014-07-21 17:27:24 +00:00
|
|
|
bool seeking; // there's a seek queued
|
|
|
|
int seek_flags; // flags for next seek (if seeking==true)
|
|
|
|
double seek_pts;
|
|
|
|
|
player: improve instant track switching
When switching tracks, we normally have the problem that data gets lost
due to readahead buffering. (Which in turn is because we're stubborn and
instruct the demuxers to discard data on unselected streams.) The
demuxer layer has a hack that re-reads discarded buffered data if a
stream is enabled mid-stream, so track switching will seem instant.
A somewhat similar problem is when all tracks of an external files were
disabled - when enabling the first track, we have to seek to the target
position.
Handle these with the same mechanism. Pass the "current time" to the
demuxer's stream switch function, and let the demuxer figure out what to
do. The demuxer will issue a refresh seek (if possible) to update the
new stream, or will issue a "normal" seek if there was no active stream
yet.
One case that changes is when a video/audio stream is enabled on an
external file with only a subtitle stream active, and the demuxer does
not support rrefresh seeks. This is a fuzzy case, because subtitles are
sparse, and the demuxer might have skipped large amounts of data. We
used to seek (and send the subtitle decoder some subtitle packets
twice). This case is sort of obscure and insane, and the fix would be
questionable, so we simply don't care.
Should mostly fix #3392.
2016-08-06 13:47:04 +00:00
|
|
|
double ref_pts; // assumed player position (only for track switches)
|
demux: hack for instant stream switching
This removes the delay when switching audio tracks in mkv or mp4 files.
Other formats are not enabled, because it's not clear whether the
demuxers fulfill the requirements listed in demux.h. (Many formats
definitely do not with libavformat.)
Background:
The demuxer packet cache buffers a certain amount of packets. This
includes only packets from selected streams. We discard packets from
other streams for various reasons. This introduces a problem: switching
to a different audio track introduces a delay. The delay is as big as
the demuxer packet cache buffer, because while the file was read ahead
to fill the packet buffer, the process of reading packets also discarded
all packets from the previously not selected audio stream. Once the
remaining packet buffer has been played, new audio packets are available
and you hear audio again.
We could probably just not discard packets from unselected streams. But
this would require additional memory and CPU resources, and also it's
hard to tell when packets from unused streams should be discarded (we
don't want to keep them forever; it'd be a memory leak).
We could also issue a player hr-seek to the current playback position,
which would solve the problem in 1 line of code or so. But this can be
rather slow.
So what we do in this commit instead is: we just seek back to the
position where our current packet buffer starts, and start demuxing from
this position again. This way we can get the "past" packets for the
newly selected stream. For streams which were already selected the
packets are simply discarded until the previous position is reached
again.
That latter part is the hard part. We really want to skip packets
exactly until the position where we left off previously, or we will skip
packets or feed packets to the decoder twice. If we assume that the
demuxer is deterministic (returns exactly the same packets after a seek
to a previous position), then we can try to check whether it's the same
packet as the one at the end of the packet buffer. If it is, we know
that the packet after it is where we left off last time.
Unfortunately, this is not very robust, and maybe it can't be made
robust. Currently we use the demux_packet.pos field as unique packet
ID - which works fine in some scenarios, but will break in arbitrary
ways if the basic requirement to the demuxer (as listed in the demux.h
additions) are broken. Thus, this is enabled only for the internal mkv
demuxer and the libavformat mp4 demuxer.
(libavformat mkv does not work, because the packet positions are not
unique. Probably could be fixed upstream, but it's not clear whether
it's a bug or a feature.)
2015-02-13 20:17:17 +00:00
|
|
|
|
player: improve instant track switching
When switching tracks, we normally have the problem that data gets lost
due to readahead buffering. (Which in turn is because we're stubborn and
instruct the demuxers to discard data on unselected streams.) The
demuxer layer has a hack that re-reads discarded buffered data if a
stream is enabled mid-stream, so track switching will seem instant.
A somewhat similar problem is when all tracks of an external files were
disabled - when enabling the first track, we have to seek to the target
position.
Handle these with the same mechanism. Pass the "current time" to the
demuxer's stream switch function, and let the demuxer figure out what to
do. The demuxer will issue a refresh seek (if possible) to update the
new stream, or will issue a "normal" seek if there was no active stream
yet.
One case that changes is when a video/audio stream is enabled on an
external file with only a subtitle stream active, and the demuxer does
not support rrefresh seeks. This is a fuzzy case, because subtitles are
sparse, and the demuxer might have skipped large amounts of data. We
used to seek (and send the subtitle decoder some subtitle packets
twice). This case is sort of obscure and insane, and the fix would be
questionable, so we simply don't care.
Should mostly fix #3392.
2016-08-06 13:47:04 +00:00
|
|
|
double ts_offset; // timestamp offset to apply to everything
|
2015-11-16 21:47:17 +00:00
|
|
|
|
2016-03-09 23:06:13 +00:00
|
|
|
void (*run_fn)(void *); // if non-NULL, function queued to be run on
|
|
|
|
void *run_fn_arg; // the thread as run_fn(run_fn_arg)
|
|
|
|
|
2014-07-16 20:40:21 +00:00
|
|
|
// Cached state.
|
2014-11-12 20:47:41 +00:00
|
|
|
bool force_cache_update;
|
2014-07-16 20:40:21 +00:00
|
|
|
struct mp_tags *stream_metadata;
|
2016-03-29 09:29:52 +00:00
|
|
|
struct stream_cache_info stream_cache_info;
|
2014-07-16 20:40:21 +00:00
|
|
|
int64_t stream_size;
|
2014-10-24 13:40:01 +00:00
|
|
|
// Updated during init only.
|
|
|
|
char *stream_base_filename;
|
2014-07-16 20:40:21 +00:00
|
|
|
};
|
|
|
|
|
2013-07-11 17:20:25 +00:00
|
|
|
struct demux_stream {
|
2014-07-16 20:40:21 +00:00
|
|
|
struct demux_internal *in;
|
2017-10-21 18:35:03 +00:00
|
|
|
struct sh_stream *sh;
|
2014-07-16 20:40:21 +00:00
|
|
|
enum stream_type type;
|
2017-10-21 17:26:33 +00:00
|
|
|
// --- all fields are protected by in->lock
|
|
|
|
|
|
|
|
// demuxer state
|
2014-07-16 20:40:21 +00:00
|
|
|
bool selected; // user wants packets from this stream
|
|
|
|
bool active; // try to keep at least 1 packet queued
|
2015-04-20 20:53:33 +00:00
|
|
|
// if false, this stream is disabled, or passively
|
|
|
|
// read (like subtitles)
|
2014-07-16 20:40:21 +00:00
|
|
|
bool eof; // end of demuxed stream? (true if all buffer empty)
|
player: improve instant track switching
When switching tracks, we normally have the problem that data gets lost
due to readahead buffering. (Which in turn is because we're stubborn and
instruct the demuxers to discard data on unselected streams.) The
demuxer layer has a hack that re-reads discarded buffered data if a
stream is enabled mid-stream, so track switching will seem instant.
A somewhat similar problem is when all tracks of an external files were
disabled - when enabling the first track, we have to seek to the target
position.
Handle these with the same mechanism. Pass the "current time" to the
demuxer's stream switch function, and let the demuxer figure out what to
do. The demuxer will issue a refresh seek (if possible) to update the
new stream, or will issue a "normal" seek if there was no active stream
yet.
One case that changes is when a video/audio stream is enabled on an
external file with only a subtitle stream active, and the demuxer does
not support rrefresh seeks. This is a fuzzy case, because subtitles are
sparse, and the demuxer might have skipped large amounts of data. We
used to seek (and send the subtitle decoder some subtitle packets
twice). This case is sort of obscure and insane, and the fix would be
questionable, so we simply don't care.
Should mostly fix #3392.
2016-08-06 13:47:04 +00:00
|
|
|
bool need_refresh; // enabled mid-stream
|
demux: hack for instant stream switching
This removes the delay when switching audio tracks in mkv or mp4 files.
Other formats are not enabled, because it's not clear whether the
demuxers fulfill the requirements listed in demux.h. (Many formats
definitely do not with libavformat.)
Background:
The demuxer packet cache buffers a certain amount of packets. This
includes only packets from selected streams. We discard packets from
other streams for various reasons. This introduces a problem: switching
to a different audio track introduces a delay. The delay is as big as
the demuxer packet cache buffer, because while the file was read ahead
to fill the packet buffer, the process of reading packets also discarded
all packets from the previously not selected audio stream. Once the
remaining packet buffer has been played, new audio packets are available
and you hear audio again.
We could probably just not discard packets from unselected streams. But
this would require additional memory and CPU resources, and also it's
hard to tell when packets from unused streams should be discarded (we
don't want to keep them forever; it'd be a memory leak).
We could also issue a player hr-seek to the current playback position,
which would solve the problem in 1 line of code or so. But this can be
rather slow.
So what we do in this commit instead is: we just seek back to the
position where our current packet buffer starts, and start demuxing from
this position again. This way we can get the "past" packets for the
newly selected stream. For streams which were already selected the
packets are simply discarded until the previous position is reached
again.
That latter part is the hard part. We really want to skip packets
exactly until the position where we left off previously, or we will skip
packets or feed packets to the decoder twice. If we assume that the
demuxer is deterministic (returns exactly the same packets after a seek
to a previous position), then we can try to check whether it's the same
packet as the one at the end of the packet buffer. If it is, we know
that the packet after it is where we left off last time.
Unfortunately, this is not very robust, and maybe it can't be made
robust. Currently we use the demux_packet.pos field as unique packet
ID - which works fine in some scenarios, but will break in arbitrary
ways if the basic requirement to the demuxer (as listed in the demux.h
additions) are broken. Thus, this is enabled only for the internal mkv
demuxer and the libavformat mp4 demuxer.
(libavformat mkv does not work, because the packet positions are not
unique. Probably could be fixed upstream, but it's not clear whether
it's a bug or a feature.)
2015-02-13 20:17:17 +00:00
|
|
|
bool refreshing;
|
demux: make refresh seek handling more generic
Remove the explicit whitelisting of formats for refresh seeks. Instead,
check whether the packet position is somewhat reliable during demuxing.
If there are packets without position, or the packet position is not
monotonically increasing, then do not use them for refresh seeks.
This does not make sure of some requirements, such as deterministic
seeks. If that happens, mpv will mess up a bit on stream switching.
Also, add another method that uses DTS to identify packets, and prefer
it to the packet position method. Even if there's a demuxer which
randomizes packet positions, it hardly can do that with DTS. The DTS
method is not always available either, though. Some formats do not have
a DTS, and others are not always strictly monotonic (possibly due to
libavformat codec parsing and timestamp determination issues).
2016-08-06 17:24:25 +00:00
|
|
|
bool correct_dts; // packet DTS is strictly monotonically increasing
|
|
|
|
bool correct_pos; // packet pos is strictly monotonically increasing
|
2017-10-21 17:26:33 +00:00
|
|
|
size_t fw_packs; // number of packets in buffer (forward)
|
|
|
|
size_t fw_bytes; // total bytes of packets in buffer (forward)
|
|
|
|
size_t bw_bytes; // same as fw_bytes, but for back buffer
|
|
|
|
int64_t last_pos;
|
|
|
|
double last_dts;
|
2014-08-16 15:07:36 +00:00
|
|
|
double last_ts; // timestamp of the last packet added to queue
|
2017-10-21 17:26:33 +00:00
|
|
|
double back_pts; // smallest timestamp on the start of the back buffer
|
|
|
|
struct demux_packet *queue_head; // start of the full queue
|
|
|
|
struct demux_packet *queue_tail; // end of the full queue
|
|
|
|
|
|
|
|
// reader (decoder) state (bitrate calculations are part of it because we
|
|
|
|
// want to return the bitrate closest to the "current position")
|
|
|
|
double base_ts; // timestamp of the last packet returned to decoder
|
2014-12-12 00:00:58 +00:00
|
|
|
double last_br_ts; // timestamp of last packet bitrate was calculated
|
|
|
|
size_t last_br_bytes; // summed packet sizes since last bitrate calculation
|
|
|
|
double bitrate;
|
2017-10-21 17:26:33 +00:00
|
|
|
struct demux_packet *reader_head; // points at current decoder position
|
2017-01-10 13:03:41 +00:00
|
|
|
bool attached_picture_added;
|
|
|
|
|
2015-12-22 01:35:15 +00:00
|
|
|
// for closed captions (demuxer_feed_caption)
|
|
|
|
struct sh_stream *cc;
|
2017-10-21 17:26:33 +00:00
|
|
|
bool ignore_eof; // ignore stream in underrun detection
|
2013-07-11 17:20:25 +00:00
|
|
|
};
|
2013-07-11 17:17:51 +00:00
|
|
|
|
2014-11-03 20:54:49 +00:00
|
|
|
// Return "a", or if that is NOPTS, return "def".
|
|
|
|
#define PTS_OR_DEF(a, def) ((a) == MP_NOPTS_VALUE ? (def) : (a))
|
player: redo how stream caching and pausing on low cache works
Add the --cache-secs option, which literally overrides the value of
--demuxer-readahead-secs if the stream cache is active. The default
value is very high (10 seconds), which means it can act as network
cache.
Remove the old behavior of trying to pause once the byte cache runs
low. Instead, do something similar wit the demuxer cache. The nice
thing is that we can guess how many seconds of video it has cached,
and we can make better decisions. But for now, apply a relatively
naive heuristic: if the cache is below 0.5 secs, pause, and wait
until at least 2 secs are available.
Note that due to timestamp reordering, the estimated cached duration
of video might be inaccurate, depending on the file format. If the
file format has DTS, it's easy, otherwise the duration will seemingly
jump back and forth.
2014-08-26 23:13:20 +00:00
|
|
|
// If one of the values is NOPTS, always pick the other one.
|
2014-11-03 20:54:49 +00:00
|
|
|
#define MP_PTS_MIN(a, b) MPMIN(PTS_OR_DEF(a, b), PTS_OR_DEF(b, a))
|
|
|
|
#define MP_PTS_MAX(a, b) MPMAX(PTS_OR_DEF(a, b), PTS_OR_DEF(b, a))
|
player: redo how stream caching and pausing on low cache works
Add the --cache-secs option, which literally overrides the value of
--demuxer-readahead-secs if the stream cache is active. The default
value is very high (10 seconds), which means it can act as network
cache.
Remove the old behavior of trying to pause once the byte cache runs
low. Instead, do something similar wit the demuxer cache. The nice
thing is that we can guess how many seconds of video it has cached,
and we can make better decisions. But for now, apply a relatively
naive heuristic: if the cache is below 0.5 secs, pause, and wait
until at least 2 secs are available.
Note that due to timestamp reordering, the estimated cached duration
of video might be inaccurate, depending on the file format. If the
file format has DTS, it's easy, otherwise the duration will seemingly
jump back and forth.
2014-08-26 23:13:20 +00:00
|
|
|
|
2015-11-16 21:47:17 +00:00
|
|
|
#define MP_ADD_PTS(a, b) ((a) == MP_NOPTS_VALUE ? (a) : ((a) + (b)))
|
|
|
|
|
2014-07-16 20:40:21 +00:00
|
|
|
static void demuxer_sort_chapters(demuxer_t *demuxer);
|
|
|
|
static void *demux_thread(void *pctx);
|
|
|
|
static void update_cache(struct demux_internal *in);
|
2017-10-13 22:16:32 +00:00
|
|
|
static int cached_demux_control(struct demux_internal *in, int cmd, void *arg);
|
2017-10-21 17:26:33 +00:00
|
|
|
static void clear_demux_state(struct demux_internal *in);
|
stream: report chapter times, use time seeks for DVD chapters
Allow the stream layer to report chapter times. Extend stream_dvd to do
this. I'm not 100% sure whether the re-used code is bug-free (because it
was used for slave-mode and/or debugging only).
MAke the frontend do time-based seeks when switching DVD chapters. I'm
not sure if there's a real reason STREAM_CTRL_SEEK_TO_CHAPTER exists
(maybe/hopefully not), but we will see.
Note that querying chapter times in demuxer_chapter_time() with the new
STREAM_CTRL_GET_CHAPTER_TIME could be excessively slow, especially with
the cache enabled. The frontend likes to query chapter times very often.
Additionally, stream_dvd uses some sort of quadratic algorithm to list
times for all chapters. For this reason, we try to query all chapters on
start (after the demuxer is opened), and add the chapters to the demuxer
chapter list. demuxer_chapter_time() will get the time from that list,
instead of asking the stream layer over and over again.
This assumes stream_dvd knows the list of chapters at the start, and
also that the list of chapters never changes during playback. This
seems to be true, and the only exception, switching DVD titles, is not
supported at runtime (and doesn't need to be supported).
2013-05-03 23:20:39 +00:00
|
|
|
|
2017-10-21 17:26:33 +00:00
|
|
|
static void ds_clear_reader_state(struct demux_stream *ds)
|
2013-07-11 17:20:25 +00:00
|
|
|
{
|
2017-10-21 17:26:33 +00:00
|
|
|
ds->reader_head = NULL;
|
|
|
|
ds->base_ts = ds->last_br_ts = MP_NOPTS_VALUE;
|
|
|
|
ds->last_br_bytes = 0;
|
|
|
|
ds->bitrate = -1;
|
|
|
|
ds->attached_picture_added = false;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void ds_clear_demux_state(struct demux_stream *ds)
|
|
|
|
{
|
|
|
|
ds_clear_reader_state(ds);
|
|
|
|
|
|
|
|
demux_packet_t *dp = ds->queue_head;
|
2013-07-11 17:20:25 +00:00
|
|
|
while (dp) {
|
|
|
|
demux_packet_t *dn = dp->next;
|
|
|
|
free_demux_packet(dp);
|
|
|
|
dp = dn;
|
|
|
|
}
|
2017-10-21 17:26:33 +00:00
|
|
|
ds->queue_head = ds->queue_tail = NULL;
|
|
|
|
|
|
|
|
ds->fw_packs = 0;
|
|
|
|
ds->fw_bytes = 0;
|
|
|
|
ds->bw_bytes = 0;
|
2014-07-16 20:40:21 +00:00
|
|
|
ds->eof = false;
|
|
|
|
ds->active = false;
|
demux: hack for instant stream switching
This removes the delay when switching audio tracks in mkv or mp4 files.
Other formats are not enabled, because it's not clear whether the
demuxers fulfill the requirements listed in demux.h. (Many formats
definitely do not with libavformat.)
Background:
The demuxer packet cache buffers a certain amount of packets. This
includes only packets from selected streams. We discard packets from
other streams for various reasons. This introduces a problem: switching
to a different audio track introduces a delay. The delay is as big as
the demuxer packet cache buffer, because while the file was read ahead
to fill the packet buffer, the process of reading packets also discarded
all packets from the previously not selected audio stream. Once the
remaining packet buffer has been played, new audio packets are available
and you hear audio again.
We could probably just not discard packets from unselected streams. But
this would require additional memory and CPU resources, and also it's
hard to tell when packets from unused streams should be discarded (we
don't want to keep them forever; it'd be a memory leak).
We could also issue a player hr-seek to the current playback position,
which would solve the problem in 1 line of code or so. But this can be
rather slow.
So what we do in this commit instead is: we just seek back to the
position where our current packet buffer starts, and start demuxing from
this position again. This way we can get the "past" packets for the
newly selected stream. For streams which were already selected the
packets are simply discarded until the previous position is reached
again.
That latter part is the hard part. We really want to skip packets
exactly until the position where we left off previously, or we will skip
packets or feed packets to the decoder twice. If we assume that the
demuxer is deterministic (returns exactly the same packets after a seek
to a previous position), then we can try to check whether it's the same
packet as the one at the end of the packet buffer. If it is, we know
that the packet after it is where we left off last time.
Unfortunately, this is not very robust, and maybe it can't be made
robust. Currently we use the demux_packet.pos field as unique packet
ID - which works fine in some scenarios, but will break in arbitrary
ways if the basic requirement to the demuxer (as listed in the demux.h
additions) are broken. Thus, this is enabled only for the internal mkv
demuxer and the libavformat mp4 demuxer.
(libavformat mkv does not work, because the packet positions are not
unique. Probably could be fixed upstream, but it's not clear whether
it's a bug or a feature.)
2015-02-13 20:17:17 +00:00
|
|
|
ds->refreshing = false;
|
player: improve instant track switching
When switching tracks, we normally have the problem that data gets lost
due to readahead buffering. (Which in turn is because we're stubborn and
instruct the demuxers to discard data on unselected streams.) The
demuxer layer has a hack that re-reads discarded buffered data if a
stream is enabled mid-stream, so track switching will seem instant.
A somewhat similar problem is when all tracks of an external files were
disabled - when enabling the first track, we have to seek to the target
position.
Handle these with the same mechanism. Pass the "current time" to the
demuxer's stream switch function, and let the demuxer figure out what to
do. The demuxer will issue a refresh seek (if possible) to update the
new stream, or will issue a "normal" seek if there was no active stream
yet.
One case that changes is when a video/audio stream is enabled on an
external file with only a subtitle stream active, and the demuxer does
not support rrefresh seeks. This is a fuzzy case, because subtitles are
sparse, and the demuxer might have skipped large amounts of data. We
used to seek (and send the subtitle decoder some subtitle packets
twice). This case is sort of obscure and insane, and the fix would be
questionable, so we simply don't care.
Should mostly fix #3392.
2016-08-06 13:47:04 +00:00
|
|
|
ds->need_refresh = false;
|
demux: make refresh seek handling more generic
Remove the explicit whitelisting of formats for refresh seeks. Instead,
check whether the packet position is somewhat reliable during demuxing.
If there are packets without position, or the packet position is not
monotonically increasing, then do not use them for refresh seeks.
This does not make sure of some requirements, such as deterministic
seeks. If that happens, mpv will mess up a bit on stream switching.
Also, add another method that uses DTS to identify packets, and prefer
it to the packet position method. Even if there's a demuxer which
randomizes packet positions, it hardly can do that with DTS. The DTS
method is not always available either, though. Some formats do not have
a DTS, and others are not always strictly monotonic (possibly due to
libavformat codec parsing and timestamp determination issues).
2016-08-06 17:24:25 +00:00
|
|
|
ds->correct_dts = ds->correct_pos = true;
|
2017-10-21 17:26:33 +00:00
|
|
|
ds->last_pos = -1;
|
|
|
|
ds->last_ts = ds->last_dts = MP_NOPTS_VALUE;
|
|
|
|
ds->back_pts = MP_NOPTS_VALUE;
|
2013-07-11 17:20:25 +00:00
|
|
|
}
|
|
|
|
|
2015-11-16 21:47:17 +00:00
|
|
|
void demux_set_ts_offset(struct demuxer *demuxer, double offset)
|
|
|
|
{
|
|
|
|
struct demux_internal *in = demuxer->in;
|
|
|
|
pthread_mutex_lock(&in->lock);
|
|
|
|
in->ts_offset = offset;
|
|
|
|
pthread_mutex_unlock(&in->lock);
|
|
|
|
}
|
|
|
|
|
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
|
|
|
// Allocate a new sh_stream of the given type. It either has to be released
|
|
|
|
// with talloc_free(), or added to a demuxer with demux_add_sh_stream(). You
|
|
|
|
// cannot add or read packets from the stream before it has been added.
|
|
|
|
struct sh_stream *demux_alloc_sh_stream(enum stream_type type)
|
2012-08-03 10:24:55 +00:00
|
|
|
{
|
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 = talloc_ptrtype(NULL, sh);
|
2013-07-11 17:20:25 +00:00
|
|
|
*sh = (struct sh_stream) {
|
2012-08-03 10:24:55 +00:00
|
|
|
.type = type,
|
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
|
|
|
.index = -1,
|
|
|
|
.ff_index = -1, // may be overwritten by demuxer
|
|
|
|
.demuxer_id = -1, // ... same
|
2016-01-12 22:48:19 +00:00
|
|
|
.codec = talloc_zero(sh, struct mp_codec_params),
|
2016-08-12 19:39:32 +00:00
|
|
|
.tags = talloc_zero(sh, struct mp_tags),
|
2014-07-16 20:40:21 +00:00
|
|
|
};
|
2016-01-12 22:48:19 +00:00
|
|
|
sh->codec->type = type;
|
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
|
|
|
return sh;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Add a new sh_stream to the demuxer. Note that as soon as the stream has been
|
|
|
|
// added, it must be immutable, and must not be released (this will happen when
|
|
|
|
// the demuxer is destroyed).
|
|
|
|
void demux_add_sh_stream(struct demuxer *demuxer, struct sh_stream *sh)
|
|
|
|
{
|
|
|
|
struct demux_internal *in = demuxer->in;
|
|
|
|
pthread_mutex_lock(&in->lock);
|
|
|
|
|
|
|
|
assert(!sh->ds); // must not be added yet
|
|
|
|
|
|
|
|
sh->ds = talloc(sh, struct demux_stream);
|
2014-07-16 20:40:21 +00:00
|
|
|
*sh->ds = (struct demux_stream) {
|
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
|
|
|
.in = in,
|
2017-10-21 18:35:03 +00:00
|
|
|
.sh = sh,
|
2014-07-16 20:40:21 +00:00
|
|
|
.type = sh->type,
|
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
|
|
|
.selected = in->autoselect,
|
2013-07-11 17:20:25 +00:00
|
|
|
};
|
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
|
|
|
|
2016-01-12 22:48:19 +00:00
|
|
|
if (!sh->codec->codec)
|
|
|
|
sh->codec->codec = "";
|
|
|
|
|
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
|
|
|
sh->index = in->num_streams;
|
|
|
|
if (sh->ff_index < 0)
|
|
|
|
sh->ff_index = sh->index;
|
|
|
|
if (sh->demuxer_id < 0) {
|
|
|
|
sh->demuxer_id = 0;
|
|
|
|
for (int n = 0; n < in->num_streams; n++) {
|
|
|
|
if (in->streams[n]->type == sh->type)
|
|
|
|
sh->demuxer_id += 1;
|
|
|
|
}
|
2012-08-03 10:24:55 +00:00
|
|
|
}
|
2013-07-11 17:22:24 +00:00
|
|
|
|
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
|
|
|
MP_TARRAY_APPEND(in, in->streams, in->num_streams, sh);
|
|
|
|
|
|
|
|
in->events |= DEMUX_EVENT_STREAMS;
|
|
|
|
if (in->wakeup_cb)
|
|
|
|
in->wakeup_cb(in->wakeup_cb_ctx);
|
|
|
|
pthread_mutex_unlock(&in->lock);
|
|
|
|
}
|
|
|
|
|
2016-08-12 19:39:32 +00:00
|
|
|
// Update sh->tags (lazily). This must be called by demuxers which update
|
|
|
|
// stream tags after init. (sh->tags can be accessed by the playback thread,
|
|
|
|
// which means the demuxer thread cannot write or read it directly.)
|
|
|
|
// Before init is finished, sh->tags can still be accessed freely.
|
|
|
|
// Ownership of tags goes to the function.
|
|
|
|
void demux_set_stream_tags(struct demuxer *demuxer, struct sh_stream *sh,
|
|
|
|
struct mp_tags *tags)
|
|
|
|
{
|
|
|
|
struct demux_internal *in = demuxer->in;
|
|
|
|
assert(demuxer == in->d_thread);
|
|
|
|
|
|
|
|
if (sh->ds) {
|
|
|
|
while (demuxer->num_update_stream_tags <= sh->index) {
|
|
|
|
MP_TARRAY_APPEND(demuxer, demuxer->update_stream_tags,
|
|
|
|
demuxer->num_update_stream_tags, NULL);
|
|
|
|
}
|
|
|
|
talloc_free(demuxer->update_stream_tags[sh->index]);
|
|
|
|
demuxer->update_stream_tags[sh->index] = talloc_steal(demuxer, tags);
|
|
|
|
|
|
|
|
demux_changed(demuxer, DEMUX_EVENT_METADATA);
|
|
|
|
} else {
|
|
|
|
// not added yet
|
|
|
|
talloc_free(sh->tags);
|
|
|
|
sh->tags = talloc_steal(sh, tags);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
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
|
|
|
// Return a stream with the given index. Since streams can only be added during
|
|
|
|
// the lifetime of the demuxer, it is guaranteed that an index within the valid
|
|
|
|
// range [0, demux_get_num_stream()) always returns a valid sh_stream pointer,
|
|
|
|
// which will be valid until the demuxer is destroyed.
|
|
|
|
struct sh_stream *demux_get_stream(struct demuxer *demuxer, int index)
|
|
|
|
{
|
|
|
|
struct demux_internal *in = demuxer->in;
|
|
|
|
pthread_mutex_lock(&in->lock);
|
|
|
|
assert(index >= 0 && index < in->num_streams);
|
|
|
|
struct sh_stream *r = in->streams[index];
|
|
|
|
pthread_mutex_unlock(&in->lock);
|
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
|
|
|
// See demux_get_stream().
|
|
|
|
int demux_get_num_stream(struct demuxer *demuxer)
|
|
|
|
{
|
|
|
|
struct demux_internal *in = demuxer->in;
|
|
|
|
pthread_mutex_lock(&in->lock);
|
|
|
|
int r = in->num_streams;
|
|
|
|
pthread_mutex_unlock(&in->lock);
|
|
|
|
return r;
|
2012-08-03 10:24:55 +00:00
|
|
|
}
|
|
|
|
|
2008-04-12 15:51:08 +00:00
|
|
|
void free_demuxer(demuxer_t *demuxer)
|
|
|
|
{
|
2013-08-25 18:40:21 +00:00
|
|
|
if (!demuxer)
|
|
|
|
return;
|
2014-07-16 20:40:21 +00:00
|
|
|
struct demux_internal *in = demuxer->in;
|
|
|
|
assert(demuxer == in->d_user);
|
|
|
|
|
|
|
|
demux_stop_thread(demuxer);
|
|
|
|
|
2008-04-12 15:51:08 +00:00
|
|
|
if (demuxer->desc->close)
|
2014-07-16 20:40:21 +00:00
|
|
|
demuxer->desc->close(in->d_thread);
|
2017-10-21 17:26:33 +00:00
|
|
|
|
|
|
|
clear_demux_state(in);
|
|
|
|
|
|
|
|
for (int n = in->num_streams - 1; n >= 0; n--)
|
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
|
|
|
talloc_free(in->streams[n]);
|
2014-07-16 20:40:21 +00:00
|
|
|
pthread_mutex_destroy(&in->lock);
|
|
|
|
pthread_cond_destroy(&in->wakeup);
|
2009-03-16 03:11:22 +00:00
|
|
|
talloc_free(demuxer);
|
2001-08-22 23:54:57 +00:00
|
|
|
}
|
|
|
|
|
2015-02-20 20:08:10 +00:00
|
|
|
void free_demuxer_and_stream(struct demuxer *demuxer)
|
|
|
|
{
|
|
|
|
if (!demuxer)
|
|
|
|
return;
|
|
|
|
struct stream *s = demuxer->stream;
|
|
|
|
free_demuxer(demuxer);
|
|
|
|
free_stream(s);
|
|
|
|
}
|
|
|
|
|
2014-07-16 20:40:21 +00:00
|
|
|
// Start the demuxer thread, which reads ahead packets on its own.
|
|
|
|
void demux_start_thread(struct demuxer *demuxer)
|
2008-04-12 15:51:08 +00:00
|
|
|
{
|
2014-07-16 20:40:21 +00:00
|
|
|
struct demux_internal *in = demuxer->in;
|
|
|
|
assert(demuxer == in->d_user);
|
|
|
|
|
|
|
|
if (!in->threading) {
|
|
|
|
in->threading = true;
|
|
|
|
if (pthread_create(&in->thread, NULL, demux_thread, in))
|
|
|
|
in->threading = false;
|
2001-02-24 20:28:24 +00:00
|
|
|
}
|
2013-07-11 17:20:25 +00:00
|
|
|
}
|
|
|
|
|
2014-07-16 20:40:21 +00:00
|
|
|
void demux_stop_thread(struct demuxer *demuxer)
|
2013-07-11 17:20:25 +00:00
|
|
|
{
|
2014-07-16 20:40:21 +00:00
|
|
|
struct demux_internal *in = demuxer->in;
|
|
|
|
assert(demuxer == in->d_user);
|
|
|
|
|
|
|
|
if (in->threading) {
|
|
|
|
pthread_mutex_lock(&in->lock);
|
|
|
|
in->thread_terminate = true;
|
|
|
|
pthread_cond_signal(&in->wakeup);
|
|
|
|
pthread_mutex_unlock(&in->lock);
|
|
|
|
pthread_join(in->thread, NULL);
|
|
|
|
in->threading = false;
|
|
|
|
in->thread_terminate = false;
|
|
|
|
}
|
2013-07-11 17:20:25 +00:00
|
|
|
}
|
|
|
|
|
2014-07-16 20:40:21 +00:00
|
|
|
// The demuxer thread will call cb(ctx) if there's a new packet, or EOF is reached.
|
|
|
|
void demux_set_wakeup_cb(struct demuxer *demuxer, void (*cb)(void *ctx), void *ctx)
|
2013-07-11 17:20:25 +00:00
|
|
|
{
|
2014-07-16 20:40:21 +00:00
|
|
|
struct demux_internal *in = demuxer->in;
|
|
|
|
pthread_mutex_lock(&in->lock);
|
|
|
|
in->wakeup_cb = cb;
|
|
|
|
in->wakeup_cb_ctx = ctx;
|
|
|
|
pthread_mutex_unlock(&in->lock);
|
|
|
|
}
|
|
|
|
|
|
|
|
const char *stream_type_name(enum stream_type type)
|
|
|
|
{
|
|
|
|
switch (type) {
|
|
|
|
case STREAM_VIDEO: return "video";
|
|
|
|
case STREAM_AUDIO: return "audio";
|
|
|
|
case STREAM_SUB: return "sub";
|
|
|
|
default: return "unknown";
|
|
|
|
}
|
2001-02-24 20:28:24 +00:00
|
|
|
}
|
|
|
|
|
2015-12-22 01:35:15 +00:00
|
|
|
void demuxer_feed_caption(struct sh_stream *stream, demux_packet_t *dp)
|
|
|
|
{
|
|
|
|
struct demuxer *demuxer = stream->ds->in->d_thread;
|
2017-10-20 20:30:59 +00:00
|
|
|
struct demux_internal *in = demuxer->in;
|
2015-12-22 01:35:15 +00:00
|
|
|
struct sh_stream *sh = stream->ds->cc;
|
|
|
|
|
|
|
|
if (!sh) {
|
|
|
|
sh = demux_alloc_sh_stream(STREAM_SUB);
|
2016-01-19 13:19:50 +00:00
|
|
|
if (!sh) {
|
|
|
|
talloc_free(dp);
|
2015-12-22 01:35:15 +00:00
|
|
|
return;
|
2016-01-19 13:19:50 +00:00
|
|
|
}
|
2015-12-22 01:35:15 +00:00
|
|
|
sh->codec->codec = "eia_608";
|
|
|
|
stream->ds->cc = sh;
|
|
|
|
demux_add_sh_stream(demuxer, sh);
|
|
|
|
}
|
|
|
|
|
2017-10-20 20:30:59 +00:00
|
|
|
pthread_mutex_lock(&in->lock);
|
|
|
|
|
|
|
|
sh->ds->ignore_eof = true;
|
|
|
|
|
|
|
|
dp->pts = MP_ADD_PTS(dp->pts, -in->ts_offset);
|
|
|
|
dp->dts = MP_ADD_PTS(dp->dts, -in->ts_offset);
|
|
|
|
|
|
|
|
pthread_mutex_unlock(&in->lock);
|
|
|
|
|
2016-01-19 13:19:50 +00:00
|
|
|
demux_add_packet(sh, dp);
|
2015-12-22 01:35:15 +00:00
|
|
|
}
|
|
|
|
|
player: improve instant track switching
When switching tracks, we normally have the problem that data gets lost
due to readahead buffering. (Which in turn is because we're stubborn and
instruct the demuxers to discard data on unselected streams.) The
demuxer layer has a hack that re-reads discarded buffered data if a
stream is enabled mid-stream, so track switching will seem instant.
A somewhat similar problem is when all tracks of an external files were
disabled - when enabling the first track, we have to seek to the target
position.
Handle these with the same mechanism. Pass the "current time" to the
demuxer's stream switch function, and let the demuxer figure out what to
do. The demuxer will issue a refresh seek (if possible) to update the
new stream, or will issue a "normal" seek if there was no active stream
yet.
One case that changes is when a video/audio stream is enabled on an
external file with only a subtitle stream active, and the demuxer does
not support rrefresh seeks. This is a fuzzy case, because subtitles are
sparse, and the demuxer might have skipped large amounts of data. We
used to seek (and send the subtitle decoder some subtitle packets
twice). This case is sort of obscure and insane, and the fix would be
questionable, so we simply don't care.
Should mostly fix #3392.
2016-08-06 13:47:04 +00:00
|
|
|
// An obscure mechanism to get stream switching to be executed faster.
|
|
|
|
// On a switch, it seeks back, and then grabs all packets that were
|
|
|
|
// "missing" from the packet queue of the newly selected stream.
|
|
|
|
// Returns MP_NOPTS_VALUE if no seek should happen.
|
|
|
|
static double get_refresh_seek_pts(struct demux_internal *in)
|
|
|
|
{
|
|
|
|
struct demuxer *demux = in->d_thread;
|
|
|
|
|
|
|
|
double start_ts = in->ref_pts;
|
|
|
|
bool needed = false;
|
|
|
|
bool normal_seek = true;
|
demux: make refresh seek handling more generic
Remove the explicit whitelisting of formats for refresh seeks. Instead,
check whether the packet position is somewhat reliable during demuxing.
If there are packets without position, or the packet position is not
monotonically increasing, then do not use them for refresh seeks.
This does not make sure of some requirements, such as deterministic
seeks. If that happens, mpv will mess up a bit on stream switching.
Also, add another method that uses DTS to identify packets, and prefer
it to the packet position method. Even if there's a demuxer which
randomizes packet positions, it hardly can do that with DTS. The DTS
method is not always available either, though. Some formats do not have
a DTS, and others are not always strictly monotonic (possibly due to
libavformat codec parsing and timestamp determination issues).
2016-08-06 17:24:25 +00:00
|
|
|
bool refresh_possible = true;
|
player: improve instant track switching
When switching tracks, we normally have the problem that data gets lost
due to readahead buffering. (Which in turn is because we're stubborn and
instruct the demuxers to discard data on unselected streams.) The
demuxer layer has a hack that re-reads discarded buffered data if a
stream is enabled mid-stream, so track switching will seem instant.
A somewhat similar problem is when all tracks of an external files were
disabled - when enabling the first track, we have to seek to the target
position.
Handle these with the same mechanism. Pass the "current time" to the
demuxer's stream switch function, and let the demuxer figure out what to
do. The demuxer will issue a refresh seek (if possible) to update the
new stream, or will issue a "normal" seek if there was no active stream
yet.
One case that changes is when a video/audio stream is enabled on an
external file with only a subtitle stream active, and the demuxer does
not support rrefresh seeks. This is a fuzzy case, because subtitles are
sparse, and the demuxer might have skipped large amounts of data. We
used to seek (and send the subtitle decoder some subtitle packets
twice). This case is sort of obscure and insane, and the fix would be
questionable, so we simply don't care.
Should mostly fix #3392.
2016-08-06 13:47:04 +00:00
|
|
|
for (int n = 0; n < in->num_streams; n++) {
|
|
|
|
struct demux_stream *ds = in->streams[n]->ds;
|
demux: make refresh seek handling more generic
Remove the explicit whitelisting of formats for refresh seeks. Instead,
check whether the packet position is somewhat reliable during demuxing.
If there are packets without position, or the packet position is not
monotonically increasing, then do not use them for refresh seeks.
This does not make sure of some requirements, such as deterministic
seeks. If that happens, mpv will mess up a bit on stream switching.
Also, add another method that uses DTS to identify packets, and prefer
it to the packet position method. Even if there's a demuxer which
randomizes packet positions, it hardly can do that with DTS. The DTS
method is not always available either, though. Some formats do not have
a DTS, and others are not always strictly monotonic (possibly due to
libavformat codec parsing and timestamp determination issues).
2016-08-06 17:24:25 +00:00
|
|
|
|
|
|
|
if (!ds->selected)
|
|
|
|
continue;
|
|
|
|
|
player: improve instant track switching
When switching tracks, we normally have the problem that data gets lost
due to readahead buffering. (Which in turn is because we're stubborn and
instruct the demuxers to discard data on unselected streams.) The
demuxer layer has a hack that re-reads discarded buffered data if a
stream is enabled mid-stream, so track switching will seem instant.
A somewhat similar problem is when all tracks of an external files were
disabled - when enabling the first track, we have to seek to the target
position.
Handle these with the same mechanism. Pass the "current time" to the
demuxer's stream switch function, and let the demuxer figure out what to
do. The demuxer will issue a refresh seek (if possible) to update the
new stream, or will issue a "normal" seek if there was no active stream
yet.
One case that changes is when a video/audio stream is enabled on an
external file with only a subtitle stream active, and the demuxer does
not support rrefresh seeks. This is a fuzzy case, because subtitles are
sparse, and the demuxer might have skipped large amounts of data. We
used to seek (and send the subtitle decoder some subtitle packets
twice). This case is sort of obscure and insane, and the fix would be
questionable, so we simply don't care.
Should mostly fix #3392.
2016-08-06 13:47:04 +00:00
|
|
|
if (ds->type == STREAM_VIDEO || ds->type == STREAM_AUDIO)
|
|
|
|
start_ts = MP_PTS_MIN(start_ts, ds->base_ts);
|
demux: make refresh seek handling more generic
Remove the explicit whitelisting of formats for refresh seeks. Instead,
check whether the packet position is somewhat reliable during demuxing.
If there are packets without position, or the packet position is not
monotonically increasing, then do not use them for refresh seeks.
This does not make sure of some requirements, such as deterministic
seeks. If that happens, mpv will mess up a bit on stream switching.
Also, add another method that uses DTS to identify packets, and prefer
it to the packet position method. Even if there's a demuxer which
randomizes packet positions, it hardly can do that with DTS. The DTS
method is not always available either, though. Some formats do not have
a DTS, and others are not always strictly monotonic (possibly due to
libavformat codec parsing and timestamp determination issues).
2016-08-06 17:24:25 +00:00
|
|
|
|
player: improve instant track switching
When switching tracks, we normally have the problem that data gets lost
due to readahead buffering. (Which in turn is because we're stubborn and
instruct the demuxers to discard data on unselected streams.) The
demuxer layer has a hack that re-reads discarded buffered data if a
stream is enabled mid-stream, so track switching will seem instant.
A somewhat similar problem is when all tracks of an external files were
disabled - when enabling the first track, we have to seek to the target
position.
Handle these with the same mechanism. Pass the "current time" to the
demuxer's stream switch function, and let the demuxer figure out what to
do. The demuxer will issue a refresh seek (if possible) to update the
new stream, or will issue a "normal" seek if there was no active stream
yet.
One case that changes is when a video/audio stream is enabled on an
external file with only a subtitle stream active, and the demuxer does
not support rrefresh seeks. This is a fuzzy case, because subtitles are
sparse, and the demuxer might have skipped large amounts of data. We
used to seek (and send the subtitle decoder some subtitle packets
twice). This case is sort of obscure and insane, and the fix would be
questionable, so we simply don't care.
Should mostly fix #3392.
2016-08-06 13:47:04 +00:00
|
|
|
needed |= ds->need_refresh;
|
|
|
|
// If there were no other streams selected, we can use a normal seek.
|
demux: make refresh seek handling more generic
Remove the explicit whitelisting of formats for refresh seeks. Instead,
check whether the packet position is somewhat reliable during demuxing.
If there are packets without position, or the packet position is not
monotonically increasing, then do not use them for refresh seeks.
This does not make sure of some requirements, such as deterministic
seeks. If that happens, mpv will mess up a bit on stream switching.
Also, add another method that uses DTS to identify packets, and prefer
it to the packet position method. Even if there's a demuxer which
randomizes packet positions, it hardly can do that with DTS. The DTS
method is not always available either, though. Some formats do not have
a DTS, and others are not always strictly monotonic (possibly due to
libavformat codec parsing and timestamp determination issues).
2016-08-06 17:24:25 +00:00
|
|
|
normal_seek &= ds->need_refresh;
|
player: improve instant track switching
When switching tracks, we normally have the problem that data gets lost
due to readahead buffering. (Which in turn is because we're stubborn and
instruct the demuxers to discard data on unselected streams.) The
demuxer layer has a hack that re-reads discarded buffered data if a
stream is enabled mid-stream, so track switching will seem instant.
A somewhat similar problem is when all tracks of an external files were
disabled - when enabling the first track, we have to seek to the target
position.
Handle these with the same mechanism. Pass the "current time" to the
demuxer's stream switch function, and let the demuxer figure out what to
do. The demuxer will issue a refresh seek (if possible) to update the
new stream, or will issue a "normal" seek if there was no active stream
yet.
One case that changes is when a video/audio stream is enabled on an
external file with only a subtitle stream active, and the demuxer does
not support rrefresh seeks. This is a fuzzy case, because subtitles are
sparse, and the demuxer might have skipped large amounts of data. We
used to seek (and send the subtitle decoder some subtitle packets
twice). This case is sort of obscure and insane, and the fix would be
questionable, so we simply don't care.
Should mostly fix #3392.
2016-08-06 13:47:04 +00:00
|
|
|
ds->need_refresh = false;
|
demux: make refresh seek handling more generic
Remove the explicit whitelisting of formats for refresh seeks. Instead,
check whether the packet position is somewhat reliable during demuxing.
If there are packets without position, or the packet position is not
monotonically increasing, then do not use them for refresh seeks.
This does not make sure of some requirements, such as deterministic
seeks. If that happens, mpv will mess up a bit on stream switching.
Also, add another method that uses DTS to identify packets, and prefer
it to the packet position method. Even if there's a demuxer which
randomizes packet positions, it hardly can do that with DTS. The DTS
method is not always available either, though. Some formats do not have
a DTS, and others are not always strictly monotonic (possibly due to
libavformat codec parsing and timestamp determination issues).
2016-08-06 17:24:25 +00:00
|
|
|
|
|
|
|
refresh_possible &= ds->correct_dts || ds->correct_pos;
|
player: improve instant track switching
When switching tracks, we normally have the problem that data gets lost
due to readahead buffering. (Which in turn is because we're stubborn and
instruct the demuxers to discard data on unselected streams.) The
demuxer layer has a hack that re-reads discarded buffered data if a
stream is enabled mid-stream, so track switching will seem instant.
A somewhat similar problem is when all tracks of an external files were
disabled - when enabling the first track, we have to seek to the target
position.
Handle these with the same mechanism. Pass the "current time" to the
demuxer's stream switch function, and let the demuxer figure out what to
do. The demuxer will issue a refresh seek (if possible) to update the
new stream, or will issue a "normal" seek if there was no active stream
yet.
One case that changes is when a video/audio stream is enabled on an
external file with only a subtitle stream active, and the demuxer does
not support rrefresh seeks. This is a fuzzy case, because subtitles are
sparse, and the demuxer might have skipped large amounts of data. We
used to seek (and send the subtitle decoder some subtitle packets
twice). This case is sort of obscure and insane, and the fix would be
questionable, so we simply don't care.
Should mostly fix #3392.
2016-08-06 13:47:04 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (!needed || start_ts == MP_NOPTS_VALUE || !demux->desc->seek ||
|
|
|
|
!demux->seekable || demux->partially_seekable)
|
|
|
|
return MP_NOPTS_VALUE;
|
|
|
|
|
|
|
|
if (normal_seek)
|
|
|
|
return start_ts;
|
|
|
|
|
demux: make refresh seek handling more generic
Remove the explicit whitelisting of formats for refresh seeks. Instead,
check whether the packet position is somewhat reliable during demuxing.
If there are packets without position, or the packet position is not
monotonically increasing, then do not use them for refresh seeks.
This does not make sure of some requirements, such as deterministic
seeks. If that happens, mpv will mess up a bit on stream switching.
Also, add another method that uses DTS to identify packets, and prefer
it to the packet position method. Even if there's a demuxer which
randomizes packet positions, it hardly can do that with DTS. The DTS
method is not always available either, though. Some formats do not have
a DTS, and others are not always strictly monotonic (possibly due to
libavformat codec parsing and timestamp determination issues).
2016-08-06 17:24:25 +00:00
|
|
|
if (!refresh_possible) {
|
|
|
|
MP_VERBOSE(in, "can't issue refresh seek\n");
|
player: improve instant track switching
When switching tracks, we normally have the problem that data gets lost
due to readahead buffering. (Which in turn is because we're stubborn and
instruct the demuxers to discard data on unselected streams.) The
demuxer layer has a hack that re-reads discarded buffered data if a
stream is enabled mid-stream, so track switching will seem instant.
A somewhat similar problem is when all tracks of an external files were
disabled - when enabling the first track, we have to seek to the target
position.
Handle these with the same mechanism. Pass the "current time" to the
demuxer's stream switch function, and let the demuxer figure out what to
do. The demuxer will issue a refresh seek (if possible) to update the
new stream, or will issue a "normal" seek if there was no active stream
yet.
One case that changes is when a video/audio stream is enabled on an
external file with only a subtitle stream active, and the demuxer does
not support rrefresh seeks. This is a fuzzy case, because subtitles are
sparse, and the demuxer might have skipped large amounts of data. We
used to seek (and send the subtitle decoder some subtitle packets
twice). This case is sort of obscure and insane, and the fix would be
questionable, so we simply don't care.
Should mostly fix #3392.
2016-08-06 13:47:04 +00:00
|
|
|
return MP_NOPTS_VALUE;
|
demux: make refresh seek handling more generic
Remove the explicit whitelisting of formats for refresh seeks. Instead,
check whether the packet position is somewhat reliable during demuxing.
If there are packets without position, or the packet position is not
monotonically increasing, then do not use them for refresh seeks.
This does not make sure of some requirements, such as deterministic
seeks. If that happens, mpv will mess up a bit on stream switching.
Also, add another method that uses DTS to identify packets, and prefer
it to the packet position method. Even if there's a demuxer which
randomizes packet positions, it hardly can do that with DTS. The DTS
method is not always available either, though. Some formats do not have
a DTS, and others are not always strictly monotonic (possibly due to
libavformat codec parsing and timestamp determination issues).
2016-08-06 17:24:25 +00:00
|
|
|
}
|
player: improve instant track switching
When switching tracks, we normally have the problem that data gets lost
due to readahead buffering. (Which in turn is because we're stubborn and
instruct the demuxers to discard data on unselected streams.) The
demuxer layer has a hack that re-reads discarded buffered data if a
stream is enabled mid-stream, so track switching will seem instant.
A somewhat similar problem is when all tracks of an external files were
disabled - when enabling the first track, we have to seek to the target
position.
Handle these with the same mechanism. Pass the "current time" to the
demuxer's stream switch function, and let the demuxer figure out what to
do. The demuxer will issue a refresh seek (if possible) to update the
new stream, or will issue a "normal" seek if there was no active stream
yet.
One case that changes is when a video/audio stream is enabled on an
external file with only a subtitle stream active, and the demuxer does
not support rrefresh seeks. This is a fuzzy case, because subtitles are
sparse, and the demuxer might have skipped large amounts of data. We
used to seek (and send the subtitle decoder some subtitle packets
twice). This case is sort of obscure and insane, and the fix would be
questionable, so we simply don't care.
Should mostly fix #3392.
2016-08-06 13:47:04 +00:00
|
|
|
|
|
|
|
for (int n = 0; n < in->num_streams; n++) {
|
|
|
|
struct demux_stream *ds = in->streams[n]->ds;
|
demux: make refresh seek handling more generic
Remove the explicit whitelisting of formats for refresh seeks. Instead,
check whether the packet position is somewhat reliable during demuxing.
If there are packets without position, or the packet position is not
monotonically increasing, then do not use them for refresh seeks.
This does not make sure of some requirements, such as deterministic
seeks. If that happens, mpv will mess up a bit on stream switching.
Also, add another method that uses DTS to identify packets, and prefer
it to the packet position method. Even if there's a demuxer which
randomizes packet positions, it hardly can do that with DTS. The DTS
method is not always available either, though. Some formats do not have
a DTS, and others are not always strictly monotonic (possibly due to
libavformat codec parsing and timestamp determination issues).
2016-08-06 17:24:25 +00:00
|
|
|
// Streams which didn't have any packets yet will return all packets,
|
|
|
|
// other streams return packets only starting from the last position.
|
|
|
|
if (ds->last_pos != -1 || ds->last_dts != MP_NOPTS_VALUE)
|
2016-10-21 13:54:57 +00:00
|
|
|
ds->refreshing |= ds->selected;
|
player: improve instant track switching
When switching tracks, we normally have the problem that data gets lost
due to readahead buffering. (Which in turn is because we're stubborn and
instruct the demuxers to discard data on unselected streams.) The
demuxer layer has a hack that re-reads discarded buffered data if a
stream is enabled mid-stream, so track switching will seem instant.
A somewhat similar problem is when all tracks of an external files were
disabled - when enabling the first track, we have to seek to the target
position.
Handle these with the same mechanism. Pass the "current time" to the
demuxer's stream switch function, and let the demuxer figure out what to
do. The demuxer will issue a refresh seek (if possible) to update the
new stream, or will issue a "normal" seek if there was no active stream
yet.
One case that changes is when a video/audio stream is enabled on an
external file with only a subtitle stream active, and the demuxer does
not support rrefresh seeks. This is a fuzzy case, because subtitles are
sparse, and the demuxer might have skipped large amounts of data. We
used to seek (and send the subtitle decoder some subtitle packets
twice). This case is sort of obscure and insane, and the fix would be
questionable, so we simply don't care.
Should mostly fix #3392.
2016-08-06 13:47:04 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// Seek back to player's current position, with a small offset added.
|
|
|
|
return start_ts - 1.0;
|
|
|
|
}
|
|
|
|
|
2017-10-21 17:26:33 +00:00
|
|
|
// Get the PTS in the keyframe range starting at or following dp. We assume
|
|
|
|
// that the minimum PTS values within a keyframe range are strictly monotonic
|
|
|
|
// increasing relative to the range after it. Since we don't assume that the
|
|
|
|
// first packet has the minimum PTS, a search within the keyframe range is done.
|
|
|
|
// This function does not assume dp->keyframe==true, because it deals with weird
|
|
|
|
// cases like apparently seeking to non-keyframes, or pruning the complete
|
|
|
|
// backbuffer, which might end up with non-keyframes even at queue start.
|
|
|
|
static double recompute_keyframe_target_pts(struct demux_packet *dp)
|
|
|
|
{
|
|
|
|
int keyframes = 0;
|
|
|
|
double res = MP_NOPTS_VALUE;
|
|
|
|
while (dp) {
|
|
|
|
if (dp->keyframe)
|
|
|
|
keyframes++;
|
|
|
|
if (keyframes == 2)
|
|
|
|
break;
|
|
|
|
if (keyframes == 1)
|
|
|
|
res = MP_PTS_MIN(res, dp->pts);
|
|
|
|
dp = dp->next;
|
|
|
|
}
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
2015-10-17 12:27:55 +00:00
|
|
|
void demux_add_packet(struct sh_stream *stream, demux_packet_t *dp)
|
2013-07-11 17:17:51 +00:00
|
|
|
{
|
2013-07-11 17:20:25 +00:00
|
|
|
struct demux_stream *ds = stream ? stream->ds : NULL;
|
2014-07-16 20:40:21 +00:00
|
|
|
if (!dp || !ds) {
|
|
|
|
talloc_free(dp);
|
2015-10-17 12:27:55 +00:00
|
|
|
return;
|
2014-07-16 20:40:21 +00:00
|
|
|
}
|
|
|
|
struct demux_internal *in = ds->in;
|
|
|
|
pthread_mutex_lock(&in->lock);
|
demux: hack for instant stream switching
This removes the delay when switching audio tracks in mkv or mp4 files.
Other formats are not enabled, because it's not clear whether the
demuxers fulfill the requirements listed in demux.h. (Many formats
definitely do not with libavformat.)
Background:
The demuxer packet cache buffers a certain amount of packets. This
includes only packets from selected streams. We discard packets from
other streams for various reasons. This introduces a problem: switching
to a different audio track introduces a delay. The delay is as big as
the demuxer packet cache buffer, because while the file was read ahead
to fill the packet buffer, the process of reading packets also discarded
all packets from the previously not selected audio stream. Once the
remaining packet buffer has been played, new audio packets are available
and you hear audio again.
We could probably just not discard packets from unselected streams. But
this would require additional memory and CPU resources, and also it's
hard to tell when packets from unused streams should be discarded (we
don't want to keep them forever; it'd be a memory leak).
We could also issue a player hr-seek to the current playback position,
which would solve the problem in 1 line of code or so. But this can be
rather slow.
So what we do in this commit instead is: we just seek back to the
position where our current packet buffer starts, and start demuxing from
this position again. This way we can get the "past" packets for the
newly selected stream. For streams which were already selected the
packets are simply discarded until the previous position is reached
again.
That latter part is the hard part. We really want to skip packets
exactly until the position where we left off previously, or we will skip
packets or feed packets to the decoder twice. If we assume that the
demuxer is deterministic (returns exactly the same packets after a seek
to a previous position), then we can try to check whether it's the same
packet as the one at the end of the packet buffer. If it is, we know
that the packet after it is where we left off last time.
Unfortunately, this is not very robust, and maybe it can't be made
robust. Currently we use the demux_packet.pos field as unique packet
ID - which works fine in some scenarios, but will break in arbitrary
ways if the basic requirement to the demuxer (as listed in the demux.h
additions) are broken. Thus, this is enabled only for the internal mkv
demuxer and the libavformat mp4 demuxer.
(libavformat mkv does not work, because the packet positions are not
unique. Probably could be fixed upstream, but it's not clear whether
it's a bug or a feature.)
2015-02-13 20:17:17 +00:00
|
|
|
|
demux: make refresh seek handling more generic
Remove the explicit whitelisting of formats for refresh seeks. Instead,
check whether the packet position is somewhat reliable during demuxing.
If there are packets without position, or the packet position is not
monotonically increasing, then do not use them for refresh seeks.
This does not make sure of some requirements, such as deterministic
seeks. If that happens, mpv will mess up a bit on stream switching.
Also, add another method that uses DTS to identify packets, and prefer
it to the packet position method. Even if there's a demuxer which
randomizes packet positions, it hardly can do that with DTS. The DTS
method is not always available either, though. Some formats do not have
a DTS, and others are not always strictly monotonic (possibly due to
libavformat codec parsing and timestamp determination issues).
2016-08-06 17:24:25 +00:00
|
|
|
bool drop = ds->refreshing;
|
demux: hack for instant stream switching
This removes the delay when switching audio tracks in mkv or mp4 files.
Other formats are not enabled, because it's not clear whether the
demuxers fulfill the requirements listed in demux.h. (Many formats
definitely do not with libavformat.)
Background:
The demuxer packet cache buffers a certain amount of packets. This
includes only packets from selected streams. We discard packets from
other streams for various reasons. This introduces a problem: switching
to a different audio track introduces a delay. The delay is as big as
the demuxer packet cache buffer, because while the file was read ahead
to fill the packet buffer, the process of reading packets also discarded
all packets from the previously not selected audio stream. Once the
remaining packet buffer has been played, new audio packets are available
and you hear audio again.
We could probably just not discard packets from unselected streams. But
this would require additional memory and CPU resources, and also it's
hard to tell when packets from unused streams should be discarded (we
don't want to keep them forever; it'd be a memory leak).
We could also issue a player hr-seek to the current playback position,
which would solve the problem in 1 line of code or so. But this can be
rather slow.
So what we do in this commit instead is: we just seek back to the
position where our current packet buffer starts, and start demuxing from
this position again. This way we can get the "past" packets for the
newly selected stream. For streams which were already selected the
packets are simply discarded until the previous position is reached
again.
That latter part is the hard part. We really want to skip packets
exactly until the position where we left off previously, or we will skip
packets or feed packets to the decoder twice. If we assume that the
demuxer is deterministic (returns exactly the same packets after a seek
to a previous position), then we can try to check whether it's the same
packet as the one at the end of the packet buffer. If it is, we know
that the packet after it is where we left off last time.
Unfortunately, this is not very robust, and maybe it can't be made
robust. Currently we use the demux_packet.pos field as unique packet
ID - which works fine in some scenarios, but will break in arbitrary
ways if the basic requirement to the demuxer (as listed in the demux.h
additions) are broken. Thus, this is enabled only for the internal mkv
demuxer and the libavformat mp4 demuxer.
(libavformat mkv does not work, because the packet positions are not
unique. Probably could be fixed upstream, but it's not clear whether
it's a bug or a feature.)
2015-02-13 20:17:17 +00:00
|
|
|
if (ds->refreshing) {
|
|
|
|
// Resume reading once the old position was reached (i.e. we start
|
|
|
|
// returning packets where we left off before the refresh).
|
demux: make refresh seek handling more generic
Remove the explicit whitelisting of formats for refresh seeks. Instead,
check whether the packet position is somewhat reliable during demuxing.
If there are packets without position, or the packet position is not
monotonically increasing, then do not use them for refresh seeks.
This does not make sure of some requirements, such as deterministic
seeks. If that happens, mpv will mess up a bit on stream switching.
Also, add another method that uses DTS to identify packets, and prefer
it to the packet position method. Even if there's a demuxer which
randomizes packet positions, it hardly can do that with DTS. The DTS
method is not always available either, though. Some formats do not have
a DTS, and others are not always strictly monotonic (possibly due to
libavformat codec parsing and timestamp determination issues).
2016-08-06 17:24:25 +00:00
|
|
|
// If it's the same position, drop, but continue normally next time.
|
|
|
|
if (ds->correct_dts) {
|
|
|
|
ds->refreshing = dp->dts < ds->last_dts;
|
|
|
|
} else if (ds->correct_pos) {
|
|
|
|
ds->refreshing = dp->pos < ds->last_pos;
|
|
|
|
} else {
|
|
|
|
ds->refreshing = false; // should not happen
|
|
|
|
}
|
demux: hack for instant stream switching
This removes the delay when switching audio tracks in mkv or mp4 files.
Other formats are not enabled, because it's not clear whether the
demuxers fulfill the requirements listed in demux.h. (Many formats
definitely do not with libavformat.)
Background:
The demuxer packet cache buffers a certain amount of packets. This
includes only packets from selected streams. We discard packets from
other streams for various reasons. This introduces a problem: switching
to a different audio track introduces a delay. The delay is as big as
the demuxer packet cache buffer, because while the file was read ahead
to fill the packet buffer, the process of reading packets also discarded
all packets from the previously not selected audio stream. Once the
remaining packet buffer has been played, new audio packets are available
and you hear audio again.
We could probably just not discard packets from unselected streams. But
this would require additional memory and CPU resources, and also it's
hard to tell when packets from unused streams should be discarded (we
don't want to keep them forever; it'd be a memory leak).
We could also issue a player hr-seek to the current playback position,
which would solve the problem in 1 line of code or so. But this can be
rather slow.
So what we do in this commit instead is: we just seek back to the
position where our current packet buffer starts, and start demuxing from
this position again. This way we can get the "past" packets for the
newly selected stream. For streams which were already selected the
packets are simply discarded until the previous position is reached
again.
That latter part is the hard part. We really want to skip packets
exactly until the position where we left off previously, or we will skip
packets or feed packets to the decoder twice. If we assume that the
demuxer is deterministic (returns exactly the same packets after a seek
to a previous position), then we can try to check whether it's the same
packet as the one at the end of the packet buffer. If it is, we know
that the packet after it is where we left off last time.
Unfortunately, this is not very robust, and maybe it can't be made
robust. Currently we use the demux_packet.pos field as unique packet
ID - which works fine in some scenarios, but will break in arbitrary
ways if the basic requirement to the demuxer (as listed in the demux.h
additions) are broken. Thus, this is enabled only for the internal mkv
demuxer and the libavformat mp4 demuxer.
(libavformat mkv does not work, because the packet positions are not
unique. Probably could be fixed upstream, but it's not clear whether
it's a bug or a feature.)
2015-02-13 20:17:17 +00:00
|
|
|
}
|
|
|
|
|
2016-08-08 09:13:43 +00:00
|
|
|
if (!ds->selected || ds->need_refresh || in->seeking || drop) {
|
2014-07-16 20:40:21 +00:00
|
|
|
pthread_mutex_unlock(&in->lock);
|
2013-07-11 17:20:25 +00:00
|
|
|
talloc_free(dp);
|
2015-10-17 12:27:55 +00:00
|
|
|
return;
|
2013-07-11 17:20:25 +00:00
|
|
|
}
|
|
|
|
|
demux: make refresh seek handling more generic
Remove the explicit whitelisting of formats for refresh seeks. Instead,
check whether the packet position is somewhat reliable during demuxing.
If there are packets without position, or the packet position is not
monotonically increasing, then do not use them for refresh seeks.
This does not make sure of some requirements, such as deterministic
seeks. If that happens, mpv will mess up a bit on stream switching.
Also, add another method that uses DTS to identify packets, and prefer
it to the packet position method. Even if there's a demuxer which
randomizes packet positions, it hardly can do that with DTS. The DTS
method is not always available either, though. Some formats do not have
a DTS, and others are not always strictly monotonic (possibly due to
libavformat codec parsing and timestamp determination issues).
2016-08-06 17:24:25 +00:00
|
|
|
ds->correct_pos &= dp->pos >= 0 && dp->pos > ds->last_pos;
|
|
|
|
ds->correct_dts &= dp->dts != MP_NOPTS_VALUE && dp->dts > ds->last_dts;
|
|
|
|
ds->last_pos = dp->pos;
|
|
|
|
ds->last_dts = dp->dts;
|
|
|
|
|
2013-11-16 20:28:59 +00:00
|
|
|
dp->stream = stream->index;
|
|
|
|
dp->next = NULL;
|
|
|
|
|
2017-10-21 17:26:33 +00:00
|
|
|
ds->fw_packs++;
|
|
|
|
ds->fw_bytes += demux_packet_estimate_total_size(dp);
|
|
|
|
if (ds->queue_tail) {
|
2013-07-11 17:20:25 +00:00
|
|
|
// next packet in stream
|
2017-10-21 17:26:33 +00:00
|
|
|
ds->queue_tail->next = dp;
|
|
|
|
ds->queue_tail = dp;
|
2013-07-11 17:17:51 +00:00
|
|
|
} else {
|
2013-07-11 17:20:25 +00:00
|
|
|
// first packet in stream
|
2017-10-21 17:26:33 +00:00
|
|
|
ds->queue_head = ds->queue_tail = dp;
|
2013-07-11 17:17:51 +00:00
|
|
|
}
|
2017-10-21 17:26:33 +00:00
|
|
|
// (keep in mind that even if the reader went out of data, the queue is not
|
|
|
|
// necessarily empty due to the backbuffer)
|
|
|
|
if (!ds->reader_head)
|
|
|
|
ds->reader_head = dp;
|
|
|
|
|
|
|
|
// (In theory it'd be more efficient to make this incremental.)
|
|
|
|
if (ds->back_pts == MP_NOPTS_VALUE && dp->keyframe)
|
|
|
|
ds->back_pts = recompute_keyframe_target_pts(ds->queue_head);
|
2014-08-16 15:07:36 +00:00
|
|
|
|
2017-10-20 20:30:59 +00:00
|
|
|
if (!ds->ignore_eof) {
|
|
|
|
// obviously not true anymore
|
|
|
|
ds->eof = false;
|
|
|
|
in->last_eof = in->eof = false;
|
|
|
|
}
|
2013-11-16 19:40:37 +00:00
|
|
|
|
2013-11-25 22:13:01 +00:00
|
|
|
// For video, PTS determination is not trivial, but for other media types
|
|
|
|
// distinguishing PTS and DTS is not useful.
|
|
|
|
if (stream->type != STREAM_VIDEO && dp->pts == MP_NOPTS_VALUE)
|
|
|
|
dp->pts = dp->dts;
|
|
|
|
|
2014-08-16 15:07:36 +00:00
|
|
|
double ts = dp->dts == MP_NOPTS_VALUE ? dp->pts : dp->dts;
|
|
|
|
if (ts != MP_NOPTS_VALUE && (ts > ds->last_ts || ts + 10 < ds->last_ts))
|
|
|
|
ds->last_ts = ts;
|
|
|
|
if (ds->base_ts == MP_NOPTS_VALUE)
|
|
|
|
ds->base_ts = ds->last_ts;
|
|
|
|
|
2014-07-16 20:40:21 +00:00
|
|
|
MP_DBG(in, "append packet to %s: size=%d pts=%f dts=%f pos=%"PRIi64" "
|
|
|
|
"[num=%zd size=%zd]\n", stream_type_name(stream->type),
|
2017-10-21 17:26:33 +00:00
|
|
|
dp->len, dp->pts, dp->dts, dp->pos, ds->fw_packs, ds->fw_bytes);
|
2014-07-16 20:40:21 +00:00
|
|
|
|
2017-10-21 17:26:33 +00:00
|
|
|
// Wake up if this was the first packet after start/possible underrun.
|
|
|
|
if (ds->in->wakeup_cb && !ds->reader_head->next)
|
2014-07-16 20:40:21 +00:00
|
|
|
ds->in->wakeup_cb(ds->in->wakeup_cb_ctx);
|
|
|
|
pthread_cond_signal(&in->wakeup);
|
|
|
|
pthread_mutex_unlock(&in->lock);
|
2013-07-11 17:17:51 +00:00
|
|
|
}
|
|
|
|
|
2014-07-16 20:40:21 +00:00
|
|
|
// Returns true if there was "progress" (lock was released temporarily).
|
|
|
|
static bool read_packet(struct demux_internal *in)
|
2013-02-14 13:49:50 +00:00
|
|
|
{
|
2014-07-16 20:40:21 +00:00
|
|
|
in->eof = false;
|
player: redo how stream caching and pausing on low cache works
Add the --cache-secs option, which literally overrides the value of
--demuxer-readahead-secs if the stream cache is active. The default
value is very high (10 seconds), which means it can act as network
cache.
Remove the old behavior of trying to pause once the byte cache runs
low. Instead, do something similar wit the demuxer cache. The nice
thing is that we can guess how many seconds of video it has cached,
and we can make better decisions. But for now, apply a relatively
naive heuristic: if the cache is below 0.5 secs, pause, and wait
until at least 2 secs are available.
Note that due to timestamp reordering, the estimated cached duration
of video might be inaccurate, depending on the file format. If the
file format has DTS, it's easy, otherwise the duration will seemingly
jump back and forth.
2014-08-26 23:13:20 +00:00
|
|
|
in->idle = true;
|
2014-07-16 20:40:21 +00:00
|
|
|
|
|
|
|
// Check if we need to read a new packet. We do this if all queues are below
|
|
|
|
// the minimum, or if a stream explicitly needs new packets. Also includes
|
|
|
|
// safe-guards against packet queue overflow.
|
|
|
|
bool active = false, read_more = false;
|
2017-10-21 17:26:33 +00:00
|
|
|
size_t bytes = 0;
|
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
|
|
|
for (int n = 0; n < in->num_streams; n++) {
|
|
|
|
struct demux_stream *ds = in->streams[n]->ds;
|
2014-08-16 15:07:36 +00:00
|
|
|
active |= ds->active;
|
2017-10-21 17:26:33 +00:00
|
|
|
read_more |= (ds->active && !ds->reader_head) || ds->refreshing;
|
|
|
|
bytes += ds->fw_bytes;
|
2015-05-26 10:59:48 +00:00
|
|
|
if (ds->active && ds->last_ts != MP_NOPTS_VALUE && in->min_secs > 0 &&
|
|
|
|
ds->last_ts >= ds->base_ts)
|
2014-08-16 15:07:36 +00:00
|
|
|
read_more |= ds->last_ts - ds->base_ts < in->min_secs;
|
2013-07-11 17:20:25 +00:00
|
|
|
}
|
2017-10-21 17:26:33 +00:00
|
|
|
MP_DBG(in, "bytes=%zd, active=%d, more=%d\n",
|
|
|
|
bytes, active, read_more);
|
|
|
|
if (bytes >= in->max_bytes) {
|
2014-07-16 20:40:21 +00:00
|
|
|
if (!in->warned_queue_overflow) {
|
|
|
|
in->warned_queue_overflow = true;
|
2016-08-22 10:10:55 +00:00
|
|
|
MP_WARN(in, "Too many packets in the demuxer packet queues:\n");
|
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
|
|
|
for (int n = 0; n < in->num_streams; n++) {
|
|
|
|
struct demux_stream *ds = in->streams[n]->ds;
|
2014-07-16 20:40:21 +00:00
|
|
|
if (ds->selected) {
|
2016-08-22 10:10:55 +00:00
|
|
|
MP_WARN(in, " %s/%d: %zd packets, %zd bytes\n",
|
2017-10-21 17:26:33 +00:00
|
|
|
stream_type_name(ds->type), n,
|
|
|
|
ds->fw_packs, ds->fw_bytes);
|
2014-07-16 20:40:21 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
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
|
|
|
for (int n = 0; n < in->num_streams; n++) {
|
|
|
|
struct demux_stream *ds = in->streams[n]->ds;
|
2017-10-21 17:26:33 +00:00
|
|
|
bool eof = !ds->reader_head;
|
2016-02-24 21:04:18 +00:00
|
|
|
if (eof && !ds->eof) {
|
|
|
|
if (in->wakeup_cb)
|
|
|
|
in->wakeup_cb(in->wakeup_cb_ctx);
|
|
|
|
}
|
|
|
|
ds->eof |= eof;
|
2014-07-16 20:40:21 +00:00
|
|
|
}
|
|
|
|
pthread_cond_signal(&in->wakeup);
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
player: fix instant subtitle refresh on track switches
When switching a subtitle track, the subtitle wasn't necessarily
updated, especially when playback was paused.
Some awfully subtle and complex interactions here.
First off (and not so subtle), the subtitle decoder will read packets
only on explicit update_subtitles() calls, which, if video is active, is
called only when a new video frame is shown. (A simply video frame
redraw doesn't trigger this.) So call it explicitly. But only if
playback is "initialized", i.e. not when it does initial track selection
and decoder init, during which no packets should be read.
The second issue is that the demuxer thread simply will not read new
packets just because a track was switched, especially if playback is
paused. That's fine, but if a refresh seek is to be done, it really
should do this. So if there's either 1. a refresh seek requested, or 2.
a refresh seek ongoing, then read more packets.
Note that it's entirely possible that we overflow the packet queue with
this in unpredicated weird corner cases, but the queue limit will still
be enforced, so this shouldn't make the situation worse.
2016-09-24 17:56:13 +00:00
|
|
|
double seek_pts = get_refresh_seek_pts(in);
|
|
|
|
bool refresh_seek = seek_pts != MP_NOPTS_VALUE;
|
|
|
|
read_more |= refresh_seek;
|
|
|
|
|
2014-07-16 20:40:21 +00:00
|
|
|
if (!read_more)
|
|
|
|
return false;
|
|
|
|
|
|
|
|
// Actually read a packet. Drop the lock while doing so, because waiting
|
|
|
|
// for disk or network I/O can take time.
|
player: redo how stream caching and pausing on low cache works
Add the --cache-secs option, which literally overrides the value of
--demuxer-readahead-secs if the stream cache is active. The default
value is very high (10 seconds), which means it can act as network
cache.
Remove the old behavior of trying to pause once the byte cache runs
low. Instead, do something similar wit the demuxer cache. The nice
thing is that we can guess how many seconds of video it has cached,
and we can make better decisions. But for now, apply a relatively
naive heuristic: if the cache is below 0.5 secs, pause, and wait
until at least 2 secs are available.
Note that due to timestamp reordering, the estimated cached duration
of video might be inaccurate, depending on the file format. If the
file format has DTS, it's easy, otherwise the duration will seemingly
jump back and forth.
2014-08-26 23:13:20 +00:00
|
|
|
in->idle = false;
|
player: improve instant track switching
When switching tracks, we normally have the problem that data gets lost
due to readahead buffering. (Which in turn is because we're stubborn and
instruct the demuxers to discard data on unselected streams.) The
demuxer layer has a hack that re-reads discarded buffered data if a
stream is enabled mid-stream, so track switching will seem instant.
A somewhat similar problem is when all tracks of an external files were
disabled - when enabling the first track, we have to seek to the target
position.
Handle these with the same mechanism. Pass the "current time" to the
demuxer's stream switch function, and let the demuxer figure out what to
do. The demuxer will issue a refresh seek (if possible) to update the
new stream, or will issue a "normal" seek if there was no active stream
yet.
One case that changes is when a video/audio stream is enabled on an
external file with only a subtitle stream active, and the demuxer does
not support rrefresh seeks. This is a fuzzy case, because subtitles are
sparse, and the demuxer might have skipped large amounts of data. We
used to seek (and send the subtitle decoder some subtitle packets
twice). This case is sort of obscure and insane, and the fix would be
questionable, so we simply don't care.
Should mostly fix #3392.
2016-08-06 13:47:04 +00:00
|
|
|
in->initial_state = false;
|
2014-07-16 20:40:21 +00:00
|
|
|
pthread_mutex_unlock(&in->lock);
|
player: improve instant track switching
When switching tracks, we normally have the problem that data gets lost
due to readahead buffering. (Which in turn is because we're stubborn and
instruct the demuxers to discard data on unselected streams.) The
demuxer layer has a hack that re-reads discarded buffered data if a
stream is enabled mid-stream, so track switching will seem instant.
A somewhat similar problem is when all tracks of an external files were
disabled - when enabling the first track, we have to seek to the target
position.
Handle these with the same mechanism. Pass the "current time" to the
demuxer's stream switch function, and let the demuxer figure out what to
do. The demuxer will issue a refresh seek (if possible) to update the
new stream, or will issue a "normal" seek if there was no active stream
yet.
One case that changes is when a video/audio stream is enabled on an
external file with only a subtitle stream active, and the demuxer does
not support rrefresh seeks. This is a fuzzy case, because subtitles are
sparse, and the demuxer might have skipped large amounts of data. We
used to seek (and send the subtitle decoder some subtitle packets
twice). This case is sort of obscure and insane, and the fix would be
questionable, so we simply don't care.
Should mostly fix #3392.
2016-08-06 13:47:04 +00:00
|
|
|
|
2014-07-16 20:40:21 +00:00
|
|
|
struct demuxer *demux = in->d_thread;
|
player: improve instant track switching
When switching tracks, we normally have the problem that data gets lost
due to readahead buffering. (Which in turn is because we're stubborn and
instruct the demuxers to discard data on unselected streams.) The
demuxer layer has a hack that re-reads discarded buffered data if a
stream is enabled mid-stream, so track switching will seem instant.
A somewhat similar problem is when all tracks of an external files were
disabled - when enabling the first track, we have to seek to the target
position.
Handle these with the same mechanism. Pass the "current time" to the
demuxer's stream switch function, and let the demuxer figure out what to
do. The demuxer will issue a refresh seek (if possible) to update the
new stream, or will issue a "normal" seek if there was no active stream
yet.
One case that changes is when a video/audio stream is enabled on an
external file with only a subtitle stream active, and the demuxer does
not support rrefresh seeks. This is a fuzzy case, because subtitles are
sparse, and the demuxer might have skipped large amounts of data. We
used to seek (and send the subtitle decoder some subtitle packets
twice). This case is sort of obscure and insane, and the fix would be
questionable, so we simply don't care.
Should mostly fix #3392.
2016-08-06 13:47:04 +00:00
|
|
|
|
player: fix instant subtitle refresh on track switches
When switching a subtitle track, the subtitle wasn't necessarily
updated, especially when playback was paused.
Some awfully subtle and complex interactions here.
First off (and not so subtle), the subtitle decoder will read packets
only on explicit update_subtitles() calls, which, if video is active, is
called only when a new video frame is shown. (A simply video frame
redraw doesn't trigger this.) So call it explicitly. But only if
playback is "initialized", i.e. not when it does initial track selection
and decoder init, during which no packets should be read.
The second issue is that the demuxer thread simply will not read new
packets just because a track was switched, especially if playback is
paused. That's fine, but if a refresh seek is to be done, it really
should do this. So if there's either 1. a refresh seek requested, or 2.
a refresh seek ongoing, then read more packets.
Note that it's entirely possible that we overflow the packet queue with
this in unpredicated weird corner cases, but the queue limit will still
be enforced, so this shouldn't make the situation worse.
2016-09-24 17:56:13 +00:00
|
|
|
if (refresh_seek) {
|
player: improve instant track switching
When switching tracks, we normally have the problem that data gets lost
due to readahead buffering. (Which in turn is because we're stubborn and
instruct the demuxers to discard data on unselected streams.) The
demuxer layer has a hack that re-reads discarded buffered data if a
stream is enabled mid-stream, so track switching will seem instant.
A somewhat similar problem is when all tracks of an external files were
disabled - when enabling the first track, we have to seek to the target
position.
Handle these with the same mechanism. Pass the "current time" to the
demuxer's stream switch function, and let the demuxer figure out what to
do. The demuxer will issue a refresh seek (if possible) to update the
new stream, or will issue a "normal" seek if there was no active stream
yet.
One case that changes is when a video/audio stream is enabled on an
external file with only a subtitle stream active, and the demuxer does
not support rrefresh seeks. This is a fuzzy case, because subtitles are
sparse, and the demuxer might have skipped large amounts of data. We
used to seek (and send the subtitle decoder some subtitle packets
twice). This case is sort of obscure and insane, and the fix would be
questionable, so we simply don't care.
Should mostly fix #3392.
2016-08-06 13:47:04 +00:00
|
|
|
MP_VERBOSE(in, "refresh seek to %f\n", seek_pts);
|
2017-10-23 17:05:39 +00:00
|
|
|
demux->desc->seek(demux, seek_pts, SEEK_HR);
|
player: improve instant track switching
When switching tracks, we normally have the problem that data gets lost
due to readahead buffering. (Which in turn is because we're stubborn and
instruct the demuxers to discard data on unselected streams.) The
demuxer layer has a hack that re-reads discarded buffered data if a
stream is enabled mid-stream, so track switching will seem instant.
A somewhat similar problem is when all tracks of an external files were
disabled - when enabling the first track, we have to seek to the target
position.
Handle these with the same mechanism. Pass the "current time" to the
demuxer's stream switch function, and let the demuxer figure out what to
do. The demuxer will issue a refresh seek (if possible) to update the
new stream, or will issue a "normal" seek if there was no active stream
yet.
One case that changes is when a video/audio stream is enabled on an
external file with only a subtitle stream active, and the demuxer does
not support rrefresh seeks. This is a fuzzy case, because subtitles are
sparse, and the demuxer might have skipped large amounts of data. We
used to seek (and send the subtitle decoder some subtitle packets
twice). This case is sort of obscure and insane, and the fix would be
questionable, so we simply don't care.
Should mostly fix #3392.
2016-08-06 13:47:04 +00:00
|
|
|
}
|
|
|
|
|
2017-02-04 21:50:45 +00:00
|
|
|
bool eof = true;
|
|
|
|
if (demux->desc->fill_buffer && !demux_cancel_test(demux))
|
|
|
|
eof = demux->desc->fill_buffer(demux) <= 0;
|
2014-07-16 20:40:21 +00:00
|
|
|
update_cache(in);
|
player: improve instant track switching
When switching tracks, we normally have the problem that data gets lost
due to readahead buffering. (Which in turn is because we're stubborn and
instruct the demuxers to discard data on unselected streams.) The
demuxer layer has a hack that re-reads discarded buffered data if a
stream is enabled mid-stream, so track switching will seem instant.
A somewhat similar problem is when all tracks of an external files were
disabled - when enabling the first track, we have to seek to the target
position.
Handle these with the same mechanism. Pass the "current time" to the
demuxer's stream switch function, and let the demuxer figure out what to
do. The demuxer will issue a refresh seek (if possible) to update the
new stream, or will issue a "normal" seek if there was no active stream
yet.
One case that changes is when a video/audio stream is enabled on an
external file with only a subtitle stream active, and the demuxer does
not support rrefresh seeks. This is a fuzzy case, because subtitles are
sparse, and the demuxer might have skipped large amounts of data. We
used to seek (and send the subtitle decoder some subtitle packets
twice). This case is sort of obscure and insane, and the fix would be
questionable, so we simply don't care.
Should mostly fix #3392.
2016-08-06 13:47:04 +00:00
|
|
|
|
2014-10-24 13:56:45 +00:00
|
|
|
pthread_mutex_lock(&in->lock);
|
2014-07-16 20:40:21 +00:00
|
|
|
|
2016-08-06 13:50:46 +00:00
|
|
|
if (!in->seeking) {
|
|
|
|
if (eof) {
|
|
|
|
for (int n = 0; n < in->num_streams; n++)
|
|
|
|
in->streams[n]->ds->eof = true;
|
|
|
|
// If we had EOF previously, then don't wakeup (avoids wakeup loop)
|
|
|
|
if (!in->last_eof) {
|
|
|
|
if (in->wakeup_cb)
|
|
|
|
in->wakeup_cb(in->wakeup_cb_ctx);
|
|
|
|
pthread_cond_signal(&in->wakeup);
|
|
|
|
MP_VERBOSE(in, "EOF reached.\n");
|
|
|
|
}
|
2014-07-16 20:40:21 +00:00
|
|
|
}
|
2016-08-06 13:50:46 +00:00
|
|
|
in->eof = in->last_eof = eof;
|
2013-02-14 13:49:50 +00:00
|
|
|
}
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2017-10-21 17:26:33 +00:00
|
|
|
static void prune_old_packets(struct demux_internal *in)
|
|
|
|
{
|
|
|
|
size_t buffered = 0;
|
|
|
|
for (int n = 0; n < in->num_streams; n++)
|
|
|
|
buffered += in->streams[n]->ds->bw_bytes;
|
|
|
|
|
|
|
|
MP_TRACE(in, "total backbuffer = %zd\n", buffered);
|
|
|
|
|
|
|
|
// It's not clear what the ideal way to prune old packets is. For now, we
|
|
|
|
// prune the oldest packet runs, as long as the total cache amount is too
|
|
|
|
// big.
|
|
|
|
while (buffered > in->max_bytes_bw) {
|
|
|
|
double earliest_ts = MP_NOPTS_VALUE;
|
|
|
|
int earliest_stream = -1;
|
|
|
|
|
|
|
|
for (int n = 0; n < in->num_streams; n++) {
|
|
|
|
struct demux_stream *ds = in->streams[n]->ds;
|
|
|
|
|
|
|
|
if (ds->queue_head && ds->queue_head != ds->reader_head) {
|
|
|
|
struct demux_packet *dp = ds->queue_head;
|
|
|
|
double ts = PTS_OR_DEF(dp->dts, dp->pts);
|
|
|
|
// Note: in obscure cases, packets might have no timestamps set,
|
|
|
|
// in which case we still need to prune _something_.
|
|
|
|
if (earliest_ts == MP_NOPTS_VALUE ||
|
|
|
|
(ts != MP_NOPTS_VALUE && ts < earliest_ts))
|
|
|
|
{
|
|
|
|
earliest_ts = ts;
|
|
|
|
earliest_stream = n;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
assert(earliest_stream >= 0); // incorrect accounting of "buffered"?
|
|
|
|
struct demux_stream *ds = in->streams[earliest_stream]->ds;
|
|
|
|
|
|
|
|
// Prune all packets until the next keyframe or reader_head. Keeping
|
|
|
|
// those packets would not help with seeking at all, so we strictly
|
|
|
|
// drop them.
|
|
|
|
// Note: might be pretty inefficient for streams with many small audio
|
|
|
|
// or subtitle packets. (All are keyframe and selection logic runs for
|
|
|
|
// every packet.)
|
|
|
|
bool dropped_one = false;
|
|
|
|
while (ds->queue_head && ds->queue_head != ds->reader_head) {
|
|
|
|
struct demux_packet *dp = ds->queue_head;
|
|
|
|
if (dp->keyframe && dropped_one)
|
|
|
|
break;
|
|
|
|
dropped_one = true;
|
|
|
|
size_t bytes = demux_packet_estimate_total_size(dp);
|
|
|
|
buffered -= bytes;
|
|
|
|
MP_TRACE(in, "dropping backbuffer packet size %zd from stream %d\n",
|
|
|
|
bytes, earliest_stream);
|
|
|
|
|
|
|
|
ds->queue_head = dp->next;
|
|
|
|
if (!ds->queue_head)
|
|
|
|
ds->queue_tail = NULL;
|
|
|
|
talloc_free(dp);
|
|
|
|
ds->bw_bytes -= bytes;
|
|
|
|
}
|
|
|
|
|
|
|
|
ds->back_pts = recompute_keyframe_target_pts(ds->queue_head);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-08-06 17:25:37 +00:00
|
|
|
static void execute_trackswitch(struct demux_internal *in)
|
|
|
|
{
|
|
|
|
in->tracks_switched = false;
|
|
|
|
|
2016-01-18 17:34:44 +00:00
|
|
|
bool any_selected = false;
|
|
|
|
for (int n = 0; n < in->num_streams; n++)
|
|
|
|
any_selected |= in->streams[n]->ds->selected;
|
|
|
|
|
2014-08-06 17:25:37 +00:00
|
|
|
pthread_mutex_unlock(&in->lock);
|
|
|
|
|
|
|
|
if (in->d_thread->desc->control)
|
|
|
|
in->d_thread->desc->control(in->d_thread, DEMUXER_CTRL_SWITCHED_TRACKS, 0);
|
|
|
|
|
2016-01-18 17:34:44 +00:00
|
|
|
stream_control(in->d_thread->stream, STREAM_CTRL_SET_READAHEAD,
|
|
|
|
&(int){any_selected});
|
|
|
|
|
2014-08-06 17:25:37 +00:00
|
|
|
pthread_mutex_lock(&in->lock);
|
|
|
|
}
|
|
|
|
|
2014-07-21 17:27:24 +00:00
|
|
|
static void execute_seek(struct demux_internal *in)
|
|
|
|
{
|
|
|
|
int flags = in->seek_flags;
|
|
|
|
double pts = in->seek_pts;
|
|
|
|
in->seeking = false;
|
player: improve instant track switching
When switching tracks, we normally have the problem that data gets lost
due to readahead buffering. (Which in turn is because we're stubborn and
instruct the demuxers to discard data on unselected streams.) The
demuxer layer has a hack that re-reads discarded buffered data if a
stream is enabled mid-stream, so track switching will seem instant.
A somewhat similar problem is when all tracks of an external files were
disabled - when enabling the first track, we have to seek to the target
position.
Handle these with the same mechanism. Pass the "current time" to the
demuxer's stream switch function, and let the demuxer figure out what to
do. The demuxer will issue a refresh seek (if possible) to update the
new stream, or will issue a "normal" seek if there was no active stream
yet.
One case that changes is when a video/audio stream is enabled on an
external file with only a subtitle stream active, and the demuxer does
not support rrefresh seeks. This is a fuzzy case, because subtitles are
sparse, and the demuxer might have skipped large amounts of data. We
used to seek (and send the subtitle decoder some subtitle packets
twice). This case is sort of obscure and insane, and the fix would be
questionable, so we simply don't care.
Should mostly fix #3392.
2016-08-06 13:47:04 +00:00
|
|
|
in->initial_state = false;
|
2014-07-21 17:27:24 +00:00
|
|
|
|
|
|
|
pthread_mutex_unlock(&in->lock);
|
|
|
|
|
2015-06-18 20:31:55 +00:00
|
|
|
MP_VERBOSE(in, "execute seek (to %f flags %d)\n", pts, flags);
|
|
|
|
|
2014-07-21 17:27:24 +00:00
|
|
|
if (in->d_thread->desc->seek)
|
|
|
|
in->d_thread->desc->seek(in->d_thread, pts, flags);
|
|
|
|
|
2015-06-18 20:31:55 +00:00
|
|
|
MP_VERBOSE(in, "seek done\n");
|
|
|
|
|
2014-07-21 17:27:24 +00:00
|
|
|
pthread_mutex_lock(&in->lock);
|
|
|
|
}
|
|
|
|
|
2014-07-16 20:40:21 +00:00
|
|
|
static void *demux_thread(void *pctx)
|
2008-04-12 15:51:08 +00:00
|
|
|
{
|
2014-07-16 20:40:21 +00:00
|
|
|
struct demux_internal *in = pctx;
|
2014-10-19 21:32:34 +00:00
|
|
|
mpthread_set_name("demux");
|
2014-07-16 20:40:21 +00:00
|
|
|
pthread_mutex_lock(&in->lock);
|
|
|
|
while (!in->thread_terminate) {
|
2016-03-09 23:06:13 +00:00
|
|
|
if (in->run_fn) {
|
|
|
|
in->run_fn(in->run_fn_arg);
|
|
|
|
in->run_fn = NULL;
|
2014-07-16 20:40:21 +00:00
|
|
|
pthread_cond_signal(&in->wakeup);
|
|
|
|
continue;
|
|
|
|
}
|
2014-08-06 17:25:37 +00:00
|
|
|
if (in->tracks_switched) {
|
|
|
|
execute_trackswitch(in);
|
|
|
|
continue;
|
|
|
|
}
|
2014-07-21 17:27:24 +00:00
|
|
|
if (in->seeking) {
|
|
|
|
execute_seek(in);
|
|
|
|
continue;
|
|
|
|
}
|
2014-07-16 20:40:21 +00:00
|
|
|
if (!in->eof) {
|
|
|
|
if (read_packet(in))
|
|
|
|
continue; // read_packet unlocked, so recheck conditions
|
|
|
|
}
|
2014-11-12 20:47:41 +00:00
|
|
|
if (in->force_cache_update) {
|
|
|
|
pthread_mutex_unlock(&in->lock);
|
|
|
|
update_cache(in);
|
|
|
|
pthread_mutex_lock(&in->lock);
|
|
|
|
in->force_cache_update = false;
|
|
|
|
continue;
|
|
|
|
}
|
2014-07-16 20:40:21 +00:00
|
|
|
pthread_cond_signal(&in->wakeup);
|
|
|
|
pthread_cond_wait(&in->wakeup, &in->lock);
|
2001-07-29 21:07:34 +00:00
|
|
|
}
|
2014-07-16 20:40:21 +00:00
|
|
|
pthread_mutex_unlock(&in->lock);
|
|
|
|
return NULL;
|
2001-02-24 20:28:24 +00:00
|
|
|
}
|
2001-04-20 23:00:11 +00:00
|
|
|
|
2014-07-18 13:08:05 +00:00
|
|
|
static struct demux_packet *dequeue_packet(struct demux_stream *ds)
|
|
|
|
{
|
2017-10-21 18:35:03 +00:00
|
|
|
if (ds->sh->attached_picture) {
|
2017-01-10 13:03:41 +00:00
|
|
|
ds->eof = true;
|
|
|
|
if (ds->attached_picture_added)
|
|
|
|
return NULL;
|
|
|
|
ds->attached_picture_added = true;
|
2017-10-21 18:35:03 +00:00
|
|
|
return demux_copy_packet(ds->sh->attached_picture);
|
2017-01-10 13:03:41 +00:00
|
|
|
}
|
2017-10-21 17:26:33 +00:00
|
|
|
if (!ds->reader_head)
|
2014-07-18 13:08:05 +00:00
|
|
|
return NULL;
|
2017-10-21 17:26:33 +00:00
|
|
|
struct demux_packet *pkt = ds->reader_head;
|
|
|
|
ds->reader_head = pkt->next;
|
|
|
|
|
|
|
|
// Update cached packet queue state.
|
|
|
|
ds->fw_packs--;
|
|
|
|
size_t bytes = demux_packet_estimate_total_size(pkt);
|
|
|
|
ds->fw_bytes -= bytes;
|
|
|
|
ds->bw_bytes += bytes;
|
|
|
|
|
|
|
|
// The returned packet is mutated etc. and will be owned by the user.
|
|
|
|
pkt = demux_copy_packet(pkt);
|
|
|
|
if (!pkt)
|
|
|
|
abort();
|
2014-07-18 13:08:05 +00:00
|
|
|
pkt->next = NULL;
|
|
|
|
|
2017-10-21 17:26:33 +00:00
|
|
|
double ts = PTS_OR_DEF(pkt->dts, pkt->pts);
|
2014-08-16 15:07:36 +00:00
|
|
|
if (ts != MP_NOPTS_VALUE)
|
|
|
|
ds->base_ts = ts;
|
|
|
|
|
2016-03-05 11:48:58 +00:00
|
|
|
if (pkt->keyframe && ts != MP_NOPTS_VALUE) {
|
2014-12-12 00:00:58 +00:00
|
|
|
// Update bitrate - only at keyframe points, because we use the
|
|
|
|
// (possibly) reordered packet timestamps instead of realtime.
|
|
|
|
double d = ts - ds->last_br_ts;
|
2016-03-05 11:48:58 +00:00
|
|
|
if (ds->last_br_ts == MP_NOPTS_VALUE || d < 0) {
|
2014-12-12 00:00:58 +00:00
|
|
|
ds->bitrate = -1;
|
|
|
|
ds->last_br_ts = ts;
|
|
|
|
ds->last_br_bytes = 0;
|
2017-05-10 19:45:42 +00:00
|
|
|
} else if (d >= 0.5) { // a window of least 500ms for UI purposes
|
2014-12-12 00:00:58 +00:00
|
|
|
ds->bitrate = ds->last_br_bytes / d;
|
|
|
|
ds->last_br_ts = ts;
|
|
|
|
ds->last_br_bytes = 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
ds->last_br_bytes += pkt->len;
|
|
|
|
|
2014-07-18 13:08:05 +00:00
|
|
|
// This implies this function is actually called from "the" user thread.
|
2014-09-02 23:59:40 +00:00
|
|
|
if (pkt->pos >= ds->in->d_user->filepos)
|
2014-07-18 13:08:05 +00:00
|
|
|
ds->in->d_user->filepos = pkt->pos;
|
|
|
|
|
2015-11-16 21:47:17 +00:00
|
|
|
pkt->pts = MP_ADD_PTS(pkt->pts, ds->in->ts_offset);
|
|
|
|
pkt->dts = MP_ADD_PTS(pkt->dts, ds->in->ts_offset);
|
|
|
|
|
2016-02-20 15:22:15 +00:00
|
|
|
pkt->start = MP_ADD_PTS(pkt->start, ds->in->ts_offset);
|
|
|
|
pkt->end = MP_ADD_PTS(pkt->end, ds->in->ts_offset);
|
|
|
|
|
2017-10-21 17:26:33 +00:00
|
|
|
prune_old_packets(ds->in);
|
2014-07-18 13:08:05 +00:00
|
|
|
return pkt;
|
|
|
|
}
|
|
|
|
|
2017-01-10 11:14:04 +00:00
|
|
|
// Whether to avoid actively demuxing new packets to find a new packet on the
|
|
|
|
// given stream.
|
2017-01-10 13:03:41 +00:00
|
|
|
// Attached pictures (cover art) should never actively read.
|
2016-01-18 17:25:14 +00:00
|
|
|
// Sparse packets (Subtitles) interleaved with other non-sparse packets (video,
|
|
|
|
// audio) should never be read actively, meaning the demuxer thread does not
|
|
|
|
// try to exceed default readahead in order to find a new packet.
|
2017-01-10 11:14:04 +00:00
|
|
|
static bool use_lazy_packet_reading(struct demux_stream *ds)
|
2016-01-18 17:25:14 +00:00
|
|
|
{
|
2017-10-21 18:35:03 +00:00
|
|
|
if (ds->sh->attached_picture)
|
2017-01-10 13:03:41 +00:00
|
|
|
return true;
|
2016-01-18 17:25:14 +00:00
|
|
|
if (ds->type != STREAM_SUB)
|
|
|
|
return false;
|
2017-01-10 11:14:04 +00:00
|
|
|
// Subtitles are only lazily read if there's at least 1 other actively read
|
|
|
|
// stream.
|
2016-01-18 17:25:14 +00:00
|
|
|
for (int n = 0; n < ds->in->num_streams; n++) {
|
|
|
|
struct demux_stream *s = ds->in->streams[n]->ds;
|
2017-10-21 18:35:03 +00:00
|
|
|
if (s->type != STREAM_SUB && s->selected && !s->eof && !
|
|
|
|
s->sh->attached_picture)
|
2016-01-18 17:25:14 +00:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2013-07-11 17:10:33 +00:00
|
|
|
// Read a packet from the given stream. The returned packet belongs to the
|
|
|
|
// caller, who has to free it with talloc_free(). Might block. Returns NULL
|
|
|
|
// on EOF.
|
|
|
|
struct demux_packet *demux_read_packet(struct sh_stream *sh)
|
2006-04-24 10:58:40 +00:00
|
|
|
{
|
2013-07-11 17:20:25 +00:00
|
|
|
struct demux_stream *ds = sh ? sh->ds : NULL;
|
2014-07-16 20:40:21 +00:00
|
|
|
struct demux_packet *pkt = NULL;
|
2013-07-11 17:10:33 +00:00
|
|
|
if (ds) {
|
2017-01-10 10:54:34 +00:00
|
|
|
struct demux_internal *in = ds->in;
|
|
|
|
pthread_mutex_lock(&in->lock);
|
2017-01-10 11:14:04 +00:00
|
|
|
if (!use_lazy_packet_reading(ds)) {
|
2017-01-10 10:54:34 +00:00
|
|
|
const char *t = stream_type_name(ds->type);
|
|
|
|
MP_DBG(in, "reading packet for %s\n", t);
|
|
|
|
in->eof = false; // force retry
|
2017-10-21 17:26:33 +00:00
|
|
|
while (ds->selected && !ds->reader_head) {
|
2017-01-10 10:54:34 +00:00
|
|
|
ds->active = true;
|
|
|
|
// Note: the following code marks EOF if it can't continue
|
|
|
|
if (in->threading) {
|
|
|
|
MP_VERBOSE(in, "waiting for demux thread (%s)\n", t);
|
|
|
|
pthread_cond_signal(&in->wakeup);
|
|
|
|
pthread_cond_wait(&in->wakeup, &in->lock);
|
|
|
|
} else {
|
|
|
|
read_packet(in);
|
|
|
|
}
|
|
|
|
if (ds->eof)
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2014-07-18 13:08:05 +00:00
|
|
|
pkt = dequeue_packet(ds);
|
2017-01-10 10:54:34 +00:00
|
|
|
pthread_cond_signal(&in->wakeup); // possibly read more
|
|
|
|
pthread_mutex_unlock(&in->lock);
|
2013-06-02 23:28:14 +00:00
|
|
|
}
|
2014-07-16 20:40:21 +00:00
|
|
|
return pkt;
|
2001-04-20 23:00:11 +00:00
|
|
|
}
|
|
|
|
|
2014-07-18 13:08:05 +00:00
|
|
|
// Poll the demuxer queue, and if there's a packet, return it. Otherwise, just
|
|
|
|
// make the demuxer thread read packets for this stream, and if there's at
|
|
|
|
// least one packet, call the wakeup callback.
|
2015-12-29 00:35:52 +00:00
|
|
|
// Unlike demux_read_packet(), this always enables readahead (except for
|
|
|
|
// interleaved subtitles).
|
2014-07-18 13:08:05 +00:00
|
|
|
// Returns:
|
|
|
|
// < 0: EOF was reached, *out_pkt=NULL
|
|
|
|
// == 0: no new packet yet, but maybe later, *out_pkt=NULL
|
|
|
|
// > 0: new packet read, *out_pkt is set
|
2015-12-29 00:35:52 +00:00
|
|
|
// Note: when reading interleaved subtitles, the demuxer won't try to forcibly
|
|
|
|
// read ahead to get the next subtitle packet (as the next packet could be
|
|
|
|
// minutes away). In this situation, this function will just return -1.
|
2014-07-18 13:08:05 +00:00
|
|
|
int demux_read_packet_async(struct sh_stream *sh, struct demux_packet **out_pkt)
|
|
|
|
{
|
|
|
|
struct demux_stream *ds = sh ? sh->ds : NULL;
|
|
|
|
int r = -1;
|
|
|
|
*out_pkt = NULL;
|
|
|
|
if (ds) {
|
|
|
|
if (ds->in->threading) {
|
|
|
|
pthread_mutex_lock(&ds->in->lock);
|
|
|
|
*out_pkt = dequeue_packet(ds);
|
2017-01-10 11:14:04 +00:00
|
|
|
if (use_lazy_packet_reading(ds)) {
|
2015-12-29 00:35:52 +00:00
|
|
|
r = *out_pkt ? 1 : -1;
|
|
|
|
} else {
|
|
|
|
r = *out_pkt ? 1 : ((ds->eof || !ds->selected) ? -1 : 0);
|
|
|
|
ds->active = ds->selected; // enable readahead
|
|
|
|
ds->in->eof = false; // force retry
|
|
|
|
pthread_cond_signal(&ds->in->wakeup); // possibly read more
|
|
|
|
}
|
2014-07-18 13:08:05 +00:00
|
|
|
pthread_mutex_unlock(&ds->in->lock);
|
|
|
|
} else {
|
|
|
|
*out_pkt = demux_read_packet(sh);
|
|
|
|
r = *out_pkt ? 1 : -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
2013-07-11 17:10:33 +00:00
|
|
|
// Return whether a packet is queued. Never blocks, never forces any reads.
|
|
|
|
bool demux_has_packet(struct sh_stream *sh)
|
2006-04-27 11:13:21 +00:00
|
|
|
{
|
2014-07-16 20:40:21 +00:00
|
|
|
bool has_packet = false;
|
|
|
|
if (sh) {
|
|
|
|
pthread_mutex_lock(&sh->ds->in->lock);
|
2017-10-21 17:26:33 +00:00
|
|
|
has_packet = sh->ds->reader_head;
|
2014-07-16 20:40:21 +00:00
|
|
|
pthread_mutex_unlock(&sh->ds->in->lock);
|
|
|
|
}
|
|
|
|
return has_packet;
|
2002-05-02 10:25:48 +00:00
|
|
|
}
|
|
|
|
|
Rewrite ordered chapters and timeline stuff
This uses a different method to piece segments together. The old
approach basically changes to a new file (with a new start offset) any
time a segment ends. This meant waiting for audio/video end on segment
end, and then changing to the new segment all at once. It had a very
weird impact on the playback core, and some things (like truly gapless
segment transitions, or frame backstepping) just didn't work.
The new approach adds the demux_timeline pseudo-demuxer, which presents
an uniform packet stream from the many segments. This is pretty similar
to how ordered chapters are implemented everywhere else. It also reminds
of the FFmpeg concat pseudo-demuxer.
The "pure" version of this approach doesn't work though. Segments can
actually have different codec configurations (different extradata), and
subtitles are most likely broken too. (Subtitles have multiple corner
cases which break the pure stream-concatenation approach completely.)
To counter this, we do two things:
- Reinit the decoder with each segment. We go as far as allowing
concatenating files with completely different codecs for the sake
of EDL (which also uses the timeline infrastructure). A "lighter"
approach would try to make use of decoder mechanism to update e.g.
the extradata, but that seems fragile.
- Clip decoded data to segment boundaries. This is equivalent to
normal playback core mechanisms like hr-seek, but now the playback
core doesn't need to care about these things.
These two mechanisms are equivalent to what happened in the old
implementation, except they don't happen in the playback core anymore.
In other words, the playback core is completely relieved from timeline
implementation details. (Which honestly is exactly what I'm trying to
do here. I don't think ordered chapter behavior deserves improvement,
even if it's bad - but I want to get it out from the playback core.)
There is code duplication between audio and video decoder common code.
This is awful and could be shareable - but this will happen later.
Note that the audio path has some code to clip audio frames for the
purpose of codec preroll/gapless handling, but it's not shared as
sharing it would cause more pain than it would help.
2016-02-15 20:04:07 +00:00
|
|
|
// Read and return any packet we find. NULL means EOF.
|
2014-07-05 14:57:56 +00:00
|
|
|
struct demux_packet *demux_read_any_packet(struct demuxer *demuxer)
|
|
|
|
{
|
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 demux_internal *in = demuxer->in;
|
|
|
|
assert(!in->threading); // doesn't work with threading
|
2014-07-19 10:34:07 +00:00
|
|
|
bool read_more = true;
|
|
|
|
while (read_more) {
|
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
|
|
|
for (int n = 0; n < in->num_streams; n++) {
|
|
|
|
struct sh_stream *sh = in->streams[n];
|
2014-07-19 10:19:12 +00:00
|
|
|
sh->ds->active = sh->ds->selected; // force read_packet() to read
|
|
|
|
struct demux_packet *pkt = dequeue_packet(sh->ds);
|
|
|
|
if (pkt)
|
|
|
|
return pkt;
|
2014-07-06 17:02:58 +00:00
|
|
|
}
|
|
|
|
// retry after calling this
|
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
|
|
|
pthread_mutex_lock(&in->lock); // lock only because read_packet unlocks
|
|
|
|
read_more = read_packet(in);
|
|
|
|
read_more &= !in->eof;
|
|
|
|
pthread_mutex_unlock(&in->lock);
|
2014-07-05 14:57:56 +00:00
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2013-12-21 19:24:20 +00:00
|
|
|
void demuxer_help(struct mp_log *log)
|
2005-08-05 19:57:47 +00:00
|
|
|
{
|
2008-04-12 15:51:08 +00:00
|
|
|
int i;
|
|
|
|
|
2013-12-21 19:24:20 +00:00
|
|
|
mp_info(log, "Available demuxers:\n");
|
|
|
|
mp_info(log, " demuxer: info:\n");
|
2008-04-12 15:51:08 +00:00
|
|
|
for (i = 0; demuxer_list[i]; i++) {
|
2013-12-21 19:24:20 +00:00
|
|
|
mp_info(log, "%10s %s\n",
|
|
|
|
demuxer_list[i]->name, demuxer_list[i]->desc);
|
2008-04-12 15:51:08 +00:00
|
|
|
}
|
2005-08-05 19:57:47 +00:00
|
|
|
}
|
2005-02-13 13:39:19 +00:00
|
|
|
|
2013-07-12 19:58:11 +00:00
|
|
|
static const char *d_level(enum demux_check level)
|
|
|
|
{
|
|
|
|
switch (level) {
|
|
|
|
case DEMUX_CHECK_FORCE: return "force";
|
|
|
|
case DEMUX_CHECK_UNSAFE: return "unsafe";
|
|
|
|
case DEMUX_CHECK_REQUEST:return "request";
|
|
|
|
case DEMUX_CHECK_NORMAL: return "normal";
|
2008-04-12 15:51:08 +00:00
|
|
|
}
|
2013-07-12 19:58:11 +00:00
|
|
|
abort();
|
2005-08-05 19:57:47 +00:00
|
|
|
}
|
2001-12-27 21:24:56 +00:00
|
|
|
|
2014-03-28 11:38:42 +00:00
|
|
|
static int decode_float(char *str, float *out)
|
|
|
|
{
|
|
|
|
char *rest;
|
|
|
|
float dec_val;
|
|
|
|
|
|
|
|
dec_val = strtod(str, &rest);
|
|
|
|
if (!rest || (rest == str) || !isfinite(dec_val))
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
*out = dec_val;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2016-08-12 19:39:32 +00:00
|
|
|
static int decode_gain(struct mp_log *log, struct mp_tags *tags,
|
|
|
|
const char *tag, float *out)
|
2014-03-28 11:38:42 +00:00
|
|
|
{
|
|
|
|
char *tag_val = NULL;
|
|
|
|
float dec_val;
|
|
|
|
|
2016-08-12 19:39:32 +00:00
|
|
|
tag_val = mp_tags_get_str(tags, tag);
|
2014-12-04 20:07:45 +00:00
|
|
|
if (!tag_val)
|
2014-03-28 11:38:42 +00:00
|
|
|
return -1;
|
|
|
|
|
2016-08-13 13:09:03 +00:00
|
|
|
if (decode_float(tag_val, &dec_val) < 0) {
|
2016-08-12 19:39:32 +00:00
|
|
|
mp_msg(log, MSGL_ERR, "Invalid replaygain value\n");
|
2014-03-28 11:38:42 +00:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
*out = dec_val;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2016-08-12 19:39:32 +00:00
|
|
|
static int decode_peak(struct mp_log *log, struct mp_tags *tags,
|
|
|
|
const char *tag, float *out)
|
2014-03-28 11:38:42 +00:00
|
|
|
{
|
|
|
|
char *tag_val = NULL;
|
|
|
|
float dec_val;
|
|
|
|
|
|
|
|
*out = 1.0;
|
|
|
|
|
2016-08-12 19:39:32 +00:00
|
|
|
tag_val = mp_tags_get_str(tags, tag);
|
2014-03-28 11:38:42 +00:00
|
|
|
if (!tag_val)
|
|
|
|
return 0;
|
|
|
|
|
2016-08-13 13:09:03 +00:00
|
|
|
if (decode_float(tag_val, &dec_val) < 0 || dec_val <= 0.0)
|
|
|
|
return -1;
|
2014-03-28 11:38:42 +00:00
|
|
|
|
|
|
|
*out = dec_val;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2016-08-12 19:39:32 +00:00
|
|
|
static struct replaygain_data *decode_rgain(struct mp_log *log,
|
|
|
|
struct mp_tags *tags)
|
2014-03-28 11:38:42 +00:00
|
|
|
{
|
2015-07-12 17:31:06 +00:00
|
|
|
struct replaygain_data rg = {0};
|
2014-03-28 11:38:42 +00:00
|
|
|
|
2016-08-13 13:09:03 +00:00
|
|
|
if (decode_gain(log, tags, "REPLAYGAIN_TRACK_GAIN", &rg.track_gain) >= 0 &&
|
|
|
|
decode_peak(log, tags, "REPLAYGAIN_TRACK_PEAK", &rg.track_peak) >= 0)
|
2014-03-28 11:38:42 +00:00
|
|
|
{
|
2016-08-13 13:09:03 +00:00
|
|
|
if (decode_gain(log, tags, "REPLAYGAIN_ALBUM_GAIN", &rg.album_gain) < 0 ||
|
|
|
|
decode_peak(log, tags, "REPLAYGAIN_ALBUM_PEAK", &rg.album_peak) < 0)
|
2016-08-13 13:06:45 +00:00
|
|
|
{
|
|
|
|
rg.album_gain = rg.track_gain;
|
|
|
|
rg.album_peak = rg.track_peak;
|
|
|
|
}
|
2016-08-12 19:39:32 +00:00
|
|
|
return talloc_memdup(NULL, &rg, sizeof(rg));
|
2014-03-28 11:38:42 +00:00
|
|
|
}
|
2015-07-12 17:33:34 +00:00
|
|
|
|
2016-08-13 13:09:03 +00:00
|
|
|
if (decode_gain(log, tags, "REPLAYGAIN_GAIN", &rg.track_gain) >= 0 &&
|
|
|
|
decode_peak(log, tags, "REPLAYGAIN_PEAK", &rg.track_peak) >= 0)
|
2015-07-12 17:33:34 +00:00
|
|
|
{
|
|
|
|
rg.album_gain = rg.track_gain;
|
|
|
|
rg.album_peak = rg.track_peak;
|
2016-08-12 19:39:32 +00:00
|
|
|
return talloc_memdup(NULL, &rg, sizeof(rg));
|
|
|
|
}
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void demux_update_replaygain(demuxer_t *demuxer)
|
|
|
|
{
|
|
|
|
struct demux_internal *in = demuxer->in;
|
|
|
|
for (int n = 0; n < in->num_streams; n++) {
|
|
|
|
struct sh_stream *sh = in->streams[n];
|
|
|
|
if (sh->type == STREAM_AUDIO && !sh->codec->replaygain_data) {
|
|
|
|
struct replaygain_data *rg = decode_rgain(demuxer->log, sh->tags);
|
|
|
|
if (!rg)
|
|
|
|
rg = decode_rgain(demuxer->log, demuxer->metadata);
|
2016-08-13 13:06:07 +00:00
|
|
|
if (rg)
|
2016-08-12 19:39:32 +00:00
|
|
|
sh->codec->replaygain_data = talloc_steal(in, rg);
|
|
|
|
}
|
2015-07-12 17:33:34 +00:00
|
|
|
}
|
2014-03-28 11:38:42 +00:00
|
|
|
}
|
|
|
|
|
2014-07-16 20:40:21 +00:00
|
|
|
// Copy all fields from src to dst, depending on event flags.
|
|
|
|
static void demux_copy(struct demuxer *dst, struct demuxer *src)
|
|
|
|
{
|
|
|
|
if (src->events & DEMUX_EVENT_INIT) {
|
2015-02-17 22:44:31 +00:00
|
|
|
// Note that we do as shallow copies as possible. We expect the data
|
2014-07-16 20:40:21 +00:00
|
|
|
// that is not-copied (only referenced) to be immutable.
|
|
|
|
// This implies e.g. that no chapters are added after initialization.
|
|
|
|
dst->chapters = src->chapters;
|
|
|
|
dst->num_chapters = src->num_chapters;
|
|
|
|
dst->editions = src->editions;
|
|
|
|
dst->num_editions = src->num_editions;
|
|
|
|
dst->edition = src->edition;
|
|
|
|
dst->attachments = src->attachments;
|
|
|
|
dst->num_attachments = src->num_attachments;
|
|
|
|
dst->matroska_data = src->matroska_data;
|
|
|
|
dst->playlist = src->playlist;
|
|
|
|
dst->seekable = src->seekable;
|
2015-01-26 12:46:33 +00:00
|
|
|
dst->partially_seekable = src->partially_seekable;
|
2014-07-16 20:40:21 +00:00
|
|
|
dst->filetype = src->filetype;
|
|
|
|
dst->ts_resets_possible = src->ts_resets_possible;
|
2015-02-18 20:10:43 +00:00
|
|
|
dst->fully_read = src->fully_read;
|
2014-07-16 20:40:21 +00:00
|
|
|
dst->start_time = src->start_time;
|
2017-06-20 11:57:58 +00:00
|
|
|
dst->duration = src->duration;
|
2016-08-26 10:31:09 +00:00
|
|
|
dst->is_network = src->is_network;
|
2015-02-17 22:47:54 +00:00
|
|
|
dst->priv = src->priv;
|
2014-07-16 20:40:21 +00:00
|
|
|
}
|
2016-08-12 19:39:32 +00:00
|
|
|
|
2014-07-16 20:40:21 +00:00
|
|
|
if (src->events & DEMUX_EVENT_METADATA) {
|
|
|
|
talloc_free(dst->metadata);
|
|
|
|
dst->metadata = mp_tags_dup(dst, src->metadata);
|
2016-08-12 19:39:32 +00:00
|
|
|
|
|
|
|
if (dst->num_update_stream_tags != src->num_update_stream_tags) {
|
2016-08-16 08:48:54 +00:00
|
|
|
dst->num_update_stream_tags = src->num_update_stream_tags;
|
2016-08-12 19:39:32 +00:00
|
|
|
talloc_free(dst->update_stream_tags);
|
|
|
|
dst->update_stream_tags =
|
|
|
|
talloc_zero_array(dst, struct mp_tags *, dst->num_update_stream_tags);
|
|
|
|
}
|
|
|
|
for (int n = 0; n < dst->num_update_stream_tags; n++) {
|
|
|
|
talloc_free(dst->update_stream_tags[n]);
|
|
|
|
dst->update_stream_tags[n] =
|
|
|
|
talloc_steal(dst->update_stream_tags, src->update_stream_tags[n]);
|
|
|
|
src->update_stream_tags[n] = NULL;
|
|
|
|
}
|
2014-07-16 20:40:21 +00:00
|
|
|
}
|
2016-08-12 19:39:32 +00:00
|
|
|
|
2014-07-16 20:40:21 +00:00
|
|
|
dst->events |= src->events;
|
|
|
|
src->events = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
// This is called by demuxer implementations if certain parameters change
|
|
|
|
// at runtime.
|
|
|
|
// events is one of DEMUX_EVENT_*
|
|
|
|
// The code will copy the fields references by the events to the user-thread.
|
|
|
|
void demux_changed(demuxer_t *demuxer, int events)
|
|
|
|
{
|
|
|
|
assert(demuxer == demuxer->in->d_thread); // call from demuxer impl. only
|
|
|
|
struct demux_internal *in = demuxer->in;
|
|
|
|
|
|
|
|
demuxer->events |= events;
|
|
|
|
|
|
|
|
update_cache(in);
|
|
|
|
|
2014-10-24 13:56:45 +00:00
|
|
|
pthread_mutex_lock(&in->lock);
|
|
|
|
|
2014-07-16 20:40:21 +00:00
|
|
|
if (demuxer->events & DEMUX_EVENT_INIT)
|
|
|
|
demuxer_sort_chapters(demuxer);
|
|
|
|
|
|
|
|
demux_copy(in->d_buffer, demuxer);
|
|
|
|
|
2014-12-04 20:09:17 +00:00
|
|
|
if (in->wakeup_cb)
|
|
|
|
in->wakeup_cb(in->wakeup_cb_ctx);
|
2014-07-16 20:40:21 +00:00
|
|
|
pthread_mutex_unlock(&in->lock);
|
|
|
|
}
|
|
|
|
|
|
|
|
// Called by the user thread (i.e. player) to update metadata and other things
|
|
|
|
// from the demuxer thread.
|
|
|
|
void demux_update(demuxer_t *demuxer)
|
|
|
|
{
|
|
|
|
assert(demuxer == demuxer->in->d_user);
|
|
|
|
struct demux_internal *in = demuxer->in;
|
|
|
|
|
2014-08-06 22:34:14 +00:00
|
|
|
if (!in->threading)
|
|
|
|
update_cache(in);
|
2014-10-24 13:56:45 +00:00
|
|
|
|
|
|
|
pthread_mutex_lock(&in->lock);
|
2014-07-16 20:40:21 +00:00
|
|
|
demux_copy(demuxer, in->d_buffer);
|
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
|
|
|
demuxer->events |= in->events;
|
|
|
|
in->events = 0;
|
2016-08-12 19:39:32 +00:00
|
|
|
if (demuxer->events & DEMUX_EVENT_METADATA) {
|
|
|
|
int num_streams = MPMIN(in->num_streams, demuxer->num_update_stream_tags);
|
|
|
|
for (int n = 0; n < num_streams; n++) {
|
|
|
|
struct mp_tags *tags = demuxer->update_stream_tags[n];
|
|
|
|
demuxer->update_stream_tags[n] = NULL;
|
|
|
|
if (tags) {
|
|
|
|
struct sh_stream *sh = in->streams[n];
|
|
|
|
talloc_free(sh->tags);
|
|
|
|
sh->tags = talloc_steal(sh, tags);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Often useful audio-only files, which have metadata in the audio track
|
|
|
|
// metadata instead of the main metadata (especially OGG).
|
|
|
|
if (in->num_streams == 1)
|
|
|
|
mp_tags_merge(demuxer->metadata, in->streams[0]->tags);
|
|
|
|
|
|
|
|
if (in->stream_metadata)
|
|
|
|
mp_tags_merge(demuxer->metadata, in->stream_metadata);
|
|
|
|
}
|
|
|
|
if (demuxer->events & (DEMUX_EVENT_METADATA | DEMUX_EVENT_STREAMS))
|
|
|
|
demux_update_replaygain(demuxer);
|
2014-07-16 20:40:21 +00:00
|
|
|
pthread_mutex_unlock(&in->lock);
|
|
|
|
}
|
|
|
|
|
2014-10-24 13:40:01 +00:00
|
|
|
static void demux_init_cache(struct demuxer *demuxer)
|
|
|
|
{
|
|
|
|
struct demux_internal *in = demuxer->in;
|
|
|
|
struct stream *stream = demuxer->stream;
|
|
|
|
|
|
|
|
char *base = NULL;
|
|
|
|
stream_control(stream, STREAM_CTRL_GET_BASE_FILENAME, &base);
|
|
|
|
in->stream_base_filename = talloc_steal(demuxer, base);
|
|
|
|
}
|
|
|
|
|
2015-05-19 19:36:52 +00:00
|
|
|
static void demux_init_cuesheet(struct demuxer *demuxer)
|
|
|
|
{
|
|
|
|
char *cue = mp_tags_get_str(demuxer->metadata, "cuesheet");
|
|
|
|
if (cue && !demuxer->num_chapters) {
|
|
|
|
struct cue_file *f = mp_parse_cue(bstr0(cue));
|
|
|
|
if (f) {
|
2015-12-17 09:40:31 +00:00
|
|
|
if (mp_check_embedded_cue(f) < 0) {
|
|
|
|
MP_WARN(demuxer, "Embedded cue sheet references more than one file. "
|
|
|
|
"Ignoring it.\n");
|
|
|
|
} else {
|
|
|
|
for (int n = 0; n < f->num_tracks; n++) {
|
|
|
|
struct cue_track *t = &f->tracks[n];
|
|
|
|
int idx = demuxer_add_chapter(demuxer, "", t->start, -1);
|
|
|
|
mp_tags_merge(demuxer->chapters[idx].metadata, t->tags);
|
|
|
|
}
|
2015-05-19 19:36:52 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
talloc_free(f);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-08-26 11:05:14 +00:00
|
|
|
static void demux_maybe_replace_stream(struct demuxer *demuxer)
|
|
|
|
{
|
|
|
|
struct demux_internal *in = demuxer->in;
|
|
|
|
assert(!in->threading && demuxer == in->d_user);
|
|
|
|
|
|
|
|
if (demuxer->fully_read) {
|
|
|
|
MP_VERBOSE(demuxer, "assuming demuxer read all data; closing stream\n");
|
|
|
|
free_stream(demuxer->stream);
|
|
|
|
demuxer->stream = open_memory_stream(NULL, 0); // dummy
|
|
|
|
in->d_thread->stream = demuxer->stream;
|
|
|
|
in->d_buffer->stream = demuxer->stream;
|
|
|
|
|
|
|
|
if (demuxer->desc->control)
|
|
|
|
demuxer->desc->control(in->d_thread, DEMUXER_CTRL_REPLACE_STREAM, NULL);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-12-21 19:24:20 +00:00
|
|
|
static struct demuxer *open_given_type(struct mpv_global *global,
|
|
|
|
struct mp_log *log,
|
2010-11-10 12:37:15 +00:00
|
|
|
const struct demuxer_desc *desc,
|
2013-07-12 19:58:11 +00:00
|
|
|
struct stream *stream,
|
|
|
|
struct demuxer_params *params,
|
|
|
|
enum demux_check check)
|
|
|
|
{
|
2015-10-06 16:18:18 +00:00
|
|
|
if (mp_cancel_test(stream->cancel))
|
|
|
|
return NULL;
|
|
|
|
|
2013-07-12 19:58:11 +00:00
|
|
|
struct demuxer *demuxer = talloc_ptrtype(NULL, demuxer);
|
2016-12-04 22:15:31 +00:00
|
|
|
struct demux_opts *opts = mp_get_config_group(demuxer, global, &demux_conf);
|
2013-07-12 19:58:11 +00:00
|
|
|
*demuxer = (struct demuxer) {
|
|
|
|
.desc = desc,
|
|
|
|
.stream = stream,
|
2014-05-24 12:04:09 +00:00
|
|
|
.seekable = stream->seekable,
|
2013-07-12 19:58:11 +00:00
|
|
|
.filepos = -1,
|
2013-12-21 19:24:20 +00:00
|
|
|
.global = global,
|
|
|
|
.log = mp_log_new(demuxer, log, desc->name),
|
2013-12-21 20:55:41 +00:00
|
|
|
.glog = log,
|
2013-07-12 19:58:11 +00:00
|
|
|
.filename = talloc_strdup(demuxer, stream->url),
|
2016-08-26 10:31:09 +00:00
|
|
|
.is_network = stream->is_network,
|
2016-12-04 22:15:31 +00:00
|
|
|
.access_references = opts->access_references,
|
2014-07-16 20:40:21 +00:00
|
|
|
.events = DEMUX_EVENT_ALL,
|
|
|
|
};
|
2014-07-18 14:16:05 +00:00
|
|
|
demuxer->seekable = stream->seekable;
|
2017-02-02 17:03:29 +00:00
|
|
|
if (demuxer->stream->underlying && !demuxer->stream->underlying->seekable)
|
2014-07-18 14:16:05 +00:00
|
|
|
demuxer->seekable = false;
|
|
|
|
|
2014-07-16 20:40:21 +00:00
|
|
|
struct demux_internal *in = demuxer->in = talloc_ptrtype(demuxer, in);
|
|
|
|
*in = (struct demux_internal){
|
|
|
|
.log = demuxer->log,
|
|
|
|
.d_thread = talloc(demuxer, struct demuxer),
|
|
|
|
.d_buffer = talloc(demuxer, struct demuxer),
|
|
|
|
.d_user = demuxer,
|
2016-09-06 18:09:56 +00:00
|
|
|
.min_secs = opts->min_secs,
|
|
|
|
.max_bytes = opts->max_bytes,
|
2017-10-21 17:26:33 +00:00
|
|
|
.max_bytes_bw = opts->max_bytes_bw,
|
|
|
|
.seekable_cache = opts->seekable_cache,
|
player: improve instant track switching
When switching tracks, we normally have the problem that data gets lost
due to readahead buffering. (Which in turn is because we're stubborn and
instruct the demuxers to discard data on unselected streams.) The
demuxer layer has a hack that re-reads discarded buffered data if a
stream is enabled mid-stream, so track switching will seem instant.
A somewhat similar problem is when all tracks of an external files were
disabled - when enabling the first track, we have to seek to the target
position.
Handle these with the same mechanism. Pass the "current time" to the
demuxer's stream switch function, and let the demuxer figure out what to
do. The demuxer will issue a refresh seek (if possible) to update the
new stream, or will issue a "normal" seek if there was no active stream
yet.
One case that changes is when a video/audio stream is enabled on an
external file with only a subtitle stream active, and the demuxer does
not support rrefresh seeks. This is a fuzzy case, because subtitles are
sparse, and the demuxer might have skipped large amounts of data. We
used to seek (and send the subtitle decoder some subtitle packets
twice). This case is sort of obscure and insane, and the fix would be
questionable, so we simply don't care.
Should mostly fix #3392.
2016-08-06 13:47:04 +00:00
|
|
|
.initial_state = true,
|
2013-07-12 19:58:11 +00:00
|
|
|
};
|
2014-07-16 20:40:21 +00:00
|
|
|
pthread_mutex_init(&in->lock, NULL);
|
|
|
|
pthread_cond_init(&in->wakeup, NULL);
|
|
|
|
|
|
|
|
*in->d_thread = *demuxer;
|
|
|
|
*in->d_buffer = *demuxer;
|
|
|
|
|
|
|
|
in->d_thread->metadata = talloc_zero(in->d_thread, struct mp_tags);
|
|
|
|
in->d_user->metadata = talloc_zero(in->d_user, struct mp_tags);
|
|
|
|
in->d_buffer->metadata = talloc_zero(in->d_buffer, struct mp_tags);
|
|
|
|
|
2016-02-11 19:54:44 +00:00
|
|
|
mp_dbg(log, "Trying demuxer: %s (force-level: %s)\n",
|
|
|
|
desc->name, d_level(check));
|
2013-07-12 19:58:11 +00:00
|
|
|
|
Rewrite ordered chapters and timeline stuff
This uses a different method to piece segments together. The old
approach basically changes to a new file (with a new start offset) any
time a segment ends. This meant waiting for audio/video end on segment
end, and then changing to the new segment all at once. It had a very
weird impact on the playback core, and some things (like truly gapless
segment transitions, or frame backstepping) just didn't work.
The new approach adds the demux_timeline pseudo-demuxer, which presents
an uniform packet stream from the many segments. This is pretty similar
to how ordered chapters are implemented everywhere else. It also reminds
of the FFmpeg concat pseudo-demuxer.
The "pure" version of this approach doesn't work though. Segments can
actually have different codec configurations (different extradata), and
subtitles are most likely broken too. (Subtitles have multiple corner
cases which break the pure stream-concatenation approach completely.)
To counter this, we do two things:
- Reinit the decoder with each segment. We go as far as allowing
concatenating files with completely different codecs for the sake
of EDL (which also uses the timeline infrastructure). A "lighter"
approach would try to make use of decoder mechanism to update e.g.
the extradata, but that seems fragile.
- Clip decoded data to segment boundaries. This is equivalent to
normal playback core mechanisms like hr-seek, but now the playback
core doesn't need to care about these things.
These two mechanisms are equivalent to what happened in the old
implementation, except they don't happen in the playback core anymore.
In other words, the playback core is completely relieved from timeline
implementation details. (Which honestly is exactly what I'm trying to
do here. I don't think ordered chapter behavior deserves improvement,
even if it's bad - but I want to get it out from the playback core.)
There is code duplication between audio and video decoder common code.
This is awful and could be shareable - but this will happen later.
Note that the audio path has some code to clip audio frames for the
purpose of codec preroll/gapless handling, but it's not shared as
sharing it would cause more pain than it would help.
2016-02-15 20:04:07 +00:00
|
|
|
// not for DVD/BD/DVB in particular
|
|
|
|
if (stream->seekable && (!params || !params->timeline))
|
2014-10-28 14:28:46 +00:00
|
|
|
stream_seek(stream, 0);
|
|
|
|
|
|
|
|
// Peek this much data to avoid that stream_read() run by some demuxers
|
2015-02-27 18:51:14 +00:00
|
|
|
// will flush previous peeked data.
|
2014-10-28 14:28:46 +00:00
|
|
|
stream_peek(stream, STREAM_BUFFER_SIZE);
|
|
|
|
|
2015-02-20 20:21:14 +00:00
|
|
|
in->d_thread->params = params; // temporary during open()
|
2014-07-16 20:40:21 +00:00
|
|
|
int ret = demuxer->desc->open(in->d_thread, check);
|
2013-07-12 19:58:11 +00:00
|
|
|
if (ret >= 0) {
|
2014-07-16 20:40:21 +00:00
|
|
|
in->d_thread->params = NULL;
|
|
|
|
if (in->d_thread->filetype)
|
2014-05-31 20:07:36 +00:00
|
|
|
mp_verbose(log, "Detected file format: %s (%s)\n",
|
2014-07-16 20:40:21 +00:00
|
|
|
in->d_thread->filetype, desc->desc);
|
2010-11-10 13:38:36 +00:00
|
|
|
else
|
2014-05-31 20:07:36 +00:00
|
|
|
mp_verbose(log, "Detected file format: %s\n", desc->desc);
|
2014-10-17 16:18:20 +00:00
|
|
|
if (!in->d_thread->seekable)
|
2014-12-05 22:55:48 +00:00
|
|
|
mp_verbose(log, "Stream is not seekable.\n");
|
2016-09-06 18:09:56 +00:00
|
|
|
if (!in->d_thread->seekable && opts->force_seekable) {
|
2015-07-08 20:04:35 +00:00
|
|
|
mp_warn(log, "Not seekable, but enabling seeking on user request.\n");
|
2014-07-16 20:40:21 +00:00
|
|
|
in->d_thread->seekable = true;
|
2015-01-26 12:46:33 +00:00
|
|
|
in->d_thread->partially_seekable = true;
|
2013-11-03 18:21:47 +00:00
|
|
|
}
|
2015-05-19 19:36:52 +00:00
|
|
|
demux_init_cuesheet(in->d_thread);
|
2014-10-24 13:40:01 +00:00
|
|
|
demux_init_cache(demuxer);
|
2014-07-16 20:40:21 +00:00
|
|
|
demux_changed(in->d_thread, DEMUX_EVENT_ALL);
|
|
|
|
demux_update(demuxer);
|
2017-01-19 07:00:19 +00:00
|
|
|
stream_control(demuxer->stream, STREAM_CTRL_SET_READAHEAD,
|
|
|
|
&(int){params ? params->initial_readahead : false});
|
2016-10-22 15:17:04 +00:00
|
|
|
if (!(params && params->disable_timeline)) {
|
|
|
|
struct timeline *tl = timeline_load(global, log, demuxer);
|
|
|
|
if (tl) {
|
|
|
|
struct demuxer_params params2 = {0};
|
|
|
|
params2.timeline = tl;
|
|
|
|
struct demuxer *sub =
|
|
|
|
open_given_type(global, log, &demuxer_desc_timeline, stream,
|
|
|
|
¶ms2, DEMUX_CHECK_FORCE);
|
2017-02-02 17:38:16 +00:00
|
|
|
if (sub) {
|
|
|
|
demuxer = sub;
|
|
|
|
} else {
|
|
|
|
timeline_destroy(tl);
|
|
|
|
}
|
2016-10-22 15:17:04 +00:00
|
|
|
}
|
Rewrite ordered chapters and timeline stuff
This uses a different method to piece segments together. The old
approach basically changes to a new file (with a new start offset) any
time a segment ends. This meant waiting for audio/video end on segment
end, and then changing to the new segment all at once. It had a very
weird impact on the playback core, and some things (like truly gapless
segment transitions, or frame backstepping) just didn't work.
The new approach adds the demux_timeline pseudo-demuxer, which presents
an uniform packet stream from the many segments. This is pretty similar
to how ordered chapters are implemented everywhere else. It also reminds
of the FFmpeg concat pseudo-demuxer.
The "pure" version of this approach doesn't work though. Segments can
actually have different codec configurations (different extradata), and
subtitles are most likely broken too. (Subtitles have multiple corner
cases which break the pure stream-concatenation approach completely.)
To counter this, we do two things:
- Reinit the decoder with each segment. We go as far as allowing
concatenating files with completely different codecs for the sake
of EDL (which also uses the timeline infrastructure). A "lighter"
approach would try to make use of decoder mechanism to update e.g.
the extradata, but that seems fragile.
- Clip decoded data to segment boundaries. This is equivalent to
normal playback core mechanisms like hr-seek, but now the playback
core doesn't need to care about these things.
These two mechanisms are equivalent to what happened in the old
implementation, except they don't happen in the playback core anymore.
In other words, the playback core is completely relieved from timeline
implementation details. (Which honestly is exactly what I'm trying to
do here. I don't think ordered chapter behavior deserves improvement,
even if it's bad - but I want to get it out from the playback core.)
There is code duplication between audio and video decoder common code.
This is awful and could be shareable - but this will happen later.
Note that the audio path has some code to clip audio frames for the
purpose of codec preroll/gapless handling, but it's not shared as
sharing it would cause more pain than it would help.
2016-02-15 20:04:07 +00:00
|
|
|
}
|
2017-02-02 17:38:16 +00:00
|
|
|
if (demuxer->is_network || stream->caching)
|
|
|
|
in->min_secs = MPMAX(in->min_secs, opts->min_secs_cache);
|
2010-11-10 12:37:15 +00:00
|
|
|
return demuxer;
|
|
|
|
}
|
2013-07-12 19:58:11 +00:00
|
|
|
|
2010-11-10 12:37:15 +00:00
|
|
|
free_demuxer(demuxer);
|
|
|
|
return NULL;
|
|
|
|
}
|
2008-04-12 15:51:08 +00:00
|
|
|
|
2013-07-12 19:58:11 +00:00
|
|
|
static const int d_normal[] = {DEMUX_CHECK_NORMAL, DEMUX_CHECK_UNSAFE, -1};
|
|
|
|
static const int d_request[] = {DEMUX_CHECK_REQUEST, -1};
|
|
|
|
static const int d_force[] = {DEMUX_CHECK_FORCE, -1};
|
|
|
|
|
2015-02-20 20:21:14 +00:00
|
|
|
// params can be NULL
|
|
|
|
struct demuxer *demux_open(struct stream *stream, struct demuxer_params *params,
|
2013-12-21 19:24:20 +00:00
|
|
|
struct mpv_global *global)
|
2010-11-10 12:37:15 +00:00
|
|
|
{
|
2013-07-12 19:58:11 +00:00
|
|
|
const int *check_levels = d_normal;
|
|
|
|
const struct demuxer_desc *check_desc = NULL;
|
2013-12-21 19:24:20 +00:00
|
|
|
struct mp_log *log = mp_log_new(NULL, global->log, "!demux");
|
|
|
|
struct demuxer *demuxer = NULL;
|
2015-02-20 20:21:14 +00:00
|
|
|
char *force_format = params ? params->force_format : NULL;
|
2013-07-12 19:58:11 +00:00
|
|
|
|
|
|
|
if (!force_format)
|
|
|
|
force_format = stream->demuxer;
|
2008-04-12 15:51:08 +00:00
|
|
|
|
2013-07-12 19:58:11 +00:00
|
|
|
if (force_format && force_format[0]) {
|
|
|
|
check_levels = d_request;
|
|
|
|
if (force_format[0] == '+') {
|
|
|
|
force_format += 1;
|
|
|
|
check_levels = d_force;
|
|
|
|
}
|
|
|
|
for (int n = 0; demuxer_list[n]; n++) {
|
|
|
|
if (strcmp(demuxer_list[n]->name, force_format) == 0)
|
|
|
|
check_desc = demuxer_list[n];
|
|
|
|
}
|
|
|
|
if (!check_desc) {
|
2013-12-21 19:24:20 +00:00
|
|
|
mp_err(log, "Demuxer %s does not exist.\n", force_format);
|
|
|
|
goto done;
|
2006-10-19 18:20:12 +00:00
|
|
|
}
|
|
|
|
}
|
2003-01-19 00:21:54 +00:00
|
|
|
|
2013-07-12 19:58:11 +00:00
|
|
|
// Test demuxers from first to last, one pass for each check_levels[] entry
|
|
|
|
for (int pass = 0; check_levels[pass] != -1; pass++) {
|
|
|
|
enum demux_check level = check_levels[pass];
|
2016-02-11 19:54:44 +00:00
|
|
|
mp_verbose(log, "Trying demuxers for level=%s.\n", d_level(level));
|
2013-07-12 19:58:11 +00:00
|
|
|
for (int n = 0; demuxer_list[n]; n++) {
|
|
|
|
const struct demuxer_desc *desc = demuxer_list[n];
|
|
|
|
if (!check_desc || desc == check_desc) {
|
2013-12-21 19:24:20 +00:00
|
|
|
demuxer = open_given_type(global, log, desc, stream, params, level);
|
2013-12-21 20:55:41 +00:00
|
|
|
if (demuxer) {
|
|
|
|
talloc_steal(demuxer, log);
|
|
|
|
log = NULL;
|
2013-12-21 19:24:20 +00:00
|
|
|
goto done;
|
2013-12-21 20:55:41 +00:00
|
|
|
}
|
2013-07-12 19:58:11 +00:00
|
|
|
}
|
2006-10-19 18:20:12 +00:00
|
|
|
}
|
|
|
|
}
|
2001-12-26 16:34:06 +00:00
|
|
|
|
2013-12-21 19:24:20 +00:00
|
|
|
done:
|
|
|
|
talloc_free(log);
|
|
|
|
return demuxer;
|
2001-07-21 22:37:55 +00:00
|
|
|
}
|
2001-08-12 17:28:16 +00:00
|
|
|
|
2015-02-20 20:56:55 +00:00
|
|
|
// Convenience function: open the stream, enable the cache (according to params
|
|
|
|
// and global opts.), open the demuxer.
|
|
|
|
// (use free_demuxer_and_stream() to free the underlying stream too)
|
2016-08-26 11:05:14 +00:00
|
|
|
// Also for some reason may close the opened stream if it's not needed.
|
2015-02-20 20:56:55 +00:00
|
|
|
struct demuxer *demux_open_url(const char *url,
|
|
|
|
struct demuxer_params *params,
|
|
|
|
struct mp_cancel *cancel,
|
|
|
|
struct mpv_global *global)
|
|
|
|
{
|
2015-08-03 23:01:09 +00:00
|
|
|
struct demuxer_params dummy = {0};
|
|
|
|
if (!params)
|
|
|
|
params = &dummy;
|
|
|
|
struct stream *s = stream_create(url, STREAM_READ | params->stream_flags,
|
|
|
|
cancel, global);
|
2015-02-20 20:56:55 +00:00
|
|
|
if (!s)
|
|
|
|
return NULL;
|
2015-08-03 23:01:09 +00:00
|
|
|
if (!params->disable_cache)
|
2016-09-06 18:09:56 +00:00
|
|
|
stream_enable_cache_defaults(&s);
|
2015-02-20 20:56:55 +00:00
|
|
|
struct demuxer *d = demux_open(s, params, global);
|
2016-08-26 11:05:14 +00:00
|
|
|
if (d) {
|
|
|
|
demux_maybe_replace_stream(d);
|
|
|
|
} else {
|
2015-08-03 23:01:09 +00:00
|
|
|
params->demuxer_failed = true;
|
2015-02-20 20:56:55 +00:00
|
|
|
free_stream(s);
|
2015-08-03 23:01:09 +00:00
|
|
|
}
|
2015-02-20 20:56:55 +00:00
|
|
|
return d;
|
|
|
|
}
|
|
|
|
|
2017-10-21 17:26:33 +00:00
|
|
|
// called locked, from user thread only
|
|
|
|
static void clear_reader_state(struct demux_internal *in)
|
2008-06-04 05:10:48 +00:00
|
|
|
{
|
2017-10-21 17:26:33 +00:00
|
|
|
for (int n = 0; n < in->num_streams; n++)
|
|
|
|
ds_clear_reader_state(in->streams[n]->ds);
|
|
|
|
in->warned_queue_overflow = false;
|
|
|
|
in->d_user->filepos = -1; // implicitly synchronized
|
2014-07-21 17:27:24 +00:00
|
|
|
}
|
|
|
|
|
2017-10-21 17:26:33 +00:00
|
|
|
static void clear_demux_state(struct demux_internal *in)
|
2017-10-13 22:16:32 +00:00
|
|
|
{
|
2017-10-21 17:26:33 +00:00
|
|
|
clear_reader_state(in);
|
|
|
|
for (int n = 0; n < in->num_streams; n++)
|
|
|
|
ds_clear_demux_state(in->streams[n]->ds);
|
|
|
|
in->eof = false;
|
|
|
|
in->last_eof = false;
|
|
|
|
in->idle = true;
|
2017-10-13 22:16:32 +00:00
|
|
|
}
|
|
|
|
|
2014-07-21 17:27:24 +00:00
|
|
|
// clear the packet queues
|
|
|
|
void demux_flush(demuxer_t *demuxer)
|
|
|
|
{
|
|
|
|
pthread_mutex_lock(&demuxer->in->lock);
|
2017-10-21 17:26:33 +00:00
|
|
|
clear_demux_state(demuxer->in);
|
2014-07-16 20:40:21 +00:00
|
|
|
pthread_mutex_unlock(&demuxer->in->lock);
|
2008-06-02 10:17:48 +00:00
|
|
|
}
|
|
|
|
|
2017-10-21 17:26:33 +00:00
|
|
|
static void recompute_buffers(struct demux_stream *ds)
|
2017-10-13 22:16:32 +00:00
|
|
|
{
|
2017-10-21 17:26:33 +00:00
|
|
|
ds->fw_packs = 0;
|
|
|
|
ds->fw_bytes = 0;
|
|
|
|
ds->bw_bytes = 0;
|
|
|
|
|
|
|
|
bool in_backbuffer = true;
|
|
|
|
for (struct demux_packet *dp = ds->queue_head; dp; dp = dp->next) {
|
|
|
|
if (dp == ds->reader_head)
|
|
|
|
in_backbuffer = false;
|
|
|
|
|
|
|
|
size_t bytes = demux_packet_estimate_total_size(dp);
|
|
|
|
if (in_backbuffer) {
|
|
|
|
ds->bw_bytes += bytes;
|
|
|
|
} else {
|
|
|
|
ds->fw_packs++;
|
|
|
|
ds->fw_bytes += bytes;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2017-10-13 22:16:32 +00:00
|
|
|
|
2017-10-21 17:26:33 +00:00
|
|
|
static struct demux_packet *find_seek_target(struct demux_stream *ds,
|
|
|
|
double pts, int flags)
|
|
|
|
{
|
|
|
|
struct demux_packet *target = NULL;
|
|
|
|
double target_diff = MP_NOPTS_VALUE;
|
|
|
|
for (struct demux_packet *dp = ds->queue_head; dp; dp = dp->next) {
|
|
|
|
if (!dp->keyframe)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
double range_pts = recompute_keyframe_target_pts(dp);
|
|
|
|
if (range_pts == MP_NOPTS_VALUE)
|
|
|
|
continue;
|
|
|
|
|
2017-10-23 17:05:39 +00:00
|
|
|
double diff = range_pts - pts;
|
|
|
|
if (flags & SEEK_FORWARD)
|
2017-10-21 17:26:33 +00:00
|
|
|
diff = -diff;
|
|
|
|
if (target_diff != MP_NOPTS_VALUE) {
|
|
|
|
if (diff <= 0) {
|
|
|
|
if (target_diff <= 0 && diff <= target_diff)
|
|
|
|
continue;
|
|
|
|
} else if (diff >= target_diff)
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
target_diff = diff;
|
|
|
|
target = dp;
|
|
|
|
}
|
|
|
|
|
|
|
|
return target;
|
|
|
|
}
|
|
|
|
|
|
|
|
// must be called locked
|
|
|
|
static bool try_seek_cache(struct demux_internal *in, double pts, int flags)
|
|
|
|
{
|
|
|
|
if ((flags & SEEK_FACTOR) || !in->seekable_cache)
|
2017-10-13 22:16:32 +00:00
|
|
|
return false;
|
|
|
|
|
2017-10-21 17:26:33 +00:00
|
|
|
// no idea how this could interact
|
|
|
|
if (in->seeking)
|
|
|
|
return false;
|
|
|
|
|
|
|
|
struct demux_ctrl_reader_state rstate;
|
2017-10-13 22:16:32 +00:00
|
|
|
if (cached_demux_control(in, DEMUXER_CTRL_GET_READER_STATE, &rstate) < 0)
|
|
|
|
return false;
|
|
|
|
|
2017-10-21 17:26:33 +00:00
|
|
|
double start = MP_ADD_PTS(rstate.ts_min, -in->ts_offset);
|
|
|
|
double end = MP_ADD_PTS(rstate.ts_max, -in->ts_offset);
|
2017-10-13 22:16:32 +00:00
|
|
|
|
2017-10-21 17:26:33 +00:00
|
|
|
MP_VERBOSE(in, "in-cache seek range = %f <-> %f (%f)\n", start, end, pts);
|
|
|
|
|
|
|
|
if (pts < start || pts > end)
|
2017-10-13 22:16:32 +00:00
|
|
|
return false;
|
|
|
|
|
|
|
|
MP_VERBOSE(in, "in-cache seek is possible..\n");
|
|
|
|
|
2017-10-21 17:26:33 +00:00
|
|
|
clear_reader_state(in);
|
|
|
|
|
|
|
|
// Adjust the seek target to the found video key frames. Otherwise the
|
|
|
|
// video will undershoot the seek target, while audio will be closer to it.
|
|
|
|
// The player frontend will play the additional video without audio, so
|
|
|
|
// you get silent audio for the amount of "undershoot". Adjusting the seek
|
|
|
|
// target will make the audio seek to the video target or before.
|
|
|
|
// (If hr-seeks are used, it's better to skip this, as it would only mean
|
|
|
|
// that more audio data than necessary would have to be decoded.)
|
|
|
|
if (!(flags & SEEK_HR)) {
|
|
|
|
for (int n = 0; n < in->num_streams; n++) {
|
|
|
|
struct demux_stream *ds = in->streams[n]->ds;
|
|
|
|
if (ds->selected && ds->type == STREAM_VIDEO) {
|
|
|
|
struct demux_packet *target = find_seek_target(ds, pts, flags);
|
|
|
|
if (target) {
|
|
|
|
double target_pts = recompute_keyframe_target_pts(target);
|
|
|
|
if (target_pts != MP_NOPTS_VALUE) {
|
|
|
|
MP_VERBOSE(in, "adjust seek target %f -> %f\n",
|
|
|
|
pts, target_pts);
|
|
|
|
// (We assume the find_seek_target() will return the
|
|
|
|
// same target for the video stream.)
|
|
|
|
pts = target_pts;
|
2017-10-23 17:05:39 +00:00
|
|
|
flags &= ~SEEK_FORWARD;
|
2017-10-21 17:26:33 +00:00
|
|
|
}
|
2017-10-13 22:16:32 +00:00
|
|
|
}
|
2017-10-21 17:26:33 +00:00
|
|
|
break;
|
2017-10-13 22:16:32 +00:00
|
|
|
}
|
|
|
|
}
|
2017-10-21 17:26:33 +00:00
|
|
|
}
|
2017-10-13 22:16:32 +00:00
|
|
|
|
2017-10-21 17:26:33 +00:00
|
|
|
for (int n = 0; n < in->num_streams; n++) {
|
|
|
|
struct demux_stream *ds = in->streams[n]->ds;
|
2017-10-13 22:16:32 +00:00
|
|
|
|
2017-10-21 17:26:33 +00:00
|
|
|
struct demux_packet *target = find_seek_target(ds, pts, flags);
|
|
|
|
ds->reader_head = target;
|
|
|
|
recompute_buffers(ds);
|
|
|
|
|
|
|
|
MP_VERBOSE(in, "seeking stream %d (%s) to ",
|
|
|
|
n, stream_type_name(ds->type));
|
2017-10-13 22:16:32 +00:00
|
|
|
|
2017-10-21 17:26:33 +00:00
|
|
|
if (target) {
|
|
|
|
MP_VERBOSE(in, "packet %f/%f\n", target->pts, target->dts);
|
|
|
|
} else {
|
|
|
|
MP_VERBOSE(in, "nothing\n");
|
|
|
|
}
|
2017-10-13 22:16:32 +00:00
|
|
|
}
|
|
|
|
|
2017-10-21 17:26:33 +00:00
|
|
|
return true;
|
2017-10-13 22:16:32 +00:00
|
|
|
}
|
|
|
|
|
2016-02-28 18:14:23 +00:00
|
|
|
int demux_seek(demuxer_t *demuxer, double seek_pts, int flags)
|
2008-04-12 15:51:08 +00:00
|
|
|
{
|
2014-07-21 17:27:24 +00:00
|
|
|
struct demux_internal *in = demuxer->in;
|
|
|
|
assert(demuxer == in->d_user);
|
|
|
|
|
2008-04-12 15:51:08 +00:00
|
|
|
if (!demuxer->seekable) {
|
2013-12-21 19:24:20 +00:00
|
|
|
MP_WARN(demuxer, "Cannot seek in this file.\n");
|
2008-04-12 15:51:08 +00:00
|
|
|
return 0;
|
|
|
|
}
|
2012-12-08 12:12:46 +00:00
|
|
|
|
2016-02-28 18:14:23 +00:00
|
|
|
if (seek_pts == MP_NOPTS_VALUE)
|
2012-12-08 12:12:46 +00:00
|
|
|
return 0;
|
|
|
|
|
2014-07-21 17:27:24 +00:00
|
|
|
pthread_mutex_lock(&in->lock);
|
2014-07-16 20:40:21 +00:00
|
|
|
|
2016-02-28 18:14:23 +00:00
|
|
|
MP_VERBOSE(in, "queuing seek to %f%s\n", seek_pts,
|
2015-06-18 20:31:55 +00:00
|
|
|
in->seeking ? " (cascade)" : "");
|
|
|
|
|
2017-10-21 17:26:33 +00:00
|
|
|
if (!(flags & SEEK_FACTOR))
|
|
|
|
seek_pts = MP_ADD_PTS(seek_pts, -in->ts_offset);
|
|
|
|
|
|
|
|
if (try_seek_cache(in, seek_pts, flags)) {
|
2017-10-13 22:16:32 +00:00
|
|
|
MP_VERBOSE(in, "in-cache seek worked!\n");
|
|
|
|
} else {
|
2017-10-21 17:26:33 +00:00
|
|
|
clear_demux_state(in);
|
|
|
|
|
2017-10-13 22:16:32 +00:00
|
|
|
in->seeking = true;
|
|
|
|
in->seek_flags = flags;
|
|
|
|
in->seek_pts = seek_pts;
|
|
|
|
|
|
|
|
if (!in->threading)
|
|
|
|
execute_seek(in);
|
|
|
|
}
|
2001-08-12 17:28:16 +00:00
|
|
|
|
2014-07-21 17:27:24 +00:00
|
|
|
pthread_cond_signal(&in->wakeup);
|
|
|
|
pthread_mutex_unlock(&in->lock);
|
2001-08-12 17:28:16 +00:00
|
|
|
|
2014-07-16 20:40:21 +00:00
|
|
|
return 1;
|
2001-11-21 16:14:14 +00:00
|
|
|
}
|
2002-02-20 16:59:25 +00:00
|
|
|
|
2012-08-19 16:01:30 +00:00
|
|
|
struct sh_stream *demuxer_stream_by_demuxer_id(struct demuxer *d,
|
|
|
|
enum stream_type t, int id)
|
2008-04-12 15:51:08 +00:00
|
|
|
{
|
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
|
|
|
int num = demux_get_num_stream(d);
|
|
|
|
for (int n = 0; n < num; n++) {
|
|
|
|
struct sh_stream *s = demux_get_stream(d, n);
|
2012-08-19 16:01:30 +00:00
|
|
|
if (s->type == t && s->demuxer_id == id)
|
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
|
|
|
return s;
|
2010-05-22 05:19:23 +00:00
|
|
|
}
|
2012-08-19 16:01:30 +00:00
|
|
|
return NULL;
|
2005-04-03 14:08:28 +00:00
|
|
|
}
|
2006-08-06 18:55:34 +00:00
|
|
|
|
player: improve instant track switching
When switching tracks, we normally have the problem that data gets lost
due to readahead buffering. (Which in turn is because we're stubborn and
instruct the demuxers to discard data on unselected streams.) The
demuxer layer has a hack that re-reads discarded buffered data if a
stream is enabled mid-stream, so track switching will seem instant.
A somewhat similar problem is when all tracks of an external files were
disabled - when enabling the first track, we have to seek to the target
position.
Handle these with the same mechanism. Pass the "current time" to the
demuxer's stream switch function, and let the demuxer figure out what to
do. The demuxer will issue a refresh seek (if possible) to update the
new stream, or will issue a "normal" seek if there was no active stream
yet.
One case that changes is when a video/audio stream is enabled on an
external file with only a subtitle stream active, and the demuxer does
not support rrefresh seeks. This is a fuzzy case, because subtitles are
sparse, and the demuxer might have skipped large amounts of data. We
used to seek (and send the subtitle decoder some subtitle packets
twice). This case is sort of obscure and insane, and the fix would be
questionable, so we simply don't care.
Should mostly fix #3392.
2016-08-06 13:47:04 +00:00
|
|
|
// Set whether the given stream should return packets.
|
|
|
|
// ref_pts is used only if the stream is enabled. Then it serves as approximate
|
|
|
|
// start pts for this stream (in the worst case it is ignored).
|
2013-07-11 17:22:24 +00:00
|
|
|
void demuxer_select_track(struct demuxer *demuxer, struct sh_stream *stream,
|
player: improve instant track switching
When switching tracks, we normally have the problem that data gets lost
due to readahead buffering. (Which in turn is because we're stubborn and
instruct the demuxers to discard data on unselected streams.) The
demuxer layer has a hack that re-reads discarded buffered data if a
stream is enabled mid-stream, so track switching will seem instant.
A somewhat similar problem is when all tracks of an external files were
disabled - when enabling the first track, we have to seek to the target
position.
Handle these with the same mechanism. Pass the "current time" to the
demuxer's stream switch function, and let the demuxer figure out what to
do. The demuxer will issue a refresh seek (if possible) to update the
new stream, or will issue a "normal" seek if there was no active stream
yet.
One case that changes is when a video/audio stream is enabled on an
external file with only a subtitle stream active, and the demuxer does
not support rrefresh seeks. This is a fuzzy case, because subtitles are
sparse, and the demuxer might have skipped large amounts of data. We
used to seek (and send the subtitle decoder some subtitle packets
twice). This case is sort of obscure and insane, and the fix would be
questionable, so we simply don't care.
Should mostly fix #3392.
2016-08-06 13:47:04 +00:00
|
|
|
double ref_pts, bool selected)
|
2013-07-11 17:22:24 +00:00
|
|
|
{
|
demux: hack for instant stream switching
This removes the delay when switching audio tracks in mkv or mp4 files.
Other formats are not enabled, because it's not clear whether the
demuxers fulfill the requirements listed in demux.h. (Many formats
definitely do not with libavformat.)
Background:
The demuxer packet cache buffers a certain amount of packets. This
includes only packets from selected streams. We discard packets from
other streams for various reasons. This introduces a problem: switching
to a different audio track introduces a delay. The delay is as big as
the demuxer packet cache buffer, because while the file was read ahead
to fill the packet buffer, the process of reading packets also discarded
all packets from the previously not selected audio stream. Once the
remaining packet buffer has been played, new audio packets are available
and you hear audio again.
We could probably just not discard packets from unselected streams. But
this would require additional memory and CPU resources, and also it's
hard to tell when packets from unused streams should be discarded (we
don't want to keep them forever; it'd be a memory leak).
We could also issue a player hr-seek to the current playback position,
which would solve the problem in 1 line of code or so. But this can be
rather slow.
So what we do in this commit instead is: we just seek back to the
position where our current packet buffer starts, and start demuxing from
this position again. This way we can get the "past" packets for the
newly selected stream. For streams which were already selected the
packets are simply discarded until the previous position is reached
again.
That latter part is the hard part. We really want to skip packets
exactly until the position where we left off previously, or we will skip
packets or feed packets to the decoder twice. If we assume that the
demuxer is deterministic (returns exactly the same packets after a seek
to a previous position), then we can try to check whether it's the same
packet as the one at the end of the packet buffer. If it is, we know
that the packet after it is where we left off last time.
Unfortunately, this is not very robust, and maybe it can't be made
robust. Currently we use the demux_packet.pos field as unique packet
ID - which works fine in some scenarios, but will break in arbitrary
ways if the basic requirement to the demuxer (as listed in the demux.h
additions) are broken. Thus, this is enabled only for the internal mkv
demuxer and the libavformat mp4 demuxer.
(libavformat mkv does not work, because the packet positions are not
unique. Probably could be fixed upstream, but it's not clear whether
it's a bug or a feature.)
2015-02-13 20:17:17 +00:00
|
|
|
struct demux_internal *in = demuxer->in;
|
|
|
|
pthread_mutex_lock(&in->lock);
|
|
|
|
// don't flush buffers if stream is already selected / unselected
|
2013-07-11 17:22:24 +00:00
|
|
|
if (stream->ds->selected != selected) {
|
|
|
|
stream->ds->selected = selected;
|
2017-10-21 17:26:33 +00:00
|
|
|
ds_clear_demux_state(stream->ds);
|
2016-01-18 17:21:29 +00:00
|
|
|
in->tracks_switched = true;
|
player: improve instant track switching
When switching tracks, we normally have the problem that data gets lost
due to readahead buffering. (Which in turn is because we're stubborn and
instruct the demuxers to discard data on unselected streams.) The
demuxer layer has a hack that re-reads discarded buffered data if a
stream is enabled mid-stream, so track switching will seem instant.
A somewhat similar problem is when all tracks of an external files were
disabled - when enabling the first track, we have to seek to the target
position.
Handle these with the same mechanism. Pass the "current time" to the
demuxer's stream switch function, and let the demuxer figure out what to
do. The demuxer will issue a refresh seek (if possible) to update the
new stream, or will issue a "normal" seek if there was no active stream
yet.
One case that changes is when a video/audio stream is enabled on an
external file with only a subtitle stream active, and the demuxer does
not support rrefresh seeks. This is a fuzzy case, because subtitles are
sparse, and the demuxer might have skipped large amounts of data. We
used to seek (and send the subtitle decoder some subtitle packets
twice). This case is sort of obscure and insane, and the fix would be
questionable, so we simply don't care.
Should mostly fix #3392.
2016-08-06 13:47:04 +00:00
|
|
|
stream->ds->need_refresh = selected && !in->initial_state;
|
|
|
|
if (stream->ds->need_refresh)
|
|
|
|
in->ref_pts = MP_ADD_PTS(ref_pts, -in->ts_offset);
|
2016-01-18 17:21:29 +00:00
|
|
|
if (in->threading) {
|
|
|
|
pthread_cond_signal(&in->wakeup);
|
|
|
|
} else {
|
|
|
|
execute_trackswitch(in);
|
|
|
|
}
|
2013-07-11 17:20:25 +00:00
|
|
|
}
|
demux: hack for instant stream switching
This removes the delay when switching audio tracks in mkv or mp4 files.
Other formats are not enabled, because it's not clear whether the
demuxers fulfill the requirements listed in demux.h. (Many formats
definitely do not with libavformat.)
Background:
The demuxer packet cache buffers a certain amount of packets. This
includes only packets from selected streams. We discard packets from
other streams for various reasons. This introduces a problem: switching
to a different audio track introduces a delay. The delay is as big as
the demuxer packet cache buffer, because while the file was read ahead
to fill the packet buffer, the process of reading packets also discarded
all packets from the previously not selected audio stream. Once the
remaining packet buffer has been played, new audio packets are available
and you hear audio again.
We could probably just not discard packets from unselected streams. But
this would require additional memory and CPU resources, and also it's
hard to tell when packets from unused streams should be discarded (we
don't want to keep them forever; it'd be a memory leak).
We could also issue a player hr-seek to the current playback position,
which would solve the problem in 1 line of code or so. But this can be
rather slow.
So what we do in this commit instead is: we just seek back to the
position where our current packet buffer starts, and start demuxing from
this position again. This way we can get the "past" packets for the
newly selected stream. For streams which were already selected the
packets are simply discarded until the previous position is reached
again.
That latter part is the hard part. We really want to skip packets
exactly until the position where we left off previously, or we will skip
packets or feed packets to the decoder twice. If we assume that the
demuxer is deterministic (returns exactly the same packets after a seek
to a previous position), then we can try to check whether it's the same
packet as the one at the end of the packet buffer. If it is, we know
that the packet after it is where we left off last time.
Unfortunately, this is not very robust, and maybe it can't be made
robust. Currently we use the demux_packet.pos field as unique packet
ID - which works fine in some scenarios, but will break in arbitrary
ways if the basic requirement to the demuxer (as listed in the demux.h
additions) are broken. Thus, this is enabled only for the internal mkv
demuxer and the libavformat mp4 demuxer.
(libavformat mkv does not work, because the packet positions are not
unique. Probably could be fixed upstream, but it's not clear whether
it's a bug or a feature.)
2015-02-13 20:17:17 +00:00
|
|
|
pthread_mutex_unlock(&in->lock);
|
2014-07-16 20:40:21 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void demux_set_stream_autoselect(struct demuxer *demuxer, bool autoselect)
|
|
|
|
{
|
|
|
|
assert(!demuxer->in->threading); // laziness
|
|
|
|
demuxer->in->autoselect = autoselect;
|
2006-11-16 21:23:06 +00:00
|
|
|
}
|
|
|
|
|
2017-10-21 17:26:33 +00:00
|
|
|
// This is for demuxer implementations only. demuxer_select_track() sets the
|
|
|
|
// logical state, while this function returns the actual state (in case the
|
|
|
|
// demuxer attempts to cache even unselected packets for track switching - this
|
|
|
|
// will potentially be done in the future).
|
2014-07-06 17:02:21 +00:00
|
|
|
bool demux_stream_is_selected(struct sh_stream *stream)
|
2013-04-14 17:19:35 +00:00
|
|
|
{
|
2014-07-16 20:40:21 +00:00
|
|
|
if (!stream)
|
|
|
|
return false;
|
|
|
|
bool r = false;
|
|
|
|
pthread_mutex_lock(&stream->ds->in->lock);
|
|
|
|
r = stream->ds->selected;
|
|
|
|
pthread_mutex_unlock(&stream->ds->in->lock);
|
|
|
|
return r;
|
2013-04-14 17:19:35 +00:00
|
|
|
}
|
|
|
|
|
2015-06-24 12:18:51 +00:00
|
|
|
int demuxer_add_attachment(demuxer_t *demuxer, char *name, char *type,
|
|
|
|
void *data, size_t data_size)
|
2008-04-12 15:51:08 +00:00
|
|
|
{
|
2010-01-26 01:31:31 +00:00
|
|
|
if (!(demuxer->num_attachments % 32))
|
|
|
|
demuxer->attachments = talloc_realloc(demuxer, demuxer->attachments,
|
|
|
|
struct demux_attachment,
|
|
|
|
demuxer->num_attachments + 32);
|
|
|
|
|
2015-06-24 12:18:51 +00:00
|
|
|
struct demux_attachment *att = &demuxer->attachments[demuxer->num_attachments];
|
|
|
|
att->name = talloc_strdup(demuxer->attachments, name);
|
|
|
|
att->type = talloc_strdup(demuxer->attachments, type);
|
|
|
|
att->data = talloc_memdup(demuxer->attachments, data, data_size);
|
|
|
|
att->data_size = data_size;
|
2008-01-12 01:12:36 +00:00
|
|
|
|
2008-04-12 15:51:08 +00:00
|
|
|
return demuxer->num_attachments++;
|
2008-01-12 01:12:36 +00:00
|
|
|
}
|
|
|
|
|
2012-02-26 20:12:53 +00:00
|
|
|
static int chapter_compare(const void *p1, const void *p2)
|
|
|
|
{
|
|
|
|
struct demux_chapter *c1 = (void *)p1;
|
|
|
|
struct demux_chapter *c2 = (void *)p2;
|
|
|
|
|
2014-11-02 16:20:04 +00:00
|
|
|
if (c1->pts > c2->pts)
|
2012-02-26 20:12:53 +00:00
|
|
|
return 1;
|
2014-11-02 16:20:04 +00:00
|
|
|
else if (c1->pts < c2->pts)
|
2012-02-26 20:12:53 +00:00
|
|
|
return -1;
|
2013-04-12 11:20:37 +00:00
|
|
|
return c1->original_index > c2->original_index ? 1 :-1; // never equal
|
2012-02-26 20:12:53 +00:00
|
|
|
}
|
|
|
|
|
2014-07-16 20:40:21 +00:00
|
|
|
static void demuxer_sort_chapters(demuxer_t *demuxer)
|
2012-02-26 20:12:53 +00:00
|
|
|
{
|
|
|
|
qsort(demuxer->chapters, demuxer->num_chapters,
|
|
|
|
sizeof(struct demux_chapter), chapter_compare);
|
|
|
|
}
|
|
|
|
|
2015-06-24 12:18:51 +00:00
|
|
|
int demuxer_add_chapter(demuxer_t *demuxer, char *name,
|
2014-11-02 16:20:04 +00:00
|
|
|
double pts, uint64_t demuxer_id)
|
2008-04-12 15:51:08 +00:00
|
|
|
{
|
2013-04-12 11:38:20 +00:00
|
|
|
struct demux_chapter new = {
|
|
|
|
.original_index = demuxer->num_chapters,
|
2014-11-02 16:20:04 +00:00
|
|
|
.pts = pts,
|
2013-09-08 05:42:05 +00:00
|
|
|
.metadata = talloc_zero(demuxer, struct mp_tags),
|
|
|
|
.demuxer_id = demuxer_id,
|
2013-04-12 11:38:20 +00:00
|
|
|
};
|
2015-06-24 12:18:51 +00:00
|
|
|
mp_tags_set_str(new.metadata, "TITLE", name);
|
2013-04-12 11:38:20 +00:00
|
|
|
MP_TARRAY_APPEND(demuxer, demuxer->chapters, demuxer->num_chapters, new);
|
2014-02-06 12:43:01 +00:00
|
|
|
return demuxer->num_chapters - 1;
|
2013-09-08 05:42:05 +00:00
|
|
|
}
|
|
|
|
|
2014-10-24 13:56:45 +00:00
|
|
|
// must be called not locked
|
2014-07-16 20:40:21 +00:00
|
|
|
static void update_cache(struct demux_internal *in)
|
|
|
|
{
|
|
|
|
struct demuxer *demuxer = in->d_thread;
|
|
|
|
struct stream *stream = demuxer->stream;
|
|
|
|
|
2014-10-24 13:56:45 +00:00
|
|
|
// Don't lock while querying the stream.
|
|
|
|
struct mp_tags *stream_metadata = NULL;
|
2016-03-29 09:29:52 +00:00
|
|
|
struct stream_cache_info stream_cache_info = {.size = -1};
|
2014-10-24 13:56:45 +00:00
|
|
|
|
2015-08-17 22:10:54 +00:00
|
|
|
int64_t stream_size = stream_get_size(stream);
|
2014-10-24 13:56:45 +00:00
|
|
|
stream_control(stream, STREAM_CTRL_GET_METADATA, &stream_metadata);
|
2016-03-29 09:29:52 +00:00
|
|
|
stream_control(stream, STREAM_CTRL_GET_CACHE_INFO, &stream_cache_info);
|
2014-10-24 13:56:45 +00:00
|
|
|
|
|
|
|
pthread_mutex_lock(&in->lock);
|
|
|
|
in->stream_size = stream_size;
|
2016-03-29 09:29:52 +00:00
|
|
|
in->stream_cache_info = stream_cache_info;
|
2014-10-24 13:56:45 +00:00
|
|
|
if (stream_metadata) {
|
2014-07-16 20:40:21 +00:00
|
|
|
talloc_free(in->stream_metadata);
|
2014-10-24 13:56:45 +00:00
|
|
|
in->stream_metadata = talloc_steal(in, stream_metadata);
|
2014-07-16 20:40:21 +00:00
|
|
|
in->d_buffer->events |= DEMUX_EVENT_METADATA;
|
|
|
|
}
|
2014-10-24 13:56:45 +00:00
|
|
|
pthread_mutex_unlock(&in->lock);
|
2014-07-16 20:40:21 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// must be called locked
|
|
|
|
static int cached_stream_control(struct demux_internal *in, int cmd, void *arg)
|
|
|
|
{
|
2014-08-26 22:20:38 +00:00
|
|
|
// If the cache is active, wake up the thread to possibly update cache state.
|
2016-03-29 09:29:52 +00:00
|
|
|
if (in->stream_cache_info.size >= 0) {
|
2014-11-12 20:47:41 +00:00
|
|
|
in->force_cache_update = true;
|
2014-08-26 22:20:38 +00:00
|
|
|
pthread_cond_signal(&in->wakeup);
|
2014-11-12 20:47:41 +00:00
|
|
|
}
|
2014-08-26 22:20:38 +00:00
|
|
|
|
2014-07-16 20:40:21 +00:00
|
|
|
switch (cmd) {
|
2016-03-29 09:29:52 +00:00
|
|
|
case STREAM_CTRL_GET_CACHE_INFO:
|
|
|
|
if (in->stream_cache_info.size < 0)
|
2014-07-16 20:40:21 +00:00
|
|
|
return STREAM_UNSUPPORTED;
|
2016-03-29 09:29:52 +00:00
|
|
|
*(struct stream_cache_info *)arg = in->stream_cache_info;
|
2014-07-16 20:40:21 +00:00
|
|
|
return STREAM_OK;
|
|
|
|
case STREAM_CTRL_GET_SIZE:
|
|
|
|
if (in->stream_size < 0)
|
|
|
|
return STREAM_UNSUPPORTED;
|
|
|
|
*(int64_t *)arg = in->stream_size;
|
|
|
|
return STREAM_OK;
|
2014-10-24 13:40:01 +00:00
|
|
|
case STREAM_CTRL_GET_BASE_FILENAME:
|
|
|
|
if (!in->stream_base_filename)
|
|
|
|
return STREAM_UNSUPPORTED;
|
|
|
|
*(char **)arg = talloc_strdup(NULL, in->stream_base_filename);
|
|
|
|
return STREAM_OK;
|
2014-07-16 20:40:21 +00:00
|
|
|
}
|
|
|
|
return STREAM_ERROR;
|
|
|
|
}
|
|
|
|
|
|
|
|
// must be called locked
|
|
|
|
static int cached_demux_control(struct demux_internal *in, int cmd, void *arg)
|
|
|
|
{
|
|
|
|
switch (cmd) {
|
|
|
|
case DEMUXER_CTRL_STREAM_CTRL: {
|
|
|
|
struct demux_ctrl_stream_ctrl *c = arg;
|
|
|
|
int r = cached_stream_control(in, c->ctrl, c->arg);
|
|
|
|
if (r == STREAM_ERROR)
|
|
|
|
break;
|
|
|
|
c->res = r;
|
2017-06-19 15:54:02 +00:00
|
|
|
return CONTROL_OK;
|
2014-07-16 20:40:21 +00:00
|
|
|
}
|
2014-12-12 00:00:58 +00:00
|
|
|
case DEMUXER_CTRL_GET_BITRATE_STATS: {
|
|
|
|
double *rates = arg;
|
|
|
|
for (int n = 0; n < STREAM_TYPE_COUNT; n++)
|
2015-10-23 12:53:19 +00:00
|
|
|
rates[n] = -1;
|
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
|
|
|
for (int n = 0; n < in->num_streams; n++) {
|
|
|
|
struct demux_stream *ds = in->streams[n]->ds;
|
2015-10-23 12:53:19 +00:00
|
|
|
if (ds->selected && ds->bitrate >= 0)
|
|
|
|
rates[ds->type] = MPMAX(0, rates[ds->type]) + ds->bitrate;
|
2014-12-12 00:00:58 +00:00
|
|
|
}
|
2017-06-19 15:54:02 +00:00
|
|
|
return CONTROL_OK;
|
2014-12-12 00:00:58 +00:00
|
|
|
}
|
player: redo how stream caching and pausing on low cache works
Add the --cache-secs option, which literally overrides the value of
--demuxer-readahead-secs if the stream cache is active. The default
value is very high (10 seconds), which means it can act as network
cache.
Remove the old behavior of trying to pause once the byte cache runs
low. Instead, do something similar wit the demuxer cache. The nice
thing is that we can guess how many seconds of video it has cached,
and we can make better decisions. But for now, apply a relatively
naive heuristic: if the cache is below 0.5 secs, pause, and wait
until at least 2 secs are available.
Note that due to timestamp reordering, the estimated cached duration
of video might be inaccurate, depending on the file format. If the
file format has DTS, it's easy, otherwise the duration will seemingly
jump back and forth.
2014-08-26 23:13:20 +00:00
|
|
|
case DEMUXER_CTRL_GET_READER_STATE: {
|
|
|
|
struct demux_ctrl_reader_state *r = arg;
|
|
|
|
*r = (struct demux_ctrl_reader_state){
|
|
|
|
.eof = in->last_eof,
|
2017-10-21 19:13:53 +00:00
|
|
|
.seekable = in->seekable_cache,
|
2017-10-21 17:26:33 +00:00
|
|
|
.ts_start = MP_NOPTS_VALUE,
|
|
|
|
.ts_min = MP_NOPTS_VALUE,
|
|
|
|
.ts_max = MP_NOPTS_VALUE,
|
|
|
|
.ts_reader = MP_NOPTS_VALUE,
|
2014-08-27 20:42:28 +00:00
|
|
|
.ts_duration = -1,
|
player: redo how stream caching and pausing on low cache works
Add the --cache-secs option, which literally overrides the value of
--demuxer-readahead-secs if the stream cache is active. The default
value is very high (10 seconds), which means it can act as network
cache.
Remove the old behavior of trying to pause once the byte cache runs
low. Instead, do something similar wit the demuxer cache. The nice
thing is that we can guess how many seconds of video it has cached,
and we can make better decisions. But for now, apply a relatively
naive heuristic: if the cache is below 0.5 secs, pause, and wait
until at least 2 secs are available.
Note that due to timestamp reordering, the estimated cached duration
of video might be inaccurate, depending on the file format. If the
file format has DTS, it's easy, otherwise the duration will seemingly
jump back and forth.
2014-08-26 23:13:20 +00:00
|
|
|
};
|
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
|
|
|
for (int n = 0; n < in->num_streams; n++) {
|
|
|
|
struct demux_stream *ds = in->streams[n]->ds;
|
2017-10-21 17:26:33 +00:00
|
|
|
if (ds->active && !(!ds->queue_head && ds->eof) && !ds->ignore_eof)
|
|
|
|
{
|
|
|
|
r->underrun |= !ds->reader_head && !ds->eof;
|
|
|
|
r->ts_reader = MP_PTS_MAX(r->ts_reader, ds->base_ts);
|
|
|
|
// (yes, this is asymmetric, and uses MAX in both cases - it's ok
|
|
|
|
// if it's a bit off for ts_max, as the demuxer can just wait for
|
|
|
|
// new packets if we seek there and also last_ts is the hightest
|
|
|
|
// DTS or PTS, while ts_min should be as accurate as possible, as
|
|
|
|
// we would have to trigger a real seek if it's off and we seeked
|
2017-10-23 17:05:39 +00:00
|
|
|
// there)
|
2017-10-21 17:26:33 +00:00
|
|
|
r->ts_min = MP_PTS_MAX(r->ts_min, ds->back_pts);
|
2017-10-23 17:36:20 +00:00
|
|
|
r->ts_max = MP_PTS_MAX(r->ts_max, ds->last_ts);
|
2017-10-21 17:26:33 +00:00
|
|
|
if (ds->queue_head) {
|
|
|
|
double ts = PTS_OR_DEF(ds->queue_head->dts,
|
|
|
|
ds->queue_head->pts);
|
|
|
|
r->ts_start = MP_PTS_MIN(r->ts_start, ts);
|
|
|
|
}
|
player: redo how stream caching and pausing on low cache works
Add the --cache-secs option, which literally overrides the value of
--demuxer-readahead-secs if the stream cache is active. The default
value is very high (10 seconds), which means it can act as network
cache.
Remove the old behavior of trying to pause once the byte cache runs
low. Instead, do something similar wit the demuxer cache. The nice
thing is that we can guess how many seconds of video it has cached,
and we can make better decisions. But for now, apply a relatively
naive heuristic: if the cache is below 0.5 secs, pause, and wait
until at least 2 secs are available.
Note that due to timestamp reordering, the estimated cached duration
of video might be inaccurate, depending on the file format. If the
file format has DTS, it's easy, otherwise the duration will seemingly
jump back and forth.
2014-08-26 23:13:20 +00:00
|
|
|
}
|
|
|
|
}
|
2014-08-27 20:42:45 +00:00
|
|
|
r->idle = (in->idle && !r->underrun) || r->eof;
|
2014-08-27 20:51:06 +00:00
|
|
|
r->underrun &= !r->idle;
|
2017-10-21 17:26:33 +00:00
|
|
|
r->ts_start = MP_ADD_PTS(r->ts_start, in->ts_offset);
|
|
|
|
r->ts_min = MP_ADD_PTS(r->ts_min, in->ts_offset);
|
|
|
|
r->ts_max = MP_ADD_PTS(r->ts_max, in->ts_offset);
|
|
|
|
if (r->ts_reader != MP_NOPTS_VALUE && r->ts_reader <= r->ts_max)
|
|
|
|
r->ts_duration = r->ts_max - r->ts_reader;
|
2017-10-23 17:36:20 +00:00
|
|
|
if (in->seeking) {
|
|
|
|
r->ts_max = r->ts_min = MP_NOPTS_VALUE;
|
|
|
|
r->ts_duration = 0;
|
|
|
|
}
|
2017-06-19 15:54:02 +00:00
|
|
|
return CONTROL_OK;
|
player: redo how stream caching and pausing on low cache works
Add the --cache-secs option, which literally overrides the value of
--demuxer-readahead-secs if the stream cache is active. The default
value is very high (10 seconds), which means it can act as network
cache.
Remove the old behavior of trying to pause once the byte cache runs
low. Instead, do something similar wit the demuxer cache. The nice
thing is that we can guess how many seconds of video it has cached,
and we can make better decisions. But for now, apply a relatively
naive heuristic: if the cache is below 0.5 secs, pause, and wait
until at least 2 secs are available.
Note that due to timestamp reordering, the estimated cached duration
of video might be inaccurate, depending on the file format. If the
file format has DTS, it's easy, otherwise the duration will seemingly
jump back and forth.
2014-08-26 23:13:20 +00:00
|
|
|
}
|
2014-07-16 20:40:21 +00:00
|
|
|
}
|
2017-06-19 15:54:02 +00:00
|
|
|
return CONTROL_UNKNOWN;
|
2014-07-16 20:40:21 +00:00
|
|
|
}
|
|
|
|
|
2016-03-09 22:55:16 +00:00
|
|
|
struct demux_control_args {
|
|
|
|
struct demuxer *demuxer;
|
|
|
|
int cmd;
|
|
|
|
void *arg;
|
|
|
|
int *r;
|
|
|
|
};
|
|
|
|
|
|
|
|
static void thread_demux_control(void *p)
|
2014-07-16 20:40:21 +00:00
|
|
|
{
|
2016-03-09 22:55:16 +00:00
|
|
|
struct demux_control_args *args = p;
|
|
|
|
struct demuxer *demuxer = args->demuxer;
|
|
|
|
int cmd = args->cmd;
|
|
|
|
void *arg = args->arg;
|
2014-07-16 20:40:21 +00:00
|
|
|
struct demux_internal *in = demuxer->in;
|
2017-06-19 15:54:02 +00:00
|
|
|
int r = CONTROL_UNKNOWN;
|
2016-03-09 22:55:16 +00:00
|
|
|
|
2014-07-16 20:40:21 +00:00
|
|
|
if (cmd == DEMUXER_CTRL_STREAM_CTRL) {
|
|
|
|
struct demux_ctrl_stream_ctrl *c = arg;
|
2014-08-11 13:53:01 +00:00
|
|
|
if (in->threading)
|
|
|
|
MP_VERBOSE(demuxer, "blocking for STREAM_CTRL %d\n", c->ctrl);
|
2014-07-16 20:40:21 +00:00
|
|
|
c->res = stream_control(demuxer->stream, c->ctrl, c->arg);
|
|
|
|
if (c->res != STREAM_UNSUPPORTED)
|
2017-06-19 15:54:02 +00:00
|
|
|
r = CONTROL_OK;
|
2014-07-16 20:40:21 +00:00
|
|
|
}
|
2017-06-19 15:54:02 +00:00
|
|
|
if (r != CONTROL_OK) {
|
2014-08-11 13:53:01 +00:00
|
|
|
if (in->threading)
|
|
|
|
MP_VERBOSE(demuxer, "blocking for DEMUXER_CTRL %d\n", cmd);
|
2014-07-16 20:40:21 +00:00
|
|
|
if (demuxer->desc->control)
|
|
|
|
r = demuxer->desc->control(demuxer->in->d_thread, cmd, arg);
|
|
|
|
}
|
2016-03-09 22:55:16 +00:00
|
|
|
|
|
|
|
*args->r = r;
|
|
|
|
}
|
|
|
|
|
|
|
|
int demux_control(demuxer_t *demuxer, int cmd, void *arg)
|
|
|
|
{
|
|
|
|
struct demux_internal *in = demuxer->in;
|
2017-01-21 16:19:01 +00:00
|
|
|
assert(demuxer == in->d_user);
|
2016-03-09 22:55:16 +00:00
|
|
|
|
|
|
|
if (in->threading) {
|
|
|
|
pthread_mutex_lock(&in->lock);
|
|
|
|
int cr = cached_demux_control(in, cmd, arg);
|
|
|
|
pthread_mutex_unlock(&in->lock);
|
2017-06-19 15:54:02 +00:00
|
|
|
if (cr != CONTROL_UNKNOWN)
|
2016-03-09 22:55:16 +00:00
|
|
|
return cr;
|
|
|
|
}
|
|
|
|
|
|
|
|
int r = 0;
|
|
|
|
struct demux_control_args args = {demuxer, cmd, arg, &r};
|
2016-03-09 23:06:13 +00:00
|
|
|
if (in->threading) {
|
|
|
|
MP_VERBOSE(in, "blocking on demuxer thread\n");
|
|
|
|
pthread_mutex_lock(&in->lock);
|
|
|
|
while (in->run_fn)
|
|
|
|
pthread_cond_wait(&in->wakeup, &in->lock);
|
2017-01-21 16:19:01 +00:00
|
|
|
in->run_fn = thread_demux_control;
|
|
|
|
in->run_fn_arg = &args;
|
2016-03-09 23:06:13 +00:00
|
|
|
pthread_cond_signal(&in->wakeup);
|
|
|
|
while (in->run_fn)
|
|
|
|
pthread_cond_wait(&in->wakeup, &in->lock);
|
|
|
|
pthread_mutex_unlock(&in->lock);
|
|
|
|
} else {
|
2017-01-21 16:19:01 +00:00
|
|
|
thread_demux_control(&args);
|
2016-03-09 23:06:13 +00:00
|
|
|
}
|
2017-01-21 16:19:01 +00:00
|
|
|
|
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
|
|
|
int demux_stream_control(demuxer_t *demuxer, int ctrl, void *arg)
|
|
|
|
{
|
|
|
|
struct demux_ctrl_stream_ctrl c = {ctrl, arg, STREAM_UNSUPPORTED};
|
|
|
|
demux_control(demuxer, DEMUXER_CTRL_STREAM_CTRL, &c);
|
|
|
|
return c.res;
|
2016-03-09 22:55:16 +00:00
|
|
|
}
|
|
|
|
|
2015-03-09 21:32:04 +00:00
|
|
|
bool demux_cancel_test(struct demuxer *demuxer)
|
|
|
|
{
|
|
|
|
return mp_cancel_test(demuxer->stream->cancel);
|
|
|
|
}
|
|
|
|
|
2014-11-02 16:20:04 +00:00
|
|
|
struct demux_chapter *demux_copy_chapter_data(struct demux_chapter *c, int num)
|
|
|
|
{
|
|
|
|
struct demux_chapter *new = talloc_array(NULL, struct demux_chapter, num);
|
|
|
|
for (int n = 0; n < num; n++) {
|
|
|
|
new[n] = c[n];
|
2015-08-12 09:10:45 +00:00
|
|
|
new[n].metadata = mp_tags_dup(new, new[n].metadata);
|
2014-11-02 16:20:04 +00:00
|
|
|
}
|
|
|
|
return new;
|
|
|
|
}
|