media: QCOM's revenge

Disable media if media-caf is used

Change-Id: I3dcc20d75d57e694d56373d7f7c0e8e759e533ae
mm-video: Use actual kernel headers for all builds

This reverts commit ba9e6c47df3b8408880b0591ebc0641a0c3d9eae

Change-Id: Ic8e2febd74c77e119cd95ffd9a4cd9bdb239f7e4
libc2dcolorconvert: add include for kernel headers

The header msm_kgsl.h is needed.

Change-Id: I904a08ec7678423cd938b9cc3b6e9805c2c38d0a
Make KERNEL_OBJS a LOCAL_ADDITIONAL_DEPENDENCIES to prevent build errors

On a clean build linux/msm_kgsl.h is called for before kernel.mk has ran
and thus the needed header isn't available. This dependency fixes the same.

hardware/qcom/media/libc2dcolorconvert/C2DColorConverter.cpp:37:28:
fatal error: linux/msm_kgsl.h: No such file or directory
compilation terminated.

Change-Id: I55ebca12a23a7c63ec1f406206148fd78d812674
Merge "mm-video: Use actual kernel headers for all builds" into android-4.4
Merge changes I55ebca12,I904a08ec into android-4.4

* changes:
  Make KERNEL_OBJS a LOCAL_ADDITIONAL_DEPENDENCIES to prevent build errors
  libc2dcolorconvert: add include for kernel headers
QCMetaData: Add key for interlace

key for interlace set in metadata is being used for thumbnail mode.
If the key is set, two ETB are send to the decoder

Change-Id: I1e4e996f46f022916ab5f4f14ff2c111f04717c1
Merge tag 'android-4.4.1_r1' into HEAD

Android 4.4.1 Release 1
Merge "QCMetaData: Add key for interlace" into android-4.4
mm-video: vidc: fix memory leak in dynamic buffer mode

In dynamic buffer mode, for non-secure playback,
output buffer is mapped before each ftb to driver.
This buffer is unmapped in the fbd. During flush
operations, the mapped buffer in ftb is not freed
leading to memory leak. To fix the issue, move
the memory mapping to just before sending the ftb
to driver.

Bug: 11973141

Change-Id: Ib0e5525fdf8132434800bf4d4ff8d27b085fc8fc
Move Android.mks to their parent dir.

So we don't need "../" to reference source files in the common/
directory.
"../" in LOCAL_SRC_FILES causes build race condition: the path of object
file of ../common/src/extra_data_handler.cpp in vdec actually is the
same
as the path of object file of ../common/src/extra_data_handler.cpp in
venc.

Bug: 12779537
Change-Id: I42bf0471451316dc61f5fafdde5bb1cf1f0218c3
(cherry picked from commit d919cadbcaabc6295c1096c0fa7fa33207fb13d2)
Move Android.mks to their parent dir.

So we don't need "../" to reference source files in the common/
directory.
"../" in LOCAL_SRC_FILES causes build race condition: the path of object
file of ../common/src/extra_data_handler.cpp in vdec actually is the same
as the path of object file of ../common/src/extra_data_handler.cpp in
venc.

Bug: 12779537
Change-Id: Ifd7fef36810c15fbe7854aeb3d505fba63f5d7e2
(cherry picked from commit c9a7bd20d3891b002f6b0285692adb9d246036ae)
Merge "Move Android.mks to their parent dir." into klp-dev
Merge tag 'android-4.4.3_r1.1' into HEAD

Android 4.4.3 release 1.1

Conflicts:
	mm-video-legacy/vidc/vdec.mk
	mm-video-legacy/vidc/venc.mk

Change-Id: Ia8f7057bc5969ff417f03ef24bf84a23f022d6bb