2010-01-30 16:57:40 +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.
|
|
|
|
*/
|
2002-03-01 00:25:43 +00:00
|
|
|
|
|
|
|
#include "config.h"
|
2013-12-17 01:02:25 +00:00
|
|
|
#include "options/options.h"
|
2002-03-01 00:25:43 +00:00
|
|
|
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <stdlib.h>
|
2008-12-01 17:53:57 +00:00
|
|
|
#include <stdbool.h>
|
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
|
|
|
#include <assert.h>
|
|
|
|
|
2013-08-06 20:41:30 +00:00
|
|
|
#include "mpvcore/mp_msg.h"
|
2002-03-01 00:25:43 +00:00
|
|
|
|
2003-02-09 20:18:23 +00:00
|
|
|
#include "osdep/timer.h"
|
2002-03-01 00:25:43 +00:00
|
|
|
|
2007-03-15 17:10:36 +00:00
|
|
|
#include "stream/stream.h"
|
2013-11-18 17:46:44 +00:00
|
|
|
#include "demux/packet.h"
|
2002-03-01 00:25:43 +00:00
|
|
|
|
2013-08-06 20:41:30 +00:00
|
|
|
#include "mpvcore/codecs.h"
|
2002-03-01 00:25:43 +00:00
|
|
|
|
2012-11-09 00:06:43 +00:00
|
|
|
#include "video/out/vo.h"
|
|
|
|
#include "video/csputils.h"
|
2002-03-01 00:25:43 +00:00
|
|
|
|
2012-11-09 00:06:43 +00:00
|
|
|
#include "demux/stheader.h"
|
|
|
|
#include "video/decode/vd.h"
|
|
|
|
#include "video/filter/vf.h"
|
2002-03-01 00:25:43 +00:00
|
|
|
|
2012-11-09 00:06:43 +00:00
|
|
|
#include "video/decode/dec_video.h"
|
2002-03-01 00:25:43 +00:00
|
|
|
|
2013-11-23 20:28:28 +00:00
|
|
|
extern const vd_functions_t mpcodecs_vd_ffmpeg;
|
|
|
|
|
|
|
|
/* Please do not add any new decoders here. If you want to implement a new
|
|
|
|
* decoder, add it to libavcodec, except for wrappers around external
|
|
|
|
* libraries and decoders requiring binary support. */
|
|
|
|
|
|
|
|
const vd_functions_t * const mpcodecs_vd_drivers[] = {
|
|
|
|
&mpcodecs_vd_ffmpeg,
|
|
|
|
/* Please do not add any new decoders here. If you want to implement a new
|
|
|
|
* decoder, add it to libavcodec, except for wrappers around external
|
|
|
|
* libraries and decoders requiring binary support. */
|
|
|
|
NULL
|
|
|
|
};
|
2002-03-01 00:25:43 +00:00
|
|
|
|
2013-11-27 19:54:07 +00:00
|
|
|
void video_reset_decoding(struct dec_video *d_video)
|
|
|
|
{
|
|
|
|
video_vd_control(d_video, VDCTRL_RESET, NULL);
|
2013-12-07 18:32:44 +00:00
|
|
|
if (d_video->vfilter && d_video->vfilter->initialized == 1)
|
|
|
|
vf_seek_reset(d_video->vfilter);
|
video: display last frame, drain frames on video reconfig
Until now, the player didn't care to drain frames on video reconfig.
Instead, the VO was reconfigured (i.e. resized) before the queued frames
finished displaying. This can for example be observed by passing
multiple images with different size as mf:// filename. Then the window
would resize one frame before image with the new size is displayed. With
--vo=vdpau, the effect is worse, because this VO queues more than 1
frame internally.
Fix this by explicitly draining buffered frames before video reconfig.
Raise the display time of the last frame. Otherwise, the last frame
would be shown for a very short time only. This usually doesn't matter,
but helps when playing image files. This is a byproduct of frame
draining, because normally, video timing is based on the frames queued
to the VO, and we can't do that with frames of different size or format.
So we pretend that the frame before the change is the last frame in
order to time it. This code is incorrect though: it tries to use the
framerate, which often doesn't make sense. But it's good enough to test
this code with mf://.
2013-12-10 18:33:11 +00:00
|
|
|
mp_image_unrefp(&d_video->waiting_decoded_mpi);
|
2013-11-27 19:54:29 +00:00
|
|
|
d_video->num_buffered_pts = 0;
|
|
|
|
d_video->last_pts = MP_NOPTS_VALUE;
|
|
|
|
d_video->last_packet_pdts = MP_NOPTS_VALUE;
|
video: refactor PTS code, add fall back heuristic to DTS
Refactor the PTS handling code to make it cleaner, and to separate the
bits that use PTS sorting.
Add a heuristic to fall back to DTS if the PTS us non-monotonic. This
code is based on what FFmpeg/Libav use for ffplay/avplay and also
best_effort_timestamp (which is only in FFmpeg). Basically, this 1. just
uses the DTS if PTS is unset, and 2. ignores PTS entirely if PTS is non-
monotonic, but DTS is sorted.
The code is pretty much the same as in Libav [1]. I'm not sure if all of
it is really needed, or if it does more than what the paragraph above
mentions. But maybe it's fine to cargo-cult this.
This heuristic fixes playback of mpeg4 in ogm, which returns packets
with PTS==DTS, even though the PTS timestamps should follow codec
reordering. This is probably a libavformat demuxer bug, but good luck
trying to fix it.
The way vd_lavc.c returns the frame PTS and DTS to dec_video.c is a bit
inelegant, but maybe better than trying to mess the PTS back into the
decoder callback again.
[1] https://git.libav.org/?p=libav.git;a=blob;f=cmdutils.c;h=3f1c667075724c5cde69d840ed5ed7d992898334;hb=fa515c2088e1d082d45741bbd5c05e13b0500804#l1431
2013-11-27 19:54:56 +00:00
|
|
|
d_video->decoded_pts = MP_NOPTS_VALUE;
|
|
|
|
d_video->codec_pts = MP_NOPTS_VALUE;
|
|
|
|
d_video->codec_dts = MP_NOPTS_VALUE;
|
|
|
|
d_video->sorted_pts = MP_NOPTS_VALUE;
|
|
|
|
d_video->unsorted_pts = MP_NOPTS_VALUE;
|
2013-11-27 19:54:07 +00:00
|
|
|
}
|
|
|
|
|
2013-11-23 20:36:20 +00:00
|
|
|
int video_vd_control(struct dec_video *d_video, int cmd, void *arg)
|
2013-07-14 22:52:17 +00:00
|
|
|
{
|
2013-11-23 20:36:20 +00:00
|
|
|
const struct vd_functions *vd = d_video->vd_driver;
|
2013-07-14 22:52:17 +00:00
|
|
|
if (vd)
|
2013-11-23 20:36:20 +00:00
|
|
|
return vd->control(d_video, cmd, arg);
|
2013-07-14 22:52:17 +00:00
|
|
|
return CONTROL_UNKNOWN;
|
|
|
|
}
|
|
|
|
|
2013-11-23 20:36:20 +00:00
|
|
|
int video_set_colors(struct dec_video *d_video, const char *item, int value)
|
2002-03-01 00:25:43 +00:00
|
|
|
{
|
2002-07-28 21:30:09 +00:00
|
|
|
vf_equalizer_t data;
|
|
|
|
|
|
|
|
data.item = item;
|
|
|
|
data.value = value;
|
2002-07-25 13:12:23 +00:00
|
|
|
|
2013-12-16 19:40:02 +00:00
|
|
|
mp_msg(MSGT_DECVIDEO, MSGL_V, "set video colors %s=%d \n", item, value);
|
2013-12-07 18:32:44 +00:00
|
|
|
if (d_video->vfilter) {
|
2013-12-10 18:08:56 +00:00
|
|
|
int ret = video_vf_vo_control(d_video, VFCTRL_SET_EQUALIZER, &data);
|
2008-04-24 02:23:45 +00:00
|
|
|
if (ret == CONTROL_TRUE)
|
2008-06-04 05:10:48 +00:00
|
|
|
return 1;
|
2002-07-25 10:27:35 +00:00
|
|
|
}
|
2013-12-16 19:40:02 +00:00
|
|
|
mp_msg(MSGT_DECVIDEO, MSGL_V, "Video attribute '%s' is not supported by selected vo.\n",
|
2008-04-24 02:23:45 +00:00
|
|
|
item);
|
2002-07-24 18:14:21 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2013-11-23 20:36:20 +00:00
|
|
|
int video_get_colors(struct dec_video *d_video, const char *item, int *value)
|
2002-07-24 18:14:21 +00:00
|
|
|
{
|
2002-07-28 21:30:09 +00:00
|
|
|
vf_equalizer_t data;
|
|
|
|
|
|
|
|
data.item = item;
|
2002-07-25 13:12:23 +00:00
|
|
|
|
2013-12-16 19:40:02 +00:00
|
|
|
mp_msg(MSGT_DECVIDEO, MSGL_V, "get video colors %s \n", item);
|
2013-12-07 18:32:44 +00:00
|
|
|
if (d_video->vfilter) {
|
2013-12-10 18:08:56 +00:00
|
|
|
int ret = video_vf_vo_control(d_video, VFCTRL_GET_EQUALIZER, &data);
|
2008-04-24 02:23:45 +00:00
|
|
|
if (ret == CONTROL_TRUE) {
|
|
|
|
*value = data.value;
|
2008-06-04 05:10:48 +00:00
|
|
|
return 1;
|
2008-04-24 02:23:45 +00:00
|
|
|
}
|
2002-07-25 13:12:23 +00:00
|
|
|
}
|
2002-03-01 00:25:43 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2013-11-23 20:36:20 +00:00
|
|
|
void video_uninit(struct dec_video *d_video)
|
2006-07-06 06:58:17 +00:00
|
|
|
{
|
video: display last frame, drain frames on video reconfig
Until now, the player didn't care to drain frames on video reconfig.
Instead, the VO was reconfigured (i.e. resized) before the queued frames
finished displaying. This can for example be observed by passing
multiple images with different size as mf:// filename. Then the window
would resize one frame before image with the new size is displayed. With
--vo=vdpau, the effect is worse, because this VO queues more than 1
frame internally.
Fix this by explicitly draining buffered frames before video reconfig.
Raise the display time of the last frame. Otherwise, the last frame
would be shown for a very short time only. This usually doesn't matter,
but helps when playing image files. This is a byproduct of frame
draining, because normally, video timing is based on the frames queued
to the VO, and we can't do that with frames of different size or format.
So we pretend that the frame before the change is the last frame in
order to time it. This code is incorrect though: it tries to use the
framerate, which often doesn't make sense. But it's good enough to test
this code with mf://.
2013-12-10 18:33:11 +00:00
|
|
|
mp_image_unrefp(&d_video->waiting_decoded_mpi);
|
2013-11-23 20:38:39 +00:00
|
|
|
if (d_video->vd_driver) {
|
2013-12-16 19:40:02 +00:00
|
|
|
mp_msg(MSGT_DECVIDEO, MSGL_V, "Uninit video.\n");
|
2013-11-23 20:36:20 +00:00
|
|
|
d_video->vd_driver->uninit(d_video);
|
|
|
|
}
|
|
|
|
talloc_free(d_video->priv);
|
2013-12-07 18:32:44 +00:00
|
|
|
vf_destroy(d_video->vfilter);
|
2013-11-23 20:36:20 +00:00
|
|
|
talloc_free(d_video);
|
2002-03-01 00:25:43 +00:00
|
|
|
}
|
|
|
|
|
2013-11-23 20:36:20 +00:00
|
|
|
static int init_video_codec(struct dec_video *d_video, const char *decoder)
|
2008-04-24 02:23:45 +00:00
|
|
|
{
|
2013-11-23 20:36:20 +00:00
|
|
|
if (!d_video->vd_driver->init(d_video, decoder)) {
|
2013-12-16 19:40:02 +00:00
|
|
|
mp_msg(MSGT_DECVIDEO, MSGL_V, "Video decoder init failed.\n");
|
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
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
return 1;
|
2002-08-31 13:09:23 +00:00
|
|
|
}
|
|
|
|
|
2013-11-23 20:36:20 +00:00
|
|
|
struct mp_decoder_list *video_decoder_list(void)
|
2008-04-24 02:23:45 +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
|
|
|
struct mp_decoder_list *list = talloc_zero(NULL, struct mp_decoder_list);
|
|
|
|
for (int i = 0; mpcodecs_vd_drivers[i] != NULL; i++)
|
|
|
|
mpcodecs_vd_drivers[i]->add_decoders(list);
|
|
|
|
return list;
|
|
|
|
}
|
2002-05-29 22:39:25 +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
|
|
|
static struct mp_decoder_list *mp_select_video_decoders(const char *codec,
|
|
|
|
char *selection)
|
|
|
|
{
|
2013-11-23 20:36:20 +00:00
|
|
|
struct mp_decoder_list *list = video_decoder_list();
|
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
|
|
|
struct mp_decoder_list *new = mp_select_decoders(list, codec, selection);
|
|
|
|
talloc_free(list);
|
|
|
|
return new;
|
|
|
|
}
|
2008-04-24 03:41:12 +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
|
|
|
static const struct vd_functions *find_driver(const char *name)
|
|
|
|
{
|
|
|
|
for (int i = 0; mpcodecs_vd_drivers[i] != NULL; i++) {
|
|
|
|
if (strcmp(mpcodecs_vd_drivers[i]->name, name) == 0)
|
|
|
|
return mpcodecs_vd_drivers[i];
|
2002-03-01 00:26:10 +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
|
|
|
return NULL;
|
2002-03-01 00:25:43 +00:00
|
|
|
}
|
|
|
|
|
2013-11-23 20:38:39 +00:00
|
|
|
bool video_init_best_codec(struct dec_video *d_video, char* video_decoders)
|
2008-04-24 02:23:45 +00:00
|
|
|
{
|
2013-11-23 20:38:39 +00:00
|
|
|
assert(!d_video->vd_driver);
|
2013-11-27 19:54:29 +00:00
|
|
|
video_reset_decoding(d_video);
|
2013-11-28 12:34:56 +00:00
|
|
|
d_video->has_broken_packet_pts = -10; // needs 10 packets to reach decision
|
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
|
|
|
|
|
|
|
struct mp_decoder_entry *decoder = NULL;
|
|
|
|
struct mp_decoder_list *list =
|
2013-11-23 20:36:20 +00:00
|
|
|
mp_select_video_decoders(d_video->header->codec, video_decoders);
|
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
|
|
|
|
|
|
|
mp_print_decoders(MSGT_DECVIDEO, MSGL_V, "Codec list:", list);
|
|
|
|
|
|
|
|
for (int n = 0; n < list->num_entries; n++) {
|
|
|
|
struct mp_decoder_entry *sel = &list->entries[n];
|
|
|
|
const struct vd_functions *driver = find_driver(sel->family);
|
|
|
|
if (!driver)
|
|
|
|
continue;
|
2013-12-16 19:40:02 +00:00
|
|
|
mp_msg(MSGT_DECVIDEO, MSGL_V, "Opening video decoder %s:%s\n",
|
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
|
|
|
sel->family, sel->decoder);
|
2013-11-23 20:36:20 +00:00
|
|
|
d_video->vd_driver = driver;
|
|
|
|
if (init_video_codec(d_video, sel->decoder)) {
|
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
|
|
|
decoder = sel;
|
|
|
|
break;
|
2008-04-24 02:23:45 +00:00
|
|
|
}
|
2013-11-23 20:36:20 +00:00
|
|
|
d_video->vd_driver = NULL;
|
2013-12-16 19:40:02 +00:00
|
|
|
mp_msg(MSGT_DECVIDEO, MSGL_WARN, "Video decoder init failed for "
|
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
|
|
|
"%s:%s\n", sel->family, sel->decoder);
|
2002-09-25 23:45:34 +00:00
|
|
|
}
|
|
|
|
|
2013-11-23 20:38:39 +00:00
|
|
|
if (d_video->vd_driver) {
|
2013-11-23 20:36:20 +00:00
|
|
|
d_video->decoder_desc =
|
|
|
|
talloc_asprintf(d_video, "%s [%s:%s]", decoder->desc, decoder->family,
|
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
|
|
|
decoder->decoder);
|
|
|
|
mp_msg(MSGT_DECVIDEO, MSGL_INFO, "Selected video codec: %s\n",
|
2013-11-23 20:36:20 +00:00
|
|
|
d_video->decoder_desc);
|
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
|
|
|
} else {
|
|
|
|
mp_msg(MSGT_DECVIDEO, MSGL_ERR,
|
|
|
|
"Failed to initialize a video decoder for codec '%s'.\n",
|
2013-11-23 20:36:20 +00:00
|
|
|
d_video->header->codec ? d_video->header->codec : "<unknown>");
|
2008-04-24 02:23:45 +00:00
|
|
|
}
|
2002-09-25 23:45:34 +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
|
|
|
talloc_free(list);
|
2013-11-23 20:38:39 +00:00
|
|
|
return !!d_video->vd_driver;
|
2002-09-25 23:45:34 +00:00
|
|
|
}
|
|
|
|
|
video: refactor PTS code, add fall back heuristic to DTS
Refactor the PTS handling code to make it cleaner, and to separate the
bits that use PTS sorting.
Add a heuristic to fall back to DTS if the PTS us non-monotonic. This
code is based on what FFmpeg/Libav use for ffplay/avplay and also
best_effort_timestamp (which is only in FFmpeg). Basically, this 1. just
uses the DTS if PTS is unset, and 2. ignores PTS entirely if PTS is non-
monotonic, but DTS is sorted.
The code is pretty much the same as in Libav [1]. I'm not sure if all of
it is really needed, or if it does more than what the paragraph above
mentions. But maybe it's fine to cargo-cult this.
This heuristic fixes playback of mpeg4 in ogm, which returns packets
with PTS==DTS, even though the PTS timestamps should follow codec
reordering. This is probably a libavformat demuxer bug, but good luck
trying to fix it.
The way vd_lavc.c returns the frame PTS and DTS to dec_video.c is a bit
inelegant, but maybe better than trying to mess the PTS back into the
decoder callback again.
[1] https://git.libav.org/?p=libav.git;a=blob;f=cmdutils.c;h=3f1c667075724c5cde69d840ed5ed7d992898334;hb=fa515c2088e1d082d45741bbd5c05e13b0500804#l1431
2013-11-27 19:54:56 +00:00
|
|
|
static void add_pts_to_sort(struct dec_video *d_video, double pts)
|
2013-11-25 22:16:22 +00:00
|
|
|
{
|
video: refactor PTS code, add fall back heuristic to DTS
Refactor the PTS handling code to make it cleaner, and to separate the
bits that use PTS sorting.
Add a heuristic to fall back to DTS if the PTS us non-monotonic. This
code is based on what FFmpeg/Libav use for ffplay/avplay and also
best_effort_timestamp (which is only in FFmpeg). Basically, this 1. just
uses the DTS if PTS is unset, and 2. ignores PTS entirely if PTS is non-
monotonic, but DTS is sorted.
The code is pretty much the same as in Libav [1]. I'm not sure if all of
it is really needed, or if it does more than what the paragraph above
mentions. But maybe it's fine to cargo-cult this.
This heuristic fixes playback of mpeg4 in ogm, which returns packets
with PTS==DTS, even though the PTS timestamps should follow codec
reordering. This is probably a libavformat demuxer bug, but good luck
trying to fix it.
The way vd_lavc.c returns the frame PTS and DTS to dec_video.c is a bit
inelegant, but maybe better than trying to mess the PTS back into the
decoder callback again.
[1] https://git.libav.org/?p=libav.git;a=blob;f=cmdutils.c;h=3f1c667075724c5cde69d840ed5ed7d992898334;hb=fa515c2088e1d082d45741bbd5c05e13b0500804#l1431
2013-11-27 19:54:56 +00:00
|
|
|
if (pts != MP_NOPTS_VALUE) {
|
|
|
|
int delay = -1;
|
|
|
|
video_vd_control(d_video, VDCTRL_QUERY_UNSEEN_FRAMES, &delay);
|
|
|
|
if (delay >= 0 && delay < d_video->num_buffered_pts)
|
|
|
|
d_video->num_buffered_pts = delay;
|
|
|
|
if (d_video->num_buffered_pts ==
|
|
|
|
sizeof(d_video->buffered_pts) / sizeof(double))
|
|
|
|
mp_msg(MSGT_DECVIDEO, MSGL_ERR, "Too many buffered pts\n");
|
|
|
|
else {
|
|
|
|
int i, j;
|
|
|
|
for (i = 0; i < d_video->num_buffered_pts; i++)
|
|
|
|
if (d_video->buffered_pts[i] < pts)
|
|
|
|
break;
|
|
|
|
for (j = d_video->num_buffered_pts; j > i; j--)
|
|
|
|
d_video->buffered_pts[j] = d_video->buffered_pts[j - 1];
|
|
|
|
d_video->buffered_pts[i] = pts;
|
|
|
|
d_video->num_buffered_pts++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2013-11-25 22:16:22 +00:00
|
|
|
|
video: refactor PTS code, add fall back heuristic to DTS
Refactor the PTS handling code to make it cleaner, and to separate the
bits that use PTS sorting.
Add a heuristic to fall back to DTS if the PTS us non-monotonic. This
code is based on what FFmpeg/Libav use for ffplay/avplay and also
best_effort_timestamp (which is only in FFmpeg). Basically, this 1. just
uses the DTS if PTS is unset, and 2. ignores PTS entirely if PTS is non-
monotonic, but DTS is sorted.
The code is pretty much the same as in Libav [1]. I'm not sure if all of
it is really needed, or if it does more than what the paragraph above
mentions. But maybe it's fine to cargo-cult this.
This heuristic fixes playback of mpeg4 in ogm, which returns packets
with PTS==DTS, even though the PTS timestamps should follow codec
reordering. This is probably a libavformat demuxer bug, but good luck
trying to fix it.
The way vd_lavc.c returns the frame PTS and DTS to dec_video.c is a bit
inelegant, but maybe better than trying to mess the PTS back into the
decoder callback again.
[1] https://git.libav.org/?p=libav.git;a=blob;f=cmdutils.c;h=3f1c667075724c5cde69d840ed5ed7d992898334;hb=fa515c2088e1d082d45741bbd5c05e13b0500804#l1431
2013-11-27 19:54:56 +00:00
|
|
|
// Return true if pts1 comes before pts2. pts1 can be MP_NOPTS_VALUE, but pts2
|
|
|
|
// always has to be valid. pts1 can't be equal or larger than pts2.
|
|
|
|
#define PTS_IS_ORDERED(pts1, pts2) \
|
|
|
|
((pts2) != MP_NOPTS_VALUE && ((pts1) == MP_NOPTS_VALUE || ((pts1) < (pts2))))
|
2013-11-25 22:16:22 +00:00
|
|
|
|
video: refactor PTS code, add fall back heuristic to DTS
Refactor the PTS handling code to make it cleaner, and to separate the
bits that use PTS sorting.
Add a heuristic to fall back to DTS if the PTS us non-monotonic. This
code is based on what FFmpeg/Libav use for ffplay/avplay and also
best_effort_timestamp (which is only in FFmpeg). Basically, this 1. just
uses the DTS if PTS is unset, and 2. ignores PTS entirely if PTS is non-
monotonic, but DTS is sorted.
The code is pretty much the same as in Libav [1]. I'm not sure if all of
it is really needed, or if it does more than what the paragraph above
mentions. But maybe it's fine to cargo-cult this.
This heuristic fixes playback of mpeg4 in ogm, which returns packets
with PTS==DTS, even though the PTS timestamps should follow codec
reordering. This is probably a libavformat demuxer bug, but good luck
trying to fix it.
The way vd_lavc.c returns the frame PTS and DTS to dec_video.c is a bit
inelegant, but maybe better than trying to mess the PTS back into the
decoder callback again.
[1] https://git.libav.org/?p=libav.git;a=blob;f=cmdutils.c;h=3f1c667075724c5cde69d840ed5ed7d992898334;hb=fa515c2088e1d082d45741bbd5c05e13b0500804#l1431
2013-11-27 19:54:56 +00:00
|
|
|
static double retrieve_sorted_pts(struct dec_video *d_video, double codec_pts)
|
|
|
|
{
|
|
|
|
struct MPOpts *opts = d_video->opts;
|
|
|
|
|
|
|
|
double sorted_pts;
|
|
|
|
if (d_video->num_buffered_pts) {
|
|
|
|
d_video->num_buffered_pts--;
|
|
|
|
sorted_pts = d_video->buffered_pts[d_video->num_buffered_pts];
|
|
|
|
} else {
|
|
|
|
mp_msg(MSGT_CPLAYER, MSGL_ERR,
|
|
|
|
"No pts value from demuxer to use for frame!\n");
|
|
|
|
sorted_pts = MP_NOPTS_VALUE;
|
2013-11-25 22:16:22 +00:00
|
|
|
}
|
|
|
|
|
video: refactor PTS code, add fall back heuristic to DTS
Refactor the PTS handling code to make it cleaner, and to separate the
bits that use PTS sorting.
Add a heuristic to fall back to DTS if the PTS us non-monotonic. This
code is based on what FFmpeg/Libav use for ffplay/avplay and also
best_effort_timestamp (which is only in FFmpeg). Basically, this 1. just
uses the DTS if PTS is unset, and 2. ignores PTS entirely if PTS is non-
monotonic, but DTS is sorted.
The code is pretty much the same as in Libav [1]. I'm not sure if all of
it is really needed, or if it does more than what the paragraph above
mentions. But maybe it's fine to cargo-cult this.
This heuristic fixes playback of mpeg4 in ogm, which returns packets
with PTS==DTS, even though the PTS timestamps should follow codec
reordering. This is probably a libavformat demuxer bug, but good luck
trying to fix it.
The way vd_lavc.c returns the frame PTS and DTS to dec_video.c is a bit
inelegant, but maybe better than trying to mess the PTS back into the
decoder callback again.
[1] https://git.libav.org/?p=libav.git;a=blob;f=cmdutils.c;h=3f1c667075724c5cde69d840ed5ed7d992898334;hb=fa515c2088e1d082d45741bbd5c05e13b0500804#l1431
2013-11-27 19:54:56 +00:00
|
|
|
if (!PTS_IS_ORDERED(d_video->sorted_pts, sorted_pts))
|
|
|
|
d_video->num_sorted_pts_problems++;
|
|
|
|
d_video->sorted_pts = sorted_pts;
|
|
|
|
|
|
|
|
if (!PTS_IS_ORDERED(d_video->unsorted_pts, codec_pts))
|
|
|
|
d_video->num_unsorted_pts_problems++;
|
|
|
|
d_video->unsorted_pts = codec_pts;
|
|
|
|
|
video: add insane hack to work around FFmpeg/Libav insanity
So, FFmpeg/Libav requires us to figure out video timestamps ourselves
(see last 10 commits or so), but the methods it provides for this aren't
even sufficient. In particular, everything that uses AVI-style DTS (avi,
vfw-muxed mkv, possibly mpeg4-in-ogm) with a codec that has an internal
frame delay is broken. In this case, libavcodec will shift the packet-
to-image correspondence by the codec delay, meaning that with a delay=1,
the first AVFrame.pkt_dts is not 0, but that of the second packet. All
timestamps will appear shifted. The start time (e.g. the time displayed
when doing "mpv file.avi --pause") will not be exactly 0.
(According to Libav developers, this is how it's supposed to work; just
that the first DTS values are normally negative with formats that use
DTS "properly". Who cares if it doesn't work at all with very common
video formats? There's no indication that they'll fix this soon,
either. An elegant workaround is missing too.)
Add a hack to re-enable the old PTS code for AVI and vfw-muxed MKV.
Since these timestamps are not reorderd, we wouldn't need to sort them,
but it's less code this way (and possibly more robust, should a demuxer
unexpectedly output PTS).
The original intention of all the timestamp changes recently was
actually to get rid of demuxer-specific hacks and the old timestamp
sorting code, but it looks like this didn't work out. Yet another case
where trying to replace native MPlayer functionality with FFmpeg/Libav
led to disadvantages and bugs. (Note that the old PTS sorting code
doesn't and can't handle frame dropping correctly, though.)
Bug reports:
https://trac.ffmpeg.org/ticket/3178
https://bugzilla.libav.org/show_bug.cgi?id=600
2013-11-28 14:10:45 +00:00
|
|
|
if (d_video->header->video->avi_dts) {
|
|
|
|
// Actually, they don't need to be sorted, we just reuse the buffering.
|
|
|
|
d_video->pts_assoc_mode = 2;
|
|
|
|
} else if (opts->user_pts_assoc_mode) {
|
2013-11-25 22:16:22 +00:00
|
|
|
d_video->pts_assoc_mode = opts->user_pts_assoc_mode;
|
video: add insane hack to work around FFmpeg/Libav insanity
So, FFmpeg/Libav requires us to figure out video timestamps ourselves
(see last 10 commits or so), but the methods it provides for this aren't
even sufficient. In particular, everything that uses AVI-style DTS (avi,
vfw-muxed mkv, possibly mpeg4-in-ogm) with a codec that has an internal
frame delay is broken. In this case, libavcodec will shift the packet-
to-image correspondence by the codec delay, meaning that with a delay=1,
the first AVFrame.pkt_dts is not 0, but that of the second packet. All
timestamps will appear shifted. The start time (e.g. the time displayed
when doing "mpv file.avi --pause") will not be exactly 0.
(According to Libav developers, this is how it's supposed to work; just
that the first DTS values are normally negative with formats that use
DTS "properly". Who cares if it doesn't work at all with very common
video formats? There's no indication that they'll fix this soon,
either. An elegant workaround is missing too.)
Add a hack to re-enable the old PTS code for AVI and vfw-muxed MKV.
Since these timestamps are not reorderd, we wouldn't need to sort them,
but it's less code this way (and possibly more robust, should a demuxer
unexpectedly output PTS).
The original intention of all the timestamp changes recently was
actually to get rid of demuxer-specific hacks and the old timestamp
sorting code, but it looks like this didn't work out. Yet another case
where trying to replace native MPlayer functionality with FFmpeg/Libav
led to disadvantages and bugs. (Note that the old PTS sorting code
doesn't and can't handle frame dropping correctly, though.)
Bug reports:
https://trac.ffmpeg.org/ticket/3178
https://bugzilla.libav.org/show_bug.cgi?id=600
2013-11-28 14:10:45 +00:00
|
|
|
} else if (d_video->pts_assoc_mode == 0) {
|
video: refactor PTS code, add fall back heuristic to DTS
Refactor the PTS handling code to make it cleaner, and to separate the
bits that use PTS sorting.
Add a heuristic to fall back to DTS if the PTS us non-monotonic. This
code is based on what FFmpeg/Libav use for ffplay/avplay and also
best_effort_timestamp (which is only in FFmpeg). Basically, this 1. just
uses the DTS if PTS is unset, and 2. ignores PTS entirely if PTS is non-
monotonic, but DTS is sorted.
The code is pretty much the same as in Libav [1]. I'm not sure if all of
it is really needed, or if it does more than what the paragraph above
mentions. But maybe it's fine to cargo-cult this.
This heuristic fixes playback of mpeg4 in ogm, which returns packets
with PTS==DTS, even though the PTS timestamps should follow codec
reordering. This is probably a libavformat demuxer bug, but good luck
trying to fix it.
The way vd_lavc.c returns the frame PTS and DTS to dec_video.c is a bit
inelegant, but maybe better than trying to mess the PTS back into the
decoder callback again.
[1] https://git.libav.org/?p=libav.git;a=blob;f=cmdutils.c;h=3f1c667075724c5cde69d840ed5ed7d992898334;hb=fa515c2088e1d082d45741bbd5c05e13b0500804#l1431
2013-11-27 19:54:56 +00:00
|
|
|
if (codec_pts != MP_NOPTS_VALUE)
|
2013-11-25 22:16:22 +00:00
|
|
|
d_video->pts_assoc_mode = 1;
|
|
|
|
else
|
|
|
|
d_video->pts_assoc_mode = 2;
|
|
|
|
} else {
|
video: refactor PTS code, add fall back heuristic to DTS
Refactor the PTS handling code to make it cleaner, and to separate the
bits that use PTS sorting.
Add a heuristic to fall back to DTS if the PTS us non-monotonic. This
code is based on what FFmpeg/Libav use for ffplay/avplay and also
best_effort_timestamp (which is only in FFmpeg). Basically, this 1. just
uses the DTS if PTS is unset, and 2. ignores PTS entirely if PTS is non-
monotonic, but DTS is sorted.
The code is pretty much the same as in Libav [1]. I'm not sure if all of
it is really needed, or if it does more than what the paragraph above
mentions. But maybe it's fine to cargo-cult this.
This heuristic fixes playback of mpeg4 in ogm, which returns packets
with PTS==DTS, even though the PTS timestamps should follow codec
reordering. This is probably a libavformat demuxer bug, but good luck
trying to fix it.
The way vd_lavc.c returns the frame PTS and DTS to dec_video.c is a bit
inelegant, but maybe better than trying to mess the PTS back into the
decoder callback again.
[1] https://git.libav.org/?p=libav.git;a=blob;f=cmdutils.c;h=3f1c667075724c5cde69d840ed5ed7d992898334;hb=fa515c2088e1d082d45741bbd5c05e13b0500804#l1431
2013-11-27 19:54:56 +00:00
|
|
|
int probcount1 = d_video->num_unsorted_pts_problems;
|
2013-11-25 22:16:22 +00:00
|
|
|
int probcount2 = d_video->num_sorted_pts_problems;
|
|
|
|
if (d_video->pts_assoc_mode == 2) {
|
|
|
|
int tmp = probcount1;
|
|
|
|
probcount1 = probcount2;
|
|
|
|
probcount2 = tmp;
|
|
|
|
}
|
|
|
|
if (probcount1 >= probcount2 * 1.5 + 2) {
|
|
|
|
d_video->pts_assoc_mode = 3 - d_video->pts_assoc_mode;
|
|
|
|
mp_msg(MSGT_DECVIDEO, MSGL_WARN,
|
|
|
|
"Switching to pts association mode %d.\n",
|
|
|
|
d_video->pts_assoc_mode);
|
|
|
|
}
|
|
|
|
}
|
video: refactor PTS code, add fall back heuristic to DTS
Refactor the PTS handling code to make it cleaner, and to separate the
bits that use PTS sorting.
Add a heuristic to fall back to DTS if the PTS us non-monotonic. This
code is based on what FFmpeg/Libav use for ffplay/avplay and also
best_effort_timestamp (which is only in FFmpeg). Basically, this 1. just
uses the DTS if PTS is unset, and 2. ignores PTS entirely if PTS is non-
monotonic, but DTS is sorted.
The code is pretty much the same as in Libav [1]. I'm not sure if all of
it is really needed, or if it does more than what the paragraph above
mentions. But maybe it's fine to cargo-cult this.
This heuristic fixes playback of mpeg4 in ogm, which returns packets
with PTS==DTS, even though the PTS timestamps should follow codec
reordering. This is probably a libavformat demuxer bug, but good luck
trying to fix it.
The way vd_lavc.c returns the frame PTS and DTS to dec_video.c is a bit
inelegant, but maybe better than trying to mess the PTS back into the
decoder callback again.
[1] https://git.libav.org/?p=libav.git;a=blob;f=cmdutils.c;h=3f1c667075724c5cde69d840ed5ed7d992898334;hb=fa515c2088e1d082d45741bbd5c05e13b0500804#l1431
2013-11-27 19:54:56 +00:00
|
|
|
return d_video->pts_assoc_mode == 1 ? codec_pts : sorted_pts;
|
2013-11-25 22:16:22 +00:00
|
|
|
}
|
|
|
|
|
2013-11-25 22:09:40 +00:00
|
|
|
struct mp_image *video_decode(struct dec_video *d_video,
|
|
|
|
struct demux_packet *packet,
|
|
|
|
int drop_frame)
|
2007-03-11 17:30:43 +00:00
|
|
|
{
|
2013-11-23 20:36:20 +00:00
|
|
|
struct MPOpts *opts = d_video->opts;
|
video: add insane hack to work around FFmpeg/Libav insanity
So, FFmpeg/Libav requires us to figure out video timestamps ourselves
(see last 10 commits or so), but the methods it provides for this aren't
even sufficient. In particular, everything that uses AVI-style DTS (avi,
vfw-muxed mkv, possibly mpeg4-in-ogm) with a codec that has an internal
frame delay is broken. In this case, libavcodec will shift the packet-
to-image correspondence by the codec delay, meaning that with a delay=1,
the first AVFrame.pkt_dts is not 0, but that of the second packet. All
timestamps will appear shifted. The start time (e.g. the time displayed
when doing "mpv file.avi --pause") will not be exactly 0.
(According to Libav developers, this is how it's supposed to work; just
that the first DTS values are normally negative with formats that use
DTS "properly". Who cares if it doesn't work at all with very common
video formats? There's no indication that they'll fix this soon,
either. An elegant workaround is missing too.)
Add a hack to re-enable the old PTS code for AVI and vfw-muxed MKV.
Since these timestamps are not reorderd, we wouldn't need to sort them,
but it's less code this way (and possibly more robust, should a demuxer
unexpectedly output PTS).
The original intention of all the timestamp changes recently was
actually to get rid of demuxer-specific hacks and the old timestamp
sorting code, but it looks like this didn't work out. Yet another case
where trying to replace native MPlayer functionality with FFmpeg/Libav
led to disadvantages and bugs. (Note that the old PTS sorting code
doesn't and can't handle frame dropping correctly, though.)
Bug reports:
https://trac.ffmpeg.org/ticket/3178
https://bugzilla.libav.org/show_bug.cgi?id=600
2013-11-28 14:10:45 +00:00
|
|
|
bool sort_pts =
|
|
|
|
(opts->user_pts_assoc_mode != 1 || d_video->header->video->avi_dts)
|
|
|
|
&& opts->correct_pts;
|
2013-11-27 19:52:28 +00:00
|
|
|
double pkt_pts = packet ? packet->pts : MP_NOPTS_VALUE;
|
|
|
|
double pkt_dts = packet ? packet->dts : MP_NOPTS_VALUE;
|
2007-03-11 17:30:43 +00:00
|
|
|
|
2013-11-27 19:52:28 +00:00
|
|
|
double pkt_pdts = pkt_pts == MP_NOPTS_VALUE ? pkt_dts : pkt_pts;
|
|
|
|
if (pkt_pdts != MP_NOPTS_VALUE)
|
|
|
|
d_video->last_packet_pdts = pkt_pdts;
|
2013-11-25 22:12:18 +00:00
|
|
|
|
video: refactor PTS code, add fall back heuristic to DTS
Refactor the PTS handling code to make it cleaner, and to separate the
bits that use PTS sorting.
Add a heuristic to fall back to DTS if the PTS us non-monotonic. This
code is based on what FFmpeg/Libav use for ffplay/avplay and also
best_effort_timestamp (which is only in FFmpeg). Basically, this 1. just
uses the DTS if PTS is unset, and 2. ignores PTS entirely if PTS is non-
monotonic, but DTS is sorted.
The code is pretty much the same as in Libav [1]. I'm not sure if all of
it is really needed, or if it does more than what the paragraph above
mentions. But maybe it's fine to cargo-cult this.
This heuristic fixes playback of mpeg4 in ogm, which returns packets
with PTS==DTS, even though the PTS timestamps should follow codec
reordering. This is probably a libavformat demuxer bug, but good luck
trying to fix it.
The way vd_lavc.c returns the frame PTS and DTS to dec_video.c is a bit
inelegant, but maybe better than trying to mess the PTS back into the
decoder callback again.
[1] https://git.libav.org/?p=libav.git;a=blob;f=cmdutils.c;h=3f1c667075724c5cde69d840ed5ed7d992898334;hb=fa515c2088e1d082d45741bbd5c05e13b0500804#l1431
2013-11-27 19:54:56 +00:00
|
|
|
if (sort_pts)
|
|
|
|
add_pts_to_sort(d_video, pkt_pdts);
|
|
|
|
|
|
|
|
double prev_codec_pts = d_video->codec_pts;
|
|
|
|
double prev_codec_dts = d_video->codec_dts;
|
2007-03-11 17:30:43 +00:00
|
|
|
|
2013-11-27 19:52:28 +00:00
|
|
|
struct mp_image *mpi = d_video->vd_driver->decode(d_video, packet, drop_frame);
|
2007-03-11 17:30:43 +00:00
|
|
|
|
|
|
|
//------------------------ frame decoded. --------------------
|
2002-03-01 00:25:43 +00:00
|
|
|
|
video/filter: change filter API, use refcounting, remove filter DR
Change the entire filter API to use reference counted images instead
of vf_get_image().
Remove filter "direct rendering". This was useful for vf_expand and (in
rare cases) vf_sub: DR allowed these filters to pass a cropped image to
the filters before them. Then, on filtering, the image was "uncropped",
so that black bars could be added around the image without copying. This
means that in some cases, vf_expand will be slower (-vf gradfun,expand
for example).
Note that another form of DR used for in-place filters has been replaced
by simpler logic. Instead of trying to do DR, filters can check if the
image is writeable (with mp_image_is_writeable()), and do true in-place
if that's the case. This affects filters like vf_gradfun and vf_sub.
Everything has to support strides now. If something doesn't, making a
copy of the image data is required.
2012-11-05 13:25:04 +00:00
|
|
|
if (!mpi || drop_frame) {
|
|
|
|
talloc_free(mpi);
|
2008-04-24 02:23:45 +00:00
|
|
|
return NULL; // error / skipped frame
|
video/filter: change filter API, use refcounting, remove filter DR
Change the entire filter API to use reference counted images instead
of vf_get_image().
Remove filter "direct rendering". This was useful for vf_expand and (in
rare cases) vf_sub: DR allowed these filters to pass a cropped image to
the filters before them. Then, on filtering, the image was "uncropped",
so that black bars could be added around the image without copying. This
means that in some cases, vf_expand will be slower (-vf gradfun,expand
for example).
Note that another form of DR used for in-place filters has been replaced
by simpler logic. Instead of trying to do DR, filters can check if the
image is writeable (with mp_image_is_writeable()), and do true in-place
if that's the case. This affects filters like vf_gradfun and vf_sub.
Everything has to support strides now. If something doesn't, making a
copy of the image data is required.
2012-11-05 13:25:04 +00:00
|
|
|
}
|
2002-03-11 01:13:13 +00:00
|
|
|
|
2013-05-20 22:45:42 +00:00
|
|
|
if (opts->field_dominance == 0)
|
2008-04-24 02:23:45 +00:00
|
|
|
mpi->fields |= MP_IMGFIELD_TOP_FIRST;
|
2013-05-20 22:45:42 +00:00
|
|
|
else if (opts->field_dominance == 1)
|
2008-04-24 02:23:45 +00:00
|
|
|
mpi->fields &= ~MP_IMGFIELD_TOP_FIRST;
|
2007-02-02 18:32:07 +00:00
|
|
|
|
video: refactor PTS code, add fall back heuristic to DTS
Refactor the PTS handling code to make it cleaner, and to separate the
bits that use PTS sorting.
Add a heuristic to fall back to DTS if the PTS us non-monotonic. This
code is based on what FFmpeg/Libav use for ffplay/avplay and also
best_effort_timestamp (which is only in FFmpeg). Basically, this 1. just
uses the DTS if PTS is unset, and 2. ignores PTS entirely if PTS is non-
monotonic, but DTS is sorted.
The code is pretty much the same as in Libav [1]. I'm not sure if all of
it is really needed, or if it does more than what the paragraph above
mentions. But maybe it's fine to cargo-cult this.
This heuristic fixes playback of mpeg4 in ogm, which returns packets
with PTS==DTS, even though the PTS timestamps should follow codec
reordering. This is probably a libavformat demuxer bug, but good luck
trying to fix it.
The way vd_lavc.c returns the frame PTS and DTS to dec_video.c is a bit
inelegant, but maybe better than trying to mess the PTS back into the
decoder callback again.
[1] https://git.libav.org/?p=libav.git;a=blob;f=cmdutils.c;h=3f1c667075724c5cde69d840ed5ed7d992898334;hb=fa515c2088e1d082d45741bbd5c05e13b0500804#l1431
2013-11-27 19:54:56 +00:00
|
|
|
// Note: the PTS is reordered, but the DTS is not. Both should be monotonic.
|
|
|
|
double pts = d_video->codec_pts;
|
|
|
|
double dts = d_video->codec_dts;
|
|
|
|
|
|
|
|
if (pts == MP_NOPTS_VALUE) {
|
|
|
|
d_video->codec_pts = prev_codec_pts;
|
|
|
|
} else if (pts <= prev_codec_pts) {
|
|
|
|
d_video->num_codec_pts_problems++;
|
2007-03-11 17:30:43 +00:00
|
|
|
}
|
video: refactor PTS code, add fall back heuristic to DTS
Refactor the PTS handling code to make it cleaner, and to separate the
bits that use PTS sorting.
Add a heuristic to fall back to DTS if the PTS us non-monotonic. This
code is based on what FFmpeg/Libav use for ffplay/avplay and also
best_effort_timestamp (which is only in FFmpeg). Basically, this 1. just
uses the DTS if PTS is unset, and 2. ignores PTS entirely if PTS is non-
monotonic, but DTS is sorted.
The code is pretty much the same as in Libav [1]. I'm not sure if all of
it is really needed, or if it does more than what the paragraph above
mentions. But maybe it's fine to cargo-cult this.
This heuristic fixes playback of mpeg4 in ogm, which returns packets
with PTS==DTS, even though the PTS timestamps should follow codec
reordering. This is probably a libavformat demuxer bug, but good luck
trying to fix it.
The way vd_lavc.c returns the frame PTS and DTS to dec_video.c is a bit
inelegant, but maybe better than trying to mess the PTS back into the
decoder callback again.
[1] https://git.libav.org/?p=libav.git;a=blob;f=cmdutils.c;h=3f1c667075724c5cde69d840ed5ed7d992898334;hb=fa515c2088e1d082d45741bbd5c05e13b0500804#l1431
2013-11-27 19:54:56 +00:00
|
|
|
|
|
|
|
if (dts == MP_NOPTS_VALUE) {
|
|
|
|
d_video->codec_dts = prev_codec_dts;
|
|
|
|
} else if (dts <= prev_codec_dts) {
|
|
|
|
d_video->num_codec_dts_problems++;
|
|
|
|
}
|
|
|
|
|
|
|
|
// If PTS is unset, or non-monotonic, fall back to DTS.
|
|
|
|
if ((d_video->num_codec_pts_problems > d_video->num_codec_dts_problems ||
|
|
|
|
pts == MP_NOPTS_VALUE) && dts != MP_NOPTS_VALUE)
|
|
|
|
pts = dts;
|
|
|
|
|
|
|
|
// Alternative PTS determination methods
|
2013-11-27 19:56:38 +00:00
|
|
|
if (sort_pts)
|
|
|
|
pts = retrieve_sorted_pts(d_video, pts);
|
|
|
|
|
|
|
|
if (!opts->correct_pts || pts == MP_NOPTS_VALUE) {
|
|
|
|
if (opts->correct_pts)
|
|
|
|
mp_msg(MSGT_DECVIDEO, MSGL_WARN, "No video PTS! Making something up.\n");
|
|
|
|
|
video: refactor PTS code, add fall back heuristic to DTS
Refactor the PTS handling code to make it cleaner, and to separate the
bits that use PTS sorting.
Add a heuristic to fall back to DTS if the PTS us non-monotonic. This
code is based on what FFmpeg/Libav use for ffplay/avplay and also
best_effort_timestamp (which is only in FFmpeg). Basically, this 1. just
uses the DTS if PTS is unset, and 2. ignores PTS entirely if PTS is non-
monotonic, but DTS is sorted.
The code is pretty much the same as in Libav [1]. I'm not sure if all of
it is really needed, or if it does more than what the paragraph above
mentions. But maybe it's fine to cargo-cult this.
This heuristic fixes playback of mpeg4 in ogm, which returns packets
with PTS==DTS, even though the PTS timestamps should follow codec
reordering. This is probably a libavformat demuxer bug, but good luck
trying to fix it.
The way vd_lavc.c returns the frame PTS and DTS to dec_video.c is a bit
inelegant, but maybe better than trying to mess the PTS back into the
decoder callback again.
[1] https://git.libav.org/?p=libav.git;a=blob;f=cmdutils.c;h=3f1c667075724c5cde69d840ed5ed7d992898334;hb=fa515c2088e1d082d45741bbd5c05e13b0500804#l1431
2013-11-27 19:54:56 +00:00
|
|
|
double frame_time = 1.0f / (d_video->fps > 0 ? d_video->fps : 25);
|
|
|
|
double base = d_video->last_packet_pdts;
|
|
|
|
pts = d_video->decoded_pts;
|
|
|
|
if (pts == MP_NOPTS_VALUE)
|
|
|
|
pts = base == MP_NOPTS_VALUE ? 0 : base;
|
|
|
|
|
|
|
|
pts += frame_time;
|
|
|
|
}
|
|
|
|
|
2013-11-28 12:39:36 +00:00
|
|
|
if (d_video->decoded_pts != MP_NOPTS_VALUE && pts <= d_video->decoded_pts) {
|
|
|
|
mp_msg(MSGT_DECVIDEO, MSGL_WARN, "Non-monotonic video pts: %f <= %f\n",
|
2013-11-27 19:57:08 +00:00
|
|
|
pts, d_video->decoded_pts);
|
|
|
|
}
|
|
|
|
|
2013-11-28 12:34:56 +00:00
|
|
|
if (d_video->has_broken_packet_pts < 0)
|
|
|
|
d_video->has_broken_packet_pts++;
|
|
|
|
if (d_video->num_codec_pts_problems || pkt_pts == MP_NOPTS_VALUE)
|
|
|
|
d_video->has_broken_packet_pts = 1;
|
|
|
|
|
video: refactor PTS code, add fall back heuristic to DTS
Refactor the PTS handling code to make it cleaner, and to separate the
bits that use PTS sorting.
Add a heuristic to fall back to DTS if the PTS us non-monotonic. This
code is based on what FFmpeg/Libav use for ffplay/avplay and also
best_effort_timestamp (which is only in FFmpeg). Basically, this 1. just
uses the DTS if PTS is unset, and 2. ignores PTS entirely if PTS is non-
monotonic, but DTS is sorted.
The code is pretty much the same as in Libav [1]. I'm not sure if all of
it is really needed, or if it does more than what the paragraph above
mentions. But maybe it's fine to cargo-cult this.
This heuristic fixes playback of mpeg4 in ogm, which returns packets
with PTS==DTS, even though the PTS timestamps should follow codec
reordering. This is probably a libavformat demuxer bug, but good luck
trying to fix it.
The way vd_lavc.c returns the frame PTS and DTS to dec_video.c is a bit
inelegant, but maybe better than trying to mess the PTS back into the
decoder callback again.
[1] https://git.libav.org/?p=libav.git;a=blob;f=cmdutils.c;h=3f1c667075724c5cde69d840ed5ed7d992898334;hb=fa515c2088e1d082d45741bbd5c05e13b0500804#l1431
2013-11-27 19:54:56 +00:00
|
|
|
mpi->pts = pts;
|
|
|
|
d_video->decoded_pts = pts;
|
2007-03-11 17:30:43 +00:00
|
|
|
return mpi;
|
2006-11-14 12:29:20 +00:00
|
|
|
}
|
2013-11-23 20:28:28 +00:00
|
|
|
|
2013-12-10 18:07:29 +00:00
|
|
|
int video_reconfig_filters(struct dec_video *d_video,
|
|
|
|
const struct mp_image_params *params)
|
2013-11-23 20:28:28 +00:00
|
|
|
{
|
2013-11-23 20:36:20 +00:00
|
|
|
struct MPOpts *opts = d_video->opts;
|
2013-11-23 20:28:28 +00:00
|
|
|
struct mp_image_params p = *params;
|
2013-11-23 20:36:20 +00:00
|
|
|
struct sh_video *sh = d_video->header->video;
|
2013-11-23 20:28:28 +00:00
|
|
|
|
|
|
|
mp_msg(MSGT_DECVIDEO, MSGL_V,
|
|
|
|
"VIDEO: %dx%d %5.3f fps %5.1f kbps (%4.1f kB/s)\n",
|
|
|
|
p.w, p.h, sh->fps, sh->i_bps * 0.008,
|
|
|
|
sh->i_bps / 1000.0);
|
|
|
|
|
|
|
|
mp_msg(MSGT_DECVIDEO, MSGL_V, "VDec: vo config request - %d x %d (%s)\n",
|
|
|
|
p.w, p.h, vo_format_name(p.imgfmt));
|
|
|
|
|
2013-11-23 20:40:51 +00:00
|
|
|
float decoder_aspect = p.d_w / (float)p.d_h;
|
|
|
|
if (d_video->initial_decoder_aspect == 0)
|
|
|
|
d_video->initial_decoder_aspect = decoder_aspect;
|
|
|
|
|
|
|
|
// We normally prefer the container aspect, unless the decoder aspect
|
|
|
|
// changes at least once.
|
|
|
|
if (d_video->initial_decoder_aspect == decoder_aspect) {
|
|
|
|
if (sh->aspect > 0)
|
|
|
|
vf_set_dar(&p.d_w, &p.d_h, p.w, p.h, sh->aspect);
|
|
|
|
} else {
|
|
|
|
// Even if the aspect switches back, don't use container aspect again.
|
|
|
|
d_video->initial_decoder_aspect = -1;
|
|
|
|
}
|
2013-11-23 20:28:28 +00:00
|
|
|
|
|
|
|
float force_aspect = opts->movie_aspect;
|
2013-11-23 20:36:20 +00:00
|
|
|
if (force_aspect > -1.0 && d_video->stream_aspect != 0.0)
|
|
|
|
force_aspect = d_video->stream_aspect;
|
2013-11-23 20:28:28 +00:00
|
|
|
|
2013-11-23 20:40:51 +00:00
|
|
|
if (force_aspect > 0)
|
2013-11-23 20:28:28 +00:00
|
|
|
vf_set_dar(&p.d_w, &p.d_h, p.w, p.h, force_aspect);
|
|
|
|
|
|
|
|
if (abs(p.d_w - p.w) >= 4 || abs(p.d_h - p.h) >= 4) {
|
2013-12-16 19:40:02 +00:00
|
|
|
mp_msg(MSGT_CPLAYER, MSGL_V, "Aspect ratio is %.2f:1 - "
|
2013-11-23 20:28:28 +00:00
|
|
|
"scaling to correct movie aspect.\n", sh->aspect);
|
|
|
|
mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_VIDEO_ASPECT=%1.4f\n", sh->aspect);
|
|
|
|
} else {
|
|
|
|
p.d_w = p.w;
|
|
|
|
p.d_h = p.h;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Apply user overrides
|
|
|
|
if (opts->requested_colorspace != MP_CSP_AUTO)
|
|
|
|
p.colorspace = opts->requested_colorspace;
|
|
|
|
if (opts->requested_input_range != MP_CSP_LEVELS_AUTO)
|
|
|
|
p.colorlevels = opts->requested_input_range;
|
|
|
|
p.outputlevels = opts->requested_output_range;
|
|
|
|
|
|
|
|
// Detect colorspace from resolution.
|
|
|
|
// Make sure the user-overrides are consistent (no RGB csp for YUV, etc.).
|
|
|
|
mp_image_params_guess_csp(&p);
|
|
|
|
|
|
|
|
// Time to config libvo!
|
2013-12-05 21:55:35 +00:00
|
|
|
mp_msg(MSGT_CPLAYER, MSGL_V, "VO Config (%dx%d->%dx%d,0x%X)\n",
|
|
|
|
p.w, p.h, p.d_w, p.d_h, p.imgfmt);
|
2013-11-23 20:28:28 +00:00
|
|
|
|
2013-12-07 18:32:44 +00:00
|
|
|
if (vf_reconfig(d_video->vfilter, &p) < 0) {
|
2013-12-16 19:40:02 +00:00
|
|
|
mp_msg(MSGT_CPLAYER, MSGL_WARN, "FATAL: Cannot initialize video driver.\n");
|
2013-11-23 20:28:28 +00:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2013-11-23 20:39:07 +00:00
|
|
|
d_video->vf_input = p;
|
2013-11-23 20:28:28 +00:00
|
|
|
|
|
|
|
if (opts->gamma_gamma != 1000)
|
2013-11-23 20:36:20 +00:00
|
|
|
video_set_colors(d_video, "gamma", opts->gamma_gamma);
|
2013-11-23 20:28:28 +00:00
|
|
|
if (opts->gamma_brightness != 1000)
|
2013-11-23 20:36:20 +00:00
|
|
|
video_set_colors(d_video, "brightness", opts->gamma_brightness);
|
2013-11-23 20:28:28 +00:00
|
|
|
if (opts->gamma_contrast != 1000)
|
2013-11-23 20:36:20 +00:00
|
|
|
video_set_colors(d_video, "contrast", opts->gamma_contrast);
|
2013-11-23 20:28:28 +00:00
|
|
|
if (opts->gamma_saturation != 1000)
|
2013-11-23 20:36:20 +00:00
|
|
|
video_set_colors(d_video, "saturation", opts->gamma_saturation);
|
2013-11-23 20:28:28 +00:00
|
|
|
if (opts->gamma_hue != 1000)
|
2013-11-23 20:36:20 +00:00
|
|
|
video_set_colors(d_video, "hue", opts->gamma_hue);
|
2013-11-23 20:28:28 +00:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
2013-12-10 18:08:56 +00:00
|
|
|
|
|
|
|
// Send a VCTRL, or if it doesn't work, translate it to a VOCTRL and try the VO.
|
|
|
|
int video_vf_vo_control(struct dec_video *d_video, int vf_cmd, void *data)
|
|
|
|
{
|
|
|
|
if (d_video->vfilter && d_video->vfilter->initialized > 0) {
|
|
|
|
int r = vf_control_any(d_video->vfilter, vf_cmd, data);
|
|
|
|
if (r != CONTROL_UNKNOWN)
|
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
|
|
|
switch (vf_cmd) {
|
|
|
|
case VFCTRL_GET_DEINTERLACE:
|
|
|
|
return vo_control(d_video->vo, VOCTRL_GET_DEINTERLACE, data) == VO_TRUE;
|
|
|
|
case VFCTRL_SET_DEINTERLACE:
|
|
|
|
return vo_control(d_video->vo, VOCTRL_SET_DEINTERLACE, data) == VO_TRUE;
|
|
|
|
case VFCTRL_SET_EQUALIZER: {
|
|
|
|
vf_equalizer_t *eq = data;
|
|
|
|
if (!d_video->vo->config_ok)
|
|
|
|
return CONTROL_FALSE; // vo not configured?
|
|
|
|
struct voctrl_set_equalizer_args param = {
|
|
|
|
eq->item, eq->value
|
|
|
|
};
|
|
|
|
return vo_control(d_video->vo, VOCTRL_SET_EQUALIZER, ¶m) == VO_TRUE;
|
|
|
|
}
|
|
|
|
case VFCTRL_GET_EQUALIZER: {
|
|
|
|
vf_equalizer_t *eq = data;
|
|
|
|
if (!d_video->vo->config_ok)
|
|
|
|
return CONTROL_FALSE; // vo not configured?
|
|
|
|
struct voctrl_get_equalizer_args param = {
|
|
|
|
eq->item, &eq->value
|
|
|
|
};
|
|
|
|
return vo_control(d_video->vo, VOCTRL_GET_EQUALIZER, ¶m) == VO_TRUE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return CONTROL_UNKNOWN;
|
|
|
|
}
|