[vlc-commits] codec: videotoolbox: simplify draining

Thomas Guillem git at videolan.org
Wed Sep 27 19:17:04 CEST 2017


vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Wed Sep 27 18:52:25 2017 +0200| [9a1ebc738f2eeab01c3531a5aa501c539ebe92e0] | committer: Thomas Guillem

codec: videotoolbox: simplify draining

VTDecompressionSessionFinishDelayedFrames() is automatically called from
VTDecompressionSessionWaitForAsynchronousFrames().

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=9a1ebc738f2eeab01c3531a5aa501c539ebe92e0
---

 modules/codec/videotoolbox.m | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/modules/codec/videotoolbox.m b/modules/codec/videotoolbox.m
index 29ba7ee081..fd07c82f5c 100644
--- a/modules/codec/videotoolbox.m
+++ b/modules/codec/videotoolbox.m
@@ -1381,14 +1381,7 @@ static void Drain(decoder_t *p_dec)
 
     /* draining: return last pictures of the reordered queue */
     if (p_sys->session)
-    {
-        OSStatus status =
-            VTDecompressionSessionFinishDelayedFrames(p_sys->session);
-        if (status == noErr)
-            VTDecompressionSessionWaitForAsynchronousFrames(p_sys->session);
-        else
-            msg_Warn(p_dec, "VTDecompressionSessionFinishDelayedFrames failed");
-    }
+        VTDecompressionSessionWaitForAsynchronousFrames(p_sys->session);
 
     vlc_mutex_lock(&p_sys->lock);
     DrainDPB(p_dec, false);



More information about the vlc-commits mailing list