commit ced69386c75e4fdcdb58edab60328d1d0829c4cf
author Ryan Saffores <ryan.d.saffores@intel.com> Fri Jan 30 16:33:11 2015 -0800
committer Patrick Tjin <pattjin@google.com> Tue Feb 10 12:31:25 2015 -0800
tree b6be863f1faff7b11bf27880d4a7334b95d8f4b0
parent a6ebfeb41f53933b4a4882aab2b625b74204527d

Revert "libmix: Reject MDRM multi-slice decode to avoid VED FW hang."

This reverts commit 5eee2b3fb2cd6fef340e2a3ffc283e30b897c097.

Bug: 19192177

Change-Id: Ic6b92e32c4782abfb0731c257415a002d3677d53
Signed-off-by: Ryan Saffores <ryan.d.saffores@intel.com>

videodecoder/securevideo/moorefield/VideoDecoderAVCSecure.cpp

diff --git a/videodecoder/securevideo/moorefield/VideoDecoderAVCSecure.cpp b/videodecoder/securevideo/moorefield/VideoDecoderAVCSecure.cpp
index 4260f30..029484c 100644
--- a/videodecoder/securevideo/moorefield/VideoDecoderAVCSecure.cpp
+++ b/videodecoder/securevideo/moorefield/VideoDecoderAVCSecure.cpp
@@ -472,10 +472,6 @@
             return DECODE_FAIL;
         }
         VTRACE("picData->num_slices = %d", picData->num_slices);
-        if ((picData->num_slices > 1) && mModularMode) {
-            ETRACE("MDRM multi-slice not supported yet!");
-            return DECODE_PARSER_FAIL;
-	}
         for (uint32_t sliceIndex = 0; sliceIndex < picData->num_slices; sliceIndex++) {
             status = decodeSlice(data, picIndex, sliceIndex);
             if (status != DECODE_SUCCESS) {