mirror of
https://github.com/mpv-player/mpv
synced 2024-12-22 23:02:37 +00:00
1301a90761
This adds a thread to the demuxer which reads packets asynchronously. It will do so until a configurable minimum packet queue size is reached. (See options.rst additions.) For now, the thread is disabled by default. There are some corner cases that have to be fixed, such as fixing cache behavior with webradios. Note that most interaction with the demuxer is still blocking, so if e.g. network dies, the player will still freeze. But this change will make it possible to remove most causes for freezing. Most of the new code in demux.c actually consists of weird caches to compensate for thread-safety issues (with the previously single-threaded design), or to avoid blocking by having to wait on the demuxer thread. Most of the changes in the player are due to the fact that we must not access the source stream directly. the demuxer thread already accesses it, and the stream stuff is not thread-safe. For timeline stuff (like ordered chapters), we enable the thread for the current segment only. We also clear its packet queue on seek, so that the remaining (unconsumed) readahead buffer doesn't waste memory. Keep in mind that insane subtitles (such as ASS typesetting muxed into mkv files) will practically disable the readahead, because the total queue size is considered when checking whether the minimum queue size was reached.
99 lines
3.2 KiB
C
99 lines
3.2 KiB
C
/*
|
|
* This file is part of MPlayer.
|
|
*
|
|
* MPlayer 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.
|
|
*
|
|
* MPlayer 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 MPlayer; if not, write to the Free Software Foundation, Inc.,
|
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
*/
|
|
|
|
#ifndef MPLAYER_STHEADER_H
|
|
#define MPLAYER_STHEADER_H
|
|
|
|
#include <stdbool.h>
|
|
|
|
#include "common/common.h"
|
|
#include "audio/chmap.h"
|
|
#include "ms_hdr.h"
|
|
struct MPOpts;
|
|
struct demuxer;
|
|
|
|
// Stream headers:
|
|
|
|
struct sh_stream {
|
|
enum stream_type type;
|
|
// Index into demuxer->streams.
|
|
int index;
|
|
// Demuxer/format specific ID. Corresponds to the stream IDs as encoded in
|
|
// some file formats (e.g. MPEG), or an index chosen by demux.c.
|
|
int demuxer_id;
|
|
// One of these is non-NULL, the others are NULL, depending on the stream
|
|
// type.
|
|
struct sh_audio *audio;
|
|
struct sh_video *video;
|
|
struct sh_sub *sub;
|
|
|
|
// E.g. "h264" (usually corresponds to AVCodecDescriptor.name)
|
|
const char *codec;
|
|
|
|
// Usually a FourCC, exact meaning depends on codec.
|
|
unsigned int format;
|
|
|
|
// Codec specific header data (set by demux_lavf.c)
|
|
// Other demuxers use sh_audio->wf and sh_video->bih instead.
|
|
struct AVCodecContext *lav_headers;
|
|
|
|
char *title;
|
|
char *lang; // language code
|
|
bool default_track; // container default track flag
|
|
|
|
// stream is a picture (such as album art)
|
|
struct demux_packet *attached_picture;
|
|
|
|
// Internal to demux.c
|
|
struct demux_stream *ds;
|
|
};
|
|
|
|
typedef struct sh_audio {
|
|
int samplerate;
|
|
struct mp_chmap channels;
|
|
int bitrate; // compressed bits/sec
|
|
// win32-compatible codec parameters:
|
|
MP_WAVEFORMATEX *wf;
|
|
// note codec extradata may be either under "wf" or "codecdata"
|
|
unsigned char *codecdata;
|
|
int codecdata_len;
|
|
struct replaygain_data *replaygain_data;
|
|
} sh_audio_t;
|
|
|
|
typedef struct sh_video {
|
|
bool avi_dts; // use DTS timing; first frame and DTS is 0
|
|
float fps; // frames per second (set only if constant fps)
|
|
float aspect; // aspect ratio stored in the file (for prescaling)
|
|
int bitrate; // compressed bits/sec
|
|
int disp_w, disp_h; // display size
|
|
int rotate; // intended display rotation, in degrees, [0, 359]
|
|
MP_BITMAPINFOHEADER *bih;
|
|
} sh_video_t;
|
|
|
|
typedef struct sh_sub {
|
|
unsigned char *extradata; // extra header data passed from demuxer
|
|
int extradata_len;
|
|
int w, h; // mp4 vobsubs
|
|
double frame_based; // timestamps are frame-based (and this is the
|
|
// fallback framerate used for timestamps)
|
|
bool is_utf8; // if false, subtitle packet charset is unknown
|
|
struct dec_sub *dec_sub; // decoder context
|
|
} sh_sub_t;
|
|
|
|
#endif /* MPLAYER_STHEADER_H */
|