Remove temporal layer data structure.

BZ: 179113

Remove temporal layer data structure.
Add nMaxQP/nFrameRate/nTemporalID in ConfigIntelBitRateType
Add GetExtensionIndex for temporal layer vp8 encode
Refine code style.Remove meaningless modification.

Change-Id: I0ff98d73d69b40c207aa770bc26f0d910cdf37fd
Signed-off-by: bolunliu <bolun.liu@intel.com>

3 files changed, 16 insertions, 13 deletions

diff --git a/base/src/componentbase.cpp b/base/src/componentbase.cpp
index a9388ef..13ddd3b 100644
--- a/base/src/componentbase.cpp
+++ b/base/src/componentbase.cpp
@@ -835,6 +835,16 @@ OMX_ERRORTYPE ComponentBase::CBaseGetExtensionIndex(
         return OMX_ErrorNone;
     }
 
+    if (!strcmp(cParameterName, "OMX.Intel.index.vp8MaxFrameRatio")) {
+        *pIndexType = static_cast<OMX_INDEXTYPE>(OMX_IndexExtVP8MaxFrameSizeRatio);
+        return OMX_ErrorNone;
+    }
+
+    if (!strcmp(cParameterName, "OMX.Intel.index.numberOfTemporalLayer")) {
+        *pIndexType = static_cast<OMX_INDEXTYPE>(OMX_IndexExtNumberOfTemporalLayer);
+        return OMX_ErrorNone;
+    }
+
     return OMX_ErrorUnsupportedIndex;
 }
 
diff --git a/core/inc/khronos/openmax/include/OMX_IntelIndexExt.h b/core/inc/khronos/openmax/include/OMX_IntelIndexExt.h
index 401677a..e395f79 100644
--- a/core/inc/khronos/openmax/include/OMX_IntelIndexExt.h
+++ b/core/inc/khronos/openmax/include/OMX_IntelIndexExt.h
@@ -68,8 +68,7 @@ typedef enum OMX_INTELINDEXEXTTYPE {
     OMX_IndexExtPrepareForAdaptivePlayback,         /**<reference: Prepare for AdaptivePlayback*/
     OMX_IndexExtVP8ForceKFrame,                     /**<reference: For VP8 Force K Frame*/
     OMX_IndexExtVP8MaxFrameSizeRatio,                    /**<reference: For VP8 Max Frame Size*/
-    OMX_IndexExtVP8NumberOfTemporalLayer,               /**<reference: For SAND VP8 Number of Layer*/
-    OMX_IndexExtVP8TemporalLayerBitRateFrameRate,       /**<reference: For SAND VP8 bitrate and framerate for every layer*/
+    OMX_IndexExtNumberOfTemporalLayer,               /**<reference: For Number of Layer*/
     // Index for VPP must always be put at the end
 #ifdef TARGET_HAS_VPP
     OMX_IndexExtVppBufferNum,                       /**<reference: vpp buffer number*/
diff --git a/core/inc/khronos/openmax/include/OMX_IntelVideoExt.h b/core/inc/khronos/openmax/include/OMX_IntelVideoExt.h
index 1e7bba0..bd2a8ed 100644
--- a/core/inc/khronos/openmax/include/OMX_IntelVideoExt.h
+++ b/core/inc/khronos/openmax/include/OMX_IntelVideoExt.h
@@ -63,6 +63,9 @@ typedef struct OMX_VIDEO_CONFIG_INTEL_BITRATETYPE {
      OMX_U32 nWindowSize;          // Window size in milliseconds allowed for bitrate to reach target
      OMX_U32 nInitialQP;           // Initial QP for I frames
      OMX_U32 nMinQP;
+     OMX_U32 nMaxQP;
+     OMX_U32 nFrameRate;
+     OMX_U32 nTemporalID;
 } OMX_VIDEO_CONFIG_INTEL_BITRATETYPE;
 
 typedef enum OMX_VIDEO_INTEL_CONTROLRATETYPE {
@@ -197,22 +200,13 @@ typedef struct OMX_VIDEO_CONFIG_INTEL_VP8_MAX_FRAME_SIZE_RATIO {
 } OMX_VIDEO_CONFIG_INTEL_VP8_MAX_FRAME_SIZE_RATIO;
 
 // number of temporal layer for WebRTC and Sand
-typedef struct OMX_VIDEO_PARAM_INTEL_VP8_NUMBER_OF_TEMPORAL_LAYER {
+typedef struct OMX_VIDEO_PARAM_INTEL_NUMBER_OF_TEMPORAL_LAYER {
     OMX_U32 nSize;
     OMX_VERSIONTYPE nVersion;
     OMX_U32 nPortIndex;
     OMX_U32 nNumberOfTemporalLayer;
-} OMX_VIDEO_PARAM_INTEL_VP8_NUMBER_OF_TEMPORAL_LAYER;
+} OMX_VIDEO_PARAM_INTEL_NUMBER_OF_TEMPORAL_LAYER;
 
-// Layer and Bitrate Framerate data paires for SAND VP8 encode
-typedef struct OMX_VIDEO_CONFIG_INTEL_VP8_TEMPORAL_LAYER_BITRATE_FRAMERATE {
-    OMX_U32 nSize;
-    OMX_VERSIONTYPE nVersion;
-    OMX_U32 nPortIndex;
-    OMX_U32 nLayerID;
-    OMX_U32 nBitrate;
-    OMX_U32 nFramerate;
-} OMX_VIDEO_CONFIG_INTEL_VP8_TEMPORAL_LAYER_BITRATE_FRAMERATE;
 
 #ifdef __cplusplus
 }