Merge branch 'ics' into github/ics

Change-Id: Id94bf36465511fdaf3b7500987e7ab2697c72c0e
Merge "Add support for external dock batterys" into ics
Merge "framework/base: Change to enable mm-parser." into ics
Merge "framework/base: Add customized parameters for camera features." into ics
Merge "stagefright: Additional types for Colorconvertor" into ics
libstagefright: Initial commit for video

Patchset 1: Add QCOM_HARDWARE ifdefs.
Patchset 2: Rebase and move omx include to vendor.
Patchset 3: Fix whitespace

Conflicts:

	include/media/stagefright/OMXCodec.h
	media/libstagefright/OMXCodec.cpp

Change-Id: I6586f3d29524ba031d8c814abdfbb47bb7e5bfda
Signed-off-by: Evan McClain <aeroevan@gmail.com>
frameworks/base: Enabling mmparser for AVI, ASF, QCP, AAC formats

- Add support in MediaScanner for AVI, DIVX
- Add new mime definitions for AVI, DIVX, WMA, WMV, AAC, QCP, AC3, DIVX311
- Add Extended Extractor, register new sniffers
- Enable DIVX, VC1, WMA, QCELP components in OMXCodec

Patchset 1: Add QCOM_HARDWARE ifdefs.
Patchset 2: Fix AVIExtractor include
Patchset 3: Whitespace.

Conflicts:

	include/media/stagefright/OMXCodec.h
	media/libstagefright/DataSource.cpp
	media/libstagefright/Android.mk
	media/libstagefright/OMXCodec.cpp
	media/libstagefright/StagefrightMediaScanner.cpp

Change-Id: Ie92c8a95f513bc9b915a46144adb603d03d1fa18
Signed-off-by: Evan McClain <aeroevan@gmail.com>
libstagefright: Framework changes for video bringup

 -Modified the makefile to define the correct macros depending on the target.
 -Added changes to select the proper video output color format for each target using
the macros defined in the makefile.
 -Modified the thumbnail generation logic to select HW decoders for supported targets.

Patchset 1: Add QCOM_HARDWARE ifdefs and rename TARGET_BOARD stuff.
Patchset 2: Fix ifdef for 8x60 for non-qcom hardware.

Conflicts:

	media/libstagefright/Android.mk

Change-Id: Ia034fb025c116a79937e70101e93fcc478898e8a
Signed-off-by: Evan McClain <aeroevan@gmail.com>
Camera: Add mode in Framework Structure

Patchset 1: Add QCOM_HARDWARE ifdefs.

Change-Id: Ia6f983a998b6ab543d335f2e4e2ab18af97f53fe
Signed-off-by: Evan McClain <aeroevan@gmail.com>
frameworks/base - suspend implementation for video playback

- suspend( ) API is not supported in MediaPlayer.
- On suspend, save current position and seek to the saved
  position when playback is resumed.

Change-Id: I62f79a2984d57841bdbdbe918a38d01d623c0a2b
CRs-Fixed: 281944
libstagefright: Initial commit for Camcorder bringup

- Memcpy mode for camcorder bringup

Patchset 1: Add QCOM_HARDWARE ifdefs.

Change-Id: I2d63c8c643bc2d7a278f4dff7e58d768b9ad4171
Signed-off-by: Evan McClain <aeroevan@gmail.com>
camcorder: disable audio temporarily.

- set property camcorder.debug.disableaudio 1 to disable audio encode

Patchset 1: Add QCOM_HARDWARE ifdefs.

Change-Id: I33b6ba1cfc45c83f7779ae1abe3fddb4631a309e
Signed-off-by: Evan McClain <aeroevan@gmail.com>
libmedia: Update media profile cap for video codecs

- Update H.263, MPEG4 and H.264 profile caps
- Changes made to max width, height, bitrate and fps

Patchset 1: Add QCOM_HARDWARE ifdefs.
Patchset 2: Fix non-qcom createDefaults.

Change-Id: I0d50221a9e38a45fcccb70b7455412abe9a7a48b
Signed-off-by: Evan McClain <aeroevan@gmail.com>
frameworks/base: Add support for QCELP/EVRC non-tunnel encoding in SF

Add support for QCELP and EVRC formats non-tunnel mode encoding
in StageFright using hardware accelerated encoders.

Patchset 1: Add QCOM_HARDWARE ifdefs.
Patchset 2: Fix ifdef derp.
Patchset 3: Fix endif derp, change omx-core include to vendor/qcom.

Conflicts:

	media/libstagefright/Android.mk
	media/libstagefright/OMXCodec.cpp

Change-Id: I179030d71a9598ddddcf754e963fbed1e1357024
Signed-off-by: Evan McClain <aeroevan@gmail.com>
libstagefright: Ignore other sniffers if current sniffer returns positive confidence

-MP3 sniffer functions takes around 400ms for the playback
of most of the clips.
-This was causing a startup delay of 1.5 seconds on playback
-Increasing the value of confidence for amr,wav,ogg,mpeg4 formats
to 0.6 so that when they are detected, we ignore the sniffMP3
function.

Change-Id: I08acf28a63c8ae7b1b69e03f85fa9065a52c649e
frameworks/base/nuplayer: Fixes to enable HTTP live streaming

- Enable QCOM specifc color formats in ACodec
- Do not skip lines without /n, in M3U Parser
- Stop scanning sources until reset is handled in NuPlayer.

Patchset 1: Add QCOM_HARDWARE ifdefs.

Conflicts:

	media/libstagefright/ACodec.cpp

Change-Id: Ie7e902c0cd56e7aec17d0ac67d2869a7819770cd
Signed-off-by: Evan McClain <aeroevan@gmail.com>
libstagefright: Changes to support NV21 pixel format Video buffer

-video component returns NV21 color format on qdsp5 targets and it is
mapped to correct HAL Pixed format.

Patchset 1: Add QCOM_HARDWARE ifdefs.

Conflicts:

	media/libstagefright/OMXCodec.cpp

Change-Id: I6b427a2e8b498103ea6c428b62112e8ce1517b2c
Signed-off-by: Evan McClain <aeroevan@gmail.com>
libstagefright: Add property to enable software decoder for video

Add sys property to enable software decoder for video in AwesomePlayer.

Enable software decoder using the adb shell command:
 setprop sys.media.vdec.sw 1

Disable software decoder using the adb shell command:
 setprop sys.media.vdec.sw 0

Change-Id: I9ae6c139575761d2b374b447f38dc5d43172ab40
libstagefright: changes to return proper HAL Pixel format for video buffers.

  -video component returns NV21_SP color formatted video buffers on qdsp5 targets and
it is mapped to HAL_PIXEL_FORMAT_YCrCb_420_SP pixel format for MDP/GPU to do proper
color conversion.

Conflicts:

	media/libstagefright/OMXCodec.cpp

Change-Id: I9e794994e0f66694255e3cf88036472220e233b5
Signed-off-by: Evan McClain <aeroevan@gmail.com>
libstagefright: Remove qcelp decoder from encoder info list

-qcelp decoder omx component is present in the omx component
 encoder list.
-Removed qcelp decoder component.

Change-Id: I05cd86d83384c2b9c0921948775b76de19b9d75c