2014-07-05 14:45:28 +00:00
|
|
|
/*
|
|
|
|
* This file is part of mpv.
|
|
|
|
*
|
2017-04-21 11:33:23 +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.
|
2014-07-05 14:45:28 +00:00
|
|
|
*
|
|
|
|
* mpv is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
2017-04-21 11:33:23 +00:00
|
|
|
* GNU Lesser General Public License for more details.
|
2014-07-05 14:45:28 +00:00
|
|
|
*
|
2017-04-21 11:33:23 +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/>.
|
2014-07-05 14:45:28 +00:00
|
|
|
*/
|
2017-04-21 11:33:23 +00:00
|
|
|
|
2014-07-05 14:45:28 +00:00
|
|
|
#include <stdlib.h>
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <string.h>
|
|
|
|
#include <assert.h>
|
|
|
|
|
|
|
|
#include <libavcodec/avcodec.h>
|
2014-11-03 19:00:34 +00:00
|
|
|
#include <libavutil/intreadwrite.h>
|
2014-07-05 14:45:28 +00:00
|
|
|
|
2014-11-03 21:30:07 +00:00
|
|
|
#include "config.h"
|
|
|
|
|
2014-07-05 14:45:28 +00:00
|
|
|
#include "common/av_common.h"
|
|
|
|
#include "common/common.h"
|
|
|
|
|
|
|
|
#include "packet.h"
|
|
|
|
|
|
|
|
static void packet_destroy(void *ptr)
|
|
|
|
{
|
|
|
|
struct demux_packet *dp = ptr;
|
2014-08-24 15:45:28 +00:00
|
|
|
av_packet_unref(dp->avpacket);
|
2014-07-05 14:45:28 +00:00
|
|
|
}
|
|
|
|
|
2014-08-24 15:45:28 +00:00
|
|
|
// This actually preserves only data and side data, not PTS/DTS/pos/etc.
|
|
|
|
// It also allows avpkt->data==NULL with avpkt->size!=0 - the libavcodec API
|
|
|
|
// does not allow it, but we do it to simplify new_demux_packet().
|
|
|
|
struct demux_packet *new_demux_packet_from_avpacket(struct AVPacket *avpkt)
|
2014-07-05 14:45:28 +00:00
|
|
|
{
|
2014-09-16 16:11:00 +00:00
|
|
|
if (avpkt->size > 1000000000)
|
|
|
|
return NULL;
|
2014-07-05 14:45:28 +00:00
|
|
|
struct demux_packet *dp = talloc(NULL, struct demux_packet);
|
|
|
|
talloc_set_destructor(dp, packet_destroy);
|
|
|
|
*dp = (struct demux_packet) {
|
|
|
|
.pts = MP_NOPTS_VALUE,
|
|
|
|
.dts = MP_NOPTS_VALUE,
|
|
|
|
.duration = -1,
|
|
|
|
.pos = -1,
|
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
|
|
|
.start = MP_NOPTS_VALUE,
|
|
|
|
.end = MP_NOPTS_VALUE,
|
2014-07-05 14:45:28 +00:00
|
|
|
.stream = -1,
|
2014-08-24 15:45:28 +00:00
|
|
|
.avpacket = talloc_zero(dp, AVPacket),
|
2017-11-04 22:02:25 +00:00
|
|
|
.kf_seek_pts = MP_NOPTS_VALUE,
|
2014-07-05 14:45:28 +00:00
|
|
|
};
|
2014-08-24 15:45:28 +00:00
|
|
|
av_init_packet(dp->avpacket);
|
|
|
|
int r = -1;
|
|
|
|
if (avpkt->data) {
|
|
|
|
// We hope that this function won't need/access AVPacket input padding,
|
|
|
|
// because otherwise new_demux_packet_from() wouldn't work.
|
|
|
|
r = av_packet_ref(dp->avpacket, avpkt);
|
|
|
|
} else {
|
|
|
|
r = av_new_packet(dp->avpacket, avpkt->size);
|
|
|
|
}
|
|
|
|
if (r < 0) {
|
2014-09-16 16:11:00 +00:00
|
|
|
*dp->avpacket = (AVPacket){0};
|
|
|
|
talloc_free(dp);
|
|
|
|
return NULL;
|
2014-07-05 14:45:28 +00:00
|
|
|
}
|
2014-08-24 15:45:28 +00:00
|
|
|
dp->buffer = dp->avpacket->data;
|
|
|
|
dp->len = dp->avpacket->size;
|
2014-07-05 14:45:28 +00:00
|
|
|
return dp;
|
|
|
|
}
|
|
|
|
|
2017-11-05 15:36:18 +00:00
|
|
|
// (buf must include proper padding)
|
|
|
|
struct demux_packet *new_demux_packet_from_buf(struct AVBufferRef *buf)
|
|
|
|
{
|
video: make decoder wrapper a filter
Move dec_video.c to filters/f_decoder_wrapper.c. It essentially becomes
a source filter. vd.h mostly disappears, because mp_filter takes care of
the dataflow, but its remains are in struct mp_decoder_fns.
One goal is to simplify dataflow by letting the filter framework handle
it (or more accurately, using its conventions). One result is that the
decode calls disappear from video.c, because we simply connect the
decoder wrapper and the filter chain with mp_pin_connect().
Another goal is to eventually remove the code duplication between the
audio and video paths for this. This commit prepares for this by trying
to make f_decoder_wrapper.c extensible, so it can be used for audio as
well later.
Decoder framedropping changes a bit. It doesn't seem to be worse than
before, and it's an obscure feature, so I'm content with its new state.
Some special code that was apparently meant to avoid dropping too many
frames in a row is removed, though.
I'm not sure how the source code tree should be organized. For one,
video/decode/vd_lavc.c is the only file in its directory, which is a bit
annoying.
2018-01-28 09:08:45 +00:00
|
|
|
if (!buf)
|
|
|
|
return NULL;
|
2017-11-05 15:36:18 +00:00
|
|
|
AVPacket pkt = {
|
|
|
|
.size = buf->size,
|
|
|
|
.data = buf->data,
|
|
|
|
.buf = buf,
|
|
|
|
};
|
|
|
|
return new_demux_packet_from_avpacket(&pkt);
|
|
|
|
}
|
|
|
|
|
2014-08-24 15:45:28 +00:00
|
|
|
// Input data doesn't need to be padded.
|
|
|
|
struct demux_packet *new_demux_packet_from(void *data, size_t len)
|
2014-07-05 14:45:28 +00:00
|
|
|
{
|
2014-09-16 16:11:00 +00:00
|
|
|
if (len > INT_MAX)
|
|
|
|
return NULL;
|
2014-08-24 15:45:28 +00:00
|
|
|
AVPacket pkt = { .data = data, .size = len };
|
|
|
|
return new_demux_packet_from_avpacket(&pkt);
|
2014-07-05 14:45:28 +00:00
|
|
|
}
|
|
|
|
|
2014-08-24 15:45:28 +00:00
|
|
|
struct demux_packet *new_demux_packet(size_t len)
|
2014-07-05 14:45:28 +00:00
|
|
|
{
|
2014-09-16 16:11:00 +00:00
|
|
|
if (len > INT_MAX)
|
|
|
|
return NULL;
|
2014-08-24 15:45:28 +00:00
|
|
|
AVPacket pkt = { .data = NULL, .size = len };
|
|
|
|
return new_demux_packet_from_avpacket(&pkt);
|
2014-07-05 14:45:28 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void demux_packet_shorten(struct demux_packet *dp, size_t len)
|
|
|
|
{
|
|
|
|
assert(len <= dp->len);
|
|
|
|
dp->len = len;
|
2017-02-08 14:08:49 +00:00
|
|
|
memset(dp->buffer + dp->len, 0, AV_INPUT_BUFFER_PADDING_SIZE);
|
2014-07-05 14:45:28 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void free_demux_packet(struct demux_packet *dp)
|
|
|
|
{
|
|
|
|
talloc_free(dp);
|
|
|
|
}
|
|
|
|
|
2015-02-05 20:52:07 +00:00
|
|
|
void demux_packet_copy_attribs(struct demux_packet *dst, struct demux_packet *src)
|
|
|
|
{
|
|
|
|
dst->pts = src->pts;
|
|
|
|
dst->dts = src->dts;
|
|
|
|
dst->duration = src->duration;
|
|
|
|
dst->pos = src->pos;
|
demux: get rid of demux_packet.new_segment field
The new_segment field was used to track the decoder data flow handler of
timeline boundaries, which are used for ordered chapters etc. (anything
that sets demuxer_desc.load_timeline). This broke seeking with the
demuxer cache enabled. The demuxer is expected to set the new_segment
field after every seek or segment boundary switch, so the cached packets
basically contained incorrect values for this, and the decoders were not
initialized correctly.
Fix this by getting rid of the flag completely. Let the decoders instead
compare the segment information by content, which is hopefully enough.
(In theory, two segments with same information could perhaps appear in
broken-ish corner cases, or in an attempt to simulate looping, and such.
I preferred the simple solution over others, such as generating unique
and stable segment IDs.)
We still add a "segmented" field to make it explicit whether segments
are used, instead of doing something silly like testing arbitrary other
segment fields for validity.
Cached seeking with timeline stuff is still slightly broken even with
this commit: the seek logic is not aware of the overlap that segments
can have, and the timestamp clamping that needs to be performed in
theory to account for the fact that a packet might contain a frame that
is always clipped off by segment handling. This can be fixed later.
2017-10-24 17:33:01 +00:00
|
|
|
dst->segmented = src->segmented;
|
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
|
|
|
dst->start = src->start;
|
|
|
|
dst->end = src->end;
|
2017-10-23 09:28:31 +00:00
|
|
|
dst->codec = src->codec;
|
2015-02-05 20:52:07 +00:00
|
|
|
dst->keyframe = src->keyframe;
|
|
|
|
dst->stream = src->stream;
|
|
|
|
}
|
|
|
|
|
2014-07-05 14:45:28 +00:00
|
|
|
struct demux_packet *demux_copy_packet(struct demux_packet *dp)
|
|
|
|
{
|
|
|
|
struct demux_packet *new = NULL;
|
|
|
|
if (dp->avpacket) {
|
2014-08-24 15:45:28 +00:00
|
|
|
new = new_demux_packet_from_avpacket(dp->avpacket);
|
|
|
|
} else {
|
|
|
|
// Some packets might be not created by new_demux_packet*().
|
|
|
|
new = new_demux_packet_from(dp->buffer, dp->len);
|
2014-07-05 14:45:28 +00:00
|
|
|
}
|
2014-09-16 16:11:00 +00:00
|
|
|
if (!new)
|
|
|
|
return NULL;
|
2015-02-05 20:52:07 +00:00
|
|
|
demux_packet_copy_attribs(new, dp);
|
2014-07-05 14:45:28 +00:00
|
|
|
return new;
|
|
|
|
}
|
2014-11-03 19:00:34 +00:00
|
|
|
|
2017-04-14 17:19:44 +00:00
|
|
|
#define ROUND_ALLOC(s) MP_ALIGN_UP(s, 64)
|
|
|
|
|
|
|
|
// Attempt to estimate the total memory consumption of the given packet.
|
|
|
|
// This is important if we store thousands of packets and not to exceed
|
|
|
|
// user-provided limits. Of course we can't know how much memory internal
|
|
|
|
// fragmentation of the libc memory allocator will waste.
|
|
|
|
// Note that this should return a "stable" value - e.g. if a new packet ref
|
|
|
|
// is created, this should return the same value with the new ref. (This
|
|
|
|
// implies the value is not exact and does not return the actual size of
|
|
|
|
// memory wasted due to internal fragmentation.)
|
|
|
|
size_t demux_packet_estimate_total_size(struct demux_packet *dp)
|
|
|
|
{
|
|
|
|
size_t size = ROUND_ALLOC(sizeof(struct demux_packet));
|
|
|
|
size += ROUND_ALLOC(dp->len);
|
|
|
|
if (dp->avpacket) {
|
|
|
|
size += ROUND_ALLOC(sizeof(AVPacket));
|
|
|
|
size += ROUND_ALLOC(sizeof(AVBufferRef));
|
|
|
|
size += 64; // upper bound estimate on sizeof(AVBuffer)
|
|
|
|
size += ROUND_ALLOC(dp->avpacket->side_data_elems *
|
|
|
|
sizeof(dp->avpacket->side_data[0]));
|
|
|
|
for (int n = 0; n < dp->avpacket->side_data_elems; n++)
|
|
|
|
size += ROUND_ALLOC(dp->avpacket->side_data[n].size);
|
|
|
|
}
|
|
|
|
return size;
|
|
|
|
}
|
|
|
|
|
2014-11-03 19:00:34 +00:00
|
|
|
int demux_packet_set_padding(struct demux_packet *dp, int start, int end)
|
|
|
|
{
|
2017-01-24 07:11:42 +00:00
|
|
|
#if LIBAVCODEC_VERSION_MICRO >= 100
|
2017-01-31 13:48:10 +00:00
|
|
|
if (!start && !end)
|
2014-11-03 19:00:34 +00:00
|
|
|
return 0;
|
|
|
|
if (!dp->avpacket)
|
|
|
|
return -1;
|
|
|
|
uint8_t *p = av_packet_new_side_data(dp->avpacket, AV_PKT_DATA_SKIP_SAMPLES, 10);
|
|
|
|
if (!p)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
AV_WL32(p + 0, start);
|
|
|
|
AV_WL32(p + 4, end);
|
2014-11-03 21:30:07 +00:00
|
|
|
#endif
|
2014-11-03 19:00:34 +00:00
|
|
|
return 0;
|
|
|
|
}
|
2017-01-31 13:48:10 +00:00
|
|
|
|
|
|
|
int demux_packet_add_blockadditional(struct demux_packet *dp, uint64_t id,
|
|
|
|
void *data, size_t size)
|
|
|
|
{
|
|
|
|
#if LIBAVCODEC_VERSION_MICRO >= 100
|
|
|
|
if (!dp->avpacket)
|
|
|
|
return -1;
|
|
|
|
uint8_t *sd = av_packet_new_side_data(dp->avpacket,
|
|
|
|
AV_PKT_DATA_MATROSKA_BLOCKADDITIONAL,
|
|
|
|
8 + size);
|
|
|
|
if (!sd)
|
|
|
|
return -1;
|
|
|
|
AV_WB64(sd, id);
|
|
|
|
if (size > 0)
|
|
|
|
memcpy(sd + 8, data, size);
|
|
|
|
#endif
|
|
|
|
return 0;
|
|
|
|
}
|