Merge remote-tracking branch 'remotes/quic/partner-android/jb-mr1-dev' into HEAD

* remotes/quic/partner-android/jb-mr1-dev:
  vdec: Use proper message identifier during input flush
  mm-video: use only IOMMU heap for non-secure playback
  mm-video: vidc: Allow client to request inband video header
  mm-video: secure/unsecure display calls
Merge remote-tracking branch 'remotes/quic/partner-android/jb-mr1-dev' into mybranch

* remotes/quic/partner-android/jb-mr1-dev:
  chmod uga-x
mm-core: remove duplicate color format enum

 - duplicate definition of OMX_QCOM_COLOR_FormatYVU420SemiPlanar
   exists in OMX_IVCommon.h

Change-Id: I42afb2768c1b600ba6e2ba17267254f5d8c4b7de
Revert "mm-video: use only IOMMU heap for non-secure playback"

This reverts commit a370c157f9ab6a5d4576820acd09dd4239879ffa.
mm-core: Add QC specific MetaData and MediaDefs

- to integrate extened extractor with existing framework
  new QC specific MetaData and MediaDefs are required.
- create new files to avoid changing stock MetaData and
  MediaDefs file

Change-Id: If32e182337fa4be8b039367729ffa6cecefd8115
DivxDrmDecrypt: Export the header\include file

- Export DivXDrmDecrypt.h which is needed by mm-parser
  for generating libDivxDrm
- libDixDrm is needed to play encrypted divx DRM
  content

Change-Id: I99b04f1a53c82166ca8d33b33528f1df23949d44
(cherry picked from commit 0c7cee4259b58ea43cb38b3e1d11fb8279b46c36)
Merge "DivxDrmDecrypt: Export the header\include file" into jb_2.5
mm-core: Adds support for encryption type request.

Adds support for encryption type request.

CRs-Fixed: 396778
Change-Id: I980754aa33af705e79d2051fd6fea988318c8505
(cherry picked from commit 0f0ec3a40d765901044327d21e7ee6d243e37e41)
Merge "mm-core: remove duplicate color format enum"
mm-video: port heap mask change to ion.

Change-Id: Ifcb1316b5c26d5a1d2d490d177140057b3e93e16
mm-video: set ION_SECURE to flags instead of heap_mask during
ion alloc.

Without this change secure playback will fail.

Change-Id: I13dc44113a6752a9198346725e9b5155414446d5
Merge "mm-video: set ION_SECURE to flags instead of heap_mask during ion alloc."
omx_vdec: default case for get profile levels

 - return ERROR_NO_MORE by default if the name is not part of the
   ones containing profile level.
 - Otherwise QueryCodecs will go into infinite loop and leak memory

Change-Id: I6d4b4dce6ea020cb72171518b87450232cf638d0
Merge "omx_vdec: default case for get profile levels"
mm-core: remove duplicate color format enum

 - duplicate definition of OMX_QCOM_COLOR_FormatYVU420SemiPlanar
   exists in OMX_IVCommon.h

Change-Id: I42afb2768c1b600ba6e2ba17267254f5d8c4b7de
mm-core: Add QC specific MetaData and MediaDefs

- to integrate extened extractor with existing framework
  new QC specific MetaData and MediaDefs are required.
- create new files to avoid changing stock MetaData and
  MediaDefs file

Change-Id: If32e182337fa4be8b039367729ffa6cecefd8115
DivxDrmDecrypt: Export the header\include file

- Export DivXDrmDecrypt.h which is needed by mm-parser
  for generating libDivxDrm
- libDixDrm is needed to play encrypted divx DRM
  content

Change-Id: I99b04f1a53c82166ca8d33b33528f1df23949d44
(cherry picked from commit 0c7cee4259b58ea43cb38b3e1d11fb8279b46c36)
mm-core: Adds support for encryption type request.

Adds support for encryption type request.

CRs-Fixed: 396778
Change-Id: I980754aa33af705e79d2051fd6fea988318c8505
(cherry picked from commit 0f0ec3a40d765901044327d21e7ee6d243e37e41)
media: Compensate for alternate display variant

 * Set correct path if CAF display driver is in use

Change-Id: I15e172029ab9bc8df0258a4e22e365a16c8fc263
Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/hardware/qcom/media into aosp