mirror of
https://github.com/mpv-player/mpv
synced 2024-12-21 22:30:22 +00:00
22b3f522ca
Most libavcodec decoders output non-interleaved audio. Add direct support for this, and remove the hack that repacked non-interleaved audio back to packed audio. Remove the minlen argument from the decoder callback. Instead of forcing every decoder to have its own decode loop to fill the buffer until minlen is reached, leave this to the caller. So if a decoder doesn't return enough data, it's simply called again. (In future, I even want to change it so that decoders don't read packets directly, but instead the caller has to pass packets to the decoders. This fits well with this change, because now the decoder callback typically decodes at most one packet.) ad_mpg123.c receives some heavy refactoring. The main problem is that it wanted to handle format changes when there was no data in the decode output buffer yet. This sounds reasonable, but actually it would write data into a buffer prepared for old data, since the caller doesn't know about the format change yet. (I.e. the best place for a format change would be _after_ writing the last sample to the output buffer.) It's possible that this code was not perfectly sane before this commit, and perhaps lost one frame of data after a format change, but I didn't confirm this. Trying to fix this, I ended up rewriting the decoding and also the probing.
148 lines
5.2 KiB
C
148 lines
5.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 "audio/chmap.h"
|
|
#include "ms_hdr.h"
|
|
struct MPOpts;
|
|
struct demuxer;
|
|
|
|
enum stream_type {
|
|
STREAM_VIDEO,
|
|
STREAM_AUDIO,
|
|
STREAM_SUB,
|
|
STREAM_TYPE_COUNT,
|
|
};
|
|
|
|
// Stream headers:
|
|
|
|
struct sh_stream {
|
|
enum stream_type type;
|
|
struct demuxer *demuxer;
|
|
// 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;
|
|
|
|
// 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;
|
|
|
|
// Human readable description of the running decoder, or NULL
|
|
char *decoder_desc;
|
|
|
|
// shouldn't exist type of stuff
|
|
struct MPOpts *opts;
|
|
|
|
// Internal to demux.c
|
|
struct demux_stream *ds;
|
|
};
|
|
|
|
#define SH_COMMON \
|
|
struct sh_stream *gsh; \
|
|
struct MPOpts *opts; \
|
|
/* usually a FourCC, exact meaning depends on gsh->format */ \
|
|
unsigned int format; \
|
|
int initialized; \
|
|
/* audio: last known pts value in output from decoder \
|
|
* video: predicted/interpolated PTS of the current frame */ \
|
|
double pts; \
|
|
/* decoder context */ \
|
|
void *context; \
|
|
|
|
typedef struct sh_audio {
|
|
SH_COMMON
|
|
// output format:
|
|
int sample_format;
|
|
int samplerate;
|
|
struct mp_chmap channels;
|
|
int i_bps; // == bitrate (compressed bytes/sec)
|
|
// decoder state:
|
|
struct mp_audio_buffer *decode_buffer;
|
|
struct af_stream *afilter; // the audio filter stream
|
|
const struct ad_functions *ad_driver;
|
|
// win32-compatible codec parameters:
|
|
MP_WAVEFORMATEX *wf;
|
|
// note codec extradata may be either under "wf" or "codecdata"
|
|
unsigned char *codecdata;
|
|
int codecdata_len;
|
|
int pts_offset; // number of samples output by decoder after last known pts
|
|
} sh_audio_t;
|
|
|
|
typedef struct sh_video {
|
|
SH_COMMON
|
|
float next_frame_time;
|
|
double last_pts;
|
|
double buffered_pts[32];
|
|
int num_buffered_pts;
|
|
double codec_reordered_pts;
|
|
double prev_codec_reordered_pts;
|
|
int num_reordered_pts_problems;
|
|
double sorted_pts;
|
|
double prev_sorted_pts;
|
|
int num_sorted_pts_problems;
|
|
int pts_assoc_mode;
|
|
// output format: (set by demuxer)
|
|
float fps; // frames per second (set only if constant fps)
|
|
float aspect; // aspect ratio stored in the file (for prescaling)
|
|
float stream_aspect; // aspect ratio in media headers (DVD IFO files)
|
|
int i_bps; // == bitrate (compressed bytes/sec)
|
|
int disp_w, disp_h; // display size (filled by demuxer or decoder)
|
|
// output driver/filters: (set by libmpcodecs core)
|
|
struct vf_instance *vfilter; // video filter chain
|
|
const struct vd_functions *vd_driver;
|
|
int vf_initialized; // -1 failed, 0 not done, 1 done
|
|
long vf_reconfig_count; // incremented each mpcodecs_reconfig_vo() call
|
|
struct mp_image_params *vf_input; // video filter input params
|
|
struct mp_hwdec_info *hwdec_info; // video output hwdec handles
|
|
// win32-compatible codec parameters:
|
|
MP_BITMAPINFOHEADER *bih;
|
|
} sh_video_t;
|
|
|
|
typedef struct sh_sub {
|
|
SH_COMMON
|
|
unsigned char *extradata; // extra header data passed from demuxer
|
|
int extradata_len;
|
|
int frame_based; // timestamps are frame-based
|
|
bool is_utf8; // if false, subtitle packet charset is unknown
|
|
struct ass_track *track; // loaded by libass
|
|
struct dec_sub *dec_sub; // decoder context
|
|
} sh_sub_t;
|
|
|
|
#endif /* MPLAYER_STHEADER_H */
|