commit 4f13d11b40dbef6c019d4231f05ed53f83396dd9
author Wonsik Kim <wonsik@google.com> Wed Mar 17 04:37:46 2021 +0000
committer Wonsik Kim <wonsik@google.com> Wed Mar 17 04:37:46 2021 +0000
tree 09e7939f55f2ea049a66d68b78fddde748754024
parent 40aaf9549cb6a4eb5c5de4dc010f6a4ade78ea96

Revert "CCodec: handle dataspace update from GraphicBufferSource"

This reverts commit 40aaf9549cb6a4eb5c5de4dc010f6a4ade78ea96.

Reason for revert: b/182820205

Change-Id: Id59363390691d457b404161f973bb548d1c34db7

media/codec2/sfplugin/C2OMXNode.cpp

diff --git a/media/codec2/sfplugin/C2OMXNode.cpp b/media/codec2/sfplugin/C2OMXNode.cpp
index 1a92c08..ab73245 100644
--- a/media/codec2/sfplugin/C2OMXNode.cpp
+++ b/media/codec2/sfplugin/C2OMXNode.cpp
@@ -33,14 +33,12 @@
 #include <OMX_IndexExt.h>
 
 #include <android/fdsan.h>
-#include <media/stagefright/foundation/ColorUtils.h>
 #include <media/stagefright/omx/OMXUtils.h>
 #include <media/stagefright/MediaErrors.h>
 #include <ui/Fence.h>
 #include <ui/GraphicBuffer.h>
 #include <utils/Thread.h>
 
-#include "utils/Codec2Mapper.h"
 #include "C2OMXNode.h"
 
 namespace android {
@@ -73,25 +71,6 @@
         jobs->cond.broadcast();
     }
 
-    void setDataspace(android_dataspace dataspace) {
-        Mutexed<Jobs>::Locked jobs(mJobs);
-        ColorUtils::convertDataSpaceToV0(dataspace);
-        jobs->configUpdate.emplace_back(new C2StreamDataSpaceInfo::input(0u, dataspace));
-        int32_t standard = (int32_t(dataspace) & HAL_DATASPACE_STANDARD_MASK)
-            >> HAL_DATASPACE_STANDARD_SHIFT;
-        int32_t transfer = (int32_t(dataspace) & HAL_DATASPACE_TRANSFER_MASK)
-            >> HAL_DATASPACE_TRANSFER_SHIFT;
-        int32_t range = (int32_t(dataspace) & HAL_DATASPACE_RANGE_MASK)
-            >> HAL_DATASPACE_RANGE_SHIFT;
-        std::unique_ptr<C2StreamColorAspectsInfo::input> colorAspects =
-            std::make_unique<C2StreamColorAspectsInfo::input>(0u);
-        if (C2Mapper::map(standard, &colorAspects->primaries, &colorAspects->matrix)
-                && C2Mapper::map(transfer, &colorAspects->transfer)
-                && C2Mapper::map(range, &colorAspects->range)) {
-            jobs->configUpdate.push_back(std::move(colorAspects));
-        }
-    }
-
 protected:
     bool threadLoop() override {
         constexpr nsecs_t kIntervalNs = nsecs_t(10) * 1000 * 1000;  // 10ms
@@ -123,9 +102,6 @@
                     uniqueFds.push_back(std::move(queue.workList.front().fd1));
                     queue.workList.pop_front();
                 }
-                for (const std::unique_ptr<C2Param> &param : jobs->configUpdate) {
-                    items.front()->input.configUpdate.emplace_back(C2Param::Copy(*param));
-                }
 
                 jobs.unlock();
                 for (int fenceFd : fenceFds) {
@@ -143,7 +119,6 @@
                 queued = true;
             }
             if (queued) {
-                jobs->configUpdate.clear();
                 return true;
             }
             if (i == 0) {
@@ -186,7 +161,6 @@
         std::map<std::weak_ptr<Codec2Client::Component>,
                  Queue,
                  std::owner_less<std::weak_ptr<Codec2Client::Component>>> queues;
-        std::vector<std::unique_ptr<C2Param>> configUpdate;
         Condition cond;
     };
     Mutexed<Jobs> mJobs;
@@ -198,9 +172,6 @@
       mQueueThread(new QueueThread) {
     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;
 }
 
 status_t C2OMXNode::freeNode() {
@@ -488,11 +459,8 @@
     android_dataspace dataSpace = (android_dataspace)msg.u.event_data.data1;
     uint32_t pixelFormat = msg.u.event_data.data3;
 
+    // TODO: set dataspace on component to see if it impacts color aspects
     ALOGD("dataspace changed to %#x pixel format: %#x", dataSpace, pixelFormat);
-    mQueueThread->setDataspace(dataSpace);
-
-    Mutexed<android_dataspace>::Locked ds(mDataspace);
-    *ds = dataSpace;
     return OK;
 }
 
@@ -525,8 +493,4 @@
     (void)mBufferSource->onInputBufferEmptied(bufferId, -1);
 }
 
-android_dataspace C2OMXNode::getDataspace() {
-    return *mDataspace.lock();
-}
-
 }  // namespace android