mirror of
https://github.com/mpv-player/mpv
synced 2024-12-19 05:15:12 +00:00
a5b51f75dc
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.
63 lines
2.2 KiB
C
63 lines
2.2 KiB
C
/*
|
|
* This file is part of mpv.
|
|
*
|
|
* 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.
|
|
*
|
|
* 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
|
|
* GNU Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with mpv. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#ifndef MPLAYER_DEMUX_PACKET_H
|
|
#define MPLAYER_DEMUX_PACKET_H
|
|
|
|
#include <stdbool.h>
|
|
#include <stddef.h>
|
|
#include <inttypes.h>
|
|
|
|
// Holds one packet/frame/whatever
|
|
typedef struct demux_packet {
|
|
int len;
|
|
unsigned char *buffer;
|
|
|
|
double pts;
|
|
double dts;
|
|
double duration;
|
|
bool keyframe;
|
|
|
|
int64_t pos; // position in source file byte stream
|
|
int stream; // source stream index
|
|
|
|
// segmentation (ordered chapters, EDL)
|
|
bool segmented;
|
|
struct mp_codec_params *codec; // set to non-NULL iff segmented is set
|
|
double start, end; // set to non-NOPTS iff segmented is set
|
|
|
|
// private
|
|
struct demux_packet *next;
|
|
struct AVPacket *avpacket; // keep the buffer allocation and sidedata
|
|
} demux_packet_t;
|
|
|
|
struct demux_packet *new_demux_packet(size_t len);
|
|
struct demux_packet *new_demux_packet_from_avpacket(struct AVPacket *avpkt);
|
|
struct demux_packet *new_demux_packet_from(void *data, size_t len);
|
|
void demux_packet_shorten(struct demux_packet *dp, size_t len);
|
|
void free_demux_packet(struct demux_packet *dp);
|
|
struct demux_packet *demux_copy_packet(struct demux_packet *dp);
|
|
size_t demux_packet_estimate_total_size(struct demux_packet *dp);
|
|
|
|
void demux_packet_copy_attribs(struct demux_packet *dst, struct demux_packet *src);
|
|
|
|
int demux_packet_set_padding(struct demux_packet *dp, int start, int end);
|
|
int demux_packet_add_blockadditional(struct demux_packet *dp, uint64_t id,
|
|
void *data, size_t size);
|
|
|
|
#endif /* MPLAYER_DEMUX_PACKET_H */
|