vlc | branch: master | Thomas Guillem <[email protected]> | Wed Apr 19 14:40:54 2017 +0200| [a32c5ee780ba1820e7d3bb1116e255563c054597] | committer: Thomas Guillem
videotoolbox: abort in case of kVTVideoDecoderMalfunctionErr And fallback to the next decoder. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=a32c5ee780ba1820e7d3bb1116e255563c054597 --- modules/codec/videotoolbox.m | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/codec/videotoolbox.m b/modules/codec/videotoolbox.m index c5eb0e8d44..69f7530865 100644 --- a/modules/codec/videotoolbox.m +++ b/modules/codec/videotoolbox.m @@ -1346,8 +1346,10 @@ static int DecodeBlock(decoder_t *p_dec, block_t *p_block) { switch (status) { + case -8960 /* codecErr */: case kCVReturnInvalidArgument: - msg_Err(p_dec, "decoder failure: invalid argument"); + case kVTVideoDecoderMalfunctionErr: + msg_Err(p_dec, "decoder failure, Abort."); /* The decoder module will be reloaded next time since we already * modified the input block */ vlc_mutex_lock(&p_sys->lock); @@ -1368,8 +1370,6 @@ static int DecodeBlock(decoder_t *p_dec, block_t *p_block) } } break; - case -8960 /* codecErr */: - case kVTVideoDecoderMalfunctionErr: case kVTInvalidSessionErr: RestartVideoToolbox(p_dec, true); break; _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
