media: Only build when no variant is set

Change-Id: I4363e0c9163050932a52711d080b0957e1d5925c
Only build when no media variant is set, and display variant isn't legacy

* Fixes change I4363e0c9163050932a52711d080b0957e1d5925c

Change-Id: Id7e5f5f5019fec5cce169d7ff5fe7d3c707562eb
Merge tag 'android-4.3_r2.1' into cm-10.2

Android 4.3 release 2.1

Conflicts:
	libc2dcolorconvert/C2DColorConverter.cpp
	mm-core/inc/OMX_QCOMExtns.h
	mm-video/vidc/vdec/Android.mk
	mm-video/vidc/vdec/inc/omx_vdec.h
	mm-video/vidc/vdec/src/omx_vdec.cpp
	mm-video/vidc/venc/src/omx_video_base.cpp
	mm-video/vidc/venc/src/video_encoder_device.cpp
	mm-video/vidc/venc/test/venc_test.cpp

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

The header msm_kgsl.h is needed.

Change-Id: I904a08ec7678423cd938b9cc3b6e9805c2c38d0a
vdec/venc: Revert the ION API preference

NEW_ION_API is now the default. Devices requiring the old API need
to set TARGET_HAS_OLD_QCOM_ION=true in their board configs

Change-Id: I3b7b3606a47401c5abe3206ce50bfda8b6d7caae
mm-video: revert usage of flag GRALLOC_USAGE_PRIVATE_CP_BUFFER

Obsolete the custom flag added to notify usage of secure buffers. Now all
secure buffers are allocated based on the flag GRALLOC_USAGE_PROTECTED

Change-Id: I92a87f402892d5758fa9adef8ae734d1b8be2c83
mm-video: remove unneeded code from merge

Change-Id: I560370677cd465844703b44c12bf2d38eb79ffd2
Merge "mm-video: revert usage of flag GRALLOC_USAGE_PRIVATE_CP_BUFFER" into cm-10.2
dashplayer: Squashed update from CodeAurora

DashPlayer:call unregisterHandler in DashPlayer, avoid memory leak

AHandler objects in mediaplayer registred with ALooper
but did not call unregister at shutdown.

Change-Id: If9140d30ace0423c8181a1a64707ddcdc448d525
CRs-Fixed: 461906

dashplayer: Fix seek bar jump during seek

Fix to update current position with seek time.

Change-Id: I3febf7a46f2c0a85fbbc36ec0898adc58ec2e2a9

dashplayer: Adjust buffer count for native window

When allocating buffers from native window, adjust the
buffer count based on the minimum undequed buffer count,
and allocate an extra buffer for smooth streaming.

Change-Id: I72ad33872b68bb0bfe41fcb565d61b429f76b892

DashPlayer: enable secure output buffers for drm use cases

 - sets GRALLOC_USAGE_PROTECTED for output buffers if
   content is DRM

Change-Id: Ib1bdab9e88dbac41aa336c906bbba897699a9402

dashplayer: Fix green frame issue on session timeout

* Avoid rendering video buffer which signals EOS as it does
  not contain valid video data.

CRs-Fixed: 476333

Change-Id: I10e3a0cb1e2dc9e1574d5e2b05f6339e868ac6fe

DashCodec: keep cache of formats to support b2b format change

     - when format change takes place too fast, it will pick up wrong
       format.
     - keep a cache of formats and only issue one sendFormatChange per
       crop change.
     - clear format cache when flushing

Change-Id: Ib45f3c5ac7764b4dd1edc4ac6c6f11390c33c151
CRs-Fixed: 475092

Fix for the flicker while changing the resolution in DashPlayer

- Just notify the message of MEDIA_SET_VIDEO_SIZE to JAVA Layer,
  while beginning to play the streaming.
- After the streaming begin to play, don't notify this message,
  while changing the resolution or seek operation finished.
- If we don't set video size,
  windowsmanager will adapt the dimension of the clip by itself.

Change-Id: I6a79d13159cd9bf33e0f483c7e1b71690f071011

CRs-fixed: 451993

DashPlayer: Notify position for video EOS buffer immediately

Notify current rendering position for video EOS buffer immediately,
without waiting for 100ms between subsequent updates.

CRs-Fixed: 489546
Change-Id: I9a8f346a68ff5c333d96e5ae24980e0ed1b27903

DashPlayer: Add support for dumpsys in DashPlayer

Added functionality in DashPlayer to dump playback statistics to file.

Change-Id: I0f95684f10db376731f622f06d17cc262480ecd3

DashPlayer: Notify seek position to dash source

Notify seek position to dash source to make sure that
if text samples arrive before audio/video, the time
out for sending text samples is not wrongly calculated.

CRs-Fixed: 492376

Change-Id: I952e474d92936532956c1d456b6ad1d554402405

DashPlayer: make jb_mr2 compatible .

 - ISurfaceTexture is called IGraphicBufferProducer in jb_mr2
 - SurfaceTextureClient is called Surface in jb_mr2

Change-Id: I790f49dd0cd2a155918155a6bae3badb5e412976

DashCodec: Changes to bringup DASH on MR2

*Disable AMR_WB audio support.
*Remove OMX_QCOM_COLOR_FormatYUV420PackedSemiPlanar32m from supported
 output color format

Change-Id: I4e675199a7e012d81f71dc027baa722b5eaa5281