Fix HarmonyOS decoding error and temporarily increased frame wait limit to 16. (#2743)

Author: kevingpqi123

src/platform/ohos/NativeDisplayLink.h

@@ -18,6 +18,7 @@
 
 #pragma once
 #include <native_vsync/native_vsync.h>
+#include <cstdint>
 #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,19 +194,21 @@ 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();
     codecUserData->outputBufferInfoQueue.pop();
     lock.unlock();
+    lastOutputBufferIndex = codecBufferInfo.bufferIndex;
     pendingFrames.remove(codecBufferInfo.attr.pts);
     if (codecBufferInfo.buffer == nullptr) {
       return DecodingResult::Error;
@@ -215,11 +217,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;
   }
@@ -233,6 +230,7 @@ void OHOSVideoDecoder::onFlush() {
   }
   codecUserData->clearQueue();
   pendingFrames.clear();
+  lastOutputBufferIndex = -1;
   codecBufferInfo = {0, nullptr};
   start();
 }
@@ -310,4 +308,14 @@ std::shared_ptr<tgfx::ImageBuffer> OHOSVideoDecoder::onRenderFrame() {
   return imageBuffer;
 }
 
+void OHOSVideoDecoder::releaseOutputBuffer() {
+  if (lastOutputBufferIndex != -1) {
+    int ret = OH_VideoDecoder_FreeOutputBuffer(videoCodec, codecBufferInfo.bufferIndex);
+    if (ret != AV_ERR_OK) {
+      LOGE("OH_VideoDecoder_FreeOutputBuffer failed, ret:%d", ret);
+    }
+    lastOutputBufferIndex = -1;
+  }
+}
+
 }  // namespace pag

src/platform/ohos/OHOSVideoDecoder.h

@@ -97,9 +97,11 @@ class OHOSVideoDecoder : public VideoDecoder {
   int64_t yBufferSize = 0;
   int64_t uvBufferSize = 0;
   std::weak_ptr<OHOSVideoDecoder> weakThis;
+  int lastOutputBufferIndex = -1;
 
   explicit OHOSVideoDecoder(const VideoFormat& format, bool hardware);
   bool initDecoder(const OH_AVCodecCategory avCodecCategory);
   bool start();
+  void releaseOutputBuffer();
 };
 }  // namespace pag