优化代码；

RealChuan · Nov 7, 2023 · 7e23188 · 7e23188
1 parent 1bbe84f
commit 7e23188
Show file tree

Hide file tree

Showing 8 changed files with 51 additions and 54 deletions.
diff --git a/README.md b/README.md
@@ -7,7 +7,7 @@
 
 <div align=center><img src="doc/player.jpeg"></div>
 
-### 需要一个强大的opengl和vulkan yuv渲染模块！
+### 需要一个强大的opengl和vulkan yuv渲染模块
 
 1. Opengl中的shader有太多if else导致GPU空跑，影响GPU解码和av_hwframe_transfer_data速度，这个现象在4K视频图像上尤为明显；
 2. 在WidgetRender中，尽可能使用QImage::Format_RGB32和QImage::Format_ARGB32_Premultiplied图像格式。如下原因：
@@ -18,35 +18,36 @@
 现在调整了对比度，饱和度，亮度；效果并不是很好。
 
 ```cpp
-contrast = 1.6;
-saturation = 1.0;
+contrast = 1.4;
+saturation = 0.9;
 brightness = 0;
 ```
+
 如果不调整，就跟ffplay输出图像效果一致，整体颜色偏暗。Netflix的视频，视频开头的N，显示的颜色偏暗黄色。
 
 ### OpenGL 渲染图像，怎么实现画质增强的效果？
 
 ### Ffmpeg（5.0）在解码字幕与4.4.3不太一样
 
-#### 解码字幕(ffmpeg-n5.0):
+#### 解码字幕(ffmpeg-n5.0)
 
-```
+```bash
 0,,en,,0000,0000,0000,,Peek-a-boo!
 ```
 
 你必须使用 ``ass_process_chunk`` 并设置 pts 和持续时间, 如在 libavfilter/vf_subtitles.c 中一样。
 
-#### ASS 标准格式应为(ffmpeg-n4.4.3) :
+#### ASS 标准格式应为(ffmpeg-n4.4.3)
 
-```
+```bash
 Dialogue: 0,0:01:06.77,0:01:08.00,en,,0000,0000,0000,,Peek-a-boo!\r\n
 ```
 
 使用 ``ass_process_data``;
 
 ### 使用字幕过滤器时，字幕显示时间有问题
 
-```
+```bash
 subtitles=filename='%1':original_size=%2x%3
 ```
 
@@ -61,6 +62,7 @@ subtitles=filename='%1':original_size=%2x%3
    d_ptr->codecCtx->flags |= AV_CODEC_FLAG_QSCALE;
    d_ptr->codecCtx->global_quality = FF_QP2LAMBDA * quailty;
    ```
+
 3. 设置 ``crf`` 无效。代码如下：
 
    ```C++
@@ -78,23 +80,13 @@ transcodeCtx->audioPts += frame->nb_samples;
 
 ### [New BING的视频转码建议](./doc/bing_transcode.md)
 
-## SwsContext很棒！与 QImage 转换为和缩放相比。
+## SwsContext很棒！与 QImage 转换为和缩放相比
 
 ## QT-BUG
 
-### Failed to set up resampler
-
-[it&#39;s a bug in Qt 6.4.1 on Windows](https://forum.qt.io/topic/140523/qt-6-x-error-message-qt-multimedia-audiooutput-failed-to-setup-resampler)
-https://bugreports.qt.io/browse/QTBUG-108383 (johnco3's bug report)
-https://bugreports.qt.io/browse/QTBUG-108669 (a duplicate bug report; I filed it before I found any of this)
-
-#### solution:
-
-https://stackoverflow.com/questions/74500509/failed-to-setup-resampler-when-starting-qaudiosink
-
 #### 动态切换Video Render，从opengl切换到widget，还是有GPU 0-3D占用，而且使用量是opengl的2倍！！！QT-BUG？
 
-### QOpenGLWidget内存泄漏，移动放大和缩小窗口，代码如下：
+### QOpenGLWidget内存泄漏，移动放大和缩小窗口，代码如下
 
 ```C++
 int main(int argc, char *argv[])

diff --git a/doc/bing_transcode.md b/doc/bing_transcode.md
@@ -139,4 +139,4 @@ ffmpeg -i input.mp4 -c:v libx264 -crf 22 -preset slow -tune zerolatency -profile
 ```bash
 # Encode input.mp4 to output.mkv with resolution=1280x720, bitrate=2000000, framerate=30, codec=libx265
 ffmpeg -i input.mp4 -c:v libx265 -s 1280x720 -b:v 2000000 -r 30 output.mkv
-```
+```
diff --git a/ffmpeg/videoframeconverter.cc b/ffmpeg/videoframeconverter.cc
@@ -67,9 +67,9 @@ VideoFrameConverter::VideoFrameConverter(CodecContext *codecCtx,
                                              d_ptr->dst_pix_fmt,
                                              d_ptr->dstSize.width() > ctx->width ? SWS_BICUBIC
                                                                                  : SWS_BILINEAR,
-                                             NULL,
-                                             NULL,
-                                             NULL);
+                                             nullptr,
+                                             nullptr,
+                                             nullptr);
     Q_ASSERT(d_ptr->swsContext != nullptr);
 }
 
@@ -106,9 +106,9 @@ void VideoFrameConverter::flush(Frame *frame, const QSize &dstSize, AVPixelForma
                                              d_ptr->dst_pix_fmt,
                                              d_ptr->dstSize.width() > avFrame->width ? SWS_BICUBIC
                                                                                      : SWS_BILINEAR,
-                                             NULL,
-                                             NULL,
-                                             NULL);
+                                             nullptr,
+                                             nullptr,
+                                             nullptr);
     Q_ASSERT(d_ptr->swsContext != nullptr);
 }
 

diff --git a/ffmpeg/videoframeconverter.hpp b/ffmpeg/videoframeconverter.hpp
@@ -20,9 +20,9 @@ class VideoFrameConverter : public QObject
                                  AVPixelFormat pix_fmt = AV_PIX_FMT_RGBA,
                                  QObject *parent = nullptr);
     explicit VideoFrameConverter(Frame *frame,
-                        const QSize &size = QSize(-1, -1),
-                        AVPixelFormat pix_fmt = AV_PIX_FMT_RGBA,
-                        QObject *parent = nullptr);
+                                 const QSize &size = QSize(-1, -1),
+                                 AVPixelFormat pix_fmt = AV_PIX_FMT_RGBA,
+                                 QObject *parent = nullptr);
     ~VideoFrameConverter() override;
 
     void flush(Frame *frame,

diff --git a/ffmpeg/videorender/openglrender.cc b/ffmpeg/videorender/openglrender.cc
@@ -183,9 +183,6 @@ void OpenglRender::initSubTexture()
 
 void OpenglRender::setColorSpace()
 {
-    GLfloat contrast = 1.0;
-    GLfloat saturation = 0;
-    GLfloat brightness = 0;
     auto *avFrame = d_ptr->framePtr->avFrame();
     switch (avFrame->colorspace) {
     case AVCOL_SPC_BT470BG:
@@ -199,9 +196,7 @@ void OpenglRender::setColorSpace()
         d_ptr->programPtr->setUniformValue("offset", ColorSpace::kBT2020ffset);
         d_ptr->programPtr->setUniformValue("colorConversion",
                                            QMatrix3x3(ColorSpace::kBT2020Matrix.data()));
-        contrast = 1.6;
-        saturation = 1.0;
-        brightness = 0;
+
         break;
     //case AVCOL_SPC_BT709:
     default:
@@ -210,6 +205,22 @@ void OpenglRender::setColorSpace()
                                            QMatrix3x3(ColorSpace::kBT709Matrix.data()));
         break;
     }
+}
+
+void OpenglRender::setColorTrc()
+{
+    GLfloat contrast = 1.0;
+    GLfloat saturation = 0;
+    GLfloat brightness = 0;
+    auto *avFrame = d_ptr->framePtr->avFrame();
+    switch (avFrame->color_trc) {
+    case AVCOL_TRC_SMPTE2084: // fake hdr
+        contrast = 1.4;
+        saturation = 0.9;
+        brightness = 0;
+        break;
+    default: break;
+    }
     d_ptr->programPtr->setUniformValue("contrast", contrast);
     d_ptr->programPtr->setUniformValue("saturation", saturation);
     d_ptr->programPtr->setUniformValue("brightness", brightness);
@@ -366,6 +377,7 @@ void OpenglRender::paintVideoFrame()
     d_ptr->programPtr->bind(); // 绑定着色器
     d_ptr->programPtr->setUniformValue("transform", fitToScreen({avFrame->width, avFrame->height}));
     setColorSpace();
+    setColorTrc();
     draw();
     d_ptr->programPtr->release();
     d_ptr->frameChanged = false;

diff --git a/ffmpeg/videorender/openglrender.hpp b/ffmpeg/videorender/openglrender.hpp
@@ -39,7 +39,6 @@ class FFMPEG_EXPORT OpenglRender : public VideoRender,
     void draw();
     void initTexture();
     void initSubTexture();
-    void setColorSpace();
     auto fitToScreen(const QSize &size) -> QMatrix4x4;
     void cleanup();
     void resetShader(int format);
@@ -49,6 +48,8 @@ class FFMPEG_EXPORT OpenglRender : public VideoRender,
 
     void paintVideoFrame();
     void paintSubTitleFrame();
+    void setColorSpace();
+    void setColorTrc();
 
     void updateYUV420P();
     void updateYUYV422();

diff --git a/ffmpeg/videorender/shader/video_nv12.frag b/ffmpeg/videorender/shader/video_nv12.frag
@@ -13,27 +13,19 @@ uniform float contrast;
 uniform float saturation;
 uniform float brightness;
 
-vec3 adjustContrast(vec3 rgb, float contrast) // 对比度调整函数
+vec3 adjustContrast(vec3 rgb, float contrast) // 调整对比度
 {
-    vec3 temp = rgb - vec3(0.5);
-    temp = temp * contrast;
-    temp = temp + vec3(0.5);
-    temp = clamp(temp, vec3(0.0), vec3(1.0));
-    return temp;
+    return clamp((rgb - vec3(0.5)) * contrast + vec3(0.5), vec3(0.0), vec3(1.0));
 }
 
-vec3 adjustSaturation(vec3 rgb, float saturation) // 饱和度调整函数
+vec3 adjustSaturation(vec3 rgb, float saturation) // 调整饱和度
 {
-    const vec3 luminosityFactor = vec3(0.2126, 0.7152, 0.0722);
-    vec3 grayscale = vec3(dot(rgb, luminosityFactor));
-    return mix(grayscale, rgb, 1.0 + saturation);
+    return mix(vec3(dot(rgb, vec3(0.2126, 0.7152, 0.0722))), rgb, 1.0 + saturation);
 }
 
-vec3 adjustBrightness(vec3 rgb, float brightness) // 亮度调整函数
+vec3 adjustBrightness(vec3 rgb, float brightness) // 调整亮度
 {
-    vec3 temp = rgb + vec3(brightness);
-    temp = clamp(temp, vec3(0.0), vec3(1.0));
-    return temp;
+    return clamp(rgb + vec3(brightness), vec3(0.0), vec3(1.0));
 }
 
 void main()

diff --git a/ffmpeg/videorender/widgetrender.cc b/ffmpeg/videorender/widgetrender.cc
@@ -16,10 +16,10 @@ namespace Ffmpeg {
 class WidgetRender::WidgetRenderPrivate
 {
 public:
-    WidgetRenderPrivate(QWidget *parent)
+    explicit WidgetRenderPrivate(QWidget *parent)
         : owner(parent)
     {}
-    ~WidgetRenderPrivate() {}
+    ~WidgetRenderPrivate() = default;
 
     QWidget *owner;
 
@@ -42,7 +42,7 @@ WidgetRender::WidgetRender(QWidget *parent)
     , d_ptr(new WidgetRenderPrivate(this))
 {}
 
-WidgetRender::~WidgetRender() {}
+WidgetRender::~WidgetRender() = default;
 
 bool WidgetRender::isSupportedOutput_pix_fmt(AVPixelFormat pix_fmt)
 {