Merge commit '3ea11c011c4685c9df4cd8e81a29991a0b073848' into HEAD

Change-Id: I89a175b78dddce99e9680b49506038fadb32078a

6 files changed, 13 insertions, 21 deletions

diff --git a/conf_files/msmnile/media_codecs.xml b/conf_files/msmnile/media_codecs.xml
index aadbb717..18c43f6d 100644
--- a/conf_files/msmnile/media_codecs.xml
+++ b/conf_files/msmnile/media_codecs.xml
@@ -110,7 +110,6 @@ Only the three quirks included above are recognized at this point:
  |             | 4096    2304    60      220     2211840             |
  |             | 7680    4320    30      220     3888000             |
  |             | 8192    4320    24      220     3317760             |
- | vc1         | 1920    1088    30      20      244800      244800  |
  | h263-sw     | 864     480     30      16       48600       48600  |
  | mpeg2       | 1920    1088    30      40      244800      244800  |
  |_____________|_____________________________________________________|
@@ -437,19 +436,6 @@ Only the three quirks included above are recognized at this point:
              <Limit name="concurrent-instances" max="16" />
              <Limit name="performance-point-1920x1080" value="30" />
         </MediaCodec>
-        <MediaCodec name="OMX.qti.video.decoder.vc1sw" type="video/x-ms-wmv" >
-            <Quirk name="requires-allocate-on-input-ports" />
-            <Quirk name="requires-allocate-on-output-ports" />
-            <Limit name="size" min="96x96" max="1920x1088" />
-            <Limit name="alignment" value="2x2" />
-            <Limit name="block-size" value="16x16" />
-            <Limit name="blocks-per-second" min="36" max="244800" />
-            <Limit name="bitrate" range="1-20000000" />
-            <Limit name="frame-rate" range="1-30" />
-            <Feature name="adaptive-playback" />
-            <Limit name="concurrent-instances" max="16" />
-            <Limit name="performance-point-1920x1080" value="30" />
-        </MediaCodec>
         <MediaCodec name="OMX.google.opus.decoder" type="audio/opus" update="true" rank="100"/>
     </Decoders>
     <Include href="media_codecs_google_video.xml" />
diff --git a/conf_files/sm6150/media_codecs.xml b/conf_files/sm6150/media_codecs.xml
index b76d0da8..030fbc41 100644
--- a/conf_files/sm6150/media_codecs.xml
+++ b/conf_files/sm6150/media_codecs.xml
@@ -169,6 +169,7 @@ Only the three quirks included above are recognized at this point:
             <Limit name="performance-point-3840x2160" value="30" />
             <Limit name="performance-point-1920x1080" value="120" />
             <Limit name="performance-point-1280x720" value="240" />
+        </MediaCodec>
         <MediaCodec name="OMX.qcom.video.encoder.hevc.cq" type="video/hevc" >
             <Quirk name="requires-allocate-on-input-ports" />
             <Quirk name="requires-allocate-on-input-ports" />
@@ -181,7 +182,6 @@ Only the three quirks included above are recognized at this point:
             <Limit name="performance-point-512x512" value="480" />
             <Feature name="bitrate-modes" value="CQ" />
         </MediaCodec>
-        </MediaCodec>
         <!-- Video Software -->
         <MediaCodec name="OMX.qcom.video.encoder.h263sw" type="video/3gpp" >
             <Quirk name="requires-allocate-on-input-ports" />
diff --git a/mm-core/src/common/qc_omx_core.c b/mm-core/src/common/qc_omx_core.c
index f15d24b2..754c3b57 100644
--- a/mm-core/src/common/qc_omx_core.c
+++ b/mm-core/src/common/qc_omx_core.c
@@ -142,9 +142,13 @@ OMX_Init()
                   continue;
           } else if (!strcmp("OMX.qcom.video.encoder.tme", core[i].name) || !strcmp("OMX.qcom.video.encoder.tme.secure", core[i].name))
                     continue;
-      } else if (!strcmp(platform_name, "atoll") || !strcmp(platform_name, "trinket")) {
-                //Trinket and Atoll both does not support vc1 hence don't add them in list
-                 if (!strcmp("OMX.qti.video.decoder.vc1sw", core[i].name))
+      } else if (!strcmp(platform_name, "atoll")) {
+                //Atoll does not support vc1 and vpp hence don't add them in list
+              if (!strcmp("OMX.qti.video.decoder.vc1sw", core[i].name) || !strcmp("OMX.qti.vdec.vpp", core[i].name))
+                     continue;
+      } else if (!strcmp(platform_name, "trinket")) {
+                //Trinket does not support vc1 hence don't add them in list
+              if (!strcmp("OMX.qti.video.decoder.vc1sw", core[i].name))
                      continue;
       } else if (!strcmp(platform_name, "msmnile")) {
                 //Hana does not support tme,tme secure hence donot add to list
diff --git a/mm-core/src/registry_table.c b/mm-core/src/registry_table.c
index e6d88ed3..8d392a5a 100644
--- a/mm-core/src/registry_table.c
+++ b/mm-core/src/registry_table.c
@@ -78,7 +78,7 @@ omx_core_cb_type core[] =
     //Entries specific to msmsteppe
     OMX_REGISTRY_ENTRY("OMX.qcom.video.encoder.tme", "libOmxVenc.so", "video_encoder.tme"),
     OMX_REGISTRY_ENTRY("OMX.qcom.video.encoder.tme.secure", "libOmxVenc.so", "video_encoder.tme"),
-    OMX_REGISTRY_ENTRY("OMX.qti.vdec.vpp", "libOmxVpp.so", "video_decoder.vpp"),
+//    OMX_REGISTRY_ENTRY("OMX.qti.vdec.vpp", "libOmxVpp.so", "video_decoder.vpp"),
 //#endif //_STEPPE_ || _ATOLL_
 
 //#if !defined(_ATOLL_) && !defined(_TRINKET_)
diff --git a/mm-core/src/registry_table_android.c b/mm-core/src/registry_table_android.c
index ecf0d0f7..81b169dd 100644
--- a/mm-core/src/registry_table_android.c
+++ b/mm-core/src/registry_table_android.c
@@ -85,7 +85,7 @@ omx_core_cb_type core[] =
     //Entries specific to msmsteppe
     OMX_REGISTRY_ENTRY("OMX.qcom.video.encoder.tme", "libOmxVenc.so", "video_encoder.tme"),
     OMX_REGISTRY_ENTRY("OMX.qcom.video.encoder.tme.secure", "libOmxVenc.so", "video_encoder.tme"),
-    OMX_REGISTRY_ENTRY("OMX.qti.vdec.vpp", "libOmxVpp.so", "iv_processor.yuv"),
+//    OMX_REGISTRY_ENTRY("OMX.qti.vdec.vpp", "libOmxVpp.so", "iv_processor.yuv"),
 //#endif //_STEPPE_
 
 //#if !defined(_ATOLL_) && !defined(_TRINKET_)
diff --git a/mm-video-v4l2/vidc/vdec/src/omx_swvdec.cpp b/mm-video-v4l2/vidc/vdec/src/omx_swvdec.cpp
index d71cc789..eb666cfc 100644
--- a/mm-video-v4l2/vidc/vdec/src/omx_swvdec.cpp
+++ b/mm-video-v4l2/vidc/vdec/src/omx_swvdec.cpp
@@ -3546,7 +3546,9 @@ OMX_ERRORTYPE omx_swvdec::get_buffer_requirements_swvdec(
 
         if (m_sync_frame_decoding_mode)
         {
-            p_buffer_req->mincount = 1;
+            /* Content for which low delay is 0 for ex: XVID clips
+               minimum two buffers are required to generate thumbnail */
+            p_buffer_req->mincount = 2;
         }
 
         m_port_op.def.nBufferSize        = p_buffer_req->size;