History log of /frameworks/av/
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
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
edia/libstagefright/colorconversion/SoftwareRenderer.cpp
f74acc7bb472b2bfa5f1aac368d598a760c29a77 10-Feb-2015 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to lmp-mr1-dev
0c11f31b610534754f48b40d0a6ccdd311d43fcf 10-Feb-2015 Lajos Molnar <lajos@google.com> Merge "nuplayer: acquire wakelock during offload pause timeout" into lmp-mr1-dev
60d2954301cb06eeeddf7f8e101bec4b4ff47ca8 09-Feb-2015 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 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
nclude/media/stagefright/foundation/AWakeLock.h
edia/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
edia/libmediaplayerservice/nuplayer/NuPlayerRenderer.h
edia/libstagefright/foundation/AWakeLock.cpp
edia/libstagefright/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
edia/libstagefright/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
edia/libstagefright/ACodec.cpp
edia/libstagefright/WAVExtractor.cpp
78e52bfac041d71ce53b5b13c2abf78af742b09d 06-Feb-2015 Lajos Molnar <lajos@google.com> stagefright: change licensing headers on h264dec omxdl sources

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

Bug: 19179927
Change-Id: I3accaa655e9bad2b0efcac98c5dd95a23f8d6671
edia/libstagefright/colorconversion/SoftwareRenderer.cpp
43beaf3b08bae6b8ebf097293fae9b97d827c66d 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
edia/libstagefright/ACodec.cpp
edia/libstagefright/colorconversion/SoftwareRenderer.cpp
9578a90c214e430334b8696999f921290c35d067 05-Feb-2015 Lajos Molnar <lajos@google.com> stagefright: add software renderer support to OMX_COLOR_YUV420SemiPlanar

Bug: 19179927
Change-Id: I3accaa655e9bad2b0efcac98c5dd95a23f8d6671
edia/libstagefright/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
edia/libstagefright/ACodec.cpp
edia/libstagefright/colorconversion/SoftwareRenderer.cpp
ba8fe8e0a0625289bb68d3fb812d471a6bbde215 05-Feb-2015 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to lmp-mr1-dev
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
edia/libmediaplayerservice/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
nclude/media/stagefright/MediaCodec.h
edia/libstagefright/ACodec.cpp
edia/libstagefright/MediaCodec.cpp
57f75272fcd16b205ed60cdd0b33ffc19991fd10 04-Feb-2015 Lajos Molnar <lajos@google.com> Merge "stagefright: add support for native flex-YUV formats" into lmp-mr1-dev
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
edia/libstagefright/httplive/LiveSession.cpp
edia/libstagefright/httplive/PlaylistFetcher.cpp
3ae5f31393609b7fa92f24132c66e9a8c9244a45 04-Feb-2015 Eric Laurent <elaurent@google.com> audiopolicy: send device connect notification to HALs

Device disconnect notifications are sent from audiopolicy to
the HALs. Send connect notifications as well.

Bug: 19249796.
Bug: 17785277.

Change-Id: Ia823ed154d6a0c7ceb84b0a94f0c3b78392faaf6
ervices/audiopolicy/AudioPolicyManager.cpp
2e700eb576b4fbf717450e96e0320b657b55257b 04-Feb-2015 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to lmp-mr1-dev
0d09182a1dde960f7acda1c28469e5deead1b996 30-Jan-2015 Lajos Molnar <lajos@google.com> stagefright: add support for native flex-YUV formats

Bug: 17906609
Change-Id: I14116796eaa94aa8ae62dcc29f67cb7d2c060d34
nclude/media/stagefright/ACodec.h
edia/libstagefright/ACodec.cpp
edia/libstagefright/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
edia/libmediaplayerservice/nuplayer/GenericSource.cpp
edia/libmediaplayerservice/nuplayer/GenericSource.h
edia/libmediaplayerservice/nuplayer/NuPlayer.cpp
edia/libmediaplayerservice/nuplayer/NuPlayer.h
edia/libmediaplayerservice/nuplayer/NuPlayerSource.h
edia/libstagefright/NuCachedSource2.cpp
5e452e53b9c97b1a77a2f3a979f4e0f93e520528 02-Feb-2015 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to lmp-mr1-dev
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
edia/libstagefright/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
edia/libstagefright/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
edia/libstagefright/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
edia/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp
1bf8a21018cc1d95dc3c28b5044aeda327c7b54e 30-Jan-2015 Eric Laurent <elaurent@google.com> Merge "audio policy: add fallback for output selection" into lmp-mr1-dev
a82797faddb37adb2d441737884576684c8515cb 30-Jan-2015 Eric Laurent <elaurent@google.com> audio policy: add fallback for output selection

When getOutputForDevice() finds a matching direct output profile
but fails to open it, try to fallback to downmix on mixer output
when format is PCM and sampling rate allows it.

Bug: 19197137.
Change-Id: I197b9b202504265b6928e69740875cb7aba5c2c5
ervices/audiopolicy/AudioPolicyManager.cpp
d99c6855901e4b2625aaad3fc24cff5ecf675fa3 30-Jan-2015 Eric Laurent <elaurent@google.com> Merge "audio policy: match attached device to declared devices" into lmp-mr1-dev
78b01639c08fe5e7e9c1be5e9dc5de560f1383f9 30-Jan-2015 Rachad <rachad@google.com> Acodec: Send framerate information to OMX decoder if available

Bug: 19110889
Change-Id: Ia8dbe1b77aaac421ec9415884e1248b9b68168dc
nclude/media/stagefright/ACodec.h
edia/libstagefright/ACodec.cpp
a1d525fbf2c1e0b2c61e5d29f338b0a0d8823436 29-Jan-2015 Eric Laurent <elaurent@google.com> audio policy: match attached device to declared devices

Make sure that when a new audio device is connected,
and a specific profile for this device is listed in
audio_policy.conf, this particular profile is used instead
of a default generic profile.

Bug: 19188567.
Change-Id: I5f576fcd697adc041b2cfbd2bac7a51bcc2143b9
ervices/audiopolicy/AudioPolicyManager.cpp
ervices/audiopolicy/AudioPolicyManager.h
0d84ba3fd82038cb721ffae234a99e6751ed7fbe 29-Jan-2015 Jean-Michel Trivi <jmtrivi@google.com> Merge "Fix FLAG_BEACON regression" into lmp-mr1-dev
79ad438ed25c59a37244a48899263bbc4bc92f5d 29-Jan-2015 Jean-Michel Trivi <jmtrivi@google.com> Fix FLAG_BEACON regression

Fix regression where FLAG_BEACON is not honored anymore in terms
of routing and muting behavior
When converting from AudioAttributes to stream types, also look
at FLAG_BEACON for mapping to STREAM_TTS

Bug 19185342

Change-Id: I5871c1b94480ae3da544aef99ea9ab4dff97443d
ervices/audiopolicy/AudioPolicyManager.cpp
6bb894cb4273884fdeb26551a0b23814e6f1b039 29-Jan-2015 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to lmp-mr1-dev
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
edia/libstagefright/HTTPBase.cpp
edia/libstagefright/httplive/LiveSession.cpp
edia/libstagefright/httplive/LiveSession.h
edia/libstagefright/httplive/PlaylistFetcher.cpp
edia/libstagefright/httplive/PlaylistFetcher.h
edia/libstagefright/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
edia/libstagefright/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
edia/libstagefright/httplive/PlaylistFetcher.cpp
edia/libstagefright/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
edia/libstagefright/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
edia/libstagefright/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
edia/libstagefright/httplive/LiveSession.cpp
edia/libstagefright/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
edia/libstagefright/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
edia/libstagefright/HTTPBase.cpp
edia/libstagefright/httplive/LiveSession.cpp
edia/libstagefright/httplive/LiveSession.h
edia/libstagefright/httplive/PlaylistFetcher.cpp
edia/libstagefright/httplive/PlaylistFetcher.h
edia/libstagefright/include/HTTPBase.h
edia/libstagefright/mpeg2ts/AnotherPacketSource.cpp
c84bc78d4244987268cbe621cecdfb72cbd48dc7 29-Jan-2015 Eric Laurent <elaurent@google.com> Merge "Audio policy: fix device gain initialization" into lmp-mr1-dev
8d10f8ea7b06e47173ab9e6062a39ea58a694f3f 29-Jan-2015 Ronghua Wu <ronghuawu@google.com> stagefright: do not reject SPL5 files outright in SoftMpeg4 decoder

Bug:19013118
Change-Id: I58f63ae13559c93ea5e627b658c9919e86769076
edia/libstagefright/codecs/m4v_h263/dec/src/vop.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
edia/libstagefright/codecs/m4v_h263/dec/src/vop.cpp
a6bd4496d4eea4f866111db198a48f24895eee98 28-Jan-2015 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to lmp-mr1-dev
1db89b9c2692fd70eb1cc98b7db2f9beed81e66e 28-Jan-2015 Eric Laurent <elaurent@google.com> Audio policy: fix device gain initialization

Fix initilization of default gain configuration for
audio devices loaded from audio_policy.conf.

Initialization cannot be done in constructor as the possible
gain configurations are not loaded yet.

Bug: 19120566.
Change-Id: I78f057ecfa1a121365ac3d8f317912a6f1647627
ervices/audiopolicy/AudioPolicyManager.cpp
ervices/audiopolicy/AudioPolicyManager.h
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
edia/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
edia/libmediaplayerservice/nuplayer/NuPlayerRenderer.h
9e8cf8e5712fedb021ad5c679709e1629f8df11a 26-Jan-2015 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to lmp-mr1-dev
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
edia/mtp/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
d8010502aa0fea39666165f8dddbb9efb953f75b 23-Jan-2015 Ronghua Wu <ronghuawu@google.com> libstagefright: Use aligned width and height.

Bug: 19014147
Change-Id: I33314b02448e436c43fcfad086b5edfa650dcf83
edia/libstagefright/codecs/m4v_h263/dec/src/pvdec_api.cpp
841d22b0645ff48a03e7f500f95458f3d70a0a61 23-Jan-2015 Ronghua Wu <ronghuawu@google.com> libstagefright: Use aligned width and height.

Bug: 19014147
Change-Id: I33314b02448e436c43fcfad086b5edfa650dcf83
edia/libstagefright/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
edia/libstagefright/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
edia/libstagefright/MPEG4Extractor.cpp
1d46191a895615e39509f68e8e81c9ef4d47c62f 21-Jan-2015 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to lmp-mr1-dev
0c4e56d0baaa19fcf17234b38d634b7281e2ae37 10-Jan-2015 Yin-Chia Yeh <yinchiayeh@google.com> Camera: make sure jpeg buffer size isn't too small

Assuming the jpeg header can take up to 256KB, make sure we always
allocate enough size for the image data.

Bug: 18962703
Change-Id: I08eb3d198d12f71f3ab7266324e80fe7410bdc89
ervices/camera/libcameraservice/device3/Camera3Device.cpp
7ccc6b9baf2f568a0a8c6e27dcd4195645a6361d 20-Jan-2015 Eric Laurent <elaurent@google.com> Merge "fix audio patch leak." into lmp-mr1-dev
0a10eed0c3f3bee14a7d28302af33f8b749ee4ff 19-Jan-2015 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to lmp-mr1-dev
c2953895d4e443f00b738ce712d029bdffada0bc 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
edia/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
aa79befb301bc3451a19021b3fc9e9e6a1f231e8 15-Jan-2015 Eric Laurent <elaurent@google.com> fix audio patch leak.

Always wait for status when executing a create audio patch
command in audio policy service command thread.
The returned patch handle must be passed back to audio policy manager
so that the patch can be modified later.
Failing to do so causes a leak of patch descriptors in audio flinger.

Bug: 19032387.
Change-Id: I5462d1437fac244d9c5e38f2c7b8e1a4c01d2b75
ervices/audiopolicy/AudioPolicyService.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
21291a420e11ccdf23e955c3dc390304230ddce3 16-Jan-2015 Eric Laurent <elaurent@google.com> Merge "fix leak in audio policy effect config parser" into lmp-mr1-dev
182c2f5e48f46c11dbcb5eecb46268dff4ad4797 15-Jan-2015 Eric Laurent <elaurent@google.com> fix leak in audio policy effect config parser

Free temporary effect descriptors created in
loadAudioEffectConfig().

Bug 19021726.

Change-Id: Icd44216e25df3fe683a01763d7e8a7b84f367a1a
ervices/audiopolicy/AudioPolicyEffects.cpp
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
edia/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
96e3a95c575f2a89efd6e1dc89d215c2705fe5c7 15-Jan-2015 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to lmp-mr1-dev
5b578beca7c835c0c49f8f93219cf4d2f82057e3 15-Jan-2015 Leo Wang <leozwang@google.com> Merge " [FM]There is no sound output from BT earphone while BT earphone is connected" into lmp-mr1-dev
b1bc6d5188900c99c7092ca17d6f19406e6928cf 14-Jan-2015 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to lmp-mr1-dev
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
edia/libmediaplayerservice/MidiFile.cpp
e6b8b27088f461957b4cbc51adbc8b01c41e9de2 13-Jan-2015 Hochi Huang <hochi.huang@mediatek.com> [FM]There is no sound output from BT earphone while BT earphone is connected

Bug: 18847131

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

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

Change-Id: I79703ba4ceb67ca3b95fbc71444dd3b116ba4131
ervices/audiopolicy/AudioPolicyManager.h
24c3cd53e04795898f673067a5c87d5a26c3a8aa 12-Jan-2015 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to lmp-mr1-dev
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
edia/libstagefright/omx/SoftVideoDecoderOMXComponent.cpp
40166aab7d753a5c5dff2daf45876c893db9fabd 07-Jan-2015 Ronghua Wu <ronghuawu@google.com> Use aligned width and height to compute size.

Bug: 18528130
Change-Id: I4d2304d8c8919c1cde60676848cfe2e4f2061a87
edia/libstagefright/codecs/m4v_h263/dec/src/pvdec_api.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
b9aeaa25f01c65e5d0c0702c69c0940b09084dfd 08-Jan-2015 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 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
nclude/media/stagefright/ACodec.h
edia/libmediaplayerservice/nuplayer/GenericSource.cpp
edia/libmediaplayerservice/nuplayer/NuPlayer.cpp
edia/libmediaplayerservice/nuplayer/NuPlayerSource.h
edia/libstagefright/ACodec.cpp
cfa5bf04ff250a14b11a75bcfa35ee2d6dbab4e9 07-Jan-2015 Chong Zhang <chz@google.com> Merge "make libserviceutility a shared lib" into lmp-mr1-dev
5db7897ddd32e3ec3ab45ecdb6f21b6265e7e14a 07-Jan-2015 Chong Zhang <chz@google.com> make libserviceutility a shared lib

so that we have only one getpid_cached in mediaserver process

bug: 18919657

Change-Id: Iff3cd932c9110e874b3885f79705f49bf3e3f1fc
ervices/audioflinger/Android.mk
ervices/audiopolicy/Android.mk
ervices/soundtrigger/Android.mk
55dfeeb53fdd2e940d0b7c7e3661152ca51ed85e 07-Jan-2015 Ronghua Wu <ronghuawu@google.com> Use aligned width and height to compute size.

Bug: 18528130
Change-Id: I4d2304d8c8919c1cde60676848cfe2e4f2061a87
edia/libstagefright/codecs/m4v_h263/dec/src/pvdec_api.cpp
610255e8f2d02cb3513695eacf1c37d66b3553d6 07-Jan-2015 Eric Laurent <elaurent@google.com> Merge "audioflinger: pause HW A/V sync output when AudioTrack underruns" into lmp-mr1-dev
5ae6638ff4aaaee87c1291bf0be6e1bd1fb891c0 07-Jan-2015 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to lmp-mr1-dev
8140a2b7ef0650e8cce6be16efcbfce56d0ed1e4 07-Jan-2015 Lajos Molnar <lajos@google.com> stagefright: report crop rectangle as codec resolution if exists

Bug: 18789054
Change-Id: I08b82a400541b5e09580801473c34ce56bfef5db
edia/libstagefright/MediaCodec.cpp
7ae3dfabb40d061aa613b255cba65ee35567f323 07-Jan-2015 Eric Laurent <elaurent@google.com> Merge "fix record from default input source" into lmp-mr1-dev
aee1c89f3d1868e77208bc64f9f1b2fc5c4a3514 07-Jan-2015 Eric Laurent <elaurent@google.com> Merge "DO NOT MERGE - fix memory leak in PatchPanel" into lmp-mr1-dev
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
edia/libmedia/AudioRecord.cpp
ervices/audiopolicy/AudioPolicyInterfaceImplLegacy.cpp
ervices/audiopolicy/AudioPolicyManager.cpp
71d13d4c94cea2113d074cf0d0c6e07ad68ff3ec 06-Jan-2015 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to lmp-mr1-dev
ea7fba9abadcc3aae9c9b71bf67f2dd657c5b5dd 06-Jan-2015 Eric Laurent <elaurent@google.com> am 36d15776: (-s ours) audio policy: validate stream type received from binder calls.

* commit '36d15776c37a6512d452628673e6286f8d9cf89c':
audio policy: validate stream type received from binder calls.
e443ffac2a09b69470c4663ee031a527c53738d9 05-Jan-2015 soon1.choi <soon1.choi@lge.com> DO NOT MERGE - fix memory leak in PatchPanel

Before the audio patch is created, audio patch with same handle is
removed from vector for patches. At this time, Patch allocated in the
heap is not freed. This causes memory leaks in the mediaserver.

Bug: 18904322.

Change-Id: Id0d28c36a7e7fbf473753bf4ead7518f28c1b998
ervices/audioflinger/PatchPanel.cpp
3190e67d5c80c1e39e3be91784110af1180cd182 30-Dec-2014 keunyoung <keunyoung@google.com> close remote submix's output when device is not available.

- change output close logic to find the device from IOProfile rather than
AudioPatch as AudioPatch handle can be cleared before disconnect.
- Otherwise, remote submix can be stuck as output is never closed and does not
work any more as subsequent open fails as output is already taken.

bug: 18733215

Change-Id: Iddb481c91e81070e6be18996a4c8837dabd7ebdb
ervices/audiopolicy/AudioPolicyManager.cpp
ervices/audiopolicy/AudioPolicyManager.h
8a4728966dc9c78e21c3c93a927707e93c05e5e0 24-Dec-2014 Rachad <rachad@google.com> ACodec: Added support for E-AC3 decoders

Bug: 17883772

Change-Id: I05f674c33522eec0e6ceeece88dd800b1857b3ab
nclude/media/stagefright/ACodec.h
nclude/media/stagefright/MediaDefs.h
edia/libstagefright/ACodec.cpp
edia/libstagefright/MediaDefs.cpp
c63c797b6028560b3b2942fa37ad7eec8b481ccd 23-Dec-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to lmp-mr1-dev
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
edia/libstagefright/HTTPBase.cpp
edia/libstagefright/httplive/LiveSession.cpp
edia/libstagefright/httplive/LiveSession.h
edia/libstagefright/httplive/PlaylistFetcher.cpp
edia/libstagefright/httplive/PlaylistFetcher.h
edia/libstagefright/include/HTTPBase.h
edia/libstagefright/mpeg2ts/AnotherPacketSource.cpp
a1aad21c7dc48442987734b68cb7cc73f405e4a5 22-Dec-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to lmp-mr1-dev
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
edia/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
edia/libmediaplayerservice/nuplayer/NuPlayerRenderer.h
5886252a7b08fb5c5d8829443e56a63956986148 20-Dec-2014 Eric Laurent <elaurent@google.com> Merge "audio policy: fix isSourceActive() for hotword" into lmp-mr1-dev
0f7b5f2b231caf87da9b20b74d086e5a9d6f4a9d 19-Dec-2014 Eric Laurent <elaurent@google.com> audioflinger: pause HW A/V sync output when AudioTrack underruns

Do not standby, starve or feed 0s to the audio HAL on direct
output using HW A/V sync mode.

Bug: 17883772.

Change-Id: I11e6c97ec24360d75f9b602814d40a54b60cb7a7
ervices/audioflinger/Threads.cpp
ervices/audioflinger/Threads.h
0a0662ea48b060716e0e982661836df9a0958111 20-Dec-2014 Eric Laurent <elaurent@google.com> Merge "audio policy: improve accessibility routing" into lmp-mr1-dev
ad019236b9bc4a030c2740fd9cfdd0670b118d5c 19-Dec-2014 Wei Jia <wjia@google.com> Merge "NuPlayer: reports paused position in paused state." into lmp-mr1-dev
a34c9ce292ea984e92d8f70d2c056e5372c4f452 19-Dec-2014 Eric Laurent <elaurent@google.com> audio policy: fix isSourceActive() for hotword

Only condider AUDIO_SOURCE_HOTWORD equivalent to
AUDIO_SOURCE_VOICE_RECOGNITION if the active capture
was triggered by a hardware hotword recognition.

Also fix activeInputsCount().

Bug: 18802896.
Change-Id: I471aafcae29a76e9c323c6c0c314ef083991476b
ervices/audiopolicy/AudioPolicyManager.cpp
2cbe89a82d4167c5d5bcf3024edc22ab6874143a 19-Dec-2014 Eric Laurent <elaurent@google.com> audio policy: improve accessibility routing

Force re-evaluating accessibility use case routing
when a condition affecting it (ringtone, alarm, call state)
is changing.

Bug: 18761698.
Change-Id: I42ac3a9fdc80bce11cf0a7fc76f680af4271abc9
ervices/audiopolicy/AudioPolicyManager.cpp
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
edia/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp
edia/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
edia/libmediaplayerservice/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
edia/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
9fc1bf138ed0b2b375a5d71e9d9e661ff30b49f5 18-Dec-2014 Robert Shih <robertshih@google.com> OggExtractor: ignore timestamp calculation for configuration packets

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

Bug: 18771789
Change-Id: Ic12bf565be23eba39b49930c7ce43372fce4f826
edia/libstagefright/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
edia/mtp/MtpServer.cpp
145cf5d885c238b690ab8240137934327b85c427 17-Dec-2014 Eric Laurent <elaurent@google.com> Merge "audioflinger: implement pause/resume for direct outputs" into lmp-mr1-dev
71b52b5bb3be81bffa320241ca486fbf964d743e 17-Dec-2014 Jean-Michel Trivi <jmtrivi@google.com> Merge "Fix routing not happening after change in output device list" into lmp-mr1-dev
277c7b8c41436125742339d8c80bccf0f2b086d9 17-Dec-2014 Jean-Michel Trivi <jmtrivi@google.com> Merge "Fix permission check for audio recording" into lmp-mr1-dev
045e710f8ce7ce1679b9b5f0adbd3290c4cc6f54 10-Dec-2014 Hochi Huang <hochi.huang@mediatek.com> [FM] Fix notification routing when FM enable

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

Bug: 18727227

Change-Id: I74856ede5999cfc8a6932a99855d468cccd6f51c
Signed-off-by: Hochi Huang <hochi.huang@mediatek.com>
ervices/audiopolicy/AudioPolicyManager.h
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
edia/libstagefright/mpeg2ts/ESQueue.cpp
fe472e292ab50c121ff93dffa3b54c96feedcfef 16-Dec-2014 Jean-Michel Trivi <jmtrivi@google.com> Fix routing not happening after change in output device list

If an output stream is active while rerouting rules are installed
and recording starts, the list of outputs is not updated and
therefore the stream is not rerouted to the new virtual device.
The fix consists in also taking into account all the policy-related
outputs when evaluating the before and after list of outputs
following a connection state event.

Bug 18736417

Change-Id: I6697976b3f89e2c0995e888e9046a2273361bb97
ervices/audiopolicy/AudioPolicyManager.cpp
be845fce36a65139eb353ba7442eba951b1ebee3 16-Dec-2014 Eric Laurent <elaurent@google.com> Merge "audiopolicy : Fix for incorrect input device selection" into lmp-mr1-dev
dc136ffee31f21da3b31240f8a22d4d08a658d0d 16-Dec-2014 Eric Laurent <elaurent@google.com> audiopolicy : Fix for incorrect input device selection

Some VoIP applications do not use source as VOICE_COMM
but MIC and policy manager ignores the force usage in that
case and selects handset-mic as input device even when
BT-SCO headset is connected.
Check the force usage for the AUDIO_SOURCE_MIC as well.

Bug: 18606571

Change-Id: I5d5010ab396f85bf58573943c91fd815f39f57c1
ervices/audiopolicy/AudioPolicyManager.cpp
cd71a69d922eab2929faf8f5652fcd1b9a29cbe8 16-Dec-2014 Eric Laurent <elaurent@google.com> audio: Force audio to Speaker if requested during VOIP call

getDeviceForStrategy is returning AUDIO_DEVICE_OUT_USB even
when setForceUse is called with Speaker during VOIP call.
Actual Intention is to route audio for phone strategy to USB
device even after setForceUse is called with Speaker when not
in voice call. It is supposed to exclude VOIP call too

Added additional check for MODE_IN_COMMUNICATION so that
it returns SPEAKER when setForceUse is called with speaker

Bug: 18758599

Change-Id: I1c51128cc1c7bfce1cf6f1fde60b428d3a9379fc
ervices/audiopolicy/AudioPolicyManager.cpp
8975220e28f632c5db4d89c798384d7635228bbc 16-Dec-2014 Ricardo Garcia <rago@google.com> Merge "Fix for Bundled Effects level compensation" into lmp-mr1-dev
97bb33f58d742539f3382583d7978fca71ffa2d5 13-Dec-2014 Jean-Michel Trivi <jmtrivi@google.com> Fix permission check for audio recording

Define input types covering the different usecases for audio
recording, and check the corresponding permissions when
starting to record.
Move the permission check from audio flinger to audio policy,
as only the policy has the information to determine which
permission to enforce.
Fix missing permission when an application records audio
and the audio is injected by an external policy.

Bug 18736417

Change-Id: If7ec040502242c990ac8ea464db484339bdce573
ervices/audioflinger/AudioFlinger.cpp
ervices/audiopolicy/AudioPolicyClientImplLegacy.cpp
ervices/audiopolicy/AudioPolicyInterface.h
ervices/audiopolicy/AudioPolicyInterfaceImpl.cpp
ervices/audiopolicy/AudioPolicyManager.cpp
ervices/audiopolicy/AudioPolicyManager.h
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
edia/libmedia/AudioTrack.cpp
ervices/audioflinger/Threads.cpp
ervices/audioflinger/Threads.h
ervices/audioflinger/Tracks.cpp
6eac9e2f04480e80adca05347ae69919037c968e 16-Dec-2014 Chien-Yu Chen <cychen@google.com> Merge "Camera2Client: flush requests in stopPreviewL" into lmp-mr1-dev
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
2cec0dfa9f97b87733b8b250b49729fc6bb3a60a 20-Aug-2014 Ruchit Sharma <ruchits@nvidia.com> Camera2Client: flush requests in stopPreviewL

Requests queued in the pipeline have little meaning after the app
calls stopPreview(). Flushing will help improve the switch KPI.

bug 17340914

Change-Id: I899d69aa3b0fd41f028760290a81013297712fed
ervices/camera/libcameraservice/api1/Camera2Client.cpp
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
edia/libmediaplayerservice/nuplayer/GenericSource.cpp
fa736496b3a7c1de2a4dbe2ced5bb62df4db6a6e 12-Dec-2014 Eric Laurent <elaurent@google.com> audio policy: fix remote mic capture

commit 275e8e9de introduced a regression for platforms
overriding AudioPolicyManager::getDeviceForInputSource() method.

Fixed by defining specific non virtual methods when overiding would
break remote submix implementation.

Bug: 18736417.

Change-Id: Id4d0a6c48da987e6fb24422f2d61c7ab0fbfc921
ervices/audiopolicy/AudioPolicyManager.cpp
ervices/audiopolicy/AudioPolicyManager.h
9210450a8b62805c8e961aa66e025c1a84a4b382 10-Dec-2014 Eric Laurent <elaurent@google.com> audio policy: suppport for dynamic source

Completed support for dynamic sources:
- remote submix input device is dynamically connected/disconnected
when corresponding AudioTrack starts/stops.

Also do not create a duplicated output for mixes used by dynamic policies.

Bug: 16006090.
Change-Id: Ib5b5a2159fcac9d9f410a5a2f1c64d7ebad79f72
ervices/audiopolicy/AudioPolicyManager.cpp
ervices/audiopolicy/AudioPolicyManager.h
eee82e44548f17253c2e06b25725f91c7b549ec2 12-Dec-2014 Lajos Molnar <lajos@google.com> MediaCodecList: handle binder death

Bug: 18691591
Change-Id: Icc402d6ea9b0de4ac642c3b403fb64e865481b2e
nclude/media/stagefright/MediaCodecList.h
edia/libstagefright/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
edia/libstagefright/ACodec.cpp
554016a37167fc5cb449be3d93a9290e4a0dac21 13-Dec-2014 Lajos Molnar <lajos@google.com> Merge "stagefright: advertise 8kHz AAC decoder support" into lmp-mr1-dev
30b865a2cfb508cd91d7403b7bf6ebcf34189c00 10-Dec-2014 Lajos Molnar <lajos@google.com> stagefright: advertise 8kHz AAC decoder support

Bug: 18738266
Change-Id: I1e5a1dc04b4deabfac069e70e4f730be6023a8ef
edia/libstagefright/data/media_codecs_google_audio.xml
c73ca6ef04136f28306784ad35f444538f081957 12-Dec-2014 Eric Laurent <elaurent@google.com> audio policy: fix remote mic capture

commit 275e8e9de introduced a regression for platforms
overriding AudioPolicyManager::getDeviceForInputSource() method.

Fixed by defining specific non virtual methods when overiding would
break remote submix implementation.

Bug: 18736417.

Change-Id: Id4d0a6c48da987e6fb24422f2d61c7ab0fbfc921
ervices/audiopolicy/AudioPolicyManager.cpp
ervices/audiopolicy/AudioPolicyManager.h
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
edia/libmediaplayerservice/nuplayer/NuPlayer.cpp
edia/libstagefright/httplive/LiveSession.cpp
8cffa91a76d3fa4c96268fc40fc8722a0d33dc8d 11-Dec-2014 Eric Laurent <elaurent@google.com> Merge "audio policy: suppport for dynamic source" into lmp-mr1-dev
5c5350677d093afd1e1a1a8fe20d68d101cebd53 11-Dec-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to lmp-mr1-dev
c722f30eef03e77054395ae122470cf8dba93937 10-Dec-2014 Eric Laurent <elaurent@google.com> audio policy: suppport for dynamic source

Completed support for dynamic sources:
- remote submix input device is dynamically connected/disconnected
when corresponding AudioTrack starts/stops.

Also do not create a duplicated output for mixes used by dynamic policies.

Bug: 16006090.
Change-Id: Ib5b5a2159fcac9d9f410a5a2f1c64d7ebad79f72
ervices/audiopolicy/AudioPolicyManager.cpp
ervices/audiopolicy/AudioPolicyManager.h
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
nclude/media/stagefright/foundation/AUtils.h
edia/libstagefright/ACodec.cpp
edia/libstagefright/codecs/avc/enc/SoftAVCEncoder.cpp
edia/libstagefright/codecs/avc/enc/SoftAVCEncoder.h
edia/libstagefright/codecs/hevcdec/SoftHEVC.cpp
edia/libstagefright/codecs/m4v_h263/dec/SoftMPEG4.cpp
edia/libstagefright/codecs/m4v_h263/dec/SoftMPEG4.h
edia/libstagefright/codecs/m4v_h263/enc/SoftMPEG4Encoder.cpp
edia/libstagefright/codecs/m4v_h263/enc/SoftMPEG4Encoder.h
edia/libstagefright/codecs/on2/dec/SoftVPX.cpp
edia/libstagefright/codecs/on2/enc/SoftVPXEncoder.cpp
edia/libstagefright/codecs/on2/enc/SoftVPXEncoder.h
edia/libstagefright/codecs/on2/h264dec/SoftAVC.cpp
edia/libstagefright/data/media_codecs_google_video.xml
edia/libstagefright/include/SoftVideoDecoderOMXComponent.h
edia/libstagefright/include/SoftVideoEncoderOMXComponent.h
edia/libstagefright/omx/SoftVideoDecoderOMXComponent.cpp
edia/libstagefright/omx/SoftVideoEncoderOMXComponent.cpp
edia/libstagefright/tests/Utils_test.cpp
94a92c69af528edf6ec17d7978a0c3bb6ab51e63 11-Dec-2014 Phil Burk <philburk@google.com> Merge "[audio][audioflinger] Consume all frames when a DirectThread is done." into lmp-mr1-dev
99adee3c3d9cde6819741a38163954808fea270a 11-Dec-2014 Phil Burk <philburk@google.com> [audio][audioflinger] Consume all frames when a DirectThread is done.

This bug was causing movies to think there was still data left to play so they never finished.

Bug: 18360054
Change-Id: If7aee81d62b7af8532abd14579677848a06fe2b1
Signed-off-by: Phil Burk <philburk@google.com>
ervices/audioflinger/Threads.cpp
f484952edd94c1b7ee82d7b108edc1ce08671cc4 11-Dec-2014 Lajos Molnar <lajos@google.com> mediaplayer: allow setVideoSurface before setDataSource

Bug: 18709604
Change-Id: I41e4734faed48b5583feb29896cd5783b8cd7e33
edia/libmediaplayerservice/nuplayer/NuPlayer.cpp
2e4800145a173732b832bd168dfed7100ed2fadc 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>
edia/libstagefright/codecs/m4v_h263/dec/SoftMPEG4.cpp
edia/libstagefright/codecs/m4v_h263/dec/SoftMPEG4.h
e3fc6a353a2dbd26b356a1d60c8b3da99e11005c 10-Dec-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to lmp-mr1-dev
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>
edia/libstagefright/codecs/m4v_h263/dec/SoftMPEG4.cpp
edia/libstagefright/codecs/m4v_h263/dec/SoftMPEG4.h
1767df778e20c1395afc63b3a0479bd903e7b9f0 10-Dec-2014 Jean-Michel Trivi <jmtrivi@google.com> AudioPolicyManager: distinguish between mirroring and rerouting

In the screen mirroring case, the notification manager queries
the policy to see if media "is playing remotely": if yes, it
will not request audio focus before playing a notification.
This is the correct behavior for screen mirroring, but doesn't
work when audio is rerouted to an external policy.
This change consists in not reporting "remote" activity when
playing to a mix of an external policy by looking at the address
of the output on which playback is active for the given stream
type.

Bug 16009464

Change-Id: Iebbf5a8c738ab36c1cf2055e921c0a3472503125
ervices/audiopolicy/AudioPolicyManager.cpp
ervices/audiopolicy/AudioPolicyManager.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
nclude/media/AudioSystem.h
nclude/media/IAudioPolicyService.h
edia/libmedia/AudioSystem.cpp
edia/libmedia/IAudioPolicyService.cpp
ervices/audiopolicy/AudioPolicyInterface.h
ervices/audiopolicy/AudioPolicyInterfaceImpl.cpp
ervices/audiopolicy/AudioPolicyInterfaceImplLegacy.cpp
ervices/audiopolicy/AudioPolicyService.h
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
nclude/media/AudioPolicy.h
nclude/media/AudioPolicyHelper.h
edia/libmedia/Android.mk
edia/libmedia/AudioPolicy.cpp
edia/libmedia/AudioTrack.cpp
ervices/audioflinger/Threads.cpp
ervices/audiopolicy/AudioPolicyManager.cpp
ervices/audiopolicy/AudioPolicyManager.h
9cea7aa494f6f93a473cab936af79868fc8efea6 10-Dec-2014 Chien-Yu Chen <cychen@google.com> Merge "Camera3Device: support shutter after result" into lmp-mr1-dev
6533dc1c576af241c9c1753f29d6777802d4c496 10-Dec-2014 Ruben Brunk <rubenbrunk@google.com> Merge "Camera2: Round unsupported surface sizes in configure." into lmp-mr1-dev
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
edia/libeffects/lvm/wrapper/Bundle/EffectBundle.cpp
edia/libeffects/lvm/wrapper/Bundle/EffectBundle.h
43e69a6792f01b86b4aaf2314534f637e11c5843 26-Nov-2014 Chien-Yu Chen <cychen@google.com> Camera3Device: support shutter after result

Move the code to remove in-flight requests from processCaptureResult
to a separate function so it can be called when the framework
receives a result or a shutter event. An in-flight request will only
be removed when both results and the shutter event arrive in the
case of a successful request.

Also send out results only after the shutter event receives.

Bug: 18135776
Change-Id: I340db1a495c711b0913784d43fd0f144871e4420
ervices/camera/libcameraservice/device3/Camera3Device.cpp
ervices/camera/libcameraservice/device3/Camera3Device.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
edia/libstagefright/AACWriter.cpp
98a8d057f6d72d4d0a018b4ba9532beed083a299 09-Dec-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to lmp-mr1-dev
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
edia/libmedia/AudioTrackShared.cpp
4a0e00138e1c4a900d1935d988e19d0f892cd58d 08-Dec-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to lmp-mr1-dev
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
edia/libmediaplayerservice/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
18265202049bfa53fe5b18a95d956325acca9c7b 06-Dec-2014 Eric Laurent <elaurent@google.com> Merge "audio policy: fix inifinite loop in clearAudioPatches()" 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
edia/libmediaplayerservice/nuplayer/GenericSource.cpp
edia/libmediaplayerservice/nuplayer/GenericSource.h
edia/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp
edia/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
0add0fd07401c507a77b37868f46a2ae587c30df 05-Dec-2014 Eric Laurent <elaurent@google.com> audio policy: fix inifinite loop in clearAudioPatches()

releaseAudioPatch() does not necessarily remove the audio patch
from the list.
Scan the list from the top down to avoid adjusting the index.

Bug: 18621514.
Change-Id: I58787154680f7cb1818509017835b1693d62190f
ervices/audiopolicy/AudioPolicyManager.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
nclude/media/stagefright/ACodec.h
edia/libstagefright/ACodec.cpp
bba75576c3bc5a90cd8e14bd053ab2d74a6c7e9d 21-Nov-2014 Ruben Brunk <rubenbrunk@google.com> Camera2: Round unsupported surface sizes in configure.

Bug: 16030677
Change-Id: Ida04e04f41983b9126609522dd12064a7bf9645f
ervices/camera/libcameraservice/api2/CameraDeviceClient.cpp
ervices/camera/libcameraservice/api2/CameraDeviceClient.h
a147c17adabaab819ac108fbc448c49525cf74bc 06-Dec-2014 Chong Zhang <chz@google.com> Merge "fixes for non-secure widevine playback" into lmp-mr1-dev
cbbe1ccc41a86fbf009767bbdab43232e6c369c0 06-Dec-2014 Eric Laurent <elaurent@google.com> Merge "audio policy: fix AudioPort parameter checks" 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
edia/libmediaplayerservice/nuplayer/GenericSource.cpp
edia/libmediaplayerservice/nuplayer/GenericSource.h
57216ca41b2d7e35bda01ce910ae6e72ed01bfae 05-Dec-2014 Glenn Kasten <gkasten@google.com> Merge "Track volume should be maintained even if track is restored" into lmp-mr1-dev
597ce69a77636eab073fc83ded01e8af51e887e2 05-Dec-2014 Eino-Ville Talvala <etalvala@google.com> Merge "Camera: Add support for SCENE_MODE_HDR for newer HALs" into lmp-mr1-dev
af2645a679a61c8e8199d43d29b8b5ead5723b25 05-Dec-2014 Eino-Ville Talvala <etalvala@google.com> Camera: Add support for SCENE_MODE_HDR for newer HALs

Bug: 18640480
Change-Id: I7b772d10b2bd136c78395fd2816114b27bb48d00
ervices/camera/libcameraservice/api1/client2/Parameters.cpp
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
edia/libmedia/AudioTrack.cpp
9257000c453c1a6f6bf073ff0bf3ba7ef9baf183 04-Nov-2014 Ruchit Sharma <ruchits@nvidia.com> camera: fix logging in ZslProcessor to avoid spam

AF state mismatch while selecting ZSL candidate should not be treated
as a warning. This results into undesriable spam in the logs.

ALso, using ALOGVV is consistent with how AE state mismatch is handled
in ZslProcessor3.cpp

Bug: 18634318
Change-Id: Ia9d7f2bb98f784990b1a6f923983c35f622c3791
ervices/camera/libcameraservice/api1/client2/ZslProcessor3.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
0daea39f02fb1ba60a7b351bb5859e407f9f090b 05-Dec-2014 Eric Laurent <elaurent@google.com> audio policy: fix AudioPort parameter checks

Accept any value for sampling rate, format or channel mask
if the list of supported values is empty in the AudioPort.

Bug: 18575607.
Change-Id: I93e1942b89c630e3fee490799a8f8d79f7831ab7
ervices/audiopolicy/AudioPolicyManager.cpp
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
db995fe3239276be9dfd9e446b10417e07948acc 05-Dec-2014 Andy Hung <hunga@google.com> Merge "Fix getTimestamp if offload thread is not initialized." 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
edia/libeffects/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
edia/libstagefright/avc_utils.cpp
edia/libstagefright/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
edia/libstagefright/data/media_codecs_google_audio.xml
864450b334bf4c3d6323c52b61927d901af6d264 04-Dec-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to lmp-mr1-dev
814cbb4e33396fce559475270d6f6c0bd7c43fc5 04-Dec-2014 Wei Jia <wjia@google.com> Merge "ESQueue: add frame length checking in validation of ADTS header." into lmp-mr1-dev
36d15776c37a6512d452628673e6286f8d9cf89c 28-Oct-2014 Eric Laurent <elaurent@google.com> audio policy: validate stream type received from binder calls.

Bug: 18001784.
Bug: 18002005.
Change-Id: I8efa674dceff5a6e10251b1c7a55e9bb2d532395
(cherry picked from commit dea1541fc0042abf05674b19c2f94ca086945dfd)
ervices/audiopolicy/AudioPolicyInterfaceImpl.cpp
ervices/audiopolicy/AudioPolicyInterfaceImplLegacy.cpp
180d1b96ee2312f1056a58e26884a89d25ab62c8 03-Dec-2014 Chong Zhang <chz@google.com> fix threading in RTSPSource and StreamingSource

Bug: 18532335

Change-Id: I9c34401a928dc0ddbd0923aa5f127dc628efbb92
edia/libmediaplayerservice/nuplayer/RTSPSource.cpp
edia/libmediaplayerservice/nuplayer/RTSPSource.h
edia/libmediaplayerservice/nuplayer/StreamingSource.cpp
edia/libmediaplayerservice/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
edia/libstagefright/mpeg2ts/ESQueue.cpp
18f2f90cff65c384a4e8292cc3296dafafb43d52 03-Dec-2014 Hochi Huang <hochi.huang@mediatek.com> [FM] Fix Buganizer ID: 18456930 - FM radio audio got routed to loudspeaker unexpectedly

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

Change-Id: I3f9175bbc302e382155e568e66b88400ec05ffa5
Signed-off-by: Hochi Huang <hochi.huang@mediatek.com>
ervices/audiopolicy/AudioPolicyManager.h
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
edia/libmediaplayerservice/nuplayer/NuPlayer.cpp
edia/libmediaplayerservice/nuplayer/NuPlayer.h
edia/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp
edia/libmediaplayerservice/nuplayer/NuPlayerDecoder.h
edia/libmediaplayerservice/nuplayer/NuPlayerDecoderBase.cpp
edia/libmediaplayerservice/nuplayer/NuPlayerDecoderBase.h
edia/libmediaplayerservice/nuplayer/NuPlayerDecoderPassThrough.cpp
edia/libmediaplayerservice/nuplayer/NuPlayerDecoderPassThrough.h
edia/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
edia/libmediaplayerservice/nuplayer/NuPlayerRenderer.h
9a1c8892f6835325db6931529dc74bf98cf0aee8 03-Dec-2014 Andy Hung <hunga@google.com> Fix getTimestamp if offload thread is not initialized.

Returns INVALID_OPERATION.

Bug: 18605649
Change-Id: I440fb687fbf9249098e049982fa83bcd1515fd80
ervices/audioflinger/Threads.cpp
ab05b4ccb8ea59079d7f773aa0e090029c479bad 02-Dec-2014 Wei Jia <wjia@google.com> StreamingSource: check mTSParser before dereferencing it.

Bug: 18532335
Change-Id: I7819d8d359fe75ea4c827138e9aaa2454ccfe3b1
edia/libmediaplayerservice/nuplayer/StreamingSource.cpp
df58e861726431e1f8930ba1646660d12dd43d9d 02-Dec-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to lmp-mr1-dev
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
edia/libmediaplayerservice/nuplayer/NuPlayerDecoderPassThrough.cpp
edia/libmediaplayerservice/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
edia/libmediaplayerservice/nuplayer/NuPlayer.cpp
edia/libmediaplayerservice/nuplayer/NuPlayer.h
edia/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp
edia/libmediaplayerservice/nuplayer/NuPlayerDecoder.h
edia/libmediaplayerservice/nuplayer/NuPlayerDecoderBase.cpp
edia/libmediaplayerservice/nuplayer/NuPlayerDecoderBase.h
edia/libmediaplayerservice/nuplayer/NuPlayerDecoderPassThrough.cpp
edia/libmediaplayerservice/nuplayer/NuPlayerDecoderPassThrough.h
9510ed3cc6c1fb03d936c3e6579d01f5ece8cc5a 27-Nov-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to lmp-mr1-dev
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
nclude/media/AudioRecord.h
nclude/media/AudioSystem.h
nclude/media/IAudioPolicyService.h
edia/libmedia/AudioRecord.cpp
edia/libmedia/AudioSystem.cpp
edia/libmedia/AudioTrack.cpp
edia/libmedia/IAudioPolicyService.cpp
ervices/audiopolicy/AudioPolicyInterface.h
ervices/audiopolicy/AudioPolicyInterfaceImpl.cpp
ervices/audiopolicy/AudioPolicyInterfaceImplLegacy.cpp
ervices/audiopolicy/AudioPolicyManager.cpp
ervices/audiopolicy/AudioPolicyManager.h
ervices/audiopolicy/AudioPolicyService.h
d9e0603a1be07dbb347c55050c7d4629ea7492e8 26-Nov-2014 Chong Zhang <chz@google.com> MediaCodec: resume codec if state is FLUSHED in async mode

bug: 18513091

Change-Id: I192625c61834584f711de76db788c2c0332ae774
edia/libstagefright/MediaCodec.cpp
087eb332cdd64026de27c914194127f8fda1a846 26-Nov-2014 Eric Laurent <elaurent@google.com> Merge "audio policy: do not route accessibility prompts to compressed output" into lmp-mr1-dev
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
512dd849d0ef9e9988fedfbaf951b4b82523957c 25-Nov-2014 Zhijun He <zhijunhe@google.com> Merge "camera: fix frame deletion logic in mInFlightMap" 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
066ceecf4c6ed5ce26c5ddf00d7d9097d560b7a2 25-Nov-2014 Eric Laurent <elaurent@google.com> audio policy: do not route accessibility prompts to compressed output

When a digital output (HDMI or S/PDIF) is configured with
a non linear PCM audio format it is likely that the audio HAL
or HW will not be able to mix other sounds with the main
media stream being played.

In this case, do not condider HDMI or S/PDIF as a valid route for
accessibilty strategy so that accessibility prompts are always audible.

Bug: 18067208.
Change-Id: If20603a1dc1dc470f206f841308bed2b87daf21c
ervices/audiopolicy/AudioPolicyManager.cpp
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
nclude/media/AudioPolicyHelper.h
nclude/media/AudioSystem.h
nclude/media/AudioTrack.h
nclude/media/IAudioPolicyService.h
edia/libmedia/AudioRecord.cpp
edia/libmedia/AudioSystem.cpp
edia/libmedia/AudioTrack.cpp
edia/libmedia/IAudioPolicyService.cpp
ervices/audioflinger/Threads.cpp
ervices/audioflinger/Tracks.cpp
ervices/audiopolicy/AudioPolicyInterface.h
ervices/audiopolicy/AudioPolicyInterfaceImpl.cpp
ervices/audiopolicy/AudioPolicyInterfaceImplLegacy.cpp
ervices/audiopolicy/AudioPolicyManager.cpp
ervices/audiopolicy/AudioPolicyManager.h
ervices/audiopolicy/AudioPolicyService.cpp
ervices/audiopolicy/AudioPolicyService.h
0f78eabb733e1413d7febd00c0bad0f0add02314 25-Nov-2014 Eric Laurent <elaurent@google.com> fix the build.

Change-Id: Iab6b65327ae1adbf0b3a6da5a23b8107468f533e
ervices/audiopolicy/AudioPolicyManager.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
edia/libstagefright/omx/SimpleSoftOMXComponent.cpp
31867b30d3144decd42de0214d8b71c45a2c8cc1 14-Nov-2014 Ruchit Sharma <ruchits@nvidia.com> camera: fix frame deletion logic in mInFlightMap

For per-frame error notifications, camera3.h requirements state that all the
buffer handles for a failed frame capture must be returned via
process_capture_result() call(s). Hence, Camera3Device needs to ensure that
the frame entry is not deleted from mInFlightMap until all buffers for that
frame have been returned by HAL.

Bug: 17757940

Change-Id: I2579ca7980d2fd67d53abc530e2706538f7d3d3a
ervices/camera/libcameraservice/device3/Camera3Device.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
edia/libmedia/AudioTrack.cpp
edia/libmedia/AudioTrackShared.cpp
7d42a51a320f10ba9647d381c7daa737c3e82d5b 24-Nov-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to lmp-mr1-dev
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
edia/libmedia/AudioTrack.cpp
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
ervices/audioflinger/Threads.cpp
ervices/audioflinger/Threads.h
ervices/audioflinger/Tracks.cpp
ervices/audiopolicy/AudioPolicyEffects.cpp
ervices/audiopolicy/AudioPolicyEffects.h
ervices/audiopolicy/AudioPolicyInterfaceImpl.cpp
ervices/audiopolicy/AudioPolicyInterfaceImplLegacy.cpp
ervices/audiopolicy/AudioPolicyManager.cpp
ervices/audiopolicy/AudioPolicyManager.h
bc0f452b9a76dd8c8244e775bc9c5aa85cae3ddf 21-Nov-2014 Ruben Brunk <rubenbrunk@google.com> Merge "Camera2: Fix CameraParameters parse segfault." into lmp-mr1-dev
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
edia/libmediaplayerservice/nuplayer/Android.mk
edia/libmediaplayerservice/nuplayer/NuPlayer.cpp
edia/libmediaplayerservice/nuplayer/NuPlayer.h
edia/libmediaplayerservice/nuplayer/NuPlayerCCDecoder.cpp
edia/libmediaplayerservice/nuplayer/NuPlayerCCDecoder.h
edia/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp
edia/libmediaplayerservice/nuplayer/NuPlayerDecoder.h
edia/libmediaplayerservice/nuplayer/NuPlayerDecoderBase.cpp
edia/libmediaplayerservice/nuplayer/NuPlayerDecoderBase.h
edia/libmediaplayerservice/nuplayer/NuPlayerDecoderPassThrough.cpp
edia/libmediaplayerservice/nuplayer/NuPlayerDecoderPassThrough.h
edia/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
edia/libmediaplayerservice/nuplayer/NuPlayerRenderer.h
8052d933822e51dec3b096cb5fc8a9fbdc076bdc 21-Nov-2014 Eric Laurent <elaurent@google.com> Merge "SoundTrigger: allow sound model reloading" into lmp-mr1-dev
02eb47cf18793effe9fc7ab34e1b0fe9ea6635bc 20-Nov-2014 Eric Laurent <elaurent@google.com> SoundTrigger: allow sound model reloading

Allow reloading a sound model without unloading it before.

Bug: 18308781.
Change-Id: I31c83b81a03ee1c1e80f4339ca62e6d06fb1a33b
ervices/soundtrigger/SoundTriggerHwService.cpp
ervices/soundtrigger/SoundTriggerHwService.h
5fc9d902510ccd04db80e0bc6aa679a4317a51b2 20-Nov-2014 Ruben Brunk <rubenbrunk@google.com> Camera2: Fix CameraParameters parse segfault.

Bug: 18331142
Change-Id: I41feec93f753f97b3e6bf963deb4a42b73406421
amera/CameraParameters.cpp
ervices/camera/libcameraservice/CameraService.cpp
f50db74f4efa2f689711bd2e2ff3d88b7426f107 20-Nov-2014 Glenn Kasten <gkasten@google.com> Merge "Fix format conversion in DuplicatingThread" into lmp-mr1-dev
7966142a096c1d5d7386a42eaccc9aed5b4344b3 20-Nov-2014 Ronghua Wu <ronghuawu@google.com> Merge "NuPlayer: invalid anchor time when render is flushed." into lmp-mr1-dev
f4ea51fda9396d7ee851b1d4d220384210ea2336 20-Nov-2014 Chien-Yu Chen <cychen@google.com> Merge "camera2: fix an error reading a NULL string" into lmp-mr1-dev
ec0eeafa8a7fd882e8206e9cf8c4c7e1db81857b 20-Nov-2014 Haynes Mathew George <hgeorge@codeaurora.org> Fix format conversion in DuplicatingThread

DuplicatingThread converts PCM data from the format of the source thread
to PCM_16BIT before writing to all connected output tracks.
This needs to be done just once before writing to all tracks.

Bug: 18461844
Change-Id: If05254f87f9198e09a0fa3c4e857afbb53ae7073
ervices/audioflinger/Threads.cpp
ec9459c63d1c2969505ffdc4a100646fd07223bd 20-Nov-2014 Chong Zhang <chz@google.com> Merge "close fd if data source is reset without prepare" into lmp-mr1-dev
7bc4fc847770d399d7c4a7afee5aa58b94f3b897 20-Nov-2014 Chien-Yu Chen <cychen@google.com> camera2: fix an error reading a NULL string

Handle the case where the surface name isn't set.

Bug: 10461464
Change-Id: I3ee233a7a5f6489513e6d87241cda2aaefbfd43b
amera/camera2/CaptureRequest.cpp
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
nclude/media/AudioSystem.h
edia/libmedia/AudioSystem.cpp
ervices/audiopolicy/AudioPolicyService.cpp
ervices/audiopolicy/AudioPolicyService.h
408b9f374519bdb1bae76af9ce6586cfb6747632 20-Nov-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to lmp-mr1-dev
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
edia/libmediaplayerservice/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
edia/libstagefright/ACodec.cpp
d9fd6317913c74e1c955eb31978c41e70d5810bc 06-Nov-2014 Lajos Molnar <lajos@google.com> mediaplayer: request auto-frc for high quality avsync

Bug: 17383204
Change-Id: I7209305b4ff3c2386019d7a09d6a0536e9f21522
edia/libmediaplayerservice/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
edia/libmediaplayerservice/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
03181012beab17e145ca8b9bedbcc08d117df1cb 19-Nov-2014 Yin-Chia Yeh <yinchiayeh@google.com> Merge "Camera2Client: remove recording stream if necessary" 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
edia/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp
edia/libmediaplayerservice/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
nclude/media/AudioSystem.h
edia/libmedia/AudioSystem.cpp
61dfa44caaf0e552746191aebcd8c6c83a51fa51 19-Nov-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to lmp-mr1-dev
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
nclude/private/media/AudioTrackShared.h
edia/libmedia/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
edia/libstagefright/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
edia/libmediaplayerservice/nuplayer/GenericSource.cpp
edia/libmediaplayerservice/nuplayer/GenericSource.h
edia/libmediaplayerservice/nuplayer/HTTPLiveSource.cpp
edia/libmediaplayerservice/nuplayer/HTTPLiveSource.h
edia/libmediaplayerservice/nuplayer/NuPlayer.cpp
edia/libmediaplayerservice/nuplayer/NuPlayer.h
edia/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp
edia/libmediaplayerservice/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
edia/libmediaplayerservice/nuplayer/NuPlayer.cpp
edia/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
edia/libmediaplayerservice/nuplayer/NuPlayerRenderer.h
092d49c26d77fafad5170bf709c2a716ec335855 07-Nov-2014 Yin-Chia Yeh <yinchiayeh@google.com> Camera2Client: remove recording stream if necessary

Bug: 17495165
Change-Id: I11b763fde8f9448f4bddec3fe6c81581e7699edb
ervices/camera/libcameraservice/api1/Camera2Client.cpp
ervices/camera/libcameraservice/api1/client2/Parameters.cpp
ervices/camera/libcameraservice/api1/client2/Parameters.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
edia/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp
edia/libstagefright/AwesomePlayer.cpp
9b2c78caf749385aa757df0760950ec690c0c808 18-Nov-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to lmp-mr1-dev
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
edia/libmedia/AudioTrack.cpp
ervices/audiopolicy/AudioPolicyManager.cpp
4d0a5985fb5e7ea5a1f9a605afea2b7534ebc16b 18-Nov-2014 Andy Hung <hunga@google.com> Merge "Prevent stopped audio tracks from mixing data" into lmp-mr1-dev
27876c02c21cd3ab7ef01bdd1fc5400c5143584a 10-Sep-2014 Andy Hung <hunga@google.com> Prevent stopped audio tracks from mixing data

Static tracks should have zero framesReady when stopping or stopped,
to prevent mixer from running potentially indefinitely with loop mode.

Bug: 16070883

Change-Id: Iab9968044d1a6f8543bbcbfb246f49f27d68cace
ervices/audioflinger/Tracks.cpp
fd85870ee9f7ded70adce065b524e0c63bab2b50 17-Nov-2014 Andy Hung <hunga@google.com> Fix race condition in signaling completion for decode.

Bug: 18048775
Change-Id: I2207eb2cf30cf205d9bf414edbb1d3e709185f67
edia/libmediaplayerservice/MediaPlayerService.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
edia/libmediaplayerservice/MediaPlayerService.cpp
f89f2ff4df0855eb56d95a02ab29d856e0ffa858 17-Nov-2014 Eric Laurent <elaurent@google.com> Merge "audiopolicy: Update input device check in checkInputsForDevice" into lmp-mr1-dev
3171f4e12e5cabb2b496be6aa660aaa83e8fe77d 17-Nov-2014 Chien-Yu Chen <cychen@google.com> Merge "CameraService: normalize face rectangles properly" into lmp-mr1-dev
86cc8f33d1d755c05c27b369e37e24ad46b988e5 17-Nov-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to lmp-mr1-dev
ddbc6657fa0c55166148ca597980edbaafc418bf 14-Nov-2014 Eric Laurent <elaurent@google.com> audiopolicy: Update input device check in checkInputsForDevice

- When an input device is disconnected, checkInputsForDevice clears
dynamic fields of input profiles that are supporting the disconnected
device. AUDIO_DEVICE_BIT_IN mask is missing while comparing with the
supported input devices of a profile which is resulting in clearing
wrong fields

- Fix is to include AUDIO_DEVICE_BIT_IN in this comparison

- also fix two other places where comparison with input device was not
masked with AUDIO_DEVICE_BIT_IN.

Bug: 18367045

Change-Id: Icc94b8353bc49567d8a6d6a75293c3b0dd42d83c
ervices/audiopolicy/AudioPolicyManager.cpp
4dbc8cc68a2674110ac1dce9e475ac30b1baa7c5 16-Nov-2014 Jeff Tinker <jtinker@google.com> Fix missing mutex lock in Drm::binderDied

bug: 18194977
Change-Id: Ie6107a34237577c3b9cc6507d507f5c51f49fcf6
edia/libmediaplayerservice/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
edia/libmediaplayerservice/nuplayer/NuPlayer.cpp
edia/libmediaplayerservice/nuplayer/NuPlayer.h
edia/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp
edia/libmediaplayerservice/nuplayer/NuPlayerDecoder.h
edia/libmediaplayerservice/nuplayer/NuPlayerDecoderPassThrough.cpp
edia/libmediaplayerservice/nuplayer/NuPlayerDecoderPassThrough.h
edia/libstagefright/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
d7535106412d2245f1995051355529615ed93868 13-Nov-2014 Wei Jia <wjia@google.com> AnotherPacketSource: need reset some members before returning from queueDiscontinuity().

Bug: 18355014
Bug: 17511837

Change-Id: I4b623d3bc4fbeaf0e8bf4ddd96661469d17afe7a
edia/libstagefright/mpeg2ts/AnotherPacketSource.cpp
daad5b2f4a6bb46a7911661e398278d6a80d7093 30-Aug-2014 Robert Shih <robertshih@google.com> PlaylistFetcher: handle sporadic fetch erros

Bug: 17490472
Change-Id: I2c04e2352f13db762b845f4d35db0a8b851a148c
edia/libstagefright/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
5e15b80e801a0110bc1bad1190f02cb9c7d22e37 13-Nov-2014 Chien-Yu Chen <cychen@google.com> CameraService: normalize face rectangles properly

Use android.scaler.cropRegion reported in the capture result to
normalize face rectangles instead of using the one in current capture
request.

Bug: 11460393
Change-Id: Id21834bf6ae1f7cc106b4dffb98f9f249a75034b
ervices/camera/libcameraservice/api1/client2/FrameProcessor.cpp
ervices/camera/libcameraservice/api1/client2/Parameters.cpp
ervices/camera/libcameraservice/api1/client2/Parameters.h
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
edia/libstagefright/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
4586f2dd8795a4a217d6923de667dc59956002c9 13-Nov-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 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
nclude/media/AudioSystem.h
edia/libmedia/AudioSystem.cpp
edia/libmedia/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
edia/libstagefright/httplive/PlaylistFetcher.cpp
edia/libstagefright/mpeg2ts/ATSParser.cpp
edia/libstagefright/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
nclude/media/stagefright/MediaCodecSource.h
edia/libstagefright/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
edia/mtp/MtpDataPacket.cpp
edia/mtp/MtpDataPacket.h
edia/mtp/MtpDevice.cpp
edia/mtp/MtpDevice.h
edia/mtp/MtpDeviceInfo.cpp
edia/mtp/MtpDeviceInfo.h
edia/mtp/MtpObjectInfo.cpp
edia/mtp/MtpObjectInfo.h
edia/mtp/MtpPacket.cpp
edia/mtp/MtpPacket.h
edia/mtp/MtpProperty.cpp
edia/mtp/MtpProperty.h
edia/mtp/MtpRequestPacket.cpp
edia/mtp/MtpRequestPacket.h
edia/mtp/MtpServer.cpp
edia/mtp/MtpStorageInfo.cpp
edia/mtp/MtpStorageInfo.h
edia/mtp/MtpStringBuffer.cpp
edia/mtp/MtpStringBuffer.h
f296e2b262d2a8f7c570eaed454a28cca99eb976 19-Jun-2014 Lajos Molnar <lajos@google.com> stagefright: add runtime debug support

Bug: 18285408
Change-Id: I56346f4652b2c5f7ef5fa3003fd8676051339384
nclude/media/stagefright/foundation/ADebug.h
nclude/media/stagefright/foundation/AStringUtils.h
edia/libstagefright/OMXCodec.cpp
edia/libstagefright/foundation/ADebug.cpp
edia/libstagefright/foundation/AStringUtils.cpp
edia/libstagefright/foundation/Android.mk
edia/libstagefright/include/OMXNodeInstance.h
edia/libstagefright/omx/OMX.cpp
edia/libstagefright/omx/OMXNodeInstance.cpp
edia/libstagefright/omx/SoftOMXComponent.cpp
edia/libstagefright/tests/Utils_test.cpp
94691b01a94d3ae115a7181c99db58fbeb785c64 12-Nov-2014 Marco Nelissen <marcone@google.com> Merge "Fix Ogg Vorbis packet timestamps" into lmp-mr1-dev
7c77c75d43ac2a40f2b5ce98085ef68f8ba3b4f2 12-Nov-2014 Chien-Yu Chen <cychen@google.com> Merge "Camera2Device: fix camera metadata leaks" into lmp-mr1-dev
ba37077dc8507a32109128a4fcfbc5f43fb47217 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
edia/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp
538596f71dc667b2f39c27d0bc9bbf119b0e6d58 12-Nov-2014 Marco Nelissen <marcone@google.com> Merge "Fix looping sound playback" into lmp-mr1-dev
ccc11fbffb9c6733f1b675779ff5505a1466cbf8 12-Nov-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 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
edia/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp
7a493d8578bb00cf10190053a4caf1d07f4e24f7 11-Nov-2014 Marco Nelissen <marcone@google.com> Fix Ogg Vorbis packet timestamps

Bug: 17586090
Change-Id: Iea88f7cc1f623cbea5df24169ea76181925fbb13
edia/libstagefright/OggExtractor.cpp
ff0a58f365cde1127785ee674267ac4bd516c837 11-Nov-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to lmp-mr1-dev
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
a64ed568c94d7bf837eab02f7ad1e6d196ac396f 11-Nov-2014 Eric Laurent <elaurent@google.com> am 8e2b445f: am ae6965ae: am 3aef3560: am e360f0f6: IAudioPolicyService: bound array size in queryDefaultPreProcessing automerge: 99370d2 automerge: cb5c8c0
automerge: 98356ad

* commit '98356ada9146e8630821b760b161cbd9993f1228':
98356ada9146e8630821b760b161cbd9993f1228 11-Nov-2014 Eric Laurent <elaurent@google.com> am 8e2b445f: am ae6965ae: am 3aef3560: am e360f0f6: IAudioPolicyService: bound array size in queryDefaultPreProcessing automerge: 99370d2 automerge: cb5c8c0

* commit '8e2b445fabd05132de57226de71c7860a5391954':
8e2b445fabd05132de57226de71c7860a5391954 11-Nov-2014 Eric Laurent <elaurent@google.com> am ae6965ae: am 3aef3560: am e360f0f6: IAudioPolicyService: bound array size in queryDefaultPreProcessing automerge: 99370d2
automerge: cb5c8c0

* commit 'cb5c8c0de3f796f6a2499d4467abe59e11ffa8f5':
cb5c8c0de3f796f6a2499d4467abe59e11ffa8f5 11-Nov-2014 Eric Laurent <elaurent@google.com> am ae6965ae: am 3aef3560: am e360f0f6: IAudioPolicyService: bound array size in queryDefaultPreProcessing
automerge: 99370d2

* commit '99370d2da54d7537ffda7fef1f6ef36f8b690321':
IAudioPolicyService: bound array size in queryDefaultPreProcessing
f840fc850b31b0e038978d72f4841b48bef8a84a 11-Nov-2014 Eric Laurent <elaurent@google.com> am 17c2c87c: am 6d60079e: am 99370d2d: am ae6965ae: am 3aef3560: am e360f0f6: IAudioPolicyService: bound array size in queryDefaultPreProcessing

* commit '17c2c87c40588fe77c327bb4dd57460aad90731c':
IAudioPolicyService: bound array size in queryDefaultPreProcessing
17c2c87c40588fe77c327bb4dd57460aad90731c 11-Nov-2014 Eric Laurent <elaurent@google.com> am 6d60079e: am 99370d2d: am ae6965ae: am 3aef3560: am e360f0f6: IAudioPolicyService: bound array size in queryDefaultPreProcessing

* commit '6d60079e97c5fd6ba7de7b60adb0a027c0608d19':
IAudioPolicyService: bound array size in queryDefaultPreProcessing
6d60079e97c5fd6ba7de7b60adb0a027c0608d19 11-Nov-2014 Eric Laurent <elaurent@google.com> am 99370d2d: am ae6965ae: am 3aef3560: am e360f0f6: IAudioPolicyService: bound array size in queryDefaultPreProcessing

* commit '99370d2da54d7537ffda7fef1f6ef36f8b690321':
IAudioPolicyService: bound array size in queryDefaultPreProcessing
99370d2da54d7537ffda7fef1f6ef36f8b690321 11-Nov-2014 Eric Laurent <elaurent@google.com> am ae6965ae: am 3aef3560: am e360f0f6: IAudioPolicyService: bound array size in queryDefaultPreProcessing

* commit 'ae6965ae7664aaea489a8d58358035610075c9af':
IAudioPolicyService: bound array size in queryDefaultPreProcessing
ae6965ae7664aaea489a8d58358035610075c9af 11-Nov-2014 Eric Laurent <elaurent@google.com> am 3aef3560: am e360f0f6: IAudioPolicyService: bound array size in queryDefaultPreProcessing

* commit '3aef35600523eb6b4ccc8086a8913e80701a031a':
IAudioPolicyService: bound array size in queryDefaultPreProcessing
3aef35600523eb6b4ccc8086a8913e80701a031a 11-Nov-2014 Eric Laurent <elaurent@google.com> am e360f0f6: IAudioPolicyService: bound array size in queryDefaultPreProcessing

* commit 'e360f0f6cad290f69e07fd3a20dcf11a1dbc4160':
IAudioPolicyService: bound array size in queryDefaultPreProcessing
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
edia/libmediaplayerservice/nuplayer/GenericSource.cpp
edia/libmediaplayerservice/nuplayer/GenericSource.h
80de5dca0b8e04f81da0d15dff957f82551eaafc 08-Nov-2014 Chien-Yu Chen <cychen@google.com> Camera2Device: fix camera metadata leaks

bug 11132653

Change-Id: I5445b020c3aeaac9a556c023568adac635834356
ervices/camera/libcameraservice/device2/Camera2Device.cpp
ervices/camera/libcameraservice/device2/Camera2Device.h
e360f0f6cad290f69e07fd3a20dcf11a1dbc4160 05-Nov-2014 Eric Laurent <elaurent@google.com> IAudioPolicyService: bound array size in queryDefaultPreProcessing

Bug: 18226810.
Change-Id: Ib8e2bfe835a8681aac50bf23161db14e50c9a124
(cherry picked from commit 74adca9ad30b7f8a70d40c5237bade0d16c4ea58)
nclude/media/AudioEffect.h
edia/libmedia/IAudioPolicyService.cpp
2dc28b69258d4772aaf40902b939153239e7fe7f 10-Nov-2014 Robert Shih <robertshih@google.com> Merge "HTTPLiveSource: NULL check in getFormat" into lmp-mr1-dev
c5208b7a23300c0f628a4dab3a22536e351da18b 10-Nov-2014 Eric Laurent <elaurent@google.com> am 2dca6f68: am 995599cb: audioflinger: fix duplicating thread output buffers clear

* commit '2dca6f6826c81372e67625024bbe7fa00c02b708':
audioflinger: fix duplicating thread output buffers clear
2dca6f6826c81372e67625024bbe7fa00c02b708 10-Nov-2014 Eric Laurent <elaurent@google.com> am 995599cb: audioflinger: fix duplicating thread output buffers clear

* commit '995599cbd6ada739c257716a6d8b90eee6d61473':
audioflinger: fix duplicating thread output buffers clear
995599cbd6ada739c257716a6d8b90eee6d61473 08-Nov-2014 Eric Laurent <elaurent@google.com> audioflinger: fix duplicating thread output buffers clear

Also clear mix buffer in DuplicatingThread::threadLoop_mix()
instead of just sink buffer when output threads are not
ready.

Bug: 18262127.
Change-Id: I4c22bbeaccdcc8d7c10c5882dde3439eb73d6ede
(cherry picked from commit 02b5708776ba2a9b4ff8c09008483aef7dbe38c7)
ervices/audioflinger/Threads.cpp
1e9af7671939f8ef3d019d49d8d7e1301de3025b 10-Nov-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to lmp-mr1-dev
50b9ffee58026994cd30b852628125860c58a6b8 09-Nov-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to lmp-mr1-dev
241063af243bc8b14d8582899820388bcf838ef6 08-Nov-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 02b5708776ba2a9b4ff8c09008483aef7dbe38c7
1098d87e56f726184ae9c8fe903ea4743669f35b 06-Nov-2014 Robert Shih <robertshih@google.com> HTTPLiveSource: NULL check in getFormat

Bug: 18297916
Change-Id: I14c5de8d28202ee1b68e369d33e01bd26dbe968d
edia/libmediaplayerservice/nuplayer/HTTPLiveSource.cpp
02b5708776ba2a9b4ff8c09008483aef7dbe38c7 08-Nov-2014 Eric Laurent <elaurent@google.com> audioflinger: fix duplicating thread output buffers clear

Also clear mix buffer in DuplicatingThread::threadLoop_mix()
instead of just sink buffer when output threads are not
ready.

Bug: 18262127.
Change-Id: I4c22bbeaccdcc8d7c10c5882dde3439eb73d6ede
ervices/audioflinger/Threads.cpp
f5b7c3b3c9a6da29f3bbd02e4031ad19bc7ad0f7 08-Nov-2014 Robert Shih <robertshih@google.com> PlaylistFetcher: clear mStartup for .aac playlists after seek

Bug: 18296856
Change-Id: I26beabee338312eb2125b69284052c61aef611f0
edia/libstagefright/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
edia/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
0644f95a8976470e84c6c0a6d96585ae6437ecd2 05-Nov-2014 Robert Shih <robertshih@google.com> MatroskaExtractor: use GetTrackByNumber instead of GetTrackByIndex

Bug: 18297854
Change-Id: I5e14a358576d9c7d25b7e421cd22428fb17a6e06
edia/libstagefright/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
nclude/media/AudioSystem.h
edia/libmedia/AudioSystem.cpp
62fe78b66c87339a64f047561e7b4aac606310e2 07-Nov-2014 Glenn Kasten <gkasten@google.com> Merge "Fix memory leak" into lmp-mr1-dev
f2f072e87718ecf6df40ba51b95e2a93bc68f720 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
edia/libmediaplayerservice/nuplayer/GenericSource.cpp
edia/libmediaplayerservice/nuplayer/NuPlayer.cpp
edia/libmediaplayerservice/nuplayer/NuPlayer.h
edia/libmediaplayerservice/nuplayer/RTSPSource.cpp
edia/libmediaplayerservice/nuplayer/StreamingSource.cpp
edia/libstagefright/httplive/LiveSession.cpp
edia/libstagefright/httplive/PlaylistFetcher.cpp
edia/libstagefright/mpeg2ts/ATSParser.h
edia/libstagefright/mpeg2ts/AnotherPacketSource.cpp
d556fad7475f4cd05a2199e9716ed8e01aa0ea9b 06-Nov-2014 Jeff Tinker <jtinker@google.com> Fix build, update mock drm plugin

Bug: 18280078
(cherry picked from commit 85c737a67e1b679251fce7f456ae79eefdc15e07)

Change-Id: I341981e71d87be666787d9c866fc71a6b758c0e9
rm/mediadrm/plugins/mock/MockDrmCryptoPlugin.cpp
rm/mediadrm/plugins/mock/MockDrmCryptoPlugin.h
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
edia/libmediaplayerservice/nuplayer/HTTPLiveSource.cpp
edia/libmediaplayerservice/nuplayer/HTTPLiveSource.h
edia/libstagefright/httplive/LiveSession.cpp
edia/libstagefright/httplive/LiveSession.h
edia/libstagefright/httplive/M3UParser.cpp
edia/libstagefright/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
edia/libmediaplayerservice/nuplayer/GenericSource.cpp
edia/libmediaplayerservice/nuplayer/NuPlayer.cpp
edia/libmediaplayerservice/nuplayer/NuPlayer.h
edia/libmediaplayerservice/nuplayer/RTSPSource.cpp
edia/libmediaplayerservice/nuplayer/StreamingSource.cpp
edia/libstagefright/httplive/LiveSession.cpp
edia/libstagefright/httplive/PlaylistFetcher.cpp
edia/libstagefright/mpeg2ts/ATSParser.h
edia/libstagefright/mpeg2ts/AnotherPacketSource.cpp
85f480e7fd7c5e70c91d2f205b5c49488a84eb4d 06-Nov-2014 Glenn Kasten <gkasten@google.com> Fix memory leak

Change-Id: I3f4110a88679b7e7841f40c6acdbf5dcde40fb19
edia/libmedia/IAudioPolicyService.cpp
868e2f0148b1c491e4fd4839b46d73f6216a058d 06-Nov-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 1cf9ad1abb599ce4057189e0db154cf00b4913f8
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
nclude/media/AudioSystem.h
edia/libmedia/AudioSystem.cpp
edia/libmedia/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
edia/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
74adca9ad30b7f8a70d40c5237bade0d16c4ea58 05-Nov-2014 Eric Laurent <elaurent@google.com> IAudioPolicyService: bound array size in queryDefaultPreProcessing

Bug: 18226810.
Change-Id: Ib8e2bfe835a8681aac50bf23161db14e50c9a124
nclude/media/AudioEffect.h
edia/libmedia/IAudioPolicyService.cpp
d5735f915191061994cd6e2356492d5dae30a591 05-Nov-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to ed1e55c5276a1c031e9b2f016387c7d2fe7bc47f
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
mds/screenrecord/FrameOutput.cpp
mds/screenrecord/FrameOutput.h
mds/screenrecord/Overlay.cpp
mds/screenrecord/Overlay.h
nclude/camera/ProCamera.h
nclude/media/stagefright/SurfaceMediaSource.h
edia/libstagefright/SurfaceMediaSource.cpp
edia/libstagefright/omx/GraphicBufferSource.cpp
edia/libstagefright/omx/GraphicBufferSource.h
ervices/camera/libcameraservice/api1/client2/BurstCapture.cpp
ervices/camera/libcameraservice/api1/client2/BurstCapture.h
ervices/camera/libcameraservice/api1/client2/CallbackProcessor.cpp
ervices/camera/libcameraservice/api1/client2/CallbackProcessor.h
ervices/camera/libcameraservice/api1/client2/JpegProcessor.cpp
ervices/camera/libcameraservice/api1/client2/JpegProcessor.h
ervices/camera/libcameraservice/api1/client2/StreamingProcessor.cpp
ervices/camera/libcameraservice/api1/client2/StreamingProcessor.h
ervices/camera/libcameraservice/api1/client2/ZslProcessor.cpp
ervices/camera/libcameraservice/api1/client2/ZslProcessor.h
ervices/camera/libcameraservice/gui/RingBufferConsumer.cpp
ervices/camera/libcameraservice/gui/RingBufferConsumer.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
edia/libstagefright/MediaCodec.cpp
6cf366415afd237b014a7266049af2bb38df6112 04-Nov-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to ed1e55c5276a1c031e9b2f016387c7d2fe7bc47f
2514d080c8a54ff603a45d7e336de668fe7329db 03-Nov-2014 Jeff Tinker <jtinker@google.com> Pass resolution to Crypto plugin on format change

Change-Id: I56cd557ce3525fe625db8c312d2557d3c8b51101
related-to-bug: 16034599
nclude/media/ICrypto.h
edia/libmedia/ICrypto.cpp
edia/libmediaplayerservice/Crypto.cpp
edia/libmediaplayerservice/Crypto.h
edia/libstagefright/MediaCodec.cpp
ed1e55c5276a1c031e9b2f016387c7d2fe7bc47f 04-Nov-2014 Eric Laurent <elaurent@google.com> Merge "remove some restrictions on effect output channels" into lmp-mr1-dev
461b02d3eccefea48fa15c67a9cd3a5895bd2765 04-Nov-2014 Eric Laurent <elaurent@google.com> Merge "audio: fix talkback why alarm is playing" into lmp-mr1-dev
b10352f4bc11ae6f3d93e464074709555ecf9e06 04-Nov-2014 Eric Laurent <elaurent@google.com> remove some restrictions on effect output channels

Do not prevent from attaching effects to a non stereo
output thread, unless the output thread is a mixer thread.

Bug: 18157592.
Change-Id: I6ac3187187a1b8aade7db04ea6dfbc47dacc25c3
ervices/audioflinger/AudioFlinger.cpp
0def1d9e88e5ce567e13e0081f2ee8ae3cba0232 04-Nov-2014 Eric Laurent <elaurent@google.com> am 9c0c41ff: am 42f785c5: am 4fbe49a8: am 96016c2d: am 9944ff09: am 70c3507d: am 450b10c9: am d0f9dc71: am e0a65f30: am f5af3a72: am 6d80b687: audio policy: validate stream type received from binder calls. automerge: ca83dd2 automerge: ba30b45
automerge: 10e898c

* commit '10e898cc583473d4c3604456b48e008f90d82f70':
5e4215f5d7f78b5f6bffafc8a93a0f5575524b77 04-Nov-2014 Chris Elliott <chriselliott@google.com> am 9c356efa: Revert "audio: prevent larger than required sleeps - DO NOT MERGE" automerge: b6dcdbf -s ours automerge: ed394bc -s ours
automerge: 953705d -s ours

* commit '953705d721627558bbdcd0c014ba3a95f073f4da':
c7eca4e8ea8c6cd6d1a96404331c2119c1dd556e 04-Nov-2014 Chris Elliott <chriselliott@google.com> am 4b189fe2: audio: prevent larger than required sleeps - DO NOT MERGE automerge: 620208d -s ours automerge: b2c3ad1 -s ours
automerge: 4f97e69 -s ours

* commit '4f97e6933b529e3822fb3ef121a9f0139e7a04d7':
3baa9d08ad2ec5afd4c1cdd48942aeb74b5428d7 04-Nov-2014 Chris Elliott <chriselliott@google.com> am 1aed5c92: Revert "audio: prevent larger than required sleeps - DO NOT MERGE" automerge: 2feb18d -s ours automerge: bb92112 -s ours
automerge: 0a978b7 -s ours

* commit '0a978b70e95f8499831843b155d64fecc54208e8':
398a2c5425ecbc4225b934e61440a5f2dd92f607 04-Nov-2014 Haynes Mathew George <hgeorge@codeaurora.org> am d6d711c3: audio: prevent larger than required sleeps - DO NOT MERGE automerge: 8c0417c -s ours automerge: 52ea677 -s ours
automerge: d20609f -s ours

* commit 'd20609f642d8455f8cf548ac0ca42c732931b891':
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
edia/libmedia/AudioTrack.cpp
3736dbc5c4ef7c0e0cf81ff3fc73579527cad50a 03-Nov-2014 Chien-Yu Chen <cychen@google.com> Merge "CameraService: API1: fix picture FOV" into lmp-mr1-dev
10e898cc583473d4c3604456b48e008f90d82f70 03-Nov-2014 Eric Laurent <elaurent@google.com> am 9c0c41ff: am 42f785c5: am 4fbe49a8: am 96016c2d: am 9944ff09: am 70c3507d: am 450b10c9: am d0f9dc71: am e0a65f30: am f5af3a72: am 6d80b687: audio policy: validate stream type received from binder calls. automerge: ca83dd2 automerge: ba30b45

* commit '9c0c41ff36926030778a8a41210d02602c5a9f62':
953705d721627558bbdcd0c014ba3a95f073f4da 03-Nov-2014 Chris Elliott <chriselliott@google.com> am 9c356efa: Revert "audio: prevent larger than required sleeps - DO NOT MERGE" automerge: b6dcdbf -s ours automerge: ed394bc -s ours

* commit '9c356efa84e6fa756ebcce88ea192921f1a0da3e':
4f97e6933b529e3822fb3ef121a9f0139e7a04d7 03-Nov-2014 Chris Elliott <chriselliott@google.com> am 4b189fe2: audio: prevent larger than required sleeps - DO NOT MERGE automerge: 620208d -s ours automerge: b2c3ad1 -s ours

* commit '4b189fe2c22bc0079ec6d40947de9172c36f49eb':
0a978b70e95f8499831843b155d64fecc54208e8 03-Nov-2014 Chris Elliott <chriselliott@google.com> am 1aed5c92: Revert "audio: prevent larger than required sleeps - DO NOT MERGE" automerge: 2feb18d -s ours automerge: bb92112 -s ours

* commit '1aed5c9213e6f7eb31b53bc7771889b146e39877':
d20609f642d8455f8cf548ac0ca42c732931b891 03-Nov-2014 Haynes Mathew George <hgeorge@codeaurora.org> am d6d711c3: audio: prevent larger than required sleeps - DO NOT MERGE automerge: 8c0417c -s ours automerge: 52ea677 -s ours

* commit 'd6d711c3b12cca2c6eee21b088831144e1fb0550':
9c0c41ff36926030778a8a41210d02602c5a9f62 03-Nov-2014 Eric Laurent <elaurent@google.com> am 42f785c5: am 4fbe49a8: am 96016c2d: am 9944ff09: am 70c3507d: am 450b10c9: am d0f9dc71: am e0a65f30: am f5af3a72: am 6d80b687: audio policy: validate stream type received from binder calls. automerge: ca83dd2
automerge: ba30b45

* commit 'ba30b4547c6b7ca949ef74e760ccc6157f435690':
9c356efa84e6fa756ebcce88ea192921f1a0da3e 03-Nov-2014 Chris Elliott <chriselliott@google.com> Revert "audio: prevent larger than required sleeps - DO NOT MERGE" automerge: b6dcdbf -s ours
automerge: ed394bc -s ours

* commit 'ed394bcfa79da3dd25cd24d485aa0d063818a977':
4b189fe2c22bc0079ec6d40947de9172c36f49eb 03-Nov-2014 Chris Elliott <chriselliott@google.com> audio: prevent larger than required sleeps - DO NOT MERGE automerge: 620208d -s ours
automerge: b2c3ad1 -s ours

* commit 'b2c3ad13cb248159910bef6ac51f7e6023e133b9':
1aed5c9213e6f7eb31b53bc7771889b146e39877 03-Nov-2014 Chris Elliott <chriselliott@google.com> Revert "audio: prevent larger than required sleeps - DO NOT MERGE" automerge: 2feb18d -s ours
automerge: bb92112 -s ours

* commit 'bb9211236cf6104d16fc09b58550ce692d9af4e9':
d6d711c3b12cca2c6eee21b088831144e1fb0550 03-Nov-2014 Haynes Mathew George <hgeorge@codeaurora.org> audio: prevent larger than required sleeps - DO NOT MERGE automerge: 8c0417c -s ours
automerge: 52ea677 -s ours

* commit '52ea677828b23b216484dd34f84da2699ed850e3':
0c629a3857c31bee6fa39ba7a9a8cbcabeb383fd 01-Nov-2014 Gaurav Batra <gbatra@nvidia.com> camera: fix vendortags section malloc failure

size_t type variables should be initialized properly especially on 64-bit archs
if they are type casted to shorter datatypes for some operation and then later
used in entirety. The results may be unpredictable since the most significant
bytes may contain garbage.

Bug 18222311

Change-Id: Iced82e964cf8c98f6856d257fc1534a5237a9064
amera/VendorTagDescriptor.cpp
797f88b756968d980eeb7b09439710cc98691c5e 03-Nov-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 151b3f41ffcdf187580542ba0c0d3b84df16beed
3c65cb14e6ca9ad8f08150af079993b841f8fc9d 02-Nov-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 151b3f41ffcdf187580542ba0c0d3b84df16beed
151b3f41ffcdf187580542ba0c0d3b84df16beed 01-Nov-2014 Eric Laurent <elaurent@google.com> am aa751488: am 5987e7ae: am ca83dd27: (-s ours) am 42f785c5: am 4fbe49a8: am 96016c2d: am 9944ff09: am 70c3507d: am 450b10c9: am d0f9dc71: am e0a65f30: am f5af3a72: am 6d80b687: audio policy: validate stream type received from binder calls.

* commit 'aa751488b338e7f806bb20cb69e60fcd2b0ad738':
audio policy: validate stream type received from binder calls.
a845d4dc7d5f1aff64abe327b63cfb0ec25ee782 01-Nov-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to d9cfeb447356cb6334379eaf5da1e49424eb5979
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
edia/libmedia/AudioTrack.cpp
ervices/audiopolicy/AudioPolicyManager.cpp
ervices/audiopolicy/AudioPolicyManager.h
3c1285e8f86bd497e14c14fb6df7b42072ef52bd 31-Oct-2014 Jeff Tinker <jtinker@google.com> Add missing secure stop methods

b/18053197
b/18076411

Change-Id: I923dc893d48c70bf17980007b32f0ac5dfd22896
rm/mediadrm/plugins/clearkey/DrmPlugin.h
nclude/media/IDrm.h
edia/libmedia/IDrm.cpp
edia/libmediaplayerservice/Drm.cpp
edia/libmediaplayerservice/Drm.h
ba30b4547c6b7ca949ef74e760ccc6157f435690 31-Oct-2014 Eric Laurent <elaurent@google.com> am 42f785c5: am 4fbe49a8: am 96016c2d: am 9944ff09: am 70c3507d: am 450b10c9: am d0f9dc71: am e0a65f30: am f5af3a72: am 6d80b687: audio policy: validate stream type received from binder calls.
automerge: ca83dd2

* commit 'ca83dd27f6c662bcbb0cea204c4df7ca77a479fd':
audio policy: validate stream type received from binder calls.
aa751488b338e7f806bb20cb69e60fcd2b0ad738 31-Oct-2014 Eric Laurent <elaurent@google.com> am 5987e7ae: am ca83dd27: (-s ours) am 42f785c5: am 4fbe49a8: am 96016c2d: am 9944ff09: am 70c3507d: am 450b10c9: am d0f9dc71: am e0a65f30: am f5af3a72: am 6d80b687: audio policy: validate stream type received from binder calls.

* commit '5987e7ae4491842f9c8d0e8a888105a56273159d':
audio policy: validate stream type received from binder calls.
5987e7ae4491842f9c8d0e8a888105a56273159d 31-Oct-2014 Eric Laurent <elaurent@google.com> am ca83dd27: (-s ours) am 42f785c5: am 4fbe49a8: am 96016c2d: am 9944ff09: am 70c3507d: am 450b10c9: am d0f9dc71: am e0a65f30: am f5af3a72: am 6d80b687: audio policy: validate stream type received from binder calls.

* commit 'ca83dd27f6c662bcbb0cea204c4df7ca77a479fd':
audio policy: validate stream type received from binder calls.
ca83dd27f6c662bcbb0cea204c4df7ca77a479fd 31-Oct-2014 Eric Laurent <elaurent@google.com> am 42f785c5: am 4fbe49a8: am 96016c2d: am 9944ff09: am 70c3507d: am 450b10c9: am d0f9dc71: am e0a65f30: am f5af3a72: am 6d80b687: audio policy: validate stream type received from binder calls.

* commit '42f785c5d5ae596d781171327c98c541f0517feb':
audio policy: validate stream type received from binder calls.
42f785c5d5ae596d781171327c98c541f0517feb 31-Oct-2014 Eric Laurent <elaurent@google.com> am 4fbe49a8: am 96016c2d: am 9944ff09: am 70c3507d: am 450b10c9: am d0f9dc71: am e0a65f30: am f5af3a72: am 6d80b687: audio policy: validate stream type received from binder calls.

* commit '4fbe49a83d41a64d44e363ccd691e7bfc41bb6af':
audio policy: validate stream type received from binder calls.
4fbe49a83d41a64d44e363ccd691e7bfc41bb6af 31-Oct-2014 Eric Laurent <elaurent@google.com> am 96016c2d: am 9944ff09: am 70c3507d: am 450b10c9: am d0f9dc71: am e0a65f30: am f5af3a72: am 6d80b687: audio policy: validate stream type received from binder calls.

* commit '96016c2d583ccca9fffd6974cb9473f7effd6cf5':
audio policy: validate stream type received from binder calls.
96016c2d583ccca9fffd6974cb9473f7effd6cf5 31-Oct-2014 Eric Laurent <elaurent@google.com> am 9944ff09: am 70c3507d: am 450b10c9: am d0f9dc71: am e0a65f30: am f5af3a72: am 6d80b687: audio policy: validate stream type received from binder calls.

* commit '9944ff09ac4eb076cab994ef245b0103f60836ba':
audio policy: validate stream type received from binder calls.
9944ff09ac4eb076cab994ef245b0103f60836ba 31-Oct-2014 Eric Laurent <elaurent@google.com> am 70c3507d: am 450b10c9: am d0f9dc71: am e0a65f30: am f5af3a72: am 6d80b687: audio policy: validate stream type received from binder calls.

* commit '70c3507d915baaa5a0ab163eeb0a445030f4f492':
audio policy: validate stream type received from binder calls.
70c3507d915baaa5a0ab163eeb0a445030f4f492 31-Oct-2014 Eric Laurent <elaurent@google.com> am 450b10c9: am d0f9dc71: am e0a65f30: am f5af3a72: am 6d80b687: audio policy: validate stream type received from binder calls.

* commit '450b10c97514411ef1d0d887d4e18851fd286f0b':
audio policy: validate stream type received from binder calls.
450b10c97514411ef1d0d887d4e18851fd286f0b 31-Oct-2014 Eric Laurent <elaurent@google.com> am d0f9dc71: am e0a65f30: am f5af3a72: am 6d80b687: audio policy: validate stream type received from binder calls.

* commit 'd0f9dc7156e531d5cd0615f6e682d2449e08e9a7':
audio policy: validate stream type received from binder calls.
d0f9dc7156e531d5cd0615f6e682d2449e08e9a7 31-Oct-2014 Eric Laurent <elaurent@google.com> am e0a65f30: am f5af3a72: am 6d80b687: audio policy: validate stream type received from binder calls.

* commit 'e0a65f3008ac5874106b21d03e19296c8015da41':
audio policy: validate stream type received from binder calls.
e0a65f3008ac5874106b21d03e19296c8015da41 30-Oct-2014 Eric Laurent <elaurent@google.com> am f5af3a72: am 6d80b687: audio policy: validate stream type received from binder calls.

* commit 'f5af3a72f308cd4dff7859e62922ee5a13bd4c15':
audio policy: validate stream type received from binder calls.
20f51b1ea04c410a25f214e37bcdb586e2a028cc 30-Oct-2014 Glenn Kasten <gkasten@google.com> AudioTrack::flush() will no longer flush later data

Bug: 17832076
Change-Id: I4915d782acb8077923e419406b0dcea5b6aab961
edia/libmedia/AudioTrackShared.cpp
f5af3a72f308cd4dff7859e62922ee5a13bd4c15 30-Oct-2014 Eric Laurent <elaurent@google.com> am 6d80b687: audio policy: validate stream type received from binder calls.

* commit '6d80b687c3b8d9c8da7cdad7d9813aa51c1cf15e':
audio policy: validate stream type received from binder calls.
6d80b687c3b8d9c8da7cdad7d9813aa51c1cf15e 30-Oct-2014 Eric Laurent <elaurent@google.com> audio policy: validate stream type received from binder calls.

Bug: 18001784.
Bug: 18002005.
Change-Id: If08866a3c21bcbfd8cdbbf8336bcf1faad66f321
ervices/audioflinger/AudioPolicyService.cpp
b1322c78b035c9f47ebe57a39799d7a0e13bf57f 30-Oct-2014 Eric Laurent <elaurent@google.com> audio policy: fix commit dea1541f

Fix return types in early returns added by
commit dea1541f in AudioPolicy binder call methods.

Also fix former similar mistakes found nearby.

Bug: 18001784.
Bug: 18002005.

Change-Id: I088c6029ca04e2c2c2f78e560c9cb6b9576dd88f
ervices/audiopolicy/AudioPolicyInterfaceImpl.cpp
ervices/audiopolicy/AudioPolicyInterfaceImplLegacy.cpp
8e05b5f5f45b8d6931ff830969125a42428c6830 30-Oct-2014 Eric Laurent <elaurent@google.com> Merge "audio policy: validate stream type received from binder calls." into lmp-mr1-dev
eac3d324dfcf1c3851fa0442c5e6f071a8751bd6 30-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 7011ee31d65917a9e15b271942e863f06eee2da1
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
edia/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
edia/libstagefright/AwesomePlayer.cpp
cde2b72229fd6e06ee301238fd2943cdc1c40686 29-Oct-2014 Wei Jia <wjia@google.com> Merge "NuPlayer: merge start() and resume()." into lmp-mr1-dev
72c6d082a7919c0428a4032724511bf3d7b73ae9 29-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 6e8212b2a02685e50d0c093a6f44d9af636261d9
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
edia/libmediaplayerservice/nuplayer/NuPlayer.cpp
edia/libmediaplayerservice/nuplayer/NuPlayer.h
edia/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp
ed394bcfa79da3dd25cd24d485aa0d063818a977 29-Oct-2014 Chris Elliott <chriselliott@google.com> Revert "audio: prevent larger than required sleeps - DO NOT MERGE"
automerge: b6dcdbf -s ours

* commit 'b6dcdbf436ffacb52a41ac8ef9b07f99fd64779f':
Revert "audio: prevent larger than required sleeps - DO NOT MERGE"
b2c3ad13cb248159910bef6ac51f7e6023e133b9 29-Oct-2014 Chris Elliott <chriselliott@google.com> audio: prevent larger than required sleeps - DO NOT MERGE
automerge: 620208d -s ours

* commit '620208dc0bbd7a0792702df3ab08800fdad60cec':
audio: prevent larger than required sleeps - DO NOT MERGE
bb9211236cf6104d16fc09b58550ce692d9af4e9 29-Oct-2014 Chris Elliott <chriselliott@google.com> Revert "audio: prevent larger than required sleeps - DO NOT MERGE"
automerge: 2feb18d -s ours

* commit '2feb18ddfdbd20941ebcc3314780a582da5608e4':
Revert "audio: prevent larger than required sleeps - DO NOT MERGE"
52ea677828b23b216484dd34f84da2699ed850e3 29-Oct-2014 Haynes Mathew George <hgeorge@codeaurora.org> audio: prevent larger than required sleeps - DO NOT MERGE
automerge: 8c0417c -s ours

* commit '8c0417c173d1fd618ae54e2d721b0ec360ea70cc':
audio: prevent larger than required sleeps - DO NOT MERGE
dea1541fc0042abf05674b19c2f94ca086945dfd 28-Oct-2014 Eric Laurent <elaurent@google.com> audio policy: validate stream type received from binder calls.

Bug: 18001784.
Bug: 18002005.
Change-Id: I8efa674dceff5a6e10251b1c7a55e9bb2d532395
ervices/audiopolicy/AudioPolicyInterfaceImpl.cpp
ervices/audiopolicy/AudioPolicyInterfaceImplLegacy.cpp
6e8212b2a02685e50d0c093a6f44d9af636261d9 28-Oct-2014 Jean-Michel Trivi <jmtrivi@google.com> Merge "Always use an address for remote submix" into lmp-mr1-dev
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
edia/libmedia/Visualizer.cpp
1bbc1c93b5db545e503dc27c262eef38685d0726 24-Oct-2014 Chien-Yu Chen <cychen@google.com> CameraService: API1: fix picture FOV

Fix the wrong assumption that active array size equals to pixel array
size.

bug 17918247

Change-Id: Ic308f281fb677332a74e95abb473c5b13063eeca
ervices/camera/libcameraservice/api1/client2/Parameters.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
edia/libmediaplayerservice/nuplayer/NuPlayer.cpp
edia/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
b80a2a8871d3af8619bf774a0c9ddbac8d598bf9 28-Oct-2014 Eric Laurent <elaurent@google.com> audio policy: fix output device command after clearing audio patch

Make sure that a valid audio patch is created again on an output stream
following the disconneciton and reconnection of the same output device.

Bug: 18144611.
Change-Id: I72387ad8e93f8fb2571da2a6c58a6e167ac7fc4d
ervices/audiopolicy/AudioPolicyManager.cpp
98304bc56416f0d7684aa3ae5079ca7104556cd2 28-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 701b96474dc8afd16046e440975e00be57cc4874
701b96474dc8afd16046e440975e00be57cc4874 28-Oct-2014 Lajos Molnar <lajos@google.com> Merge "libstagefright: set actual stride info for SW encoder input port" into lmp-mr1-dev
fd4c14883b268a0bc5514da135fe6b7d1ce2071b 07-Aug-2014 Jean-Michel Trivi <jmtrivi@google.com> Always use an address for remote submix

Usage of remote submix device for audio rerouting (e.g. wifi display)
didn't mandate the use of addresses. Use "0" as the default address
when none is specificed.
In logs, only use hex format for audio devices

Bug 16009464

Change-Id: Ibfb1ce6881eba8b7e34420293b8a7077a6e659e6
ervices/audioflinger/AudioFlinger.cpp
ervices/audiopolicy/AudioPolicyManager.cpp
df2592beab557663a471da2ac33ca463f7eee722 25-Oct-2014 Chong Zhang <chz@google.com> do not hold mNotifyLock when calling MediaPlayer::notify

Bug:18120688
Change-Id: Ia66dcfc3fd2d67d1ceba9808d21e0120cc8691d6
nclude/media/MediaPlayerInterface.h
edia/libmediaplayerservice/MediaPlayerService.cpp
31551f8dd625b8d40961e141d2913b0073f852ab 11-Oct-2014 Eric Laurent <elaurent@google.com> audio policy: fix multiple device volume

Whem multiple devices are selected by a strategy,
apply volume to all these devices when one of them is changed by
setStreamVolumeIndex() API.

Also only consider devices supported by current output profile
in checkDeviceMuteStrategies() to avoid muting a stream because of
devices connected to another output stream.

Bug: 17507571.

Change-Id: I83ef9fb7f294214d30f7f890db44c64ece3be387
ervices/audiopolicy/AudioPolicyManager.cpp
b8121495da5a3950049edc46d5d84d41a19fe86a 27-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 8bfa96c2f7c098550b00b84677088f84e81f4ed4
2505a3418769f162a7933198061774befa566c76 26-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 8bfa96c2f7c098550b00b84677088f84e81f4ed4
52c65bfe5279f61a5b39cc0fbcd31ac6f1c59338 25-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 8bfa96c2f7c098550b00b84677088f84e81f4ed4
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
edia/libstagefright/ACodec.cpp
edia/libstagefright/codecs/avc/enc/SoftAVCEncoder.cpp
edia/libstagefright/codecs/m4v_h263/enc/SoftMPEG4Encoder.cpp
edia/libstagefright/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
edia/libmediaplayerservice/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
ee94675469f67c3fe25428b87fc9a2d468f908c6 24-Oct-2014 Eino-Ville Talvala <etalvala@google.com> am 4d8ae211: am 661c21da: CameraService: Disconnect: Release mutex while waiting for joins.

* commit '4d8ae211ae2e2a5ae464931ce41ec5b1d6e6d51f':
CameraService: Disconnect: Release mutex while waiting for joins.
511ae0549f889c78a820693fdd7e27ea634c2cd2 23-Oct-2014 Marco Nelissen <marcone@google.com> am f256901b: Merge "64 bit fixes for NdkMediaExtractor" into lmp-dev

* commit 'f256901b83d393c5fe6d9b1cfb6391faa86cac72':
64 bit fixes for NdkMediaExtractor
4d8ae211ae2e2a5ae464931ce41ec5b1d6e6d51f 23-Oct-2014 Eino-Ville Talvala <etalvala@google.com> am 661c21da: CameraService: Disconnect: Release mutex while waiting for joins.

* commit '661c21da5592ca48256747ec220efb2e599eeb72':
CameraService: Disconnect: Release mutex while waiting for joins.
f256901b83d393c5fe6d9b1cfb6391faa86cac72 23-Oct-2014 Marco Nelissen <marcone@google.com> Merge "64 bit fixes for NdkMediaExtractor" into lmp-dev
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
edia/ndk/NdkMediaExtractor.cpp
7f721d6d4962328e8becc0da1da60d5df2671274 23-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to b9b21bc11bfb6e77cc0f9e9a31de02342ab9d653
661c21da5592ca48256747ec220efb2e599eeb72 22-Oct-2014 Eino-Ville Talvala <etalvala@google.com> CameraService: Disconnect: Release mutex while waiting for joins.

The threads shutting down may have callpaths that require taking the
binder interface mutex, so waiting to join them with that mutex held
can lead to deadlocks.

A specific instance is StreamingProcessor calling dataCallbackTimestamp,
which can immediately lead to a Camera2Client::releaseRecordingFrame call,
which requires the binder interface mutex. If this call happens right when
shutdown is occurring, and Camera2Client::disconnect is holding the mutex,
deadlock ensues.

Bug: 17997578
Change-Id: I71253cd5542b5920ad205976d315110ca0043d94
ervices/camera/libcameraservice/api1/Camera2Client.cpp
b9b21bc11bfb6e77cc0f9e9a31de02342ab9d653 22-Oct-2014 Chong Zhang <chz@google.com> am 2f368e57: Merge branch \'lmp-sprout-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/av into lmp-sprout-dev

* commit '2f368e57e58c6bc3ab291d6318b19c6698fc184b':
7a337b8f4c49588e350ec47f214c35fadaa9af29 22-Oct-2014 Chong Zhang <chz@google.com> am 3873c920: am 168799c3: Merge "release camera without holding CameraSource mutex" into lmp-dev

* commit '3873c920b830fcea2979a5bf6097bfd5810957f9':
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
9d0d5958969cffae5d4305025bc20d05f32e6ff2 22-Oct-2014 Eric Laurent <elaurent@google.com> Merge "audioflinger: new HW A/V sync ID allocation flow" into lmp-mr1-dev
fa90e84ed0cb2abdc0e0873a06d10ccf2b3c34f6 18-Oct-2014 Eric Laurent <elaurent@google.com> audioflinger: new HW A/V sync ID allocation flow

The HW A/V sync ID is now allocated by the audio HAL before the
output stream is created by a call to global get_parameters() with
key AUDIO_PARAMETER_HW_AV_SYNC.

When the AudioTrack is created, the HW A/V sync ID is communicated
to the output stream by stream set_parameters() with key
AUDIO_PARAMETER_STREAM_HW_AV_SYNC.

Bug: 17112525.
Change-Id: Ia8bc6f3bf9f358aa89f3f56ac554e893a19811ad
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
1f58bb157ded117fe931142e9906b2b6b406b534 22-Oct-2014 Eric Laurent <elaurent@google.com> am 964b7312: am 7de5ac1f: audio policy: fix effect handle leak

* commit '964b73121a634921f000ef3f877a7546f65bb700':
audio policy: fix effect handle leak
133f7a18c16fb3bfc4faddfcca6e1e06bcf7ae39 22-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 171fa1607e8bc3e94c2c9ff080777fcdf06f60d9
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.
2f368e57e58c6bc3ab291d6318b19c6698fc184b 22-Oct-2014 Chong Zhang <chz@google.com> Merge branch 'lmp-sprout-dev' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/av into lmp-sprout-dev
6456ae745e919085c5024f784aaa2703f9695f98 03-Sep-2014 David Yeh <david.yeh@mediatek.com> stagefright: return failure on malformed TS streams

Bug: 18075193
Change-Id: I7bd97dea263e972a8de3429ed000cbd4913164bf
edia/libstagefright/mpeg2ts/ATSParser.cpp
c3ddddbd4ec1fe2c570a25925db6b396fb83badf 22-Oct-2014 Chong Zhang <chz@google.com> Merge "release camera without holding CameraSource mutex" into lmp-dev
automerge: 168799c

* commit '168799c32ce3f9196ae7928986a7ba3770c74b14':
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
3873c920b830fcea2979a5bf6097bfd5810957f9 22-Oct-2014 Chong Zhang <chz@google.com> am 168799c3: Merge "release camera without holding CameraSource mutex" into lmp-dev

* commit '168799c32ce3f9196ae7928986a7ba3770c74b14':
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
168799c32ce3f9196ae7928986a7ba3770c74b14 22-Oct-2014 Chong Zhang <chz@google.com> Merge "release camera without holding CameraSource mutex" into lmp-dev
f04e8b5e51cfc868e5e58e1ad234095c8b7505ad 22-Oct-2014 Lajos Molnar <lajos@google.com> am 25842048: Merge "stagefright: try to free codec instance if MediaCodec.release hangs" into lmp-dev

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

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

* commit 'f592671336be0a061799033e47ceeacb648ed3bf':
mediaplayer: don't report position past last queued position
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
edia/libstagefright/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
nclude/media/stagefright/ACodec.h
edia/libstagefright/ACodec.cpp
edia/libstagefright/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
edia/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
edia/libmediaplayerservice/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
nclude/media/stagefright/MediaCodec.h
edia/libstagefright/MediaCodec.cpp
964b73121a634921f000ef3f877a7546f65bb700 21-Oct-2014 Eric Laurent <elaurent@google.com> am 7de5ac1f: audio policy: fix effect handle leak

* commit '7de5ac1f067ec61f7ea424d5534cfd40987b11fa':
audio policy: fix effect handle leak
7de5ac1f067ec61f7ea424d5534cfd40987b11fa 21-Oct-2014 Eric Laurent <elaurent@google.com> audio policy: fix effect handle leak

Fix ref counting error in AudioPolicyEffect::addInputEffects()
and addOutputSessionEffects()

Bug: 17675112.
Change-Id: I5267d1024a585919f66ead83662e57b78ba53540
ervices/audiopolicy/AudioPolicyEffects.cpp
7927fc702ae891d7db04397c9768aa0b21b488b6 21-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to d61ba0aae5c3155a3e232490129f97a2b3601663
9bbccd13231fbf30e466efedacec5ac03690701b 21-Oct-2014 Lajos Molnar <lajos@google.com> am d5923409: mediaplayer: limit scheduling video frames into the future

* commit 'd5923409bbcbb22954a92c2b497ef4492d7cb6a5':
mediaplayer: limit scheduling video frames into the future
da686693896ecf5cd29c3a35979e7cf17e2702b3 21-Oct-2014 Ronghua Wu <ronghuawu@google.com> am eecb7805: NuPlayer: set anchor time for each audio buffer.

* commit 'eecb7805bbbb712925d4372c505f8c7f5c4fb5ed':
NuPlayer: set anchor time for each audio buffer.
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
edia/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
edia/libmediaplayerservice/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
edia/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
edia/libmediaplayerservice/nuplayer/NuPlayerRenderer.h
d61ba0aae5c3155a3e232490129f97a2b3601663 20-Oct-2014 Marco Nelissen <marcone@google.com> am 36d9256f: am ac302143: Fix the fix

* commit '36d9256f956b2ed4d7a221d84ad05bf4ba482958':
Fix the fix
36d9256f956b2ed4d7a221d84ad05bf4ba482958 20-Oct-2014 Marco Nelissen <marcone@google.com> am ac302143: Fix the fix

* commit 'ac302143551a8b964f026385a524dda9ff8ea5ba':
Fix the fix
ac302143551a8b964f026385a524dda9ff8ea5ba 20-Oct-2014 Marco Nelissen <marcone@google.com> Fix the fix

We need to clear the buffer a little more often.

Bug: 18023017
Change-Id: If8a522b9133a4269e2435af8958f6ced322e71e9
ervices/audioflinger/Threads.cpp
0cfc8f2500bb76d44ad45a723a570835aeff502b 20-Oct-2014 Marco Nelissen <marcone@google.com> am 145a4c67: am 22bc10a3: Merge "Clear effect buffer before sending to chain" into lmp-dev

* commit '145a4c679a9ab27aceaa1d386ea9aca1c0cd4d33':
Clear effect buffer before sending to chain
145a4c679a9ab27aceaa1d386ea9aca1c0cd4d33 20-Oct-2014 Marco Nelissen <marcone@google.com> am 22bc10a3: Merge "Clear effect buffer before sending to chain" into lmp-dev

* commit '22bc10a347569a0ab2980c24783e31aba4d7414d':
Clear effect buffer before sending to chain
22bc10a347569a0ab2980c24783e31aba4d7414d 20-Oct-2014 Marco Nelissen <marcone@google.com> Merge "Clear effect buffer before sending to chain" into lmp-dev
9565cddc295d8fa809ba8b9f583b8ca17fb686d3 20-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to dfe7616237240e8a5c4cb26ba395be70bd898cbd
d692e50077b09306f2d685ca635fff9cd602844e 20-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to e9234f17dfbb192c96b122b9e0ce8cd9015d1589
e995864b9262c12c553b23b30438935afa1fc098 19-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to dfe7616237240e8a5c4cb26ba395be70bd898cbd
1d31d76b0dd4760c3e867c15138da41c4baf498c 18-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to dfe7616237240e8a5c4cb26ba395be70bd898cbd
57088b5c8e76855b99b3e6b3e410de5b6382670e 18-Oct-2014 Marco Nelissen <marcone@google.com> Clear effect buffer before sending to chain

otherwise the effect might get a buffer with previous data instead
of silence.

Bug: 18023017
Change-Id: Ic6be5ce0e74552aac2a0cce9c660893f9ad27f5c
ervices/audioflinger/Threads.cpp
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
e0459eb091d98b944d9d1c9483a08f322aa60eda 17-Oct-2014 Andy Hung <hunga@google.com> am e9234f17: Merge "Fix AudioTrack retrograde getPosition when restoring tracks" into lmp-dev

* commit 'e9234f17dfbb192c96b122b9e0ce8cd9015d1589':
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
edia/libmedia/AudioTrack.cpp
2b6b1d39c151596bc153022d4e4356d216b2eeae 16-Oct-2014 Chong Zhang <chz@google.com> move audio sink open/close to NuPlayerRenderer

Bug: 17675112
Change-Id: I7eb3d02380658f848baedafe2aea287586ccf016
edia/libmediaplayerservice/nuplayer/NuPlayer.cpp
edia/libmediaplayerservice/nuplayer/NuPlayer.h
edia/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
edia/libmediaplayerservice/nuplayer/NuPlayerRenderer.h
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
95b6e531a68561e3381645c0998aa799ae70018e 17-Oct-2014 Chong Zhang <chz@google.com> am 0ebf65be: Merge "move audio sink open/close to NuPlayerRenderer" into lmp-dev

* commit '0ebf65be6642774c26e6fddd44b030ddd3eae492':
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
edia/libmediaplayerservice/nuplayer/NuPlayer.cpp
edia/libmediaplayerservice/nuplayer/NuPlayer.h
edia/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
edia/libmediaplayerservice/nuplayer/NuPlayerRenderer.h
e9e427e9b8b22c7500c91afe9c6cdad60cfac8e0 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
edia/libstagefright/MPEG4Extractor.cpp
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
ea4053283f8b77bf650d91347f6e591685daa1fa 16-Oct-2014 Lajos Molnar <lajos@google.com> am c40da54b: Merge "Fix freed memory references" into lmp-dev

* commit 'c40da54b34138856446e79245ac45600191962b5':
Fix freed memory references
2ea68aaa5efa765a81a33f077ba9da4322e5fd2e 16-Oct-2014 Chris Elliott <chriselliott@google.com> am 053125b5: am 4b21635d: am b6dcdbf4: (-s ours) Revert "audio: prevent larger than required sleeps - DO NOT MERGE"

* commit '053125b506821f4bbecd352312030020fe897455':
Revert "audio: prevent larger than required sleeps - DO NOT MERGE"
c40da54b34138856446e79245ac45600191962b5 16-Oct-2014 Lajos Molnar <lajos@google.com> Merge "Fix freed memory references" into lmp-dev
053125b506821f4bbecd352312030020fe897455 16-Oct-2014 Chris Elliott <chriselliott@google.com> am 4b21635d: am b6dcdbf4: (-s ours) Revert "audio: prevent larger than required sleeps - DO NOT MERGE"

* commit '4b21635de017d3d28846bff3ee1856a7a7be5a83':
Revert "audio: prevent larger than required sleeps - DO NOT MERGE"
4b21635de017d3d28846bff3ee1856a7a7be5a83 16-Oct-2014 Chris Elliott <chriselliott@google.com> am b6dcdbf4: (-s ours) Revert "audio: prevent larger than required sleeps - DO NOT MERGE"

* commit 'b6dcdbf436ffacb52a41ac8ef9b07f99fd64779f':
Revert "audio: prevent larger than required sleeps - DO NOT MERGE"
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
edia/libstagefright/MPEG4Extractor.cpp
f79987663f050fee8b4739ebc9c7916242361595 16-Oct-2014 Haynes Mathew George <hgeorge@codeaurora.org> am f4c58707: am a2d4a6da: audio policy: Fix for voice call audio loss

* commit 'f4c58707b511af4c9f55c25781304172964107cb':
audio policy: Fix for voice call audio loss
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
edia/libstagefright/codecs/aacdec/SoftAAC2.cpp
36a13be056dc01fd23b6f5154f56fd72945ae448 16-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to a2d4a6dac432f0c4f543d79b9a63c55ae91f81d6
7a5a80ee971b06cdd7667cb516b57196f6d4620e 16-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 7771ebfe2457da705439b16cdb80b120a15fc619
7771ebfe2457da705439b16cdb80b120a15fc619 16-Oct-2014 Chris Elliott <chriselliott@google.com> am f1b6516f: am 05c0d7d7: am 620208dc: (-s ours) audio: prevent larger than required sleeps - DO NOT MERGE

* commit 'f1b6516f6c7a6d9c8c7230a99e389bb07f1fe383':
audio: prevent larger than required sleeps - DO NOT MERGE
b6dcdbf436ffacb52a41ac8ef9b07f99fd64779f 16-Oct-2014 Chris Elliott <chriselliott@google.com> Revert "audio: prevent larger than required sleeps - DO NOT MERGE"

Revert change if we require a build beyond P

This reverts commit 620208dc0bbd7a0792702df3ab08800fdad60cec.

Change-Id: I07f65e35dbd9f814725f50f7bb346f7b285f41aa
edia/libmedia/AudioTrack.cpp
f4c58707b511af4c9f55c25781304172964107cb 16-Oct-2014 Haynes Mathew George <hgeorge@codeaurora.org> am a2d4a6da: audio policy: Fix for voice call audio loss

* commit 'a2d4a6dac432f0c4f543d79b9a63c55ae91f81d6':
audio policy: Fix for voice call audio loss
a2d4a6dac432f0c4f543d79b9a63c55ae91f81d6 13-Oct-2014 Haynes Mathew George <hgeorge@codeaurora.org> audio policy: Fix for voice call audio loss

Audio Policy service filters out one of the create patch
commands when it finds two pending commands with the same
patch handles. Due to this routing command is not received
to audio HAL and the voice call set up fails.
Fix this by filtering create patch commands only when
they are issued on the same output.

authored-by: Karthik Reddy Katta <a_katta@codeaurora.org>

Bug: 17787282
Change-Id: If36f0ab71e9b72d6a8eb61d31f762bc5e1683b89
ervices/audiopolicy/AudioPolicyService.cpp
f1b6516f6c7a6d9c8c7230a99e389bb07f1fe383 16-Oct-2014 Chris Elliott <chriselliott@google.com> am 05c0d7d7: am 620208dc: (-s ours) audio: prevent larger than required sleeps - DO NOT MERGE

* commit '05c0d7d71be9578ad59d71f07f84e08c09e8d73a':
audio: prevent larger than required sleeps - DO NOT MERGE
219bb2d2d44befd612f15a4b893816afe1a3f8a8 16-Oct-2014 Chris Elliott <chriselliott@google.com> am 013b82a0: am 54599682: am 2feb18dd: (-s ours) Revert "audio: prevent larger than required sleeps - DO NOT MERGE"

* commit '013b82a0f9e278595d5296baa73be7cae0e68b18':
Revert "audio: prevent larger than required sleeps - DO NOT MERGE"
013b82a0f9e278595d5296baa73be7cae0e68b18 16-Oct-2014 Chris Elliott <chriselliott@google.com> am 54599682: am 2feb18dd: (-s ours) Revert "audio: prevent larger than required sleeps - DO NOT MERGE"

* commit '545996822e060b6b5421d6a0f1860d08cc5c3ce0':
Revert "audio: prevent larger than required sleeps - DO NOT MERGE"
05c0d7d71be9578ad59d71f07f84e08c09e8d73a 16-Oct-2014 Chris Elliott <chriselliott@google.com> am 620208dc: (-s ours) audio: prevent larger than required sleeps - DO NOT MERGE

* commit '620208dc0bbd7a0792702df3ab08800fdad60cec':
audio: prevent larger than required sleeps - DO NOT MERGE
620208dc0bbd7a0792702df3ab08800fdad60cec 15-Oct-2014 Chris Elliott <chriselliott@google.com> audio: prevent larger than required sleeps - DO NOT MERGE

This will be cherry picked into P build after O completes for other devices.

This reverts the revert from commit 2feb18ddfdbd20941ebcc3314780a582da5608e4.

b/17962037

From: Haynes Mathew George <hgeorge@codeaurora.org>
Date: Wed, 26 Mar 2014 16:18:42 -0700
Subject: [PATCH] AudioTrack: prevent larger than required sleeps

AudioTrackThread can end up waiting for larger than necessary
time for free space to be available in the cblk. Fix this by
waiting on the cblk futex instead of the (internal) condition variable.

Change-Id: Iba5b266f9b4082b3833f4abd52ebc6601c8e3034
edia/libmedia/AudioTrack.cpp
545996822e060b6b5421d6a0f1860d08cc5c3ce0 15-Oct-2014 Chris Elliott <chriselliott@google.com> am 2feb18dd: (-s ours) Revert "audio: prevent larger than required sleeps - DO NOT MERGE"

* commit '2feb18ddfdbd20941ebcc3314780a582da5608e4':
Revert "audio: prevent larger than required sleeps - DO NOT MERGE"
4455db00f38ce6b14c063df4382459eed607d2fc 15-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 9d2189ffcf1142b2948ce3065c32521ed7d966c4
e4903231f4875ce11decfe51f1c7d71f5a3b46f2 15-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to fc1d3da510310ce72aee8a68f103ed7096f4e9d4
2feb18ddfdbd20941ebcc3314780a582da5608e4 15-Oct-2014 Chris Elliott <chriselliott@google.com> Revert "audio: prevent larger than required sleeps - DO NOT MERGE"

This reverts commit 8c0417c173d1fd618ae54e2d721b0ec360ea70cc.

Reverting as we only wanted to include this CL the KNX01M build

Change-Id: Ib53292de658078285a38710915168e1746486fea
edia/libmedia/AudioTrack.cpp
fc1d3da510310ce72aee8a68f103ed7096f4e9d4 15-Oct-2014 Zhijun He <zhijunhe@google.com> am 62c456f0: am 9d2189ff: Merge "Camera2Client: avoid two consecutive sets of configure_streams calls" into lmp-dev

* commit '62c456f02d3f1071d18644fb3a1de354d6e4ee7f':
Camera2Client: avoid two consecutive sets of configure_streams calls
62c456f02d3f1071d18644fb3a1de354d6e4ee7f 15-Oct-2014 Zhijun He <zhijunhe@google.com> am 9d2189ff: Merge "Camera2Client: avoid two consecutive sets of configure_streams calls" into lmp-dev

* commit '9d2189ffcf1142b2948ce3065c32521ed7d966c4':
Camera2Client: avoid two consecutive sets of configure_streams calls
9d2189ffcf1142b2948ce3065c32521ed7d966c4 15-Oct-2014 Zhijun He <zhijunhe@google.com> Merge "Camera2Client: avoid two consecutive sets of configure_streams calls" into lmp-dev
fdd9850af2b418582812753d2d4964646a851ec2 15-Oct-2014 Haynes Mathew George <hgeorge@codeaurora.org> am 027aca33: am 95740336: am 8c0417c1: (-s ours) audio: prevent larger than required sleeps - DO NOT MERGE

* commit '027aca334d145d26ccd2f321ea5b74ac9d97965f':
audio: prevent larger than required sleeps - DO NOT MERGE
027aca334d145d26ccd2f321ea5b74ac9d97965f 15-Oct-2014 Haynes Mathew George <hgeorge@codeaurora.org> am 95740336: am 8c0417c1: (-s ours) audio: prevent larger than required sleeps - DO NOT MERGE

* commit '95740336c7ca5c9dc290a1eb5a193d9a91fd6c0a':
audio: prevent larger than required sleeps - DO NOT MERGE
30fa3068b8664043f26108e4f0cb88de21c425c4 15-Oct-2014 Hochi Huang <hochi.huang@mediatek.com> am f53eaf49: fix FM no sound issue

* commit 'f53eaf49df1e1e1c01708919e9e0a046543de9b6':
fix FM no sound issue
95740336c7ca5c9dc290a1eb5a193d9a91fd6c0a 15-Oct-2014 Haynes Mathew George <hgeorge@codeaurora.org> am 8c0417c1: (-s ours) audio: prevent larger than required sleeps - DO NOT MERGE

* commit '8c0417c173d1fd618ae54e2d721b0ec360ea70cc':
audio: prevent larger than required sleeps - DO NOT MERGE
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
96ff5c48a81f3f45c384113480bf5e28620a72ae 14-Oct-2014 Zhijun He <zhijunhe@google.com> Camera2Client: avoid two consecutive sets of configure_streams calls

When mediaRecorder starts without an active preview stream, Camera2Client
starts preview then immediately start recording, which could cause the second
configure_streams to call into HAL before any preview request is sent. This
could cause HAL to run into bad state. This change work around this issue
by making sure the first preview request is submitted to the HAL before
start recording.

Bug: 17915062
Change-Id: I94ae64ee76487603695a469240da601ddcb29a66
ervices/camera/libcameraservice/api1/Camera2Client.cpp
f53eaf49df1e1e1c01708919e9e0a046543de9b6 09-Oct-2014 Hochi Huang <hochi.huang@mediatek.com> fix FM no sound issue

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

Signed-off-by: Carson Liao <carson.liao@mediatek.com>

Change-Id: I0847c8a6e6d054a9258b52402c914105d902c573
ervices/audioflinger/ServiceUtilities.cpp
ervices/audioflinger/ServiceUtilities.h
ervices/audiopolicy/AudioPolicyInterfaceImpl.cpp
ervices/audiopolicy/AudioPolicyInterfaceImplLegacy.cpp
8c0417c173d1fd618ae54e2d721b0ec360ea70cc 09-Oct-2014 Haynes Mathew George <hgeorge@codeaurora.org> audio: prevent larger than required sleeps - DO NOT MERGE

b/17962037

From: Haynes Mathew George <hgeorge@codeaurora.org>
Date: Wed, 26 Mar 2014 16:18:42 -0700
Subject: [PATCH] AudioTrack: prevent larger than required sleeps

AudioTrackThread can end up waiting for larger than necessary
time for free space to be available in the cblk. Fix this by
waiting on the cblk futex instead of the (internal) condition variable.

Change-Id: I75bd14cd46f3b75afe0ea8bd9b48d7a2f95f654a
edia/libmedia/AudioTrack.cpp
e86f4be598b1d2c521e2b3fcd05101c3848e93e2 14-Oct-2014 Lajos Molnar <lajos@google.com> am 447898bc: Merge "ACodec: only check crop rect on output port" into lmp-dev

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

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

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

* commit '512e979284de984427e5b2f73b9054ae1b5e2b0a':
stagefright: support passing GraphicBuffer in metadata buffer
e0d90abca440ee5063cb9b7cf32199ef01e6dd2e 14-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 447898bca790fae2fdae304073162e980d816b79
87ff14b2f56cba242b473ea98c41a8d2ee764f4c 14-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 45b944024edde49c27371c73236276aa35ab5423
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
edia/libstagefright/codecs/avc/enc/SoftAVCEncoder.cpp
edia/libstagefright/codecs/avc/enc/SoftAVCEncoder.h
edia/libstagefright/codecs/m4v_h263/enc/SoftMPEG4Encoder.cpp
edia/libstagefright/codecs/m4v_h263/enc/SoftMPEG4Encoder.h
edia/libstagefright/codecs/on2/enc/Android.mk
edia/libstagefright/codecs/on2/enc/SoftVPXEncoder.cpp
edia/libstagefright/codecs/on2/enc/SoftVPXEncoder.h
edia/libstagefright/include/SoftVideoEncoderOMXComponent.h
edia/libstagefright/omx/Android.mk
edia/libstagefright/omx/SoftVideoEncoderOMXComponent.cpp
512e979284de984427e5b2f73b9054ae1b5e2b0a 11-Oct-2014 Lajos Molnar <lajos@google.com> stagefright: support passing GraphicBuffer in metadata buffer

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

Bug: 17653702
Change-Id: Ie0b1f92420b071a0cfcd389f5e7917a54d332541
edia/libmediaplayerservice/nuplayer/NuPlayer.cpp
edia/libmediaplayerservice/nuplayer/NuPlayer.h
edia/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp
edia/libmediaplayerservice/nuplayer/NuPlayerDriver.h
edia/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
edia/libmediaplayerservice/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
2fa84b0bbc83c2f475a4b86a2388af7423641b51 14-Oct-2014 Wei Jia <wjia@google.com> am e760de61: Merge "NuPlayerDriver: request seek notification when prepare*() is called in STOPPED state." into lmp-dev

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

* commit '801a3ff80c36aa9b55dc9b360d0e59f863011a39':
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
edia/libmediaplayerservice/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.
e39c192937df50861067b376c7ea8a58cdc68205 13-Oct-2014 Wei Jia <wjia@google.com> am 7225187b: Merge "ACodec: process deferred messages when entering Loaded state." into lmp-dev

* commit '7225187b5126b921e40f0221db158a16c366344e':
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
edia/libstagefright/ACodec.cpp
edia/libstagefright/codecs/g711/dec/SoftG711.cpp
3452ca59fdb77586eefd7f37f29f56a0ba1727bc 13-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 380757ba5c927015d403e3b97cc418413330453e
af1ab233d16fcb3147ebe775a9a68ee2610662c9 13-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 0f69763d41c101a2afcac7f10be86b41974f1279
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"
ee3f39f66580df7941be054ed3dcd6e90bfc2dfb 13-Oct-2014 Guang Zhu <guangzhu@google.com> am 380757ba: Merge "Revert "handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat"" into lmp-dev

* commit '380757ba5c927015d403e3b97cc418413330453e':
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
edia/libstagefright/ACodec.cpp
aff6fb0a9e40c475483b247ac8e83c7e055d7505 12-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 9286354c0a864ce2348cc7dfc6ca81e84a15f8e2
9ac1b8e384d619b030a0ea74d6dccf92e10670a5 12-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to d763561844c4f1c45703f25a37b8f30310060073
4d8cd7fee6fb6b30c3ef5679c1983cb0b3865097 12-Oct-2014 Dave Burke <daveburke@google.com> am fa845267: am 9286354c: Merge "Revert "audio policy: add support for ro.audio.media_deep_buffer"" into lmp-dev

* commit 'fa845267f7cb5aede69ff1f62db99e8478db170d':
Revert "audio policy: add support for ro.audio.media_deep_buffer"
fa845267f7cb5aede69ff1f62db99e8478db170d 12-Oct-2014 Dave Burke <daveburke@google.com> am 9286354c: Merge "Revert "audio policy: add support for ro.audio.media_deep_buffer"" into lmp-dev

* commit '9286354c0a864ce2348cc7dfc6ca81e84a15f8e2':
Revert "audio policy: add support for ro.audio.media_deep_buffer"
9286354c0a864ce2348cc7dfc6ca81e84a15f8e2 12-Oct-2014 Dave Burke <daveburke@google.com> Merge "Revert "audio policy: add support for ro.audio.media_deep_buffer"" into lmp-dev
f2ab2191387ce7902c730cc68314ea5fdc4a9237 11-Oct-2014 Vineeta Srivastava <vsrivastava@google.com> Revert "audio policy: add support for ro.audio.media_deep_buffer"

This reverts commit 95511add8ad4d440c67272503559f5042c4e6f1f.

Change-Id: I76a8b86790b06b08d8ca0f8d374e585f964ffba8
ervices/audiopolicy/AudioPolicyManager.cpp
ervices/audiopolicy/AudioPolicyManager.h
b01aff987393a23cf7160fabb19c14b58997ee47 11-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to d763561844c4f1c45703f25a37b8f30310060073
d5b9260d4878b126e8226e94beb91250076588a9 11-Oct-2014 Eric Laurent <elaurent@google.com> am 6337f603: am ffd5cdbd: Merge "audio policy: add support for ro.audio.media_deep_buffer" into lmp-dev

* commit '6337f6032e7bdbf0b4654fb07512a00bd33ef696':
audio policy: add support for ro.audio.media_deep_buffer
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
edia/libstagefright/ACodec.cpp
6337f6032e7bdbf0b4654fb07512a00bd33ef696 11-Oct-2014 Eric Laurent <elaurent@google.com> am ffd5cdbd: Merge "audio policy: add support for ro.audio.media_deep_buffer" into lmp-dev

* commit 'ffd5cdbd3e3faa203539e26adc755f860c8cac80':
audio policy: add support for ro.audio.media_deep_buffer
ffd5cdbd3e3faa203539e26adc755f860c8cac80 11-Oct-2014 Eric Laurent <elaurent@google.com> Merge "audio policy: add support for ro.audio.media_deep_buffer" into lmp-dev
32c7e2e9412eeb866b5b1af175ff9b05f79729be 11-Oct-2014 Eric Laurent <elaurent@google.com> am 733ee8aa: am f5ada6ed: audio policy: move intializations to onFirstRef()

* commit '733ee8aaf2a91ac98cc7cfae5b98164d3aefab2a':
audio policy: move intializations to onFirstRef()
fba182ce91b43117a452a572a72f29e4b497ea30 10-Oct-2014 Eric Laurent <elaurent@google.com> audio policy: move intializations to onFirstRef()

Bug: 17896324.

Change-Id: I3bb74f5397142ac354bd815eb362e5ddacdcb463
ervices/audiopolicy/AudioPolicyService.cpp
ervices/audiopolicy/AudioPolicyService.h
95511add8ad4d440c67272503559f5042c4e6f1f 11-Oct-2014 Eric Laurent <elaurent@google.com> audio policy: add support for ro.audio.media_deep_buffer

Bug: 17931716.
Change-Id: Ife170f20f5d02b71059fbd384bd29759fafee826
ervices/audiopolicy/AudioPolicyManager.cpp
ervices/audiopolicy/AudioPolicyManager.h
92ab9962203f72c69308b0c2a3fed0702f6e1192 11-Oct-2014 Chong Zhang <chz@google.com> am aec1dbfd: Merge "handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat" into lmp-dev

* commit 'aec1dbfd10150da3f28b64471b4dc249a58a104e':
handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat
aec1dbfd10150da3f28b64471b4dc249a58a104e 11-Oct-2014 Chong Zhang <chz@google.com> Merge "handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat" into lmp-dev
7acbabb31437bc18e01d7bd5bc515c7e08332311 10-Oct-2014 Eric Laurent <elaurent@google.com> audio policy: move intializations to onFirstRef()

Bug: 17896324.

Change-Id: I3bb74f5397142ac354bd815eb362e5ddacdcb463
ervices/audiopolicy/AudioPolicyService.cpp
ervices/audiopolicy/AudioPolicyService.h
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
733ee8aaf2a91ac98cc7cfae5b98164d3aefab2a 10-Oct-2014 Eric Laurent <elaurent@google.com> am f5ada6ed: audio policy: move intializations to onFirstRef()

* commit 'f5ada6edcc83bb1b313abcd4c4fbdc4f7724f04d':
audio policy: move intializations to onFirstRef()
f5ada6edcc83bb1b313abcd4c4fbdc4f7724f04d 10-Oct-2014 Eric Laurent <elaurent@google.com> audio policy: move intializations to onFirstRef()

Bug: 17896324.

Change-Id: I3bb74f5397142ac354bd815eb362e5ddacdcb463
ervices/audiopolicy/AudioPolicyService.cpp
ervices/audiopolicy/AudioPolicyService.h
6f559515c4edca867dbf2dbf6015e42c44ee3871 10-Oct-2014 Lajos Molnar <lajos@google.com> am a4c3d8f0: Merge "MediaCodec: fix onError and onInputBufferAvailable" into lmp-dev

* commit 'a4c3d8f0f9aab53b106d95e6139e0465908909f4':
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
edia/libstagefright/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.
9e9196fe5e962bdb997e2d9f16551999a3deb702 10-Oct-2014 Wei Jia <wjia@google.com> am 185a295d: Merge "NuPlayerRenderer: adjust anchor time correctly for video only case." into lmp-dev

* commit '185a295d4518878d5e2bca7b7c3e51df44492df1':
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
bd15f216197c1866f0a20d7a4af3eabb9edf6261 10-Oct-2014 Marco Nelissen <marcone@google.com> am feea7c3b: am af238382: Merge "Fix VideoFrame class layout for 64/32 bit" into lmp-dev

* commit 'feea7c3b8eb8917de955a20b819756eaa5ea557d':
Fix VideoFrame class layout for 64/32 bit
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
edia/libstagefright/MediaCodec.cpp
6c7fbb3fb85d437982adef0dd8f609a47d6bc631 09-Oct-2014 Marco Nelissen <marcone@google.com> Fix VideoFrame class layout for 64/32 bit

This structure is passed between 64 and 32 bit processes via shared
memory, so ensure it's the same size, and that the members we care
about are in the same place.

Bug: 17569156
Change-Id: Id776bc825af1fbf43a6dd3407cca064f6d932902
nclude/private/media/VideoFrame.h
feea7c3b8eb8917de955a20b819756eaa5ea557d 09-Oct-2014 Marco Nelissen <marcone@google.com> am af238382: Merge "Fix VideoFrame class layout for 64/32 bit" into lmp-dev

* commit 'af238382e33a027494a53556e6104b7245e7213f':
Fix VideoFrame class layout for 64/32 bit
af238382e33a027494a53556e6104b7245e7213f 09-Oct-2014 Marco Nelissen <marcone@google.com> Merge "Fix VideoFrame class layout for 64/32 bit" into lmp-dev
49966fff32b27f8821ebe280f25688b3c4f5f73f 09-Oct-2014 Wei Jia <wjia@google.com> NuPlayerRenderer: adjust anchor time correctly for video only case.

Bug: 17922171
Change-Id: I4c7e9e7f5ab96d3675d012ae30f78ef945394103
edia/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
edia/libmediaplayerservice/nuplayer/NuPlayerRenderer.h
04906863a1fa7f296ac11f07e62aa688da39c3ad 09-Oct-2014 Marco Nelissen <marcone@google.com> Fix VideoFrame class layout for 64/32 bit

This structure is passed between 64 and 32 bit processes via shared
memory, so ensure it's the same size, and that the members we care
about are in the same place.

Bug: 17569156
Change-Id: Id776bc825af1fbf43a6dd3407cca064f6d932902
nclude/private/media/VideoFrame.h
7a15279e0117506822fc933b9e6e8311e7b16b78 09-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to ce26e9d13da7a4a4443b9be775bb12fb3ac97d23
6215435b2b3f187488e14e1450d6531bda242018 09-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 58202e1d7e4d244e1d93699c840d200a6056d918
dba83c1cb1bef03bc5d1760c2639d06ff71c0fa7 08-Oct-2014 Mark Salyzyn <salyzyn@google.com> libstagefright: compile errors

Change-Id: I752d7d73f9c4939160a1ccaefc44ce1f8ffd9982
edia/libstagefright/CameraSource.cpp
edia/libstagefright/MPEG4Writer.cpp
edia/libstagefright/OMXCodec.cpp
edia/libstagefright/codecs/m4v_h263/dec/SoftMPEG4.cpp
edia/libstagefright/codecs/on2/dec/SoftVPX.cpp
7be3c19df359f3d998793d729ced59af0d259f85 08-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to ce26e9d13da7a4a4443b9be775bb12fb3ac97d23
4817dbe5cc30d7b8804f7dab0750b23ba95d87a5 08-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 58202e1d7e4d244e1d93699c840d200a6056d918
58202e1d7e4d244e1d93699c840d200a6056d918 08-Oct-2014 Eric Laurent <elaurent@google.com> am ce26e9d1: Merge "AudioTrack: fix AudioTrackThread crash upon exit" into lmp-dev

* commit 'ce26e9d13da7a4a4443b9be775bb12fb3ac97d23':
AudioTrack: fix AudioTrackThread crash upon exit
91a3cc00db31a713a25848f345bd624ac2ad8dc5 08-Oct-2014 Lajos Molnar <lajos@google.com> ACodec: only check crop rect on output port

Bug: 17789956
Change-Id: I0e17660d95ac0b3b051e7f555820188d9286571a
edia/libstagefright/ACodec.cpp
ce26e9d13da7a4a4443b9be775bb12fb3ac97d23 08-Oct-2014 Eric Laurent <elaurent@google.com> Merge "AudioTrack: fix AudioTrackThread crash upon exit" into lmp-dev
e96fced473bc98364106d975fb64728c4fd28ccc 03-Oct-2014 Andy Hung <hunga@google.com> NuPlayer: wait for renderer flush before decoder shutdown

Bug: 17679341
Change-Id: Ie3883686891e7ee6fb45ceb01af1eb60b559d3a0
edia/libmediaplayerservice/nuplayer/NuPlayer.cpp
edia/libmediaplayerservice/nuplayer/NuPlayer.h
edia/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp
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
edia/libmedia/AudioTrack.cpp
7c6977c42da29bf47e44aab55d3b2044bf9b442d 07-Oct-2014 Eric Laurent <elaurent@google.com> am 07811789: Merge "audio policy: fix build with USE_LEGACY_AUDIO_POLICY" into lmp-dev

* commit '07811789ebf31f5317403356f624d04282e666aa':
audio policy: fix build with USE_LEGACY_AUDIO_POLICY
8610f49c1a14c91550c8abde27bda59ac6526b23 07-Oct-2014 Eric Laurent <elaurent@google.com> am 5bee844f: Merge "audio policy: fix lockup during mediaserver restart" into lmp-dev

* commit '5bee844fd8c2f6d9fa78ed5e063a8e3df9f2f7b6':
audio policy: fix lockup during mediaserver restart
07811789ebf31f5317403356f624d04282e666aa 07-Oct-2014 Eric Laurent <elaurent@google.com> Merge "audio policy: fix build with USE_LEGACY_AUDIO_POLICY" into lmp-dev
5bee844fd8c2f6d9fa78ed5e063a8e3df9f2f7b6 07-Oct-2014 Eric Laurent <elaurent@google.com> Merge "audio policy: fix lockup during mediaserver restart" into lmp-dev
595a5c7062c2d7b6cee4251e5e50766ca166f103 07-Oct-2014 Andy Hung <hunga@google.com> am 73d0a798: Merge "NuPlayer: wait for renderer flush before decoder shutdown" into lmp-dev

* commit '73d0a798747c8d022e8a9c8cf4e284ac97508b1e':
NuPlayer: wait for renderer flush before decoder shutdown
73d0a798747c8d022e8a9c8cf4e284ac97508b1e 07-Oct-2014 Andy Hung <hunga@google.com> Merge "NuPlayer: wait for renderer flush before decoder shutdown" into lmp-dev
a130edc34859cc27b258de865551b1b62b920e5c 07-Oct-2014 Marco Nelissen <marcone@google.com> am 5002d02e: Merge "Recover from errors" into lmp-dev

* commit '5002d02e545dafbcf129b2e5bccf087e765019e5':
Recover from errors
5002d02e545dafbcf129b2e5bccf087e765019e5 07-Oct-2014 Marco Nelissen <marcone@google.com> Merge "Recover from errors" into lmp-dev
f380677f21240ffb78bcdf7c804fe0a7807fb08d 07-Oct-2014 Eric Laurent <elaurent@google.com> audio policy: fix build with USE_LEGACY_AUDIO_POLICY

Bug: 17894512.
Change-Id: I6431c0b03ba02cf561413c34848a334caa0261fa
ervices/audiopolicy/AudioPolicyClientImplLegacy.cpp
ervices/audiopolicy/AudioPolicyInterfaceImplLegacy.cpp
8b1e80bf1e9f214feea219cfe981ba533b806003 07-Oct-2014 Eric Laurent <elaurent@google.com> audio policy: fix lockup during mediaserver restart

When pre or post processing effects are applied by audio policy service
automatically there is a potential lockup if the first call into
AudioPolicyService is made while creating one of those effects.
This is because effects are created with AudioPolicyService mutex held and
effect creation calls into methods (e.g registerClient()) which also acquire
the mutex.

The fix consists in adding a new mutex to AudioPolicyEffects class and not
hold the AudioPolicyService mutex when calling methods in of class.

Bug: 17830596.
Change-Id: Ie61c3671d3147f46e99ba208f39c1a3bf180779f
ervices/audiopolicy/AudioPolicyEffects.cpp
ervices/audiopolicy/AudioPolicyEffects.h
ervices/audiopolicy/AudioPolicyInterfaceImpl.cpp
ervices/audiopolicy/AudioPolicyInterfaceImplLegacy.cpp
ervices/audiopolicy/AudioPolicyService.cpp
42fc04ff4db20f2de12834818a73778ec9ede052 07-Oct-2014 Rachad <rachad@google.com> am 584c14c3: Merge "stagefright: do not allocate output buffers for tunneled playback" into lmp-dev

* commit '584c14c370f141685b7e8963a13ed91584383ca1':
stagefright: do not allocate output buffers for tunneled playback
bab133a59454c75d4f2f5e813bb6d05dbd7457e9 07-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 584c14c370f141685b7e8963a13ed91584383ca1
ccd9df00db4848a66484b37a0383a5d6a50c1051 07-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 1318a60824c4f787e54fbbc8a388c6be5146f220
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
edia/libstagefright/codecs/aacdec/SoftAAC2.cpp
1318a60824c4f787e54fbbc8a388c6be5146f220 06-Oct-2014 Chong Zhang <chz@google.com> am e48b90d6: Merge "StageFrightRecorder: Enable meta-data mode for VP8 hardware encoder." into lmp-dev

* commit 'e48b90d634f9e6190a788e6225927d418b11d162':
StageFrightRecorder: Enable meta-data mode for VP8 hardware encoder.
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
edia/libmediaplayerservice/StagefrightRecorder.cpp
8d121d41f5355b78b687f44e8d4aae4de2aa0359 03-Oct-2014 Andy Hung <hunga@google.com> NuPlayer: wait for renderer flush before decoder shutdown

Bug: 17679341
Change-Id: Ie3883686891e7ee6fb45ceb01af1eb60b559d3a0
edia/libmediaplayerservice/nuplayer/NuPlayer.cpp
edia/libmediaplayerservice/nuplayer/NuPlayer.h
edia/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp
658937e7a61957de6d40d3e46f80c076e891a4ce 06-Oct-2014 Ronghua Wu <ronghuawu@google.com> am c4da004d: Merge "NuPlayer: add audioDecoderStillNeeded." into lmp-dev

* commit 'c4da004d4baef8cc4a631058549216c8d2383824':
NuPlayer: add audioDecoderStillNeeded.
c4da004d4baef8cc4a631058549216c8d2383824 06-Oct-2014 Ronghua Wu <ronghuawu@google.com> Merge "NuPlayer: add audioDecoderStillNeeded." into lmp-dev
cb41d79f2c8805b993045776a4e313be09dbc1e5 06-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to f0011d49c0f08753dc2dc254c5a70885a9986602
4ee5bd796afbcaaa0a1c6d314ec05c8ed2ed20f4 06-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to dfc2a8f8a7d5062ecb2af4b940e54c3ce52795e3
44909d8584e01760c5779f88f510875a57090cbc 05-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to f0011d49c0f08753dc2dc254c5a70885a9986602
b285b95fceb4f63d0e5158602c04fe5d18d53651 05-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to dfc2a8f8a7d5062ecb2af4b940e54c3ce52795e3
a63654cf83a73d6463d243ffc56046163263a6fd 04-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to dfc2a8f8a7d5062ecb2af4b940e54c3ce52795e3
dfc2a8f8a7d5062ecb2af4b940e54c3ce52795e3 04-Oct-2014 Chong Zhang <chz@google.com> am f0011d49: Merge "MediaRecorder: only dequeue available buffers from MediaCodec" into lmp-dev

* commit 'f0011d49c0f08753dc2dc254c5a70885a9986602':
MediaRecorder: only dequeue available buffers from MediaCodec
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
edia/libmediaplayerservice/nuplayer/NuPlayer.cpp
edia/libmediaplayerservice/nuplayer/NuPlayer.h
23fe3c0a05fcb619eeb5b0c2ece02cdadab2df6e 03-Oct-2014 Hochi Huang <hochi.huang@mediatek.com> [AU] Import gain setting into ports

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

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

Change-Id: I415d0b494b9bfadf783280aeea6ad46e0a242cfb
ervices/audiopolicy/AudioPolicyManager.cpp
f2a64852a4a48c5a3d8a08ffcda20d6884586672 04-Oct-2014 Chong Zhang <chz@google.com> MediaRecorder: only dequeue available buffers from MediaCodec

Bug: 17514968
Change-Id: If232f92d163deb2440b927315c69e0c4d51ca290
nclude/media/stagefright/MediaCodecSource.h
edia/libstagefright/MediaCodecSource.cpp
acc8918e034e4715319f388f2c214118671aa674 03-Oct-2014 Ronghua Wu <ronghuawu@google.com> am af1a4dc9: Merge "NuPlayer: don\'t restart AudioSink when torn down due to pause timeout." into lmp-dev

* commit 'af1a4dc989d6707116eaefab300ad55124aace66':
NuPlayer: don't restart AudioSink when torn down due to pause timeout.
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
edia/libmediaplayerservice/nuplayer/NuPlayer.cpp
edia/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
edia/libmediaplayerservice/nuplayer/NuPlayerRenderer.h
10b464cf2a193f1a5d4b70db052d36eee227916e 03-Oct-2014 Eric Laurent <elaurent@google.com> am 2b217bb3: Merge "audioflinger: fix pre processing transfer between record threads." into lmp-dev

* commit '2b217bb3aee87ce8486014f261c0f498f6209e80':
audioflinger: fix pre processing transfer between record threads.
2b217bb3aee87ce8486014f261c0f498f6209e80 03-Oct-2014 Eric Laurent <elaurent@google.com> Merge "audioflinger: fix pre processing transfer between record threads." into lmp-dev
6427cf119ca2c32bc39731768c91b408f1e666b6 28-Sep-2014 Glenn Kasten <gkasten@google.com> Fix uncertainty of one normal mix buffer in AudioTrack::getTimestamp

The per-thread timestamp latch was not synchronized with the per-track
released frames. Now the value of each track's released frames is
latched along with the timestamp.

Bug: 17531839
Bug: 17669342
Change-Id: I9d50c8c6a5de55a3f4561ac40e20d497376c1257
ervices/audioflinger/Threads.cpp
ervices/audioflinger/Threads.h
ervices/audioflinger/Tracks.cpp
c4fd8b3b7fc24932626143ea45ab75192cc247c2 03-Oct-2014 Ronghua Wu <ronghuawu@google.com> am b220fe0e: Merge "stagefright: fix fake-stride handling for H263 SW decoder" into lmp-dev

* commit 'b220fe0e40bc3752b62a9576fc824634a16fc3ab':
stagefright: fix fake-stride handling for H263 SW decoder
3a8bad2ed0b463d1401c33b92ff30951fc0df3a4 03-Oct-2014 Glenn Kasten <gkasten@google.com> am be9ebd46: Merge "Fix uncertainty of one normal mix buffer in AudioTrack::getTimestamp" into lmp-dev

* commit 'be9ebd46c1ec366dca5f142a36a71015b048c037':
Fix uncertainty of one normal mix buffer in AudioTrack::getTimestamp
b220fe0e40bc3752b62a9576fc824634a16fc3ab 03-Oct-2014 Ronghua Wu <ronghuawu@google.com> Merge "stagefright: fix fake-stride handling for H263 SW decoder" into lmp-dev
be9ebd46c1ec366dca5f142a36a71015b048c037 03-Oct-2014 Glenn Kasten <gkasten@google.com> Merge "Fix uncertainty of one normal mix buffer in AudioTrack::getTimestamp" into lmp-dev
e8d964e560b09eeef538629bf0b832b52f961e7a 30-Sep-2014 Chong Zhang <chz@google.com> send available codec buffer count with codec notification

Bug: 14679336
Change-Id: Id927c96a9a14dd6ecd72540f0037d5841aa32154
edia/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp
edia/libstagefright/MediaCodec.cpp
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
edia/libstagefright/codecs/m4v_h263/dec/SoftMPEG4.cpp
edia/libstagefright/omx/SoftVideoDecoderOMXComponent.cpp
1b92868010b5c1409692a86f6b27e4a265b64c1a 03-Oct-2014 Eric Laurent <elaurent@google.com> audioflinger: fix pre processing transfer between record threads.

Fix two problems remaining with pre processing effects transfer from
one record thread to the next in case of tear down due to device connection:
1 - the enabled state of the effects was not communicated to the new HAL
input stream.
2 - the effects saved in orphan chains list were not transfered to the
new thread when a AudioRecord was created.

Bug: 17757378.
Change-Id: I0923c98470db3b51154dc89846157780a4c21e86
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/Effects.cpp
ervices/audioflinger/Effects.h
ervices/audioflinger/Threads.cpp
f0d98899b13c2f5735f1a2b8d0b7254b975b7860 03-Oct-2014 Chong Zhang <chz@google.com> am aaa527fb: Merge "send available codec buffer count with codec notification" into lmp-dev

* commit 'aaa527fbd790d30353d15608e54b5b94625b7b6d':
send available codec buffer count with codec notification
aaa527fbd790d30353d15608e54b5b94625b7b6d 03-Oct-2014 Chong Zhang <chz@google.com> Merge "send available codec buffer count with codec notification" into lmp-dev
ccecc29f64a537a8136642761e6357ff240e835d 02-Oct-2014 Lajos Molnar <lajos@google.com> mediarecorder: set level if setting default profile

Bug: 17676461
Change-Id: If01ccd09935945d330de0842be95c3544951b6b9
nclude/media/stagefright/ACodec.h
edia/libmediaplayerservice/StagefrightRecorder.cpp
edia/libstagefright/ACodec.cpp
19da73b940a2648f05628f430068af2c6d1c2951 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
nclude/media/stagefright/foundation/AUtils.h
edia/libmediaplayerservice/VideoFrameScheduler.cpp
edia/libstagefright/tests/Android.mk
edia/libstagefright/tests/Utils_test.cpp
4c053ea158b29fa2cdd4c6f39d3c8da4ee5a7a02 28-Sep-2014 Glenn Kasten <gkasten@google.com> Fix uncertainty of one normal mix buffer in AudioTrack::getTimestamp

The per-thread timestamp latch was not synchronized with the per-track
released frames. Now the value of each track's released frames is
latched along with the timestamp.

Bug: 17531839
Bug: 17669342
Change-Id: I9d50c8c6a5de55a3f4561ac40e20d497376c1257
ervices/audioflinger/Threads.cpp
ervices/audioflinger/Threads.h
ervices/audioflinger/Tracks.cpp
2e74aefdc1e77e6623bd869fb94eba1e1a7eeb0c 03-Oct-2014 Lajos Molnar <lajos@google.com> am fc93499e: Merge "mediarecorder: set level if setting default profile" into lmp-dev

* commit 'fc93499e83403d5959693efa040cb29fd6825abb':
mediarecorder: set level if setting default profile
fc93499e83403d5959693efa040cb29fd6825abb 03-Oct-2014 Lajos Molnar <lajos@google.com> Merge "mediarecorder: set level if setting default profile" into lmp-dev
86c541dc3ce6c5af1d0b9dc051f804e03d2c7424 03-Oct-2014 Wei Jia <wjia@google.com> am 6eff943c: Merge "NuPlayerDecoder: postpone input message processing when it\'s not dequeued." into lmp-dev

* commit '6eff943c133903fcd9bdb7bb1812d7b383b090f8':
NuPlayerDecoder: postpone input message processing when it's not dequeued.
6eff943c133903fcd9bdb7bb1812d7b383b090f8 03-Oct-2014 Wei Jia <wjia@google.com> Merge "NuPlayerDecoder: postpone input message processing when it's not dequeued." into lmp-dev
55fc6a77f5c6e26627098dc5257fcf9b605967ef 03-Oct-2014 Lajos Molnar <lajos@google.com> am 8b76b592: Merge "stagefright: move math templates into AUtils.h" into lmp-dev

* commit '8b76b592be5bc162fb5a6d7e8c47812544b6b345':
stagefright: move math templates into AUtils.h
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
edia/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp
edia/libstagefright/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
edia/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp
edia/libmediaplayerservice/nuplayer/NuPlayerDecoder.h
3e15aea623a4c7a21719e4a947e72ff5c23494f6 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
edia/libmediaplayerservice/nuplayer/GenericSource.cpp
edia/libmediaplayerservice/nuplayer/GenericSource.h
edia/libmediaplayerservice/nuplayer/NuPlayer.cpp
edia/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp
edia/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp
edia/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
a147b4f91143d9f2fb608e22f9fca14bbd029573 02-Oct-2014 Lajos Molnar <lajos@google.com> mediarecorder: set level if setting default profile

Bug: 17676461
Change-Id: If01ccd09935945d330de0842be95c3544951b6b9
nclude/media/stagefright/ACodec.h
edia/libmediaplayerservice/StagefrightRecorder.cpp
edia/libstagefright/ACodec.cpp
cfe3ba6be87f8a82f0819111029bfa5111219b32 02-Oct-2014 Andy Hung <hunga@google.com> am d8b03abf: Merge "NuPlayer: Fix flush mode decoder error handling" into lmp-dev

* commit 'd8b03abf1d003e2940a19f0071ea2892689dd10e':
NuPlayer: Fix flush mode decoder error handling
d8b03abf1d003e2940a19f0071ea2892689dd10e 02-Oct-2014 Andy Hung <hunga@google.com> Merge "NuPlayer: Fix flush mode decoder error handling" into lmp-dev
f6cb9de0bd000aeefe86b177fb92a8bd8ccb768a 02-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 79e687edb9bd7e2fcc60e06dd779f98c75511045
f5c4e438067f82861db80217de4e1e682257d64b 02-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 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
nclude/media/stagefright/foundation/AUtils.h
edia/libmediaplayerservice/VideoFrameScheduler.cpp
edia/libstagefright/tests/Android.mk
edia/libstagefright/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
edia/libmediaplayerservice/nuplayer/GenericSource.cpp
edia/libmediaplayerservice/nuplayer/GenericSource.h
edia/libmediaplayerservice/nuplayer/NuPlayer.cpp
edia/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp
edia/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp
edia/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
d10ec42cdfffae6a39f3ba1e538152de85998713 02-Oct-2014 Ruben Brunk <rubenbrunk@google.com> am f916667a: Merge "camera2: Force DNG previews to render with LSC map." into lmp-dev

* commit 'f916667a017a5a6763afc4808344778570312d5a':
camera2: Force DNG previews to render with LSC map.
f916667a017a5a6763afc4808344778570312d5a 02-Oct-2014 Ruben Brunk <rubenbrunk@google.com> Merge "camera2: Force DNG previews to render with LSC map." into lmp-dev
92a69cde5f53a916c8c26a64d0dd610284161555 02-Oct-2014 Eric Laurent <elaurent@google.com> am cb4b6e9f: audioflinger: fix failure to indicate volume to effect

* commit 'cb4b6e9f05d1c0b3fcc5be5ebe3f7d6f32669b1a':
audioflinger: fix failure to indicate volume to effect
6753e396a7eada4ec8b2aca7e2e78a7da5fbb070 02-Oct-2014 Glenn Kasten <gkasten@google.com> Revert "Fix uncertainty of one normal mix buffer in AudioTrack::getTimestamp"

This reverts commit 54464ba861aaafd11ee5645f5d1ecd1171c6e9fe.

Bug: 17733142.

Change-Id: I9886d40032b2f7d96bee03e600e14f78943d8052
ervices/audioflinger/Threads.cpp
ervices/audioflinger/Threads.h
ervices/audioflinger/Tracks.cpp
cb4b6e9f05d1c0b3fcc5be5ebe3f7d6f32669b1a 01-Oct-2014 Eric Laurent <elaurent@google.com> audioflinger: fix failure to indicate volume to effect

If an effect is added and enabled after a track is started
it will not receive current volume information because volume
is indicated only to active effects and if there is a volume change.

Add a flag to force EffectChain::setVolume_l() to pass volume indication
to all effects each time an effect is enabled.

Bug: 17572556.

Change-Id: I6b68488c9aca8b2095fb210aa124d02e4f759660
ervices/audioflinger/Effects.cpp
ervices/audioflinger/Effects.h
e5095be17c623de8e4b97829d33e8a16b1b7164a 02-Oct-2014 Glenn Kasten <gkasten@google.com> am a49c94ea: Merge "Revert "Fix uncertainty of one normal mix buffer in AudioTrack::getTimestamp"" into lmp-dev

* commit 'a49c94ea49c8329a1bdefe980e1f7d335c0d1ec5':
Revert "Fix uncertainty of one normal mix buffer in AudioTrack::getTimestamp"
a49c94ea49c8329a1bdefe980e1f7d335c0d1ec5 02-Oct-2014 Glenn Kasten <gkasten@google.com> Merge "Revert "Fix uncertainty of one normal mix buffer in AudioTrack::getTimestamp"" into lmp-dev
6954127b7ace022677ac407ff943c2793f8a11be 02-Oct-2014 Glenn Kasten <gkasten@google.com> Revert "Fix uncertainty of one normal mix buffer in AudioTrack::getTimestamp"

This reverts commit 54464ba861aaafd11ee5645f5d1ecd1171c6e9fe.

Bug: 17733142.

Change-Id: I9886d40032b2f7d96bee03e600e14f78943d8052
ervices/audioflinger/Threads.cpp
ervices/audioflinger/Threads.h
ervices/audioflinger/Tracks.cpp
9e9b3f5adf97cc37024d2a1b7aafe9495a432c29 29-Sep-2014 Robert Shih <robertshih@google.com> GenericSource: support disconnect before NuCachedSource2 is created

Bug: 17672488
Change-Id: I96776c9679fdcfbe9a442c86447c59802b1465ac
nclude/media/stagefright/DataSource.h
edia/libmediaplayerservice/nuplayer/GenericSource.cpp
edia/libmediaplayerservice/nuplayer/GenericSource.h
edia/libstagefright/DataSource.cpp
52cb10c4d794e5041e04f20d716aac82c325b06b 01-Oct-2014 Chong Zhang <chz@google.com> am d0b9efe7: Merge "add AAC audio decoder params for PCM limiter enable" into lmp-dev

* commit 'd0b9efe7d8300e48f7a99c1dd746d60060206b3c':
add AAC audio decoder params for PCM limiter enable
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
edia/img_utils/src/DngUtils.cpp
8359c43a8261ee2cc1f8580f5722975d952421c9 01-Oct-2014 Robert Shih <robertshih@google.com> am 3af67d03: Merge "GenericSource: support disconnect before NuCachedSource2 is created" into lmp-dev

* commit '3af67d03bbc30c368821caf8b74ae7fb91ee7db7': (32 commits)
GenericSource: support disconnect before NuCachedSource2 is created
Camera1 shim: If there's no flash, the keys need to be null.
NuCachedSource2: more fixes for source read hang
NuPlayer: change assert to conditional check.
Camera2Client: log an error when autoFocus is called in wrong state
NuPlayer: use generation to filter out stale message from renderer.
MediaBuffer: ABuffer will release MediaBuffer when it's destructed.
AudioEffect acquires session
Add support for ANDROID_LOOP to NuPlayer
StagefrightRecorder: default to codec and fps from camcorder low profile
AudioPolicyManager: Use "safe" speaker for notifications if available
mediaplayer: release MediaBuffer in stale input buffers
NuPlayerDriver: do not set to paused state when receiving playback complete and reset is in progress.
Revert "Fix AAC timestamps for multiple aac frames per input buffer"
fix failure in MediaCodecTest#testException
mediaplayer: limit number of outstanding buffer requests
NuPlayer: make previous decoders obsolete when reset is done.
NuPlayer::Renderer::onPause() - Converted CHECK(!mPaused) to a warning.
NuPlayer: check mSource before deferencing it.
Move stale handler cleanup to constructor
...
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
nclude/media/stagefright/DataSource.h
edia/libmediaplayerservice/nuplayer/GenericSource.cpp
edia/libmediaplayerservice/nuplayer/GenericSource.h
edia/libstagefright/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
nclude/media/stagefright/ACodec.h
edia/libstagefright/ACodec.cpp
edia/libstagefright/codecs/aacdec/SoftAAC2.cpp
79e687edb9bd7e2fcc60e06dd779f98c75511045 01-Oct-2014 Nicholas Sauer <nicksauer@google.com> Merge "[AU] Update volume setting and Audio Device API 3.0" into lmp-sprout-dev
844f73b5e4b61f65bbe601a74085ebbfa91f95bb 01-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 1f4b162e0bee6bcb0c9de464087db286270f5525
ae2cd4897b39fcb86308313def9d9c05ab233587 01-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 4379c03433e4613c417998ca7917059ef17dc3a9
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
edia/libstagefright/NuCachedSource2.cpp
c06cf18e5933cfddddfe86df85b72e1d5f7fcdde 01-Oct-2014 Marco Nelissen <marcone@google.com> Merge "Check if info for uri is available" into lmp-dev
c33a7d4e5e6886e1ef1559e9834784c2425ec510 30-Sep-2014 Lajos Molnar <lajos@google.com> mediaplayer: make frame-accurate avsync configurable

disable by default

Bug: 17686015
Change-Id: I3961b1bc9c6d48afc8c5f7f5270528ea6341bc60
edia/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
6300cbe99899da0103c910ba6a35c785261ce433 30-Sep-2014 Marco Nelissen <marcone@google.com> Check if info for uri is available

before retrieving it.

Bug: 17683986
Change-Id: I7a44cd06faf11c22be2ed5ace8ab6e2a5513b66c
edia/libstagefright/httplive/LiveSession.cpp
327cb70dcbf3a1f1679aeafaaa62d8532abea86d 21-Sep-2014 Hochi Huang <hochi.huang@mediatek.com> [AU] Update volume setting and Audio Device API 3.0

Signed-off-by: Hochi Huang <hochi.huang@mediatek.com>
Review: https://partner-android-review.git.corp.google.com/#/c/182522

Change-Id: Ida2dfedc6eaa3204354cdc182e0ee13a35472661
ervices/audiopolicy/AudioPolicyManager.cpp
ervices/audiopolicy/AudioPolicyManager.h
41b9ef26fba6dc2e97c33e4db19c400b1b5d6c38 30-Sep-2014 Lajos Molnar <lajos@google.com> Merge "mediaplayer: make frame-accurate avsync configurable" into lmp-dev
992626cfe4852f1a2b46ea226b19c2eaa5dcfb89 30-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 955e24d3a8e218d4711cabc6558781e095011132
8d5b069df77894da42e2680bd241ab1836786f94 30-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to a67ced9746e6f0d4e03ff8007682091afea71f6c
955e24d3a8e218d4711cabc6558781e095011132 30-Sep-2014 Glenn Kasten <gkasten@google.com> Merge "Fix uncertainty of one normal mix buffer in AudioTrack::getTimestamp" into lmp-dev
6c7ae72f0eccf456744474785afd25f9e205881c 30-Sep-2014 Eric Laurent <elaurent@google.com> Merge "audio policy: fix HW A/V sync output selection" into lmp-dev
f71224ce266abb39f83ecba87783c2347631654a 30-Sep-2014 Eric Laurent <elaurent@google.com> Merge "audioflinger: forward flush to direct output streams" into lmp-dev
54464ba861aaafd11ee5645f5d1ecd1171c6e9fe 28-Sep-2014 Glenn Kasten <gkasten@google.com> Fix uncertainty of one normal mix buffer in AudioTrack::getTimestamp

The per-thread timestamp latch was not synchronized with the per-track
released frames. Now the value of each track's released frames is
latched along with the timestamp.

Bug: 17531839
Bug: 17669342
Change-Id: I96252782911bd42a2534cc4030521b7eeb99a7b9
ervices/audioflinger/Threads.cpp
ervices/audioflinger/Threads.h
ervices/audioflinger/Tracks.cpp
c260784e37dea73a2090d4ccd91472d61d3b6230 29-Sep-2014 Eric Laurent <elaurent@google.com> audio policy: fix HW A/V sync output selection

commit b732cf5a broke the selection mechanism for the
HW A/V sync direct output.
Add a rule to only select a mixed output for basic PCM
stereo content when a direct output is not explicitly requested.

Bug: 17702382.

Change-Id: I1387690ace77cd4d6a8faf0b525c3d1008fba3f1
ervices/audiopolicy/AudioPolicyManager.cpp
e659ef420dae0caae84ab78f9df8952acb9ad3a0 29-Sep-2014 Eric Laurent <elaurent@google.com> audioflinger: forward flush to direct output streams

Track flush should be forwarded to the audio HAL when playing
on a direct output stream.

Bug: 17704953.
Change-Id: Iafc94327fe9aebf1d4eaa97b76c6767b7ac5babe
ervices/audioflinger/Threads.cpp
ervices/audioflinger/Threads.h
ervices/audioflinger/Tracks.cpp
274084f7bfd3f6bdf5a55cf16ceefed345aa0060 30-Sep-2014 Lajos Molnar <lajos@google.com> mediaplayer: make frame-accurate avsync configurable

disable by default

Bug: 17686015
Change-Id: I3961b1bc9c6d48afc8c5f7f5270528ea6341bc60
edia/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
c8c05d6a5821dd56209e160066314a03d2f2ca06 30-Sep-2014 Eino-Ville Talvala <etalvala@google.com> Merge "CameraService: API1: Reallocate JPEG ashmem heap if size changes" into lmp-dev
2d077d0acdbb26eeb1357489c999ec875f6ce297 29-Sep-2014 Eino-Ville Talvala <etalvala@google.com> CameraService: API1: Reallocate JPEG ashmem heap if size changes

Bug: 17682603
Change-Id: I7cba3365d00c33cf4267b1b59a94bd7d0bba08df
ervices/camera/libcameraservice/api1/client2/JpegProcessor.cpp
4379c03433e4613c417998ca7917059ef17dc3a9 29-Sep-2014 Glenn Kasten <gkasten@google.com> Merge "Fix tee sink" into lmp-dev
12d990ba4370633327af91184ba6bf466598c45a 29-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to dc2e6ddc933e40632e79a866d9ece870db1a975e
c4e55307a72efe1e864fe6b354b28823436738ab 29-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to a67ced9746e6f0d4e03ff8007682091afea71f6c
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
nclude/media/stagefright/ACodec.h
edia/libstagefright/ACodec.cpp
ba0b34c18da93681c0813ecdab19b0e215b6d261 28-Sep-2014 Glenn Kasten <gkasten@google.com> Fix tee sink

Note: this does not fix the bug below, but it helps to investigate the bug.

Bug: 17578238
Change-Id: I0fd27a477b73ba0e1c5a658bdfad17c500f5dc67
ervices/audioflinger/Threads.cpp
dc2e6ddc933e40632e79a866d9ece870db1a975e 26-Sep-2014 Eino-Ville Talvala <etalvala@google.com> Camera2Client: Revert HALv2 device behavior back to MR2

- Do not idle device before video snapshot stream configuration, to
avoid deadlock during waiting.
- Do not tear down ZSL stream
- Don't refresh ZSL stream after deletion was requested.
The v2 HAL implementations really don't like the ZSL stream being
touched ever.

Bug: 17634430
Bug: 17628507

Change-Id: I36b44a395e697be9802c4bd917a82b77c8d04be2
ervices/camera/libcameraservice/api1/Camera2Client.cpp
ervices/camera/libcameraservice/api1/client2/ZslProcessor.cpp
b3b248cf27fbc41b33734bb1605ec5c93bcc2ece 28-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to a67ced9746e6f0d4e03ff8007682091afea71f6c
7cc190e27910b57a4176fb8482ce0960e983fa0d 28-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to a67ced9746e6f0d4e03ff8007682091afea71f6c
a67ced9746e6f0d4e03ff8007682091afea71f6c 28-Sep-2014 Eino-Ville Talvala <etalvala@google.com> Merge "CameraService: API1: Fix flash mode" into lmp-dev
248f9ce1b6052889dd55e7701f908477d16d6ff4 27-Sep-2014 Eino-Ville Talvala <etalvala@google.com> CameraService: API1: Fix flash mode

Sometimes it's useful to ensure variables are initialized in
all code paths.

Bug: 17680416
Change-Id: I9bed8a3bcb94417384bf0551fe1c0eee6cc49577
ervices/camera/libcameraservice/api1/client2/Parameters.cpp
7071505a78501ea3960ca909932b61f9f225eaa9 27-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to a8a4eeb95988e6bb73f7a742c8dd238c1f96c5c4
a8a4eeb95988e6bb73f7a742c8dd238c1f96c5c4 27-Sep-2014 Eric Laurent <elaurent@google.com> Merge "audio policy: favor mixed over direct output for PCM format" into lmp-dev
b732cf5af93c33fa183769210ce9954521fb68cd 25-Sep-2014 Eric Laurent <elaurent@google.com> audio policy: favor mixed over direct output for PCM format

modify getOutputForDevice() to skip direct output selection
if the request can obviously be attached to a mixed output
This prevents from selecting a direct output profile that
can manage stereo PCM format if a mixer output is available
to reach the same device.

Bug: 17628413.
Change-Id: I02e9a0b02c9ae5f44ff5768ac4ed02ce84d521c5
ervices/audiopolicy/AudioPolicyManager.cpp
504de531a08facd130fa00f64fdc00521a975175 27-Sep-2014 Eric Laurent <elaurent@google.com> Merge "audio: fix stream type for accessibility usage" into lmp-dev
85ea794c06e4ee8f9eaa03cb54ace3fd30cc5b34 25-Sep-2014 Eino-Ville Talvala <etalvala@google.com> Camera1 shim: If there's no flash, the keys need to be null.

Previously, we set FLASH_MODE_OFF for FLASH_MODE when a flash unit
isn't available. However, per the API documentation, the key has to
be null instead.

- Make sure that the flash mode and supported flash mode keys are null
if there's no flash unit on start
- Don't set flash mode in later setParameters calls if there is no
flash unit
- Map NULL value for flash mode key to FLASH_MODE_OFF for internal
consistency.

Bug: 17660716
Change-Id: I3033682f0b882b8c2004114e2afef31662caebda
ervices/camera/libcameraservice/api1/client2/Parameters.cpp
5f5d0544454f062c1f37acad1a72d8c47b4a32b2 26-Sep-2014 Eino-Ville Talvala <etalvala@google.com> Merge "Camera1 shim: If there's no flash, the keys need to be null." 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
nclude/media/AudioSystem.h
nclude/media/IAudioPolicyService.h
edia/libmedia/AudioSystem.cpp
edia/libmedia/AudioTrack.cpp
edia/libmedia/IAudioPolicyService.cpp
ervices/audiopolicy/AudioPolicyInterfaceImpl.cpp
ervices/audiopolicy/AudioPolicyInterfaceImplLegacy.cpp
ervices/audiopolicy/AudioPolicyService.cpp
ervices/audiopolicy/AudioPolicyService.h
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
edia/libmediaplayerservice/nuplayer/NuPlayer.cpp
ea55da9434f674efaacaa443c97a411bdef4ff1a 26-Sep-2014 Marco Nelissen <marcone@google.com> Merge "Fix SoftAAC2 flush" into lmp-dev
b5bd1df2d6c78f8db5e7f6b416353ca8a93b7119 25-Sep-2014 Eino-Ville Talvala <etalvala@google.com> Camera1 shim: If there's no flash, the keys need to be null.

Previously, we set FLASH_MODE_OFF for FLASH_MODE when a flash unit
isn't available. However, per the API documentation, the key has to
be null instead.

- Make sure that the flash mode and supported flash mode keys are null
if there's no flash unit on start
- Don't set flash mode in later setParameters calls if there is no
flash unit
- Map NULL value for flash mode key to FLASH_MODE_OFF for internal
consistency.

Bug: 17660716
Change-Id: I3033682f0b882b8c2004114e2afef31662caebda
ervices/camera/libcameraservice/api1/client2/Parameters.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
edia/libstagefright/codecs/aacdec/SoftAAC2.cpp
e0711f2651121754a10c784e3b149024d17fa4d5 18-Aug-2014 Ruchit Sharma <ruchits@nvidia.com> camera: add traces for KPI measurement

Bug: 17658101
Change-Id: I1d8035c4a8fba7b88a87f205ce57c13d812e9df5
ervices/camera/libcameraservice/device3/Camera3OutputStream.cpp
ervices/camera/libcameraservice/device3/Camera3OutputStream.h
a21b654eaed87e87eab4cf2596a420675ab4c6e1 25-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to c0d17e349901c3ccf6d15b7dcdf7fa30139c9750
8f4e34dbe5c6f9aae81d48e4cb03a960a20e943e 25-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 846202f5483c30ff380fc997c7d4461cce090098
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
edia/libstagefright/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
edia/libmediaplayerservice/nuplayer/NuPlayer.cpp
edia/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp
edia/libstagefright/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
edia/libmediaplayerservice/VideoFrameScheduler.cpp
edia/libmediaplayerservice/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
edia/libstagefright/codecs/m4v_h263/dec/SoftMPEG4.cpp
edia/libstagefright/codecs/on2/h264dec/SoftAVC.cpp
edia/libstagefright/codecs/on2/h264dec/SoftAVC.h
edia/libstagefright/include/SoftVideoDecoderOMXComponent.h
edia/libstagefright/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
edia/libstagefright/omx/SoftVideoDecoderOMXComponent.cpp
4923cee4fb3b29538d8f46bceeea7d5128242a71 24-Sep-2014 Wei Jia <wjia@google.com> NuPlayerDecoder: release MediaBuffers when decoder is deleted.

Bug: 17454455
Change-Id: Ic984c74826f87f5f3c27756a7e7d52295a529bed
edia/libmediaplayerservice/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
edia/libstagefright/ACodec.cpp
20574aa637780b76984e5e5d60d5e0068cda283f 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
edia/libstagefright/NuCachedSource2.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
edia/libmediaplayerservice/nuplayer/GenericSource.cpp
80ec934ae7d4e3a78af87554fdb77a58f6386ba0 24-Sep-2014 Ronghua Wu <ronghuawu@google.com> Merge "stagefright: add adaptive playback support to SoftHEVC decoder." into lmp-dev
b9627a028c659547e8bc437b4c7cef764cffb9b0 24-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to fc55783d0886d5dbaa234f85a4313796d9ef1df4
9c205c7ae55d455b62c17a3858862265f67f9e0a 24-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to fc55783d0886d5dbaa234f85a4313796d9ef1df4
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
edia/libstagefright/NuCachedSource2.cpp
fc55783d0886d5dbaa234f85a4313796d9ef1df4 24-Sep-2014 Wei Jia <wjia@google.com> Merge "NuPlayer will notify SeekComplete only when requested so." into lmp-dev
a4b0894425c0e2a2ebd54b002b6bafa5f1ce0445 24-Sep-2014 Eric Laurent <elaurent@google.com> Merge "audio policy: add hw hotword flag for inputs" into lmp-dev
686589f91b92cdcd3a7b85b49a3fe7d09913e66c 23-Sep-2014 Wei Jia <wjia@google.com> NuPlayer: change assert to conditional check.

Bug: 17491050
Change-Id: I657866c5342c227d57617eb89955897171eb5976
edia/libmediaplayerservice/nuplayer/NuPlayer.cpp
0837d0ac1b572923a27f1b0b742960fc64a6b162 24-Sep-2014 Lajos Molnar <lajos@google.com> stagefright: return encrypted input buffer for secure codecs

Bug: 17630446
Change-Id: I8a9352bcd00a3f4eb6fd2797d6809a8c1edc8482
edia/libstagefright/MediaCodec.cpp
6901949dabd81adb29d2be7899ce8d269a0eb3cc 24-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 3cdd6b8c82f2c71054bdd767782fc78f501f8e62
1824bd8d902a4427f46311f0c6e9f82eda607325 23-Sep-2014 Zhijun He <zhijunhe@google.com> Camera2Client: log an error when autoFocus is called in wrong state

Bug: 17555612
Change-Id: Ife33da712fbc8dc44d81e1e869fc75fb21026204
ervices/camera/libcameraservice/api1/Camera2Client.cpp
eefe317b8ce4f085f098e8bebfc9af3b3ee70a1e 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
edia/libmediaplayerservice/nuplayer/NuPlayer.cpp
edia/libmediaplayerservice/nuplayer/NuPlayer.h
7e9f7f7a9fb6c5d93fc9163e32936f3ea284caad 23-Sep-2014 Wei Jia <wjia@google.com> NuPlayer: change assert to conditional check.

Bug: 17491050
Change-Id: I657866c5342c227d57617eb89955897171eb5976
edia/libmediaplayerservice/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
edia/libstagefright/codecs/hevcdec/SoftHEVC.cpp
edia/libstagefright/codecs/hevcdec/SoftHEVC.h
edia/libstagefright/include/SoftVideoDecoderOMXComponent.h
edia/libstagefright/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
88b4cc81779cc7da9c438e1bcd2e9f0897157bbd 23-Sep-2014 Zhijun He <zhijunhe@google.com> Merge "Camera2Client: log an error when autoFocus is called in wrong state" into lmp-dev
f79f8ca07f9130d67ba575748cf3481f32dcad9f 23-Sep-2014 Zhijun He <zhijunhe@google.com> Camera2Client: log an error when autoFocus is called in wrong state

Bug: 17555612
Change-Id: Ife33da712fbc8dc44d81e1e869fc75fb21026204
ervices/camera/libcameraservice/api1/Camera2Client.cpp
e427abf1ea252ff305fc33aacdd2e83cf34891b5 23-Sep-2014 Wei Jia <wjia@google.com> NuPlayer will notify SeekComplete only when requested so.

Bug: 17596535
Change-Id: I6b744fdcf80f11d521d26c7c8b45f7de70aa0dc3
edia/libmediaplayerservice/nuplayer/NuPlayer.cpp
edia/libmediaplayerservice/nuplayer/NuPlayer.h
edia/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp
fb3de8a8e68d616cc3ecf91edd05b7dd8385d8f3 23-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 5110d6a00db5973881d06c39c60e477fb90a2d55
236031d78b9c0b85f37de8306b7c5a8e13ace870 23-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 5110d6a00db5973881d06c39c60e477fb90a2d55
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
edia/libstagefright/rtsp/MyHandler.h
a44d8f71a4b9ebae87c386bc3fe19abc52590bb5 23-Sep-2014 Chong Zhang <chz@google.com> Merge "fix crash when makeHTTPConnection fails with null pointer" into lmp-dev
a2e086d0de970feb3a0e727a84feac97145beac9 19-Sep-2014 Wei Jia <wjia@google.com> MediaBuffer: ABuffer will release MediaBuffer when it's destructed.

Bug: 17454455
Change-Id: Ia423bcc2e1fa39137f114eac44912ed15357bb99
nclude/media/stagefright/MediaBuffer.h
nclude/media/stagefright/foundation/ABuffer.h
nclude/media/stagefright/foundation/MediaBufferBase.h
edia/libmediaplayerservice/nuplayer/GenericSource.cpp
edia/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp
edia/libstagefright/ACodec.cpp
edia/libstagefright/MediaCodecSource.cpp
edia/libstagefright/foundation/ABuffer.cpp
edia/libstagefright/mpeg2ts/AnotherPacketSource.cpp
edia/libstagefright/wifi-display/source/Converter.cpp
edia/libstagefright/wifi-display/source/MediaPuller.cpp
217bde880be6f4d937caf9555ea98942883ebda0 22-Sep-2014 Chong Zhang <chz@google.com> fix crash when makeHTTPConnection fails with null pointer

Bug: 17608108
Change-Id: I4bdf6d09ae565418be3d6677b5ccac9072fb9b2c
edia/libstagefright/DataSource.cpp
d7f77cd78f5180ba7a04b270d632cc4f9f11718a 22-Sep-2014 Andy Hung <hunga@google.com> Merge "MediaCodec: Fix deallocated pointer reference when calling reset()" into lmp-dev
514cb1da43367a09dbe3ce15dedbcd982e0576e8 22-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 8d6ae6d9e9f2740f88928fae52e811ca68b0024e
aca8047abd09725813e3dcf3a911a248c37d1390 22-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 8d6ae6d9e9f2740f88928fae52e811ca68b0024e
f5b1db11734358d979a23a1ac4903872186ef60b 09-Sep-2014 Ronghua Wu <ronghuawu@google.com> NuPlayer: add pause timeout event for offload audio.

Bug: 17375249
Change-Id: Ie59c6b372e9ad2aace3d1e27b9896d79de35d722
edia/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
edia/libmediaplayerservice/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
nclude/media/stagefright/MediaCodec.h
edia/libstagefright/MediaCodec.cpp
e53c60ebd6ad6938461307fbfcc85af193d4cd04 22-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 8d6ae6d9e9f2740f88928fae52e811ca68b0024e
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
edia/libmediaplayerservice/nuplayer/NuPlayer.cpp
edia/libmediaplayerservice/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
f0ed013c171f1d630d443df164cf3c3c2b07da87 22-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 8d6ae6d9e9f2740f88928fae52e811ca68b0024e
a8c0f9e1bdc7efd326ddb7bda5798e154e95990e 21-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 8d6ae6d9e9f2740f88928fae52e811ca68b0024e
b69bd92f6e75df3014dd2cf7e17bf354a2993179 21-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to a7326b42c42f5014e8dabf18d69a8376b2f3f67d
c71545f36ddccb49be6b6cb1e89158565f4ce8c6 20-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 8d6ae6d9e9f2740f88928fae52e811ca68b0024e
96e92b58b7e9647b4c7c2f54b62a1b357ab06b66 19-Sep-2014 Wei Jia <wjia@google.com> MediaBuffer: ABuffer will release MediaBuffer when it's destructed.

Bug: 17454455
Change-Id: Ia423bcc2e1fa39137f114eac44912ed15357bb99
nclude/media/stagefright/MediaBuffer.h
nclude/media/stagefright/foundation/ABuffer.h
nclude/media/stagefright/foundation/MediaBufferBase.h
edia/libmediaplayerservice/nuplayer/GenericSource.cpp
edia/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp
edia/libstagefright/ACodec.cpp
edia/libstagefright/MediaCodecSource.cpp
edia/libstagefright/foundation/ABuffer.cpp
edia/libstagefright/mpeg2ts/AnotherPacketSource.cpp
edia/libstagefright/wifi-display/source/Converter.cpp
edia/libstagefright/wifi-display/source/MediaPuller.cpp
5dbe47139713292bf45bbf4f1a7af0835a5ff368 20-Sep-2014 Eric Laurent <elaurent@google.com> audio policy: add hw hotword flag for inputs

Audio input profiles can indicate flag AUDIO_INPUT_FLAG_HW_HOTWORD
meaning they allow capture from the same source as HW hotword
detection.

When a client requests capture with this flag, the policy will
try to find an input profile matching this request first and
fallback to a regular input if not found.

Bug: 17575019.
Change-Id: Ia463211597d7fa363527d776389f2257f0ced9a2
ervices/audiopolicy/AudioPolicyManager.cpp
ervices/audiopolicy/AudioPolicyManager.h
8d6ae6d9e9f2740f88928fae52e811ca68b0024e 20-Sep-2014 Lajos Molnar <lajos@google.com> Merge "mediaplayer: smooth out videoplayback based on framerate" into lmp-dev
d3b7327c38964773453a861099c74f547aab9662 20-Sep-2014 Zhijun He <zhijunhe@google.com> Merge "API1: ZSL buffers should be skipped for manual AF mode" into lmp-dev
c851b5de495169d7e9528644c2592746021bd968 18-Sep-2014 Lajos Molnar <lajos@google.com> mediaplayer: smooth out videoplayback based on framerate

Bug: 14659809
Change-Id: I73f6c7224c51ac06487475f9ed395379111ad71f
edia/libmediaplayerservice/VideoFrameScheduler.cpp
edia/libmediaplayerservice/VideoFrameScheduler.h
edia/libmediaplayerservice/nuplayer/NuPlayer.cpp
edia/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
edia/libmediaplayerservice/nuplayer/NuPlayerRenderer.h
3bde6b1c3387c51479f39846533ead246a920990 20-Sep-2014 Marco Nelissen <marcone@google.com> Merge "Make prepare properly report failure again" into lmp-dev
43e2418e30c360cdd43052fb3471433161cc161e 20-Sep-2014 Zhijun He <zhijunhe@google.com> API1: ZSL buffers should be skipped for manual AF mode

ZSL counts on good auto focus (CAF). It is really tricky to enable ZSL for
manual focus mode. as it is bascically a locked focus mode, you can not tell
if the focus is good or not by reading the afstate.

Bug: 17577928
Change-Id: I68ff7d143e7d56f942bb00a8da6a9faea57b52a0
ervices/camera/libcameraservice/api1/client2/ZslProcessor3.cpp
705d3290102875409e334e2a80e64221714aa37c 20-Sep-2014 Marco Nelissen <marcone@google.com> Make prepare properly report failure again

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

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

Bug: 14659809
Change-Id: Ic340ac61ad4778b493625c79c2cb4f747ff54ede
edia/libmediaplayerservice/Android.mk
edia/libmediaplayerservice/VideoFrameScheduler.cpp
edia/libmediaplayerservice/VideoFrameScheduler.h
edia/libmediaplayerservice/nuplayer/Android.mk
edia/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp
edia/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
edia/libmediaplayerservice/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
edia/libstagefright/codecs/aacdec/SoftAAC2.cpp
edia/libstagefright/codecs/aacdec/SoftAAC2.h
4f62441d36ad9e9e3f993b6f03ce68fcecf4f83b 19-Sep-2014 Eino-Ville Talvala <etalvala@google.com> Merge "CameraService: Add client name/pid to device open/close logging." into lmp-dev
dfc34daba6d6cb923683d96689a0cb7c7006eee5 19-Sep-2014 Glenn Kasten <gkasten@google.com> Reduce log spam from getTimestamp errors

Bug: 17576481
Change-Id: I07d99e7c42b7d4f0994b5a6d9c9fe8eb29fbbe40
edia/libmedia/AudioTrack.cpp
a7326b42c42f5014e8dabf18d69a8376b2f3f67d 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
nclude/media/AudioEffect.h
edia/libmedia/AudioEffect.cpp
800599cdd50737de1cde483a34b39923750b0658 30-Aug-2014 Robert Shih <robertshih@google.com> LiveSession: do not drop seek request

Bug: 17538727
Change-Id: I28658b2779ac16512ff54adbe536d01790e6449e
edia/libstagefright/httplive/LiveSession.cpp
b9d2f3333369183344aa89c7be1e643a44296d48 19-Sep-2014 Eino-Ville Talvala <etalvala@google.com> CameraService: Add client name/pid to device open/close logging.

Bug: 15672812
Change-Id: I1162c6d9d0a1eea1dd32949a04c295b4941d2602
ervices/camera/libcameraservice/common/Camera2ClientBase.cpp
ervices/camera/libcameraservice/common/Camera2ClientBase.h
b0ed4e3e482cbdc2fa6c7853526597f4ae3f0972 19-Sep-2014 Marco Nelissen <marcone@google.com> Merge "Always consider first buffer to be config" into lmp-dev
0fb7b51f6e2a123b2414f4a4daf73ce465c9d8b6 19-Sep-2014 Eino-Ville Talvala <etalvala@google.com> Merge "CameraService: Fix dump methods for two clients" into lmp-dev
67489d2f5668441a36cb1f1157e80ec8684023bf 19-Sep-2014 Eino-Ville Talvala <etalvala@google.com> CameraService: Fix dump methods for two clients

Actually write dump text into the provided FD, and add a bit more
dump data into CameraDeviceClient.

Bug: 17570762
Change-Id: I37b1db85188855d4e89c8050c4b13f0d22e07e0c
ervices/camera/libcameraservice/api2/CameraDeviceClient.cpp
ervices/camera/libcameraservice/api_pro/ProCamera2Client.cpp
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
edia/libstagefright/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
nclude/media/AudioEffect.h
edia/libmedia/AudioEffect.cpp
4704de0ce240cf6d2c93846d38463bbbd03ad7cf 18-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 2973994af39d55b58728df3dca067594e826ea2a
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
nclude/media/AudioTrack.h
edia/libmedia/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
edia/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp
edia/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
edia/libmediaplayerservice/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>
edia/libmediaplayerservice/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
nclude/media/MediaPlayerInterface.h
edia/libmediaplayerservice/MediaPlayerService.cpp
edia/libmediaplayerservice/MediaPlayerService.h
edia/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
edia/libmediaplayerservice/nuplayer/NuPlayerRenderer.h
2720c8c45a0040d7007239c100591b9f092b780f 18-Sep-2014 Eric Laurent <elaurent@google.com> Merge "audioflinger: remove debug log." into lmp-dev
5e5a6e100920679f20b4d7fae0d8866ec5053f7e 17-Sep-2014 Marco Nelissen <marcone@google.com> Add support for ANDROID_LOOP to NuPlayer

Bug: 17518139
Change-Id: I9355ddd4c998d967013dd8bd32d670a9a83dea31
edia/libmediaplayerservice/nuplayer/GenericSource.cpp
edia/libmediaplayerservice/nuplayer/GenericSource.h
edia/libmediaplayerservice/nuplayer/NuPlayer.cpp
edia/libmediaplayerservice/nuplayer/NuPlayer.h
edia/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp
edia/libmediaplayerservice/nuplayer/NuPlayerDriver.h
edia/libmediaplayerservice/nuplayer/NuPlayerSource.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
edia/libstagefright/codecs/aacdec/SoftAAC2.cpp
80b617cf82e0030deef4f968a6341e2867166135 17-Sep-2014 Eric Laurent <elaurent@google.com> audioflinger: remove debug log.

Remove debug log left by commit ab5cdbaf.

bug: 17537746.
Change-Id: I10f672f607f8e87caaa8228fc05eff8aee7dfa15
ervices/audioflinger/Threads.cpp
3a6a0f9daa766b280326c7f6007dd388a71fbccb 17-Sep-2014 Lajos Molnar <lajos@google.com> Merge "mediaplayer: reset flags when pre-reading multiple buffers" into lmp-dev
ce250c91ba3c2d746fe00f309c9c8fa8bb6071ab 17-Sep-2014 Eric Laurent <elaurent@google.com> Merge "audio policy: fix attached devices validation" into lmp-dev
15f8ecfa23b650b3efa8fe841d2be6bd0c9523fb 15-Sep-2014 Robert Shih <robertshih@google.com> PlaylistFetcher:don't signal a/v eos on subttitle eos

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

Bug: 17518139
Change-Id: I9355ddd4c998d967013dd8bd32d670a9a83dea31
edia/libmediaplayerservice/nuplayer/GenericSource.cpp
edia/libmediaplayerservice/nuplayer/GenericSource.h
edia/libmediaplayerservice/nuplayer/NuPlayer.cpp
edia/libmediaplayerservice/nuplayer/NuPlayer.h
edia/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp
edia/libmediaplayerservice/nuplayer/NuPlayerDriver.h
edia/libmediaplayerservice/nuplayer/NuPlayerSource.h
6e584e2b3b0b00929512a04f658f07bea0d21b8a 17-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 90869c2bef1bc47394a9f603ccebb62b2592fd2b
317a49a4c4bf02944d1e01941c6b9f86179044bb 17-Sep-2014 Marco Nelissen <marcone@google.com> mediaplayer: reset flags when pre-reading multiple buffers

Bug: 17521470
Change-Id: I15ee9b1d3dd4ad29f4961a642f7fadafd9fe5b24
edia/libmediaplayerservice/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
edia/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp
d78f153a21868d870b14169a6928d991e4b82e73 17-Sep-2014 Eric Laurent <elaurent@google.com> audio policy: fix attached devices validation

Consider all supported devices in an io profile and
not only the first one when looking for a match with attached
devices.
Failing to do so would cause the device validation to fail
if supported devices are not declared in a specific order
in the io profile descriptor in audio_policy.conf

Bug: 17532764.
Change-Id: Id27c9192e21de7f075076e17eb8c48e7e42847f6
ervices/audiopolicy/AudioPolicyManager.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
edia/libmediaplayerservice/nuplayer/GenericSource.cpp
48296b792a8d68358de74141fa80bd5bd84d0307 14-Sep-2014 Chong Zhang <chz@google.com> Disconnect HTTP-based data source upon reset

Bug: 17425250

Change-Id: Ieb4c93fd9848489f9dbf35a36474376924fd8eb9
edia/libmediaplayerservice/nuplayer/GenericSource.cpp
edia/libmediaplayerservice/nuplayer/GenericSource.h
edia/libmediaplayerservice/nuplayer/NuPlayer.cpp
edia/libmediaplayerservice/nuplayer/NuPlayerSource.h
edia/libstagefright/NuCachedSource2.cpp
edia/libstagefright/include/NuCachedSource2.h
31fc9cbfedcb2d4c2ad8994c7a9658bb19c2e806 16-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 086c1e3f41a92aa0025a1da1db5dabbfdffaf129
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
edia/libstagefright/httplive/LiveSession.cpp
edia/libstagefright/httplive/PlaylistFetcher.cpp
edia/libstagefright/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
edia/libstagefright/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
edia/libstagefright/mpeg2ts/ESQueue.cpp
edia/libstagefright/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
edia/libstagefright/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
edia/libstagefright/httplive/PlaylistFetcher.cpp
edia/libstagefright/httplive/PlaylistFetcher.h
47e89d7dcb4406b197c13764897fb28ac1e0b09b 16-Sep-2014 Yin-Chia Yeh <yinchiayeh@google.com> Merge "Camera2: handle one more videosnapshot failure" into lmp-dev
d3c5b081863ad5930971d90aee2f3a61f8424d88 15-Sep-2014 Yin-Chia Yeh <yinchiayeh@google.com> Camera2: handle one more videosnapshot failure

Handle one more corner case.
Also remove redundant re-try path.

Bug: 17484683
Change-Id: I0b3e1223f4f28022e7ec6abe028ca3c2623829de
ervices/camera/libcameraservice/api1/Camera2Client.cpp
cf7863ea8d9137aadf6bfd9756eb07ebd1c81b5c 15-Sep-2014 Eric Laurent <elaurent@google.com> Merge "audioflinger: fix pre processing effect leak" into lmp-dev
c7b29572d22dff51b5432a7d211875d528406da6 15-Sep-2014 Phil Burk <philburk@google.com> Merge "mediaplayer: optimize buffer queue management" into lmp-dev
dd5f7dc1a870877c2f0cbe0b595c42b77035f9ec 15-Sep-2014 Eino-Ville Talvala <etalvala@google.com> Merge "Camera3Device: Treat failure to idle as an error" into lmp-dev
14986f6cca08b9ab0407cc2d31f92bfb02b5cb8c 15-Sep-2014 Lajos Molnar <lajos@google.com> mediaplayer: handle surface dis/connection errors

Bug: 17408008
Change-Id: I752d5372086772b79b1300a2d3fabbc4985954a8
edia/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp
2a6074c4f7dd6f5b85ea8d858199d4970ff404ac 15-Sep-2014 Eric Laurent <elaurent@google.com> Merge "audioflinger: send mic mute command to all audio HALs" into lmp-dev
aaa44478a373232d8416657035a9020f9c7aa7c3 13-Sep-2014 Eric Laurent <elaurent@google.com> audioflinger: fix pre processing effect leak

When a capture thread was closed, the effects attached to this thread
were left dangling and the associated effect chain destroyed.
When their last client was disconnected, the effects were not released
properly from the effect library because the destruction process could
not be completed without the effect being attached to a thread.

A similar problem prevented a RecordTrack to be properly released if
its client was destroyed after the capture thread.

The fix consists in allowing the effect or record track to be properly
released even if its parent thread cannot be promoted.

Also save any effect chain still present on a closed capture thread
in case a new client wants to reuse the effects on the same session later.

Bug: 17110064.
Change-Id: I5cd644daa357afd1f3548f9bcb28e6152d95fdb8
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
ervices/audioflinger/Effects.cpp
ervices/audioflinger/Effects.h
ervices/audioflinger/Threads.cpp
ervices/audioflinger/Threads.h
ervices/audioflinger/TrackBase.h
ervices/audioflinger/Tracks.cpp
2f035f59d1e28728d38d18a7f0f7a9c6e8b0c11b 14-Sep-2014 Eric Laurent <elaurent@google.com> audioflinger: send mic mute command to all audio HALs

Mic mute should be sent to all audio HALs, not
only the primary HAL as telephony can use
capture devices on other HALs (e.g USB)

Bug: 17321604.
Change-Id: I658f6084d5b5cdc5a70784661d5cea0b6f81c3a9
ervices/audioflinger/AudioFlinger.cpp
84e4a417a7902c3e0e04f7bf8bddaf5e91f11294 15-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 83a23e1e1e45d9e2f5497e214796250f74aad1d4
83a23e1e1e45d9e2f5497e214796250f74aad1d4 15-Sep-2014 Eino-Ville Talvala <etalvala@google.com> Merge "Camera1: Validate scene mode override AF mode" into lmp-dev
9c8a091436052fb0f3290356abe1ac55b7bae8a2 14-Sep-2014 Eino-Ville Talvala <etalvala@google.com> Camera3Device: Treat failure to idle as an error

Bug: 16899526
Change-Id: Ia995aac6360c9c41ed654af5a7052480f23903d8
ervices/camera/libcameraservice/device3/Camera3Device.cpp
a1530f1b16f093a91edbbbaf7dac9f9809867817 14-Sep-2014 Zhijun He <zhijunhe@google.com> Camera3: Update ZSL post-processing tags

Update ZSL processing tags according the still capture template
Also cache the request template to avoid extra cost of querying
into HAL every time.

Bug: 17463102
Change-Id: I2eeffefb0a4131c99a85dd3e4484cc6f0f025efa
ervices/camera/libcameraservice/api1/client2/ZslProcessor3.cpp
ervices/camera/libcameraservice/api1/client2/ZslProcessor3.h
ervices/camera/libcameraservice/device3/Camera3Device.cpp
ervices/camera/libcameraservice/device3/Camera3Device.h
2b9530a7287f4f470d5f2aecea4da043b7af98a7 14-Sep-2014 Eric Laurent <elaurent@google.com> Merge "audio policy: fix relative priorities of PHONE and ENFORCED_AUDIBLE" into lmp-dev
d0303d7b0420db9f08535770317672a974c50977 14-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to f0b31e6333839972afb2e374f6d8824180d29fc2
176e4c253a63d581af6b21f3182d71b3026ef516 13-Sep-2014 Eino-Ville Talvala <etalvala@google.com> Camera1: Validate scene mode override AF mode

Don't allow uncalibrated cameras to list a fixed focus mode for
variable-focus cameras, since uncalibrated cameras cannot do INFINITY
focus.

Bug: 17492043
Change-Id: I5835efd6f21be0ebb74a9b7ea3ef5b2e7cf63e7a
ervices/camera/libcameraservice/api1/client2/Parameters.cpp
f0b31e6333839972afb2e374f6d8824180d29fc2 13-Sep-2014 Eino-Ville Talvala <etalvala@google.com> Merge "Camera: Allow larger preview resolutions in API1 for >= HALv2 devices" into lmp-dev
a4c95a6bc3b801bf41ca841440e9124f947e53fe 13-Sep-2014 Eino-Ville Talvala <etalvala@google.com> Camera: Allow larger preview resolutions in API1 for >= HALv2 devices

Limit preview resolutions to a max of 1920x1920 instead of 1920x1080p,
so that any aspect ratio with a 1920 as the larger dimension can be used.

Also improve the initial preview/video size selection logic, to ensure
that the selected size is both a valid preview and video size, and not
too large.

Bug: 17458832
Change-Id: Iea006fadb5fbf0f03d23c3c5babb5b3611469688
ervices/camera/libcameraservice/api1/client2/Parameters.cpp
ervices/camera/libcameraservice/api1/client2/Parameters.h
0e40a83936d42a34788bbce1c113c404d727fe47 13-Sep-2014 Zhijun He <zhijunhe@google.com> Merge "Camera2: fix 4K recording" into lmp-dev
a53021f776d0c82271727e5817388936513feb92 12-Sep-2014 Yin-Chia Yeh <yinchiayeh@google.com> Camera2: fix 4K recording

Bug: 17484683
Change-Id: I09bb12698057555329286c777102b9b310452fb3
ervices/camera/libcameraservice/api1/Camera2Client.cpp
ervices/camera/libcameraservice/api1/Camera2Client.h
ervices/camera/libcameraservice/api1/client2/StreamingProcessor.cpp
ervices/camera/libcameraservice/api1/client2/StreamingProcessor.h
6b685b47f31d118f88b6e31eb9b61fd5d1d0545c 13-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 715e30cbbc8b1ed62165ef0e33368f27b6865b20
d6ddd194017711ab951d0a4baca06213180e8921 13-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 4d22f2085141374fd88dba4142a8135f1bd9165c
966095ea014bc0f6ae9f523ee7f37f2fed2faeb5 09-Sep-2014 Jon Eklund <jeklund@motorola.com> audio policy: fix relative priorities of PHONE and ENFORCED_AUDIBLE

ENFORCED_AUDIBLE should only be highest priority if system tones
are being forced. Otherwise it should behave like SONIFICATION.

Bug: 17474485.

Change-Id: Ia651779870d51100cc3179c96fa09694bc691ba7
ervices/audiopolicy/AudioPolicyManager.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>
edia/libmediaplayerservice/nuplayer/GenericSource.cpp
edia/libmediaplayerservice/nuplayer/NuPlayer.cpp
edia/libmediaplayerservice/nuplayer/NuPlayer.h
edia/libmediaplayerservice/nuplayer/NuPlayerDecoderPassThrough.cpp
edia/libmediaplayerservice/nuplayer/NuPlayerDecoderPassThrough.h
f4a48dfa8570d6a4708a868b8b15d1236f7ca54b 30-Aug-2014 Robert Shih <robertshih@google.com> LiveSession: reliable switch

Bug: 17142706
Change-Id: I9cd6c068178d62c294496e8ab0b0a3763354964f
edia/libstagefright/httplive/LiveSession.cpp
edia/libstagefright/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
61cd63a51c87dde24c9b163033937fa304864512 13-Sep-2014 Eric Laurent <elaurent@google.com> Merge "audio policy: fix check in creaateAudioPatch()" into lmp-dev
58f8eb7ae0ee400585bce6682a7212575115e758 13-Sep-2014 Eric Laurent <elaurent@google.com> audio policy: fix check in creaateAudioPatch()

Bug: 17488759.
Change-Id: I9dd2c3ca7f83de4b3573f4fb0e9934e1bc37c3bc
ervices/audiopolicy/AudioPolicyManager.cpp
e293c71cee0d00cda005baf5d0c2faa034812b7a 13-Sep-2014 Igor Murashkin <iam@google.com> Merge "camera: add latest parameters to dumpsys for api1 cameras" 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
edia/libstagefright/httplive/LiveSession.cpp
edia/libstagefright/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
f2a74aad5efc01e5b9939c7cbbfde058ce64bfec 12-Sep-2014 Yin-Chia Yeh <yinchiayeh@google.com> Merge "Camera2: improve ZSL candidate selection logic" into lmp-dev
095da43dfe840f28d8c026710644a97d9b7805bf 12-Sep-2014 Yin-Chia Yeh <yinchiayeh@google.com> Merge "camera2: skip capture result after clearZslQueue" into lmp-dev
715e30cbbc8b1ed62165ef0e33368f27b6865b20 09-Sep-2014 Chong Zhang <chz@google.com> StagefrightRecorder: default to codec and fps from camcorder low profile

Bug: 16870964
Change-Id: I18425af630d3f041a3bcf77fbae3f07856fe8af2
edia/libmediaplayerservice/StagefrightRecorder.cpp
edia/libmediaplayerservice/StagefrightRecorder.h
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
edia/libstagefright/httplive/LiveSession.cpp
edia/libstagefright/httplive/LiveSession.h
edia/libstagefright/mpeg2ts/AnotherPacketSource.cpp
edia/libstagefright/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
edia/libmediaplayerservice/nuplayer/GenericSource.cpp
6b7a2294b9e4da784cfe4b562ee1720ad606c852 09-Sep-2014 Yin-Chia Yeh <yinchiayeh@google.com> camera2: skip capture result after clearZslQueue

After ZSL queue is cleared, don't add capture result to ZSL queue
if its corresponding buffer has been cleared.

Bug: 17185356
Change-Id: Iddac39ab09b2560e2ce9390895927217c1736d5a
ervices/camera/libcameraservice/api1/client2/ZslProcessor3.cpp
ervices/camera/libcameraservice/api1/client2/ZslProcessor3.h
ervices/camera/libcameraservice/device3/Camera3ZslStream.cpp
ervices/camera/libcameraservice/device3/Camera3ZslStream.h
ervices/camera/libcameraservice/gui/RingBufferConsumer.cpp
ervices/camera/libcameraservice/gui/RingBufferConsumer.h
fcf5fea2ac99e6359998078d09fd7e21269dca4a 11-Sep-2014 Igor Murashkin <iam@google.com> camera: add latest parameters to dumpsys for api1 cameras

Bug: 17290106
Change-Id: I08ac1659d0367613c37669d5bf6e6bf7b2b63bc2
ervices/camera/libcameraservice/api1/CameraClient.cpp
ervices/camera/libcameraservice/api1/CameraClient.h
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
edia/libmediaplayerservice/nuplayer/GenericSource.cpp
edia/libmediaplayerservice/nuplayer/GenericSource.h
332beebb72bd02e8024244f33e0a61f429efaffe 23-Jun-2014 Jon Eklund <jeklund@motorola.com> AudioPolicyManager: Use "safe" speaker for notifications if available

On particularly loud devices, unexpected audio bursts can be harmful.
For longer audio events, the conventional mitigation strategy is to
somehow soft-start (ramp) the loudspeaker volume, but this strategy
can severely impact the audibility of short audio events.

Use of the "safe" speaker path hints to AudioHAL to immediately output
at best allowable level for transient audio events.

SPEAKER_SAFE is aliased to SPEAKER for purposes of volume control.

Bug: 17319721
Change-Id: I75187c23f3d1f18e9f638c5d14e7b0bf805a67bc
ervices/audiopolicy/AudioPolicyManager.cpp
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
edia/libmediaplayerservice/StagefrightRecorder.cpp
edia/libmediaplayerservice/StagefrightRecorder.h
2f875dc8aa3f419daec9089909bb7b540141e783 11-Sep-2014 Eric Laurent <elaurent@google.com> Merge "AudioPolicyManager: Use "safe" speaker for notifications if available" into lmp-dev
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
edia/libstagefright/codecs/m4v_h263/dec/SoftMPEG4.cpp
edia/libstagefright/codecs/m4v_h263/dec/SoftMPEG4.h
edia/libstagefright/codecs/m4v_h263/dec/src/vop.cpp
edia/libstagefright/colorconversion/SoftwareRenderer.cpp
edia/libstagefright/include/SoftVideoDecoderOMXComponent.h
edia/libstagefright/omx/SoftVideoDecoderOMXComponent.cpp
971873179cf202ad8aa1ddc4ec737795f1e03ce3 11-Sep-2014 Ronghua Wu <ronghuawu@google.com> Merge "stagefright: add adaptive playback support to SoftAVC decoder." into lmp-dev
dec84fb1c687509c3125acac76e0af80e4e0afbd 11-Sep-2014 Yin-Chia Yeh <yinchiayeh@google.com> Camera2: improve ZSL candidate selection logic

1. Clear ZSL queue when focus mode is changed and autoFocus is
cancelled.
2. Do not check focus state is focus mode is fixed.

Bug: 17185356
Change-Id: I2cb10fb457b080f0db950c894e56995f638e147b
ervices/camera/libcameraservice/api1/Camera2Client.cpp
ervices/camera/libcameraservice/api1/client2/ZslProcessor3.cpp
ervices/camera/libcameraservice/api1/client2/ZslProcessor3.h
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
nclude/media/AudioTrack.h
nclude/media/IAudioTrack.h
nclude/media/nbaio/NBAIO.h
edia/libmedia/AudioTrack.cpp
003d7bd44147481f3dc2a74c9b1b12704fe0e6db 11-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 4953f92be5c45d7b79448e8964ecbdc39eacb782
4953f92be5c45d7b79448e8964ecbdc39eacb782 11-Sep-2014 Robert Shih <robertshih@google.com> am 0568cd5b: am e6b5d4c2: am 6fd1cf0c: am 86543654: am 0d83cf22: am 97d917bc: am ab0b3212: am 9b51a37f: am cb5dc219: am 74abb1ae: am 482b18bb: am f106b199: SampleTable: check integer overflow during table alloc

* commit '0568cd5bf0a93c54a5bca47b48f7cbe799ccafcf':
SampleTable: check integer overflow during table alloc
0568cd5bf0a93c54a5bca47b48f7cbe799ccafcf 11-Sep-2014 Robert Shih <robertshih@google.com> am e6b5d4c2: am 6fd1cf0c: am 86543654: am 0d83cf22: am 97d917bc: am ab0b3212: am 9b51a37f: am cb5dc219: am 74abb1ae: am 482b18bb: am f106b199: SampleTable: check integer overflow during table alloc

* commit 'e6b5d4c2d58a02184dd97815b5f76980025379bc':
SampleTable: check integer overflow during table alloc
e6b5d4c2d58a02184dd97815b5f76980025379bc 11-Sep-2014 Robert Shih <robertshih@google.com> am 6fd1cf0c: am 86543654: am 0d83cf22: am 97d917bc: am ab0b3212: am 9b51a37f: am cb5dc219: am 74abb1ae: am 482b18bb: am f106b199: SampleTable: check integer overflow during table alloc

* commit '6fd1cf0c00ee76802cfff0035011691aac8a1724':
SampleTable: check integer overflow during table alloc
6fd1cf0c00ee76802cfff0035011691aac8a1724 11-Sep-2014 Robert Shih <robertshih@google.com> am 86543654: am 0d83cf22: am 97d917bc: am ab0b3212: am 9b51a37f: am cb5dc219: am 74abb1ae: am 482b18bb: am f106b199: SampleTable: check integer overflow during table alloc

* commit '8654365499f8e9956c490e98184abe33978d4e67':
SampleTable: check integer overflow during table alloc
fd7327797fe1d21cb225cae34616b8f7b67ad29d 11-Sep-2014 Lajos Molnar <lajos@google.com> Merge "stagefright: don't use AAtomizer in AMessage" into lmp-dev
c640e19c11b3f93e739dd1504159dbe9fe529f0c 10-Sep-2014 Lajos Molnar <lajos@google.com> mediaplayer: release MediaBuffer in stale input buffers

Bug: 17454455
Change-Id: If63a6e42f96851d6c10fdec11360f0dabae9bf50
edia/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp
666c8011c7ea96436b40912d94e6d6097dcfdaf6 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
edia/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp
11c9fb1f90cc786485a53aeb1d31ec1ad1dbf840 23-Jun-2014 Jon Eklund <jeklund@motorola.com> AudioPolicyManager: Use "safe" speaker for notifications if available

On particularly loud devices, unexpected audio bursts can be harmful.
For longer audio events, the conventional mitigation strategy is to
somehow soft-start (ramp) the loudspeaker volume, but this strategy
can severely impact the audibility of short audio events.

Use of the "safe" speaker path hints to AudioHAL to immediately output
at best allowable level for transient audio events.

SPEAKER_SAFE is aliased to SPEAKER for purposes of volume control.

Bug: 17319721
Change-Id: I75187c23f3d1f18e9f638c5d14e7b0bf805a67bc
ervices/audiopolicy/AudioPolicyManager.cpp
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
edia/libstagefright/codecs/aacdec/SoftAAC2.cpp
edia/libstagefright/codecs/aacdec/SoftAAC2.h
5fc863a507d3e1171158e0d16ff0174fadf0ec04 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
edia/libstagefright/codecs/aacdec/SoftAAC2.cpp
edia/libstagefright/codecs/aacdec/SoftAAC2.h
c02ca4ca1e7597891bcf92f9294c83d928118cf9 10-Sep-2014 Chong Zhang <chz@google.com> fix failure in MediaCodecTest#testException

reset codec after failed configure()
Bug: 17418876

Change-Id: I21ff8a0751dae6a164678015142e11d481403bed
edia/libstagefright/MediaCodec.cpp
b6f9a21e7036e5619216faae902f005374bd8cad 10-Sep-2014 Lajos Molnar <lajos@google.com> mediaplayer: limit number of outstanding buffer requests

Bug: 14679336
Change-Id: I94a20ada30a9a25065329a85fc884d32d154d029
edia/libmediaplayerservice/nuplayer/NuPlayerDecoderPassThrough.cpp
b9b87fe9d9f3d91c05300a22920d7227a3f8eb83 10-Sep-2014 Lajos Molnar <lajos@google.com> mediaplayer: release MediaBuffer in stale input buffers

Bug: 17454455
Change-Id: If63a6e42f96851d6c10fdec11360f0dabae9bf50
edia/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp
8654365499f8e9956c490e98184abe33978d4e67 10-Sep-2014 Robert Shih <robertshih@google.com> am 0d83cf22: am 97d917bc: am ab0b3212: am 9b51a37f: am cb5dc219: am 74abb1ae: am 482b18bb: am f106b199: SampleTable: check integer overflow during table alloc

* commit '0d83cf22991c48f4bb5f2afe3d16ae076861f394':
SampleTable: check integer overflow during table alloc
0d83cf22991c48f4bb5f2afe3d16ae076861f394 10-Sep-2014 Robert Shih <robertshih@google.com> am 97d917bc: am ab0b3212: am 9b51a37f: am cb5dc219: am 74abb1ae: am 482b18bb: am f106b199: SampleTable: check integer overflow during table alloc

* commit '97d917bc1ccc958d8f1051de6a888de9a25dc6bd':
SampleTable: check integer overflow during table alloc
97d917bc1ccc958d8f1051de6a888de9a25dc6bd 10-Sep-2014 Robert Shih <robertshih@google.com> am ab0b3212: am 9b51a37f: am cb5dc219: am 74abb1ae: am 482b18bb: am f106b199: SampleTable: check integer overflow during table alloc

* commit 'ab0b3212e0c15132f2dab2beeb39c47d31bb1dab':
SampleTable: check integer overflow during table alloc
ab0b3212e0c15132f2dab2beeb39c47d31bb1dab 10-Sep-2014 Robert Shih <robertshih@google.com> am 9b51a37f: am cb5dc219: am 74abb1ae: am 482b18bb: am f106b199: SampleTable: check integer overflow during table alloc

* commit '9b51a37fa8ad9d28be791213ceba4fcbec52b14d':
SampleTable: check integer overflow during table alloc
9b51a37fa8ad9d28be791213ceba4fcbec52b14d 10-Sep-2014 Robert Shih <robertshih@google.com> am cb5dc219: am 74abb1ae: am 482b18bb: am f106b199: SampleTable: check integer overflow during table alloc

* commit 'cb5dc219b78e6eeacb7ee2f5c93e6763db677122':
SampleTable: check integer overflow during table alloc
cb5dc219b78e6eeacb7ee2f5c93e6763db677122 10-Sep-2014 Robert Shih <robertshih@google.com> am 74abb1ae: am 482b18bb: am f106b199: SampleTable: check integer overflow during table alloc

* commit '74abb1ae32fbd3fa4112cc8b8d53882777feb191':
SampleTable: check integer overflow during table alloc
74abb1ae32fbd3fa4112cc8b8d53882777feb191 10-Sep-2014 Robert Shih <robertshih@google.com> am 482b18bb: am f106b199: SampleTable: check integer overflow during table alloc

* commit '482b18bbfd6c9214157bfab47feae86df48a7178':
SampleTable: check integer overflow during table alloc
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
482b18bbfd6c9214157bfab47feae86df48a7178 10-Sep-2014 Robert Shih <robertshih@google.com> am f106b199: SampleTable: check integer overflow during table alloc

* commit 'f106b1993143df44282777253244ce67974c9d4a':
SampleTable: check integer overflow during table alloc
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
edia/libstagefright/codecs/aacdec/SoftAAC2.cpp
edia/libstagefright/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
edia/libstagefright/httplive/LiveSession.cpp
edia/libstagefright/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
edia/libmediaplayerservice/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
edia/libstagefright/MediaCodec.cpp
4bcbb07be57947ea1421519094f73577b1e263e6 10-Sep-2014 Ruben Brunk <rubenbrunk@google.com> Merge "camera2: Fix video snapshot for HAL 2.* devices." into lmp-dev
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
edia/libstagefright/codecs/on2/dec/SoftVPX.cpp
edia/libstagefright/codecs/on2/h264dec/SoftAVC.cpp
edia/libstagefright/codecs/on2/h264dec/SoftAVC.h
edia/libstagefright/include/SoftVideoDecoderOMXComponent.h
edia/libstagefright/omx/SoftVideoDecoderOMXComponent.cpp
4194a91283c1fe88be07357d8a64d1533babf920 10-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 83ee5564965408307e6f045ce5faed72bc3437b0
7ea429295a2eb31f2d9256c36c1ef53a195456ac 27-Aug-2014 Lajos Molnar <lajos@google.com> stagefright: don't use AAtomizer in AMessage

Bug: 15094301
Change-Id: Ib82fb6d8fb6b48402d81f411123b3d924368eb93
nclude/media/stagefright/foundation/AMessage.h
edia/libstagefright/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
edia/libmediaplayerservice/nuplayer/NuPlayerDecoderPassThrough.cpp
c99d333f59b5559248a5bf3135b7ef85b5f40133 10-Sep-2014 Eric Laurent <elaurent@google.com> Merge "audioflinger: fix audio patch release" into lmp-dev
f8fd8d6daab5ced86ce950be68070d27c24d487f 10-Sep-2014 Eric Laurent <elaurent@google.com> audioflinger: fix audio patch release

Fix error in PatchPanel:releaseAudioPatch() causing
the wrong patch handle to be passed to the audio HAL.

Bug: 17368621.
Change-Id: I037fd2e6273508c830414b5900d07c0178b96dae
ervices/audioflinger/PatchPanel.cpp
9caf1f5677edb365c20739612cba9f59291a9afb 10-Sep-2014 Jeff Tinker <jtinker@google.com> Merge "Add error code for insufficient output protection" into lmp-dev
6551e1ede59f4a3043fb141159ca67bd2c85a911 10-Sep-2014 Ruben Brunk <rubenbrunk@google.com> camera2: Fix video snapshot for HAL 2.* devices.

Bug: 15408128

- Lazily destroy ZSL stream when ZslProcessor is updated, or
when the camera client is disconnected, allowing HAL 2.*
devices that rely on the ZSL stream to capture video snapshots
to function correctly.

Change-Id: Ia5cf14c62acda4d9c640440dc5b8e0796dc0b3fa
ervices/camera/libcameraservice/Android.mk
ervices/camera/libcameraservice/api1/Camera2Client.cpp
ervices/camera/libcameraservice/api1/client2/ZslProcessor.cpp
ervices/camera/libcameraservice/api1/client2/ZslProcessor.h
ervices/camera/libcameraservice/api1/client2/ZslProcessorInterface.cpp
ervices/camera/libcameraservice/api1/client2/ZslProcessorInterface.h
9520aa609c505cf8a9ee105bd78dc186cfb7770b 10-Sep-2014 Zhijun He <zhijunhe@google.com> CamcorderProfile: Add QUALITY_HIGH_SPEED_2160P

Bug: 17059255
Change-Id: Ic6b272e4ceec8fc852c9eb787370f4d366dad0ac
nclude/media/MediaProfiles.h
edia/libmedia/MediaProfiles.cpp
f3b5190f2aa659d498b1d31389b90a441fc879a7 09-Sep-2014 Wei Jia <wjia@google.com> NuPlayer: make previous decoders obsolete when reset is done.

Bug: 17428608
Change-Id: I724174d65f8e00bfecb51e6f690ae709ed2cf442
edia/libmediaplayerservice/nuplayer/NuPlayer.cpp
95af55020ccbebdf5457165ea93244c9b0adfd4d 09-Sep-2014 Rachad <rachad@google.com> NuPlayer::Renderer::onPause() - Converted CHECK(!mPaused) to a warning.

Bug: 17436451

Change-Id: I7e9e0c48bbdd8ab65c5f4a587699a28435bd03f4
edia/libmediaplayerservice/nuplayer/NuPlayerRenderer.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>
edia/libmediaplayerservice/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
edia/libmediaplayerservice/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
edia/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
002eda11d7bff5813fad13bd0ef3b6c4d4998157 09-Sep-2014 Wei Jia <wjia@google.com> NuPlayer: check mSource before deferencing it.

Bug: 17428608
Change-Id: I7b264d1288ed3c495434aedeeeef2fbfc3ca2f16
edia/libmediaplayerservice/nuplayer/NuPlayer.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
edia/libmediaplayerservice/nuplayer/NuPlayer.cpp
9f8551ffa967bd8a4d0a52487a183dcf8b22d91f 09-Sep-2014 Eric Laurent <elaurent@google.com> Merge "audio policy: fix output stream selection" into lmp-dev
48d4c899e8e834e773979c53830c82f4bc48e2da 09-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 1a9ac031e9de8b3be1ec2c8d6d00f92bd3d59ea8
8838a3895c365d443ee22e169ccf45956780c081 09-Sep-2014 Eric Laurent <elaurent@google.com> audio policy: fix output stream selection

Make sure that all outputs considered by selectOutput()
when called from AudioPolicyManager::getOutputForDevice()
support the requested audio format.

Bug: 17340382.
Change-Id: I76520ce60e9a8fe4d2d23125d6143bb016522754
ervices/audiopolicy/AudioPolicyManager.cpp
ervices/audiopolicy/AudioPolicyManager.h
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
6d61a4f8a2fd63a5b906572e586a3e1c6ebfa8af 08-Sep-2014 Yin-Chia Yeh <yinchiayeh@google.com> Merge "Camera2: reconfigure video snapshot size if needed" into lmp-dev
b445375f50a1a619b2d7518d32387d5ea77ceb70 08-Sep-2014 Andy Hung <hunga@google.com> Fix potential deadlock between AudioPolicyService and AudioSystem

Bug: 17109761
Change-Id: I315c1c5066f62b05e1c13b04fae1272b5fbce977
edia/libmedia/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>
edia/libmediaplayerservice/nuplayer/NuPlayer.cpp
edia/libmediaplayerservice/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
3ea3fcd0822b2f43d87f1d8f67d7bf145864b201 05-Sep-2014 Yin-Chia Yeh <yinchiayeh@google.com> Camera2: reconfigure video snapshot size if needed

When recording fails to start due to stream configuration failed,
try configure stream again by setting jpeg stream to video size.

Bug: 16162133
Change-Id: Ib20271e787ae07719ce419f0b15c7f86434f7ebb
ervices/camera/libcameraservice/api1/Camera2Client.cpp
ervices/camera/libcameraservice/api1/client2/Parameters.cpp
ervices/camera/libcameraservice/api1/client2/Parameters.h
ervices/camera/libcameraservice/device3/Camera3Device.cpp
ervices/camera/libcameraservice/device3/Camera3Stream.cpp
2e97b01cecec65e690ac7da5df9433c52ff75bd8 08-Sep-2014 Eric Laurent <elaurent@google.com> Merge "audiopolicy: fix direct output profile probing" into lmp-dev
9d26548c8456dbd4e53a748185f7877b74ac69e2 08-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 835ae86b49da5e15a501cb12c25458f8b63e38be
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
edia/libstagefright/httplive/PlaylistFetcher.cpp
828bcffa0d5f73461c6c1ba4ef6d3da704c27b7e 07-Sep-2014 Eric Laurent <elaurent@google.com> audiopolicy: fix direct output profile probing

Do not select maximum sampling rate and channel count
when opening a direct output for the first time
to make sure that the combination of sampling rate
and channel count is supported by the connected sink.

Bug: 17047809.
Change-Id: I077a3c1436158378f2762343469ceb39fab9775e
ervices/audiopolicy/AudioPolicyManager.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
edia/libstagefright/codecs/aacdec/SoftAAC2.cpp
edia/libstagefright/codecs/aacdec/SoftAAC2.h
04940683ffa7e33676a3b13fdb02285e2c1aead2 07-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to cb16968f593e4d58857c693c8ec6f2d2337f5512
07189628efacc9f5e709f1f6d0149432e26725a2 06-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to ae6b041b7ceed3b1690a7201d6587538dbab8c1b
f225bb975b348e7a2a87953ce016bf15787ac89c 06-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to cb16968f593e4d58857c693c8ec6f2d2337f5512
cb16968f593e4d58857c693c8ec6f2d2337f5512 06-Sep-2014 Jungshik Jang <jayjang@google.com> Merge "Fix "invalid device combination" in system audio mode." into lmp-dev
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)
edia/libstagefright/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
edia/libstagefright/TimedEventQueue.cpp
ervices/audioflinger/Threads.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
edia/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp
3c15d9b12394c62b58ab101c958e354f2c2bea19 05-Sep-2014 Zhijun He <zhijunhe@google.com> Merge "Camera API1: fix AE state check in precapture state" into lmp-dev
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
nclude/media/mediaplayer.h
edia/libmedia/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
edia/libmediaplayerservice/nuplayer/NuPlayer.cpp
f2a2d0d6731174f5ce2a7b9d6dfd96dd7f1727a4 05-Sep-2014 Eric Laurent <elaurent@google.com> Merge "audio policy service: filter out delayed audio patch commands if needed." into lmp-dev
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
edia/libmediaplayerservice/MediaPlayerService.cpp
e45b48aba115f4daf4a4aad31b6a95df9b79f463 05-Sep-2014 Eric Laurent <elaurent@google.com> audio policy service: filter out delayed audio patch commands if needed.

As for set parameters commands, create or release audio patch commands
modifying the same patch handle should be filtered by the audio policy service
command thread so that an immediate command is not overridden by
a pending delayed command.

Bug: 17379728.

Change-Id: I6aa4652b4bfec59eebd3c3cb7d1d9ac1bc1d6e49
ervices/audiopolicy/AudioPolicyService.cpp
a1f9917243caafd1da5fa743c6fda1d0614ed167 05-Sep-2014 Jungshik Jang <jayjang@google.com> Fix "invalid device combination" in system audio mode.

HDMI-CEC system audio mode removes speaker from output
list. It also has multiple outputs by connected outputs.
However, getDeviceForVolume() doesn't cover multiple
output with no speaker or bluetooth case.
This change picks one of system audio outputs in order.

Bug: 17400026
Change-Id: I102fd0052c9c4c9543f9e8f3b16ec6815d7485d8
ervices/audiopolicy/AudioPolicyManager.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
edia/libmediaplayerservice/nuplayer/NuPlayer.cpp
edia/libmediaplayerservice/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
edia/libstagefright/ACodec.cpp
edia/libstagefright/OMXCodec.cpp
ae6b041b7ceed3b1690a7201d6587538dbab8c1b 04-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 9007305003e689362749a264af2eafea80eb12a0
b86e68f834b7040518b99d1d0245d5f2e5cb9c86 01-Aug-2014 Chong Zhang <chz@google.com> Split CEA-608 Closed caption into 4 tracks CC1~CC4

Bug: 16463078

Change-Id: Ib3073090934232016e535fbb8fa56cdf9d7ab6eb
edia/libmediaplayerservice/nuplayer/NuPlayer.cpp
edia/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp
edia/libmediaplayerservice/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
edia/libmediaplayerservice/nuplayer/GenericSource.cpp
edia/libmediaplayerservice/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
edia/libstagefright/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
edia/libmediaplayerservice/MediaPlayerFactory.cpp
edia/libmediaplayerservice/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
e8339fb87364469feb1f2cbda92889efecb79a7c 03-Sep-2014 Zhijun He <zhijunhe@google.com> Camera API1: fix AE state check in precapture state

It is legal to transit to CONVERGED or FLASH_REQUIRED after a AE precapture
trigger.

Bug: 17365185
Change-Id: Id041eff5eac564c32d09b547a0139d24807336f4
ervices/camera/libcameraservice/api1/client2/CaptureSequencer.cpp
16fdf7ec12dd8f7cefb70217ea080d0efe92e4c2 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
edia/libstagefright/foundation/ALooper.cpp
9bd0ba2898bd0c0439ecd863433f9f9c3f0d5126 28-Aug-2014 Marco Nelissen <marcone@google.com> Fix more potential deadlocks in ALooperRoster

Bug: 17059501
Change-Id: I242f2859527bed2d6e275c27de94fb19f4dcdc28
nclude/media/stagefright/foundation/ALooperRoster.h
edia/libstagefright/foundation/ALooperRoster.cpp
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
edia/libstagefright/codecs/on2/dec/SoftVPX.cpp
edia/libstagefright/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
edia/libmediaplayerservice/nuplayer/NuPlayer.cpp
edia/libmediaplayerservice/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
23c8cf958b1a756d5e0c78c46eac676676be4fdd 03-Sep-2014 Glenn Kasten <gkasten@google.com> Merge "Restore the ability to build tee sink for debugging" into lmp-dev
0cc07218bf75577277d367a449baaf75c36906fb 03-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 453d633ba6351c8efc2103383ca178a0674bd373
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
edia/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
edia/libmediaplayerservice/nuplayer/NuPlayerRenderer.h
97d547da43c9c41711d1ed1e3f4fa87c2ee3cb9a 02-Sep-2014 Eric Laurent <elaurent@google.com> audio flinger: fix use of global effect buffer

When float mixing format is enabled, audio effects use a specific
buffer in 16 bit format. This buffer was not enabled when only
global effects were present resulting in the mixer accumulating directly
to the output sink buffer.

Bug: 16202259.
Change-Id: I3537d36c63196d97772f0ab22dd31d04dfa7fdd6
ervices/audioflinger/Threads.cpp
329f6511ee4e03a4605c70bbda8d3a96d2544884 29-Aug-2014 Glenn Kasten <gkasten@google.com> Restore the ability to build tee sink for debugging

This changelist does not enable tee sink, but makes it possible to do so.
Tee sink had suffered some bit rot since it is not built by default.

Also fixes a crash for > 2 byte per sample or > 2 channels.
Still does not write correct header for floating-point;
that will be best solved by moving to libsndfile.

Bug: 16990102
Change-Id: I8e92c588ccc513d7802d696fcfb324e815772df6
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/FastMixer.cpp
ervices/audioflinger/Tracks.cpp
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
nclude/media/CharacterEncodingDetector.h
nclude/media/StringArray.h
nclude/media/mediascanner.h
edia/libmedia/Android.mk
edia/libmedia/CharacterEncodingDetector.cpp
edia/libmedia/CharacterEncodingDetector.h
edia/libmedia/MediaScannerClient.cpp
edia/libmedia/StringArray.h
edia/libstagefright/Android.mk
edia/libstagefright/StagefrightMetadataRetriever.cpp
b72726bad6c9253c26c82fea76bdf99e18b8ba6d 02-Sep-2014 Ruben Brunk <rubenbrunk@google.com> Merge "camera1: Ensure MemoryHeap buffers are mmapped before copying." into lmp-dev
e4478febd87f6a663bbdf2c22dd829af2a8166a6 02-Sep-2014 Ronghua Wu <ronghuawu@google.com> Merge "Add adaptive playback support to VPX decoder." into lmp-dev
3abe6e79de27fd55c18043e71c9fd08be61dee0f 02-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to e7494680914c384dc6e93ae85f4337b06b300468
e7494680914c384dc6e93ae85f4337b06b300468 02-Sep-2014 Wei Jia <wjia@google.com> Merge "NuPlayerRenderer: stop feeding AudioSink when paused." into lmp-dev
994b6ddc7166753e22ec860dffced1a941e634ca 01-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 64a385d5d8e42ac96c88fb025212b4023690db39
768deb4ef673f922c29d2788ede9c39bd4622045 31-Aug-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 64a385d5d8e42ac96c88fb025212b4023690db39
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
edia/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp
edia/libstagefright/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
edia/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp
edia/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
65e01f763571b779fbc759e6f96d0a195b94c6da 30-Aug-2014 Ruben Brunk <rubenbrunk@google.com> camera1: Ensure MemoryHeap buffers are mmapped before copying.

Bug: 16986293
Change-Id: Icb68254d7ed1812fa9e60342749a2746d6fcfb17
ervices/camera/libcameraservice/api1/CameraClient.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
edia/libmediaplayerservice/Android.mk
edia/libmediaplayerservice/nuplayer/GenericSource.cpp
edia/libmediaplayerservice/nuplayer/GenericSource.h
edia/libmediaplayerservice/nuplayer/NuPlayer.cpp
edia/libmediaplayerservice/nuplayer/NuPlayerSource.h
4030b56153b398a96269522344e5be485f821b95 29-Aug-2014 Eric Laurent <elaurent@google.com> Merge "sound trigger: fix cross deadlock between service and client" into lmp-dev
9a63396f70880772e551e1e4c38f27c635612083 29-Aug-2014 Eric Laurent <elaurent@google.com> Merge "audio policy: fix input source passed to openInput()" into lmp-dev
7fa4207870344d6773b077d13e08267986801f18 29-Aug-2014 Dmitry Shmidt <dimitrysh@google.com> Merge "audiopolicy: Indicate output device change to all input threads for pre-processing" into lmp-dev
886561f06ddaea86a51def1e918367430240b5ac 29-Aug-2014 Eric Laurent <elaurent@google.com> sound trigger: fix cross deadlock between service and client

Do not call callback methods on ISoundTriggerClient with the service mutex
locked: the client implementation will lock its mutex to process
the callback and if a request from the same client with client
mutex locked was waiting for the service mutex a deadlock occurs.

Bug: 16873049.
Change-Id: Ifc3b31fdfaed525981fa59876c041478f38b42e8
ervices/soundtrigger/SoundTriggerHwService.cpp
1c9c2cc4b170b79a83433749808e286eb0fcc449 29-Aug-2014 Eric Laurent <elaurent@google.com> audio policy: fix input source passed to openInput()

The input source passed to openInput() must be
modified from HOTWORD to VOICE_RECOGNITION if the capture does not
correspond to a sound trigger session.

Bug: 16731718.
Change-Id: I48aa4180e75dd5335cd096b48da1c15f2236e6ed
ervices/audiopolicy/AudioPolicyManager.cpp
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
nclude/media/stagefright/ACodec.h
edia/libstagefright/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>
edia/libmedia/Android.mk
0671947255321526cb1ba1ec3a20af9e8579c257 29-Aug-2014 Jeff Tinker <jtinker@google.com> Add error code for insufficient output protection

bug: 16034599
Change-Id: Ib52c8bdae83ea138cac897bce78ab651c36c1998
nclude/media/stagefright/MediaErrors.h
f5e7e79bf88b0c08c73262e7992634797a4f81a1 19-Aug-2014 bryant_liu <bryant_liu@htc.com> audiopolicy: Indicate output device change to all input threads for pre-processing

Bug: 17129715

Change-Id: I1fd938cce0b85241c80ea00f3d013a98948d3975
ervices/audiopolicy/AudioPolicyManager.cpp
890a5637b3e3eb197fd2c7f5deec816c7feb13fc 20-Aug-2014 bryant_liu <bryant_liu@htc.com> frameworks: av: AudioPolicyEffect: Add refCount for each session

Audio framework stops and restarts AudioTracks on same audio session.
Sometimes the AudioTrack start() comes before a stop(). As effects
are linked to the session, they should only be created on the last
stop() related to that session.

Bug: 17201117

Change-Id: I19343e293d6b7b6b794fe05ebd0dd239ed3b075c
ervices/audiopolicy/AudioPolicyEffects.cpp
ervices/audiopolicy/AudioPolicyEffects.h
8b250cb67d0cab6234c0e8e0e21342d03c1eca5d 29-Aug-2014 Eino-Ville Talvala <etalvala@google.com> Merge "CameraService: Create a dummy stream when 0 streams are requested." into lmp-dev
6868628c0df9b8dfa0a1c16be109d907384e3186 29-Aug-2014 Robert Shih <robertshih@google.com> Merge "PlaylistFetcher: add lower bound check when starting live streams" into lmp-dev
16a2ada049447c156648812b94d25be07869f284 27-Aug-2014 Eino-Ville Talvala <etalvala@google.com> CameraService: Create a dummy stream when 0 streams are requested.

A workaround for a camera device HAL v3.2 or older specification hole - it's
not acceptable to configure_streams with 0 output streams. However, we allow for
this at the public API level, to allow an application to release all output streams.

So in this case, create a dummy stream that doesn't actually do anything as a placeholder.

Bug: 17220694
Change-Id: Ib25242ffc2c9f2b2f619fd5fe6d652266579da85
ervices/camera/libcameraservice/Android.mk
ervices/camera/libcameraservice/device3/Camera3Device.cpp
ervices/camera/libcameraservice/device3/Camera3Device.h
ervices/camera/libcameraservice/device3/Camera3DummyStream.cpp
ervices/camera/libcameraservice/device3/Camera3DummyStream.h
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
edia/libstagefright/httplive/PlaylistFetcher.cpp
8962e08c4989368d2c821b64f42632b6f5fb016e 28-Aug-2014 Paul McLean <pmclean@google.com> Merge "Fix audio dropouts with multiple playback streams." into lmp-dev
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
edia/libstagefright/foundation/ALooper.cpp
047dd13ca42ff7cea10821ef64eb09229fa3e751 28-Aug-2014 Marco Nelissen <marcone@google.com> Fix more potential deadlocks in ALooperRoster

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

Bug: 13842676
Change-Id: I9c054ea489fd3a71b3b2394f15a85b84d42edb5a
edia/libstagefright/codecs/avc/enc/SoftAVCEncoder.h
edia/libstagefright/codecs/m4v_h263/enc/SoftMPEG4Encoder.h
edia/libstagefright/codecs/on2/dec/SoftVPX.cpp
edia/libstagefright/codecs/on2/enc/SoftVPXEncoder.h
edia/libstagefright/include/SimpleSoftOMXComponent.h
edia/libstagefright/include/SoftVideoDecoderOMXComponent.h
edia/libstagefright/omx/SoftVideoDecoderOMXComponent.cpp
47f64f2ed14839a00b3b148d490dc0394282eb54 28-Aug-2014 Eric Laurent <elaurent@google.com> Merge "audio policy: remove audio patch when closing input or output" into lmp-dev
638794db70e692a0f5a6094809be0deedc0f94f4 28-Aug-2014 Zhijun He <zhijunhe@google.com> Camera API1: Fix ZSLProcessor3 deadlock

ZSLProcessor3 shouldn't acquire mInputMutex in onBufferReleased call for output
buffers, because the caller (Camera3Stream::returnBuffer) holds the camera3
stream lock already. This could cause deadlock for ZSL reprocess request as it
holds the ZSLProcessor3 input lock and try to acquire camera3 stream lock to
submit the request.

Bug: 17299038
Change-Id: I6a7bf8ebd7c2064852358c655f3a3e9a67769213
ervices/camera/libcameraservice/api1/client2/ZslProcessor3.cpp
05b90f833337ab5f7b16509e5f1d339a04eb5bf6 28-Aug-2014 Eric Laurent <elaurent@google.com> audio policy: remove audio patch when closing input or output

Make sure that an audio patch having an output as source or input as sink
is removed when this input or output is closed.

Bug: 17303725.

Change-Id: I234d54a25ce0b579eeeafdcfda3a0594f048768c
ervices/audiopolicy/AudioPolicyManager.cpp
ervices/audiopolicy/AudioPolicyManager.h
01b9256a1358110ed718c1a83c2a1808d4afbb92 28-Aug-2014 Yin-Chia Yeh <yinchiayeh@google.com> Merge "cameraservice: decrease zsl metadata queue size by 1" into lmp-dev
13d98f419c614c5d389b06232ff99f7fe00dabf7 28-Aug-2014 Zhijun He <zhijunhe@google.com> Merge "Camera API1: Fix ZSLProcessor3 deadlock" into lmp-dev
5487fd54f344c422be089217e62098545704bb03 28-Aug-2014 Zhijun He <zhijunhe@google.com> Camera API1: Fix ZSLProcessor3 deadlock

ZSLProcessor3 shouldn't acquire mInputMutex in onBufferReleased call for output
buffers, because the caller (Camera3Stream::returnBuffer) holds the camera3
stream lock already. This could cause deadlock for ZSL reprocess request as it
holds the ZSLProcessor3 input lock and try to acquire camera3 stream lock to
submit the request.

Bug: 17299038
Change-Id: I6a7bf8ebd7c2064852358c655f3a3e9a67769213
ervices/camera/libcameraservice/api1/client2/ZslProcessor3.cpp
5c477aa6205e2ebafec237411900d89a510cc105 21-Aug-2014 Paul McLean <pmclean@google.com> Fix audio dropouts with multiple playback streams.

Bug 17136569

Change-Id: I7f69cb24168c7d27ce28679735f53c1ece4014c1
ervices/audiopolicy/AudioPolicyManager.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
edia/libstagefright/foundation/ALooperRoster.cpp
690895cfe0f128ee3fc375a357ab99b0b98394b6 27-Aug-2014 Yin-Chia Yeh <yinchiayeh@google.com> cameraservice: decrease zsl metadata queue size by 1

Zsl buffer needs to be longer than metadata queue to ensure that
oldest metadata can always find a match in buffer queue.
Since we don't want to add memory overhead, decrease metadata
queue size by one serves the same purpose.

bug 17264283

Change-Id: Ic53441cc29c98e57d3345f5845d92839d0ce6faf
ervices/camera/libcameraservice/api1/client2/ZslProcessor3.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
edia/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
edia/libmediaplayerservice/nuplayer/NuPlayerRenderer.h
4789dea53f9e4404762cbeceafa7b54cf67dc77a 26-Aug-2014 Marco Nelissen <marcone@google.com> Fix memory leak in getConnectionState

Turns out having an sp<> point at the containing object doesn't really
work so well.

Bug: 17210991
Change-Id: I4bcb0c38adffc574d661f0772583357868f6c5b4
ervices/audiopolicy/AudioPolicyManager.cpp
ervices/audiopolicy/AudioPolicyManager.h
1754351d9199721e7e7943461689e399ef015260 06-Aug-2014 Eino-Ville Talvala <etalvala@google.com> CameraService: Correct API2 error handling

- Add more error codes to the binder camera2 callbacks
- Translate HAL errors to callback errors
- When flushing, report failures for queued requests
- Treat stream config failure as nonfatal
- Send request errors when buffers aren't available for captures

Bug: 15524101
Bug: 14448494
Bug: 11272459
Bug: 17160301
Change-Id: I81aa54e805a9cce1cb8a6a9374549daa7666deb2
nclude/camera/camera2/ICameraDeviceCallbacks.h
ervices/camera/libcameraservice/device3/Camera3Device.cpp
ervices/camera/libcameraservice/device3/Camera3Device.h
ervices/camera/libcameraservice/device3/Camera3Stream.cpp
ervices/camera/libcameraservice/device3/Camera3Stream.h
ervices/camera/libcameraservice/device3/Camera3StreamInterface.h
60ffbe05857b7583f4c70c31914947476a908b5b 27-Aug-2014 Marco Nelissen <marcone@google.com> Merge "Fix memory leak in getConnectionState" into lmp-dev
7bf083ed328d33499782215877c6c962706ca764 27-Aug-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 9dd4a2ddd7caf8cbe50d8a76e0ec3e0274d2bce6
9dd4a2ddd7caf8cbe50d8a76e0ec3e0274d2bce6 27-Aug-2014 Andy Hung <hunga@google.com> Merge "Fix AudioMixer MONO muted track handling" into lmp-dev
5bc5b4fbf16a0331a4f2f1d16585932087ee41c1 27-Aug-2014 Wei Jia <wjia@google.com> Merge "NuPlayer: set controlledByApp to true when creating Surface." into lmp-dev
1c874b152291361fb5a05fc9da87aba664898fd5 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
edia/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp
961ec21a5878517ce6db27bad8da269637c45a44 26-Aug-2014 Marco Nelissen <marcone@google.com> Fix memory leak in getConnectionState

Turns out having an sp<> point at the containing object doesn't really
work so well.

Bug: 17210991
Change-Id: I4bcb0c38adffc574d661f0772583357868f6c5b4
ervices/audiopolicy/AudioPolicyManager.cpp
ervices/audiopolicy/AudioPolicyManager.h
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
edia/libmediaplayerservice/nuplayer/NuPlayer.cpp
9a8b629ad56f97e0178aa7352bafd66ec6b0ced3 26-Aug-2014 Chong Zhang <chz@google.com> do string compare with mime immediately after we get the value

Bug: 17210803
Change-Id: I4d20dd4b95d18251c18a371bd8f89b1320b38879
edia/libmediaplayerservice/nuplayer/GenericSource.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
edia/libmediaplayerservice/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
edia/libmediaplayerservice/nuplayer/GenericSource.cpp
a824e8a2ce6b15588b765a3a81f41ea5349f8a0b 26-Aug-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to d42173a44721af1a600b9c8599bc736394fcc724
395db4bfa5b43a839f95632676d59cde99a9840d 26-Aug-2014 Andy Hung <hunga@google.com> Fix AudioMixer MONO muted track handling

Incorrect handling caused "stereo" mode to be used.
Augmented error handling to print more debug info.

Bug: 17208475
Change-Id: I5bcaf0ba5bd5a4f7d4885f8cce43bbf42e5f1e6b
ervices/audioflinger/AudioMixer.cpp
8ba2a6ec5c50e99c295309d93fd650ded2eb3d85 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
edia/libmediaplayerservice/MediaPlayerFactory.cpp
edia/libmediaplayerservice/MediaPlayerFactory.h
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
edia/libmediaplayerservice/MediaPlayerFactory.cpp
edia/libmediaplayerservice/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
4b15e370445bb02fa82af4be116bea7a827fb053 25-Aug-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 34febc9654ba3b447239b7761ce4c93ca9a20b5f
f24c58cda916333a3f838be12a9c56c14291cb6b 24-Aug-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 34febc9654ba3b447239b7761ce4c93ca9a20b5f
87603c0dd1f4e62e52feffa8d6e960ad21f68893 21-Aug-2014 Lajos Molnar <lajos@google.com> NuPlayer: remember and resubmit CSDs after flush

Bug: 17118001
Change-Id: I09bbefd4c05de0db1c593e8d6d38859358a20ebb
edia/libmediaplayerservice/nuplayer/NuPlayer.cpp
edia/libmediaplayerservice/nuplayer/NuPlayer.h
edia/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp
edia/libmediaplayerservice/nuplayer/NuPlayerDecoder.h
a53f18bb562646daf4466af79e4470e859ec794e 23-Aug-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 848726d845b51da04364bdaf4ec915c85d593c0e
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
edia/libstagefright/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
edia/libstagefright/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
edia/libmediaplayerservice/nuplayer/NuPlayer.cpp
edia/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp
edia/libmediaplayerservice/nuplayer/NuPlayerDriver.h
d1de9bb33a2f645fb9dc54e7fc69ca45304850a5 22-Aug-2014 Wei Jia <wjia@google.com> Merge "ACodec: handle errors related to native window." into lmp-dev
615fb231ac0c750af41d35dfe13e752630fea00b 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
nclude/media/stagefright/DataSource.h
edia/libmediaplayerservice/nuplayer/GenericSource.cpp
edia/libmediaplayerservice/nuplayer/GenericSource.h
edia/libstagefright/DataSource.cpp
fe6ac9fee19c932f074c48eae9f119211021fc8c 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
edia/libmediaplayerservice/MediaPlayerService.cpp
edia/libmediaplayerservice/MediaPlayerService.h
edia/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
43e36e9ec905f8bc0bbc7afc495e3a298c168a66 20-Aug-2014 Chong Zhang <chz@google.com> print warning if offset != buffer size

Bug: 17110981
Change-Id: Iacceca203372f4c06ff5ef7ce98edd5554727b64
edia/libstagefright/rtsp/AMPEG4ElementaryAssembler.cpp
3fb9f68dea5d991288f0ea8037742b50c7df5767 20-Aug-2014 Wei Jia <wjia@google.com> ACodec: handle errors related to native window.

Bug: 17068327
Bug: 13133027
Change-Id: I9875e524222a10d1be26be5a84b9633b4aaeb210
edia/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp
edia/libstagefright/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
a97e0db6befd47c4b4c96de7657879e76a73d0ec 22-Aug-2014 Zhijun He <zhijunhe@google.com> Merge "Camera API1: remove unnecessary buffer count check" into lmp-dev
2a3cc9a64330dd36e466fe5e1b634146f2d641c1 22-Aug-2014 Chong Zhang <chz@google.com> add buffering update to GenericSource

Bug: 17182378

Change-Id: Ib86f3f522d7ea635489edd2b512adb7f4b27e381
edia/libmediaplayerservice/nuplayer/GenericSource.cpp
edia/libmediaplayerservice/nuplayer/GenericSource.h
edia/libmediaplayerservice/nuplayer/NuPlayer.cpp
edia/libmediaplayerservice/nuplayer/NuPlayerSource.h
61deb78a8a608955e120469ea7a5d39e652b2ae8 22-Aug-2014 Zhijun He <zhijunhe@google.com> Camera API1: remove unnecessary buffer count check

This check doesn't work with ZSL use case. Since the ZSL is both an input and
output stream, When an input buffer is acquired, checking the handout buffer
count for that stream could trigger false alarm when all the output buffers
are sent to hal, instead, we should wait for an output buffer to return.

Bug: 17188380
Change-Id: I7eb166eb49d2f063189d993195ef389d2cf4f2b4
ervices/camera/libcameraservice/device3/Camera3IOStreamBase.cpp
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
edia/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp
edia/libmediaplayerservice/nuplayer/NuPlayerDriver.h
5f42113f21c31802e044f0a73351eef35e32feaf 22-Aug-2014 Lajos Molnar <lajos@google.com> stagefright: allow to resubmit CSDs for SoftAAC2

Bug: 17118001
Change-Id: I45469b9aa6146edf3265b0f05f5ce3592b5daca6
edia/libstagefright/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
edia/libstagefright/codecs/aacdec/SoftAAC2.cpp
fa1fc7086313f2f1868cae4c1a5698e592a437cb 22-Aug-2014 Yin-Chia Yeh <yinchiayeh@google.com> Merge "Camera: fix triggerId logic" into lmp-dev
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
nclude/media/stagefright/DataSource.h
edia/libmediaplayerservice/nuplayer/GenericSource.cpp
edia/libmediaplayerservice/nuplayer/GenericSource.h
edia/libstagefright/DataSource.cpp
ef8ae4cbec0c9f49a24625d4316ec9bfde4e75c3 22-Aug-2014 Andy Hung <hunga@google.com> Merge "Fix SoundPool and MediaPlayerService buffer overflow" into lmp-dev
5746c86c90cd65be2b79d94a53877d83292bac81 21-Aug-2014 Ruben Brunk <rubenbrunk@google.com> camera2: Fix CameraUtils orientation for front camera.

Bug: 16637957
Change-Id: If6d213794a92eb60b8a333546670ca868b75e5fc
amera/CameraUtils.cpp
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
edia/libmediaplayerservice/MediaPlayerService.cpp
edia/libmediaplayerservice/MediaPlayerService.h
edia/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
c9ad42d5232e7b6d4c9b5221643ffcb956ea6fe5 22-Aug-2014 Ruben Brunk <rubenbrunk@google.com> Merge "camera2: Fix CameraUtils orientation for front camera." into lmp-dev
1da8c89a9d4a2319bb939771e43960c118445329 22-Aug-2014 Igor Murashkin <iam@google.com> Merge "camera: Configure streams immediately when API2 does configuration" into lmp-dev
c00a25ccce0734bf5627cf02d0c4fb3cf051ce15 21-Aug-2014 Yin-Chia Yeh <yinchiayeh@google.com> Camera: fix triggerId logic

Fix missing triggerId introduced by previous cleanup change.

bug 17108154
bug 17053130

Change-Id: Ifda55d5fbe992d98f335a8427aa256d78a856586
ervices/camera/libcameraservice/device3/Camera3Device.cpp
ervices/camera/libcameraservice/device3/Camera3Device.h
b3afa1e3c2af242e0d31a7619713b170d43c7e88 21-Aug-2014 Ruben Brunk <rubenbrunk@google.com> camera2: Fix CameraUtils orientation for front camera.

Bug: 16637957
Change-Id: If6d213794a92eb60b8a333546670ca868b75e5fc
amera/CameraUtils.cpp
0e522ed229053c7d0238425e407431fc08cd7c63 21-Aug-2014 Yin-Chia Yeh <yinchiayeh@google.com> Merge "camera: zsl: remove AF check if no focser presents" into lmp-dev
754fb0225369123ef6e369fd91c48071dcf6057c 21-Aug-2014 Yin-Chia Yeh <yinchiayeh@google.com> camera: zsl: remove AF check if no focser presents

If there is no focuser, don't check AF state while picking ZSL
candidate frames.

bug 17164077

Change-Id: Ib56e260249dcfb1b3bafea22abeb3abeae4e2c1a
ervices/camera/libcameraservice/api1/client2/ZslProcessor3.cpp
ervices/camera/libcameraservice/api1/client2/ZslProcessor3.h
bdbdcadd1934f82027b4a296e66069d8b0021a55 21-Aug-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 01047680ac57712303e259f485efd9cb97e9a99a
01047680ac57712303e259f485efd9cb97e9a99a 21-Aug-2014 Wei Jia <wjia@google.com> Merge "NuPlayerDriver: include lapsed time when reporting current position." into lmp-dev
afcb794a3d837764f0e1ce036796b4f1c5202190 20-Aug-2014 Marco Nelissen <marcone@google.com> Fix typo in comment

Bug: 14057920
Change-Id: I51c4d47b9e175ef789ed3c51d59c9eda77edc1e0
edia/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp
7f5a4e3e2e64b53e243a36c711551c0a361d1554 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
edia/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp
edia/libmediaplayerservice/nuplayer/NuPlayerDriver.h
15506a6582fb86567c6887c4c426d44be02d12af 21-Aug-2014 Wei Jia <wjia@google.com> NuPlayerDriver: include lapsed time when reporting current position.

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

Bug: 17108024

Change-Id: I0a970e6476d0f739e65d2200d0f5220dee8d36ef
edia/libmediaplayerservice/MediaPlayerFactory.cpp
edia/libmediaplayerservice/MediaPlayerFactory.h
e2d167eb689d7a536805f950c31f11b9e9c578ae 20-Aug-2014 Igor Murashkin <iam@google.com> camera: Configure streams immediately when API2 does configuration

This makes the configuration more eager (no more waiting until the first
request) and also allows any errors to immediately be sent back to the
client.

Bug: 16629195
Change-Id: I0c365bc8f760466916dcc089217a43c43f9f4c9d
ervices/camera/libcameraservice/api2/CameraDeviceClient.cpp
ervices/camera/libcameraservice/common/CameraDeviceBase.h
ervices/camera/libcameraservice/device2/Camera2Device.cpp
ervices/camera/libcameraservice/device2/Camera2Device.h
ervices/camera/libcameraservice/device3/Camera3Device.cpp
ervices/camera/libcameraservice/device3/Camera3Device.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
edia/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp
f106b1993143df44282777253244ce67974c9d4a 28-Jul-2014 Robert Shih <robertshih@google.com> SampleTable: check integer overflow during table alloc

Bug: 15328708
Bug: 15342615
Bug: 15342751
Change-Id: I6bb110a1eba46506799c73be8ff9a4f71c7e7053
(cherry picked from commit edd4a76eb4747bd19ed122df46fa46b452c12a0d)
edia/libstagefright/SampleTable.cpp
7b7a3cadbf042632cb46026588c700ab83aec11d 20-Aug-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to a8143b2bbaabc3f704b05078ccc930dbc28591b9
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
edia/libstagefright/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
edia/libmediaplayerservice/nuplayer/NuPlayer.cpp
edia/libmediaplayerservice/nuplayer/NuPlayer.h
9f0446d8842b5c6fb3a48c33a447632687ac581e 19-Aug-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 1b786a35ddd072765348eee2bffa2009c1b14da3
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
edia/libmediaplayerservice/nuplayer/NuPlayer.cpp
edia/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp
edia/libstagefright/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
edia/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp
edia/libmediaplayerservice/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
edia/libmediaplayerservice/StagefrightRecorder.cpp
5596d7c4ad388d1757398181b3a1453d731a1b41 20-Aug-2014 Wei Jia <wjia@google.com> Merge "Allow audio and video flushed separately." into lmp-dev
657369328359ed8230c5ec4da07a380d5eccb0f9 20-Aug-2014 Igor Murashkin <iam@google.com> Merge changes I116ee711,Ieb3fc61f into lmp-dev

* changes:
camera: hal3: Remove register_stream setprop check
camera: Allow shutter sounds to be disabled from camera2 api
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
edia/libmediaplayerservice/nuplayer/NuPlayer.cpp
edia/libmediaplayerservice/nuplayer/NuPlayer.h
c758f2276f9f9fca9ea24a6647361726acb03646 20-Aug-2014 Igor Murashkin <iam@google.com> camera: hal3: Remove register_stream setprop check

camera3_device_t::register_stream must always be NULL in HAL3.2+ cameras

Bug: 13914251
Change-Id: I116ee71135a827c8b4db61cd91f56ba56da3f0ef
ervices/camera/libcameraservice/device3/Camera3Stream.cpp
a858ea0495c887621a2fd9c0afc13780deccb597 19-Aug-2014 Igor Murashkin <iam@google.com> camera: Allow shutter sounds to be disabled from camera2 api

When using the connectLegacy binder interface (available only
through an @hide java api), then consider the camera to be in the
camera2 api legacy mode.

In legacy mode, allow disabling the shutter sound unconditionally.

Bug: 17109582
Change-Id: Ieb3fc61ff111d792cc657c018e278349c25472cf
ervices/camera/libcameraservice/CameraService.cpp
ervices/camera/libcameraservice/CameraService.h
ervices/camera/libcameraservice/api1/Camera2Client.cpp
ervices/camera/libcameraservice/api1/Camera2Client.h
ervices/camera/libcameraservice/api1/CameraClient.cpp
ervices/camera/libcameraservice/api1/CameraClient.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
edia/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
97c7fa1b1596a062147f034a2b44781193c052cf 19-Aug-2014 Yin-Chia Yeh <yinchiayeh@google.com> Merge "cameraservice: update supportedFocusModes for api1" into lmp-dev
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
edia/libstagefright/httplive/LiveSession.cpp
1b786a35ddd072765348eee2bffa2009c1b14da3 19-Aug-2014 Eino-Ville Talvala <etalvala@google.com> Merge "camera: Fix setParameters for Preview FPS single/range values" into lmp-dev
0b88a62d4d5ac1e515721e587cdf9bcec191812b 19-Mar-2014 Igor Murashkin <iam@google.com> camera: Fix setParameters for Preview FPS single/range values

As a workaround, duplicate CameraParameters into CameraParameters2 to
prevent ABI break for some camera HALs that directly link into
CameraParameters.

CameraParameters2 implements the real fixes needed in the framework,
while CameraParameters is left in to satisfy older camera HALs.

Bug: 12609188
Bug: 16654949
Change-Id: I82ea6f5de2183dd046d4bf5683600c97f37ab4da
amera/Android.mk
amera/CameraParameters2.cpp
nclude/camera/CameraParameters2.h
ervices/camera/libcameraservice/api1/client2/Parameters.cpp
ervices/camera/libcameraservice/api1/client2/Parameters.h
735f45fbc37d7905ffb722f40727edbed82319b7 19-Aug-2014 Glenn Kasten <gkasten@google.com> Fix memory access error due to race during fast track removal

Bug: 16205169
Change-Id: Ie15ec2a737b6ddd16b2d26030d01564ff70177f5
ervices/audioflinger/Threads.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
edia/libstagefright/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
edia/libmediaplayerservice/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
edia/libmediaplayerservice/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
edia/libmediaplayerservice/MediaPlayerService.cpp
a7ee3549823af3dc4b22284f1a2fe4fbf31cf30b 19-Aug-2014 Ronghua Wu <ronghuawu@google.com> Merge "stagefright: Do not add silence data for compress offload" into lmp-dev
d5977eb1e79b3df8c74f40284ae126636cc938b6 18-Aug-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 426c719a5f3b4d88480eb35a7b0b373f672ea3cb
e39aedb3baf12614eed54e60d4201ddbfe5e0de1 17-Aug-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 426c719a5f3b4d88480eb35a7b0b373f672ea3cb
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
edia/libstagefright/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
ad07410c0a31a474a1fac12f9bbe88287082ed45 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
edia/libmediaplayerservice/nuplayer/GenericSource.cpp
edia/libmediaplayerservice/nuplayer/GenericSource.h
edia/libmediaplayerservice/nuplayer/HTTPLiveSource.cpp
edia/libmediaplayerservice/nuplayer/NuPlayer.cpp
edia/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp
edia/libmediaplayerservice/nuplayer/NuPlayerDriver.h
edia/libmediaplayerservice/nuplayer/RTSPSource.cpp
edia/libmediaplayerservice/nuplayer/RTSPSource.h
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
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/MediaCodec.cpp
edia/libstagefright/Utils.cpp
edia/libstagefright/colorconversion/SoftwareRenderer.cpp
edia/libstagefright/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
edia/libstagefright/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
edia/libstagefright/data/media_codecs_google_audio.xml
edia/libstagefright/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
edia/libstagefright/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
nclude/media/MediaCodecInfo.h
edia/libmedia/MediaCodecInfo.cpp
edia/libstagefright/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
edia/libmediaplayerservice/nuplayer/NuPlayer.cpp
edia/libmediaplayerservice/nuplayer/NuPlayer.h
80ef94b5a7daa2d48ca72501e335a648dc67bc1d 14-Aug-2014 Yin-Chia Yeh <yinchiayeh@google.com> cameraservice: update supportedFocusModes for api1

Do not list infinity focus mode if the focuser is not calibrated.

bug 13933979

Change-Id: I677ed22305703ac09eeaf986f5bc2a680cececd8
ervices/camera/libcameraservice/api1/client2/Parameters.cpp
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
edia/libmediaplayerservice/nuplayer/GenericSource.cpp
edia/libmediaplayerservice/nuplayer/GenericSource.h
edia/libmediaplayerservice/nuplayer/HTTPLiveSource.cpp
edia/libmediaplayerservice/nuplayer/NuPlayer.cpp
edia/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp
edia/libmediaplayerservice/nuplayer/NuPlayerDriver.h
edia/libmediaplayerservice/nuplayer/RTSPSource.cpp
edia/libmediaplayerservice/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
edia/libstagefright/DataSource.cpp
a8a20985d427ded6b7b8a0951e8b360917091475 14-Aug-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 44a5a202101614302f607228d4357496b350bab4
2bb58b46df985d119722ee5ce444c845195f3745 13-Aug-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to e6e18e8de729316b3fac7733f9ebc7f1b3feba95
47bf8d8f0242bbe9cfa777c96e41e5fcd5294ee4 13-Aug-2014 Jean-Michel Trivi <jmtrivi@google.com> Merge "audiopolicy: add dump for audio patches" into lmp-dev
57ffbaa2e1f11d766fb9fae28de50c87d2371199 11-Aug-2014 Zhijun He <zhijunhe@google.com> Camera API1: Ignore the video size change during recording

Ignore the video size parameter change when recording is active.

Bug: 16524513
Change-Id: I55b7c961c06199764486f48bc2187838c2279606
ervices/camera/libcameraservice/api1/client2/Parameters.cpp
44a5a202101614302f607228d4357496b350bab4 13-Aug-2014 Chong Zhang <chz@google.com> Merge "cache up to 200K bytes (instead of 10 buffers) in DecoderPassThrough" into lmp-dev
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
edia/libmediaplayerservice/nuplayer/NuPlayerDecoderPassThrough.cpp
edia/libmediaplayerservice/nuplayer/NuPlayerDecoderPassThrough.h
e6e18e8de729316b3fac7733f9ebc7f1b3feba95 13-Aug-2014 Lajos Molnar <lajos@google.com> Merge "stagefright: allow scenarios when dequeueBufferFromNativeWindow fails" into lmp-dev
49d00ad9164ea5ce48c85765a2b6460d9b457d38 21-Jul-2014 Glenn Kasten <gkasten@google.com> Fix overruns when capturing with resampling

Bug: 16658148
Change-Id: I2dd04b23a143e0948b299d408790e7a46b5a53b0
ervices/audioflinger/Threads.cpp
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
edia/libstagefright/ACodec.cpp
ca05eb4b0194bb9b37a5261fa91f89add7a6df53 12-Aug-2014 Zhijun He <zhijunhe@google.com> Merge "Camera API1: Ignore the video size change during recording" into lmp-dev
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
nclude/media/MediaCodecInfo.h
edia/libmedia/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
nclude/media/MediaCodecInfo.h
edia/libmedia/MediaCodecInfo.cpp
edia/libstagefright/MediaCodecList.cpp
c572362427cdfda53142ad0b44818c269c1d9db1 11-Aug-2014 Zhijun He <zhijunhe@google.com> Camera API1: Ignore the video size change during recording

Ignore the video size parameter change when recording is active.

Bug: 16524513
Change-Id: I55b7c961c06199764486f48bc2187838c2279606
ervices/camera/libcameraservice/api1/client2/Parameters.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
edia/libmediaplayerservice/nuplayer/NuPlayer.cpp
306c92dabc524f408445f7da2524c7a5e77ade63 11-Aug-2014 Andy Hung <hunga@google.com> Merge "Extend downsampling ratios greater than 2:1" into lmp-dev
de975ca87c3dbdf9b7d92dae54b3446670b2a50e 11-Aug-2014 Igor Murashkin <iam@google.com> Merge "camera: Allow Camera#getParameters to be called by mediaserver anytime" into lmp-dev
e7a1737c92cf2e84754ffbc52cfec8edeffcbc75 12-Aug-2014 Ricardo Garcia <rago@google.com> Merge "Fix to support mono in effect buffer allocation." into lmp-dev
726b6a7540ac997928df1a14dfede872a82f6210 11-Aug-2014 Ricardo Garcia <rago@google.com> Fix to support mono in effect buffer allocation.

Since effects are now enabled for recording, mono cases are possible
and needed to be correctly allocated.

Bug: 16917961
Change-Id: I760fc421f9f90fabb3f0deadd5f9dc61cd284371
ervices/audioflinger/Effects.cpp
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
nclude/media/AudioResamplerPublic.h
edia/libmedia/AudioTrack.cpp
ervices/audioflinger/AudioResamplerDyn.cpp
ervices/audioflinger/Threads.cpp
088308a685ee54a476c96649af48ca3eca0bdd9c 11-Aug-2014 Zhijun He <zhijunhe@google.com> Merge "Camera2/3: Cleanup the jpeg buffer size calcaulation logic" into lmp-dev
edf103987d71f09dc2acb0a971cb40ff6608f1a5 11-Aug-2014 Jean-Michel Trivi <jmtrivi@google.com> Merge "Update audio ports with profile capabilities" into lmp-dev
28c9b6f298134624cb52b1af4ed8716dddb983d3 08-Aug-2014 Zhijun He <zhijunhe@google.com> Camera2/3: Cleanup the jpeg buffer size calcaulation logic

- Only one place calculating the jpeg size-the device layer, Camera2Device and
Camera3Device.
- Remove size argument for CameraDeviceBase and cleanup related code.

Bug: 14327010
Change-Id: I45d2ab4859ee0cc9273e579254f0569108c748f1
ervices/camera/libcameraservice/api1/client2/CallbackProcessor.cpp
ervices/camera/libcameraservice/api1/client2/JpegProcessor.cpp
ervices/camera/libcameraservice/api1/client2/StreamingProcessor.cpp
ervices/camera/libcameraservice/api1/client2/ZslProcessor.cpp
ervices/camera/libcameraservice/api2/CameraDeviceClient.cpp
ervices/camera/libcameraservice/api_pro/ProCamera2Client.cpp
ervices/camera/libcameraservice/common/CameraDeviceBase.h
ervices/camera/libcameraservice/device2/Camera2Device.cpp
ervices/camera/libcameraservice/device2/Camera2Device.h
ervices/camera/libcameraservice/device3/Camera3Device.cpp
ervices/camera/libcameraservice/device3/Camera3Device.h
f17026dfef596cf1c8008fda20f1f2ad23a3df3a 10-Aug-2014 Jean-Michel Trivi <jmtrivi@google.com> Update audio ports with profile capabilities

When opening an output, import the profile capabilities associated
with the device into the AudioPort.

Bug 10549017

Change-Id: If102f5623457542d2c1407ada303c71e43d19a08
ervices/audiopolicy/AudioPolicyManager.cpp
ervices/audiopolicy/AudioPolicyManager.h
4d41695d45e2c7211899afa94b20e32120b2b7e0 10-Aug-2014 Eric Laurent <elaurent@google.com> audiopolicy: add dump for audio patches

Bug: 10549017.
Change-Id: I896c8e16c8cf7490bab75295903620a76236f571
ervices/audiopolicy/AudioPolicyManager.cpp
ervices/audiopolicy/AudioPolicyManager.h
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>
edia/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp
edia/libmediaplayerservice/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
f7999047b5a555b7acd7a9e56794c028a74b4a9a 09-Aug-2014 Robert Shih <robertshih@google.com> Merge "NuPlayer: getSelectedTrack" into lmp-dev
7c4f0d757bfeedaab4b7ef4ccf5b0a72ec8f4306 10-Jul-2014 Robert Shih <robertshih@google.com> NuPlayer: getSelectedTrack

Change-Id: If5251f89b881e7f268e11a06cd3685d794c958b6
nclude/media/mediaplayer.h
edia/libmediaplayerservice/nuplayer/NuPlayer.cpp
edia/libmediaplayerservice/nuplayer/NuPlayer.h
edia/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp
edia/libmediaplayerservice/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
edia/libstagefright/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
nclude/media/IOMX.h
nclude/media/stagefright/ACodec.h
edia/libmedia/IOMX.cpp
edia/libstagefright/ACodec.cpp
edia/libstagefright/OMXClient.cpp
edia/libstagefright/include/OMX.h
edia/libstagefright/include/OMXNodeInstance.h
edia/libstagefright/omx/OMX.cpp
edia/libstagefright/omx/OMXNodeInstance.cpp
48449403a1946653074591829e8c39c8000918d1 09-Aug-2014 Eric Laurent <elaurent@google.com> Merge "audio policy: enable more than one sink per audio patch." into lmp-dev
5f24404277a4ce2bdfd2a38c45abb48b7aeccad4 09-Aug-2014 Lajos Molnar <lajos@google.com> Merge "Fix WAVExtractor to output full audio frames only" into lmp-dev
874c4287a4e49c59ac88767751dce00fcd3edb73 09-Aug-2014 Eric Laurent <elaurent@google.com> audio policy: enable more than one sink per audio patch.

Allow creation of audio patches with more than one sink.
More than one sink is enabled when:
- Connecting an input device to output devices on the same audio HW module.
- Connecting an output mix to output devices on the same audio HA module.

All other patches are limited to one sink.

Bug: 16879363.
Change-Id: I95be6948ef29df64e51e5b8ace38c2db7f3e89f2
ervices/audioflinger/PatchPanel.cpp
ervices/audiopolicy/AudioPolicyManager.cpp
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
edia/libstagefright/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
edia/libmediaplayerservice/nuplayer/GenericSource.cpp
edia/libmediaplayerservice/nuplayer/HTTPLiveSource.cpp
edia/libmediaplayerservice/nuplayer/NuPlayer.cpp
edia/libmediaplayerservice/nuplayer/NuPlayer.h
edia/libmediaplayerservice/nuplayer/NuPlayerSource.h
edia/libmediaplayerservice/nuplayer/RTSPSource.cpp
edia/libmediaplayerservice/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
nclude/media/stagefright/ACodec.h
edia/libstagefright/ACodec.cpp
edia/libstagefright/codecs/aacdec/SoftAAC2.cpp
15ff76c99482eab01934cf0f55c815a85cf06f35 08-Aug-2014 Sasha Levitskiy <sanek@google.com> Merge "libstagefright: foundation: Add syntactic sugar to the cast." into lmp-dev
55971df8768a2e613717a14251d56993b9322b5e 08-Aug-2014 Sasha Levitskiy <sanek@google.com> libstagefright: foundation: Add syntactic sugar to the cast.

Change-Id: I0b6b3ae440addd4891c26b0639bd6e647a7b031e
edia/libstagefright/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)
edia/libstagefright/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)
edia/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/Filt_6k_7k_opt.s
edia/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/pred_lt4_1_opt.s
edia/libstagefright/codecs/amrwbenc/src/asm/ARMV7/Filt_6k_7k_neon.s
edia/libstagefright/codecs/amrwbenc/src/asm/ARMV7/pred_lt4_1_neon.s
edia/libstagefright/codecs/mp3dec/src/asm/pvmp3_polyphase_filter_window_gcc.s
edia/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_DecodeCoeffsToPair_s.S
edia/libstagefright/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
edia/libmediaplayerservice/nuplayer/GenericSource.cpp
edia/libmediaplayerservice/nuplayer/GenericSource.h
edia/libmediaplayerservice/nuplayer/NuPlayer.cpp
1198a3394a21d3c31b19395b124c77f09a8f0924 08-Aug-2014 Colin Cross <ccross@android.com> libstagefright_foundation: fix build

Change-Id: If61766efa8834df175bd5758c760344364458d4a
edia/libstagefright/foundation/AString.cpp
ebe865b175b3f1b2a9212cea7b008937c919d8f3 08-Aug-2014 Igor Murashkin <iam@google.com> camera: Allow Camera#getParameters to be called by mediaserver anytime

This fixes a crash if the camera was locked by the media recorder and
another process tried to get the legacy parameters (for the camera
characteristics).

Bug: 16695955
Change-Id: I945a16a686a6987150c8754b5296353e76e5afa0
ervices/camera/libcameraservice/api1/Camera2Client.cpp
ervices/camera/libcameraservice/api1/CameraClient.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
edia/libmediaplayerservice/nuplayer/NuPlayer.cpp
0912a5738d6baf2df7cd62e877240e3807b4b21f 08-Aug-2014 Andy Hung <hunga@google.com> Merge "Fix effect and mono sink handling." into lmp-dev
389cfdbb9a92a438a0d7710321c2964c7ad55eca 08-Aug-2014 Andy Hung <hunga@google.com> Fix effect and mono sink handling.

Do not permit mixing to mono sink in AudioFlinger.
Allow effects on mono sink if not Mixer thread (e.g. Record).

Bug: 16863095
Change-Id: I8b232fc1fb3f07bf017020c5d4f9ace644dec6d8
ervices/audioflinger/AudioFlinger.h
ervices/audioflinger/Threads.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
nclude/media/stagefright/MediaCodec.h
nclude/media/stagefright/MediaErrors.h
edia/libstagefright/ACodec.cpp
edia/libstagefright/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
nclude/media/stagefright/ACodec.h
edia/libstagefright/ACodec.cpp
edia/libstagefright/OMXCodec.cpp
1381d4b5c0385aec3741073e5998773b064c1fb0 08-Aug-2014 Lajos Molnar <lajos@google.com> media/playerservice: add getCodecList() to MediaPlayerService

Bug: 11990470
Change-Id: I8fa45946fd9b76f9b975fc59062819c57e6881ef
nclude/media/IMediaPlayerService.h
edia/libmedia/IMediaPlayerService.cpp
edia/libmediaplayerservice/MediaPlayerService.cpp
edia/libmediaplayerservice/MediaPlayerService.h
edia/libstagefright/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
nclude/media/IMediaCodecList.h
nclude/media/MediaCodecInfo.h
nclude/media/stagefright/MediaCodecList.h
nclude/media/stagefright/OMXCodec.h
edia/libmedia/Android.mk
edia/libmedia/IMediaCodecList.cpp
edia/libmedia/MediaCodecInfo.cpp
edia/libstagefright/MediaCodec.cpp
edia/libstagefright/MediaCodecList.cpp
edia/libstagefright/OMXCodec.cpp
bf9b95d712a24b654761cb9fea0d94d383cfc661 08-Aug-2014 Chong Zhang <chz@google.com> delay data source creation for GenericSource prepare time

Bug: 16708180

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

Bug: 11990470
Change-Id: If43ada5d2e768931f4409e499eaa268edade0500
nclude/media/stagefright/foundation/AString.h
edia/libstagefright/foundation/AString.cpp
3659445a8b71afba9927b9d0d8ac41782278bde5 07-Aug-2014 Zhijun He <zhijunhe@google.com> Merge "Camera: Need consider AF state for ZSL buffer selection" into lmp-dev
ef28532ffcc5bef44301f0c63d5abf3c2feb4921 07-Aug-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 0893eaf7d21e3a50b81324673eaa91a6b77a39c2
7e4c0033c5d2f9d5f53f520a9b0a2fcb8023c810 07-Aug-2014 Zhijun He <zhijunhe@google.com> Camera: Need consider AF state for ZSL buffer selection

Bug: 16569983
Change-Id: I65e604e382ac0b98777155ad480ec3f6071e1a76
ervices/camera/libcameraservice/api1/client2/ZslProcessor3.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
edia/libmediaplayerservice/nuplayer/NuPlayer.cpp
7f04ec2a4ec94ada7ef89db8c50fd1e5c3a93a3b 07-Aug-2014 Eric Laurent <elaurent@google.com> Merge "audio policy: add support for USB devices for voice call" into lmp-dev
a9522673f3076ea937eb2912945d7ed646ca05df 06-Aug-2014 Lajos Molnar <lajos@google.com> stagefright: move ARRAY_SIZE to foundation

Bug: 11990470
Change-Id: Ifae790b774a0fb210acbe33a1310d3d6ba46e7fa
nclude/media/stagefright/foundation/ABase.h
edia/libstagefright/include/SoftVideoDecoderOMXComponent.h
95b980dcc3aa2af687da2ab4e4ad2286a8c2040b 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
nclude/media/stagefright/DataSource.h
nclude/media/stagefright/MediaExtractor.h
edia/libmediaplayerservice/nuplayer/GenericSource.cpp
edia/libmediaplayerservice/nuplayer/GenericSource.h
edia/libmediaplayerservice/nuplayer/NuPlayer.cpp
edia/libstagefright/DataSource.cpp
edia/libstagefright/include/WVMExtractor.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
nclude/media/stagefright/DataSource.h
nclude/media/stagefright/MediaExtractor.h
edia/libmediaplayerservice/nuplayer/GenericSource.cpp
edia/libmediaplayerservice/nuplayer/GenericSource.h
edia/libmediaplayerservice/nuplayer/NuPlayer.cpp
edia/libstagefright/DataSource.cpp
edia/libstagefright/include/WVMExtractor.h
c2730ba7c5e9559b7499ef5e0d7742deb18c5110 21-Jul-2014 Eric Laurent <elaurent@google.com> audio policy: add support for USB devices for voice call

Add possibility to use sink and source devices not on
the primary HW module for voice calls (e.g. USB headsets).

Bug: 15520724.

Change-Id: Ib27db4ba759b6d91ea1104dc2e35c87733517b30
ervices/audioflinger/Tracks.cpp
ervices/audiopolicy/AudioPolicyManager.cpp
ervices/audiopolicy/AudioPolicyManager.h
29e09664c2c5b49d78f2666d38a812502a36e26b 07-Aug-2014 Chong Zhang <chz@google.com> Merge "some fixes for crash when extractor creation fails" into lmp-dev
0a0e5f02037f396237461a9840b2fc7271812bdc 06-Aug-2014 Eric Laurent <elaurent@google.com> Merge "AudioSystem: add API to query audio HW sync source" into lmp-dev
7f3f2fa386b8dd917022663bcb01f10ea67061be 06-Aug-2014 Ricardo Garcia <rago@google.com> Merge "MediaServer crashing and audio effects not applied to TTS." into lmp-dev
322bab26dc3fe9bd9c1cbb829dc62ff44f1ae810 06-Aug-2014 Ricardo Garcia <rago@google.com> MediaServer crashing and audio effects not applied to TTS.

A memclear in the EffectChain was out of bounds.

Bug 15432115
Bug 16845751

Change-Id: Ib0adc7fa730d630bb71fb87d51163a26149b16e2
ervices/audioflinger/Effects.cpp
0893eaf7d21e3a50b81324673eaa91a6b77a39c2 07-Aug-2014 Robert Shih <robertshih@google.com> Merge "httplive: timestamp reporting, track selection" into lmp-dev
8ff6582f056c5f7f1d49085e3939d7cfa0e1b3d7 06-Aug-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 92ce4715315bddd158c7d4028556632f0547e3b9
309aa8bf5e4cd66fe988adf2654cac3fadc2a1c3 30-Jul-2014 Robert Shih <robertshih@google.com> httplive: timestamp reporting, track selection

Bug: 15153976
Bug: 15763638
Bug: 16351654
Change-Id: I4462276d4b7342647286a0ca4be11692ce52ff6d
edia/libmediaplayerservice/nuplayer/GenericSource.cpp
edia/libstagefright/httplive/LiveSession.cpp
edia/libstagefright/httplive/LiveSession.h
edia/libstagefright/httplive/M3UParser.cpp
edia/libstagefright/httplive/M3UParser.h
edia/libstagefright/httplive/PlaylistFetcher.cpp
edia/libstagefright/httplive/PlaylistFetcher.h
edia/libstagefright/mpeg2ts/ATSParser.cpp
edia/libstagefright/mpeg2ts/AnotherPacketSource.cpp
edia/libstagefright/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
nclude/media/AudioSystem.h
nclude/media/IAudioFlinger.h
edia/libmedia/AudioSystem.cpp
edia/libmedia/IAudioFlinger.cpp
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
ervices/audiopolicy/AudioPolicyManager.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
edia/libmediaplayerservice/nuplayer/NuPlayer.cpp
b97cc6a9a3c81215e365c61b071a932073b56ff2 02-Aug-2014 Jean-Michel Trivi <jmtrivi@google.com> AAC encoder: add support for SBR mode selection

Change-Id: Ibc07bff7710398929c135f38324dd29857fa0ea6
nclude/media/stagefright/ACodec.h
edia/libstagefright/ACodec.cpp
edia/libstagefright/codecs/aacenc/SoftAACEncoder2.cpp
edia/libstagefright/codecs/aacenc/SoftAACEncoder2.h
49bccd14cf3b33ffef5fc48fb9bb3b92bb8a0b09 05-Aug-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to d0fded31e473e909c018f534d3019fb5168bdcd6
92ce4715315bddd158c7d4028556632f0547e3b9 06-Aug-2014 Eric Laurent <elaurent@google.com> Merge "audio: fix crashes upon USB device connection" into lmp-dev
cf817a2330936947df94c11859f48771f5596a59 05-Aug-2014 Eric Laurent <elaurent@google.com> audio: fix crashes upon USB device connection

- Audio policy:
Replace unknown device assertion by debug log in setDeviceConnectionState().
It is possible that some kernels indicate connection of a legacy device type
when a USB audio device is connected.
We should just ignore this device.

- Audio flinger:
Make sure FastMixer thread is idle before exiting the normal mixer thread and
closing the output stream.

Change-Id: Ia10a20176a60a8aa56765538093a555fc998508a
ervices/audioflinger/Threads.cpp
ervices/audiopolicy/AudioPolicyManager.cpp
1c8d1e4079f2b8efd71423158e7f298cf1dc2c31 06-Aug-2014 Yin-Chia Yeh <yinchiayeh@google.com> Merge "cameraservice: disallow zsl/recording coexistentce" into lmp-dev
a57ab8da6fe56fdb91dfc95ebd0282eb879dde53 30-Jul-2014 Eric Laurent <elaurent@google.com> policy manager: recognize AUDIO_DEVICE_IN_AMBIENT from policy.conf

Change-Id: If46b8d13f216bad4aa62598531d406d3303134f5
ervices/audiopolicy/AudioPolicyManager.cpp
ca05ebd4c666322e754ac63236c8b329dbb53b00 05-Aug-2014 Yin-Chia Yeh <yinchiayeh@google.com> cameraservice: disallow zsl/recording coexistentce

Make sure ZSL and recording stream does not exist at the same
time.

Change-Id: I19e28dedd9dd5cc5118449860b612a5c950fdaec
ervices/camera/libcameraservice/api1/Camera2Client.cpp
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
ac29afacbb34b92f1948188e5353fce5a252ccb3 28-Jul-2014 Jon Eklund <jeklund@motorola.com> audio policy: support line output device

Change-Id: Iddf1b6486430270d871a45c75615e54339a818e9
ervices/audiopolicy/AudioPolicyManager.cpp
ervices/audiopolicy/AudioPolicyManager.h
7e892180f3992c088dc0d44f0b0e54ace4dabe3c 05-Aug-2014 Chong Zhang <chz@google.com> set secure flag for secure file playback

Bug: 16786456
Change-Id: I06f18b0e9c3f65e3e127369baa1f9ea8c9307762
edia/libmediaplayerservice/nuplayer/GenericSource.cpp
edia/libmediaplayerservice/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
nclude/media/AudioSystem.h
nclude/media/IAudioPolicyService.h
nclude/soundtrigger/ISoundTriggerClient.h
nclude/soundtrigger/ISoundTriggerHwService.h
nclude/soundtrigger/SoundTrigger.h
nclude/soundtrigger/SoundTriggerCallback.h
edia/libmedia/AudioSystem.cpp
edia/libmedia/IAudioPolicyService.cpp
ervices/audiopolicy/Android.mk
ervices/audiopolicy/AudioPolicyClientImpl.cpp
ervices/audiopolicy/AudioPolicyInterface.h
ervices/audiopolicy/AudioPolicyInterfaceImpl.cpp
ervices/audiopolicy/AudioPolicyInterfaceImplLegacy.cpp
ervices/audiopolicy/AudioPolicyManager.cpp
ervices/audiopolicy/AudioPolicyManager.h
ervices/audiopolicy/AudioPolicyService.h
ervices/soundtrigger/Android.mk
ervices/soundtrigger/SoundTriggerHwService.cpp
ervices/soundtrigger/SoundTriggerHwService.h
oundtrigger/ISoundTriggerClient.cpp
oundtrigger/ISoundTriggerHwService.cpp
oundtrigger/SoundTrigger.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
edia/libmediaplayerservice/nuplayer/NuPlayer.cpp
edia/libstagefright/Utils.cpp
7a9b25940309e2967820daa13a7f71e41293d165 05-Aug-2014 Andy Hung <hunga@google.com> Merge "Remove unused TwoTrack process mode from AudioMixer" into lmp-dev
5241b8cacee86e17223695190959f4752910680f 05-Aug-2014 Andy Hung <hunga@google.com> Remove unused TwoTrack process mode from AudioMixer

Legacy code that has not been hooked up.

Change-Id: Ic01a4eddfa1020089d5bc42f58b6a4697698c27a
ervices/audioflinger/AudioMixer.cpp
ervices/audioflinger/AudioMixer.h
3c9879b980ad195797543ce237ecbe479267e16f 06-Aug-2014 Jean-Michel Trivi <jmtrivi@google.com> Merge "AAC encoder: add support for SBR mode selection" into lmp-dev
d0fded31e473e909c018f534d3019fb5168bdcd6 05-Aug-2014 Phil Burk <philburk@google.com> Merge "[audio][policy] fix crash when offloadInfo is NULL" into lmp-dev
77cce80fa9d44f1e2a6bc486ad957fbbebfce3b2 05-Aug-2014 Phil Burk <philburk@google.com> [audio][policy] fix crash when offloadInfo is NULL

Added check for NULL pointer to avoid crash
in AudioPolicyManager when playing AC3 data.

Change-Id: Ie56788f6277be6da47d4218b1b4a6b359fce6473
Signed-off-by: Phil Burk <philburk@google.com>
ervices/audiopolicy/AudioPolicyManager.cpp
c2320223222fe4507b6d67f6b8b4001d26c77a9c 05-Aug-2014 Jeff Tinker <jtinker@google.com> Fix build break in mock drm plugin build

Change-Id: I8ae5d378df694360be3d76e06512e2ebc9fc0572
rm/mediadrm/plugins/mock/MockDrmCryptoPlugin.cpp
rm/mediadrm/plugins/mock/MockDrmCryptoPlugin.h
44622db93a24219123facbbe14259000f90de728 02-Aug-2014 Eric Laurent <elaurent@google.com> audio flinger: fix service fuzz test crash

Bug: 13744704.
Change-Id: I572c89f88dcab2b8b612ec6860983306f9f159ab
ervices/audioflinger/AudioFlinger.cpp
c1aa22b9b4fe5d73a68da46ea2220fa26a61a31e 04-Aug-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 678792e362c4cd70640934049491d9f21560c63b
9f74a325b8b22b1a65b45979fb5373507cd893f2 03-Aug-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to facd8cf2651f7fcf7225e735cae5f5d4ef3a334e
69344f83f552a64452615f882f928efe4481283a 02-Aug-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to facd8cf2651f7fcf7225e735cae5f5d4ef3a334e
facd8cf2651f7fcf7225e735cae5f5d4ef3a334e 02-Aug-2014 Eric Laurent <elaurent@google.com> Merge "Revert "Revert "sound trigger: added permission checks""" into lmp-dev
8ba53d87a2d311ff4b3f04e30b2e09309ae7421c 02-Aug-2014 Eric Laurent <elaurent@google.com> Revert "Revert "sound trigger: added permission checks""

This reverts commit 936c84a5b743dce2a2572fdf54b37b187bc88b60.

Bug: 16374803.
Change-Id: I9d3137faeddf119b13f9cdb73c14ca49e1ee3d1c
ervices/soundtrigger/Android.mk
ervices/soundtrigger/SoundTriggerHwService.cpp
b63d63b8afa25694d1973988d7acdfebcd01a18d 04-Aug-2014 Jeff Tinker <jtinker@google.com> Merge "Allow device to be unprovisioned" into lmp-dev
68b15554f6dca3b056eac517fe5fa2fd4ee80a33 30-Apr-2014 Jeff Tinker <jtinker@google.com> Allow device to be unprovisioned

bug: 12247651
Change-Id: I564ac8de3da2430342a028f4058e2c5ac2d85d5e
rm/mediadrm/plugins/clearkey/DrmPlugin.h
nclude/media/IDrm.h