commit ad01f6ac17ac6a531e9c5e663e6c6fe3feaa9e10
author Songyue Han <songyueh@google.com> Thu Aug 17 05:45:35 2023 +0000
committer Songyue Han <songyueh@google.com> Tue Sep 26 00:46:44 2023 +0000
tree 43cbb2838927c95b56f6eb2804937541a8fe5615
parent 1e6769bba20077d909d8461da5fb653a412b8ca1

Log pixel format metric for encoders using surface.

Send pixel format update from GraphicBufferSource to C2OMXNode. CCodec check pixel format with that in C2OMXNode while receiving kWorkDone.

Bug: 270518245
Test: manual

Merged-in: I3b425089bef72e66af69dd4b4fd28211ca41b223
Change-Id: I3b425089bef72e66af69dd4b4fd28211ca41b223
(cherry picked from commit 2a8d88348559a0d5e7232c2d5c507539d8db7675)

media/codec2/sfplugin/C2OMXNode.cpp

diff --git a/media/codec2/sfplugin/C2OMXNode.cpp b/media/codec2/sfplugin/C2OMXNode.cpp
index 92cfe31..bba022b 100644
--- a/media/codec2/sfplugin/C2OMXNode.cpp
+++ b/media/codec2/sfplugin/C2OMXNode.cpp
@@ -202,8 +202,10 @@
     android_fdsan_set_error_level(ANDROID_FDSAN_ERROR_LEVEL_WARN_ALWAYS);
     mQueueThread->run("C2OMXNode", PRIORITY_AUDIO);
 
-    Mutexed<android_dataspace>::Locked ds(mDataspace);
-    *ds = HAL_DATASPACE_UNKNOWN;
+    android_dataspace ds = HAL_DATASPACE_UNKNOWN;
+    mDataspace.lock().set(ds);
+    uint32_t pf = PIXEL_FORMAT_UNKNOWN;
+    mPixelFormat.lock().set(pf);
 }
 
 status_t C2OMXNode::freeNode() {
@@ -521,8 +523,8 @@
     ALOGD("dataspace changed to %#x pixel format: %#x", dataSpace, pixelFormat);
     mQueueThread->setDataspace(dataSpace);
 
-    Mutexed<android_dataspace>::Locked ds(mDataspace);
-    *ds = dataSpace;
+    mDataspace.lock().set(dataSpace);
+    mPixelFormat.lock().set(pixelFormat);
     return OK;
 }
 
@@ -559,6 +561,10 @@
     return *mDataspace.lock();
 }
 
+uint32_t C2OMXNode::getPixelFormat() {
+    return *mPixelFormat.lock();
+}
+
 void C2OMXNode::setPriority(int priority) {
     mQueueThread->setPriority(priority);
 }