diff options
| author | Ryan Saffores <ryan.d.saffores@intel.com> | 2015-02-11 02:53:51 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-11 02:53:51 +0000 |
| commit | 98c0349840fc047b137db8c1708f9dc748e97ce5 (patch) | |
| tree | cd82d98ba3176962dc987ec0eb0b7d009ea020da | |
| parent | 93c7c350b878dd384ef1a129963e16f204b5890a (diff) | |
| parent | 4e99b915295c77f86ffcd6769b1d4928bf4193ff (diff) | |
| download | libmix-98c0349840fc047b137db8c1708f9dc748e97ce5.tar.gz | |
am 4e99b915: am ced69386: Revert "libmix: Reject MDRM multi-slice decode to avoid VED FW hang."
* commit '4e99b915295c77f86ffcd6769b1d4928bf4193ff':
Revert "libmix: Reject MDRM multi-slice decode to avoid VED FW hang."
| -rw-r--r-- | videodecoder/securevideo/moorefield/VideoDecoderAVCSecure.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/videodecoder/securevideo/moorefield/VideoDecoderAVCSecure.cpp b/videodecoder/securevideo/moorefield/VideoDecoderAVCSecure.cpp index 5b36d7e..3313c40 100644 --- a/videodecoder/securevideo/moorefield/VideoDecoderAVCSecure.cpp +++ b/videodecoder/securevideo/moorefield/VideoDecoderAVCSecure.cpp @@ -473,10 +473,6 @@ Decode_Status VideoDecoderAVCSecure::continueDecodingFrame(vbp_data_h264 *data) 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) { |