Revert "CCodec: fix dataspace configured for the input surfaces"
This reverts commit ac55b54fd080f280fa4949fa65c944b3f5c60f66.
Reason for revert: Possible cause for b/195620186
Bug: 195620186
Change-Id: If4f5187a9c0f7be12c561d54035b4881685ceee0
diff --git a/media/codec2/sfplugin/CCodec.cpp b/media/codec2/sfplugin/CCodec.cpp
index db7b3b6..16398a4 100644
--- a/media/codec2/sfplugin/CCodec.cpp
+++ b/media/codec2/sfplugin/CCodec.cpp
@@ -1572,25 +1572,8 @@
// configure dataspace
static_assert(sizeof(int32_t) == sizeof(android_dataspace), "dataspace size mismatch");
-
- // The output format contains app-configured color aspects, and the input format
- // has the default color aspects. Use the default for the unspecified params.
- ColorAspects inputColorAspects, outputColorAspects;
- getColorAspectsFromFormat(config->mOutputFormat, outputColorAspects);
- getColorAspectsFromFormat(config->mInputFormat, inputColorAspects);
- if (outputColorAspects.mRange == ColorAspects::RangeUnspecified) {
- outputColorAspects.mRange = inputColorAspects.mRange;
- }
- if (outputColorAspects.mPrimaries == ColorAspects::PrimariesUnspecified) {
- outputColorAspects.mPrimaries = inputColorAspects.mPrimaries;
- }
- if (outputColorAspects.mTransfer == ColorAspects::TransferUnspecified) {
- outputColorAspects.mTransfer = inputColorAspects.mTransfer;
- }
- if (outputColorAspects.mMatrixCoeffs == ColorAspects::MatrixUnspecified) {
- outputColorAspects.mMatrixCoeffs = inputColorAspects.mMatrixCoeffs;
- }
- android_dataspace dataSpace = getDataSpaceForColorAspects(outputColorAspects, false);
+ android_dataspace dataSpace = HAL_DATASPACE_UNKNOWN;
+ (void)config->mInputFormat->findInt32("android._dataspace", (int32_t*)&dataSpace);
surface->setDataSpace(dataSpace);
status_t err = mChannel->setInputSurface(surface);