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/vd.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/vd.h')
-rw-r--r-- | video/decode/vd.h | 56 |
1 files changed, 0 insertions, 56 deletions
diff --git a/video/decode/vd.h b/video/decode/vd.h deleted file mode 100644 index 980de44bdc..0000000000 --- a/video/decode/vd.h +++ /dev/null @@ -1,56 +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_VD_H -#define MPLAYER_VD_H - -#include "video/mp_image.h" -#include "demux/stheader.h" -#include "dec_video.h" - -struct demux_packet; -struct mp_decoder_list; - -/* interface of video decoder drivers */ -typedef struct vd_functions -{ - const char *name; - void (*add_decoders)(struct mp_decoder_list *list); - int (*init)(struct dec_video *vd, const char *decoder); - void (*uninit)(struct dec_video *vd); - int (*control)(struct dec_video *vd, int cmd, void *arg); - // Return whether or not the packet has been consumed. - bool (*send_packet)(struct dec_video *vd, struct demux_packet *pkt); - // Return whether decoding is still going on (false if EOF was reached). - // Never returns false & *out_image set, but can return true with no image. - bool (*receive_frame)(struct dec_video *vd, struct mp_image **out_image); -} vd_functions_t; - -// NULL terminated array of all drivers -extern const vd_functions_t *const mpcodecs_vd_drivers[]; - -enum vd_ctrl { - VDCTRL_RESET = 1, // reset decode state after seeking - VDCTRL_FORCE_HWDEC_FALLBACK, // force software decoding fallback - VDCTRL_GET_HWDEC, - VDCTRL_REINIT, - VDCTRL_GET_BFRAMES, - // framedrop mode: 0=none, 1=standard, 2=hrseek - VDCTRL_SET_FRAMEDROP, -}; - -#endif /* MPLAYER_VD_H */ |