mirror of
https://github.com/mpv-player/mpv
synced 2024-10-22 08:51:57 +02:00
044af63d98
More the ignore_eof field to the internal demux_stream struct. This is relatively messy, because the internal struct exists only once the stream is created, and after that setting the ignore_eof flag is a race condition. We could bother with adding demux_add_sh_stream() parameters for this, but let's not. So in theory a tiny race condition is introduced, which can never be triggered since all demux API functions are called by the playback thread only anyway. Fix that ts_offset is accessed without log (this was introduced much earlier by myself). Introduce an alternative way of avoiding the annoying EOF reached messages by not resetting the EOF flags for CC streams when a CC packet is added. This makes the second commit in the PR which added the original fix unnecessary. As another cosmetic change merge the check in cached_demux_control() into a single if(). In the future, the CC pseudo-stream should probably be replaced with an entire pseudo-demuxer or such, which would avoid some of the messiness (or maybe not, we don't know yet).
107 lines
3.2 KiB
C
107 lines
3.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_STHEADER_H
|
|
#define MPLAYER_STHEADER_H
|
|
|
|
#include <stdbool.h>
|
|
|
|
#include "common/common.h"
|
|
#include "audio/chmap.h"
|
|
#include "video/mp_image.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;
|
|
// FFmpeg stream index (AVFormatContext.streams[index]), or equivalent.
|
|
int ff_index;
|
|
|
|
struct mp_codec_params *codec;
|
|
|
|
char *title;
|
|
char *lang; // language code
|
|
bool default_track; // container default track flag
|
|
bool forced_track; // container forced track flag
|
|
int hls_bitrate;
|
|
|
|
struct mp_tags *tags;
|
|
|
|
bool missing_timestamps;
|
|
|
|
// stream is a picture (such as album art)
|
|
struct demux_packet *attached_picture;
|
|
|
|
// Internal to demux.c
|
|
struct demux_stream *ds;
|
|
};
|
|
|
|
struct mp_codec_params {
|
|
enum stream_type type;
|
|
|
|
// E.g. "h264" (usually corresponds to AVCodecDescriptor.name)
|
|
const char *codec;
|
|
|
|
// Usually a FourCC, exact meaning depends on codec.
|
|
unsigned int codec_tag;
|
|
|
|
unsigned char *extradata; // codec specific per-stream header
|
|
int extradata_size;
|
|
|
|
// Codec specific header data (set by demux_lavf.c only)
|
|
struct AVCodecParameters *lav_codecpar;
|
|
|
|
// Timestamp granularity for converting double<->rational timestamps.
|
|
int native_tb_num, native_tb_den;
|
|
|
|
// STREAM_AUDIO
|
|
int samplerate;
|
|
struct mp_chmap channels;
|
|
bool force_channels;
|
|
int bitrate; // compressed bits/sec
|
|
int block_align;
|
|
struct replaygain_data *replaygain_data;
|
|
|
|
// STREAM_VIDEO
|
|
bool avi_dts; // use DTS timing; first frame and DTS is 0
|
|
double fps; // frames per second (set only if constant fps)
|
|
bool reliable_fps; // the fps field is definitely not broken
|
|
int par_w, par_h; // pixel aspect ratio (0 if unknown/square)
|
|
int disp_w, disp_h; // display size
|
|
int rotate; // intended display rotation, in degrees, [0, 359]
|
|
int stereo_mode; // mp_stereo3d_mode (0 if none/unknown)
|
|
struct mp_colorspace color; // colorspace info where available
|
|
struct mp_spherical_params spherical;
|
|
|
|
// STREAM_VIDEO + STREAM_AUDIO
|
|
int bits_per_coded_sample;
|
|
|
|
// STREAM_SUB
|
|
double frame_based; // timestamps are frame-based (and this is the
|
|
// fallback framerate used for timestamps)
|
|
};
|
|
|
|
#endif /* MPLAYER_STHEADER_H */
|