[GStreamer] Remove unsound assertions in MediaPlayerPrivateGStreamerBase.
authorMs2ger@igalia.com <Ms2ger@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 5 Aug 2018 10:10:10 +0000 (10:10 +0000)
committerMs2ger@igalia.com <Ms2ger@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 5 Aug 2018 10:10:10 +0000 (10:10 +0000)
https://bugs.webkit.org/show_bug.cgi?id=188162

Reviewed by Philippe Normand.

These assertions sometimes fail, and there's a runtime check right
after them anyway.

Tests: fast/canvas/webgl/texImage2D-video-flipY-false.html
       fast/canvas/webgl/texImage2D-video-flipY-true.html

* platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:
(WebCore::MediaPlayerPrivateGStreamerBase::copyVideoTextureToPlatformTexture):
(WebCore::MediaPlayerPrivateGStreamerBase::nativeImageForCurrentTime):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@234583 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp

index 3f08fc1..3d89b3c 100644 (file)
@@ -1,3 +1,20 @@
+2018-08-05  Ms2ger  <Ms2ger@igalia.com>
+
+        [GStreamer] Remove unsound assertions in MediaPlayerPrivateGStreamerBase.
+        https://bugs.webkit.org/show_bug.cgi?id=188162
+
+        Reviewed by Philippe Normand.
+
+        These assertions sometimes fail, and there's a runtime check right
+        after them anyway.
+
+        Tests: fast/canvas/webgl/texImage2D-video-flipY-false.html
+               fast/canvas/webgl/texImage2D-video-flipY-true.html
+
+        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:
+        (WebCore::MediaPlayerPrivateGStreamerBase::copyVideoTextureToPlatformTexture):
+        (WebCore::MediaPlayerPrivateGStreamerBase::nativeImageForCurrentTime):
+
 2018-08-05  Philippe Normand  <pnormand@igalia.com>
 
         [MediaCapabilities] Platform integration
index e3635d2..d73f241 100644 (file)
@@ -938,7 +938,6 @@ bool MediaPlayerPrivateGStreamerBase::copyVideoTextureToPlatformTexture(Graphics
     std::unique_ptr<GstVideoFrameHolder> frameHolder = std::make_unique<GstVideoFrameHolder>(m_sample.get(), texMapFlagFromOrientation(m_videoSourceOrientation), true);
 
     auto textureID = frameHolder->textureID();
-    ASSERT(textureID);
     if (!textureID)
         return false;
 
@@ -966,7 +965,6 @@ NativeImagePtr MediaPlayerPrivateGStreamerBase::nativeImageForCurrentTime()
     std::unique_ptr<GstVideoFrameHolder> frameHolder = std::make_unique<GstVideoFrameHolder>(m_sample.get(), texMapFlagFromOrientation(m_videoSourceOrientation), true);
 
     auto textureID = frameHolder->textureID();
-    ASSERT(textureID);
     if (!textureID)
         return nullptr;