commit d81602979a29333f015661ce5070db6e02a005bf
author Sungtak Lee <taklee@google.com> Wed May 29 22:18:03 2024 +0000
committer Sungtak Lee <taklee@google.com> Thu May 30 04:20:05 2024 +0000
tree e2eadd646deda53f2e9d42bd3fffc2eaa583327a
parent 13ed94458e82368c78a17cd6c9aa23e557cde9a4

aidlpersistentsurface: enable submitting a null buffer

enable IAidlNode::submitBuffer to submit a null buffer when signalling
an end of stream.

Bug: 342038031
Change-Id: Ia6153ad570da5bd4cb980c6b56895a020f319e71

media/codec2/sfplugin/C2AidlNode.cpp

diff --git a/media/codec2/sfplugin/C2AidlNode.cpp b/media/codec2/sfplugin/C2AidlNode.cpp
index 93c9d8b..ef1cbf6 100644
--- a/media/codec2/sfplugin/C2AidlNode.cpp
+++ b/media/codec2/sfplugin/C2AidlNode.cpp
@@ -68,10 +68,15 @@
 }
 
 ::ndk::ScopedAStatus C2AidlNode::submitBuffer(
-        int32_t buffer, const ::aidl::android::hardware::HardwareBuffer& hBuffer,
+        int32_t buffer,
+        const std::optional<::aidl::android::hardware::HardwareBuffer>& hBuffer,
         int32_t flags, int64_t timestamp, const ::ndk::ScopedFileDescriptor& fence) {
     sp<GraphicBuffer> gBuf;
-    AHardwareBuffer *ahwb = hBuffer.get();
+    AHardwareBuffer *ahwb = nullptr;
+    if (hBuffer.has_value()) {
+        ahwb = hBuffer.value().get();
+    }
+
     if (ahwb) {
         gBuf = AHardwareBuffer_to_GraphicBuffer(ahwb);
     }

media/codec2/sfplugin/C2AidlNode.h

diff --git a/media/codec2/sfplugin/C2AidlNode.h b/media/codec2/sfplugin/C2AidlNode.h
index 365a41d..6d54ed6 100644
--- a/media/codec2/sfplugin/C2AidlNode.h
+++ b/media/codec2/sfplugin/C2AidlNode.h
@@ -49,7 +49,7 @@
 
     ::ndk::ScopedAStatus submitBuffer(
             int32_t buffer,
-            const ::aidl::android::hardware::HardwareBuffer& hBuffer,
+            const std::optional<::aidl::android::hardware::HardwareBuffer>& hBuffer,
             int32_t flags,
             int64_t timestampUs,
             const ::ndk::ScopedFileDescriptor& fence) override;