Merge "conf_files: set higher priority to c2 than OMX"

diff --git a/conf_files/sm6150/media_codecs_performance.xml b/conf_files/sm6150/media_codecs_performance.xml
index 720dbb9..cead250 100644
--- a/conf_files/sm6150/media_codecs_performance.xml
+++ b/conf_files/sm6150/media_codecs_performance.xml

@@ -42,7 +42,7 @@
             <Limit name="measured-frame-rate-176x144" range="92-115" />
             <Limit name="measured-frame-rate-352x288" range="53-80" />
             <Limit name="measured-frame-rate-640x480" range="41-66" />
-            <Limit name="measured-frame-rate-1280x720" range="32-39" />
+            <Limit name="measured-frame-rate-1280x720" range="10-12" />
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.encoder.vp8" type="video/x-vnd.on2.vp8" update="true">
             <Limit name="measured-frame-rate-320x180" range="266-266" />

diff --git a/mm-video-v4l2/vidc/venc/src/omx_video_encoder.cpp b/mm-video-v4l2/vidc/venc/src/omx_video_encoder.cpp
index 57e66a0..8f0868b 100644
--- a/mm-video-v4l2/vidc/venc/src/omx_video_encoder.cpp
+++ b/mm-video-v4l2/vidc/venc/src/omx_video_encoder.cpp

@@ -273,10 +273,26 @@
                 eRet = OMX_ErrorInvalidComponentName;
             }
         }
+        else if (!strcmp(platform_name, "atoll")) {
+            //TME is enabled on ATOLL
+            strlcpy((char *)m_cRole, "video_encoder.tme", OMX_MAX_STRINGNAME_SIZE);
+            codec_type = (OMX_VIDEO_CODINGTYPE)QOMX_VIDEO_CodingTME;
+        }
         else {
             DEBUG_PRINT_LOW("TME is not supported");
             eRet = OMX_ErrorInvalidComponentName;
         }
+    } else if (!strncmp((char *)m_nkind, "OMX.qcom.video.encoder.tme.secure",    \
+                OMX_MAX_STRINGNAME_SIZE)) {
+        char platform_name[PROP_VALUE_MAX] = {0};
+        char version[PROP_VALUE_MAX] = {0};
+        property_get("ro.board.platform", platform_name, "0");
+        if (!strcmp(platform_name, "atoll")) {
+            //TME is enabled on atoll
+            strlcpy((char *)m_cRole, "video_encoder.tme", OMX_MAX_STRINGNAME_SIZE);
+            codec_type =  (OMX_VIDEO_CODINGTYPE)QOMX_VIDEO_CodingTME;
+            secure_session = true;
+        }
     } else {
         DEBUG_PRINT_ERROR("ERROR: Unknown Component");
         eRet = OMX_ErrorInvalidComponentName;

diff --git a/mm-video-v4l2/vidc/venc/src/video_encoder_device_v4l2.cpp b/mm-video-v4l2/vidc/venc/src/video_encoder_device_v4l2.cpp
index 73f6cfa..34db3fe 100644
--- a/mm-video-v4l2/vidc/venc/src/video_encoder_device_v4l2.cpp
+++ b/mm-video-v4l2/vidc/venc/src/video_encoder_device_v4l2.cpp

@@ -3765,7 +3765,15 @@
         return 1;
     }
 
-    venc_set_extradata_hdr10metadata();
+    char platform_name[PROP_VALUE_MAX] = {0};
+    char version[PROP_VALUE_MAX] = {0};
+    property_get("ro.board.platform", platform_name, "0");
+    if (!strcmp(platform_name, "sm6150") || !strcmp(platform_name, "atoll"))
+    {
+        DEBUG_PRINT_HIGH("HDR10 is not supported on this target");
+    } else {
+        venc_set_extradata_hdr10metadata();
+    }
 
     venc_config_print();