mirror of
https://github.com/mpv-player/mpv
synced 2025-01-05 22:49:58 +00:00
aa03ee7300
The old implementation didn't work for the OGG case. Discard the old shit code (instead of fixing it), and write new shit code. The old code was already over a year old, so it's about time to rewrite it for no reason anyway. While it's true that the old code appears to be broken, the main reason to rewrite this is to make it simpler. While the amount of code seems to be about the same, both the concept and the actual tag handling are simpler. The result is probably a bit more correct. The packet struct shrinks by 8 byte. That fact that it wasted 8 bytes per packet for a rather obscure use case was the reason I started this at all (and when I found that OGG updates didn't work). While these 8 bytes aren't going to hurt, the packet struct was getting too bloated. If you buffer a lot of data, these extra fields will add up. Still quite some effort for 8 bytes. Fortunately, it's not like there are any managers that need to be convinced whether it's worth doing. The freedom to waste time on dumb shit. The old implementation attached the current metadata to each packet. When the decoder read the packet, the packet's metadata was made current. The new implementation stores metadata as separate list, and requires that the player frontend tells it the current playback time, which will be used to find the currently valid metadata. In both cases, the objective was to correctly update metadata even if a lot of data is buffered ahead (and to update them correctly when seeking within the demuxer cache). The new implementation is actually slightly more correct, because it uses the playback time for the metadata lookup. Consider if you have an audio filter which buffers 15 seconds (unfortunately such a filter exists), then the old code would update the current title 15 seconds too early, while the new one does it correctly. The new code also simplifies mixing the 3 metadata sources (global, per stream, ICY). We assume these aren't mixed in a meaningful way. The old code tried to be a bit more "exact". I didn't bother to look how the old code did this, but the new code simply always "merges" with the previous metadata, so if a newer tag removes a field, it's going to stick around anyway. I tried to keep it simple. Other approaches include making metadata a special sh_stream with metadata packets. This would have been conceptually clean, but the implementation would probably have been unnatural (and doesn't match well with libavformat's API anyway). It would have been nice to make the metadata updates chapter points (makes a lot of sense for the intended use case, web radio current song information), but I don't think it would have been a good idea to make chapters suddenly so dynamic. (Still an idea to keep in mind; the new code actually makes it easier to work towards this.) You could mention how subtitles are timed metadata, and actually are implemented as sparse packet streams in some formats. mp4 implements chapters as special subtitle stream, AFAIK. (Ironically, this is very not-ideal for files. It would be useful for streaming like web radio, but mp4 is extremely bad for streaming by design for other reasons.) bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla
73 lines
2.6 KiB
C
73 lines
2.6 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 {
|
|
double pts;
|
|
double dts;
|
|
double duration;
|
|
int64_t pos; // position in source file byte stream
|
|
|
|
unsigned char *buffer;
|
|
size_t len;
|
|
|
|
int stream; // source stream index (typically sh_stream.index)
|
|
|
|
bool keyframe;
|
|
|
|
// backward playback
|
|
bool back_restart; // restart point (reverse and return previous frames)
|
|
bool back_preroll; // initial discarded frame for smooth decoder reinit
|
|
|
|
// 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
|
|
uint64_t cum_pos; // demux.c internal: cumulative size until _start_ of pkt
|
|
double kf_seek_pts; // demux.c internal: seek pts for keyframe range
|
|
} demux_packet_t;
|
|
|
|
struct AVBufferRef;
|
|
|
|
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);
|
|
struct demux_packet *new_demux_packet_from_buf(struct AVBufferRef *buf);
|
|
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 */
|