RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

vd_lavc: make software decoding fallback an option

This commit is contained in:
Rodger Combs 2015-10-25 04:45:44 -05:00 committed by wm4
parent d1a46c2c32
commit d6e7190836
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
DOCS/man/options.rst
View File

@ -823,6 +823,10 @@ Video
The result is most likely broken decoding, but may also help if the The result is most likely broken decoding, but may also help if the
detected or reported profiles are somehow incorrect. detected or reported profiles are somehow incorrect.
``--vd-lavc-software-fallback=<yes|no>``
Fallback to software decoding if the hardware-accelerated decoder fails
(default: yes).
``--vd-lavc-bitexact`` ``--vd-lavc-bitexact``
Only use bit-exact algorithms in all decoding steps (for codec testing). Only use bit-exact algorithms in all decoding steps (for codec testing).

6
video/decode/vd_lavc.c
View File

@ -74,6 +74,7 @@ struct vd_lavc_params {
int threads; int threads;
int bitexact; int bitexact;
int check_hw_profile; int check_hw_profile;
int software_fallback;
char **avopts; char **avopts;
}; };
@ -101,6 +102,7 @@ const struct m_sub_options vd_lavc_conf = {
OPT_INT("threads", threads, M_OPT_MIN, .min = 0), OPT_INT("threads", threads, M_OPT_MIN, .min = 0),
OPT_FLAG("bitexact", bitexact, 0), OPT_FLAG("bitexact", bitexact, 0),
OPT_FLAG("check-hw-profile", check_hw_profile, 0), OPT_FLAG("check-hw-profile", check_hw_profile, 0),
OPT_FLAG("software-fallback", software_fallback, 0),
OPT_KEYVALUELIST("o", avopts, 0), OPT_KEYVALUELIST("o", avopts, 0),
{0} {0}
}, },
@ -108,6 +110,7 @@ const struct m_sub_options vd_lavc_conf = {
.defaults = &(const struct vd_lavc_params){ .defaults = &(const struct vd_lavc_params){
.show_all = 0, .show_all = 0,
.check_hw_profile = 1, .check_hw_profile = 1,
.software_fallback = 1,
.skip_loop_filter = AVDISCARD_DEFAULT, .skip_loop_filter = AVDISCARD_DEFAULT,
.skip_idct = AVDISCARD_DEFAULT, .skip_idct = AVDISCARD_DEFAULT,
.skip_frame = AVDISCARD_DEFAULT, .skip_frame = AVDISCARD_DEFAULT,
@ -627,7 +630,8 @@ static void decode(struct dec_video *vd, struct demux_packet *packet,
if (ret < 0) { if (ret < 0) {
MP_WARN(vd, "Error while decoding frame!\n"); MP_WARN(vd, "Error while decoding frame!\n");
ctx->hwdec_failed = true; if (lavc_param->software_fallback)
ctx->hwdec_failed = true;
return; return;
} }