commit 4cb09789fdc716febc55c9bff7e894cdfc91ee71
author Mahesh Lanka <mlanka@codeaurora.org> Fri Apr 19 18:13:01 2019 +0530
committer Gerrit - the friendly Code Review server <code-review@localhost> Fri Oct 25 01:43:23 2019 -0700
tree 85a67e5adc17efdd8e9255a3376f05819b73abfd
parent cd654f5d9a42eaa0d4afaba8e07a0fb7b50c36a5

mm-video-v4l2: vidc: Add support to retrieve color aspects

Add support to retrieve color aspects that match dataspace.
Client can retrieve and set matching color aspects
to handle dataspace change event.

Change-Id: Ic8236e2d4d9ea8dd75fa511bdcaf152536bf64b5

mm-video-v4l2/vidc/venc/src/omx_video_base.cpp

diff --git a/mm-video-v4l2/vidc/venc/src/omx_video_base.cpp b/mm-video-v4l2/vidc/venc/src/omx_video_base.cpp
index 906a0be..56aa24f 100644
--- a/mm-video-v4l2/vidc/venc/src/omx_video_base.cpp
+++ b/mm-video-v4l2/vidc/venc/src/omx_video_base.cpp
@@ -2235,9 +2235,49 @@
                         pParam->sAspects.mTransfer = ColorAspects::TransferSMPTE170M;
                         pParam->sAspects.mMatrixCoeffs = ColorAspects::MatrixBT601_6;
                     } else {
-                        // For IMPLEMENTATION_DEFINED (or anything else), stick to client's defaults.
-                        DEBUG_PRINT_INFO("get_config (dataspace changed): ColorSpace: use client-default for format=%x",
-                                pParam->nPixelFormat);
+                         DEBUG_PRINT_INFO("get_config (dataspace changed): dataspace=0x%x", pParam->nDataSpace);
+                         if (pParam->nDataSpace == HAL_DATASPACE_JFIF || pParam->nDataSpace == HAL_DATASPACE_V0_JFIF) {
+                             DEBUG_PRINT_INFO("get_config (dataspace changed): ColorSpace: for HAL_DATASPACE_JFIF");
+                             pParam->sAspects.mPrimaries = ColorAspects::PrimariesBT601_6_625;
+                             pParam->sAspects.mRange = ColorAspects::RangeFull;
+                             pParam->sAspects.mTransfer = ColorAspects::TransferSMPTE170M;
+                             pParam->sAspects.mMatrixCoeffs = ColorAspects::MatrixBT601_6;
+                         } else if (pParam->nDataSpace == HAL_DATASPACE_BT601_525 || pParam->nDataSpace == HAL_DATASPACE_V0_BT601_525) {
+                             DEBUG_PRINT_INFO("get_config (dataspace changed): ColorSpace: for HAL_DATASPACE_BT601_525");
+                             pParam->sAspects.mPrimaries = ColorAspects::PrimariesBT601_6_525;
+                             pParam->sAspects.mRange = ColorAspects::RangeLimited;
+                             pParam->sAspects.mTransfer = ColorAspects::TransferSMPTE170M;
+                             pParam->sAspects.mMatrixCoeffs = ColorAspects::MatrixBT601_6;
+                         } else if (pParam->nDataSpace == HAL_DATASPACE_BT601_625 || pParam->nDataSpace == HAL_DATASPACE_V0_BT601_625) {
+                             DEBUG_PRINT_INFO("get_config (dataspace changed): ColorSpace: for HAL_DATASPACE_BT601_625");
+                             pParam->sAspects.mPrimaries = ColorAspects::PrimariesBT601_6_625;
+                             pParam->sAspects.mRange = ColorAspects::RangeLimited;
+                             pParam->sAspects.mTransfer = ColorAspects::TransferSMPTE170M;
+                             pParam->sAspects.mMatrixCoeffs = ColorAspects::MatrixBT601_6;
+                         } else if (pParam->nDataSpace == HAL_DATASPACE_BT709 || pParam->nDataSpace == HAL_DATASPACE_V0_BT709) {
+                             DEBUG_PRINT_INFO("get_config (dataspace changed): ColorSpace: for HAL_DATASPACE_BT709");
+                             pParam->sAspects.mPrimaries = ColorAspects::PrimariesBT709_5;
+                             pParam->sAspects.mRange = ColorAspects::RangeLimited;
+                             pParam->sAspects.mTransfer = ColorAspects::TransferSMPTE170M;
+                             pParam->sAspects.mMatrixCoeffs = ColorAspects::MatrixBT709_5;
+                         } else if (pParam->nDataSpace == HAL_DATASPACE_BT2020) {
+                             DEBUG_PRINT_INFO("get_config (dataspace changed): ColorSpace: for HAL_DATASPACE_BT2020");
+                             pParam->sAspects.mPrimaries = ColorAspects::PrimariesBT2020;
+                             pParam->sAspects.mRange = ColorAspects::RangeFull;
+                             pParam->sAspects.mTransfer = ColorAspects::TransferSMPTE170M;
+                             pParam->sAspects.mMatrixCoeffs = ColorAspects::MatrixBT2020;
+                         } else if (pParam->nDataSpace == (HAL_DATASPACE_STANDARD_BT2020|HAL_DATASPACE_TRANSFER_HLG|HAL_DATASPACE_RANGE_LIMITED)) {
+                             //For SONY HDR
+                             DEBUG_PRINT_INFO("get_config (dataspace changed): ColorSpace: for HAL_DATASPACE_STANDARD_BT2020|HAL_DATASPACE_TRANSFER_HLG|HAL_DATASPACE_RANGE_LIMITED");
+                             pParam->sAspects.mPrimaries = ColorAspects::PrimariesBT2020;
+                             pParam->sAspects.mRange = ColorAspects::RangeLimited;
+                             pParam->sAspects.mTransfer = ColorAspects::TransferHLG;
+                             pParam->sAspects.mMatrixCoeffs = ColorAspects::MatrixBT2020;
+                         } else {
+                             // Stick to client's defaults.
+                             DEBUG_PRINT_INFO("get_config (dataspace changed): ColorSpace: use client-default for format=%x",
+                             pParam->nPixelFormat);
+                         }
                     }
                     print_debug_color_aspects(&(pParam->sAspects), "get_config (dataspace changed) recommended");
                 } else {