Merge branch 'Tencent:main' into build_viewer

Author: CodeJhF

CMakeLists.txt

@@ -21,7 +21,8 @@ set(CMAKE_CXX_VISIBILITY_PRESET hidden)
 
 # Options for building libpag
 option(PAG_USE_OPENGL "Allow use of OpenGL as GPU backend" ON)
-option(PAG_USE_SWIFTSHADER "Allow build with SwiftShader library" OFF)
+option(PAG_USE_SWIFTSHADER "Allow build with the SwiftShader library" OFF)
+option(PAG_USE_ANGLE "Allow build with the ANGLE library" OFF)
 option(PAG_USE_QT "Allow build with QT frameworks" OFF)
 option(PAG_USE_RTTR "Enable RTTR support" OFF)
 option(PAG_USE_HARFBUZZ "Enable HarfBuzz support" OFF)
@@ -76,12 +77,13 @@ endif ()
 
 if (PAG_USE_QT)
     set(PAG_USE_SWIFTSHADER OFF)
+    set(PAG_USE_ANGLE OFF)
+elseif (PAG_USE_SWIFTSHADER)
+    set(PAG_USE_ANGLE OFF)
 endif ()
 
-if (PAG_USE_QT OR PAG_USE_SWIFTSHADER)
+if (PAG_USE_QT OR PAG_USE_SWIFTSHADER OR PAG_USE_ANGLE)
     set(PAG_USE_OPENGL ON)
-else ()
-    set(USE_NATIVE_PLATFORM ON)
 endif ()
 
 if (PAG_USE_FFAVC)
@@ -201,6 +203,8 @@ elseif (PAG_USE_SWIFTSHADER)
     list(APPEND PAG_INCLUDES ${TGFX_DIR}/vendor/swiftshader/include)
     file(GLOB_RECURSE PLATFORM_FILES src/platform/swiftshader/*.*)
     list(APPEND PAG_FILES ${PLATFORM_FILES})
+else ()
+    set(USE_NATIVE_PLATFORM ON)
 endif ()
 
 if (PAG_USE_RTTR)
@@ -350,9 +354,16 @@ elseif (WIN32)
     list(APPEND PAG_DEFINES NOMINMAX _USE_MATH_DEFINES)
 
     if (USE_NATIVE_PLATFORM)
-        list(APPEND PAG_INCLUDES ${TGFX_DIR}/vendor/angle/include)
-        file(GLOB ANGLE_LIBS ${TGFX_DIR}/vendor/angle/${PLATFORM}/${ARCH}/*${CMAKE_STATIC_LIBRARY_SUFFIX})
-        list(APPEND PAG_STATIC_LIBS ${ANGLE_LIBS})
+        if (PAG_USE_ANGLE)
+            list(APPEND PAG_DEFINES PAG_USE_ANGLE)
+            list(APPEND PAG_INCLUDES ${TGFX_DIR}/vendor/angle/include)
+            file(GLOB ANGLE_LIBS ${TGFX_DIR}/vendor/angle/${PLATFORM}/${ARCH}/*${CMAKE_STATIC_LIBRARY_SUFFIX})
+            list(APPEND PAG_STATIC_LIBS ${ANGLE_LIBS})
+        else ()
+            find_library(OPENGL_LIB opengl32)
+            list(APPEND PAG_STATIC_LIBS ${OPENGL_LIB})
+        endif ()
+
         file(GLOB_RECURSE PLATFORM_FILES src/platform/win/*.*)
         list(APPEND PAG_FILES ${PLATFORM_FILES})
     endif ()
@@ -431,6 +442,7 @@ if (NOT HAS_CUSTOM_TGFX_DIR AND EXISTS ${TGFX_CACHE_DIR})
     list(APPEND TGFX_OPTIONS "-DTGFX_USE_OPENGL=${PAG_USE_OPENGL}")
     list(APPEND TGFX_OPTIONS "-DTGFX_USE_QT=${PAG_USE_QT}")
     list(APPEND TGFX_OPTIONS "-DTGFX_USE_SWIFTSHADER=${PAG_USE_SWIFTSHADER}")
+    list(APPEND TGFX_OPTIONS "-DTGFX_USE_ANGLE=${PAG_USE_ANGLE}")
     list(APPEND TGFX_OPTIONS "-DTGFX_USE_FREETYPE=${PAG_USE_FREETYPE}")
     list(APPEND TGFX_OPTIONS "-DTGFX_USE_PNG_DECODE=${PAG_USE_PNG_DECODE}")
     list(APPEND TGFX_OPTIONS "-DTGFX_USE_PNG_ENCODE=${PAG_USE_PNG_ENCODE}")
@@ -462,6 +474,7 @@ else ()
     set(TGFX_USE_OPENGL ${PAG_USE_OPENGL})
     set(TGFX_USE_QT ${PAG_USE_QT})
     set(TGFX_USE_SWIFTSHADER ${PAG_USE_SWIFTSHADER})
+    set(TGFX_USE_ANGLE ${PAG_USE_ANGLE})
     set(TGFX_USE_FREETYPE ${PAG_USE_FREETYPE})
     set(TGFX_USE_PNG_DECODE ${PAG_USE_PNG_DECODE})
     set(TGFX_USE_PNG_ENCODE ${PAG_USE_PNG_ENCODE})

DEPS

@@ -12,7 +12,7 @@
       },
       {
         "url": "${PAG_GROUP}/tgfx.git",
-        "commit": "235ce5e99ddb33cb8679702ea6b17a7098e10023",
+        "commit": "2d4b07c7388b5a5825fbbc032a30bb7a05e6452b",
         "dir": "third_party/tgfx"
       },
       {

src/platform/ohos/NativeDisplayLink.h

@@ -17,7 +17,11 @@
 /////////////////////////////////////////////////////////////////////////////////////////////////
 
 #pragma once
+
+// clang-format off
+#include <stdint.h>
 #include <native_vsync/native_vsync.h>
+// clang-format on
 #include <functional>
 #include <mutex>
 #include "rendering/utils/DisplayLink.h"

src/platform/ohos/OHOSVideoDecoder.cpp

@@ -100,6 +100,7 @@ OHOSVideoDecoder::~OHOSVideoDecoder() {
     }
   }
   if (videoCodec != nullptr) {
+    releaseOutputBuffer();
     OH_VideoDecoder_Flush(videoCodec);
     OH_VideoDecoder_Stop(videoCodec);
     OH_VideoDecoder_Destroy(videoCodec);
@@ -133,7 +134,6 @@ bool OHOSVideoDecoder::initDecoder(const OH_AVCodecCategory avCodecCategory) {
   OH_AVFormat* ohFormat = OH_AVFormat_Create();
   OH_AVFormat_SetIntValue(ohFormat, OH_MD_KEY_WIDTH, videoFormat.width);
   OH_AVFormat_SetIntValue(ohFormat, OH_MD_KEY_HEIGHT, videoFormat.height);
-  OH_AVFormat_SetIntValue(ohFormat, OH_MD_KEY_VIDEO_ENABLE_LOW_LATENCY, 1);
   OH_AVFormat_SetIntValue(ohFormat, OH_MD_KEY_PIXEL_FORMAT, AV_PIXEL_FORMAT_NV12);
   ret = OH_VideoDecoder_Configure(videoCodec, ohFormat);
   OH_AVFormat_Destroy(ohFormat);
@@ -194,14 +194,15 @@ DecodingResult OHOSVideoDecoder::onEndOfStream() {
 }
 
 DecodingResult OHOSVideoDecoder::onDecodeFrame() {
+  releaseOutputBuffer();
   std::unique_lock<std::mutex> lock(codecUserData->outputMutex);
   codecUserData->outputCondition.wait(lock, [this]() {
-    // In the PAG file, video sequence frame software decoding testing requires sending additional
-    // data before obtaining the decoded data. If compatibility with user video decoding is desired,
-    // retesting is necessary.
-    return codecUserData->outputBufferInfoQueue.size() > 0 ||
-           pendingFrames.size() <= static_cast<size_t>(videoFormat.maxReorderSize) +
-                                       (codecCategory == SOFTWARE ? 1 : 0);
+    /**
+     * According to HarmonyOS recommendations, temporarily modify the maximum frame delivery count to 16 to avoid 
+     * freezing issues caused by the lack of decoded data on certain HarmonyOS devices. However, this change will 
+     * result in increased memory usage. Once HarmonyOS are improved, appropriate adjustments will be made here.
+     */
+    return codecUserData->outputBufferInfoQueue.size() > 0 || pendingFrames.size() <= 16;
   });
   if (codecUserData->outputBufferInfoQueue.size() > 0) {
     codecBufferInfo = codecUserData->outputBufferInfoQueue.front();
@@ -215,11 +216,6 @@ DecodingResult OHOSVideoDecoder::onDecodeFrame() {
     lock.unlock();
     return DecodingResult::Success;
   }
-  int ret = OH_VideoDecoder_FreeOutputBuffer(videoCodec, codecBufferInfo.bufferIndex);
-  if (ret != AV_ERR_OK) {
-    LOGE("OH_VideoDecoder_FreeOutputBuffer failed, ret:%d", ret);
-    return DecodingResult::Error;
-  }
   if (codecBufferInfo.attr.flags == AVCODEC_BUFFER_FLAGS_EOS) {
     return DecodingResult::EndOfStream;
   }
@@ -310,4 +306,14 @@ std::shared_ptr<tgfx::ImageBuffer> OHOSVideoDecoder::onRenderFrame() {
   return imageBuffer;
 }
 
+void OHOSVideoDecoder::releaseOutputBuffer() {
+  if (codecBufferInfo.buffer) {
+    int ret = OH_VideoDecoder_FreeOutputBuffer(videoCodec, codecBufferInfo.bufferIndex);
+    if (ret != AV_ERR_OK) {
+      LOGE("OH_VideoDecoder_FreeOutputBuffer failed, ret:%d", ret);
+    }
+    codecBufferInfo = {0, nullptr};
+  }
+}
+
 }  // namespace pag

src/platform/ohos/OHOSVideoDecoder.h

@@ -101,5 +101,6 @@ class OHOSVideoDecoder : public VideoDecoder {
   explicit OHOSVideoDecoder(const VideoFormat& format, bool hardware);
   bool initDecoder(const OH_AVCodecCategory avCodecCategory);
   bool start();
+  void releaseOutputBuffer();
 };
 }  // namespace pag

src/platform/win/GPUDrawable.cpp

@@ -19,7 +19,11 @@
 #include "GPUDrawable.h"
 #include <windows.h>
 #include "base/utils/Log.h"
+#ifdef PAG_USE_ANGLE
 #include "tgfx/gpu/opengl/egl/EGLWindow.h"
+#else
+#include "tgfx/gpu/opengl/wgl/WGLWindow.h"
+#endif
 
 namespace pag {
 std::shared_ptr<GPUDrawable> GPUDrawable::FromWindow(void* nativeWindow, void* sharedContext) {
@@ -56,8 +60,13 @@ std::shared_ptr<tgfx::Device> GPUDrawable::getDevice() {
     return nullptr;
   }
   if (window == nullptr) {
+#ifdef PAG_USE_ANGLE
     window = tgfx::EGLWindow::MakeFrom(reinterpret_cast<EGLNativeWindowType>(nativeWindow),
                                        sharedContext);
+#else
+    window = tgfx::WGLWindow::MakeFrom(reinterpret_cast<HWND>(nativeWindow),
+                                       reinterpret_cast<HGLRC>(sharedContext));
+#endif
   }
   return window ? window->getDevice() : nullptr;
 }
@@ -75,4 +84,4 @@ void GPUDrawable::onFreeSurface() {
 void GPUDrawable::present(tgfx::Context* context) {
   window->present(context);
 }
-}  // namespace pag
+}  // namespace pag

src/platform/win/GPUDrawable.h

@@ -22,7 +22,8 @@
 
 namespace tgfx {
 class EGLWindow;
-}
+class WGLWindow;
+}  // namespace tgfx
 
 namespace pag {
 class GPUDrawable : public Drawable {
@@ -51,10 +52,14 @@ class GPUDrawable : public Drawable {
  private:
   int _width = 0;
   int _height = 0;
+#ifdef PAG_USE_ANGLE
   std::shared_ptr<tgfx::EGLWindow> window = nullptr;
+#else
+  std::shared_ptr<tgfx::WGLWindow> window = nullptr;
+#endif
   void* nativeWindow = nullptr;
   void* sharedContext = nullptr;
 
   GPUDrawable(void* nativeWindow, void* sharedContext);
 };
-}  // namespace pag
+}  // namespace pag

src/rendering/PAGAnimator.cpp

@@ -275,7 +275,7 @@ std::vector<int> PAGAnimator::doAdvance() {
 
 void PAGAnimator::doUpdate(bool setStartTime) {
   locker.lock();
-  if (task != nullptr && task->executing()) {
+  if (task != nullptr && task->status() == tgfx::TaskStatus::Executing) {
     locker.unlock();
     return;
   }

src/rendering/graphics/Canvas.h

@@ -105,10 +105,6 @@ class Canvas {
     canvas->clear();
   }
 
-  void clearRect(const tgfx::Rect& rect, const tgfx::Color& color) {
-    canvas->clearRect(rect, color);
-  }
-
   void drawLine(float x0, float y0, float x1, float y1, const tgfx::Paint& paint) {
     canvas->drawLine(x0, y0, x1, y1, createPaint(paint));
   }

src/rendering/renderers/FilterRenderer.cpp

@@ -152,8 +152,12 @@ void FilterRenderer::MeasureFilterBounds(tgfx::Rect* bounds, const FilterModifie
   }
 }
 
-tgfx::Rect GetClipBounds(Canvas* canvas, const FilterList* filterList) {
+tgfx::Rect GetClipBounds(Canvas* canvas, const FilterList* filterList,
+                         const tgfx::Rect& contentBounds) {
   auto clip = canvas->getTotalClip();
+  if (clip.isInverseFillType()) {
+    return contentBounds;
+  }
   auto matrix = canvas->getMatrix();
   if (filterList->useParentSizeInput) {
     tgfx::Matrix inverted = tgfx::Matrix::I();
@@ -359,7 +363,7 @@ void FilterRenderer::DrawWithFilter(Canvas* parentCanvas, const FilterModifier*
   auto filterList = MakeFilterList(modifier);
   auto contentBounds = GetContentBounds(filterList.get(), content);
   // 相对于content Bounds的clip Bounds
-  auto clipBounds = GetClipBounds(parentCanvas, filterList.get());
+  auto clipBounds = GetClipBounds(parentCanvas, filterList.get(), contentBounds);
 
   auto contentScale = GetContentScale(parentCanvas, filterList->scaleFactorLimit,
                                       GetScaleFactor(filterList.get(), contentBounds));