Remove lastOutputBufferIndex from OHOSVideoDecoder. (#2744)

Author: kevingpqi123

src/platform/ohos/NativeDisplayLink.h

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

src/platform/ohos/OHOSVideoDecoder.cpp

@@ -208,7 +208,6 @@ DecodingResult OHOSVideoDecoder::onDecodeFrame() {
     codecBufferInfo = codecUserData->outputBufferInfoQueue.front();
     codecUserData->outputBufferInfoQueue.pop();
     lock.unlock();
-    lastOutputBufferIndex = codecBufferInfo.bufferIndex;
     pendingFrames.remove(codecBufferInfo.attr.pts);
     if (codecBufferInfo.buffer == nullptr) {
       return DecodingResult::Error;
@@ -230,7 +229,6 @@ void OHOSVideoDecoder::onFlush() {
   }
   codecUserData->clearQueue();
   pendingFrames.clear();
-  lastOutputBufferIndex = -1;
   codecBufferInfo = {0, nullptr};
   start();
 }
@@ -309,12 +307,12 @@ std::shared_ptr<tgfx::ImageBuffer> OHOSVideoDecoder::onRenderFrame() {
 }
 
 void OHOSVideoDecoder::releaseOutputBuffer() {
-  if (lastOutputBufferIndex != -1) {
+  if (codecBufferInfo.buffer) {
     int ret = OH_VideoDecoder_FreeOutputBuffer(videoCodec, codecBufferInfo.bufferIndex);
     if (ret != AV_ERR_OK) {
       LOGE("OH_VideoDecoder_FreeOutputBuffer failed, ret:%d", ret);
     }
-    lastOutputBufferIndex = -1;
+    codecBufferInfo = {0, nullptr};
   }
 }
 

src/platform/ohos/OHOSVideoDecoder.h

@@ -97,7 +97,6 @@ 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);