diff options
author | wm4 <wm4@nowhere> | 2018-01-28 10:08:45 +0100 |
---|---|---|
committer | Kevin Mitchell <kevmitch@gmail.com> | 2018-01-30 03:10:27 -0800 |
commit | 6d36fad83c779936a012e85a1eb92ec94651c7c0 (patch) | |
tree | 76762208837d18545a4a315be890d7bffad7e47f /video/decode/dec_video.h | |
parent | eaced0ebb03a078394ed01bcbe641b5b7a4312aa (diff) | |
download | mpv-6d36fad83c779936a012e85a1eb92ec94651c7c0.tar.bz2 mpv-6d36fad83c779936a012e85a1eb92ec94651c7c0.tar.xz |
video: make decoder wrapper a filter
Move dec_video.c to filters/f_decoder_wrapper.c. It essentially becomes
a source filter. vd.h mostly disappears, because mp_filter takes care of
the dataflow, but its remains are in struct mp_decoder_fns.
One goal is to simplify dataflow by letting the filter framework handle
it (or more accurately, using its conventions). One result is that the
decode calls disappear from video.c, because we simply connect the
decoder wrapper and the filter chain with mp_pin_connect().
Another goal is to eventually remove the code duplication between the
audio and video paths for this. This commit prepares for this by trying
to make f_decoder_wrapper.c extensible, so it can be used for audio as
well later.
Decoder framedropping changes a bit. It doesn't seem to be worse than
before, and it's an obscure feature, so I'm content with its new state.
Some special code that was apparently meant to avoid dropping too many
frames in a row is removed, though.
I'm not sure how the source code tree should be organized. For one,
video/decode/vd_lavc.c is the only file in its directory, which is a bit
annoying.
Diffstat (limited to 'video/decode/dec_video.h')
-rw-r--r-- | video/decode/dec_video.h | 101 |
1 files changed, 0 insertions, 101 deletions
diff --git a/video/decode/dec_video.h b/video/decode/dec_video.h deleted file mode 100644 index 426dd967db..0000000000 --- a/video/decode/dec_video.h +++ /dev/null @@ -1,101 +0,0 @@ -/* - * This file is part of mpv. - * - * mpv is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * mpv is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with mpv. If not, see <http://www.gnu.org/licenses/>. - */ - -#ifndef MPLAYER_DEC_VIDEO_H -#define MPLAYER_DEC_VIDEO_H - -#include <stdbool.h> - -#include "demux/stheader.h" -#include "video/hwdec.h" -#include "video/mp_image.h" - -struct mp_decoder_list; -struct vo; - -struct dec_video { - struct mp_log *log; - struct mpv_global *global; - struct MPOpts *opts; - const struct vd_functions *vd_driver; - struct mp_hwdec_devices *hwdec_devs; // video output hwdec handles - struct sh_stream *header; - struct mp_codec_params *codec; - struct vo *vo; // required for direct rendering into video memory - - char *decoder_desc; - - float fps; // FPS from demuxer or from user override - - int dropped_frames; - - struct mp_recorder_sink *recorder_sink; - - // Internal (shared with vd_lavc.c). - - void *priv; // for free use by vd_driver - - // Strictly internal (dec_video.c). - - // Last PTS from decoder (set with each vd_driver->decode() call) - double codec_pts; - int num_codec_pts_problems; - - // Last packet DTS from decoder (passed through from source packets) - double codec_dts; - int num_codec_dts_problems; - - // PTS or DTS of packet first read - double first_packet_pdts; - - // There was at least one packet with non-sense timestamps. - int has_broken_packet_pts; // <0: uninitialized, 0: no problems, 1: broken - - int has_broken_decoded_pts; - - // Final PTS of previously decoded image - double decoded_pts; - - struct mp_image_params dec_format, last_format, fixed_format; - - double start_pts; - double start, end; - struct demux_packet *new_segment; - struct demux_packet *packet; - bool framedrop_enabled; - bool may_decoder_framedrop; - struct mp_image *current_mpi; - int current_state; -}; - -struct mp_decoder_list *video_decoder_list(void); - -bool video_init_best_codec(struct dec_video *d_video); -void video_uninit(struct dec_video *d_video); - -void video_work(struct dec_video *d_video); -int video_get_frame(struct dec_video *d_video, struct mp_image **out_mpi); - -void video_set_framedrop(struct dec_video *d_video, bool enabled); -void video_set_start(struct dec_video *d_video, double start_pts); - -int video_vd_control(struct dec_video *d_video, int cmd, void *arg); -void video_reset(struct dec_video *d_video); -void video_reset_params(struct dec_video *d_video); -void video_get_dec_params(struct dec_video *d_video, struct mp_image_params *p); - -#endif /* MPLAYER_DEC_VIDEO_H */ |