mirror of
https://github.com/mpv-player/mpv
synced 2024-07-31 16:29:58 +02:00
b477c68aa0
Using -demuxer mpegts -correct-pts triggered the assertion in ds_get_packet2(). This is not surprising, because the correct-pts code was changed to accept _complete_ packets, while all the old demuxers (including the mpegts demuxer) require you to use "partial" packet reads, together with the video_read_frame(). (That function actually parses video frames, so fragments of the original "packets" can be fed to the decoder.) However, it returns out demux_ts packet's are mostly useable. demux_ts still adds an offset (i.e. ds->buffer_pos != 0) to the packets when calling internal parser functions, such as in parse_es.c. While this is unclean design due to mplayer's old video demuxing/decoding path, it can be easily be made work by modifying the packet as returned by ds_get_packet2(). We also have to change the packet freeing code, as demux_packet->buffer doesn't have to point to the start of the memory allocation anymore. MPlayer handles this "correctly" because it doesn't have a function that reads a complete packet.
40 lines
1.3 KiB
C
40 lines
1.3 KiB
C
/*
|
|
* This file is part of mplayer2.
|
|
*
|
|
* mplayer2 is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* mplayer2 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 General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License along
|
|
* with mplayer2; if not, write to the Free Software Foundation, Inc.,
|
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
*/
|
|
|
|
#ifndef MPLAYER_DEMUX_PACKET_H
|
|
#define MPLAYER_DEMUX_PACKET_H
|
|
|
|
#include <stdbool.h>
|
|
#include <sys/types.h>
|
|
|
|
// Holds one packet/frame/whatever
|
|
typedef struct demux_packet {
|
|
int len;
|
|
double pts;
|
|
double duration;
|
|
double stream_pts;
|
|
int64_t pos; // position in index (AVI) or file (MPG)
|
|
unsigned char *buffer;
|
|
bool keyframe;
|
|
struct demux_packet *next;
|
|
void *allocation;
|
|
struct AVPacket *avpacket; // original libavformat packet (demux_lavf)
|
|
} demux_packet_t;
|
|
|
|
#endif /* MPLAYER_DEMUX_PACKET_H */
|