2009-05-08 21:51:13 +00:00
|
|
|
/*
|
|
|
|
* 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.
|
|
|
|
*/
|
|
|
|
|
2008-02-22 09:09:46 +00:00
|
|
|
#ifndef MPLAYER_STHEADER_H
|
|
|
|
#define MPLAYER_STHEADER_H
|
2002-03-03 18:47:29 +00:00
|
|
|
|
2011-01-16 18:03:08 +00:00
|
|
|
#include <stdbool.h>
|
|
|
|
|
2013-04-06 20:43:12 +00:00
|
|
|
#include "audio/chmap.h"
|
2004-04-28 10:18:33 +00:00
|
|
|
#include "ms_hdr.h"
|
2008-04-16 01:23:38 +00:00
|
|
|
struct MPOpts;
|
2009-04-19 14:37:03 +00:00
|
|
|
struct demuxer;
|
2002-09-22 00:43:14 +00:00
|
|
|
|
2012-08-03 10:24:55 +00:00
|
|
|
enum stream_type {
|
2012-08-19 16:01:30 +00:00
|
|
|
STREAM_VIDEO,
|
2012-07-29 19:04:57 +00:00
|
|
|
STREAM_AUDIO,
|
2012-08-03 10:24:55 +00:00
|
|
|
STREAM_SUB,
|
2012-08-19 16:01:30 +00:00
|
|
|
STREAM_TYPE_COUNT,
|
2012-07-29 19:04:57 +00:00
|
|
|
};
|
|
|
|
|
2002-09-22 00:43:14 +00:00
|
|
|
// Stream headers:
|
2002-01-16 12:24:36 +00:00
|
|
|
|
2012-08-03 10:24:55 +00:00
|
|
|
struct sh_stream {
|
|
|
|
enum stream_type type;
|
2012-08-19 16:01:30 +00:00
|
|
|
struct demuxer *demuxer;
|
2012-08-03 10:24:55 +00:00
|
|
|
// Index into demuxer->streams.
|
|
|
|
int index;
|
2013-04-29 20:34:36 +00:00
|
|
|
// 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.
|
2012-08-03 10:24:55 +00:00
|
|
|
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;
|
|
|
|
|
core: redo how codecs are mapped, remove codecs.conf
Use codec names instead of FourCCs to identify codecs. Rewrite how
codecs are selected and initialized. Now each decoder exports a list
of decoders (and the codec it supports) via add_decoders(). The order
matters, and the first decoder for a given decoder is preferred over
the other decoders. E.g. all ad_mpg123 decoders are preferred over
ad_lavc, because it comes first in the mpcodecs_ad_drivers array.
Likewise, decoders within ad_lavc that are enumerated first by
libavcodec (using av_codec_next()) are preferred. (This is actually
critical to select h264 software decoding by default instead of vdpau.
libavcodec and ffmpeg/avconv use the same method to select decoders by
default, so we hope this is sane.)
The codec names follow libavcodec's codec names as defined by
AVCodecDescriptor.name (see libavcodec/codec_desc.c). Some decoders
have names different from the canonical codec name. The AVCodecDescriptor
API is relatively new, so we need a compatibility layer for older
libavcodec versions for codec names that are referenced internally,
and which are different from the decoder name. (Add a configure check
for that, because checking versions is getting way too messy.)
demux/codec_tags.c is generated from the former codecs.conf (minus
"special" decoders like vdpau, and excluding the mappings that are the
same as the mappings libavformat's exported RIFF tables). It contains
all the mappings from FourCCs to codec name. This is needed for
demux_mkv, demux_mpg, demux_avi and demux_asf. demux_lavf will set the
codec as determined by libavformat, while the other demuxers have to do
this on their own, using the mp_set_audio/video_codec_from_tag()
functions. Note that the sh_audio/video->format members don't uniquely
identify the codec anymore, and sh->codec takes over this role.
Replace the --ac/--vc/--afm/--vfm with new --vd/--ad options, which
provide cover the functionality of the removed switched.
Note: there's no CODECS_FLAG_FLIP flag anymore. This means some obscure
container/video combinations (e.g. the sample Film_200_zygo_pro.mov)
are played flipped. ffplay/avplay doesn't handle this properly either,
so we don't care and blame ffmeg/libav instead.
2013-02-09 14:15:19 +00:00
|
|
|
// E.g. "h264" (usually corresponds to AVCodecDescriptor.name)
|
|
|
|
const char *codec;
|
|
|
|
|
demux_lavf, ad_lavc, vd_lavc: pass codec header data directly
Instead of putting codec header data into WAVEFORMATEX and
BITMAPINFOHEADER, pass it directly via AVCodecContext. To do this, we
add mp_copy_lav_codec_headers(), which copies the codec header data
from one AVCodecContext to another (originally, the plan was to use
avcodec_copy_context() for this, but it looks like this would turn
decoder initialization into an even worse mess).
Get rid of the silly CodecID <-> codec_tag mapping. This was originally
needed for codecs.conf: codec tags were used to identify codecs, but
libavformat didn't always return useful codec tags (different file
formats can have different, overlapping tag numbers). Since we don't
go through WAVEFORMATEX etc. and pass all header data directly via
AVCodecContext, we can be absolutely sure that the codec tag mapping is
not needed anymore.
Note that this also destroys the "standard" MPlayer method of exporting
codec header data. WAVEFORMATEX and BITMAPINFOHEADER made sure that
other non-libavcodec decoders could be initialized. However, all these
decoders have been removed, so this is just cruft full of old hacks that
are not needed anymore. There's still ad_spdif and ad_mpg123, bu neither
of these need codec header data. Should we ever add non-libavcodec
decoders, better data structures without the past hacks could be added
to export the headers.
2013-02-09 14:15:37 +00:00
|
|
|
// Codec specific header data (set by demux_lavf.c)
|
|
|
|
// Other demuxers use sh_audio->wf and sh_video->bih instead.
|
|
|
|
struct AVCodecContext *lav_headers;
|
2012-10-28 23:06:51 +00:00
|
|
|
|
2012-08-03 10:24:55 +00:00
|
|
|
char *title;
|
2013-02-09 14:15:28 +00:00
|
|
|
char *lang; // language code
|
2012-12-10 17:52:06 +00:00
|
|
|
bool default_track; // container default track flag
|
core: completely change handling of attached picture pseudo video
Before this commit, we tried to play along with libavformat and tried
to pretend that attached pictures are video streams with a single
frame, and that the frame magically appeared at the seek position when
seeking. The playback core would then switch to a mode where the video
has ended, and the "remaining" audio is played.
This didn't work very well:
- we needed a hack in demux.c, because we tried to read more packets in
order to find the "next" video frame (libavformat doesn't tell us if
a stream has ended)
- switching the video stream didn't work, because we can't tell
libavformat to send the packet again
- seeking and resuming after was hacky (for some reason libavformat sets
the returned packet's PTS to that of the previously returned audio
packet in generic code not related to attached pictures, and this
happened to work)
- if the user did something stupid and e.g. inserted a deinterlacer by
default, a picture was never displayed, only an inactive VO window)
- same when using a command that reconfigured the VO (like switching
aspect or video filters)
- hr-seek didn't work
For this reason, handle attached pictures as separate case with a
separate video decoding function, which doesn't read packets. Also,
do not synchronize audio to video start in this case.
2013-07-11 17:23:56 +00:00
|
|
|
|
|
|
|
// stream is a picture (such as album art)
|
|
|
|
struct demux_packet *attached_picture;
|
2012-08-03 10:24:55 +00:00
|
|
|
|
core: redo how codecs are mapped, remove codecs.conf
Use codec names instead of FourCCs to identify codecs. Rewrite how
codecs are selected and initialized. Now each decoder exports a list
of decoders (and the codec it supports) via add_decoders(). The order
matters, and the first decoder for a given decoder is preferred over
the other decoders. E.g. all ad_mpg123 decoders are preferred over
ad_lavc, because it comes first in the mpcodecs_ad_drivers array.
Likewise, decoders within ad_lavc that are enumerated first by
libavcodec (using av_codec_next()) are preferred. (This is actually
critical to select h264 software decoding by default instead of vdpau.
libavcodec and ffmpeg/avconv use the same method to select decoders by
default, so we hope this is sane.)
The codec names follow libavcodec's codec names as defined by
AVCodecDescriptor.name (see libavcodec/codec_desc.c). Some decoders
have names different from the canonical codec name. The AVCodecDescriptor
API is relatively new, so we need a compatibility layer for older
libavcodec versions for codec names that are referenced internally,
and which are different from the decoder name. (Add a configure check
for that, because checking versions is getting way too messy.)
demux/codec_tags.c is generated from the former codecs.conf (minus
"special" decoders like vdpau, and excluding the mappings that are the
same as the mappings libavformat's exported RIFF tables). It contains
all the mappings from FourCCs to codec name. This is needed for
demux_mkv, demux_mpg, demux_avi and demux_asf. demux_lavf will set the
codec as determined by libavformat, while the other demuxers have to do
this on their own, using the mp_set_audio/video_codec_from_tag()
functions. Note that the sh_audio/video->format members don't uniquely
identify the codec anymore, and sh->codec takes over this role.
Replace the --ac/--vc/--afm/--vfm with new --vd/--ad options, which
provide cover the functionality of the removed switched.
Note: there's no CODECS_FLAG_FLIP flag anymore. This means some obscure
container/video combinations (e.g. the sample Film_200_zygo_pro.mov)
are played flipped. ffplay/avplay doesn't handle this properly either,
so we don't care and blame ffmeg/libav instead.
2013-02-09 14:15:19 +00:00
|
|
|
// Human readable description of the running decoder, or NULL
|
|
|
|
char *decoder_desc;
|
|
|
|
|
2012-08-03 10:24:55 +00:00
|
|
|
// shouldn't exist type of stuff
|
|
|
|
struct MPOpts *opts;
|
2013-07-11 17:20:25 +00:00
|
|
|
|
|
|
|
// Internal to demux.c
|
|
|
|
struct demux_stream *ds;
|
2012-08-03 10:24:55 +00:00
|
|
|
};
|
|
|
|
|
2011-07-03 07:30:50 +00:00
|
|
|
#define SH_COMMON \
|
2012-08-03 10:24:55 +00:00
|
|
|
struct sh_stream *gsh; \
|
2011-07-03 07:30:50 +00:00
|
|
|
struct MPOpts *opts; \
|
core: redo how codecs are mapped, remove codecs.conf
Use codec names instead of FourCCs to identify codecs. Rewrite how
codecs are selected and initialized. Now each decoder exports a list
of decoders (and the codec it supports) via add_decoders(). The order
matters, and the first decoder for a given decoder is preferred over
the other decoders. E.g. all ad_mpg123 decoders are preferred over
ad_lavc, because it comes first in the mpcodecs_ad_drivers array.
Likewise, decoders within ad_lavc that are enumerated first by
libavcodec (using av_codec_next()) are preferred. (This is actually
critical to select h264 software decoding by default instead of vdpau.
libavcodec and ffmpeg/avconv use the same method to select decoders by
default, so we hope this is sane.)
The codec names follow libavcodec's codec names as defined by
AVCodecDescriptor.name (see libavcodec/codec_desc.c). Some decoders
have names different from the canonical codec name. The AVCodecDescriptor
API is relatively new, so we need a compatibility layer for older
libavcodec versions for codec names that are referenced internally,
and which are different from the decoder name. (Add a configure check
for that, because checking versions is getting way too messy.)
demux/codec_tags.c is generated from the former codecs.conf (minus
"special" decoders like vdpau, and excluding the mappings that are the
same as the mappings libavformat's exported RIFF tables). It contains
all the mappings from FourCCs to codec name. This is needed for
demux_mkv, demux_mpg, demux_avi and demux_asf. demux_lavf will set the
codec as determined by libavformat, while the other demuxers have to do
this on their own, using the mp_set_audio/video_codec_from_tag()
functions. Note that the sh_audio/video->format members don't uniquely
identify the codec anymore, and sh->codec takes over this role.
Replace the --ac/--vc/--afm/--vfm with new --vd/--ad options, which
provide cover the functionality of the removed switched.
Note: there's no CODECS_FLAG_FLIP flag anymore. This means some obscure
container/video combinations (e.g. the sample Film_200_zygo_pro.mov)
are played flipped. ffplay/avplay doesn't handle this properly either,
so we don't care and blame ffmeg/libav instead.
2013-02-09 14:15:19 +00:00
|
|
|
/* usually a FourCC, exact meaning depends on gsh->format */ \
|
2011-07-03 07:30:50 +00:00
|
|
|
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; \
|
2009-12-27 14:40:56 +00:00
|
|
|
|
2008-04-16 02:00:34 +00:00
|
|
|
typedef struct sh_audio {
|
2011-07-03 07:30:50 +00:00
|
|
|
SH_COMMON
|
|
|
|
// output format:
|
|
|
|
int sample_format;
|
|
|
|
int samplerate;
|
2013-04-06 20:43:12 +00:00
|
|
|
struct mp_chmap channels;
|
2011-07-03 07:30:50 +00:00
|
|
|
int i_bps; // == bitrate (compressed bytes/sec)
|
audio: add support for using non-interleaved audio from decoders directly
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.
2013-11-12 21:27:44 +00:00
|
|
|
// decoder state:
|
|
|
|
struct mp_audio_buffer *decode_buffer;
|
2011-07-03 07:30:50 +00:00
|
|
|
struct af_stream *afilter; // the audio filter stream
|
|
|
|
const struct ad_functions *ad_driver;
|
|
|
|
// win32-compatible codec parameters:
|
2013-11-02 14:10:28 +00:00
|
|
|
MP_WAVEFORMATEX *wf;
|
2011-07-03 07:30:50 +00:00
|
|
|
// note codec extradata may be either under "wf" or "codecdata"
|
|
|
|
unsigned char *codecdata;
|
|
|
|
int codecdata_len;
|
audio: add support for using non-interleaved audio from decoders directly
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.
2013-11-12 21:27:44 +00:00
|
|
|
int pts_offset; // number of samples output by decoder after last known pts
|
2001-04-06 01:18:59 +00:00
|
|
|
} sh_audio_t;
|
|
|
|
|
2008-04-16 02:00:34 +00:00
|
|
|
typedef struct sh_video {
|
2011-07-03 07:30:50 +00:00
|
|
|
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)
|
2013-07-14 23:04:49 +00:00
|
|
|
int disp_w, disp_h; // display size (filled by demuxer or decoder)
|
2011-07-03 07:30:50 +00:00
|
|
|
// 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
|
core: add --deinterlace option, restore it with resume functionality
The --deinterlace option does on playback start what the "deinterlace"
property normally does at runtime. You could do this before by using the
--vf option or by messing with the vo_vdpau default options, but this
new option is supposed to be a "foolproof" way.
The main motivation for adding this is so that the deinterlace property
can be restored when using the video resume functionality
(quit_watch_later command).
Implementation-wise, this is a bit messy. The video chain is rebuilt in
mpcodecs_reconfig_vo(), where we don't have access to MPContext, so the
usual mechanism for enabling deinterlacing can't be used. Further,
mpcodecs_reconfig_vo() is called by the video decoder, which doesn't
have access to MPContext either. Moving this call to mplayer.c isn't
currently possible either (see below). So we just do this before frames
are filtered, which potentially means setting the deinterlacing every
frame. Fortunately, setting deinterlacing is stable and idempotent, so
this is hopefully not a problem. We also add a counter that is
incremented on each reconfig to reduce the amount of additional work per
frame to nearly zero.
The reason we can't move mpcodecs_reconfig_vo() to mplayer.c is because
of hardware decoding: we need to check whether the video chain works
before we decide that we can use hardware decoding. Changing it so that
this can be decided in advance without building a filter chain sounds
like a good idea and should be done, but we aren't there yet.
2013-09-13 16:06:08 +00:00
|
|
|
long vf_reconfig_count; // incremented each mpcodecs_reconfig_vo() call
|
vdpau: split off decoder parts, use "new" libavcodec vdpau hwaccel API
Move the decoder parts from vo_vdpau.c to a new file vdpau_old.c. This
file is named so because because it's written against the "old"
libavcodec vdpau pseudo-decoder (e.g. "h264_vdpau").
Add support for the "new" libavcodec vdpau support. This was recently
added and replaces the "old" vdpau parts. (In fact, Libav is about to
deprecate and remove the "old" API without deprecation grace period,
so we have to support it now. Moreover, there will probably be no Libav
release which supports both, so the transition is even less smooth than
we could hope, and we have to support both the old and new API.)
Whether the old or new API is used is checked by a configure test: if
the new API is found, it is used, otherwise the old API is assumed.
Some details might be handled differently. Especially display preemption
is a bit problematic with the "new" libavcodec vdpau support: it wants
to keep a pointer to a specific vdpau API function (which can be driver
specific, because preemption might switch drivers). Also, surface IDs
are now directly stored in AVFrames (and mp_images), so they can't be
forced to VDP_INVALID_HANDLE on preemption. (This changes even with
older libavcodec versions, because mp_image always uses the newer
representation to make vo_vdpau.c simpler.)
Decoder initialization in the new code tries to deal with codec
profiles, while the old code always uses the highest profile per codec.
Surface allocation changes. Since the decoder won't call config() in
vo_vdpau.c on video size change anymore, we allow allocating surfaces
of arbitrary size instead of locking it to what the VO was configured.
The non-hwdec code also has slightly different allocation behavior now.
Enabling the old vdpau special decoders via e.g. --vd=lavc:h264_vdpau
doesn't work anymore (a warning suggesting the --hwdec option is
printed instead).
2013-07-27 23:49:45 +00:00
|
|
|
struct mp_image_params *vf_input; // video filter input params
|
|
|
|
struct mp_hwdec_info *hwdec_info; // video output hwdec handles
|
2011-07-03 07:30:50 +00:00
|
|
|
// win32-compatible codec parameters:
|
2013-11-02 14:10:28 +00:00
|
|
|
MP_BITMAPINFOHEADER *bih;
|
2001-04-06 01:18:59 +00:00
|
|
|
} sh_video_t;
|
|
|
|
|
2008-04-16 02:00:34 +00:00
|
|
|
typedef struct sh_sub {
|
2011-07-03 07:30:50 +00:00
|
|
|
SH_COMMON
|
|
|
|
unsigned char *extradata; // extra header data passed from demuxer
|
|
|
|
int extradata_len;
|
2013-06-23 20:14:43 +00:00
|
|
|
int frame_based; // timestamps are frame-based
|
2013-06-23 20:16:47 +00:00
|
|
|
bool is_utf8; // if false, subtitle packet charset is unknown
|
2013-06-01 17:54:18 +00:00
|
|
|
struct ass_track *track; // loaded by libass
|
|
|
|
struct dec_sub *dec_sub; // decoder context
|
2006-11-13 18:38:29 +00:00
|
|
|
} sh_sub_t;
|
|
|
|
|
2008-02-22 09:09:46 +00:00
|
|
|
#endif /* MPLAYER_STHEADER_H */
|