diff options
| author | Rajesh Poornachandran <rajesh.poornachandran@intel.com> | 2014-10-29 15:37:53 -0700 |
|---|---|---|
| committer | Ed Tam <etam@google.com> | 2014-11-10 23:39:51 -0800 |
| commit | 5eee2b3fb2cd6fef340e2a3ffc283e30b897c097 (patch) | |
| tree | ee86499cff3741b6b316c5699a89690cdba94c72 | |
| parent | e5d3d0350319d2eac1c29ba10e86cb8c4784e97f (diff) | |
| download | libmix-5eee2b3fb2cd6fef340e2a3ffc283e30b897c097.tar.gz | |
libmix: Reject MDRM multi-slice decode to avoid VED FW hang.
Bug: 17656112
BZ: 226486
Change-Id: Ic934e0a7d33d2b416afee5ee781d625f00340e1c
Signed-off-by: Rajesh Poornachandran <rajesh.poornachandran@intel.com>
| -rw-r--r-- | videodecoder/securevideo/moorefield/VideoDecoderAVCSecure.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/videodecoder/securevideo/moorefield/VideoDecoderAVCSecure.cpp b/videodecoder/securevideo/moorefield/VideoDecoderAVCSecure.cpp index 23f75de..b124832 100644 --- a/videodecoder/securevideo/moorefield/VideoDecoderAVCSecure.cpp +++ b/videodecoder/securevideo/moorefield/VideoDecoderAVCSecure.cpp @@ -462,6 +462,10 @@ 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) { |