media: Only build when no variant is set

Change-Id: I4363e0c9163050932a52711d080b0957e1d5925c
Use actual kernel headers and display-caf paths if defined

Change-Id: I7338867f6eb4d88b33b610a2b2f93280ed6e71bc
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
mm-video: venc: Correct a typo in variable name

A kernel variable was to be defined as unsigned long but
it is mistakenly defined as unsigned only, the space is
missing after long. This bug is silent because unsigned
is also a valid data type by itself.
Corresponding to kernel fix, similar correction is done
in userspace code.

Change-Id: Ie58f275149dc9c85553f75e02594113b1a03ddcf
CRs-fixed: 556771
Merge tag 'android-4.4.1_r1' into kk-4.4

Android 4.4.1 Release 1
Merge tag 'android-4.4.1_r1' into HEAD

Android 4.4.1 Release 1
media: fix msm8660 omx issue

for msm8660: previous code lost libOmxVdec.so & libOmxVenc.so , now fixed it!

Change-Id: Ie6db1be912f0411bca47e9bfba9d0b7053febb18
Merge remote-tracking branch 'cm/cm-11.0' into kk-4.4
mm-video: venc: restrict codec level based on target specific macro

Without this change, call for supported codec levels for
different codec profile returned same for different chipset.

The change will now return different codec levels supported
for different chipset.This change will fix CTS case.

Change-Id: I2da19265b5b9360aae363b2b43fe83b8f007fc96
CRs-Fixed: 572716
vidc: venc: Add support for AVCProfileConstrainedBaseline

This change adds AVCProfileConstrainedBaseline profile
support for H264 encoder. OMX Client can now set this
profile to get required profile settings in SPS NAL unit
from video component.

CRs-Fixed:525412

Change-Id: Id15f620cd3a39b199b2750db92ac1c23bc083c88
Merge remote-tracking branch 'cm/cm-11.0' into kk-4.4
Fix the header-inclusion paths for non-AOSP A and B-family targets

AOSP chose to use specific platform names to split the A/B-family
implementations of the display HALs, but we support other platforms
within the same families. Add support for those.

Change-Id: I8a4b9164e04e0fb7128216e56f76b4d96fc1868c
mm-video-legacy: vdec: display: Change in screenRefresh interface

Display interface changed to optimise binder transaction.
This change depends on
ChangeID I4db66f2427ecf16d7a6264462ae85815217a16b1

Change-Id: I7f7861e2626fdd32efcfe3a2575a62caed91f8db
libc2dcolorconvert: Add compatibility with older libc2d

The C2D implementation on Adreno200 either lacks the map/unmap
functions, or returns invalid values, so fallback to the direct
usage of /dev/kgsl nodes to map GPU memory when the symbols are
absent.

Change-Id: I243d2ef6f4257bace2c785230d71cd032a5b6a09
mm-video: venc: Distinguish between normal NV12 and aligned NV12

Encoder has a hard-requirement of 2K alignment of UV plane.
Apps and other non-camera sources (not aware of this alignment)
will queue YUV420SP buffers, which need an explicit alignment.
But for some other apps(e.g VT) that are aware that the component
wants aligned NV12 and would align it themselves, causing the component
to muck up the buffer by realigning it.

To prevent the confusion, the component now makes a distinction between
NV12 (OMX_COLOR_FormatYUV420SemiPlanar) and aligned NV12 (QOMX_COLOR_\
FORMATYUV420PackedSemiPlanar32).  Clients who prefer to provide aligned
buffers will now set the latter as the input port format.

Change-Id: I73c337660fb825e9b267663266fd4b9d6e35443e

Conflicts:
	mm-core/inc/OMX_QCOMExtns.h
	mm-video-legacy/vidc/venc/src/omx_video_base.cpp
qcom: fix errors inside ALOGV

Fix errors exposed by adding compile-time checking to disabled ALOGVs.

Change-Id: I3578e2829e64d49c8dd967c8b4ed23ecbdb48a87
Merge https://github.com/Project-OctOS/android_hardware_qcom_media into HEAD
media: Avoid collision with FFMPEG plugin

Change-Id: Ica2cdf9f6572ec18f396d25758cbb2be1359ac0b
media: Avoid collision with FFMPEG plugin

Change-Id: Ica2cdf9f6572ec18f396d25758cbb2be1359ac0b
Merge tag 'android-4.4.3_r1' into HEAD

Android 4.4.3 release 1

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

Change-Id: I411dbff9a16063e6d9526cbe8fc837b1b61442d2