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
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"
Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/hardware/qcom/media into aosp
mm-video: Change kernel headers search path

Compilation is failing as user space component is
using kernel header from bionic which is not up-to-date.
Make changes to the make file to include kernel header
from kernel obj of the target out folder.

Change-Id: I1444c55f90999fb332e206a8229aff9eda215b8c
Merge "mm-video: Change kernel headers search path"
mm-video:vidc: Add the handling of MPEG-2 extension and user data.

Handling of extension and user data returned by core is added
to user space code. Now extension and user data is appended to
YUV data along with other extra data and passed to client.

Change-Id: I6735263633d1cd224ce332fb7801b08511676922
(cherry picked from commit 5b126aeb3ab33e635090bef8254025590197da32)
mm-core: Add MPEG-2 extension and user data types.

With this commit, OMX_ExtraDataMP2ExtnData and
OMX_ExtraDataMP2UserData eTypes are added to support
MPEG-2 extra data types.

Change-Id: Iffd6e216d9f6fdf30f6a99410c353a37bbe14dc7
(cherry picked from commit 051cdcaae9d3d69440b2bc5053b0c11e4486a60a)

Conflicts:

	mm-core/inc/OMX_QCOMExtns.h
(cherry picked from commit 63d30d6c955068efc11a1a77b91aba4b927a56b4)
mm-video: vidc: Add PAR value extradata support for H264.

Core gives aspect ratio information for H264 in a shared
memory register. This change will fetch the value of the
aspect ratio from the designated register and append this
information to the frame_info extradata which can be used
by the client.

Change-Id: I8f7f29a4f70cb99049d8238101326f86b5901a6f
(cherry picked from commit 428f393430cd4d0cec771cd12e0abf3f2a637f85)
(cherry picked from commit abec80d1348940972dd6307f3e03beaba9198260)
mm-video: vidc: Add support for MPEG-2 sample aspect ratio.

ISDB-T client requires sample aspect ratio (SAR) and it
depends on the sequence display extension and display
aspect ratio (DAR). This change calculates the SAR
values as required by the client.

Change-Id: Ib7e3d1cfb8aff3a9e33048197a95b1d266ed3658

Conflicts:

	mm-video/vidc/vdec/src/omx_vdec.cpp
(cherry picked from commit 5bf5f6cff2e5674f4f4b2bb721fb4b89bbcc92c0)