gl: convert pal8 to rgb by sws wang-bin#776

what about gray video?

Author: wang-bin

qml/QQuickItemRenderer.cpp

@@ -94,7 +94,9 @@ VideoRendererId QQuickItemRenderer::id() const
 
 bool QQuickItemRenderer::isSupported(VideoFormat::PixelFormat pixfmt) const
 {
-    if (pixfmt == VideoFormat::Format_RGB48BE)
+    if (pixfmt == VideoFormat::Format_RGB48BE
+            || pixfmt == VideoFormat::Format_Invalid
+            )
         return false;
     if (!isOpenGL())
         return VideoFormat::isRGB(pixfmt);

qml/QuickFBORenderer.cpp

@@ -116,7 +116,8 @@ QQuickFramebufferObject::Renderer* QuickFBORenderer::createRenderer() const
 
 bool QuickFBORenderer::isSupported(VideoFormat::PixelFormat pixfmt) const
 {
-    if (pixfmt == VideoFormat::Format_RGB48BE)
+    if (pixfmt == VideoFormat::Format_RGB48BE
+            || pixfmt == VideoFormat::Format_Invalid)
         return false;
     if (!isOpenGL())
         return VideoFormat::isRGB(pixfmt);

src/VideoThread.cpp

@@ -218,7 +218,12 @@ bool VideoThread::deliverVideoFrame(VideoFrame &frame)
     if (vo && (!vo->isSupported(frame.pixelFormat())
             || (vo->isPreferredPixelFormatForced() && vo->preferredPixelFormat() != frame.pixelFormat())
             )) {
-        VideoFrame outFrame(d.conv.convert(frame, vo->preferredPixelFormat()));
+        VideoFormat fmt(frame.format());
+        if (fmt.hasPalette() || fmt.isRGB())
+            fmt = VideoFormat::Format_RGB32;
+        else
+            fmt = vo->preferredPixelFormat();
+        VideoFrame outFrame(d.conv.convert(frame, fmt));
         if (!outFrame.isValid()) {
             d.outputSet->unlock();
             return false;
@@ -612,6 +617,14 @@ void VideoThread::run()
             //qDebug("v_a:%.4f, v_a_: %.4f", v_a, v_a_);
         }
     }
+#if 0
+    if (d.stop) {// user stop
+        // decode eof?
+        qDebug("decoding eof...");
+
+        while (d.dec && d.dec->decode(Packet::createEOF())) {d.dec->flush();}
+    }
+#endif
     d.packets.clear();
     qDebug("Video thread stops running...");
 }

src/opengl/OpenGLVideo.cpp

@@ -153,7 +153,7 @@ OpenGLVideo::OpenGLVideo() {}
 
 bool OpenGLVideo::isSupported(VideoFormat::PixelFormat pixfmt)
 {
-    return pixfmt != VideoFormat::Format_RGB48BE;
+    return pixfmt != VideoFormat::Format_RGB48BE && pixfmt != VideoFormat::Format_Invalid;
 }
 
 void OpenGLVideo::setOpenGLContext(QOpenGLContext *ctx)
@@ -197,7 +197,7 @@ void OpenGLVideo::setOpenGLContext(QOpenGLContext *ctx)
     // TODO: what if ctx is delete?
 #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
     d.manager = new ShaderManager(ctx);
-    QObject::connect(ctx, SIGNAL(aboutToBeDestroyed()), this, SLOT(resetGL()), Qt::DirectConnection); //direct?
+    QObject::connect(ctx, SIGNAL(aboutToBeDestroyed()), this, SLOT(resetGL()), Qt::DirectConnection); // direct to make sure there is a valid context. makeCurrent in window.aboutToBeDestroyed()?
 #else
     d.manager = new ShaderManager(this);
 #endif