History log of /frameworks/av/media/
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
22412164dee9f658272a25833aebe83d05dfe4ff 31-Mar-2015 Lajos Molnar <lajos@google.com> mediaplayer: ensure secure decoders are instantiated before starting source

Bug: 19984798
Change-Id: Iff13cf03c4ce3141380f4d7ab4a2b1045c5ce747
ibmediaplayerservice/nuplayer/GenericSource.cpp
ibmediaplayerservice/nuplayer/GenericSource.h
ibmediaplayerservice/nuplayer/NuPlayer.cpp
ibmediaplayerservice/nuplayer/NuPlayer.h
ibmediaplayerservice/nuplayer/NuPlayerSource.h
6dc6c38b63b0ec5a72bd956c4821b9d00d3ab123 06-Feb-2015 Eric Laurent <elaurent@google.com> DO NOT MERGE - audio policy service: fix possible memory overflow

Add limit on number of audio ports and patches requested by
listaudioPorts() and listAudioPatches().

Bug: 19261727.
Change-Id: I21dfdf11cf805734cc3b7b2a85762c5598f60580
(cherry picked from commit 1d670b11313250442455a22f1056ad649d607fb2)
ibmedia/IAudioPolicyService.cpp
e2c8023444bf96739ff0e4cbaebc086bb73d3bf0 11-Feb-2015 Lajos Molnar <lajos@google.com> Revert "DO NOT MERGE: stagefright: add support for Intel's YUV420SP format in SoftwareRenderer"

This reverts commit 7a9510dcf637cc1e5c953d77c7bd4409c80a820f.

Bug: 19317169
Change-Id: I881ce6b1592b7250f423a561dadd40d379e16104
ibstagefright/colorconversion/SoftwareRenderer.cpp
0c11f31b610534754f48b40d0a6ccdd311d43fcf 10-Feb-2015 Lajos Molnar <lajos@google.com> Merge "nuplayer: acquire wakelock during offload pause timeout" into lmp-mr1-dev
0c11001c58526cddc7f6135982f456fff6e34aeb 07-Feb-2015 Lajos Molnar <lajos@google.com> Merge "stagefright: change licensing headers on h264dec omxdl sources" into lmp-mr1-dev
35d5af131c9d4962e935082f204ccd6a2130861c 28-Jan-2015 Weiyin Jiang <wjiang@codeaurora.org> nuplayer: acquire wakelock during offload pause timeout

Hold a wakelock while paused in audio offload mode, until audio
teardown event is received, or pause is canceled.

Since ARM cores are sleeping, the delayed AMessage will not be
received, and the audio output driver will not be closed.
This blocks XO shutdown.

Bug: 19297092
Change-Id: I3d11fef633e3f2783f4aa31e71285e2fa09d234c
ibmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
ibmediaplayerservice/nuplayer/NuPlayerRenderer.h
ibstagefright/foundation/AWakeLock.cpp
ibstagefright/foundation/Android.mk
17e95f40a534101e2df48f077a8029430adef6c3 07-Feb-2015 Lajos Molnar <lajos@google.com> stagefright: add media_codecs_google_video_le.xml

This can be used by low-end devices

Bug: 19027495
Change-Id: I2cf90bf5a9a95b3f38c32eef2a950c9e33c70a7a
ibstagefright/data/media_codecs_google_video_le.xml
41d3f579d2c166984958263533284209b90c87d5 06-Feb-2015 Marco Nelissen <marcone@google.com> Fix GSM WAV playback

Bug:19289381
Change-Id: If7bbf1ecf1cb8796188e61bc2c42f8a099510424
ibstagefright/ACodec.cpp
ibstagefright/WAVExtractor.cpp
78e52bfac041d71ce53b5b13c2abf78af742b09d 06-Feb-2015 Lajos Molnar <lajos@google.com> stagefright: change licensing headers on h264dec omxdl sources

Bug: 19030684
Change-Id: I6d4674fad126c26d3b6819fde91277a92dfd8862
ibstagefright/codecs/on2/h264dec/omxdl/arm11/api/armCOMM.h
ibstagefright/codecs/on2/h264dec/omxdl/arm11/api/armCOMM_BitDec_s.h
ibstagefright/codecs/on2/h264dec/omxdl/arm11/api/armCOMM_Bitstream.h
ibstagefright/codecs/on2/h264dec/omxdl/arm11/api/armCOMM_IDCTTable.h
ibstagefright/codecs/on2/h264dec/omxdl/arm11/api/armCOMM_IDCT_s.h
ibstagefright/codecs/on2/h264dec/omxdl/arm11/api/armCOMM_MaskTable.h
ibstagefright/codecs/on2/h264dec/omxdl/arm11/api/armCOMM_s.h
ibstagefright/codecs/on2/h264dec/omxdl/arm11/api/armOMX.h
ibstagefright/codecs/on2/h264dec/omxdl/arm11/api/omxtypes_s.h
ibstagefright/codecs/on2/h264dec/omxdl/arm11/build_vc.pl
ibstagefright/codecs/on2/h264dec/omxdl/arm11/src/armCOMM.c
ibstagefright/codecs/on2/h264dec/omxdl/arm11/src/armCOMM_Bitstream.c
ibstagefright/codecs/on2/h264dec/omxdl/arm11/src/armCOMM_IDCTTable.c
ibstagefright/codecs/on2/h264dec/omxdl/arm11/src/armCOMM_MaskTable.c
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/api/armVC.h
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/api/armVCCOMM_s.h
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/comm/src/omxVCCOMM_ExpandFrame_I_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/api/armVCM4P10_CAVLCTables.h
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/armVCM4P10_Average_4x_Align_unsafe_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/armVCM4P10_CAVLCTables.c
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/armVCM4P10_DeblockingChroma_unsafe_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/armVCM4P10_DeblockingLuma_unsafe_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/armVCM4P10_DecodeCoeffsToPair_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/armVCM4P10_DequantTables_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/armVCM4P10_InterpolateLuma_Align_unsafe_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/armVCM4P10_InterpolateLuma_Copy_unsafe_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/armVCM4P10_InterpolateLuma_DiagCopy_unsafe_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/armVCM4P10_InterpolateLuma_HalfDiagHorVer4x4_unsafe_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/armVCM4P10_InterpolateLuma_HalfDiagVerHor4x4_unsafe_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/armVCM4P10_InterpolateLuma_HalfHor4x4_unsafe_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/armVCM4P10_InterpolateLuma_HalfVer4x4_unsafe_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/armVCM4P10_Interpolate_Chroma_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/armVCM4P10_QuantTables_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/armVCM4P10_TransformResidual4x4_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/armVCM4P10_UnpackBlock4x4_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/omxVCM4P10_DeblockChroma_I.c
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/omxVCM4P10_DeblockLuma_I.c
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/omxVCM4P10_DecodeChromaDcCoeffsToPairCAVLC.c
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/omxVCM4P10_DecodeCoeffsToPairCAVLC.c
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/omxVCM4P10_DequantTransformResidualFromPairAndAdd_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/omxVCM4P10_FilterDeblockingChroma_HorEdge_I_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/omxVCM4P10_FilterDeblockingChroma_VerEdge_I_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/omxVCM4P10_FilterDeblockingLuma_HorEdge_I_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/omxVCM4P10_FilterDeblockingLuma_VerEdge_I_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/omxVCM4P10_InterpolateChroma.c
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/omxVCM4P10_InterpolateLuma_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/omxVCM4P10_PredictIntraChroma_8x8_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/omxVCM4P10_PredictIntra_16x16_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/omxVCM4P10_PredictIntra_4x4_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/omxVCM4P10_TransformDequantChromaDCFromPair_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/omxVCM4P10_TransformDequantLumaDCFromPair_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p2/api/armVCM4P2_Huff_Tables_VLC.h
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p2/api/armVCM4P2_ZigZag_Tables.h
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p2/src/armVCM4P2_Clip8_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p2/src/armVCM4P2_DecodeVLCZigzag_AC_unsafe_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p2/src/armVCM4P2_Huff_Tables_VLC.c
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p2/src/armVCM4P2_Lookup_Tables.c
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p2/src/armVCM4P2_SetPredDir_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p2/src/armVCM4P2_Zigzag_Tables.c
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p2/src/omxVCM4P2_DecodeBlockCoef_Inter.c
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p2/src/omxVCM4P2_DecodeBlockCoef_Intra.c
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p2/src/omxVCM4P2_DecodePadMV_PVOP_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p2/src/omxVCM4P2_DecodeVLCZigzag_Inter_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p2/src/omxVCM4P2_DecodeVLCZigzag_IntraACVLC_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p2/src/omxVCM4P2_DecodeVLCZigzag_IntraDCVLC_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p2/src/omxVCM4P2_FindMVpred_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p2/src/omxVCM4P2_IDCT8x8blk_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p2/src/omxVCM4P2_MCReconBlock_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p2/src/omxVCM4P2_PredictReconCoefIntra_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p2/src/omxVCM4P2_QuantInvInter_I_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p2/src/omxVCM4P2_QuantInvIntra_I_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/api/armCOMM.h
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/api/armCOMM_BitDec_s.h
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/api/armCOMM_Bitstream.h
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/api/armCOMM_IDCTTable.h
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/api/armCOMM_IDCT_s.h
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/api/armCOMM_MaskTable.h
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/api/armCOMM_s.h
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/api/armOMX.h
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/api/omxtypes_s.h
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/build_vc.pl
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/src/armCOMM.c
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/src/armCOMM_Bitstream.c
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/src/armCOMM_IDCTTable.c
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/src/armCOMM_MaskTable.c
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/api/armVC.h
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/api/armVCCOMM_s.h
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/comm/src/omxVCCOMM_ExpandFrame_I_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/api/armVCM4P10_CAVLCTables.h
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/armVCM4P10_Average_4x_Align_unsafe_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/armVCM4P10_CAVLCTables.c
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/armVCM4P10_DeblockingChroma_unsafe_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/armVCM4P10_DeblockingLuma_unsafe_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/armVCM4P10_DecodeCoeffsToPair_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/armVCM4P10_DequantTables_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/armVCM4P10_InterpolateLuma_Align_unsafe_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/armVCM4P10_InterpolateLuma_Copy_unsafe_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/armVCM4P10_InterpolateLuma_DiagCopy_unsafe_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/armVCM4P10_InterpolateLuma_HalfDiagHorVer4x4_unsafe_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/armVCM4P10_InterpolateLuma_HalfDiagVerHor4x4_unsafe_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/armVCM4P10_InterpolateLuma_HalfHor4x4_unsafe_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/armVCM4P10_InterpolateLuma_HalfVer4x4_unsafe_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/armVCM4P10_Interpolate_Chroma_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/armVCM4P10_QuantTables_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/armVCM4P10_TransformResidual4x4_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/armVCM4P10_UnpackBlock4x4_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/omxVCM4P10_DeblockChroma_I.c
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/omxVCM4P10_DeblockLuma_I.c
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/omxVCM4P10_DecodeChromaDcCoeffsToPairCAVLC.c
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/omxVCM4P10_DecodeCoeffsToPairCAVLC.c
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/omxVCM4P10_DequantTransformResidualFromPairAndAdd_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/omxVCM4P10_FilterDeblockingChroma_HorEdge_I_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/omxVCM4P10_FilterDeblockingChroma_VerEdge_I_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/omxVCM4P10_FilterDeblockingLuma_HorEdge_I_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/omxVCM4P10_FilterDeblockingLuma_VerEdge_I_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/omxVCM4P10_InterpolateChroma.c
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/omxVCM4P10_InterpolateLuma_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/omxVCM4P10_PredictIntraChroma_8x8_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/omxVCM4P10_PredictIntra_16x16_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/omxVCM4P10_PredictIntra_4x4_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/omxVCM4P10_TransformDequantChromaDCFromPair_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/omxVCM4P10_TransformDequantLumaDCFromPair_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_Average_4x_Align_unsafe_s.S
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_DeblockingChroma_unsafe_s.S
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_DeblockingLuma_unsafe_s.S
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_DecodeCoeffsToPair_s.S
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_DequantTables_s.S
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_InterpolateLuma_Align_unsafe_s.S
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_InterpolateLuma_Copy_unsafe_s.S
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_InterpolateLuma_DiagCopy_unsafe_s.S
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_InterpolateLuma_HalfDiagHorVer4x4_unsafe_s.S
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_InterpolateLuma_HalfDiagVerHor4x4_unsafe_s.S
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_InterpolateLuma_HalfHor4x4_unsafe_s.S
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_InterpolateLuma_HalfVer4x4_unsafe_s.S
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_Interpolate_Chroma_s.S
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_QuantTables_s.S
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_TransformResidual4x4_s.S
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_UnpackBlock4x4_s.S
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/omxVCM4P10_DeblockLuma_I.S
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/omxVCM4P10_DequantTransformResidualFromPairAndAdd_s.S
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/omxVCM4P10_FilterDeblockingChroma_HorEdge_I_s.S
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/omxVCM4P10_FilterDeblockingChroma_VerEdge_I_s.S
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/omxVCM4P10_FilterDeblockingLuma_HorEdge_I_s.S
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/omxVCM4P10_FilterDeblockingLuma_VerEdge_I_s.S
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/omxVCM4P10_InterpolateLuma_s.S
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/omxVCM4P10_PredictIntraChroma_8x8_s.S
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/omxVCM4P10_PredictIntra_16x16_s.S
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/omxVCM4P10_PredictIntra_4x4_s.S
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/omxVCM4P10_TransformDequantChromaDCFromPair_s.S
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/omxVCM4P10_TransformDequantLumaDCFromPair_s.S
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p2/api/armVCM4P2_Huff_Tables_VLC.h
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p2/api/armVCM4P2_ZigZag_Tables.h
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p2/src/armVCM4P2_Clip8_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p2/src/armVCM4P2_DecodeVLCZigzag_AC_unsafe_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p2/src/armVCM4P2_Huff_Tables_VLC.c
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p2/src/armVCM4P2_Lookup_Tables.c
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p2/src/armVCM4P2_SetPredDir_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p2/src/armVCM4P2_Zigzag_Tables.c
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p2/src/omxVCM4P2_DecodeBlockCoef_Inter.c
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p2/src/omxVCM4P2_DecodeBlockCoef_Intra.c
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p2/src/omxVCM4P2_DecodePadMV_PVOP_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p2/src/omxVCM4P2_DecodeVLCZigzag_Inter_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p2/src/omxVCM4P2_DecodeVLCZigzag_IntraACVLC_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p2/src/omxVCM4P2_DecodeVLCZigzag_IntraDCVLC_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p2/src/omxVCM4P2_FindMVpred_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p2/src/omxVCM4P2_IDCT8x8blk_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p2/src/omxVCM4P2_MCReconBlock_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p2/src/omxVCM4P2_PredictReconCoefIntra_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p2/src/omxVCM4P2_QuantInvInter_I_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p2/src/omxVCM4P2_QuantInvIntra_I_s.s
ibstagefright/codecs/on2/h264dec/omxdl/reference/api/armCOMM.h
ibstagefright/codecs/on2/h264dec/omxdl/reference/api/armCOMM_Bitstream.h
ibstagefright/codecs/on2/h264dec/omxdl/reference/api/armOMX.h
ibstagefright/codecs/on2/h264dec/omxdl/reference/build_vc.pl
ibstagefright/codecs/on2/h264dec/omxdl/reference/src/armCOMM.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/src/armCOMM_Bitstream.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/api/armVC.h
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/comm/src/armVCCOMM_Average.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/comm/src/armVCCOMM_SAD.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/comm/src/omxVCCOMM_Average_16x.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/comm/src/omxVCCOMM_Average_8x.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/comm/src/omxVCCOMM_ComputeTextureErrorBlock.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/comm/src/omxVCCOMM_ComputeTextureErrorBlock_SAD.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/comm/src/omxVCCOMM_Copy16x16.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/comm/src/omxVCCOMM_Copy8x8.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/comm/src/omxVCCOMM_ExpandFrame_I.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/comm/src/omxVCCOMM_LimitMVToRect.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/comm/src/omxVCCOMM_SAD_16x.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/comm/src/omxVCCOMM_SAD_8x.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/api/armVCM4P10_CAVLCTables.h
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/armVCM4P10_CAVLCTables.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/armVCM4P10_CompareMotionCostToMV.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/armVCM4P10_DeBlockPixel.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/armVCM4P10_DecodeCoeffsToPair.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/armVCM4P10_DequantTables.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/armVCM4P10_FwdTransformResidual4x4.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/armVCM4P10_InterpolateHalfDiag_Luma.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/armVCM4P10_InterpolateHalfHor_Luma.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/armVCM4P10_InterpolateHalfVer_Luma.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/armVCM4P10_Interpolate_Chroma.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/armVCM4P10_Interpolate_Luma.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/armVCM4P10_PredictIntraDC4x4.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/armVCM4P10_QuantTables.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/armVCM4P10_SADQuar.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/armVCM4P10_TransformResidual4x4.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/armVCM4P10_UnpackBlock2x2.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/armVCM4P10_UnpackBlock4x4.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_Average_4x.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_BlockMatch_Half.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_BlockMatch_Integer.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_BlockMatch_Quarter.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_DeblockChroma_I.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_DeblockLuma_I.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_DecodeChromaDcCoeffsToPairCAVLC.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_DecodeCoeffsToPairCAVLC.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_DequantTransformResidualFromPairAndAdd.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_FilterDeblockingChroma_HorEdge_I.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_FilterDeblockingChroma_VerEdge_I.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_FilterDeblockingLuma_HorEdge_I.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_FilterDeblockingLuma_VerEdge_I.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_GetVLCInfo.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_InterpolateChroma.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_InterpolateHalfHor_Luma.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_InterpolateHalfVer_Luma.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_InterpolateLuma.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_InvTransformDequant_ChromaDC.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_InvTransformDequant_LumaDC.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_InvTransformResidualAndAdd.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_MEGetBufSize.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_MEInit.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_MotionEstimationMB.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_PredictIntraChroma_8x8.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_PredictIntra_16x16.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_PredictIntra_4x4.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_SADQuar_16x.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_SADQuar_4x.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_SADQuar_8x.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_SAD_4x.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_SATD_4x4.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_SubAndTransformQDQResidual.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_TransformDequantChromaDCFromPair.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_TransformDequantLumaDCFromPair.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_TransformQuant_ChromaDC.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_TransformQuant_LumaDC.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/api/armVCM4P2_DCT_Table.h
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/api/armVCM4P2_Huff_Tables_VLC.h
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/api/armVCM4P2_ZigZag_Tables.h
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/armVCM4P2_ACDCPredict.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/armVCM4P2_BlockMatch_Half.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/armVCM4P2_BlockMatch_Integer.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/armVCM4P2_CheckVLCEscapeMode.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/armVCM4P2_CompareMV.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/armVCM4P2_DCT_Table.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/armVCM4P2_DecodeVLCZigzag_intra.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/armVCM4P2_EncodeVLCZigzag_intra.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/armVCM4P2_FillVLCBuffer.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/armVCM4P2_FillVLDBuffer.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/armVCM4P2_GetVLCBits.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/armVCM4P2_Huff_Tables_VLC.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/armVCM4P2_PutVLCBits.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/armVCM4P2_SetPredDir.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/armVCM4P2_Zigzag_Tables.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_BlockMatch_Half_16x16.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_BlockMatch_Half_8x8.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_BlockMatch_Integer_16x16.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_BlockMatch_Integer_8x8.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_DCT8x8blk.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_DecodeBlockCoef_Inter.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_DecodeBlockCoef_Intra.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_DecodePadMV_PVOP.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_DecodeVLCZigzag_Inter.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_DecodeVLCZigzag_IntraACVLC.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_DecodeVLCZigzag_IntraDCVLC.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_EncodeMV.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_EncodeVLCZigzag_Inter.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_EncodeVLCZigzag_IntraACVLC.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_EncodeVLCZigzag_IntraDCVLC.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_FindMVpred.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_IDCT8x8blk.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_MCReconBlock.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_MEGetBufSize.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_MEInit.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_MotionEstimationMB.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_PredictReconCoefIntra.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_QuantInter_I.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_QuantIntra_I.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_QuantInvInter_I.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_QuantInvIntra_I.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_TransRecBlockCoef_inter.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_TransRecBlockCoef_intra.c
35395ea6ad11824a4a89cc1ab9ee84f936188296 06-Feb-2015 Lajos Molnar <lajos@google.com> DO NOT MERGE: stagefright: add support for Intel's YUV420SP format in SoftwareRenderer

This seems to have the same layout as OMX_COLOR_FormatYUV420SemiPlanar

Bug: 19246722
Change-Id: Ief41bfaf997426a6900c3632dadaf8f4a6a38baf
ibstagefright/colorconversion/SoftwareRenderer.cpp
99cef1ef1cf1232966fabf3793ce7964c01474d7 06-Feb-2015 Chong Zhang <chz@google.com> allow HLS streams with CLOSED-CAPTIONS tag to play

bug: 19284568
Change-Id: I2ccf1c5952c13d1332b6a91f967af0bd3ee67451
ibstagefright/httplive/M3UParser.cpp
9578a90c214e430334b8696999f921290c35d067 05-Feb-2015 Lajos Molnar <lajos@google.com> stagefright: add software renderer support to OMX_COLOR_YUV420SemiPlanar

Bug: 19179927
Change-Id: I3accaa655e9bad2b0efcac98c5dd95a23f8d6671
ibstagefright/colorconversion/SoftwareRenderer.cpp
5a52a060fcbe4804bcf4f61b8a457fe0e18a9014 31-Jan-2015 Lajos Molnar <lajos@google.com> stagefright: set consumer usage flags and desribe YV12 HAL format

Bug: 17906609
Bug: 19179288
Bug: 19179927
Change-Id: I3713d4e894d3350d46e25dc0206b21c0ff3b9009
ibstagefright/ACodec.cpp
ibstagefright/colorconversion/SoftwareRenderer.cpp
13cfe85ae9f4daab1d0bfcd248fc2576585e259a 05-Feb-2015 Chong Zhang <chz@google.com> Merge "reuse CCDecoder on video discontinuity" into lmp-mr1-dev
0662f5b0c43fcfdf055704d02ea41202c9b6094a 04-Feb-2015 Lajos Molnar <lajos@google.com> Merge "stagefright: add fallback for native flex-YUV support" into lmp-mr1-dev
341ab6eebb6a992ec7bdf095420cf82bcab1c6b3 04-Feb-2015 Chong Zhang <chz@google.com> reuse CCDecoder on video discontinuity

bug: 19266084
Change-Id: I06ef57b09b048a85f77be4dee27599c4f60aacc9
ibmediaplayerservice/nuplayer/NuPlayer.cpp
6fbcf6331abfbbc935bf89332f84303733e578b2 04-Feb-2015 Robert Shih <robertshih@google.com> Merge "httplive: Set start time and segment start time in conjunction." into lmp-mr1-dev
3a01a71dcbb467d06cc5da4a72a82bb588648cfc 31-Jan-2015 Lajos Molnar <lajos@google.com> stagefright: add fallback for native flex-YUV support

Use software renderer if codec cannot support flex-YUV on a surface

Bug: 17906609
Change-Id: I3d0e3ff5fee7d7b3e2416892968fa18f6139598a
ibstagefright/ACodec.cpp
ibstagefright/MediaCodec.cpp
afcc4fcbb3a094ec2221d6e523772e76894d1f00 04-Feb-2015 Robert Shih <robertshih@google.com> httplive: Set start time and segment start time in conjunction.

Also add comments describing how start time and segment start time are
used.

Based on AOSP CL https://android-review.googlesource.com/127653
by Joakim Johansson <joakim.c.johansson@sonymobile.com> but uses the
lowest segment start time instead of highest.

Bug: 18821145
Change-Id: I14cf1186d0daf517a24e8423c3a708b4c9ba06c4
ibstagefright/httplive/LiveSession.cpp
ibstagefright/httplive/PlaylistFetcher.cpp
0d09182a1dde960f7acda1c28469e5deead1b996 30-Jan-2015 Lajos Molnar <lajos@google.com> stagefright: add support for native flex-YUV formats

Bug: 17906609
Change-Id: I14116796eaa94aa8ae62dcc29f67cb7d2c060d34
ibstagefright/ACodec.cpp
ibstagefright/OMXCodec.cpp
efbb61950db36a5eb789be83f077246172507c67 31-Jan-2015 Chong Zhang <chz@google.com> NuPlayer: pause playback when buffering is low

also fix buffering percentage report (should be the buffered position)

bug: 18730095
Change-Id: I11e7ca4ba9e772a1ae76861ca1ff1725b62f65ae
ibmediaplayerservice/nuplayer/GenericSource.cpp
ibmediaplayerservice/nuplayer/GenericSource.h
ibmediaplayerservice/nuplayer/NuPlayer.cpp
ibmediaplayerservice/nuplayer/NuPlayer.h
ibmediaplayerservice/nuplayer/NuPlayerSource.h
ibstagefright/NuCachedSource2.cpp
77f877f82733263bca825b92a3f4537caafabf74 31-Jan-2015 Rachad <rachad@google.com> Merge "Acodec: reset sideband handle for all non tunneled mode video playback" into lmp-mr1-dev
36dca156e0b5bf1865d1f6a1c692c71e10583481 31-Jan-2015 Rachad <rachad@google.com> Merge "Acodec: Send framerate information to OMX decoder if available" into lmp-mr1-dev
7a4342651cc6539fc9a8775ce1e322a47adeda78 31-Jan-2015 Robert Shih <robertshih@google.com> Merge "Wrong format used in seamless check" into lmp-mr1-dev
296a0d038e9e485d7a10b54057f24a562a2e76e3 31-Jan-2015 Robert Shih <robertshih@google.com> Merge "PlaylistFetcher: clear packet sources when adjusting starting sequence number" into lmp-mr1-dev
3fb3917ae19f07ddfb2176a9da3c7cfa514522a5 30-Jan-2015 Rachad <rachad@google.com> Acodec: reset sideband handle for all non tunneled mode video playback

Bug: 19202023
Change-Id: I414847d72a3c9fd79f858c4ee457270ec65470b6
ibstagefright/ACodec.cpp
678bcdc852dd8f801f5c46fdc85db587b721d83d 05-Dec-2014 Apurupa Pattapu <apurupa@codeaurora.org> httplive: Defer switch down if a switch is in progress

Bandwidth switch down is triggered if the buffered duration in
any of the current packet sources is below a threshold. When a
switch is in progress, all the packet sources are drained until
they are empty or until stop time is dequeued. Hence buffered
duration keeps going down during switch. Defering check switch
down will avoid unnecessary switches.

Do not switch down if estimated bandwidth index is more than
the current one.

Bug: 18821145
Change-Id: I655a308462503cf9df10672ecd904a51b2cba691
ibstagefright/httplive/LiveSession.cpp
dae1e733f7cd4abaa14791657fa0a1b0e44a27b6 30-Jan-2015 Robert Shih <robertshih@google.com> PlaylistFetcher: clear packet sources when adjusting starting sequence number

Bug: 19215971
Change-Id: I4ad29cf0ac24dea330017a1b0159b06922d768ae
ibstagefright/httplive/PlaylistFetcher.cpp
7abbd4c954e26fb69235831e11090ad61cec7b94 30-Jan-2015 joakim johansson <joakim.c.johansson@sonymobile.com> Wrong format used in seamless check

The targetFormat that is sent to supportsSeamlessFormatChange
function corresponds to the data in mInputFormat but the format
provided is the output format, so the check will always return
false.

Use the input format instead.

Bug: 18821145
Change-Id: Iea3cbd59e423da5f2f813e98505b40dc341061b8
ibmediaplayerservice/nuplayer/NuPlayerDecoder.cpp
78b01639c08fe5e7e9c1be5e9dc5de560f1383f9 30-Jan-2015 Rachad <rachad@google.com> Acodec: Send framerate information to OMX decoder if available

Bug: 19110889
Change-Id: Ia8dbe1b77aaac421ec9415884e1248b9b68168dc
ibstagefright/ACodec.cpp
a93fd2be99d21629bed504b9b7df035fc2f54562 04-Dec-2014 Leena Winterrowd <lenhardw@codeaurora.org> stagefright: httplive: Decouple block size from bandwidth estimate

A very small block size in PlaylistFetcher can lead to framework
overhead and difficulty streaming high bitrate content, but since
HTTPBase keeps a constant history of the past 100 HTTP reads, the
block size directly affects bandwidth estimation and in turn,
switching latency.

Add setBandwidthHistorySize() to HTTPBase to allow setting the
history size for bandwidth estimation. Call this within LiveSession
based on the current block size to ensure that the number of bytes
used for estimating bandwidth does not change if the block size is
changed in PlaylistFetcher.

Since a single TCP/IP packet can contain up to 64k of data, increase
the block size in PlaylistFetcher from 2k to lcm(188, 1024) or 47k to
avoid inaccuracies in read timings due to up to a comparable 47 reads
from the same locally-cached packet instead of from the network.

Also make HTTPBase::addBandwidthMeasurement() virtual to allow
bandwidth estimation extensions that do not rely on a history list.

Bug: 18821145
Change-Id: I5f957be01f5346e74cfb7eeb150ca4b397ad5798
ibstagefright/HTTPBase.cpp
ibstagefright/httplive/LiveSession.cpp
ibstagefright/httplive/LiveSession.h
ibstagefright/httplive/PlaylistFetcher.cpp
ibstagefright/httplive/PlaylistFetcher.h
ibstagefright/include/HTTPBase.h
9aff25fb41f516ac26f9d1983a25402909f1e77a 05-Nov-2014 Leena Winterrowd <lenhardw@codeaurora.org> stagefright: httplive: Reduce memcpy calls for chunked content

Streams using http chunking will not report the segment's total
content-length. In this case, a 64k buffer is allocated and is
increased by 32k each time the buffer is filled again. For high
bitrate content, this can lead to a large number of copies that
affect the HLS framework delay. Increase fetchFile buffer size
exponentially by 50% or at least 32k instead of by 32k each time
to reduce the number of memcpy calls.

Example for a chunked 6 MB 1080p segment (ie ~3s):
Adding 32k:
190 copies with 572.97 MB copied

Increasing by 50%:
12 copies with 16.09 MB copied

Bug: 18821145
Change-Id: Iedf0e4437e96026a58d50bce2660f85ac90d0ada
ibstagefright/httplive/LiveSession.cpp
79971c747e62cad50359286f18dee0c4de5829da 15-Oct-2014 Apurupa Pattapu <apurupa@codeaurora.org> httplive: Dont resume if we have almost fetched till stop time

- Use the last enqueued instead of last dequeued time in
ResumeUntil.
- Set duration in access unit meta as timestamp difference
between the last two queued access units.

Bug: 18821145
Change-Id: If53ddee1d87775905a6d4f11a6219fe66f498450
ibstagefright/httplive/PlaylistFetcher.cpp
ibstagefright/mpeg2ts/AnotherPacketSource.cpp
9dee2e592e89e90097cbb3b5065cffa768917b56 18-Nov-2014 Leena Winterrowd <lenhardw@codeaurora.org> stagefright: httplive: Propagate target duration to LiveSession

LiveSession's switch-down monitor requires the 'targetDuration'
key to evaluate the switching threshold. Ensure that this key is
set in the access unit metadata.

Bug: 18821145
Change-Id: Ib30f3b4bd8185a77a06abd755822f96644968a21
ibstagefright/httplive/PlaylistFetcher.cpp
2a66207f1136d60857759bccbaa5b7612f7070cf 05-Dec-2014 Apurupa Pattapu <apurupa@codeaurora.org> httplive: Create a copy of last enqueued metadata

Create duplicate of metadata in queueAccessUnit so that it is
available even after all the buffers are erased from packet source.

During a bandwidth switch httplive streaming Source uses last
enqueued timestamp as the start time for the new streams, and this
switch can occur at a time when all the packets are dequeued from
the current packet source. This is one of the scenarios when the
last enqueued time was showing a invalid timestamp. Creating a
copy will retain the timestamp value until the packet source is
active.

Bug: 18821145
Change-Id: I4d4ee700705cee58773da4660f8769f56018f9e4
ibstagefright/mpeg2ts/AnotherPacketSource.cpp
174609765fb9c8cbd6aeb61f489746c3570bfee2 18-Nov-2014 Leena Winterrowd <lenhardw@codeaurora.org> stagefright: httplive: Fix deadlock for low duration clips

PlaylistFetcher buffers up to 3 * target-duration bytes of data,
but if a stream is slow (ie due to bad network conditions), a
buffer threshold of 10s is used to resume playback. This results
in an indefinite freeze as PlaylistFetcher has stopped buffering
before this threshold. Reduce the 10s threshold to be more in-sync
with PlaylistFetcher's buffering size.

Bug: 18821145
Change-Id: Ife846e7c5b4f9645895873d08250c4bee0164972
ibstagefright/httplive/LiveSession.cpp
ibstagefright/httplive/PlaylistFetcher.h
5cf91c5067a9c7ed3c138d4e56fb176b28f5dc3a 04-Nov-2014 Leena Winterrowd <lenhardw@codeaurora.org> libstagefright: httplive: Add NULL check for empty playlist

If the source playlist is empty, the playlist meta will be NULL.
Check for this case to avoid an invalid dereference. Also flag
playlists without the required EXT-X-TARGETDURATION tag as malformed.

Bug: 18821145
Change-Id: Idf74d890a89bbc6483a6d4060eb092dc7461be24
ibstagefright/httplive/PlaylistFetcher.cpp
f0d689934e70d3e5b3784265e890377db04c7c1d 29-Jan-2015 Lajos Molnar <lajos@google.com> Revert "HLS: QCom enhancements"

This is to restore patch attributions

This reverts commit f580806d893c4631f5324ff0af5c2db68a40ef42.

Bug: 18821145
Change-Id: Idc49385fffccfde2a3915388fe3fe4e2b740d787
ibstagefright/HTTPBase.cpp
ibstagefright/httplive/LiveSession.cpp
ibstagefright/httplive/LiveSession.h
ibstagefright/httplive/PlaylistFetcher.cpp
ibstagefright/httplive/PlaylistFetcher.h
ibstagefright/include/HTTPBase.h
ibstagefright/mpeg2ts/AnotherPacketSource.cpp
628d4ea1622337de273ea0da3f89ab2bf2bb2faf 29-Jan-2015 Ronghua Wu <ronghuawu@google.com> Merge "stagefright: do not reject SPL5 files outright in SoftMpeg4 decoder" into lmp-mr1-dev
1338e177ad49369e83ff724ee8428b0b833d48d1 29-Jan-2015 Ronghua Wu <ronghuawu@google.com> stagefright: do not reject SPL5 files outright in SoftMpeg4 decoder

Bug:19013118
Change-Id: I58f63ae13559c93ea5e627b658c9919e86769076
ibstagefright/codecs/m4v_h263/dec/src/vop.cpp
231406d597cca1c9c009f870fbb62e46b8475186 27-Jan-2015 Wei Jia <wjia@google.com> NuPlayerRenderer: return current real time as render time for video frame when paused.

This allows video to display immediately during seeking in paused state.
Also fix some racing condition.

Bug: 19153026
Change-Id: I0d7a8981ca3c121f5dbc430c2c6d8b7522edc24a
ibmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
ibmediaplayerservice/nuplayer/NuPlayerRenderer.h
64c496c8d51c71605cd34a510da2ecd8180656ec 23-Jan-2015 Marco Nelissen <marcone@google.com> Merge "Fix MTP delete" into lmp-mr1-dev
ea9f215a13f1a5e6455be91624a81a024641a26d 23-Jan-2015 Marco Nelissen <marcone@google.com> Fix MTP delete

Bug: 18836972
Change-Id: Ia1caa9bfb0f2084af774745b5c01b260ab1f1b20
tp/MtpServer.cpp
ddc1216dcf8f9dc1a1340ed4bc6c6f28f29b1076 23-Jan-2015 Robert Shih <robertshih@google.com> Merge "MPEG4Extractor: more NULL derefernce fixes in parseChunk" into lmp-mr1-dev
c0c2366c180e06f03cbd1c1a4020bdc26f1002f7 23-Jan-2015 Ronghua Wu <ronghuawu@google.com> Merge "stagefright: do not reject SPL4 files outright in SoftMpeg4 decoder" into lmp-mr1-dev
841d22b0645ff48a03e7f500f95458f3d70a0a61 23-Jan-2015 Ronghua Wu <ronghuawu@google.com> libstagefright: Use aligned width and height.

Bug: 19014147
Change-Id: I33314b02448e436c43fcfad086b5edfa650dcf83
ibstagefright/codecs/m4v_h263/dec/src/pvdec_api.cpp
463c54e007279996943e27a78ed32f573236e042 21-Jan-2015 Ronghua Wu <ronghuawu@google.com> stagefright: do not reject SPL4 files outright in SoftMpeg4 decoder

Bug: 19014147
Change-Id: Ie90e8fc69e9ac2cb34d6362e67ad289d002a2c14
ibstagefright/codecs/m4v_h263/dec/src/vop.cpp
202fbed96db40ec5fb43d633fc97601a15a6dd7a 21-Jan-2015 Robert Shih <robertshih@google.com> MPEG4Extractor: more NULL derefernce fixes in parseChunk

Bug: 18771789
Change-Id: Ie0511ed3a885dbf64a7472e8fa74d15b0e87778d
ibstagefright/MPEG4Extractor.cpp
4d4ea7f7ca04cfe70ecf6f35658389f52ae6d3c1 16-Jan-2015 Chong Zhang <chz@google.com> Merge "do not use paused postition if it's not available" into lmp-mr1-dev
cec7febc48ff76b293ace0cc12a6288f13f72293 15-Jan-2015 Chong Zhang <chz@google.com> do not use paused postition if it's not available

bug: 18896133
bug: 18996505
Change-Id: I1e24fabe3fe8f2275b1ccc0df100cb2c4ba2264b
ibmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
5f3194c9efeadc200c89d9e2b00a19f1afeac55d 14-Jan-2015 Wei Jia <wjia@google.com> MidiFile: report correct state during transient period when start() is called first time.

Bug: 18905421
Bug: 18994222
Change-Id: Iee47043e60740fab9e62aa28db4cbcec4f339c22
ibmediaplayerservice/MidiFile.cpp
0b460ad7557f6be56aad3fa027d93b38d5995ac4 10-Jan-2015 Rachad <rachad@google.com> Merge "ACodec: Added support for E-AC3 decoders" into lmp-mr1-dev
38a97bd7891cb0e16f8127510aa81b1b05df3f17 09-Jan-2015 Lajos Molnar <lajos@google.com> stagefright: keep alignment restrictions for SoftVideoDecoder

Reuse updatePortDefinitions for setParam(PortDefinition).
Allow increasing input buffer size even if size changes.

Bug: 18528130
Change-Id: I62b66d8f1135504dd16ac576046bfc5b5b8cda59
ibstagefright/omx/SoftVideoDecoderOMXComponent.cpp
c8c68c88c1f0eed0c647b0a9cdf1c402aecb2667 08-Jan-2015 Ronghua Wu <ronghuawu@google.com> Merge "Use aligned width and height to compute size." into lmp-mr1-dev
468977f0fecaa983f712d9eacb80a73d3de807ae 08-Jan-2015 Chong Zhang <chz@google.com> Merge "mark any copyrighted content as protected to disable capture" into lmp-mr1-dev
1713460104b86f6be3a5d9993d9ace864d889b2d 08-Jan-2015 Chong Zhang <chz@google.com> mark any copyrighted content as protected to disable capture

bug: 18916274
Change-Id: I23f096b51433bf18a10dc5fe6dc6b75c3881c340
ibmediaplayerservice/nuplayer/GenericSource.cpp
ibmediaplayerservice/nuplayer/NuPlayer.cpp
ibmediaplayerservice/nuplayer/NuPlayerSource.h
ibstagefright/ACodec.cpp
55dfeeb53fdd2e940d0b7c7e3661152ca51ed85e 07-Jan-2015 Ronghua Wu <ronghuawu@google.com> Use aligned width and height to compute size.

Bug: 18528130
Change-Id: I4d2304d8c8919c1cde60676848cfe2e4f2061a87
ibstagefright/codecs/m4v_h263/dec/src/pvdec_api.cpp
8140a2b7ef0650e8cce6be16efcbfce56d0ed1e4 07-Jan-2015 Lajos Molnar <lajos@google.com> stagefright: report crop rectangle as codec resolution if exists

Bug: 18789054
Change-Id: I08b82a400541b5e09580801473c34ce56bfef5db
ibstagefright/MediaCodec.cpp
c447ded04f11169e9b96b31cd196b2c4ffa9f31c 06-Jan-2015 Eric Laurent <elaurent@google.com> fix record from default input source

Commit caf7f48a0e broke capture from default
input source on some devices: the input source is now specified as part of
the audio attributes and the default source was not remapped to mic source.

Bug: 18736417.
Change-Id: I3f5da33cdb56f959aaef68ed1952342babc63aa0
ibmedia/AudioRecord.cpp
8a4728966dc9c78e21c3c93a927707e93c05e5e0 24-Dec-2014 Rachad <rachad@google.com> ACodec: Added support for E-AC3 decoders

Bug: 17883772

Change-Id: I05f674c33522eec0e6ceeece88dd800b1857b3ab
ibstagefright/ACodec.cpp
ibstagefright/MediaDefs.cpp
0d19abb440c7e62e944efbeadf02299990f9a589 23-Dec-2014 Andy Hung <hunga@google.com> Merge "NuPlayer: Do not recreate AudioTrack if not needed" into lmp-mr1-dev
f580806d893c4631f5324ff0af5c2db68a40ef42 22-Dec-2014 Robert Shih <robertshih@google.com> HLS: QCom enhancements

This commit consists of:

http://go/pag/c/188753 Add NULL check for empty playlist
http://go/pag/c/188754 Fix deadlock for low duration clips
http://go/pag/c/188757 Create a copy of last enqueued metadata
http://go/pag/c/188755 Propagate target duration to LiveSession
http://go/pag/c/188762 Decouple block size from bandwidth estimate
http://go/pag/c/188756 Reduce memcpy calls for chunked content
http://go/pag/c/188758 Dont resume if we have almost fetched till stop time

Bug: 18821145
Change-Id: I7fd650999c6c50bbadffd65adee9020e669dfe62
ibstagefright/HTTPBase.cpp
ibstagefright/httplive/LiveSession.cpp
ibstagefright/httplive/LiveSession.h
ibstagefright/httplive/PlaylistFetcher.cpp
ibstagefright/httplive/PlaylistFetcher.h
ibstagefright/include/HTTPBase.h
ibstagefright/mpeg2ts/AnotherPacketSource.cpp
f0e83644637bd05852c244df481f21a0d435ff66 20-Dec-2014 Andy Hung <hunga@google.com> NuPlayer: Do not recreate AudioTrack if not needed

On output format change from the decoder, check if a new audio
track is really needed. This prevents excessive track
creation/destruction during seeks.

Bug: 18817027
Change-Id: I4290dcb90cb35bc1303b025e162f6b813d49a05b
ibmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
ibmediaplayerservice/nuplayer/NuPlayerRenderer.h
ad019236b9bc4a030c2740fd9cfdd0670b118d5c 19-Dec-2014 Wei Jia <wjia@google.com> Merge "NuPlayer: reports paused position in paused state." into lmp-mr1-dev
d4b056da7cbf1adb2a5f668e4425def3754a9c09 19-Dec-2014 Andy Hung <hunga@google.com> Merge "NuPlayer: Fix failure to stop audio playback" into lmp-mr1-dev
d4cdba18ba7d0057ae54ec7efa5871b1a9d8beca 18-Dec-2014 Wei Jia <wjia@google.com> NuPlayer: reports paused position in paused state.

Bug: 18733773
Change-Id: I993a4bf108913ab98a0294d7dcf7605349f7029b
ibmediaplayerservice/nuplayer/NuPlayerDriver.cpp
ibmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
ibmediaplayerservice/nuplayer/NuPlayerRenderer.h
89ee55cb01f6e230990eb344718627c8fcbec349 19-Dec-2014 Robert Shih <robertshih@google.com> Merge "OggExtractor: ignore timestamp calculation for configuration packets" into lmp-mr1-dev
3491232a7c0d953fa021f6a81baee64c44f364f3 19-Dec-2014 Andy Hung <hunga@google.com> NuPlayer: Fix failure to stop audio playback

Don't stop audio sink if gapless - it's not necessary and has
a side effect of resetting the AudioTrack frames written
without resetting the AudioSink frames written.

Bug: 18787619
Change-Id: I71063b9e3aad9a6dfd7d46ea614e107c815e4c57
ibmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
9fc1bf138ed0b2b375a5d71e9d9e661ff30b49f5 18-Dec-2014 Robert Shih <robertshih@google.com> OggExtractor: ignore timestamp calculation for configuration packets

Bug: 18801155
Change-Id: Ib0b5a03fa4cf2c75d79be2df939257835259deed
ibstagefright/OggExtractor.cpp
1391f933b49cfb56da9aa63f723de83b076cf888 18-Dec-2014 Robert Shih <robertshih@google.com> MPEG4Extractor: null check in MPEG4Source::parseChunk

Bug: 18771789
Change-Id: Ic12bf565be23eba39b49930c7ce43372fce4f826
ibstagefright/MPEG4Extractor.cpp
e48cf5b8f823c30af93577c1e380d752ac69b871 17-Dec-2014 Mike Lockwood <lockwood@google.com> Fix bounds checking for GetPartialObject command

GetPartialObject has only 3 arguments, whereas the 64 bit version takes 4.

Bug: 18786282
Change-Id: I4376962769ed0eae2f4991c2569244db22509204
tp/MtpServer.cpp
145cf5d885c238b690ab8240137934327b85c427 17-Dec-2014 Eric Laurent <elaurent@google.com> Merge "audioflinger: implement pause/resume for direct outputs" into lmp-mr1-dev
184e63ffcdd5654eb8e132346d2736dc9a9c7b01 17-Dec-2014 Wei Jia <wjia@google.com> Merge "ESQueue: change warning message of one buffer containing multiple ADTS frames into verbose." into lmp-mr1-dev
f247eef54c58ee1b7c13a3f6888b6374e9bea66f 17-Dec-2014 Wei Jia <wjia@google.com> ESQueue: change warning message of one buffer containing multiple ADTS frames into verbose.

Bug: 18741580
Change-Id: I35b38e106c3ca5421e0985d5e7feeaafe773ed6d
ibstagefright/mpeg2ts/ESQueue.cpp
8975220e28f632c5db4d89c798384d7635228bbc 16-Dec-2014 Ricardo Garcia <rago@google.com> Merge "Fix for Bundled Effects level compensation" into lmp-mr1-dev
d1f69b0b17acbd96987ecb2f3378abd394d05903 15-Dec-2014 Eric Laurent <elaurent@google.com> audioflinger: implement pause/resume for direct outputs

Extend pause/resume support to direct output threads
(was only for offload threads).

If the HAL implements pause/resume, track pause/resume is forwarded to
the HAL.

Pause, flush, resume sequence is respected by executing the HAL
calls in the playback thread (same as offload).

Make sure the track flags on client side are consistent with the
flags on server side.

Bug: 17883772.
Change-Id: I89b360d69818f7a9204bd36e3ec63a79e106ecf1
ibmedia/AudioTrack.cpp
9f932418856844c6b8242d4c921654d0cc6af754 15-Dec-2014 Jeff Tinker <jtinker@google.com> Merge "Fix for apps that forget to use widevine:// urls" into lmp-mr1-dev
2aa82e786be2e986be1ecb48d72b095b040efe9a 15-Dec-2014 Lajos Molnar <lajos@google.com> Merge "MediaCodecList: handle binder death" into lmp-mr1-dev
6e430fbd927b9cc043639eb728ddc921392a60e8 15-Dec-2014 Wei Jia <wjia@google.com> Merge "NuPlayer: send NOT_SEEKABLE media info to client when the source is not seekable." into lmp-mr1-dev
661a5270303392bbf22eaa459961e6ab7b26b529 13-Dec-2014 Jeff Tinker <jtinker@google.com> Fix for apps that forget to use widevine:// urls

bug: 18554455

Change-Id: I8ff08e7270c65c375205169eb068f361f2a4a727
ibmediaplayerservice/nuplayer/GenericSource.cpp
eee82e44548f17253c2e06b25725f91c7b549ec2 12-Dec-2014 Lajos Molnar <lajos@google.com> MediaCodecList: handle binder death

Bug: 18691591
Change-Id: Icc402d6ea9b0de4ac642c3b403fb64e865481b2e
ibstagefright/MediaCodecList.cpp
8ddb02230d02968d471aa41b22433957c38827c0 13-Dec-2014 Rachad <rachad@google.com> Merge "Tunneled video Playback/Max resolution: Call mOmx->prepareForAdaptivePlayback() to provide max resolution information to tunneled OMX component." into lmp-mr1-dev
d0b9a2b8538c9e4538d92fd675cf6786644ccb85 13-Dec-2014 Rachad <rachad@google.com> Tunneled video Playback/Max resolution:
Call mOmx->prepareForAdaptivePlayback() to provide max resolution information
to tunneled OMX component.

bug: 17883772
Change-Id: I8f634824103e66483527828993bb24f65e68e419
ibstagefright/ACodec.cpp
30b865a2cfb508cd91d7403b7bf6ebcf34189c00 10-Dec-2014 Lajos Molnar <lajos@google.com> stagefright: advertise 8kHz AAC decoder support

Bug: 18738266
Change-Id: I1e5a1dc04b4deabfac069e70e4f730be6023a8ef
ibstagefright/data/media_codecs_google_audio.xml
895651b07fec30b0f9b0d2499599a179d95c9be4 11-Dec-2014 Wei Jia <wjia@google.com> NuPlayer: send NOT_SEEKABLE media info to client when the source is not seekable.

LiveSession: return -1 for duration when it's not available.

Bug: 18599325
Change-Id: Iecd040f48750806f98d1799e2aaab2f90c6f3887
ibmediaplayerservice/nuplayer/NuPlayer.cpp
ibstagefright/httplive/LiveSession.cpp
a0940a569f2bc24b00dc10ce0fa7658b1dc3a3a5 24-Sep-2014 Lajos Molnar <lajos@google.com> stagefright: misc fixes to software video encoders (and decoders)

- move logic to set encoder parameters to common encoder class
(similarly to what was done for decoders)
- set compressed buffer size based on frame size and compression ratio,
and codec-specific minimum size
- set raw buffer size based on frame size and metadata mode
- do not set stride and slice height on compressed ports
- advertise only QCIF support for google H263 encoder
- set large-enough input size for video decoders to support adaptive
playback
- do not change input buffer size on output port reconfiguration, as
no input buffer reallocation takes place
- do not return empty buffers with EOS after EOS has been signaled

Bug: 18513091
Bug: 18639027
Change-Id: Ib13492ef66adf331aa4572c67d2b283ea020cb41
ibstagefright/ACodec.cpp
ibstagefright/codecs/avc/enc/SoftAVCEncoder.cpp
ibstagefright/codecs/avc/enc/SoftAVCEncoder.h
ibstagefright/codecs/hevcdec/SoftHEVC.cpp
ibstagefright/codecs/m4v_h263/dec/SoftMPEG4.cpp
ibstagefright/codecs/m4v_h263/dec/SoftMPEG4.h
ibstagefright/codecs/m4v_h263/enc/SoftMPEG4Encoder.cpp
ibstagefright/codecs/m4v_h263/enc/SoftMPEG4Encoder.h
ibstagefright/codecs/on2/dec/SoftVPX.cpp
ibstagefright/codecs/on2/enc/SoftVPXEncoder.cpp
ibstagefright/codecs/on2/enc/SoftVPXEncoder.h
ibstagefright/codecs/on2/h264dec/SoftAVC.cpp
ibstagefright/data/media_codecs_google_video.xml
ibstagefright/include/SoftVideoDecoderOMXComponent.h
ibstagefright/include/SoftVideoEncoderOMXComponent.h
ibstagefright/omx/SoftVideoDecoderOMXComponent.cpp
ibstagefright/omx/SoftVideoEncoderOMXComponent.cpp
ibstagefright/tests/Utils_test.cpp
f484952edd94c1b7ee82d7b108edc1ce08671cc4 11-Dec-2014 Lajos Molnar <lajos@google.com> mediaplayer: allow setVideoSurface before setDataSource

Bug: 18709604
Change-Id: I41e4734faed48b5583feb29896cd5783b8cd7e33
ibmediaplayerservice/nuplayer/NuPlayer.cpp
7e45789f5fbcbe68075f57b6d17f72b7b48df546 20-Nov-2014 Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org> Fix overload of SoftVideoDecoderOMXComponent::updatePortDefinitions

An overloaded function should take the same parameters as the function
it is overloading.

Bug: 18639027
Change-Id: I8327fe1b363917515cf76c8f76bdbc05b2c0fbf0
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
ibstagefright/codecs/m4v_h263/dec/SoftMPEG4.cpp
ibstagefright/codecs/m4v_h263/dec/SoftMPEG4.h
1487d270e86845e93a9abd1af020b45d6799b257 10-Dec-2014 Eric Laurent <elaurent@google.com> Merge "audio policy: binder calls for dynamic audio policy mixes" into lmp-mr1-dev
2dda40d638138c426cf4a66ddd0da8794c87f5c7 10-Dec-2014 Eric Laurent <elaurent@google.com> Merge "audio policy: add support for custom mixes" into lmp-mr1-dev
baac183f3808d7b68f184647a97bd381620415fe 02-Dec-2014 Eric Laurent <elaurent@google.com> audio policy: binder calls for dynamic audio policy mixes

Add binder calls to register and unregister dynamic mixes
to AudioPolicyManager.

Bug: 16009464.

Change-Id: I4ef38166d0cfc88c984970969380d0cd6eb083ac
ibmedia/AudioSystem.cpp
ibmedia/IAudioPolicyService.cpp
275e8e9de2e11b4b344f5a201f1f0e51fda02d9c 01-Dec-2014 Eric Laurent <elaurent@google.com> audio policy: add support for custom mixes

Add support for custom mixes in AudioPolicyManager.

Two methods are added to register or unregister a list of custom mixes
with their attributes and format.

getOutputForAttr() and getInputForAttr() first look for a match in
registered mixes before defaulting to normal output/input selection

Remote submix device connection disconnection now takes address into
account to identify the correspnoding custom mix.

Bug: 16009464.

Change-Id: I3f1c2a485a0fb71b1f984ed0adc9b68aa971e408
ibmedia/Android.mk
ibmedia/AudioPolicy.cpp
ibmedia/AudioTrack.cpp
02521e37c0494b83947c35160f3669de8adc9e5b 20-Nov-2014 Ricardo Garcia <rago@google.com> Fix for Bundled Effects level compensation

From the bundled effects, only the EQ had some sort of level compensation
based on the settings of the effect. This patch takes into account all
the status and levels of EQ, BassBoost and Virtualizer bundled effects
and makes an informed decision on the overall level compensation.

bug: 18213779
Change-Id: I23c7b94fe7da5482f0bbef0cbe715ea464631420
ibeffects/lvm/wrapper/Bundle/EffectBundle.cpp
ibeffects/lvm/wrapper/Bundle/EffectBundle.h
f6a364ed92945bf8a39dbadddb674c3f2e3b7d53 09-Dec-2014 Marco Nelissen <marcone@google.com> Merge "Fix AAC recording issue" into lmp-mr1-dev
9fa3db9a8c164daaf0d7334595dbd0ca24fe97bf 09-Dec-2014 Marco Nelissen <marcone@google.com> Fix AAC recording issue

Fix uninitialized variable that caused ADTS recording to incorrectly
specify LTP object in the header.

Bug: 17895547
Change-Id: I75650f4963f4f371cd191bc635e32c9ab17fa8c9
ibstagefright/AACWriter.cpp
82a69ea8b090d57bff5e02774688b546a711bbb8 07-Nov-2014 zunkyu.lee <zunkyu.lee@lge.com> Prevent ANR when AudioTrack is paused or re-routed

If ClientProxy was interrupted by AudioTrack::pause() just before futex syscall() in obtainBuffer() was called,
It will not call releaseBuffer to wake up AudioTrackThread.
It puts the AudioTrackThread to sleep and then a deadlock occurs.

In this case, CBLK_INTERRUPT flags can't prevent a deadlock,
so this patch set mFutex to FUTEX_WAKE during interrupt() to avoid deadlock.

A similar problem could occur due to re-route or recovery after mediaserver death.

Bug: 18641665
Change-Id: I66fcae43af9a91eb55f6cdb52c644ee6c0999772
ibmedia/AudioTrackShared.cpp
ca7b4bc40604ae4f06718cb34945fdab278987ae 06-Dec-2014 Lajos Molnar <lajos@google.com> mediaplayerservice: add support for legacy DRM

Legacy DRM uses AwesomePlayer for widevine content.

Bug: 18006370
Change-Id: I1de9e33de51b60352a9c79c2dcedec330160abe4
ibmediaplayerservice/MediaPlayerFactory.cpp
a9d2f9fbbfa6e8daa3252e88e9861d7f80a974ff 06-Dec-2014 Lajos Molnar <lajos@google.com> Merge "stagefright: preserve output format flags on format change" into lmp-mr1-dev
80c57d570238f9f213ccfe818e285090daeafd63 06-Dec-2014 Wei Jia <wjia@google.com> Merge "NuPlayerRenderer: Update mAnchorMaxMediaUs when anchor time is changed to fix pause-seek-getCurrentPosition." into lmp-mr1-dev
474d7c778b63aa33dcf25a92e23a52c1c47f0ac1 05-Dec-2014 Wei Jia <wjia@google.com> NuPlayerRenderer: Update mAnchorMaxMediaUs when anchor time is changed to fix pause-seek-getCurrentPosition.

NuPlayerDecoder: Notify resume is done when EOS is reached.

GenericSource: add code to signal pre-roll for seek so that it will seek to the requested position,
not only I-frame. This code is disabled temporarily till we have a full solution to handle both
single seek and continous seek gracefully.

Bug: 18625723
Change-Id: I99a54d4d549e0d805e3abcc227fbf96c16405af0
ibmediaplayerservice/nuplayer/GenericSource.cpp
ibmediaplayerservice/nuplayer/GenericSource.h
ibmediaplayerservice/nuplayer/NuPlayerDecoder.cpp
ibmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
4e865a3cfe4c955e0890321a6b488cf661808b63 06-Dec-2014 Lajos Molnar <lajos@google.com> stagefright: preserve output format flags on format change

Some flags are only set in configure, and get lost when output
format changes.

Bug: 17383204
Change-Id: I2011bce70920c4ee46fccc378da3b428f3395c11
ibstagefright/ACodec.cpp
a147c17adabaab819ac108fbc448c49525cf74bc 06-Dec-2014 Chong Zhang <chz@google.com> Merge "fixes for non-secure widevine playback" into lmp-mr1-dev
42e8153cf7271b572e4a94ade332b68521977f36 01-Dec-2014 Chong Zhang <chz@google.com> fixes for non-secure widevine playback

- separate secure decoding from widevine

- use non-blocking mode when reading from widevine source

- schedule buffer read when packet source is empty

bug: 18536934
Change-Id: I65a8e5e819975ca6900ed8e887a442940f2d5d38
ibmediaplayerservice/nuplayer/GenericSource.cpp
ibmediaplayerservice/nuplayer/GenericSource.h
be837c328ae1ea2b193d05aaa3d4214c263b5b77 22-Nov-2014 seunghak.han <seunghak.han@lge.com> Track volume should be maintained even if track is restored

If track is restored when it set its volume to a non-unity value (such as mute),
the volume was forced to unity again. Now, the previous volume is restored.

Bug: 18570664
Change-Id: I79f34c6c7d6f535baba813fd3b8ba8e55cac8ad7
ibmedia/AudioTrack.cpp
d6e7f1e1f8b1dfa6a87c7c0b1a5c68d435096b01 05-Dec-2014 Ricardo Garcia <rago@google.com> Merge "Fix for AOSP force virtualization mode" into lmp-mr1-dev
b65842dd9447a7925046b2285b2aa8459dc63ed3 05-Dec-2014 Andy Hung <hunga@google.com> Merge "Fix NuPlayer assertion on failure to create AudioTrack" into lmp-mr1-dev
76c156f71f398d08fd88100f499a8a41ddfd3808 05-Dec-2014 Chong Zhang <chz@google.com> Merge "fix threading in RTSPSource and StreamingSource" into lmp-mr1-dev
852dc963a53487f2e2f197ab095299aed9c60a5e 05-Dec-2014 Wei Jia <wjia@google.com> Merge "avc_util: try to find the first start code prefix 0x000001 even though there is non-zero byte at the beginning of the buffer." into lmp-mr1-dev
47d4c9a4d53ed014b520edbda2edc3e280efb8a5 05-Dec-2014 Ricardo Garcia <rago@google.com> Fix for AOSP force virtualization mode

Forcing virtualization mode with AOSP code might erroneously return
a failed code, whilst it was correct. Fixing the condition for
Automatic mode.

bug: 18538537
Change-Id: I5837ff40cfed04c99889813cd56ebe3d90793e74
ibeffects/lvm/wrapper/Bundle/EffectBundle.cpp
15ebd70bdb7aeb3d5ce309710dbd64c0ea038113 03-Dec-2014 Wei Jia <wjia@google.com> avc_util: try to find the first start code prefix 0x000001 even though there is non-zero byte at the beginning of the buffer.

ESQueue: allow one PES playload contains multiple ADTS AAC frames.

Bug: 18532335
Change-Id: I1f42017cff139d5e932e0aaa3e7d33164d1a48e7
ibstagefright/avc_utils.cpp
ibstagefright/mpeg2ts/ESQueue.cpp
8790740d6bb1546dee6c87270976415503283820 04-Dec-2014 Lajos Molnar <lajos@google.com> media_codecs.xml: extend vorbis sample rate to 8-96kHz

Bug: 18615604
Change-Id: I0245556b8164959dd52fe677901cbfc517627cb4
ibstagefright/data/media_codecs_google_audio.xml
180d1b96ee2312f1056a58e26884a89d25ab62c8 03-Dec-2014 Chong Zhang <chz@google.com> fix threading in RTSPSource and StreamingSource

Bug: 18532335

Change-Id: I9c34401a928dc0ddbd0923aa5f127dc628efbb92
ibmediaplayerservice/nuplayer/RTSPSource.cpp
ibmediaplayerservice/nuplayer/RTSPSource.h
ibmediaplayerservice/nuplayer/StreamingSource.cpp
ibmediaplayerservice/nuplayer/StreamingSource.h
4d23645c8d3d93c91967a5494473b4a8b5d10d9c 03-Dec-2014 Wei Jia <wjia@google.com> ESQueue: add frame length checking in validation of ADTS header.

This allows an invalid ADTS buffer to be abandoned when frame length in
the header exceeds buffer size.

Bug: 18532335
Change-Id: I8057db525d06ff00ca24afd075a7c6c17b87eaa8
ibstagefright/mpeg2ts/ESQueue.cpp
202bce11a7f66f27e6dbb6d154ddc123aa62513d 03-Dec-2014 Andy Hung <hunga@google.com> Fix NuPlayer assertion on failure to create AudioTrack

Under heavy media load or monkey/stress testing, more than
32 AudioTracks may be created or memory resources may be scarce.
Remove the assertion on failure to create AudioTrack
and signal MEDIA_ERROR.

Bug: 17319843
Change-Id: I5d4e200b5f50d800046851a33e035cdc6ff10075
ibmediaplayerservice/nuplayer/NuPlayer.cpp
ibmediaplayerservice/nuplayer/NuPlayer.h
ibmediaplayerservice/nuplayer/NuPlayerDecoder.cpp
ibmediaplayerservice/nuplayer/NuPlayerDecoder.h
ibmediaplayerservice/nuplayer/NuPlayerDecoderBase.cpp
ibmediaplayerservice/nuplayer/NuPlayerDecoderBase.h
ibmediaplayerservice/nuplayer/NuPlayerDecoderPassThrough.cpp
ibmediaplayerservice/nuplayer/NuPlayerDecoderPassThrough.h
ibmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
ibmediaplayerservice/nuplayer/NuPlayerRenderer.h
ab05b4ccb8ea59079d7f773aa0e090029c479bad 02-Dec-2014 Wei Jia <wjia@google.com> StreamingSource: check mTSParser before dereferencing it.

Bug: 18532335
Change-Id: I7819d8d359fe75ea4c827138e9aaa2454ccfe3b1
ibmediaplayerservice/nuplayer/StreamingSource.cpp
f1828910d48bbd22e1392e6ab0ce31298d1f115c 02-Dec-2014 Ronghua Wu <ronghuawu@google.com> nuplayer: clear pending audio access unit on flush.

Also add flag to avoid reading on flush.

Bug: 18540219
Change-Id: I2fc351c32c87db9a8c8c2aad12ee2bd56a0370ab
ibmediaplayerservice/nuplayer/NuPlayerDecoderPassThrough.cpp
ibmediaplayerservice/nuplayer/NuPlayerDecoderPassThrough.h
d8731629bed46ff573b1ef904e5366d28f23dc0a 02-Dec-2014 Chong Zhang <chz@google.com> Merge "notify seek complete upon first video output frame" into lmp-mr1-dev
f8d717772f6d185cb07720cd5091df9b7d612e0b 27-Nov-2014 Chong Zhang <chz@google.com> notify seek complete upon first video output frame

Bug: 18541814
Change-Id: Ie4e0976885f26eb253460eab371cb181ea85f2db
ibmediaplayerservice/nuplayer/NuPlayer.cpp
ibmediaplayerservice/nuplayer/NuPlayer.h
ibmediaplayerservice/nuplayer/NuPlayerDecoder.cpp
ibmediaplayerservice/nuplayer/NuPlayerDecoder.h
ibmediaplayerservice/nuplayer/NuPlayerDecoderBase.cpp
ibmediaplayerservice/nuplayer/NuPlayerDecoderBase.h
ibmediaplayerservice/nuplayer/NuPlayerDecoderPassThrough.cpp
ibmediaplayerservice/nuplayer/NuPlayerDecoderPassThrough.h
f20c4356931ef72084b6b8e310f56b67715c6fb9 27-Nov-2014 Eric Laurent <elaurent@google.com> Merge "AudioRecord: use audio attributes instead of audio source." into lmp-mr1-dev
5d2c5fcb5cbd262b6a238886a7ce43add03eee20 26-Nov-2014 Chong Zhang <chz@google.com> Merge "MediaCodec: resume codec if state is FLUSHED in async mode" into lmp-mr1-dev
caf7f48a0ef558689d39aafd187c1571ff4128b4 26-Nov-2014 Eric Laurent <elaurent@google.com> AudioRecord: use audio attributes instead of audio source.

Added AudioRecord constructor with audio attributes.
Replaced AudioPolicymanager::getInput() by getInputForAttr().

No new functionality for now.

Also:

- Fixed warnings in AudioPolicyManager
- Allocate audio session ID before calling getOutputForAttr() in
AudioTrack.

Bug: 16006090.
Change-Id: I15df21e4411db688e3096dd801cf579d76d81711
ibmedia/AudioRecord.cpp
ibmedia/AudioSystem.cpp
ibmedia/AudioTrack.cpp
ibmedia/IAudioPolicyService.cpp
d9e0603a1be07dbb347c55050c7d4629ea7492e8 26-Nov-2014 Chong Zhang <chz@google.com> MediaCodec: resume codec if state is FLUSHED in async mode

bug: 18513091

Change-Id: I192625c61834584f711de76db788c2c0332ae774
ibstagefright/MediaCodec.cpp
72bf901ca905ce154fe7866f06d25a01aadcf974 26-Nov-2014 Eric Laurent <elaurent@google.com> Merge "audio policy: new getOutputForAttr() prototype." into lmp-mr1-dev
d325005e4a3be45c57e950f8c18b329c968602ce 26-Nov-2014 Andy Hung <hunga@google.com> Merge "Fix AudioTrack loop mode to play audio from buffer start" into lmp-mr1-dev
b2cf160fef5071183d52ad85b49892e23b790e8a 25-Nov-2014 Lajos Molnar <lajos@google.com> Merge "stagefright: add graceful handling when setting port definition" into lmp-mr1-dev
e83b55dc29ca16092ba02f36f55fa6e0e37fd78c 14-Nov-2014 Eric Laurent <elaurent@google.com> audio policy: new getOutputForAttr() prototype.

Update getOutputForAttr() prototype and group all logic
dealing with audio attributes to stream type conversion in
audio policy manager.

getOutputForAttr():
- specifies the audio session (for future use)
- returns a status code
- receives either stream type (for legacy) or audio attributes
- returns an updated streamtype

Remove logic dealing with legacy stream types to attributes conversion
from AudioTrack.

Use correct type for audio sessions in other APIs (startOutput() ...).

releaseOutput() specifies the audio session (for future use).

Bug: 18067208.

Change-Id: I1bfbe9626c04c7955d77f8a70aecfad2cb204817
ibmedia/AudioRecord.cpp
ibmedia/AudioSystem.cpp
ibmedia/AudioTrack.cpp
ibmedia/IAudioPolicyService.cpp
643319f60e72a86c180ee839b25c086554e5bd47 25-Nov-2014 Lajos Molnar <lajos@google.com> stagefright: add graceful handling when setting port definition

- don't crash when count of buffers is incorrect, or when the buffer
size decreases.

This allows configuring SW video encoders for smaller than QCIF size.

Bug: 18513091
Change-Id: Ibfcd6b883a892156e408e94fbc329103b9ac09ac
ibstagefright/omx/SimpleSoftOMXComponent.cpp
680b795435a5a501a56610258dce5eda40a1725d 12-Nov-2014 Andy Hung <hunga@google.com> Fix AudioTrack loop mode to play audio from buffer start

Bug: 18217633
Change-Id: Ica77acf0a32832d9b04eb657ef2f4f5329f8fbda
ibmedia/AudioTrack.cpp
ibmedia/AudioTrackShared.cpp
223fd5c9738e9665e495904d37d4632414b68c1e 11-Nov-2014 Eric Laurent <elaurent@google.com> audio: new routing strategies and stream types

Added new routing strategies and stream type for internal use
by audio policy manager and audio flinger:
- One for accessibility to allow different routing than media
- One for re-routing (remote submix) in preparation of dynamic
policies
- Added stream type for "internal" audio flinger tracks used
for audio patches and duplication.

Bug: 18067208.
Change-Id: I88f884b552e51e4a49c29125e5a1204cf58ff434
ibmedia/AudioTrack.cpp
3a8d7d1064a665a8a348710c7d27b31642f7f624 21-Nov-2014 Chong Zhang <chz@google.com> Merge "tunnel NuPlayer source and decoder input" into lmp-mr1-dev
7137ec7e005a5a6e3c0edb91cfacf16a31f4bf6a 13-Nov-2014 Chong Zhang <chz@google.com> tunnel NuPlayer source and decoder input

Bug: 18342383

Change-Id: Ieff1cd3bad2b39d46f127ddd5d5139b919992461
ibmediaplayerservice/nuplayer/Android.mk
ibmediaplayerservice/nuplayer/NuPlayer.cpp
ibmediaplayerservice/nuplayer/NuPlayer.h
ibmediaplayerservice/nuplayer/NuPlayerCCDecoder.cpp
ibmediaplayerservice/nuplayer/NuPlayerCCDecoder.h
ibmediaplayerservice/nuplayer/NuPlayerDecoder.cpp
ibmediaplayerservice/nuplayer/NuPlayerDecoder.h
ibmediaplayerservice/nuplayer/NuPlayerDecoderBase.cpp
ibmediaplayerservice/nuplayer/NuPlayerDecoderBase.h
ibmediaplayerservice/nuplayer/NuPlayerDecoderPassThrough.cpp
ibmediaplayerservice/nuplayer/NuPlayerDecoderPassThrough.h
ibmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
ibmediaplayerservice/nuplayer/NuPlayerRenderer.h
7966142a096c1d5d7386a42eaccc9aed5b4344b3 20-Nov-2014 Ronghua Wu <ronghuawu@google.com> Merge "NuPlayer: invalid anchor time when render is flushed." into lmp-mr1-dev
ec9459c63d1c2969505ffdc4a100646fd07223bd 20-Nov-2014 Chong Zhang <chz@google.com> Merge "close fd if data source is reset without prepare" into lmp-mr1-dev
a7cf01da547bad8d4e66e3e4570eddeac98b6b05 20-Nov-2014 Glenn Kasten <gkasten@google.com> Merge "Fix missing loop count for static tracks." into lmp-mr1-dev
574aed902443d41581684dc8bc5ddd2e067f4cdf 20-Nov-2014 Marco Nelissen <marcone@google.com> Merge "When aggregating buffers, make sure we don't lose data" into lmp-mr1-dev
3a2a32b5e758854712caf638fe1f74bb49b50777 20-Nov-2014 Eric Laurent <elaurent@google.com> Merge "AudioSystem: fix cross deadlock" into lmp-mr1-dev
0ebd5f95b68a3a5c9e5509f21938c9e51e74d71b 20-Nov-2014 Eric Laurent <elaurent@google.com> AudioSystem: fix cross deadlock

Do not hold gLockAPS when calling
AudioPolicyService::registerClient() in get_audio_policy_service().
registerClient() will need to acquire the AudioPolicyService mutex and
if at the same time a method called from AudioPolicyService
(with mutex held) calls back into AudioSystem and get_audio_policy_service()
a cross deadlock occurs.

Same preventive fix for get_audio_flinger().

Use a separate mutex for notification client list in AudioPolicyService.
This prevents deadlocking if registerClient() is called as a consequence of
AudioFlinger calling back into AudioPolicyManager while executing a method
with AudioPolicyService locked

Bug: 18403952.
Bug: 18450065.
Change-Id: Ia832e41aede8bc6c843fc615508fbdd74e0863b5
ibmedia/AudioSystem.cpp
8ed5afa3aff29c2a9d078802f71211d14414d14b 20-Nov-2014 Lajos Molnar <lajos@google.com> Merge "mediaplayer: request auto-frc for high quality avsync" into lmp-mr1-dev
a6bf21f2a7cdd33c78464019dc1105ef01248b51 20-Nov-2014 Chong Zhang <chz@google.com> close fd if data source is reset without prepare

bug: 18434887
Change-Id: I70dff721710b7299d1ca1f8520278f82d355141d
ibmediaplayerservice/nuplayer/GenericSource.cpp
6597c00f7015e5ec9a07601d7a760169ca7266d3 06-Nov-2014 Lajos Molnar <lajos@google.com> stagefright: add (temporary) support for automatic video frc

Use MediaFormat.setInteger("auto-frc", 1) to turn this feature on.
If supported, this feature will show up in codec.getOutputFormat().getInteger("auto-frc")
Otherwise, this key will not be present.

Bug: 17383204
Change-Id: I03549b3ede4de156e9e2d81b3883010360bb42ae
ibstagefright/ACodec.cpp
d9fd6317913c74e1c955eb31978c41e70d5810bc 06-Nov-2014 Lajos Molnar <lajos@google.com> mediaplayer: request auto-frc for high quality avsync

Bug: 17383204
Change-Id: I7209305b4ff3c2386019d7a09d6a0536e9f21522
ibmediaplayerservice/nuplayer/NuPlayer.cpp
6c41e622512a99581afcbdbd6ad284237923c942 19-Nov-2014 Marco Nelissen <marcone@google.com> When aggregating buffers, make sure we don't lose data

Bug: 18277034
Change-Id: Ia8c35791eea88545a873cad339eb6b5fc25d1d97
ibmediaplayerservice/nuplayer/NuPlayer.cpp
18899808001ddaea13fa4c5277502c96351f69a5 19-Nov-2014 Ronghua Wu <ronghuawu@google.com> Merge "NuPlayer: open audio sink in offload mode when resuming from timeout teardown." into lmp-mr1-dev
bbda5ce4782b20f3ed75482e5f73b8d999223438 19-Nov-2014 Eric Laurent <elaurent@google.com> Merge "AudioSystem: Add mutex for output cache" into lmp-mr1-dev
f83408b41bbd796b7923d719e7e3799ddc7acaff 19-Nov-2014 Ronghua Wu <ronghuawu@google.com> NuPlayer: invalid anchor time when render is flushed.

Also rememeber the pause time in NuPlayerDriver.

Bug: 18436336
Change-Id: If09f680a0d0f9137bd55c5f94201eb3aa783278a
ibmediaplayerservice/nuplayer/NuPlayerDriver.cpp
ibmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
f6778fd0c72ab54328f0e9f5ecf0017b73e99dd8 19-Nov-2014 Eric Laurent <elaurent@google.com> AudioSystem: Add mutex for output cache

Fix cross deadlock with AudioFlinger by adding
a dedicated mutex to protect access to cached output list
and parameters.

Bug: 18410728.
Change-Id: Ia31283b1972d8865a46e84e63695173c187eb781
ibmedia/AudioSystem.cpp
408dba5ff6dd014a19afeeeae69242f022b73b30 19-Nov-2014 Robert Shih <robertshih@google.com> Merge "HLS: fix live lock after missing the boat during configuration change" into lmp-mr1-dev
ba0790bf10da74caacb214ea8155d172bae4d0c5 19-Nov-2014 Marco Nelissen <marcone@google.com> Merge "Don't autoloop notifications" into lmp-mr1-dev
cb2129b3b568a4e31bcbda3545a468024bc972fe 11-Nov-2014 Andy Hung <hunga@google.com> Fix missing loop count for static tracks.

StaticAudioTrackServerProxy::framesReady() previously returned
only the contiguous frames, update to return the total
available frames. This resolves short-count looping in
SoundPool for FastTracks.

Also (1) Removes the racy condition of reading two variables
and (2) Fixes buffer->mNonContig to return the correct value
and (3) Restores behavior that loop count of 1 goes back to
loopStart once during playback.

Bug: 11830751
Bug: 12070295
Bug: 17456842
Change-Id: I64906e6036bb00a1d7375b03efe6deb69d6478ca
ibmedia/AudioTrackShared.cpp
95697aecd644ffcfbe7fe828e9e42bfab71b75a5 11-Nov-2014 Robert Shih <robertshih@google.com> HLS: fix live lock after missing the boat during configuration change

Bug:17488643
Change-Id: I4f5de42f86d6c616a67dc803f35c026b35347983
ibstagefright/httplive/PlaylistFetcher.cpp
993d57ec4817922e291e2d88d690559403a1bcd6 19-Nov-2014 Robert Shih <robertshih@google.com> Merge "NuPlayer: pass media time to selectTrack for responsiveness" into lmp-mr1-dev
6ffb1fd67eb8f00f130a6db914ba42a8432aec70 30-Oct-2014 Robert Shih <robertshih@google.com> NuPlayer: pass media time to selectTrack for responsiveness

Bug: 18020001
Change-Id: Id50f8473992f39d8c0aa86a1fabb2601093d2572
ibmediaplayerservice/nuplayer/GenericSource.cpp
ibmediaplayerservice/nuplayer/GenericSource.h
ibmediaplayerservice/nuplayer/HTTPLiveSource.cpp
ibmediaplayerservice/nuplayer/HTTPLiveSource.h
ibmediaplayerservice/nuplayer/NuPlayer.cpp
ibmediaplayerservice/nuplayer/NuPlayer.h
ibmediaplayerservice/nuplayer/NuPlayerDriver.cpp
ibmediaplayerservice/nuplayer/NuPlayerSource.h
a10fd23bb9fcf16e778c639ea5638e2917dacd89 07-Nov-2014 Ronghua Wu <ronghuawu@google.com> NuPlayer: open audio sink in offload mode when resuming from timeout teardown.

Also always recheck if a new stream can do offload.

Bug: 18154425
Change-Id: I121877834bd963eeeba91a2b951fd30d5dc36a8b
ibmediaplayerservice/nuplayer/NuPlayer.cpp
ibmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
ibmediaplayerservice/nuplayer/NuPlayerRenderer.h
8cd37d677f10a7718c9247830652a588ea4600de 18-Nov-2014 Eric Laurent <elaurent@google.com> Merge "audio policy: do not prevent routing to A2DP when suspended." into lmp-mr1-dev
707eadef2ad1388bafdb2d003a4169208fa99811 18-Nov-2014 Marco Nelissen <marcone@google.com> Don't autoloop notifications

Some apps think it's cool to use ringtones as notification sounds, but
ringtones often loop, which is not appropriate for notifications.

Bug: 15929273
Change-Id: I77c4277801cb2561743f8c676ef76ab4d1668b08
ibmediaplayerservice/nuplayer/NuPlayerDriver.cpp
ibstagefright/AwesomePlayer.cpp
35b0f7095fac4f2cc112edd4b0298a9cb1ee394f 18-Nov-2014 Jeff Tinker <jtinker@google.com> Merge "Fix missing mutex lock in Drm::binderDied" into lmp-mr1-dev
29e6cecdd8562700ab625c5645ddd6a7753789f1 14-Nov-2014 Eric Laurent <elaurent@google.com> audio policy: do not prevent routing to A2DP when suspended.

Allow A2DP sink selection even if A2DP is suspended.
It is not because use of A2DP is temporarily disabled by SCO
selection that the policy rule routing a given use case
to A2DP should be altered. The source will be routed to A2DP
but it will remain silent until suspend condition is cleared
which is the purpose of suspend mode.

Also make sure that accessibility prompts are audible while in call
by forcing stream type to STREAM_VOICE_CALL.
Fix inconsistent logic between AudioTrack::setStreamTypeFromAttributes()
and AudioPolicyManager::getStrategyForAttr()

Bug: 18095151.
Change-Id: I1c75dd8288ed3dd494eb942060eac9c9660dca50
ibmedia/AudioTrack.cpp
88ec9e992af75f9783794df5d7be31c3b018ad09 18-Nov-2014 Andy Hung <hunga@google.com> Merge "Fix race condition in signaling completion for decode." into lmp-mr1-dev
39b109a1df23e7610b031b466e9ecf510b3c077f 18-Nov-2014 Robert Shih <robertshih@google.com> Merge "NuPlayer HTTPLiveSource: impl getSelectedTrack" into lmp-mr1-dev
b51457f8d915e0ed8edf66d1d2c263ab4a792be8 17-Nov-2014 Andy Hung <hunga@google.com> Fix race condition in signaling completion for decode.

Bug: 18048775
Change-Id: I2207eb2cf30cf205d9bf414edbb1d3e709185f67
ibmediaplayerservice/MediaPlayerService.cpp
4dbc8cc68a2674110ac1dce9e475ac30b1baa7c5 16-Nov-2014 Jeff Tinker <jtinker@google.com> Fix missing mutex lock in Drm::binderDied

bug: 18194977
Change-Id: Ie6107a34237577c3b9cc6507d507f5c51f49fcf6
ibmediaplayerservice/Drm.cpp
addfc718ff85115355060d6b07ca67b41a3765c2 15-Nov-2014 Wei Jia <wjia@google.com> Merge "NuPlayer: tunnel decoder with renderer for data buffer passing." into lmp-mr1-dev
f97dfbc9e20a61e56a03058af7d947b17c48515e 15-Nov-2014 Robert Shih <robertshih@google.com> Merge "PlaylistFetcher: handle sporadic fetch erros" into lmp-mr1-dev
c6cfd70f24a11b946859485ce398a189c301a4e2 12-Nov-2014 Wei Jia <wjia@google.com> NuPlayer: tunnel decoder with renderer for data buffer passing.

Bug: 18342383

Change-Id: I182928007814c146c01a86196c4fda1d46e74ea4
ibmediaplayerservice/nuplayer/NuPlayer.cpp
ibmediaplayerservice/nuplayer/NuPlayer.h
ibmediaplayerservice/nuplayer/NuPlayerDecoder.cpp
ibmediaplayerservice/nuplayer/NuPlayerDecoder.h
ibmediaplayerservice/nuplayer/NuPlayerDecoderPassThrough.cpp
ibmediaplayerservice/nuplayer/NuPlayerDecoderPassThrough.h
ibstagefright/mpeg2ts/ATSParser.cpp
990dad996b748fdaa2041cc6d039e96ccfeae6fb 14-Nov-2014 Eric Laurent <elaurent@google.com> Merge "remove AudioSystem::getOutputSamplingRateForAttr()" into lmp-mr1-dev
cede28e22bce0c92a6d139b51d2c007d2e3f6fca 14-Nov-2014 Lajos Molnar <lajos@google.com> Merge "stagefright: add runtime debug support" into lmp-mr1-dev
daad5b2f4a6bb46a7911661e398278d6a80d7093 30-Aug-2014 Robert Shih <robertshih@google.com> PlaylistFetcher: handle sporadic fetch erros

Bug: 17490472
Change-Id: I2c04e2352f13db762b845f4d35db0a8b851a148c
ibstagefright/httplive/PlaylistFetcher.cpp
97e6ca1a0be83e420ab238d9a1c31d3112126646 14-Nov-2014 Chong Zhang <chz@google.com> Merge "Stagefright: use MediaCodec in async mode for recording" into lmp-mr1-dev
12acd3f0374e7707ff50c04f8075883be71b128c 14-Nov-2014 Wei Jia <wjia@google.com> Merge "AnotherPacketSource: need reset some members before returning from queueDiscontinuity()." into lmp-mr1-dev
87e8123d4d6058fbd50065a4fb18a0bdb6989b3f 13-Nov-2014 Wei Jia <wjia@google.com> AnotherPacketSource: need reset some members before returning from queueDiscontinuity().

Bug: 18355014
Bug: 17511837

Change-Id: I4b623d3bc4fbeaf0e8bf4ddd96661469d17afe7a
ibstagefright/mpeg2ts/AnotherPacketSource.cpp
6641004be544a394f3fca81f7213dd6e0668ff98 13-Nov-2014 Lajos Molnar <lajos@google.com> Merge "Revert "mediaplayer: make frame-accurate avsync configurable"" into lmp-mr1-dev
e0b7ddcda9b4fb493cc365c92293ed7d12c3208a 13-Nov-2014 Robert Shih <robertshih@google.com> Merge "PlaylistFetcher: check ts program streams before disabling a/v" into lmp-mr1-dev
869e0798bbb51af570b4d6ef750f2c21e6b94c8a 13-Nov-2014 Mike Lockwood <lockwood@google.com> Merge "MTP: add strict bounds checking for all incoming packets" into lmp-mr1-dev
0d6db582f2ccc9f8943c5f3965e2994b7d137158 13-Nov-2014 Eric Laurent <elaurent@google.com> remove AudioSystem::getOutputSamplingRateForAttr()

It is safer to query the output sampling rate once the output
have been acquired by calling getOutputForAttr().

Bug: 16009464.
Change-Id: Ib561facd19fba5359a6b837d75f1a1cd2dc51b29
ibmedia/AudioSystem.cpp
ibmedia/AudioTrack.cpp
bf20727f0aaf609bc3b495b07b45822b137d21ba 31-Oct-2014 Robert Shih <robertshih@google.com> PlaylistFetcher: check ts program streams before disabling a/v

Bug: 14648838
Change-Id: Ibf2b2cbb235f3d80bc33013e2afc053f13b9035f
ibstagefright/httplive/PlaylistFetcher.cpp
ibstagefright/mpeg2ts/ATSParser.cpp
ibstagefright/mpeg2ts/ATSParser.h
1099188151eb63af24ecf542b58d4257bbb8236a 16-Oct-2014 Praveen Chavan <pchavan@codeaurora.org> Stagefright: use MediaCodec in async mode for recording

Async mode reduces the number of messages posted between
MediaCodec and MediaCodecSource. This reduces thread
wakeups and helps reduce CPU utilization.

Bug: 18246026
Change-Id: I4b0837f309fdd12e323c1dfa72525f5a31971a03
ibstagefright/MediaCodecSource.cpp
ab063847e6e893740749029a04cce1f6b7345ed5 12-Nov-2014 Mike Lockwood <lockwood@google.com> MTP: add strict bounds checking for all incoming packets

Previously we did not sanity check incoming MTP packets,
which could result in crashes due to reading off the edge of a packet.
Now all MTP packet getter functions return a boolean result
(true for OK, false for reading off the edge of the packet)
and we now return errors for malformed packets.

Bug: 18113092
Change-Id: Ic7623ee96f00652bdfb4f66acb16a93db5a1c105
tp/MtpDataPacket.cpp
tp/MtpDataPacket.h
tp/MtpDevice.cpp
tp/MtpDevice.h
tp/MtpDeviceInfo.cpp
tp/MtpDeviceInfo.h
tp/MtpObjectInfo.cpp
tp/MtpObjectInfo.h
tp/MtpPacket.cpp
tp/MtpPacket.h
tp/MtpProperty.cpp
tp/MtpProperty.h
tp/MtpRequestPacket.cpp
tp/MtpRequestPacket.h
tp/MtpServer.cpp
tp/MtpStorageInfo.cpp
tp/MtpStorageInfo.h
tp/MtpStringBuffer.cpp
tp/MtpStringBuffer.h
f296e2b262d2a8f7c570eaed454a28cca99eb976 19-Jun-2014 Lajos Molnar <lajos@google.com> stagefright: add runtime debug support

Bug: 18285408
Change-Id: I56346f4652b2c5f7ef5fa3003fd8676051339384
ibstagefright/OMXCodec.cpp
ibstagefright/foundation/ADebug.cpp
ibstagefright/foundation/AStringUtils.cpp
ibstagefright/foundation/Android.mk
ibstagefright/include/OMXNodeInstance.h
ibstagefright/omx/OMX.cpp
ibstagefright/omx/OMXNodeInstance.cpp
ibstagefright/omx/SoftOMXComponent.cpp
ibstagefright/tests/Utils_test.cpp
94691b01a94d3ae115a7181c99db58fbeb785c64 12-Nov-2014 Marco Nelissen <marcone@google.com> Merge "Fix Ogg Vorbis packet timestamps" into lmp-mr1-dev
538596f71dc667b2f39c27d0bc9bbf119b0e6d58 12-Nov-2014 Marco Nelissen <marcone@google.com> Merge "Fix looping sound playback" into lmp-mr1-dev
745602d87607521f4fe84c4f3a6388fbdb6a867c 11-Nov-2014 Andy Hung <hunga@google.com> Merge "MediaCodec: Prevent stop() in the UNINITIALIZED state" into lmp-mr1-dev
368e33700ed16acc8e99657fb84edd5d2806b34f 11-Nov-2014 Marco Nelissen <marcone@google.com> Fix looping sound playback

The renderer stops the audio sink at the end in order to play out
the last little bit of audio. When the sound is looping, the sink
needs to be restarted.

Bug: 18326137
Change-Id: I3bc3629597fc43cce33bdf5691d29cc4c2285926
ibmediaplayerservice/nuplayer/NuPlayerDriver.cpp
7a493d8578bb00cf10190053a4caf1d07f4e24f7 11-Nov-2014 Marco Nelissen <marcone@google.com> Fix Ogg Vorbis packet timestamps

Bug: 17586090
Change-Id: Iea88f7cc1f623cbea5df24169ea76181925fbb13
ibstagefright/OggExtractor.cpp
a7e65b196bf7efb27daa36c8a783d9c57c9ffc03 11-Nov-2014 Robert Shih <robertshih@google.com> Merge "MatroskaExtractor: use GetTrackByNumber instead of GetTrackByIndex" into lmp-mr1-dev
95768fc3c357f243ded53baa9f375401dc4835cd 11-Nov-2014 Robert Shih <robertshih@google.com> Merge "PlaylistFetcher: clear mStartup for .aac playlists after seek" into lmp-mr1-dev
48cb6d7c840e695769405b0d33fd2b85479ec717 10-Nov-2014 Marco Nelissen <marcone@google.com> Merge "Fix short sound playback" into lmp-mr1-dev
21efaad13f13e390f585cea4371d399997f8d1a6 10-Nov-2014 Robert Shih <robertshih@google.com> Merge "GenericSource: add mVideoLastDequeueTimeUs/mAudioLastDequeueTimeUs" into lmp-mr1-dev
5c67ddcf987b1f07c9abc1d051a0c051e7c73ff7 05-Nov-2014 Robert Shih <robertshih@google.com> GenericSource: add mVideoLastDequeueTimeUs/mAudioLastDequeueTimeUs

Bug: 18296874
Change-Id: I9608523b4cc37e6cf8b91fb1407035aac087796b
ibmediaplayerservice/nuplayer/GenericSource.cpp
ibmediaplayerservice/nuplayer/GenericSource.h
2dc28b69258d4772aaf40902b939153239e7fe7f 10-Nov-2014 Robert Shih <robertshih@google.com> Merge "HTTPLiveSource: NULL check in getFormat" into lmp-mr1-dev
1098d87e56f726184ae9c8fe903ea4743669f35b 06-Nov-2014 Robert Shih <robertshih@google.com> HTTPLiveSource: NULL check in getFormat

Bug: 18297916
Change-Id: I14c5de8d28202ee1b68e369d33e01bd26dbe968d
ibmediaplayerservice/nuplayer/HTTPLiveSource.cpp
f5b7c3b3c9a6da29f3bbd02e4031ad19bc7ad0f7 08-Nov-2014 Robert Shih <robertshih@google.com> PlaylistFetcher: clear mStartup for .aac playlists after seek

Bug: 18296856
Change-Id: I26beabee338312eb2125b69284052c61aef611f0
ibstagefright/httplive/PlaylistFetcher.cpp
e17afa888040eb5fbd31249305efd88ee03bb5bc 08-Nov-2014 Lajos Molnar <lajos@google.com> Revert "mediaplayer: make frame-accurate avsync configurable"

Reenable PTS scheduling for all playback.

This reverts commit 274084f7bfd3f6bdf5a55cf16ceefed345aa0060.

Bug: 18111837
Change-Id: Ia734ad304c1f85d2ac302261866be82b8f2a30d4
ibmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
0644f95a8976470e84c6c0a6d96585ae6437ecd2 05-Nov-2014 Robert Shih <robertshih@google.com> MatroskaExtractor: use GetTrackByNumber instead of GetTrackByIndex

Bug: 18297854
Change-Id: I5e14a358576d9c7d25b7e421cd22428fb17a6e06
ibstagefright/matroska/MatroskaExtractor.cpp
e662cd5cdbe1312d6b74754d2945fffe99e4fe2c 07-Nov-2014 Glenn Kasten <gkasten@google.com> Merge "Improve AudioTrack recovery from mediaserver death" into lmp-mr1-dev
1609e451cf6101efe6aeaaa2da61db2cb095c9e8 07-Nov-2014 Dan Stoza <stoza@google.com> Merge "Add a BufferItem parameter to onFrameAvailable" into lmp-mr1-dev
c339a921642c38621f57e95b4ec41cfaa99c7a63 07-Nov-2014 Eric Laurent <elaurent@google.com> Merge "AudioSystem: remove obsolete method." into lmp-mr1-dev
a36060891425c4ce0621e40344ac473ec14924dd 07-Nov-2014 Eric Laurent <elaurent@google.com> AudioSystem: remove obsolete method.

Bug: 18067208.
Change-Id: I9bbf9088485f5162c765ca504d9b784b956234c6
ibmedia/AudioSystem.cpp
62fe78b66c87339a64f047561e7b4aac606310e2 07-Nov-2014 Glenn Kasten <gkasten@google.com> Merge "Fix memory leak" into lmp-mr1-dev
e86c6d59dfa8aea8f321287cbb1f122623e5417a 07-Nov-2014 Wei Jia <wjia@google.com> Merge "AnotherPacketSource.cpp: Do not queue discontinity signal buffer resulted from seek." into lmp-mr1-dev
89bf2525c5b57f17260de5b00c5f3f78ac4b881e 30-Jul-2014 Robert Shih <robertshih@google.com> NuPlayer HTTPLiveSource: impl getSelectedTrack

Bug: 17514665
Change-Id: I81c62553f2c5acb4d2436a9d8f04c10fdbe315d0
ibmediaplayerservice/nuplayer/HTTPLiveSource.cpp
ibmediaplayerservice/nuplayer/HTTPLiveSource.h
ibstagefright/httplive/LiveSession.cpp
ibstagefright/httplive/LiveSession.h
ibstagefright/httplive/M3UParser.cpp
ibstagefright/httplive/M3UParser.h
fef808d42a9c94b0b5ef3c3d5fb0a090edbc42da 01-Nov-2014 Wei Jia <wjia@google.com> AnotherPacketSource.cpp: Do not queue discontinity signal buffer resulted from seek.

This will remove the unnecessary flush for seek.

Bug: 17511837
Change-Id: I4b7acfc71a410372f5c630afb94b6a95d09d8974
ibmediaplayerservice/nuplayer/GenericSource.cpp
ibmediaplayerservice/nuplayer/NuPlayer.cpp
ibmediaplayerservice/nuplayer/NuPlayer.h
ibmediaplayerservice/nuplayer/RTSPSource.cpp
ibmediaplayerservice/nuplayer/StreamingSource.cpp
ibstagefright/httplive/LiveSession.cpp
ibstagefright/httplive/PlaylistFetcher.cpp
ibstagefright/mpeg2ts/ATSParser.h
ibstagefright/mpeg2ts/AnotherPacketSource.cpp
85f480e7fd7c5e70c91d2f205b5c49488a84eb4d 06-Nov-2014 Glenn Kasten <gkasten@google.com> Fix memory leak

Change-Id: I3f4110a88679b7e7841f40c6acdbf5dcde40fb19
ibmedia/IAudioPolicyService.cpp
1cf9ad1abb599ce4057189e0db154cf00b4913f8 06-Nov-2014 Jeff Tinker <jtinker@google.com> Merge "Pass resolution to Crypto plugin on format change" into lmp-mr1-dev
19a3f69d9d5398db62ee7b15f2c13052d7ee9f07 06-Nov-2014 Jeff Tinker <jtinker@google.com> Merge "Add missing secure stop methods" into lmp-mr1-dev
d2d089fc86c62843992e7d5b371ee9227189a1e6 05-Nov-2014 Glenn Kasten <gkasten@google.com> Improve AudioTrack recovery from mediaserver death

1. Fix race condition in handling of binder death notifications.

AudioSystem has a mixture of APIs for both ordinary app clients,
and the AudioFlinger and AudioPolicy services within mediaserver.
Due to this mix of uses, it is possible for there to be "surprising"
sequences of calls on the call stack.

Previously, we used a single mutex for all global variables, but
this caused a deadlock. To avoid the deadlock, we unlocked the mutex
during the critical sequence of calls. But this was a a
crucial place where it should have stayed locked;
see Change-Id I315c1c5066f62b05e1c13b04fae1272b5fbce977

Now we use separate mutexes for the AudioFlinger, AudioPolicy, and audio port
related global variables. This allows us to correctly hold each mutex
throughout the atomic region, even when AudioFlinger calls AudioPolicy
via AudioSystem, or vice-versa.

2. AudioSystem::clearAudioConfigCache now clears the IAudioFlinger reference.

3. Make AudioSystem::get_audio_policy_service more like get_audio_flinger.

Bug: 18242291
Change-Id: I9761443d8337df5bf66d4ca2316a9fd0bd11be94
ibmedia/AudioSystem.cpp
ibmedia/AudioTrack.cpp
15ce5f35187659ad757ee2ea6f70dcef5010c2c2 05-Nov-2014 Marco Nelissen <marcone@google.com> Fix short sound playback

AudioTrack needs to be stopped, not paused, at the end of the file,
since otherwise the last bit of queued up audio will not be played.

Bug: 18188921
Change-Id: I038aad74a105e163963929c7002b55f377de1442
ibmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
74adca9ad30b7f8a70d40c5237bade0d16c4ea58 05-Nov-2014 Eric Laurent <elaurent@google.com> IAudioPolicyService: bound array size in queryDefaultPreProcessing

Bug: 18226810.
Change-Id: Ib8e2bfe835a8681aac50bf23161db14e50c9a124
ibmedia/IAudioPolicyService.cpp
04f101c35eaa90b1f95939afac30674ec1611e6f 04-Nov-2014 Dan Stoza <stoza@google.com> Add a BufferItem parameter to onFrameAvailable

Passes the BufferItem for the queued buffer to the onFrameAvailable
callback so the consumer can track the BufferQueue's contents.

Bug: 18111837
Change-Id: If9d07229c9b586c668e5f99074e9b63b0468feb0
ibstagefright/SurfaceMediaSource.cpp
ibstagefright/omx/GraphicBufferSource.cpp
ibstagefright/omx/GraphicBufferSource.h
33223c4f97abb78fa8c92e1b8c817546f15d97e1 04-Nov-2014 Andy Hung <hunga@google.com> MediaCodec: Prevent stop() in the UNINITIALIZED state

Return INVALID_OPERATION instead. This is a corner case when
the decoder is still allocated, occurring after codec error.

Bug: 18121124
Change-Id: If87e44dd40db48f63f965b765205f1e733663efd
ibstagefright/MediaCodec.cpp
2514d080c8a54ff603a45d7e336de668fe7329db 03-Nov-2014 Jeff Tinker <jtinker@google.com> Pass resolution to Crypto plugin on format change

Change-Id: I56cd557ce3525fe625db8c312d2557d3c8b51101
related-to-bug: 16034599
ibmedia/ICrypto.cpp
ibmediaplayerservice/Crypto.cpp
ibmediaplayerservice/Crypto.h
ibstagefright/MediaCodec.cpp
461b02d3eccefea48fa15c67a9cd3a5895bd2765 04-Nov-2014 Eric Laurent <elaurent@google.com> Merge "audio: fix talkback why alarm is playing" into lmp-mr1-dev
03fcdcd0aa9758b6d882b18218fcfb9a1ccffdad 04-Nov-2014 Eric Laurent <elaurent@google.com> audio: fix talkback why alarm is playing

Convert attributes usage "assistance accessibility" to
a stream type guarantying that the prompt is audible
and not muted by policy manager.

Bug: 17994328.
Change-Id: I89f53f2ce84b499b859336c0a1a3a0332ee670f5
ibmedia/AudioTrack.cpp
d9cfeb447356cb6334379eaf5da1e49424eb5979 23-Sep-2014 Jean-Michel Trivi <jmtrivi@google.com> Support speaker routing for FLAG_BEACON

Add support for routing audio stream to the speaker when audio
attributes carry the FLAG_BEACON value:
- associate streams with FLAG_BEACON to the up-to-now unused
STREAM_TTS ("Transmitted Through Speaker").
The remapping happens in AudioTrack.
- AudioPolicyManager: define new strategy for handling the Beacon
behavior, that only goes to speaker. Define new volume curves
for STREAM_TTS that are not silence only for the speaker device
category. Keep ref count of other streams and never play Beacon
streams when anything else is playing: either don't start playback
if something else is playing, or unmute STREAM_TTS when it's
allowed to play and mute when it's done.
- Take into account muting latency when starting an output.

Bug 15415971

Change-Id: I26539c7ec1a486accd85bbeb1623e9c7d3a1192f
ibmedia/AudioTrack.cpp
3c1285e8f86bd497e14c14fb6df7b42072ef52bd 31-Oct-2014 Jeff Tinker <jtinker@google.com> Add missing secure stop methods

b/18053197
b/18076411

Change-Id: I923dc893d48c70bf17980007b32f0ac5dfd22896
ibmedia/IDrm.cpp
ibmediaplayerservice/Drm.cpp
ibmediaplayerservice/Drm.h
20f51b1ea04c410a25f214e37bcdb586e2a028cc 30-Oct-2014 Glenn Kasten <gkasten@google.com> AudioTrack::flush() will no longer flush later data

Bug: 17832076
Change-Id: I4915d782acb8077923e419406b0dcea5b6aab961
ibmedia/AudioTrackShared.cpp
7011ee31d65917a9e15b271942e863f06eee2da1 30-Oct-2014 Eric Laurent <elaurent@google.com> Merge "NuPlayer: reduce offload pause teardown timeout." into lmp-mr1-dev
a5d316fd802cfc92954527f27e6f32206a896113 29-Oct-2014 Eric Laurent <elaurent@google.com> NuPlayer: reduce offload pause teardown timeout.

Waiting 60 seconds to teardown an offloaded path when paused
is not needed and causes unecessary battery drain.
10 seconds is enough to avaoid teardown when it would be
problematic (seek, pause for notifications, buffering...).

Bug: 13505340.
Change-Id: Ibcaa609b59e86ba2bc49539620bd77504d534c0c
ibmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
ibstagefright/AwesomePlayer.cpp
cde2b72229fd6e06ee301238fd2943cdc1c40686 29-Oct-2014 Wei Jia <wjia@google.com> Merge "NuPlayer: merge start() and resume()." into lmp-mr1-dev
9421174a2f002fef31b330fb04e00105a905dca4 29-Oct-2014 Wei Jia <wjia@google.com> NuPlayer: merge start() and resume().

NuPlayerDriver: allow seekTo called in STOPPED_AND_PREPARED state.

Bug: 18127606
Change-Id: I92ff9f7e0a176c434202762d30966d8c4643d1ef
ibmediaplayerservice/nuplayer/NuPlayer.cpp
ibmediaplayerservice/nuplayer/NuPlayer.h
ibmediaplayerservice/nuplayer/NuPlayerDriver.cpp
eac3f36c5d22ca28890fe4258987ded5ac0666dc 28-Oct-2014 Eric Laurent <elaurent@google.com> Merge "fix deep buffer logic in NuPlayer." into lmp-mr1-dev
aac745f29b0e8b18e9f9aff0d122c7d5d82f218a 28-Oct-2014 Glenn Kasten <gkasten@google.com> Merge "libmedia: ensure mCaptureThread exit within Visualizer destructor" into lmp-mr1-dev
63f6ffb996a7ffc920012f05c3deca731614373f 25-Sep-2014 Haynes Mathew George <hgeorge@codeaurora.org> libmedia: ensure mCaptureThread exit within Visualizer destructor

If mCaptureThread doesn't exit when Visualizer instance gets destroyed,
recycled member variables with random value such as danger pointer will
be accessed again and causes crash.

Thread which is created within Visualizer instance lifecycle should be
terminated before or within destructor.

CRs-Fixed: 688546
authored-by: wjiang@codeaurora.org
cherry-pick from CAF commit: 4823e3d6b8c60faa4d8fee5d58728eb70e56abf2

Bug: 18159501
Change-Id: Ie0b12ae8a3b9735b6ecbac0353781b8358cad644
ibmedia/Visualizer.cpp
d88c3cafb439367f2a245b625e0a74bcd785f099 28-Oct-2014 Eric Laurent <elaurent@google.com> fix deep buffer logic in NuPlayer.

Deep buffer output should be requested when there is
no video track, not when there is one.

Also make sure that the deep buffer flag is restored after
a failure to offload audio decoding.

Bug: 18114624.
Change-Id: If3c04c784bc20d77926993ee475fbf961aeba7ae
ibmediaplayerservice/nuplayer/NuPlayer.cpp
ibmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
701b96474dc8afd16046e440975e00be57cc4874 28-Oct-2014 Lajos Molnar <lajos@google.com> Merge "libstagefright: set actual stride info for SW encoder input port" into lmp-mr1-dev
df2592beab557663a471da2ac33ca463f7eee722 25-Oct-2014 Chong Zhang <chz@google.com> do not hold mNotifyLock when calling MediaPlayer::notify

Bug:18120688
Change-Id: Ia66dcfc3fd2d67d1ceba9808d21e0120cc8691d6
ibmediaplayerservice/MediaPlayerService.cpp
a32d5435d9585794b72dd12546054f13adb845f2 25-Oct-2014 Lajos Molnar <lajos@google.com> libstagefright: set actual stride info for SW encoder input port

This fixes encoding flexible YUV content using SW encoders.
Also skip setting input color format if it is flexible YUV, as it
has already been translated to a color format supported by the codec.

Bug: 18124320
Change-Id: I423782936986f4d6cf65ea9ef89ae77a92e30140
ibstagefright/ACodec.cpp
ibstagefright/codecs/avc/enc/SoftAVCEncoder.cpp
ibstagefright/codecs/m4v_h263/enc/SoftMPEG4Encoder.cpp
ibstagefright/codecs/on2/enc/SoftVPXEncoder.cpp
8bfa96c2f7c098550b00b84677088f84e81f4ed4 24-Oct-2014 Hochi Huang <hochi.huang@mediatek.com> am 0f8f4e68: [FM] Fix FM App record fail Buganizer ID: 17975676

* commit '0f8f4e681b867dd611d2d916453337cb0770d4da':
[FM] Fix FM App record fail Buganizer ID: 17975676
0f8f4e681b867dd611d2d916453337cb0770d4da 22-Oct-2014 Hochi Huang <hochi.huang@mediatek.com> [FM] Fix FM App record fail Buganizer ID: 17975676

Review: https://partner-android-review.git.corp.google.com/#/c/185234

Signed-off-by: Hochi Huang <hochi.huang@mediatek.com>

Change-Id: I872ce744d23049e251a46aebc4019be5b25e3612
ibmediaplayerservice/StagefrightRecorder.cpp
b8f096c067f94ed0507d828f5cca2ceab9781c18 24-Oct-2014 Marco Nelissen <marcone@google.com> am 511ae054: am f256901b: Merge "64 bit fixes for NdkMediaExtractor" into lmp-dev

* commit '511ae0549f889c78a820693fdd7e27ea634c2cd2':
64 bit fixes for NdkMediaExtractor
6f907217c7a624c9e304f799d51771aff93c0f92 23-Oct-2014 Chong Zhang <chz@google.com> Merge "stagefright: return failure on malformed TS streams" into lmp-mr1-dev
58344bc9165a9465a63acc874f3e71251a0d7f50 23-Oct-2014 Marco Nelissen <marcone@google.com> 64 bit fixes for NdkMediaExtractor

Bug: 18094443
Change-Id: Iae049012966707f5c187c61ed68407f22c662b25
dk/NdkMediaExtractor.cpp
c99e2e46256b11cae0a424e3341e1c04a3ee2076 22-Oct-2014 Chong Zhang <chz@google.com> am c3ddddbd: Merge "release camera without holding CameraSource mutex" into lmp-dev automerge: 168799c

* commit 'c3ddddbd4ec1fe2c570a25925db6b396fb83badf':
release camera without holding CameraSource mutex
move audio sink open/close to NuPlayerRenderer
Fix freed memory references
audio policy: move intializations to onFirstRef()
Fix VideoFrame class layout for 64/32 bit
NuPlayer: wait for renderer flush before decoder shutdown
Fix uncertainty of one normal mix buffer in AudioTrack::getTimestamp
send available codec buffer count with codec notification
mediarecorder: set level if setting default profile
stagefright: move math templates into AUtils.h
NuPlayer: Fix flush mode decoder error handling
Revert "Fix uncertainty of one normal mix buffer in AudioTrack::getTimestamp"
GenericSource: support disconnect before NuCachedSource2 is created
mediaplayer: make frame-accurate avsync configurable
42aae0c4e722d08828d7316eaa86bb920ea474f2 22-Oct-2014 Lajos Molnar <lajos@google.com> am f04e8b5e: am 25842048: Merge "stagefright: try to free codec instance if MediaCodec.release hangs" into lmp-dev

* commit 'f04e8b5e51cfc868e5e58e1ad234095c8b7505ad':
stagefright: try to free codec instance if MediaCodec.release hangs
8274b049020e9c8f0b0a892c24d6308d92dd3b92 22-Oct-2014 Lajos Molnar <lajos@google.com> am cd3fc4e3: am 6ce19d24: Merge "Stagefright: MediaCodec: shutdown allocated codec on error" into lmp-dev

* commit 'cd3fc4e341abc224db6876c5a028cb94606dc4e8':
Stagefright: MediaCodec: shutdown allocated codec on error
a4ee6d5fcdb71674c79cc2c211672524606a3d83 22-Oct-2014 Lajos Molnar <lajos@google.com> am 6e52a61a: am f5926713: mediaplayer: don\'t report position past last queued position

* commit '6e52a61ace0055167ab1b995ba997217f7e1822f':
mediaplayer: don't report position past last queued position
171fa1607e8bc3e94c2c9ff080777fcdf06f60d9 22-Oct-2014 Lajos Molnar <lajos@google.com> am 9bbccd13: am d5923409: mediaplayer: limit scheduling video frames into the future

* commit '9bbccd13231fbf30e466efedacec5ac03690701b':
mediaplayer: limit scheduling video frames into the future
41c4d1a242708aed8d0ad97b24bc4aa06805eb1d 22-Oct-2014 Ronghua Wu <ronghuawu@google.com> am da686693: am eecb7805: NuPlayer: set anchor time for each audio buffer.

* commit 'da686693896ecf5cd29c3a35979e7cf17e2702b3':
NuPlayer: set anchor time for each audio buffer.
6456ae745e919085c5024f784aaa2703f9695f98 03-Sep-2014 David Yeh <david.yeh@mediatek.com> stagefright: return failure on malformed TS streams

Bug: 18075193
Change-Id: I7bd97dea263e972a8de3429ed000cbd4913164bf
ibstagefright/mpeg2ts/ATSParser.cpp
168799c32ce3f9196ae7928986a7ba3770c74b14 22-Oct-2014 Chong Zhang <chz@google.com> Merge "release camera without holding CameraSource mutex" into lmp-dev
258420480e1edc73b112a5994a8456e31c558860 22-Oct-2014 Lajos Molnar <lajos@google.com> Merge "stagefright: try to free codec instance if MediaCodec.release hangs" into lmp-dev
6ce19d24ff985cf845f04c2d6542ce03c7d07964 22-Oct-2014 Lajos Molnar <lajos@google.com> Merge "Stagefright: MediaCodec: shutdown allocated codec on error" into lmp-dev
121969b7e0d958092fae76226dc55fe8547a1da6 21-Oct-2014 Chong Zhang <chz@google.com> release camera without holding CameraSource mutex

Bug: 17997578
Change-Id: Iba93848ad10ba84d2d836573da7ce242c761582f
ibstagefright/CameraSource.cpp
30358faf33fb9b638257b017fadb4c5f7352d903 22-Oct-2014 Lajos Molnar <lajos@google.com> stagefright: try to free codec instance if MediaCodec.release hangs

Bug: 18033275
Change-Id: If86cd26566d7b75941976f37829bbec619800778
ibstagefright/ACodec.cpp
ibstagefright/omx/OMXNodeInstance.cpp
f592671336be0a061799033e47ceeacb648ed3bf 21-Oct-2014 Lajos Molnar <lajos@google.com> mediaplayer: don't report position past last queued position

also reanchor offloaded audio track correctly

Bug: 17653702
Change-Id: If05394d3b119be8d80b7764847496246d34a2133
ibmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
ibmediaplayerservice/nuplayer/NuPlayerRenderer.h
097fc64d8d888be76bb8c7386e9dde0b101a7fa5 21-Oct-2014 Marco Nelissen <marcone@google.com> Merge "Don't signal an error at the end of a short file" into lmp-mr1-dev
52dfbee90cc3c4426428318e06a92774f5201198 15-Oct-2014 Praveen Chavan <pchavan@codeaurora.org> Stagefright: MediaCodec: shutdown allocated codec on error

If MediaCodec sees a fatal error and transitions to
UNINITIALIZED state, The codec may still be alive (with an
exception of 'mediaserver-died' error).
Handle Shutdown of the codec during release().

Bug: 17784012
Bug: 18033275

Change-Id: I891e036499d9b440a57f77fb735a5ba4da9a6e43
ibstagefright/MediaCodec.cpp
d5923409bbcbb22954a92c2b497ef4492d7cb6a5 21-Oct-2014 Lajos Molnar <lajos@google.com> mediaplayer: limit scheduling video frames into the future

This addresses when video timestamps jumps before an audio timestamp,
but still works on slideshow video clips (<=1fps).

This, however, will not skip time-changes on video-only live video
streams, as we cannot distinguish live slideshow video clips from
non-slideshow ones.

Bug: 18032127
Change-Id: I959a714edfe1c8cf3b84704c693dcd1b3e5b7855
ibmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
ibmediaplayerservice/nuplayer/NuPlayerRenderer.h
eecb7805bbbb712925d4372c505f8c7f5c4fb5ed 20-Oct-2014 Ronghua Wu <ronghuawu@google.com> NuPlayer: set anchor time for each audio buffer.

And use anchor time to compute current position

Bug: 17999949
Bug: 18008307
Bug: 18032127
Change-Id: Ie493c9a1d45d7b788aef65d863f710da6326fcc1
ibmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
ibmediaplayerservice/nuplayer/NuPlayerRenderer.h
dfe7616237240e8a5c4cb26ba395be70bd898cbd 17-Oct-2014 Andy Hung <hunga@google.com> am e0459eb0: am e9234f17: Merge "Fix AudioTrack retrograde getPosition when restoring tracks" into lmp-dev

* commit 'e0459eb091d98b944d9d1c9483a08f322aa60eda':
Fix AudioTrack retrograde getPosition when restoring tracks
e9234f17dfbb192c96b122b9e0ce8cd9015d1589 17-Oct-2014 Andy Hung <hunga@google.com> Merge "Fix AudioTrack retrograde getPosition when restoring tracks" into lmp-dev
c2813e568aa476e03d159529c0af28c99536db8d 17-Oct-2014 Andy Hung <hunga@google.com> Fix AudioTrack retrograde getPosition when restoring tracks

mReleased represents the number of frames written to the
track, but was cleared on start() causing a mismatch if the
client wrote to the track before starting. Moved the clearing
to entering the STATE_STOPPED or STATE_FLUSHED state.

Bug: 18017947
Bug: 18022276
Change-Id: I3788c98c4c3c4d9cc004378432797b3f3138e22e
ibmedia/AudioTrack.cpp
f4f340374eaeb8ef3a1521495eb195139bedd5c6 17-Oct-2014 Chong Zhang <chz@google.com> am 95b6e531: am 0ebf65be: Merge "move audio sink open/close to NuPlayerRenderer" into lmp-dev

* commit '95b6e531a68561e3381645c0998aa799ae70018e':
move audio sink open/close to NuPlayerRenderer
0ebf65be6642774c26e6fddd44b030ddd3eae492 17-Oct-2014 Chong Zhang <chz@google.com> Merge "move audio sink open/close to NuPlayerRenderer" into lmp-dev
3b9eb1f8629c6264d924ab7043f80d824cdd39e2 16-Oct-2014 Chong Zhang <chz@google.com> move audio sink open/close to NuPlayerRenderer

Bug: 17675112
Change-Id: I7eb3d02380658f848baedafe2aea287586ccf016
ibmediaplayerservice/nuplayer/NuPlayer.cpp
ibmediaplayerservice/nuplayer/NuPlayer.h
ibmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
ibmediaplayerservice/nuplayer/NuPlayerRenderer.h
44a1fd38065d438038a75a0a1535571d492d3457 16-Oct-2014 Lajos Molnar <lajos@google.com> am ea405328: am c40da54b: Merge "Fix freed memory references" into lmp-dev

* commit 'ea4053283f8b77bf650d91347f6e591685daa1fa':
Fix freed memory references
c40da54b34138856446e79245ac45600191962b5 16-Oct-2014 Lajos Molnar <lajos@google.com> Merge "Fix freed memory references" into lmp-dev
942481eee58cb1e81853bc79e25359a7ee8a59e1 16-Oct-2014 Marco Nelissen <marcone@google.com> Fix freed memory references

MPEG4Source references memory owned by MPEG4Extractor, and therefore an
MPEG4Extractor needs to be kept around as long as the MPEG4Sources obtained
from it exist.

Bug: 17890354
Change-Id: I399e18ec78517559ccc0914ffc7e099687c0ba51
ibstagefright/MPEG4Extractor.cpp
b1f5ab447c6b44c810f5e97aeef381c93347a47a 16-Oct-2014 Marco Nelissen <marcone@google.com> Don't signal an error at the end of a short file

Just signaling EOS is sufficient

Bug: 17933838
Change-Id: I04a1af57378115731febe7cacb35af5e55d5db83
ibstagefright/codecs/aacdec/SoftAAC2.cpp
6bbf27e5a3beeca3046caef70e4e5acc487dd062 14-Oct-2014 Lajos Molnar <lajos@google.com> am e86f4be5: am 447898bc: Merge "ACodec: only check crop rect on output port" into lmp-dev

* commit 'e86f4be598b1d2c521e2b3fcd05101c3848e93e2':
ACodec: only check crop rect on output port
cd559cc67d6cda5e9ec19eb9937e537f90351441 14-Oct-2014 Lajos Molnar <lajos@google.com> am c3340b80: am 1375ac6d: Merge "NuPlayer: query current position from NuPlayerRenderer." into lmp-dev

* commit 'c3340b80f77fa35d346fb050d571adbed2a73b28':
NuPlayer: query current position from NuPlayerRenderer.
f4147ee993a5eba4b8602ea2eebfda4d539937ad 14-Oct-2014 Lajos Molnar <lajos@google.com> am 48be19a4: am 2edda09a: stagefright: fix surface input handling of software encoders

* commit '48be19a4a17cfc1e0627039bf740fffd2fcbd9f8':
stagefright: fix surface input handling of software encoders
55e816d0b50a9887e07006fccc026ee33206df50 14-Oct-2014 Lajos Molnar <lajos@google.com> am 9195b11b: am 512e9792: stagefright: support passing GraphicBuffer in metadata buffer

* commit '9195b11b3ee6f2b4174536706c1f731d87669198':
stagefright: support passing GraphicBuffer in metadata buffer
447898bca790fae2fdae304073162e980d816b79 14-Oct-2014 Lajos Molnar <lajos@google.com> Merge "ACodec: only check crop rect on output port" into lmp-dev
1375ac6d029b74ac392db411907b3c0ea57f08a7 14-Oct-2014 Lajos Molnar <lajos@google.com> Merge "NuPlayer: query current position from NuPlayerRenderer." into lmp-dev
2edda09a2ad1d112c52acd37d323f63f0a492d67 11-Oct-2014 Lajos Molnar <lajos@google.com> stagefright: fix surface input handling of software encoders

- added SoftVideoEncoder for common color conversion and
extension handling logic
- fix YUV420 SemiPlanar handling that should be NV12 not NV21

Bug: 17935149
Change-Id: I9b8d05678b1862dd37bf349ea83d67bdf1bb5560
ibstagefright/codecs/avc/enc/SoftAVCEncoder.cpp
ibstagefright/codecs/avc/enc/SoftAVCEncoder.h
ibstagefright/codecs/m4v_h263/enc/SoftMPEG4Encoder.cpp
ibstagefright/codecs/m4v_h263/enc/SoftMPEG4Encoder.h
ibstagefright/codecs/on2/enc/Android.mk
ibstagefright/codecs/on2/enc/SoftVPXEncoder.cpp
ibstagefright/codecs/on2/enc/SoftVPXEncoder.h
ibstagefright/include/SoftVideoEncoderOMXComponent.h
ibstagefright/omx/Android.mk
ibstagefright/omx/SoftVideoEncoderOMXComponent.cpp
512e979284de984427e5b2f73b9054ae1b5e2b0a 11-Oct-2014 Lajos Molnar <lajos@google.com> stagefright: support passing GraphicBuffer in metadata buffer

Bug: 17935149
Change-Id: I6bb5dd654e498a7153410afc052c2c8f7f35e44d
ibstagefright/include/OMXNodeInstance.h
ibstagefright/omx/GraphicBufferSource.cpp
ibstagefright/omx/GraphicBufferSource.h
ibstagefright/omx/OMXNodeInstance.cpp
a73d9e0b3d171d2bfcd9eb07df9d6d36ae74df57 09-Oct-2014 Ronghua Wu <ronghuawu@google.com> NuPlayer: query current position from NuPlayerRenderer.

Bug: 17653702
Change-Id: Ie0b1f92420b071a0cfcd389f5e7917a54d332541
ibmediaplayerservice/nuplayer/NuPlayer.cpp
ibmediaplayerservice/nuplayer/NuPlayer.h
ibmediaplayerservice/nuplayer/NuPlayerDriver.cpp
ibmediaplayerservice/nuplayer/NuPlayerDriver.h
ibmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
ibmediaplayerservice/nuplayer/NuPlayerRenderer.h
45b944024edde49c27371c73236276aa35ab5423 14-Oct-2014 Wei Jia <wjia@google.com> am 2fa84b0b: am e760de61: Merge "NuPlayerDriver: request seek notification when prepare*() is called in STOPPED state." into lmp-dev

* commit '2fa84b0bbc83c2f475a4b86a2388af7423641b51':
NuPlayerDriver: request seek notification when prepare*() is called in STOPPED state.
3384cfaa4b933e4406a41bc4362a74511e0a0e79 14-Oct-2014 Chong Zhang <chz@google.com> am 1195142c: am 801a3ff8: Merge "handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat" into lmp-dev

* commit '1195142cec56fdfd509294da724ce3e13c628be5':
handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat
e760de61d9a662b1fbfda96ac34aaa246c2711bb 13-Oct-2014 Wei Jia <wjia@google.com> Merge "NuPlayerDriver: request seek notification when prepare*() is called in STOPPED state." into lmp-dev
dab70a065a8e972d272ed948e77cf2cd0f1525e1 12-Oct-2014 Wei Jia <wjia@google.com> NuPlayerDriver: request seek notification when prepare*() is called in STOPPED state.

Bug: 17596535
Change-Id: Ib43f91f9b0d0a52112aa1fa8352adac15aaf80f8
ibmediaplayerservice/nuplayer/NuPlayerDriver.cpp
801a3ff80c36aa9b55dc9b360d0e59f863011a39 13-Oct-2014 Chong Zhang <chz@google.com> Merge "handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat" into lmp-dev
7d2b381f6a611e60f715e8356269c71ecc7f5884 13-Oct-2014 Wei Jia <wjia@google.com> am e39c1929: am 7225187b: Merge "ACodec: process deferred messages when entering Loaded state." into lmp-dev

* commit 'e39c192937df50861067b376c7ea8a58cdc68205':
ACodec: process deferred messages when entering Loaded state.
7225187b5126b921e40f0221db158a16c366344e 13-Oct-2014 Wei Jia <wjia@google.com> Merge "ACodec: process deferred messages when entering Loaded state." into lmp-dev
10d023beb0544591d0f5ff556f7f67356f0d9189 13-Oct-2014 Chong Zhang <chz@google.com> handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat

Bug: 17935293
Change-Id: Id09190ae813aa9e00a3c1ef6fb8a1bd3021deb6e
ibstagefright/ACodec.cpp
ibstagefright/codecs/g711/dec/SoftG711.cpp
0f69763d41c101a2afcac7f10be86b41974f1279 13-Oct-2014 Guang Zhu <guangzhu@google.com> am ee3f39f6: am 380757ba: Merge "Revert "handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat"" into lmp-dev

* commit 'ee3f39f66580df7941be054ed3dcd6e90bfc2dfb':
Revert "handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat"
380757ba5c927015d403e3b97cc418413330453e 13-Oct-2014 Guang Zhu <guangzhu@google.com> Merge "Revert "handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat"" into lmp-dev
667623ac75700fc1bb4829b8275c4fc29c631fe9 13-Oct-2014 Guang Zhu <guangzhu@google.com> Revert "handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat"

Bug: 17935293

fix 64-bit builds

This reverts commit 9c78328f4dfd2c8a1dd5d31010f10ffcd762f04b.

Change-Id: Ifbc499342fb47fd67cae02a79cb900e701caed68
ibstagefright/ACodec.cpp
1d6fe0424915ce575747c2c2fe7c79a911df7e37 11-Oct-2014 Chong Zhang <chz@google.com> am 92ab9962: am aec1dbfd: Merge "handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat" into lmp-dev

* commit '92ab9962203f72c69308b0c2a3fed0702f6e1192':
handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat
f393c33e65ae51a7cf168b4e15771b152f996b32 11-Oct-2014 Wei Jia <wjia@google.com> ACodec: process deferred messages when entering Loaded state.

Bug: 17792260
Change-Id: Ie8154cf41be5672fc8a9f3a2a82b7ede0a8b828f
ibstagefright/ACodec.cpp
aec1dbfd10150da3f28b64471b4dc249a58a104e 11-Oct-2014 Chong Zhang <chz@google.com> Merge "handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat" into lmp-dev
392730f7c04e090e9cee61926dfebed96a805085 10-Oct-2014 Lajos Molnar <lajos@google.com> am 6f559515: am a4c3d8f0: Merge "MediaCodec: fix onError and onInputBufferAvailable" into lmp-dev

* commit '6f559515c4edca867dbf2dbf6015e42c44ee3871':
MediaCodec: fix onError and onInputBufferAvailable
9c78328f4dfd2c8a1dd5d31010f10ffcd762f04b 10-Oct-2014 Chong Zhang <chz@google.com> handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat

Bug: 17935293
Change-Id: I8eab0acf55df6934e05947b0dbdd1fd456130088
ibstagefright/ACodec.cpp
a4c3d8f0f9aab53b106d95e6139e0465908909f4 10-Oct-2014 Lajos Molnar <lajos@google.com> Merge "MediaCodec: fix onError and onInputBufferAvailable" into lmp-dev
d763561844c4f1c45703f25a37b8f30310060073 10-Oct-2014 Wei Jia <wjia@google.com> am 9e9196fe: am 185a295d: Merge "NuPlayerRenderer: adjust anchor time correctly for video only case." into lmp-dev

* commit '9e9196fe5e962bdb997e2d9f16551999a3deb702':
NuPlayerRenderer: adjust anchor time correctly for video only case.
185a295d4518878d5e2bca7b7c3e51df44492df1 10-Oct-2014 Wei Jia <wjia@google.com> Merge "NuPlayerRenderer: adjust anchor time correctly for video only case." into lmp-dev
6e029f0ba9a3b421eb7273a095305f7998e9aa5a 10-Oct-2014 Lajos Molnar <lajos@google.com> MediaCodec: fix onError and onInputBufferAvailable

- don't call onInputBufferAvailable if we created an input surface
- keep component name alive if an error occurs

Bug: 17934966
Change-Id: I396c6e6cfd9fa589a1a95c6169492089255e6993
ibstagefright/MediaCodec.cpp
49966fff32b27f8821ebe280f25688b3c4f5f73f 09-Oct-2014 Wei Jia <wjia@google.com> NuPlayerRenderer: adjust anchor time correctly for video only case.

Bug: 17922171
Change-Id: I4c7e9e7f5ab96d3675d012ae30f78ef945394103
ibmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
ibmediaplayerservice/nuplayer/NuPlayerRenderer.h
dba83c1cb1bef03bc5d1760c2639d06ff71c0fa7 08-Oct-2014 Mark Salyzyn <salyzyn@google.com> libstagefright: compile errors

Change-Id: I752d7d73f9c4939160a1ccaefc44ce1f8ffd9982
ibstagefright/CameraSource.cpp
ibstagefright/MPEG4Writer.cpp
ibstagefright/OMXCodec.cpp
ibstagefright/codecs/m4v_h263/dec/SoftMPEG4.cpp
ibstagefright/codecs/on2/dec/SoftVPX.cpp
91a3cc00db31a713a25848f345bd624ac2ad8dc5 08-Oct-2014 Lajos Molnar <lajos@google.com> ACodec: only check crop rect on output port

Bug: 17789956
Change-Id: I0e17660d95ac0b3b051e7f555820188d9286571a
ibstagefright/ACodec.cpp
ce26e9d13da7a4a4443b9be775bb12fb3ac97d23 08-Oct-2014 Eric Laurent <elaurent@google.com> Merge "AudioTrack: fix AudioTrackThread crash upon exit" into lmp-dev
7985dcb06e0c29d5cc12d0c0e17e03d5d863cf53 08-Oct-2014 Eric Laurent <elaurent@google.com> AudioTrack: fix AudioTrackThread crash upon exit

In case of error during createTrack_l(), there is a possibility
that a newly created AudioTrackThread is resumed by requestExit()
just after entering the Thread class _threadLoop() but before
entering the class threadLoop(). In this case, processAudioBuffer()
is executed once with mCblk == 0 and we assert.

Bug: 17894033.
Change-Id: I93d0d0d4dbf14bcb88dad23e6ad49d2ecd47badd
ibmedia/AudioTrack.cpp
73d0a798747c8d022e8a9c8cf4e284ac97508b1e 07-Oct-2014 Andy Hung <hunga@google.com> Merge "NuPlayer: wait for renderer flush before decoder shutdown" into lmp-dev
5002d02e545dafbcf129b2e5bccf087e765019e5 07-Oct-2014 Marco Nelissen <marcone@google.com> Merge "Recover from errors" into lmp-dev
584c14c370f141685b7e8963a13ed91584383ca1 07-Oct-2014 Rachad <rachad@google.com> Merge "stagefright: do not allocate output buffers for tunneled playback" into lmp-dev
c68cc33cd94cfc97c2a7b57955ce18b0ff931f19 05-Oct-2014 Marco Nelissen <marcone@google.com> Recover from errors

When the AAC decoder encounters an error, the lists of submitted
and consumed sizes need to be resynchronized, to prevent timestamp
drift.

Bug: 17638652
Change-Id: Ia6d5f48dc36be355803589e4a5796b01559942b8
ibstagefright/codecs/aacdec/SoftAAC2.cpp
e48b90d634f9e6190a788e6225927d418b11d162 06-Oct-2014 Chong Zhang <chz@google.com> Merge "StageFrightRecorder: Enable meta-data mode for VP8 hardware encoder." into lmp-dev
bc78bd02f0b823b18e3a4f8b8f862780b51994c0 06-Oct-2014 Praveen Chavan <pchavan@codeaurora.org> StageFrightRecorder: Enable meta-data mode for VP8 hardware encoder.

Meta-data mode for input is preferred (rather required) for recording
with camera v1. This capability is queried and enabled per codec; enable
it for VP8 hardware encoder.

Bug: 17664960

Change-Id: I4735c61670ebe0a555002cc25ef3ed823ab02f1f
ibmediaplayerservice/StagefrightRecorder.cpp
8d121d41f5355b78b687f44e8d4aae4de2aa0359 03-Oct-2014 Andy Hung <hunga@google.com> NuPlayer: wait for renderer flush before decoder shutdown

Bug: 17679341
Change-Id: Ie3883686891e7ee6fb45ceb01af1eb60b559d3a0
ibmediaplayerservice/nuplayer/NuPlayer.cpp
ibmediaplayerservice/nuplayer/NuPlayer.h
ibmediaplayerservice/nuplayer/NuPlayerDriver.cpp
c4da004d4baef8cc4a631058549216c8d2383824 06-Oct-2014 Ronghua Wu <ronghuawu@google.com> Merge "NuPlayer: add audioDecoderStillNeeded." into lmp-dev
f0011d49c0f08753dc2dc254c5a70885a9986602 04-Oct-2014 Chong Zhang <chz@google.com> Merge "MediaRecorder: only dequeue available buffers from MediaCodec" into lmp-dev
d7988b1a7b32e39e671f7d4e2b2d8027a1f99639 04-Oct-2014 Ronghua Wu <ronghuawu@google.com> NuPlayer: add audioDecoderStillNeeded.

Bug: 17752358
Change-Id: Ia3b3ee4df65e5564afd0723943d2d747f3a604af
ibmediaplayerservice/nuplayer/NuPlayer.cpp
ibmediaplayerservice/nuplayer/NuPlayer.h
f2a64852a4a48c5a3d8a08ffcda20d6884586672 04-Oct-2014 Chong Zhang <chz@google.com> MediaRecorder: only dequeue available buffers from MediaCodec

Bug: 17514968
Change-Id: If232f92d163deb2440b927315c69e0c4d51ca290
ibstagefright/MediaCodecSource.cpp
af1a4dc989d6707116eaefab300ad55124aace66 03-Oct-2014 Ronghua Wu <ronghuawu@google.com> Merge "NuPlayer: don't restart AudioSink when torn down due to pause timeout." into lmp-dev
0852917279f79a94907e9906d0533ae409a30f6a 03-Oct-2014 Ronghua Wu <ronghuawu@google.com> NuPlayer: don't restart AudioSink when torn down due to pause timeout.

Bug: 17752358
Change-Id: I232d105480139bfc0b991bcd8e001930e577cf30
ibmediaplayerservice/nuplayer/NuPlayer.cpp
ibmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
ibmediaplayerservice/nuplayer/NuPlayerRenderer.h
b220fe0e40bc3752b62a9576fc824634a16fc3ab 03-Oct-2014 Ronghua Wu <ronghuawu@google.com> Merge "stagefright: fix fake-stride handling for H263 SW decoder" into lmp-dev
0f694a12f92a01f95807242320bd65e88c699708 02-Oct-2014 Ronghua Wu <ronghuawu@google.com> stagefright: fix fake-stride handling for H263 SW decoder

- Use outputBufferWidth/Height to init H263 decoder.
- Handle stride change when using fake stride.

Bug: 17773094
Bug: 17326758
Change-Id: I66ce7b9c650383456923d75417c590e3a8a814e7
ibstagefright/codecs/m4v_h263/dec/SoftMPEG4.cpp
ibstagefright/omx/SoftVideoDecoderOMXComponent.cpp
aaa527fbd790d30353d15608e54b5b94625b7b6d 03-Oct-2014 Chong Zhang <chz@google.com> Merge "send available codec buffer count with codec notification" into lmp-dev
fc93499e83403d5959693efa040cb29fd6825abb 03-Oct-2014 Lajos Molnar <lajos@google.com> Merge "mediarecorder: set level if setting default profile" into lmp-dev
6eff943c133903fcd9bdb7bb1812d7b383b090f8 03-Oct-2014 Wei Jia <wjia@google.com> Merge "NuPlayerDecoder: postpone input message processing when it's not dequeued." into lmp-dev
8b76b592be5bc162fb5a6d7e8c47812544b6b345 03-Oct-2014 Lajos Molnar <lajos@google.com> Merge "stagefright: move math templates into AUtils.h" into lmp-dev
e47d44486f0a9f9b828b01d0fbaf84f5573f0aa2 30-Sep-2014 Chong Zhang <chz@google.com> send available codec buffer count with codec notification

Bug: 14679336
Change-Id: Id927c96a9a14dd6ecd72540f0037d5841aa32154
ibmediaplayerservice/nuplayer/NuPlayerDecoder.cpp
ibstagefright/MediaCodec.cpp
2245fc625910e47d1ba3c339e205c21ab58a47ad 03-Oct-2014 Wei Jia <wjia@google.com> NuPlayerDecoder: postpone input message processing when it's not dequeued.

Bug: 17622642
Change-Id: I67608121bf70d6acb152e4aa64892b11bf167e8c
ibmediaplayerservice/nuplayer/NuPlayerDecoder.cpp
ibmediaplayerservice/nuplayer/NuPlayerDecoder.h
a147b4f91143d9f2fb608e22f9fca14bbd029573 02-Oct-2014 Lajos Molnar <lajos@google.com> mediarecorder: set level if setting default profile

Bug: 17676461
Change-Id: If01ccd09935945d330de0842be95c3544951b6b9
ibmediaplayerservice/StagefrightRecorder.cpp
ibstagefright/ACodec.cpp
d8b03abf1d003e2940a19f0071ea2892689dd10e 02-Oct-2014 Andy Hung <hunga@google.com> Merge "NuPlayer: Fix flush mode decoder error handling" into lmp-dev
c416becd966945fca5fa7fb45ac51f84d1d8cd20 02-Oct-2014 Lajos Molnar <lajos@google.com> stagefright: move math templates into AUtils.h

add unit test for math templates

Bug: 17676461
Change-Id: Ie964c5fcfcca1ec53b4538f8e577392e8fbb4319
ibmediaplayerservice/VideoFrameScheduler.cpp
ibstagefright/tests/Android.mk
ibstagefright/tests/Utils_test.cpp
2abde2c118a94f843a7450818c925d3f0b673cd3 30-Sep-2014 Andy Hung <hunga@google.com> NuPlayer: Fix flush mode decoder error handling

Explicitly handle each flush mode upon decoder error.
Do not clear out affected decoder immediately.
Alter logcat messages for better diagnostics.

Bug: 17638878
Bug: 17679341
Change-Id: I219796c04d65d7c4dd61c0d4f99f9f580241a68b
ibmediaplayerservice/nuplayer/GenericSource.cpp
ibmediaplayerservice/nuplayer/GenericSource.h
ibmediaplayerservice/nuplayer/NuPlayer.cpp
ibmediaplayerservice/nuplayer/NuPlayerDecoder.cpp
ibmediaplayerservice/nuplayer/NuPlayerDriver.cpp
ibmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
f916667a017a5a6763afc4808344778570312d5a 02-Oct-2014 Ruben Brunk <rubenbrunk@google.com> Merge "camera2: Force DNG previews to render with LSC map." into lmp-dev
d0b9efe7d8300e48f7a99c1dd746d60060206b3c 01-Oct-2014 Chong Zhang <chz@google.com> Merge "add AAC audio decoder params for PCM limiter enable" into lmp-dev
482e0235f84ec483c57bab4cb16b5918d0821630 01-Oct-2014 Ruben Brunk <rubenbrunk@google.com> camera2: Force DNG previews to render with LSC map.

Bug: 17688063
Change-Id: I7f60a3465ab608a6b68d1e38493895cbd40bd7ae
mg_utils/src/DngUtils.cpp
3af67d03bbc30c368821caf8b74ae7fb91ee7db7 01-Oct-2014 Robert Shih <robertshih@google.com> Merge "GenericSource: support disconnect before NuCachedSource2 is created" into lmp-dev
360d6d0924f99b82ebacb5cfb6f7bca95e11b4ee 29-Sep-2014 Robert Shih <robertshih@google.com> GenericSource: support disconnect before NuCachedSource2 is created

Bug: 17672488
Change-Id: I96776c9679fdcfbe9a442c86447c59802b1465ac
ibmediaplayerservice/nuplayer/GenericSource.cpp
ibmediaplayerservice/nuplayer/GenericSource.h
ibstagefright/DataSource.cpp
2965f4eb7dceaf1173f0e2d93c11c28293aeead7 01-Oct-2014 Chong Zhang <chz@google.com> add AAC audio decoder params for PCM limiter enable

Bug: 17470065
Change-Id: Ib67aa1c50e3b6c24c4b12b0f31a996cc6874abd1
ibstagefright/ACodec.cpp
ibstagefright/codecs/aacdec/SoftAAC2.cpp
1f4b162e0bee6bcb0c9de464087db286270f5525 01-Oct-2014 Robert Shih <robertshih@google.com> Merge "NuCachedSource2: fix disconnect process" into lmp-dev
4f17dadd3cfd9940893ea042ca8883c6aa6ada07 30-Sep-2014 Robert Shih <robertshih@google.com> NuCachedSource2: fix disconnect process

- clear mAsyncResult
- return early from reads if mDisconnecting is set

Bug: 17696761
Change-Id: I98bfc3f5f06594915bd58faf71fbcded482664d2
ibstagefright/NuCachedSource2.cpp
c06cf18e5933cfddddfe86df85b72e1d5f7fcdde 01-Oct-2014 Marco Nelissen <marcone@google.com> Merge "Check if info for uri is available" into lmp-dev
6300cbe99899da0103c910ba6a35c785261ce433 30-Sep-2014 Marco Nelissen <marcone@google.com> Check if info for uri is available

before retrieving it.

Bug: 17683986
Change-Id: I7a44cd06faf11c22be2ed5ace8ab6e2a5513b66c
ibstagefright/httplive/LiveSession.cpp
274084f7bfd3f6bdf5a55cf16ceefed345aa0060 30-Sep-2014 Lajos Molnar <lajos@google.com> mediaplayer: make frame-accurate avsync configurable

disable by default

Bug: 17686015
Change-Id: I3961b1bc9c6d48afc8c5f7f5270528ea6341bc60
ibmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
ab76066c11e988ca3d3a5d6d74dd510ae080322e 23-Sep-2014 Rachad <rachad@google.com> stagefright: do not allocate output buffers for tunneled playback

Do not allocate native window buffers for tunneled video playback codecs.

Bug: 17112525
Change-Id: I262d8030a9df6188938fde5d62ebce8faf7dba1f
ibstagefright/ACodec.cpp
504de531a08facd130fa00f64fdc00521a975175 27-Sep-2014 Eric Laurent <elaurent@google.com> Merge "audio: fix stream type for accessibility usage" into lmp-dev
0ed72488feba74904d25ebc91bda60c6b1d0af55 26-Sep-2014 Wei Jia <wjia@google.com> Merge "NuPlayer: use format obtained from source to tell if video exists." into lmp-dev
bb6c9a05840d924b502ce0f1868fca4881ada1ed 25-Sep-2014 Eric Laurent <elaurent@google.com> audio: fix stream type for accessibility usage

Make sure that accessibility prompts are heard when
a ringtone is active by forcing stream type
to AUDIO_STREAM_RING when phone state is AUDIO_MODE_RINGTONE.

Bug: 17558149.
Change-Id: Ia3bead8052fca5cbf282c267f7b9b06014fef628
ibmedia/AudioSystem.cpp
ibmedia/AudioTrack.cpp
ibmedia/IAudioPolicyService.cpp
36f389888e4b2905f0b457f451187fd8d3ed5153 26-Sep-2014 Wei Jia <wjia@google.com> NuPlayer: use format obtained from source to tell if video exists.

Bug: 17374216
Change-Id: I2d5f90d72b70684475d67ff8f41b803c2880840b
ibmediaplayerservice/nuplayer/NuPlayer.cpp
4edf384a512748b871f24e4c03afaa3c1151ca23 25-Sep-2014 Marco Nelissen <marcone@google.com> Fix SoftAAC2 flush

If there were less than a full frame worth of samples in the ring
buffer, then flush would loop forever trying to empty the ring
buffer.

Bug: 17646525
Change-Id: I68ec87352a91ce3a96d05e9b3f60a6e7975f9156
ibstagefright/codecs/aacdec/SoftAAC2.cpp
c0d17e349901c3ccf6d15b7dcdf7fa30139c9750 25-Sep-2014 Andy Hung <hunga@google.com> Merge "NuPlayer: Fix decoder error handling" into lmp-dev
9a70c2c490afe35383c2226061af5a2f4e5b2109 25-Sep-2014 Lajos Molnar <lajos@google.com> Merge "Fix Widevine classic playback errors with NuPlayer" into lmp-dev
a935c76f96b066941b34f81c42b3fe9d00db98c5 25-Sep-2014 Lajos Molnar <lajos@google.com> stagefright: Advertise 16x16 alignment requirement for PV codecs

Bug: 17648616
Change-Id: Iaf276467ae9361d918feee1f72e13c7a60075819
ibstagefright/data/media_codecs_google_video.xml
cf31f1eecf46d599428e115dfee8dd47b76c83fc 23-Sep-2014 Andy Hung <hunga@google.com> NuPlayer: Fix decoder error handling

Upon error, release MediaCodec after flushing data.
Report errors when they occur with ALOGE.
Fix onInputBufferFilled mInputBufferIsDequeued check.

Bug: 17423087
Bug: 17622642
Change-Id: I316601a19d5ec95cf8e14f5bc0418a05ec423041
ibmediaplayerservice/nuplayer/NuPlayer.cpp
ibmediaplayerservice/nuplayer/NuPlayerDecoder.cpp
ibstagefright/foundation/AMessage.cpp
207fc297cb388c1466b7e0ef35de9d8b13830b37 25-Sep-2014 Lajos Molnar <lajos@google.com> Merge "mediaplayer: handle bad input in VideoFrameScheduler" into lmp-dev
4a34b9a4759d7dcc2d2ad5bd96ea8477915dd67a 25-Sep-2014 Lajos Molnar <lajos@google.com> Merge "stagefright: use frame height if slice height is 0" into lmp-dev
70a250ab52079a4d02ff0687c07a73b2bd39feaf 25-Sep-2014 Ronghua Wu <ronghuawu@google.com> Merge "SoftVideoDecoderOMXComponent: re-config the buffer size when port definition changed." into lmp-dev
5d6fb5e41f57a71bd5b2902dc8334825de7bdcc0 24-Sep-2014 Lajos Molnar <lajos@google.com> mediaplayer: handle bad input in VideoFrameScheduler

Bug: 17626098
Change-Id: I2ae22ed43b35ff532a47818b118dd328ce2abf63
ibmediaplayerservice/VideoFrameScheduler.cpp
ibmediaplayerservice/VideoFrameScheduler.h
cae1c0fa3f4d5e2387f05a6055bf356914851c4b 25-Sep-2014 Ronghua Wu <ronghuawu@google.com> Merge "stagefright: fix cropping handling for SoftAVC and SoftMEPEG4." into lmp-dev
ec5206c99694d263ac099bf2c37f8119f43f74f1 25-Sep-2014 Robert Shih <robertshih@google.com> Merge "LiveSession: do not drop seek request" into lmp-dev
50373731b2438912e467ae34c92c712bb84d8a75 25-Sep-2014 Wei Jia <wjia@google.com> Merge "NuPlayerDecoder: release MediaBuffers when decoder is deleted." into lmp-dev
f74023f0fbd35b4e9382703dd34c14b440f3da43 25-Sep-2014 Lajos Molnar <lajos@google.com> Merge "stagefright: return encrypted input buffer for secure codecs" into lmp-dev
d5a2f55034022f2d0425fa0701894d0c4787b726 24-Sep-2014 Ronghua Wu <ronghuawu@google.com> stagefright: fix cropping handling for SoftAVC and SoftMEPEG4.

Bug: 17326758
Change-Id: I9b0c281d92cf1803e275b1768e9edab9404ea577
ibstagefright/codecs/m4v_h263/dec/SoftMPEG4.cpp
ibstagefright/codecs/on2/h264dec/SoftAVC.cpp
ibstagefright/codecs/on2/h264dec/SoftAVC.h
ibstagefright/include/SoftVideoDecoderOMXComponent.h
ibstagefright/omx/SoftVideoDecoderOMXComponent.cpp
42a9fd4f382253a2fb7fe6761273841c999606af 22-Sep-2014 Ronghua Wu <ronghuawu@google.com> SoftVideoDecoderOMXComponent: re-config the buffer size when port definition changed.

Bug: 17326758
Change-Id: I7c6b85284ae0cbfa54f999851f56db84345b65bf
ibstagefright/omx/SoftVideoDecoderOMXComponent.cpp
4923cee4fb3b29538d8f46bceeea7d5128242a71 24-Sep-2014 Wei Jia <wjia@google.com> NuPlayerDecoder: release MediaBuffers when decoder is deleted.

Bug: 17454455
Change-Id: Ic984c74826f87f5f3c27756a7e7d52295a529bed
ibmediaplayerservice/nuplayer/NuPlayerDecoder.cpp
b32ebac7e3afb49b41eeccf130c8a96c1dae85d1 24-Sep-2014 Lajos Molnar <lajos@google.com> stagefright: use frame height if slice height is 0

This is a workaround for some vendors that set slice height to 0.
Android uses slice height is the vertical stride for YUV planar
and semiplanar formats.

Bug: 13433554
Change-Id: I4da038e7a768dcd8360c33fa1a9ce95a172f16bb
ibstagefright/ACodec.cpp
846202f5483c30ff380fc997c7d4461cce090098 24-Sep-2014 Chong Zhang <chz@google.com> Merge "NuCachedSource2: more fixes for source read hang" into lmp-dev
a28785aa9ce323494a6971a38ce1d4d29bf710e4 24-Sep-2014 Jeff Tinker <jtinker@google.com> Fix Widevine classic playback errors with NuPlayer

bug: 17589961
Change-Id: If16c61b90cf92caa89eecd66aabef5813fd7619b
ibmediaplayerservice/nuplayer/GenericSource.cpp
80ec934ae7d4e3a78af87554fdb77a58f6386ba0 24-Sep-2014 Ronghua Wu <ronghuawu@google.com> Merge "stagefright: add adaptive playback support to SoftHEVC decoder." into lmp-dev
9f3d1cffe3bbec35c1fb7fc7e206428728ac234e 24-Sep-2014 Chong Zhang <chz@google.com> NuCachedSource2: more fixes for source read hang

- Do not try to read from HTTP source if already disconnecting

- Let NuCachedSource2::readAt() return immediately when disconnecting

Bug: 17613805

Change-Id: Ibca4d3a4288ae9a9e2f5658a4240ace54efeb220
ibstagefright/NuCachedSource2.cpp
fc55783d0886d5dbaa234f85a4313796d9ef1df4 24-Sep-2014 Wei Jia <wjia@google.com> Merge "NuPlayer will notify SeekComplete only when requested so." into lmp-dev
0837d0ac1b572923a27f1b0b742960fc64a6b162 24-Sep-2014 Lajos Molnar <lajos@google.com> stagefright: return encrypted input buffer for secure codecs

Bug: 17630446
Change-Id: I8a9352bcd00a3f4eb6fd2797d6809a8c1edc8482
ibstagefright/MediaCodec.cpp
7e9f7f7a9fb6c5d93fc9163e32936f3ea284caad 23-Sep-2014 Wei Jia <wjia@google.com> NuPlayer: change assert to conditional check.

Bug: 17491050
Change-Id: I657866c5342c227d57617eb89955897171eb5976
ibmediaplayerservice/nuplayer/NuPlayer.cpp
1aa26f787afc525e0deae31d856dce74a4b28a0f 12-Sep-2014 Ronghua Wu <ronghuawu@google.com> stagefright: add adaptive playback support to SoftHEVC decoder.

Bug: 17326758
Change-Id: I245e2bd1490e810094ca550fdddfa87075bc2056
ibstagefright/codecs/hevcdec/SoftHEVC.cpp
ibstagefright/codecs/hevcdec/SoftHEVC.h
ibstagefright/include/SoftVideoDecoderOMXComponent.h
ibstagefright/omx/SoftVideoDecoderOMXComponent.cpp
3cdd6b8c82f2c71054bdd767782fc78f501f8e62 23-Sep-2014 Ronghua Wu <ronghuawu@google.com> Merge "NuPlayer: add pause timeout event for offload audio." into lmp-dev
ad5447f659043ce3e4b3719c6c18a254bee1dde2 23-Sep-2014 Wei Jia <wjia@google.com> Merge "NuPlayer: use generation to filter out stale message from renderer." into lmp-dev
e427abf1ea252ff305fc33aacdd2e83cf34891b5 23-Sep-2014 Wei Jia <wjia@google.com> NuPlayer will notify SeekComplete only when requested so.

Bug: 17596535
Change-Id: I6b744fdcf80f11d521d26c7c8b45f7de70aa0dc3
ibmediaplayerservice/nuplayer/NuPlayer.cpp
ibmediaplayerservice/nuplayer/NuPlayer.h
ibmediaplayerservice/nuplayer/NuPlayerDriver.cpp
5110d6a00db5973881d06c39c60e477fb90a2d55 23-Sep-2014 Wei Jia <wjia@google.com> Merge "MyHandler: set ip address to an invalid one when getsockname() returns error." into lmp-dev
820c4893fdec784321826fd903da34fe3d609b93 23-Sep-2014 Wei Jia <wjia@google.com> MyHandler: set ip address to an invalid one when getsockname() returns error.

Bug: 17556472
Change-Id: I0387c78727d9a18abddcfdb4b480f4b1412bbc9f
ibstagefright/rtsp/MyHandler.h
a44d8f71a4b9ebae87c386bc3fe19abc52590bb5 23-Sep-2014 Chong Zhang <chz@google.com> Merge "fix crash when makeHTTPConnection fails with null pointer" into lmp-dev
217bde880be6f4d937caf9555ea98942883ebda0 22-Sep-2014 Chong Zhang <chz@google.com> fix crash when makeHTTPConnection fails with null pointer

Bug: 17608108
Change-Id: I4bdf6d09ae565418be3d6677b5ccac9072fb9b2c
ibstagefright/DataSource.cpp
d7f77cd78f5180ba7a04b270d632cc4f9f11718a 22-Sep-2014 Andy Hung <hunga@google.com> Merge "MediaCodec: Fix deallocated pointer reference when calling reset()" into lmp-dev
f5b1db11734358d979a23a1ac4903872186ef60b 09-Sep-2014 Ronghua Wu <ronghuawu@google.com> NuPlayer: add pause timeout event for offload audio.

Bug: 17375249
Change-Id: Ie59c6b372e9ad2aace3d1e27b9896d79de35d722
ibmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
ibmediaplayerservice/nuplayer/NuPlayerRenderer.h
dc9f58dc23a86d0635fd8601d1cbc8d47bab0303 18-Sep-2014 Andy Hung <hunga@google.com> MediaCodec: Fix deallocated pointer reference when calling reset()

The name pointer argument in MediaCodec::init() was being
implicitly deallocated.

Bug: 17499622
Change-Id: If9409f95674e52d1478f969f77693c4d27ff1ff2
ibstagefright/MediaCodec.cpp
57568df014f8629ebc5ca8bce9da796dd187401b 22-Sep-2014 Wei Jia <wjia@google.com> NuPlayer: use generation to filter out stale message from renderer.

Clean up generation number for decoders.

Bug: 17507846
Change-Id: Ibd2cfe11f89f404882d66c384b5198dc641f5e71
ibmediaplayerservice/nuplayer/NuPlayer.cpp
ibmediaplayerservice/nuplayer/NuPlayer.h
0079b331227fc1555d7c5305f33917a570d44890 22-Sep-2014 Wei Jia <wjia@google.com> Merge "MediaBuffer: ABuffer will release MediaBuffer when it's destructed." into lmp-dev
39e07162be0680fd30bec7be50628883aa912ffd 22-Sep-2014 Robert Shih <robertshih@google.com> Merge "NuPlayer HLS: better subtitle toggling" into lmp-dev
96e92b58b7e9647b4c7c2f54b62a1b357ab06b66 19-Sep-2014 Wei Jia <wjia@google.com> MediaBuffer: ABuffer will release MediaBuffer when it's destructed.

Bug: 17454455
Change-Id: Ia423bcc2e1fa39137f114eac44912ed15357bb99
ibmediaplayerservice/nuplayer/GenericSource.cpp
ibmediaplayerservice/nuplayer/NuPlayerDecoder.cpp
ibstagefright/ACodec.cpp
ibstagefright/MediaCodecSource.cpp
ibstagefright/foundation/ABuffer.cpp
ibstagefright/mpeg2ts/AnotherPacketSource.cpp
ibstagefright/wifi-display/source/Converter.cpp
ibstagefright/wifi-display/source/MediaPuller.cpp
c851b5de495169d7e9528644c2592746021bd968 18-Sep-2014 Lajos Molnar <lajos@google.com> mediaplayer: smooth out videoplayback based on framerate

Bug: 14659809
Change-Id: I73f6c7224c51ac06487475f9ed395379111ad71f
ibmediaplayerservice/VideoFrameScheduler.cpp
ibmediaplayerservice/VideoFrameScheduler.h
ibmediaplayerservice/nuplayer/NuPlayer.cpp
ibmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
ibmediaplayerservice/nuplayer/NuPlayerRenderer.h
3bde6b1c3387c51479f39846533ead246a920990 20-Sep-2014 Marco Nelissen <marcone@google.com> Merge "Make prepare properly report failure again" into lmp-dev
705d3290102875409e334e2a80e64221714aa37c 20-Sep-2014 Marco Nelissen <marcone@google.com> Make prepare properly report failure again

Bug: 17583084
Bug: 17548451
Change-Id: I759d28eaafb520c206d54740c2c0a857b534d23c
ibmediaplayerservice/nuplayer/GenericSource.cpp
b44ce2f84691559672cfaf6bb8fd3a9ac43904f2 19-Sep-2014 Robert Shih <robertshih@google.com> NuPlayer HLS: better subtitle toggling

Bug: 17310061
Change-Id: Iacee1816285425aaad08c32b28591bb0162d5a85
ibstagefright/httplive/LiveSession.cpp
ibstagefright/httplive/LiveSession.h
ibstagefright/httplive/PlaylistFetcher.cpp
ibstagefright/httplive/PlaylistFetcher.h
dc43dfa1294470a4413c37e863ef3b621da8681f 08-May-2014 Lajos Molnar <lajos@google.com> mediaplayer: schedule video frames in VSYNC valleys

Bug: 14659809
Change-Id: Ic340ac61ad4778b493625c79c2cb4f747ff54ede
ibmediaplayerservice/Android.mk
ibmediaplayerservice/VideoFrameScheduler.cpp
ibmediaplayerservice/VideoFrameScheduler.h
ibmediaplayerservice/nuplayer/Android.mk
ibmediaplayerservice/nuplayer/NuPlayerDecoder.cpp
ibmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
ibmediaplayerservice/nuplayer/NuPlayerRenderer.h
4409ba46fab830d81860edba056c3dc6e1c7c003 19-Sep-2014 Marco Nelissen <marcone@google.com> Merge "Fix ringbuffer handling" into lmp-dev
ab7f4182d4d509733107622216db4dd128340185 19-Sep-2014 Marco Nelissen <marcone@google.com> Fix ringbuffer handling

Explicitly keep track of the number of samples in the ring buffer,
rather than inferring it from the difference between the read and
write pointer, since the latter cannot distinguish between a
completely full and a completely empty buffer.

Bug: 17582331

Change-Id: I24d16ce96710209b7457ffad7c4c60201451980f
ibstagefright/codecs/aacdec/SoftAAC2.cpp
ibstagefright/codecs/aacdec/SoftAAC2.h
dfc34daba6d6cb923683d96689a0cb7c7006eee5 19-Sep-2014 Glenn Kasten <gkasten@google.com> Reduce log spam from getTimestamp errors

Bug: 17576481
Change-Id: I07d99e7c42b7d4f0994b5a6d9c9fe8eb29fbbe40
ibmedia/AudioTrack.cpp
800599cdd50737de1cde483a34b39923750b0658 30-Aug-2014 Robert Shih <robertshih@google.com> LiveSession: do not drop seek request

Bug: 17538727
Change-Id: I28658b2779ac16512ff54adbe536d01790e6449e
ibstagefright/httplive/LiveSession.cpp
b0ed4e3e482cbdc2fa6c7853526597f4ae3f0972 19-Sep-2014 Marco Nelissen <marcone@google.com> Merge "Always consider first buffer to be config" into lmp-dev
229b7a8d7c986645ef7ef75a36f27feb0c1a4117 19-Sep-2014 Marco Nelissen <marcone@google.com> Always consider first buffer to be config

for backwards compatibility. Also fix a problem where writing 0
bytes to an empty ringbuffer would treat it as overflowed.

Bug: 17567501
Change-Id: I8019da76466576e1b2984e9eccf09bdec593038a
ibstagefright/codecs/aacdec/SoftAAC2.cpp
c0651e858ae4ef4c9a2df2e4506b4093b6666ae9 19-Sep-2014 Phil Burk <philburk@google.com> Merge "mediaplayer: fix buffer aggregation when video has offloaded audio" into lmp-dev
6aadfce1d8c972faad7f4437dcd88d8cd3557611 19-Sep-2014 Jean-Michel Trivi <jmtrivi@google.com> Merge "AudioEffect acquires session" into lmp-dev
a0fd9ca66a68baefd9d76800fd66823fd654ef45 18-Sep-2014 Jean-Michel Trivi <jmtrivi@google.com> AudioEffect acquires session

Currently, users of audio sessions, AudioTrack and AudioRecord,
are acquiring and releasing audio sessions according to their
life-cycle. AudioEffect instances were not counting as users
of an audio session. This caused an effect used on a session
to be purged by AudioFlinger::purgeStaleEffects_l() whenever
the last user of that session went away.
This CL makes AudioEffect acquire and release a session when
created and destroyed.

Bug 15432115

Change-Id: I922532150009988d43872f9b5928044a830ae0b3
ibmedia/AudioEffect.cpp
2973994af39d55b58728df3dca067594e826ea2a 18-Sep-2014 Robert Shih <robertshih@google.com> Merge "PlaylistFetcher:don't signal a/v eos on subttitle eos" into lmp-dev
21a1d72bb42710d149532653490154f89330b9dd 18-Sep-2014 Andy Hung <hunga@google.com> Merge "NuPlayer: update timestamp handling" into lmp-dev
832666776a681ec3a30ee8fc7d5da9039646147d 18-Sep-2014 Lajos Molnar <lajos@google.com> Merge "NuPlayer: use getTimestamp instead of getPosition" into lmp-dev
a87be62b083fb969aeece99d6c29735ef9a5a373 18-Sep-2014 Lajos Molnar <lajos@google.com> Merge "Fix AudioTrack offloaded timestamp handling." into lmp-dev
7f1bc8af1c46695191bf7e2aba6467f3616629c0 12-Sep-2014 Andy Hung <hunga@google.com> Fix AudioTrack offloaded timestamp handling.

getTimestamp for offloaded tracks now returns WOULD_BLOCK for
situations where the timestamp is unavailable due to the
previous track still flushing or the timestamp is stale.
It is fixed for normal playback conditions.

Bug: 14659809
Bug: 17428188
Change-Id: Ic9ec07ccabc604236979769db5c4ea2dec252660
ibmedia/AudioTrack.cpp
09e0c3646362d29c78bc26c8b23b7a753c412e6c 13-Sep-2014 Andy Hung <hunga@google.com> NuPlayer: update timestamp handling

Use getTimestamp WOULD_BLOCK error return code to clean up
initial playback/start timestamp handling.

Account for pause time and seeks.
Only send notification from driver when the media time changes.

Bug: 14659809
Bug: 17428188
Change-Id: I051bb5e2dd4fd5990474f8fb635615ad8d18eb2c
ibmediaplayerservice/nuplayer/NuPlayerDriver.cpp
ibmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
ibmediaplayerservice/nuplayer/NuPlayerRenderer.h
33b51b07ca90cc3b48e86598f7e82f93e440fe02 18-Sep-2014 Phil Burk <philburk@google.com> mediaplayer: fix buffer aggregation when video has offloaded audio

Change conditional test so we don't accidentally do buffer aggregation
on video buffers.

Bug: 17553847
Change-Id: I746452b2e62db664315732a38f982ce7faf26212
Signed-off-by: Phil Burk <philburk@google.com>
ibmediaplayerservice/nuplayer/NuPlayer.cpp
06ad1528e6dd4c866c085d3cad9235d2752eb3ed 28-Aug-2014 Lajos Molnar <lajos@google.com> NuPlayer: use getTimestamp instead of getPosition

Bug: 14659809
Bug: 16985287
Change-Id: I59ec72fbd40a9b8d28fe548ddad082c03000c045
ibmediaplayerservice/MediaPlayerService.cpp
ibmediaplayerservice/MediaPlayerService.h
ibmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
ibmediaplayerservice/nuplayer/NuPlayerRenderer.h
866e028bbe30b1ba0b9d8903c88bbe8525b81a37 18-Sep-2014 Marco Nelissen <marcone@google.com> Merge "Add support for ANDROID_LOOP to NuPlayer" into lmp-dev
999b888f07f4549b1f8490d7153e3b1704684ca2 18-Sep-2014 Marco Nelissen <marcone@google.com> Merge "Fix null pointer dereference" into lmp-dev
9b7db1c57ff2a3f854568dd61fcec82ff63addeb 17-Sep-2014 Marco Nelissen <marcone@google.com> Fix null pointer dereference

Bug: 17544813
Change-Id: I6c94cd3056a99bb42fc71ee583938a2e3806fdc7
ibstagefright/codecs/aacdec/SoftAAC2.cpp
15f8ecfa23b650b3efa8fe841d2be6bd0c9523fb 15-Sep-2014 Robert Shih <robertshih@google.com> PlaylistFetcher:don't signal a/v eos on subttitle eos

Bug: 17310061
Change-Id: Ifbca3c12f21171a6e429dca51a250a41051fdd34
ibstagefright/httplive/LiveSession.cpp
f0b72b509ab1147a2a0925aced970dd68fd7fa4f 17-Sep-2014 Marco Nelissen <marcone@google.com> Add support for ANDROID_LOOP to NuPlayer

Bug: 17518139
Change-Id: I9355ddd4c998d967013dd8bd32d670a9a83dea31
ibmediaplayerservice/nuplayer/GenericSource.cpp
ibmediaplayerservice/nuplayer/GenericSource.h
ibmediaplayerservice/nuplayer/NuPlayer.cpp
ibmediaplayerservice/nuplayer/NuPlayer.h
ibmediaplayerservice/nuplayer/NuPlayerDriver.cpp
ibmediaplayerservice/nuplayer/NuPlayerDriver.h
ibmediaplayerservice/nuplayer/NuPlayerSource.h
317a49a4c4bf02944d1e01941c6b9f86179044bb 17-Sep-2014 Marco Nelissen <marcone@google.com> mediaplayer: reset flags when pre-reading multiple buffers

Bug: 17521470
Change-Id: I15ee9b1d3dd4ad29f4961a642f7fadafd9fe5b24
ibmediaplayerservice/nuplayer/GenericSource.cpp
90869c2bef1bc47394a9f603ccebb62b2592fd2b 17-Sep-2014 Robert Shih <robertshih@google.com> Merge "HLS: fix freezes when toggling between a/v streams" into lmp-dev
919b93473ebbba036f3934e92039f038c7f91a54 17-Sep-2014 Robert Shih <robertshih@google.com> Merge "NuPlayerDriver: restart after eos pause" into lmp-dev
6e9f6b498d758848fd934f8217c386dd74ef3833 17-Sep-2014 Robert Shih <robertshih@google.com> NuPlayerDriver: restart after eos pause

Bug: 17512187
Change-Id: I204ce83790bf98bc7ffebcb76d5df1e56a6a3f66
ibmediaplayerservice/nuplayer/NuPlayerDriver.cpp
fbbeeeb87c55c3eca94a709f9f8986190f6472a1 17-Sep-2014 Chong Zhang <chz@google.com> Merge "Disconnect HTTP-based data source upon reset" into lmp-dev
da23ab9b0dfa780175651daf057a02b0aa106dc8 16-Sep-2014 Robert Shih <robertshih@google.com> GenericSource: fix selectTrack parameter

Bug: 17512187
Change-Id: I19a0915fb0fb1b1ae036bf5df85b9c9e7657a7ea
ibmediaplayerservice/nuplayer/GenericSource.cpp
48296b792a8d68358de74141fa80bd5bd84d0307 14-Sep-2014 Chong Zhang <chz@google.com> Disconnect HTTP-based data source upon reset

Bug: 17425250

Change-Id: Ieb4c93fd9848489f9dbf35a36474376924fd8eb9
ibmediaplayerservice/nuplayer/GenericSource.cpp
ibmediaplayerservice/nuplayer/GenericSource.h
ibmediaplayerservice/nuplayer/NuPlayer.cpp
ibmediaplayerservice/nuplayer/NuPlayerSource.h
ibstagefright/NuCachedSource2.cpp
ibstagefright/include/NuCachedSource2.h
086c1e3f41a92aa0025a1da1db5dabbfdffaf129 16-Sep-2014 Wei Jia <wjia@google.com> Merge "ASessionDescription: allow open-ended NTP range." into lmp-dev
73d2847af14cdd5fdf8bd1ac80fb7ddf9ae7d9a7 30-Aug-2014 Robert Shih <robertshih@google.com> HLS: fix freezes when toggling between a/v streams

Bug: 17412740
Change-Id: Iacaf2fa1d20584056375803e1782ad6761c56fc5
ibstagefright/httplive/LiveSession.cpp
ibstagefright/httplive/PlaylistFetcher.cpp
ibstagefright/httplive/PlaylistFetcher.h
9299a6873a4b909357e031361055a888843619da 16-Sep-2014 Robert Shih <robertshih@google.com> Merge "ESQueue: do not merge aac packets" into lmp-dev
f4eadb67ba9130b583b8f2f192276b53fa3d50bc 16-Sep-2014 Wei Jia <wjia@google.com> ASessionDescription: allow open-ended NTP range.

Bug: 17435211
Change-Id: I450d512abdc4368f5180d9859f3b4e207e3b5591
ibstagefright/rtsp/ASessionDescription.cpp
db8556baf10baefd286f7654c822fd0b648e71ef 16-Sep-2014 hkuang <hkuang@google.com> Merge "Optimize the YUV buffer copy a little bit to skip unnecessary operation." into lmp-dev
60a89850fdbb71fd48bdef3712b340cc2fa5a722 16-Sep-2014 Robert Shih <robertshih@google.com> Merge "PlaylistFetcher: find the correct sequence number to start fetching" into lmp-dev
666c96d37203fd91ec319b8b499442696f70fd53 03-Sep-2014 Robert Shih <robertshih@google.com> ESQueue: do not merge aac packets

Bug: 17310061
Change-Id: Ie0fb0702b0af1c4094415190fdfdf132d5fcd511
ibstagefright/mpeg2ts/ESQueue.cpp
ibstagefright/mpeg2ts/ESQueue.h
73721170e1a3c9751ef00fd53b6b5eec5f2c5c81 16-Sep-2014 Lajos Molnar <lajos@google.com> Merge "mediaplayer: handle surface dis/connection errors" into lmp-dev
58c4cf4540e3f23847196bd4b45d82613e238821 12-Sep-2014 hkuang <hkuang@google.com> Optimize the YUV buffer copy a little bit to skip unnecessary operation.

Bug: 17326758

Change-Id: I2505751cb40a53242ceeb3be8f362c3754c2ee3f
ibstagefright/omx/SoftVideoDecoderOMXComponent.cpp
f78f62bd6b0a99747db53828d281a50b9270a646 30-Aug-2014 Robert Shih <robertshih@google.com> PlaylistFetcher: find the correct sequence number to start fetching

- skip over bad segemnts
- if we skipped too far into the future when adapting in live streams,
adjust back

Bug: 17141635
Bug: 17416657
Change-Id: I0877ceaf6e69cab751bf9e92579071f9e61643eb
ibstagefright/httplive/PlaylistFetcher.cpp
ibstagefright/httplive/PlaylistFetcher.h
c7b29572d22dff51b5432a7d211875d528406da6 15-Sep-2014 Phil Burk <philburk@google.com> Merge "mediaplayer: optimize buffer queue management" into lmp-dev
14986f6cca08b9ab0407cc2d31f92bfb02b5cb8c 15-Sep-2014 Lajos Molnar <lajos@google.com> mediaplayer: handle surface dis/connection errors

Bug: 17408008
Change-Id: I752d5372086772b79b1300a2d3fabbc4985954a8
ibmediaplayerservice/nuplayer/NuPlayerDecoder.cpp
4d22f2085141374fd88dba4142a8135f1bd9165c 13-Sep-2014 Robert Shih <robertshih@google.com> Merge "LiveSession: reliable switch" into lmp-dev
c5cc2e21602182c7ab4df1d7eba40f18037c1818 10-Sep-2014 Phil Burk <philburk@google.com> mediaplayer: optimize buffer queue management

Various changes for power consumption including:
Restrict the number of messages in flight.
Buffer more frames in the GenericSource so reads occur in a burst.

Bug: 15094301
Change-Id: I783481fd91f3fdd445b95e88ab82178f649f1a38
Signed-off-by: Phil Burk <philburk@google.com>
ibmediaplayerservice/nuplayer/GenericSource.cpp
ibmediaplayerservice/nuplayer/NuPlayer.cpp
ibmediaplayerservice/nuplayer/NuPlayer.h
ibmediaplayerservice/nuplayer/NuPlayerDecoderPassThrough.cpp
ibmediaplayerservice/nuplayer/NuPlayerDecoderPassThrough.h
f4a48dfa8570d6a4708a868b8b15d1236f7ca54b 30-Aug-2014 Robert Shih <robertshih@google.com> LiveSession: reliable switch

Bug: 17142706
Change-Id: I9cd6c068178d62c294496e8ab0b0a3763354964f
ibstagefright/httplive/LiveSession.cpp
ibstagefright/httplive/LiveSession.h
de7e2ae67f198b3dcc861b0908ca099db10dab6f 13-Sep-2014 Marco Nelissen <marcone@google.com> Merge "Fix AAC timestamps for multiple aac frames per input buffer" into lmp-dev
f6454e6d69f2ebb7b25c8e5275a0f301af8bca04 13-Sep-2014 Robert Shih <robertshih@google.com> Merge "LiveSession: re-buffer on under run to avoid stutter" into lmp-dev
f69c996864844e8f669308af8412cede043062a2 30-Aug-2014 Robert Shih <robertshih@google.com> LiveSession: re-buffer on under run to avoid stutter

Bug: 13742725
Change-Id: I7dad8876e18084c3c060d08190fa8a72fc2f5bad
ibstagefright/httplive/LiveSession.cpp
ibstagefright/httplive/LiveSession.h
98d594620365088e05c4e5925bb00bf065b8caa1 12-Sep-2014 Ronghua Wu <ronghuawu@google.com> Merge "stagefright: add adaptive playback support to SoftMPEG decoder." into lmp-dev
ae6fe431d150d561fa27d060f38b5dd7c42820bb 12-Sep-2014 Robert Shih <robertshih@google.com> Merge "GenericSource: move track packet init from start to prepare" into lmp-dev
84de1dc2512aa886638c103ee3e9f5c19f4a4a04 12-Sep-2014 Robert Shih <robertshih@google.com> Merge "LiveSession: added onSwitchDown" into lmp-dev
3b54aba0883bdc5924290f44db8beb70da70ea26 12-Sep-2014 Robert Shih <robertshih@google.com> Merge "LiveSession: raise upwards adaptation constraint" into lmp-dev
6851cdc292aa68e3ac38c01fca3036cf06489ca9 12-Sep-2014 Chong Zhang <chz@google.com> Merge "StagefrightRecorder: default to codec and fps from camcorder low profile" into lmp-dev
0ad776d2e4c6b4968d9dcd9bf34b962366b312a9 30-Aug-2014 Robert Shih <robertshih@google.com> LiveSession: added onSwitchDown

additionally in this change
- AnotherPacketSource: added getEstimatedDurationUs that avoids
looping through buffered access units in most cases; this method
is called by LiveSession before triggering onSwitchDown. Also fix
the original getBufferedDurationUs to accumulate durations across
discontinuities.

Bug: 13742612
Change-Id: I135932ea0c74671b7019a3c7054844926c18bc14
ibstagefright/httplive/LiveSession.cpp
ibstagefright/httplive/LiveSession.h
ibstagefright/mpeg2ts/AnotherPacketSource.cpp
ibstagefright/mpeg2ts/AnotherPacketSource.h
5ea3378d49285aaf39a544bcda7a98e331ad370a 12-Sep-2014 Robert Shih <robertshih@google.com> Merge "PlaylistFetcher: avoid repeated fetch when we run off the edge of live playlists" into lmp-dev
af52c1a1ccab588ae4ed94521f202ed9474eccec 12-Sep-2014 Robert Shih <robertshih@google.com> GenericSource: move track packet init from start to prepare

Bug: 17244704
Change-Id: I15eba0e4d2a178cc0ba46bbc17be0e6d95e76935
ibmediaplayerservice/nuplayer/GenericSource.cpp
84f5278a36f2816cc38f64307b4a1ad8a6818507 11-Sep-2014 Lajos Molnar <lajos@google.com> avoid kWhatReadBuffer message spam in GenericSource

When playig WVM video, an extra readBuffer is posted for each
dequeueAccessUnit, resulting in an unbounded number of messages.

Bug: 17472979
Change-Id: Ice92ccf2454bf7a70856a4a8b535cefffc9e61ac
ibmediaplayerservice/nuplayer/GenericSource.cpp
ibmediaplayerservice/nuplayer/GenericSource.h
7c12b0358b6d3b66e231fe4a67bb55f424b3857e 11-Sep-2014 Glenn Kasten <gkasten@google.com> Merge "Clean up AudioTrack position and timestamp handling" into lmp-dev
54ef1bae010f12dfe6a40ff4452695b1b11ff449 09-Sep-2014 Chong Zhang <chz@google.com> StagefrightRecorder: default to codec and fps from camcorder low profile

Bug: 16870964
Change-Id: I18425af630d3f041a3bcf77fbae3f07856fe8af2
ibmediaplayerservice/StagefrightRecorder.cpp
ibmediaplayerservice/StagefrightRecorder.h
a694dd0ce2caaf921f7bc894df87a5d52594b4eb 05-Sep-2014 Ronghua Wu <ronghuawu@google.com> stagefright: add adaptive playback support to SoftMPEG decoder.

This covers both MPEG4 and H263 adaptive playback.

Bug: 17326758
Change-Id: I80a67b7f3ceab05e792f0a459439a8274bd78e20
ibstagefright/codecs/m4v_h263/dec/SoftMPEG4.cpp
ibstagefright/codecs/m4v_h263/dec/SoftMPEG4.h
ibstagefright/codecs/m4v_h263/dec/src/vop.cpp
ibstagefright/colorconversion/SoftwareRenderer.cpp
ibstagefright/include/SoftVideoDecoderOMXComponent.h
ibstagefright/omx/SoftVideoDecoderOMXComponent.cpp
971873179cf202ad8aa1ddc4ec737795f1e03ce3 11-Sep-2014 Ronghua Wu <ronghuawu@google.com> Merge "stagefright: add adaptive playback support to SoftAVC decoder." into lmp-dev
200092b7f21d2b98f30b800e79d152636f9ba225 16-Aug-2014 Glenn Kasten <gkasten@google.com> Clean up AudioTrack position and timestamp handling

Replace epoch concept by observing and accumulating server delta
positions. The advantage of using server deltas instead of absolute
values is that they (1) are not sensitive to 32-bit wraparound,
(2) are not sensitive to server behavior for stop(), and
(3) prepare for future 64-bit client positions without requiring 64-bit
positions on server.

Add comments to AudioTrack::getTimestamp() and friends
that the timestamp output parameter is undefined on error.

Don't allow getTimestamp to return a negative frame position after stop().

Accumulate the client released frames, which may be useful for a future API.

Bug: 11815245
Change-Id: I652940fa2db2f34a78c012a3ead0d9204fa29c6e
ibmedia/AudioTrack.cpp
fd7327797fe1d21cb225cae34616b8f7b67ad29d 11-Sep-2014 Lajos Molnar <lajos@google.com> Merge "stagefright: don't use AAtomizer in AMessage" into lmp-dev
a3d078b02d22ee2329e3778f63974be59296f64f 05-Sep-2014 Marco Nelissen <marcone@google.com> Fix AAC timestamps for multiple aac frames per input buffer

Support multiple aac frames per input buffer also for non-ADTS streams,
now also works with 5.1 audio.

Bug: 16715379
ibstagefright/codecs/aacdec/SoftAAC2.cpp
ibstagefright/codecs/aacdec/SoftAAC2.h
b9b87fe9d9f3d91c05300a22920d7227a3f8eb83 10-Sep-2014 Lajos Molnar <lajos@google.com> mediaplayer: release MediaBuffer in stale input buffers

Bug: 17454455
Change-Id: If63a6e42f96851d6c10fdec11360f0dabae9bf50
ibmediaplayerservice/nuplayer/NuPlayerDecoder.cpp
e4c8b32f1123aa639f46d234203ad5c5e7926628 10-Sep-2014 Wei Jia <wjia@google.com> Merge "NuPlayerDriver: do not set to paused state when receiving playback complete and reset is in progress." into lmp-dev
43f2e3cf20c2a99cd3e9b99c8b507143e2954756 10-Sep-2014 Marco Nelissen <marcone@google.com> Merge "Revert "Fix AAC timestamps for multiple aac frames per input buffer"" into lmp-dev
748486657623fc0753d11bc2d91c113bca584a1e 10-Sep-2014 Chong Zhang <chz@google.com> Merge "fix failure in MediaCodecTest#testException" into lmp-dev
8484830a6b488b41da0e32acacf2e6b68060d9d0 10-Sep-2014 Marco Nelissen <marcone@google.com> Revert "Fix AAC timestamps for multiple aac frames per input buffer"

This reverts commit e086387c805311ac87904c3c4d6d4eb08d4b4ee2.
(broke multichannel movie playback)
Bug: 17454025

Change-Id: I95b82359f87f8beca66f35c34b7e125850a44747
ibstagefright/codecs/aacdec/SoftAAC2.cpp
ibstagefright/codecs/aacdec/SoftAAC2.h
b606de81ce5fffc8923c53cb7d5d00f5b423c9b9 10-Sep-2014 Lajos Molnar <lajos@google.com> Merge "mediaplayer: limit number of outstanding buffer requests" into lmp-dev
00598ec0b15426197494aaf9e5ec0bc88507c762 30-Aug-2014 Robert Shih <robertshih@google.com> LiveSession: raise upwards adaptation constraint

Adjust bandwidth more conservatively when considering an upwards
adaptation. Also fixed an issue with kWhatCheckBandwidth messages
being accumulated across switch generations; this causes
onCheckBandwidth to be fired at a high frequency and LiveSession to
be too sensitive to network glitches.

Bug: 13743153
Change-Id: I1dec99cb5d123c6675abe0847fd12aab5178eefd
ibstagefright/httplive/LiveSession.cpp
ibstagefright/httplive/LiveSession.h
71079fc29d93fb49d6022397b6d4168b7fba6e9b 10-Sep-2014 Wei Jia <wjia@google.com> NuPlayerDriver: do not set to paused state when receiving playback complete and reset is in progress.

Bug: 17453240
Change-Id: If243e2232779681fc84dc767feaed00f23d8fdb1
ibmediaplayerservice/nuplayer/NuPlayerDriver.cpp
f64b36deccd473b545dbed22c2feb11fc49157e5 10-Sep-2014 Chong Zhang <chz@google.com> fix failure in MediaCodecTest#testException

reset codec after failed configure()
Bug: 17418876

Change-Id: I21ff8a0751dae6a164678015142e11d481403bed
ibstagefright/MediaCodec.cpp
bf220f3e6e799f28d1599c3c5106e9e15631a91d 02-Sep-2014 Ronghua Wu <ronghuawu@google.com> stagefright: add adaptive playback support to SoftAVC decoder.

Also change SoftVPX decoder to use common handlePortSettingsChanged
and copyYV12FrameToOutputBuffer method.

Bug: 17326758
Change-Id: I6fb2ee8fb9291f69c70493b8558af341adc1f4b2
ibstagefright/codecs/on2/dec/SoftVPX.cpp
ibstagefright/codecs/on2/h264dec/SoftAVC.cpp
ibstagefright/codecs/on2/h264dec/SoftAVC.h
ibstagefright/include/SoftVideoDecoderOMXComponent.h
ibstagefright/omx/SoftVideoDecoderOMXComponent.cpp
7ea429295a2eb31f2d9256c36c1ef53a195456ac 27-Aug-2014 Lajos Molnar <lajos@google.com> stagefright: don't use AAtomizer in AMessage

Bug: 15094301
Change-Id: Ib82fb6d8fb6b48402d81f411123b3d924368eb93
ibstagefright/foundation/AMessage.cpp
83ee5564965408307e6f045ce5faed72bc3437b0 10-Sep-2014 Zhijun He <zhijunhe@google.com> Merge "CamcorderProfile: Add QUALITY_HIGH_SPEED_2160P" into lmp-dev
178e506350ef41609daaf307f598ef0bc4f82c71 10-Sep-2014 Lajos Molnar <lajos@google.com> mediaplayer: limit number of outstanding buffer requests

Bug: 14679336
Change-Id: I94a20ada30a9a25065329a85fc884d32d154d029
ibmediaplayerservice/nuplayer/NuPlayerDecoderPassThrough.cpp
9520aa609c505cf8a9ee105bd78dc186cfb7770b 10-Sep-2014 Zhijun He <zhijunhe@google.com> CamcorderProfile: Add QUALITY_HIGH_SPEED_2160P

Bug: 17059255
Change-Id: Ic6b272e4ceec8fc852c9eb787370f4d366dad0ac
ibmedia/MediaProfiles.cpp
8716e3f386f37abd3d759404ca8b3deaf46afde8 10-Sep-2014 Wei Jia <wjia@google.com> Merge "NuPlayer: make previous decoders obsolete when reset is done." into lmp-dev
47a13d45ae3f05ddb778124484a17d4754c82b7a 10-Sep-2014 Phil Burk <philburk@google.com> Merge "[media][nuplayer] Remove debug message EWOULDBLOCK" into lmp-dev
cbe165a6f68c90bbdd2b1593387d4072bd80b924 09-Sep-2014 Phil Burk <philburk@google.com> [media][nuplayer] Remove debug message EWOULDBLOCK

A debug message that was silent during testing is now spewing messages.
It was removed.

Bug: 17438882
Change-Id: I9c61409cac77c7bc1fd1088815823207094606f2
Signed-off-by: Phil Burk <philburk@google.com>
ibmediaplayerservice/nuplayer/NuPlayer.cpp
1008e1c9eb9ec7aeefffa4d9907f890a8eab7668 09-Sep-2014 Wei Jia <wjia@google.com> NuPlayer: make previous decoders obsolete when reset is done.

Bug: 17428608
Change-Id: I724174d65f8e00bfecb51e6f690ae709ed2cf442
ibmediaplayerservice/nuplayer/NuPlayer.cpp
95861b33c7dcfa450f5e10568c0767b07bc50729 09-Sep-2014 Rachad <rachad@google.com> Merge " NuPlayer::Renderer::onPause() - Converted CHECK(!mPaused) to a warning." into lmp-dev
8270e1d13a101fa946848871b9903b31ff11981f 09-Sep-2014 Marco Nelissen <marcone@google.com> Merge "Fix AAC timestamps for multiple aac frames per input buffer" into lmp-dev
8592dbbdf5339890db2b14f83bcd6da2ffb023d2 09-Sep-2014 Rachad <rachad@google.com> NuPlayer::Renderer::onPause() - Converted CHECK(!mPaused) to a warning.

Bug: 17436451

Change-Id: I7e9e0c48bbdd8ab65c5f4a587699a28435bd03f4
ibmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
2adbeda4f46f88ddb17519d39cc13e183741e071 09-Sep-2014 Wei Jia <wjia@google.com> Merge "NuPlayer: check mSource before deferencing it." into lmp-dev
f702d0415be7d5cb8c1801953b74adc1065c015e 09-Sep-2014 Wei Jia <wjia@google.com> NuPlayer: check mSource before deferencing it.

Bug: 17428608
Change-Id: I7b264d1288ed3c495434aedeeeef2fbfc3ca2f16
ibmediaplayerservice/nuplayer/NuPlayer.cpp
1a9ac031e9de8b3be1ec2c8d6d00f92bd3d59ea8 09-Sep-2014 Phil Burk <philburk@google.com> Merge "[audio][nuplayer] Aggregate buffers to reduce power." into lmp-dev
d3a5ff9afff08b3be1b2853868c0f28eefc36f19 08-Sep-2014 Andy Hung <hunga@google.com> Merge "Fix potential deadlock between AudioPolicyService and AudioSystem" into lmp-dev
b445375f50a1a619b2d7518d32387d5ea77ceb70 08-Sep-2014 Andy Hung <hunga@google.com> Fix potential deadlock between AudioPolicyService and AudioSystem

Bug: 17109761
Change-Id: I315c1c5066f62b05e1c13b04fae1272b5fbce977
ibmedia/AudioSystem.cpp
9f5264958557c45e942eabab8b32db2544d6c498 04-Sep-2014 Phil Burk <philburk@google.com> [audio][nuplayer] Aggregate buffers to reduce power.

Combine audio data from multiple buffers into one.
This reduces churn between threads and saves battery power.

Only use buffer aggregation when offloading the decoder.
Pend buffer if it won't fit in the bigger buffer.

Bug: 15094301
Change-Id: Iad3dac90b5d6b0fa43432b0e6776652ee2eafaa1
Signed-off-by: Phil Burk <philburk@google.com>
ibmediaplayerservice/nuplayer/NuPlayer.cpp
ibmediaplayerservice/nuplayer/NuPlayer.h
43cbe059b21185855465063d3767c2364f446f44 08-Sep-2014 Wei Jia <wjia@google.com> Merge "NuPlayerDriver: put player in paused state when reaching EOS." into lmp-dev
62ce207291353a13dd722855102e99684259a517 08-Sep-2014 Glenn Kasten <gkasten@google.com> Merge "Make IPowerManager native conform to .aidl for oneway" into lmp-dev
835ae86b49da5e15a501cb12c25458f8b63e38be 08-Sep-2014 Andy Hung <hunga@google.com> Merge "Revert "Revert "disable AwesomePlayer for Ogg vorbis""" into lmp-dev
0e2c09d56bb1d7d33b0de2f446fe0cf2d5b59fcb 30-Aug-2014 Robert Shih <robertshih@google.com> PlaylistFetcher: avoid repeated fetch when we run off the edge of live playlists

Bug: 17416658
Change-Id: I1d07ce03a293206c48ff9ee11dc78b815ba367a4
ibstagefright/httplive/PlaylistFetcher.cpp
fa20a1db4be377a004efd756887f8b212e31d670 05-Sep-2014 Marco Nelissen <marcone@google.com> Fix AAC timestamps for multiple aac frames per input buffer

Support multiple aac frames per input buffer also for non-ADTS streams.

Bug: 16715379
Change-Id: I84f33d9bb65b6821b2a697f6750356cea98777c4
ibstagefright/codecs/aacdec/SoftAAC2.cpp
ibstagefright/codecs/aacdec/SoftAAC2.h
ea477effb909089401f6d1ec40fd495757d75021 06-Sep-2014 Robert Shih <robertshih@google.com> Merge "DO NOT MERGE - MPEG4Extractor: parse csd correctly; workaround malformed csd" into lmp-dev
45452ffeb3827dd3c955aca1b4ab3522b70cf8cc 16-May-2014 Robert Shih <robertshih@google.com> DO NOT MERGE - MPEG4Extractor: parse csd correctly; workaround malformed csd

Bug: 14895152
Change-Id: Ibfee9e176459099507589c26a5eca6c61caabd1c
(cherry picked from commit bc413f6ad0023f7ad451a0129a07fc31dbc65665)
ibstagefright/MPEG4Extractor.cpp
3abc2ded40066f3b1df23aceb553f22d569c5cd3 06-Sep-2014 Glenn Kasten <gkasten@google.com> Make IPowerManager native conform to .aidl for oneway

But provide a temporary escape hatch for AudioFlinger.
This oneway option will be removed as soon as possible.

Bug: 16408906
Change-Id: I058a50906af810787e444a96819cb781b7f639ad
ibstagefright/TimedEventQueue.cpp
2adb3f32d152c567a3538a709c47d9bd6cf05bc4 06-Sep-2014 Jean-Michel Trivi <jmtrivi@google.com> Merge "Cache audio attributes when player not available" into lmp-dev
52c6a355503dbbe9bb134af07faee982534031dd 06-Sep-2014 Lajos Molnar <lajos@google.com> Merge "stagefright: allow P-frames spacing of 0 and 1" into lmp-dev
f17882b310426d243f8cd541f1774c03ccdd4957 06-Sep-2014 Robert Shih <robertshih@google.com> Merge "GenericSource: refactor track selection for dedicated looper" into lmp-dev
4ec6746804ad8172c8b1c4eb3e6deb19a0920734 05-Sep-2014 Wei Jia <wjia@google.com> NuPlayerDriver: put player in paused state when reaching EOS.

Bug: 17352759
Change-Id: I19b183e0a86b712524f79ec7c35e32b5a5b47bc6
ibmediaplayerservice/nuplayer/NuPlayerDriver.cpp
ade312d5c933cff798c3febefabc47b00390ee4a 05-Sep-2014 Andy Hung <hunga@google.com> Merge "NuPlayer: Restrict seek on video texture changes" into lmp-dev
767fc12e58422eef14aa40a5e7ffefd0b3949b82 05-Sep-2014 Andy Hung <hunga@google.com> Merge "NuPlayer: Discard seeks when source and decoders are NULL" into lmp-dev
3ec9c3d2d813149b9f049afc5ea48f1276645f3a 05-Sep-2014 Chong Zhang <chz@google.com> Merge "Split CEA-608 Closed caption into 4 tracks CC1~CC4" into lmp-dev
640adb3cf89cc9b826372009fad8c9b3d120482e 05-Sep-2014 Jean-Michel Trivi <jmtrivi@google.com> Cache audio attributes when player not available

Cache the audio attributes stored in a Parcel in the client-side
MediaPlayer object if they are set through setParameter()
before the server-side MediaPlayer is available. Apply them when
the player is prepared.

Bug 17280746

Change-Id: I72f1a7fc4e2b076fae8cbdede77a2f74e98b2a03
ibmedia/mediaplayer.cpp
7353585789513466d5887986620e8734a325b3eb 05-Sep-2014 Andy Hung <hunga@google.com> NuPlayer: Restrict seek on video texture changes

MediaPlayer::setVideoSurfaceTexture() should generate seek to refresh
display only if player is started and has video.

Bug: 17379148
Bug: 17404923
Change-Id: I5f55dc40943e4419d08be6fdab964b8a2c5ee519
ibmediaplayerservice/nuplayer/NuPlayer.cpp
f2c0ff43e5c6f83775990fd539dad49c14c6037c 05-Sep-2014 Eric Laurent <elaurent@google.com> Merge "Fix to parse audio_source_t member of audio_attributes_t" into lmp-dev
4f418f9705d6c247b645cbcf255a3f56e665d216 05-Sep-2014 Hyejin Kim <hyejin.kim@lge.com> Fix to parse audio_source_t member of audio_attributes_t

When unmarshalling audio_attributes_t typed data,
it didn't parse the audio_source_t member between content_type and flags.

Bug: 16906307

Change-Id: Ia0d8df9b5c31441d34dc82678bceccd8ce31423d
ibmediaplayerservice/MediaPlayerService.cpp
adf34bf9b7925f990259b1b6f4c69b8668f76ead 04-Sep-2014 Andy Hung <hunga@google.com> NuPlayer: Discard seeks when source and decoders are NULL

Problem occurs when loop mode asynchronously seeks to the
start of the source after a MediaPlayer::reset().

Bug: 17379148
Change-Id: I50bfe65a753afffb1d478db54c76067a9c61a0ae
ibmediaplayerservice/nuplayer/NuPlayer.cpp
ibmediaplayerservice/nuplayer/NuPlayerDriver.cpp
6a548e9114c4a283a6e08a2d35540f8549f44b82 05-Sep-2014 Robert Shih <robertshih@google.com> Merge "PlaylistFetcher: do not reset mStartTimeUs if we are resuming" into lmp-dev
5da491bb05009e2062d8a98a153594bb3ff15188 04-Sep-2014 Lajos Molnar <lajos@google.com> stagefright: allow P-frames spacing of 0 and 1

Bug: 17387418
Change-Id: Ib966496b4ca220d96fb3741c29002c13cd2db848
ibstagefright/ACodec.cpp
ibstagefright/OMXCodec.cpp
b86e68f834b7040518b99d1d0245d5f2e5cb9c86 01-Aug-2014 Chong Zhang <chz@google.com> Split CEA-608 Closed caption into 4 tracks CC1~CC4

Bug: 16463078

Change-Id: Ib3073090934232016e535fbb8fa56cdf9d7ab6eb
ibmediaplayerservice/nuplayer/NuPlayer.cpp
ibmediaplayerservice/nuplayer/NuPlayerDecoder.cpp
ibmediaplayerservice/nuplayer/NuPlayerDecoder.h
17f6dd64cd749f4e38e12b672b551047f4cbe9b4 21-Aug-2014 Robert Shih <robertshih@google.com> GenericSource: refactor track selection for dedicated looper

- move getFormatMeta, getSelectedTrack, selectTrack, and seekTo to
dedicated looper
- start & dequeueAccessUnit posts readBuffer requests instead of reading
directly
- call internal doGetFormatMeta in onPrepareAsync

Bug: 16892748
Change-Id: I5d5e34381f1dfceca655c52a201627b53454ad22
ibmediaplayerservice/nuplayer/GenericSource.cpp
ibmediaplayerservice/nuplayer/GenericSource.h
0f9a3cf9962b6859cfee9d4bf4676b5aafca79cb 30-Aug-2014 Robert Shih <robertshih@google.com> PlaylistFetcher: do not reset mStartTimeUs if we are resuming

Bug: 17376049
Change-Id: Ie519bdf7128841172df41e6512d624e99d9853d6
ibstagefright/httplive/PlaylistFetcher.cpp
48f36a07d1faa1b8ec0af5d12d3c18fbfcb9eb65 04-Sep-2014 Andy Hung <hunga@google.com> Revert "Revert "disable AwesomePlayer for Ogg vorbis""

This reverts commit da65048e8e6f65ed9b3f23cda3f4554025c76fc4.

Deadlock audio issues for NuPlayer have been resolved.

Change-Id: I1853d367dc771a9396a9b2d48ff34e50c78c112c
ibmediaplayerservice/MediaPlayerFactory.cpp
ibmediaplayerservice/MediaPlayerFactory.h
9007305003e689362749a264af2eafea80eb12a0 03-Sep-2014 hkuang <hkuang@google.com> Merge "Fix the bug that same video frame has been decoded twice during port reconfig." into lmp-dev
d3db0bfafc98305f867502c06de3ce415c97d3fb 03-Sep-2014 Wei Jia <wjia@google.com> Merge "NuPlayer: add seek operation when change video texture surface." into lmp-dev
d71233a846aca7035a851941c1530d04c6a65086 03-Sep-2014 Marco Nelissen <marcone@google.com> Merge "Use CharacterEncodingDetector in metadataretriever" into lmp-dev
50f939d655a5156157564cb91434f1cce424b2dd 02-Sep-2014 hkuang <hkuang@google.com> Fix the bug that same video frame has been decoded twice during port reconfig.

This does not hurt normal video playback. But in adaptive playback,
this will lead to a little bit delay for some clips.

Bug: 17202935

Change-Id: I5af0a5911e28a1597c74d79960fac25faf72c9d2
ibstagefright/codecs/on2/dec/SoftVPX.cpp
ibstagefright/codecs/on2/dec/SoftVPX.h
ac428aa54d2489705091dd38372bbaade281a92e 03-Sep-2014 Wei Jia <wjia@google.com> NuPlayer: add seek operation when change video texture surface.

Bug: 17278770

Change-Id: I9fd5207e1eccb91e64644d2d1da4183d4bf7ac2c
ibmediaplayerservice/nuplayer/NuPlayer.cpp
ibmediaplayerservice/nuplayer/NuPlayer.h
acdae5d7865b604acaadd3be1c45c84ca4bf3952 03-Sep-2014 Marco Nelissen <marcone@google.com> Merge "Move stale handler cleanup to constructor" into lmp-dev
ea8462ccd1a882f2c7c785250bcfaa2606b53cb5 03-Sep-2014 Marco Nelissen <marcone@google.com> Merge "Fix more potential deadlocks in ALooperRoster" into lmp-dev
453d633ba6351c8efc2103383ca178a0674bd373 03-Sep-2014 Chong Zhang <chz@google.com> Merge "render one video frame after flush even when we're paused" into lmp-dev
fbe8bef8bcf7aed97f0332908a817b0e6d91b9ba 30-Aug-2014 Chong Zhang <chz@google.com> render one video frame after flush even when we're paused

allows the video to get some update when user seeks while paused.

Bug: 17140448

Change-Id: I064806bfd566585eeb4150a508422c9775e08f99
ibmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
ibmediaplayerservice/nuplayer/NuPlayerRenderer.h
34581f44cde67960fbac3ba1f191a2c063ea5145 30-Aug-2014 Marco Nelissen <marcone@google.com> Use CharacterEncodingDetector in metadataretriever

instead of media scanner. This way the java MediaMetadataRetriever API
will give the same result as the media scanner.
Also apply some tweaks to the encoding detector to improve handling of
ISO-8859-1 tags.

Bug: 16302581, 17205395

Change-Id: I1682a7a6a8bf04cffaa455044ba72dd7fd152d49
ibmedia/Android.mk
ibmedia/CharacterEncodingDetector.cpp
ibmedia/CharacterEncodingDetector.h
ibmedia/MediaScannerClient.cpp
ibmedia/StringArray.h
ibstagefright/Android.mk
ibstagefright/StagefrightMetadataRetriever.cpp
e4478febd87f6a663bbdf2c22dd829af2a8166a6 02-Sep-2014 Ronghua Wu <ronghuawu@google.com> Merge "Add adaptive playback support to VPX decoder." into lmp-dev
e7494680914c384dc6e93ae85f4337b06b300468 02-Sep-2014 Wei Jia <wjia@google.com> Merge "NuPlayerRenderer: stop feeding AudioSink when paused." into lmp-dev
64a385d5d8e42ac96c88fb025212b4023690db39 30-Aug-2014 Ronghua Wu <ronghuawu@google.com> Merge "GenericSource: set DRM playback status." into lmp-dev
c9d62de72b67f069a517f24c13ff9c4e4593f76a 30-Aug-2014 Wei Jia <wjia@google.com> Merge "MediaCodec: set state to UNINITIALIZED when receiving fatal error." into lmp-dev
b6b927fc437389a9fa499eaad69da88969ec9ffc 30-Aug-2014 Rachad <rachad@google.com> Merge "Tunneled Video Playback: Changed AudioHwSync token to int32_t to match Audio stack api." into lmp-dev
c22c695660ed9edaba0d4cd7c0ab3a794216fe80 29-Aug-2014 Wei Jia <wjia@google.com> MediaCodec: set state to UNINITIALIZED when receiving fatal error.

NuPlayerDecoder: release MediaCodec when handling an error.

Bug: 16661923
Change-Id: I1b6fd7ee5cc1136b3f289135e5360cd3d98f9799
ibmediaplayerservice/nuplayer/NuPlayerDecoder.cpp
ibstagefright/MediaCodec.cpp
73ddd210ea572375198cac1d4960df793745fb4b 30-Aug-2014 Wei Jia <wjia@google.com> NuPlayerRenderer: stop feeding AudioSink when paused.

NuPlayerDriver: current position is updated only in running state.

Bug: 17141882
Change-Id: Ia88551cc29ef8f0e7ef0600a214feb5633389b6e
ibmediaplayerservice/nuplayer/NuPlayerDriver.cpp
ibmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
3049c672b7fbcfb832791d23da25b6f9ef1e3805 29-Aug-2014 Lajos Molnar <lajos@google.com> Merge "stagefright: add codec capability info for google video codecs" into lmp-dev
802768790c131f8237364906fd13981a6bb91193 29-Aug-2014 Ronghua Wu <ronghuawu@google.com> GenericSource: set DRM playback status.

Bug: 17307158
Change-Id: I36b801a9b67831b618930cf1241756bb9644b4fd
ibmediaplayerservice/Android.mk
ibmediaplayerservice/nuplayer/GenericSource.cpp
ibmediaplayerservice/nuplayer/GenericSource.h
ibmediaplayerservice/nuplayer/NuPlayer.cpp
ibmediaplayerservice/nuplayer/NuPlayerSource.h
97827bd7c7e64dec22c8fe0f9e734a3c432ad7ee 29-Aug-2014 Rachad <rachad@google.com> Tunneled Video Playback:
Changed AudioHwSync token to int32_t to match Audio stack api.

Bug: 17112525
Change-Id: I673819495c2e7b540e8d7572cc95796bddbf63bb
ibstagefright/ACodec.cpp
c2aa6971f7ea685346308d1661f430e1f802cb11 29-Aug-2014 Bart Sears <bsears@google.com> Merge "[AU]Sync libmedia/Android.mk modification from KLP-Sprout" into lmp-dev
a90cff5f7091bfb50c57e2d87bad3fc3f103f397 23-Aug-2014 Hochi Huang <hochi.huang@mediatek.com> [AU]Sync libmedia/Android.mk modification from KLP-Sprout

Bug: 17322146

Change-Id: If29fbd87252710bd794f2e0bb270bc846380ef1d
Signed-off-by: Hochi Huang <hochi.huang@mediatek.com>
ibmedia/Android.mk
39f5874c4040bec6fdbf0c0912daffcb10010df8 29-Aug-2014 Robert Shih <robertshih@google.com> PlaylistFetcher: add lower bound check when starting live streams

Avoid false 'missed the boat' alarms that cause us to queue a bogus
discontinuity before even starting.

Bug: 17303166
Change-Id: I5003934fc695f30db2df9a0803b8fe960d77a458
ibstagefright/httplive/PlaylistFetcher.cpp
0b0f6075377260e006e860e3ba296f5504a6c891 28-Aug-2014 Marco Nelissen <marcone@google.com> Move stale handler cleanup to constructor

This avoids the potential side effect of deleting more ALoopers
inside the cleanup loop.

Bug: 17059501
Change-Id: I41efaf490449b95fedfe01175f3b19067d50da24
ibstagefright/foundation/ALooper.cpp
047dd13ca42ff7cea10821ef64eb09229fa3e751 28-Aug-2014 Marco Nelissen <marcone@google.com> Fix more potential deadlocks in ALooperRoster

Bug: 17059501
Change-Id: I242f2859527bed2d6e275c27de94fb19f4dcdc28
ibstagefright/foundation/ALooperRoster.cpp
031be0f358b07732092a4d1bf02fc99f109a63c4 22-Aug-2014 Ronghua Wu <ronghuawu@google.com> Add adaptive playback support to VPX decoder.

Bug: 13842676
Change-Id: I9c054ea489fd3a71b3b2394f15a85b84d42edb5a
ibstagefright/codecs/avc/enc/SoftAVCEncoder.h
ibstagefright/codecs/m4v_h263/enc/SoftMPEG4Encoder.h
ibstagefright/codecs/on2/dec/SoftVPX.cpp
ibstagefright/codecs/on2/enc/SoftVPXEncoder.h
ibstagefright/include/SimpleSoftOMXComponent.h
ibstagefright/include/SoftVideoDecoderOMXComponent.h
ibstagefright/omx/SoftVideoDecoderOMXComponent.cpp
277090f1983a6378958c24028d4f58c33c0659b2 28-Aug-2014 Marco Nelissen <marcone@google.com> Merge "Fix potential deadlock in unregisterStaleHandlers()" into lmp-dev
75c672fc376ef9b3ceff61a96513242b0e5ebd60 28-Aug-2014 Marco Nelissen <marcone@google.com> Fix potential deadlock in unregisterStaleHandlers()

The scenario is that a call to unregisterStaleHandlers() is in progress,
and is holding a temporary sp<ALooper> reference to an active ALooper inside
of the loop. At this point the only other remaining external reference to
the ALooper goes away, so the temporary sp<ALooper> in the loop is now
the only reference keeping that object alive. When the loop iterates and
the sp<> goes out of scope, the ALooper destructor is called, which in turn
calls unregisterStaleHandlers again, resulting in a recursive lock.

Bug: 17300093
Change-Id: I116f2ffab4ae7c43b6bcf54a367ae6f9d77c9626
ibstagefright/foundation/ALooperRoster.cpp
d362ea179c25dd1998e2edee7994e549d00e7eec 27-Aug-2014 Ronghua Wu <ronghuawu@google.com> Merge "AudioPlayback: delay the post of EOS based on pending playout." into lmp-dev
5095d7091874cb9e9c95ecc4fe762076ed05e624 27-Aug-2014 Ronghua Wu <ronghuawu@google.com> AudioPlayback: delay the post of EOS based on pending playout.

Bug: 16840522
Change-Id: Icdc8888f5a8a77e2e5ebeb8a6934c7d79bd9e71a
ibmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
ibmediaplayerservice/nuplayer/NuPlayerRenderer.h
5bc5b4fbf16a0331a4f2f1d16585932087ee41c1 27-Aug-2014 Wei Jia <wjia@google.com> Merge "NuPlayer: set controlledByApp to true when creating Surface." into lmp-dev
355286ee1e5057c66158fcea785bf1881e069101 27-Aug-2014 Marco Nelissen <marcone@google.com> Merge "Fix SoundPool lockup" into lmp-dev
9c03a40367c149526c31ddf14a518ba2036195a5 27-Aug-2014 Wei Jia <wjia@google.com> NuPlayer: set controlledByApp to true when creating Surface.

This fixes hang when trying to dequeue buffer from native window
followed by a flush.

Bug: 16303659
Bug: 17250931
Change-Id: Ib87ae558b020f5ce82b4192ec63339c93a72a2e9
ibmediaplayerservice/nuplayer/NuPlayer.cpp
2a79c3274e11b91675a509e16cb3b157df141fac 26-Aug-2014 Marco Nelissen <marcone@google.com> Fix SoundPool lockup

NuPlayerDriver needs to update its internal state before calling
its listener, so that when the listener calls back into NuPlayerDriver,
NuPlayerDriver has the right state.

Bug: 14057920
Change-Id: I224882c427f5e3c9d4bf96c5d68075e235062401
ibmediaplayerservice/nuplayer/NuPlayerDriver.cpp
5bbffc05432b6a81280872a9c3ed9cac7bec53df 26-Aug-2014 Chong Zhang <chz@google.com> Merge "do string compare with mime immediately after we get the value" into lmp-dev
afc0a87cc92a474bb14fb2a4093c74d04e4efd1b 26-Aug-2014 Chong Zhang <chz@google.com> do string compare with mime immediately after we get the value

Bug: 17210803
Change-Id: I4d20dd4b95d18251c18a371bd8f89b1320b38879
ibmediaplayerservice/nuplayer/GenericSource.cpp
d42173a44721af1a600b9c8599bc736394fcc724 25-Aug-2014 Rachad Alao <rachad@google.com> Merge "Revert "disable AwesomePlayer for Ogg vorbis"" into lmp-dev
da65048e8e6f65ed9b3f23cda3f4554025c76fc4 25-Aug-2014 Rachad Alao <rachad@google.com> Revert "disable AwesomePlayer for Ogg vorbis"

Temporarily revert commit 9b48f5d780757ffb81709df3633d06b62edaf39f as a workaround for b/17173673

Bug: 17173673
Change-Id: Iec52289e77485a58ce28cc515d6a5b8e7b2d328a
ibmediaplayerservice/MediaPlayerFactory.cpp
ibmediaplayerservice/MediaPlayerFactory.h
8dad3f606a3112e24f0b75f2edc05be299d18c43 25-Aug-2014 Lajos Molnar <lajos@google.com> Merge "NuPlayer: remember and resubmit CSDs after flush" into lmp-dev
9c42bf257a7501491beca196a868aa260d515422 25-Aug-2014 Robert Shih <robertshih@google.com> Merge "HTTPLiveSource: check for NULL before getTrackCount/Info" into lmp-dev
87603c0dd1f4e62e52feffa8d6e960ad21f68893 21-Aug-2014 Lajos Molnar <lajos@google.com> NuPlayer: remember and resubmit CSDs after flush

Bug: 17118001
Change-Id: I09bbefd4c05de0db1c593e8d6d38859358a20ebb
ibmediaplayerservice/nuplayer/NuPlayer.cpp
ibmediaplayerservice/nuplayer/NuPlayer.h
ibmediaplayerservice/nuplayer/NuPlayerDecoder.cpp
ibmediaplayerservice/nuplayer/NuPlayerDecoder.h
34febc9654ba3b447239b7761ce4c93ca9a20b5f 23-Aug-2014 Lajos Molnar <lajos@google.com> stagefright: process CSD regardless of what port was last queued

CSD is always on the input port, so it does not matter which port
a buffer was last queued to.
Bug: 17216852

Change-Id: I6d00eb4bf3c2e9b9cc3c9918229de958bc465693
ibstagefright/codecs/aacdec/SoftAAC2.cpp
848726d845b51da04364bdaf4ec915c85d593c0e 23-Aug-2014 Wei Jia <wjia@google.com> Merge "MediaCodec: handle errors during flushing." into lmp-dev
5530f7a7f9dff5280be84f2675b3be081beb5540 20-Aug-2014 Wei Jia <wjia@google.com> MediaCodec: handle errors during flushing.

Bug: 17068327
Bug: 13133027
Change-Id: I06caf79b90ebf55d6d7561cb82516c0b6c66f0e4
ibstagefright/MediaCodec.cpp
052efa490b595d17d1452ec019979996fe470a05 23-Aug-2014 Chong Zhang <chz@google.com> Merge "wait for flush to finish before returning setSurface" into lmp-dev
43febe72dadc751acff410842e091d4099919fad 23-Aug-2014 Chong Zhang <chz@google.com> Merge "add buffering update to GenericSource" into lmp-dev
13d6faa02087ce3bb0d4a02b8495f1822f211433 23-Aug-2014 Chong Zhang <chz@google.com> wait for flush to finish before returning setSurface

Bug: 17187598
Change-Id: I091219e57158a4532044ca49342b57277d6ecb15
ibmediaplayerservice/nuplayer/NuPlayer.cpp
ibmediaplayerservice/nuplayer/NuPlayerDriver.cpp
ibmediaplayerservice/nuplayer/NuPlayerDriver.h
d1de9bb33a2f645fb9dc54e7fc69ca45304850a5 22-Aug-2014 Wei Jia <wjia@google.com> Merge "ACodec: handle errors related to native window." into lmp-dev
3fb9f68dea5d991288f0ea8037742b50c7df5767 20-Aug-2014 Wei Jia <wjia@google.com> ACodec: handle errors related to native window.

Bug: 17068327
Bug: 13133027
Change-Id: I9875e524222a10d1be26be5a84b9633b4aaeb210
ibmediaplayerservice/nuplayer/NuPlayerDecoder.cpp
ibstagefright/ACodec.cpp
7992a5d0f6d995d46bf649dbac45e0e8267f1397 22-Aug-2014 Wei Jia <wjia@google.com> Merge "NuPlayerDriver: fix current position for stop and pause." into lmp-dev
b534f461f6056c84c3ae87e27430f4b934fd3eb1 22-Aug-2014 Chong Zhang <chz@google.com> Merge "move cache prefill to GenericSource's message handler" into lmp-dev
89c4ab2f4e4fbccf5c67e2671cf252053dbe5d38 22-Aug-2014 Chong Zhang <chz@google.com> Merge "print warning if offset != buffer size" into lmp-dev
2a3cc9a64330dd36e466fe5e1b634146f2d641c1 22-Aug-2014 Chong Zhang <chz@google.com> add buffering update to GenericSource

Bug: 17182378

Change-Id: Ib86f3f522d7ea635489edd2b512adb7f4b27e381
ibmediaplayerservice/nuplayer/GenericSource.cpp
ibmediaplayerservice/nuplayer/GenericSource.h
ibmediaplayerservice/nuplayer/NuPlayer.cpp
ibmediaplayerservice/nuplayer/NuPlayerSource.h
0560195a71ee26e8546075e56c49ff535fcf1767 21-Aug-2014 Wei Jia <wjia@google.com> NuPlayerDriver: fix current position for stop and pause.

When start() is called after EOS, it means restarting from the beginning of the stream.
Fix racing conditon on accessing some members.
Report seekTo position before any notifyPosition is called.

Bug: 17031731
Bug: 17178928
Change-Id: I008b827288cf28d39e2a943373fe1e5d7d6c2595
ibmediaplayerservice/nuplayer/NuPlayerDriver.cpp
ibmediaplayerservice/nuplayer/NuPlayerDriver.h
5f42113f21c31802e044f0a73351eef35e32feaf 22-Aug-2014 Lajos Molnar <lajos@google.com> stagefright: allow to resubmit CSDs for SoftAAC2

Bug: 17118001
Change-Id: I45469b9aa6146edf3265b0f05f5ce3592b5daca6
ibstagefright/codecs/aacdec/SoftAAC2.cpp
143a951f1f19161fa12ca97f3dee85094078365a 21-Aug-2014 Robert Shih <robertshih@google.com> SoftAAC2: allow reconfiguring output after multiple output buffers

Bug: 17134697
Change-Id: Iaa8bdccbf1a8ccd3f898e48cfd22a0a443710fdd
ibstagefright/codecs/aacdec/SoftAAC2.cpp
d354d8d1b09503c0166c1f3e626cda72a3eeb83c 20-Aug-2014 Chong Zhang <chz@google.com> move cache prefill to GenericSource's message handler

This allows prepareAsync to be terminated by reset promptly.

It also makes it easier to do buffer update as GenericSource
can access the cache status now.

Bug: 16892748
Bug: 17182378

Change-Id: Ia55c04a810fd805041cb2025f6739afa5120b5ed
ibmediaplayerservice/nuplayer/GenericSource.cpp
ibmediaplayerservice/nuplayer/GenericSource.h
ibstagefright/DataSource.cpp
ef8ae4cbec0c9f49a24625d4316ec9bfde4e75c3 22-Aug-2014 Andy Hung <hunga@google.com> Merge "Fix SoundPool and MediaPlayerService buffer overflow" into lmp-dev
a31335a4ec96ba351f25f3b26fa79a78c2723a13 21-Aug-2014 Andy Hung <hunga@google.com> Fix SoundPool and MediaPlayerService buffer overflow

Overflow occurs when SoundPool sample tracks cannot
fit in the MediaPlayerService AudioCache buffer.

Unnecessary decoding occurred with AwesomePlayer and
an assert failure occurred with NuPlayer. NuPlayerRenderer
is also tweaked to handle the latter case.

Bug: 17122639
Change-Id: I4d25d3e2c0c62e36a91da6bf969edabddc2ebbb0
ibmediaplayerservice/MediaPlayerService.cpp
ibmediaplayerservice/MediaPlayerService.h
ibmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
01047680ac57712303e259f485efd9cb97e9a99a 21-Aug-2014 Wei Jia <wjia@google.com> Merge "NuPlayerDriver: include lapsed time when reporting current position." into lmp-dev
15506a6582fb86567c6887c4c426d44be02d12af 21-Aug-2014 Wei Jia <wjia@google.com> NuPlayerDriver: include lapsed time when reporting current position.

Bug: 17031731
Change-Id: I01962ee9194bdaa9e8ed1a51abbf365733be3c85
ibmediaplayerservice/nuplayer/NuPlayerDriver.cpp
ibmediaplayerservice/nuplayer/NuPlayerDriver.h
9b48f5d780757ffb81709df3633d06b62edaf39f 20-Aug-2014 Chong Zhang <chz@google.com> disable AwesomePlayer for Ogg vorbis

Bug: 17108024

Change-Id: I0a970e6476d0f739e65d2200d0f5220dee8d36ef
ibmediaplayerservice/MediaPlayerFactory.cpp
ibmediaplayerservice/MediaPlayerFactory.h
e0b5cf7eae5ae16699864eeb8ae36975caa7a26c 20-Aug-2014 Marco Nelissen <marcone@google.com> Merge "Fix typo in comment" into lmp-dev
44d3281b6529370efb72fe2fb126ee3a468d53e2 20-Aug-2014 Marco Nelissen <marcone@google.com> Fix typo in comment

Bug: 14057920
Change-Id: I51c4d47b9e175ef789ed3c51d59c9eda77edc1e0
ibmediaplayerservice/nuplayer/NuPlayerDriver.cpp
c10b4689be0d3a0f4ff38c544a6c86c984665d26 21-Aug-2014 Chong Zhang <chz@google.com> Merge "disable AwesomePlayer for Ogg vorbis" into lmp-dev
80804f4e953d6c5f6ed0c3c8e004c4cce280f5c1 20-Aug-2014 Chong Zhang <chz@google.com> print warning if offset != buffer size

Bug: 17110981
Change-Id: Iacceca203372f4c06ff5ef7ce98edd5554727b64
ibstagefright/rtsp/AMPEG4ElementaryAssembler.cpp
2a1bcb8347ad4778a49bb340c3ed28ba27caa7d7 19-Aug-2014 Wei Jia <wjia@google.com> Merge "NuPlayer: use generation to detect stale requests from old decoders." into lmp-dev
88703c34fb4a9db1ff51495879f9775474c8ce89 06-Aug-2014 Wei Jia <wjia@google.com> NuPlayer: use generation to detect stale requests from old decoders.

Bug: 14955925
Bug: 16303659
Bug: 16467066
Bug: 13133027
Change-Id: I3e66b25b2302c0eb795361629b03bf2e96ed34e4
ibmediaplayerservice/nuplayer/NuPlayer.cpp
ibmediaplayerservice/nuplayer/NuPlayer.h
111333eaab12448f45927464c8aeacbbf9a578a1 20-Aug-2014 Marco Nelissen <marcone@google.com> Merge "handle error during flush in MediaPlayer.reset()" into lmp-dev
9e2b7918eb5621b24bd54c922f630da45339de77 19-Aug-2014 Marco Nelissen <marcone@google.com> handle error during flush in MediaPlayer.reset()

If there was an error during the flush phase of a reset, then the
reset would never complete. We now make sure the MediaCodec moves
to the right state in this case, and that NuPlayer cleans up and
resumes the rest of the reset after a failed flush.

Bug: 16955082
Change-Id: Ied61136871a9fcdffcc80647fa2bba64a926ac2a
ibmediaplayerservice/nuplayer/NuPlayer.cpp
ibmediaplayerservice/nuplayer/NuPlayerDecoder.cpp
ibstagefright/MediaCodec.cpp
4deb606bca47f971f1ca05e44b934c5328cfb6b7 20-Aug-2014 Marco Nelissen <marcone@google.com> Merge "Fix NuPlayer deadlock" into lmp-dev
eb645a0d1820b227af287a5309f017afadbab4e3 20-Aug-2014 Marco Nelissen <marcone@google.com> Fix NuPlayer deadlock

Mutexes can't be locked recursively. This would cause a seek in the prepared
state to deadlock

Bug: 14057920
Change-Id: Ifb5e25f24450b7e5f71611a8ee2bdba45dba70a7
ibmediaplayerservice/nuplayer/NuPlayerDriver.cpp
ibmediaplayerservice/nuplayer/NuPlayerDriver.h
bb137ef84e6308fb4f977ebf757cf3559e9cce71 20-Aug-2014 Robert Shih <robertshih@google.com> Merge "StagefrightRecorder: add VIDEO_ENCODER_VP8 case in setupVideoEncoder" into lmp-dev
76dc9c5052741bf0910a23a20c9df6018c4979d8 20-Aug-2014 Robert Shih <robertshih@google.com> StagefrightRecorder: add VIDEO_ENCODER_VP8 case in setupVideoEncoder

Bug: 16329805
Change-Id: Ibc80cdeb1958f739dd67b65e57f6b7cc551a9db3
ibmediaplayerservice/StagefrightRecorder.cpp
5596d7c4ad388d1757398181b3a1453d731a1b41 20-Aug-2014 Wei Jia <wjia@google.com> Merge "Allow audio and video flushed separately." into lmp-dev
3ef1e656086e6aed75b508715e59951f028841a1 20-Aug-2014 Wei Jia <wjia@google.com> Merge "NuPlayerRenderer: allow flush() to be called multiple times." into lmp-dev
53904f372b9c4a5ea7f839012b52b3d564e41207 29-Jul-2014 Wei Jia <wjia@google.com> Allow audio and video flushed separately.

Bug: 14955925
Bug: 16303659
Bug: 16467066
Bug: 13133027
Change-Id: I956a9f55513970115119c7639a5e33b39e6d2f55
ibmediaplayerservice/nuplayer/NuPlayer.cpp
ibmediaplayerservice/nuplayer/NuPlayer.h
28a8a9ff2a2bfd5edbdbbadde50c6d804335ffdc 18-Aug-2014 Wei Jia <wjia@google.com> NuPlayerRenderer: allow flush() to be called multiple times.

Also fix racing condition on accessing some members.

Bug: 16982307
Bug: 13133027
Change-Id: I0d4a605146e24ad7396a07369d501593cad73f41
ibmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
9d7fc5c5fab0c7c967a625d22fffda046f9d5c29 19-Aug-2014 Robert Shih <robertshih@google.com> HTTPLiveSource: check for NULL before getTrackCount/Info

The effect is MediaPlayer returns a 0-length array when getTrackInfo is
called before PREPARED state.

Bug: 12029173
Change-Id: Ib3a48525eac07b04a2ff88ce199d66dcc61c1641
ibstagefright/httplive/LiveSession.cpp
1e2d7cd671ece1b9eaec7b4c56633884c9a899bd 19-Aug-2014 Ronghua Wu <ronghuawu@google.com> Merge "stagefright: Fix thumbnail generation for some clips." into lmp-dev
a518dd9ac06d519bf226e6b1e952f85d6078eecc 05-Aug-2014 Ronghua Wu <ronghuawu@google.com> stagefright: Fix thumbnail generation for some clips.

Fix thumbnail generation for clips that include an immediate resolution change:
* Enable dynamic resolution change, when port settings may change while we have
filled buffers.
* Handle the case when port settings change happens right after stop is called.

Bug: 16210021
Change-Id: I8b2c48365d74ce7551f000a1f4b0711647a9796f
ibstagefright/OMXCodec.cpp
5a5a23255ad83ef378f924ead4e90e756773e278 19-Aug-2014 Ronghua Wu <ronghuawu@google.com> Merge "NuPlayer: disable deep audio buffer in offload mode." into lmp-dev
1ffb5381ca40884868299a2ac8a1424b68a1a43e 19-Aug-2014 Ronghua Wu <ronghuawu@google.com> NuPlayer: disable deep audio buffer in offload mode.

Bug: 17035257
Change-Id: I56ca28d4c4774c1c0103d19126cf0b8f859964b7
ibmediaplayerservice/nuplayer/NuPlayer.cpp
1593dc575cf4a83be9f4d04b24ecc402ee4e2519 19-Aug-2014 Ronghua Wu <ronghuawu@google.com> Merge "NuPlayerRenderer: only query audio sink for position for the first entry." into lmp-dev
3e5efb37308aa1f54c2a72cd8a7a73d2d7921a90 19-Aug-2014 Ronghua Wu <ronghuawu@google.com> NuPlayerRenderer: only query audio sink for position for the first entry.

Bug: 17035257
Change-Id: I472ec4610e1174c59986f42d72fe55f90e93731e
ibmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
af11287b39b6420c8a05a5c8c9b72f7e4ddc82f7 19-Aug-2014 Lajos Molnar <lajos@google.com> Merge "NuPlayer: add support for proper stop" into lmp-dev
f2575571d88cd42508407e98957a19a875dcf926 13-Aug-2014 aarti jadhav-gaikwad <agaikwad@nvidia.com> stagefright: Do not add silence data for compress offload

Bug: 16683770
Bug: 17035257
Change-Id: I7aef543c47214cc2854d143167b02f1603cf8bea
ibmediaplayerservice/MediaPlayerService.cpp
a7ee3549823af3dc4b22284f1a2fe4fbf31cf30b 19-Aug-2014 Ronghua Wu <ronghuawu@google.com> Merge "stagefright: Do not add silence data for compress offload" into lmp-dev
a8143b2bbaabc3f704b05078ccc930dbc28591b9 20-Aug-2014 Chong Zhang <chz@google.com> Merge "Don't crash for bitstream errors in AMPEG4ElementaryAssembler" into lmp-dev
dc9aa7e2cb903bb4ebfce558671a97088477bb6e 20-Aug-2014 Chong Zhang <chz@google.com> Don't crash for bitstream errors in AMPEG4ElementaryAssembler

Bug: 17110981
Change-Id: I0d0960fa12f2ad179231494be29af307de217b2a
ibstagefright/rtsp/AMPEG4ElementaryAssembler.cpp
c975c23bb9da36262b37a1d64367d726f8dd42e5 18-Aug-2014 Lajos Molnar <lajos@google.com> Merge "stagefright: add codec capability info for google audio codecs" into lmp-dev
475da7ef08c05a482ced8d318832cf5aa1141aff 09-Aug-2014 Ronghua Wu <ronghuawu@google.com> stagefright: Fix race condition between MediaCodec and SoftwareRenderer

* Set the buffer's format info when it's returned from OMX component.
* Move frame format meta from SoftwareRenderer's ctor to the render call.
I.e. each frame sent to the renderer carries the format info.
* Reset renderer with the new format instead of re-creating
SoftwareRenderer when incoming frame's format is changed.

Bug: 13842676
Change-Id: Ibab46f109200bcbdeab13a4cc1bcd0870f2a99fb
ibstagefright/AwesomePlayer.cpp
ibstagefright/MediaCodec.cpp
ibstagefright/Utils.cpp
ibstagefright/colorconversion/SoftwareRenderer.cpp
ibstagefright/include/SoftwareRenderer.h
426c719a5f3b4d88480eb35a7b0b373f672ea3cb 15-Aug-2014 Chong Zhang <chz@google.com> Merge "use dedicated looper for GenericSource" into lmp-dev
1864e9f621cabc77cae58a6214d13dae09b05681 15-Aug-2014 Lajos Molnar <lajos@google.com> Merge "stagefright: allow specifying flac copmression level by 'complexity'" into lmp-dev
74868d6d167ff231e9d2c65cb90eb249bc99c0ea 15-Aug-2014 Lajos Molnar <lajos@google.com> Merge "stagefright/media: add support for codec features with text value" into lmp-dev
c2319720436f525315ec13fdce8b929d5dec8e84 15-Aug-2014 Andy Hung <hunga@google.com> Merge "nuplayer: create AudioSink early to verify offload is possible" into lmp-dev
c0b56379020941b913419f0fabbc64c815539a53 15-Aug-2014 Lajos Molnar <lajos@google.com> stagefright: add codec capability info for google video codecs

Bug: 11990470
Change-Id: I3926551506ebc33181d50f532ef379be55b60147
ibstagefright/data/media_codecs_google_video.xml
037f9b619f166e2bd67384f2e66b99bab19700ac 15-Aug-2014 Lajos Molnar <lajos@google.com> stagefright: add codec capability info for google audio codecs

Bug: 11990470
Change-Id: I6a7d6758727cc205c636dfb19eb7fe99d67fb084
ibstagefright/data/media_codecs_google_audio.xml
ibstagefright/data/media_codecs_google_telephony.xml
cd39746f8d83bb3f12e8f613e77c3c3b5f77c077 15-Aug-2014 Lajos Molnar <lajos@google.com> stagefright: allow specifying flac copmression level by 'complexity'

Bug: 11990470
Change-Id: I428961cc654b768773814078f753e2e67243f186
ibstagefright/ACodec.cpp
732c6d955524ead6c31e6e1bafbd41ea4cee525d 15-Aug-2014 Lajos Molnar <lajos@google.com> stagefright/media: add support for codec features with text value

Bug: 11990470
Change-Id: I7600d999c5f4b6821d825d25fa7e8a2bb5a80c46
ibmedia/MediaCodecInfo.cpp
ibstagefright/MediaCodecList.cpp
282a7e31681840253a4cb6fab3f6725d35798699 15-Aug-2014 Andy Hung <hunga@google.com> nuplayer: create AudioSink early to verify offload is possible

Offload audio playback is not guaranteed even if AudioSystem says it
is allowed. Create AudioSink early to verify offload is really possible.
Move AudioSink open / close into functions.

Bug: 16732303
Bug: 16978805
Change-Id: Ie1c73a96656863c1281bed3280a84b86d3cbadf5
ibmediaplayerservice/nuplayer/NuPlayer.cpp
ibmediaplayerservice/nuplayer/NuPlayer.h
261562316c1b652ea697c99c0f24a54112bd0385 14-Aug-2014 Chong Zhang <chz@google.com> Merge "make NuPlayer's http connection mechanism behave more like that of AwesomePlayer's" into lmp-dev
1228d6b175de8b21787cbe0c6c4bb5642f4d555e 13-Aug-2014 Chong Zhang <chz@google.com> use dedicated looper for GenericSource

- handle setVideoSurface in deferred action, and return
to client immediately

- handle GenericSource's prepareAsync on its own looper,
instead of sharing looper with NuPlayer

- let HTTPLiveSource share looper with LiveSession, instead
of NuPlayer

- remove reflector in RTSPSource

Bug: 16892748
Change-Id: I1aed557320052012065f5a90adbcb03c238da988
ibmediaplayerservice/nuplayer/GenericSource.cpp
ibmediaplayerservice/nuplayer/GenericSource.h
ibmediaplayerservice/nuplayer/HTTPLiveSource.cpp
ibmediaplayerservice/nuplayer/NuPlayer.cpp
ibmediaplayerservice/nuplayer/NuPlayerDriver.cpp
ibmediaplayerservice/nuplayer/NuPlayerDriver.h
ibmediaplayerservice/nuplayer/RTSPSource.cpp
ibmediaplayerservice/nuplayer/RTSPSource.h
7b3cd1f33dcfc0b6034144cf48c0919cf7ca6046 14-Aug-2014 Chong Zhang <chz@google.com> make NuPlayer's http connection mechanism behave
more like that of AwesomePlayer's

- remove cache specific headers before connect

- read mime type before creating cached source on top
of the http source

Bug: 16892521

Change-Id: Ie13a62dd8dd959be6095a42e2b41e3bc817efeb5
ibstagefright/DataSource.cpp
de01afbbc55ac9c5c23ec66154603f34217aed2c 13-Aug-2014 Chong Zhang <chz@google.com> cache up to 200K bytes (instead of 10 buffers) in DecoderPassThrough

Bug: 16892521
Change-Id: I0e2da4134a37e632f9f2c29d1d27d8fded7a7863
ibmediaplayerservice/nuplayer/NuPlayerDecoderPassThrough.cpp
ibmediaplayerservice/nuplayer/NuPlayerDecoderPassThrough.h
e53350373ac516257b4f8956ff1e3f1ac48f607e 12-Aug-2014 Lajos Molnar <lajos@google.com> stagefright: allow scenarios when dequeueBufferFromNativeWindow fails

We can run out of native buffers when the bufferqueue is abandoned.

Bug: 16839124
Change-Id: If605f692b87082f1630e1da0fd44da0cb76133f5
ibstagefright/ACodec.cpp
d018b8ffd84452a7a4b992b5325713b3256e48ff 12-Aug-2014 Lajos Molnar <lajos@google.com> Merge "MediaCodecList: handle errors gracefully" into lmp-dev
2461e0cf6ae3fe5c9b52ce9e3ac764f4aff5e5eb 12-Aug-2014 Lajos Molnar <lajos@google.com> MediaCodecList: don't return references

Bug: 16905025
Change-Id: I5b42b294f0cc785b8e4dda0e82c8f8377a46f487
ibmedia/MediaCodecInfo.cpp
6ff58f04f78886b07c72c0118eb71a78d08f5651 12-Aug-2014 Lajos Molnar <lajos@google.com> MediaCodecList: handle errors gracefully

Handle missing OMX codecs, and codecs that do not load.
Fix NULL dereference when initializing codec with no type.

Bug: 16907578
Bug: 16905025
Change-Id: I5d103db36ebb029d1aab03222bf6e9324beb1566
ibmedia/MediaCodecInfo.cpp
ibstagefright/MediaCodecList.cpp
dbdaa08cbed61b9ba4afc43f0ce0230346a1ca2f 12-Aug-2014 Chong Zhang <chz@google.com> Merge "propogate heartbeat error code to app" into lmp-dev
f4c0a94ab32541611f5ed6d407fc25b394c1988b 12-Aug-2014 Chong Zhang <chz@google.com> propogate heartbeat error code to app

Bug: 16885604
Change-Id: Ib6c60f0ef8cf72aa1aac67a75121142bff304018
ibmediaplayerservice/nuplayer/NuPlayer.cpp
306c92dabc524f408445f7da2524c7a5e77ade63 11-Aug-2014 Andy Hung <hunga@google.com> Merge "Extend downsampling ratios greater than 2:1" into lmp-dev
cd04484f4837b8ca0041d118286ab6a98e84fc75 07-Aug-2014 Andy Hung <hunga@google.com> Extend downsampling ratios greater than 2:1

Also improve robustness to choice of sampling rate or buffer size
such that increasing either by 10x does not cause overflow.

Bug: 12979141
Bug: 15933066
Change-Id: If7989bd745d1bee3bdf811b8b7c978543ccafb65
ibmedia/AudioTrack.cpp
4b75b86785d674b98dade17cd197b912d87cd279 16-Aug-2013 Lajos Molnar <lajos@google.com> NuPlayer: add support for proper stop

MediaPlayer.stop() should move to the Stopped state which is
semantically identical to the Initialized state.

Bug: 13138230
Change-Id: I5d7b4a22533f545c24a18e2cd9f7cb2685d42c84
Signed-off-by: Lajos Molnar <lajos@google.com>
ibmediaplayerservice/nuplayer/NuPlayerDriver.cpp
ibmediaplayerservice/nuplayer/NuPlayerDriver.h
2dfe8ea7c131a045067c123efc934ef6ccdb8821 09-Aug-2014 Dan Albert <danalbert@google.com> Merge changes Idc9808f7,If7bc8e5b into lmp-dev

* changes:
Fix the build after -Bsymbolic fix.
Fix PIC relocations for non-Bsymbolic builds
7c4f0d757bfeedaab4b7ef4ccf5b0a72ec8f4306 10-Jul-2014 Robert Shih <robertshih@google.com> NuPlayer: getSelectedTrack

Change-Id: If5251f89b881e7f268e11a06cd3685d794c958b6
ibmediaplayerservice/nuplayer/NuPlayer.cpp
ibmediaplayerservice/nuplayer/NuPlayer.h
ibmediaplayerservice/nuplayer/NuPlayerDriver.cpp
ibmediaplayerservice/nuplayer/NuPlayerSource.h
53a1e46e559b00653eadf6f4bb5572679b0ee734 09-Aug-2014 Lajos Molnar <lajos@google.com> Merge "stagefright: set crop rect in SoftwareRenderer" into lmp-dev
25a147aaad0ce30da8db763054d963ceaedb4065 08-Aug-2014 Lajos Molnar <lajos@google.com> stagefright: set crop rect in SoftwareRenderer

Bug: 9563986
Change-Id: Id66a21ef8cdd8350e3eb95d6359fe9c1b94c4f98
ibstagefright/colorconversion/SoftwareRenderer.cpp
e079c76c5c29d6cca85d9debc470358588721618 09-Aug-2014 Rachad <rachad@google.com> Merge "Added Tunneled video playback support to ACodec" into lmp-dev
5a446aafff3020d607ad6fb14cc7ae76dd8f7947 30-Jul-2014 Rachad <rachad@google.com> Added Tunneled video playback support to ACodec

Bug:16132368
Change-Id: I88d2d66b8548fc203f4a2c4797196af15e56ff38
ibmedia/IOMX.cpp
ibstagefright/ACodec.cpp
ibstagefright/OMXClient.cpp
ibstagefright/include/OMX.h
ibstagefright/include/OMXNodeInstance.h
ibstagefright/omx/OMX.cpp
ibstagefright/omx/OMXNodeInstance.cpp
5f24404277a4ce2bdfd2a38c45abb48b7aeccad4 09-Aug-2014 Lajos Molnar <lajos@google.com> Merge "Fix WAVExtractor to output full audio frames only" into lmp-dev
e3fdb6012905d593c9350958f4429d0d670adae4 09-Aug-2014 Andy Hung <hunga@google.com> Fix WAVExtractor to output full audio frames only

Fixes NuPlayer crash from MediaBuffers ending in partial audio frames.

Bug: 16881623
Change-Id: Ia80a9910f99245e645860c00ae85118cc85bef57
ibstagefright/WAVExtractor.cpp
ced1c2f8f6c422063092f5cc5c675ccdebb2dc10 09-Aug-2014 Chong Zhang <chz@google.com> some clean up of video size change notification

need to consider rotation when notifying video size change after
initial prepare, in addition to after an output format change.

Bug: 16870964
Change-Id: Icd1c9e901ac932e720ce95b8a983c0edcf251c35
ibmediaplayerservice/nuplayer/GenericSource.cpp
ibmediaplayerservice/nuplayer/HTTPLiveSource.cpp
ibmediaplayerservice/nuplayer/NuPlayer.cpp
ibmediaplayerservice/nuplayer/NuPlayer.h
ibmediaplayerservice/nuplayer/NuPlayerSource.h
ibmediaplayerservice/nuplayer/RTSPSource.cpp
ibmediaplayerservice/nuplayer/StreamingSource.cpp
a912c194ded6c9ece78c492c68c3763f284bb5d5 09-Aug-2014 Chong Zhang <chz@google.com> Merge "some clean up of video size change notification" into lmp-dev
ddabe554e95940891c5df9a7f092798351b5f75e 08-Aug-2014 Jean-Michel Trivi <jmtrivi@google.com> Merge "AAC decoder: add support for controlling presentation parameters" into lmp-dev
8045853d03649f43ea2f7107e7d2dbb9b2d20855 02-Aug-2014 Jean-Michel Trivi <jmtrivi@google.com> AAC decoder: add support for controlling presentation parameters

Control the dowmixing of the AAC decoder
Control the DRC processing of the AAC decoder

Bug 16740915

Change-Id: I9b06ea8785f56213ea120ed85eeb360c88223297
ibstagefright/ACodec.cpp
ibstagefright/codecs/aacdec/SoftAAC2.cpp
55971df8768a2e613717a14251d56993b9322b5e 08-Aug-2014 Sasha Levitskiy <sanek@google.com> libstagefright: foundation: Add syntactic sugar to the cast.

Change-Id: I0b6b3ae440addd4891c26b0639bd6e647a7b031e
ibstagefright/foundation/AString.cpp
e43f501f3d4fda8578da519fc50d9156d8828e3a 08-Aug-2014 Dan Albert <danalbert@google.com> Fix the build after -Bsymbolic fix.

Bug: 16853291
Change-Id: Idc9808f76e8be7afb70513c4036b57c91690728e
(cherry picked from commit 8173554d5b5e25215e9c591a0dbb92b8c0ff082e)
ibstagefright/codecs/hevcdec/Android.mk
e17bb5cafdbc6089716d8e8c5afbb00f207a59bb 08-Aug-2014 Ard Biesheuvel <ard.biesheuvel@gmail.com> Fix PIC relocations for non-Bsymbolic builds

The ARM assembly contains a couple of hand-coded PC relative references
to data defined in other object files. Make sure the externs are tagged
as hidden so the linker knows that it can resolve the reference locally
at build time.

Signed-off-by: Ard Biesheuvel <ard.biesheuvel@gmail.com>
Bug: 16853291
Change-Id: If7bc8e5bb6a2c63b9df33666d56e6c42f398fd47
(cherry picked from commit 97e3e847179c17eb9059fb322413b6facd3e5a03)
ibstagefright/codecs/amrwbenc/src/asm/ARMV5E/Filt_6k_7k_opt.s
ibstagefright/codecs/amrwbenc/src/asm/ARMV5E/pred_lt4_1_opt.s
ibstagefright/codecs/amrwbenc/src/asm/ARMV7/Filt_6k_7k_neon.s
ibstagefright/codecs/amrwbenc/src/asm/ARMV7/pred_lt4_1_neon.s
ibstagefright/codecs/mp3dec/src/asm/pvmp3_polyphase_filter_window_gcc.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_DecodeCoeffsToPair_s.S
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_DequantTables_s.S
a19f33e4e50cda5d5953fa0cc662502262ac9dfd 08-Aug-2014 Chong Zhang <chz@google.com> delay data source creation for GenericSource prepare time

Bug: 16708180

Change-Id: I9d578ef5e2edaed50279d28d3831c68556468f39
ibmediaplayerservice/nuplayer/GenericSource.cpp
ibmediaplayerservice/nuplayer/GenericSource.h
ibmediaplayerservice/nuplayer/NuPlayer.cpp
1198a3394a21d3c31b19395b124c77f09a8f0924 08-Aug-2014 Colin Cross <ccross@android.com> libstagefright_foundation: fix build

Change-Id: If61766efa8834df175bd5758c760344364458d4a
ibstagefright/foundation/AString.cpp
b189a5b37cd1768f996096122b9541d9fa29ec43 07-Aug-2014 Wei Jia <wjia@google.com> Revert "NuPlayer: don't feed decoder input data during flushing."

The previous patch results in MediaBuffer leakage.

This reverts commit 69a85b792c31033a99c8858e3b1a3c2ea68b6278.

Bug: 14955925
Bug: 16303659
Bug: 16467066
Bug: 16849601
Change-Id: Ib1892b7603a97e12b7ee228fd5a4009700cdc988
ibmediaplayerservice/nuplayer/NuPlayer.cpp
317bb9163befccd87348c11bdfc0044e629b362b 08-Aug-2014 Andy Hung <hunga@google.com> Merge "Clarify and implement MediaCodec status codes" into lmp-dev
251d4be8aa5ab80bc915a82a2420233bdc62018e 31-Jul-2014 Andy Hung <hunga@google.com> Clarify and implement MediaCodec status codes

Clarify MediaCodec status codes in MediaError.h
When appropriate, return OMX error codes for status.
Optionally return a status code from CreateByType() and
CreateByComponentName().

Bug: 12034929
Bug: 13976475
Change-Id: I7463dd08d101074f730481b26127a69c9186c97e
ibstagefright/ACodec.cpp
ibstagefright/MediaCodec.cpp
0afbc2c3a7769b31cbd1de931b65c4ab95fdf5a5 08-Aug-2014 Chong Zhang <chz@google.com> Merge "delay data source creation for GenericSource prepare time" into lmp-dev
229d242665c612fd97431d1e7ac004823b47f181 07-Aug-2014 Lajos Molnar <lajos@google.com> stagefright: support flexible YUV format

- Report flexible format for standard OMX formats that are flexible.
- Accept flexible format when specifying video port formats.

Bug: 10706245
Change-Id: I9e82bc895bb0d5d606eb05fdf83bec766eaa2046
ibstagefright/ACodec.cpp
ibstagefright/OMXCodec.cpp
1381d4b5c0385aec3741073e5998773b064c1fb0 08-Aug-2014 Lajos Molnar <lajos@google.com> media/playerservice: add getCodecList() to MediaPlayerService

Bug: 11990470
Change-Id: I8fa45946fd9b76f9b975fc59062819c57e6881ef
ibmedia/IMediaPlayerService.cpp
ibmediaplayerservice/MediaPlayerService.cpp
ibmediaplayerservice/MediaPlayerService.h
ibstagefright/MediaCodecList.cpp
60b1c0e79d12a1c70758bc8d060156924635f8ba 07-Aug-2014 Lajos Molnar <lajos@google.com> stagefright: rework media codec list and infos

This is in preparation of serving the codec list and codec infos
from the mediaserver

Bug: 11990470
Change-Id: Ib8e2708679c9ce461a4ba179974a740cdcdf2731
ibmedia/Android.mk
ibmedia/IMediaCodecList.cpp
ibmedia/MediaCodecInfo.cpp
ibstagefright/MediaCodec.cpp
ibstagefright/MediaCodecList.cpp
ibstagefright/OMXCodec.cpp
bf9b95d712a24b654761cb9fea0d94d383cfc661 08-Aug-2014 Chong Zhang <chz@google.com> delay data source creation for GenericSource prepare time

Bug: 16708180

Change-Id: I9d578ef5e2edaed50279d28d3831c68556468f39
ibmediaplayerservice/nuplayer/GenericSource.cpp
ibmediaplayerservice/nuplayer/GenericSource.h
ibmediaplayerservice/nuplayer/NuPlayer.cpp
8accee4f0e94f19866d260be6eecd6c219eb4982 06-Aug-2014 Lajos Molnar <lajos@google.com> stagefright: add AString parceling, and equal/compareIgnoreCase

Bug: 11990470
Change-Id: If43ada5d2e768931f4409e499eaa268edade0500
ibstagefright/foundation/AString.cpp
c80863e922cb94122b783ef31ce18cf58471f546 07-Aug-2014 Wei Jia <wjia@google.com> Merge "Revert "NuPlayer: don't feed decoder input data during flushing." " into lmp-dev
5e78d66badd543bc9587eed74128bca47df40d70 07-Aug-2014 Wei Jia <wjia@google.com> Revert "NuPlayer: don't feed decoder input data during flushing."

The previous patch results in MediaBuffer leakage.

This reverts commit 69a85b792c31033a99c8858e3b1a3c2ea68b6278.

Bug: 14955925
Bug: 16303659
Bug: 16467066
Bug: 16849601
Change-Id: Ib1892b7603a97e12b7ee228fd5a4009700cdc988
ibmediaplayerservice/nuplayer/NuPlayer.cpp
a9522673f3076ea937eb2912945d7ed646ca05df 06-Aug-2014 Lajos Molnar <lajos@google.com> stagefright: move ARRAY_SIZE to foundation

Bug: 11990470
Change-Id: Ifae790b774a0fb210acbe33a1310d3d6ba46e7fa
ibstagefright/include/SoftVideoDecoderOMXComponent.h
3de157dd8f9cd45bf9b0406268f5830887105ae1 06-Aug-2014 Chong Zhang <chz@google.com> some fixes for crash when extractor creation fails

- prefetch data for sniffing

- notify error instead of crashing if extractor is NULL

Bug: 16818302

Change-Id: I56ff4996d99ac2811d19d141f7ff7acdd7c1da17
ibmediaplayerservice/nuplayer/GenericSource.cpp
ibmediaplayerservice/nuplayer/GenericSource.h
ibmediaplayerservice/nuplayer/NuPlayer.cpp
ibstagefright/DataSource.cpp
ibstagefright/include/WVMExtractor.h
0893eaf7d21e3a50b81324673eaa91a6b77a39c2 07-Aug-2014 Robert Shih <robertshih@google.com> Merge "httplive: timestamp reporting, track selection" into lmp-dev
29e09664c2c5b49d78f2666d38a812502a36e26b 07-Aug-2014 Chong Zhang <chz@google.com> Merge "some fixes for crash when extractor creation fails" into lmp-dev
309aa8bf5e4cd66fe988adf2654cac3fadc2a1c3 30-Jul-2014 Robert Shih <robertshih@google.com> httplive: timestamp reporting, track selection

Bug: 15153976
Bug: 15763638
Bug: 16351654
Change-Id: I4462276d4b7342647286a0ca4be11692ce52ff6d
ibmediaplayerservice/nuplayer/GenericSource.cpp
ibstagefright/httplive/LiveSession.cpp
ibstagefright/httplive/LiveSession.h
ibstagefright/httplive/M3UParser.cpp
ibstagefright/httplive/M3UParser.h
ibstagefright/httplive/PlaylistFetcher.cpp
ibstagefright/httplive/PlaylistFetcher.h
ibstagefright/mpeg2ts/ATSParser.cpp
ibstagefright/mpeg2ts/AnotherPacketSource.cpp
ibstagefright/mpeg2ts/AnotherPacketSource.h
93c3d41bdb15e39dac0faea9c5b60f1637cd477c 01-Aug-2014 Eric Laurent <elaurent@google.com> AudioSystem: add API to query audio HW sync source

Add a method to query from the audio HAL the HW sync
source used for a given audio session.
Modify audio policy to select a direct output with HW sync
when requested.

Bug: 16132368.

Change-Id: I03038f9188f2d389f8a5fd76a671854013a4513e
ibmedia/AudioSystem.cpp
ibmedia/IAudioFlinger.cpp
69a85b792c31033a99c8858e3b1a3c2ea68b6278 05-Aug-2014 Wei Jia <wjia@google.com> NuPlayer: don't feed decoder input data during flushing.

Bug: 14955925
Bug: 16303659
Bug: 16467066
Change-Id: I7c258b986ae711357bd7e636b79853f8f3959d32
ibmediaplayerservice/nuplayer/NuPlayer.cpp
b97cc6a9a3c81215e365c61b071a932073b56ff2 02-Aug-2014 Jean-Michel Trivi <jmtrivi@google.com> AAC encoder: add support for SBR mode selection

Change-Id: Ibc07bff7710398929c135f38324dd29857fa0ea6
ibstagefright/ACodec.cpp
ibstagefright/codecs/aacenc/SoftAACEncoder2.cpp
ibstagefright/codecs/aacenc/SoftAACEncoder2.h
3c9879b980ad195797543ce237ecbe479267e16f 06-Aug-2014 Jean-Michel Trivi <jmtrivi@google.com> Merge "AAC encoder: add support for SBR mode selection" into lmp-dev
e46711343b43786c049a007369a72c1c78e6c5db 05-Aug-2014 Wei Jia <wjia@google.com> Merge "NuPlayer: don't feed decoder input data during flushing." into lmp-dev
b15486f973f80063ae2d436f7d71667b592c6fc9 05-Aug-2014 Chong Zhang <chz@google.com> Merge "set secure flag for secure file playback" into lmp-dev
7e892180f3992c088dc0d44f0b0e54ace4dabe3c 05-Aug-2014 Chong Zhang <chz@google.com> set secure flag for secure file playback

Bug: 16786456
Change-Id: I06f18b0e9c3f65e3e127369baa1f9ea8c9307762
ibmediaplayerservice/nuplayer/GenericSource.cpp
ibmediaplayerservice/nuplayer/NuPlayer.cpp
85c3773092cad9f2c6130ee83e8a78222bac6a0b 05-Aug-2014 Eric Laurent <elaurent@google.com> Merge "Add sound trigger control by audio policy" into lmp-dev
df3dc7e2fe6c639529b70e3f3a7d2bf0f4c6e871 28-Jul-2014 Eric Laurent <elaurent@google.com> Add sound trigger control by audio policy

Audio policy:
- Added active capture indication to sound trigger service:
recognition stops if concurrent capture is not supported.
- Added generation of reserved I/O handle and session ID for
utterance capture.

Sound trigger service
- Added sound model update callback handling.
- Added service state callback
- Simplified callback shared memory allocation.

Bug: 12378680.

Change-Id: Ib0292c2733e6df90fdae480633dd9953d0016ef1
ibmedia/AudioSystem.cpp
ibmedia/IAudioPolicyService.cpp
ccad786f3497f223cbc5af981b08b460433ee622 02-Aug-2014 aarti jadhav-gaikwad <agaikwad@nvidia.com> stagefright: Pass audio aac subformats in offloadinfo

Pass audio aac sub formats in offloadinfo according
to aac profile. Audio HAL can take decision about offload
using DSP capabilities

Change-Id: Ice277e8b6561b7a7db92c474f23f8041ebb35e8c
ibmediaplayerservice/nuplayer/NuPlayer.cpp
ibstagefright/Utils.cpp
ca61a8f0bc22606cb11b99bdb10a146f941d556e 04-Aug-2014 Chong Zhang <chz@google.com> Merge "MediaCodecSource: stop puller from caller's thread instead of looper" into lmp-dev
16e79115e497386eaf010af388627f94314a55a3 01-Aug-2014 Chong Zhang <chz@google.com> MediaCodecSource: stop puller from caller's thread instead of looper

Currently CameraSource/AudioSource's stop() and read() are both called
from the puller's looper. This works if source operates normally (i.e.
read() returns regularly before source is stopped), as the stop() will
eventually be handled by the looper. However, if for some reason the
source hang, it will get stuck in read(), and the stop() will never
be processed, which could lead to ANR (in addition to the source hang).

We need to move the source's stop out of the puller's looper. It also
can't be on MediaCodecSource's looper, because the source's stop
synchrounously waits for all outstanding buffers to return, these
are only returned when MediaCodecSource's looper processes the buffer.

This change moves the stop to MediaCodecSource::stop, after encoder
is shutdown.

Bug: 16522726
Change-Id: Ie91f563c5d8a98ab091bf1945af4e51f662b9403
ibstagefright/AudioSource.cpp
ibstagefright/MediaCodecSource.cpp
68b15554f6dca3b056eac517fe5fa2fd4ee80a33 30-Apr-2014 Jeff Tinker <jtinker@google.com> Allow device to be unprovisioned

bug: 12247651
Change-Id: I564ac8de3da2430342a028f4058e2c5ac2d85d5e
ibmedia/IDrm.cpp
ibmediaplayerservice/Drm.cpp
ibmediaplayerservice/Drm.h
25644c502ed8ec13bcf496613e65ec8edb1af4a7 31-Jul-2014 Lajos Molnar <lajos@google.com> Merge "GenericSource: timed text support" into lmp-dev
3423bbdb05f843a64356fa24e8657f03ecbb7d65 17-Jul-2014 Robert Shih <robertshih@google.com> GenericSource: support track (de)selection

Bug: 15153976

Change-Id: Idfce856b4ca5fa7853da857757490798bc3ffe1e
ibmediaplayerservice/nuplayer/GenericSource.cpp
ibmediaplayerservice/nuplayer/GenericSource.h
ibstagefright/mpeg2ts/AnotherPacketSource.cpp
ibstagefright/mpeg2ts/AnotherPacketSource.h
e26940f11c3f2040bced09f06a8f374b50c985fb 31-Jul-2014 Lajos Molnar <lajos@google.com> GenericSource: timed text support

Bug: 16385674
Change-Id: Ib322cc13488dcadf2409921272cd469304b0af37
ibmediaplayerservice/nuplayer/GenericSource.cpp
ibmediaplayerservice/nuplayer/GenericSource.h
63c0ce7ab7bd99d51414dcb4f765bc6faabf367d 31-Jul-2014 Lajos Molnar <lajos@google.com> mediaplayerservice: initialize mIsWidevine

Bug: 16641557
Change-Id: I77aad6e710117a16093726bf3b36360904fbe148
ibmediaplayerservice/nuplayer/GenericSource.cpp
3c6fac2c807e4234953dcdc793029a82d1f3a089 31-Jul-2014 Lajos Molnar <lajos@google.com> Merge "stagefright: propagate error in MPEG4Extractor::readMetaData" into lmp-dev
a2e14302d4b5ca5443611d0c05218b9da4cc64a6 31-Jul-2014 Lajos Molnar <lajos@google.com> mediaplayer: add looping support to NuPlayer

Bug: 16641557
Change-Id: I433158e6e585b4714cfd6d89562ecd0587a07ae2
ibmediaplayerservice/nuplayer/NuPlayerDriver.cpp
ibmediaplayerservice/nuplayer/NuPlayerDriver.h
4ff2a0dbb178c4ea652f30aa4f1d3deb9fdbc832 31-Jul-2014 Lajos Molnar <lajos@google.com> stagefright: propagate error in MPEG4Extractor::readMetaData

Bug: 16641557
Change-Id: I252825bd767a4581b9fca560f2cabfb37c18e137
ibstagefright/MPEG4Extractor.cpp
a298101317e5472f6b6a12e6ddeafdc4064bd5b2 31-Jul-2014 Robert Shih <robertshih@google.com> NuPlayer: fix av discontinuity race

Assumption:
NuPlayer must see both (a/v) discontinuities before resuming.

Example issue:
Suppose we're changing the video track, so the video source queues a
DISCONTINUITY_FORMATCHANGE, and the audio source queues a DISCONTINUITY_NONE.
Consider this sequence of events without this change:
1. audio discontinuity seen by player
2. mFlushingAudio = FLUSHED
3. video discontinuity seen by player
4. mFlushingAudio != NONE so no performScanSources is queued
5. video decoding shuts down without being restarted

Bug: 15153976
Change-Id: I659550d9c0f883828103142abead857f576f25b1
ibmediaplayerservice/nuplayer/NuPlayer.cpp
1d5b45f70f684996acc24fbf3e30fa5af0a0c642 31-Jul-2014 Lajos Molnar <lajos@google.com> Merge "stagefright: MediaCodec async operations." into lmp-dev
89869f692c35d0ca914c7de4a1f5ff63c9920634 28-Jul-2014 Lajos Molnar <lajos@google.com> stagefright: enable decoder color format selection

Bug: 10706245
Change-Id: I9a77631bfae0358be229b079228c1fcae0e77faf
ibstagefright/ACodec.cpp
0e8cfc36044ba97545e7c9e129b0b3e98eec5089 31-Jul-2014 Lajos Molnar <lajos@google.com> stagefright: MediaCodec async operations.

In async mode:
- codec must be restarted after flush
- dequeueIn/OutputBuffers fail
- getIn/OutputBuffers fail

Bug: 11990118
Change-Id: If2d6a76ab499ee9ed4a11486fb537acbc52e66f6
ibstagefright/MediaCodec.cpp
b382340f33ac2dc26fe825ceb3ef98bac8af974c 31-Jul-2014 Chong Zhang <chz@google.com> Merge "handle rotation in NuPlayer" into lmp-dev
e9e63bcf6c36351f1129b0bdc5e93f17f0f9f0b4 31-Jul-2014 Chong Zhang <chz@google.com> handle rotation in NuPlayer

Bug: 16653284
Change-Id: I54165041da5a13498d627eee1b3ec59ef3c923b0
ibmediaplayerservice/nuplayer/NuPlayer.cpp
ibstagefright/ACodec.cpp
ibstagefright/Utils.cpp
d089a740e1e61d9503d2c84259bacb3e06c58a0e 31-Jul-2014 Chong Zhang <chz@google.com> Merge "ATSParser: treat stream type 0x83 as TrueHD AC3" into lmp-dev
9bf32f06e8971c1d3eb4fc5edd74b69557f97212 31-Jul-2014 Chong Zhang <chz@google.com> ATSParser: treat stream type 0x83 as TrueHD AC3

Bug: 16668055
Change-Id: I11fd3f795bbb50113e1a1e28e682edd76f11e146
ibstagefright/MediaCodecList.cpp
ibstagefright/mpeg2ts/ATSParser.cpp
ibstagefright/mpeg2ts/ATSParser.h
cb48eacb6f8857c7857bb28d6a13d4a0d417f2bd 30-Jul-2014 Wei Jia <wjia@google.com> Revert GenericSource track selection changes

This reverts commit bace25b0fbcd5101d2db288b0c70c4a239f0e815.
This reverts commit eb1735e343a93830df259ae8882160bb0d79dcb5.
This reverts commit 05312bc7478feec11d9ae88e951c0857a7a3f28d.

Bug: 16660839
ibmediaplayerservice/nuplayer/GenericSource.cpp
ibmediaplayerservice/nuplayer/GenericSource.h
ibstagefright/mpeg2ts/AnotherPacketSource.cpp
ibstagefright/mpeg2ts/AnotherPacketSource.h
f0a3c16901a7d9455f5d3153f6240e73e57a7beb 29-Jul-2014 Robert Shih <robertshih@google.com> Merge "SampleTable: check integer overflow during table alloc" into lmp-dev
0ec1f33ed4e953c7468b41a7c611faeb9bb7ae91 29-Jul-2014 Robert Shih <robertshih@google.com> Merge "GenericSource: start/stop tracks correctly on selection" into lmp-dev
4dc680607181e6a76f4e91a39366c4f5dfb7b03e 29-Jul-2014 Eric Laurent <elaurent@google.com> audio policy: pass session ID to capture activity methods

Indicate the audio session ID when calling getInput(),
startInput(), stopInput(), releaseInput().

Bug: 12378680.
Change-Id: I763793752f93e2f4e1445a5ab217c895af011038
ibmedia/AudioRecord.cpp
ibmedia/AudioSystem.cpp
ibmedia/IAudioPolicyService.cpp
edd4a76eb4747bd19ed122df46fa46b452c12a0d 28-Jul-2014 Robert Shih <robertshih@google.com> SampleTable: check integer overflow during table alloc

Bug: 15328708
Bug: 15342615
Bug: 15342751
Change-Id: I6bb110a1eba46506799c73be8ff9a4f71c7e7053
ibstagefright/SampleTable.cpp
bace25b0fbcd5101d2db288b0c70c4a239f0e815 25-Jul-2014 Robert Shih <robertshih@google.com> GenericSource: start/stop tracks correctly on selection

Change-Id: I10343151f930a4ab778a6d2574ab5165af2013ba
ibmediaplayerservice/nuplayer/GenericSource.cpp
de3f8392fbf380ba6f09d009b00d7172477389a2 28-Jul-2014 Eric Laurent <elaurent@google.com> rename AudioSystem::newAudioSessionId()

Rename AudioSystem::newAudioSessionId() to
AudioSystem::newAudioUniqueId() as it can be used
also for I/O handles.

Bug: 12378680.
Change-Id: I611ea3b5eb57a4b0774437f477ee87dc4ccc2cc2
ibmedia/AudioRecord.cpp
ibmedia/AudioSystem.cpp
ibmedia/IAudioFlinger.cpp
ibmedia/mediaplayer.cpp
ec3c71ed320e5e2252a84aa8b35ac4b9a6f92712 26-Jul-2014 Robert Shih <robertshih@google.com> Merge "NuPlayer: timed text support" into lmp-dev
d3b0bbb8a37f90fba84eb4e95c58aa0fec6c51e7 24-Jul-2014 Robert Shih <robertshih@google.com> NuPlayer: timed text support

Bug: 16385674
Change-Id: Ifa9fbc17a1276aa774d57b82cdce500876a0b543
ibmediaplayerservice/nuplayer/Android.mk
ibmediaplayerservice/nuplayer/NuPlayer.cpp
ibmediaplayerservice/nuplayer/NuPlayer.h
ibmediaplayerservice/nuplayer/NuPlayerSource.h
ef9c5ade2308f9eb6f222db3c4796e196f0ab76c 28-Jul-2014 Robert Shih <robertshih@google.com> Merge "GenericSource: timed text support" into lmp-dev
f5bdd770d509373cc4174a55d0b81b223ecc4d81 28-Jul-2014 Lajos Molnar <lajos@google.com> mediaplayer: make nuplayer the default player

Bug: 11784824
Change-Id: I60d215d0348adcd589da5bd479d5921dcf076ee4
ibmediaplayerservice/MediaPlayerFactory.cpp
eb1735e343a93830df259ae8882160bb0d79dcb5 24-Jul-2014 Robert Shih <robertshih@google.com> GenericSource: timed text support

Bug: 16385674
Change-Id: I954cc463b55af4b93c6a6e714115db4fda729dc8
ibmediaplayerservice/nuplayer/GenericSource.cpp
ibmediaplayerservice/nuplayer/GenericSource.h
03524dcc1215b2c468f5c8c8abe6f1c26239fd71 28-Jul-2014 Eric Laurent <elaurent@google.com> Merge "AudioFlinger: update openInput() and openOutput()" into lmp-dev
cf2c0210c8afbe7d0661ccbbae3835b5ce73c0bf 26-Jul-2014 Eric Laurent <elaurent@google.com> AudioFlinger: update openInput() and openOutput()

Add parameters to openInput() and openOutput(): device address,
input source.
Allow caller to specify a given I/O handle
Group parameters in a struct audio_config.

Bug: 12378680.
Change-Id: I7e9af74c0d996561cc13cbee7d9012d2daf33025
ibmedia/IAudioFlinger.cpp
6c28f1fb6d8262a327ffa8be5bb4c84c9ef7ce62 26-Jul-2014 Zhijun He <zhijunhe@google.com> Merge "CamcorderProfiles: add high speed profile constants" into lmp-dev
03c556ae1eb409ad088c49037e185946c54e1d25 25-Jul-2014 Lajos Molnar <lajos@google.com> stagefright: add flexible YUV support

Bug: 10706245
Change-Id: Icd246f22edfc67ed5240d59f5a5bde3e5f749465
ibstagefright/ACodec.cpp
ibstagefright/MediaCodec.cpp
90b16fbdef406d95a6fb2f9395719dd7b7ca6adb 25-Jul-2014 Lajos Molnar <lajos@google.com> stagefright: add ABuffer.CreateAsCopy

Bug: 10706245
Change-Id: I8c4e96a2581a039e9e8237c3e09e2c22226da055
ibstagefright/foundation/ABuffer.cpp
d8f33e78f9a09ffda0d7c9cadc1902044849461c 26-Jul-2014 Ruben Brunk <rubenbrunk@google.com> Merge "DNG: Clean up logging." into lmp-dev
ca73159becc0fc0098530929e467a3d92e470571 26-Jul-2014 Ruben Brunk <rubenbrunk@google.com> DNG: Clean up logging.

Change-Id: Ie34d5a22c89a726215d740fef359d53e5a1a360b
mg_utils/src/TiffEntry.cpp
mg_utils/src/TiffWriter.cpp
435e040267c4dd08b4e32b0e7b579902709aa9d6 25-Jul-2014 Chong Zhang <chz@google.com> Merge "reset battery stats when media player service is started" into lmp-dev
f591b865552dce57c5b4347974a1ac93c676459e 25-Jul-2014 Robert Shih <robertshih@google.com> Merge "StagefrightRecorder: check for WEBM format instead of MP4" into lmp-dev
68e97e7388bc9efa03e56c999645002cc3f38df5 24-Jul-2014 Robert Shih <robertshih@google.com> StagefrightRecorder: check for WEBM format instead of MP4

Bug: 16544665
Change-Id: Idc45bd4cafc65a11132d10fdf21f8439e186f35f
ibmediaplayerservice/StagefrightRecorder.cpp
858c7517abd04c58d2f140df0f27cbad1253e18a 25-Jul-2014 Chong Zhang <chz@google.com> Merge "signal mFrameAvailableCondition when AudioSource is stopped" into lmp-dev
37b216c75ca5e38f1a56a86a95b04ff6b4e71ae7 25-Jul-2014 Elliott Hughes <enh@google.com> Remove last user of <cutils/tztime.h>.

Bug: 15765976

(cherry picked from commit 56687f7cbf0a3d7909830fc1390a98c713a05e6f)

Change-Id: Iacb225584c3acdbb512f46b638a215b75b32cdcb
tp/Android.mk
tp/MtpUtils.cpp
81e50d0c782cc18eab4ef40ecd6c7f36df50fea5 24-Jul-2014 Wei Jia <wjia@google.com> Reset the value for Vector of pointers.

Bug: 16467066
Change-Id: I3674e07779a59f4d4fa639d066ed1988df89b3f5
ibmediaplayerservice/nuplayer/NuPlayerDecoder.cpp
d459e303f2f1d34c2b8c1af4f943747b20a8b1b2 24-Jul-2014 Chong Zhang <chz@google.com> signal mFrameAvailableCondition when AudioSource is stopped

This allows last read() to exit properly, otherwise it could get
stuck waiting for the condition forever.

Bug: 15849309
Change-Id: I79bba53630e59783a5fc041cfc5d3fdb2545cc2c
ibstagefright/AudioSource.cpp
e07909715b44cc56df723750af93f0608210f94d 24-Jul-2014 Zhijun He <zhijunhe@google.com> CamcorderProfiles: add high speed profile constants

Change-Id: I8f783466f8c2560820db14488acc1a309d27ab0f
ibmedia/MediaProfiles.cpp
0b30fd4ccf5218b15f770e778703d69cd3432446 23-Jul-2014 Chong Zhang <chz@google.com> reset battery stats when media player service is started

Bug: 12979595
Change-Id: Ia800de3e65ed4dec8334c6fde566edab12d23c42
ibmediaplayerservice/MediaPlayerService.cpp
4730fa07a3290cc3a904dcb16dbb92fcf46c36ac 23-Jul-2014 Wei Jia <wjia@google.com> Hook up querying of VP8 temporal layering support.

Bug: 14562236
Change-Id: I0ec5866173f7fb84dd3f79b588d1b35b523ca08a
ibstagefright/ACodec.cpp
db2225b2a24fa4ade5c0353730dc2d6a2f5838d9 23-Jul-2014 Chong Zhang <chz@google.com> Merge "NuPlayer: save thread id in MediaPlayer::start" into lmp-dev
d88adb96ec867ed1b629c434f87514d2fabaf5e9 23-Jul-2014 Chong Zhang <chz@google.com> NuPlayer: save thread id in MediaPlayer::start

so that when MediaPlayer::notify is called from within start,
it doesn't try to lock itself again.

Bug: 15323063
Change-Id: Idd77e892cd22538bbfe3e65c64c9dd2a216a0aee
ibmedia/mediaplayer.cpp
05312bc7478feec11d9ae88e951c0857a7a3f28d 17-Jul-2014 Robert Shih <robertshih@google.com> GenericSource: support track (de)selection

Bug: 15153976
Change-Id: I522b1f9f0ffedf4edbea03a6654a6dbc0262860a
ibmediaplayerservice/nuplayer/GenericSource.cpp
ibmediaplayerservice/nuplayer/GenericSource.h
ibstagefright/mpeg2ts/AnotherPacketSource.cpp
ibstagefright/mpeg2ts/AnotherPacketSource.h
4c9a0e3e30e97a31fcd7e41cb77d15427cb9c50b 23-Jul-2014 Robert Shih <robertshih@google.com> Merge "GenericSource: support track (de)selection" into lmp-dev
f6f4c0d7c5e2d33b38f080896466e56e2d0a97d4 23-Jul-2014 Robert Shih <robertshih@google.com> Merge "StagefrightRecorder: webm (video only) support" into lmp-dev
114819633470ebd5b346c13c2a82a0025d2d39c0 10-Jul-2014 Robert Shih <robertshih@google.com> StagefrightRecorder: webm (video only) support

Bug: 16329805
Change-Id: I8a0ecd100fca397add97a1416125bcc6aeb86364
ibmedia/mediarecorder.cpp
ibmediaplayerservice/Android.mk
ibmediaplayerservice/StagefrightRecorder.cpp
ibmediaplayerservice/StagefrightRecorder.h
b104d5a4dfbd8415f6bc227106b9f0130350d79a 23-Jul-2014 Robert Shih <robertshih@google.com> Merge "MediaWriter: make get/setStartTimeOffsetMs virtual" into lmp-dev
3a2956d148d81194e297408179e84a47a309ef48 23-Jul-2014 Wei Jia <wjia@google.com> Fall back to s/w decoding when audio offloading fails.

Change-Id: Icde3d65c964b2a13fb1c6636adcce52ae048a3fb
ibmediaplayerservice/nuplayer/NuPlayer.cpp
ibmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
ibmediaplayerservice/nuplayer/NuPlayerRenderer.h
2606b10d51c2dceb851a2ea63e803aba4134bf00 22-Jul-2014 Chong Zhang <chz@google.com> update battery stats for video/audio

Bug: 12979595

Change-Id: Iafd93046a4fd9f22bcd66084deace746a7ca5d3c
ibstagefright/MediaCodec.cpp
225d5b20409fd400bfa4ed5e9bc1d5babb498471 21-Jul-2014 Lajos Molnar <lajos@google.com> stagefright: handle seeking to before first cue-point.

Bug: 16446994
Change-Id: Id3f9d6780a7c4f62171cbfa8675a67334e8dfa10
ibstagefright/OggExtractor.cpp
ibstagefright/SampleTable.cpp
df813a3ba59109ca519ce0cb00a1a9144074f40e 21-Jul-2014 Jean-Michel Trivi <jmtrivi@google.com> audio_attributes_t for SoundPool

Add support for the audio_attributes_t structure in the
SoundPoool constructor.
Remove SRC quality which was never implemented.
Remove stream types.

Add file to contain audio helper functions related to policy.

Change-Id: I1720ff15e7b23ea7b713a4395fdfac26dc3fd4da
ibmedia/SoundPool.cpp
d8cf55d878edddfc36bb821a95b88dfb2453c2c3 17-Jul-2014 Robert Shih <robertshih@google.com> MediaWriter: make get/setStartTimeOffsetMs virtual

Bug: 16329805
Change-Id: Ib971dd95b54829438c8af97528f9e00b87ab3f1e
ibstagefright/webm/WebmWriter.h
cf1f53baa636f1782ff924d6003c70c6b8542c0b 19-Jul-2014 Lajos Molnar <lajos@google.com> Fix: Add MediaCodecList capabilities

fix getting capability index from type

Bug: 12065651

Change-Id: Id2bc60410a92e17c841a5dd072257bc40ad6236f
ibstagefright/MediaCodecList.cpp
2096abe982891b641f6117811dae419230c5d3ba 19-Jul-2014 Lajos Molnar <lajos@google.com> Merge "Add MediaCodecList capabilities" into lmp-dev
513d967dae82cd03e67bff17b927cf869d9bc43e 15-Jul-2014 Lajos Molnar <lajos@google.com> Add MediaCodecList capabilities

Bug: 12065651
Change-Id: Icfb73c0009621cd747e113d8a0cd84c966bf055d
ibstagefright/MediaCodecList.cpp
ibstagefright/foundation/AMessage.cpp
ada688878122d6504cccebb9121f9d4f8f701e38 18-Jul-2014 Lajos Molnar <lajos@google.com> Merge "stagefright: Fix seeking in MPEG4 container" into lmp-dev
599950efbb03b1672561d4cf2272504b879525e8 17-Jul-2014 Lajos Molnar <lajos@google.com> stagefright: Fix seeking in MPEG4 container

- seek based on user-visible timestamp
- seek to previous, next and closest exactly

Bug: 12786906
Change-Id: I2d5e1fbff6469b6f081a284be2222a4cb50aa754
ibstagefright/MPEG4Extractor.cpp
ibstagefright/OggExtractor.cpp
ibstagefright/SampleTable.cpp
ibstagefright/include/SampleTable.h
095248375e29adde961ec2a44989ecb3a6dda6a2 17-Jul-2014 Lajos Molnar <lajos@google.com> nuplayer: support widevine sources

- handle widevine:// scheme
- add separate looper for renderer (as it can block initial buffer
handling if all buffers are used)
- initiate secure codecs before source is started
- don't read secure buffers
- share ACodec's input buffers with Widevine source

on the decoder side

- keep track of mediabuffers released by widevine source
- keep track of dequeued input buffers (for safety)
- release mediabuffer when buffer is subsequently dequeued. (This
was hardcoded into OMXCodec to do this when buffer-empties message
was handled, but MediaCodec does not support such functionality.)

Bug: 15699665
Change-Id: I4a369443294e45c644be8b0257010e52db1d7c9b
ibmediaplayerservice/nuplayer/NuPlayer.cpp
ibmediaplayerservice/nuplayer/NuPlayer.h
ibmediaplayerservice/nuplayer/NuPlayerDecoder.cpp
ibmediaplayerservice/nuplayer/NuPlayerDecoder.h
ibmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
cc227036b05f7c2f960a89c567a61f9decefe742 18-Jul-2014 Lajos Molnar <lajos@google.com> nuplayer: add widevine support to GenericSource

Bug: 15699665
Change-Id: Ided823bd0b1118bbabb288cf62d6389518f820a9
ibmediaplayerservice/nuplayer/GenericSource.cpp
ibmediaplayerservice/nuplayer/GenericSource.h
ibmediaplayerservice/nuplayer/NuPlayerSource.h
3cb576166020bfdc1522b33919fe5ff8d211d0a3 17-Jul-2014 Lajos Molnar <lajos@google.com> stagefright: use all input buffers in ACodec

Bug: 15699665
Change-Id: If37e5c70e56821375ede911e781b5d4b8d41f8ad
ibstagefright/ACodec.cpp
c9a11abbb6b48604ea063daedd6118024cfbfa92 17-Jul-2014 Lajos Molnar <lajos@google.com> stagefright: add nonblocking MediaBufferGroup.acquire_buffer method

Bug: 15699665
Change-Id: I31c1ab4413c62ff3dd4e0d5b06a398064b4aaddd
ibstagefright/MediaBufferGroup.cpp
20965b564a606f9432177668c032ce97d1913e26 18-Jul-2014 Lajos Molnar <lajos@google.com> Merge "stagefright: add nonblocking read option to MediaBuffer" into lmp-dev
8eebda045d865c2e23fc439e87fe915467812967 17-Jul-2014 Lajos Molnar <lajos@google.com> stagefright: add nonblocking read option to MediaBuffer

Bug: 15699665
Change-Id: I2aaddc4c937cf5c1e36386bafd7d396d5781bf6d
ibstagefright/MediaSource.cpp
c63680d80ac262a6be4a22a66f92960e9f44d460 19-Jul-2014 Wei Jia <wjia@google.com> Merge "Free MediaBuffer when ABuffer is discarded." into lmp-dev
65eeb3c92ffc8b90eb1330fdf9a74c55f3c6b463 18-Jul-2014 Wei Jia <wjia@google.com> Free MediaBuffer when ABuffer is discarded.

BUG: 15699665
Change-Id: Ie7da017cf32ccc08094fe4b01a2b07d2739770d2
ibstagefright/mpeg2ts/AnotherPacketSource.cpp
7410591dad836434c72ddee66680802708b70c10 03-Jul-2014 Glenn Kasten <gkasten@google.com> Move AudioRecord frame count calculations to server

Buffer frame count and notification frame count
are now calculated by server instead of by client.
The server has more information and can do a better job.

Also fix a few bugs:

- If a fast track was re-created, even with same pipe depth, it would fail.
Now it can correctly re-create a fast track provided the pipe depth is same.

- Notification frame count for fast tracks was calculated by client
as 1/2 of the total frame count, which is a large value due to the pipe.
Now the notification frame count is set by server to the HAL frame count.
This should reduce latency for fast tracks.

- EVENT_OVERRUN were happening frequently when there was sample rate conversion,
because the client didn't know about the sample rate conversion,
and under-estimated the necessary buffer size. Now since server
calculates the buffer sizes, EVENT_OVERRUN is unlikely.

- RecordThread::createRecordTrack_l was checking for mono and stereo
for fast tracks. This is not necessary, and now we can handle a
multi-channel fast track.

Bug: 7498763
Change-Id: I0c581618e8db33084d5ff9ed50a592990c9749e8
ibmedia/AudioRecord.cpp
ibmedia/IAudioFlinger.cpp
b3b1660ecb67f61f9da54efced8677fa3a6f4863 16-Jul-2014 Glenn Kasten <gkasten@google.com> Add audio_input_flags_t to IAudioPolicyService::getInput

Change-Id: I9f37be05f8dc7b85a8827a94e76ca0f45453e170
ibmedia/AudioRecord.cpp
ibmedia/AudioSystem.cpp
ibmedia/IAudioPolicyService.cpp
ec40d284218466d8f0e832e7eb88e6ea6c479c88 16-Jul-2014 Glenn Kasten <gkasten@google.com> Add audio_input_flags_t to IAudioFlinger::openInput

For backward compatibility, until flags are correctly calculated,
we will assume that the request is for a low latency input stream.

Change-Id: I76746834e870df00833dc77cbdaa2edd2ffeec95
ibmedia/IAudioFlinger.cpp
09b9a3b0aadb347ae823ff0396232930c82a7ff1 18-Jul-2014 Zhijun He <zhijunhe@google.com> Merge "stagefright: add error log when create omx component failed" into lmp-dev
7a727021b86c2fb2c9f60af2c999154dce1766eb 18-Jul-2014 Zhijun He <zhijunhe@google.com> stagefright: add error log when create omx component failed

Bug: 16343447
Change-Id: I6854b9b837a141a77ab318953dc002ec5ad5d31d
ibstagefright/ACodec.cpp
ibstagefright/omx/OMX.cpp
5f881c631d3a8e2c0801cdfbbe465c355816f1e3 17-Jul-2014 Lajos Molnar <lajos@google.com> Merge "M3UParser: check for NULL before setting meta data" into lmp-dev
5154f98277922aba7103ac19529ecc00b1889c1e 17-Jul-2014 Robert Shih <robertshih@google.com> M3UParser: check for NULL before setting meta data

Bug:16351654
Change-Id: I64e9510f719b220471522b4d78a9b00a98bda772
ibstagefright/httplive/M3UParser.cpp
dd235727a1b4e283deeb581559f99c2c8889da07 12-Jun-2014 Robert Shih <robertshih@google.com> GenericSource: implement getTrackCount/getTrackInfo

Bug: 15153976
Change-Id: I0204c4188d485cda026497469c7cde24f7bd5c95
ibmediaplayerservice/nuplayer/GenericSource.cpp
ibmediaplayerservice/nuplayer/GenericSource.h
a8454c29b15748964b5eb556d1e23fbb1ee19ceb 14-Jul-2014 Lajos Molnar <lajos@google.com> Fix M3UParser relative path handling.

Bug: 16017037
Change-Id: Ibfff99387fb5b3e721144a2b3f9174092d785137
ibstagefright/httplive/M3UParser.cpp
671160ffe81592efa376dc1ff0fc3f4ddcdebc35 15-Jul-2014 Lajos Molnar <lajos@google.com> stagefright: add MediaCodec.reset()

Bug: 12034929
Change-Id: I326f1356df89474aa088c1c87f8505b33654139d
ibstagefright/MediaCodec.cpp
333f66d4642ddd36b42668da2767551ba25f0248 09-Jul-2014 Jean-Michel Trivi <jmtrivi@google.com> DO NOT MERGE LVM virtualizer: add support for virtualizer capability query

Change-Id: I88106ba25f9b3f8fd7616307ab6b7fbe7afb6e91
(cherry picked from commit bfd3b9764841971be2d2f04a3fdbd41a2144beea)
ibeffects/lvm/wrapper/Bundle/EffectBundle.cpp
ibeffects/lvm/wrapper/Bundle/EffectBundle.h
e580006cd0067109189975c56395d29309d49883 08-Jul-2014 Jesse Hall <jessehall@google.com> Encoder input buffers don't need HW_TEXTURE usage

Change-Id: Ibb1be86ae99439ccbce3fc2b38d92115083ef7ff
ibstagefright/omx/GraphicBufferSource.cpp
f6ef963fecde3b63696028fadce4bcfb5b998db0 02-Jul-2014 Naveen Kumar Ponnusamy <naveenkumar.p@ittiam.com> Resolution reinitialization changes

Decoder initialized to 320x240. When higher resolution comes,
the decoder reinitialized to the resolution.

Bug: 14571712
Change-Id: I6b6ad17dd87f0112ce7ccf4f6c17bb4c65b5d8af
ibstagefright/codecs/hevcdec/SoftHEVC.cpp
ibstagefright/codecs/hevcdec/SoftHEVC.h
e71dcef63a746970d5c11c83207201fe8de02a78 12-Jul-2014 Chong Zhang <chz@google.com> Merge "MediaCodec: change onError cb to return CodecException"
749dafad09d85f2aaf6902a7ff16b4087e3bc4c7 12-Jul-2014 Chong Zhang <chz@google.com> MediaCodec: change onError cb to return CodecException

Bug: 11990118
Change-Id: I3278aecb20df88c42fa2709a66e6166eb3cbe56f
ibstagefright/MediaCodec.cpp
8e6912423c3be3fc2f4bab8ac815f0dce075ded8 12-Jul-2014 Sreeram Ramachandran <sreeram@google.com> Use a better and more direct API to mark a socket as if it were a user's.

Change-Id: If525ee259b74314191d1913f7c2a3e828e05c38f
ibstagefright/Android.mk
ibstagefright/HTTPBase.cpp
c5619c7a6dcc1137fde7520351ad5284e3e958ab 09-Jul-2014 Chong Zhang <chz@google.com> MediaCodec async callbacks

Bug: 11990118

Change-Id: I6fe4b407d9c85cddec8d958620d5d356735273cf
ibstagefright/MediaCodec.cpp
7bad72237b49ac47e77ffe2a89fd26f3d171324c 09-Jul-2014 Lajos Molnar <lajos@google.com> stagefright: add indexed buffer and format getters to MediaCodec

These are designed to be called from the same thread as the one
calling dequeue?Buffer, and use a mutex to avoid switching
context. All other calls of MediaCodec are designed to be blocking
and synchronous.

Bug: 14297827
Change-Id: If341c6e4407ca6f10f5e0d47008dddc0e20b0a50
ibstagefright/MediaCodec.cpp
e125bba94afe74df330c661ab0a64b1e9e2ac5b7 19-Jun-2014 aarti jadhav-gaikwad <agaikwad@nvidia.com> stagefright: Return correct play position after EOS

In case of offload getOutputPlayPositionUs_l returns
zero on reaching EOS. Return duration as position.

Bug: 15770459

Change-Id: I7aeafdc315a86ccd197d555d604e1069eead3153
ibstagefright/AudioPlayer.cpp
2db91ae0e6aa33b50cc924ad65d6dc01876d220f 11-Jul-2014 Chong Zhang <chz@google.com> Merge "MediaCodec async callbacks"
2829edccd7d2bb8244246f316face82b650b8949 18-Jun-2014 aarti jadhav-gaikwad <agaikwad@nvidia.com> stagefright: Pass audio aac sub formats in offloadinfo

Pass audio aac sub formats in offloadinfo according to
aac profile. Audio HAL can take decision about offload
using DSP capabilities

Change-Id: If269a3654b5d2b09c183212b0646ef03e06f2d8f
ibstagefright/AudioPlayer.cpp
ibstagefright/Utils.cpp
94bda64006ed4b5c2c19634a206d29ea936fa81b 11-Jul-2014 Wei Jia <wjia@google.com> Merge "Check meta before dereferencing it."
cd249c40c51584e89e065bf7d51999b04db2eb57 11-Jul-2014 Wei Jia <wjia@google.com> Check meta before dereferencing it.

Change-Id: Ic8153b33413a34d75a3053dbfb9530a639e0ec12
ibstagefright/Utils.cpp
eb062b5a6c98115f36af2dab8ede0efa4469825b 11-Jul-2014 Ruben Brunk <rubenbrunk@google.com> Merge "DNG: Update TiffWriter to handle thumbnails and SubIfds."
4510de26e5361f3a9f07057ec6f26483c888c1fa 29-May-2014 Ruben Brunk <rubenbrunk@google.com> DNG: Update TiffWriter to handle thumbnails and SubIfds.

- Fix SubIfd handling.
- Add StripSources, convenience functions for writing image strips.
- Update Input classes to use with JNI.
- Add skip method.
- Add tag definitions for GPS tags.
- Add name string to tag definitions.

Bug: 15112503

Change-Id: I9535b21261027f6c06a041c1621de8f865a0ad32
mg_utils/include/img_utils/FileInput.h
mg_utils/include/img_utils/Input.h
mg_utils/include/img_utils/StripSource.h
mg_utils/include/img_utils/TagDefinitions.h
mg_utils/include/img_utils/TiffEntry.h
mg_utils/include/img_utils/TiffEntryImpl.h
mg_utils/include/img_utils/TiffHelpers.h
mg_utils/include/img_utils/TiffIfd.h
mg_utils/include/img_utils/TiffWriter.h
mg_utils/src/Android.mk
mg_utils/src/FileInput.cpp
mg_utils/src/Input.cpp
mg_utils/src/StripSource.cpp
mg_utils/src/TiffEntry.cpp
mg_utils/src/TiffEntryImpl.cpp
mg_utils/src/TiffIfd.cpp
mg_utils/src/TiffWriter.cpp
01cab9ce4fb203fab8f5115ff866f9f0cc96a73a 10-Jul-2014 Elliott Hughes <enh@google.com> resolved conflicts for merge of 373e21cc to master

Change-Id: I91afd8f9cba04559d21e1c84e25c5c60c990165d
373e21cc119cede767dc93d75c91645dbf9ae19f 10-Jul-2014 Elliott Hughes <enh@google.com> am be44e0e0: am 0bffd2e6: Merge "Switch frameworks/av/media/libmedia to the new icu."

* commit 'be44e0e0ffda04725c4864d894a7cc80bd74b5ca':
Switch frameworks/av/media/libmedia to the new icu.
be44e0e0ffda04725c4864d894a7cc80bd74b5ca 10-Jul-2014 Elliott Hughes <enh@google.com> am 0bffd2e6: Merge "Switch frameworks/av/media/libmedia to the new icu."

* commit '0bffd2e60f644c8b8650c48d320c8cc22deb8ab6':
Switch frameworks/av/media/libmedia to the new icu.
bc2fb720bbd0acd122bacc67e844e982d068f6f9 09-Jul-2014 Wei Jia <wjia@google.com> Add support of audio offloading for NuPlayer.

Change-Id: Ic83973339fb46a83b48382e6097925f45d200867
ibmediaplayerservice/nuplayer/Android.mk
ibmediaplayerservice/nuplayer/NuPlayer.cpp
ibmediaplayerservice/nuplayer/NuPlayer.h
ibmediaplayerservice/nuplayer/NuPlayerDecoder.h
ibmediaplayerservice/nuplayer/NuPlayerDecoderPassThrough.cpp
ibmediaplayerservice/nuplayer/NuPlayerDecoderPassThrough.h
ibmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
ibmediaplayerservice/nuplayer/NuPlayerRenderer.h
ibmediaplayerservice/nuplayer/NuPlayerSource.h
ibstagefright/Utils.cpp
aae3f86c7c9a3bce5aab0d283343455d58b133b8 09-Jul-2014 Lajos Molnar <lajos@google.com> DO NOT MERGE: Fix build for libstagefright

Bug: 15987446
Change-Id: I6a13e1f73b067b733e2592e12ee21210d4c4d476
ibstagefright/ACodec.cpp
ibstagefright/OMXCodec.cpp
0bffd2e60f644c8b8650c48d320c8cc22deb8ab6 10-Jul-2014 Elliott Hughes <enh@google.com> Merge "Switch frameworks/av/media/libmedia to the new icu."
51bc26144ca9c3872e41f9864622170d528be1b0 10-Jul-2014 Elliott Hughes <enh@google.com> Switch frameworks/av/media/libmedia to the new icu.

Change-Id: I45349756bac6d89b02dba082ba6d606f4c489dcf
ibmedia/Android.mk
782be1ecf1022d4e2da714b5aebe51ab616e9975 09-Jul-2014 Narayan Kamath <narayan@google.com> am 1c1b5e51: am c37eaa32: Merge "m4v_h263_enc: Use uint32_t for ULong"

* commit '1c1b5e51cb1acd43984ce2e82a27e61b4943186a':
m4v_h263_enc: Use uint32_t for ULong
1c1b5e51cb1acd43984ce2e82a27e61b4943186a 09-Jul-2014 Narayan Kamath <narayan@google.com> am c37eaa32: Merge "m4v_h263_enc: Use uint32_t for ULong"

* commit 'c37eaa320437b7d65d1c3f704d7b7c61d4ccd8f1':
m4v_h263_enc: Use uint32_t for ULong
d539e610d0d87964714a4ea2f916d6c693394152 09-Jul-2014 Jean-Michel Trivi <jmtrivi@google.com> Merge "Cleanup unused parameters or variable in EffectBundle"
c24dd75a6baf9448f8a54a671519557fc19d84bd 09-Jul-2014 Narayan Kamath <narayan@google.com> am 782be1ec: am 1c1b5e51: am c37eaa32: Merge "m4v_h263_enc: Use uint32_t for ULong"

* commit '782be1ecf1022d4e2da714b5aebe51ab616e9975':
m4v_h263_enc: Use uint32_t for ULong
7618c5cb2fd60e944307e46afa051987d1e016c6 08-Jul-2014 Jean-Michel Trivi <jmtrivi@google.com> Cleanup unused parameters or variable in EffectBundle

No unused parameter warning in EffectBundle.
Remove unused variable declaration in Virtualizer_getParameter

Change-Id: Ibe1c051bc21ac53a6c770b4aa28e31ac5d559d9b
ibeffects/lvm/wrapper/Bundle/EffectBundle.cpp
82d04827c290c0d7b81840897b6466170a500fa3 09-Jul-2014 Sungsoo Lim <sungsoo@google.com> Merge "Restore the LOOPING flag in onAudioTearDownEvent"
ba5e39b994b44cc458708eedd26c2d50404c9a46 09-Jul-2014 Chong Zhang <chz@google.com> Merge "HLS: do not discard packets when queuing explicit discontinuity"
718cee5f3ba7c0a055fbeced90f26296f8acb117 08-Jul-2014 Chong Zhang <chz@google.com> Merge "handle emulation_prevention_three_bytes for AVC"
e8eb7a885e574858ddfe3dfd836fbe9ce62f92b8 08-Jul-2014 Lajos Molnar <lajos@google.com> Merge "AString: add startsWithIgnoreCase and endsWithIgnoreCase"
862f8455eaacc1ffb5d8911f0bc7ecc3cf7ec46c 27-Jun-2014 Chong Zhang <chz@google.com> handle emulation_prevention_three_bytes for AVC

bug: 15917805
Change-Id: I824fe7eea807f8faba6b149c31890b7a5df87825
ibmediaplayerservice/nuplayer/NuPlayerDecoder.cpp
ibstagefright/foundation/ABitReader.cpp
d8cbe4a024ef54adf043b6ea31fa22271b8b2c51 08-Jul-2014 Lajos Molnar <lajos@google.com> stagefright: update ACodec to use CodecBase enumerations directly

Bug: 11784825
Change-Id: I9f322b78b52bfcc5040fda951486df4354cdba4f
ibstagefright/ACodec.cpp
92cd05b8f2e994aabcdda5d7454c96a707dc9579 07-Jul-2014 Lajos Molnar <lajos@google.com> stagefright: update MediaCodec to use CodecBase instead of ACodec

MediaCodec still creates an ACodec instance in init()

Bug: 11784825
Change-Id: Ifba1e1582c788056c0e59afdf68cd3a504ab3679
ibstagefright/MediaCodec.cpp
05ca3bfb847ff3c1980f2f0922a4d494c0e7ebab 07-Jul-2014 Lajos Molnar <lajos@google.com> stagefright: create CodecBase interface (abstract class)

This abstracts out the ACodec dependency in MediaCodec.

Bug: 11784825
Change-Id: I0aa8b56c6414865fd4b0646e2c5bd1b62d030682
ibstagefright/Android.mk
ibstagefright/CodecBase.cpp
ibstagefright/foundation/AHierarchicalStateMachine.cpp
7df8c0b799d8f52d6386e03313286dbd7d5cdc7c 03-Jul-2014 Glenn Kasten <gkasten@google.com> IAudioFlinger::openRecord now suggests notificationFrames

Change-Id: I08885cc381d03c522a23289e74f0e1ed46563863
ibmedia/AudioRecord.cpp
ibmedia/IAudioFlinger.cpp
2426d11f795a99de85999b3ff0a26cc070a99a59 16-Jun-2014 Ashok Bhat <ashok.bhat@arm.com> m4v_h263_enc: Use uint32_t for ULong

ULong is used in the encoder code as 32-bit unsigned integer type.
But it has been defined as an unsigned long, which will be 64-bit
on 64-bit platforms. This causes many problems including output
mismatch between 32-bit and 64-bit code and crash in certain cases.

This patch defines ULong as uint32_t. In addition, it uses uintptr_t
at places where an address is cast to an integer to check for alignment.

Change-Id: I2b0086824a5985b9fc4628ce6fbe81db156e37d2
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
ibstagefright/codecs/m4v_h263/enc/SoftMPEG4Encoder.cpp
ibstagefright/codecs/m4v_h263/enc/include/mp4enc_api.h
ibstagefright/codecs/m4v_h263/enc/src/motion_comp.cpp
ibstagefright/codecs/m4v_h263/enc/src/mp4def.h
7f44751f95e722f7c628652bdacfa2bb5f510591 02-Jul-2014 Robert Shih <robertshih@google.com> Merge "MatroskaExtractor: track specific seeking"
d9d7fa0873796ac661c44a7fcd6ad5ff697ff01f 24-Jun-2014 Jean-Michel Trivi <jmtrivi@google.com> Support for audio attributes on audio output of media player

Change-Id: Iae4995c98e64add1ab9e6c8ae6501515032755f5
ibmedia/AudioTrack.cpp
ibmedia/mediaplayer.cpp
ibmediaplayerservice/MediaPlayerService.cpp
ibmediaplayerservice/MediaPlayerService.h
3a8d3eae3899f8923e3386aaa015b24ef6739489 23-Jun-2014 Sungsoo Lim <sungsoo@google.com> Restore the LOOPING flag in onAudioTearDownEvent

Bug: 15728572
Change-Id: Ib8d118a148a7bb74531c8c025dae479c0a86efcb
ibstagefright/AwesomePlayer.cpp
4ce87ac008bcd6a1004ca416f6d7031ba813078f 28-Jun-2014 Rachad <rachad@google.com> Merge "Add HEVC encoder support to ACodec"
632740c58119a132ce19f6d498e39c5c3773971a 26-Jun-2014 Chong Zhang <chz@google.com> HLS: do not discard packets when queuing explicit discontinuity

in case of explicit discontinuity (#EXT-X-DISCONTINUITY tag in the
playlist), do not discard packets that's already queued.

(when seeking, the old fetcher will be discarded so this won't affect
seeking case.)

Bug: 15020526
Change-Id: I5d3fc489df35e3bc44acb1ee7851571cb99cb56b
ibmediaplayerservice/nuplayer/GenericSource.cpp
ibmediaplayerservice/nuplayer/RTSPSource.cpp
ibstagefright/httplive/PlaylistFetcher.cpp
ibstagefright/mpeg2ts/ATSParser.cpp
ibstagefright/mpeg2ts/AnotherPacketSource.cpp
ibstagefright/mpeg2ts/AnotherPacketSource.h
a5a103c579d5ecde233e04c00c90f4d15b216f29 26-Jun-2014 Marco Nelissen <marcone@google.com> Fix AAC timestamps

When playing an mpeg-2 transport stream with AAC audio, there will be
more than one packet per input buffer, resulting in multiple output
buffers for each input buffers. Additional timestamps needs to be
generated in that case.

b/15755476

Change-Id: I2df50b0cb3690eb36d56871daa1263de0028db06
ibstagefright/codecs/aacdec/SoftAAC2.cpp
ibstagefright/codecs/aacdec/SoftAAC2.h
e8f2c6cfe9afc5b303ab6b0fb51e18ddce512b54 26-Jun-2014 Chong Zhang <chz@google.com> Merge "HLS: only queue discontinuity for first block"
98f28cde0d5d682956b5e6b119823e7e8d40415b 19-Jun-2014 Mark Salyzyn <salyzyn@google.com> ndk: 64-bit compile warnings

Change-Id: I214973a97547bf714e56e4596359cb2bd9cdea9c
dk/NdkMediaCodec.cpp
dk/NdkMediaExtractor.cpp
dk/NdkMediaFormat.cpp
a5750e0dad9e90f2195ce36f2c4457fa04b2b83e 19-Jun-2014 Mark Salyzyn <salyzyn@google.com> libstagefright: 64-bit compile warnings

Change-Id: I3d1146714fa23be3d4e696599b6f70cac1f9d28b
ibstagefright/AACWriter.cpp
ibstagefright/AMRWriter.cpp
ibstagefright/AudioPlayer.cpp
ibstagefright/AudioSource.cpp
ibstagefright/AwesomePlayer.cpp
ibstagefright/CameraSource.cpp
ibstagefright/CameraSourceTimeLapse.cpp
ibstagefright/DataURISource.cpp
ibstagefright/ESDS.cpp
ibstagefright/MPEG2TSWriter.cpp
ibstagefright/MPEG4Extractor.cpp
ibstagefright/MPEG4Writer.cpp
ibstagefright/MediaBuffer.cpp
ibstagefright/MediaCodec.cpp
ibstagefright/MediaCodecSource.cpp
ibstagefright/MediaMuxer.cpp
ibstagefright/NuCachedSource2.cpp
ibstagefright/NuMediaExtractor.cpp
ibstagefright/OggExtractor.cpp
ibstagefright/StagefrightMetadataRetriever.cpp
ibstagefright/SurfaceMediaSource.cpp
ibstagefright/TimedEventQueue.cpp
ibstagefright/Utils.cpp
ibstagefright/VBRISeeker.cpp
ibstagefright/WAVExtractor.cpp
ibstagefright/codecs/on2/enc/SoftVPXEncoder.cpp
ibstagefright/omx/GraphicBufferSource.cpp
ibstagefright/omx/OMXMaster.cpp
1130c49ee00e2faf0e21152da88cda07299232da 26-Jun-2014 Chong Zhang <chz@google.com> HLS: only queue discontinuity for first block

Bug: 15020526
Change-Id: I15f9ab0f38dc510e584c668eea73ece61844d413
ibstagefright/httplive/PlaylistFetcher.cpp
c8efda9e9cd61dfe8e486c93fa8940b77cc3cceb 20-May-2014 Rachad <rachad@google.com> Add HEVC encoder support to ACodec

Bug: 14571712
Change-Id: Idaec2394d569541f3963befe722f46f6b0007937
ibstagefright/ACodec.cpp
d239cb6e6898bdf2300e9038111727a9056c58ee 19-Jun-2014 Mark Salyzyn <salyzyn@google.com> mtp: 64-bit compile warnings

Change-Id: I9ebc270c990d2f83311cec8fef8f1d2842ebf291
tp/MtpServer.cpp
tp/MtpStorageInfo.cpp
76e4e02d6b6c1da140b8cbe48fc58035d2b7d311 24-Jun-2014 Mark Salyzyn <salyzyn@google.com> am 940c688d: Merge "libmediaplayerservice: unused argument warning messages"

* commit '940c688d76828ffd83929c661e75b5197903d30f':
libmediaplayerservice: unused argument warning messages
840797f674f7c38d5215d0bcf0f4547c4e9a6957 24-Jun-2014 Mark Salyzyn <salyzyn@google.com> am 76e4e02d: am 940c688d: Merge "libmediaplayerservice: unused argument warning messages"

* commit '76e4e02d6b6c1da140b8cbe48fc58035d2b7d311':
libmediaplayerservice: unused argument warning messages
fd1e188dc142a8a7adf36e854aa60464faedf0a0 17-Dec-2013 Xiaosong Wei <xiaosong.wei@intel.com> DO NOT MERGE: Fix for SW video decoder OMX profile/level query

get the correct profile index from the input param and pass it to
profileLevel array to get the corresponding profile/level

Change-Id: I582961c0afb53c1781af7fb94226a23e5fdb96cf
Signed-off-by: Xiaosong Wei <xiaosong.wei@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
ibstagefright/omx/SoftVideoDecoderOMXComponent.cpp
dcd89ecad321e2e052322fe2b1907d50d762b311 24-Jun-2014 Marco Nelissen <marcone@google.com> Improve MTP error checking

Change-Id: I1ab02ca0e99a1c284411fb368a773fb481d72ab2
tp/MtpServer.cpp
247d9ebdbe7f165644f308745eee061fcbb77771 23-Jun-2014 Mark Salyzyn <salyzyn@google.com> libmediaplayerservice: unused argument warning messages

Change-Id: I7dbf62858114ac9b8de6d7b66cc00e002769a5cf
ibmediaplayerservice/MediaPlayerFactory.cpp
ibmediaplayerservice/MediaPlayerFactory.h
ibmediaplayerservice/MetadataRetrieverClient.cpp
ibmediaplayerservice/MidiFile.h
c27f5259cf2c45ea6f0a021fc17578f32f6c2f7d 23-Jun-2014 Marco Nelissen <marcone@google.com> am 620f348f: am da69fdbb: Merge "Fix buffer allocation"

* commit '620f348faf3ce0c39e71338a005f1528765f4d1e':
Fix buffer allocation
620f348faf3ce0c39e71338a005f1528765f4d1e 23-Jun-2014 Marco Nelissen <marcone@google.com> am da69fdbb: Merge "Fix buffer allocation"

* commit 'da69fdbbeb79885a3c063a2017bd6d2848fcc312':
Fix buffer allocation
215ebcddf7216d15fde34f9a32d27f280d1b19d3 23-Jun-2014 Marco Nelissen <marcone@google.com> Merge "Parse trex and mehd boxes"
c1f4b2b73fe9432cb75ce1dd368475a2867e70ed 17-Jun-2014 Marco Nelissen <marcone@google.com> Parse trex and mehd boxes

Also get duration from mvhd if available, use that in addition to track
durations to determine total length of file, clear track header
struct so we don't read uninitialized garbage from it, and take
composition time offset into account for proper ordering when B frames
are used.

b/15669839

Change-Id: Ibf3e35b5c7299bac11d0e78a391545fc325dd2d0
ibmediaplayerservice/nuplayer/GenericSource.cpp
ibstagefright/AwesomePlayer.cpp
ibstagefright/MPEG4Extractor.cpp
ibstagefright/include/MPEG4Extractor.h
ebb1081a624a773a67c49b279c775e18e693c4fc 23-Jun-2014 Marco Nelissen <marcone@google.com> Fix buffer allocation

b/15293123

Change-Id: Icb3ceabf02a55bc931baaf388ce125db6332de0e
tp/MtpDataPacket.cpp
7b6c7b89241397261d52602cbeaa559962efbfec 20-Jun-2014 Mark Salyzyn <salyzyn@google.com> libeffects: 64-bit compile warnings

Change-Id: I210129f5742b046f7ceef48194f039352eff596d
ibeffects/lvm/wrapper/Bundle/EffectBundle.cpp
ibeffects/lvm/wrapper/Reverb/EffectReverb.cpp
0f6a0435713c435e1aaeacbfd9ce7abb6a5b19a9 19-Jun-2014 Mark Salyzyn <salyzyn@google.com> libnbaio: 64-bit compile warnings

Change-Id: I9517c32193031dcc7af7b2104e985d66805b84aa
ibnbaio/MonoPipe.cpp
ibnbaio/NBAIO.cpp
77342f72fdf96603938a95fcbb9888ec90e71e68 19-Jun-2014 Mark Salyzyn <salyzyn@google.com> libmediaplayerservice: 64-bit compile warnings

Change-Id: I333e52dc377becc774f3fa971c230ecb55ea8d7b
ibmediaplayerservice/MediaPlayerService.cpp
ibmediaplayerservice/MetadataRetrieverClient.cpp
ibmediaplayerservice/MidiFile.cpp
34fb29696b0f3abf61b10f8d053b1f33d501de0a 19-Jun-2014 Mark Salyzyn <salyzyn@google.com> libmedia: 64-bit compile warnings

Change-Id: I600f062fa7148c01851023c1240c39939e648002
ibmedia/AudioRecord.cpp
ibmedia/AudioSystem.cpp
ibmedia/AudioTrack.cpp
ibmedia/AudioTrackShared.cpp
ibmedia/CharacterEncodingDetector.cpp
ibmedia/IMediaMetadataRetriever.cpp
ibmedia/IMediaRecorder.cpp
ibmedia/MediaProfiles.cpp
ibmedia/SoundPool.cpp
ibmedia/mediametadataretriever.cpp
ibmedia/mediaplayer.cpp
ibmedia/mediarecorder.cpp
2f46e8152fb881d3a1d7afd223f1ed51f6e358b8 12-Jun-2014 Robert Shih <robertshih@google.com> MatroskaExtractor: track specific seeking

Divide cues based on tracks to support track specific seeking.

Bug: 15595215
Change-Id: Ibb853b0955c62af72243ed29253f939d07628ae4
ibstagefright/Android.mk
ibstagefright/matroska/MatroskaExtractor.cpp
ibstagefright/matroska/MatroskaExtractor.h
ab5cdbaf65ca509681d2726aacdf3ac8bfb6b3fa 10-Jun-2014 Eric Laurent <elaurent@google.com> AudioTrack: add support for compressed audio

Add support for compressed audio playback by use
of an AudioTrack attached to a direct output thread.

Bug: 9428304.

Change-Id: I4a61be9cf0e31003ca85935d6e0ee38ca8192e03
ibmedia/AudioTrack.cpp
3c1da7224155516a08d94598eb64b64204bf10f8 18-Jun-2014 Lajos Molnar <lajos@google.com> AString: add startsWithIgnoreCase and endsWithIgnoreCase

Change-Id: I340159aa14d4d3d28ea675c6c5b8a82f7e731069
ibstagefright/foundation/AString.cpp
29a8b2fe294a34ac7f004203426961a599e725ea 19-Jun-2014 Jean-Michel Trivi <jmtrivi@google.com> Merge changes I0fef0584,I322b91fa

* changes:
AudioPolicyManager: return output for audio attributes
AudioTrack construction with audio attributes
5bd3f38638acab633d181359cc9ec27b80f84d43 14-Jun-2014 Jean-Michel Trivi <jmtrivi@google.com> AudioPolicyManager: return output for audio attributes

In AudioPolicyManager, support querying an output
or playback strategy for audio attributes,
instead of a stream type,
In AudioTrack creation, use the output returned
for the track's attributes.

Change-Id: I0fef05845ba676404775e2e338c10e6a96237268
ibmedia/AudioSystem.cpp
ibmedia/AudioTrack.cpp
ibmedia/IAudioPolicyService.cpp
faabb51ceef13bf1e3f692219ac410c1cd75d0de 12-Jun-2014 Jean-Michel Trivi <jmtrivi@google.com> AudioTrack construction with audio attributes

Store audio attributes in AudioTrack class.
When an AudioTrack is "set" with non null audio
attributes, derive a stream type that reflects
the attributes.
When an AudioTrack is "set" without attributes,
and only has a stream type, derive default
audio attributes.

Change-Id: I322b91fa9a7e193118960c5e78cdddd85d66f9ad
ibmedia/AudioTrack.cpp
7a4d7d6670f1766442b54045fb420dbf42b75750 18-Jun-2014 Marco Nelissen <marcone@google.com> Merge "Fail more gracefully on allocation failure"
8da8b2e80ccdb10ff2445f503829f803d3a6ab9f 13-Jun-2014 Marco Nelissen <marcone@google.com> Fail more gracefully on allocation failure

Check allocations when the size is read from a file and might therefore
be invalid.

b/14388161

Change-Id: Ia08cc0a6107f275a70e793ef3b50c0ce16ceeee0
ibstagefright/MPEG4Extractor.cpp
3a227969f604d7c6a24a795661a13f70a5f37e1f 17-Jun-2014 Marco Nelissen <marcone@google.com> Merge "Fix logging"
3ea91c9593c2c792f96682f436b587c278fe228c 16-Jun-2014 Chong Zhang <chz@google.com> Merge "support for CEA-608 closed caption"
7791cf11186a22b3f84d98cfde67393bee748cb0 10-Jun-2014 Marco Nelissen <marcone@google.com> Fix logging

Make the log message specify whether it was an encoder or a decoder
that failed to instantiate.

Change-Id: Ie357775114c8dea722d87381c13affdfb19dcde4
ibstagefright/ACodec.cpp
a7fa1d9530b6870f2c7850e3025d7db963661803 11-Jun-2014 Chong Zhang <chz@google.com> support for CEA-608 closed caption

Bug: 15470448

Change-Id: Ic6a527f5c35a8ee0a08a5b043336e4d193216083
ibmediaplayerservice/nuplayer/NuPlayer.cpp
ibmediaplayerservice/nuplayer/NuPlayer.h
ibmediaplayerservice/nuplayer/NuPlayerDecoder.cpp
ibmediaplayerservice/nuplayer/NuPlayerDecoder.h
ibstagefright/MediaDefs.cpp
ibstagefright/mpeg2ts/ESQueue.cpp
404fced9bfa8fa423ee210a271ca051ffd1bec13 11-Jun-2014 Chong Zhang <chz@google.com> refactor getTrackInfo()

(this is in preparation for supporting other cc source)

- split into two methods: getTrackCount() and getTrackInfo()

- move track info parcelling to NuPlayer

- parcel in the mime type of the subtitle format

Bug: 15470448
Change-Id: If00724d8c3a2b2319cb9c5f29d3fe76347bfe947
ibmediaplayerservice/nuplayer/HTTPLiveSource.cpp
ibmediaplayerservice/nuplayer/HTTPLiveSource.h
ibmediaplayerservice/nuplayer/NuPlayer.cpp
ibmediaplayerservice/nuplayer/NuPlayer.h
ibmediaplayerservice/nuplayer/NuPlayerSource.h
ibstagefright/MediaDefs.cpp
ibstagefright/httplive/LiveSession.cpp
ibstagefright/httplive/LiveSession.h
ibstagefright/httplive/M3UParser.cpp
ibstagefright/httplive/M3UParser.h
ba7a4e11a66a7044dbbd767983865e1774092dc6 13-Jun-2014 Narayan Kamath <narayan@google.com> am 90732a3b: Merge "Remove dependency on Parcel::{read,write}IntPtr"

* commit '90732a3be5e70156486aca94bde8aa81106329ba':
Remove dependency on Parcel::{read,write}IntPtr
8b8e5d45928aed8592d321fe55f560e35a4fece8 13-Jun-2014 Narayan Kamath <narayan@google.com> resolved conflicts for merge of cbd74fcb to klp-modular-dev-plus-aosp

Change-Id: I00270ef6fe813c0d3649483cbc3aba6af789e033
bdb8ef09f119c3fa8cc751babd483e942ad17749 16-Jun-2014 Chong Zhang <chz@google.com> Merge "refactor getTrackInfo()"
9c68ac03f16cc32625f6965e869432eae4fded2d 13-Jun-2014 Jean-Michel Trivi <jmtrivi@google.com> Merge "AudioSystem: remove unused stream type"
20d16a8af2dc95e827be693edabde4f09eb90c32 13-Jun-2014 Eric Laurent <elaurent@google.com> am 3bcffa13: force command flush after releasing a reference to shared memory

* commit '3bcffa136909c1fb6e88ee4efd12ccac18360a85':
force command flush after releasing a reference to shared memory
3bcffa136909c1fb6e88ee4efd12ccac18360a85 13-Jun-2014 Eric Laurent <elaurent@google.com> force command flush after releasing a reference to shared memory

After releasing a reference to a shared memory interface,
IPCThreadState::self()->flushCommands() must be called to ensure
that the corresponding reference is also cleared immediately in the
remote process. Otherwise the binder implementaiton will not
push the clear systematically causing the memory region not to be freed.

See issues 10711502 and 2801375.

Bug: 14057166.
Change-Id: If55f36f00d452d6cf00cf83bd2fba1c8f3abcb57
ibmedia/AudioRecord.cpp
ibmedia/AudioTrack.cpp
7903bb2b3065d58cc75637900922b434f50024d9 12-Jun-2014 Elliott Hughes <enh@google.com> am 2a8270e6: am c323737d: Merge "Offer a type-safe album art interface."

* commit '2a8270e6944fb3addfcba87f6885aaad196b8b88':
Offer a type-safe album art interface.
2a8270e6944fb3addfcba87f6885aaad196b8b88 12-Jun-2014 Elliott Hughes <enh@google.com> am c323737d: Merge "Offer a type-safe album art interface."

* commit 'c323737dd46d724b4c1ec230b283f26ae2a22b4f':
Offer a type-safe album art interface.
b7f24b101d43139b4c747129bfbc4ecf5c468b86 11-Jun-2014 Jean-Michel Trivi <jmtrivi@google.com> AudioSystem: remove unused stream type

The audio stream type is not used in the getSampleRate() and
getFrameCount() methods.

Change-Id: I3d065ae272bd039204cd323cdab9b60460034f2d
ibmedia/AudioSystem.cpp
ibmedia/AudioTrack.cpp
8b1be2ca7cee71a4920d5d31fdcbad2b1d4ca49d 02-May-2014 Andy Hung <hunga@google.com> Update OMX messages for 64 bit

Change node_id and buffer_id to uint32_t.
Ensure IOMX messages are fixed size.
Remove 64 bit compile warnings in associated files.

Change-Id: Icdbef00aca575e5dc502ebb52e3ce7d0d7883203
Signed-off-by: Andy Hung <hunga@google.com>
ibmedia/IOMX.cpp
ibstagefright/ACodec.cpp
ibstagefright/MediaCodec.cpp
ibstagefright/OMXClient.cpp
ibstagefright/OMXCodec.cpp
ibstagefright/include/OMX.h
ibstagefright/include/OMXNodeInstance.h
ibstagefright/omx/OMX.cpp
ibstagefright/omx/OMXNodeInstance.cpp
c323737dd46d724b4c1ec230b283f26ae2a22b4f 12-Jun-2014 Elliott Hughes <enh@google.com> Merge "Offer a type-safe album art interface."
f3e80dddd7376aa9deeb27de25e1d50030a2ad98 11-Jun-2014 Elliott Hughes <enh@google.com> Offer a type-safe album art interface.

Bug: 15514223
Change-Id: Iddfc33a00e6cd3779ca09c01a55f62b151f6ec95
ibmedia/MediaScanner.cpp
ibmediaplayerservice/MetadataRetrieverClient.cpp
ibstagefright/StagefrightMediaScanner.cpp
ibstagefright/StagefrightMetadataRetriever.cpp
ca44dc79b5a163030ab0963f80aa771871de092d 11-Jun-2014 Christopher Ferris <cferris@google.com> am 8d6d8f54: Merge "Add libcrypto for users of libstagefright."

* commit '8d6d8f546c1d6c55b79b454c720c03a80c738444':
Add libcrypto for users of libstagefright.
7dc5bfcf42cfb59025f615f494e29ff9e55990cc 11-Jun-2014 Christopher Ferris <cferris@google.com> Add libcrypto for users of libstagefright.

libstagefright_rtsp uses some MD5 functions that used to be in bionic,
but it was removed recently. As an initial fix, I statically linked in
libcrypto_static to the libstagefright_rtsp library. However, I think
it's better to modify the single user of this library to link against
the shared libcrypto library.

Change-Id: Iaf2e1aeea32fd8af038f6e77bf58ea7df50d807a
ibmediaplayerservice/Android.mk
ibstagefright/rtsp/Android.mk
8756d415b6c31ec72caf912910248fa7ab709d25 11-Jun-2014 Wei Jia <wjia@google.com> Merge "Added paused state to NuPlayerDecoder" into lmp-preview-dev
c5a66b77adcdfa2a403dfddc5ef3469fada75683 12-Jun-2014 Jeff Tinker <jtinker@google.com> Merge "Remove dependency on Parcel::{read,write}IntPtr"
b9e55c4f17a91f070f78fb9fd72c08e461526e9e 11-Jun-2014 Christopher Ferris <cferris@google.com> am ca44dc79: am 8d6d8f54: Merge "Add libcrypto for users of libstagefright."

* commit 'ca44dc79b5a163030ab0963f80aa771871de092d':
Add libcrypto for users of libstagefright.
77fc9bbc4163c7ec7ac4b0dabf4f84325cca8473 11-Jun-2014 Zhijun He <zhijunhe@google.com> Merge "MediaProfiles: Add 4K video related constants"
11cbb06b35cbcb488c7f39b71886ce379e57f867 11-Jun-2014 Christopher Ferris <cferris@google.com> resolved conflicts for merge of 281b884c to master

Change-Id: If8924939bdf54d3a9e6a4876a05d0672c27cf8ef
ef0cf50343f8a6d74894f96f5ecb5eec4c5f1bc6 11-Jun-2014 Chong Zhang <chz@google.com> Log an error when audio/video encoder failed to create

Change-Id: I493981cddeb9452c533e2917d8c440897d5e6b49
related-to-bug: 15106730
ibmediaplayerservice/StagefrightRecorder.cpp
5f6af1a8e34381ca2ac2527fcefe220a22f49b53 10-Jun-2014 Zhijun He <zhijunhe@google.com> MediaProfiles: Add 4K video related constants

Bug: 15287656
Change-Id: I4c49640a349afb336f52db1636902fc216bff6ad
ibmedia/MediaProfiles.cpp
d7e8d9a7393b5429f8f13a6794b9b04d37390fb5 05-Jun-2014 Marco Nelissen <marcone@google.com> Guard against malformed files

b/15433074

Change-Id: I35363def42d38eba49dd5aece566fd345743937e
ibstagefright/MPEG4Extractor.cpp
90732a3be5e70156486aca94bde8aa81106329ba 13-Jun-2014 Narayan Kamath <narayan@google.com> Merge "Remove dependency on Parcel::{read,write}IntPtr"
1766b08d35a45e12a13b264a5944e1b622b8715b 10-Jun-2014 Jeff Tinker <jtinker@google.com> Remove dependency on Parcel::{read,write}IntPtr

bug: 15424960
bug: 15107693

(cherry picked from commit bcca9e072c1f288a53ce6862936f57dc36488f96)

Change-Id: I3ba59fccb184e99a07f6f82ccdbd00e5204901f6
ibmedia/ICrypto.cpp
bcca9e072c1f288a53ce6862936f57dc36488f96 10-Jun-2014 Jeff Tinker <jtinker@google.com> Remove dependency on Parcel::{read,write}IntPtr

bug: 15424960
bug: 15107693

Change-Id: Ic3bf37f591e620985c37f345f9a5544fd20ec4a1
ibmedia/ICrypto.cpp
6d96582e2310212381489da68bee74c44a0a5926 05-Jun-2014 Wei Jia <wjia@google.com> Added paused state to NuPlayerDecoder

This prevents decoder from requesting new buffer until the decoder
is resumed, and prevents processing a potential DISCONTINUITY while
the player is still flushing.

Bug: 13133027

Change-Id: I2f9fa9f00c8583aa6908809cb7c31ddde07cfaf0
(cherry picked from commit 704e72658b1082264a26a83c50046da34f07d1a1)
ibmediaplayerservice/nuplayer/NuPlayerDecoder.cpp
ibmediaplayerservice/nuplayer/NuPlayerDecoder.h
47a2377ec07ad4ec06ecd25bfd45a37df91e68e6 10-Jun-2014 Marco Nelissen <marcone@google.com> Merge "Remove unneeded code"
ed83915060af3eaaf62feef2eb2eec1e7d431891 06-Jun-2014 Marco Nelissen <marcone@google.com> Remove unneeded code

Change-Id: I33c7424f1858e9f3f7f7ab5fb46db09c2714e02e
ibstagefright/codecs/aacdec/SoftAAC2.cpp
281b884c42fb6c2ba225009af3ecb4d84fbcc607 10-Jun-2014 Christopher Ferris <cferris@google.com> am d3af4265: Merge "Link libcrypto for MD5_* functions."

* commit 'd3af4265dca4c8ebcead5376f1c73a5dafc34778':
Link libcrypto for MD5_* functions.
67ae86eea1aeb574ca19ec6b37d6e4dd7170e4c4 10-Jun-2014 Christopher Ferris <cferris@google.com> Link libcrypto for MD5_* functions.

Change-Id: I5dce8f041b9faf035161b82d5e46bd46166bd05c
ibstagefright/rtsp/Android.mk
3e648747e7e40752580ae7fd0ff2e803623680cd 07-Jun-2014 Lajos Molnar <lajos@google.com> add back HEVC SoftOMX decoder

Bug: 14571712
Change-Id: Iea399e0cfec1f78584c74089f01821d8552ced40
ibstagefright/codecs/hevcdec/Android.mk
ibstagefright/codecs/hevcdec/SoftHEVC.cpp
ibstagefright/codecs/hevcdec/SoftHEVC.h
bd856d78a407853f7779decbcf965f832ee99c31 07-Jun-2014 Lajos Molnar <lajos@google.com> Remove SoftOMX HEVC decoder

Bug: 14571712
Change-Id: Ie3fb3743ec27a0cfdea612052ba15a06f2c891db
ibstagefright/codecs/hevcdec/Android.mk
ibstagefright/codecs/hevcdec/SoftHEVC.cpp
ibstagefright/codecs/hevcdec/SoftHEVC.h
62df539321b3079f5ff11bb6aeaaab75ef307d40 07-Jun-2014 Lajos Molnar <lajos@google.com> am 8a454611: Merge "stagefright: added support, and SoftOMX decoder, for HEVC" into lmp-preview-dev

* commit '8a45461198c69e9e15f133c2e11ded47fc4c708b':
stagefright: added support, and SoftOMX decoder, for HEVC
8a45461198c69e9e15f133c2e11ded47fc4c708b 07-Jun-2014 Lajos Molnar <lajos@google.com> Merge "stagefright: added support, and SoftOMX decoder, for HEVC" into lmp-preview-dev
3b5a6b9fa6c6825a1d0b441429e2bb365b259827 20-May-2014 Harish Mahendrakar <harish.mahendrakar@ittiam.com> stagefright: added support, and SoftOMX decoder, for HEVC

also fixed QuerySupportedProfileLevels in
SoftVideoDecoderOMXComponent.cpp

Bug: 14571712
Change-Id: Ifa3793f7c1b18ac5e8c0a096848c998cabd9e777
ibstagefright/MPEG4Extractor.cpp
ibstagefright/OMXCodec.cpp
ibstagefright/Utils.cpp
ibstagefright/codecs/hevcdec/Android.mk
ibstagefright/codecs/hevcdec/SoftHEVC.cpp
ibstagefright/codecs/hevcdec/SoftHEVC.h
ibstagefright/data/media_codecs_google_video.xml
ibstagefright/omx/SoftOMXPlugin.cpp
ibstagefright/omx/SoftVideoDecoderOMXComponent.cpp
e5fc7320c12f353d61b1cf7de1c5ec2b1a1c1055 06-Jun-2014 Marco Nelissen <marcone@google.com> Merge "Guard against malformed files"
22e4b319da44a86bbda41a2e68eb55f01729b23c 06-Jun-2014 Chong Zhang <chz@google.com> Merge "do not drop TS packet on discontinuity at payload start"
66830855846db5c211c2da6c055ca9b4167e8974 05-Jun-2014 Chong Zhang <chz@google.com> do not drop TS packet on discontinuity at payload start

Bug: 15470543

Change-Id: Ia96a295fbc7e9f1b1d5c0d9091ac62184d44dcfa
ibstagefright/mpeg2ts/ATSParser.cpp
1fffa73d5c8f8dec9ea237159ae21a624722eb18 06-Jun-2014 Chong Zhang <chz@google.com> Merge "check camera permission for video source other than SURFACE"
1cfe8ce28eafd5ff758adbb73bfb257503d7704b 05-Jun-2014 Chong Zhang <chz@google.com> check camera permission for video source other than SURFACE

Bug: 15448704
Change-Id: I5f5417037b877a6da3a46700ebb5a80ea59aac36
ibmediaplayerservice/MediaRecorderClient.cpp
a91b538853e94191fbceab5f5050940dd6b96577 05-Jun-2014 Marco Nelissen <marcone@google.com> Guard against malformed files

b/15433074

Change-Id: I35363def42d38eba49dd5aece566fd345743937e
ibstagefright/MPEG4Extractor.cpp
a78df9591c698834f3d57f6e882e4b0af5f8f473 06-Jun-2014 Marco Nelissen <marcone@google.com> Merge "Make AAC decoder behavior after flush consistent with non-flush"
475300b8ac5438b5037ac088ff599394e9658022 06-Jun-2014 Marco Nelissen <marcone@google.com> Make AAC decoder behavior after flush consistent with non-flush

Timestamps don't start at zero, but at least they're consistent.

Change-Id: I2ce9cd60655a4ece787802902b679fda01cb6182
ibstagefright/codecs/aacdec/SoftAAC2.cpp
f7ceda1957d83f41f9af6c1991ee4cb767574349 06-Jun-2014 Marco Nelissen <marcone@google.com> am 270facca: We still need the raw codec

* commit '270facca297275a4889d1cc49ec4d2768ed38bb7':
We still need the raw codec
270facca297275a4889d1cc49ec4d2768ed38bb7 06-Jun-2014 Marco Nelissen <marcone@google.com> We still need the raw codec

It's used for FLAC and PCM Wav, which output PCM data.
b/15320804

Change-Id: I67921a45dd4a3a175fce412e055728859e2309ba
ibstagefright/data/media_codecs_google_audio.xml
5981fc5acb23eecf659bed49f29354b440cbb68e 05-Jun-2014 Wei Jia <wjia@google.com> Merge "Added paused state to NuPlayerDecoder"
704e72658b1082264a26a83c50046da34f07d1a1 05-Jun-2014 Wei Jia <wjia@google.com> Added paused state to NuPlayerDecoder

This prevents decoder from requesting new buffer until the decoder
is resumed, and prevents processing a potential DISCONTINUITY while
the player is still flushing.

Bug: 13133027

Change-Id: I2f9fa9f00c8583aa6908809cb7c31ddde07cfaf0
ibmediaplayerservice/nuplayer/NuPlayerDecoder.cpp
ibmediaplayerservice/nuplayer/NuPlayerDecoder.h
4fa0bb24d51a8af69db9796f909fee6b61428cf4 05-Jun-2014 Eric Laurent <elaurent@google.com> Merge "add sound trigger native service"
03873edded28f88b5bdbe44fbf2e5ca071c6f10e 05-Jun-2014 Lajos Molnar <lajos@google.com> am 9042b116: Merge "MediaCodecList: remove force-added codecs for videoeditor" into lmp-preview-dev

* commit '9042b116b62a287bb86a18af6b428c7a2b7720aa':
MediaCodecList: remove force-added codecs for videoeditor
1a392aa114a7aeacc0464b56d4392449b8782542 05-Jun-2014 Glenn Kasten <gkasten@google.com> Merge "Squashed commit of the following:" into lmp-preview-dev
cb3d3a365c91ed996c47dea6ff1490f2f13c1b52 05-Jun-2014 Lajos Molnar <lajos@google.com> am 17a6dd60: DO NOT MERGE: MediaCodecList: remove force-added codecs for videoeditor

* commit '17a6dd60f5f8a28af1db451bcbf44805648c844a':
DO NOT MERGE: MediaCodecList: remove force-added codecs for videoeditor
88010cc278ce9fae87e97cea25ea22bc28c9e7ff 05-Jun-2014 Ruben Brunk <rubenbrunk@google.com> am cc839bd4: Merge "DNG: Fix OpcodeList2 length field." into lmp-preview-dev

* commit 'cc839bd4727be02d9352f46d043a7e9cc9c7d642':
DNG: Fix OpcodeList2 length field.
9042b116b62a287bb86a18af6b428c7a2b7720aa 05-Jun-2014 Lajos Molnar <lajos@google.com> Merge "MediaCodecList: remove force-added codecs for videoeditor" into lmp-preview-dev
c263ca0ad8b6bdf5b0693996bc5f2f5916e0cd49 05-Jun-2014 Glenn Kasten <gkasten@google.com> Squashed commit of the following:

commit 9128d6ffec43731d723f9b394f243d940f4c7e41
Author: Glenn Kasten <gkasten@google.com>
Date: Tue May 13 10:38:42 2014 -0700

Use of fast capture by normal capture

Will only configure fast capture path if the input buffer size is less than
10 ms and the input sample rate is same as the primary output sample rate.

Change-Id: I4a7cdc6069d750845412c626d27e83f72a1ab397

commit 2e5e0806a5abe7499848358ef5fde5c26405000d
Author: Glenn Kasten <gkasten@google.com>
Date: Mon Jun 2 08:29:22 2014 -0700

Add mPrimaryOutputSampleRate

Change-Id: I46b527fc3f2b5a5720a74b4f0b9a8f2e0d570b09

commit baf1d73467923996d1b1f2a9237260cc5697e050
Author: Andy Hung <hunga@google.com>
Date: Fri May 30 10:42:03 2014 -0700

Change parameter type for volume to float in AudioMixer

Change-Id: I4da1505ce852505f86f8e5b87f60e8edceeb30e0

commit 40fe20fa9760cd03c69778c2021cf7a490d75ece
Author: Andy Hung <hunga@google.com>
Date: Fri May 30 10:35:47 2014 -0700

Rename UNITY_GAIN to UNITY_GAIN_INT in AudioMixer

Change-Id: Ic040311305026f0b4c4280a5b3bef7a447ac1da3

commit 37c9a2b49f876abc5ff537a9ec036d7f0a423775
Author: Andy Hung <hunga@google.com>
Date: Thu May 29 21:33:13 2014 -0700

Refactor setVolumeRampVariables in AudioMixer

Change-Id: I8fcf3101bcea292de7c65433fa578f1c9cdd0974

commit 397070eca31f121d5d3993de1bfea99aaea5d4f3
Author: Andy Hung <hunga@google.com>
Date: Thu May 29 18:52:38 2014 -0700

Fix floating point output from mixer

A buffer pointer was being erroneously reset to buffer start,
potentially causing an audio glitch. The floating point
output mode is not enabled at this time, but will be in
the future.

Change-Id: If8b6414d232f064f3a2e2c5a6da889a91b27fb24

commit 2e61aa5b33b2247bbc5d4eaa0b519df9accd4bbc
Author: Andy Hung <hunga@google.com>
Date: Fri May 23 21:22:17 2014 -0700

Add multiple format capability to FastMixer

Floating point data from MixerThread into FastMixer.
Multiple output format capability from FastMixer to Sink.

Change-Id: I0da17810ee71381a39a006c46faec71108d22c26

commit b9ea653c702a785bbd23a66c5e588d40b4192c4e
Author: Andy Hung <hunga@google.com>
Date: Thu May 29 15:53:09 2014 -0700

Avoid resetting BufferProviders in mixer unnecessarily

Change-Id: Iad85c4dfd21be1dbf89dc11906106b34219376f8

commit 7f1a6d6da21c616f80cf9ba21bea11b419ec561b
Author: Andy Hung <hunga@google.com>
Date: Tue May 27 12:32:17 2014 -0700

Update dynamic resampler buffer fetching

Make the criteria tight for fetching to avoid storing
excessive frame data internal to the resampler.
This should reduce jitter in frame delivery computation.

Bug: 14962343
Change-Id: I7adaf714d11c272696ccdbf218bda994c7217477

commit b5e4aac07b9a02f0c803c090058602b03ac09ebb
Author: Glenn Kasten <gkasten@google.com>
Date: Tue May 27 12:30:54 2014 -0700

Allow kFastTrackMultiplier to be specified per device

Change-Id: I4eaaaf038df720cec4f5d9221d1b632970f9e3dd

commit b93cd97a52af31122df2da2cc0415cda888c8c73
Author: Andy Hung <hunga@google.com>
Date: Fri May 23 21:13:31 2014 -0700

Rename mixBuffer to mMixerBuffer in FastMixer

Likewise mixBufferState becomes mMixerBufferState.
This harmonizes with the naming in AF::MixerThread.

Change-Id: I1255d7c07cc2c6ee925d7430925236d2bd163122

commit 8340758622b9711365a8801806cbdf934803c63f
Author: Andy Hung <hunga@google.com>
Date: Mon May 12 16:51:41 2014 -0700

Add multiple format capability to AudioMixer

Change-Id: I04ac1cafd90b6ed652f8d51888ad07576678f0bc
Signed-off-by: Andy Hung <hunga@google.com>

commit 6b695b9d094820c232a897a3fabbe83d2b7193fe
Author: Glenn Kasten <gkasten@google.com>
Date: Thu Mar 13 14:59:31 2014 -0700

Start adding FastCapture based on FastThread WIP

This version supports at most one fast capture client.

Change-Id: Idf609bfc80ae22433433d66a5232c043c65506df

commit e951ad05a2c388471d7e2806d91e7d51325a150a
Author: Glenn Kasten <gkasten@google.com>
Date: Mon May 12 11:06:26 2014 -0700

Move validation of frameCount from set to openRecord_l

This move is needed because frameCount is validated on server side for
fast tracks (as should be done for normal tracks too).

Change-Id: I6d99e80869fd90fab373cf60ef348c01f075fbca

commit 73e76992dbba794894837c38e5472312ea829cf3
Author: Glenn Kasten <gkasten@google.com>
Date: Tue May 13 10:41:52 2014 -0700

Allow track buffer "allocation" to be from pipe

Change-Id: Ib9ac170f8e8b7746b3588157a56cbee3b753a1cb

commit 60de1d7ded05c6304037d4858b401094b1d2b4d3
Author: Andy Hung <hunga@google.com>
Date: Fri May 9 15:02:21 2014 -0700

Add format parameter to getTrackName() and track_t

Change-Id: Ia152a839014e235fbfb656104c15d7c1b456d02e
Signed-off-by: Andy Hung <hunga@google.com>

Change-Id: Ied0ade8b25d23e89bb03319a7e3135c238f735b9
ibmedia/AudioRecord.cpp
ibmedia/AudioTrackShared.cpp
e40ed90293eeb0feecb5b7729cf24f8ecea9b412 05-Jun-2014 Eric Laurent <elaurent@google.com> am 26594add: Merge "audio policy: new setAudioPortConfig implementation" into lmp-preview-dev

* commit '26594add1ec0b6255c96b39e43ccdc95b2c480aa':
audio policy: new setAudioPortConfig implementation
cc839bd4727be02d9352f46d043a7e9cc9c7d642 05-Jun-2014 Ruben Brunk <rubenbrunk@google.com> Merge "DNG: Fix OpcodeList2 length field." into lmp-preview-dev
3fe1435e28dc6959e410740feea89ca1bf4f4fc1 05-Jun-2014 Ruben Brunk <rubenbrunk@google.com> DNG: Fix OpcodeList2 length field.

Bug: 15432434
Change-Id: I2a0e017f72c31cdbd30df1fdb32cdd5ff4af3649
mg_utils/src/DngUtils.cpp
b7a11d83f749ad0200778c4815e907d011d4b5d3 19-Apr-2014 Eric Laurent <elaurent@google.com> add sound trigger native service

Change-Id: I0cd954c1c7d28a334e786d0004431d4f6a1227ec
ediaserver/Android.mk
ediaserver/main_mediaserver.cpp
ee777157c12a02e7350e18d49f7571b1222dfa69 03-Jun-2014 Ruben Brunk <rubenbrunk@google.com> DNG: Add additional TIFF/EP tag definitions.

Bug: 15112503
Change-Id: Ib06d9a5e70e6e3d5063a95a7109538ef64f03334
mg_utils/include/img_utils/TagDefinitions.h
26594add1ec0b6255c96b39e43ccdc95b2c480aa 04-Jun-2014 Eric Laurent <elaurent@google.com> Merge "audio policy: new setAudioPortConfig implementation" into lmp-preview-dev
a121f90f388343dc48793cbc7eb899aba42e7664 03-Jun-2014 Eric Laurent <elaurent@google.com> audio policy: new setAudioPortConfig implementation

Rewrite setAudioPortConfig() to take advantage of the new
AudioPortConfig class.

The configuration is now checked against AudioPort capabilities
and stored in the AudioPortConfig.

Fix a bug where the config mask was not set properly when calling
setAudioPortConfig at the PatchPanel interface.

Remove debug log in IAudioPolicyService.

Bug: 14815883.
Change-Id: I7eb7683a96e049581c13f2a212486507883d008d
ibmedia/IAudioPolicyService.cpp
0d843fdc91c98d447c3c3e357020d07b783c7bc0 04-Jun-2014 Marco Nelissen <marcone@google.com> Merge "Fix typos, remove callback functions - do not merge" into lmp-preview-dev
63141c4356b4f885d3926247df508df3515e41a7 03-Jun-2014 Marco Nelissen <marcone@google.com> Fix typos, remove callback functions - do not merge

b/15414091
Change-Id: I2f7b7ea6a7943a808de2c6a54fe810eefdee133e
dk/NdkMediaCodec.cpp
dk/NdkMediaCrypto.cpp
dk/NdkMediaDrm.cpp
dk/NdkMediaExtractor.cpp
dk/NdkMediaFormat.cpp
dk/NdkMediaMuxer.cpp
61378ccba48bb826988cdc585b264fdd999e1e6a 04-Jun-2014 Ruben Brunk <rubenbrunk@google.com> Merge "DNG: Add additional TIFF/EP tag definitions." into lmp-preview-dev
f3e7f11f419eef7cba752936e637b4f1b70267f4 03-Jun-2014 Narayan Kamath <narayan@google.com> am b6af7c63: am 05eaf105: Merge "Mp3decoder: Remove unused arm assembly files"

* commit 'b6af7c635113d288d16a4f549679beffd86822d8':
Mp3decoder: Remove unused arm assembly files
b6af7c635113d288d16a4f549679beffd86822d8 03-Jun-2014 Narayan Kamath <narayan@google.com> am 05eaf105: Merge "Mp3decoder: Remove unused arm assembly files"

* commit '05eaf105a2a1445c2c13801ee4533ded47f1df1b':
Mp3decoder: Remove unused arm assembly files
05eaf105a2a1445c2c13801ee4533ded47f1df1b 03-Jun-2014 Narayan Kamath <narayan@google.com> Merge "Mp3decoder: Remove unused arm assembly files"
8c472f09e49884146ef7d83917ec482208d320c2 03-Jun-2014 Ruben Brunk <rubenbrunk@google.com> DNG: Add additional TIFF/EP tag definitions.

Bug: 15112503
Change-Id: Ib06d9a5e70e6e3d5063a95a7109538ef64f03334
mg_utils/include/img_utils/TagDefinitions.h
6dbb5e3336cfff1ad51d429fcb847307c06efd61 13-May-2014 Glenn Kasten <gkasten@google.com> Use of fast capture by normal capture

Will only configure fast capture path if the input buffer size is less than
10 ms and the input sample rate is same as the primary output sample rate.

Change-Id: I4a7cdc6069d750845412c626d27e83f72a1ab397
ibmedia/AudioTrackShared.cpp
cc19c8b58a48a0d090ea9d9897664f9817e7bac1 02-Jun-2014 Robert Shih <robertshih@google.com> Merge "MPEG4Extractor: guard against missing stbl."
24c01a8417fe195e5ba2187dbbdf9bd1e3a6553f 02-Jun-2014 Marco Nelissen <marcone@google.com> Merge "Disable verbose logging"
72aa32f7dbbfb658097930b57659d8e50f24a953 31-May-2014 Eric Laurent <elaurent@google.com> resolved conflicts for merge of b52c152d to master

Change-Id: I34869bda071d511c9595ea0a5ff6571eb34da059
cf570853ee36eeb58be38ea3dac16a17c6a5d4ba 30-May-2014 Mark Salyzyn <salyzyn@google.com> am 0289d545: am 6ed77c13: am 2d0e8d8f: Merge "libcpustats: Turn on -Werror"

* commit '0289d54520ba66b0d7f0913a89a524c89a01b87e':
libcpustats: Turn on -Werror
0289d54520ba66b0d7f0913a89a524c89a01b87e 30-May-2014 Mark Salyzyn <salyzyn@google.com> am 6ed77c13: am 2d0e8d8f: Merge "libcpustats: Turn on -Werror"

* commit '6ed77c130d80fe607ec91ada4cf5718d512b4ad5':
libcpustats: Turn on -Werror
6ed77c130d80fe607ec91ada4cf5718d512b4ad5 30-May-2014 Mark Salyzyn <salyzyn@google.com> am 2d0e8d8f: Merge "libcpustats: Turn on -Werror"

* commit '2d0e8d8f75369b491362f2ea3a6efd5159df404c':
libcpustats: Turn on -Werror
fc3afda925f4b493ef68a745fdd753d9330316ad 30-May-2014 Mark Salyzyn <salyzyn@google.com> libcpustats: Turn on -Werror

- Switch to static_assert from deprecated utils/Debug.h
- Turn on C++11 standard
- Turn on -Werror

Change-Id: I4f1c08bbcaf1ad3a97502cde756a2f42bcece789
ibcpustats/Android.mk
ibcpustats/ThreadCpuUsage.cpp
c7a11b2208aa8f1e6a39eb70a136fbc0dafd3260 30-May-2014 Marco Nelissen <marcone@google.com> Disable verbose logging

Change-Id: If9c87615707ed67f209258f9207d56f671cd0f08
dk/NdkMediaCodec.cpp
dk/NdkMediaCrypto.cpp
dk/NdkMediaDrm.cpp
dk/NdkMediaExtractor.cpp
dk/NdkMediaFormat.cpp
dk/NdkMediaMuxer.cpp
b52c152d553556b2d227ffc943489de0c60b4b02 20-May-2014 Eric Laurent <elaurent@google.com> audio policy: add routing update client interface

Added IAudioPolicyServiceClient client binder interface
for client process to receive notifications from AudioPolicyService
when audio ports are added/removed or audio patches created/released.

The audio patches owned by a given client are automatically released when
this client binder dies.

Bug: 14815883.

Change-Id: I6013f6aec03b50565cffb1ad2cd1f0f8852032c5
ibmedia/Android.mk
ibmedia/AudioSystem.cpp
ibmedia/IAudioPolicyService.cpp
ibmedia/IAudioPolicyServiceClient.cpp
65734fba3029d2c75ed4e3f030d75b7c03eea4b0 29-May-2014 Jean-Michel Trivi <jmtrivi@google.com> Merge "AAC decoder: compensate limiter delay"
d4838ed14a169f5981c0adc2edcb24559a913fe6 21-May-2014 Jean-Michel Trivi <jmtrivi@google.com> AAC decoder: compensate limiter delay

Add decoder limiter delay compensation to decoder wrapper
Includes a wrapper function for SoftAAC2.cpp which selects
DRC-related decoder parameters according to information in the bitstream
and desired DRC characteristics for different playback modes.

Bug 9428126

Change-Id: I5041b68760e95cf54073c3addf2b6026b9cfe8c5
ibstagefright/codecs/aacdec/Android.mk
ibstagefright/codecs/aacdec/DrcPresModeWrap.cpp
ibstagefright/codecs/aacdec/DrcPresModeWrap.h
ibstagefright/codecs/aacdec/SoftAAC2.cpp
ibstagefright/codecs/aacdec/SoftAAC2.h
798ce934571bc7eb5715bf1c03cbe5436a1220e3 29-May-2014 Marco Nelissen <marcone@google.com> Merge "getSampletime -> getSampleTime"
eb4860c305def68c5965474bb43c67c2c9d49bbb 29-May-2014 Marco Nelissen <marcone@google.com> getSampletime -> getSampleTime

Change-Id: I87aaa87be068d414903a0e1e22bfe4183cf45ab0
dk/NdkMediaExtractor.cpp
dcec687af73ee38d8e0053a378b6bc7d5efe0bb8 29-May-2014 Lajos Molnar <lajos@google.com> MediaCodecList: remove force-added codecs for videoeditor

Bug: 15320804
Change-Id: I1c2f0f75aeaabc20cb94e79e47b70f7faefe0a9e
ibstagefright/MediaCodecList.cpp
17a6dd60f5f8a28af1db451bcbf44805648c844a 29-May-2014 Lajos Molnar <lajos@google.com> DO NOT MERGE: MediaCodecList: remove force-added codecs for videoeditor

Bug: 15320804
Change-Id: I1c2f0f75aeaabc20cb94e79e47b70f7faefe0a9e
ibstagefright/MediaCodecList.cpp
32f93b7bedc44b425ba99d69dec998334e759532 28-May-2014 Vignesh Venkatasubramanian <vigneshv@google.com> DO NOT MERGE: libstagefright: Add Opus support to ACodec::getPortFormat

Bug: 15114855
Change-Id: Idb184ae15986450423fc8cf116cf077600b3ea67
(cherry picked from commit 8c6693b73cb4aed9d1dcb8d5d0828a77b7471a55)
ibstagefright/ACodec.cpp
a26e58ef564b26c9eef610c8bd747836a5ad4c47 29-May-2014 Lajos Molnar <lajos@google.com> Merge "libstagefright: Add Opus support to ACodec::getPortFormat"
8c6693b73cb4aed9d1dcb8d5d0828a77b7471a55 28-May-2014 Vignesh Venkatasubramanian <vigneshv@google.com> libstagefright: Add Opus support to ACodec::getPortFormat

Bug: 15114855
Change-Id: Idb184ae15986450423fc8cf116cf077600b3ea67
ibstagefright/ACodec.cpp
dd114d19f65d8a5cdfddbaf6d3ef8119c6169b28 29-May-2014 Marco Nelissen <marcone@google.com> Fix some NuPlayer issues.

Fixes OnSeekCompleted callback and calling getDuration immediately
after prepare().

Change-Id: Ie58c509005cded278a0e50c87240b0a2d920b7d7
ibmediaplayerservice/nuplayer/NuPlayer.cpp
ibmediaplayerservice/nuplayer/NuPlayerDriver.cpp
203b1a18a806e2c56c701aac49cda963bccfad5b 01-Apr-2014 Eric Laurent <elaurent@google.com> DO NOT MERGE - IAudioPolicyService interface extension for patch panel

Change-Id: I0a62e5416edc41c3a0e816275085ab18a23066f1
ibmedia/AudioSystem.cpp
ibmedia/IAudioPolicyService.cpp
1cda6afaf6207a41303e653a6ecd7909d73186eb 11-Apr-2014 Eric Laurent <elaurent@google.com> DO NOT MERGE - IAudioFlinger interface extension for patch panel

Change-Id: Iaabe0a7e315d5725e00a74a6ed40339b98f20330
ibmedia/IAudioFlinger.cpp
5584c58c7c952b5ed891bbff3b00a0be3f96196d 28-May-2014 Eric Laurent <elaurent@google.com> Merge "IAudioPolicyService interface extension for patch panel"
5e49780692b4f23966be89ac32b19c3c1ead4e85 28-May-2014 Eric Laurent <elaurent@google.com> Merge "IAudioFlinger interface extension for patch panel"
7b2b401a1decf286890171a6791b7a6aa8b80ca7 27-May-2014 Marco Nelissen <marcone@google.com> Merge "Remove codec callback for now."
8670c31fddbeadcf9627aa970c69a823f13939ff 01-Apr-2014 Eric Laurent <elaurent@google.com> IAudioPolicyService interface extension for patch panel

Change-Id: I0a62e5416edc41c3a0e816275085ab18a23066f1
ibmedia/AudioSystem.cpp
ibmedia/IAudioPolicyService.cpp
4b123406c10c17852734a1b691bb9ce2a4cb7caf 11-Apr-2014 Eric Laurent <elaurent@google.com> IAudioFlinger interface extension for patch panel

Change-Id: Iaabe0a7e315d5725e00a74a6ed40339b98f20330
ibmedia/IAudioFlinger.cpp
5912117110ae6efadd862fcb0e395fdcd18aa00c 27-May-2014 Glenn Kasten <gkasten@google.com> Merge "Move validation of frameCount from set to openRecord_l"
bd278f7c631fb4ce698e6cbcbdd34d879302b4c1 23-May-2014 Ashok Bhat <ashok.bhat@arm.com> Mp3decoder: Remove unused arm assembly files

The unused ARM assembly files were written for
legacy proprietary ARM compilers. They are not
needed when gcc or clang compiler is used.

Change-Id: I8dfe9ad458efbb34922094e943ad334cc34f59a3
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
ibstagefright/codecs/mp3dec/src/asm/pvmp3_dct_9_arm.s
ibstagefright/codecs/mp3dec/src/asm/pvmp3_mdct_18_arm.s
ibstagefright/codecs/mp3dec/src/asm/pvmp3_mdct_18_wm.asm
ibstagefright/codecs/mp3dec/src/asm/pvmp3_polyphase_filter_window_arm.s
ibstagefright/codecs/mp3dec/src/asm/pvmp3_polyphase_filter_window_wm.asm
e22a64b6887240fc9910d6fc8afb0e6f81507047 24-May-2014 Marco Nelissen <marcone@google.com> Remove codec callback for now.

Change-Id: I7ef3c1fc7aa1bfec958e6ea58bf95ae35a575e91
dk/NdkMediaCodec.cpp
24ffe7a9161943c8ba2353e956653a71af564b5d 23-May-2014 Elliott Hughes <enh@google.com> am 79262cfc: am 5b756bfd: am 8b187f4a: Merge "Move frameworks/av off <sys/atomics.h>."

* commit '79262cfc14a9d8b5aa29d43e84ea91eedb9492ba':
Move frameworks/av off <sys/atomics.h>.
29b703eec27b305e7b5b2343bf257643e38f6b68 12-May-2014 Glenn Kasten <gkasten@google.com> Move validation of frameCount from set to openRecord_l

This move is needed because frameCount is validated on server side for
fast tracks (as should be done for normal tracks too).

Change-Id: I6d99e80869fd90fab373cf60ef348c01f075fbca
ibmedia/AudioRecord.cpp
79262cfc14a9d8b5aa29d43e84ea91eedb9492ba 23-May-2014 Elliott Hughes <enh@google.com> am 5b756bfd: am 8b187f4a: Merge "Move frameworks/av off <sys/atomics.h>."

* commit '5b756bfdaa27c8b606720544bf507213cf47376d':
Move frameworks/av off <sys/atomics.h>.
5b756bfdaa27c8b606720544bf507213cf47376d 23-May-2014 Elliott Hughes <enh@google.com> am 8b187f4a: Merge "Move frameworks/av off <sys/atomics.h>."

* commit '8b187f4acea8d7e517ff9ced32fc7368bdbaa6e0':
Move frameworks/av off <sys/atomics.h>.
63492411cf4abff452b47f59ec7ff6f3e9925c84 22-May-2014 Elliott Hughes <enh@google.com> Move frameworks/av off <sys/atomics.h>.

Bug: 14903517
Change-Id: I92cdfc618d83fd914cfb558a07b1deae0255fccb
ibstagefright/MediaBuffer.cpp
87cebadd48710e42474756fc3513df678de045ce 22-May-2014 Elliott Hughes <enh@google.com> resolved conflicts for merge of f285c91e to master

Change-Id: I4c995e297d09c0854a42142cc57dce8b771acf65
f285c91efbae23783fe94dc5ad19a2560e157685 22-May-2014 Calin Juravle <calin@google.com> am c10b874c: am d5516339: Merge "Move frameworks/av from fdprintf to POSIX dprintf."

* commit 'c10b874c4d0d6208fb93a7aa0dc8af4418faad45':
Move frameworks/av from fdprintf to POSIX dprintf.
c10b874c4d0d6208fb93a7aa0dc8af4418faad45 22-May-2014 Calin Juravle <calin@google.com> am d5516339: Merge "Move frameworks/av from fdprintf to POSIX dprintf."

* commit 'd551633916d3677da4dda10aba6837bdc6803ee0':
Move frameworks/av from fdprintf to POSIX dprintf.
8b5f642eb2364ea7fe46a5b3af51b48b58f12183 22-May-2014 Elliott Hughes <enh@google.com> Move frameworks/av from fdprintf to POSIX dprintf.

Bug: 11156955
Change-Id: Ia98cd16b4c1f7be87cf060b7456de4f40896bacb
ibnbaio/NBLog.cpp
e348c5b72ad889389c7c1c900c121f0fbee221b5 22-May-2014 Elliott Hughes <enh@google.com> resolved conflicts for merge of c0bf836f to master

Change-Id: I5cf238fa56d6fff443b212870cf9dd7f1110e7da
c0bf836f8a4e34d66c10a2bb8b8cee0db04790cc 22-May-2014 Elliott Hughes <enh@google.com> am ad71caf2: am 3b6da6bf: Merge "Move frameworks/av off private API."

* commit 'ad71caf25e31ecfc4ecf2c925e38fd87905fbc8e':
Move frameworks/av off private API.
ad71caf25e31ecfc4ecf2c925e38fd87905fbc8e 22-May-2014 Elliott Hughes <enh@google.com> am 3b6da6bf: Merge "Move frameworks/av off private API."

* commit '3b6da6bfb50a1c0324fb4c87326d3a477944d5fe':
Move frameworks/av off private API.
ee499291404a192b059f2e04c5afc65aa6cdd74c 22-May-2014 Elliott Hughes <enh@google.com> Move frameworks/av off private API.

Bug: 11156955
Change-Id: Ib3bb9d66a2bf92977c2445b62aa074a2d7a45aea
ibmedia/AudioTrackShared.cpp
9382378b6b271949bdce527ea3da748c13c4c692 22-May-2014 Elliott Hughes <enh@google.com> resolved conflicts for merge of b1080917 to master

Change-Id: Iabbe3e95e29f28461ff722b550e8a9f35bd2528f
b108091734ee7668084cc1063187c2b10ddb7bb7 22-May-2014 Elliott Hughes <enh@google.com> am acbd9492: am d084206d: Merge "Move frameworks/av off __futex_syscall3."

* commit 'acbd9492996348bf4565fbaa5a14772f0f4ace38':
Move frameworks/av off __futex_syscall3.
d83062287758be57d1d0908b30bb18aa9b367f38 22-May-2014 Eric Laurent <elaurent@google.com> Merge "audio policy: split audio policy library"
acbd9492996348bf4565fbaa5a14772f0f4ace38 22-May-2014 Elliott Hughes <enh@google.com> am d084206d: Merge "Move frameworks/av off __futex_syscall3."

* commit 'd084206d5a4a5364211af46e4201311933e83bfc':
Move frameworks/av off __futex_syscall3.
77e1512aee8092069514973379a59a318e721be3 22-May-2014 Elliott Hughes <enh@google.com> Move frameworks/av off __futex_syscall3.

Bug: 11156955
Change-Id: I943080bc51b6efa781059b48b5b5ecc4fa287512
ibmedia/AudioTrackShared.cpp
7ac0039611ea7ea18f9545f96a8f5cb31dcdebe5 21-May-2014 Marco Nelissen <marcone@google.com> Merge "Remove the last of the references."
98c6be0e30fa28e752b13f3dd5986d41710bb7ae 21-May-2014 Eric Laurent <elaurent@google.com> audio policy: split audio policy library

Split audio policy library into a service part and a policy part.
This will allow OEMs to customize the policy part:
- libaudiopolicyservice for the service.
- libaudiopolicymanager for the policy.

Two build options can be defined in device make file to select
the policy library:
- USE_LEGACY_AUDIO_POLICY = 1: this will use the legacy policy
in hardware/libhardware_legacy implemented by AudioPolicyManagerBase class.
This policy is loaded as a harware module and exposes the audio policy HAL
defined in include/hardware/audio_policy.h and is in a library called
audio_policy.XXX.so (e.g audio_policy.default.so)

The legacy HAL will not be updated with new features.

If USE_LEGACY_AUDIO_POLICY is not defined, the policy is implemented by
a class named AudioPolicyManager exposing an interface defined in
AudioPolicyInterface.h.
The corresponding library is libaudiopolicymanager.so.

New features will be added only to AudioPolicyInterface.h

The default implementation is provided here in file AudioPolicyManager.cpp

OEMs wanting to cutomize the policy can implement the AudioPolicyManager class
and provide the libaudiopolicymanager.so library.
In this case the device make file should define:
- USE_CUSTOM_AUDIO_POLICY = 1

For now, USE_LEGACY_AUDIO_POLICY = 1 is forced in audio policy service make file.
This will be removed when the new audio policy is enabled.

Change-Id: I066799dacc9b182b468a43d48ff7798c9109a414
ediaserver/Android.mk
0e03cf07deeda10c573657479591dcfbf1efca56 21-May-2014 Marco Nelissen <marcone@google.com> Remove the last of the references.

Change-Id: Id68cdab7e972e3e78e2065e56b8a095c3d496df2
dk/NdkMediaMuxer.cpp
a8570374fad5547ad27a1bbb5dbedbde5b1a7de5 20-May-2014 Marco Nelissen <marcone@google.com> Merge "Use pointers instead of references because C"
34d632f3e8381caebc838ef09feda3bf403dfa2a 20-May-2014 Andy Hung <hunga@google.com> Merge "Fix OGG recognition for 64 bit"
18a1b5904b352cedef29b95169a1226140d38576 20-May-2014 Marco Nelissen <marcone@google.com> Use pointers instead of references because C

Change-Id: I5c84469e5ff977bf8bb91be2cc6c38a0c7f08609
dk/NdkMediaDrm.cpp
14ead787204a1bfc13e92067691efaefd624fcae 20-May-2014 Andy Hung <hunga@google.com> Fix OGG recognition for 64 bit

Change-Id: I4cef86ca05e06f508929d109a52e375169c33bf9
ibmediaplayerservice/MediaPlayerFactory.cpp
93c6fa7508cd0f5bb0ec80ea29ef8bfab4a6015f 20-May-2014 Marco Nelissen <marcone@google.com> Merge "Add docs, releaseOutputBufferAtTime, seekTo."
ddde219f2f93c1d81ff1cfaf4d3d31d95156f7a3 20-May-2014 Rachad <rachad@google.com> Merge "Add HEVC decoder support to ACodec bug: 14571712"
b4db73d022f3de3530bc2b3c9c831ccfdd1a2ead 20-May-2014 Andy Hung <hunga@google.com> Merge "Use new channel count functions for audio masks"
1e54e6dfc1bb8d33089ed8857f0f194e696f85e2 19-May-2014 Glenn Kasten <gkasten@google.com> Merge "Pass stereo gains as packed minifloat"
ce171998009e1abcb0c718c0aee495fcd33645e2 19-May-2014 Robert Shih <robertshih@google.com> MPEG4Extractor: guard against missing stbl.

Bug: 14320131
Change-Id: I33f65117c9c5365bddd96bb41cc4379a0c7ebcbd
ibstagefright/MPEG4Extractor.cpp
79e2b622702fb148ccff12d6f38643466555c4eb 16-May-2014 Marco Nelissen <marcone@google.com> Add docs, releaseOutputBufferAtTime, seekTo.

Change-Id: Iadd231b63e75b7937c13d2ebfef47aedeaeef5a1
dk/NdkMediaCodec.cpp
dk/NdkMediaExtractor.cpp
c56f3426099a3cf2d07ccff8886050c7fbce140f 22-Mar-2014 Glenn Kasten <gkasten@google.com> Pass stereo gains as packed minifloat

This will allow (eventually) a greater dynamic range for gains.
However there are still a few remaining places in effects and mixer
that will also need to be changed in order to get the full benefit.

Also fixes a minor bug: was not checking for NaN in AudioTrack C++.

Change-Id: I63bce9e82e0a61546d8ff475fb94bcb700d99c96
ibmedia/AudioTrack.cpp
ibmedia/AudioTrackShared.cpp
ediaserver/Android.mk
272b7f26c300d2029f278cf2af523cf94e513b89 17-May-2014 Ruben Brunk <rubenbrunk@google.com> Fix warnings, re-enable -Werror.

Change-Id: Ic6b1a10f46f980f9a9d8d130600419a792703c44
mg_utils/include/img_utils/TiffEntryImpl.h
mg_utils/include/img_utils/TiffIfd.h
mg_utils/src/Android.mk
mg_utils/src/TiffEntryImpl.cpp
mg_utils/src/TiffIfd.cpp
22fcacaf30e157037e6651241c7b3a45f075daa0 17-May-2014 Ruben Brunk <rubenbrunk@google.com> Fixbuild

Change-Id: I4379964731b671f36a1e239b0f7665f595ac1c2d
mg_utils/src/Android.mk
e507721000647a7d8afe44c63ef7fd04ef8971b1 29-Apr-2014 Ruben Brunk <rubenbrunk@google.com> camera2: Adding TIFF writing utilities.

Adds a native image utilities library with support for:
- Writing TIFF 6.0 and TIFF EP compliant file headers.
- Additional tags defined in EXIF 2.3 and DNG 1.4 specs.

Change-Id: I7a4fef74bd5254d92baf08a3cf61af5de1b7ca83
mg_utils/Android.mk
mg_utils/include/img_utils/ByteArrayOutput.h
mg_utils/include/img_utils/DngUtils.h
mg_utils/include/img_utils/EndianUtils.h
mg_utils/include/img_utils/FileInput.h
mg_utils/include/img_utils/FileOutput.h
mg_utils/include/img_utils/Input.h
mg_utils/include/img_utils/Orderable.h
mg_utils/include/img_utils/Output.h
mg_utils/include/img_utils/Pair.h
mg_utils/include/img_utils/SortedEntryVector.h
mg_utils/include/img_utils/TagDefinitions.h
mg_utils/include/img_utils/TiffEntry.h
mg_utils/include/img_utils/TiffEntryImpl.h
mg_utils/include/img_utils/TiffHelpers.h
mg_utils/include/img_utils/TiffIfd.h
mg_utils/include/img_utils/TiffWritable.h
mg_utils/include/img_utils/TiffWriter.h
mg_utils/src/Android.mk
mg_utils/src/ByteArrayOutput.cpp
mg_utils/src/DngUtils.cpp
mg_utils/src/EndianUtils.cpp
mg_utils/src/FileInput.cpp
mg_utils/src/FileOutput.cpp
mg_utils/src/Input.cpp
mg_utils/src/Orderable.cpp
mg_utils/src/Output.cpp
mg_utils/src/SortedEntryVector.cpp
mg_utils/src/TiffEntry.cpp
mg_utils/src/TiffEntryImpl.cpp
mg_utils/src/TiffIfd.cpp
mg_utils/src/TiffWritable.cpp
mg_utils/src/TiffWriter.cpp
e541269be94f3a1072932d51537905b120ef4733 16-May-2014 Andy Hung <hunga@google.com> Use new channel count functions for audio masks

Change-Id: Ia658ab4b6320d19fdb50f123c930918724ff0ef3
Signed-off-by: Andy Hung <hunga@google.com>
ibeffects/downmix/EffectDownmix.c
ibeffects/preprocessing/PreProcessing.cpp
ibeffects/visualizer/EffectVisualizer.cpp
ibmedia/AudioRecord.cpp
ibmedia/AudioTrack.cpp
ibnbaio/AudioStreamInSource.cpp
ibnbaio/AudioStreamOutSink.cpp
c1a4e7cfd07ae8e9c227a97fb4315f035b0ccef9 16-May-2014 Andreas Huber <andih@google.com> am 6b787cb8: am 1b8b8793: am 3059e27d: Merge "libstagefright foundation: fix uninitialized varibale warning"

* commit '6b787cb8ddde9d411cab0964062d5d942a710ff8':
libstagefright foundation: fix uninitialized varibale warning
6b787cb8ddde9d411cab0964062d5d942a710ff8 16-May-2014 Andreas Huber <andih@google.com> am 1b8b8793: am 3059e27d: Merge "libstagefright foundation: fix uninitialized varibale warning"

* commit '1b8b8793c0e86865df456c3d26f969b1498041db':
libstagefright foundation: fix uninitialized varibale warning
1b8b8793c0e86865df456c3d26f969b1498041db 16-May-2014 Andreas Huber <andih@google.com> am 3059e27d: Merge "libstagefright foundation: fix uninitialized varibale warning"

* commit '3059e27d0e18a427f3c19889aac86ea31ec0d5d1':
libstagefright foundation: fix uninitialized varibale warning
7c96d53a65085f42ac2b6d416cbc16fd36ed72ff 16-May-2014 Marco Nelissen <marcone@google.com> Fix build.

Change-Id: I2b0a3049c81b99ba233d5945e16dcddd975aa4f9
dk/NdkMediaDrm.cpp
5362ba070797c52a18d3cb5558cd41d1a72c74c5 15-May-2014 Marco Nelissen <marcone@google.com> Merge "Unify error/status codes"
e419d7cd5c62b4b5866a45d59c5770bb470193c1 15-May-2014 Marco Nelissen <marcone@google.com> Unify error/status codes

Change-Id: Ib90cc2f2adc07ff146256931c92c0ec4becb86f5
dk/NdkMediaCodec.cpp
dk/NdkMediaCrypto.cpp
dk/NdkMediaDrm.cpp
dk/NdkMediaExtractor.cpp
dk/NdkMediaFormat.cpp
dk/NdkMediaMuxer.cpp
16a25c150c49c730d206167012a24cbd9eb3a082 15-May-2014 Jeff Tinker <jtinker@google.com> Merge "Hook up event handling in NDK MediaDrm API"
47aea1f7c58f5302b16822f9e7e1763f2af04ef5 15-May-2014 Lajos Molnar <lajos@google.com> ACodec: remove PTS log spam

Bug: 14976517
Bug: 11784827
Change-Id: Ibc1bbd80e7aac30b0f8f1e9ca2be1bb3e5e2ebbb
ibstagefright/ACodec.cpp
ibstagefright/MediaCodec.cpp
3305b99ec3804c740aecd2ab6d1edd5c6137b7c6 15-May-2014 Jeff Tinker <jtinker@google.com> Hook up event handling in NDK MediaDrm API

Change-Id: I48ac1d3ca5405c5909454c7a553917b31b9a50e5
dk/NdkMediaDrm.cpp
5d5f8a5d3cf24b5dcf1267ef512b24caa695787a 14-May-2014 Amit Pundir <amit.pundir@linaro.org> libstagefright foundation: fix uninitialized varibale warning

gcc-4.9 reports warning for this uninitialized variable
and -Werror make this warning fatal.

Change-Id: I6901362246d53deeded78fa38ad656b167705346
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
ibstagefright/foundation/ANetworkSession.cpp
d25b89d1e417082b7e4ee9db7c08ab8095d48d87 15-May-2014 Andy Hung <hunga@google.com> Merge "Send 64 bit OMX codec handling to 32 bit MediaServer"
f87e30fe71752dc431d8e8d5682c38271c03265a 14-May-2014 Andy Hung <hunga@google.com> Send 64 bit OMX codec handling to 32 bit MediaServer

This is a temporary fix for 64 bit OMX handling until 64 bit
codecs are more robust.

Bug: 13938273
Change-Id: Ifc79e360f9606f6c909b859d322b7dd5d416b26b
Signed-off-by: Andy Hung <hunga@google.com>
ibstagefright/ACodec.cpp
ibstagefright/OMXClient.cpp
ibstagefright/OMXCodec.cpp
19a0c7687ca1d00d4518191648848a16d08083c7 15-May-2014 Andy Hung <hunga@google.com> Merge "Update OMX messages for 64 bit"
609b815a3131d22da38b2f452faa9f89daad4039 02-May-2014 Andy Hung <hunga@google.com> Update OMX messages for 64 bit

Change node_id and buffer_id to uint32_t.
Ensure IOMX messages are fixed size.
Remove 64 bit compile warnings in associated files.

Change-Id: Icdbef00aca575e5dc502ebb52e3ce7d0d7883203
Signed-off-by: Andy Hung <hunga@google.com>
ibmedia/IOMX.cpp
ibstagefright/ACodec.cpp
ibstagefright/MediaCodec.cpp
ibstagefright/OMXClient.cpp
ibstagefright/OMXCodec.cpp
ibstagefright/include/OMX.h
ibstagefright/include/OMXNodeInstance.h
ibstagefright/omx/OMX.cpp
ibstagefright/omx/OMXNodeInstance.cpp
2472b1c0d63454e5d90a982bd6c555de6c3127bd 06-May-2014 Rachad <rachad@google.com> Add HEVC decoder support to ACodec
bug: 14571712

Change-Id: I221625a42e143cb1c581059694f6730211e251ae
ibstagefright/ACodec.cpp
ibstagefright/MediaDefs.cpp
3425fd5a55dd31e261d2f2a9590c762d6d0a6b79 14-May-2014 Marco Nelissen <marcone@google.com> Only export necessary symbols

Change-Id: I869d7124c8cc555f4b09801a898f4dd3ecb072ec
dk/Android.mk
dk/NdkMediaCodec.cpp
dk/NdkMediaCrypto.cpp
dk/NdkMediaDrm.cpp
dk/NdkMediaExtractor.cpp
dk/NdkMediaFormat.cpp
dk/NdkMediaMuxer.cpp
7edda7ac8b86f2493b7df945e9f63da947124288 15-May-2014 Marco Nelissen <marcone@google.com> Merge "Fix typos and pointer math."
829e097f832b4c4c41733f9b77121888204d993e 14-May-2014 Marco Nelissen <marcone@google.com> Fix typos and pointer math.

Change-Id: I07f33a57454d013844b56bc3e57fe0a271e8b38c
dk/NdkMediaCodec.cpp
dk/NdkMediaCrypto.cpp
497ca097bf373ac69405131bd257915c97b31dc0 13-May-2014 Jeff Tinker <jtinker@google.com> WIP: MediaDrm NDK APIs

Change-Id: I3ac08a3b027135c3fd2a9e95c5e8b3fd722df019
TODO: hooking up event handler, testing
dk/Android.mk
dk/NdkMediaDrm.cpp
050eb3280d7305b84f723d515be2dc9606dc39d1 10-May-2014 Marco Nelissen <marcone@google.com> Some crypto stuff, error codes

Add crypto/drm related functions, define some media errors
instead of using magic numbers in the code.

Change-Id: I5924cba0bfcdb3623073c9182a646b70f4ead5a5
dk/Android.mk
dk/NdkMediaCodec.cpp
dk/NdkMediaCrypto.cpp
dk/NdkMediaCryptoPriv.h
dk/NdkMediaExtractor.cpp
aa0315f9fdcf99e84a969a4f81192150ddaef260 13-May-2014 Marco Nelissen <marcone@google.com> Merge "Add AMediaCodec callback"
5e4c4f12337ff4d7ceb105bcd441bb7aea6ab070 09-May-2014 Glenn Kasten <gkasten@google.com> Fix bit rot in AudioStreamInSource

It obviously had not been compiled in a while.

Change-Id: If514f474808e557a67a671c3b833572ad4a88338
ibnbaio/AudioStreamInSource.cpp
c26d923712a59e669d18191d93fbe3696789d592 09-May-2014 Glenn Kasten <gkasten@google.com> Allow placement of Pipe buffer to be specified

Change-Id: I2f6b68089ecfe85cd975d29ad0d0afd13c487002
ibnbaio/Pipe.cpp
844f88ccfcca95687e774bccb5e9065da61d33f8 09-May-2014 Glenn Kasten <gkasten@google.com> Cache mCblk in local variable cblk

This is the style used throughout the rest of AudioTrackShared.

Change-Id: I959a6be3064e087bb19eba41173fd130dfcb4a9a
ibmedia/AudioTrackShared.cpp
fe9570c7b937b49d3603ccb394aed732b79bc6be 07-May-2014 Glenn Kasten <gkasten@google.com> Remove obsolete IAudioRecord::getCblk()

Change-Id: Id20b5efd765b9796b0e391610e06dc928a829ebf
ibmedia/IAudioRecord.cpp
16821ec9e1619f4edcc87f21ea1537580109b14d 10-May-2014 Glenn Kasten <gkasten@google.com> Merge "IAudioFlinger::openRecord returns IMemory(s)"
01427884471391999393a15abbb95b5f0dce7d3b 09-May-2014 Robert Shih <robertshih@google.com> Merge "Expose sample duration in MPEG4Extractor."
70c2fd3dc648b512ea088ee9de5e505c626fd39c 09-May-2014 Robert Shih <robertshih@google.com> Merge "PlaylistFetcher: start queueing AUs after the 1st IDR nalu"
d776ac63ce9c013c9626226e43f7db606e035838 07-May-2014 Glenn Kasten <gkasten@google.com> IAudioFlinger::openRecord returns IMemory(s)

openRecord() now explicitly returns the control block and data buffer
as separate IMemory references. If the IMemory for data buffer
is 0, this means it immediately follows the control block.

Change-Id: Ic098f88f0e037f8fbe30006689e18cacacf09d06
ibmedia/AudioRecord.cpp
ibmedia/IAudioFlinger.cpp
cdb42cdc5ccb785edabe1ee6407134fbae5662a9 08-May-2014 Marco Nelissen <marcone@google.com> Add AMediaCodec callback

Change-Id: I33b7ff3bcdcff6d3a5e1db385b900ae18b7e0f03
dk/NdkMediaCodec.cpp
0c5b910e6eb2b9b2a622ccc0dd66e8fcae3eb28b 09-May-2014 Lajos Molnar <lajos@google.com> Merge "stagefright: set PTS for SoftwareRenderer"
fc7fca77caa12993dd938d5ff43797d781291027 08-May-2014 Lajos Molnar <lajos@google.com> MediaCodec: add renderAndReleaseOutputBuffer() method with timestamp

Bug: 11784827
Change-Id: Ia1dcbd6c1d1a4380db04b750c0eb3fa0bd58d7b4
ibstagefright/ACodec.cpp
ibstagefright/MediaCodec.cpp
e99703920adb8037c506bfc6d0159a1b9aa8cf7c 09-May-2014 Lajos Molnar <lajos@google.com> Merge "Allow BOM and space in WebVTT files"
7d8e3ccfbf326b5e190b416590e956c2fc3021f7 09-May-2014 Lajos Molnar <lajos@google.com> Allow BOM and space in WebVTT files

Bug: 10900755
Change-Id: I47a7a33f749ea2470ce7d9d36d33c7484637d61c
ibstagefright/httplive/PlaylistFetcher.cpp
ibstagefright/httplive/PlaylistFetcher.h
49f095546d047b52c5070229bbee0c3f27548256 08-May-2014 Ying Wang <wangying@google.com> resolved conflicts for merge of cf79c7a5 to master

Change-Id: Ic4e75541193f733f477cfa4a2a87cce4c9e64f45
96b292fd3c76f9af155ee6f7a8559258eeedc6fd 08-May-2014 Glenn Kasten <gkasten@google.com> Merge "Add client side support for more AUDIO_FORMAT_PCM_*"
86aa02ce274826dc80ffa00766b16172c47503fd 08-May-2014 Marco Nelissen <marcone@google.com> Make AMediaCodec_create* APIs more like their Java counterparts

and add configure flags.

Change-Id: Ibfb7f8cad724fa1db2320966828104d40b5e6590
dk/NdkMediaCodec.cpp
908ea6603c64e29e40277a74c9fb0e776c097830 08-May-2014 Lajos Molnar <lajos@google.com> stagefright: set PTS for SoftwareRenderer

Change-Id: I08661a9eae09f919149aa5a58aa514d848de50a1
ibstagefright/AwesomePlayer.cpp
ibstagefright/colorconversion/SoftwareRenderer.cpp
ibstagefright/include/SoftwareRenderer.h
36dae0a9ce8a1f2c7106aaf63b6d6c92300bfc8b 08-May-2014 Marco Nelissen <marcone@google.com> Merge "Expand AMediaFormat"
b773038277ba328696832b690b91ce6e95bd1a6c 01-May-2014 Glenn Kasten <gkasten@google.com> Add client side support for more AUDIO_FORMAT_PCM_*

As much as possible, the checks for specific formats are done on server
side. The only exception is 8-bit, which needs a client side workaround.

Change-Id: I52fe086c039460c8dac009de03b67eb54c56a836
ibmedia/AudioTrack.cpp
34d497283c66b5ef0f8855c007eaa20d7ac8b96d 07-May-2014 Marco Nelissen <marcone@google.com> Expand AMediaFormat

Remove getDouble and getSize methods, since these are not used and/or
not present in the corresponding Java MediaFormat API.
Add setBuffer/getBuffer, needed for making formats for encoding, and
add other setters.

Change-Id: I528d51b4ed571d852b949637f7ae3a95d31da7c1
dk/NdkMediaFormat.cpp
0dd3c9cb0ed66888c224a97d817701df6c3b2655 07-May-2014 Marco Nelissen <marcone@google.com> Merge "Add NDK version of MediaMuxer"
a079461668e881718fa6c0de967e557f59da1cab 07-May-2014 Glenn Kasten <gkasten@google.com> Merge "Fix a couple of fast capture typo bugs"
828f883a43f66f77d776a75d0ea2b87c7c826071 07-May-2014 Glenn Kasten <gkasten@google.com> Fix a couple of fast capture typo bugs

AudioRecord constructor was not passing flags through to set().
Server-side check was using wrong kind of channel mask.

Change-Id: Ifaa880ec323771e9fd168262be05f3e539f53390
ibmedia/AudioRecord.cpp
703b67ed9552914f7763aed8f8bd054759db0576 07-May-2014 Andy Hung <hunga@google.com> Merge "Remove legacy omx_message variables"
08aaabe87960c04ecac180db1fe88b5a7bc2ed3b 07-May-2014 Marco Nelissen <marcone@google.com> Add NDK version of MediaMuxer

and add some constness here and there.

Change-Id: Ib3caa8310691e8f27aaa1afcfaec0b384513d4f1
dk/Android.mk
dk/NdkMediaCodec.cpp
dk/NdkMediaFormat.cpp
dk/NdkMediaFormatPriv.h
dk/NdkMediaMuxer.cpp
784e24e386b088c05d653ab482f2e95cb53e3d01 07-May-2014 Andy Hung <hunga@google.com> Remove legacy omx_message variables

Remove platform_private and data_ptr from omx_message.
These were used for legacy deferred buffer creation.
See OMXCodec quirks: kDefersOutputBufferAllocation and
kRequiresAllocateBufferOnOutputPorts.

Change-Id: I94da56bc64f3b46ee1276e93d67b36c1662e2eaf
Signed-off-by: Andy Hung <hunga@google.com>
ibstagefright/ACodec.cpp
ibstagefright/OMXCodec.cpp
ibstagefright/omx/OMX.cpp
7c9b141d551fde406f199f0dd21582f8551aea23 06-May-2014 Marco Nelissen <marcone@google.com> MediaFormat owns its strings

Have MediaFormat own the strings it returns from toString and getString,
reducing the chance of memory leaks.

Change-Id: I0ddd593874c8b3af0b7714f2d8a106edf8121108
dk/NdkMediaFormat.cpp
83ae5be9a9928a7265e40d2906530e56eb3bc20c 05-May-2014 Marco Nelissen <marcone@google.com> Don't build libmediandk for PDK

Change-Id: I9b2e5f5c8cc0fad59d4a4268c8767f540d536d10
dk/Android.mk
0c3be875376adaee8d8e8dd917c64926e1513b29 01-May-2014 Marco Nelissen <marcone@google.com> WIP: MediaCodec and friends NDK APIs, plain C version

Change-Id: I9ed6b9c5afb026a1b5fe8b652e75635bbcc223df
dk/Android.mk
dk/NdkMediaCodec.cpp
dk/NdkMediaExtractor.cpp
dk/NdkMediaFormat.cpp
dk/NdkMediaFormatPriv.h
0a9aa4f5539482061dfe4dfa6128ef3696557818 02-May-2014 Glenn Kasten <gkasten@google.com> Merge "Fix bug for direct track with PCM != 16-bit"
c4b88a8d0f524666bf0f390075c334d047a104f2 01-May-2014 Glenn Kasten <gkasten@google.com> Fix bug for direct track with PCM != 16-bit

The AUDIO_FORMAT_PCM_8_BIT format was being converted to
AUDIO_FORMAT_PCM_16_BIT on client side even for direct tracks.
That conversion was incorrect; it should only be done for mixed tracks.

Also remove checks for specific PCM formats in the generic part of
server side of createTrack. Those format checks should only be done by
the thread. This will allow direct tracks for PCM 8-bit, PCM 24-bit, etc.

Change-Id: If5b9fd79f8642ed93e2aeabcaf4809b2ed798978
ibmedia/AudioTrack.cpp
33a610c4a79975eb585526195a7c8eae8177777b 02-May-2014 Lajos Molnar <lajos@google.com> am 63249d6e: am bc4bf532: am b2314088: Merge "AwesomePlayer: use PTS for queueBuffer"

* commit '63249d6ea560b2f29d3ee255951f527b01ecbac5':
AwesomePlayer: use PTS for queueBuffer
344a1b9bb5cba14a0771c8b416466678aff3215f 02-May-2014 Lajos Molnar <lajos@google.com> am 113f2122: am 5fa3f7af: am b52675e9: Merge "Smooth out AwesomePlayer"

* commit '113f2122662856f2482836f1b4c585a050888afa':
Smooth out AwesomePlayer
63249d6ea560b2f29d3ee255951f527b01ecbac5 02-May-2014 Lajos Molnar <lajos@google.com> am bc4bf532: am b2314088: Merge "AwesomePlayer: use PTS for queueBuffer"

* commit 'bc4bf532b7581ecb1c8734a63742183c3ecb02c5':
AwesomePlayer: use PTS for queueBuffer
bc4bf532b7581ecb1c8734a63742183c3ecb02c5 02-May-2014 Lajos Molnar <lajos@google.com> am b2314088: Merge "AwesomePlayer: use PTS for queueBuffer"

* commit 'b231408849158baea8dddc0edf7e97fcfc2e3240':
AwesomePlayer: use PTS for queueBuffer
113f2122662856f2482836f1b4c585a050888afa 02-May-2014 Lajos Molnar <lajos@google.com> am 5fa3f7af: am b52675e9: Merge "Smooth out AwesomePlayer"

* commit '5fa3f7afc0d8d4978d0192cd2cf67ed3899d4dd5':
Smooth out AwesomePlayer
5fa3f7afc0d8d4978d0192cd2cf67ed3899d4dd5 02-May-2014 Lajos Molnar <lajos@google.com> am b52675e9: Merge "Smooth out AwesomePlayer"

* commit 'b52675e9e3b2cfd7ca3ec4eda80dde77dee9dafb':
Smooth out AwesomePlayer
b231408849158baea8dddc0edf7e97fcfc2e3240 02-May-2014 Lajos Molnar <lajos@google.com> Merge "AwesomePlayer: use PTS for queueBuffer"
b52675e9e3b2cfd7ca3ec4eda80dde77dee9dafb 02-May-2014 Lajos Molnar <lajos@google.com> Merge "Smooth out AwesomePlayer"
b0210338bba812d27e0e6b1bb4b6b89405209a19 02-May-2014 Lajos Molnar <lajos@google.com> am 9e0922ba: am 6e76fda3: am f9782266: Merge "AwesomePlayer: improve scheduling of video event to hit PTS"

* commit '9e0922ba7dda72fc94d2af2872cfc630ad599c91':
AwesomePlayer: improve scheduling of video event to hit PTS
192d6a509cf609a2a4b7f9cb70aeb5daabb0204e 02-May-2014 Lajos Molnar <lajos@google.com> am edf6131d: am 075c8f6e: am a69d6f52: Merge "stagefright: add ClockEstimator API and WindowedLinearFitEstimator"

* commit 'edf6131d1eca1fdff3b151805d241a1cc81b52ca':
stagefright: add ClockEstimator API and WindowedLinearFitEstimator
9e0922ba7dda72fc94d2af2872cfc630ad599c91 02-May-2014 Lajos Molnar <lajos@google.com> am 6e76fda3: am f9782266: Merge "AwesomePlayer: improve scheduling of video event to hit PTS"

* commit '6e76fda36a87e154397de816fa091b721a4c11bd':
AwesomePlayer: improve scheduling of video event to hit PTS
edf6131d1eca1fdff3b151805d241a1cc81b52ca 02-May-2014 Lajos Molnar <lajos@google.com> am 075c8f6e: am a69d6f52: Merge "stagefright: add ClockEstimator API and WindowedLinearFitEstimator"

* commit '075c8f6e174e824b6bc95809cc25f1430e9d4e62':
stagefright: add ClockEstimator API and WindowedLinearFitEstimator
6e76fda36a87e154397de816fa091b721a4c11bd 02-May-2014 Lajos Molnar <lajos@google.com> am f9782266: Merge "AwesomePlayer: improve scheduling of video event to hit PTS"

* commit 'f9782266802b02fc06a9c532f40128496aefb3e0':
AwesomePlayer: improve scheduling of video event to hit PTS
075c8f6e174e824b6bc95809cc25f1430e9d4e62 02-May-2014 Lajos Molnar <lajos@google.com> am a69d6f52: Merge "stagefright: add ClockEstimator API and WindowedLinearFitEstimator"

* commit 'a69d6f529239950a8bdf5e4253ea13bb029375cb':
stagefright: add ClockEstimator API and WindowedLinearFitEstimator
f9782266802b02fc06a9c532f40128496aefb3e0 02-May-2014 Lajos Molnar <lajos@google.com> Merge "AwesomePlayer: improve scheduling of video event to hit PTS"
a69d6f529239950a8bdf5e4253ea13bb029375cb 02-May-2014 Lajos Molnar <lajos@google.com> Merge "stagefright: add ClockEstimator API and WindowedLinearFitEstimator"
b53fc4ef8da47df8d5f580e8ee6135866ffebc33 02-May-2014 Glenn Kasten <gkasten@google.com> resolved conflicts for merge of 47c888a9 to master

Change-Id: I4ba2fdc6374a93a892bb7651b0d174e495f09bf6
47c888a9fb74f8a46fbf666f0611fd1a9491466f 02-May-2014 Glenn Kasten <gkasten@google.com> am e580aa4a: am 86438382: Merge "When passing a size_t via binder, use 64-bits unconditionally"

* commit 'e580aa4a756d1825c440a4b4309022b1babb6de1':
When passing a size_t via binder, use 64-bits unconditionally
e580aa4a756d1825c440a4b4309022b1babb6de1 02-May-2014 Glenn Kasten <gkasten@google.com> am 86438382: Merge "When passing a size_t via binder, use 64-bits unconditionally"

* commit '86438382a381eb39ed8da53fbd16cf6730fded6c':
When passing a size_t via binder, use 64-bits unconditionally
86438382a381eb39ed8da53fbd16cf6730fded6c 02-May-2014 Glenn Kasten <gkasten@google.com> Merge "When passing a size_t via binder, use 64-bits unconditionally"
a6e6c70a3c5403e178741eee20c7742e736c4818 30-Apr-2014 Lajos Molnar <lajos@google.com> AwesomePlayer: use PTS for queueBuffer

Change-Id: I1c14ad4784c799c46cf06a14b0f00c5e4d01f718
ibstagefright/AwesomePlayer.cpp
1b78c4b1484c7d4c12b9a87329dc8d4b6e8c0c37 30-Apr-2014 Lajos Molnar <lajos@google.com> Smooth out AwesomePlayer

Use clock estimator to smooth out audio time stamps.

Change-Id: Iec1ff30c011069d06ff8051fc4839d00895463d6
ibstagefright/AwesomePlayer.cpp
ibstagefright/include/AwesomePlayer.h
9747b68530aa65b04751b43bf4ce3385b5d781f9 30-Apr-2014 Lajos Molnar <lajos@google.com> AwesomePlayer: improve scheduling of video event to hit PTS

Change-Id: I7b19911acbde9b592b757b952d4ad63cd8efebed
ibstagefright/AwesomePlayer.cpp
aa8b569eb652c22821b93a6e543449a52ad21158 23-Apr-2014 Lajos Molnar <lajos@google.com> stagefright: add ClockEstimator API and WindowedLinearFitEstimator

Change-Id: I74474c385848a8eab2ac0da7c069510378e2b217
ibstagefright/Android.mk
ibstagefright/ClockEstimator.cpp
33ddcb6f1049cb4b6c71bb7ea605375f9492601d 02-May-2014 Glenn Kasten <gkasten@google.com> Merge "Use AUDIO_INTERLEAVE_* constants"
8710fb4b39e1807a5f2a4486fe0b140129b3618d 02-May-2014 Glenn Kasten <gkasten@android.com> am f38e1908: am 3d9164da: am 236f8ddd: Merge "Add missing include"

* commit 'f38e190887e73bc08735af95b073ebfaabd65f95':
Add missing include
f38e190887e73bc08735af95b073ebfaabd65f95 02-May-2014 Glenn Kasten <gkasten@android.com> am 3d9164da: am 236f8ddd: Merge "Add missing include"

* commit '3d9164da1b3d58701e41c78e06839d61ed1b4ff9':
Add missing include
3d9164da1b3d58701e41c78e06839d61ed1b4ff9 02-May-2014 Glenn Kasten <gkasten@android.com> am 236f8ddd: Merge "Add missing include"

* commit '236f8ddd23af92f98f2deae86bf6e6b5c9278857':
Add missing include
236f8ddd23af92f98f2deae86bf6e6b5c9278857 02-May-2014 Glenn Kasten <gkasten@android.com> Merge "Add missing include"
88014186c34dbc5c8f4cdf0936cae2a36e4b61ac 01-May-2014 Lajos Molnar <lajos@google.com> am ee46bd37: am 2b0b701f: am 0c388650: Merge "ACodec: add frame render/drop systrace"

* commit 'ee46bd378b7a68789be9c85d8a59fa02d4aed030':
ACodec: add frame render/drop systrace
ee46bd378b7a68789be9c85d8a59fa02d4aed030 01-May-2014 Lajos Molnar <lajos@google.com> am 2b0b701f: am 0c388650: Merge "ACodec: add frame render/drop systrace"

* commit '2b0b701f57c5efebe868d0eedce8cfc399007e8a':
ACodec: add frame render/drop systrace
2b0b701f57c5efebe868d0eedce8cfc399007e8a 01-May-2014 Lajos Molnar <lajos@google.com> am 0c388650: Merge "ACodec: add frame render/drop systrace"

* commit '0c388650722ac53571be21ee04ce342c1c9510c2':
ACodec: add frame render/drop systrace
0c388650722ac53571be21ee04ce342c1c9510c2 01-May-2014 Lajos Molnar <lajos@google.com> Merge "ACodec: add frame render/drop systrace"
ee7a5ef61b8d1149811ee73c80aca2ac8474d559 01-May-2014 Glenn Kasten <gkasten@android.com> am b4eacebf: am 1afedc4d: am 6eafba6b: Merge "Temporary workaround for log spam"

* commit 'b4eacebfc5c5fd86b20661eab0797ce70c66e323':
Temporary workaround for log spam
b4eacebfc5c5fd86b20661eab0797ce70c66e323 01-May-2014 Glenn Kasten <gkasten@android.com> am 1afedc4d: am 6eafba6b: Merge "Temporary workaround for log spam"

* commit '1afedc4d99acd52f99221d71b3a372a0a5497a84':
Temporary workaround for log spam
1afedc4d99acd52f99221d71b3a372a0a5497a84 01-May-2014 Glenn Kasten <gkasten@android.com> am 6eafba6b: Merge "Temporary workaround for log spam"

* commit '6eafba6bba3a4949cf3807ea39d5c1e969bebc52':
Temporary workaround for log spam
83f052a749b8e0ee5df3467d8332d6140fcafb50 01-May-2014 Glenn Kasten <gkasten@android.com> Temporary workaround for log spam

Bug: 13790505
Change-Id: Icfc403bceaefdede1af65dfd70ba3e8b26abab02
ibstagefright/codecs/vorbis/dec/SoftVorbis.cpp
877a0ac7e8677fa1cbd0e8565ad9d38ba0db5fc0 01-May-2014 Glenn Kasten <gkasten@google.com> Use AUDIO_INTERLEAVE_* constants

Change-Id: I6609fa75c9a57fc4ca3887d626a2f4fb8b6593a1
ibmedia/AudioTrack.cpp
d1adad7acdff96f6518935214d93a655cc447570 01-May-2014 Glenn Kasten <gkasten@google.com> resolved conflicts for merge of 0d79b935 to master

Change-Id: If6de8c1b1d7707918e2a60ea8583749e0127edb8
029a64e0327ecc1215a3d17ce50f508edae1c4a6 15-Apr-2014 Glenn Kasten <gkasten@google.com> Define CHANNEL_MASK_* in terms of AUDIO_CHANNEL_OUT_*

and use same suffixes

Change-Id: I90b74ede171ba2550db4a220cfd1ad2e3caefe2d
ibeffects/downmix/EffectDownmix.c
6fbc1afd36f514f8b8d36ce67f5e69776c690bd2 30-Apr-2014 Lajos Molnar <lajos@google.com> ACodec: add frame render/drop systrace

Change-Id: I7a33d4a937d039fd454b889ddb12b7ca1c0ff3c2
ibstagefright/ACodec.cpp
0d79b935f533220613f492ab06a12f5cc9591805 30-Apr-2014 Glenn Kasten <gkasten@android.com> am b27ce2fb: am 416685d0: Merge "Fix format warnings"

* commit 'b27ce2fba0049897558f1f3df9039f443ee4bc88':
Fix format warnings
b27ce2fba0049897558f1f3df9039f443ee4bc88 30-Apr-2014 Glenn Kasten <gkasten@android.com> am 416685d0: Merge "Fix format warnings"

* commit '416685d0cbab40bfc48b0e787206b5d5c2e2ec25':
Fix format warnings
32fa3c6fab55b075c916f4dad38e42e239bb7813 29-Apr-2014 Glenn Kasten <gkasten@google.com> Remove AUDIO_CHANNEL_OUT_SURROUND

and corresponding downmix effect

Change-Id: I1576aa373ca7acbb84d7742bacbd9c2da04a7a4c
ibeffects/downmix/EffectDownmix.c
ibeffects/downmix/EffectDownmix.h
1a7be1ec9c769203e6c8e26378de0ab8e2ad493d 29-Apr-2014 Bill Yi <byi@google.com> Merge commit '91820d46b5f3065c2fded3cdf65d305715b33bb1' into HEAD
6643b3d878d674dd5be4b589d63dc3e6fc94df72 29-Apr-2014 Glenn Kasten <gkasten@google.com> am f131f873: Merge "Add private method NBLog::Reader::dumpLine()"

* commit 'f131f87369ec06fc27fc1f14ea72f0ca1a066509':
Add private method NBLog::Reader::dumpLine()
7aeb4b5b08aa31b8bcdebe43e9f56169b7a3b03e 29-Apr-2014 Robert Shih <robertshih@google.com> Merge "PlaylistFetcher: clear mTSParser on bad starting seq # hint"
95d287db3aa5c93533d8e4a723e24f33ea29ffa0 28-Apr-2014 Glenn Kasten <gkasten@android.com> Fix format warnings

Change-Id: Id7aded4287cc8d5387a20389d3ef6220d67d1d88
ibnbaio/NBLog.cpp
92dfd8e67e099577d07eaeb28aad533fd5514d8a 11-Jul-2013 Glenn Kasten <gkasten@google.com> Add private method NBLog::Reader::dumpLine()

This allows us to abstract out fdprintf vs ALOGI
so that callers don't need an 'if' at every location.

Change-Id: I4c68185fc19f32caeaed93347e6b7d09b8d4c4d8
ibnbaio/NBLog.cpp
5cda1b30b8c3900f8405f9bf2fab2df6e38ea95f 24-Apr-2014 Robert Shih <robertshih@google.com> PlaylistFetcher: clear mTSParser on bad starting seq # hint

Bug: 14159556
Change-Id: If25187477066282d5980da3c4d8a76dcfcf54d27
ibstagefright/httplive/PlaylistFetcher.cpp
1da7ee098ac97d2fdd2cff16a2bfa51fd1889ad8 24-Apr-2014 Robert Shih <robertshih@google.com> PlaylistFetcher: start queueing AUs after the 1st IDR nalu

Bug: 14159556
Change-Id: I4fc16dda9357e1251d2909571a79215d13d0104b
ibstagefright/httplive/PlaylistFetcher.cpp
ibstagefright/httplive/PlaylistFetcher.h
15387a6e8e7930ea80f46c98fab54f22981e7f11 17-Apr-2014 Robert Shih <robertshih@google.com> AwesomePlayer: fixed division by zero in onBufferingUpdate

Bug: 13911283
Change-Id: I968a274634a86f5c46f75dc533024dad44afc36b
ibstagefright/AwesomePlayer.cpp
170056540e9ce65261b45efd15f67e72e2df1bed 11-Apr-2014 Robert Shih <robertshih@google.com> Expose sample duration in MPEG4Extractor.

Bug: 12782113
Change-Id: I75ee361243c5382d9288349c554deb7bed952782
ibstagefright/MPEG4Extractor.cpp
ibstagefright/SampleIterator.cpp
ibstagefright/SampleTable.cpp
ibstagefright/include/SampleIterator.h
ibstagefright/include/SampleTable.h
67ee990d324229ab0565ce632bd5a04297e16a01 24-Apr-2014 Alex Glaznev <glaznev@google.com> Merge "Support VP8 encoder key frame interval and number of temporal layers configuration."
4154795d5526750b7aec5f774831a9e1ba0a3f15 21-Mar-2014 Alex Glaznev <glaznev@google.com> Support VP8 encoder key frame interval and number of
temporal layers configuration.

- Change ACodec.cpp to populate VP8 extra parameters
structure with key frame interval, number of temporal
layers and quantization parameters.

- Change software VP8 encoder to select frame temporal
patterns and temporal layers bitrate distribution based
on the number of layers similar to patterns used in WebRTC.

- Calculate video frame duration in VP8 encoder from the
timestamps.

Bug: 11969958
Change-Id: Ia96054d886cd09d8c108dfe250fc5f4478eaa042
ibstagefright/ACodec.cpp
ibstagefright/codecs/on2/enc/SoftVPXEncoder.cpp
ibstagefright/codecs/on2/enc/SoftVPXEncoder.h
18e846c1ca29d7c4e4607243bc5ba694385128a1 21-Apr-2014 Nick Kralevich <nnk@google.com> am 474038ae: am 27158eb5: Merge "AArch64: AString::append for longs and pointers"

* commit '474038aef32f47d080567e8519d916b069a4f707':
AArch64: AString::append for longs and pointers
474038aef32f47d080567e8519d916b069a4f707 21-Apr-2014 Nick Kralevich <nnk@google.com> am 27158eb5: Merge "AArch64: AString::append for longs and pointers"

* commit '27158eb55de8150258faba6574fc51c7aa641516':
AArch64: AString::append for longs and pointers
27158eb55de8150258faba6574fc51c7aa641516 21-Apr-2014 Nick Kralevich <nnk@google.com> Merge "AArch64: AString::append for longs and pointers"
9e8eeafe1ea0e88d548270280bcc209dde51781b 21-Apr-2014 Dan Stoza <stoza@google.com> Merge "BufferQueue: Increase max slots from 32 to 64"
cb010a3fa85db1eb90346b35e484e21e7f1b1a4b 19-Apr-2014 Mark Salyzyn <salyzyn@google.com> am e1ff1051: am e0f20cea: Merge "libeffects: 64 bit compile issues"

* commit 'e1ff1051ffee8fb650741ad133f0f28b73eb7a73':
libeffects: 64 bit compile issues
e1ff1051ffee8fb650741ad133f0f28b73eb7a73 19-Apr-2014 Mark Salyzyn <salyzyn@google.com> am e0f20cea: Merge "libeffects: 64 bit compile issues"

* commit 'e0f20cea4a40deaabd2b409ab301f6fd7b2e8e7f':
libeffects: 64 bit compile issues
7cb0e733210c2ce7dd2a7c9d32f6d83c4dab9656 18-Apr-2014 Mark Salyzyn <salyzyn@google.com> libeffects: 64 bit compile issues

Change-Id: I32dd13d307572fee91150f8e113df78924ca0067
ibeffects/downmix/EffectDownmix.c
ibeffects/visualizer/EffectVisualizer.cpp
ce65a05eddc8a39d9805d1e1eee0292725df1f1c 16-Apr-2014 Mark Salyzyn <salyzyn@google.com> am f5f24006: am cd4eb72e: Merge "media: -Werror re-enabled"

* commit 'f5f24006f7bd997c6bca00804ec0f35bddd7ccc2':
media: -Werror re-enabled
1b24cf32e02a1372e57b3a2a432bc0adfe496e6d 16-Apr-2014 Mark Salyzyn <salyzyn@google.com> am e80631aa: am 839d11d1: Merge changes I0a744dc7,Id993a70d

* commit 'e80631aa1992ca50af679cd6a018c0ffda7f9b17':
media: use size_t for integer iterator to Vector::size()
media: 64 bit compile issues
f5f24006f7bd997c6bca00804ec0f35bddd7ccc2 16-Apr-2014 Mark Salyzyn <salyzyn@google.com> am cd4eb72e: Merge "media: -Werror re-enabled"

* commit 'cd4eb72edb0575ce1e84fbd3f27bb85bab6110ed':
media: -Werror re-enabled
e80631aa1992ca50af679cd6a018c0ffda7f9b17 16-Apr-2014 Mark Salyzyn <salyzyn@google.com> am 839d11d1: Merge changes I0a744dc7,Id993a70d

* commit '839d11d1f7be9dff2f06c7d30a9eb39cb6782078':
media: use size_t for integer iterator to Vector::size()
media: 64 bit compile issues
cd4eb72edb0575ce1e84fbd3f27bb85bab6110ed 16-Apr-2014 Mark Salyzyn <salyzyn@google.com> Merge "media: -Werror re-enabled"
3ab368e0810d894dcbc0971350c095049478a055 15-Apr-2014 Mark Salyzyn <salyzyn@google.com> media: use size_t for integer iterator to Vector::size()

Change-Id: I0a744dc7815a86a993df9b0623440be620ec8903
ibstagefright/CameraSourceTimeLapse.cpp
tp/MtpDevice.cpp
tp/MtpServer.cpp
db43b34c3428e480f8c4c66e7e88f4001f37f91e 04-Apr-2014 Mark Salyzyn <salyzyn@google.com> media: 64 bit compile issues

- change internal sized types to use stdint.h
- printf & scanf formats
- size_t or unsigned int for iterators

Change-Id: Id993a70d8bf54c667c5d652b34179a2c727ed446
ibstagefright/AMRExtractor.cpp
ibstagefright/NuCachedSource2.cpp
ibstagefright/OMXCodec.cpp
ibstagefright/codecs/on2/h264dec/omxdl/arm11/api/omxtypes.h
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/api/omxtypes.h
ibstagefright/codecs/on2/h264dec/omxdl/reference/api/omxtypes.h
ibstagefright/omx/GraphicBufferSource.cpp
ibstagefright/omx/OMX.cpp
ibstagefright/omx/SoftVideoDecoderOMXComponent.cpp
ibstagefright/rtsp/SDPLoader.cpp
tp/MtpDevice.cpp
tp/MtpServer.cpp
3b5ec66c3623647fc4dfd1a446c4f25a2c7f1ba0 14-Apr-2014 Mark Salyzyn <salyzyn@google.com> media: -Werror re-enabled

Change-Id: I62fdb78e8acefafd468ce2e5aa9e78eba0dd0f48
ibstagefright/matroska/Android.mk
ibstagefright/timedtext/Android.mk
6bb7a89102a8966ee032d6ddc0b3ff4f1a47ef66 15-Apr-2014 Mark Salyzyn <salyzyn@google.com> am 432ed3d6: Merge "libstagefright: fix 64-bit warnings"

* commit '432ed3d66d09464778df31c73374ee897f7b8840':
libstagefright: fix 64-bit warnings
ef80764db37aa00bbb88755cb6cf11c6f2720bd3 25-Mar-2014 Marcus Oakland <marcus.oakland@arm.com> AArch64: AString::append for longs and pointers

The AString::append methods for long, unsigned long and void *
pointers were using char arrays of 16 elements, which were not long
enough for 64-bit longs and pointers in __LP64__ systems. This
resulted in "FORTIFY_SOURCE: vsprintf: prevented write past end of
buffer. Calling abort()." when the
android.media.cts.DecoderTest#testFlush CTS test was run.

The AString::append methods that were using sprintf have been modifed
to use snprintf instead, taking the sizeof the "s" array (which has
been made 32 char without conditional compilation for __LP64__ where
appropriate), and checking the return value to ensure that the string
has not been truncated.

After this change and changes to the types of OMX_U32 and OMX_S32 in the
frameworks/native/include/media/openmax/OMX_Types.h header file, the
android.media.cts.DecoderTest#testFlush CTS test passes.

Change-Id: I76d897373473c82f52986f43a15b050b844a370a
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
ibstagefright/foundation/AString.cpp
f6d0c1fd6d9e697bb3a891fae14c7e9d4b685de6 15-Apr-2014 Colin Cross <ccross@google.com> libstagefright: fix 64-bit warnings

%lld -> %" PRId64 " for int64_t
%d -> %zu for size_t
Also fixes some casts from void* to integer types, and some comparisons
between signed and unsigned.

(cherry picked from commit b4a7a2df4c28c3f32b5d877b54831d2cc5d78f81)

Change-Id: I76ba94d0b67776fd7abdc83b43d47c61d6c32f4c
ibstagefright/codecs/flac/enc/SoftFlacEncoder.cpp
ibstagefright/codecs/m4v_h263/enc/SoftMPEG4Encoder.cpp
ibstagefright/httplive/LiveSession.cpp
ibstagefright/httplive/PlaylistFetcher.cpp
ibstagefright/id3/ID3.cpp
ibstagefright/matroska/MatroskaExtractor.cpp
ibstagefright/mpeg2ts/ATSParser.cpp
ibstagefright/mpeg2ts/ESQueue.cpp
ibstagefright/mpeg2ts/MPEG2PSExtractor.cpp
ibstagefright/rtsp/AAVCAssembler.cpp
ibstagefright/rtsp/AMPEG4ElementaryAssembler.cpp
ibstagefright/rtsp/ARTPConnection.cpp
ibstagefright/rtsp/ARTPWriter.cpp
ibstagefright/timedtext/TimedTextPlayer.cpp
210810b644a0bad76a04bfbff8a205f3b97b90ac 14-Apr-2014 Mark Salyzyn <salyzyn@google.com> am 29fe1ea4: am 9829344d: Merge "media: memset sizeof argument issues"

* commit '29fe1ea4b5a1d1fc1fb87b53866901357c04c5c1':
media: memset sizeof argument issues
29fe1ea4b5a1d1fc1fb87b53866901357c04c5c1 14-Apr-2014 Mark Salyzyn <salyzyn@google.com> am 9829344d: Merge "media: memset sizeof argument issues"

* commit '9829344d526f87ca745208f04216ec795b239581':
media: memset sizeof argument issues
9829344d526f87ca745208f04216ec795b239581 14-Apr-2014 Mark Salyzyn <salyzyn@google.com> Merge "media: memset sizeof argument issues"
2475264264b51a7592c5b2e4cd6cfdaddba16644 10-Apr-2014 Dan Stoza <stoza@google.com> BufferQueue: Increase max slots from 32 to 64

Increases NUM_BUFFER_SLOTS from 32 to 64 and changes the mask
returned by IGBC::getReleasedBuffers from 32 to 64 bits.

Bug: 13174352
Change-Id: I1c41256ffbc30abcf9f7b0b5fcf53da40462da28
ibstagefright/omx/GraphicBufferSource.cpp
8e1554f35ffcc0f7ac833a796adf3926371fcb76 12-Apr-2014 Mark Salyzyn <salyzyn@google.com> am b1b1e303: am e5238893: Merge "Fix aosp_arm64 mirror-aosp-master build 1119326"

* commit 'b1b1e303d93a5c67eedeca6ef3039be6cb4dc9f9':
Fix aosp_arm64 mirror-aosp-master build 1119326
b1b1e303d93a5c67eedeca6ef3039be6cb4dc9f9 12-Apr-2014 Mark Salyzyn <salyzyn@google.com> am e5238893: Merge "Fix aosp_arm64 mirror-aosp-master build 1119326"

* commit 'e523889332b88348e673137d272854278acbef8f':
Fix aosp_arm64 mirror-aosp-master build 1119326
4850983c3a9131af32d0fe61dd9ce3d1e5d735b5 11-Apr-2014 Mark Salyzyn <salyzyn@google.com> Fix aosp_arm64 mirror-aosp-master build 1119326

Remove -Werror that was set in 'warnings be gone'

Change-Id: I2379dc56f04a6d0ac50f90e6d1cdf05fce3a5c30
ibstagefright/matroska/Android.mk
ibstagefright/matroska/MatroskaExtractor.cpp
ibstagefright/timedtext/Android.mk
0f37620e0f79bfab1354e2e3049c260342a2637e 11-Apr-2014 Colin Cross <ccross@android.com> Revert "build fix for aosp-idea133 @ 1119318"

Build fix is needed in AOSP, but in master it re-introduces a warning
and breaks the build on -Werror. Revert it in master.

This reverts commit effbb3a9b72050dbe150af7302d9148fe7e927d3.
ibstagefright/timedtext/TimedTextDriver.cpp
027eadebbf7534d3eb596451c9197571f4e94073 11-Apr-2014 Mark Salyzyn <salyzyn@google.com> am a7281ee1: am a133bc87: Merge "build fix for aosp-idea133 @ 1119318"

* commit 'a7281ee11a27d5fa3d9fa62eb8d2c6465007eb50':
build fix for aosp-idea133 @ 1119318
a7281ee11a27d5fa3d9fa62eb8d2c6465007eb50 11-Apr-2014 Mark Salyzyn <salyzyn@google.com> am a133bc87: Merge "build fix for aosp-idea133 @ 1119318"

* commit 'a133bc87eb8269a6fa61772cb708f10c9c3b7a87':
build fix for aosp-idea133 @ 1119318
4cd0d582379ca9decba7ee0b99010d9a39f298de 11-Apr-2014 Mark Salyzyn <salyzyn@google.com> am 0938c6f7: Merge "warnings be gone (4/4)"

* commit '0938c6f7a1e713030b04e32548012f0c29c94f4d':
warnings be gone (4/4)
8819b515f541daea4288a87cfbae37561cb80b13 11-Apr-2014 Mark Salyzyn <salyzyn@google.com> am 2a27a640: Merge "warnings be gone (3/4)"

* commit '2a27a640d0d9747659cc609b4384ffead090866e':
warnings be gone (3/4)
355c04dfe84b06311bdb15a1617e22bea4eb2571 11-Apr-2014 Mark Salyzyn <salyzyn@google.com> am 79724856: Merge "warnings be gone (2/4)"

* commit '797248568b5ba32606ac0d8de024190e3cc95973':
warnings be gone (2/4)
d6579cc9f06052f94bf5a2c34261c84de0efce23 10-Apr-2014 Mark Salyzyn <salyzyn@google.com> media: memset sizeof argument issues

Change-Id: I37ef154eea0f77fb7f22faf6891f3025f6ff346e
ommon_time/utils.cpp
ibmedia/mediaplayer.cpp
ibstagefright/codecs/avc/enc/SoftAVCEncoder.cpp
a133bc87eb8269a6fa61772cb708f10c9c3b7a87 11-Apr-2014 Mark Salyzyn <salyzyn@google.com> Merge "build fix for aosp-idea133 @ 1119318"
bc64e09a65bd5ba97706d2420449b9710c9e9c01 11-Apr-2014 Mark Salyzyn <salyzyn@google.com> warnings be gone (4/4)

(cherry picked from commit 84333e0475bc911adc16417f4ca327c975cf6c36)
(squashed with commit b4a7a2df4c28c3f32b5d877b54831d2cc5d78f81)

Change-Id: I55df09714a0e1cb98a44c8fcddac2c646ae5e139
ibstagefright/matroska/MatroskaExtractor.cpp
51b9eb1c330d23b98ddb629200cd177bc9c39def 11-Apr-2014 Mark Salyzyn <salyzyn@google.com> warnings be gone (3/4)

(cherry picked from commit 84333e0475bc911adc16417f4ca327c975cf6c36)
(squashed with commit b4a7a2df4c28c3f32b5d877b54831d2cc5d78f81)

Change-Id: I0c5a0c3ea32bb5091d90c7391c67edd02e50397f
ibstagefright/mpeg2ts/ATSParser.cpp
3f37c83d9817cacc0965ca66873b0353fac07228 11-Apr-2014 Mark Salyzyn <salyzyn@google.com> warnings be gone (2/4)

(cherry picked from commit 84333e0475bc911adc16417f4ca327c975cf6c36)
(squashed with commit b4a7a2df4c28c3f32b5d877b54831d2cc5d78f81)

Change-Id: I048a2c6868515716c7cd7319a3d0abe6311dac4e
ibstagefright/httplive/M3UParser.cpp
effbb3a9b72050dbe150af7302d9148fe7e927d3 11-Apr-2014 Mark Salyzyn <salyzyn@google.com> build fix for aosp-idea133 @ 1119318

Change-Id: I34084ebb48318628d46c2ff7ca567bd7638619e4
ibstagefright/timedtext/TimedTextDriver.cpp
dd01ce9c28e37d4556606f481faeec032a1fe04e 11-Apr-2014 Mark Salyzyn <salyzyn@google.com> am 52a861d2: Merge "warnings be gone."

* commit '52a861d2825544fe2eb90f8e5f6351d02ff95536':
warnings be gone.
d411b4ca2945cd8974a3a78199fce94646950128 11-Apr-2014 Andreas Huber <andih@google.com> warnings be gone.

(cherry picked from commit 84333e0475bc911adc16417f4ca327c975cf6c36)

Modified by Mark Salyzyn <salyzyn@google.com> to keep merge conflicts
or errors downstream to a minimum.

Change-Id: Ic3b272f9cbf3155001aabd2f79728f1bc31de613
ibmediaplayerservice/StagefrightPlayer.cpp
ibmediaplayerservice/nuplayer/HTTPLiveSource.cpp
ibmediaplayerservice/nuplayer/NuPlayerDriver.cpp
ibmediaplayerservice/nuplayer/NuPlayerSource.h
ibstagefright/AACExtractor.cpp
ibstagefright/AACWriter.cpp
ibstagefright/ACodec.cpp
ibstagefright/AMRExtractor.cpp
ibstagefright/AMRWriter.cpp
ibstagefright/AudioPlayer.cpp
ibstagefright/AudioSource.cpp
ibstagefright/AwesomePlayer.cpp
ibstagefright/CameraSource.cpp
ibstagefright/CameraSourceTimeLapse.cpp
ibstagefright/FLACExtractor.cpp
ibstagefright/MP3Extractor.cpp
ibstagefright/MPEG2TSWriter.cpp
ibstagefright/MPEG4Extractor.cpp
ibstagefright/MPEG4Writer.cpp
ibstagefright/MediaAdapter.cpp
ibstagefright/MediaCodec.cpp
ibstagefright/NuCachedSource2.cpp
ibstagefright/OggExtractor.cpp
ibstagefright/StagefrightMediaScanner.cpp
ibstagefright/SurfaceMediaSource.cpp
ibstagefright/TimedEventQueue.cpp
ibstagefright/VBRISeeker.cpp
ibstagefright/WAVExtractor.cpp
ibstagefright/avc_utils.cpp
ibstagefright/codecs/aacenc/SoftAACEncoder2.cpp
ibstagefright/codecs/aacenc/src/adj_thr.c
ibstagefright/codecs/aacenc/src/dyn_bits.c
ibstagefright/codecs/amrnb/dec/SoftAMR.cpp
ibstagefright/codecs/amrnb/enc/SoftAMRNBEncoder.cpp
ibstagefright/codecs/amrwbenc/SoftAMRWBEncoder.cpp
ibstagefright/codecs/common/cmnMemory.c
ibstagefright/codecs/g711/dec/SoftG711.cpp
ibstagefright/codecs/gsm/dec/SoftGSM.cpp
ibstagefright/codecs/m4v_h263/dec/SoftMPEG4.cpp
ibstagefright/codecs/m4v_h263/enc/SoftMPEG4Encoder.cpp
ibstagefright/codecs/mp3dec/SoftMP3.cpp
ibstagefright/codecs/mp3dec/src/pvmp3_mpeg2_get_scale_data.cpp
ibstagefright/codecs/on2/dec/SoftVPX.cpp
ibstagefright/codecs/on2/h264dec/SoftAVC.cpp
ibstagefright/codecs/on2/h264dec/source/h264bsd_conceal.c
ibstagefright/codecs/on2/h264dec/source/h264bsd_util.c
ibstagefright/codecs/raw/SoftRaw.cpp
ibstagefright/foundation/ANetworkSession.cpp
ibstagefright/foundation/Android.mk
ibstagefright/httplive/M3UParser.cpp
ibstagefright/include/TimedEventQueue.h
ibstagefright/matroska/Android.mk
ibstagefright/matroska/MatroskaExtractor.cpp
ibstagefright/mpeg2ts/ATSParser.cpp
ibstagefright/mpeg2ts/AnotherPacketSource.cpp
ibstagefright/mpeg2ts/MPEG2PSExtractor.cpp
ibstagefright/mpeg2ts/MPEG2TSExtractor.cpp
ibstagefright/omx/OMX.cpp
ibstagefright/omx/OMXNodeInstance.cpp
ibstagefright/omx/SoftOMXComponent.cpp
ibstagefright/omx/SoftOMXPlugin.cpp
ibstagefright/rtsp/AMPEG2TSAssembler.cpp
ibstagefright/rtsp/ARTPWriter.cpp
ibstagefright/rtsp/ARawAudioAssembler.cpp
ibstagefright/timedtext/Android.mk
ibstagefright/timedtext/TimedTextDriver.cpp
ibstagefright/timedtext/TimedTextSource.h
ibstagefright/wifi-display/rtp/RTPSender.cpp
ibstagefright/wifi-display/source/WifiDisplaySource.cpp
c51db0a6bfb71ea9c934fb7971cb5ae1f1cf03a0 02-Apr-2014 Lajos Molnar <lajos@google.com> stagefright: handle corrupt matroska files gracefully

Bug: 13693438
Bug: 13744158
Change-Id: I557595b5b5d4a20934f79e00a622b06d13378223
ibstagefright/matroska/MatroskaExtractor.cpp
a1df816c0677185534babba6ffc29970b048e52e 04-Apr-2014 Lajos Molnar <lajos@google.com> stagefright: log uri protocols, and opt-in to log full uri

Added property media.stagefright.log-uri. Set it to true or 1 to
log uris by AwesomePlayer.

Added utility function to get uri debug string based on incognito
and log opt-in status.

Change-Id: I5ccc23079ddfb120dd9703a3ed651a162ed5acec
Related-Bug: 6994761
ibstagefright/AwesomePlayer.cpp
ibstagefright/Utils.cpp
ibstagefright/httplive/LiveSession.cpp
ibstagefright/httplive/M3UParser.cpp
ibstagefright/rtsp/ARTSPConnection.cpp
ibstagefright/rtsp/SDPLoader.cpp
bcf08569453dcb42730cda3230d5d375a697005b 05-Apr-2014 Lajos Molnar <lajos@google.com> stagefright: add AString constructor from String8

Change-Id: I85b37b6dee4ea9d5f7f1c1a40ff405a01a0c67f1
ibstagefright/foundation/AString.cpp
cffcba5681be302b1c1b40747a1305f2c2a667c3 04-Apr-2014 Dan Stoza <stoza@google.com> Merge "Remove deprecated BufferQueue constructor"
619fd4d6d4d815065becbdf360422ee40dfa7690 03-Apr-2014 Glenn Kasten <gkasten@google.com> Merge commit '52a23bd3' into manualmerge

Change-Id: I7a6105f467a2fa3631c62be3d306845e9cf9b365
52a23bd3f8ace9f3a6295fc2d2b97e64665d77d8 03-Apr-2014 Glenn Kasten <gkasten@google.com> am 51b3ea2b: Merge "64-bit: Correction to OMX_U32 and OMX_S32"

* commit '51b3ea2b8f7298bffbd246c65a606cd053357b66':
64-bit: Correction to OMX_U32 and OMX_S32
8260bf63e2fa974b524029f170d9ad17b69b884f 03-Apr-2014 Glenn Kasten <gkasten@android.com> am 93bbc834: Merge "Fix aac decoder flush"

* commit '93bbc8343133b910aeae536617efce978040bbae':
Fix aac decoder flush
638986a78c94081cded0cd87dc9d3b31965092a4 03-Apr-2014 Jeff Tinker <jtinker@google.com> am d009aa2b: am 81e0bd44: Add signature|system permission to MediaDrm signer APIs

* commit 'd009aa2bac4a4c8ca2e0c1203148194e237cc5d0':
Add signature|system permission to MediaDrm signer APIs
d009aa2bac4a4c8ca2e0c1203148194e237cc5d0 03-Apr-2014 Jeff Tinker <jtinker@google.com> am 81e0bd44: Add signature|system permission to MediaDrm signer APIs

* commit '81e0bd44a10e90778ab5b0a3babd4fc52cadedd8':
Add signature|system permission to MediaDrm signer APIs
81e0bd44a10e90778ab5b0a3babd4fc52cadedd8 03-Apr-2014 Jeff Tinker <jtinker@google.com> Add signature|system permission to MediaDrm signer APIs

Change-Id: If970e5ff8dcab2e67af2f3376dcd14dca82f2394
related-to-bug: 12702350
ibmediaplayerservice/Drm.cpp
80a5d305a8408651fbc9b11e9d21125887da8c40 02-Apr-2014 Igor Chernyshev <igorc@google.com> Add missing include

Change-Id: I9fc3ebf60b98760611ac2071c7c519a0f8326341
ibmedia/MemoryLeakTrackUtil.cpp
54654025d656b437eeb5c5c9267104625bcc496d 02-Apr-2014 Glenn Kasten <gkasten@android.com> am 2b2fbe29: Merge "Fix decoder EOS handling"

* commit '2b2fbe299163b544668b41f594943a19b78dafd3':
Fix decoder EOS handling
4cc0bedb859f9773f54f844cca4ce806c86bb6f8 02-Apr-2014 Lajos Molnar <lajos@google.com> Merge "ACodec: do not signal kWhatShutdownCompleted on codec error"
66fe2e9ee30bcb4161bc487ec63d2ae4a05f4051 02-Apr-2014 Glenn Kasten <gkasten@google.com> 64-bit: Correction to OMX_U32 and OMX_S32

Change-Id: I9c41bb34c35595ac19a7ab8faaacde8cb4fa9a15
ibstagefright/codecs/aacdec/SoftAAC2.cpp
ibstagefright/codecs/aacenc/SoftAACEncoder2.cpp
ibstagefright/codecs/avc/enc/SoftAVCEncoder.cpp
ibstagefright/codecs/flac/enc/SoftFlacEncoder.cpp
ibstagefright/codecs/g711/dec/SoftG711.cpp
ibstagefright/codecs/gsm/dec/SoftGSM.cpp
ibstagefright/codecs/m4v_h263/enc/SoftMPEG4Encoder.cpp
08fce45fdb537e135868604522aba15461f516be 20-Sep-2013 Marco Nelissen <marcone@google.com> Fix aac decoder flush

b/8543366

Change-Id: I746ffed6289486b802a2292bfc492ea6c780ed0b
ibstagefright/codecs/aacdec/SoftAAC2.cpp
c71a99131ca97bd3bdc5b78473d06e613e96e073 29-Aug-2013 Marco Nelissen <marcone@google.com> Fix decoder EOS handling

Conceptually it should be the same whether EOS is signalled on the last
buffer holding data, or an empty buffer that follows. Make it so that
this actually behaves the same for mp3, AAC and Vorbis.

b/8747869

Change-Id: Idece8ef45689a3ffaf70fb45d19862d7b93b2f92
ibstagefright/codecs/aacdec/SoftAAC2.cpp
ibstagefright/codecs/aacdec/SoftAAC2.h
ibstagefright/codecs/mp3dec/SoftMP3.cpp
ibstagefright/codecs/mp3dec/SoftMP3.h
ibstagefright/codecs/vorbis/dec/SoftVorbis.cpp
ibstagefright/codecs/vorbis/dec/SoftVorbis.h
99021c47f45ee8bf3317cff7d08226e76c8d8227 02-Apr-2014 Jeff Tinker <jtinker@google.com> am f356a123: am 68d9d71a: Support CAST V2 Authentication in MediaDrm

* commit 'f356a123bf966150965a1af1cb9bd6ff2ca020de':
Support CAST V2 Authentication in MediaDrm
f356a123bf966150965a1af1cb9bd6ff2ca020de 02-Apr-2014 Jeff Tinker <jtinker@google.com> am 68d9d71a: Support CAST V2 Authentication in MediaDrm

* commit '68d9d71a792deed75d32fe13febc07c9c12c8449':
Support CAST V2 Authentication in MediaDrm
54b0bc74e051bd7df10cd657b481d88db6cdaa27 31-Mar-2014 Lajos Molnar <lajos@google.com> ACodec: do not signal kWhatShutdownCompleted on codec error

Do not signal kWhatShutdownCompleted when moving to Uninitialized
state due to receiving a codec error.

Do not abort if error happens just before handling a stop request.

Bug: 13675112
Change-Id: I4b14b2e64cff0f71215d2bbc24cd850617dfb67b
ibstagefright/ACodec.cpp
ec5f7cc4756d389505e761b9d803a1a3a46b64d7 31-Mar-2014 Lajos Molnar <lajos@google.com> MediaCodec: move to UNINITIALIZED state on codec error

ACodec moves to Uninitialized state after receiving codec error.
Make MediaCodec also move to the same state, so stop() and
release() will work correctly.

Bug: 13675112
Change-Id: I1c7e8b274f68345fc0e6a55c70dff6c7a4fb2e72
ibstagefright/MediaCodec.cpp
68d9d71a792deed75d32fe13febc07c9c12c8449 04-Mar-2014 Jeff Tinker <jtinker@google.com> Support CAST V2 Authentication in MediaDrm

Java API version

Update frameworks to enable support for CAST
V2 Authentication in the DRM Plugin.

Change-Id: I9066ada0edf8e0d777c503897d8c7fc7f76f2861
related-to-bug: 12702350
ibmedia/IDrm.cpp
ibmediaplayerservice/Drm.cpp
ibmediaplayerservice/Drm.h
5e184b0d12f1ec436246a391da8d9355cc21ee08 28-Mar-2014 Lajos Molnar <lajos@google.com> ACodec: ignore OMX messages to already freed component

Bug: 12916984
Change-Id: I92848797b8d556cff468b9b0f0a618946083208f
ibstagefright/ACodec.cpp
b47558f87ee9bd4fce11a2d5bc213bd1aa9031a8 28-Mar-2014 Lajos Molnar <lajos@google.com> mediaplayer: add temporary developer settings to use NuPlayer as default

Bug: 11784824
Change-Id: Ic98f5fd15ee283d7f581bdc3331d000198ecc9e8
ibmediaplayerservice/MediaPlayerFactory.cpp
4f1ef2cd65d734edae17f8586cf717598b40f2c3 28-Mar-2014 Lajos Molnar <lajos@google.com> am 1000d426: am f780d28d: Merge "DO NOT MERGE: Revert "mediaplayer: keep more buffers with the BufferQueue"" into klp-dev

* commit '1000d426bedb1ec38bdfff98fc8f004b64af13cb':
DO NOT MERGE: Revert "mediaplayer: keep more buffers with the BufferQueue"
ff382d0c40493303ceb81a6c22d1a48c0fecfe9c 28-Mar-2014 Lajos Molnar <lajos@google.com> am 8bf96c01: am 3d4e4fcb: Merge "DO NOT MERGE: Revert "stagefright: allow for minUndequeuedBufs to be one less"" into klp-dev

* commit '8bf96c011ff4128f9bf06b892a38d869192d6a25':
DO NOT MERGE: Revert "stagefright: allow for minUndequeuedBufs to be one less"
1000d426bedb1ec38bdfff98fc8f004b64af13cb 28-Mar-2014 Lajos Molnar <lajos@google.com> am f780d28d: Merge "DO NOT MERGE: Revert "mediaplayer: keep more buffers with the BufferQueue"" into klp-dev

* commit 'f780d28de2e3cf7f6b26b9626321dba75719736e':
DO NOT MERGE: Revert "mediaplayer: keep more buffers with the BufferQueue"
8bf96c011ff4128f9bf06b892a38d869192d6a25 28-Mar-2014 Lajos Molnar <lajos@google.com> am 3d4e4fcb: Merge "DO NOT MERGE: Revert "stagefright: allow for minUndequeuedBufs to be one less"" into klp-dev

* commit '3d4e4fcbcfc5c16dd794591727f5c713831ab6dc':
DO NOT MERGE: Revert "stagefright: allow for minUndequeuedBufs to be one less"
f780d28de2e3cf7f6b26b9626321dba75719736e 28-Mar-2014 Lajos Molnar <lajos@google.com> Merge "DO NOT MERGE: Revert "mediaplayer: keep more buffers with the BufferQueue"" into klp-dev
3d4e4fcbcfc5c16dd794591727f5c713831ab6dc 28-Mar-2014 Lajos Molnar <lajos@google.com> Merge "DO NOT MERGE: Revert "stagefright: allow for minUndequeuedBufs to be one less"" into klp-dev
114c1b6553e3d2dc5f2780a76d92bb382234220c 28-Mar-2014 Lajos Molnar <lajos@google.com> DO NOT MERGE: Revert "mediaplayer: keep more buffers with the BufferQueue"

This reverts commit b635b0e66b257ab442e230bca96afd5105cf6829.

Bug: 13655631
ibstagefright/ACodec.cpp
ibstagefright/OMXCodec.cpp
f5ee327780ea2b538b8affafa8063f0ce0390fe0 28-Mar-2014 Lajos Molnar <lajos@google.com> DO NOT MERGE: Revert "stagefright: allow for minUndequeuedBufs to be one less"

This reverts commit a0470879e25394cb85437366fa53ce8055cd556f.

Bug: 13655631
ibstagefright/ACodec.cpp
ibstagefright/OMXCodec.cpp
c9b8d90dabdf1234be0117c592f635a92c4eb0d9 27-Mar-2014 Glenn Kasten <gkasten@google.com> Merge "Use symbol AUDIO_IO_HANDLE_NONE from <system/audio.h>"
5c4fa907328c8ee586367272c7525cb87742f14d 26-Mar-2014 Glenn Kasten <gkasten@google.com> Merge "Use LOG_ALWAYS_FATAL instead of LOG_FATAL"
142f519aa1acd5804d111e60d100f170fed28405 26-Mar-2014 Glenn Kasten <gkasten@google.com> Use symbol AUDIO_IO_HANDLE_NONE from <system/audio.h>

Change-Id: Id6b1aa17558eb73e17f22b8eab6cd02e00a96dff
ibmedia/AudioRecord.cpp
ibmedia/AudioSystem.cpp
ibmedia/AudioTrack.cpp
2301acc6a9c7a3af4ad01f3d1d0f76f13eca7350 17-Jan-2014 Glenn Kasten <gkasten@google.com> Update comments

Change-Id: I5776313b9b49072cd666d28880f0d07cc73f827b
ibmedia/AudioSystem.cpp
ibmedia/IAudioFlinger.cpp
ibmedia/IAudioPolicyService.cpp
ibstagefright/AudioPlayer.cpp
adad3d7d935da176ff24941b4ae9edf7340e9b96 21-Feb-2014 Glenn Kasten <gkasten@google.com> Use LOG_ALWAYS_FATAL instead of LOG_FATAL

LOG_FATAL is compiled out in most builds, so the
assertion checks were not being performed.

Change-Id: I774f0985ab9c5ccecd8989a0f1c940386b73fc35
ibmedia/AudioTrackShared.cpp
ibmediaplayerservice/MediaPlayerService.cpp
ecdca392ed40e89a6ef14b86446e952c35497ac4 26-Mar-2014 Glenn Kasten <gkasten@google.com> Merge "Use symbolic constants from <system/audio.h>"
51beebba9d4989d05831a13bbe5cdf53ecac1bf5 26-Mar-2014 Glenn Kasten <gkasten@google.com> Merge "Use symbol AUDIO_DEVICE_NONE from <system/audio.h>"
b8f8d231685afdec472136b45c527a71bfb8bcc4 26-Mar-2014 Glenn Kasten <gkasten@google.com> Merge "Remove stream type from AudioSystem::getRenderPosition()"
73ec11738cd4399c55d4905665a14a7c4cd42cbf 26-Mar-2014 Glenn Kasten <gkasten@google.com> Merge "Fix uses of KeyedVector"
8c7b9fb41585fccb06573252823b929c82a40999 26-Mar-2014 Glenn Kasten <gkasten@google.com> Merge "Remove streamType parameter from AudioSystem::getLatency()"
0ed19594452c901c3c8665d06610fffe46895d06 26-Mar-2014 Glenn Kasten <gkasten@google.com> Remove stream type from AudioSystem::getRenderPosition()

The I/O handle is never equal to AUDIO_IO_HANDLE_NONE,
so the stream type is not needed.

Change-Id: I1ab134a2fa379d6dd0b6167345a856a192d478f9
ibmedia/AudioSystem.cpp
f7f21b93bfce562784ee8f632fb01a2f8e4ffa6b 26-Mar-2014 Glenn Kasten <gkasten@google.com> Merge "Remove dead code"
887bbadb3e1de315c74c905594ee5f2d29a5675c 26-Mar-2014 Glenn Kasten <gkasten@google.com> Merge "Fix log spam when MonoPipe is unable to get local frequency"
ebb80e4f9873cc1a5ee3f766323f622bb0c07ae5 26-Mar-2014 Glenn Kasten <gkasten@google.com> Remove dead code

Change-Id: I0878d11451c7bbbf96b59f5fe0cd97ba1f033aa9
ibmedia/AudioTrack.cpp
241618f1b286f9e7e02fe61e96d9194e2e1e8a7a 26-Mar-2014 Glenn Kasten <gkasten@google.com> Remove streamType parameter from AudioSystem::getLatency()

Change-Id: Ie7346e93436ddc215cad7d16be555dcb6c277d54
ibmedia/AudioSystem.cpp
ibmedia/AudioTrack.cpp
45faf7e02791993a487d6e038d16ff46395f1975 17-Jan-2014 Glenn Kasten <gkasten@google.com> Use symbol AUDIO_DEVICE_NONE from <system/audio.h>

Change-Id: I61f882c5e7c949bf00d3bfc745ebf3b5e1c42a58
ibmedia/AudioSystem.cpp
ibmedia/IAudioFlinger.cpp
66e4635cb09fadcaccf912f37c387396c428378a 17-Jan-2014 Glenn Kasten <gkasten@google.com> Use symbolic constants from <system/audio.h>

AUDIO_INTERLEAVE_*
AUDIO_STREAM_MIN
AUDIO_SESSION_ALLOCATE

Change-Id: I31dd6f327204685e50716079ce21c4ba206dff11
ibmedia/AudioTrack.cpp
ibmedia/ToneGenerator.cpp
9ea65d0f4a564478343b1a722fae4ce5883670c3 17-Jan-2014 Glenn Kasten <gkasten@google.com> Fix uses of KeyedVector

Constructor for AudioFlinger::mAudioHwDevs was missing, and so
AudioFlinger::findSuitableHwDev_l() could return an undefined pointer
if a non-0 module wasn't found.

A KeyedVector of Plain Old Data (POD) element type must specify the
default value in the constructor, or else the default will be undefined.

Minor:
- Parameter had wrong type in constructor for AudioSystem::gOutputs.
- Remove obsolete AudioSystem::gStreamOutputMap.

Change-Id: I9841493e018440e559d8b8b0e4e748ba2b2d365b
ibmedia/AudioSystem.cpp
85d109a4b0eddd76a8c5cee170bc2bcc99d00118 17-Jan-2014 Glenn Kasten <gkasten@google.com> Document AudioSystem::newAudioSessionId() failures

Change-Id: Iaa168722f362c36bdfa87fe20dc0a59b43cf1ca3
ibmedia/AudioSystem.cpp
ibmedia/IAudioFlinger.cpp
3f35eb55f0e2bc5a4dda7f58ed52654403a87efa 21-Nov-2013 Glenn Kasten <gkasten@google.com> Fix log spam when MonoPipe is unable to get local frequency

Local frequency does not change, so only ask for it the first time a
MonoPipe is constructed in a given client process. Thereafter use a
previously cached value. Likewise, if the local frequency is unavailable,
only log this the first time.

Change-Id: Ib1fc7251c3832e02fe03811db39a87e500f1df50
ibnbaio/MonoPipe.cpp
1392eb3d1802e9f894f87d7a7387207d1b6faca1 25-Mar-2014 Glenn Kasten <gkasten@google.com> Fix operator precedence

Change-Id: I164708a5b76a341a185467b008ecbec98d58a6df
ibmedia/CharacterEncodingDetector.cpp
eb5d7f2f1cc049ea7f95a4f089ce2113d7683dda 25-Mar-2014 Lajos Molnar <lajos@google.com> mtp: avoid silent allocation overflow in MtpProperty

Bug: 13006907
Change-Id: Ice0352394840132c9c2ce6c28366632c792a32c0
tp/MtpProperty.cpp
55d15957bc44d11052e1cb3eea3340ec00f70bae 21-Mar-2014 Lajos Molnar <lajos@google.com> Merge "stagefright: initial media_codecs_google*.xml files"
ba1390335794a38472bf0349568bc4f199dc5c90 21-Mar-2014 Lajos Molnar <lajos@google.com> am 30890210: am 333ceb4f: Merge "DO NOT MERGE: PlaylistFetcher: fix infinite loop when parsing ADTS." into klp-dev

* commit '3089021031d6ad0f2b330567f108aec03fa13994':
DO NOT MERGE: PlaylistFetcher: fix infinite loop when parsing ADTS.
3089021031d6ad0f2b330567f108aec03fa13994 21-Mar-2014 Lajos Molnar <lajos@google.com> am 333ceb4f: Merge "DO NOT MERGE: PlaylistFetcher: fix infinite loop when parsing ADTS." into klp-dev

* commit '333ceb4f66ccf790081026f645474e07d832fbdb':
DO NOT MERGE: PlaylistFetcher: fix infinite loop when parsing ADTS.
0fcba89e5460ed3edca75322175b8a56a6e6f48d 21-Mar-2014 Lajos Molnar <lajos@google.com> am 333ceb4f: Merge "DO NOT MERGE: PlaylistFetcher: fix infinite loop when parsing ADTS." into klp-dev

* commit '333ceb4f66ccf790081026f645474e07d832fbdb':
DO NOT MERGE: PlaylistFetcher: fix infinite loop when parsing ADTS.
333ceb4f66ccf790081026f645474e07d832fbdb 21-Mar-2014 Lajos Molnar <lajos@google.com> Merge "DO NOT MERGE: PlaylistFetcher: fix infinite loop when parsing ADTS." into klp-dev
65e20ffc984c541a8119420f917493dd7b703f77 07-Feb-2014 Robert Shih <robertshih@google.com> DO NOT MERGE: PlaylistFetcher: fix infinite loop when parsing ADTS.

First check for embedded ID3 tag, then bail out if invalid.

Bug: 12934795
Change-Id: I74acebed4bfb2c6ca44dfe936166fdba8510233f
ibstagefright/httplive/PlaylistFetcher.cpp
d1afbf1372488bd927afdbb2ca49a3000511125f 21-Mar-2014 Rachad <rachad@google.com> am 1bfb8f76: am f622e2c7: Increased recorded MP4 max file size to 4GB (more precisely 2^32-1 bytes -- FAT32 max file size)

* commit '1bfb8f762dd21b39756fd8fd9990172cae1cef79':
Increased recorded MP4 max file size to 4GB (more precisely 2^32-1 bytes -- FAT32 max file size)
5ce204a6362840fe28aa762693edaab3d0da8718 21-Mar-2014 Rachad <rachad@google.com> am f622e2c7: Increased recorded MP4 max file size to 4GB (more precisely 2^32-1 bytes -- FAT32 max file size)

* commit 'f622e2c78407b50806a53a06a89b2b6546420f55':
Increased recorded MP4 max file size to 4GB (more precisely 2^32-1 bytes -- FAT32 max file size)
1bfb8f762dd21b39756fd8fd9990172cae1cef79 21-Mar-2014 Rachad <rachad@google.com> am f622e2c7: Increased recorded MP4 max file size to 4GB (more precisely 2^32-1 bytes -- FAT32 max file size)

* commit 'f622e2c78407b50806a53a06a89b2b6546420f55':
Increased recorded MP4 max file size to 4GB (more precisely 2^32-1 bytes -- FAT32 max file size)
f622e2c78407b50806a53a06a89b2b6546420f55 11-Feb-2014 Rachad <rachad@google.com> Increased recorded MP4 max file size to 4GB
(more precisely 2^32-1 bytes -- FAT32 max file size)

bug: 11039801
Change-Id: I6169f798c59d123d02d5fd7afa3b9e645ebdb598
(cherry picked from commit 1f1f2b1678fd0d038dfc501252dd2b65ecf10cae)
ibstagefright/MPEG4Writer.cpp
84f7a5b28a686f9a165e1df5c90a72b218a87568 20-Mar-2014 Marco Nelissen <marcone@google.com> am 9ec86fa0: am a577eefb: am 5be9c1da: am 01eed3c0: am 7a107b85: am 854aa061: am 42ba5806: am 72499628: am 25bab830: Fix build

* commit '9ec86fa05479cc468859c69009afda752ea46539':
Fix build
9ec86fa05479cc468859c69009afda752ea46539 20-Mar-2014 Marco Nelissen <marcone@google.com> am a577eefb: am 5be9c1da: am 01eed3c0: am 7a107b85: am 854aa061: am 42ba5806: am 72499628: am 25bab830: Fix build

* commit 'a577eefbaca24d1b9ac947daca54be1992888748':
Fix build
762f533c825040ae0d953783584f778ec187fec5 20-Mar-2014 Marco Nelissen <marcone@google.com> am a577eefb: am 5be9c1da: am 01eed3c0: am 7a107b85: am 854aa061: am 42ba5806: am 72499628: am 25bab830: Fix build

* commit 'a577eefbaca24d1b9ac947daca54be1992888748':
Fix build
a577eefbaca24d1b9ac947daca54be1992888748 20-Mar-2014 Marco Nelissen <marcone@google.com> am 5be9c1da: am 01eed3c0: am 7a107b85: am 854aa061: am 42ba5806: am 72499628: am 25bab830: Fix build

* commit '5be9c1daf956c35d37585d21fff5d6b99f506560':
Fix build
5be9c1daf956c35d37585d21fff5d6b99f506560 20-Mar-2014 Marco Nelissen <marcone@google.com> am 01eed3c0: am 7a107b85: am 854aa061: am 42ba5806: am 72499628: am 25bab830: Fix build

* commit '01eed3c0fb951e349d68f4bce818bef22e7925b1':
Fix build
01eed3c0fb951e349d68f4bce818bef22e7925b1 20-Mar-2014 Marco Nelissen <marcone@google.com> am 7a107b85: am 854aa061: am 42ba5806: am 72499628: am 25bab830: Fix build

* commit '7a107b857e658ba11c0c1fd2325ac91a2c0569a2':
Fix build
7a107b857e658ba11c0c1fd2325ac91a2c0569a2 20-Mar-2014 Marco Nelissen <marcone@google.com> am 854aa061: am 42ba5806: am 72499628: am 25bab830: Fix build

* commit '854aa061b1e2d7eaaf8ffa2ead323c1478393c57':
Fix build
72499628a24ccea0befe726de6e2b32176ddf208 20-Mar-2014 Marco Nelissen <marcone@google.com> am 25bab830: Fix build

* commit '25bab830af062dcaef6f75220066b221fd30957e':
Fix build
25bab830af062dcaef6f75220066b221fd30957e 20-Mar-2014 Marco Nelissen <marcone@google.com> Fix build

As of jb-mr1, need to explicitly include library dependencies. The original
change in jb, which the automerger dutyfully merged, did not need this.

Change-Id: I429637e2d01b8084376bb97a02bb091a0ea9eaf7
ibstagefright/chromium_http/Android.mk
fb08bd765844160649f23c0e5ee76772678528ba 20-Mar-2014 Marco Nelissen <marcone@google.com> am 994cbef7: am 2853e48c: am 6f65db14: am 0e0891f8: am 6cdc90b5: am ebc9b473: am fb49b8ba: am dfd90c80: am d434944b: am 3bc4f7ea: am 0c271b75: Verify certificates

* commit '994cbef7361b0f304883ea463488342347ed67b8':
Verify certificates
762108211026d46cf277d1585cf770170932e3f2 20-Mar-2014 Marco Nelissen <marcone@google.com> am 2853e48c: am 6f65db14: am 0e0891f8: am 6cdc90b5: am ebc9b473: am fb49b8ba: am dfd90c80: am d434944b: am 3bc4f7ea: am 0c271b75: Verify certificates

* commit '2853e48c855fc95f2bd7bf9438a878f2a79d75a7':
Verify certificates
994cbef7361b0f304883ea463488342347ed67b8 20-Mar-2014 Marco Nelissen <marcone@google.com> am 2853e48c: am 6f65db14: am 0e0891f8: am 6cdc90b5: am ebc9b473: am fb49b8ba: am dfd90c80: am d434944b: am 3bc4f7ea: am 0c271b75: Verify certificates

* commit '2853e48c855fc95f2bd7bf9438a878f2a79d75a7':
Verify certificates
2853e48c855fc95f2bd7bf9438a878f2a79d75a7 20-Mar-2014 Marco Nelissen <marcone@google.com> am 6f65db14: am 0e0891f8: am 6cdc90b5: am ebc9b473: am fb49b8ba: am dfd90c80: am d434944b: am 3bc4f7ea: am 0c271b75: Verify certificates

* commit '6f65db14e310b513c8943b236a6e61cf27cef4c7':
Verify certificates
6f65db14e310b513c8943b236a6e61cf27cef4c7 20-Mar-2014 Marco Nelissen <marcone@google.com> am 0e0891f8: am 6cdc90b5: am ebc9b473: am fb49b8ba: am dfd90c80: am d434944b: am 3bc4f7ea: am 0c271b75: Verify certificates

* commit '0e0891f8b49f31e6a28b563f86aae537e66bb6e0':
Verify certificates
0e0891f8b49f31e6a28b563f86aae537e66bb6e0 20-Mar-2014 Marco Nelissen <marcone@google.com> am 6cdc90b5: am ebc9b473: am fb49b8ba: am dfd90c80: am d434944b: am 3bc4f7ea: am 0c271b75: Verify certificates

* commit '6cdc90b5e41374dd665df3ae7283ef0c1f532678':
Verify certificates
6cdc90b5e41374dd665df3ae7283ef0c1f532678 20-Mar-2014 Marco Nelissen <marcone@google.com> am ebc9b473: am fb49b8ba: am dfd90c80: am d434944b: am 3bc4f7ea: am 0c271b75: Verify certificates

* commit 'ebc9b47330ab8565f7bdd9b3973a8f75e3206e77':
Verify certificates
dfd90c8052a913ed2bbbea1873ee51838d40bfe1 20-Mar-2014 Marco Nelissen <marcone@google.com> am d434944b: am 3bc4f7ea: am 0c271b75: Verify certificates

* commit 'd434944b00cf83a38019047e0d7db155a15d77f4':
Verify certificates
d434944b00cf83a38019047e0d7db155a15d77f4 20-Mar-2014 Marco Nelissen <marcone@google.com> am 3bc4f7ea: am 0c271b75: Verify certificates

* commit '3bc4f7eaf063201dc85ecc2f7c2bf2b70ab564ed':
Verify certificates
3bc4f7eaf063201dc85ecc2f7c2bf2b70ab564ed 20-Mar-2014 Marco Nelissen <marcone@google.com> am 0c271b75: Verify certificates

* commit '0c271b750f7314e187f8479f478ad9382d9a9045':
Verify certificates
3b800bf9a1db3c9f2f37c9512deb282588e8b50c 19-Mar-2014 Lajos Molnar <lajos@google.com> stagefright: initial media_codecs_google*.xml files

Separated description of Google-provided codecs into their own
files based on domain. Google-provided audio/telephony codecs
should be included prior to specifying vendor codecs. Google-
provided video codecs should be included after vendor codecs.

Bug: 13549114
Change-Id: I216f01feaf0379c6cd7d8714e02792fdf2214a90
ibstagefright/data/media_codecs_google_audio.xml
ibstagefright/data/media_codecs_google_telephony.xml
ibstagefright/data/media_codecs_google_video.xml
10cb92cfba6b47f98e93b1bed18acb715c5f6ecb 20-Mar-2014 Alex Glaznev <glaznev@google.com> Merge "A few fixes in SW VP8 encoder:"
b4a7a2df4c28c3f32b5d877b54831d2cc5d78f81 20-Mar-2014 Colin Cross <ccross@android.com> libstagefright: fix 64-bit warnings

%lld -> %" PRId64 " for int64_t
%d -> %zu for size_t
Also fixes some casts from void* to integer types, and some comparisons
between signed and unsigned.

Change-Id: I9c52f76240e39399da252c66459042a6fc626a90
ibstagefright/codecs/flac/enc/SoftFlacEncoder.cpp
ibstagefright/codecs/m4v_h263/enc/SoftMPEG4Encoder.cpp
ibstagefright/httplive/LiveSession.cpp
ibstagefright/httplive/M3UParser.cpp
ibstagefright/httplive/PlaylistFetcher.cpp
ibstagefright/id3/ID3.cpp
ibstagefright/matroska/MatroskaExtractor.cpp
ibstagefright/mpeg2ts/ATSParser.cpp
ibstagefright/mpeg2ts/AnotherPacketSource.cpp
ibstagefright/mpeg2ts/ESQueue.cpp
ibstagefright/mpeg2ts/MPEG2PSExtractor.cpp
ibstagefright/rtsp/AAVCAssembler.cpp
ibstagefright/rtsp/AMPEG4ElementaryAssembler.cpp
ibstagefright/rtsp/ARTPConnection.cpp
ibstagefright/rtsp/ARTPWriter.cpp
ibstagefright/rtsp/SDPLoader.cpp
ibstagefright/timedtext/TimedTextPlayer.cpp
ibstagefright/webm/WebmElement.cpp
ibstagefright/webm/WebmFrameThread.cpp
0d6abe8cdadde6f9ad7ac989042f725668233bdb 25-Feb-2014 Alex Glaznev <glaznev@google.com> A few fixes in SW VP8 encoder:

- Increase encoder output buffer size to 1 Mb to avoid buffer
overrun when encoding high complexity HD frames.

- Store output port format parameters.

- Use same VP8 encoder settings as in WebRTC when encoder is
configured to run in CBR mode.

Bug: b/12924516
Bug: b/12908952
Change-Id: Ida884efd0cd1a7272998f5835abd290bfb19b2ac
ibstagefright/codecs/on2/enc/SoftVPXEncoder.cpp
ibstagefright/codecs/on2/enc/SoftVPXEncoder.h
d4a31b8bcd7df99dfce2f25a32badf4611a6ba1a 19-Mar-2014 John Spurlock <jspurlock@google.com> Merge "Add MediaPlayer::getAudioStreamType."
259ace8f6057dbb0fdec4c8223aefc0282274be3 19-Mar-2014 Glenn Kasten <gkasten@google.com> Merge commit 'c250980f' into manualmerge

Change-Id: I254d456e8cb6c580dd77d602b391bed09110454e
181cd2ba90ab574da7b57a0b79e3e2118b6ea3ad 19-Mar-2014 Glenn Kasten <gkasten@android.com> am 24e1bd71: Merge "libstagefright is no longer 32 bit only."

* commit '24e1bd71ac6850d9062b3bd803b37c0e92f69c7a':
libstagefright is no longer 32 bit only.
c250980f65ffec76537d9c6d9b1ad12afc38346a 19-Mar-2014 Glenn Kasten <gkasten@android.com> am 24e1bd71: Merge "libstagefright is no longer 32 bit only."

* commit '24e1bd71ac6850d9062b3bd803b37c0e92f69c7a':
libstagefright is no longer 32 bit only.
b28f7445376442c64973c0193b374f919781f105 19-Mar-2014 Marco Nelissen <marcone@google.com> Merge "Use more tags to help the ICU detector."
2ceebb30a1ee5282d36bc47840f4c5a6187a7a92 19-Mar-2014 Lajos Molnar <lajos@google.com> am bd1f8f0a: am fb28c384: am 1faa4170: stagefright: allow for minUndequeuedBufs to be one less

* commit 'bd1f8f0a5cc55761edfbd2a472e229dd4b0d2cdf':
stagefright: allow for minUndequeuedBufs to be one less
bd1f8f0a5cc55761edfbd2a472e229dd4b0d2cdf 19-Mar-2014 Lajos Molnar <lajos@google.com> am fb28c384: am 1faa4170: stagefright: allow for minUndequeuedBufs to be one less

* commit 'fb28c384316518f699e7dd3e9149c9e84b05a525':
stagefright: allow for minUndequeuedBufs to be one less
fb28c384316518f699e7dd3e9149c9e84b05a525 19-Mar-2014 Lajos Molnar <lajos@google.com> am 1faa4170: stagefright: allow for minUndequeuedBufs to be one less

* commit '1faa41704e0b976e546321effcb09a85767d51ba':
stagefright: allow for minUndequeuedBufs to be one less
f4d9d45ebad478091d65b2a4c18544d308d3fff0 19-Mar-2014 Lajos Molnar <lajos@google.com> am 1faa4170: stagefright: allow for minUndequeuedBufs to be one less

* commit '1faa41704e0b976e546321effcb09a85767d51ba':
stagefright: allow for minUndequeuedBufs to be one less
de9453fb5cbc9cd69fd1ea45d577851e3aa3b8c9 19-Mar-2014 John Spurlock <jspurlock@google.com> Add MediaPlayer::getAudioStreamType.

Change-Id: I9cd8a718d2873543609aa651fd85749478f4f89f
ibmedia/mediaplayer.cpp
1faa41704e0b976e546321effcb09a85767d51ba 19-Mar-2014 Lajos Molnar <lajos@google.com> stagefright: allow for minUndequeuedBufs to be one less

Bug: 13533477
Change-Id: I909324e3e24f65d8051e0d5474267620efcfc729
ibstagefright/ACodec.cpp
ibstagefright/OMXCodec.cpp
f3aa039a2278f789e3c9d5e18b83f9d937a05a5f 19-Mar-2014 Narayan Kamath <narayan@google.com> libstagefright is no longer 32 bit only.

Change-Id: I88d5fcfc005a2c2acd0246cdd9c08b6c00b6c39b
Signed-off-by: Glenn Kasten <gkasten@android.com>
ibstagefright/Android.mk
ibstagefright/chromium_http/Android.mk
ibstagefright/codecs/aacenc/Android.mk
ibstagefright/codecs/avc/enc/Android.mk
ibstagefright/httplive/Android.mk
ibstagefright/id3/Android.mk
ibstagefright/wifi-display/Android.mk
d74110cdef2becd4f7fd2334c34c3ca73f56b355 19-Mar-2014 Lajos Molnar <lajos@google.com> stagefright: add include support for MediaCodecList xml parser

One can include full-formed XML files using <Include href=".." />.
For security/simplicity, file names must be in the form of
"media_codecs_.*\.xml"

Change-Id: Id039a4fd0ade390224485fcf5ecc1d107b2bdb9a
ibstagefright/MediaCodecList.cpp
0c271b750f7314e187f8479f478ad9382d9a9045 13-Mar-2014 Marco Nelissen <marcone@google.com> Verify certificates

b/13418320

Cherrypicked from 8a57d24c733b08da846b54d1adf029e606b5a5f3
https://googleplex-android-review.git.corp.google.com/#/c/433309/

Change-Id: I3052dd5f9ec057e700784cd713f6a7dab9ecfe7b
ibstagefright/chromium_http/support.cpp
bfd55f243feb3f04e26ad07aae035475768ada8a 18-Mar-2014 Marco Nelissen <marcone@google.com> Use more tags to help the ICU detector.

The detector only gave non-ascii data to ICU. In some cases that could
result in very short data, for which ICU would issue a low confidence
level for the actual encoding. By padding the data with additional
(ascii) tags, we improve accuracy for such files. Becauses this can
reduce accuracy in other cases, only do this when the initial confidence
is low.

b/13473604

Change-Id: I63d932043155c310b0e358cdf2d37787961e94b7
ibmedia/CharacterEncodingDetector.cpp
ibmedia/CharacterEncodingDetector.h
129c76538570cd42fce2154bfb0aec934cf84ff3 19-Mar-2014 Lajos Molnar <lajos@google.com> am 9cde5172: am b635b0e6: mediaplayer: keep more buffers with the BufferQueue

* commit '9cde517297827156de1c3b2ff54e272a5d4ae7c3':
mediaplayer: keep more buffers with the BufferQueue
9cde517297827156de1c3b2ff54e272a5d4ae7c3 19-Mar-2014 Lajos Molnar <lajos@google.com> am b635b0e6: mediaplayer: keep more buffers with the BufferQueue

* commit 'b635b0e66b257ab442e230bca96afd5105cf6829':
mediaplayer: keep more buffers with the BufferQueue
4647dba9afd0b365e47b9493a680d71b59a361e6 19-Mar-2014 Lajos Molnar <lajos@google.com> am b635b0e6: mediaplayer: keep more buffers with the BufferQueue

* commit 'b635b0e66b257ab442e230bca96afd5105cf6829':
mediaplayer: keep more buffers with the BufferQueue
7a39abac839092298cd184c5996dc82010d60a20 19-Mar-2014 Robert Shih <robertshih@google.com> am 49b2e310: am a1f0c62c: am 43ca783e: httplive: block-by-block fetch, decrypt, and parse ts files.

* commit '49b2e310f62c590a1af9f921cd8a134cdf589263':
httplive: block-by-block fetch, decrypt, and parse ts files.
49b2e310f62c590a1af9f921cd8a134cdf589263 19-Mar-2014 Robert Shih <robertshih@google.com> am a1f0c62c: am 43ca783e: httplive: block-by-block fetch, decrypt, and parse ts files.

* commit 'a1f0c62c189f2d162cca4af736c3d440f1eff53c':
httplive: block-by-block fetch, decrypt, and parse ts files.
a1f0c62c189f2d162cca4af736c3d440f1eff53c 19-Mar-2014 Robert Shih <robertshih@google.com> am 43ca783e: httplive: block-by-block fetch, decrypt, and parse ts files.

* commit '43ca783effd99bba0e6e2dd6fe177a8888578ef8':
httplive: block-by-block fetch, decrypt, and parse ts files.
28c3e94a9b02bd5d5ed4b5fe96dff74700f88677 19-Mar-2014 Robert Shih <robertshih@google.com> am 43ca783e: httplive: block-by-block fetch, decrypt, and parse ts files.

* commit '43ca783effd99bba0e6e2dd6fe177a8888578ef8':
httplive: block-by-block fetch, decrypt, and parse ts files.
b635b0e66b257ab442e230bca96afd5105cf6829 14-Feb-2014 Lajos Molnar <lajos@google.com> mediaplayer: keep more buffers with the BufferQueue

Change OMX buffer allocation policy to allocate
nBufferCountMin + what is required for the BQ.

For the BQ, try to allocate 2 additional buffers than
the minimum undequeued count.

Also account for the fact that BQ may return one less
than the actual minimum undequeued count.

In most cases the resulting number of buffers ends up
being the same as with the previous policy, but we
keep more buffers with the BQ.

Change-Id: I826db8bf7dd333b620299dba60bf1b81b228275d
Bug: 13170236
ibstagefright/ACodec.cpp
ibstagefright/OMXCodec.cpp
43ca783effd99bba0e6e2dd6fe177a8888578ef8 27-Feb-2014 Robert Shih <robertshih@google.com> httplive: block-by-block fetch, decrypt, and parse ts files.

Bug: 12060952
Change-Id: I695345081fe23961b9d0ef6db264885f914703ec
ibstagefright/httplive/LiveSession.cpp
ibstagefright/httplive/LiveSession.h
ibstagefright/httplive/PlaylistFetcher.cpp
ibstagefright/httplive/PlaylistFetcher.h
ibstagefright/mpeg2ts/ATSParser.h
286c7d915fe6d7092426c72319affe260572aa0d 19-Mar-2014 Colin Cross <ccross@android.com> am c7c839dc: am b2ecad7f: Merge "libstagefright_foundation: fix printf format for 64-bit"

* commit 'c7c839dccf58ab6322c1898cbf1b2332792d2e86':
libstagefright_foundation: fix printf format for 64-bit
c7c839dccf58ab6322c1898cbf1b2332792d2e86 19-Mar-2014 Colin Cross <ccross@android.com> am b2ecad7f: Merge "libstagefright_foundation: fix printf format for 64-bit"

* commit 'b2ecad7f079f4f852d334e67fd7a72ff1696a78e':
libstagefright_foundation: fix printf format for 64-bit
a933aa34f95ca54a765a2a3f2ef245b7054aef16 19-Mar-2014 Colin Cross <ccross@android.com> am b2ecad7f: Merge "libstagefright_foundation: fix printf format for 64-bit"

* commit 'b2ecad7f079f4f852d334e67fd7a72ff1696a78e':
libstagefright_foundation: fix printf format for 64-bit
67c036a3faada8b77d73cf81bd1b0be4cb60c562 19-Mar-2014 Colin Cross <ccross@android.com> libstagefright_foundation: fix printf format for 64-bit

Fixes build error:
frameworks/av/media/libstagefright/foundation/ANetworkSession.cpp:582:131: error: format '%d' expects argument of type 'int', but argument 4 has type 'size_t {aka long unsigned int}' [-Werror=format=]
ALOGI("%d datagrams remain queued.", mOutFragments.size());
^
cc1plus: all warnings being treated as errors

Change-Id: I69d1f086b8f1e450f107671c8f8f3ed696d170b4
ibstagefright/foundation/ANetworkSession.cpp
1143ca58e659ded1e851eb12813793ad8ac0563e 18-Mar-2014 Glenn Kasten <gkasten@android.com> am 098b28fc: am 64727dd7: Merge "More precise 32-bit only for libstagefright/ subdirectories"

* commit '098b28fc88b3d96eada2f9db318d9c38c70cf674':
More precise 32-bit only for libstagefright/ subdirectories
3327597fe780a076a0755c7a4f1aff895c531dad 18-Mar-2014 Glenn Kasten <gkasten@android.com> am 64727dd7: Merge "More precise 32-bit only for libstagefright/ subdirectories"

* commit '64727dd7c8513b6c9ddcce2f4b305618bb76121c':
More precise 32-bit only for libstagefright/ subdirectories
098b28fc88b3d96eada2f9db318d9c38c70cf674 18-Mar-2014 Glenn Kasten <gkasten@android.com> am 64727dd7: Merge "More precise 32-bit only for libstagefright/ subdirectories"

* commit '64727dd7c8513b6c9ddcce2f4b305618bb76121c':
More precise 32-bit only for libstagefright/ subdirectories
314869117d5e3365fc3e43fee01209d18515ca42 18-Mar-2014 Eric Laurent <elaurent@google.com> Merge "move audio policy service to a separate library"
dc2b47aee47ad8690fd8dc663c6602b7efa3bbac 17-Mar-2014 Glenn Kasten <gkasten@android.com> More precise 32-bit only for libstagefright/ subdirectories

Change-Id: Ie4e8f9ccd834b902287d3452cc9fa739809ddb68
ibstagefright/httplive/Android.mk
ibstagefright/id3/Android.mk
ibstagefright/omx/tests/Android.mk
ibstagefright/tests/Android.mk
ibstagefright/wifi-display/Android.mk
0dc3583043bb578b149e50a9928894eff2819508 15-Mar-2014 Marco Nelissen <marcone@google.com> am 8788c40c: am 75dcf510: Merge "Verify certificates" into klp-dev

* commit '8788c40c7b5bdcaef1dcaa7f36598ae767880047':
Verify certificates
8788c40c7b5bdcaef1dcaa7f36598ae767880047 14-Mar-2014 Marco Nelissen <marcone@google.com> am 75dcf510: Merge "Verify certificates" into klp-dev

* commit '75dcf5101c90e31bbac95694d835b0e8f57ba720':
Verify certificates
a58ed6d8378108e4309ee0077dc4529b76634791 14-Mar-2014 Marco Nelissen <marcone@google.com> am 75dcf510: Merge "Verify certificates" into klp-dev

* commit '75dcf5101c90e31bbac95694d835b0e8f57ba720':
Verify certificates
75dcf5101c90e31bbac95694d835b0e8f57ba720 14-Mar-2014 Marco Nelissen <marcone@google.com> Merge "Verify certificates" into klp-dev
c5a17425986b4ce3384e6956762c86018b49c4a0 13-Mar-2014 Glenn Kasten <gkasten@google.com> Remove name output parameter from createTrack

It was only used for one log.
A better solution will be a per-track unique ID.

Change-Id: Ia440e02ae4a5a4019a9a2d08970e1ee93ac4c3a3
ibmedia/AudioTrack.cpp
ibmedia/IAudioFlinger.cpp
758799cef41fc5495f59eeb6249d02ce9154cde8 14-Mar-2014 Glenn Kasten <gkasten@google.com> resolved conflicts for merge of 3c780188 to master

Change-Id: Ic579d346c27ff05ea6444faaa60fa6caaec86fbf
236104afb2300b7d969b1dc786f14b5f912df1cf 14-Mar-2014 Glenn Kasten <gkasten@android.com> am 089affb6: Merge "mediaserver and associated services are 32-bit only"

* commit '089affb6c2d9ed1e2d49df4be02d30dc490506f9':
mediaserver and associated services are 32-bit only
3c7801882bbb6d5f3cc641525a54cb8a6c4aca34 14-Mar-2014 Glenn Kasten <gkasten@android.com> am 089affb6: Merge "mediaserver and associated services are 32-bit only"

* commit '089affb6c2d9ed1e2d49df4be02d30dc490506f9':
mediaserver and associated services are 32-bit only
089affb6c2d9ed1e2d49df4be02d30dc490506f9 14-Mar-2014 Glenn Kasten <gkasten@android.com> Merge "mediaserver and associated services are 32-bit only"
beb57a5a08207af80180b93dd80d611a85997c43 14-Mar-2014 Andreas Huber <andih@google.com> am f1ac623f: am 4a67fc49: Merge "Implemented support for RTSP 301 Redirect"

* commit 'f1ac623fcc6bbda2faff9752cd611182a897afe1':
Implemented support for RTSP 301 Redirect
f1ac623fcc6bbda2faff9752cd611182a897afe1 14-Mar-2014 Andreas Huber <andih@google.com> am 4a67fc49: Merge "Implemented support for RTSP 301 Redirect"

* commit '4a67fc49d926c75fa6a96160ba5627fb0e209db6':
Implemented support for RTSP 301 Redirect
f10b9885462bea2f0c683038d6833ee230ad9eb2 14-Mar-2014 Andreas Huber <andih@google.com> am 4a67fc49: Merge "Implemented support for RTSP 301 Redirect"

* commit '4a67fc49d926c75fa6a96160ba5627fb0e209db6':
Implemented support for RTSP 301 Redirect
4a67fc49d926c75fa6a96160ba5627fb0e209db6 14-Mar-2014 Andreas Huber <andih@google.com> Merge "Implemented support for RTSP 301 Redirect"
fa243e07f062058e7df01c052eb79086c21fbdbc 14-Mar-2014 Lajos Molnar <lajos@google.com> am 466786b2: am 70cc5bdc: Merge changes Ic46e3069,Idc92716b into klp-dev

* commit '466786b25b262f4f6e5737b3a88e8d7f6916e45c':
LiveSession: fix incorrect stream key (subtitle"s")
M3UParser: trim spaces when parsing comma separated codecs.
a0b94395dc82c90ca437bb6fed7aa01fcbbffffe 14-Mar-2014 Lajos Molnar <lajos@google.com> am 5b297ba7: am 67a10c52: Merge "httplive: clear access units before returning from seekTo." into klp-dev

* commit '5b297ba76271e8554758cbd569e73720bc914af6':
httplive: clear access units before returning from seekTo.
466786b25b262f4f6e5737b3a88e8d7f6916e45c 14-Mar-2014 Lajos Molnar <lajos@google.com> am 70cc5bdc: Merge changes Ic46e3069,Idc92716b into klp-dev

* commit '70cc5bdc0fca3f67f3602f04152c29323cad99df':
LiveSession: fix incorrect stream key (subtitle"s")
M3UParser: trim spaces when parsing comma separated codecs.
5b297ba76271e8554758cbd569e73720bc914af6 14-Mar-2014 Lajos Molnar <lajos@google.com> am 67a10c52: Merge "httplive: clear access units before returning from seekTo." into klp-dev

* commit '67a10c522898d8223f5a2d389a846b7e2327148a':
httplive: clear access units before returning from seekTo.
f6bd712c8c252733f9d033ef60219ff1de9342ad 14-Mar-2014 Lajos Molnar <lajos@google.com> am 70cc5bdc: Merge changes Ic46e3069,Idc92716b into klp-dev

* commit '70cc5bdc0fca3f67f3602f04152c29323cad99df':
LiveSession: fix incorrect stream key (subtitle"s")
M3UParser: trim spaces when parsing comma separated codecs.
6e57e4ddc73da69e1f7e8907e6c498e7407e3c39 14-Mar-2014 Lajos Molnar <lajos@google.com> am 67a10c52: Merge "httplive: clear access units before returning from seekTo." into klp-dev

* commit '67a10c522898d8223f5a2d389a846b7e2327148a':
httplive: clear access units before returning from seekTo.
fca2d347ff3d583c15c56072b6024732d47b3d2f 14-Mar-2014 Chong Zhang <chz@google.com> am cf49a51f: fix codec buffer leak in error handling when timestamp goes backward

* commit 'cf49a51ff59c3cd228d178d23252ac0d39d5a893':
fix codec buffer leak in error handling when timestamp goes backward
b1120b65c328cf6e35c0494d7d61addcbdc16821 14-Mar-2014 Lajos Molnar <lajos@google.com> Merge changes I1455bfc6,I90c7e34b,I06e001df

* changes:
NuPlayer: use MediaCodec instead of ACodec
MediaCodec: add getInputFormat() method
Revert "NuPlayer: Use a software renderer when using software codecs"
43d3f40b389904a2bdf4fd4ef8e8b914cf5a4b67 14-Mar-2014 Chong Zhang <chz@google.com> am bd77a1b5: am cf49a51f: fix codec buffer leak in error handling when timestamp goes backward

* commit 'bd77a1b5115d355eb1e2bc270fe9aa4ceb3d8e65':
fix codec buffer leak in error handling when timestamp goes backward
bd77a1b5115d355eb1e2bc270fe9aa4ceb3d8e65 14-Mar-2014 Chong Zhang <chz@google.com> am cf49a51f: fix codec buffer leak in error handling when timestamp goes backward

* commit 'cf49a51ff59c3cd228d178d23252ac0d39d5a893':
fix codec buffer leak in error handling when timestamp goes backward
29c291f2337561b1f8c2f79bc34339b0b9c28b9c 14-Mar-2014 Chong Zhang <chz@google.com> am a671f943: am c69bc40a: Merge "Cap pts gap between adjacent frames to specified value" into klp-dev

* commit 'a671f943b72155460f0c94cdd92d829cb059b571':
Cap pts gap between adjacent frames to specified value
28836548337865536788799430e9fae77e996422 14-Mar-2014 Chong Zhang <chz@google.com> am 1e001f92: am 1c608ab3: save mGraphicBuffer pointer even when we\'re suspended

* commit '1e001f92e748de00a3e20effa464d59d75a746b3':
save mGraphicBuffer pointer even when we're suspended
7c47cafa5be623f1db483483ac27f714c54dc1cc 14-Mar-2014 Chong Zhang <chz@google.com> am c69bc40a: Merge "Cap pts gap between adjacent frames to specified value" into klp-dev

* commit 'c69bc40a347c411751cb082b3eb4a82d976a68ec':
Cap pts gap between adjacent frames to specified value
5b835698486077c5b1fd81b9fd741dfd7ff37cb3 14-Mar-2014 Chong Zhang <chz@google.com> am 1c608ab3: save mGraphicBuffer pointer even when we\'re suspended

* commit '1c608ab33acab82d4a87f1abedcc99a623d1b53a':
save mGraphicBuffer pointer even when we're suspended
8a57d24c733b08da846b54d1adf029e606b5a5f3 13-Mar-2014 Marco Nelissen <marcone@google.com> Verify certificates

b/13418320

Change-Id: I3052dd5f9ec057e700784cd713f6a7dab9ecfe7b
ibstagefright/chromium_http/Android.mk
ibstagefright/chromium_http/support.cpp
a671f943b72155460f0c94cdd92d829cb059b571 13-Mar-2014 Chong Zhang <chz@google.com> am c69bc40a: Merge "Cap pts gap between adjacent frames to specified value" into klp-dev

* commit 'c69bc40a347c411751cb082b3eb4a82d976a68ec':
Cap pts gap between adjacent frames to specified value
1e001f92e748de00a3e20effa464d59d75a746b3 13-Mar-2014 Chong Zhang <chz@google.com> am 1c608ab3: save mGraphicBuffer pointer even when we\'re suspended

* commit '1c608ab33acab82d4a87f1abedcc99a623d1b53a':
save mGraphicBuffer pointer even when we're suspended
97ae4073c5c589f7df36cc840ec77d02eececbc8 13-Mar-2014 Lajos Molnar <lajos@google.com> Merge "mediaplayer: keep more buffers with the BufferQueue"
0b89a66c96b409f51e882b7d065d4b8562884faf 13-Mar-2014 Marco Nelissen <marcone@google.com> am 19afb386: Merge "Remove streaming URI from default logs"

* commit '19afb3869eb6a3e3733dc1f7420e1d4c3c03d376':
Remove streaming URI from default logs
5205977929c8a63d3bba026c6bd7b4cc1e236627 12-Mar-2014 Dan Stoza <stoza@google.com> Remove deprecated BufferQueue constructor

Bug: 13415624
Change-Id: I1a824d09ce582ee54753683d30cdc23813c13b6b
ibstagefright/SurfaceMediaSource.cpp
ibstagefright/omx/GraphicBufferSource.cpp
ibstagefright/omx/GraphicBufferSource.h
ibstagefright/tests/SurfaceMediaSource_test.cpp
ibstagefright/wifi-display/source/PlaybackSession.cpp
ibstagefright/wifi-display/source/PlaybackSession.h
70cc5bdc0fca3f67f3602f04152c29323cad99df 12-Mar-2014 Lajos Molnar <lajos@google.com> Merge changes Ic46e3069,Idc92716b into klp-dev

* changes:
LiveSession: fix incorrect stream key (subtitle"s")
M3UParser: trim spaces when parsing comma separated codecs.
67a10c522898d8223f5a2d389a846b7e2327148a 12-Mar-2014 Lajos Molnar <lajos@google.com> Merge "httplive: clear access units before returning from seekTo." into klp-dev
fca092d953e04c7169242200f0ddb914a9f54ea4 12-Mar-2014 Marco Nelissen <marcone@google.com> am f4431278: am 19afb386: Merge "Remove streaming URI from default logs"

* commit 'f4431278a9613f55ecd944ab2e3eb615b372f269':
Remove streaming URI from default logs
af783aa91f7a279153fb8bab8d0d6b9f737996e9 03-Mar-2014 Glenn Kasten <gkasten@android.com> mediaserver and associated services are 32-bit only

also 32-bit only command-line apps

Change-Id: I9ac557a8d02bbf6986a9b5c3cdce23d400b306a3
ibmediaplayerservice/Android.mk
ibstagefright/Android.mk
ibstagefright/chromium_http/Android.mk
ibstagefright/codecs/aacenc/Android.mk
ibstagefright/codecs/avc/enc/Android.mk
ediaserver/Android.mk
a44148187c21d431aec7c7a6915f0fad2c44cd70 12-Mar-2014 Mike Lockwood <lockwood@google.com> Merge "MTP: Add support for device property changed events"
f4431278a9613f55ecd944ab2e3eb615b372f269 12-Mar-2014 Marco Nelissen <marcone@google.com> am 19afb386: Merge "Remove streaming URI from default logs"

* commit '19afb3869eb6a3e3733dc1f7420e1d4c3c03d376':
Remove streaming URI from default logs
cf49a51ff59c3cd228d178d23252ac0d39d5a893 15-Feb-2014 Chong Zhang <chz@google.com> fix codec buffer leak in error handling when timestamp goes backward

don't touch codec buffer if we decided to drop a frame with bad pts

Bug: 11971963
Change-Id: I9b4c56210f64258f1be257b14184381a1133e0d6
(cherry picked from commit b63d2433350d56bda9f3477549086c90bb6d535e)
ibstagefright/omx/GraphicBufferSource.cpp
c69bc40a347c411751cb082b3eb4a82d976a68ec 11-Mar-2014 Chong Zhang <chz@google.com> Merge "Cap pts gap between adjacent frames to specified value" into klp-dev
0fa848d780cf990a2860637f40432d28594c85a3 07-Mar-2014 Mike Lockwood <lockwood@google.com> MTP: Add support for device property changed events

Also fixed bug in MtpProperty::write() for device properties

Bug: 7342482
Change-Id: If0099095d101409d131564e55b1939895c69c202
tp/MtpProperty.cpp
tp/MtpServer.cpp
tp/MtpServer.h
e257e5ebefdd50f808ee3b4d1596db261c9b62dd 14-Feb-2014 Lajos Molnar <lajos@google.com> mediaplayer: keep more buffers with the BufferQueue

Change OMX buffer allocation policy to allocate
nBufferCountMin + what is required for the BQ.

For the BQ, try to allocate 2 additional buffers than
the minimum undequeued count.

Also account for the fact that BQ may return one less
than the actual minimum undequeued count.

In most cases the resulting number of buffers ends up
being the same as with the previous policy, but we
keep more buffers with the BQ.

Change-Id: I826db8bf7dd333b620299dba60bf1b81b228275d
Bug: 12080418
ibstagefright/ACodec.cpp
ibstagefright/OMXCodec.cpp
7d3044d64294cca6fadd184648a57185e92cf5c6 11-Mar-2014 Robert Shih <robertshih@google.com> LiveSession: fix incorrect stream key (subtitle"s")

Bug: 13402087
Change-Id: Ic46e3069c6e41f90ead47cae84cbe0123d11002a
ibstagefright/httplive/LiveSession.cpp
9f434cfd021f60e26baf589dc34bf3839b832d4d 11-Mar-2014 Robert Shih <robertshih@google.com> M3UParser: trim spaces when parsing comma separated codecs.

Bug: 13402087
Change-Id: Idc92716bfefd6d1b0cb371d0d97d990d53288090
ibstagefright/httplive/M3UParser.cpp
ceeabe15f4e7bc73efdfcafed917202de9d515cb 04-Mar-2014 Robert Shih <robertshih@google.com> httplive: clear access units before returning from seekTo.

Bug: 12060952
Change-Id: I6a69a718c082501003ee9b78a948a2f8bbfbb14e
ibstagefright/httplive/LiveSession.cpp
ibstagefright/httplive/LiveSession.h
ibstagefright/httplive/PlaylistFetcher.cpp
ibstagefright/httplive/PlaylistFetcher.h
8bd4d16aa5636e98522c07ae31236420788aa749 11-Jan-2014 Chong Zhang <chz@google.com> Cap pts gap between adjacent frames to specified value

- In the scenario of cast mirroring, encoding could be suspended
for prolonged periods. Limiting the pts gap to workaround the
problem where encoder's rate control logic produces huge frames
after a long period of suspension.

- Repeat last frame a couple more times to get better quality
on static scenes.

- Fix the timestamp on repeat frames (it was not set)

Bug: 11971963
Change-Id: I1d68ab3d269874bf3921aa429a985c5f63e428c7
(cherry picked from commit 94ee4b708acfa941581160b267afb79192b1d816)
ibstagefright/ACodec.cpp
ibstagefright/omx/GraphicBufferSource.cpp
ibstagefright/omx/GraphicBufferSource.h
ibstagefright/omx/OMXNodeInstance.cpp
1c608ab33acab82d4a87f1abedcc99a623d1b53a 18-Jan-2014 Chong Zhang <chz@google.com> save mGraphicBuffer pointer even when we're suspended

Bug: 12609966
Change-Id: Ifd41fd973876da69039113fcaeacdccf39472b37
(cherry picked from commit 49270665e7a20cd120724fc388da8b166ff0b4f1)
ibstagefright/omx/GraphicBufferSource.cpp
c7e5040aa8b8e4da86814bf560346c7571e48087 06-Mar-2014 Eric Laurent <elaurent@google.com> move audio policy service to a separate library

Change-Id: Ibc3ef07aa9860b7fd4f9aaff27b0dbe0dcbf1cbf
ediaserver/Android.mk
3a0fb34ed9fcb665e71cc055abde520af393c493 11-Mar-2014 Jesse Hall <jessehall@google.com> Merge "Add empty onSidebandChanged callbacks to BufferQueue::ConsumerListeners"
eff483b9d1b1091a307b3e7d1d786e1314ce88bf 11-Mar-2014 Narayan Kamath <narayan@google.com> am 2ad7af29: Merge "Check for ARCH_ARM_HAVE_NEON flag only for ARM arch"

* commit '2ad7af29bb667d939f27417011567847c4b62f94':
Check for ARCH_ARM_HAVE_NEON flag only for ARM arch
a4b286eb22b4cee5c0cd5e391323fef0d48b00f4 11-Mar-2014 Narayan Kamath <narayan@google.com> am a9b82160: Merge "LP64 fixes for media/libeffects"

* commit 'a9b82160a6682438d43709ba5e7a29022ad1af58':
LP64 fixes for media/libeffects
23bc7fa9b289e93173faa0af1c37a79fc7a5f6d6 11-Mar-2014 Glenn Kasten <gkasten@android.com> am 0cf16339: Merge "Fix preventing from heap overwrite in capture command"

* commit '0cf1633922f970caee19e2cc2f5c042ca30b4aa6':
Fix preventing from heap overwrite in capture command
bc9e1aa4fe8815c0b213ede636f0d0ea4ad14afc 11-Mar-2014 Narayan Kamath <narayan@google.com> am 096d72a3: Merge "AArch64: Correction for LP64"

* commit '096d72a32824a0a8c86a716ba44d589183b2b0b3':
AArch64: Correction for LP64
4e053b1aa96fe0a0b02eaa595175100a4d8d7101 11-Mar-2014 Robert Shih <robertshih@google.com> Merge "LiveSession: fix incorrect stream key (subtitle"s")"
c644345b0b8f5292a049c4cee2bb7a2a6159b884 11-Mar-2014 Jean-Michel Trivi <jmtrivi@google.com> Merge "AudioTrack non-blocking write"
c2dc9646b7c8aa4a55901edba04f45c99a9ed662 11-Mar-2014 Glenn Kasten <gkasten@android.com> am 8fc4d57d: Merge "Avoid a building error"

* commit '8fc4d57d41f532b90187b9404a8ac705770d75b4':
Avoid a building error
e4f25c280a8f1655c31a745978e0fcbc61f91dee 11-Mar-2014 Robert Shih <robertshih@google.com> LiveSession: fix incorrect stream key (subtitle"s")

Bug: 13402087
Change-Id: Ic46e3069c6e41f90ead47cae84cbe0123d11002a
ibstagefright/httplive/LiveSession.cpp
1ac1638077277de52d1dd4c54db71e67753f1960 11-Mar-2014 Robert Shih <robertshih@google.com> M3UParser: trim spaces when parsing comma separated codecs.

Bug: 13402087
Change-Id: Idc92716bfefd6d1b0cb371d0d97d990d53288090
ibstagefright/httplive/M3UParser.cpp
4860cb0e3ff6d400c788d29fa452218b91a62677 10-Mar-2014 Robert Shih <robertshih@google.com> Merge "MPEG4Writer: replace timestamp asserts in threadEntry w err return."
a5ae9aa74b1217eb838c2ba092ba2429dcaf10e8 10-Mar-2014 Robert Shih <robertshih@google.com> Merge "Stagefright: added WebM muxer."
1cd139824b2e6832f239cd27d8962d3239053c02 18-Jan-2014 Lajos Molnar <lajos@google.com> NuPlayer: use MediaCodec instead of ACodec

Bug: 11785204
Change-Id: I1455bfc683469c7a69e565b179aceacbc5c459f5
ibmediaplayerservice/nuplayer/NuPlayer.cpp
ibmediaplayerservice/nuplayer/NuPlayer.h
ibmediaplayerservice/nuplayer/NuPlayerDecoder.cpp
ibmediaplayerservice/nuplayer/NuPlayerDecoder.h
e0381245dff04aa823a59aa8b85869eddab0f39f 25-Feb-2014 Lajos Molnar <lajos@google.com> MediaCodec: add getInputFormat() method

Additional input-port format item:

int32: "adaptive-playback"
video decoders only
whether codec is configured for adaptive playback. In this case, if
codec has max-width/height limits, those limits are also exposed
(int32: "max-width", "max-height")

Also, getInput/OutputFormat() is now callable in CONFIGURED and
STARTING states, although output format may be missing CSD fields
until INFO_OUTPUT_FORMAT_CHANGED message.

Includes missing OMX support for MP3 software decoder.

Bug: 11785204
Change-Id: I90c7e34ba81c7b81c43641599f3f496e838958c6
ibstagefright/ACodec.cpp
ibstagefright/MediaCodec.cpp
ibstagefright/codecs/mp3dec/SoftMP3.cpp
259f1624cf7b93ba831af10a616267487601c27f 22-Feb-2014 Lajos Molnar <lajos@google.com> Revert "NuPlayer: Use a software renderer when using software codecs"

Remove software renderer support from NuPlayer because it is included
in MediaCodec.

Change-Id: I06e001df76df2e18ea8169620ff33aeec57e5ca2
ibmediaplayerservice/nuplayer/NuPlayer.cpp
ibmediaplayerservice/nuplayer/NuPlayer.h
ibmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
ibmediaplayerservice/nuplayer/NuPlayerRenderer.h
3a90f2849d49bf65f2d6257fd6da30ae46d745fa 10-Mar-2014 Marco Nelissen <marcone@google.com> Fix freeze on pause

isOffloaded() tries to lock mLock again. We should be calling isOffloaded_l()
b/13394633

Change-Id: I155be6fee937f894d8e6c974e593223ab6014ade
ibmedia/AudioTrack.cpp
a8b8488f703bb6bda039d7d98f87e4f9d845664d 06-Sep-2012 David Williams <david.williams@sonymobile.com> Remove streaming URI from default logs

Streaming URI should not be visible in default logcat logs

Change-Id: I104cc56b5335f8c5621013e4c5be8028f0379833
ibstagefright/httplive/LiveSession.cpp
ibstagefright/httplive/M3UParser.cpp
ibstagefright/rtsp/ARTSPConnection.cpp
ibstagefright/rtsp/MyHandler.h
ibstagefright/rtsp/SDPLoader.cpp
f566406a48ecf878d8a0034b6c600d42454d264c 08-Mar-2014 Eric Laurent <elaurent@google.com> am 6db20dcb: Merge "AudioTrack: When paused, return cached playback position" into klp-dev

* commit '6db20dcb54dad932a3ea2e3a5dca41fce5802eb4':
AudioTrack: When paused, return cached playback position
6950d10077d10757e894d8e125ba5111eb02517a 08-Mar-2014 Glenn Kasten <gkasten@google.com> am 2f55c2c0: Merge "Simplify AudioTrack stream end and fix race" into klp-dev

* commit '2f55c2c03b17795e94b325d402ac5b409e3ba0e8':
Simplify AudioTrack stream end and fix race
1aeb490d95a32be37a8691827ddc44c99575c411 08-Mar-2014 Marco Nelissen <marcone@google.com> am 5874615f: Allow for larger codec private data

* commit '5874615f26a6ba9cda8ba359e5035b21f6e3818b':
Allow for larger codec private data
3a20f9af8587d2e5bbf4654a3a958f43c4133445 08-Mar-2014 Eric Laurent <elaurent@google.com> am 38efe8eb: am 6db20dcb: Merge "AudioTrack: When paused, return cached playback position" into klp-dev

* commit '38efe8eb08e08610d535a164768851ac7c13d654':
AudioTrack: When paused, return cached playback position
38efe8eb08e08610d535a164768851ac7c13d654 08-Mar-2014 Eric Laurent <elaurent@google.com> am 6db20dcb: Merge "AudioTrack: When paused, return cached playback position" into klp-dev

* commit '6db20dcb54dad932a3ea2e3a5dca41fce5802eb4':
AudioTrack: When paused, return cached playback position
07c34a59fee02ab0732e84a2e2ff3b928de50ebc 08-Mar-2014 Robert Shih <robertshih@google.com> Merge "httplive: clear access units before returning from seekTo."
6db20dcb54dad932a3ea2e3a5dca41fce5802eb4 08-Mar-2014 Eric Laurent <elaurent@google.com> Merge "AudioTrack: When paused, return cached playback position" into klp-dev
5ce50c1931e1e3d8f113394bbe2c9f99354f4c5f 04-Mar-2014 Robert Shih <robertshih@google.com> httplive: clear access units before returning from seekTo.

Change-Id: I6a69a718c082501003ee9b78a948a2f8bbfbb14e
ibstagefright/httplive/LiveSession.cpp
ibstagefright/httplive/LiveSession.h
ibstagefright/httplive/PlaylistFetcher.cpp
ibstagefright/httplive/PlaylistFetcher.h
8dcc81a2fdb35905347cf7ef46d198afa7ae79cd 04-Mar-2014 Jesse Hall <jessehall@google.com> Add empty onSidebandChanged callbacks to BufferQueue::ConsumerListeners

Change-Id: I94384aefd47b3a581cbdc3905ba9fdbc88d3d06c
ibstagefright/SurfaceMediaSource.cpp
ibstagefright/omx/GraphicBufferSource.cpp
ibstagefright/omx/GraphicBufferSource.h
77a85ebe1fc28f3af07ebefeea53fad778f442c0 07-Mar-2014 Glenn Kasten <gkasten@google.com> am 4ee774f3: am 2f55c2c0: Merge "Simplify AudioTrack stream end and fix race" into klp-dev

* commit '4ee774f322ad3292fcfbb3c120cf250643419425':
Simplify AudioTrack stream end and fix race