• Home
  • History
  • Annotate
  • only in /frameworks/av/media/libstagefright/
History log of /frameworks/av/media/libstagefright/
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
4226c955b64e672905b99b71f1b05798ecd30105 21-Jun-2017 Venkatarama Avadhani <venkatarama.avadhani@ittiam.com> Change MPEG2 reinit Error Handling am: a67eacace7 am: a16f5a1fb3 am: 1c0389cc5f am: 4ff3666a51 am: b56bc9e762 am: f36fb2deb3 am: 25c4535f04 am: b866f43754
am: 7a22cc8944

Change-Id: Idd82dbb633faaef7e78fb2d1082b91269926e675
7a22cc894422899d01d38c925db7a1cd4117775e 21-Jun-2017 Venkatarama Avadhani <venkatarama.avadhani@ittiam.com> Change MPEG2 reinit Error Handling am: a67eacace7 am: a16f5a1fb3 am: 1c0389cc5f am: 4ff3666a51 am: b56bc9e762 am: f36fb2deb3 am: 25c4535f04
am: b866f43754

Change-Id: I4c3070b63449a82ebcb6a2053c9bc1c1563c1787
25c4535f04eb2229eca4dfa0da04b13c004f3446 21-Jun-2017 Venkatarama Avadhani <venkatarama.avadhani@ittiam.com> Change MPEG2 reinit Error Handling am: a67eacace7 am: a16f5a1fb3 am: 1c0389cc5f am: 4ff3666a51 am: b56bc9e762
am: f36fb2deb3

Change-Id: Ie0786d3f1896e42c9ee879e3f43943641bc503b1
f36fb2deb37819b831b2cd9c67e7327d142bb680 21-Jun-2017 Venkatarama Avadhani <venkatarama.avadhani@ittiam.com> Change MPEG2 reinit Error Handling am: a67eacace7 am: a16f5a1fb3 am: 1c0389cc5f am: 4ff3666a51
am: b56bc9e762

Change-Id: Id27edb4426a7c4c2fad7bac2582663667d58ad75
b56bc9e7621aa35eb4c3bceb4dcaa18e2d250c51 21-Jun-2017 Venkatarama Avadhani <venkatarama.avadhani@ittiam.com> Change MPEG2 reinit Error Handling am: a67eacace7 am: a16f5a1fb3 am: 1c0389cc5f
am: 4ff3666a51

Change-Id: Ide20e7836e3feff6eb5aa7ce5c533277af243b6b
4ff3666a51ededce3671b13839fa070c0483b66d 21-Jun-2017 Venkatarama Avadhani <venkatarama.avadhani@ittiam.com> Change MPEG2 reinit Error Handling am: a67eacace7 am: a16f5a1fb3
am: 1c0389cc5f

Change-Id: I1331b4b2263d956de7de7e882cf38d4ddb743a8b
1c0389cc5f3aa84c28bc4b73ac0e04b17e4f66b6 21-Jun-2017 Venkatarama Avadhani <venkatarama.avadhani@ittiam.com> Change MPEG2 reinit Error Handling am: a67eacace7
am: a16f5a1fb3

Change-Id: Id5c3640af7130aeadf6e5f810cdb2f79690a6428
a16f5a1fb33bce7d77fd33103525937875c3b2df 21-Jun-2017 Venkatarama Avadhani <venkatarama.avadhani@ittiam.com> Change MPEG2 reinit Error Handling
am: a67eacace7

Change-Id: I7ba8378fe66c57f595fee2368408cc426d3e5eaf
a67eacace769095eb04b01681c99d931e68a4b08 30-May-2017 Venkatarama Avadhani <venkatarama.avadhani@ittiam.com> Change MPEG2 reinit Error Handling

Changing reinit handling to not notify error in case init fails.

Bug: 37237396
Test: ran poc before/after on nyc-mr2
Change-Id: I694a9d2ccee7622d9c736efac12c9ec8639911f4
odecs/mpeg2dec/SoftMPEG2.cpp
3aaf1671d597c41de6546605148847d4cf640217 17-Jun-2017 Dongwon Kang <dwkang@google.com> Merge "MPEG4Extractor: check size for yrrc box" into lmp-dev am: d971d18873 am: 2ace148c06 am: 18a671762d am: 6ce4126a09 am: 040485c1bc am: 6e5ef73033 am: 9262a0d58f am: 7c70a5482c am: e4c62e4582 am: 1efa35d1f8 am: 55acba9047
am: 3f05d8a9bc

Change-Id: Iaf900312d2517773062f09ae5a19f48b497408d2
3f05d8a9bc3da1375116755b3af3bafc3cd7d67c 17-Jun-2017 Dongwon Kang <dwkang@google.com> Merge "MPEG4Extractor: check size for yrrc box" into lmp-dev am: d971d18873 am: 2ace148c06 am: 18a671762d am: 6ce4126a09 am: 040485c1bc am: 6e5ef73033 am: 9262a0d58f am: 7c70a5482c am: e4c62e4582 am: 1efa35d1f8
am: 55acba9047

Change-Id: I4c62b8698635b9a328f46203f8a8ee1309da126b
1efa35d1f8b9518afda9c6136acf9487f672f025 17-Jun-2017 Dongwon Kang <dwkang@google.com> Merge "MPEG4Extractor: check size for yrrc box" into lmp-dev am: d971d18873 am: 2ace148c06 am: 18a671762d am: 6ce4126a09 am: 040485c1bc am: 6e5ef73033 am: 9262a0d58f am: 7c70a5482c
am: e4c62e4582

Change-Id: I164f086c1902fe315ae08c69b2a6287d4cbeb135
e4c62e4582bf940769a257b2232eb19062beee18 17-Jun-2017 Dongwon Kang <dwkang@google.com> Merge "MPEG4Extractor: check size for yrrc box" into lmp-dev am: d971d18873 am: 2ace148c06 am: 18a671762d am: 6ce4126a09 am: 040485c1bc am: 6e5ef73033 am: 9262a0d58f
am: 7c70a5482c

Change-Id: I975dd858eaf473a3cf9a22c206272c4017e3c95c
7c70a5482c7b1f9f9a501562aaecb30df4929495 17-Jun-2017 Dongwon Kang <dwkang@google.com> Merge "MPEG4Extractor: check size for yrrc box" into lmp-dev am: d971d18873 am: 2ace148c06 am: 18a671762d am: 6ce4126a09 am: 040485c1bc am: 6e5ef73033
am: 9262a0d58f

Change-Id: I8854738e25b4038062cc66b392693792ee3de72d
9262a0d58fbbdd8c88fd56b04050ed96f7ce05a0 17-Jun-2017 Dongwon Kang <dwkang@google.com> Merge "MPEG4Extractor: check size for yrrc box" into lmp-dev am: d971d18873 am: 2ace148c06 am: 18a671762d am: 6ce4126a09 am: 040485c1bc
am: 6e5ef73033

Change-Id: I6d7aef658319bc6bbd43076d43788d2235dd14f6
6e5ef73033bbdea8f2bd80885b4c9722b5850384 17-Jun-2017 Dongwon Kang <dwkang@google.com> Merge "MPEG4Extractor: check size for yrrc box" into lmp-dev am: d971d18873 am: 2ace148c06 am: 18a671762d am: 6ce4126a09
am: 040485c1bc

Change-Id: I0feb497a42b3e2d10a1f226da308c29b0da46c81
040485c1bcd8f22ca6f7c45d934a2e90ec48a231 17-Jun-2017 Dongwon Kang <dwkang@google.com> Merge "MPEG4Extractor: check size for yrrc box" into lmp-dev am: d971d18873 am: 2ace148c06 am: 18a671762d
am: 6ce4126a09

Change-Id: Ifebdfcfd50c5167bbce4f4680d426ba69b0cbc6a
6ce4126a09190954a69dfc97f1f340fe9e139431 17-Jun-2017 Dongwon Kang <dwkang@google.com> Merge "MPEG4Extractor: check size for yrrc box" into lmp-dev am: d971d18873 am: 2ace148c06
am: 18a671762d

Change-Id: I38d2d1c89bb6662745a77e5f4fc3ed6b81d40331
2ace148c06da2e79234cab43db9a6d3dc9220b7c 17-Jun-2017 Dongwon Kang <dwkang@google.com> Merge "MPEG4Extractor: check size for yrrc box" into lmp-dev
am: d971d18873

Change-Id: I8613293a4bbea17818f873274b80c318a8f3d5b8
e2424e989525f332bce80191d5316594b2a08a61 17-Jun-2017 Venkatarama Avadhani <venkatarama.avadhani@ittiam.com> Merge "Notify Errors Appropriately from SoftMPEG2" into mnc-dev am: 74a2af11b9 am: 0817640c9f
am: 41c60ea30e

Change-Id: I654945cc7d760d769e7edd024e78a5a883d9602f
41c60ea30ed60c59441a8e1728ce181d4397af4d 17-Jun-2017 Venkatarama Avadhani <venkatarama.avadhani@ittiam.com> Merge "Notify Errors Appropriately from SoftMPEG2" into mnc-dev am: 74a2af11b9
am: 0817640c9f

Change-Id: If72152b0e19ab8942d56d99819f5670950770a91
0817640c9fd0936415a2850b786be4e2a063ce78 17-Jun-2017 Venkatarama Avadhani <venkatarama.avadhani@ittiam.com> Merge "Notify Errors Appropriately from SoftMPEG2" into mnc-dev
am: 74a2af11b9

Change-Id: Ia57de4d0172426c590f562d57fbba5fff7ec55bf
88f181fef320c9fec8889e368fcf28081123cd0a 17-Jun-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Report error when using buffers for secure codec without providing crypto" into oc-dev
7ae3111d2cb8bbdb3a73a90ab54ff43e44a0227a 31-May-2017 Venkatarama Avadhani <venkatarama.avadhani@ittiam.com> Notify Errors Appropriately from SoftMPEG2

This is to ensure that the framework realises that an error has
occured and does not call onQueueFilled if the error is fatal.

Bug: 36715268
Merged-In: If02499d306aa9b6df64a7f25d43d1bdf318a10cd
Change-Id: I6911d2e8899cc3a472b5ba5ecdcfbd92233ecfa6
odecs/mpeg2dec/SoftMPEG2.cpp
odecs/mpeg2dec/SoftMPEG2.h
514a9ffc192595bdcdd2544b613d15badddf4387 17-Jun-2017 Venkatarama Avadhani <venkatarama.avadhani@ittiam.com> Notify Errors Appropriately from SoftMPEG2 am: eae3ad0585 am: 7392f40d44 am: ba95c14826 am: 7d5bad4c55
am: 4311fc1a2f

Change-Id: I76812f9763861a0aedbaeb6a865a2b9cd7c794a3
4311fc1a2f01710b5c2f6b92a65cfbe1acd9e22d 17-Jun-2017 Venkatarama Avadhani <venkatarama.avadhani@ittiam.com> Notify Errors Appropriately from SoftMPEG2 am: eae3ad0585 am: 7392f40d44 am: ba95c14826
am: 7d5bad4c55

Change-Id: Ic18c51c21885ab9917a28b1aa87ec09b07e65a9c
ba95c148265adf701bda5b25194bba92253a5222 17-Jun-2017 Venkatarama Avadhani <venkatarama.avadhani@ittiam.com> Notify Errors Appropriately from SoftMPEG2 am: eae3ad0585
am: 7392f40d44

Change-Id: Ib9f0eb58ecafb2a3e2c6af2177314eb023c145b7
7392f40d44cbfc5f4bb53fa74c93eb84bba5928f 17-Jun-2017 Venkatarama Avadhani <venkatarama.avadhani@ittiam.com> Notify Errors Appropriately from SoftMPEG2
am: eae3ad0585

Change-Id: Ic3f7d31db3feca479bb5aa8e6d2ce1686ec1361f
32c1bcda7c9fb429fe6c235184f8bb6aa7ef12db 14-Jun-2017 Dongwon Kang <dwkang@google.com> Report error when using buffers for secure codec without providing crypto

Test: passes media post-submit tests and MediaCodecCapabilitiesTest
Bug: 62570231
Change-Id: I07ff8d28700d19d1ed2c08bbb070ffa5407932ef
ediaCodec.cpp
4a9ab2a382558941ea7fe92324a3d97848686ca8 14-Jun-2017 Dongwon Kang <dwkang@google.com> Revert "Throw IAE when crypto or descrambler is not given for secure codec"

This reverts commit aaa5e6400d7654ca1a7dcebeba36214ed060e3cb.

Test: revert change
Bug: 62570231
Change-Id: Ic1d8b67616a3ac8f491e367d91b3a70d7d22ffa0
Codec.cpp
CodecBufferChannel.cpp
ediaCodec.cpp
nclude/ACodecBufferChannel.h
a1a709d5574c934cd0d5ef7e351178aaea582c60 13-Jun-2017 Ram Mohan <ram.mohan@ittiam.com> fix uninitialized variable in SoftVideoDecoderOMXComponent.cpp

mUpdateColorAspects is uninitialized and resulting in notifying
unexpected OMX_EventPortSettingsChanged events

Test: VtsHalMediaOmx1_0Host
bug: 62601943
Change-Id: Ie1da74abce4f3b68fb8db0f0559b2ad81d6109b6
mx/SoftVideoDecoderOMXComponent.cpp
eae3ad0585d17bab12bbd831b58407c122732a1c 13-Apr-2017 Venkatarama Avadhani <venkatarama.avadhani@ittiam.com> Notify Errors Appropriately from SoftMPEG2

This is to ensure that the framework realises that an error has
occured and does not call onQueueFilled if the error is fatal.

Bug: 36715268

Change-Id: If02499d306aa9b6df64a7f25d43d1bdf318a10cd
odecs/mpeg2dec/SoftMPEG2.cpp
odecs/mpeg2dec/SoftMPEG2.h
6ace94d2952eac82fc4c86aa6d585258248bf18c 12-Jun-2017 Dongwon Kang <dwkang@google.com> MPEG4Extractor: check size for yrrc box

Test: stagefright -s poc_file
Bug: 62133227
Change-Id: Iafefac39764ce01b4dde414b9f152c9ea71810e9
PEG4Extractor.cpp
4ff7a41e72412b4faa4545f401245c2807531a31 10-Jun-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Fix crash in Opus and Vorbis decoders" into oc-dev
5783ee1c3db77b098d6528b3018b8ad9fc009251 10-Jun-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "SoftVPXEncoder: Disable lagged vp9 encoding" into oc-dev
bd4676a6098a9ed73943764d88451be07b57c7b0 10-Jun-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "GraphicBufferSource: no longer hold onto repeatable buffer after eos" into oc-dev
b607c45afc7e9c9bcb7878f08803c6cdaededff6 09-Jun-2017 Pawin Vongmasa <pawin@google.com> Fix crash in Opus and Vorbis decoders

This CL reverts the fix for EOS flag in the first call, which causes a
crash in other tests and is not needed now.

Test: VtsHalMediaOmxV1_0Host
Bug: 62271829
Bug: 37501531
Change-Id: If25b78ba8019250a79e0402bbae7ee4e31b1d781
odecs/opus/dec/SoftOpus.cpp
odecs/vorbis/dec/SoftVorbis.cpp
e09e96617a341f52b900b39c4270784998a4b672 09-Jun-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Throw IAE when crypto or descrambler is not given for secure codec" into oc-dev
a77b3819af8c5fb90edebb3ebb3038d6b37c625f 09-Jun-2017 Vignesh Venkatasubramanian <vigneshv@google.com> SoftVPXEncoder: Disable lagged vp9 encoding

VP9 encoding on realtime should not have any lag set (it is set to
the library default right now for VBR mode). Unconditionally
disable it.

Test: CtsVideoTestCases

Bug: 62274213
Change-Id: Iab1abcae4f648198cb2b9bc634f73f612025f986
odecs/on2/enc/SoftVPXEncoder.cpp
aaa5e6400d7654ca1a7dcebeba36214ed060e3cb 08-Jun-2017 Dongwon Kang <dwkang@google.com> Throw IAE when crypto or descrambler is not given for secure codec

Test: MediaCodec throws IAE for the given decoder stress test
Bug: 62100632
Change-Id: I33e7a1f942c49647a17bc2728f1d3b099265628d
Codec.cpp
CodecBufferChannel.cpp
ediaCodec.cpp
nclude/ACodecBufferChannel.h
a62633366642ce9ae3d99b2574c9148d94bef6e1 08-Jun-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "OMX codecs: send out EOS when input buffer has non-zero data and EOS." into oc-dev
79924d78b9465eed113347f2597f698b1d9bd5d9 08-Jun-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "add missing color format to check list" into oc-dev
610bc72b09396af03d5020bd34e390ad23208357 08-Jun-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Bug fix: timestamp deviation fail test" into oc-dev
fa77e3f5e89a28c6c94dc6ab381947fb52e58fa7 08-Jun-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Fix strides while extracting graphic buffer" into oc-dev
99098e35ebea11b11b919855b5894bfb3267d922 06-Jun-2017 Ram Mohan <ram.mohan@ittiam.com> configure port format

For SetParameter, the field is nIndex ignored. If the format is supported,
it is set as the format of the port.

Change-Id: I5c1a9a87b56102c368ac0cd67475add02c3e9a1f
odecs/aacenc/SoftAACEncoder.cpp
odecs/aacenc/SoftAACEncoder2.cpp
odecs/amrnb/enc/SoftAMRNBEncoder.cpp
odecs/amrwbenc/SoftAMRWBEncoder.cpp
mx/SoftVideoDecoderOMXComponent.cpp
0d402df5bb21d9b32aefc9841725cf4f602fb99c 17-May-2017 Ram Mohan M <ram.mohan@ittiam.com> add missing color format to check list

Test: Small CtsMediaTestCases
Bug: 37501531
Change-Id: I89ce99f7322d3b0dac333b75ead0ec1122eba9d0
mx/SoftVideoEncoderOMXComponent.cpp
199a6e3682c2804975ef8b56159bbc31426ef3d4 03-Jun-2017 Wei Jia <wjia@google.com> OMX codecs: send out EOS when input buffer has non-zero data and EOS.

send out EOS when CSD input buffer has EOS flag.

Test: Small CtsMediaTestCases
Bug: 62271829
Merged-In: Ib5dbb00f4534615d250144b7f53a475e55bc9def
Change-Id: Ib5dbb00f4534615d250144b7f53a475e55bc9def
odecs/amrnb/dec/SoftAMR.cpp
odecs/g711/dec/SoftG711.cpp
odecs/gsm/dec/SoftGSM.cpp
odecs/opus/dec/SoftOpus.cpp
odecs/vorbis/dec/SoftVorbis.cpp
fa0b15cf8f78672b1049c59e86201cd871d9f0af 07-Jun-2017 Pawin Vongmasa <pawin@google.com> Merge "Check the buffer index from acquireBuffer" into klp-dev am: d050902155 am: 668b7f4b8f am: 54f81e8fe7
am: 8cb7994cbf

Change-Id: Ibf23434ea242faa85098c73747d1dc42ad5c85ba
8cb7994cbfea4aaa7adb5835ec5c91e34229f3e2 07-Jun-2017 Pawin Vongmasa <pawin@google.com> Merge "Check the buffer index from acquireBuffer" into klp-dev am: d050902155 am: 668b7f4b8f
am: 54f81e8fe7

Change-Id: Ic1ee69858d27b8d695f075bd436faa04795f058f
54f81e8fe777b1c63348b4e83e1287386a8263cf 07-Jun-2017 Pawin Vongmasa <pawin@google.com> Merge "Check the buffer index from acquireBuffer" into klp-dev am: d050902155
am: 668b7f4b8f

Change-Id: I9d59a91f2a63115978bc48087a721cd7e6d8facb
d050902155d820e0bbba48ec1a7764b939bdba9c 07-Jun-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Check the buffer index from acquireBuffer" into klp-dev
5f0883c02a32a8b605b805aab56ca098fd4b6e77 07-Jun-2017 Pawin Vongmasa <pawin@google.com> Merge "Check the buffer index from acquireBuffer" into mnc-dev am: ec2549aa62 am: adfbbe1684
am: 11b3066c06

Change-Id: I53089abb23af74febf92aa8c70ca807cb3213a63
11b3066c069dc1bdeb490d75940a926d20f7c54d 07-Jun-2017 Pawin Vongmasa <pawin@google.com> Merge "Check the buffer index from acquireBuffer" into mnc-dev am: ec2549aa62
am: adfbbe1684

Change-Id: I2c5cb01a4d8fbeaed1dbadc5cb1ab3b4a0f7d60e
adfbbe1684e1fb5ad59035c722558ad47dacad63 07-Jun-2017 Pawin Vongmasa <pawin@google.com> Merge "Check the buffer index from acquireBuffer" into mnc-dev
am: ec2549aa62

Change-Id: Ifa4eeaf32cd5a7d5ab77c0e20d3ab5d5b811def5
ec2549aa6266f49191b78dcbcdb276be233ba127 07-Jun-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Check the buffer index from acquireBuffer" into mnc-dev
2c0e01a4f01b37d301f21a7403aa32357eabb7f2 07-Jun-2017 Pawin Vongmasa <pawin@google.com> Merge "Check the buffer index from acquireBuffer" into nyc-dev
am: c12291d88a

Change-Id: I7b6cff8f5bb2cc4c79e02fde50c648276f6c052b
c12291d88abc0bed21a45dee16c5bd13c2407eb6 07-Jun-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Check the buffer index from acquireBuffer" into nyc-dev
318e41b4b3160fd95402d9d4f0c480baca409198 07-Jun-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Protect sp assignments in RemoteDataSource." into oc-dev
94c024db21d185c4a3e77ce3aacdf20457f7dd64 07-Jun-2017 Pawin Vongmasa <pawin@google.com> Merge "RESTRICT AUTOMERGE Check the buffer index from acquireBuffer" into nyc-mr1-dev am: c422235e9b
am: f13d78e7e8

Change-Id: I400e3759e5066b67f57e5b75801391890548239e
c422235e9ba93c5c9219a25f4cb03bc1c612fd98 07-Jun-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "RESTRICT AUTOMERGE Check the buffer index from acquireBuffer" into nyc-mr1-dev
f0c558d0f620e5b85affe993dba7d85cce73e9b8 06-Jun-2017 Ray Essick <essick@google.com> Merge "better manage buffer for libstagefright_soft_mpeg4enc" into klp-dev am: 021575025c am: 5944b611e5 am: 1a419c7b2a am: 70a63bdf27 am: 40833da7b9 am: 2ad98cf1c7 am: be560fcb1c am: b9f302c2f0 am: 1c1d3116d9 am: f7350dd989 am: a06d2eb83e am: ce15503bf9 am: 6ff81f0096 am: feecaecca1
am: fde4cbba53

Change-Id: Ie7271767369a4a12995ce92be3933731e2e51f69
c2038edcae19abc2eb8df974b1ada7993b437918 06-Jun-2017 Wei Jia <wjia@google.com> Merge "m4v_h263: update width/height only when they are valid." into klp-dev am: 2da03f40eb am: 5e9a9442a3 am: 36eb1039cf am: 1173c884db am: 3e99d14712 am: 0cb6c1f2b3 am: a0f88fe10b am: 3905eac9c0 am: 1c724844d8 am: ab6bb51371 am: 367499bc42 am: a087c3fc93 am: b8eb299886 am: d206fc5664
am: 6d8f3b8240

Change-Id: I6a512b3112c52cd44ae37b33216add76da540f73
fde4cbba53d8396832b8099c8f6cfcdc2796b1be 06-Jun-2017 Ray Essick <essick@google.com> Merge "better manage buffer for libstagefright_soft_mpeg4enc" into klp-dev am: 021575025c am: 5944b611e5 am: 1a419c7b2a am: 70a63bdf27 am: 40833da7b9 am: 2ad98cf1c7 am: be560fcb1c am: b9f302c2f0 am: 1c1d3116d9 am: f7350dd989 am: a06d2eb83e am: ce15503bf9 am: 6ff81f0096
am: feecaecca1

Change-Id: I4685f12d40a5a2afc46f54fa26308961866c5239
6d8f3b8240d8b16c4dd2370e3fee158d66cb876c 06-Jun-2017 Wei Jia <wjia@google.com> Merge "m4v_h263: update width/height only when they are valid." into klp-dev am: 2da03f40eb am: 5e9a9442a3 am: 36eb1039cf am: 1173c884db am: 3e99d14712 am: 0cb6c1f2b3 am: a0f88fe10b am: 3905eac9c0 am: 1c724844d8 am: ab6bb51371 am: 367499bc42 am: a087c3fc93 am: b8eb299886
am: d206fc5664

Change-Id: If5e76c48ee3cabd10f41bc4dbe5ec5198f8324ba
6ff81f0096f561bc7a3c2ab9f9bfd189608f1b49 06-Jun-2017 Ray Essick <essick@google.com> Merge "better manage buffer for libstagefright_soft_mpeg4enc" into klp-dev am: 021575025c am: 5944b611e5 am: 1a419c7b2a am: 70a63bdf27 am: 40833da7b9 am: 2ad98cf1c7 am: be560fcb1c am: b9f302c2f0 am: 1c1d3116d9 am: f7350dd989 am: a06d2eb83e
am: ce15503bf9

Change-Id: I7ebfe4251b74d1268624fdad16c13b2c329d2ddf
b8eb299886a0f85bd9d44c9bf2f30488d9394b67 06-Jun-2017 Wei Jia <wjia@google.com> Merge "m4v_h263: update width/height only when they are valid." into klp-dev am: 2da03f40eb am: 5e9a9442a3 am: 36eb1039cf am: 1173c884db am: 3e99d14712 am: 0cb6c1f2b3 am: a0f88fe10b am: 3905eac9c0 am: 1c724844d8 am: ab6bb51371 am: 367499bc42
am: a087c3fc93

Change-Id: I870b467ebfb350508872c8115ebe04f48650c73b
ce15503bf97ce997cd1749a346cd372174fa2659 06-Jun-2017 Ray Essick <essick@google.com> Merge "better manage buffer for libstagefright_soft_mpeg4enc" into klp-dev am: 021575025c am: 5944b611e5 am: 1a419c7b2a am: 70a63bdf27 am: 40833da7b9 am: 2ad98cf1c7 am: be560fcb1c am: b9f302c2f0 am: 1c1d3116d9 am: f7350dd989
am: a06d2eb83e

Change-Id: I67cbeed83d25ff5aa228f6f418656a3d984daf09
a087c3fc939faca9f4ec5f1f38960336814f1191 06-Jun-2017 Wei Jia <wjia@google.com> Merge "m4v_h263: update width/height only when they are valid." into klp-dev am: 2da03f40eb am: 5e9a9442a3 am: 36eb1039cf am: 1173c884db am: 3e99d14712 am: 0cb6c1f2b3 am: a0f88fe10b am: 3905eac9c0 am: 1c724844d8 am: ab6bb51371
am: 367499bc42

Change-Id: Ib79ce8adddb4012b3d5051550811a73d140cacd9
716d805db4184eb72e1ce6eea2ffc9ce833fe75b 06-Jun-2017 Wei Jia <wjia@google.com> Merge "m4v_h263: check header first before decoding a frame." into lmp-dev am: 6aed93d593 am: 8772f84f2c am: fc97c43c79 am: c572616245 am: 0c2592782f am: a4a232c7d4 am: d8de34f60c am: 8bd081a57f am: b73a717745 am: 53ee1b675b am: 6c58251e3d
am: ce85c6646e

Change-Id: I8e17f4ce9a2425fcaad4aa10a80c7587545be5d8
a06d2eb83e22f923cece45e8c56bc04cd28cf2ab 06-Jun-2017 Ray Essick <essick@google.com> Merge "better manage buffer for libstagefright_soft_mpeg4enc" into klp-dev am: 021575025c am: 5944b611e5 am: 1a419c7b2a am: 70a63bdf27 am: 40833da7b9 am: 2ad98cf1c7 am: be560fcb1c am: b9f302c2f0 am: 1c1d3116d9
am: f7350dd989

Change-Id: I811d91df28a5eb49f72e0add5c58165066a50891
367499bc42305c511611980aecb40b8414982247 06-Jun-2017 Wei Jia <wjia@google.com> Merge "m4v_h263: update width/height only when they are valid." into klp-dev am: 2da03f40eb am: 5e9a9442a3 am: 36eb1039cf am: 1173c884db am: 3e99d14712 am: 0cb6c1f2b3 am: a0f88fe10b am: 3905eac9c0 am: 1c724844d8
am: ab6bb51371

Change-Id: Id7b3bf6e2a884982305b253d84c045287471c29a
ce85c6646e8ec4791090231aa14d397b710536a3 06-Jun-2017 Wei Jia <wjia@google.com> Merge "m4v_h263: check header first before decoding a frame." into lmp-dev am: 6aed93d593 am: 8772f84f2c am: fc97c43c79 am: c572616245 am: 0c2592782f am: a4a232c7d4 am: d8de34f60c am: 8bd081a57f am: b73a717745 am: 53ee1b675b
am: 6c58251e3d

Change-Id: Iac79c371f94fd58373ec0b7780386cc68522d1b9
f7350dd9898e88c1d06145a5bd0398f4762079c0 06-Jun-2017 Ray Essick <essick@google.com> Merge "better manage buffer for libstagefright_soft_mpeg4enc" into klp-dev am: 021575025c am: 5944b611e5 am: 1a419c7b2a am: 70a63bdf27 am: 40833da7b9 am: 2ad98cf1c7 am: be560fcb1c am: b9f302c2f0
am: 1c1d3116d9

Change-Id: Id18428135190a66889802987c27289ba7fe6a806
ab6bb51371ca519a45b2be9132b381c1756650ab 06-Jun-2017 Wei Jia <wjia@google.com> Merge "m4v_h263: update width/height only when they are valid." into klp-dev am: 2da03f40eb am: 5e9a9442a3 am: 36eb1039cf am: 1173c884db am: 3e99d14712 am: 0cb6c1f2b3 am: a0f88fe10b am: 3905eac9c0
am: 1c724844d8

Change-Id: I962848bfd282a20a733be8b3e24a33df542a5f95
1c1d3116d95ee756150eea15d4586aae3b675c4d 06-Jun-2017 Ray Essick <essick@google.com> Merge "better manage buffer for libstagefright_soft_mpeg4enc" into klp-dev am: 021575025c am: 5944b611e5 am: 1a419c7b2a am: 70a63bdf27 am: 40833da7b9 am: 2ad98cf1c7 am: be560fcb1c
am: b9f302c2f0

Change-Id: I840dd96ff4825becf34a89dde03778c6fd61aeef
1c724844d89e68403b76fd64999a995248ba0da2 06-Jun-2017 Wei Jia <wjia@google.com> Merge "m4v_h263: update width/height only when they are valid." into klp-dev am: 2da03f40eb am: 5e9a9442a3 am: 36eb1039cf am: 1173c884db am: 3e99d14712 am: 0cb6c1f2b3 am: a0f88fe10b
am: 3905eac9c0

Change-Id: I51707915c0b284a597cfd56a72b4c09cc6158ab7
53ee1b675b72f87a881de8ea7016785646d43d14 06-Jun-2017 Wei Jia <wjia@google.com> Merge "m4v_h263: check header first before decoding a frame." into lmp-dev am: 6aed93d593 am: 8772f84f2c am: fc97c43c79 am: c572616245 am: 0c2592782f am: a4a232c7d4 am: d8de34f60c am: 8bd081a57f
am: b73a717745

Change-Id: I463ea5e72bc80c326ba6a214272c003e3a1114c9
b9f302c2f0b788a9beb250d0ada2ac3fbf368fc6 06-Jun-2017 Ray Essick <essick@google.com> Merge "better manage buffer for libstagefright_soft_mpeg4enc" into klp-dev am: 021575025c am: 5944b611e5 am: 1a419c7b2a am: 70a63bdf27 am: 40833da7b9 am: 2ad98cf1c7
am: be560fcb1c

Change-Id: Ia48ab3048f31dbf53c2c5dd78044fc9dd1b855bf
3905eac9c044bc13290a19a0c0159959ed6f6087 06-Jun-2017 Wei Jia <wjia@google.com> Merge "m4v_h263: update width/height only when they are valid." into klp-dev am: 2da03f40eb am: 5e9a9442a3 am: 36eb1039cf am: 1173c884db am: 3e99d14712 am: 0cb6c1f2b3
am: a0f88fe10b

Change-Id: I08ea2f520efb37c10fb25a193175fb5f7c0263a3
b73a717745027f3e405a3c125adc6d929a2a5faf 06-Jun-2017 Wei Jia <wjia@google.com> Merge "m4v_h263: check header first before decoding a frame." into lmp-dev am: 6aed93d593 am: 8772f84f2c am: fc97c43c79 am: c572616245 am: 0c2592782f am: a4a232c7d4 am: d8de34f60c
am: 8bd081a57f

Change-Id: I72be8b70198e790d25a3e292d603d1e6ede27ef0
be560fcb1cb54cc7734dfcbb63ddc04852ca7daf 06-Jun-2017 Ray Essick <essick@google.com> Merge "better manage buffer for libstagefright_soft_mpeg4enc" into klp-dev am: 021575025c am: 5944b611e5 am: 1a419c7b2a am: 70a63bdf27 am: 40833da7b9
am: 2ad98cf1c7

Change-Id: Ib1856e8073d36b874ac3280b31d69da5afb7878f
a0f88fe10b66d6848e85bdb0d0228281dcae434c 06-Jun-2017 Wei Jia <wjia@google.com> Merge "m4v_h263: update width/height only when they are valid." into klp-dev am: 2da03f40eb am: 5e9a9442a3 am: 36eb1039cf am: 1173c884db am: 3e99d14712
am: 0cb6c1f2b3

Change-Id: I387bb015e84b6a32eef251860a9369c30eb7e8f6
8bd081a57f27f704546f0cf1dc1cdffe4e93d40d 06-Jun-2017 Wei Jia <wjia@google.com> Merge "m4v_h263: check header first before decoding a frame." into lmp-dev am: 6aed93d593 am: 8772f84f2c am: fc97c43c79 am: c572616245 am: 0c2592782f am: a4a232c7d4
am: d8de34f60c

Change-Id: If0555114cd444c5340c5dbbd1e110a5d063ff210
d8de34f60cc31fefcca935c894c6ab309bfd76c6 06-Jun-2017 Wei Jia <wjia@google.com> Merge "m4v_h263: check header first before decoding a frame." into lmp-dev am: 6aed93d593 am: 8772f84f2c am: fc97c43c79 am: c572616245 am: 0c2592782f
am: a4a232c7d4

Change-Id: I24e7e5e6d178dbfacd156ca1ae99e22297d61b48
40833da7b919e2a6a6b1e5e4ed77a03ec86a4b26 06-Jun-2017 Ray Essick <essick@google.com> Merge "better manage buffer for libstagefright_soft_mpeg4enc" into klp-dev am: 021575025c am: 5944b611e5 am: 1a419c7b2a
am: 70a63bdf27

Change-Id: If759d2cd6c4bd350ca54218c2a6ae3fd07c11548
3e99d147129341cf78d387df31a5b0f69e1f3e4c 06-Jun-2017 Wei Jia <wjia@google.com> Merge "m4v_h263: update width/height only when they are valid." into klp-dev am: 2da03f40eb am: 5e9a9442a3 am: 36eb1039cf
am: 1173c884db

Change-Id: Ie070371abe02527147724cdb620547c9f1ec1b2d
a4a232c7d475954b7de9764bdc472c119c0a4f37 06-Jun-2017 Wei Jia <wjia@google.com> Merge "m4v_h263: check header first before decoding a frame." into lmp-dev am: 6aed93d593 am: 8772f84f2c am: fc97c43c79 am: c572616245
am: 0c2592782f

Change-Id: Ib17e3a67871a039b1665742c5cb6b74e931a88ec
70a63bdf273d17dfabdebb9a1ae3a4607710cf36 06-Jun-2017 Ray Essick <essick@google.com> Merge "better manage buffer for libstagefright_soft_mpeg4enc" into klp-dev am: 021575025c am: 5944b611e5
am: 1a419c7b2a

Change-Id: Ibb5f76a8dac6cf37d4115d3c277687fa96b08660
1173c884db8ab718dc8958974b45d0d19236b75d 06-Jun-2017 Wei Jia <wjia@google.com> Merge "m4v_h263: update width/height only when they are valid." into klp-dev am: 2da03f40eb am: 5e9a9442a3
am: 36eb1039cf

Change-Id: I62be2937991b3d2d9fdf5c4cd543d669ba2edfab
1a419c7b2ac876da8dd304145320baeed4a30575 06-Jun-2017 Ray Essick <essick@google.com> Merge "better manage buffer for libstagefright_soft_mpeg4enc" into klp-dev am: 021575025c
am: 5944b611e5

Change-Id: I7f5f93f57aa77cb87fdf5155881ed9463e50ef0f
0c2592782fd0d5f0f47109a09aae8e32f95cfcc7 06-Jun-2017 Wei Jia <wjia@google.com> Merge "m4v_h263: check header first before decoding a frame." into lmp-dev am: 6aed93d593 am: 8772f84f2c am: fc97c43c79
am: c572616245

Change-Id: If16b6f9fc5b859fd913bbbf2a03afff59b8ac26c
36eb1039cfa11fb3fb4106aa04d289d1d4f401f7 06-Jun-2017 Wei Jia <wjia@google.com> Merge "m4v_h263: update width/height only when they are valid." into klp-dev am: 2da03f40eb
am: 5e9a9442a3

Change-Id: I48abb4d5dfa84f3759dc7990b79a7495562a1376
c572616245a015dae86b7ba6c608c621e1b99326 06-Jun-2017 Wei Jia <wjia@google.com> Merge "m4v_h263: check header first before decoding a frame." into lmp-dev am: 6aed93d593 am: 8772f84f2c
am: fc97c43c79

Change-Id: Icfb77facdc3883b0741b98584d7bc08acc5d158a
021575025c132594e69acac882cdce1f3e0a57ed 06-Jun-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "better manage buffer for libstagefright_soft_mpeg4enc" into klp-dev
2da03f40eb1c8a135c0f64fc572ee0a0869a678e 06-Jun-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "m4v_h263: update width/height only when they are valid." into klp-dev
8772f84f2c14b3962d63117c1192e83cfbb705c4 06-Jun-2017 Wei Jia <wjia@google.com> Merge "m4v_h263: check header first before decoding a frame." into lmp-dev
am: 6aed93d593

Change-Id: I3fc4c73813fa895796747b63ee849988f94f671a
6aed93d5933e7894be077ab1b078a3f37af9cd07 06-Jun-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "m4v_h263: check header first before decoding a frame." into lmp-dev
f3383881ffde82b1b50d5a69b488006f289fd8b5 06-Jun-2017 Wei Jia <wjia@google.com> Merge "DO NOT MERGE - m4v_h263: check header first before decoding a frame." into klp-dev am: da924b45e1
am: fdfad5899d

Change-Id: Ibfeec763c09ce978dd44d7cade7cb848b31aa528
da924b45e19ebe195f0f9a281527bb39b9c667b6 06-Jun-2017 Wei Jia <wjia@google.com> Merge "DO NOT MERGE - m4v_h263: check header first before decoding a frame." into klp-dev
1f0fa90d7c345d44b319705602770dcba36ca23b 05-Jun-2017 Lajos Molnar <lajos@google.com> GraphicBufferSource: no longer hold onto repeatable buffer after eos

Bug: 62271796
Change-Id: Id0571d16ea968732c7c08602d8446d2ab845a651
mx/GraphicBufferSource.cpp
009ff0dd59732f0c389d172edb26942c35422e3a 06-Jun-2017 Dongwon Kang <dwkang@google.com> Protect sp assignments in RemoteDataSource.

sp assignments is not thread safe and close also can be called from
binder clean-up procedure on the separate thread.

Test: cts-tradefed run cts -m CtsMediaTestCases -t android.media.cts.MediaPlayerTest#testVorbisCrash
Bug: 62251555
Change-Id: I3e5f42d87b490f4aadfa17276632783545611cdc
nclude/RemoteDataSource.h
8437f4e9094567affaa72ba7bfab654e12e78399 31-May-2017 Ram Mohan M <ram.mohan@ittiam.com> Bug fix: timestamp deviation fail test

In mpeg2/avc/hevc decoder, after resolution change, old timestamps
are still retained by the plugin. In mpeg2 decoder these old timestamps
are being sent for the new sequence. This is corrected.

Test: Small CtsMediaTestCases
Bug: 62273493

Change-Id: Ie464e3b48df6c8f21b1dbb9d45cb3726d53285ca
odecs/avcdec/SoftAVCDec.cpp
odecs/hevcdec/SoftHEVC.cpp
odecs/mpeg2dec/SoftMPEG2.cpp
14a09c9d989113798546d61d58e59c513ac4652a 17-May-2017 Ram Mohan M <ram.mohan@ittiam.com> Fix strides while extracting graphic buffer

Test: Small CtsMediaTestCases
Bug: 62271835

Change-Id: Ic8d2ba1309778a7683887bfcece18276a022116e
mx/SoftVideoEncoderOMXComponent.cpp
90d2dd403bc8faa421cfc6b26930e5aa69879943 02-Jun-2017 Ray Essick <essick@google.com> better manage buffer for libstagefright_soft_mpeg4enc

Existing code allocated buffer, adjusted pointer to use it, and would
adjust the pointer back when it came time to free the space. The problem
was that the adjustment was based on user-supplied values and if the
user changed those values between alloc and free (which was possible),
the code ended up free()ing the wrong address.

We fix this by keeping an extra pointer -- the unmodified allocation --
which we use for the subsequent free() calls. This makes the free()
independent of any changes to values that the user provides.

Bug: 36075363
Test: ran poc against patched nyc-mr2-dev tree
Change-Id: I7013ff5883a945c4647517b2980c76a6558f23d2
odecs/m4v_h263/enc/src/mp4enc_api.cpp
odecs/m4v_h263/enc/src/mp4lib_int.h
8ff995a8ae93d19cf7bfa85844ed321de1a403eb 02-Jun-2017 Marco Nelissen <marcone@google.com> Merge "Fix potential leak" into klp-dev am: 2f9eacc3ae am: a7602f8339 am: fe7c2700ae
am: cbaad4b189

Change-Id: Ifd9897d7c631c92e756481c3f43f0b4cbca85ca0
cbaad4b189c8566318bdb148cf905fe2b333b8ed 02-Jun-2017 Marco Nelissen <marcone@google.com> Merge "Fix potential leak" into klp-dev am: 2f9eacc3ae am: a7602f8339
am: fe7c2700ae

Change-Id: I9c4c5dbe0682992f9e7521ed3bf6a52d8311e00f
fe7c2700aef6c944203f080f21b6761071181c4e 02-Jun-2017 Marco Nelissen <marcone@google.com> Merge "Fix potential leak" into klp-dev am: 2f9eacc3ae
am: a7602f8339

Change-Id: I2883ac8221475d5fa73ed34350f199355b541b14
2f9eacc3ae01d17745f8da6ecc198474ecdb4555 02-Jun-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Fix potential leak" into klp-dev
38142b60f5144f92d99463fa1d65c543382d1264 19-May-2017 Wei Jia <wjia@google.com> m4v_h263: check header first before decoding a frame.

Test: fix the file in the bug
Bug: 37660827
Change-Id: I9d6919f96c0c9f29221be1e8e852ecb21062bad9
(cherry picked from commit db545366c2e893dbbe1a42d858c52067101beda6)
odecs/m4v_h263/dec/SoftMPEG4.cpp
cc12f885a86a25fd28aa1bb449c6ea0d5cc60417 02-Jun-2017 Marco Nelissen <marcone@google.com> Merge "Fix potential leak" into mnc-dev am: 167af356fd am: 39336ac84e am: 1adfafdfdb am: 781d2a7521 am: 8c96e87157 am: 015ed4cd36 am: 03c4e00bed am: d2972602ee
am: 60a160510c

Change-Id: I90f762013c9da6d0d991c44b90535ea5a3b8a1da
60a160510c1cfef3958692b8ed0a83a87cfde4cd 02-Jun-2017 Marco Nelissen <marcone@google.com> Merge "Fix potential leak" into mnc-dev am: 167af356fd am: 39336ac84e am: 1adfafdfdb am: 781d2a7521 am: 8c96e87157 am: 015ed4cd36 am: 03c4e00bed
am: d2972602ee

Change-Id: I9cbf69f1fa4a7a1f916a1246bdea1361523a4d1b
03c4e00bedf0c7f8631e247569f9851366857146 02-Jun-2017 Marco Nelissen <marcone@google.com> Merge "Fix potential leak" into mnc-dev am: 167af356fd am: 39336ac84e am: 1adfafdfdb am: 781d2a7521 am: 8c96e87157
am: 015ed4cd36

Change-Id: Ia00aa35c911f8ce5c5703f1eb3cd6f64f430344b
015ed4cd361b392b94c3b72e7de8ff85e0b2efea 02-Jun-2017 Marco Nelissen <marcone@google.com> Merge "Fix potential leak" into mnc-dev am: 167af356fd am: 39336ac84e am: 1adfafdfdb am: 781d2a7521
am: 8c96e87157

Change-Id: I8e207b2ee20bbeacd4a91439ac098304d6ca6748
8c96e87157e7b334be4532fa9f40e28b663db073 02-Jun-2017 Marco Nelissen <marcone@google.com> Merge "Fix potential leak" into mnc-dev am: 167af356fd am: 39336ac84e am: 1adfafdfdb
am: 781d2a7521

Change-Id: I3744292b358320f52342a3eb8550ea53afa4be5b
781d2a7521d15b4a4f1be40c2bdb3314769794e2 02-Jun-2017 Marco Nelissen <marcone@google.com> Merge "Fix potential leak" into mnc-dev am: 167af356fd am: 39336ac84e
am: 1adfafdfdb

Change-Id: Ie4741f517a464ddb02cf6f1ccccc131cf3eafcfa
1adfafdfdb6570662ea78b98145dccbfcebeadb4 02-Jun-2017 Marco Nelissen <marcone@google.com> Merge "Fix potential leak" into mnc-dev am: 167af356fd
am: 39336ac84e

Change-Id: I92f65b5720aed2ffe0659c19d54836e8c87f94fe
39336ac84e0b2594c33226d708e00d5237ffa003 02-Jun-2017 Marco Nelissen <marcone@google.com> Merge "Fix potential leak" into mnc-dev
am: 167af356fd

Change-Id: I47300ca03662a0b24195ac16e73c2873577a2b55
167af356fd1132d0dbbfae1e18fd9dd8cc894685 02-Jun-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Fix potential leak" into mnc-dev
19b6a74a9de53d20e60de2855d49b654e0b8b2f9 26-May-2017 Robert Shih <robertshih@google.com> DO NOT MERGE Don't leak `this` out of GraphicBufferSource ctor am: ebeb47000d am: afa728e0b7
am: 63f4d38b3e

Change-Id: I970ff440d2efd77587bbd110f379a9e5ae8a03ca
63f4d38b3e9c6957ff7274d213462b15aa43e3c4 25-May-2017 Robert Shih <robertshih@google.com> DO NOT MERGE Don't leak `this` out of GraphicBufferSource ctor am: ebeb47000d
am: afa728e0b7

Change-Id: I8e5afcf1bb874447737d1a7c7c45ecd4e54dacd1
afa728e0b79ea5f0e977f37ae481c4cb24e69127 25-May-2017 Robert Shih <robertshih@google.com> DO NOT MERGE Don't leak `this` out of GraphicBufferSource ctor
am: ebeb47000d

Change-Id: I1ae0603aa9b798bd6c624d96c18ef6457212bfa7
ea5576c980a8e069340b1ae2a62c8097dda3a7a0 25-May-2017 Robert Shih <robertshih@google.com> DO NOT MERGE Don't leak `this` out of GraphicBufferSource ctor am: 6301f88251 am: 188e7dbd05 am: 393436e351
am: 5c87e1dab9

Change-Id: I995cde6ec5eb082b308d7f9dd4cf6aca21716a18
393436e351d3a403d2050bc035a542c302a291d7 25-May-2017 Robert Shih <robertshih@google.com> DO NOT MERGE Don't leak `this` out of GraphicBufferSource ctor am: 6301f88251
am: 188e7dbd05

Change-Id: If13260b623df38c7ba99becca87025e985d23c5c
188e7dbd05b63bdeff115d7c2f22547e3dc8701e 25-May-2017 Robert Shih <robertshih@google.com> DO NOT MERGE Don't leak `this` out of GraphicBufferSource ctor
am: 6301f88251

Change-Id: I1f9e4a9fbbd0c17b19151cdec2c2b2b7f9cf2392
6301f882512ec39baf28640f31b90104def1738d 23-May-2017 Robert Shih <robertshih@google.com> DO NOT MERGE Don't leak `this` out of GraphicBufferSource ctor

Bug: 37622974
Bug: 37622987
Bug: 37623757
Test: run poc and observe no crash
Change-Id: I1e25c011f02bec26a1480ec9a217a52f15d43cf2
mx/GraphicBufferSource.cpp
mx/GraphicBufferSource.h
mx/OMXNodeInstance.cpp
ebeb47000de33edd551d1d46fa0abe7100dbb30a 23-May-2017 Robert Shih <robertshih@google.com> DO NOT MERGE Don't leak `this` out of GraphicBufferSource ctor

Bug: 37622974
Bug: 37622987
Bug: 37623757
Test: run poc and observe no crash
Change-Id: I1e25c011f02bec26a1480ec9a217a52f15d43cf2
mx/GraphicBufferSource.cpp
mx/GraphicBufferSource.h
mx/OMXNodeInstance.cpp
62dec9555ec832b1a8c63c70e4df745aa8635488 18-May-2017 Hassan Shojania <shojania@google.com> Modular DRM for MediaPlayer/Fixing legacy frame drop at NuPlayerDecoder

Bug: 34559906
Bug: 38039230
Bug: 38430289
Test: GTS/CTS Tests
Change-Id: I68dca5f8bae4f9f7866cfaaa6aba97c80dcd8ffb
vc_utils.cpp
4b0d94aa0c2293fee85a2149ade12ef8d8afe796 23-May-2017 Pawin Vongmasa <pawin@google.com> Check the buffer index from acquireBuffer

Test: Run the POC
Test: Small CtsMediaTestCases
Bug: 37563942
Merged-In: I8ddfbc91a08d96de1f732e6776d6f90997042f6b
Change-Id: I8ddfbc91a08d96de1f732e6776d6f90997042f6b
mx/GraphicBufferSource.cpp
14ec3b90c9eb12770562f21782822d8642b774e8 23-May-2017 Pawin Vongmasa <pawin@google.com> Check the buffer index from acquireBuffer

Test: Run the POC
Test: Small CtsMediaTestCases
Bug: 37563942
Merged-In: I8ddfbc91a08d96de1f732e6776d6f90997042f6b
Change-Id: I8ddfbc91a08d96de1f732e6776d6f90997042f6b
mx/GraphicBufferSource.cpp
77e1eb5988ed2b9abff0fec19663d1ec094af192 23-May-2017 Pawin Vongmasa <pawin@google.com> RESTRICT AUTOMERGE Check the buffer index from acquireBuffer

Test: Run the POC
Test: Small CtsMediaTestCases
Bug: 37563942
Change-Id: I8ddfbc91a08d96de1f732e6776d6f90997042f6b
mx/GraphicBufferSource.cpp
fc609407050deb43ec5f0bc8e234c9896eaccbb4 23-May-2017 Pawin Vongmasa <pawin@google.com> Check the buffer index from acquireBuffer

Test: Run the POC
Test: Small CtsMediaTestCases
Bug: 37563942
Merged-In: I8ddfbc91a08d96de1f732e6776d6f90997042f6b
Change-Id: I8ddfbc91a08d96de1f732e6776d6f90997042f6b
mx/GraphicBufferSource.cpp
677010098a3451960654be6f7649b38fa14760f3 19-May-2017 Wei Jia <wjia@google.com> DO NOT MERGE - m4v_h263: check header first before decoding a frame.

Test: fix the file in the bug
Bug: 37660827
Change-Id: I9d6919f96c0c9f29221be1e8e852ecb21062bad9
odecs/m4v_h263/dec/SoftMPEG4.cpp
c7455a0bb4909d1d48c86e4a9b699ddda65f87f4 20-May-2017 Pawin Vongmasa <pawin@google.com> Check the return value from allocateSecureBuffer

Test: Small CtsMediaTestCases

Test: com.google.android.media.gts.WidevineCodecStressTests in
GtsMediaTestCases

Bug: 38452958
Change-Id: Iba53c3fc144a3ee7d1f54b62ab3836b1a3a46dc6
mx/1.0/WOmxNode.cpp
0b5726782d5f9764325057870cef2750853f286a 18-May-2017 Wei Jia <wjia@google.com> m4v_h263: update width/height only when they are valid.

Test: the file in the bug doesn't crash
Bug: 37079296
Change-Id: Ie092971dda568119ca38ec67d65ccfc00df93185
odecs/m4v_h263/dec/src/vop.cpp
a0721999eccd22d900eb6dec7e48f835f28ce999 09-May-2017 Marco Nelissen <marcone@google.com> Fix potential leak

Fix potential memory leak introduced with bugfix for bug 31449945.

Bug: 36389123
Change-Id: I5a9a3551692d6cba385b45c4c7a465aa377a62b1
PEG4Extractor.cpp
38ad5e22885a4b02d0429ecb4c1b4446373a3551 16-May-2017 Marco Nelissen <marcone@google.com> Merge "Modifying MetaData invalidates previous char*" into nyc-dev am: eb36bac938 am: 670ba92946 am: 8bcf9aa2c4 am: e054111199
am: 3be14c2e41

Change-Id: I574e6e2f270b8a1b9bd95e665dce240898e176d6
3be14c2e41921e3a24f0ebdc994ccd2095da7635 16-May-2017 Marco Nelissen <marcone@google.com> Merge "Modifying MetaData invalidates previous char*" into nyc-dev am: eb36bac938 am: 670ba92946 am: 8bcf9aa2c4
am: e054111199

Change-Id: I2abeb0b6b9763878ae7961d96fc2014305d07f57
8bcf9aa2c44efbafaca9aebfab24840a5cd4e78a 16-May-2017 Marco Nelissen <marcone@google.com> Merge "Modifying MetaData invalidates previous char*" into nyc-dev am: eb36bac938
am: 670ba92946

Change-Id: I2890cde112e1b3bd910094774764a658079fb4e9
670ba92946a5b311d5a200f10da719d120ca917a 16-May-2017 Marco Nelissen <marcone@google.com> Merge "Modifying MetaData invalidates previous char*" into nyc-dev
am: eb36bac938

Change-Id: I1a401b30afed8fccdf48c9b41ae414f7410520a9
eb36bac938fdfd45169d42d80309b22afa7122ae 16-May-2017 Marco Nelissen <marcone@google.com> Merge "Modifying MetaData invalidates previous char*" into nyc-dev
65098155a6a193c05368c8e0e83b7e9dd4094627 16-May-2017 Marco Nelissen <marcone@google.com> Merge "Fix memory leak in error case" into klp-dev am: 5136b7436f am: 60657857c6 am: 55057ab408 am: a2fbd251ca am: 4bd7103388 am: dd2f7e982f am: 00be42f32c am: e4b59cb256 am: 15f2244696 am: 6721b0295f am: 7c3b47540e am: 0967b342f4 am: b47837e3c6 am: cc8ee0ef47
am: 1182c9d9e5

Change-Id: I9b43a2bdafbc5bb86e276ea36cf633ee2c57bffa
1182c9d9e5d82009ce293a17c11a06bb37b275cb 16-May-2017 Marco Nelissen <marcone@google.com> Merge "Fix memory leak in error case" into klp-dev am: 5136b7436f am: 60657857c6 am: 55057ab408 am: a2fbd251ca am: 4bd7103388 am: dd2f7e982f am: 00be42f32c am: e4b59cb256 am: 15f2244696 am: 6721b0295f am: 7c3b47540e am: 0967b342f4 am: b47837e3c6
am: cc8ee0ef47

Change-Id: I2ee55ff2503b9ac3428ddee8ea03f3c9c93ae4a2
b47837e3c6cba0cace96b39cc9ee2bce7c8bfac7 16-May-2017 Marco Nelissen <marcone@google.com> Merge "Fix memory leak in error case" into klp-dev am: 5136b7436f am: 60657857c6 am: 55057ab408 am: a2fbd251ca am: 4bd7103388 am: dd2f7e982f am: 00be42f32c am: e4b59cb256 am: 15f2244696 am: 6721b0295f am: 7c3b47540e
am: 0967b342f4

Change-Id: I9a41425bbfbb6c71fd2dd91e9d4b9b6abed024b4
0967b342f42a92f52688b804fbcda31b071cbd26 16-May-2017 Marco Nelissen <marcone@google.com> Merge "Fix memory leak in error case" into klp-dev am: 5136b7436f am: 60657857c6 am: 55057ab408 am: a2fbd251ca am: 4bd7103388 am: dd2f7e982f am: 00be42f32c am: e4b59cb256 am: 15f2244696 am: 6721b0295f
am: 7c3b47540e

Change-Id: I7af91e2469b5e7e3b7a2d4f0e65cb9620bfe037c
7c3b47540e0c942b07a25191a7b1d80dc9b38b7c 16-May-2017 Marco Nelissen <marcone@google.com> Merge "Fix memory leak in error case" into klp-dev am: 5136b7436f am: 60657857c6 am: 55057ab408 am: a2fbd251ca am: 4bd7103388 am: dd2f7e982f am: 00be42f32c am: e4b59cb256 am: 15f2244696
am: 6721b0295f

Change-Id: I56cc783d993f01ee26df858151d1ee649ee62c51
6721b0295f41eb7060fb84b8f33702a1bcafb2e0 16-May-2017 Marco Nelissen <marcone@google.com> Merge "Fix memory leak in error case" into klp-dev am: 5136b7436f am: 60657857c6 am: 55057ab408 am: a2fbd251ca am: 4bd7103388 am: dd2f7e982f am: 00be42f32c am: e4b59cb256
am: 15f2244696

Change-Id: I220aa6cbd2de6ac74a409d6be5aa62c331931929
15f224469620ba4c588f553aed6acf32f09ab5d4 16-May-2017 Marco Nelissen <marcone@google.com> Merge "Fix memory leak in error case" into klp-dev am: 5136b7436f am: 60657857c6 am: 55057ab408 am: a2fbd251ca am: 4bd7103388 am: dd2f7e982f am: 00be42f32c
am: e4b59cb256

Change-Id: I89844419918d671a11696909cf530185ab452822
e4b59cb2560956a891453b71d4ef47020dca0c31 16-May-2017 Marco Nelissen <marcone@google.com> Merge "Fix memory leak in error case" into klp-dev am: 5136b7436f am: 60657857c6 am: 55057ab408 am: a2fbd251ca am: 4bd7103388 am: dd2f7e982f
am: 00be42f32c

Change-Id: I651a449830219d0e7513417246d0d269cf44fe88
00be42f32cc7f8f74135f3aefc5f393bcc8757dc 16-May-2017 Marco Nelissen <marcone@google.com> Merge "Fix memory leak in error case" into klp-dev am: 5136b7436f am: 60657857c6 am: 55057ab408 am: a2fbd251ca am: 4bd7103388
am: dd2f7e982f

Change-Id: I4cdcb7694baea6c10980860880c4bdcf41905a8f
4bd7103388c9f76dccc78eb6a3120fa630a00250 16-May-2017 Marco Nelissen <marcone@google.com> Merge "Fix memory leak in error case" into klp-dev am: 5136b7436f am: 60657857c6 am: 55057ab408
am: a2fbd251ca

Change-Id: I8a0e99463feb24350f02d5b5ccdc9419ebb2d71d
a2fbd251ca74e2d7ac4f074116eda8a3fb381915 16-May-2017 Marco Nelissen <marcone@google.com> Merge "Fix memory leak in error case" into klp-dev am: 5136b7436f am: 60657857c6
am: 55057ab408

Change-Id: I5107a57def4be19aad9dca950cca06bebecad1e8
55057ab40808d6c5a0b0c16d79c68330b06eafb9 16-May-2017 Marco Nelissen <marcone@google.com> Merge "Fix memory leak in error case" into klp-dev am: 5136b7436f
am: 60657857c6

Change-Id: I1564d4e2626a31b7018bae301c50a268ccc79749
5136b7436f98b53cbca3891e0763584f1c94b442 16-May-2017 Marco Nelissen <marcone@google.com> Merge "Fix memory leak in error case" into klp-dev
423e74647d1b8fd8b2905356af1fc2b1c67a0f3f 16-May-2017 Marco Nelissen <marcone@google.com> Modifying MetaData invalidates previous char*

so don't use those char* after having updated the MetaData

Bug: 36576151
Change-Id: I1430f3151cb929e436fbdac566cf91fc4164b934
PEG4Extractor.cpp
1adebcd1bfb8a6716642e9693923858222a78c6c 15-May-2017 Marco Nelissen <marcone@google.com> Limit ogg packet size am: bf928560ac am: f349435fcf am: 086cee9d89 am: b65b0a8367 am: 412be4b735 am: 045c64fe94 am: fd7cba4d0e am: 433dacf8db am: 8c805395e5 am: bf913622a7 am: d68e4e45b0 am: 90f3fe5f66 am: 08d9bb8cb6 am: 398fa51c1c
am: a6a7b14909

Change-Id: I4b74843f8d4df0d682873b8635deafcc8624d419
a6a7b14909af258203df20a53b3d1ef34b639633 15-May-2017 Marco Nelissen <marcone@google.com> Limit ogg packet size am: bf928560ac am: f349435fcf am: 086cee9d89 am: b65b0a8367 am: 412be4b735 am: 045c64fe94 am: fd7cba4d0e am: 433dacf8db am: 8c805395e5 am: bf913622a7 am: d68e4e45b0 am: 90f3fe5f66 am: 08d9bb8cb6
am: 398fa51c1c

Change-Id: I9315cf95e40ad3966cf1de410cddc78651bdb6ef
08d9bb8cb633681d1992d6601cce1c1800024d1f 15-May-2017 Marco Nelissen <marcone@google.com> Limit ogg packet size am: bf928560ac am: f349435fcf am: 086cee9d89 am: b65b0a8367 am: 412be4b735 am: 045c64fe94 am: fd7cba4d0e am: 433dacf8db am: 8c805395e5 am: bf913622a7 am: d68e4e45b0
am: 90f3fe5f66

Change-Id: I7bd6c35a924687ca4a6e659dc49754acf01a7f44
90f3fe5f662a5da2afe4fd26eebacb18acf8ff99 15-May-2017 Marco Nelissen <marcone@google.com> Limit ogg packet size am: bf928560ac am: f349435fcf am: 086cee9d89 am: b65b0a8367 am: 412be4b735 am: 045c64fe94 am: fd7cba4d0e am: 433dacf8db am: 8c805395e5 am: bf913622a7
am: d68e4e45b0

Change-Id: Ia1ca35c6f723696256c4e379b29f2ac64e9e10b4
d68e4e45b08d137cc33f36a5cd896ecdfd57b693 15-May-2017 Marco Nelissen <marcone@google.com> Limit ogg packet size am: bf928560ac am: f349435fcf am: 086cee9d89 am: b65b0a8367 am: 412be4b735 am: 045c64fe94 am: fd7cba4d0e am: 433dacf8db am: 8c805395e5
am: bf913622a7

Change-Id: I0306abb9a6a8ffd5bc4351b4af78121fd32a4890
bf913622a7bcb4a8885777553d36e7c5846e201b 15-May-2017 Marco Nelissen <marcone@google.com> Limit ogg packet size am: bf928560ac am: f349435fcf am: 086cee9d89 am: b65b0a8367 am: 412be4b735 am: 045c64fe94 am: fd7cba4d0e am: 433dacf8db
am: 8c805395e5

Change-Id: Id4f4b331c2f4fd56a18e032ad1d55983e6b91bc5
8c805395e5d82efb12386a27988dfaab7f8af312 15-May-2017 Marco Nelissen <marcone@google.com> Limit ogg packet size am: bf928560ac am: f349435fcf am: 086cee9d89 am: b65b0a8367 am: 412be4b735 am: 045c64fe94 am: fd7cba4d0e
am: 433dacf8db

Change-Id: Ibffd67ae4a98c0b38c42f68efcb8cc7b401deb0c
433dacf8db10e8f0984240ee2fd591c5b6564dc9 15-May-2017 Marco Nelissen <marcone@google.com> Limit ogg packet size am: bf928560ac am: f349435fcf am: 086cee9d89 am: b65b0a8367 am: 412be4b735 am: 045c64fe94
am: fd7cba4d0e

Change-Id: I0c11db2bb63c110732c925cfc482deee246dc720
fd7cba4d0e5d828d42e81d373ec236f78f17fb00 15-May-2017 Marco Nelissen <marcone@google.com> Limit ogg packet size am: bf928560ac am: f349435fcf am: 086cee9d89 am: b65b0a8367 am: 412be4b735
am: 045c64fe94

Change-Id: I02f221f5a4a14706c83ce12c3273df75bd23361f
412be4b735610e6683e2db080ab2891b53b06510 15-May-2017 Marco Nelissen <marcone@google.com> Limit ogg packet size am: bf928560ac am: f349435fcf am: 086cee9d89
am: b65b0a8367

Change-Id: I2faa1a87e934851ee2a4a865e3e3d7084381dac6
b65b0a8367a8ac29400569c0bde9fc8343dadd69 15-May-2017 Marco Nelissen <marcone@google.com> Limit ogg packet size am: bf928560ac am: f349435fcf
am: 086cee9d89

Change-Id: I9687649ed25dade9f872c83a290bbcd0abb4b5fc
086cee9d89db7f2367f7b403870f3a3324d32fe3 15-May-2017 Marco Nelissen <marcone@google.com> Limit ogg packet size am: bf928560ac
am: f349435fcf

Change-Id: I952944295017f01b254c80c8db935e33c51337f3
bf928560aca13c5a615cb3ffc3b6aad16cdf3824 13-May-2017 Marco Nelissen <marcone@google.com> Limit ogg packet size

A malformed ogg file might lace together a very large packet, which
could lead to out of memory conditions. Limit the packet size to
avoid this.

Bug: 36592202
Change-Id: I8650b3ec54a0de9ec302a7cbac296bb85efcfb3d
ggExtractor.cpp
ebc26bd50ee659c08a786d6eb793c26f83838ade 12-May-2017 Ray Essick <essick@google.com> Prevent OOB write in soft_avc encoder am: 463452a949 am: 97db64baf6 am: b6bf46944f am: cd35c846f0 am: a43be7d42d am: 3c375611d6 am: 96b4e70f44 am: 9eb9b1b849
am: 91af834b13

Change-Id: Icb076c1e7f90b7ece6cf7f36f9f2e5f3062121cf
91af834b1326ceff4a96724fd77696842dde432c 12-May-2017 Ray Essick <essick@google.com> Prevent OOB write in soft_avc encoder am: 463452a949 am: 97db64baf6 am: b6bf46944f am: cd35c846f0 am: a43be7d42d am: 3c375611d6 am: 96b4e70f44
am: 9eb9b1b849

Change-Id: I603637d9ca99cea3aa899a3883ebe21d928ed3c3
96b4e70f440ca4e9f354360abd24d6695f01e96c 12-May-2017 Ray Essick <essick@google.com> Prevent OOB write in soft_avc encoder am: 463452a949 am: 97db64baf6 am: b6bf46944f am: cd35c846f0 am: a43be7d42d
am: 3c375611d6

Change-Id: I2af6025bbfea9927fb37e876b449f93732ddcd33
3c375611d68c0521b855190e3e5eb021c65f824c 12-May-2017 Ray Essick <essick@google.com> Prevent OOB write in soft_avc encoder am: 463452a949 am: 97db64baf6 am: b6bf46944f am: cd35c846f0
am: a43be7d42d

Change-Id: I9cf2d9117293f14f14fc240c674f02594f8944bd
a43be7d42d1d37659f59e3503913f02cfbc4e928 12-May-2017 Ray Essick <essick@google.com> Prevent OOB write in soft_avc encoder am: 463452a949 am: 97db64baf6 am: b6bf46944f
am: cd35c846f0

Change-Id: Id65aa9338a1a362488f33708b4bf5f36d8581104
cd35c846f01c34b1a7efd566a834842113f4a841 12-May-2017 Ray Essick <essick@google.com> Prevent OOB write in soft_avc encoder am: 463452a949 am: 97db64baf6
am: b6bf46944f

Change-Id: Ib5533f65db8acecfa3b02e13a07815af8901047c
b6bf46944fb0a2f14b3265559ad762d691b2a9ba 12-May-2017 Ray Essick <essick@google.com> Prevent OOB write in soft_avc encoder am: 463452a949
am: 97db64baf6

Change-Id: Ia77a7a995dab5a20d1757ab36d0dda680946274b
97db64baf6d61e6ac25566e72b0f7185a19e3859 12-May-2017 Ray Essick <essick@google.com> Prevent OOB write in soft_avc encoder
am: 463452a949

Change-Id: I7cad9d84093cce83b2edf09a55bb8b9a588bee43
ab34612a31e82b713ca0ac043e14f68f3788fbda 12-May-2017 Marco Nelissen <marcone@google.com> Fix memory leak in error case

Bug: 37239013
Change-Id: Ic33e0f7ed946d0729efa46f69aff1a5d35e81b1e
PEG4Extractor.cpp
c7205dc331139d2b9e2e096bf2cb7ec7a8137664 12-May-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "media: Write maker and model information into recorded videos." into oc-dev
990bc6dec9e62f1fb529a3f552aaaf7478f84756 09-May-2017 Praveen Chavan <pchavan@codeaurora.org> Omx: Fix codec instance leak if Observer dies

If Observer dies, {instance, observer} book-keeping may be
cleaned up. In such case avoid only unlinking the death-notifier,
but proceed with instance cleanup

Test: Manual use of Camera, Photos, Play Movies and YouTube.
Test: Small CtsMediaTestCases

Bug: 38149818
Change-Id: I412953b55827c93730353a95560b865fb18b5f0f
mx/1.0/Omx.cpp
da5c3beba9d9612aa0e80cc8ae668397438b4c49 11-Apr-2017 Hangyu Kuang <hkuang@google.com> media: Write maker and model information into recorded videos.

Bug: 34745604
Test: Camera recording and use isoviewer to look at the metadata
Change-Id: Idb556a0ec38d8a6a797c71b68c46979504d2cb4a
PEG4Writer.cpp
463452a94907278ca5e4c5632e50bbe59e861544 11-May-2017 Ray Essick <essick@google.com> Prevent OOB write in soft_avc encoder

Soft avc encoder cached buffer sizes across a point where the sizes
could be reset by an app, allowing crafted requests to hit outside
of the current buffer. This remedies that by forcing buffer reallocation
with new sizes whenever the encoder state at such 'reset' points.

Bug: 35421151
Test: run POC with no crash
Change-Id: I8c689846142264f7b6a277332260a6bd8a2bd92d
odecs/avcenc/SoftAVCEnc.cpp
odecs/avcenc/SoftAVCEnc.h
ebb1475d1a97ee3dbf25ea72383a6b7554aac1dd 10-May-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Add null check in setSidebandStream" into oc-dev
b622f93984da567396b79af08bde231b61dd3169 10-May-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "stagefright: provide consumer usage hint to consumers that request it" into oc-dev
d4c33214c262d9982257219c2fa6104314509abf 10-May-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "stagefright: do not reconnect surface for tunneled playback" into oc-dev
5c7ade853642a8e9414e5c69fdc43c0957bed9af 09-May-2017 Robert Shih <robertshih@google.com> Add null check in setSidebandStream

Bug: 38172844
Change-Id: I5d9a6b4c84b4c4cf9f5c9b1634a9cd35797c09b2
mx/1.0/WGraphicBufferProducer.cpp
e077beb91686c4b7e9d645664da59b7b25bd3978 09-May-2017 Marco Nelissen <marcone@google.com> Fix potential leak

Fix potential memory leak introduced with bugfix for bug 31449945.

Bug: 36389123
Change-Id: I5a9a3551692d6cba385b45c4c7a465aa377a62b1
PEG4Extractor.cpp
331207d51a620bf018081950da4b20133014657f 09-May-2017 Chong Zhang <chz@google.com> stagefright: lock mLock in codecBufferFilled

The locking is to protect mOriginalTimeUs, adding to which is done
in emptyBuffer under mLock.

bug: 38111548
Change-Id: If7853e3fe50c68279ee5d74373b53bc34bd56cfd
mx/OMXNodeInstance.cpp
0047ce7e7c032f7ec87b975447c6ab9b9aae70c7 08-May-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "ACodec: transition to UNINITIALIZED after force release" into oc-dev
903896b72e3810e77166f7570e2d5a420241238a 27-Oct-2016 Lajos Molnar <lajos@google.com> stagefright: do not reconnect surface for tunneled playback

Bug: 30608808
Change-Id: I9a6bb1660b6d0c030fda36de52dfad6fa398f2e2
(cherry picked from commit 2b85160ca0b468a11ee60e80d78747bb433c365c)
(cherry picked from commit 348cc8d612b507e6e09a7fbe3d3066f34f998017)
Codec.cpp
17fd5278d36b813701d3db0e1d8d58be513d8c34 16-Sep-2015 David Yeh <david.yeh@mediatek.com> stagefright: provide consumer usage hint to consumers that request it

Test: manual

Bug: 23471732
Change-Id: I41f7f0201d3676adf29b0a2ae017107b4675b07f
(cherry picked from commit c0a0e4c2261c6bcf5cb37297b8cf949c9c51a5c8)
(cherry picked from commit 3c665512fc867481bfbaa164fe817c83b1062112)
(cherry picked from commit d3d5eb6b63c79a990866fbd46fc06e8dd138f8b9)
Codec.cpp
ec69aafeef06b42d3bfa6c7e4a7fee0cb03d360c 03-May-2017 Wonsik Kim <wonsik@google.com> ACodec: transition to UNINITIALIZED after force release

Bug: 37857940
Test: AuptTV
Test: adb shell am instrument -e size small -w 'android.media.cts/android.support.test.runner.AndroidJUnitRunner'
Change-Id: I583f955839d440aad96cf4bbccad05ed9e291700
Codec.cpp
f1e459c6400a774d99390227e853a30f58cee4a2 24-Mar-2017 Elliott Hughes <enh@google.com> Fix apps using Adobe AIR.

Apps that use Adobe AIR are all broken because the symbol
_ZN7android9OMXClient7connectEv disappeared. If we use overloading
for OMXClient::connect rather than a default parameter, that gives
us another release to reach out to the app authors.

Bug: http://b/35325668
Bug: http://b/35454864
Bug: http://b/36106661
Bug: http://b/36263763
Bug: http://b/36501801
Bug: http://b/37176992
Test: ran broken apps
Change-Id: Ic310fc0e69be322f007601d23bb4bf82df215036
(cherry picked from commit 9f3f8dd774753c5ed2dfabde65d440182bfaa02e)
MXClient.cpp
nclude/OMXClient.h
b5625ce949ceb29e5971b6e2c94d9ee054c057d7 22-Apr-2017 Jiwen 'Steve' Cai <jwcai@google.com> SurfaceUtils: query CONSUMER_IS_PROTECTED

Using NATIVE_WINDOW_CONSUMER_IS_PROTECTED to check whether a native
window can handle protected buffers instead of expecting
GRALLOC_USAGE_PROTECTED as a consumer usage flag.

Bug: 35726763
Test: videoplayer-nodrm-protected.apk and videoplayer-drm-protected.apk
both works.

Change-Id: I67a324161dff22e6efd949f2ab988c2349cd6bcc
urfaceUtils.cpp
ea2cd1388591e70fb0c1b2c22d342b5df1702d38 29-Apr-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "IMediaExtractor: ensure users to check returned value by getTrack." into oc-dev
322db26b76f7511c6d73f34a92a4e54840fcb876 28-Apr-2017 Wei Jia <wjia@google.com> IMediaExtractor: ensure users to check returned value by getTrack.

Test: fix the crash from the stream in the bug.
Bug: 37777357
Change-Id: Ia99907c396a2074a9419db9b8103a9325b290169
uMediaExtractor.cpp
1c57d1e42aef042f85e8a8eaf754618a44922e39 27-Apr-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "stagefright: prevent component to be stuck on error" into oc-dev
a62c3c31e61086c4a15acb27297c7d17a6b3b1ef 27-Apr-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "GraphicBufferSource: remove free codec buffers only when submitted to codec" into oc-dev
4ec8d83215d61ce8dfad15f5c42e7a190d924bf6 18-Apr-2017 Wonsik Kim <wonsik@google.com> stagefright: prevent component to be stuck on error

Bug: 36818684
Bug: 34983882
Test: Run the command below on Nexus Player overnight:
while true ; do adb shell am instrument -e class 'android.platform.tv.tests.aupt.YouTubeTests' -w 'android.platform.tv.tests.aupt/android.support.test.aupt.AuptTestRunner' ; done
Test: adb shell am instrument -e size small -w 'android.media.cts/android.support.test.runner.AndroidJUnitRunner'
Change-Id: I9663c3d62d97c3f5db0af6c30f39bb59cbc7e3e7
Codec.cpp
nclude/ACodec.h
12b97c8d659c48923e42ce4abd2b22b3b7a9909a 27-Apr-2017 Pawin Vongmasa <pawin@google.com> Merge "Stub implementation for IOmxStore." into oc-dev
195f1ed9563ea2264dbca8c783695d9741dab3d8 27-Apr-2017 Lajos Molnar <lajos@google.com> GraphicBufferSource: remove free codec buffers only when submitted to codec

Bug: 37556535
Change-Id: I516c0a2fc6c78e937360a2a5c2a3dcdea1d07370
mx/GraphicBufferSource.cpp
02cccfd9e790ba8758aba2b4f2a600a7d8fd1566 26-Apr-2017 Lajos Molnar <lajos@google.com> stagefright: don't actually acquire graphic buffer when we don't want to

Bug: 37556535
Change-Id: Ic9d2bddd12c8a750c4d285a1915ac3f4455aceae
mx/GraphicBufferSource.cpp
52257b75115135821bba562ac35c0c6325a1e100 25-Apr-2017 Pawin Vongmasa <pawin@google.com> Stub implementation for IOmxStore.

Test: Small CtsMediaTestCases

Bug: 37657124
Change-Id: I5728a12d000223231600ab3c3ab4eb044dd1847d
mx/1.0/OmxStore.cpp
mx/1.0/OmxStore.h
mx/Android.mk
087f3af6ceee8fe61a27901c7c910218664265c0 25-Apr-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "MediaPlayer: enable more logs for extractor failure." into oc-dev
161dc698c7604cfd73310e96503179581822943b 21-Apr-2017 Wei Jia <wjia@google.com> MediaPlayer: enable more logs for extractor failure.

Test: compiles
Bug: 37273297
Change-Id: I53c6393e0c306c64ec4aa81c45e5ff6e8de233d8
ediaExtractor.cpp
5b281b66a8efbf7121f96976d36f78ca77bd10c1 21-Apr-2017 Hassan Shojania <shojania@google.com> Merge "Modular DRM for MediaPlayer/SampleAES" into oc-dev
22dc508717c7767927064ec7c152def99e54adcb 20-Apr-2017 Pawin Vongmasa <pawin@google.com> Make IGraphicBufferSource::setTimeLapseConfig take fps

Test: Manual use of Camera, Movies, Photos and YouTube apps.

Test: With CtsMediaTestCases.apk installed,
adb shell am instrument -e size small -w
'android.media.cts/android.support.test.runner.AndroidJUnitRunner'

Bug: 37302530
Change-Id: Id0d4f7fed57349a2f5484f6b6264981471e8f022
Codec.cpp
nclude/ACodec.h
mx/1.0/WGraphicBufferSource.cpp
mx/1.0/WGraphicBufferSource.h
mx/BWGraphicBufferSource.cpp
mx/BWGraphicBufferSource.h
mx/GraphicBufferSource.cpp
mx/GraphicBufferSource.h
24059088a46160f731903cc66404184a531d0478 07-Apr-2017 Pawin Vongmasa <pawin@google.com> Add future support for IGraphicBufferSource::getStopTimeOffsetUs

Test: Compiles
Bug: 35925528
Change-Id: I31368939d2f13811b9e8b3e5911b91b14148c167
mx/1.0/WGraphicBufferSource.cpp
mx/1.0/WGraphicBufferSource.h
3a37f3e948b600405e0c70b8a241778fda44168e 19-Apr-2017 Hassan Shojania <shojania@google.com> Modular DRM for MediaPlayer/SampleAES

Bug: 34559906
Test: CTS Tests + playback in Chrome

Change-Id: Iaa275c4cfe6d15f02774ff4cc8a2cb5e7d1012e1
ndroid.mk
ttplive/PlaylistFetcher.cpp
ttplive/PlaylistFetcher.h
peg2ts/ATSParser.cpp
peg2ts/ATSParser.h
peg2ts/Android.mk
peg2ts/ESQueue.cpp
peg2ts/ESQueue.h
peg2ts/HlsSampleDecryptor.cpp
peg2ts/HlsSampleDecryptor.h
b6ed37ed0e1176c3458294abae0ea1b11c30d44f 19-Apr-2017 Andy Hung <hunga@google.com> Merge "MediaBufferGroup: Fix MediaBufferGroup signal" into oc-dev
b3921125a9904fc3fb3eecca421bc418e273f3cd 19-Apr-2017 Yin-Chia Yeh <yinchiayeh@google.com> stagefright: fix log spam

Bug: 37110143
Change-Id: I82d147c966980716df5eb5c05cf8cb71387f0862
mx/GraphicBufferSource.cpp
43fb79ad6ffecb86d5041afd8c06b764fb6f934f 06-Apr-2017 Lajos Molnar <lajos@google.com> stagefright: Rework GraphicBufferSource - step 1

- Abstract buffer reference counting so that it does not intimately
assume a BufferQueue. Move releasing acquired buffers into a
callback as this is BQ specific. Having vectors for slots is also
BQ specific.

Use shared, copiable objects to manage buffers and their lifecycles:

CachedBuffer: a cached buffer in a slot

AcquiredBuffer: a buffer acquired from the producer that will
need to be released (and will get released when all copies of
this object go out of scope)

VideoBuffer: an acquired buffer with metadata

- Rename variables to be more descriptive.

- Move associated methods and variables closer together.

- Document methods and some of the operations of GraphicBufferSource.

Bug: 37110143
Change-Id: Iea5e7a376eba2bdd41624a7ddbe1d94c3d0e7b68
nclude/foundation/ADebug.h
nclude/foundation/FileDescriptor.h
mx/GraphicBufferSource.cpp
mx/GraphicBufferSource.h
67fbe2dac5a59d95f8527f8a0372ff5d9e2e4f9e 07-Apr-2017 Andy Hung <hunga@google.com> MediaBufferGroup: Fix MediaBufferGroup signal

Test: Photos, Camera Record
Bug: 35612467
Change-Id: Id2e30f2f8b67b207835ae6add65b9d03dfcaf2e9
oundation/MediaBufferGroup.cpp
873026fec4b3c3bbaa7d6666936e47aee7c138c7 14-Apr-2017 Steven Moreland <smoreland@google.com> omx: Removed dead files.

Test: pass
Bug: 33241851
Change-Id: I6cd2aac88861295ddf2243738f643639c7e82000
mx/hal/1.0/impl/Android.mk
9e7dd63dfff0cc967f025ea9e27a299aaa99fd69 13-Apr-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge changes from topic 'api-review' into oc-dev

* changes:
MediaCas: combine openSession methods
MediaCas: changes to address API review comments
0de04e850beced076e4b1fcf0e513255f62a7d85 12-Apr-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Remove setQuirks() from IOMXNode and IOmxNode." into oc-dev
d72bb124d3d81ee4291c100066b3cc7540cfda85 12-Apr-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Fix mmap size 0 errors" into oc-dev
a78c1cc9773532b1f9d066ed8fa0d9414c1bb8bb 01-Apr-2017 Chong Zhang <chz@google.com> MediaCas: combine openSession methods

Combine the two openSession methods into one that doesn't take any
arguments. This gives the client more flexibility on creating
sessions efficiently. They can better decide whether to share one
session for multiple streams, or create one session per stream.

bug: 22804304

Change-Id: I9634f4dd4fc437229068103b54555cc28a818937
peg2ts/CasManager.cpp
bc7aae4ff7e72e5bf0fa888f946835840a4357bb 31-Mar-2017 Chong Zhang <chz@google.com> MediaCas: changes to address API review comments

Attach CAS system id as well as session id for scrambled tracks,
so that MediaExtractor can construct the CasInfo object.

bug: 22804304
bug: 36791613
bug: 36783335

Change-Id: I524c10a746615da5c16845658c39fd5a972182c9
tils.cpp
nclude/MetaData.h
peg2ts/ATSParser.cpp
peg2ts/CasManager.cpp
peg2ts/CasManager.h
peg2ts/ESQueue.cpp
peg2ts/ESQueue.h
f0a54b35c67b11d994783b82b886ceb8ac496532 11-Apr-2017 Roger1 Jonsson <roger1.jonsson@sonymobile.com> Merge "Avoid crash for stss sync sample number 0" into lmp-dev am: d12204372f am: 6dfbcefe4b am: 85f575dc67 am: c5bea960dc am: c510b7fb9b am: 2f72b15892 am: 4f383edd27 am: 9d31e50055
am: 2046d33198

Change-Id: I124c627d756728847927c8a764180815a9a5fe42
2046d33198c8ccafa240fd232b8f3eb9b84383f4 11-Apr-2017 Roger1 Jonsson <roger1.jonsson@sonymobile.com> Merge "Avoid crash for stss sync sample number 0" into lmp-dev am: d12204372f am: 6dfbcefe4b am: 85f575dc67 am: c5bea960dc am: c510b7fb9b am: 2f72b15892 am: 4f383edd27
am: 9d31e50055

Change-Id: I161ae5bf7df872b7ef5ca116ffd6e84018f73ea3
9d31e5005554f9086c4654c585a19406e3f594c2 11-Apr-2017 Roger1 Jonsson <roger1.jonsson@sonymobile.com> Merge "Avoid crash for stss sync sample number 0" into lmp-dev am: d12204372f am: 6dfbcefe4b am: 85f575dc67 am: c5bea960dc am: c510b7fb9b am: 2f72b15892
am: 4f383edd27

Change-Id: Ica34036c7643495fb521b9a6f859d9388f3fd1cd
4f383edd273db3b7ca1460918a429e5cc01f3bb2 11-Apr-2017 Roger1 Jonsson <roger1.jonsson@sonymobile.com> Merge "Avoid crash for stss sync sample number 0" into lmp-dev am: d12204372f am: 6dfbcefe4b am: 85f575dc67 am: c5bea960dc am: c510b7fb9b
am: 2f72b15892

Change-Id: I7c0c20fd9da75dcf7dcd68b7b49aaf31b77162ae
2f72b15892e1e0ac04ec8bd7e757c22f69bc9fb8 11-Apr-2017 Roger1 Jonsson <roger1.jonsson@sonymobile.com> Merge "Avoid crash for stss sync sample number 0" into lmp-dev am: d12204372f am: 6dfbcefe4b am: 85f575dc67 am: c5bea960dc
am: c510b7fb9b

Change-Id: Ia652aac790d73def27c400b1ac327a4ad1ff8ceb
c510b7fb9bd527a37112cd8caff60968973a08a4 11-Apr-2017 Roger1 Jonsson <roger1.jonsson@sonymobile.com> Merge "Avoid crash for stss sync sample number 0" into lmp-dev am: d12204372f am: 6dfbcefe4b am: 85f575dc67
am: c5bea960dc

Change-Id: I0448adf35221404dbc19c4ed14f2d0252770499e
c5bea960dc69686ec0ce4d0afe62a9e58be9a4cd 11-Apr-2017 Roger1 Jonsson <roger1.jonsson@sonymobile.com> Merge "Avoid crash for stss sync sample number 0" into lmp-dev am: d12204372f am: 6dfbcefe4b
am: 85f575dc67

Change-Id: Ie8f3698b61e3f4d13383eaf1f36788186fdf3676
6dfbcefe4b3ea42e552d2871babd416748b7e690 11-Apr-2017 Roger1 Jonsson <roger1.jonsson@sonymobile.com> Merge "Avoid crash for stss sync sample number 0" into lmp-dev
am: d12204372f

Change-Id: Ic2bca43957197cf537760826de60fcb85777cb1b
d12204372f04b80b0ccbf6f02473aef01afaaefc 11-Apr-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Avoid crash for stss sync sample number 0" into lmp-dev
4c161506a542671f96177b16830f9b362f7a6c61 11-Apr-2017 Jeff Tinker <jtinker@google.com> Fix mmap size 0 errors

ACodecBufferChannel was attempting to create a MemoryDealer
with zero size, which resulting in mmap failures. This was
causing the ExoPlayer GTS test to fail to complete due to
the Drm HAL being blocked in createPlugin.

Test: run gts -m GtsExoPlayerTestCases

bug:36870961
Change-Id: I0945e95565ea4ef05e53fb13cf5ddbba43f27173
CodecBufferChannel.cpp
06dbccbed109c6734107f831620f7196d2020872 11-Apr-2017 Marco Nelissen <marcone@google.com> Merge "Don't allow using or allocating a buffer after the first state transition" into nyc-dev am: 3294a9fe16 am: b706fb9d69 am: faf128c93d
am: 75aa7716c4

Change-Id: Ia496d982d3321baf8506218ea7deda294b0e13e6
faf128c93dea46968f00bbfed845e5d038797c70 11-Apr-2017 Marco Nelissen <marcone@google.com> Merge "Don't allow using or allocating a buffer after the first state transition" into nyc-dev am: 3294a9fe16
am: b706fb9d69

Change-Id: Ic4de546269b2eb85f79f25900705999a7a5d24e6
b706fb9d6928edf9d574c8d5fcd2dfd02cc51276 10-Apr-2017 Marco Nelissen <marcone@google.com> Merge "Don't allow using or allocating a buffer after the first state transition" into nyc-dev
am: 3294a9fe16

Change-Id: I61c43661f42204e9aeebb44df9418d7ca5bb9e8e
81b554b04c93aebf3e74116330024272770d2967 28-Mar-2017 Marco Nelissen <marcone@google.com> Don't allow using or allocating a buffer after the first state transition

Bug: 35467458
Change-Id: Ia76c8cec8ad2abb95ca29b2a89075f7acab4b174
mx/OMXNodeInstance.cpp
2d4e2b4975a6fe2642e1a427621fb21fc3ba5e8e 10-Apr-2017 Marco Nelissen <marcone@google.com> Merge "Don't allow using or allocating a buffer after the first state transition" into klp-dev am: 922ad6183e am: 0893c50bcf am: 59bc7f77f8 am: 82ffcbd667 am: 9edaa79f62 am: 56c520c4ca am: 12c176066e am: 8671302d0b
am: 4a9200308c

Change-Id: I1534efa8ced51e1b43611da84283d67af1d4f8bd
4a9200308c658499091d7f4450018ba14d55c4d3 10-Apr-2017 Marco Nelissen <marcone@google.com> Merge "Don't allow using or allocating a buffer after the first state transition" into klp-dev am: 922ad6183e am: 0893c50bcf am: 59bc7f77f8 am: 82ffcbd667 am: 9edaa79f62 am: 56c520c4ca am: 12c176066e
am: 8671302d0b

Change-Id: I8cda69d1fdf55fe8be6d904813eb0e87db043c8a
8671302d0b5fb5b8e4317e456d95cbc43b464e79 10-Apr-2017 Marco Nelissen <marcone@google.com> Merge "Don't allow using or allocating a buffer after the first state transition" into klp-dev am: 922ad6183e am: 0893c50bcf am: 59bc7f77f8 am: 82ffcbd667 am: 9edaa79f62 am: 56c520c4ca
am: 12c176066e

Change-Id: Id2207725fc2e69c8aee4a24ee605dc7fae8939e2
12c176066efa2aa3d30998e605689aac2bc615ee 10-Apr-2017 Marco Nelissen <marcone@google.com> Merge "Don't allow using or allocating a buffer after the first state transition" into klp-dev am: 922ad6183e am: 0893c50bcf am: 59bc7f77f8 am: 82ffcbd667 am: 9edaa79f62
am: 56c520c4ca

Change-Id: I27e648ddd65325600cad22d5b0fef03aa4a9447a
9edaa79f62adc89d14bbb181f62d57dd8c7048f8 10-Apr-2017 Marco Nelissen <marcone@google.com> Merge "Don't allow using or allocating a buffer after the first state transition" into klp-dev am: 922ad6183e am: 0893c50bcf am: 59bc7f77f8
am: 82ffcbd667

Change-Id: I1b2ea29d1c22f1714f0c0e90a56c585176742dd2
82ffcbd6671a96421cdd960eb983319e3b2f1b80 10-Apr-2017 Marco Nelissen <marcone@google.com> Merge "Don't allow using or allocating a buffer after the first state transition" into klp-dev am: 922ad6183e am: 0893c50bcf
am: 59bc7f77f8

Change-Id: I133f8566b649821e06cfb21a95b20f84eb839219
59bc7f77f87f0d6f67db4e591f498281881197d5 10-Apr-2017 Marco Nelissen <marcone@google.com> Merge "Don't allow using or allocating a buffer after the first state transition" into klp-dev am: 922ad6183e
am: 0893c50bcf

Change-Id: I819b55a95ff50c51488bac50c43fea8b2244a410
922ad6183e1524c06abc4bcc60b8748a45b8bd70 10-Apr-2017 Marco Nelissen <marcone@google.com> Merge "Don't allow using or allocating a buffer after the first state transition" into klp-dev
98ace5dd8c4644e86af2c9b533c6d249fa0ff24b 08-Apr-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "(DO NOT MERGE) media: Add support for setting encoder latency in ACodec." into oc-dev
ef0b6b64144b6e062bbb445a6df73c365b66646d 07-Apr-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "MediaCas: fixes for playback tests" into oc-dev
6ed07dc02d4240f94e7fb0786fb263bdc7a610ba 05-Apr-2017 Pawin Vongmasa <pawin@google.com> Remove setQuirks() from IOMXNode and IOmxNode.

Test: Media post-submit tests on Pixel phone.
Test: Manual use of Camera, Photos, Play Movies and YouTube apps.
Bug: 36952714
Change-Id: I230df51c2d658e29cffec369ba622e336c3402d2
Codec.cpp
ndroid.mk
nclude/OMX.h
mx/1.0/Omx.cpp
mx/1.0/Omx.h
mx/1.0/WOmxNode.cpp
mx/1.0/WOmxNode.h
mx/Android.mk
mx/OMX.cpp
mx/OMXNodeInstance.cpp
89999206477b02597be9b5322d35e37b11ca7326 27-Feb-2017 Hangyu Kuang <hkuang@google.com> (DO NOT MERGE) media: Add support for setting encoder latency in ACodec.

Test: Video recording.
Bug: 34221970
Change-Id: Ibd1ac03b206540cac354d4c80bafdacb6f0ea9e7
(cherry picked from commit 8e92c7c9f17a3a05f487c6bef40e921de75df7b7)
Codec.cpp
nclude/ACodec.h
b01fb48fcc755d6bfad9bc94d8c227349155e1b5 24-Mar-2017 Chong Zhang <chz@google.com> MediaCas: fixes for playback tests

- Set crypto mode to kMode_AES_CTR, since kMode_AES_CBC is not defined
on Java API, and is rejected when the sample is queued to MediaCodec.

- Wrap the plugin object in a RefBase, and hold a strong ref to it
when executing any API calls in CasImpl. This is needed because
CasImpl could be released by Java API, while MediaCodec native is
still trying to access it.

- Fix build warnings.

Tests: cts-tradefed run cts-dev --module CtsMediaTestCases --test android.media.cts.ClearKeySystemTest

It should not fail.

bug: 22804304
Change-Id: Id4ef037d57dd741d2bb22b1de3d04c8d078b69fb
peg2ts/ESQueue.cpp
464d9fbf52f37b2ec465acad65c6342aa35db457 06-Apr-2017 Scott Randolph <randolphs@google.com> Merge "Use explicit .c_str() for hidl_string" into oc-dev
c668efcfd0ea042c73b988094414f2b2d574367c 06-Apr-2017 Ray Essick <essick@google.com> Merge "Move MediaMetrics into its own library" into oc-dev
024e783acdff65cdb8eb9de5ade3359ebb338a3b 26-Oct-2016 Roger1 Jonsson <roger1.jonsson@sonymobile.com> Avoid crash for stss sync sample number 0

A sample number value of 0 means that the value stored in
the mSyncSamples array, would become negative (-1),
when converted to index value. This causes a crash.

Make sure that stss sample numbers are bigger
than 0 before converting sample number to index value.

Bug: 32423862
bug: 35645051
Test: Playback video that triggers stss sync sample number 0
Change-Id: I35bee7c718e01b086d7e05deda13b38083f509f5
ampleTable.cpp
ab28d49e4142dc9c37a675fc6fe4eb417d9df887 06-Apr-2017 Roger1 Jonsson <roger1.jonsson@sonymobile.com> Avoid crash for stss sync sample number 0 am: 5c364997a3
am: e77a32bd3d

Change-Id: If61ba19bc937c6b7c7227296ddba5a1797072f9d
2c8fec10807dc50c2d65d250e7a9157580f7094c 05-Apr-2017 Robert Shih <robertshih@google.com> omx node: patch err code to preserve API contract

Bug: 36789323
Change-Id: Ie1d8dde5e4df8f5f4061cba7b20e1732b1466235
Test: adb shell am instrument -e size small \
-w android.media.cts/android.support.test.runner.AndroidJUnitRunner
mx/OMXNodeInstance.cpp
0f0c9b5007ff694d05a91c28359db0553e4dd061 05-Apr-2017 Ray Essick <essick@google.com> Move MediaMetrics into its own library

Changes for the new HAL structure have brought about a build time
circular dependency between libmedia and libmediadrm. This set of
changes the media metrics code into its own library and arranges
for the relevant consumers of the media metrics code to link
to this new library (where they had previously picked it up by
including libmedia).

Bug: 36990807
Test: build, boot.
Change-Id: I81768eecca88d5e59e6e6e547f29308a94e30c7b
ndroid.mk
549f208855372bd0913ffbcbb67ea6abc98193e2 05-Apr-2017 Mathias Agopian <mathias@google.com> Merge "Remove useless GraphicBuffer() constructor" into oc-dev
2bdbb166a4063a91bab75e50170695370004fecc 24-Mar-2017 Wei Jia <wjia@google.com> MPEG4Source: fix fragmented read.

Test: passed CTS test DecoderTest#testDecodeFragmented
Bug: 36571704
Change-Id: I71ad6aaae473b03483f8405899d3178148597bba
(cherry picked from commit ba9af7792dfed6e9b1b216aab91a97e713eec891)
PEG4Extractor.cpp
5c364997a3191cb4e8a288befae87e811a723256 26-Oct-2016 Roger1 Jonsson <roger1.jonsson@sonymobile.com> Avoid crash for stss sync sample number 0

A sample number value of 0 means that the value stored in
the mSyncSamples array, would become negative (-1),
when converted to index value. This causes a crash.

Make sure that stss sample numbers are bigger
than 0 before converting sample number to index value.

Bug: 32423862
bug: 35645051
Test: Playback video that triggers stss sync sample number 0
Change-Id: I35bee7c718e01b086d7e05deda13b38083f509f5
ampleTable.cpp
c1d17710bde127ad6c4533490b27effb3016f1b4 03-Apr-2017 Scott Randolph <randolphs@google.com> Use explicit .c_str() for hidl_string

hidl_string no longer will provide an implicit cast to const char* as it
interfers with other expected behaviors of the class. It now emulated
std::string in requiring a call to .c_str() to get the same behavior.

Bug: 36532780
Test: Build the tree
Change-Id: I2b7c4d8e530cc1678cd08d77e365c5e560493264
mx/1.0/Omx.cpp
mx/1.0/WOmxNode.cpp
04e331c5032609f7ed42c344780b9c1b4cfe4afb 04-Apr-2017 Mathias Agopian <mathias@google.com> Remove useless GraphicBuffer() constructor

Test: compiled & run
Bug: 36869708
Change-Id: I777701b8f47929d2b669d2a990649e58eef528fc
Codec.cpp
urfaceUtils.cpp
ests/SurfaceMediaSource_test.cpp
32a81b609574523c69e3534337c222f3294a050d 03-Apr-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Camera: HAL1 recording batching support" into oc-dev
1cbe62c82a8bfdb18a5bb79de57252dbd378445c 31-Mar-2017 Wei Jia <wjia@google.com> NuPlayer: handle source error correctly.

Test: source error is sent to app.
Bug: 35025627
Change-Id: I668bab0de20cf24def028a6a467efceaed54af2b
(cherry picked from commit 231fd353518502e3a05021473ae60e7addd9a46c)
P3Extractor.cpp
b5df547bce900fa5764d735bee304e79c001d60d 21-Mar-2017 Yin-Chia Yeh <yinchiayeh@google.com> Camera: HAL1 recording batching support

Test: Angler HAL1 + batching normal recording mode
Bug: 35997432
Change-Id: If088715ccdb40163f44150c16deed62432692c07
ameraSource.cpp
ameraSourceTimeLapse.cpp
nclude/CameraSource.h
nclude/CameraSourceTimeLapse.h
4d5f24ab62f5892ff1b0fac046fc0ccdb870cc47 31-Mar-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Remove dependency on persist.hal.binderization." into oc-dev
02b96f062a59319489c1b46617479e99805bf4e5 31-Mar-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "media: Handle STOP action properly." into oc-dev
c68689dfd6fa3b880a0d8e75408b582b389630f8 24-Aug-2016 Praveen Chavan <pchavan@codeaurora.org> libstagefright: Add error handling in mediacodecsource

During camcorder recording, if encoder throws an error,
it intimates error to media codec source.
In such error cases, added functionality to stop puller
and clean up the graph to avoid memory leaks.

Bug: 34870133
Test: Video Recording.

Author: Uma Mehta <umamehta@codeaurora.org>

Change-Id: I487d96f855f541033e8ec7872e86d00bafb96daf
ediaCodecSource.cpp
21bafd5a325aac30406fbb5dcff18812e0f44a45 30-Mar-2017 Hangyu Kuang <hkuang@google.com> media: Handle STOP action properly.

Release all buffers and set mEndOfStream when handling STOP action.

Bug: 36682265
Test: Video Recording and MediaRecorder CTS test.
Change-Id: I2f40f0dca4e0b062ab43bfc5e6a646f649fdc524
mx/GraphicBufferSource.cpp
mx/GraphicBufferSource.h
fd1c19c3a794cf263262aebe52e18a8107b2a879 30-Mar-2017 Andy Hung <hunga@google.com> Merge "Allow MediaExtractor to create FileSource" into oc-dev
d4e9ca49a3863beeb0027f51e2331e4c5ec2402b 30-Mar-2017 Pawin Vongmasa <pawin@google.com> Remove dependency on persist.hal.binderization.

Test: Manual use of Camera, Movies, Photos and YouTube apps.

Test: With CtsMediaTestCases.apk installed,
adb shell am instrument -e size small -w
'android.media.cts/android.support.test.runner.AndroidJUnitRunner'

Bug: 34274385
Change-Id: I5251fea337f33460d1f0db174cedc465822f2a47
MXClient.cpp
mx/tests/OMXHarness.cpp
12025bc9c42248d254e76a6bef2b72b5b227ec4a 30-Mar-2017 Mathias Agopian <mathias@google.com> fix another missing include

Test: built
Bug: 36603618
Change-Id: I3dd55a96fb29e42fc7accb40a471d11a37cb3296
mx/SoftVideoEncoderOMXComponent.cpp
f3134a01aa2574f8ab62f58f1a76b77029201196 29-Mar-2017 Mathias Agopian <mathias@google.com> Merge "fix missing include" into oc-dev
d49dbd6b625cddb82f3f7bbeac62d48ef338ef0f 07-Jul-2016 Andy Hung <hunga@google.com> Allow MediaExtractor to create FileSource

Remove binder call to MediaServer for reading files.

Test: Photos, Play Music, Play Movies, Youtube
Bug: 29125703
Change-Id: Id6abf592bf6d70b81158f6038b1982f0a537b9b9
allbackDataSource.cpp
ataSource.cpp
ileSource.cpp
ediaExtractor.cpp
nclude/CallbackDataSource.h
nclude/DataSource.h
nclude/FileSource.h
nclude/RemoteDataSource.h
6dcab2bafd847be84c2c2230bbd04af9c45c491e 28-Mar-2017 Chong Zhang <chz@google.com> DRM: more fixes for heap base mapping -- DO NOT MERGE

Heap base for the same heap could be mapped to different values
after they go across binder to CryptoHal. So we can't use heapbase
to index the heaps.

Since each ACodec instance allocates all its shared memory buffers
from the same memory dealer, we let CryptoHal assign a sequence
number to the ACodec when it calls setHeap. In subsequent calls
to CryptoHal::decrypt, reference the heap by the seq num, and ignore
the heap base address.

Bug: 36479980
Bug: 36209723
Bug: 36660223

Test: the above bugs don't repro

Change-Id: I2f519a689a5891447385d1bf9d6e668bb3b4dbe2

(cherry-picked from bf628da1e231e2e4d6bf61f9884e120bae3f9156)
CodecBufferChannel.cpp
nclude/ACodecBufferChannel.h
d07c92742fc5801cab8e99801f591365986acbe9 28-Mar-2017 Chong Zhang <chz@google.com> Revert "Revert "Fix decoder instantiation during playback"" -- DO NOT MERGE

This reverts commit de7268d8e20b883ec88a7ff19ad560a665373484.

Bug: 36479980
Bug: 36209723
Bug: 36660223

Change-Id: I8d83305a28dc35cee16f8f1068c90fdd0b9effff
(cherry picked from commit 6aa5c0662c86c7f7b2890577a207086eeecbd177)
CodecBufferChannel.cpp
nclude/ACodecBufferChannel.h
06cae66df7dedd164a07b802e4ca63a22d01de21 28-Mar-2017 Mathias Agopian <mathias@google.com> fix missing include

Test: built
Bug: 36603618
Change-Id: I836e2458203600768aa199f243206d5e0d9d4d39
mx/SoftVideoEncoderOMXComponent.cpp
45060d62f6ac2a6661809a1696bd007a64b93e64 28-Mar-2017 Marco Nelissen <marcone@google.com> Don't allow using or allocating a buffer after the first state transition

Bug: 35467458
Change-Id: Ia76c8cec8ad2abb95ca29b2a89075f7acab4b174
mx/OMXNodeInstance.cpp
e25320450ca414dd859fd5d80bcd18ecc91630de 28-Mar-2017 Marco Nelissen <marcone@google.com> Don't allow using or allocating a buffer after the first state transition

Bug: 35467458
Change-Id: Ia76c8cec8ad2abb95ca29b2a89075f7acab4b174
mx/OMXNodeInstance.cpp
5f8beee0ea76ffe5cc40a517e8db43dbd64fbeff 28-Mar-2017 Mathias Agopian <mathias@google.com> fix missing include

Test: built
Bug: 36603618
Change-Id: I739a13d3072e1fc168479cb26479cdbb4d19c2dc
olorconversion/SoftwareRenderer.cpp
321218afc6c0c57869d347c88a520b8020d971c7 25-Mar-2017 Lajos Molnar <lajos@google.com> stagefright: fix casting error in AMessage::findAsInt64

Change-Id: I7d9452e55611565cc4208d1835872a0de6f5a351
oundation/AMessage.cpp
130e634e639a92a79653d8cbb2a84288a0040580 24-Mar-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Enable CFI for libstagefright_foundation."
01c10f8cdcd58d1e7025f426a72e6e75ba5d7fc2 17-Mar-2017 Lajos Molnar <lajos@google.com> stagefright: add support for named vendor extension parameters for MediaCodec

Relay vendor extension params to the component and populate vendor extension
parameters to the format. Failure to set these parameters is propagated to
the caller. Component may decide whether to fail on invalid/incomplete
settings.

Also add required support:

- propagate more errors from OMX to client, and be specific about
errors we ignore in MediaCodec.configure().
- add AMessage::findAsInt64

Bug: 32746650
Change-Id: I67ee8a5c1d3e65816cdadc28d228721925e2e327
Codec.cpp
oundation/AMessage.cpp
nclude/ACodec.h
nclude/foundation/AMessage.h
mx/OMXUtils.cpp
9c0185269e373af60a8ccf927437a0e0ebdd7563 11-Mar-2017 Vishwath Mohan <vishwath@google.com> Enable CFI for libstagefright_foundation.

Adds CFI (and diagnostics for it) to libstagefright_foundation.

Bug: 36219323
Test: ENABLE_CFI=true m -j40 # builds and device boots
oundation/Android.bp
4d7aacd7e12f084aed2bc8cfe28daa0dc915a08b 23-Mar-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Revert "ACodec: update native window crop rectangle""
607e65286b7c3dcd06b7175c9d81b82e6fcfcb9a 23-Mar-2017 Wonsik Kim <wonsik@google.com> Revert "ACodec: update native window crop rectangle"

This reverts commit c7b2b233d26e80ecf823078a7504e458ba9efe8c.

Fix: 36553910
Fix: 36541617
Test: manual
Change-Id: I5f0023dee45bd9d574ef9a27c3456ca40ed75f0a
Codec.cpp
d0844433fff7aea6473235422c452f2677c87502 23-Mar-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "stagefright: properly handle crypto object reset"
3c2c5556f44765abe7e3dc25584a2ccb316a9b14 23-Mar-2017 Wonsik Kim <wonsik@google.com> stagefright: properly handle crypto object reset

Bug: 36449774
Test: Run PoC in the bug
Test: adb shell am instrument -e size small -w 'android.media.cts/android.support.test.runner.AndroidJUnitRunner'
Test: Play an encrypted content on Play Movies
Change-Id: Ia7b38ed586460ad51fa66a6959211a7dfffa3493
CodecBufferChannel.cpp
bd3ae0a48d5d76a882707b6308e232a401548b22 22-Mar-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "ACodec: update native window crop rectangle"
c7b2b233d26e80ecf823078a7504e458ba9efe8c 17-Feb-2017 Santhosh Behara <santhoshbehara@codeaurora.org> ACodec: update native window crop rectangle

In setupNativeWindowSizeFormatAndUsage, set the crop rectangle
with the output port's crop value.

Fix: 34869730
Test: adb shell am instrument -e size small -w 'android.media.cts/android.support.test.runner.AndroidJUnitRunner'
Change-Id: I415be069d02d88dcd6b7c2460dda6df191ee7434
Codec.cpp
93e29c0846e0f7583ae96edafbf5e8a3169711ee 22-Mar-2017 Jeff Tinker <jtinker@google.com> Merge "Revert "Fix decoder instantiation during playback""
de7268d8e20b883ec88a7ff19ad560a665373484 22-Mar-2017 Jeff Tinker <jtinker@google.com> Revert "Fix decoder instantiation during playback"

This reverts commit 33327c7f0f04bcce3f8e8ee23953f87efc423037.

Bug: 36479980
Bug: 36209723

Change-Id: I8ff9422086f5ba9ba5df60135d20b9d8bfc0be52
CodecBufferChannel.cpp
nclude/ACodecBufferChannel.h
384cd775be62fff1635a36a7931f361db77220c0 21-Mar-2017 Hangyu Kuang <hkuang@google.com> media: Fix a bug in recording pause/resume.

Bug:35950379
Test: Camera recording and keep pause, resume, pause...
Change-Id: I5c81016e51f40e36430553990724fef3ccb23bb5
mx/GraphicBufferSource.cpp
7ec2a45e48f6c24a5e8fa96416d8793329b79d2f 17-Mar-2017 Jeff Tinker <jtinker@google.com> Merge "Fix decoder instantiation during playback"
33327c7f0f04bcce3f8e8ee23953f87efc423037 16-Mar-2017 Jeff Tinker <jtinker@google.com> Fix decoder instantiation during playback

When a decoder is created while another decoder
is in use and the two decoders share a common
crypto instance, decryption results would become
indeterminate, which could cause the decoder to
hang. This change adds a notification to the
crypto instance so it can update state when its
ownership changes.

bug: 36209723

Test: playbacktests-debug-androidTest.apk as
described in the bug.

Change-Id: I453c260eace5543dd79a3569bf6a9592394c4113
CodecBufferChannel.cpp
nclude/ACodecBufferChannel.h
58e7a269873ff3c319f49818eac1b917c4b67546 16-Mar-2017 Marco Nelissen <marcone@google.com> Remove old software avc encoder

It hasn't been used since Lollipop

Test: build

Change-Id: I7652973b50426b3bcf8c10dcc77deb97366b003c
odecs/avc/Android.mk
odecs/avc/common/Android.mk
odecs/avc/common/MODULE_LICENSE_APACHE2
odecs/avc/common/NOTICE
odecs/avc/common/include/avc_types.h
odecs/avc/common/include/avcapi_common.h
odecs/avc/common/include/avcint_common.h
odecs/avc/common/include/avclib_common.h
odecs/avc/common/src/deblock.cpp
odecs/avc/common/src/dpb.cpp
odecs/avc/common/src/fmo.cpp
odecs/avc/common/src/mb_access.cpp
odecs/avc/common/src/reflist.cpp
odecs/avc/enc/Android.mk
odecs/avc/enc/MODULE_LICENSE_APACHE2
odecs/avc/enc/NOTICE
odecs/avc/enc/SoftAVCEncoder.cpp
odecs/avc/enc/SoftAVCEncoder.h
odecs/avc/enc/src/avcenc_api.cpp
odecs/avc/enc/src/avcenc_api.h
odecs/avc/enc/src/avcenc_int.h
odecs/avc/enc/src/avcenc_lib.h
odecs/avc/enc/src/bitstream_io.cpp
odecs/avc/enc/src/block.cpp
odecs/avc/enc/src/findhalfpel.cpp
odecs/avc/enc/src/header.cpp
odecs/avc/enc/src/init.cpp
odecs/avc/enc/src/intra_est.cpp
odecs/avc/enc/src/motion_comp.cpp
odecs/avc/enc/src/motion_est.cpp
odecs/avc/enc/src/rate_control.cpp
odecs/avc/enc/src/residual.cpp
odecs/avc/enc/src/sad.cpp
odecs/avc/enc/src/sad_halfpel.cpp
odecs/avc/enc/src/sad_halfpel_inline.h
odecs/avc/enc/src/sad_inline.h
odecs/avc/enc/src/sad_mb_offset.h
odecs/avc/enc/src/slice.cpp
odecs/avc/enc/src/vlc_encode.cpp
odecs/avc/enc/test/h264_enc_test.cpp
odecs/avc/patent_disclaimer.txt
9c544bb666bc990812422797c326a76a1bf53beb 16-Mar-2017 Ray Essick <essick@google.com> Merge "Name changes to Media Metrics Keys"
53d3550a526eb34407afb94d4c0b2d1b61c12274 16-Mar-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "WebmFrameThread: clear mThread after join."
606e71cfb90e9646230d37a52b1b43c62c85292c 15-Mar-2017 Wonsik Kim <wonsik@google.com> WebmFrameThread: clear mThread after join.

Bug: 36260305
Test: cts-tradefed run cts-dev --module CtsMediaTestCases --test android.media.cts.NativeDecoderTest
Change-Id: Ifd0ce7d6df71e514b26a4cc2b1c4fe99eacf0f7e
ebm/WebmFrameThread.cpp
107488f4d20f3c4595a78ae33ba2f38bca0a50b9 15-Mar-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Move hybrid interface from libbinder to libhidl/transport."
b67638b64e196b98273c0fedb6b9d114645939e6 15-Mar-2017 Robert Shih <robertshih@google.com> FLACExtractor: copy protect mWriteBuffer am: 8ee699977c am: 038fd6e5ec am: 4eea0b3aa4 am: b06f7c6e15 am: 5c1a7d4c64 am: 5b937b03d5 am: ced3c15960 am: 5f6b69ea29 am: 5770ac25f3 am: bde48bfbcc
am: bdd4b82237

Change-Id: Ie30544eaad64d5aa305b0bcd0ff1a14ca6ace841
bde48bfbcc47df2fae8e4600540774d852d5023b 15-Mar-2017 Robert Shih <robertshih@google.com> FLACExtractor: copy protect mWriteBuffer am: 8ee699977c am: 038fd6e5ec am: 4eea0b3aa4 am: b06f7c6e15 am: 5c1a7d4c64 am: 5b937b03d5 am: ced3c15960 am: 5f6b69ea29
am: 5770ac25f3

Change-Id: I531cbbcdba72ef21b5938468bc3aa1eda067d55a
5770ac25f360ccbe3cfb03a07004a98b98bc22e6 15-Mar-2017 Robert Shih <robertshih@google.com> FLACExtractor: copy protect mWriteBuffer am: 8ee699977c am: 038fd6e5ec am: 4eea0b3aa4 am: b06f7c6e15 am: 5c1a7d4c64 am: 5b937b03d5 am: ced3c15960
am: 5f6b69ea29

Change-Id: I5b3ebe0b7272970e401b0bedcdcf65f92cf23687
5f6b69ea29679d23e396ce5ec4d7913c8d054e25 15-Mar-2017 Robert Shih <robertshih@google.com> FLACExtractor: copy protect mWriteBuffer am: 8ee699977c am: 038fd6e5ec am: 4eea0b3aa4 am: b06f7c6e15 am: 5c1a7d4c64 am: 5b937b03d5
am: ced3c15960

Change-Id: I0e56cd59a6c8818f6fbd1f909c226970cd3b330e
ced3c15960bb2d8692530bef7fcbad088cbfea09 15-Mar-2017 Robert Shih <robertshih@google.com> FLACExtractor: copy protect mWriteBuffer am: 8ee699977c am: 038fd6e5ec am: 4eea0b3aa4 am: b06f7c6e15 am: 5c1a7d4c64
am: 5b937b03d5

Change-Id: I07fae26ec82b190b82c2949a4fbfc1d4e293fda5
5b937b03d5cf1c4cc6d0c04df53826f3045e5b20 15-Mar-2017 Robert Shih <robertshih@google.com> FLACExtractor: copy protect mWriteBuffer am: 8ee699977c am: 038fd6e5ec am: 4eea0b3aa4 am: b06f7c6e15
am: 5c1a7d4c64

Change-Id: Id2cc3152facf8147504b34c9ee575acfc3f67668
04563aafa0debc95d50951ca944abf37ef2777ce 09-Mar-2017 Pawin Vongmasa <pawin@google.com> Move hybrid interface from libbinder to libhidl/transport.

Also, merge android.hardware.media.omx@1.0-impl into libstagefright_omx.

Test: With CtsMediaTestCases.apk installed,
adb shell am instrument -e size small -w
'android.media.cts/android.support.test.runner.AndroidJUnitRunner'
Test: Manual use of Camera, Photos, Play Movies and YouTube apps.
Test: Manual use of screen mirroring.

Bug: 33854657
Change-Id: Ie927bcafd86dc7e9509bb8b76bb3b51f9a423cc7
mx/1.0/Conversion.h
mx/1.0/Omx.cpp
mx/1.0/Omx.h
mx/1.0/WGraphicBufferProducer.cpp
mx/1.0/WGraphicBufferProducer.h
mx/1.0/WGraphicBufferSource.cpp
mx/1.0/WGraphicBufferSource.h
mx/1.0/WOmxBufferSource.cpp
mx/1.0/WOmxBufferSource.h
mx/1.0/WOmxNode.cpp
mx/1.0/WOmxNode.h
mx/1.0/WOmxObserver.cpp
mx/1.0/WOmxObserver.h
mx/1.0/WProducerListener.cpp
mx/1.0/WProducerListener.h
mx/Android.mk
mx/hal/1.0/Android.mk
mx/hal/1.0/impl/Conversion.h
mx/hal/1.0/impl/Omx.cpp
mx/hal/1.0/impl/Omx.h
mx/hal/1.0/impl/WGraphicBufferSource.cpp
mx/hal/1.0/impl/WGraphicBufferSource.h
mx/hal/1.0/impl/WOmxBufferProducer.cpp
mx/hal/1.0/impl/WOmxBufferProducer.h
mx/hal/1.0/impl/WOmxBufferSource.cpp
mx/hal/1.0/impl/WOmxBufferSource.h
mx/hal/1.0/impl/WOmxNode.cpp
mx/hal/1.0/impl/WOmxNode.h
mx/hal/1.0/impl/WOmxObserver.cpp
mx/hal/1.0/impl/WOmxObserver.h
mx/hal/1.0/impl/WOmxProducerListener.cpp
mx/hal/1.0/impl/WOmxProducerListener.h
mx/tests/OMXHarness.cpp
5c1a7d4c64f2f3ab195f6340867bf9e269f47a1a 15-Mar-2017 Robert Shih <robertshih@google.com> FLACExtractor: copy protect mWriteBuffer am: 8ee699977c am: 038fd6e5ec am: 4eea0b3aa4
am: b06f7c6e15

Change-Id: I9b5601e129a7162aa125feef425bdc93de4e4471
b06f7c6e1587c7a27723903db26b85cf7e3f9cbf 15-Mar-2017 Robert Shih <robertshih@google.com> FLACExtractor: copy protect mWriteBuffer am: 8ee699977c am: 038fd6e5ec
am: 4eea0b3aa4

Change-Id: I4f3b1e4a100374da2e412082564fc6fb54dc122a
038fd6e5ec5e7cce73eaa39d9d90d4d8dbc166d2 15-Mar-2017 Robert Shih <robertshih@google.com> FLACExtractor: copy protect mWriteBuffer
am: 8ee699977c

Change-Id: Icdfd99c85fb0f76cc607f8bb29430913cf72bad1
aca26c9d45aeb7d5edd815f97dcc44208a84f4b5 15-Mar-2017 Robert Shih <robertshih@google.com> DO NOT MERGE FLACExtractor: copy protect mWriteBuffer am: 13c77f4fe0
am: 761abda1bd

Change-Id: I30bf5233b69619d260edb952248865adf5c55c83
8ee699977c155c6d67e4abd8b4259b5447148a80 24-Oct-2016 Robert Shih <robertshih@google.com> FLACExtractor: copy protect mWriteBuffer

Bug: 30895578
Bug: 34970788
Change-Id: I4cba36bbe3502678210e5925181683df9726b431
(cherry picked from commit 328cd66cc72ba7bc5452ed5a93f29ddcd73aa9f9)
LACExtractor.cpp
13c77f4fe063ad38d90502651ce545e1ed3ba888 24-Oct-2016 Robert Shih <robertshih@google.com> DO NOT MERGE FLACExtractor: copy protect mWriteBuffer

Bug: 30895578
Bug: 34970788
Change-Id: I4cba36bbe3502678210e5925181683df9726b431
LACExtractor.cpp
1ac2e2bdf0d232b4518020de7b923c0241b27137 14-Mar-2017 Ray Essick <essick@google.com> Merge "Add bounds check in SoftAACEncoder2::onQueueFilled()" into klp-dev am: 19b91af752 am: 8e3cf4d841 am: 5b1bfc1f43 am: 8abf11b512 am: 4bc4f78933 am: 7f2592fe4a am: dbdf026f76 am: c4305aeda4 am: 1baad9ad99 am: 2ad7f9b172 am: 457bde5e35 am: ed1109257a am: 9ab3187ff5 am: 530cf7afef am: 7b0b51c337
am: c44d9d4896

Change-Id: I997f158d27379de88c32ea01fcb1c024eed8e642
948c0d8d854efbd6dfda05edd7d381848b7290a7 14-Mar-2017 Ray Essick <essick@google.com> Merge "Fix TOCTOU problem in libstagefright_soft_aacenc" into klp-dev am: 2076915c5f am: dcda2ec2fe am: f5c7784dbd am: c3de266a99 am: 8655d4fc01 am: b05be00f56 am: eb58ce5bb0 am: a830539187 am: e973c65525 am: ae7fae1810 am: d4d9c97a9d am: b532a32912 am: e4cce73b86 am: ce559427fd am: bb8e18154d
am: 44b13b68cf

Change-Id: I8bb138124374252fbd259e6b51234d05acc7a3a7
c44d9d48962e02d3d341eb784c9f861528607a5a 14-Mar-2017 Ray Essick <essick@google.com> Merge "Add bounds check in SoftAACEncoder2::onQueueFilled()" into klp-dev am: 19b91af752 am: 8e3cf4d841 am: 5b1bfc1f43 am: 8abf11b512 am: 4bc4f78933 am: 7f2592fe4a am: dbdf026f76 am: c4305aeda4 am: 1baad9ad99 am: 2ad7f9b172 am: 457bde5e35 am: ed1109257a am: 9ab3187ff5 am: 530cf7afef
am: 7b0b51c337

Change-Id: I7c661b582f8511bc2e978ef6294a472ebee21dbd
44b13b68cf7d2300e43097a36458311a09fc9a53 14-Mar-2017 Ray Essick <essick@google.com> Merge "Fix TOCTOU problem in libstagefright_soft_aacenc" into klp-dev am: 2076915c5f am: dcda2ec2fe am: f5c7784dbd am: c3de266a99 am: 8655d4fc01 am: b05be00f56 am: eb58ce5bb0 am: a830539187 am: e973c65525 am: ae7fae1810 am: d4d9c97a9d am: b532a32912 am: e4cce73b86 am: ce559427fd
am: bb8e18154d

Change-Id: I2ccabcce8115b1b9d1ad90ab14fc7eccc2ab0c15
f14c49bff37ae3b703f9b0b164e39df56c9dc4ae 14-Mar-2017 Marco Nelissen <marcone@google.com> Merge "Fix integer overflow and divide-by-zero" into klp-dev am: b264ece2c0 am: bbca2719c6 am: c2e69851ea am: 3285770d37 am: d935c7f16e am: 98ee832c7e am: 1db2ee3dbd am: 946a690f5c am: 5fef11c61a am: 3a3cc883c1 am: d218b51912 am: 9305cf71d1 am: 7422dafea0 am: 731527f43f am: 4e083b91ae
am: a5091c84c3

Change-Id: I36e38ee2a6b74422bbb28c5368f5518bc69f71df
9744d5a95e4de0f0a63f313984acceb033b64c1d 14-Mar-2017 Marco Nelissen <marcone@google.com> Merge "Fix NPDs in h263 decoder" into klp-dev am: 012e5fd39e am: 9e8dfb5938 am: 9e4a0e1fab am: 3c4401fce8 am: 8867ca40df am: 4ba3934ec3 am: 89349b8d29 am: 176e7e8183 am: 0cbbb5c561 am: 2e1457123f am: bd47b7e23c am: 33745e6537 am: d79e9c79f7 am: a83fb59933 am: 16b4299141
am: 12921733fe

Change-Id: I672d4984a25b98f09be2185545b274ae45cbf315
7b0b51c33721f694803ed57c2a5dbd0faf55206a 14-Mar-2017 Ray Essick <essick@google.com> Merge "Add bounds check in SoftAACEncoder2::onQueueFilled()" into klp-dev am: 19b91af752 am: 8e3cf4d841 am: 5b1bfc1f43 am: 8abf11b512 am: 4bc4f78933 am: 7f2592fe4a am: dbdf026f76 am: c4305aeda4 am: 1baad9ad99 am: 2ad7f9b172 am: 457bde5e35 am: ed1109257a am: 9ab3187ff5
am: 530cf7afef

Change-Id: I3ded31b95bff54d255eed96d7e6e1ccd083468f4
bb8e18154d451238394d8c8c0a800c5381f37023 14-Mar-2017 Ray Essick <essick@google.com> Merge "Fix TOCTOU problem in libstagefright_soft_aacenc" into klp-dev am: 2076915c5f am: dcda2ec2fe am: f5c7784dbd am: c3de266a99 am: 8655d4fc01 am: b05be00f56 am: eb58ce5bb0 am: a830539187 am: e973c65525 am: ae7fae1810 am: d4d9c97a9d am: b532a32912 am: e4cce73b86
am: ce559427fd

Change-Id: Ide697c3ae0093839acb6a08e1617eef0f43677fe
e3758a01279fbd09f9ccaa0fc8491497f63a657b 14-Mar-2017 Marco Nelissen <marcone@google.com> Merge "Fix out of bounds access" into klp-dev am: 360cbbd72c am: f71b76cae8 am: 36c2e14da3 am: 8a3cc1963e am: 5b0ca6a92c am: d270a899c2 am: 8f2b91f0a1 am: 6e25e6f7a2 am: f375fd0f70 am: 5d1ce82bb3 am: 4c5f8398f0 am: 31b147f2f7 am: b9002a6643 am: 448e61d0d7 am: b1f14803fe
am: 8368b2be1a

Change-Id: Id3d13a1a7187ceb11640117f98f9f94b8c527452
a5091c84c38cac7e43f3fea9198fc58107d94e74 14-Mar-2017 Marco Nelissen <marcone@google.com> Merge "Fix integer overflow and divide-by-zero" into klp-dev am: b264ece2c0 am: bbca2719c6 am: c2e69851ea am: 3285770d37 am: d935c7f16e am: 98ee832c7e am: 1db2ee3dbd am: 946a690f5c am: 5fef11c61a am: 3a3cc883c1 am: d218b51912 am: 9305cf71d1 am: 7422dafea0 am: 731527f43f
am: 4e083b91ae

Change-Id: I375a88ca9ba2e9ea807c7471b347a68f7631a91a
12921733fe45fe33159fcc923dead88f88016a18 14-Mar-2017 Marco Nelissen <marcone@google.com> Merge "Fix NPDs in h263 decoder" into klp-dev am: 012e5fd39e am: 9e8dfb5938 am: 9e4a0e1fab am: 3c4401fce8 am: 8867ca40df am: 4ba3934ec3 am: 89349b8d29 am: 176e7e8183 am: 0cbbb5c561 am: 2e1457123f am: bd47b7e23c am: 33745e6537 am: d79e9c79f7 am: a83fb59933
am: 16b4299141

Change-Id: I62dc6b12ffe41bb50dee56986c042047935058a9
8368b2be1ac45be1ea8775a9e3c3d7f013418fff 14-Mar-2017 Marco Nelissen <marcone@google.com> Merge "Fix out of bounds access" into klp-dev am: 360cbbd72c am: f71b76cae8 am: 36c2e14da3 am: 8a3cc1963e am: 5b0ca6a92c am: d270a899c2 am: 8f2b91f0a1 am: 6e25e6f7a2 am: f375fd0f70 am: 5d1ce82bb3 am: 4c5f8398f0 am: 31b147f2f7 am: b9002a6643 am: 448e61d0d7
am: b1f14803fe

Change-Id: I68be1067743fa39062940a2346f5d3443edf4315
4e083b91aeabfe58add0f878b10e27b637d58d43 14-Mar-2017 Marco Nelissen <marcone@google.com> Merge "Fix integer overflow and divide-by-zero" into klp-dev am: b264ece2c0 am: bbca2719c6 am: c2e69851ea am: 3285770d37 am: d935c7f16e am: 98ee832c7e am: 1db2ee3dbd am: 946a690f5c am: 5fef11c61a am: 3a3cc883c1 am: d218b51912 am: 9305cf71d1 am: 7422dafea0
am: 731527f43f

Change-Id: I617276f7d81fc3e6d231522ff064aa96b4d5b4e6
16b429914102227b0bc7d456c4edcbb3cccf083a 14-Mar-2017 Marco Nelissen <marcone@google.com> Merge "Fix NPDs in h263 decoder" into klp-dev am: 012e5fd39e am: 9e8dfb5938 am: 9e4a0e1fab am: 3c4401fce8 am: 8867ca40df am: 4ba3934ec3 am: 89349b8d29 am: 176e7e8183 am: 0cbbb5c561 am: 2e1457123f am: bd47b7e23c am: 33745e6537 am: d79e9c79f7
am: a83fb59933

Change-Id: I3b1bf346e0f662bfc52abe774f0402659a035e75
9ab3187ff54328450f95887dcefb474dd3804d1e 14-Mar-2017 Ray Essick <essick@google.com> Merge "Add bounds check in SoftAACEncoder2::onQueueFilled()" into klp-dev am: 19b91af752 am: 8e3cf4d841 am: 5b1bfc1f43 am: 8abf11b512 am: 4bc4f78933 am: 7f2592fe4a am: dbdf026f76 am: c4305aeda4 am: 1baad9ad99 am: 2ad7f9b172 am: 457bde5e35
am: ed1109257a

Change-Id: I86d9fc749345ede7521eb2d6222e8aec17bcd9da
b1f14803fec6475cb36ee14ae3cd763ef6b695de 14-Mar-2017 Marco Nelissen <marcone@google.com> Merge "Fix out of bounds access" into klp-dev am: 360cbbd72c am: f71b76cae8 am: 36c2e14da3 am: 8a3cc1963e am: 5b0ca6a92c am: d270a899c2 am: 8f2b91f0a1 am: 6e25e6f7a2 am: f375fd0f70 am: 5d1ce82bb3 am: 4c5f8398f0 am: 31b147f2f7 am: b9002a6643
am: 448e61d0d7

Change-Id: I58ad7452682461b2685a4194151de145ab3f3adf
e4cce73b86cfd82d2083c6ebc80748b14aeedca1 14-Mar-2017 Ray Essick <essick@google.com> Merge "Fix TOCTOU problem in libstagefright_soft_aacenc" into klp-dev am: 2076915c5f am: dcda2ec2fe am: f5c7784dbd am: c3de266a99 am: 8655d4fc01 am: b05be00f56 am: eb58ce5bb0 am: a830539187 am: e973c65525 am: ae7fae1810 am: d4d9c97a9d
am: b532a32912

Change-Id: Ibc2f3193bbec30007428900d55caff74876bb856
ed1109257a79003c8f4adcc5040dddf348ea5152 14-Mar-2017 Ray Essick <essick@google.com> Merge "Add bounds check in SoftAACEncoder2::onQueueFilled()" into klp-dev am: 19b91af752 am: 8e3cf4d841 am: 5b1bfc1f43 am: 8abf11b512 am: 4bc4f78933 am: 7f2592fe4a am: dbdf026f76 am: c4305aeda4 am: 1baad9ad99 am: 2ad7f9b172
am: 457bde5e35

Change-Id: I404c43a22e26d9e410c507c065acfb855e27944e
b532a32912787ded2fbea16466f17d4d5bcb6aea 14-Mar-2017 Ray Essick <essick@google.com> Merge "Fix TOCTOU problem in libstagefright_soft_aacenc" into klp-dev am: 2076915c5f am: dcda2ec2fe am: f5c7784dbd am: c3de266a99 am: 8655d4fc01 am: b05be00f56 am: eb58ce5bb0 am: a830539187 am: e973c65525 am: ae7fae1810
am: d4d9c97a9d

Change-Id: I2ba0a0c9cdddddde43b1feac211e85a11db5ae14
457bde5e356661cdd7cf9c5c09e56cb402ed8550 14-Mar-2017 Ray Essick <essick@google.com> Merge "Add bounds check in SoftAACEncoder2::onQueueFilled()" into klp-dev am: 19b91af752 am: 8e3cf4d841 am: 5b1bfc1f43 am: 8abf11b512 am: 4bc4f78933 am: 7f2592fe4a am: dbdf026f76 am: c4305aeda4 am: 1baad9ad99
am: 2ad7f9b172

Change-Id: Iff4a0475dde613d649196c826dbc482e9af93872
7422dafea057df94a1bb3b49e6a81e9e9c8379af 14-Mar-2017 Marco Nelissen <marcone@google.com> Merge "Fix integer overflow and divide-by-zero" into klp-dev am: b264ece2c0 am: bbca2719c6 am: c2e69851ea am: 3285770d37 am: d935c7f16e am: 98ee832c7e am: 1db2ee3dbd am: 946a690f5c am: 5fef11c61a am: 3a3cc883c1 am: d218b51912
am: 9305cf71d1

Change-Id: Ica4e4d677aa87358d6d90fc4e230a62f6ef518e3
d4d9c97a9d7937f3e360576ff0183e98cb6b54f4 14-Mar-2017 Ray Essick <essick@google.com> Merge "Fix TOCTOU problem in libstagefright_soft_aacenc" into klp-dev am: 2076915c5f am: dcda2ec2fe am: f5c7784dbd am: c3de266a99 am: 8655d4fc01 am: b05be00f56 am: eb58ce5bb0 am: a830539187 am: e973c65525
am: ae7fae1810

Change-Id: I08b043910e7bf2173cd1b19c3bb76f5753b38ff0
d79e9c79f73611ff429112388cf912d9be29ac63 14-Mar-2017 Marco Nelissen <marcone@google.com> Merge "Fix NPDs in h263 decoder" into klp-dev am: 012e5fd39e am: 9e8dfb5938 am: 9e4a0e1fab am: 3c4401fce8 am: 8867ca40df am: 4ba3934ec3 am: 89349b8d29 am: 176e7e8183 am: 0cbbb5c561 am: 2e1457123f am: bd47b7e23c
am: 33745e6537

Change-Id: I8e26826bdf58e39f2d115737d49323867d947651
b9002a66436adfc25558948224d245c128b1f6ab 14-Mar-2017 Marco Nelissen <marcone@google.com> Merge "Fix out of bounds access" into klp-dev am: 360cbbd72c am: f71b76cae8 am: 36c2e14da3 am: 8a3cc1963e am: 5b0ca6a92c am: d270a899c2 am: 8f2b91f0a1 am: 6e25e6f7a2 am: f375fd0f70 am: 5d1ce82bb3 am: 4c5f8398f0
am: 31b147f2f7

Change-Id: I35435bc317247a2f51b7d211000c683784628af4
9305cf71d12b2a927601b2aba13325443b7ce99a 14-Mar-2017 Marco Nelissen <marcone@google.com> Merge "Fix integer overflow and divide-by-zero" into klp-dev am: b264ece2c0 am: bbca2719c6 am: c2e69851ea am: 3285770d37 am: d935c7f16e am: 98ee832c7e am: 1db2ee3dbd am: 946a690f5c am: 5fef11c61a am: 3a3cc883c1
am: d218b51912

Change-Id: I3f43ab6ed39910e20259a25cec59a79b87856f48
2ad7f9b1725ade40be45fdb65d8fcc02f0ac529f 14-Mar-2017 Ray Essick <essick@google.com> Merge "Add bounds check in SoftAACEncoder2::onQueueFilled()" into klp-dev am: 19b91af752 am: 8e3cf4d841 am: 5b1bfc1f43 am: 8abf11b512 am: 4bc4f78933 am: 7f2592fe4a am: dbdf026f76 am: c4305aeda4
am: 1baad9ad99

Change-Id: If99804d172112b671974d84d29ac61fe8bf885d8
33745e6537f1925287d2f7e5eb05c74bf0d3e6ef 14-Mar-2017 Marco Nelissen <marcone@google.com> Merge "Fix NPDs in h263 decoder" into klp-dev am: 012e5fd39e am: 9e8dfb5938 am: 9e4a0e1fab am: 3c4401fce8 am: 8867ca40df am: 4ba3934ec3 am: 89349b8d29 am: 176e7e8183 am: 0cbbb5c561 am: 2e1457123f
am: bd47b7e23c

Change-Id: Ib1affab1f1957366239d1c04f8b9cb769ad023ac
ae7fae1810aa77fb83d2773f085c84966966b8bf 14-Mar-2017 Ray Essick <essick@google.com> Merge "Fix TOCTOU problem in libstagefright_soft_aacenc" into klp-dev am: 2076915c5f am: dcda2ec2fe am: f5c7784dbd am: c3de266a99 am: 8655d4fc01 am: b05be00f56 am: eb58ce5bb0 am: a830539187
am: e973c65525

Change-Id: Icb9263d13832bc7826aa67af92f61bafbff4b7a1
31b147f2f790a7785450bc6604af74a8adcb36cc 14-Mar-2017 Marco Nelissen <marcone@google.com> Merge "Fix out of bounds access" into klp-dev am: 360cbbd72c am: f71b76cae8 am: 36c2e14da3 am: 8a3cc1963e am: 5b0ca6a92c am: d270a899c2 am: 8f2b91f0a1 am: 6e25e6f7a2 am: f375fd0f70 am: 5d1ce82bb3
am: 4c5f8398f0

Change-Id: I16ceed4b5bf842cda7ede27f744d78aed127c417
d218b5191238a7a5955ed79c99bec90703dff842 14-Mar-2017 Marco Nelissen <marcone@google.com> Merge "Fix integer overflow and divide-by-zero" into klp-dev am: b264ece2c0 am: bbca2719c6 am: c2e69851ea am: 3285770d37 am: d935c7f16e am: 98ee832c7e am: 1db2ee3dbd am: 946a690f5c am: 5fef11c61a
am: 3a3cc883c1

Change-Id: Iefe473341e64546c69ee98a8a4e47b17903ca02d
bd47b7e23c1b6e01cbc2b2e867ae8d85cee63848 14-Mar-2017 Marco Nelissen <marcone@google.com> Merge "Fix NPDs in h263 decoder" into klp-dev am: 012e5fd39e am: 9e8dfb5938 am: 9e4a0e1fab am: 3c4401fce8 am: 8867ca40df am: 4ba3934ec3 am: 89349b8d29 am: 176e7e8183 am: 0cbbb5c561
am: 2e1457123f

Change-Id: Idf145d96a408f70a6b5637af0603832f8dfdbcd7
4c5f8398f0600bd2163dc9d4c11086f380689a94 14-Mar-2017 Marco Nelissen <marcone@google.com> Merge "Fix out of bounds access" into klp-dev am: 360cbbd72c am: f71b76cae8 am: 36c2e14da3 am: 8a3cc1963e am: 5b0ca6a92c am: d270a899c2 am: 8f2b91f0a1 am: 6e25e6f7a2 am: f375fd0f70
am: 5d1ce82bb3

Change-Id: Ia8706bf387c1f779f31952fe287e3414e67ccbbe
1baad9ad9999254d558b92491d4add9fc3d483cb 14-Mar-2017 Ray Essick <essick@google.com> Merge "Add bounds check in SoftAACEncoder2::onQueueFilled()" into klp-dev am: 19b91af752 am: 8e3cf4d841 am: 5b1bfc1f43 am: 8abf11b512 am: 4bc4f78933 am: 7f2592fe4a am: dbdf026f76
am: c4305aeda4

Change-Id: Idac42ec10c4295ae4e5761531b96bd4ce58a8473
e973c6552548c9fd2d3bb773e42c562300b15ea6 14-Mar-2017 Ray Essick <essick@google.com> Merge "Fix TOCTOU problem in libstagefright_soft_aacenc" into klp-dev am: 2076915c5f am: dcda2ec2fe am: f5c7784dbd am: c3de266a99 am: 8655d4fc01 am: b05be00f56 am: eb58ce5bb0
am: a830539187

Change-Id: I10929475d031fb3d1b6aab57bd2041f40e5bcf01
3a3cc883c1421f6f3f77906a67f632167279345a 14-Mar-2017 Marco Nelissen <marcone@google.com> Merge "Fix integer overflow and divide-by-zero" into klp-dev am: b264ece2c0 am: bbca2719c6 am: c2e69851ea am: 3285770d37 am: d935c7f16e am: 98ee832c7e am: 1db2ee3dbd am: 946a690f5c
am: 5fef11c61a

Change-Id: I39d07c6a978c2e0c2b4c6f8bc02135c1acbb3ba5
2e1457123f5d5d09b9a4ddf6671e5c1b0f70f9d6 14-Mar-2017 Marco Nelissen <marcone@google.com> Merge "Fix NPDs in h263 decoder" into klp-dev am: 012e5fd39e am: 9e8dfb5938 am: 9e4a0e1fab am: 3c4401fce8 am: 8867ca40df am: 4ba3934ec3 am: 89349b8d29 am: 176e7e8183
am: 0cbbb5c561

Change-Id: I2dc56447dd0386046bc765110a545b967237e63b
c4305aeda456e3c6956a72e56f0fb15d25eab1d0 14-Mar-2017 Ray Essick <essick@google.com> Merge "Add bounds check in SoftAACEncoder2::onQueueFilled()" into klp-dev am: 19b91af752 am: 8e3cf4d841 am: 5b1bfc1f43 am: 8abf11b512 am: 4bc4f78933 am: 7f2592fe4a
am: dbdf026f76

Change-Id: I4d2bba1d77108acad20a8886d79a99f8b521ede3
5d1ce82bb3ef2b2320fdcac78f726a25dcca3ca6 14-Mar-2017 Marco Nelissen <marcone@google.com> Merge "Fix out of bounds access" into klp-dev am: 360cbbd72c am: f71b76cae8 am: 36c2e14da3 am: 8a3cc1963e am: 5b0ca6a92c am: d270a899c2 am: 8f2b91f0a1 am: 6e25e6f7a2
am: f375fd0f70

Change-Id: Ia373be05422e21dc98702e04a25a5f530031aaad
a8305391877711f43f6608283296864b6651509f 14-Mar-2017 Ray Essick <essick@google.com> Merge "Fix TOCTOU problem in libstagefright_soft_aacenc" into klp-dev am: 2076915c5f am: dcda2ec2fe am: f5c7784dbd am: c3de266a99 am: 8655d4fc01 am: b05be00f56
am: eb58ce5bb0

Change-Id: Id8ea82f6504b70d8a448a8d00063b1b393a2f336
5fef11c61a76a5a1ddbb362cbe159d7950e265f4 14-Mar-2017 Marco Nelissen <marcone@google.com> Merge "Fix integer overflow and divide-by-zero" into klp-dev am: b264ece2c0 am: bbca2719c6 am: c2e69851ea am: 3285770d37 am: d935c7f16e am: 98ee832c7e am: 1db2ee3dbd
am: 946a690f5c

Change-Id: I265078e7cab77a8865862f3b0319bfb0746ee814
dbdf026f768f5479caf2a23526e593f2199ca815 14-Mar-2017 Ray Essick <essick@google.com> Merge "Add bounds check in SoftAACEncoder2::onQueueFilled()" into klp-dev am: 19b91af752 am: 8e3cf4d841 am: 5b1bfc1f43 am: 8abf11b512 am: 4bc4f78933
am: 7f2592fe4a

Change-Id: Ie8c0fadcf5c424e8a4627030c04cbac96442ebf4
0cbbb5c56170aab43ba6db0fa4ddba80a35bbd7c 14-Mar-2017 Marco Nelissen <marcone@google.com> Merge "Fix NPDs in h263 decoder" into klp-dev am: 012e5fd39e am: 9e8dfb5938 am: 9e4a0e1fab am: 3c4401fce8 am: 8867ca40df am: 4ba3934ec3 am: 89349b8d29
am: 176e7e8183

Change-Id: I0d1fd31c2cbfb05a70cc7941df7c06846999a6cc
f375fd0f70c5da713e1249c1c0576fd4c14a488f 14-Mar-2017 Marco Nelissen <marcone@google.com> Merge "Fix out of bounds access" into klp-dev am: 360cbbd72c am: f71b76cae8 am: 36c2e14da3 am: 8a3cc1963e am: 5b0ca6a92c am: d270a899c2 am: 8f2b91f0a1
am: 6e25e6f7a2

Change-Id: I445e63688e03fa8088e6d8f10132f613e1377c92
eb58ce5bb0caf75d07b57c607d312842cd9f210a 14-Mar-2017 Ray Essick <essick@google.com> Merge "Fix TOCTOU problem in libstagefright_soft_aacenc" into klp-dev am: 2076915c5f am: dcda2ec2fe am: f5c7784dbd am: c3de266a99 am: 8655d4fc01
am: b05be00f56

Change-Id: I79378b8fa75e6912f49a9af3c4f46bd711494314
946a690f5ceeb3837891a7bab6938bd6a2fdbbc6 14-Mar-2017 Marco Nelissen <marcone@google.com> Merge "Fix integer overflow and divide-by-zero" into klp-dev am: b264ece2c0 am: bbca2719c6 am: c2e69851ea am: 3285770d37 am: d935c7f16e am: 98ee832c7e
am: 1db2ee3dbd

Change-Id: Ia7e87aa7baaf9bbff299ff70af5c77b90a922229
176e7e81832b64c42fadf8c28105abd09dea2ce6 14-Mar-2017 Marco Nelissen <marcone@google.com> Merge "Fix NPDs in h263 decoder" into klp-dev am: 012e5fd39e am: 9e8dfb5938 am: 9e4a0e1fab am: 3c4401fce8 am: 8867ca40df am: 4ba3934ec3
am: 89349b8d29

Change-Id: I156d984af4dc64fa69d3b07661e8f2e7e86ca7e5
6e25e6f7a24a69fb944b339b9a4e4df38ee39f8b 14-Mar-2017 Marco Nelissen <marcone@google.com> Merge "Fix out of bounds access" into klp-dev am: 360cbbd72c am: f71b76cae8 am: 36c2e14da3 am: 8a3cc1963e am: 5b0ca6a92c am: d270a899c2
am: 8f2b91f0a1

Change-Id: Ib43ba6aeba921b0d2c5b8649ac1e7015c48a7884
1db2ee3dbdc48393d1feba509e5a10967e46300b 13-Mar-2017 Marco Nelissen <marcone@google.com> Merge "Fix integer overflow and divide-by-zero" into klp-dev am: b264ece2c0 am: bbca2719c6 am: c2e69851ea am: 3285770d37 am: d935c7f16e
am: 98ee832c7e

Change-Id: Ie82d1dfa473886b9b166804da985bce439c90900
89349b8d290164d4aef1457821f5875d38323c8d 13-Mar-2017 Marco Nelissen <marcone@google.com> Merge "Fix NPDs in h263 decoder" into klp-dev am: 012e5fd39e am: 9e8dfb5938 am: 9e4a0e1fab am: 3c4401fce8 am: 8867ca40df
am: 4ba3934ec3

Change-Id: I6babc4703d1462a30d3075cfb6a3fbfdffac5724
4bc4f78933c161c8ecfa9202d8bed60078781aad 13-Mar-2017 Ray Essick <essick@google.com> Merge "Add bounds check in SoftAACEncoder2::onQueueFilled()" into klp-dev am: 19b91af752 am: 8e3cf4d841 am: 5b1bfc1f43
am: 8abf11b512

Change-Id: I1cdf8344d8ca41cf5c4b6622ec743bb094c3dff0
8f2b91f0a1fb0261ab6f4fd556e4498cc900bb7b 13-Mar-2017 Marco Nelissen <marcone@google.com> Merge "Fix out of bounds access" into klp-dev am: 360cbbd72c am: f71b76cae8 am: 36c2e14da3 am: 8a3cc1963e am: 5b0ca6a92c
am: d270a899c2

Change-Id: I64b30e83c6825a83ff628477a58d607eded0ec7d
8655d4fc0184ad54f15dfcb3a6f156042c945900 13-Mar-2017 Ray Essick <essick@google.com> Merge "Fix TOCTOU problem in libstagefright_soft_aacenc" into klp-dev am: 2076915c5f am: dcda2ec2fe am: f5c7784dbd
am: c3de266a99

Change-Id: I38701178a3fd7632fc8717472338d60d4cb0de2e
8abf11b512f7da119a04edbb152955bc5166e310 13-Mar-2017 Ray Essick <essick@google.com> Merge "Add bounds check in SoftAACEncoder2::onQueueFilled()" into klp-dev am: 19b91af752 am: 8e3cf4d841
am: 5b1bfc1f43

Change-Id: I32327162d3e69259656f0b3a82800f45572527fd
c3de266a990055c3764c9137a43da99a09d75ccc 13-Mar-2017 Ray Essick <essick@google.com> Merge "Fix TOCTOU problem in libstagefright_soft_aacenc" into klp-dev am: 2076915c5f am: dcda2ec2fe
am: f5c7784dbd

Change-Id: Ic1901b3fa14a1e1c7f582e5b7862e777489e7314
d935c7f16ec63164141211762aa51d9a357af891 13-Mar-2017 Marco Nelissen <marcone@google.com> Merge "Fix integer overflow and divide-by-zero" into klp-dev am: b264ece2c0 am: bbca2719c6 am: c2e69851ea
am: 3285770d37

Change-Id: Id82c89fed96d3cfa11d68ba5d791d5a360aa243c
8867ca40dfb176145e84b99825c1195509536a82 13-Mar-2017 Marco Nelissen <marcone@google.com> Merge "Fix NPDs in h263 decoder" into klp-dev am: 012e5fd39e am: 9e8dfb5938 am: 9e4a0e1fab
am: 3c4401fce8

Change-Id: Ib6bd99193a44fbd801906d234c42b3fa3d33fb9a
5b1bfc1f43b1341b462868fdaa8a2d74da5d2714 13-Mar-2017 Ray Essick <essick@google.com> Merge "Add bounds check in SoftAACEncoder2::onQueueFilled()" into klp-dev am: 19b91af752
am: 8e3cf4d841

Change-Id: I804c61a21202d3c5aef3edac5872f56cef67753b
5b0ca6a92c2b42e0faf9741277e919f39cafca75 13-Mar-2017 Marco Nelissen <marcone@google.com> Merge "Fix out of bounds access" into klp-dev am: 360cbbd72c am: f71b76cae8 am: 36c2e14da3
am: 8a3cc1963e

Change-Id: I72dd260e2ee0f9560c9322c3aaf7b93c8008607e
f5c7784dbd3de07e4e16da74b6c63e219c508d3f 13-Mar-2017 Ray Essick <essick@google.com> Merge "Fix TOCTOU problem in libstagefright_soft_aacenc" into klp-dev am: 2076915c5f
am: dcda2ec2fe

Change-Id: I6759f0d478dd70baf59c3e006cb904d26793c1d4
3285770d374e61518df561d1fd269f7bc4516ccd 13-Mar-2017 Marco Nelissen <marcone@google.com> Merge "Fix integer overflow and divide-by-zero" into klp-dev am: b264ece2c0 am: bbca2719c6
am: c2e69851ea

Change-Id: I2720c4439848f9aab8d7fa4f93b548793d129a4f
3c4401fce8dfbd71f9d0caab99192a8ab983a60b 13-Mar-2017 Marco Nelissen <marcone@google.com> Merge "Fix NPDs in h263 decoder" into klp-dev am: 012e5fd39e am: 9e8dfb5938
am: 9e4a0e1fab

Change-Id: I17a5c0765c31c92a25e7c89a330aa656adc03baf
8a3cc1963ee15182c0b9f3b27b1a9e36f3680b0f 13-Mar-2017 Marco Nelissen <marcone@google.com> Merge "Fix out of bounds access" into klp-dev am: 360cbbd72c am: f71b76cae8
am: 36c2e14da3

Change-Id: Ie6d46a6979bc89e2485fa4d2a25b21fc601e9783
c2e69851eac7d9e61c93cda58d8a12792e6262db 13-Mar-2017 Marco Nelissen <marcone@google.com> Merge "Fix integer overflow and divide-by-zero" into klp-dev am: b264ece2c0
am: bbca2719c6

Change-Id: If5ae485e1be0df3d4f61edf689d5b4c1520077b8
9e4a0e1fabe0751bd335e9650c984fd8b361908a 13-Mar-2017 Marco Nelissen <marcone@google.com> Merge "Fix NPDs in h263 decoder" into klp-dev am: 012e5fd39e
am: 9e8dfb5938

Change-Id: I875cb7bba1bc6f6f443923a04629ae44a9d41140
36c2e14da34ad37485404319229594a6577408fd 13-Mar-2017 Marco Nelissen <marcone@google.com> Merge "Fix out of bounds access" into klp-dev am: 360cbbd72c
am: f71b76cae8

Change-Id: I3306be5d7bb3867287732757dd14170527488b68
19b91af75247f5d78bb705541ce4fb56400bd275 13-Mar-2017 Ray Essick <essick@google.com> Merge "Add bounds check in SoftAACEncoder2::onQueueFilled()" into klp-dev
2076915c5f16f9f1a036cb70eb5d708f77fd8ff2 13-Mar-2017 Ray Essick <essick@google.com> Merge "Fix TOCTOU problem in libstagefright_soft_aacenc" into klp-dev
b264ece2c02b97226a28df55dfe80ea0593421e3 13-Mar-2017 Marco Nelissen <marcone@google.com> Merge "Fix integer overflow and divide-by-zero" into klp-dev
012e5fd39e36f69c11fbfaba3c801685895b1747 13-Mar-2017 Marco Nelissen <marcone@google.com> Merge "Fix NPDs in h263 decoder" into klp-dev
6231243626b8b9c57593b1f0ee417f2c4af4c0aa 13-Mar-2017 Ray Essick <essick@google.com> Add bounds check in SoftAACEncoder2::onQueueFilled()

Original code blindly copied some header information into the
user-supplied buffer without checking for sufficient space.
The code does check when it gets to filling the data -- it's
just the header copies that weren't checked.

Bug: 34617444
Test: ran POC before/after
Change-Id: I6e80ec90616f6cd02bb8316cd2d6e309b7e4729d
odecs/aacenc/SoftAACEncoder2.cpp
afb43f76821e6a63e17e6484289a40430ada6978 09-Mar-2017 Ray Essick <essick@google.com> Name changes to Media Metrics Keys

The API council noticed that we used keys like "ht" and "wid" which
are more properly namespaced like "android.media.mediacodec.height".
This changes those keys on the generation side of the system; it goes
together with other changes that document the namespaced-names in the
consumption and documentation side of the system.

Bug: 35811992
Test: check 'dumpsys media.metrics', subset of CTS
Change-Id: Ie05a105229ab931a6b14c0157cc642b5d8413dde
ediaCodec.cpp
ediaExtractor.cpp
nclude/MediaCodec.h
ddb459198eeaea80b04b2b345d719cc64c8c1b05 13-Mar-2017 Ray Essick <essick@google.com> Merge "Validate lengths in HEVC metadata parsing" into nyc-dev am: d4c1d61625 am: 8e1aef08e6 am: 3754af193c am: 0d9990d9f0 am: 98284d4fe0
am: 467c853b1a

Change-Id: I9df191076684006cda7ee2d222281dc4106fcf91
467c853b1aa1b10a02a6a52972df7c2b6fa7e0b1 13-Mar-2017 Ray Essick <essick@google.com> Merge "Validate lengths in HEVC metadata parsing" into nyc-dev am: d4c1d61625 am: 8e1aef08e6 am: 3754af193c am: 0d9990d9f0
am: 98284d4fe0

Change-Id: I933545664aaf68c77cff760c023c364aa605e394
98284d4fe08989025b831ea8225a9b95e4033367 13-Mar-2017 Ray Essick <essick@google.com> Merge "Validate lengths in HEVC metadata parsing" into nyc-dev am: d4c1d61625 am: 8e1aef08e6 am: 3754af193c
am: 0d9990d9f0

Change-Id: I709642fdd65cabaeffe4549c1685d2e23e45ed66
3754af193cabf09af17d35044afbff0dec6102b8 13-Mar-2017 Ray Essick <essick@google.com> Merge "Validate lengths in HEVC metadata parsing" into nyc-dev am: d4c1d61625
am: 8e1aef08e6

Change-Id: I3e4606ccac6574a786470fcb3ccab962273334c0
8e1aef08e6b8602b5081b3f8d4e9c2feffc72eb7 13-Mar-2017 Ray Essick <essick@google.com> Merge "Validate lengths in HEVC metadata parsing" into nyc-dev
am: d4c1d61625

Change-Id: I1d495aadf1ea82b715680596b086a1f29dd1f37c
2ad2a92318a3b9daf78ebcdc597085adbf32600d 03-Mar-2017 Marco Nelissen <marcone@google.com> Fix NPDs in h263 decoder

Bug: 35269635
Test: decoded PoC with and without patch
Change-Id: I636a14360c7801cc5bca63c9cb44d1d235df8fd8
odecs/m4v_h263/dec/src/mb_motion_comp.cpp
odecs/m4v_h263/dec/src/pvdec_api.cpp
0e4b8e9cb1b422195c49be49b48d039aa0814acf 11-Mar-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge changes from topic 'fix omxnode fd leak'

* changes:
Fix Omx emptyBuffer fd leak in GraphicBufferSource
Revert "Revert "Refactor GraphicBufferSource wrappers for OMX HAL""
694ebf6734cc7af6b8cf9c032fa3e5a00a54dc84 11-Mar-2017 Robert Shih <robertshih@google.com> Fix Omx emptyBuffer fd leak in GraphicBufferSource

Bug: 36110748
Test: adb shell am instrument -e size small -w android.media.cts/android.support.test.runner.AndroidJUnitRunner
Change-Id: I733bb9a0206760e8cdd74a6a72ae40f8bffaaac8
mx/hal/1.0/impl/WGraphicBufferSource.cpp
d095e65c8c125c555046c60539a0f7abf0ccf271 11-Mar-2017 Robert Shih <robertshih@google.com> Revert "Revert "Refactor GraphicBufferSource wrappers for OMX HAL""

This reverts commit a6331ba30928fac713f9d6ce94e1d5f0d008b501.

Bug: 36110748
Change-Id: I56260ae0cc13c17b0edb31c39d22f3fbd6708d34
mx/Android.mk
mx/BWGraphicBufferSource.cpp
mx/BWGraphicBufferSource.h
mx/GraphicBufferSource.cpp
mx/GraphicBufferSource.h
mx/IOmxNodeWrapper.h
mx/OMX.cpp
mx/hal/1.0/impl/Android.mk
mx/hal/1.0/impl/Conversion.h
mx/hal/1.0/impl/Omx.cpp
mx/hal/1.0/impl/WGraphicBufferSource.cpp
mx/hal/1.0/impl/WGraphicBufferSource.h
mx/hal/1.0/impl/WOmx.cpp
mx/hal/1.0/impl/WOmx.h
0495c029bd51bcfc1cca8c943ab4ce2f201dbe98 11-Mar-2017 Ray Essick <essick@google.com> Fix TOCTOU problem in libstagefright_soft_aacenc

Fixes a configuration error where we sized a buffer initially based
on the configuration at the time and held onto the buffer through the
rest of our lifetime. If the configuration was changed in a way that
resulted in needing a different size buffer, the code did not make
this happen.

Patch keeps the buffer around but also stores the 'current allocation
size'. This allows the later code that preps the buffer to query if
the buffer size is same or changed. If changed, we discard the old
buffer and allocate a new one of the appropriate size.

safetynet logging added so we can tell how often this happens in the
field.

Testing was done on nyc-mr2 (where poc was built). Patch applies
without change to k/l/m/n/master.

Bug: 34621073
Test: run POC, saw new diagnostics saying it caught the size change.
Change-Id: Ia95aadc8c727434b7ba9628deeae327c405336d3
odecs/aacenc/SoftAACEncoder2.cpp
odecs/aacenc/SoftAACEncoder2.h
3ecd658d0e403726cc8e03a4b4a4fdc81a0ec5d3 11-Mar-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Revert "Refactor GraphicBufferSource wrappers for OMX HAL""
d1c19c57f66d91ea8033c8fa6510a8760a6e663b 10-Mar-2017 Marco Nelissen <marcone@google.com> Fix out of bounds access

Bug: 34618607
Change-Id: I84f0ef948414d0b2d54e8948b6c30b8ae4da2b36
d3/ID3.cpp
a6331ba30928fac713f9d6ce94e1d5f0d008b501 10-Mar-2017 Rachad Alao <rachad@google.com> Revert "Refactor GraphicBufferSource wrappers for OMX HAL"

This reverts commit 3d32c95e94f2672d23b58196beafddacba07c5e8.

Bug: 36110748

Change-Id: I6d0cd5924b3e1e00cdcf844c638bb0acf4fae2ac
mx/Android.mk
mx/BWGraphicBufferSource.cpp
mx/BWGraphicBufferSource.h
mx/GraphicBufferSource.cpp
mx/GraphicBufferSource.h
mx/IOmxNodeWrapper.h
mx/OMX.cpp
mx/hal/1.0/impl/Android.mk
mx/hal/1.0/impl/Conversion.h
mx/hal/1.0/impl/Omx.cpp
mx/hal/1.0/impl/WGraphicBufferSource.cpp
mx/hal/1.0/impl/WGraphicBufferSource.h
mx/hal/1.0/impl/WOmx.cpp
mx/hal/1.0/impl/WOmx.h
8538a603ef992e75f29336499cb783f3ec19f18c 10-Mar-2017 Marco Nelissen <marcone@google.com> Fix integer overflow and divide-by-zero

Bug: 35763994
Test: ran CTS with and without fix
Change-Id: If835e97ce578d4fa567e33e349e48fb7b2559e0e
MRExtractor.cpp
uMediaExtractor.cpp
2752e5b66ac80b5d6bcba1db186f29f86722956b 28-Feb-2017 Mathias Agopian <mathias@google.com> fallout of getting rid of IGraphicBufferAlloc

Test: compile & run
Bug: cleanup
Change-Id: Ifba0668d798c523c556ca7dae2c172711a256b05
urfaceMediaSource.cpp
nclude/SurfaceMediaSource.h
17d791ad76d6c33201e5953483a0770380d42572 07-Mar-2017 Marco Nelissen <marcone@google.com> Merge "Guard against sample time overflow" am: 7639616e4f am: 5dfade5b09
am: 33d1c4edbc

Change-Id: I7cb4bfd82c1882d53177aba82dd7849c21692dd6
5dfade5b09d9af90f8ebcbf9bd426f5fba417dc3 07-Mar-2017 Marco Nelissen <marcone@google.com> Merge "Guard against sample time overflow"
am: 7639616e4f

Change-Id: Ia671a67d80f63f7c88763efbe4853d45d5e5e2d2
6d616e69c42fc7e692ca3770c6a1f3d573deb6ce 06-Mar-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Refactor GraphicBufferSource wrappers for OMX HAL"
ed80276361a18380bacc22bde92689e0e4901726 03-Mar-2017 Bartosz Bialek <bartosz.bialek@sonymobile.com> Guard against sample time overflow

Malformed content that has unexpectedly big delta values in stts atom
might cause integer overflow on calculating sample time while preparing
sample table. This commit prevents this situation.

Test: play mp4 file with quite big 'stts' value
Bug: 35985363

Change-Id: I6bc66f77b8b99a14517e56c3ceba9ddb9bf5524d
ampleTable.cpp
e0dcf097cc029d056926029a29419e1650cbdf1b 24-Feb-2017 Ray Essick <essick@google.com> Validate lengths in HEVC metadata parsing

Add code to validate the size parameter passed to
HecvParameterSets::addNalUnit(). Previously vulnerable
to decrementing an unsigned past 0, yielding a huge result value.

Bug: 35467107
Test: ran POC, no crash, emitted new "bad length" log entry
Change-Id: Ia169b9edc1e0f7c5302e3c68aa90a54e8863d79e
evcUtils.cpp
3d32c95e94f2672d23b58196beafddacba07c5e8 23-Feb-2017 Robert Shih <robertshih@google.com> Refactor GraphicBufferSource wrappers for OMX HAL

Bug: 35449087
Test: Manual
Change-Id: I0cf70526d820999902707af466ebb4e8a2c932ab
mx/Android.mk
mx/BWGraphicBufferSource.cpp
mx/BWGraphicBufferSource.h
mx/GraphicBufferSource.cpp
mx/GraphicBufferSource.h
mx/IOmxNodeWrapper.h
mx/OMX.cpp
mx/hal/1.0/impl/Android.mk
mx/hal/1.0/impl/Conversion.h
mx/hal/1.0/impl/Omx.cpp
mx/hal/1.0/impl/WGraphicBufferSource.cpp
mx/hal/1.0/impl/WGraphicBufferSource.h
mx/hal/1.0/impl/WOmx.cpp
mx/hal/1.0/impl/WOmx.h
832fcce0c4bdc748bc4cb75101615e77769ec4e8 03-Mar-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "stagefright: MPEG4Writer: fix Integer overflow"
0d3d9531716705787bd2168023a91772163d5e0a 23-Jan-2017 Mahesh Lanka <mlanka@codeaurora.org> stagefright: MPEG4Writer: fix Integer overflow

unsigned int was getting assigned to a negative value, which in turn was
leading to a crash in htonl.

Bug: 34757428
Test: Builds cleanly
Change-Id: Iacb580adc5b84cef09feabcb3e1b394a7e80bc40
PEG4Writer.cpp
cca34c05ca2d5e7ac6c2fbee3ac2db88f059143d 02-Mar-2017 Pawin Vongmasa <pawin@google.com> Merge "Use tokens for IOmxNode."
ac7d4125516299b8a3e6f2b25822a692bdd96311 01-Mar-2017 Pawin Vongmasa <pawin@google.com> Use tokens for IOmxNode.

Test: Mirroring, Camera, Photos, YouTube and Play Movies apps.
Bug: 35442034
Change-Id: I0e43ec57d0f37c71d41652fd9883b72650433e20
Codec.cpp
ndroid.mk
MXClient.cpp
mx/Android.mk
mx/hal/1.0/utils/Android.mk
mx/hal/1.0/utils/Conversion.h
mx/hal/1.0/utils/WGraphicBufferSource.cpp
mx/hal/1.0/utils/WGraphicBufferSource.h
mx/hal/1.0/utils/WOmx.cpp
mx/hal/1.0/utils/WOmx.h
mx/hal/1.0/utils/WOmxBufferProducer.cpp
mx/hal/1.0/utils/WOmxBufferProducer.h
mx/hal/1.0/utils/WOmxBufferSource.cpp
mx/hal/1.0/utils/WOmxBufferSource.h
mx/hal/1.0/utils/WOmxNode.cpp
mx/hal/1.0/utils/WOmxNode.h
mx/hal/1.0/utils/WOmxObserver.cpp
mx/hal/1.0/utils/WOmxObserver.h
mx/hal/1.0/utils/WOmxProducerListener.cpp
mx/hal/1.0/utils/WOmxProducerListener.h
mx/tests/Android.mk
506ba3c49e854e3152b187199d2d666366a01694 02-Mar-2017 Caroline Tice <cmtice@google.com> Merge "Fix "Dereference of null pointer" compiler warning." am: 18dc831e66 am: ff95675c5f
am: d66179fac8

Change-Id: I770b196093add7d82f3ddd330caf81c27c712cb8
ff95675c5fbb1d430a2517c43a9f405c32c4f8b7 02-Mar-2017 Caroline Tice <cmtice@google.com> Merge "Fix "Dereference of null pointer" compiler warning."
am: 18dc831e66

Change-Id: I416975454087a747946f55706bce70a7faa6b255
2928d74e1e6ed54ee80778de0fe1c988e2a0f1b5 01-Mar-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "MPEG4Extractor: ensure returned status is checked."
90fe2b8888cc5ebe33784de8a979a12a32591cf7 01-Mar-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Enable CFI for additional media components."
ff1fb4d5cdd3b2b28c69edd8cd3021e335ca381a 15-Feb-2017 Wei Jia <wjia@google.com> MPEG4Extractor: ensure returned status is checked.

Also fix handling of zero atom size in MPEG4Source::parseChunk.
IDataSource: ensure readAt returns correct status.
Test: manually test with mediaplayer.
Bug: 34718515
Change-Id: I1219ec579aa0876dc1230e36af46b158b84c6d77
PEG4Extractor.cpp
3b2847fa5506dc265d2e46f067bfbb66ae209f74 19-Jan-2017 Chong Zhang <chz@google.com> MediaCas: add CAS support to MPEG2TSExtractor and MediaCodec

bug: 22804304
Change-Id: I14ec4ffc8c72e283f5cfd742dabaf4ad8bd9d698
CodecBufferChannel.cpp
ediaCodec.cpp
tils.cpp
nclude/ACodecBufferChannel.h
nclude/CodecBase.h
nclude/MPEG2TSExtractor.h
nclude/MediaCodec.h
nclude/MetaData.h
peg2ts/ATSParser.cpp
peg2ts/ATSParser.h
peg2ts/Android.mk
peg2ts/AnotherPacketSource.cpp
peg2ts/CasManager.cpp
peg2ts/CasManager.h
peg2ts/ESQueue.cpp
peg2ts/ESQueue.h
peg2ts/MPEG2TSExtractor.cpp
881fc5c65fc7d8c56af0dea181d751fcec3a2b1c 27-Feb-2017 Pawin Vongmasa <pawin@google.com> Merge "Clone fence inside QueueBufferInput on retrieval."
e1bd456cce56406fc0e35faffa4429fb4bf5bff6 27-Feb-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Revert "Remove GraphicBufferSource wrapper from OMX HAL: 1""
9e9aa6052e962e65e60c8248d93c3b4d8b9c27c4 27-Feb-2017 Robert Shih <robertshih@google.com> Revert "Remove GraphicBufferSource wrapper from OMX HAL: 1"

This reverts commit 2b93f6b7d44513b99edd8db031c28695c5b1652d.

Change-Id: I292b28a8d61560d97d7fa673c2de0e90f6074bde
mx/hal/1.0/impl/GraphicBufferSource.cpp
mx/hal/1.0/impl/GraphicBufferSource.h
1e50d1daa696e159d1ed0606de373c1cccef2c84 25-Feb-2017 Vijay Venkatraman <vijaykv@google.com> Merge "Moved headers from include/ to appropriate libs"
413c1215003c68b5581b425fe17cbb8d0acb66d1 25-Feb-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Treblize media codec list file location"
e2b43843fd12783188edd2c54188ea8d26864788 02-Feb-2017 Vijay Venkatraman <vijaykv@google.com> Moved headers from include/ to appropriate libs

include/camera -> camera/include/camera
include/media/audiohal -> media/libaudiohal/include
include/media/AudioResampler*.h -> media/libaudioprocessing/include
include/media/Audio*.h,IAudio*.h,IEffect*.h,ToneGenerator.h -> media/libaudioclient/include
include/media/EffectsFactoryApi.h -> media/libeffects/include
include/media/stagefright -> media/libstagefright/include
include/media/nbaio -> media/libnbaio/include
include/media/<rest of files> -> media/libmedia/include
include/cpustats -> media/libcpustats/include/cpustats

Added symlinks from old location to new ones

Bug: 33241851

Test: VNDK linked modules will need to add explicit lib dep.
All other modules should compile the same

Change-Id: I0ecf754a2132640ae781a3cc31428fb8c0bd1669
oundation/Android.bp
nclude
nclude/AACWriter.h
nclude/ACodec.h
nclude/AMRWriter.h
nclude/AudioPlayer.h
nclude/AudioSource.h
nclude/BufferProducerWrapper.h
nclude/CameraSource.h
nclude/CameraSourceTimeLapse.h
nclude/CodecBase.h
nclude/ColorConverter.h
nclude/DataSource.h
nclude/DataURISource.h
nclude/FileSource.h
nclude/FrameRenderTracker.h
nclude/JPEGSource.h
nclude/MPEG2TSWriter.h
nclude/MPEG4Writer.h
nclude/MediaAdapter.h
nclude/MediaBuffer.h
nclude/MediaBufferGroup.h
nclude/MediaClock.h
nclude/MediaCodec.h
nclude/MediaCodecList.h
nclude/MediaCodecSource.h
nclude/MediaDefs.h
nclude/MediaErrors.h
nclude/MediaExtractor.h
nclude/MediaFilter.h
nclude/MediaHTTP.h
nclude/MediaMuxer.h
nclude/MediaSource.h
nclude/MediaSync.h
nclude/MediaWriter.h
nclude/MetaData.h
nclude/NuMediaExtractor.h
nclude/OMXClient.h
nclude/PersistentSurface.h
nclude/ProcessInfo.h
nclude/ProcessInfoInterface.h
nclude/RenderScriptWrapper.h
nclude/SimpleDecodingSource.h
nclude/SkipCutBuffer.h
nclude/StagefrightMediaScanner.h
nclude/SurfaceMediaSource.h
nclude/SurfaceUtils.h
nclude/Utils.h
nclude/VideoFrameScheduler.h
nclude/YUVCanvas.h
nclude/YUVImage.h
nclude/foundation/AAtomizer.h
nclude/foundation/ABase.h
nclude/foundation/ABitReader.h
nclude/foundation/ABuffer.h
nclude/foundation/AData.h
nclude/foundation/ADebug.h
nclude/foundation/AHandler.h
nclude/foundation/AHandlerReflector.h
nclude/foundation/AHierarchicalStateMachine.h
nclude/foundation/ALookup.h
nclude/foundation/ALooper.h
nclude/foundation/ALooperRoster.h
nclude/foundation/AMessage.h
nclude/foundation/ANetworkSession.h
nclude/foundation/AString.h
nclude/foundation/AStringUtils.h
nclude/foundation/AUtils.h
nclude/foundation/AWakeLock.h
nclude/foundation/ColorUtils.h
nclude/foundation/Flagged.h
nclude/foundation/MediaBufferBase.h
nclude/foundation/Mutexed.h
nclude/foundation/ParsedMessage.h
nclude/foundation/TypeTraits.h
nclude/foundation/base64.h
nclude/foundation/hexdump.h
b4d5ec0d8f3755ccb8d5ce51798c3004330e1120 24-Feb-2017 Aurimas Liutikas <aurimas@google.com> Merge "Suppress unused paramter warnings in omx hal 1.0"
8b13a00825f1ea44f5822087851fd4971d09ccac 24-Feb-2017 Pawin Vongmasa <pawin@google.com> Clone fence inside QueueBufferInput on retrieval.

Test: Record and play videos with Camera and Photo apps. Cast screen.
Bug: 35616667
Change-Id: Ia18f7990535c85cb745e0d7511367d6fb8f5dd21
mx/hal/1.0/impl/Conversion.h
mx/hal/1.0/utils/Conversion.h
0579c0bba47e9099804aaac0a7a016ac83800ae6 24-Feb-2017 Pawin Vongmasa <pawin@google.com> Merge "Fix error handling in Treble OMX wrappers."
66f8f71336b977867821a2f0d770eaa2114e3f46 24-Feb-2017 Aurimas Liutikas <aurimas@google.com> Suppress unused paramter warnings in omx hal 1.0

Test: make -j android.hardware.media.omx@1.0-impl works
Change-Id: I5d8af3f29c0a4da9fc99870a139c6dbe9964e96a
mx/hal/1.0/impl/Android.mk
1837b033310c186008ce243fd091badf28c954e7 22-Feb-2017 Mathias Agopian <mathias@google.com> fallout of libandroid.so split

Test: compiled & booted
Bug: 35164655
Change-Id: I6e0a2fdca1a7ab779011a81e7ccb17a7b2f2d67e
ndroid.mk
c61a1f2939cf8924dfc680428fdb984f0eea0a93 23-Feb-2017 Chong Zhang <chz@google.com> Merge "MediaCas: add MediaCasService"
3733b5c901e36a86e8c219e564886169dcdffcd7 23-Feb-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Remove GraphicBufferSource wrapper from OMX HAL: 1"
2b93f6b7d44513b99edd8db031c28695c5b1652d 23-Feb-2017 Robert Shih <robertshih@google.com> Remove GraphicBufferSource wrapper from OMX HAL: 1

Copy GraphicBufferSource impl to OMX HAL

Bug: 35449087
Test: Compiles
Change-Id: I793c918396da7c97ca9383cf6959a5334bfa5a75
mx/hal/1.0/impl/GraphicBufferSource.cpp
mx/hal/1.0/impl/GraphicBufferSource.h
568e453d72f4026c1a0e902d533f9352a7ca190c 23-Feb-2017 Steven Moreland <smoreland@google.com> Merge "Revert "OMX: don't respect binderization toggle.""
a45c300fcad38e23107b3ad8dd1d3935f5127f9c 23-Feb-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "OMX: don't respect binderization toggle."
223b8e36091a48b3963d2ea6fc7e304b71e26553 23-Feb-2017 Pawin Vongmasa <pawin@google.com> Fix error handling in Treble OMX wrappers.

Certain cases of error were not handled properly.

Also, this CL gets rid of the native crash as seen in b/35616667.
(Casting still does not function properly.)

Test: As instructed in b/35616667. No native crashes occur.
Bug: 35616667
Change-Id: I34d48fd83517010e8caa1b9ab246d171db1d4d49
mx/hal/1.0/impl/Android.mk
mx/hal/1.0/impl/Conversion.h
mx/hal/1.0/impl/Omx.cpp
mx/hal/1.0/impl/OmxNode.cpp
mx/hal/1.0/impl/OmxNode.h
mx/hal/1.0/impl/WGraphicBufferSource.cpp
mx/hal/1.0/impl/WOmxBufferProducer.cpp
mx/hal/1.0/impl/WOmxBufferSource.cpp
mx/hal/1.0/impl/WOmxObserver.cpp
mx/hal/1.0/utils/Android.mk
mx/hal/1.0/utils/Conversion.h
mx/hal/1.0/utils/WGraphicBufferSource.cpp
mx/hal/1.0/utils/WOmxBufferProducer.cpp
mx/hal/1.0/utils/WOmxBufferSource.cpp
mx/hal/1.0/utils/WOmxObserver.cpp
7e0c3c3e93cdf0d1fe59b82e8bc9c7c2fa678faf 23-Feb-2017 Steven Moreland <smoreland@google.com> Revert "OMX: don't respect binderization toggle."

This reverts commit 373580e1d51d3e89c16612998a10105fea09c3c5.
MXClient.cpp
mx/tests/OMXHarness.cpp
373580e1d51d3e89c16612998a10105fea09c3c5 23-Feb-2017 Steven Moreland <smoreland@google.com> OMX: don't respect binderization toggle.

Test: pass
Change-Id: I495c71b0a39ae8423e109219f8f5e96812fe2aa1
MXClient.cpp
mx/tests/OMXHarness.cpp
4e2d1466e798c8f34289ddefb4bcdc93cdad71ad 23-Feb-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Remove the dependency on passthrough IOmx in media.codec."
0d3a5edf232916e81adbc46fc0f4a1753166b066 22-Feb-2017 Pawin Vongmasa <pawin@google.com> Remove the dependency on passthrough IOmx in media.codec.

Also clean up some other dependencies.

Test: Manual testing with Camera, YouTube and Play Movies apps.
Bug: 35445903
Change-Id: I28562b5fbcc7054cf45c4ec2530bbe2ab4b5645f
mx/hal/1.0/impl/Android.mk
mx/hal/1.0/impl/Conversion.h
mx/hal/1.0/impl/Omx.cpp
mx/hal/1.0/impl/Omx.h
mx/hal/1.0/impl/OmxNode.cpp
mx/hal/1.0/impl/OmxNode.h
mx/hal/1.0/impl/WGraphicBufferSource.cpp
mx/hal/1.0/impl/WGraphicBufferSource.h
mx/hal/1.0/impl/WOmx.h
mx/hal/1.0/impl/WOmxBufferProducer.cpp
mx/hal/1.0/impl/WOmxBufferProducer.h
mx/hal/1.0/impl/WOmxBufferSource.cpp
mx/hal/1.0/impl/WOmxBufferSource.h
mx/hal/1.0/impl/WOmxNode.cpp
mx/hal/1.0/impl/WOmxNode.h
mx/hal/1.0/impl/WOmxObserver.cpp
mx/hal/1.0/impl/WOmxObserver.h
mx/hal/1.0/impl/WOmxProducerListener.h
mx/hal/1.0/utils/Android.mk
mx/hal/1.0/utils/Conversion.h
mx/hal/1.0/utils/WGraphicBufferSource.cpp
mx/hal/1.0/utils/WGraphicBufferSource.h
mx/hal/1.0/utils/WOmx.h
mx/hal/1.0/utils/WOmxBufferProducer.cpp
mx/hal/1.0/utils/WOmxBufferProducer.h
mx/hal/1.0/utils/WOmxBufferSource.cpp
mx/hal/1.0/utils/WOmxBufferSource.h
mx/hal/1.0/utils/WOmxNode.cpp
mx/hal/1.0/utils/WOmxNode.h
mx/hal/1.0/utils/WOmxObserver.cpp
mx/hal/1.0/utils/WOmxObserver.h
mx/hal/1.0/utils/WOmxProducerListener.h
mx/tests/Android.mk
mx/tests/OMXHarness.h
917da0898ee9b501b656d90f11c5eecc3d78b5c7 22-Feb-2017 Andy Hung <hunga@google.com> Stagefright: Fix MKV aspect ratio

Test: Photos with MKV display width/height set
Bug: 35644438
Change-Id: I7f3d4787ea18755822cfa01179216460df1df59a
atroska/MatroskaExtractor.cpp
9115e8905da39360d269ed27592cd408df70c7b5 20-Feb-2017 Jaekyun Seok <jaekyun@google.com> Treblize media codec list file location

Treblization requires to locate partner-specific configs in its own
partition. So the media codec list file could be located in /odm/etc
or /vendor/etc.
This CL is to support those locations for the config.

Test: building succeeded and tested on sailfish.
CTS test (MediaCodecListTest) was passed as well.
Bug: 35369237

Change-Id: Ifd307e2aae2ab65039a02b9a55fcc16895f83dbf
ediaCodecList.cpp
9b2cd918052fdfda587c45b7b2b9a9e132ce6b7b 18-Feb-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "MPEG4Extractor: allow empty atom in iTune meta."
9dbe9a57bf0ae2494ec312d6c1b06feec20e9ec9 03-Jan-2017 Chong Zhang <chz@google.com> MediaCas: add MediaCasService

This CL adds API only without implementation.

bug: 22804304
Change-Id: Ibb5a29cc616ec0af81957b2bfe1419c482591753
ndroid.mk
ediaCodec.cpp
uMediaExtractor.cpp
d20e1f932277eed35f9ec423f134b4a60b8f9b85 17-Feb-2017 Wei Jia <wjia@google.com> MPEG4Extractor: allow empty atom in iTune meta.

Test: can decode mp4 file with empty "name" atom.
Bug: 34718515

Change-Id: I0c4ee85ad9c8a8c31b6c58296f6eca4f62c30fef
PEG4Extractor.cpp
c0a3f679109769d8fb43b66fccbe47f8c505d12e 17-Feb-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Use hidl.allocator for IAllocator."
bc1713d3b85d7ce656e032da6e4b6b342f14db03 14-Feb-2017 Mathias Agopian <mathias@google.com> fallout of splitting rect.h out of libandroid.

A lot of media makefiles didn’t specify libui or
libgui but included headers from these libraries
directly.

It works because these headers are on the global
include path. With this change, though, rect.h
is not anymore (albeit exported from libui).

Test: built and booted device
Bug: 35164655
Change-Id: I72e8f0b7bd25c6a67eedc17afe52c4c484a147fe
odecs/avcenc/SoftAVCEnc.cpp
odecs/m4v_h263/enc/SoftMPEG4Encoder.cpp
olorconversion/Android.mk
olorconversion/SoftwareRenderer.cpp
ilters/Android.mk
oundation/Android.bp
nclude/OMXNodeInstance.h
mx/SoftVideoEncoderOMXComponent.cpp
13a926879249276771b0097538459c7550e2f5ce 17-Feb-2017 Steven Moreland <smoreland@google.com> Use hidl.allocator for IAllocator.

android.hidl.memory is being split into android.hidl.memory and
android.hidl.allocator since the former is a passthrough hal and the
latter is a binderized service.

Bug: 35327976
Test: hidl_test, lshal, youtube/camera works
Change-Id: I7a2e72dcd3721d2689eb7ef95f5b140ecc1c446f
Codec.cpp
ndroid.mk
mx/tests/OMXHarness.h
ca8126c04c91b6b5030be2e2c8cff786c160faac 17-Feb-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "stagefright: verbose logging for media connect/disconnect"
181fd9b5b64bab24bb49a34208f60a16e98488c5 17-Feb-2017 Chong Zhang <chz@google.com> stagefright: verbose logging for media connect/disconnect

bug: 35364355

Change-Id: I7b5f0aecf98733255cc27b091fea78298fa7e602
ediaCodec.cpp
urfaceUtils.cpp
26f202600b4e10fa80bd2d51283aebb8fdd3669c 17-Feb-2017 Pawin Vongmasa <pawin@google.com> Add a missing check for HIDL transaction status.

Test: CtsMediaTestCases
Bug: 31399200
Change-Id: I515b0b0bf0eee44a7ec664fdd48d0a7bef68d323
mx/hal/1.0/impl/WOmxObserver.cpp
mx/hal/1.0/utils/WOmxObserver.cpp
42a5de6da0084fd430c70d58671559f71c738cf0 17-Feb-2017 Hangyu Kuang <hkuang@google.com> Merge "media: Support accurate pause/resume/stop in GraphicBufferSource."
764d945bfdb9dec60f2b482fbf6c5e83824ed950 13-Dec-2016 Hangyu Kuang <hkuang@google.com> media: Support accurate pause/resume/stop in GraphicBufferSource.

Process all buffers that have been queued to the encoder on
StagefrightRecorder::pause()/stop(). Furthermore, add timestamp support for
pause/stop. Buffers willi keep getting encoded until 1) a buffer with a higher
timestamp is queued, or 2) the bufferqueue is abandoned by the producer.

Test: Recording with hacking GoogleCamera timestamp. And Mediarecorder CTS test.
Bug:32765698
Change-Id: I9ec33d635aef269836d7a5d9f4b906cb41b46a0d
Codec.cpp
ediaCodecSource.cpp
mx/GraphicBufferSource.cpp
mx/GraphicBufferSource.h
mx/hal/1.0/impl/WGraphicBufferSource.cpp
mx/hal/1.0/impl/WGraphicBufferSource.h
mx/hal/1.0/utils/WGraphicBufferSource.cpp
mx/hal/1.0/utils/WGraphicBufferSource.h
9c47c97ecac581d66b6febafd156618247e86742 08-Feb-2017 Pawin Vongmasa <pawin@google.com> Enable full migration of OMX to Treble.

1. Toggling between Treble and non-Treble OMX will now be controlled by
two properties: "persist.hal.binderization" and
"persist.media.treble_omx". (Before this CL, this was controlled by
"debug.treble_omx".)
- If persist.media.treble_omx is not set, it will assume a default value
of -1.
- If persist.media.treble_omx is -1, persist.hal.binderization will be
used to determine whether OMX will be created as a Treble or non-Treble
service.
- If persist.media.treble_omx is 1, OMX will be created as a Treble
service.
- If persist.media.treble_omx has any other value, OMX will be created
as a non-Treble service.
- persist.media.treble_omx can be changed without rebooting, but it will
only take effect after media.codec and mediaserver processes are killed.

2. Remove all dependencies on non-Treble service. This was not done for
MediaCodec, MediaPlayerService::Client, MediaRecorderClient, stagefright
command, and omx_tests command. OMXClient and media.codec process will
now pick the right version of OMX based on properties mentioned above.
Before this CL, media.codec would always present the non-Treble version
of OMX regardless of the flag.

3. Provide workarounds for some HIDL issues.
- A sequence of nested binder and hwbinder calls require many threads to
handle. (b/35283480) The workaround is to increase the number of threads
in the thread pool of media.codec process.
- android.hidl.base@1.0::IBase::unlinkToDeath takes a strong pointer
instead of a weak pointer. (b/35233970) This causes an infinite
recursion in the destructor of ServiceDeathNotifier in
MediaPlayerService::Client and MediaRecorderClient. The workaround moves
calls to unlinkToDeath() outside of the destructor.

Test: Recorded and played videos with Camera app. Ran stagefright and
omx_tests commands.
Bug: 31399200

Change-Id: Id1940ed982838e10bf10fe8ed5b7bb912a5a2d3a
Codec.cpp
MXClient.cpp
mx/hal/1.0/impl/Conversion.h
mx/hal/1.0/utils/Conversion.h
mx/tests/Android.mk
mx/tests/OMXHarness.cpp
mx/tests/OMXHarness.h
31ae35a83a8384b942d60c32456d7e2e707eb2fa 16-Feb-2017 Wonsik Kim <wonsik@google.com> resolve merge conflicts of 7fa2b10732 to master

Change-Id: I695412a2e1dcf617950a670895bda7316db0c578
cefac14261a32fb856b0d1ab31541787112e306e 07-Feb-2017 Hassan Shojania <shojania@google.com> Modular DRM for MediaPlayer

Bug: 34559906
Test: Manual through the test app

Change-Id: I286f9ff199c34563b7b8643de725f8d1534ea06c
ediaCodec.cpp
7fa2b10732d2f22376d4027b35b25fa1f9e89526 16-Feb-2017 Wonsik Kim <wonsik@google.com> codecs: handle onReset() for a few encoders am: 5443b57cc5 am: 89f501d046 am: 4f428b7c02 am: a5e72ec799 am: 787a5136f0 am: 83485b615e am: 58f7175ed4 am: 2430ff6610 am: e80b15a63f am: c5343a578c am: 9224cc83f7
am: a68afd769c

Change-Id: I0889b0b089e7386fd4f779a3b7db1b8ecbe40b25
a68afd769c55407710355163fbead6634221cd59 16-Feb-2017 Wonsik Kim <wonsik@google.com> codecs: handle onReset() for a few encoders am: 5443b57cc5 am: 89f501d046 am: 4f428b7c02 am: a5e72ec799 am: 787a5136f0 am: 83485b615e am: 58f7175ed4 am: 2430ff6610 am: e80b15a63f am: c5343a578c
am: 9224cc83f7

Change-Id: Id3cf87221a3e1c8bc7a437079a4cfd121d3096a4
b67b0afbf5eed9e852a9cac0fc9ec37a3d589956 16-Feb-2017 Wonsik Kim <wonsik@google.com> codecs: handle onReset() for a few encoders am: 5443b57cc5 am: 89f501d046 am: 4f428b7c02 am: a5e72ec799 am: 787a5136f0 am: 83485b615e am: 58f7175ed4 am: 2430ff6610 am: e80b15a63f am: c5343a578c
am: 9224cc83f7

Change-Id: Iaef9a2b69240cc6517dc78bf85b68b4e23e51c9c
c5343a578c76ecae6559c90a968364b09a90fc86 16-Feb-2017 Wonsik Kim <wonsik@google.com> codecs: handle onReset() for a few encoders am: 5443b57cc5 am: 89f501d046 am: 4f428b7c02 am: a5e72ec799 am: 787a5136f0 am: 83485b615e am: 58f7175ed4 am: 2430ff6610
am: e80b15a63f

Change-Id: I64b7684e3306b35b96b92cd71fae359d8bb613f5
e80b15a63fa23f8d81c3d8e35b4502fb2e5a299c 16-Feb-2017 Wonsik Kim <wonsik@google.com> codecs: handle onReset() for a few encoders am: 5443b57cc5 am: 89f501d046 am: 4f428b7c02 am: a5e72ec799 am: 787a5136f0 am: 83485b615e am: 58f7175ed4
am: 2430ff6610

Change-Id: I4099ab29c596f5ad2f03e0c018b0c2fddb078ed7
2430ff6610479b4374958d2a5c4db0b129fc7803 16-Feb-2017 Wonsik Kim <wonsik@google.com> codecs: handle onReset() for a few encoders am: 5443b57cc5 am: 89f501d046 am: 4f428b7c02 am: a5e72ec799 am: 787a5136f0 am: 83485b615e
am: 58f7175ed4

Change-Id: Ib5d28de651178b0ab7cd3e44793a6078d904ff4c
58f7175ed4be16dedab504c3a7c386b673ee3cc3 16-Feb-2017 Wonsik Kim <wonsik@google.com> codecs: handle onReset() for a few encoders am: 5443b57cc5 am: 89f501d046 am: 4f428b7c02 am: a5e72ec799 am: 787a5136f0
am: 83485b615e

Change-Id: I3d18f79b2d7a22122756e0cf4af2b7d46dfe808b
83485b615e4d5806f871114e14584dd9c484640d 16-Feb-2017 Wonsik Kim <wonsik@google.com> codecs: handle onReset() for a few encoders am: 5443b57cc5 am: 89f501d046 am: 4f428b7c02 am: a5e72ec799
am: 787a5136f0

Change-Id: Ie4050fea30e11b772d6a60833ffcf6c000778461
787a5136f0a3a19f2342e41137177b03b3a8b073 16-Feb-2017 Wonsik Kim <wonsik@google.com> codecs: handle onReset() for a few encoders am: 5443b57cc5 am: 89f501d046 am: 4f428b7c02
am: a5e72ec799

Change-Id: I3c4fc719cae8632fb7223db29ea035ed1a80616a
a5e72ec7993f37d6282c847ca13044326bbc5727 16-Feb-2017 Wonsik Kim <wonsik@google.com> codecs: handle onReset() for a few encoders am: 5443b57cc5 am: 89f501d046
am: 4f428b7c02

Change-Id: Ia3e7fe8b1f39448f865508da3d5836b3159273cb
daaabdcaac696870285d8ad83502fe4319c5e719 16-Feb-2017 Wonsik Kim <wonsik@google.com> DO NOT MERGE codecs: handle onReset() for a few encoders am: dd447c354e
am: afaa438503

Change-Id: Ife5d8803e38a6d62f820929c6eb83b93f8ec64c1
89f501d046c9a3ca61201e187a0d3655d59e521c 16-Feb-2017 Wonsik Kim <wonsik@google.com> codecs: handle onReset() for a few encoders
am: 5443b57cc5

Change-Id: Ifd851c8840abc615eecf0da1f6b32f30cfb4e0b2
2f77a2229be73b222098c45aed73728842667e12 15-Feb-2017 Brian C. Anderson <brianderson@google.com> Merge "Update HIDL with CompositorTiming."
5443b57cc54f2e46b35246637be26a69e9f493e1 10-Feb-2017 Wonsik Kim <wonsik@google.com> codecs: handle onReset() for a few encoders

Test: Run PoC binaries
Bug: 34749392
Bug: 34705519
Change-Id: I3356eb615b0e79272d71d72578d363671038c6dd
odecs/aacenc/SoftAACEncoder.cpp
odecs/aacenc/SoftAACEncoder.h
odecs/aacenc/SoftAACEncoder2.cpp
odecs/aacenc/SoftAACEncoder2.h
odecs/m4v_h263/enc/SoftMPEG4Encoder.cpp
odecs/m4v_h263/enc/SoftMPEG4Encoder.h
odecs/on2/enc/SoftVPXEncoder.cpp
odecs/on2/enc/SoftVPXEncoder.h
dd447c354eb6b2a99d67fd787cafe91e07e1fce6 10-Feb-2017 Wonsik Kim <wonsik@google.com> DO NOT MERGE codecs: handle onReset() for a few encoders

Test: Run PoC binaries
Bug: 34749392
Bug: 34705519
Change-Id: I3356eb615b0e79272d71d72578d363671038c6dd
odecs/aacenc/SoftAACEncoder.cpp
odecs/aacenc/SoftAACEncoder.h
odecs/aacenc/SoftAACEncoder2.cpp
odecs/aacenc/SoftAACEncoder2.h
odecs/m4v_h263/enc/SoftMPEG4Encoder.cpp
odecs/m4v_h263/enc/SoftMPEG4Encoder.h
odecs/on2/enc/SoftVPXEncoder.cpp
odecs/on2/enc/SoftVPXEncoder.h
bf063732ccaadd049448b5da0f65b84ffdf41b2f 07-Dec-2016 Caroline Tice <cmtice@google.com> Fix "Dereference of null pointer" compiler warning.

This is attempt #2 to get I1581b3337b6331a694774da27072dd39992e6218 in.
Swapping from android/log.h to log/log.h seems to fix the build
breakage.

Original commit message:

This CL fixes the warning:
"frameworks/av/media/libstagefright/codecs/aacenc/src/dyn_bits.c:197:35
warning: Array access (from variable 'sideInfoTab') results in a null
pointer dereference"

There's a switch statement that initializes 'sideInfoTab', and it does
not have a default case. The listed cases seem to cover all the valid
types for the switch variable, but since the declared type is basically
'int', it's possible for it to contain some value not covered by the
other cases, hit the non-existent default case, which leaves sideInfoTab
with its initial NULL value, later being dereferenced. This CL fixes
this by adding a default case to the switch statement that complains if
it gets an invalid value.

Bug: 27293041
Test: Compiles without the warning. Successfully built on bullhead,
aosp_arm64, and angler.
Change-Id: I554bbf266695936830d318540a2aacecf076c652
odecs/aacenc/src/dyn_bits.c
319c6e98f6c8025674b235659503c5c39eaacf75 14-Feb-2017 Hangyu Kuang <hkuang@google.com> Merge "media: Add metadata mime format parsing support to MPEG4Extractor."
d41141cc0f9d32e42b7b7515a67165979bbe968e 14-Feb-2017 Marco Nelissen <marcone@google.com> resolve merge conflicts of 79cf158c51 to mnc-dev am: 50358a80b1 am: 86d5e962ce am: 24058e96b3 am: c9d4267bf0 am: 199f36c95a am: fb800b98ed am: f70b522d31
am: 20d68e02bc

Change-Id: I8c9a62ef7afcd47d31b12643446f492c969fcd7e
1f82e093581e6175c0ea0a99f1f9e8ee335502b9 14-Feb-2017 Brian Anderson <brianderson@google.com> Update HIDL with CompositorTiming.

Test: Tested manually with Chrome.
Change-Id: If04c4bdd7fdf559e05bfcde421b9b886c63a8aa7
mx/hal/1.0/impl/Conversion.h
mx/hal/1.0/utils/Conversion.h
f70b522d31f5a85855cd2801364ea42208546346 14-Feb-2017 Marco Nelissen <marcone@google.com> resolve merge conflicts of 79cf158c51 to mnc-dev am: 50358a80b1 am: 86d5e962ce am: 24058e96b3 am: c9d4267bf0 am: 199f36c95a
am: fb800b98ed

Change-Id: Ie8cc581c6c3bf76b375a2cdb4095e4152b359b2d
fb800b98edd9ea68d3ba3e60b7ec6e0cd33978d7 14-Feb-2017 Marco Nelissen <marcone@google.com> resolve merge conflicts of 79cf158c51 to mnc-dev am: 50358a80b1 am: 86d5e962ce am: 24058e96b3 am: c9d4267bf0
am: 199f36c95a

Change-Id: I6e7307dcff161e32794ba15368bd00a5f625fd09
199f36c95a7d43e66c14176c2fb2e3f4e33af29a 14-Feb-2017 Marco Nelissen <marcone@google.com> resolve merge conflicts of 79cf158c51 to mnc-dev am: 50358a80b1 am: 86d5e962ce am: 24058e96b3
am: c9d4267bf0

Change-Id: I3c49d0414ac2d6db50dab923b9350daae96cdd1d
c9d4267bf08c64a8576b1d3d11bbfd10673902bb 14-Feb-2017 Marco Nelissen <marcone@google.com> resolve merge conflicts of 79cf158c51 to mnc-dev am: 50358a80b1 am: 86d5e962ce
am: 24058e96b3

Change-Id: Idb55e28f9cc23699d145f145c92e1c9c2e290d86
24058e96b3e1b13ae6636826f0a4cd1cd631e8ec 14-Feb-2017 Marco Nelissen <marcone@google.com> resolve merge conflicts of 79cf158c51 to mnc-dev am: 50358a80b1
am: 86d5e962ce

Change-Id: I59f1dc2a12d44018e3e8b74bcc6d9c775f896381
86d5e962ce26dde45d961836f0926f86e4ac788c 14-Feb-2017 Marco Nelissen <marcone@google.com> resolve merge conflicts of 79cf158c51 to mnc-dev
am: 50358a80b1

Change-Id: I9f0220c41cf629652329ed624469f6442186eca3
50358a80b1724f6cf1bcdf003e1abf9cc141b122 13-Feb-2017 Marco Nelissen <marcone@google.com> resolve merge conflicts of 79cf158c51 to mnc-dev

Change-Id: Ied32e83215e386c801c02991a0b2fa4baa25b643
f8a2e81bc460a33e4198cc5146ac76c9b970c0a4 13-Feb-2017 Marco Nelissen <marcone@google.com> Merge "stagefright: parseApp check data boundary conditions" into klp-dev am: 65433ff04d am: 86bd734f58 am: 7902138f2e
am: a23c9a47ab

Change-Id: I4cfef0f49e467337c36b9283d2959ddd68e41bd3
a23c9a47ab42162fcc736d4d3fbca601dfba796a 13-Feb-2017 Marco Nelissen <marcone@google.com> Merge "stagefright: parseApp check data boundary conditions" into klp-dev am: 65433ff04d am: 86bd734f58
am: 7902138f2e

Change-Id: I2d9be870193a986d9cd21d7527c4069cd1f184ed
7902138f2e36ebe7452437a8394619619b8a66a6 13-Feb-2017 Marco Nelissen <marcone@google.com> Merge "stagefright: parseApp check data boundary conditions" into klp-dev am: 65433ff04d
am: 86bd734f58

Change-Id: I3729ea0064642ac10292561d450565ee735af369
acf147e827ccb3a9914aa905eef5e90d21416aba 09-Feb-2017 Vishwath Mohan <vishwath@google.com> Enable CFI for additional media components.

Enables CFI for the following components (when built with the global
ENABLE_CFI flag set):
- media/libstagefright/
- media/libstagefright/colorconversion/
- media/libstagefright/filters/
- media/libstagefright/id3/
- media/libstagefright/matroska/
- media/libstagefright/mpeg2ts/
- media/libstagefright/timedtext/
- media/libstagefright/webm/

Bug: 30227045
Test: m -j40 and device builds and boots
Test: CFI is not enabled unless built with ENABLE_CFI=true
Test: CFI enabled build passes the media CTS tests.

Change-Id: I294b55ab34f94cca4eb9a2eef9c5c7f050d22b75
ndroid.mk
olorconversion/Android.mk
ilters/Android.mk
d3/Android.mk
atroska/Android.mk
peg2ts/Android.mk
imedtext/Android.mk
ebm/Android.mk
ed1abbfc73d4ade0ef08239fc56ac66d70a00a92 09-Feb-2017 Caroline Tice <cmtice@google.com> Merge "Fix static analyzer warnings" am: 9064b2d12a am: 9924503dfe am: 41194d937c
am: 4b0f2f5150

Change-Id: Ic5ff05b44bcfe9edefff1044c78691d3fd6c9f98
4b0f2f51509154f1180dab192bff23ce4bf725c7 09-Feb-2017 Caroline Tice <cmtice@google.com> Merge "Fix static analyzer warnings" am: 9064b2d12a am: 9924503dfe
am: 41194d937c

Change-Id: I86f7ca87a54797027949c6d30afe8862f019f34e
41194d937cbb863618d9e82f6650564979b596d0 09-Feb-2017 Caroline Tice <cmtice@google.com> Merge "Fix static analyzer warnings" am: 9064b2d12a
am: 9924503dfe

Change-Id: I50023e13c9beff766405cd3bdccfb71da7c766c9
9064b2d12a572cb53469883a595eed6360b49cd8 09-Feb-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Fix static analyzer warnings"
89a5055187864ae8bf8d5ee4f2cb2719f4d1054b 08-Feb-2017 Marco Nelissen <marcone@google.com> Merge "Fix divide by zero" am: 659cb35e19 am: 021add2def am: 6fe7d5973c
am: 77a5123b2a

Change-Id: Id75e62379acbce548ee099abb3134e6c964a9939
77a5123b2aa9cb27919b17e4da26bc7281e14943 08-Feb-2017 Marco Nelissen <marcone@google.com> Merge "Fix divide by zero" am: 659cb35e19 am: 021add2def
am: 6fe7d5973c

Change-Id: I05b15bf43fb31d9de3560ca1ccfe0c93f29fcf8f
6fe7d5973c89e27652521e4d4af46deca557d2a3 08-Feb-2017 Marco Nelissen <marcone@google.com> Merge "Fix divide by zero" am: 659cb35e19
am: 021add2def

Change-Id: Id633e8581b39e62615489981427380a80361d741
bbc0c8bb5478ee59970977033802185cccf10b48 08-Feb-2017 Marco Nelissen <marcone@google.com> Fix divide by zero

Bug: 35136163
Change-Id: If074a1c4d595489f4ff4ffc0b8c381d1bc658447
ampleIterator.cpp
65c954e72a126e4ea59d1fe2859bfb39cb800380 08-Feb-2017 Caroline Tice <cmtice@google.com> Fix static analyzer warnings

It was unhappy about uninitialized values potentially being passed into
calls. The warnings were:

frameworks/av/media/libstagefright/DataSource.cpp:254:22: warning:
Function call argument is an uninitialized value

frameworks/av/media/libstagefright/MPEG4Extractor.cpp:4528:17: warning:
Function call argument is an uninitialized value

(The latter was complaining about both `size` and `offset`)

Bug: None
Test: Still builds; static analyzer is now less unhappy.
Change-Id: If8befe493267a5de20e46787b50d854c49d208a3
ataSource.cpp
PEG4Extractor.cpp
f2b8278225bdb043fde4ec5b6a78ff5181598cd8 08-Feb-2017 Ray Essick <essick@google.com> Merge "connect APIs to mediaextractor getMetrics()"
daff0882bcf1a8556324e4ad12d03edbe7491a7f 08-Feb-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Fix some bugs in the Treble connection."
f67a95d02a22d4217a75b93887ea523379fe1e82 08-Feb-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Update conversion functions for QueueBufferOutput."
8ff40189817e95c7a56e347398d20e60d7534ee6 07-Feb-2017 Pawin Vongmasa <pawin@google.com> Fix some bugs in the Treble connection.

Test: Do the following inside adb shell:
setenforce 0
setprop debug.treble_omx 1
pkill mediacodec
pkill mediaserver

Bug: 31399200
Change-Id: I8d0ebcca477738add8b41b58ae85539061cfad7b
mx/GraphicBufferSource.cpp
mx/GraphicBufferSource.h
mx/hal/1.0/impl/Conversion.h
mx/hal/1.0/impl/WGraphicBufferSource.cpp
mx/hal/1.0/impl/WGraphicBufferSource.h
mx/hal/1.0/impl/WOmx.cpp
mx/hal/1.0/impl/WOmx.h
mx/hal/1.0/impl/WOmxBufferProducer.cpp
mx/hal/1.0/impl/WOmxBufferProducer.h
mx/hal/1.0/impl/WOmxBufferSource.cpp
mx/hal/1.0/impl/WOmxBufferSource.h
mx/hal/1.0/impl/WOmxNode.cpp
mx/hal/1.0/impl/WOmxNode.h
mx/hal/1.0/impl/WOmxObserver.cpp
mx/hal/1.0/impl/WOmxObserver.h
mx/hal/1.0/impl/WOmxProducerListener.cpp
mx/hal/1.0/impl/WOmxProducerListener.h
mx/hal/1.0/utils/Conversion.h
mx/hal/1.0/utils/WGraphicBufferSource.cpp
mx/hal/1.0/utils/WGraphicBufferSource.h
mx/hal/1.0/utils/WOmx.cpp
mx/hal/1.0/utils/WOmx.h
mx/hal/1.0/utils/WOmxBufferProducer.cpp
mx/hal/1.0/utils/WOmxBufferProducer.h
mx/hal/1.0/utils/WOmxBufferSource.cpp
mx/hal/1.0/utils/WOmxBufferSource.h
mx/hal/1.0/utils/WOmxNode.cpp
mx/hal/1.0/utils/WOmxNode.h
mx/hal/1.0/utils/WOmxObserver.cpp
mx/hal/1.0/utils/WOmxObserver.h
mx/hal/1.0/utils/WOmxProducerListener.cpp
mx/hal/1.0/utils/WOmxProducerListener.h
db0d4cc3184f400dcbb841f274d5b6f4c8400550 07-Feb-2017 Marco Nelissen <marcone@google.com> Merge "Fix potential overflows" am: a0c1eb865f am: ef3542347c am: 2774f292b7
am: 3bcc22b176

Change-Id: I78bd28ee6abb4befea5c46c8d4be8799b88b227b
3bcc22b176cdd33e3abfe004a3ea3314e7e42a30 07-Feb-2017 Marco Nelissen <marcone@google.com> Merge "Fix potential overflows" am: a0c1eb865f am: ef3542347c
am: 2774f292b7

Change-Id: I1c46b0367639fa29830c74ce92f14c295d178b2c
2774f292b726ce578091f9a3419d56f1d537f9e6 07-Feb-2017 Marco Nelissen <marcone@google.com> Merge "Fix potential overflows" am: a0c1eb865f
am: ef3542347c

Change-Id: I020bcf499ca455da44ff8eabcd867b44895eeb43
833fb390dcdfa4da31640dd3210e568d141960c4 07-Feb-2017 Marco Nelissen <marcone@google.com> Fix potential overflows

Bug: 33402896
Test: played file that triggered overflow
Change-Id: Ibf51bbbd4749377d3e77cf6e53fc66ae33b8ee7c
ampleIterator.cpp
ba13b7bc3d46d958bc4a395f2c162cb112ec1f3a 07-Feb-2017 Ray Essick <essick@google.com> connect APIs to mediaextractor getMetrics()

plumbing so that user level android.media.MediaExtractor.getMetrics()
will get down to where we keep the metrics and then haul them back
to the application. Includes the right hooks so that per-container-type
metrics will also be managed.

Bug: 35094936
Test: monitor dumpsys output, augmented CTS examination
PEG4Extractor.cpp
ediaExtractor.cpp
uMediaExtractor.cpp
nclude/MPEG4Extractor.h
92b6b72deb1e4225620806446c782d6cffb4cf17 07-Feb-2017 Pawin Vongmasa <pawin@google.com> Update conversion functions for QueueBufferOutput.

QueueBufferOutput was modified in ag/1806678.

Test: Compiles

Bug: 31399200
Bug: 34481539
Change-Id: Ibb0fb904047d9c00cb29f9f8b34dcf02fa0a0e5e
mx/hal/1.0/impl/Conversion.h
mx/hal/1.0/utils/Conversion.h
89ed5c374db5dfa3c64760f1e7d75f9cc4be00a3 04-Feb-2017 Marco Nelissen <marcone@google.com> Turn off overflow protection for various math functions am: 42b1ea8a93 am: 0785ced61b am: 6f0b9ca8a5 am: ef2510a3de am: fc46c290ea
am: 759ded4dca

Change-Id: Ic308abc85c26b5dc77716e8536843ba6be65355a
759ded4dca1129dcd56bcaecfbef47f8a2bc1c42 04-Feb-2017 Marco Nelissen <marcone@google.com> Turn off overflow protection for various math functions am: 42b1ea8a93 am: 0785ced61b am: 6f0b9ca8a5 am: ef2510a3de
am: fc46c290ea

Change-Id: I89868880925b5878f68b2ba1724e255c88c91921
fc46c290ea08f3e5d45e82b833435266ca11fccd 04-Feb-2017 Marco Nelissen <marcone@google.com> Turn off overflow protection for various math functions am: 42b1ea8a93 am: 0785ced61b am: 6f0b9ca8a5
am: ef2510a3de

Change-Id: I0ba16f325eda7debba151d29b00867bb365c1c0b
98e036257a7cec64597cac70b651e553f5b1d955 04-Feb-2017 Marco Nelissen <marcone@google.com> Turn off overflow protection for various math functions am: 42b1ea8a93 am: 0785ced61b am: 6f0b9ca8a5
am: ef2510a3de

Change-Id: If480835fb3eea21f0a20f1abf22e4976afaa70fa
6f0b9ca8a53c2106857aedf59c5dbae48413bb54 04-Feb-2017 Marco Nelissen <marcone@google.com> Turn off overflow protection for various math functions am: 42b1ea8a93
am: 0785ced61b

Change-Id: Ifc899ae6cf0b677852c807c796bc031a9b29661b
0785ced61bc86bce415439593b30fc5306bed802 04-Feb-2017 Marco Nelissen <marcone@google.com> Turn off overflow protection for various math functions
am: 42b1ea8a93

Change-Id: Iecbbea2590a1d0acac1f9091851a2434b50523af
24c4f0f3e9846ce17cc2cbb6c2400698b445b8f8 02-Feb-2017 Ray Essick <essick@google.com> Merge "include actual codec used"
888874b28972aaf8ecbbeda6fd9786f44b09beb4 02-Feb-2017 Marco Nelissen <marcone@google.com> Revert "Turn off overflow protection for various math functions" am: 2dd1d5e02e am: aa5498018f am: ce9cab33b7 am: 4c1ad41c8b am: bd91a6540d am: 08ccbcc16f am: 9070697124 am: 9986938f08 am: 245b572340 am: d0bc460432 am: 4f34250af7 am: 96f48e1601 am: 1c4083fcbf am: 878b27dfbb am: cfdba012b5
am: 7a5366b7c1

Change-Id: I1c5d8ee1217dd0f6a5b22c336ac2073e8e94b732
42b1ea8a934ee13899663ad7e1551b658d48e6d6 02-Feb-2017 Marco Nelissen <marcone@google.com> Turn off overflow protection for various math functions

These functions also exist as arm assembly files, where the overflows
just wrap around, and this makes their plain C equivalents behave
the same.

Bug: 32577290
Bug: 33071964
Test: ran PoC for bug 32577290 using plain C source code
Change-Id: I73c2609589e7a89d36f6c44391548312259daf14
(cherry picked from commit cbf5e6915c42c691a6ccb9a5d249e450f9e67467)
odecs/mp3dec/src/pv_mp3dec_fxd_op_c_equivalent.h
odecs/mp3dec/src/pvmp3_dct_16.cpp
odecs/mp3dec/src/pvmp3_dct_9.cpp
odecs/mp3dec/src/pvmp3_mdct_18.cpp
7a5366b7c1fab1a478af7cc83ba08ec649d2da81 02-Feb-2017 Marco Nelissen <marcone@google.com> Revert "Turn off overflow protection for various math functions" am: 2dd1d5e02e am: aa5498018f am: ce9cab33b7 am: 4c1ad41c8b am: bd91a6540d am: 08ccbcc16f am: 9070697124 am: 9986938f08 am: 245b572340 am: d0bc460432 am: 4f34250af7 am: 96f48e1601 am: 1c4083fcbf am: 878b27dfbb
am: cfdba012b5

Change-Id: Iffa681e1029f717d98d9bc5f7f329a954593fb95
ee721d879ca73e53bc86550b5f81e128ab01d9d5 02-Feb-2017 Marco Nelissen <marcone@google.com> Revert "Turn off overflow protection for various math functions" am: 2dd1d5e02e am: aa5498018f am: ce9cab33b7 am: 4c1ad41c8b am: bd91a6540d am: 08ccbcc16f am: 9070697124 am: 9986938f08 am: 245b572340 am: d0bc460432 am: 4f34250af7 am: 96f48e1601 am: 1c4083fcbf
am: 878b27dfbb

Change-Id: I6de3a7463a661a7aa88716bee76d1e4e6a59e857
cfdba012b5fc52adbd9068ad5f878cc6836e063a 02-Feb-2017 Marco Nelissen <marcone@google.com> Revert "Turn off overflow protection for various math functions" am: 2dd1d5e02e am: aa5498018f am: ce9cab33b7 am: 4c1ad41c8b am: bd91a6540d am: 08ccbcc16f am: 9070697124 am: 9986938f08 am: 245b572340 am: d0bc460432 am: 4f34250af7 am: 96f48e1601 am: 1c4083fcbf
am: 878b27dfbb

Change-Id: Ibb5282c8046643b625d5776f6f3efb9b2ad2127d
1c4083fcbff36dbb67e9e250d79598b96d9b1ed6 02-Feb-2017 Marco Nelissen <marcone@google.com> Revert "Turn off overflow protection for various math functions" am: 2dd1d5e02e am: aa5498018f am: ce9cab33b7 am: 4c1ad41c8b am: bd91a6540d am: 08ccbcc16f am: 9070697124 am: 9986938f08 am: 245b572340 am: d0bc460432 am: 4f34250af7
am: 96f48e1601

Change-Id: I153ab76b64a6ac5c3e7dbcb0ce24b3cfd32069e1
96f48e1601731dde35ac97ccc0a5eff55cdd32ed 02-Feb-2017 Marco Nelissen <marcone@google.com> Revert "Turn off overflow protection for various math functions" am: 2dd1d5e02e am: aa5498018f am: ce9cab33b7 am: 4c1ad41c8b am: bd91a6540d am: 08ccbcc16f am: 9070697124 am: 9986938f08 am: 245b572340 am: d0bc460432
am: 4f34250af7

Change-Id: Ia17f05fa79c3205def123170a3cd815e34ed211c
4f34250af74cd4c93a0c2a838bc131f90eee88a3 02-Feb-2017 Marco Nelissen <marcone@google.com> Revert "Turn off overflow protection for various math functions" am: 2dd1d5e02e am: aa5498018f am: ce9cab33b7 am: 4c1ad41c8b am: bd91a6540d am: 08ccbcc16f am: 9070697124 am: 9986938f08 am: 245b572340
am: d0bc460432

Change-Id: I28693f257be18393f0d5711f33ca0eb9260cd361
d0bc460432a4a0ffd15119f7cc1c7811fe7343e6 02-Feb-2017 Marco Nelissen <marcone@google.com> Revert "Turn off overflow protection for various math functions" am: 2dd1d5e02e am: aa5498018f am: ce9cab33b7 am: 4c1ad41c8b am: bd91a6540d am: 08ccbcc16f am: 9070697124 am: 9986938f08
am: 245b572340

Change-Id: I4a6bc9c420277062d46d57e734c77f67ae861ac4
245b572340a1fc85c1817a62205cb51d1078963f 02-Feb-2017 Marco Nelissen <marcone@google.com> Revert "Turn off overflow protection for various math functions" am: 2dd1d5e02e am: aa5498018f am: ce9cab33b7 am: 4c1ad41c8b am: bd91a6540d am: 08ccbcc16f am: 9070697124
am: 9986938f08

Change-Id: I9d46125d775350691fd30b79fc3672212ab463d3
9986938f083409a8a8d17556c9164b4d89857ce4 02-Feb-2017 Marco Nelissen <marcone@google.com> Revert "Turn off overflow protection for various math functions" am: 2dd1d5e02e am: aa5498018f am: ce9cab33b7 am: 4c1ad41c8b am: bd91a6540d am: 08ccbcc16f
am: 9070697124

Change-Id: Icc7f1e5688d39f1ed4d4ea3bafa1474ec55090aa
90706971240490361b3ed1c68b028b73d6dcce90 02-Feb-2017 Marco Nelissen <marcone@google.com> Revert "Turn off overflow protection for various math functions" am: 2dd1d5e02e am: aa5498018f am: ce9cab33b7 am: 4c1ad41c8b am: bd91a6540d
am: 08ccbcc16f

Change-Id: I7e920284bf69cc450d36f813e7e001ae30f656ee
bd91a6540defccd060a5a314ce6ed41bcd562577 02-Feb-2017 Marco Nelissen <marcone@google.com> Revert "Turn off overflow protection for various math functions" am: 2dd1d5e02e am: aa5498018f am: ce9cab33b7
am: 4c1ad41c8b

Change-Id: I7a754e278cdc719a0bf6543f8a2accbc43301f86
4c1ad41c8b1d4da156e2d018000427c9dd1914c3 02-Feb-2017 Marco Nelissen <marcone@google.com> Revert "Turn off overflow protection for various math functions" am: 2dd1d5e02e am: aa5498018f
am: ce9cab33b7

Change-Id: Id9318840db48994196c72eb5f14e132e23776bda
ce9cab33b7981bcf44072e5c75f2d3818e9bd2cc 02-Feb-2017 Marco Nelissen <marcone@google.com> Revert "Turn off overflow protection for various math functions" am: 2dd1d5e02e
am: aa5498018f

Change-Id: Ica9690b213037f6bd4c13bf14a4d66b77b7def41
2dd1d5e02ef7f3a10db86dc2455d5bb9d35998c2 02-Feb-2017 Marco Nelissen <marcone@google.com> Revert "Turn off overflow protection for various math functions"

This reverts commit cbf5e6915c42c691a6ccb9a5d249e450f9e67467.

Change-Id: I0a81c26d22fee36485b21c285dcc91fbd518e1dd
odecs/mp3dec/src/pv_mp3dec_fxd_op_c_equivalent.h
odecs/mp3dec/src/pvmp3_dct_16.cpp
odecs/mp3dec/src/pvmp3_dct_9.cpp
odecs/mp3dec/src/pvmp3_mdct_18.cpp
260db029ef3be03e7c46f14e4ff20c69df9ad90f 02-Feb-2017 Marco Nelissen <marcone@google.com> Turn off overflow protection for various math functions am: cbf5e6915c am: 72b1fdbf49 am: a25eb35608 am: 3d58f94eec am: 1edbc699b5 am: c0118375e5 am: ba78beef56 am: b0ceb402c1 am: e7a758e220 am: 350db71bea am: d1cc28471a am: 1212f6e406 am: 415dfd3b95 am: 1c03bbb111
am: daff8361b1

Change-Id: I5ccf5602a893bf604c9604b357586e4ad6da3e43
daff8361b1c7e3cac6a3b59be75f98e004c7a52f 02-Feb-2017 Marco Nelissen <marcone@google.com> Turn off overflow protection for various math functions am: cbf5e6915c am: 72b1fdbf49 am: a25eb35608 am: 3d58f94eec am: 1edbc699b5 am: c0118375e5 am: ba78beef56 am: b0ceb402c1 am: e7a758e220 am: 350db71bea am: d1cc28471a am: 1212f6e406 am: 415dfd3b95
am: 1c03bbb111

Change-Id: Id3ca9d3593ad612e6980af485879ae8ebe51f2ae
2c55e08dbbc630c7029beddc0310800f273eb261 02-Feb-2017 Marco Nelissen <marcone@google.com> Turn off overflow protection for various math functions am: cbf5e6915c am: 72b1fdbf49 am: a25eb35608 am: 3d58f94eec am: 1edbc699b5 am: c0118375e5 am: ba78beef56 am: b0ceb402c1 am: e7a758e220 am: 350db71bea am: d1cc28471a am: 1212f6e406 am: 415dfd3b95
am: 1c03bbb111

Change-Id: Ie7b08940fe2beda42093182ffd396828cc38b4b3
415dfd3b95e2b52b326885fe6448bc50a7a0cdea 02-Feb-2017 Marco Nelissen <marcone@google.com> Turn off overflow protection for various math functions am: cbf5e6915c am: 72b1fdbf49 am: a25eb35608 am: 3d58f94eec am: 1edbc699b5 am: c0118375e5 am: ba78beef56 am: b0ceb402c1 am: e7a758e220 am: 350db71bea am: d1cc28471a
am: 1212f6e406

Change-Id: I40f438d567d3972689705f1594bf17120b067284
1212f6e40637c0839b8c3e8317844aa847ff7045 02-Feb-2017 Marco Nelissen <marcone@google.com> Turn off overflow protection for various math functions am: cbf5e6915c am: 72b1fdbf49 am: a25eb35608 am: 3d58f94eec am: 1edbc699b5 am: c0118375e5 am: ba78beef56 am: b0ceb402c1 am: e7a758e220 am: 350db71bea
am: d1cc28471a

Change-Id: Ice433e3bccd5b520941078f4369fec4b7d26e308
d1cc28471accca8ff5a81766e615f523922c6b4c 02-Feb-2017 Marco Nelissen <marcone@google.com> Turn off overflow protection for various math functions am: cbf5e6915c am: 72b1fdbf49 am: a25eb35608 am: 3d58f94eec am: 1edbc699b5 am: c0118375e5 am: ba78beef56 am: b0ceb402c1 am: e7a758e220
am: 350db71bea

Change-Id: I8d1260360f806a605831ac070d20da52696e3608
350db71bea02fac80cdf611a8d30ab331f5455e6 02-Feb-2017 Marco Nelissen <marcone@google.com> Turn off overflow protection for various math functions am: cbf5e6915c am: 72b1fdbf49 am: a25eb35608 am: 3d58f94eec am: 1edbc699b5 am: c0118375e5 am: ba78beef56 am: b0ceb402c1
am: e7a758e220

Change-Id: I2e348f157daa783988fe0690f9df3d922eff34b9
e7a758e220b54ba6aa48bfd8c5de00e05b33f1e9 02-Feb-2017 Marco Nelissen <marcone@google.com> Turn off overflow protection for various math functions am: cbf5e6915c am: 72b1fdbf49 am: a25eb35608 am: 3d58f94eec am: 1edbc699b5 am: c0118375e5 am: ba78beef56
am: b0ceb402c1

Change-Id: I3ac829f893058cec956296aeb6d2aab12a6ad758
b0ceb402c10eb2b8e9ed4cce555e1168cfa9ee56 02-Feb-2017 Marco Nelissen <marcone@google.com> Turn off overflow protection for various math functions am: cbf5e6915c am: 72b1fdbf49 am: a25eb35608 am: 3d58f94eec am: 1edbc699b5 am: c0118375e5
am: ba78beef56

Change-Id: I9c609d9a4032aca4806f3bf660722e98c7b7bd1b
ba78beef56ea43bae34e3a9e88d93bd77b13bd0f 02-Feb-2017 Marco Nelissen <marcone@google.com> Turn off overflow protection for various math functions am: cbf5e6915c am: 72b1fdbf49 am: a25eb35608 am: 3d58f94eec am: 1edbc699b5
am: c0118375e5

Change-Id: Ie92b4cba6575ce1c01f96ac19d4b6cd79392a19c
1edbc699b5f52654543e5ce32a0ecc0d4729ac99 02-Feb-2017 Marco Nelissen <marcone@google.com> Turn off overflow protection for various math functions am: cbf5e6915c am: 72b1fdbf49 am: a25eb35608
am: 3d58f94eec

Change-Id: I6be57dc624b46c1517fab973f34dd98b7d808a28
3d58f94eec8651d98d839a3ad5ddee3ef84e2e13 02-Feb-2017 Marco Nelissen <marcone@google.com> Turn off overflow protection for various math functions am: cbf5e6915c am: 72b1fdbf49
am: a25eb35608

Change-Id: Ia0f2f794297ab8b4c5070e5948c748d0265aa54b
a25eb35608e885c00aeb5db7d53f41183988f135 02-Feb-2017 Marco Nelissen <marcone@google.com> Turn off overflow protection for various math functions am: cbf5e6915c
am: 72b1fdbf49

Change-Id: I46daf840866183690f27ff7b3e6ed7ffe8bec9f5
8574195df5de20af5fc16d6f9da1b132d6d5bfee 02-Feb-2017 Ray Essick <essick@google.com> include actual codec used

populate the 'codec' analytics field that tells us which code was
chosen (OMX.google.aac.decoder, for example).
use local declared constants instead of literal strings for our attributes.

Bug: 34935498
Test: examination of generated metrics data
ediaCodec.cpp
8dc4ee85f02e7a40b93280fb1394c729c315e462 02-Feb-2017 Hangyu Kuang <hkuang@google.com> Merge "media: Add 3gp output format to MediaMuxer."
a2db0cb965d26352e01dd930687706aec1a43b7c 02-Feb-2017 Marco Nelissen <marcone@google.com> Merge "Turn off overflow protection for various math functions"
cbf5e6915c42c691a6ccb9a5d249e450f9e67467 02-Feb-2017 Marco Nelissen <marcone@google.com> Turn off overflow protection for various math functions

These functions also exist as arm assembly files, where the overflows
just wrap around, and this makes their plain C equivalents behave
the same.

Bug: 32577290
Bug: 33071964
Test: ran PoC for bug 32577290 using plain C source code
Change-Id: I73c2609589e7a89d36f6c44391548312259daf14
odecs/mp3dec/src/pv_mp3dec_fxd_op_c_equivalent.h
odecs/mp3dec/src/pvmp3_dct_16.cpp
odecs/mp3dec/src/pvmp3_dct_9.cpp
odecs/mp3dec/src/pvmp3_mdct_18.cpp
4341ae008f5df38af5ced8fcf41738b6fa0ba34b 02-Feb-2017 Marco Nelissen <marcone@google.com> Turn off overflow protection for various math functions

These functions also exist as arm assembly files, where the overflows
just wrap around, and this makes their plain C equivalents behave
the same.

Bug: 32577290
Bug: 33071964
Test: ran PoC for bug 32577290 using plain C source code
Change-Id: I73c2609589e7a89d36f6c44391548312259daf14
odecs/mp3dec/src/pv_mp3dec_fxd_op_c_equivalent.h
odecs/mp3dec/src/pvmp3_dct_16.cpp
odecs/mp3dec/src/pvmp3_dct_9.cpp
odecs/mp3dec/src/pvmp3_mdct_18.cpp
8a21c0191f974a0b9cbd5818052e2655e0aaa306 26-Dec-2016 Pawin Vongmasa <pawin@google.com> Modify ACodec to allow using Treble.

ACodec will connect to the Treble version of Omx if the property
"debug.treble_omx" is set to true ("1", "y", "yes", "true" or "on").

Also, fix some bugs found so far.

Test: Compiles
Bug: 31399200
Change-Id: I52b27b5f99bc1d6797d3b83b8be794ed2de9956a
Codec.cpp
ndroid.mk
ufferImpl.cpp
ilters/Android.mk
nclude/SharedMemoryBuffer.h
mx/OMXNodeInstance.cpp
mx/hal/1.0/impl/Conversion.h
mx/hal/1.0/impl/WOmxNode.cpp
mx/hal/1.0/impl/WOmxObserver.cpp
mx/hal/1.0/utils/Conversion.h
mx/hal/1.0/utils/WOmxNode.cpp
mx/hal/1.0/utils/WOmxObserver.cpp
c5516dcd272bda8ef4fab9999b7035f13eb2cbd8 01-Feb-2017 Pawin Vongmasa <pawin@google.com> Merge "Add an option to connect OMXClient to a Treble service."
49dcfd2089f667f18859654d7c256974aae4e857 30-Jan-2017 Hangyu Kuang <hkuang@google.com> media: Add 3gp output format to MediaMuxer.

Test: CTS test.
Bug: 34281643
Change-Id: I9f716aba6f2bcbbcdcd65959307a5013a5751f51
ediaMuxer.cpp
5fc3f541847240cc043b071485bb24ed2e20762a 30-Jan-2017 Robert Shih <robertshih@google.com> avc_utils: skip empty NALs from malformed bistreams am: 91fe76a157 am: f79f26d257 am: 2b5d2c4a10 am: b6e8b6b875 am: e277181b71 am: 1a9f5250d8 am: 4bf710727b am: 5337437a1c am: 4fa55ddad0 am: dda9763117 am: e264868ea1 am: c2d73ef0f2
am: 11231b12d8

Change-Id: I023f6498a412d61ba616563bfc87ecfed0850343
11231b12d8e8cc9bfedfff05a97840274766c639 30-Jan-2017 Robert Shih <robertshih@google.com> avc_utils: skip empty NALs from malformed bistreams am: 91fe76a157 am: f79f26d257 am: 2b5d2c4a10 am: b6e8b6b875 am: e277181b71 am: 1a9f5250d8 am: 4bf710727b am: 5337437a1c am: 4fa55ddad0 am: dda9763117 am: e264868ea1
am: c2d73ef0f2

Change-Id: I3b849065c4ef901c5b523d2fefefcb2b05165b0b
97b02cc554dfb677bea4bb6bd77e5670ee88ea40 30-Jan-2017 Robert Shih <robertshih@google.com> avc_utils: skip empty NALs from malformed bistreams am: 91fe76a157 am: f79f26d257 am: 2b5d2c4a10 am: b6e8b6b875 am: e277181b71 am: 1a9f5250d8 am: 4bf710727b am: 5337437a1c am: 4fa55ddad0 am: dda9763117
am: e264868ea1

Change-Id: Ieded091275f27641193a285b0128845c30bfe60b
c2d73ef0f273b0cffbd04dab5fd32986ec672819 30-Jan-2017 Robert Shih <robertshih@google.com> avc_utils: skip empty NALs from malformed bistreams am: 91fe76a157 am: f79f26d257 am: 2b5d2c4a10 am: b6e8b6b875 am: e277181b71 am: 1a9f5250d8 am: 4bf710727b am: 5337437a1c am: 4fa55ddad0 am: dda9763117
am: e264868ea1

Change-Id: Iad84f5a31af230aba3862a3a2d19e9427c6c9eaf
dda9763117645b62cee85313b9fef7d46c47cdd0 30-Jan-2017 Robert Shih <robertshih@google.com> avc_utils: skip empty NALs from malformed bistreams am: 91fe76a157 am: f79f26d257 am: 2b5d2c4a10 am: b6e8b6b875 am: e277181b71 am: 1a9f5250d8 am: 4bf710727b am: 5337437a1c
am: 4fa55ddad0

Change-Id: Id43dff53b311aef4f5f24242f3278dffb111baa7
4fa55ddad0519c53a2d7b8dfb78b87905ae6798f 30-Jan-2017 Robert Shih <robertshih@google.com> avc_utils: skip empty NALs from malformed bistreams am: 91fe76a157 am: f79f26d257 am: 2b5d2c4a10 am: b6e8b6b875 am: e277181b71 am: 1a9f5250d8 am: 4bf710727b
am: 5337437a1c

Change-Id: Idf542feffe490329e52b91a4881bd37f6baed901
5337437a1cd62a96a0c772e2ff0738e372d8aa93 30-Jan-2017 Robert Shih <robertshih@google.com> avc_utils: skip empty NALs from malformed bistreams am: 91fe76a157 am: f79f26d257 am: 2b5d2c4a10 am: b6e8b6b875 am: e277181b71 am: 1a9f5250d8
am: 4bf710727b

Change-Id: Ic381f846d804f473dbb3bbb29041dd525806699f
4bf710727b74d09b65e2db17591e8cb998e1a679 30-Jan-2017 Robert Shih <robertshih@google.com> avc_utils: skip empty NALs from malformed bistreams am: 91fe76a157 am: f79f26d257 am: 2b5d2c4a10 am: b6e8b6b875 am: e277181b71
am: 1a9f5250d8

Change-Id: I3cb8cc1b6a7886333a17556f38656c93b96fc7f8
1a9f5250d88ebd45e455131632e3e63b21038839 30-Jan-2017 Robert Shih <robertshih@google.com> avc_utils: skip empty NALs from malformed bistreams am: 91fe76a157 am: f79f26d257 am: 2b5d2c4a10 am: b6e8b6b875
am: e277181b71

Change-Id: I6870c07e169adaec88fd5eaa839d586dcf7aec5b
e277181b711552c86d599b435a12a7300b437b61 30-Jan-2017 Robert Shih <robertshih@google.com> avc_utils: skip empty NALs from malformed bistreams am: 91fe76a157 am: f79f26d257 am: 2b5d2c4a10
am: b6e8b6b875

Change-Id: Icdc6674c87de89ceb06bea42fd9fc4525ba993ce
b6e8b6b8758d45aeb2d11dd529d8749541729b21 30-Jan-2017 Robert Shih <robertshih@google.com> avc_utils: skip empty NALs from malformed bistreams am: 91fe76a157 am: f79f26d257
am: 2b5d2c4a10

Change-Id: Idf43a017719d40c95e5a353985915ff80c02c0e2
f79f26d2575b2fe659375cf8e0f443c8bd5e4822 30-Jan-2017 Robert Shih <robertshih@google.com> avc_utils: skip empty NALs from malformed bistreams
am: 91fe76a157

Change-Id: I4fc3e40dbfe2839611265ba178a9f35e05bcc28a
91fe76a157847825601b8f7a627efd1c9cbadcae 25-Jan-2017 Robert Shih <robertshih@google.com> avc_utils: skip empty NALs from malformed bistreams

Avoid a CHECK and make it the decoder's repsonsibility to handle a
malformed bistream gracefully.

Bug: 34509901
Bug: 33137046
Test: StagefrightTest#testStagefright_bug_27855419_CVE_2016_2463
Change-Id: I2d94f8da63d65a86a9c711c45546e4c695e0f3b4
vc_utils.cpp
94e36c5607ec15e4c9a1dff56ca23d4001b932b3 26-Dec-2016 Pawin Vongmasa <pawin@google.com> Add an option to connect OMXClient to a Treble service.

Test: Compiles
Bug: 31399200
Change-Id: I063a8eead79da2704ba25a864f3d2c2627341c51
ndroid.mk
MXClient.cpp
bc03dbeb6c3c0c829aa25b57dc28322996a8d630 28-Jan-2017 Hangyu Kuang <hkuang@google.com> Merge "media: Save the last decode timestamp after all the timestamp adjustments."
24a8da67457267e4bac9ac2ffa07e1762510ca34 28-Jan-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "avc_utils: fix sample aspect ratio."
095bc25818904fa31ae30c454d011f33cc936530 27-Jan-2017 Wei Jia <wjia@google.com> avc_utils: fix sample aspect ratio.

Test: ensure no 0:* and *:0 pattern of sample aspect ratio show up in
NuPlayer.
Bug: 34770857

Change-Id: I40bb2a9dc0ea7f50e3936d19dadb103d8214edf7
vc_utils.cpp
bf3b18fbf4a68184cf65d9fa063ac457d5a2af5a 27-Jan-2017 Hangyu Kuang <hkuang@google.com> Merge "media: Save the last 10 frames' timestamp in MPEG4Writer for debugging."
38f4cbed37d5788e488fd39ccab0c78b07e89207 27-Jan-2017 Hangyu Kuang <hkuang@google.com> media: Save the last decode timestamp after all the timestamp adjustments.

Test: Keep taking pictures during video record for 5 mins.
Bug: 33882616
Change-Id: I2865a4842448ab9463391b983051cba243ea1ed6
PEG4Writer.cpp
62a94906c545fd9d88fb9d8ff6553bc903f73056 26-Jan-2017 Hangyu Kuang <hkuang@google.com> media: Save the last 10 frames' timestamp in MPEG4Writer for debugging.

Save both decode timestamp and presentation timestamp.

Test: Hack the writer to dump out the timestamps after recording 20 frames.
Bug: 33882616
Change-Id: I9a19f52356ebcfeb084527fccc7a94e1d7d0aefa
PEG4Writer.cpp
3a0a8b4cc0632a09fa9c669edf9c6a27be5d37d9 27-Jan-2017 Ray Essick <essick@google.com> Merge "Media Metrics for NuPlayer, Codec, Extractor"
2b118b8f939c0cf1b287b1641d17b057a8e25ce7 27-Jan-2017 Pawin Vongmasa <pawin@google.com> Merge changes from topic 'OMX Treble 2'

* changes:
Split Treble conversion module into two sides: impl and utils.
Use HIDL's memory in CodecBuffer and add wrapper classes for IOmxBufferProducer and IOmxProducerListener.
db1221479a7ffe7094c51c463bbd36522ed106ab 26-Jan-2017 Ray Essick <essick@google.com> Media Metrics for NuPlayer, Codec, Extractor

Collect metrics for nuplayer/mediaplayer, codec, extractor.
publishes them to media.metrics service
provides hooks that local APIs use to connect to retrieve metrics
from the above when running on their behalf.

Separate set of changes does the final hop to the local APIs.

Bug: 34715803
Test: build & run, observed code/extractor/player metrics in logs
Change-Id: Ic5a0a7b3b93a5a41af93d81050ba038f0f7a4329
ediaCodec.cpp
ediaExtractor.cpp
fb388a72e613d669e4de8b0e07d64a6bf640b63a 26-Jan-2017 George Burgess IV <gbiv@google.com> Merge "Revert "Fix "Dereference of null pointer" compiler warning."" am: edbb04f4a0 am: e660fa7de4 am: 721468e779
am: a6fedd98cb

Change-Id: Ic6cc452dcb7c0b3a2fca45d4076c5eba8a4250d6
a6fedd98cb36557976ff38e2150c7c13843a04d6 26-Jan-2017 George Burgess IV <gbiv@google.com> Merge "Revert "Fix "Dereference of null pointer" compiler warning."" am: edbb04f4a0 am: e660fa7de4
am: 721468e779

Change-Id: I1e7127b2611649740eddaee7a4a8705ec06de406
721468e7794383c33fca850803401acb195c2c2c 26-Jan-2017 George Burgess IV <gbiv@google.com> Merge "Revert "Fix "Dereference of null pointer" compiler warning."" am: edbb04f4a0
am: e660fa7de4

Change-Id: I0cbb8174d73ef374a6f73988250f477502dc5c80
7d743ed8e4a755d7fac1fe7c9d9fc119a7cccd14 26-Jan-2017 Andrii Kulian <akulian@google.com> Revert "Fix "Dereference of null pointer" compiler warning."

This reverts commit 5bfdce99499ef19f7b74471b8b143c4c04d2d947.

Change-Id: I653a233f32ec80022bb8a6f1418e9b74f46ca131
odecs/aacenc/src/dyn_bits.c
13b5168efd6c81c6e0bcb8780a7ed8a6b9ece950 26-Jan-2017 Caroline Tice <cmtice@google.com> Merge "Fix "Dereference of null pointer" compiler warning." am: d2862051d0 am: bf8ecdce4c am: c5fb338d75
am: 0fe0cee769

Change-Id: I5b50f7e7633dc56beeac52d5d06c3415cf1e5285
0fe0cee76948d8938f40cdaafb6b9f7a2ade5c89 26-Jan-2017 Caroline Tice <cmtice@google.com> Merge "Fix "Dereference of null pointer" compiler warning." am: d2862051d0 am: bf8ecdce4c
am: c5fb338d75

Change-Id: Ia56f188a8545b409bc01ac9a894f454e3604d8c3
c5fb338d751b4e6ef88f825764fd0ccae1ccb1a1 26-Jan-2017 Caroline Tice <cmtice@google.com> Merge "Fix "Dereference of null pointer" compiler warning." am: d2862051d0
am: bf8ecdce4c

Change-Id: Id09581405df786ae008c3b4d88299b3913228312
eeac97b18ca5c939bf2ac59334d36d54f705af3d 18-Jan-2017 Pawin Vongmasa <pawin@google.com> Split Treble conversion module into two sides: impl and utils.

impl is on the HAL side. utils is on the framework side.

Test: Compiles
Bug: 31399200
Change-Id: Ib88a80f406fa2b897aa7c65f5faba6cdd9d6a700
mx/hal/1.0/Android.mk
mx/hal/1.0/Conversion.h
mx/hal/1.0/Omx.cpp
mx/hal/1.0/Omx.h
mx/hal/1.0/OmxNode.cpp
mx/hal/1.0/OmxNode.h
mx/hal/1.0/WGraphicBufferSource.cpp
mx/hal/1.0/WGraphicBufferSource.h
mx/hal/1.0/WOmx.cpp
mx/hal/1.0/WOmx.h
mx/hal/1.0/WOmxBufferProducer.cpp
mx/hal/1.0/WOmxBufferProducer.h
mx/hal/1.0/WOmxBufferSource.cpp
mx/hal/1.0/WOmxBufferSource.h
mx/hal/1.0/WOmxNode.cpp
mx/hal/1.0/WOmxNode.h
mx/hal/1.0/WOmxObserver.cpp
mx/hal/1.0/WOmxObserver.h
mx/hal/1.0/WOmxProducerListener.cpp
mx/hal/1.0/WOmxProducerListener.h
mx/hal/1.0/impl/Android.mk
mx/hal/1.0/impl/Conversion.h
mx/hal/1.0/impl/Omx.cpp
mx/hal/1.0/impl/Omx.h
mx/hal/1.0/impl/OmxNode.cpp
mx/hal/1.0/impl/OmxNode.h
mx/hal/1.0/impl/WGraphicBufferSource.cpp
mx/hal/1.0/impl/WGraphicBufferSource.h
mx/hal/1.0/impl/WOmx.cpp
mx/hal/1.0/impl/WOmx.h
mx/hal/1.0/impl/WOmxBufferProducer.cpp
mx/hal/1.0/impl/WOmxBufferProducer.h
mx/hal/1.0/impl/WOmxBufferSource.cpp
mx/hal/1.0/impl/WOmxBufferSource.h
mx/hal/1.0/impl/WOmxNode.cpp
mx/hal/1.0/impl/WOmxNode.h
mx/hal/1.0/impl/WOmxObserver.cpp
mx/hal/1.0/impl/WOmxObserver.h
mx/hal/1.0/impl/WOmxProducerListener.cpp
mx/hal/1.0/impl/WOmxProducerListener.h
mx/hal/1.0/utils/Android.mk
mx/hal/1.0/utils/Conversion.h
mx/hal/1.0/utils/WGraphicBufferSource.cpp
mx/hal/1.0/utils/WGraphicBufferSource.h
mx/hal/1.0/utils/WOmx.cpp
mx/hal/1.0/utils/WOmx.h
mx/hal/1.0/utils/WOmxBufferProducer.cpp
mx/hal/1.0/utils/WOmxBufferProducer.h
mx/hal/1.0/utils/WOmxBufferSource.cpp
mx/hal/1.0/utils/WOmxBufferSource.h
mx/hal/1.0/utils/WOmxNode.cpp
mx/hal/1.0/utils/WOmxNode.h
mx/hal/1.0/utils/WOmxObserver.cpp
mx/hal/1.0/utils/WOmxObserver.h
mx/hal/1.0/utils/WOmxProducerListener.cpp
mx/hal/1.0/utils/WOmxProducerListener.h
f62ea8018813951e8f6a182880cadb3217e4ce37 19-Dec-2016 Pawin Vongmasa <pawin@google.com> Use HIDL's memory in CodecBuffer and add wrapper classes for
IOmxBufferProducer and IOmxProducerListener.

Test: Compiles
Bug: 31399200
Change-Id: Ia09973ee7b25120bc35cff02b1409f33b28a4b4e
ndroid.mk
nclude/OMXNodeInstance.h
mx/Android.mk
mx/OMXNodeInstance.cpp
mx/hal/1.0/Android.mk
mx/hal/1.0/Conversion.h
mx/hal/1.0/Omx.cpp
mx/hal/1.0/Omx.h
mx/hal/1.0/OmxNode.cpp
mx/hal/1.0/OmxNode.h
mx/hal/1.0/WGraphicBufferSource.cpp
mx/hal/1.0/WGraphicBufferSource.h
mx/hal/1.0/WOmx.cpp
mx/hal/1.0/WOmx.h
mx/hal/1.0/WOmxBufferProducer.cpp
mx/hal/1.0/WOmxBufferProducer.h
mx/hal/1.0/WOmxBufferSource.cpp
mx/hal/1.0/WOmxBufferSource.h
mx/hal/1.0/WOmxNode.cpp
mx/hal/1.0/WOmxNode.h
mx/hal/1.0/WOmxObserver.cpp
mx/hal/1.0/WOmxObserver.h
mx/hal/1.0/WOmxProducerListener.cpp
mx/hal/1.0/WOmxProducerListener.h
mx/tests/Android.mk
5bfdce99499ef19f7b74471b8b143c4c04d2d947 07-Dec-2016 Caroline Tice <cmtice@google.com> Fix "Dereference of null pointer" compiler warning.

This CL fixes the warning:
"frameworks/av/media/libstagefright/codecs/aacenc/src/dyn_bits.c:197:35
warning: Array access (from variable 'sideInfoTab') resutls in a null
pointer dereference"

There's a switch statement that initializes 'sideInfoTab', and it does
not have a default case. The listed cases seem to cover all the valid
types for the switch variable, but since the declared type is basically
'int', it's possible for it to contain some value not covered by the
other cases, hit the non-existant default case, which leaves sideInfoTab
with its initial NULL value, later being dereferenced. This CL fixes
this by adding a default case to the switch statement that complains if
it gets an invalid value.

Bug: None
Test: Compiles without the warning.
Change-Id: I1581b3337b6331a694774da27072dd39992e6218
odecs/aacenc/src/dyn_bits.c
29bcb38457deb3c69e0b5d2e8658446e969bd380 26-Jan-2017 Jeff Tinker <jtinker@google.com> Merge "Implement client code to use Drm and Crypto HALs"
a53d6553fce1818bdf87833f93633c93ad1b5915 20-Jan-2017 Jeff Tinker <jtinker@google.com> Implement client code to use Drm and Crypto HALs

This change adds DrmHal & CryptoHal classes that connect to the Treble
HAL interfaces for drm. These classes mirror the existing Drm and
Crypto classes that connect to the DrmPlugin and CryptoPlugin
interfaces. Having both allows mediadrmserver to run in either mode
while the HAL is stabilized.

The shared memory interfaces between mediaserver's ACodecBufferChannel
and ICrypto had to be reworked to use the Treble HALs. Specifically,
the shared memory path for returning decrypted buffers in the
non-secure case had to become separate instead of piggy-backing on the
source shared memory buffer. A separate shared memory destination
buffer is now allocated on the buffer channel. An abstraction for a
decrypt destination buffer was also introduced to clarify ICrypto's
decrypt method.

Tests: Playback using Play Movies and ExoPlayer works on angler
with and without the treble hal enabled.

bug: 32815560
Change-Id: I5a3dc84f99902eb8cf8eabab9ad074d307744950
CodecBufferChannel.cpp
ufferImpl.cpp
nclude/ACodecBufferChannel.h
8fdb3fde346b446ad3b04dafa65a6844da672e23 24-Jan-2017 Hangyu Kuang <hkuang@google.com> media: Add back the duplication of fd inside MPEG4Writer.

The fd passed in from application may be closed by application. So it needs to
be duplicated.

Test: Screenrecord
Bug: 34596564
Change-Id: I8b633e2aad6a6371296427e891985ae4892b00aa
PEG4Writer.cpp
ceec4a06595253a6dcc167064f318e470e1c3b58 24-Jan-2017 Wonsik Kim <wonsik@google.com> Merge "stagefright: fix unreleased OMX handle"
73dc6fa0843525b2515fb95616336c4a65752f13 23-Jan-2017 Hangyu Kuang <hkuang@google.com> Merge "media: Gracefully return when receiving multiple codec specific data."
3e378967b379afcd559b53d70d00e758f9c2616d 05-Jan-2017 Wonsik Kim <wonsik@google.com> stagefright: fix unreleased OMX handle

- Ensure OMX handle is freed even if binder death notification comes
first.
- Add DeathRecipient in ResourceManagerService so that it could
handle dead clients properly.

Fix: 28824626
Fix: 34252788
Test: adb shell am instrument -e size small -w 'android.media.cts/android.support.test.runner.AndroidJUnitRunner'
Change-Id: Ifc441a2771b5674749ff65a4520177dda115b292
nclude/OMXNodeInstance.h
mx/OMX.cpp
mx/OMXNodeInstance.cpp
6e80328a71d93af64c2e2618cf1b5005f5dfdb76 20-Jan-2017 Hangyu Kuang <hkuang@google.com> media: Gracefully return when receiving multiple codec specific data.

Test: Run MediaRecorder and MediaMuxer CTS test
Bug: 34036127
Change-Id: I0b3b45850cbab07ac36bd9c8bfd5868caf199a53
PEG4Writer.cpp
217fc01b390d88993c1c94669b251f952fe2c44e 20-Jan-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Enable CFI for some media components."
9b6b81d366e3f37bfe1ad3fc3d5bfd96f901fb96 23-Jun-2014 Mark Salyzyn <salyzyn@google.com> stagefright: parseApp check data boundary conditions

Test: compile, no poc for boundary violation.
Bug: 34056274
Change-Id: I23f5ccba8f211e01d9a3a741c8ea537b55aab4e2
ifi-display/rtp/RTPSender.cpp
e482d3a819edb60038ba5c4ca7f33935b27dd35f 19-Jan-2017 Hangyu Kuang <hkuang@google.com> Merge "media: Support recording exceeds filesize limit by splitting files."
a4a6d63ec590a3be60a60527c619fb0bf7870b59 21-Dec-2016 Vishwath Mohan <vishwath@google.com> Enable CFI for some media components.

Enables CFI locally for the following components:
media/libmedia/
media/libstagefright/codec2/
media/libstagefright/codecs/aacdec/
media/libstagefright/codecs/aacenc/
media/libstagefright/codecs/amrwbenc/
media/libstagefright/codecs/avc/common/
media/libstagefright/codecs/avc/enc/
media/libstagefright/codecs/avcdec/
media/libstagefright/codecs/avcenc/
media/libstagefright/codecs/flac/enc/
media/libstagefright/codecs/g711/dec/
media/libstagefright/codecs/gsm/dec/
media/libstagefright/codecs/hevcdec/
media/libstagefright/codecs/m4v_h263/dec/
media/libstagefright/codecs/m4v_h263/enc/
media/libstagefright/codecs/mp3dec/
media/libstagefright/codecs/mpeg2dec/
media/libstagefright/codecs/on2/dec/
media/libstagefright/codecs/on2/enc/
media/libstagefright/codecs/on2/h264dec/
media/libstagefright/codecs/opus/dec/
media/libstagefright/codecs/raw/
media/libstagefright/http/
media/libstagefright/httplive/
media/libstagefright/omx/
media/libstagefright/wifi-display/

Note that CFI is currently hidden under the global flag,
ENABLE_CFI=true. Unless this is set, local settings are not honored
and CFI will not be enabled. This allows CFI to essentially remain off
on all branches, but will allow it to be tested and debugged using
targeted builds.

Bug: 30227045
Test: m -j40 and device builds and boots
Test: CFI is not enabled unless built with ENABLE_CFI=true
Test: CFI enabled build passes the media CTS tests.
odec2/Android.mk
odecs/aacdec/Android.mk
odecs/aacenc/Android.mk
odecs/amrwbenc/Android.mk
odecs/avc/common/Android.mk
odecs/avc/enc/Android.mk
odecs/avcdec/Android.mk
odecs/avcenc/Android.mk
odecs/flac/enc/Android.mk
odecs/g711/dec/Android.mk
odecs/gsm/dec/Android.mk
odecs/hevcdec/Android.mk
odecs/m4v_h263/dec/Android.mk
odecs/m4v_h263/enc/Android.mk
odecs/mp3dec/Android.mk
odecs/mpeg2dec/Android.mk
odecs/on2/dec/Android.mk
odecs/on2/enc/Android.mk
odecs/on2/h264dec/Android.mk
odecs/opus/dec/Android.mk
odecs/raw/Android.mk
ttp/Android.mk
ttplive/Android.mk
mx/Android.mk
ifi-display/Android.mk
a77cf16037e73d1bee1852e13d92c9c7521de376 18-Jan-2017 Caroline Tice <cmtice@google.com> Merge "Fix 'potential memory leak' compiler warning."
158c197b668ad684f92829db6a31bee3aec794ba 18-Jan-2017 Caroline Tice <cmtice@google.com> Fix 'potential memory leak' compiler warning.

This CL fixes the following compiler warning:

frameworks/av/media/libstagefright/SampleTable.cpp:569:9: warning:
Memory allocated by 'new[]' should be deallocated by 'delete[]', not
'delete'.

Bug: 33137046
Test: Compiled with change; no warning generated.

Change-Id: I29abd90e02bf482fa840d1f7206ebbdacf7dfa37
ampleTable.cpp
13ff5b0ce7ae1d31eaa30f21c9d83290ebff0756 17-Jan-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "mediaplayer: add buffering settings API"
fb3464285629aa028cca0b0ffd7c59738f47ff25 17-Jan-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "media: Use width and height when dispWidth and dispHeight are not present."
04a45728f260bd7d875cbf417b9a96c564453dfb 17-Jan-2017 Marco Nelissen <marcone@google.com> Don't CHECK when buffer is too large am: c2f0c73bfc am: acb7186e6e am: 0a4db601b4 am: 8474c51aaf am: a5333c0056 am: 7e5936e666 am: 81341d9c16 am: 5a62595e8e
am: a2c05e0318

Change-Id: I065a2fcd2ba52123c0ce0acfda947b864923a626
a2c05e0318159c2e9d6ab8fa60e46c7ee08ce8a2 17-Jan-2017 Marco Nelissen <marcone@google.com> Don't CHECK when buffer is too large am: c2f0c73bfc am: acb7186e6e am: 0a4db601b4 am: 8474c51aaf am: a5333c0056 am: 7e5936e666 am: 81341d9c16
am: 5a62595e8e

Change-Id: Ib934e29990941bb7e30196be3ff7b1d67e61b211
5a62595e8e80a3c5223da8f7a3764141532c6d57 17-Jan-2017 Marco Nelissen <marcone@google.com> Don't CHECK when buffer is too large am: c2f0c73bfc am: acb7186e6e am: 0a4db601b4 am: 8474c51aaf am: a5333c0056 am: 7e5936e666
am: 81341d9c16

Change-Id: I701b122b4f3f97b7b8b76af25cd6fe9c67ef792b
81341d9c16fb89351b60aeebf86caea5b02be5b6 17-Jan-2017 Marco Nelissen <marcone@google.com> Don't CHECK when buffer is too large am: c2f0c73bfc am: acb7186e6e am: 0a4db601b4 am: 8474c51aaf am: a5333c0056
am: 7e5936e666

Change-Id: I8f4d5bb31a2600f6679d21fed9ebc02c2a3e3521
a5333c0056c270975754b614118eabfc7db31cbd 17-Jan-2017 Marco Nelissen <marcone@google.com> Don't CHECK when buffer is too large am: c2f0c73bfc am: acb7186e6e am: 0a4db601b4
am: 8474c51aaf

Change-Id: I8a151eff3d02600134c929754c1420353f6a6ab1
8474c51aaff7aa6fea967dfe002751b94a835f35 17-Jan-2017 Marco Nelissen <marcone@google.com> Don't CHECK when buffer is too large am: c2f0c73bfc am: acb7186e6e
am: 0a4db601b4

Change-Id: I46806d03da614119b805087d995f8f40c70ee3b2
dc6f340e537ce511ea1d2f8ce7dc1c4ed231f6a6 10-Jan-2017 Wei Jia <wjia@google.com> mediaplayer: add buffering settings API

Test: compiles, checked that params is passed all the way to source.
Bug:32524218
Change-Id: I637d1ab09f94a3830a33a39e7e9f1b3efb22357f
tils.cpp
0a4db601b40b6d7843bd7f318e84080d7ad031dd 17-Jan-2017 Marco Nelissen <marcone@google.com> Don't CHECK when buffer is too large am: c2f0c73bfc
am: acb7186e6e

Change-Id: I9af93746702bb746a48420dbb03fc29878ef730f
a72ef28f8cc2b894119b470fe6c93d1abe566398 16-Jan-2017 Brian C. Anderson <brianderson@google.com> Merge "Clean up Fence a little."
c62b65fd690a585c674caa6e79559bb847e5b3bd 16-Jan-2017 Marco Nelissen <marcone@google.com> Merge "Remove DRMExtractor"
eadba76ec937ead68bbd267585547c0bbdd459c1 14-Jan-2017 Marco Nelissen <marcone@google.com> resolve merge conflicts of 1038297e29 to nyc-mr1-dev-plus-aosp am: 6bf40ddf1c
am: fadac24ddd

Change-Id: I99e4ea9db20d052265122c217829882dcefa0eae
fadac24ddd8b0ed9c6c1be4da02b0f4503c8648c 14-Jan-2017 Marco Nelissen <marcone@google.com> resolve merge conflicts of 1038297e29 to nyc-mr1-dev-plus-aosp
am: 6bf40ddf1c

Change-Id: I884f2b7b7c0abdd8dee7540905b6158dcce6cc2d
009ed8002dc0015dbfcb8fafed6fd255826c3114 14-Jan-2017 Marco Nelissen <marcone@google.com> resolve merge conflicts of 1038297e29 to nyc-mr2-dev

Change-Id: I75f6cf03181817861b7732ebc0253e56801ed6b8
6bf40ddf1c484404a70c3217ebfb47ce504d9f93 14-Jan-2017 Marco Nelissen <marcone@google.com> resolve merge conflicts of 1038297e29 to nyc-mr1-dev-plus-aosp

Change-Id: Iea94c025a346d9b7d02b4968b98256dc87ed493d
2872c7ab71fb554ee14d4e8b65677f9c7a97f966 14-Jan-2017 Wei Jia <wjia@google.com> Merge "BufferingSettings: hook up internal BufferingSettings API."
c3773d1a9449a57ea239cd28ad46223027204bae 14-Jan-2017 Marco Nelissen <marcone@google.com> Don't initialize sync sample parameters until the end am: a9660fe122 am: 22386993b5 am: 902d8e90cc am: 25a057e427 am: c3ea68a1c8 am: a59dca6634 am: 5cc0712ce0 am: 835c7ec015
am: c0b4ce0047

Change-Id: Ia9e6e1e8d173687de18bbbf81ff669c44b9548e5
c0b4ce00476d5e741b93aff66e1172451d0d8a7c 14-Jan-2017 Marco Nelissen <marcone@google.com> Don't initialize sync sample parameters until the end am: a9660fe122 am: 22386993b5 am: 902d8e90cc am: 25a057e427 am: c3ea68a1c8 am: a59dca6634 am: 5cc0712ce0
am: 835c7ec015

Change-Id: I334a6748dfa61ee40d9b57eb2da8f178888d708e
835c7ec015c72c8a7ab13db341525363da91ce7a 14-Jan-2017 Marco Nelissen <marcone@google.com> Don't initialize sync sample parameters until the end am: a9660fe122 am: 22386993b5 am: 902d8e90cc am: 25a057e427 am: c3ea68a1c8 am: a59dca6634
am: 5cc0712ce0

Change-Id: If8703ef19663c7f25493101a871976e54ab2a3e8
5cc0712ce040bea5a5393d297e3d0882a8975893 14-Jan-2017 Marco Nelissen <marcone@google.com> Don't initialize sync sample parameters until the end am: a9660fe122 am: 22386993b5 am: 902d8e90cc am: 25a057e427 am: c3ea68a1c8
am: a59dca6634

Change-Id: I80ed5f790d1ceb2aa9f779397f75a36a5a4db8b6
a59dca6634d63de83aed9937c6ab501a6e0fe17c 14-Jan-2017 Marco Nelissen <marcone@google.com> Don't initialize sync sample parameters until the end am: a9660fe122 am: 22386993b5 am: 902d8e90cc am: 25a057e427
am: c3ea68a1c8

Change-Id: Ica12b7c73830bfbdb8a6aad323835f264a4110e3
c3ea68a1c88bbca567870adba2a29002648d0b07 14-Jan-2017 Marco Nelissen <marcone@google.com> Don't initialize sync sample parameters until the end am: a9660fe122 am: 22386993b5 am: 902d8e90cc
am: 25a057e427

Change-Id: Ica77a9017bd8446b03057563172e9f807708634c
25a057e427f2ed09db475cff330cded2e41666d5 14-Jan-2017 Marco Nelissen <marcone@google.com> Don't initialize sync sample parameters until the end am: a9660fe122 am: 22386993b5
am: 902d8e90cc

Change-Id: I6ba553f3ac3f04ef983e498756a19718b04f5206
22386993b5f66b80ffc3bd6db0947f125b540e2e 14-Jan-2017 Marco Nelissen <marcone@google.com> Don't initialize sync sample parameters until the end
am: a9660fe122

Change-Id: Ia072f16604c3e766d4d2cdc49b88efcf182ca5f7
fe44e4f74fe2582cbf012687059278dbcbdaa6f7 04-Jan-2017 Hangyu Kuang <hkuang@google.com> media: Support recording exceeds filesize limit by splitting files.

Test: Hacking camera app to record file larger than size limit.
Bug:28150626
Change-Id: I500913ec96d8ef49a78989d3f973bc7e8d923cb7
PEG4Writer.cpp
ests/SurfaceMediaSource_test.cpp
4453f452577064b4907a941225f7fc6e87800e37 13-Jan-2017 Marco Nelissen <marcone@google.com> Remove DRMExtractor

It was not used, untested and untestable.

Bug: 33354165
Test: ran forward lock and media playback CTS tests, manual playback.
Change-Id: I4dd3f07ca5b019a5fed0c860aa573fc993464712
ndroid.mk
RMExtractor.cpp
ediaExtractor.cpp
nclude/DRMExtractor.h
35f537fc5aa479caa6fd9055cdc63989d029e8a3 13-Jan-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "stagefright: add rangeOffset to OMXBuffer"
a9660fe122ca382e1777e0c5d3c42ca67ffb0377 13-Jan-2017 Marco Nelissen <marcone@google.com> Don't initialize sync sample parameters until the end

to avoid leaving them in a partially initialized state.

Bug: 33137046
Test: ran CTS tests
Change-Id: I1f5c070233c5917d85da9e930e01a3fc51a0a0ec
ampleTable.cpp
c2f0c73bfcf36219f446e3eef9effe49a3a415a5 06-Jan-2017 Marco Nelissen <marcone@google.com> Don't CHECK when buffer is too large

Bug: 31647370
Test: ran CTS test with and without patch
Change-Id: I4e3a37aabc9387432671c1c0c469241142612cc4
MXCodec.cpp
060a6c53b5022c9e539a4c9b03b16da546964bec 13-Jan-2017 Mark Salyzyn <salyzyn@google.com> Merge "liblog: use log/log.h for ALOG macros" am: 59cfe7de39 am: c6d07e8230 am: 15b18326b6
am: 49d3b5ee8e

Change-Id: I87a85c85d3f509e0496f5946d6e9e58174398ea5
49b2b4d30a0f74314630a5ea5f0e59697d90443e 12-Jan-2017 Chong Zhang <chz@google.com> stagefright: add rangeOffset to OMXBuffer

bug: 31399200
bug: 22804304

Change-Id: I0ac9a7ee684067d40a26135ab26ebd3de3a2f06d
Codec.cpp
mx/OMXNodeInstance.cpp
49d3b5ee8e89e274a5c259dddb7cde38e98c2cde 13-Jan-2017 Mark Salyzyn <salyzyn@google.com> Merge "liblog: use log/log.h for ALOG macros" am: 59cfe7de39 am: c6d07e8230
am: 15b18326b6

Change-Id: I5f4906534e4b892566776b8ee0f005fb6543c283
15b18326b67cde4bfe1d71f7a4e703c411dec2e5 13-Jan-2017 Mark Salyzyn <salyzyn@google.com> Merge "liblog: use log/log.h for ALOG macros" am: 59cfe7de39
am: c6d07e8230

Change-Id: Ia3c81c04b689ae06610df61d27627dd66d5f71bd
e74bbf18a6595a914d3c771be08a72077465c51f 13-Jan-2017 Mark Salyzyn <salyzyn@google.com> liblog: use log/log.h for ALOG macros

Test: compile
Bug: 34250038
Change-Id: Ie3b92790df631dbacdd51053264dddeba66913c1
oundation/AMessage.cpp
467743d462773ada299148ed5a210479affd1f4c 11-Jan-2017 Hangyu Kuang <hkuang@google.com> media: Use width and height when dispWidth and dispHeight are not present.

Test: Test the NativeDecode cts test and manual do camera recording.
Bug:34213028
Change-Id: Ide354d3d9ce4e4bc33cbc7821fa31471b756ec78
PEG4Writer.cpp
f675356f9e275b9a52101a997ad20404922b5147 11-Oct-2016 Brian Anderson <brianderson@google.com> Clean up Fence a little.

Test: No functional change.

Change-Id: Ie0836b4bd589cbadf219d893b44f82f70a051174
ilters/GraphicBufferListener.cpp
77a650d3407d4d2ffd698b32c8ee1d24374d080e 11-Jan-2017 Hangyu Kuang <hkuang@google.com> media: Fix the camera recording error.

Revert "media: Set the correct display width/height in muxer."

Test: Manual camera recording
Bug:34213028

This reverts commit 776daeee2fd2dc5c5ec383383c401c82bd0a0fb6.

Change-Id: I54e75596baa1547ce70588d71564d3ca2b4da4ca
PEG4Writer.cpp
ad880540d13db9e39c94496fd9bc89dfbfd1e1f5 10-Jan-2017 Mark Salyzyn <salyzyn@google.com> Merge "liblog: use log/log.h for ALOG macros" am: 06d8feefec am: 71bf335ffa am: 8790fb2613
am: 9033512273

Change-Id: I67837417d7c8fbc2cc5239f903a0cdf3b107558b
9033512273129383c8cc78beee61f17b50ffff49 10-Jan-2017 Mark Salyzyn <salyzyn@google.com> Merge "liblog: use log/log.h for ALOG macros" am: 06d8feefec am: 71bf335ffa
am: 8790fb2613

Change-Id: I8ccebdc05c7f280a101af02032d41413c198ef39
8790fb2613b493ab5ac3470deb522f79415eb6fe 10-Jan-2017 Mark Salyzyn <salyzyn@google.com> Merge "liblog: use log/log.h for ALOG macros" am: 06d8feefec
am: 71bf335ffa

Change-Id: Id07d468c8e95af39e189f53919a0ac6aabc9604c
b3962d2405b279abde234e16e5b3bff3a4a5cab5 10-Jan-2017 Hangyu Kuang <hkuang@google.com> Merge "media: Set the correct display width/height in muxer."
eb16561336e6445f7edae047998f2459e046cdfe 10-Jan-2017 Mark Salyzyn <salyzyn@google.com> liblog: use log/log.h for ALOG macros

Test: compile
Bug: 30465923
Change-Id: I247151363604714088b6059279702702b4e9f89a
odecs/amrnb/dec/src/a_refl.cpp
odecs/m4v_h263/dec/src/conceal.cpp
844800fb97bfd061f845cd13d42fbdfacdbca6c5 10-Jan-2017 xiahong.bao <xiahong.bao@nxp.com> Merge "MPEG4Write mdhd duration overflow after recording for 15 hours" am: 98d1217d58 am: 6afe508bb2 am: 3e383dc9cd
am: e4f2656ff9

Change-Id: Ic66fa94e88d686fd601c91f81318f9cc59955b54
e4f2656ff9310954ee30f55d3a3e8de4f6fd5080 10-Jan-2017 xiahong.bao <xiahong.bao@nxp.com> Merge "MPEG4Write mdhd duration overflow after recording for 15 hours" am: 98d1217d58 am: 6afe508bb2
am: 3e383dc9cd

Change-Id: Ib3552a36d555021bd0ab2f1e68b588efc7f30213
3e383dc9cd672acc970fa726b613d89ccfb8f7d8 10-Jan-2017 xiahong.bao <xiahong.bao@nxp.com> Merge "MPEG4Write mdhd duration overflow after recording for 15 hours" am: 98d1217d58
am: 6afe508bb2

Change-Id: Ib47fdde7f7b25a09bc76d9b43a937986ce9936e1
98d1217d58b1879eccee445c3510a8c563a61d11 10-Jan-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "MPEG4Write mdhd duration overflow after recording for 15 hours"
f44271816fcdc38eee139df872d57fd513347325 10-Jan-2017 Wonsik Kim <wonsik@google.com> Merge changes from topic 'mediacodec_2b'

* changes:
stagefright: fix premature change of buffer ownership
Revert "Revert "MediaCodec refactoring part 2-b: introduce BufferChannel""
643e555565501d6f5698234b194686362e702e80 09-Jan-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "libstagefright: Add NULL check during memcpy for MediaCodecSource"
776daeee2fd2dc5c5ec383383c401c82bd0a0fb6 06-Jan-2017 Hangyu Kuang <hkuang@google.com> media: Set the correct display width/height in muxer.

Test: Run the NativeDecoderTest
Bug:34094564
Change-Id: Ib5f50afd77030f0ac87a4b0eb659b8f9c2f56987
PEG4Writer.cpp
e36e1034c2938559c96d1e765b3c75380c83ff6b 07-Jan-2017 Haynes Mathew George <hgeorge@codeaurora.org> libstagefright: Add NULL check during memcpy for MediaCodecSource

Add null check for the source buffer prior to memcpy.
Test: compiles
Change-Id: I5971e0c01fd4821078780c9623154e396f679357
CRs-Fixed: 1096369

authored-by: Garmond Leung<garmondl@codeaurora.org>
(cherry picked from commit 85bb3ddece3140a59e1ecb25187e0d69fe85f002)
ediaCodecSource.cpp
e83be8af690ef1ac820a63414d522e77ca9d4db6 06-Jan-2017 Steven Moreland <smoreland@google.com> Remove usage of getStatus.

- remove from libaudiohal
- remove from services/radio
- remove from soundtrigger
- remove from omx

Bug: 31348667
Test: compiles
Change-Id: I75bb7b7388527dacfdc5bf128712cb8690bc286b
mx/hal/1.0/Conversion.h
0623c27ff220d2c1a9b52e154befd11de10ad4f5 09-Jan-2017 Jeff Tinker <jtinker@google.com> DO NOT MERGE Move legacy widevine classic global lock from framework to vendor/widevine implementation.
am: 08dbccd22d

Change-Id: Ic152c07bc890fa73dea0b53d7a9ca9dbf29d3224
cb85a295a44eb5e3f639e2a29499b51ebf2cd012 09-Jan-2017 Jeff Tinker <jtinker@google.com> Merge "DO NOT MERGE Move legacy widevine classic global lock from framework to vendor/widevine implementation." into nyc-mr2-dev
9ee321c347c64886d1078a4e4afb57ec98dd54a2 06-Jan-2017 Wonsik Kim <wonsik@google.com> stagefright: fix premature change of buffer ownership

Bug: 34059849
Test: cts-tradefed run cts-dev -m CtsMediaTestCases -t android.media.cts.MediaCodecTest#testUnsupportedCrypto
Change-Id: Id6dbb212551bd086b76895fbc5f699c34a0dc524
ediaCodec.cpp
dff26e5f53b248fd8cc6605850240c7e7c5438dc 01-Dec-2016 Wonsik Kim <wonsik@google.com> Revert "Revert "MediaCodec refactoring part 2-b: introduce BufferChannel""

- MediaCodec stops tracking the whole buffer array from OMX.
- BufferChannel handles array management instead, if necessary.
- MediaCodec delegates secure buffer management to BufferChannel.
- Remove sf2.

Bug: 32133435
Test: adb shell am instrument -e size small -w 'android.media.cts/android.support.test.runner.AndroidJUnitRunner'
Test: Play an encrypted content in Play Movies
Test: Mirror the screen via Cast.
Change-Id: I1ca705687956ad972e31257853c54e29cbd7181a
Codec.cpp
CodecBufferChannel.cpp
ndroid.mk
odecBase.cpp
ediaCodec.cpp
ilters/MediaFilter.cpp
nclude/ACodecBufferChannel.h
186673877157260cbfb05c5be51e9ac6e6a4d8bc 06-Jan-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Revert "MediaCodec refactoring part 2-b: introduce BufferChannel""
fad01bc45bd47b8f12c89857fee20b7e37310125 06-Jan-2017 Wonsik Kim <wonsik@google.com> Revert "MediaCodec refactoring part 2-b: introduce BufferChannel"

Bug: 34059849

This reverts commit 11b72100e02e02b6cd8a6b14cd2068c96dc49b7d.

Change-Id: I0ab93a617477861a4e6f43152e6b03d5c88783ab
Codec.cpp
CodecBufferChannel.cpp
ndroid.mk
odecBase.cpp
ediaCodec.cpp
ilters/MediaFilter.cpp
nclude/ACodecBufferChannel.h
7f05785ddac8411823d865a1cdc725308ae4a7ae 05-Jan-2017 Mark Salyzyn <salyzyn@google.com> Merge "stagefright: parseApp check data boundary conditions" am: ea73e1aef0 am: 046ac31f1f am: 657ea05284
am: fd23328561

Change-Id: I63e5e2696006f960321087289d34b57acfde4937
fd233285616f31ebe339a413f24c0aa9891afedf 05-Jan-2017 Mark Salyzyn <salyzyn@google.com> Merge "stagefright: parseApp check data boundary conditions" am: ea73e1aef0 am: 046ac31f1f
am: 657ea05284

Change-Id: I7cc3ec2563527e5b04cdf97d993e0fa8cc6f7c42
657ea052843d98ca74150fa05ea678f651ec15bd 05-Jan-2017 Mark Salyzyn <salyzyn@google.com> Merge "stagefright: parseApp check data boundary conditions" am: ea73e1aef0
am: 046ac31f1f

Change-Id: I31065509366a84f2f1bfd90ba1c3d9b3d91aa1bf
ea73e1aef0d38aaf5a212100233b23d09fd78122 05-Jan-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "stagefright: parseApp check data boundary conditions"
9476864f6a9b8d500f6c74ba40bfd2e1ce5265a2 04-Jan-2017 Robert Shih <robertshih@google.com> Merge "HTTPLIVE: do not store hash of malformed M3U8 file" am: e8b14c3c5c am: f1d93381be am: ab438ff052
am: 53607243f1

Change-Id: I579928687f836ebbb0097d205d26c08a28904a8e
53607243f11c4f36b0d966f71580f587e5fc2916 04-Jan-2017 Robert Shih <robertshih@google.com> Merge "HTTPLIVE: do not store hash of malformed M3U8 file" am: e8b14c3c5c am: f1d93381be
am: ab438ff052

Change-Id: I58d63bed58a007936f1f43e8f658106961d065c5
ab438ff052e79a12a55517ee9b12bd1a9b6d0b24 04-Jan-2017 Robert Shih <robertshih@google.com> Merge "HTTPLIVE: do not store hash of malformed M3U8 file" am: e8b14c3c5c
am: f1d93381be

Change-Id: I1a335148c37d720ffd47711dfdbc9c7aa43901e8
e8b14c3c5c1d4d225f2d1391f33e37582c5b06cf 04-Jan-2017 Robert Shih <robertshih@google.com> Merge "HTTPLIVE: do not store hash of malformed M3U8 file"
1d515f4b608f1e6592780365857855962c0da725 29-Dec-2016 xiahong.bao <xiahong.bao@nxp.com> MPEG4Write mdhd duration overflow after recording for 15 hours

MPEG4Write mdhd duration of AV track is larger than INT32_MAX
after record over 15 hours, so write mdhd box as version 1 type
which enhance duration to 64 bit.

Change-Id: I874b0a0ddfb7fb8f5b0a255345d8605b6c8ebf68
Signed-off-by: xiahong.bao <xiahong.bao@nxp.com>
PEG4Writer.cpp
d8086d5b2cc0a3b6cb20a57dbc3fbe560de4151b 03-Jan-2017 Andy Hung <hunga@google.com> MediaBufferGroup: release buffers in add_buffer when growth limit reached
am: d2ed09444a

Change-Id: Id3e7db610d513e10df7171201726d50e08ea8d7f
0c1c5f6bacb7c46a29bad5cd3dded8d262f6fcc7 23-Jun-2014 Mark Salyzyn <salyzyn@google.com> stagefright: parseApp check data boundary conditions

Test: compile, no poc for boundary violation.
Bug: 34056274
Change-Id: I23f5ccba8f211e01d9a3a741c8ea537b55aab4e2
ifi-display/rtp/RTPSender.cpp
32a5f5d53f9fe2ba584d2ecdf3edd487fb4146a7 22-Dec-2016 Mark Salyzyn <salyzyn@google.com> resolve merge conflicts of 4532a36 to master

Test: build
Change-Id: I9b93c4a703c0ee16116be2bea0e6df0606d29363
4532a36bf509d822a77cbc1b7837f9f1158c7796 22-Dec-2016 Mark Salyzyn <salyzyn@google.com> Merge "Replace cutils/log.h with either android/log.h or log/log.h" am: a05da2eea4 am: 9e97dc7832
am: 1121dfb5f3

Change-Id: Ie8bea1c228c602fef54012228ed714e8053d8fa6
1121dfb5f30a04393ddce02fe7808589fa9e3e25 22-Dec-2016 Mark Salyzyn <salyzyn@google.com> Merge "Replace cutils/log.h with either android/log.h or log/log.h" am: a05da2eea4
am: 9e97dc7832

Change-Id: I414954c96ad8b803a0401d416887c9ce167db210
60d02077d86d2d1092443519290101f503aa6f7a 29-Sep-2016 Mark Salyzyn <salyzyn@google.com> Replace cutils/log.h with either android/log.h or log/log.h

Test: compile
Bug: 31289077
Change-Id: I795a76f978d2213737f1fa908da789c543219b75
odecs/amrnb/dec/src/a_refl.cpp
odecs/m4v_h263/dec/src/conceal.cpp
odecs/on2/h264dec/source/H264SwDecApi.c
odecs/on2/h264dec/source/h264bsd_dpb.c
oundation/AMessage.cpp
ff8b02346adfc4df113d9223c326aff81e78b54d 20-Dec-2016 Jinguang Dong <dongjinguang@huawei.com> HTTPLIVE: do not store hash of malformed M3U8 file

From code analysis, we should make sure that M3UParser::initCheck
returns OK then perform hash memcpy. This would prevent NuPlayer from
overlooking a malformed M3U8 and crashing later on a NULL derefernce.

Test: 1 Play http://117.34.15.47/7d.v.iask.com/player/ovs1_idx_chid_1054589_br_400_fn_4_pn_weitv_sig_md5.m3u8
2 mediaserver does not crash

Bug: 33763371
Change-Id: I3d8f5450cdf45288110121973c679c8d58210d5c
ttplive/HTTPDownloader.cpp
d2ed09444a962d3954403a38e9fce09c59106bf3 21-Dec-2016 Andy Hung <hunga@google.com> MediaBufferGroup: release buffers in add_buffer when growth limit reached

Test: Webm high bitrate content
Bug: 32156769
Change-Id: Id77d023299a851ac6bf8f90c4eea90fe125ea3f5
(cherry picked from commit 7f7dea6a92e12d395d470d51c8157d6ef230200b)
oundation/MediaBufferGroup.cpp
d8915d994177d93f5e6b0dee69f1d2a82db6bed5 21-Dec-2016 Andy Hung <hunga@google.com> Merge "MediaBufferGroup: release buffers in add_buffer when growth limit reached"
6efc763e2e316e7d1c6cdcbac02c68946fbaef48 21-Dec-2016 Marco Nelissen <marcone@google.com> Merge "Use monotonic system time instead of gettimeofday"
48fa06d1e80a872c7495804979256e021e566ae0 21-Dec-2016 Wei Jia <wjia@google.com> BufferingSettings: hook up internal BufferingSettings API.

Test: compiles
Bug: 32524218

Change-Id: I4b3f1689681560f0c1af3bfc62adee1ce630e218
tils.cpp
ttplive/LiveSession.cpp
ttplive/LiveSession.h
f293e928dcd53a0bba40865698864d45ea214015 21-Dec-2016 Marco Nelissen <marcone@google.com> Use monotonic system time instead of gettimeofday

to avoid overflows when the clock changes during video decoding.

Bug: 33796695
Change-Id: Ie050c188915e80ab869721eca80249f975b4ea20
odecs/avcdec/SoftAVCDec.cpp
odecs/avcdec/SoftAVCDec.h
7f7dea6a92e12d395d470d51c8157d6ef230200b 21-Dec-2016 Andy Hung <hunga@google.com> MediaBufferGroup: release buffers in add_buffer when growth limit reached

Test: Webm high bitrate content
Bug: 32156769
Change-Id: Id77d023299a851ac6bf8f90c4eea90fe125ea3f5
oundation/MediaBufferGroup.cpp
26a586c21e26dabbdef72a821a8c9585dbddfa08 20-Dec-2016 Marco Nelissen <marcone@google.com> Merge "Fix potential NULL dereference" am: ccf56a09ee am: 485046c66a am: 473419175f
am: 1b70bf908e

Change-Id: I5e2f0eb5a7acd7cf1d0b30ef70314943e18d8bce
1b70bf908ee8ec30a6c5430dd1829ee6740b79d1 20-Dec-2016 Marco Nelissen <marcone@google.com> Merge "Fix potential NULL dereference" am: ccf56a09ee am: 485046c66a
am: 473419175f

Change-Id: Ie2cab2e5ca4828c4fb6d8ae35a35ee34c0933ab3
473419175f35e7bb5ad0fec437e53e06fe27c774 20-Dec-2016 Marco Nelissen <marcone@google.com> Merge "Fix potential NULL dereference" am: ccf56a09ee
am: 485046c66a

Change-Id: I685e35e87773d789a543f116f1277d63f53bb42f
b6f77710f3355f256c831f2465a21a745e8f9a32 19-Dec-2016 Marco Nelissen <marcone@google.com> Fix potential NULL dereference

Bug: 32875080
Change-Id: I9d6808812e735e58e8b477635441fd92f94f8d25
allbackDataSource.cpp
PEG4Extractor.cpp
517b0e090680e378f056677201426ed9dc325c65 02-Dec-2016 Pawin Vongmasa <pawin@google.com> Add conversion functions.

There are 5 pairs of wrapper classes for the 5 HIDL interfaces: IOmx,
IOmxNode, IOmxObserver, IOmxBufferSource and IGraphicBufferSource.
Some additional functions of OMXBuffer and OMXFenceParcelable are needed
in the implementation of these wrapper classes, so they are added in
this CL as well.

Auto-generated files that correspond to interfaces without queryable
instances are removed.

Test: Compiles.

Bug: 31399200
Change-Id: Iaec9c0e0afee6fc847f324c3eb3c105d6342a1fe
mx/hal/1.0/Android.mk
mx/hal/1.0/Conversion.h
mx/hal/1.0/GraphicBufferSource.cpp
mx/hal/1.0/GraphicBufferSource.h
mx/hal/1.0/Omx.cpp
mx/hal/1.0/Omx.h
mx/hal/1.0/OmxBufferSource.cpp
mx/hal/1.0/OmxBufferSource.h
mx/hal/1.0/OmxNode.cpp
mx/hal/1.0/OmxNode.h
mx/hal/1.0/OmxObserver.cpp
mx/hal/1.0/OmxObserver.h
mx/hal/1.0/WGraphicBufferSource.cpp
mx/hal/1.0/WGraphicBufferSource.h
mx/hal/1.0/WOmx.cpp
mx/hal/1.0/WOmx.h
mx/hal/1.0/WOmxBufferSource.cpp
mx/hal/1.0/WOmxBufferSource.h
mx/hal/1.0/WOmxNode.cpp
mx/hal/1.0/WOmxNode.h
mx/hal/1.0/WOmxObserver.cpp
mx/hal/1.0/WOmxObserver.h
08dbccd22da60bff73fe16706680ba2550731d21 15-Dec-2016 Jeff Tinker <jtinker@google.com> DO NOT MERGE Move legacy widevine classic global lock from framework to
vendor/widevine implementation.

This prevents a hang on contention for the lock if the datasource
read blocks during sniffing.

bug:28888414
Change-Id: Idb2a8653744535f711139c87f39b259daddbf337
VMExtractor.cpp
4278ba02628d915b52d59dcf5477880cf99f39cd 20-Oct-2016 Marco Nelissen <marcone@google.com> SimpleDecodingSource: fix handling of Vorbis buffers

The Vorbis decoder needs the number of samples in a page added to
the end of the encoded data, which SimpleDecodingSource wasn't doing.
This affected Vorbis decoding using OpenSL ES.

Bug: 32258336
Test: ran CTS and OpenSLES tests
Change-Id: I436e4a1ee998ce4581eb540bea8b66154960a4e7
impleDecodingSource.cpp
5249a5583df9a17dc3899100ea642f29eb86a23e 05-Dec-2016 Marco Nelissen <marcone@google.com> Clean up DRM handling

Avoid calling SniffDrm twice, and remove [gs]etDrmFlag methods
since they serve no purpose anymore.

Test: ran forward lock CTS test, and played protected content in Play Movies

Change-Id: I8313d2dae459151bf965a76ac1125d36ce8176e6
RMExtractor.cpp
ediaExtractor.cpp
uMediaExtractor.cpp
tagefrightMetadataRetriever.cpp
08dab5ae92ddd1f3b337b6e35f918fea8c284a56 07-Dec-2016 Jaekyun Seok <jaekyun@google.com> Use libmedia_helper as shared lib.

The dependencies to static libraries in frameworks should be removed
as many as possible to reduce a size of the system partition.
And that will improve coverage of the VNDK libraries because this
effort might find new necessary shared libs which were linked
statically before.

Size diffs of affected binaries on angler-userdebug build are as
follows.

libmedia : 598056 -> 547928 (-50128)
libstagefright : 1496420 -> 1492124 (-4296)
libaudiopolicyservice : 75372 -> 66940 (-8432)
libaudiopolicymanagerdefault: 613168 -> 583516 (-29652)
libaudioflinger : 397840 -> 364380 (-33460)
libaudiohal : 114752 -> 68684 (-46068)
libaudiopolicyenginedefault : 122096 -> 71968 (-50128)
libmedia_helper : 0 -> 66288 (+66288)

total : (-155876)

Test: building succeeded, and the image was tested on angler.
Bug: 33056637
Change-Id: I00a71e518337a1efcf7f55256145776311596991
ndroid.mk
56da4ce4783301fe11554289562b68a00654287e 08-Dec-2016 Hangyu Kuang <hkuang@google.com> Merge "media: Support muxing multiple video and audio tracks."
9b46a8f9ebcca3b86662e7ea998a2afea0153478 07-Dec-2016 Wonsik Kim <wonsik@google.com> Merge "MediaCodec refactoring part 2-b: introduce BufferChannel"
0567940b9eca82b99dbe631b020873b85059cc19 06-Dec-2016 TreeHugger Robot <treehugger-gerrit@google.com> Merge "stagefright: don't update meta for the same buffer"
1b35986c5045a97dbe852ab93046ab29bcb6a2de 06-Dec-2016 Chong Zhang <chz@google.com> stagefright: don't update meta for the same buffer

Even in dynamic ANW buffer mode, if the graphic buffer
is not changing, send sPreset instead of the same graphic
buffer, so that OMX server side doesn't update the meta.

In theory it should make no difference, however when the
same buffer is parcelled again, a new handle could be
created on server side, and some decoder doesn't recognize
the handle even if it's the same buffer.

bug: 33186735
Change-Id: Iff9e2958b90778ac37f93e74cb9cec1b89a9b5b8
Codec.cpp
bda0543787ac57cf984381c34b6acbad0339d6c0 10-Nov-2016 Hangyu Kuang <hkuang@google.com> media: Support muxing multiple video and audio tracks.

Test: CTS test.

Bug:32781701
Change-Id: I0b92601ce0cd8668e3b141d18dac393e0da789e4
PEG4Writer.cpp
11b72100e02e02b6cd8a6b14cd2068c96dc49b7d 01-Dec-2016 Wonsik Kim <wonsik@google.com> MediaCodec refactoring part 2-b: introduce BufferChannel

- MediaCodec stops tracking the whole buffer array from OMX.
- BufferChannel handles array management instead, if necessary.
- MediaCodec delegates secure buffer management to BufferChannel.
- Remove sf2.

Bug: 32133435
Test: adb shell am instrument -e size small -w 'android.media.cts/android.support.test.runner.AndroidJUnitRunner'
Test: Play an encrypted content in Play Movies
Test: Mirror the screen via Cast.
Change-Id: Idc9fdee42ea0cdd3b5f15ba5c51647c3e16504a1
Codec.cpp
CodecBufferChannel.cpp
ndroid.mk
odecBase.cpp
ediaCodec.cpp
ilters/MediaFilter.cpp
nclude/ACodecBufferChannel.h
f967d6ab32360cab729a103ccf2a6b6c6da53f34 06-Dec-2016 Robert Shih <robertshih@google.com> Merge "MPEG2TSExtractor: get duration by seeking to end"
ac6b30acb174dbdf35f845924cd63bdc48c43e8a 02-Dec-2016 Marco Nelissen <marcone@google.com> Remove unused includes

Change-Id: Ia9e0ca63064b75099f66b8088a9cc4b0af436359
ataSource.cpp
ba1dbe6e1fbb77a6b52549d42402d0ebf7c01c59 02-Dec-2016 Marco Nelissen <marcone@google.com> Merge "Use property_get_bool where possible"
2c192ad2ef8474bf752a638e7adb49ef2011f548 02-Dec-2016 TreeHugger Robot <treehugger-gerrit@google.com> Merge "stagefright/foundation: add AUnion and AData templates"
3b6889c296786b9d7d062abaa2e736c9246e0622 02-Dec-2016 Pawin Vongmasa <pawin@google.com> Merge "Decouple OMX from OMXNodeInstance."
b7c557c3c23b876a51782d85558e99fc2f39976a 02-Dec-2016 Pawin Vongmasa <pawin@google.com> Merge "Start OMX HAL implementation."
96626b7f9a4e5c9e1e04f7f710383631d1470364 01-Dec-2016 Marco Nelissen <marcone@google.com> Use property_get_bool where possible

Make handling of boolean properties more readable and consistent by
using property_get_bool instead of parsing the result of property_get

Change-Id: I8490d0f0b41a92eab5131e0aac0ecdf704a63381
ameraSource.cpp
PEG4Writer.cpp
ediaExtractor.cpp
tils.cpp
mx/OMXNodeInstance.cpp
ifi-display/source/WifiDisplaySource.cpp
d0cb8c76e2e75f315ad35fcdfe636038851696d0 01-Dec-2016 Caroline Tice <cmtice@google.com> Merge "Remove null-ptr deref compiler warning." am: b4d217ed0f am: 1095908b34 am: f5ba22b854
am: f8a57f1934

Change-Id: I280f9e731a4be51d780c9aa30dea9a7e6427258a
f8a57f193425d8e13e4a034321d4cc854c6ef5ef 01-Dec-2016 Caroline Tice <cmtice@google.com> Merge "Remove null-ptr deref compiler warning." am: b4d217ed0f am: 1095908b34
am: f5ba22b854

Change-Id: If77f4cfe54e96f7658b001eb3e15b15ce8fb6ac6
f5ba22b854ea9e245d1f08d97801a46783c2469a 01-Dec-2016 Caroline Tice <cmtice@google.com> Merge "Remove null-ptr deref compiler warning." am: b4d217ed0f
am: 1095908b34

Change-Id: Ie4ee8c1462415b89c96e3a6ade42fa60c6a67a1a
1095908b3474ecee22764ec50200aa6d971d26a9 01-Dec-2016 Caroline Tice <cmtice@google.com> Merge "Remove null-ptr deref compiler warning."
am: b4d217ed0f

Change-Id: Iaa009b250224afa46e7220c44054ae1755d897bd
f303d743250d2754209980bb42017b9668cf163f 01-Dec-2016 Caroline Tice <cmtice@google.com> Remove null-ptr deref compiler warning.

This CL removes the following compiler warning:
frameworks/av/media/libstagefright/MPEG4Extractor.cpp:1025:35
warning: Access to field 'next' results in a dereference of a null
pointer (loaded from variable 'cur')
[clang-analyzer-core.NullDereference]

Bug: None
Test: Compiled with change and no warning.
Change-Id: I365843068b098b111c281ac293a0b0b3aa2ec875
PEG4Extractor.cpp
d3ed3883c2d7bf3fb871be512055ed72cea964da 01-Dec-2016 Pawin Vongmasa <pawin@google.com> Decouple OMX from OMXNodeInstance.

OMXNodeInstance has a member named mOwner, which is a reference to OMX.
Since Treble conversion would replace OMX with a new class (to be named Omx),
mOwner should have a type that is different from OMX. Fortunately, the
only use of mOwner in OMXNodeInstance is to call freeNode(). This CL
introduces OMXNodeOwner, an abstract class that has freeNode() as the only
function, and changes the type of mOwner to OMXNodeOwner. This way,
OMXNodeInstance can work with both OMX and Omx.

Test: adb shell am instrument -e size small -w
'android.media.cts/android.support.test.runner.AndroidJUnitRunner'

Bug: 31399200

Change-Id: Ia2d07a48aa94da8378fd36e55244a7e7817a5f42
nclude/OMX.h
nclude/OMXNodeInstance.h
nclude/OmxNodeOwner.h
mx/OMXNodeInstance.cpp
76307481cf727f17add7e15527136f2402bd80a5 30-Nov-2016 Pawin Vongmasa <pawin@google.com> Start OMX HAL implementation.

Bug: 31399200

Test: None
Change-Id: I7ba9af10f76ec178c7df72e0202add30864b73c3
mx/hal/1.0/Android.mk
mx/hal/1.0/GraphicBufferSource.cpp
mx/hal/1.0/GraphicBufferSource.h
mx/hal/1.0/Omx.cpp
mx/hal/1.0/Omx.h
mx/hal/1.0/OmxBufferSource.cpp
mx/hal/1.0/OmxBufferSource.h
mx/hal/1.0/OmxNode.cpp
mx/hal/1.0/OmxNode.h
mx/hal/1.0/OmxObserver.cpp
mx/hal/1.0/OmxObserver.h
82e147049625a4cfdcb228a1de7efda594d446c9 17-Nov-2016 Robert Shih <robertshih@google.com> MPEG2TSExtractor: get duration by seeking to end

Prerequisites for this implementation (included in this commit):
* DataSources:
+ add kIsLocalFileSource flag
* AnotherPacketSource:
+ implement getEstimatedBufferDurationUs
* ATSParser:
+ expose Event SourceType
+ expose first pts

Test: adb shell am start -a android.intent.action.VIEW -n <video player activity> -d <local ts file>
Bug: 31964524
Change-Id: Ifcb6b3246cfa3748ee4d87ed09dbdf62e963a6e5
nclude/MPEG2TSExtractor.h
peg2ts/ATSParser.cpp
peg2ts/ATSParser.h
peg2ts/AnotherPacketSource.cpp
peg2ts/AnotherPacketSource.h
peg2ts/MPEG2TSExtractor.cpp
c2d29c48ea9314f1db836a906c95ee9bd6ef11c8 30-Nov-2016 Robert Shih <robertshih@google.com> Merge "mpeg2ts: report estimated duration only when stabilized"
d71f16268227c15a0ac2043e15900db5df2c417d 29-Nov-2016 Wonsik Kim <wonsik@google.com> Merge "MediaCodec refactoring part 2-a: introduce callback"
e322cc51459b3fac11e7a080c3eb8ee1bfb36fc8 16-Nov-2016 Lajos Molnar <lajos@google.com> stagefright/foundation: add AUnion and AData templates

Bug: 32885576
Change-Id: I33e09f3b91ea8e680779c0e0f77d1de9660c02d9
oundation/tests/AData_test.cpp
oundation/tests/Android.mk
oundation/tests/TypeTraits_test.cpp
92d57f926eb39d72e8fd8f3b3c9e40d25f77ad47 22-Nov-2016 Marco Nelissen <marcone@google.com> Move 'sniff' functionality from DataSource to MediaExtractor

and don't register the sniffers in every process that plays media,
but only in the extractor process.

Bug: 33166870

Change-Id: Id269d1eab8be1549542adad3037729a63b5ebaef
ataSource.cpp
ediaExtractor.cpp
tagefrightMetadataRetriever.cpp
d3/testid3.cpp
mx/tests/OMXHarness.cpp
tsp/rtp_test.cpp
ifi-display/source/PlaybackSession.cpp
221bfde160c9d0f52cab903bfb2e48d04881243e 23-Nov-2016 Baligh Uddin <baligh@google.com> Merge remote-tracking branch 'goog/cw-f-dev' into fix_merger

Bug: 32849428

* goog/cw-f-dev:
If a device does not have a camera, do not set a camera death notifier
Fix security vulnerability: Effect command might allow negative indexes
Make VBRISeeker more robust
DO NOT MERGE: defensive parsing of mp3 album art information
Effects: Check get parameter command size
IOMX: convert ANWB to Gralloc meta if using useBuffer in the same process
DO NOT MERGE: defensive parsing of mp3 album art information
DO NOT MERGE: defensive parsing of mp3 album art information
DO NOT MERGE: defensive parsing of mp3 album art information
DO NOT MERGE: defensive parsing of mp3 album art information
Camera API1: don't pick wrong preview fps value
Fix security vulnerability: Equalizer command might allow negative indexes
Camera API1: relax the fps check with some margin
stagefright: remove allottedSize equality check in IOMX::useBuffer
Camera API1: filter out the unsupported preview fps range
DO NOT MERGE: Visualizer: Check capture size and latency parameters
Visualizer: Check capture size and latency parameters
76d73bce9a63b795c7b8edbeab861239ab2eed0f 22-Nov-2016 Wonsik Kim <wonsik@google.com> stagefright: explicitly mark discarded buffers

Return buffers always, but mark discarded buffers explicitly.

Bug: 33059528
Test: (manual) open a website with a looping video and see that it works.
Test: adb shell am instrument -e size small -w 'android.media.cts/android.support.test.runner.AndroidJUnitRunner'
Change-Id: Icbe12d09b5721747437592e11def2302f4c8bf79
Codec.cpp
ediaCodec.cpp
fc88363032d90492845ad5b917496589ca225f63 21-Nov-2016 Jeff Tinker <jtinker@google.com> Merge "Removing widevine classic"
79054b1f53b448511f1edb6e0dcab1d7b6f39964 14-Nov-2016 Wonsik Kim <wonsik@google.com> MediaCodec refactoring part 2-a: introduce callback

CodecBase instances do not post reply messages back to MediaCodec
explicitly --- Callback does the job instead.

Bug: 32133435
Test: adb shell am instrument -e size small -w 'android.media.cts/android.support.test.runner.AndroidJUnitRunner'
Test: Play an encrypted content in Play Movies
Change-Id: I210993a3bbc306f970b8e9395a91e8697cfa832e
Codec.cpp
odecBase.cpp
ediaCodec.cpp
ilters/MediaFilter.cpp
48d8020342a4de6b0b925328ddbdfe34f22253a3 21-Nov-2016 Wonsik Kim <wonsik@google.com> stagefright: do not set buffer when returning buffers

Bug: 32976893
Bug: 32542437
Test: (manual) play secure content on Play Movies app (fugu) and see that it doesn't crash
Change-Id: Ib45fd552634c9addc8ce25a1d255113c80cc8ce7
ediaCodec.cpp
44a580a5262ba19c275aac3537b9306679819f94 19-Nov-2016 Wei Jia <wjia@google.com> Merge "mediaplayer: support same seek mode as MediaMetadataRetriever."
c5de09127e9e0d5df7aa587be317e1487d793245 18-Nov-2016 Wei Jia <wjia@google.com> mediaplayer: support same seek mode as MediaMetadataRetriever.

Test: manually force 4 seek modes in mediaplayer.
Bug: 32557491
Change-Id: Iea4f6dbfc224fc6da39624300c6d872b79142f07
ttplive/LiveSession.cpp
ttplive/LiveSession.h
0736a5eeb6a5f4139352ea033c0628cfa85b6b42 18-Nov-2016 TreeHugger Robot <treehugger-gerrit@google.com> Merge "stagefright: fix potential codec leaks in async stop/reset"
349b8b4c47817a565ded94ff351caf48782f1252 18-Nov-2016 Chong Zhang <chz@google.com> stagefright: fix potential codec leaks in async stop/reset

Currently if stop is followed by a reset from another thread,
we unblock the stop first (to avoid ANR) without waiting for
kWhatShutdownCompleted, and proceed with the reset request.
But this could cause release to return too early when the
kWhatShutdownCompleted for the stop is received. When this
happens, the reset() will unregister ACodec's handlers before
the real shutdown with deallocation is processed, causing
a codec node instance to be leaked.

To solve this problem, separate kWhatShutdownCompleted into
two messages kWhatStopCompleted and kWhatReleaseCompleted.
Release should only return upon kWhatReleaseCompleted.

Also initializing the fence fd in the metadata buffer (even
though it's not used) to avoid warning in freeBuffer.

bug: 32750454
bug: 32971559

Change-Id: If218c853955729a2a2f2e8356908115a79c442e3
Codec.cpp
ediaCodec.cpp
ilters/MediaFilter.cpp
6507185f5c59d39deeda6598ce50ee4900723501 17-Nov-2016 Robert Shih <robertshih@google.com> Merge "httplive: fix overflow in BandwidthEstimator" am: 6cc43e10f4 am: 3c0f1962af am: 51ae9199be
am: 01abec8737

Change-Id: I43de1de085d2a3b8f02a7b6242dedfc6683a0a4f
01abec873792d290944192814029c98a6e46917a 17-Nov-2016 Robert Shih <robertshih@google.com> Merge "httplive: fix overflow in BandwidthEstimator" am: 6cc43e10f4 am: 3c0f1962af
am: 51ae9199be

Change-Id: I334e5b3c4ec31a0010388c91b0464097a8567ef6
3c0f1962af4d61ce9f3bc250bc3bf8fe0fe7980b 17-Nov-2016 Robert Shih <robertshih@google.com> Merge "httplive: fix overflow in BandwidthEstimator"
am: 6cc43e10f4

Change-Id: I62c07442b4bcb05fa067e879c445bf19d4832b13
d59bcb06a63093337e8b0174ff414e4617bdc4f4 17-Nov-2016 TreeHugger Robot <treehugger-gerrit@google.com> Merge "stagefright/foundation: add TypeTraits.h and Flagged.h"
cd43370e46a619014fdf929dab0bbbba3fdf44b4 17-Nov-2016 Chong Zhang <chz@google.com> stagefright: fix sw renderer fallback when dynamic ANW mode fails

bug: 32944784
Change-Id: I5c2c3564b733b5b5498831a884f4b93489a34547
Codec.cpp
fba972f9d7f87c47ac0820b7f99420acc7e5dc36 15-Nov-2016 Lajos Molnar <lajos@google.com> stagefright/foundation: add TypeTraits.h and Flagged.h

TypeTraits.h includes some additional type utility templates not
covered by <type_traits>.

Flagged.h is a template that allows adding flags to an arbitrary
type, and combine additional flags into that.

Bug: 32885576
Change-Id: I13faa6d265cc06df76609b255704d0cf22e2d904
oundation/tests/Android.mk
oundation/tests/Flagged_test.cpp
oundation/tests/TypeTraits_test.cpp
oundation/tests/Utils_test.cpp
ests/Android.mk
ests/Utils_test.cpp
29b7dcf6d3cdb97103467dc8106151c6260c239a 24-Oct-2016 Jeff Tinker <jtinker@google.com> Removing widevine classic

bug:30505334
Change-Id: I40ac8020b5442857936037a15847b0271359e624
ndroid.mk
ataSource.cpp
ediaCodec.cpp
ediaExtractor.cpp
uMediaExtractor.cpp
VMExtractor.cpp
nclude/WVMExtractor.h
430fffcebdbf278c80872419e5e148822551c099 15-Nov-2016 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Use layered version of graphic buffer allocation calls."
4c1d94395a64f4c3acd8f9e0d378a778e438221d 14-Nov-2016 TreeHugger Robot <treehugger-gerrit@google.com> Merge "IOMX: add API for setPortMode"
f7aba583d095ad250bfd067ef809bec26704e1af 14-Nov-2016 Marco Nelissen <marcone@google.com> Make VBRISeeker more robust am: 7fdd36418e am: ae0cffaced am: 82642824a5 am: c236ae3ad0 am: 43dad372e7 am: aa8c778d64 am: a0b2e1682f am: 443a1aa7db am: 1b0f31aa40 am: 0465a2c215 am: 93c02f8427 am: 1d12419f63 am: 8094ae6164 am: 8d5bb6ee5a am: ac1ea5cbd1
am: cdd5b871cd

Change-Id: Iccf9bcea3afd54301da8b8bf5c5b2ae684c40423
cdd5b871cd7350b99ba0e8875c6882ef1a2365ef 14-Nov-2016 Marco Nelissen <marcone@google.com> Make VBRISeeker more robust am: 7fdd36418e am: ae0cffaced am: 82642824a5 am: c236ae3ad0 am: 43dad372e7 am: aa8c778d64 am: a0b2e1682f am: 443a1aa7db am: 1b0f31aa40 am: 0465a2c215 am: 93c02f8427 am: 1d12419f63 am: 8094ae6164 am: 8d5bb6ee5a
am: ac1ea5cbd1

Change-Id: I41dac6589357dc69f7970a71a9055591ad59bf75
ac1ea5cbd14293da7d50317d731b2ed3e6f021bf 14-Nov-2016 Marco Nelissen <marcone@google.com> Make VBRISeeker more robust am: 7fdd36418e am: ae0cffaced am: 82642824a5 am: c236ae3ad0 am: 43dad372e7 am: aa8c778d64 am: a0b2e1682f am: 443a1aa7db am: 1b0f31aa40 am: 0465a2c215 am: 93c02f8427 am: 1d12419f63 am: 8094ae6164
am: 8d5bb6ee5a

Change-Id: Id6acc0d858c710e7db9d0217a309adf5b17d0c1e
8094ae6164822eb9c540579aae9b1d859708eadd 14-Nov-2016 Marco Nelissen <marcone@google.com> Make VBRISeeker more robust am: 7fdd36418e am: ae0cffaced am: 82642824a5 am: c236ae3ad0 am: 43dad372e7 am: aa8c778d64 am: a0b2e1682f am: 443a1aa7db am: 1b0f31aa40 am: 0465a2c215 am: 93c02f8427
am: 1d12419f63

Change-Id: I69b84acb183515390c0786e7cc53fd53e922e743
1d12419f63e0d39f421da691949e89ec2664a76d 14-Nov-2016 Marco Nelissen <marcone@google.com> Make VBRISeeker more robust am: 7fdd36418e am: ae0cffaced am: 82642824a5 am: c236ae3ad0 am: 43dad372e7 am: aa8c778d64 am: a0b2e1682f am: 443a1aa7db am: 1b0f31aa40 am: 0465a2c215
am: 93c02f8427

Change-Id: I41cd3d797f6846fa16f18bdd4fcfa2903612309a
93c02f84273a1d68533987326ae58a85b196dfe6 14-Nov-2016 Marco Nelissen <marcone@google.com> Make VBRISeeker more robust am: 7fdd36418e am: ae0cffaced am: 82642824a5 am: c236ae3ad0 am: 43dad372e7 am: aa8c778d64 am: a0b2e1682f am: 443a1aa7db am: 1b0f31aa40
am: 0465a2c215

Change-Id: I09efff0a3691cf5daf25e3e346e357f3c8a543b3
0465a2c215ea52f906d5303d2b566b466c651783 14-Nov-2016 Marco Nelissen <marcone@google.com> Make VBRISeeker more robust am: 7fdd36418e am: ae0cffaced am: 82642824a5 am: c236ae3ad0 am: 43dad372e7 am: aa8c778d64 am: a0b2e1682f am: 443a1aa7db
am: 1b0f31aa40

Change-Id: Ia7a38aa375fd269177da02f557337bf18ee7cf25
1b0f31aa40320da4c49c2713b0b509524052e6b5 14-Nov-2016 Marco Nelissen <marcone@google.com> Make VBRISeeker more robust am: 7fdd36418e am: ae0cffaced am: 82642824a5 am: c236ae3ad0 am: 43dad372e7 am: aa8c778d64 am: a0b2e1682f
am: 443a1aa7db

Change-Id: I96ec7f79d6d1bec36874962386507719529b3965
443a1aa7dbf01d71661535ec10b253c5ef5c2f58 14-Nov-2016 Marco Nelissen <marcone@google.com> Make VBRISeeker more robust am: 7fdd36418e am: ae0cffaced am: 82642824a5 am: c236ae3ad0 am: 43dad372e7 am: aa8c778d64
am: a0b2e1682f

Change-Id: I75153c516c617ac0f11913c5a0f9630daa56f09b
7cfd47c566801f478a03c0e72f9426d737f1b0ac 14-Nov-2016 Ray Essick <essick@google.com> Merge "DO NOT MERGE: defensive parsing of mp3 album art information" into lmp-mr1-dev
a0b2e1682f07d19541063bd581d917940f6dfa1b 14-Nov-2016 Marco Nelissen <marcone@google.com> Make VBRISeeker more robust am: 7fdd36418e am: ae0cffaced am: 82642824a5 am: c236ae3ad0 am: 43dad372e7
am: aa8c778d64

Change-Id: Ic3efb4b7b20baf0c992e4e4a76e5cc74f25d00b3
43dad372e71c136ccb1cfc1e2f34063a90c351b0 14-Nov-2016 Marco Nelissen <marcone@google.com> Make VBRISeeker more robust am: 7fdd36418e am: ae0cffaced am: 82642824a5
am: c236ae3ad0

Change-Id: If2f8a18bd63204d336f5de1862f8226b3c74a407
c236ae3ad09b8d7a459daad3041af214b4b648f6 14-Nov-2016 Marco Nelissen <marcone@google.com> Make VBRISeeker more robust am: 7fdd36418e am: ae0cffaced
am: 82642824a5

Change-Id: Ia7eb6656c3034793e8caea2b417d99fa0702d05d
82642824a57367de89be82f4fc9bb10eb63539d6 14-Nov-2016 Marco Nelissen <marcone@google.com> Make VBRISeeker more robust am: 7fdd36418e
am: ae0cffaced

Change-Id: I3e6fdf30fc372fb32cfbd24a37814d0946eaca2f
a6ff3a8a9bd17e8a5a421b409b58b8497842ebef 14-Nov-2016 Robert Shih <robertshih@google.com> httplive: fix overflow in BandwidthEstimator

Bug: 32424616
Change-Id: If857fec44c6466aaadbde8cccbbf95a98d231fa2
ttplive/LiveSession.cpp
7d1bfc53ae1dcd32f2d54b89f4ba494d726edeb0 12-Nov-2016 Wei Jia <wjia@google.com> Merge "Avoid crash for stss sync sample number 0" into nyc-mr2-dev
d0a1bbda3e5cf32f856feb424d38d95dcc685bf2 12-Nov-2016 Roger1 Jonsson <roger1.jonsson@sonymobile.com> Merge "Avoid crash for stss sync sample number 0" am: 11f51b0463 am: 9b81cc421e am: 2943f74788
am: 19d27cc508

Change-Id: I21efb8d018c991c29c1d3a7f1a7dc5952c85e870
19d27cc5080d8f1bddccc7cbe4184163b0616ba7 12-Nov-2016 Roger1 Jonsson <roger1.jonsson@sonymobile.com> Merge "Avoid crash for stss sync sample number 0" am: 11f51b0463 am: 9b81cc421e
am: 2943f74788

Change-Id: If81581ec339cd237a224300e3fdaa49590cc2c07
9b81cc421e65e85d1b6b5846829fe66fa04f61ea 12-Nov-2016 Roger1 Jonsson <roger1.jonsson@sonymobile.com> Merge "Avoid crash for stss sync sample number 0"
am: 11f51b0463

Change-Id: I923fe096f4b9fef2d9b5b3a6e5674a0283b9f65e
1d4958d275c6de8666f3752ac2ccfb99b6859fe8 26-Oct-2016 Roger1 Jonsson <roger1.jonsson@sonymobile.com> Avoid crash for stss sync sample number 0

A sample number value of 0 means that the value stored in
the mSyncSamples array, would become negative (-1),
when converted to index value. This causes a crash.

Make sure that stss sample numbers are bigger
than 0 before converting sample number to index value.

Bug: 32423862
Test: Playback video that triggers stss sync sample number 0
Change-Id: I35bee7c718e01b086d7e05deda13b38083f509f5
ampleTable.cpp
4b2f81808a3d6600ead4d51d0f5a0eba4a7ee6fe 26-Oct-2016 Craig Donner <cdonner@google.com> Use layered version of graphic buffer allocation calls.

Allocators now require a layer count, but in these cases we can
assume that a single layer is sufficient, since that's what they
effectively do now.

Bug: 31686534
Test: manual
Change-Id: Ic22f56f8dbbf5bca01ad21421d12faac95783de7
ifi-display/MediaSender.cpp
7fdd36418e945cf6a500018632dfb0ed8cb1a343 11-Nov-2016 Marco Nelissen <marcone@google.com> Make VBRISeeker more robust

Bug: 32577290
Change-Id: I9bcc9422ae7dd3ae4a38df330c9dcd7ac4941ec8
BRISeeker.cpp
d02c08671d666e12a94bcadd943787a9ab2ceea8 13-Oct-2016 Chong Zhang <chz@google.com> IOMX: add API for setPortMode

- Add setPortMode to centralize port mode configuration

- Remove storeMetaDataInBuffers and enableNativeBuffers. These are
no longer exposed to the client. Metadata mode and native/secure
buffer mode will be enabled by OMX as needed by the port mode.

- Move handling of legacy adpative experiment (legacy metadata mode)
to OMX side. Legacy mode will now appear the same as non-metadata
mode to client.

bug: 31399200

Change-Id: Iaf33bd7c30fab4acbc19e9fb8c19e322f9b4a0a0
Codec.cpp
nclude/OMXNodeInstance.h
nclude/SimpleSoftOMXComponent.h
mx/OMXNodeInstance.cpp
mx/OMXUtils.h
ad60a0f6cd9012507f8086fe741236d12d280ef3 10-Nov-2016 Wonsik Kim <wonsik@google.com> stagefright: reuse buffers instead of cloning

In buffer array mode, the buffer reference is kept in clients of
MediaCodec, so allocating new buffer for new input/output does not
work in that case.

Bug: 32577275
Bug: 32579231
Test: use screenrecord and investigate the output file.
Test: cts-tradefed run cts-dev -m CtsMediaTestCases -t android.media.cts.EncodeDecodeTest
Change-Id: I26d89f6b5735094062b8a2027bcab4754576d574
Codec.cpp
ufferImpl.cpp
ediaCodec.cpp
nclude/SecureBuffer.h
nclude/SharedMemoryBuffer.h
2f09cc743f4807bb853dd98aecc05d8105c0034a 09-Nov-2016 Ray Essick <essick@google.com> DO NOT MERGE: defensive parsing of mp3 album art information am: fa0806b594 am: 1e9c67e52b am: e78bb7ab20 am: 830fbba76a
am: fd8fd049b5

Change-Id: If56540bdecdf06680dbbdc70054aadea63e94389
49778b36d39a86caeff6069cb8ccefc177135ab0 09-Nov-2016 Hangyu Kuang <hkuang@google.com> Merge changes from topic 'metadata-support'

* changes:
media: Limit the maximum size of per-frame metadata.
media: Add metadata track support to MPEG4Writer.
fd8fd049b585c1bbf55bfa9d3aa9bbbd4cf412bf 09-Nov-2016 Ray Essick <essick@google.com> DO NOT MERGE: defensive parsing of mp3 album art information am: fa0806b594 am: 1e9c67e52b am: e78bb7ab20
am: 830fbba76a

Change-Id: I51138ec1676f8e8d886aea588a2f38a68bb3983e
c63bbf90f94bee6bdfa4ab17e99693f2938a8a08 09-Nov-2016 Ray Essick <essick@google.com> DO NOT MERGE: defensive parsing of mp3 album art information am: 21f2814260 am: b820fe865a
am: a064916d90

Change-Id: Ie8dd560bade018ef1037f619d5b95af39eba9a0f
c696d76d984448723768ce80e461a7e0f09069f8 09-Nov-2016 Ray Essick <essick@google.com> DO NOT MERGE: defensive parsing of mp3 album art information am: 2ff80538b7
am: c3819cfda9

Change-Id: I2a98a164f3c1d728e0f5bec906116cd1bffac19a
e78bb7ab200df09f05d8d51c00ffea8d7b30698c 09-Nov-2016 Ray Essick <essick@google.com> DO NOT MERGE: defensive parsing of mp3 album art information am: fa0806b594
am: 1e9c67e52b

Change-Id: I300f325425636e30cf844b8fad13078c78ef827f
a064916d90c277959d84adc76583144d359d77e9 09-Nov-2016 Ray Essick <essick@google.com> DO NOT MERGE: defensive parsing of mp3 album art information am: 21f2814260
am: b820fe865a

Change-Id: I6f4e01197fa9098cf9764cbb52997d77bf25495e
1e9c67e52b339ae6bc6127408b57a82ecd52ea3f 09-Nov-2016 Ray Essick <essick@google.com> DO NOT MERGE: defensive parsing of mp3 album art information
am: fa0806b594

Change-Id: I4e290d41367367102a82988d94f80cf53c35e932
b820fe865a2c0aaa623bba4585c40bedb00ab62f 09-Nov-2016 Ray Essick <essick@google.com> DO NOT MERGE: defensive parsing of mp3 album art information
am: 21f2814260

Change-Id: Ib71918ef91b50ec3a7b93b6c40e0af18df9fc5d2
5759c46d849fc5ed7faa138637401ee10103a489 02-Nov-2016 Ray Essick <essick@google.com> DO NOT MERGE: defensive parsing of mp3 album art information

several points in stagefrights mp3 album art code
used strlen() to parse user-supplied strings that may be
unterminated, resulting in reading beyond the end of a buffer.

This changes the code to use strnlen() for 8-bit encodings and
strengthens the parsing of 16-bit encodings similarly. It also
reworks how we watch for the end-of-buffer to avoid all over-reads.

Bug: 32377688
Test: crafted mp3's w/ good/bad cover art. See what showed in play music
Change-Id: I479d51e88d3180461cb6ea5540974671cfd84201
(cherry picked from commit 52d02b97a4dc54cff9c4f058eeeab6753c2230a0)
d3/ID3.cpp
b569c5411a7642eb7791b65fa268d8f4009d737a 09-Nov-2016 Ray Essick <essick@google.com> Merge "DO NOT MERGE: defensive parsing of mp3 album art information" into nyc-dev
3453aa5e565c22cdc131f30b1f248ae89127bb21 09-Nov-2016 Ray Essick <essick@google.com> Merge "DO NOT MERGE: defensive parsing of mp3 album art information" into mnc-dev
75571e4bc76bd2defd4309c7154120840396329d 08-Nov-2016 Marco Nelissen <marcone@google.com> Clean up mediadrm dependencies

Move various things around so mediadrmserver doesn't need
libstagefright and libmedia

Test: build/boot
Change-Id: I48b713cd679b992cb6ad1262c20394a9892d7027
ndroid.mk
rocessInfo.cpp
e0d59b3301623c5ae8f7b6f26451179beb84a64b 04-Nov-2016 Hangyu Kuang <hkuang@google.com> media: Add metadata mime format parsing support to MPEG4Extractor.

Test: Manual test.
Bug: 28536560
Change-Id: Ic027539c61010a23ede6f057ea0aeb83c0bace88
PEG4Extractor.cpp
698616546b4f2936c8bbf0dee0f8139ebc446278 26-Oct-2016 Roger1 Jonsson <roger1.jonsson@sonymobile.com> Avoid crash for stss sync sample number 0

A sample number value of 0 means that the value stored in
the mSyncSamples array, would become negative (-1),
when converted to index value. This causes a crash.

Make sure that stss sample numbers are bigger
than 0 before converting sample number to index value.

Bug: 32423862
Test: Playback video that triggers stss sync sample number 0
Change-Id: I35bee7c718e01b086d7e05deda13b38083f509f5
ampleTable.cpp
ce5749ea9b510c4327c8656cf747a6997b957a58 07-Nov-2016 Marco Nelissen <marcone@google.com> Split libmedia into libmedia and libaudioclient am: 795a2a7554 am: 4ea929819e
am: e5a73e6a2d

Change-Id: Ib48ce56d342bfe745345d7c899613d3f950b9a67
4ea929819e23ecd388e1edce25a10631ee53e9e3 07-Nov-2016 Marco Nelissen <marcone@google.com> Split libmedia into libmedia and libaudioclient
am: 795a2a7554

Change-Id: Ic08eddc5650d3f5d344ebcf93ad98ae5bb236c8c
795a2a75542d25eefa56bebc388340ee15fdff5c 02-Nov-2016 Marco Nelissen <marcone@google.com> Split libmedia into libmedia and libaudioclient

This makes it so audioserver doesn't need to link against the entire libmedia,
which has dependencies on camera, ICU, OpenGL and other things that aren't
needed for audio.

Test: build/boot

Change-Id: I99ba1a3dc3b33ca9b3abd98e7519dbf228ee62af
ndroid.mk
03b3d23b2407105371f917b8fba123f3191c4aa7 05-Nov-2016 Marco Nelissen <marcone@google.com> Merge "Remove unused libraries from libstagefright_http_support" am: bf26c4eb62 am: 5c4ca88476
am: 26f9c97dba

Change-Id: I799b1e857e184fef27bada7bbf284394c83893c7
5c4ca88476ea3c26b88fc13c281db9eb20913511 05-Nov-2016 Marco Nelissen <marcone@google.com> Merge "Remove unused libraries from libstagefright_http_support"
am: bf26c4eb62

Change-Id: I7238f2705588d21aa3533af314825636232a9b1f
96b403fff364c4376ce7e11f67e01f09cf445995 04-Nov-2016 Marco Nelissen <marcone@google.com> Merge "Remove unused libstagefright_yuv" am: a4e77422c9 am: cd1dad10b5
am: e0016b99b2

Change-Id: I1278ead6e18d42735f9d2bda552f20bf68fd3816
66ded7d95b9a2885b9750966f0ebdaa5082bf83d 04-Nov-2016 Marco Nelissen <marcone@google.com> Merge "Remove unneeded links with dynamic libraries" am: 46d0a5b493 am: 4f197ec220
am: b3250b0b8a

Change-Id: Ic1e29e8d1e91ab34c3b7d5f7ad3e25c48a150888
cd1dad10b5e5d0d326130e471d0f89f398975a17 04-Nov-2016 Marco Nelissen <marcone@google.com> Merge "Remove unused libstagefright_yuv"
am: a4e77422c9

Change-Id: Ia23b671f54a2f8923e15311e0763fd10c2c469db
4f197ec220d2c9634429692dd37896233273111d 04-Nov-2016 Marco Nelissen <marcone@google.com> Merge "Remove unneeded links with dynamic libraries"
am: 46d0a5b493

Change-Id: Ica6dd538c30b9aeccddad229cb24ade4d82d2e4c
4843df581f99e86d93283071264c55e74782cfad 02-Nov-2016 Marco Nelissen <marcone@google.com> Remove unused libraries from libstagefright_http_support

Test: build/boot
Change-Id: I47e79fa0b51e4bb2ae63e10160aea861fabc96ac
ttp/Android.mk
f48f36ebe0415d340770f0ef73ce3967779fadf0 27-Oct-2016 Marco Nelissen <marcone@google.com> Remove unused libstagefright_yuv

Test: built and booted

Change-Id: I3db16c365b36143fee4aa532dc9cdec0bca612a5
uv/Android.mk
uv/MODULE_LICENSE_APACHE2
uv/NOTICE
uv/YUVCanvas.cpp
uv/YUVImage.cpp
263506542fbe480ddb247597bdcef16c437b48dd 25-Oct-2016 Marco Nelissen <marcone@google.com> Remove unneeded links with dynamic libraries

Various media components were linking against dynamic libraries that weren't needed.

Test: built and booted

Change-Id: I7379506fd06d4e28e0eff0001fd073a2d3860f8e
ndroid.mk
odecs/avc/enc/Android.mk
odecs/avcenc/Android.mk
odecs/g711/dec/Android.mk
odecs/gsm/dec/Android.mk
odecs/m4v_h263/enc/Android.mk
odecs/on2/enc/Android.mk
mx/Android.mk
ifi-display/Android.mk
538ec5e04f389cba637b030757be317fcb8677a8 02-Nov-2016 Marco Nelissen <marcone@google.com> Split libmedia into libmedia and libaudioclient

This makes it so audioserver doesn't need to link against the entire libmedia,
which has dependencies on camera, ICU, OpenGL and other things that aren't
needed for audio.

Test: build/boot

Change-Id: I99ba1a3dc3b33ca9b3abd98e7519dbf228ee62af
ndroid.mk
b03b155f66553a097c732b0728564dbca0886d0d 04-Nov-2016 Marco Nelissen <marcone@google.com> DO NOT MERGE SimpleDecodingSource: fix handling of Vorbis buffers
am: 2817be0fad

Change-Id: Iff73c1d4e7efdfae56c281aa105ae186d26fc11e
984ef5ce8ef224cc6982e156bcafefc786e4fcc6 04-Nov-2016 Marco Nelissen <marcone@google.com> Merge "DO NOT MERGE SimpleDecodingSource: fix handling of Vorbis buffers" into nyc-mr2-dev
f42c5854714e5c180a67ccf15976dd9c846ee2b8 02-Nov-2016 Marco Nelissen <marcone@google.com> Remove unused libraries from libstagefright_http_support

Test: build/boot
Change-Id: I47e79fa0b51e4bb2ae63e10160aea861fabc96ac
ttp/Android.mk
0cf2dfba38f718e5321f8ed0bfb9ca018da38da7 03-Nov-2016 Lajos Molnar <lajos@google.com> IOMX: convert ANWB to Gralloc meta if using useBuffer in the same process am: 4fb1e42a16 am: 63482ec6e9
am: c0f5ebaea4

Change-Id: I7e3f990bdb4a2814253bb346e6e9f02936769d54
c0f5ebaea434defebcbe0c8c20f6394d21e5fba7 03-Nov-2016 Lajos Molnar <lajos@google.com> IOMX: convert ANWB to Gralloc meta if using useBuffer in the same process am: 4fb1e42a16
am: 63482ec6e9

Change-Id: I041d197f841be998912734a9e577b6c0b6299a9e
63482ec6e907993e75a6ff32d337b63427f97656 03-Nov-2016 Lajos Molnar <lajos@google.com> IOMX: convert ANWB to Gralloc meta if using useBuffer in the same process
am: 4fb1e42a16

Change-Id: I8878bbd684459fc2381c6b0a07ff451efab45dd8
e033248fe5b9d4e9ca11f1c17290fbf63ea6ff58 02-Nov-2016 Ray Essick <essick@google.com> Merge "defensive parsing of mp3 album art information"
4fb1e42a16e77d7abf1d84bedbc20f901af26524 02-Nov-2016 Lajos Molnar <lajos@google.com> IOMX: convert ANWB to Gralloc meta if using useBuffer in the same process

This was disabled by a previous commit.

Bug: 32436178
Change-Id: I9f9c6a372a039226d61f3651be3af207fed63e60
mx/OMXNodeInstance.cpp
fa0806b594e98f1aed3ebcfc6a801b4c0056f9eb 02-Nov-2016 Ray Essick <essick@google.com> DO NOT MERGE: defensive parsing of mp3 album art information

several points in stagefrights mp3 album art code
used strlen() to parse user-supplied strings that may be
unterminated, resulting in reading beyond the end of a buffer.

This changes the code to use strnlen() for 8-bit encodings and
strengthens the parsing of 16-bit encodings similarly. It also
reworks how we watch for the end-of-buffer to avoid all over-reads.

Bug: 32377688
Test: crafted mp3's w/ good/bad cover art. See what showed in play music
Change-Id: Ia9f526d71b21ef6a61acacf616b573753cd21df6
d3/ID3.cpp
21f28142605f34d7194b7f710ae7b77f3aed2123 02-Nov-2016 Ray Essick <essick@google.com> DO NOT MERGE: defensive parsing of mp3 album art information

several points in stagefrights mp3 album art code
used strlen() to parse user-supplied strings that may be
unterminated, resulting in reading beyond the end of a buffer.

This changes the code to use strnlen() for 8-bit encodings and
strengthens the parsing of 16-bit encodings similarly. It also
reworks how we watch for the end-of-buffer to avoid all over-reads.

Bug: 32377688
Test: crafted mp3's w/ good/bad cover art. See what showed in play music
Change-Id: Ib46cd1b5a3e1707c343d395f235bedb82764e184
d3/ID3.cpp
52d02b97a4dc54cff9c4f058eeeab6753c2230a0 02-Nov-2016 Ray Essick <essick@google.com> DO NOT MERGE: defensive parsing of mp3 album art information

several points in stagefrights mp3 album art code
used strlen() to parse user-supplied strings that may be
unterminated, resulting in reading beyond the end of a buffer.

This changes the code to use strnlen() for 8-bit encodings and
strengthens the parsing of 16-bit encodings similarly. It also
reworks how we watch for the end-of-buffer to avoid all over-reads.

Bug: 32377688
Test: crafted mp3's w/ good/bad cover art. See what showed in play music
Change-Id: I479d51e88d3180461cb6ea5540974671cfd84201
d3/ID3.cpp
2ff80538b7063545e5e006f3eca96115175e7c82 02-Nov-2016 Ray Essick <essick@google.com> DO NOT MERGE: defensive parsing of mp3 album art information

several points in stagefrights mp3 album art code
used strlen() to parse user-supplied strings that may be
unterminated, resulting in reading beyond the end of a buffer.

This changes the code to use strnlen() for 8-bit encodings and
strengthens the parsing of 16-bit encodings similarly. It also
reworks how we watch for the end-of-buffer to avoid all over-reads.

Bug: 32377688
Test: crafted mp3's w/ good/bad cover art. See what showed in play music
Change-Id: Idbaf221fa2283b33e83f399562a3323dd095cc2c
d3/ID3.cpp
a109007c56de4e683adfb00ca0632e25f7702b97 02-Nov-2016 Wei Jia <wjia@google.com> Merge "NuPlayerSource: add "precise" as additional argument to seekTo."
5ec347fcaf7fefe8fd9ccbaa365ffb070921a970 02-Nov-2016 Wei Jia <wjia@google.com> NuPlayerSource: add "precise" as additional argument to seekTo.

Test: compiles
Bug: 32557491
Change-Id: I9d251bf345630d6628125302946768297e73613f
ttplive/LiveSession.cpp
ttplive/LiveSession.h
ebb726f940b29174f8dd4bb74d6de39c3f6eb611 27-Oct-2016 Ray Essick <essick@google.com> defensive parsing of mp3 album art information

several points in stagefrights mp3 album art code
used strlen() to parse user-supplied strings that may be
unterminated, resulting in reading beyond the end of a buffer.

This changes the code to use strnlen() for 8-bit encodings and
strengthens the parsing of 16-bit encodings similarly. It also
reworks how we watch for the end-of-buffer to avoid all over-reads.

Bug: 32377688
Test: crafted mp3's w/ good/bad cover art. See what showed in play music
Change-Id: I802a71c6e5968aefde21eb1612b720ff6d579988
d3/ID3.cpp
e1b943f21dff25044b349d4d628d9adb0c2e0b74 31-Oct-2016 Hangyu Kuang <hkuang@google.com> media: Limit the maximum size of per-frame metadata.

Test: Manual test.

Bug: 28536560
Change-Id: I6557ead64a33de308266ac23c0f8f793d01a369a
PEG4Writer.cpp
25adc33c1ba77b95162ebce8a4c2a7a07baeb98f 21-Oct-2016 Hangyu Kuang <hkuang@google.com> media: Add metadata track support to MPEG4Writer.

1. Remove the restriction that MPEG4Writer could only write at most one video
track and one audio track.
2. Allow muxing mutiple metadata tracks into the file. Did not put a limit on
each sample's metadata size now.
3. metadata mime format must start from prefix "application/".
4. metadata's format/layout is defined by the application.
5. Generated MP4 file use TextMetaDataSampleEntry defined in section 12.3.3.2
of the ISOBMFF to signal the metadata's mime format.

Test: Manual test.

Bug: 28536560
Change-Id: I97829e235e598e35fcad31f948eea5943f8c4fd5
PEG4Writer.cpp
6b8937f4a81447968b22b75a6f1e450bbda1a18f 01-Nov-2016 Marco Nelissen <marcone@google.com> Don't abort on nonsensical seek requests

and don't abort client when remote process died.

Bug: 30865267
Test: manual
Change-Id: I6239aa60a5f581dcbbe94bd187ba981141ecd976
uMediaExtractor.cpp
atroska/MatroskaExtractor.cpp
baa453af9fb666c7083bb8ed23aead0611def087 31-Oct-2016 Lajos Molnar <lajos@google.com> stagefright: remove allottedSize equality check in IOMX::useBuffer am: 58388aa7be am: 9d44880eb2 am: 75a1b054fd am: 4159ad155a am: d99250c134 am: b7b58a2ea5 am: 83c4ce76b5 am: 53e735504e
am: 2c39660293

Change-Id: I7a442bfe472840d8ba6e6ac274886c893011f17c
2c39660293b9e03bae7dae9a9b28397b749f8944 31-Oct-2016 Lajos Molnar <lajos@google.com> stagefright: remove allottedSize equality check in IOMX::useBuffer am: 58388aa7be am: 9d44880eb2 am: 75a1b054fd am: 4159ad155a am: d99250c134 am: b7b58a2ea5 am: 83c4ce76b5
am: 53e735504e

Change-Id: I53bc957abe6f2547d38ff66d86d18cb9be5fb67a
83c4ce76b54de9f45ee0451c4b105ae27a51bea9 31-Oct-2016 Lajos Molnar <lajos@google.com> stagefright: remove allottedSize equality check in IOMX::useBuffer am: 58388aa7be am: 9d44880eb2 am: 75a1b054fd am: 4159ad155a am: d99250c134
am: b7b58a2ea5

Change-Id: Id9ae020da62ef86c56dfd1d78017912f07d346f4
b7b58a2ea5e36463530fdd163833db53fd8a1af4 31-Oct-2016 Lajos Molnar <lajos@google.com> stagefright: remove allottedSize equality check in IOMX::useBuffer am: 58388aa7be am: 9d44880eb2 am: 75a1b054fd am: 4159ad155a
am: d99250c134

Change-Id: I075f26cc1475905a230b14c518692630e0000c2e
d99250c1346ce2f9a29a93310c505433e2a28e94 31-Oct-2016 Lajos Molnar <lajos@google.com> stagefright: remove allottedSize equality check in IOMX::useBuffer am: 58388aa7be am: 9d44880eb2 am: 75a1b054fd
am: 4159ad155a

Change-Id: Ib0e8e83da0d5802c3d08ddb36de082597067c35f
4159ad155afdac83b6c3a0deb267dc02c9201c22 31-Oct-2016 Lajos Molnar <lajos@google.com> stagefright: remove allottedSize equality check in IOMX::useBuffer am: 58388aa7be am: 9d44880eb2
am: 75a1b054fd

Change-Id: I8cbbd33b9241d5943ae287acbedebb50e4aa68b4
75a1b054fd6291d167dcaa4a41d5edea08e9d9c8 31-Oct-2016 Lajos Molnar <lajos@google.com> stagefright: remove allottedSize equality check in IOMX::useBuffer am: 58388aa7be
am: 9d44880eb2

Change-Id: I8704c2839ace12e75c82fff5afa713a3bf6d8bec
9d44880eb295c107b65d42326571ac226807c9de 31-Oct-2016 Lajos Molnar <lajos@google.com> stagefright: remove allottedSize equality check in IOMX::useBuffer
am: 58388aa7be

Change-Id: I828fa720f61e8f823ddec7c33b0db05683b76058
fd27cc04a3eafab479d635ef058756c56bfbad5f 31-Oct-2016 Hangyu Kuang <hkuang@google.com> Merge "media: Use audio timestamp for recording."
d4855ba417bcc0f9c50ea813dca51c8e33e84175 31-Oct-2016 Wonsik Kim <wonsik@google.com> Merge "stagefright: fix buffer array population for secure input"
d72ffc4416959d2c94838888c781468b2351716d 28-Oct-2016 Wei Jia <wjia@google.com> Merge "BatteryNotifier: attribute battery usage of video to correct uid."
4f998cdef97b9c027f145b2da5c48278e19c3d33 27-Oct-2016 Hangyu Kuang <hkuang@google.com> media: Use audio timestamp for recording.

Test: Manual test.

Bug: 32243250
Change-Id: Iac9009acf1c86388e835975f83f91d40cbffb22f
udioSource.cpp
f2ae3e19080938db8cbf29a963fd744a3964fcc2 28-Oct-2016 Wei Jia <wjia@google.com> BatteryNotifier: attribute battery usage of video to correct uid.

Test: manual check batterystats
Bug: 32361950
Change-Id: Id052220e87f6667ca908d5bf6be6164dc8c14c53
ediaCodec.cpp
0d6c24d4bd42c279af02825f09436e9c3a9cc84f 28-Oct-2016 Wonsik Kim <wonsik@google.com> mpeg2ts: report estimated duration only when stabilized

Bug: 31964524
Test: adb shell am instrument -w -r -e class com.android.mediaframeworktest.stress.MediaPlayerStressTest com.android.mediaframeworktest/.MediaPlayerStressTestRunner
Change-Id: Iddd0236cf8ebd58fce76f57802d5429429070f25
peg2ts/MPEG2TSExtractor.cpp
14e8740f39a707898cd0f7d476ec39ab44eaec38 28-Oct-2016 Wonsik Kim <wonsik@google.com> stagefright: fix buffer array population for secure input

Bug: 32474779
Test: Play secure content in Play Movies app
Change-Id: I89c99c7d8ed9fe88f756579447ec4bbf886be59f
ediaCodec.cpp
d4370268adbbb95eca7a518a55abe42678df93ef 27-Oct-2016 Chong Zhang <chz@google.com> Merge "IOMX: consolidate buffer passing on IOMX"
2817be0fad2330cb040aef33ceb309ce273863c5 20-Oct-2016 Marco Nelissen <marcone@google.com> DO NOT MERGE SimpleDecodingSource: fix handling of Vorbis buffers

The Vorbis decoder needs the number of samples in a page added to
the end of the encoded data, which SimpleDecodingSource wasn't doing.
This affected Vorbis decoding using OpenSL ES.

Bug: 32258336
Test: ran CTS and OpenSLES tests
Change-Id: I436e4a1ee998ce4581eb540bea8b66154960a4e7
impleDecodingSource.cpp
3fd200feb657c157125e45e30c2a7262e3c0244d 08-Oct-2016 Chong Zhang <chz@google.com> IOMX: consolidate buffer passing on IOMX

- Use OMXBuffer to parcel different buffer types.

- Only leave one useBuffer, emptyBuffer and fillBuffer.

- Remove the update metadata calls.

bug: 31399200
Change-Id: I307e59415c3c5be61772210431bd8225ce6b75a3
Codec.cpp
nclude/OMXNodeInstance.h
mx/GraphicBufferSource.cpp
mx/OMXNodeInstance.cpp
mx/tests/OMXHarness.cpp
3311417b219e5baa6a05e46637e553061fcd7268 27-Oct-2016 Hangyu Kuang <hkuang@google.com> media: Adjust the first video/audio sample time in slow motion.
am: 000d415617

Change-Id: Ie3f0d36dbbce0c50df62acb2a5ce021fdc37f434
13fb57d3762264e39aef7d81a21d920f725bcc97 27-Oct-2016 Marco Nelissen <marcone@google.com> Remove unused libstagefright_yuv

Test: built and booted

Change-Id: I3db16c365b36143fee4aa532dc9cdec0bca612a5
uv/Android.mk
uv/MODULE_LICENSE_APACHE2
uv/NOTICE
uv/YUVCanvas.cpp
uv/YUVImage.cpp
7a987ecdab7e87f916fef28bf991a6183020f1b4 27-Oct-2016 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Remove unneeded links with dynamic libraries"
a257a531c0e865f8e3ece89cee15b40d93cb5199 27-Oct-2016 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Stagefright: add a NULL check before accessing camera params"
58388aa7be1c6963eb4b8464d46938ba9b0a04b0 27-Oct-2016 Lajos Molnar <lajos@google.com> stagefright: remove allottedSize equality check in IOMX::useBuffer

This was meant for buffers shared cross-process, but we are not gaining
anything from this check even if it was at the correct place.

Bug: 32436178
Change-Id: I6919e8ac6e35092273e171f49f6711ba577ba2e6
mx/OMXNodeInstance.cpp
5737a69a910de65b67d2703bcb18d6d8058ebe48 27-Oct-2016 TreeHugger Robot <treehugger-gerrit@google.com> Merge "media: Adjust the first video/audio sample time in slow motion."
000d4156172b2595a47a6005f64af71055e128d7 26-Oct-2016 Hangyu Kuang <hkuang@google.com> media: Adjust the first video/audio sample time in slow motion.

Test: Manual test.

Bug: 32243250
Change-Id: I9469d6f9929ca67f2f12e658382bc76e7236b256
udioSource.cpp
mx/GraphicBufferSource.cpp
6f6555a169316f1b9e2acda2b8e7042e285de310 27-Oct-2016 Wonsik Kim <wonsik@google.com> Merge "MediaCodec refactoring part 1-c: buffer ownership"
2d1bcf2b8f2f23e204adcca45ca134247bdf87f9 02-Oct-2015 Praveen Chavan <pchavan@codeaurora.org> Stagefright: add a NULL check before accessing camera params

Camera may return NULL params if the remote object is dead.
Check for NULL and report error rather than crash.

Change-Id: Id1fcd04dc187aadf00ca4ec5e48fb495c3369c92
CRs-Fixed: 906099
ameraSource.cpp
bd83e4b3e77b31e089832bcfbebde086392216c9 26-Oct-2016 Hangyu Kuang <hkuang@google.com> media: Adjust the first video/audio sample time in slow motion.

Test: Manual test.

Bug: 32243250
Change-Id: I9469d6f9929ca67f2f12e658382bc76e7236b256
udioSource.cpp
mx/GraphicBufferSource.cpp
c661ae6165338fd5f0bca50a63058b4bcd6def4b 25-Oct-2016 Marco Nelissen <marcone@google.com> Remove unneeded links with dynamic libraries

Various media components were linking against dynamic libraries that weren't needed.

Test: built and booted

Change-Id: I7379506fd06d4e28e0eff0001fd073a2d3860f8e
ndroid.mk
odecs/avc/enc/Android.mk
odecs/avcenc/Android.mk
odecs/g711/dec/Android.mk
odecs/gsm/dec/Android.mk
odecs/m4v_h263/enc/Android.mk
odecs/on2/enc/Android.mk
mx/Android.mk
ifi-display/Android.mk
9270397b832d7acd670ed704008290f7f96f81a8 26-Oct-2016 TreeHugger Robot <treehugger-gerrit@google.com> Merge "stagefright: report only highest levels of a profile for soft codec"
fd44d8e2f2d37184f7add67125657f3fbfb5a085 20-Oct-2016 Wonsik Kim <wonsik@google.com> MediaCodec refactoring part 1-c: buffer ownership

- Buffers are (roughly) owned by themselves.
- As a corollary, remove output format change related events
and replace by inspecting formats associated with each buffers.

Bug: 32133435
Test: gts-tradefed run gts -m GtsExoPlayerTestCases
Test: (manual) Run Play Movies app to play a secure content.
Change-Id: I6b57da61c2d71acd0d5be4281de823ba1c95b72f
Codec.cpp
ufferImpl.cpp
ediaCodec.cpp
ilters/MediaFilter.cpp
nclude/SecureBuffer.h
nclude/SharedMemoryBuffer.h
875bbc8f48f10f083e3fae9b8e44d4c394e2cdf1 30-Apr-2016 Lajos Molnar <lajos@google.com> stagefright: Codec2 unit tests for C2Param

Unit tests for C2Params, and param utils

Bug: 30262321
Change-Id: I589f639eae8904a2d17a0f63d07f5479aa14772f
odec2/tests/Android.mk
odec2/tests/C2Param_test.cpp
odec2/tests/C2_test.cpp
odec2/tests/vndk/C2UtilTest.cpp
11ca9ffc72a9d7c628353c1a9295d3b23ec51d22 26-Oct-2016 Lajos Molnar <lajos@google.com> stagefright: add param utils for Codec2 VNDK

Utility macros to implement enumeration reflection

Bug: 30262321
Change-Id: I31b413d9de3823b16a0e5a30e0d335762e234364
odec2/vndk/include/util/C2ParamUtils.h
odec2/vndk/include/util/_C2MacroUtils.h
29a6ba9949e4127a9c6df2cc75033dbe97f501a9 22-Mar-2016 Lajos Molnar <lajos@google.com> stagefright: Codec2 API Preview

Initial source draft of Codec2 API.

Bug: 30262321
Change-Id: Ibb96080d667352b0a9798e4014c7ecceb8dddd7b
odec2/Android.mk
odec2/C2.cpp
odec2/include/C2.h
odec2/include/C2Buffer.h
odec2/include/C2Component.h
odec2/include/C2Config.h
odec2/include/C2Param.h
odec2/include/C2ParamDef.h
odec2/include/C2Work.h
fa92ed0391a722a401b6f050d941032764a8639d 26-Oct-2016 Robert Shih <robertshih@google.com> Merge "FLACExtractor: copy protect mWriteBuffer" am: f521451f62 am: f5a4013d7a am: 3b70dd2d2d
am: e760461493

Change-Id: I9a1a6d457547c79d1e1491b5377cc8139283bdfc
f5a4013d7a42f62254c913fb2e8ba4a8e56b48f5 26-Oct-2016 Robert Shih <robertshih@google.com> Merge "FLACExtractor: copy protect mWriteBuffer"
am: f521451f62

Change-Id: Ie46c44142ea7f397529c3149e89b6d0a3ae71cf0
f521451f6252404b8fd0880bfe4dbddb8e687ede 26-Oct-2016 Robert Shih <robertshih@google.com> Merge "FLACExtractor: copy protect mWriteBuffer"
7dcfadf407b3e3fb697d8c748168aba6eda33519 25-Oct-2016 Marco Nelissen <marcone@google.com> Merge "Prefer software codec with debug property" am: 829b2a0bf0 am: 78d6bc884c am: 35f53af1da
am: 7160af44fd

Change-Id: I91a9766daaf548f91952295f1dd9e4d42a386131
78d6bc884cc0b453ffc68cbeb1ceb1497cf9ee85 25-Oct-2016 Marco Nelissen <marcone@google.com> Merge "Prefer software codec with debug property"
am: 829b2a0bf0

Change-Id: Ib5cc5065540f48efaebeb02ecd1bd8036f0e56d1
829b2a0bf09d6d18d7ee30886f553fa20dcab1d0 25-Oct-2016 Treehugger Robot <treehugger-gerrit@google.com> Merge "Prefer software codec with debug property"
acc192347665943ca674acf117e4f74a88436922 24-Oct-2016 Robert Shih <robertshih@google.com> FLACExtractor: copy protect mWriteBuffer

Bug: 30895578
Change-Id: I4cba36bbe3502678210e5925181683df9726b431
LACExtractor.cpp
a97a272859d81c931bcf8f1b4219295c63cdaf18 25-Oct-2016 Harish Mahendrakar <harish.mahendrakar@ittiam.com> Merge "SoftAVCDec: Handle interlaced streams where two fields are sent in one input" am: 460dcb750d am: ba46fa9310 am: a5c08f7c51
am: 3778c8e178

Change-Id: I4331b151daff55526e6552c40fb52a4962fa8ce6
ba46fa9310d66239d7f4e0d1d7097b41c0e5869e 25-Oct-2016 Harish Mahendrakar <harish.mahendrakar@ittiam.com> Merge "SoftAVCDec: Handle interlaced streams where two fields are sent in one input"
am: 460dcb750d

Change-Id: I8dc483438793d73cbe2b403c085da5310740562f
62af0c3fafa9a256c4251aa9fdbf56a260ec55b7 25-Oct-2016 Marco Nelissen <marcone@google.com> Prefer software codec with debug property

Change-Id: Ifc44a1dee79142d13393eac3c0750b9874b46a8f
ediaCodecList.cpp
dd6e6a250846653a7661219fe7033b87d1181eb5 20-Oct-2016 Harish Mahendrakar <harish.mahendrakar@ittiam.com> SoftAVCDec: Handle interlaced streams where two fields are sent in one input

When both fields are sent in a single input buffer, only the first field was
being decoded. Fix this by not releasing input buffer when some bytes are still
left unused in the input buffer.
If both fields are sent in a separate call, decoder handles that correctly and
returns an output frame for every two fields

Bug: 32364044
Test: Manually tested by decoding clip attached in the above bug

Change-Id: Idab5acd9cbaefc5d2560a70d375f3a532d9e78eb
odecs/avcdec/SoftAVCDec.cpp
odecs/avcdec/SoftAVCDec.h
792997afead8fefe6978cf59940e74bb68e71824 24-Oct-2016 Chong Zhang <chz@google.com> stagefright: report only highest levels of a profile for soft codec

bug: 32378519
Change-Id: If42d8fb1114c9af060bff27bd4237623a6f2d8a4
odecs/avcdec/SoftAVCDec.cpp
odecs/hevcdec/SoftHEVC.cpp
odecs/mpeg2dec/SoftMPEG2.cpp
8d8aec77e6e8a63dac4f9ad6327ba7f43881a25b 19-Oct-2016 TreeHugger Robot <treehugger-gerrit@google.com> Merge "IOMX: move max pts gap handling to OMX"
124f54a23dcd3e8b58152d2d0a51c8bf462db6c7 19-Oct-2016 Lajos Molnar <lajos@google.com> Merge "stagefright: unblock stop if already in error state"
3604cb1a5548694393c7b7a87191eb517bebaa47 10-Oct-2016 Chong Zhang <chz@google.com> IOMX: move max pts gap handling to OMX

bug: 31399200

Change-Id: I52177d6826caeedf670ecf3e6d0ff85d0e3bf1df
Codec.cpp
nclude/OMXNodeInstance.h
mx/GraphicBufferSource.cpp
mx/GraphicBufferSource.h
mx/OMXNodeInstance.cpp
5d552fb812bebc3f15c7fe91a3e315a97e3ffb34 24-Sep-2016 Chong Zhang <chz@google.com> stagefright: unblock stop if already in error state

If we received an error from component during stopping, or we
already have a sticky error when we received a stop request,
post reply with error immediatly to unblock the client.

Internally, we process the stop as usual and stay in STOPPING
state. If the client doesn't do anything after that, we wait
for the component's shutdown complete. (It's possible it never
completes, and we leak the resouce; but that's still better than
leaking the resource AND have the app ANR.) If the app initiates
release or reset, we'll release with timeout.

bug: 31671152
Change-Id: I8b7ada773c1fff77aff736efd40087bd3e9b178e
ediaCodec.cpp
5874853970818cc7fe039a4a8724da4ef8fc6d61 18-Oct-2016 Viraj Karandikar <vkarandikar@nvidia.com> Merge "WAVExtractor: support ambisonic subformat" am: 5d7e276b21 am: c1cf4c1b51
am: d15df506e8

Change-Id: Id87034db774ea2c93d33d8f44a4a85e307b5a36c
c1cf4c1b51d9a26f09b67473429f7189f8909f57 18-Oct-2016 Viraj Karandikar <vkarandikar@nvidia.com> Merge "WAVExtractor: support ambisonic subformat"
am: 5d7e276b21

Change-Id: Iaae56344a8831e0dac7a724be5ba3f8e5b098e52
5d7e276b21d39ee62d2f57fa43aa497c5cb87cd2 18-Oct-2016 Treehugger Robot <treehugger-gerrit@google.com> Merge "WAVExtractor: support ambisonic subformat"
65fb65678345f03f38771523b7020f6777eff5c4 18-Oct-2016 Mikhail Naganov <mnaganov@google.com> Merge "Brush up audio parameters usage"
388360c786cdcbec650b79db65c734b8952dfec0 18-Oct-2016 Mikhail Naganov <mnaganov@google.com> Brush up audio parameters usage

It is preferred to use the constants from AudioParameter
(which can now serve as an abstraction layer similar to libaudiohal).

Grepped for usages of defines and just string values
and replaced with references to AudioParameter.

Since the parameter definitions are being moved to system/audio.h,
update includes in AudioParemeter and stagefright Utils.

Change-Id: I2addb983707d866b16f39d45d0e14b802595e292
Test: make
tils.cpp
e7557336920ca7e7d53e8ccc03d23359b41957af 18-Oct-2016 Glenn Kasten <gkasten@google.com> Remove executable bit from ordinary files

Test: builds OK
Change-Id: I7912c9c9c85dc500d33698fc174ba2a0db387407
odecs/on2/h264dec/omxdl/arm_neon/ARM_DELIVERY.TXT
odecs/on2/h264dec/omxdl/arm_neon/ARM_MANIFEST.TXT
odecs/on2/h264dec/omxdl/arm_neon/filelist_vc.txt
odecs/on2/h264dec/omxdl/arm_neon/vc/comm/src/omxVCCOMM_Copy16x16_s.s
odecs/on2/h264dec/omxdl/arm_neon/vc/comm/src/omxVCCOMM_Copy8x8_s.s
odecs/on2/h264dec/omxdl/arm_neon/vc/comm/src/omxVCCOMM_ExpandFrame_I_s.s
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/armVCM4P10_Average_4x_Align_unsafe_s.s
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/armVCM4P10_DeblockingChroma_unsafe_s.s
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/armVCM4P10_DeblockingLuma_unsafe_s.s
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/armVCM4P10_DecodeCoeffsToPair_s.s
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/armVCM4P10_DequantTables_s.s
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/armVCM4P10_InterpolateLuma_Align_unsafe_s.s
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/armVCM4P10_InterpolateLuma_Copy_unsafe_s.s
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/armVCM4P10_InterpolateLuma_DiagCopy_unsafe_s.s
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/armVCM4P10_InterpolateLuma_HalfDiagHorVer4x4_unsafe_s.s
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/armVCM4P10_InterpolateLuma_HalfDiagVerHor4x4_unsafe_s.s
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/armVCM4P10_InterpolateLuma_HalfHor4x4_unsafe_s.s
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/armVCM4P10_InterpolateLuma_HalfVer4x4_unsafe_s.s
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/armVCM4P10_Interpolate_Chroma_s.s
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/armVCM4P10_QuantTables_s.s
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/armVCM4P10_TransformResidual4x4_s.s
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/armVCM4P10_UnpackBlock4x4_s.s
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/omxVCM4P10_DequantTransformResidualFromPairAndAdd_s.s
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/omxVCM4P10_FilterDeblockingLuma_HorEdge_I_s.s
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/omxVCM4P10_FilterDeblockingLuma_VerEdge_I_s.s
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/omxVCM4P10_InterpolateLuma_s.s
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/omxVCM4P10_PredictIntraChroma_8x8_s.s
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/omxVCM4P10_PredictIntra_16x16_s.s
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/omxVCM4P10_PredictIntra_4x4_s.s
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/omxVCM4P10_TransformDequantChromaDCFromPair_s.s
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/omxVCM4P10_TransformDequantLumaDCFromPair_s.s
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p2/src/armVCM4P2_Clip8_s.s
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p2/src/armVCM4P2_DecodeVLCZigzag_AC_unsafe_s.s
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p2/src/armVCM4P2_SetPredDir_s.s
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p2/src/omxVCM4P2_DecodePadMV_PVOP_s.s
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p2/src/omxVCM4P2_DecodeVLCZigzag_Inter_s.s
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p2/src/omxVCM4P2_DecodeVLCZigzag_IntraACVLC_s.s
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p2/src/omxVCM4P2_DecodeVLCZigzag_IntraDCVLC_s.s
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p2/src/omxVCM4P2_FindMVpred_s.s
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p2/src/omxVCM4P2_IDCT8x8blk_s.s
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p2/src/omxVCM4P2_MCReconBlock_s.s
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p2/src/omxVCM4P2_PredictReconCoefIntra_s.s
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p2/src/omxVCM4P2_QuantInvInter_I_s.s
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p2/src/omxVCM4P2_QuantInvIntra_I_s.s
odecs/on2/h264dec/source/arm11_asm/h264bsd_interpolate_chroma_hor.s
odecs/on2/h264dec/source/arm11_asm/h264bsd_interpolate_chroma_hor_ver.s
odecs/on2/h264dec/source/arm11_asm/h264bsd_interpolate_chroma_ver.s
odecs/on2/h264dec/source/arm11_asm/h264bsd_interpolate_hor_half.s
odecs/on2/h264dec/source/arm11_asm/h264bsd_interpolate_hor_quarter.s
odecs/on2/h264dec/source/arm11_asm/h264bsd_interpolate_hor_ver_quarter.s
odecs/on2/h264dec/source/arm11_asm/h264bsd_interpolate_mid_hor.s
odecs/on2/h264dec/source/arm11_asm/h264bsd_interpolate_ver_half.s
odecs/on2/h264dec/source/arm11_asm/h264bsd_interpolate_ver_quarter.s
mx/SoftOMXPlugin.cpp
bc08b17c57959110c56030d3d49d338bdd7cd8a6 07-Oct-2016 Marco Nelissen <marcone@google.com> DO NOT MERGE Fix divide by zero

and be stricter about the layout of various boxes in mp4 files.

Bug: 31318219
Change-Id: I935bf2a6f29c5c7990acbb0cc8386f40144b14fc
PEG4Extractor.cpp
625300bfb3740b3357f9da10d951e2bb6b3f6758 14-Oct-2016 Wei Jia <wjia@google.com> Merge "NuPlayer: use width and height from tkhd for display and thumbnail."
1f4493426ee68360636464cc0b5d7068af195ebd 14-Oct-2016 Robert Shih <robertshih@google.com> Merge "rtsp: fix live stream duration reporting"
7b01847d0e7211989e8b452976258356afcd45d4 14-Oct-2016 TreeHugger Robot <treehugger-gerrit@google.com> Merge "MediaCodec refactoring part 1-b: secure buffers"
4811923e80a8abefa278307ebf8cc9b0294ba67f 13-Oct-2016 Wonsik Kim <wonsik@google.com> MediaCodec refactoring part 1-b: secure buffers

- Define SecureBuffer to encapsulate secure buffers containing
decrypted data.
- ACodec and MediaCodec use SecureBuffer to communicate between
themselves.

Bug: 32133435
Test: Play an encrypted content in Play Movies
Change-Id: Ic70f7f78aad15bd91ab8ccd31c340bc7964ab1b3
Codec.cpp
ufferImpl.cpp
ediaCodec.cpp
nclude/SecureBuffer.h
522d9acee29d7ffe32b7ddf5a2491077f7b4d25f 14-Oct-2016 Robert Shih <robertshih@google.com> HTTPLiveSource: implement getFormatMeta am: a83eebb78c am: 7c55dd0c5b
am: 8b7065b604

Change-Id: Ia5e9caef1020a81ab5914dcecd787707783938a1
8b7065b60493c06c7d9d676283869fef895a9bec 14-Oct-2016 Robert Shih <robertshih@google.com> HTTPLiveSource: implement getFormatMeta am: a83eebb78c
am: 7c55dd0c5b

Change-Id: Ifc927603a8c35f27cd58a1f0ce92ee92e99f1025
7c55dd0c5bdab4fbc86185787d23c2adcba8e8f1 14-Oct-2016 Robert Shih <robertshih@google.com> HTTPLiveSource: implement getFormatMeta
am: a83eebb78c

Change-Id: If4e85e963ae832a9f16c69fd7a5d6bbeb07789bf
0afc0f8f3c2418b85ab4b3d27a8e8b7deef58c4b 14-Oct-2016 Robert Shih <robertshih@google.com> Merge "HTTPLiveSource: implement getFormatMeta" into nyc-mr1-dev
7e074a8b7548ac769d1f55addacd97f885651b0d 14-Oct-2016 Robert Shih <robertshih@google.com> rtsp: fix live stream duration reporting

Bug: 28234978
Change-Id: If5be85cd92f4da2b711dc9409abd812ebf910a64
tsp/APacketSource.cpp
bd027c54192eea0c5f4f20533cd86e8d5a61df59 14-Oct-2016 Marco Nelissen <marcone@google.com> Fix divide by zero am: 0d13824315 am: c2aef83feb
am: c31b3b7d3b

Change-Id: I66a130f444fad9703fa94d10aebc91989e1ca739
5640bbf0445fba4128e15b830a0fcdc1767cf8c1 14-Oct-2016 TreeHugger Robot <treehugger-gerrit@google.com> Merge "IOMX: do not allocate if output port is in metadata mode"
c3c3ae039adff5c1e2879d209f90e3fcf123d0e7 14-Oct-2016 Marco Nelissen <marcone@google.com> DO NOT MERGE Fix divide by zero am: 2e211d38a3 am: 52e86acf03
am: 1607de251e

Change-Id: I84dd33f0ee5aa386a79c537e556762b1feda8842
c31b3b7d3b666fb19c87e022b590d695ca16042d 14-Oct-2016 Marco Nelissen <marcone@google.com> Fix divide by zero am: 0d13824315
am: c2aef83feb

Change-Id: Ib94af4f98542dd11b4f41231031bea2954fb04e2
1b3f61ceaf06da408baf558e30bda0fd08435f40 14-Oct-2016 Marco Nelissen <marcone@google.com> DO NOT MERGE Fix divide by zero am: febbd52cd9
am: 55ce7e5d1e

Change-Id: I792667b35aacfa1b910a332d855f002615041408
1607de251e9ebe514ce3d5f2270516de3e116660 14-Oct-2016 Marco Nelissen <marcone@google.com> DO NOT MERGE Fix divide by zero am: 2e211d38a3
am: 52e86acf03

Change-Id: I866eb4f2537b3297090158f160f448861b47a527
f3e1e8c0b1ee32768ee04b308756ef6ac878d8cf 14-Oct-2016 Marco Nelissen <marcone@google.com> Fix divide by zero am: 0d13824315
am: 3fdf964302

Change-Id: I66f18bf3efc32dc2081e0b785d080f50e7dcea1f
3fdf96430241a813a33e53aa62fd1d04d0f9e6da 14-Oct-2016 Marco Nelissen <marcone@google.com> Fix divide by zero
am: 0d13824315

Change-Id: I5f2a6eb52c5abe01467da3e276365c0db30c0ae9
55ce7e5d1e1860220a7a39859c513d67d21f2f66 14-Oct-2016 Marco Nelissen <marcone@google.com> DO NOT MERGE Fix divide by zero
am: febbd52cd9

Change-Id: I229ab9fee73b63493c4e61493de6183857ef886a
c2aef83febfafc8e64c183c342625e9d4e4999be 14-Oct-2016 Marco Nelissen <marcone@google.com> Fix divide by zero
am: 0d13824315

Change-Id: Ic1a3c8e78999c268a330505e92835d8c4733cbf9
52e86acf03cbdb64626c72563fa289e553744f95 14-Oct-2016 Marco Nelissen <marcone@google.com> DO NOT MERGE Fix divide by zero
am: 2e211d38a3

Change-Id: I774eeec61319489b2976d6bd1474c7d8f7ef4e93
12416c4125c4abadf67537d939fda12bbd3240d9 07-Oct-2016 Marco Nelissen <marcone@google.com> Fix divide by zero

and be stricter about the layout of various boxes in mp4 files.

Bug: 31318219
Change-Id: I50034d5b6b1967ca6e88aabeacf49f26ba3c0d32
PEG4Extractor.cpp
8996f41189c63869fa3dbeef3823c15b246ae795 14-Oct-2016 Marco Nelissen <marcone@google.com> Merge "Fix divide by zero" into nyc-dev
ec206acb995d5796e39144847606f3ab9338b86c 14-Oct-2016 Marco Nelissen <marcone@google.com> Merge "DO NOT MERGE Fix divide by zero" into mnc-dev
2c28e5b1266a12163fed8236d34830f69f8216a2 14-Oct-2016 Marco Nelissen <marcone@google.com> Merge "DO NOT MERGE Fix divide by zero" into klp-dev
df6c6af2634ef9e2495e129d9608ffa60d8e7f5a 29-Sep-2016 Wei Jia <wjia@google.com> NuPlayer: use width and height from tkhd for display and thumbnail.

Bug: 29061766
Change-Id: I863219e20986da1319bc5e84f35feb76ae038a69
tagefrightMetadataRetriever.cpp
tils.cpp
a83eebb78c3a7d57a769dac965b17a8aad7c7b8f 14-Oct-2016 Robert Shih <robertshih@google.com> HTTPLiveSource: implement getFormatMeta

Bug: 32113727
Change-Id: I10eafd4cf428f5fee6ada7213627ca7119cbf0e7
ttplive/LiveSession.cpp
ttplive/LiveSession.h
ecc97eb44a0675974fcf43b0c68edaaa539d2996 13-Oct-2016 Chong Zhang <chz@google.com> IOMX: do not allocate if output port is in metadata mode

We used to always use useBuffer() for output meta. If we let
the component allocate, some components (eg. secure decoder)
could give us a buffer that we can't update.

bug: 32136559
Change-Id: I1eefe5cbde2d0b1944ff3e72e31663693f6c1fdb
Codec.cpp
mx/OMXNodeInstance.cpp
52dd2e30b204949353c2dee0b1f1712677bbda43 13-Oct-2016 Andy Hung <hunga@google.com> Merge "AudioTrack: Advance timestamp time during pause"
0e81a7be52ee4fa3a39803e765aade9da1ffe2b0 13-Oct-2016 Pawin Vongmasa <pawin@google.com> MPEG4Extractor: Check mLastTrack before parsing btrt box. am: fd9cc97d4d am: 7ea893f684
am: 90b26ed8c9

Change-Id: I53eeaf5c71f1ecf222933a9a484cd7a6f426fd3c
90b26ed8c9a49e41371c5c1aec817e759ee0ad0f 13-Oct-2016 Pawin Vongmasa <pawin@google.com> MPEG4Extractor: Check mLastTrack before parsing btrt box. am: fd9cc97d4d
am: 7ea893f684

Change-Id: I3251216e254952e7ef044a4cbe0b43b746aa4b7c
f1e84ca8583b365fdfd47366fdea2ee54313a26d 13-Oct-2016 Pawin Vongmasa <pawin@google.com> DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing. am: de84a76b86
am: 2c76c56d56

Change-Id: I24c8963da1f34e724213bbb896722a06d1eca378
378445adb9b827b7ecb9ae6527df00f3e1ea8dfe 13-Oct-2016 Pawin Vongmasa <pawin@google.com> MPEG4Extractor: Check mLastTrack before parsing btrt box. am: fd9cc97d4d
am: 441b53063f

Change-Id: I59ffede80483146bdd734d7780bd8b9bdbee49fc
7ea893f684081253bbc7ff361d091aeeef8732ef 13-Oct-2016 Pawin Vongmasa <pawin@google.com> MPEG4Extractor: Check mLastTrack before parsing btrt box.
am: fd9cc97d4d

Change-Id: If5c785d1d26231e71007de13a25d34cdf6eff8f8
2c76c56d5612afea04987269f5fa613c19366f12 13-Oct-2016 Pawin Vongmasa <pawin@google.com> DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing.
am: de84a76b86

Change-Id: I7bfde467167616b191ac1d75f3ea08f1ba78089b
441b53063f947cba92871244371a70f700a9c232 13-Oct-2016 Pawin Vongmasa <pawin@google.com> MPEG4Extractor: Check mLastTrack before parsing btrt box.
am: fd9cc97d4d

Change-Id: I85a17cebc6613d27e4f327f4ac82654f62098cdb
253b1780556f431526028b23dfefbe4edb8294db 13-Oct-2016 Pawin Vongmasa <pawin@google.com> Merge "MPEG4Extractor: Check mLastTrack before parsing btrt box." into nyc-dev
622fd04e8856a8074440cfc28606005eeb38fd17 13-Oct-2016 Pawin Vongmasa <pawin@google.com> Merge "DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing." into lmp-mr1-dev
b6ba3d7e47b72e68c50d47dbe5ba98702b8bf448 13-Oct-2016 Pawin Vongmasa <pawin@google.com> Merge "DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing." into lmp-dev
8caef852351b04b69e0962277f97166142535867 13-Oct-2016 Pawin Vongmasa <pawin@google.com> Merge "DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing." into klp-dev
116974f01ad54d88a24f8e7af5334aff18fa199e 13-Oct-2016 TreeHugger Robot <treehugger-gerrit@google.com> Merge "IOMX: consolidate createInputSurface APIs"
addf2cbb120346ae42e78fa739245a353db5edad 29-Sep-2016 Chong Zhang <chz@google.com> IOMX: consolidate createInputSurface APIs

- Create GraphicBufferSource in IOMX regardless of persistency.

- Remove createInputSurface on IOMXNode, only keep setInputSurface
which accepts either a persistent or non-persistent surface.

- Instead of holding a IGraphicBufferConsumer, hold
IGraphicBufferSource across session as the persistent surface.

- Fix up GraphicBufferSource to allow usage across sessions.
GraphicBufferSource itself becomes agnostic to persistency.

- Remove max encoder input buffers profiling code.

bug: 31399200
Change-Id: I15ed52cc64509fd87736372a580abf7b51bf4de7
Codec.cpp
ediaCodec.cpp
ediaCodecList.cpp
ediaCodecListOverrides.cpp
ediaCodecSource.cpp
nclude/OMX.h
nclude/OMXNodeInstance.h
mx/GraphicBufferSource.cpp
mx/GraphicBufferSource.h
mx/OMX.cpp
mx/OMXNodeInstance.cpp
6616cf9e18f16493285f7416e1f06552aa453508 12-Oct-2016 Lajos Molnar <lajos@google.com> stagefright: don't fail MediaCodec.configure if clients use store-meta key am: afb20c3102 am: d9f6b22189 am: 1c44a2ed66
am: efe63962a7

Change-Id: Id22c6f78db4d457c281ab9db7c214236c2bdb18d
efe63962a70088f0dae5c1fb519f0f47565480bd 12-Oct-2016 Lajos Molnar <lajos@google.com> stagefright: don't fail MediaCodec.configure if clients use store-meta key am: afb20c3102 am: d9f6b22189
am: 1c44a2ed66

Change-Id: I5ef2909336c4264e22c4216b64fccc46ea654c19
ea35b4e1c2d88e48ab7e292dc02a972712ffb14f 12-Oct-2016 Lajos Molnar <lajos@google.com> stagefright: don't fail MediaCodec.configure if clients use store-meta key am: ae52fd383a am: 0854507c13
am: 90fc141bd3

Change-Id: I4ffa2885d17b62e1c98d17de6e2bd44e3b461e13
1c44a2ed6652b63420c861a9c58fc452d9c3cc51 12-Oct-2016 Lajos Molnar <lajos@google.com> stagefright: don't fail MediaCodec.configure if clients use store-meta key am: afb20c3102
am: d9f6b22189

Change-Id: If02cd075a28e4b96fa1c311547a8837d67e848d5
90fc141bd3e538eeb2ba67f3f4daec77a056f48e 12-Oct-2016 Lajos Molnar <lajos@google.com> stagefright: don't fail MediaCodec.configure if clients use store-meta key am: ae52fd383a
am: 0854507c13

Change-Id: I59a8a6be219809204f6da9e02f1f02b7a1b097e8
0854507c138be6e794348c32cf40c8dd0e0bc507 12-Oct-2016 Lajos Molnar <lajos@google.com> stagefright: don't fail MediaCodec.configure if clients use store-meta key
am: ae52fd383a

Change-Id: I5c510313cdea7f6d118e2999fc78ac0c7f6df4a0
56e2689a646d21fd318de9f6d2a84ea0be82097d 11-Oct-2016 Marco Nelissen <marcone@google.com> Merge "Don't CHECK when metadata is missing mime type"
5d313803bdd61d59f28e518e7a793f33832f1901 11-Oct-2016 Andy Hung <hunga@google.com> AudioTrack: Advance timestamp time during pause

Update MediaPlayer code to match.

This will change the behavior on the AudioTrack Java side,
but is within the API and should make timestamp handling easier.

Test: Photos app with pause and play.
Bug: 30502030
Change-Id: I0e9129ce6af5b920ad71e63ad0c205de7561acf2
ediaSync.cpp
ae52fd383a43ac239f459078fd003ce8ac2efb55 11-Oct-2016 Lajos Molnar <lajos@google.com> stagefright: don't fail MediaCodec.configure if clients use store-meta key

Even though storing metadata is not supported in MediaCodec.configure and
is only meant to be used by Stagefright recorder, don't fail configure.

Bug: 31986922
Change-Id: Id9f083be6e857e7a0d8d4a74159be5b8894e28be
Codec.cpp
afb20c310207aa4380f0578545ffce993ded23da 11-Oct-2016 Lajos Molnar <lajos@google.com> stagefright: don't fail MediaCodec.configure if clients use store-meta key

Even though storing metadata is not supported in MediaCodec.configure and
is only meant to be used by Stagefright recorder, don't fail configure.

Bug: 31986922
Change-Id: Id9f083be6e857e7a0d8d4a74159be5b8894e28be
Codec.cpp
ea07b85ee0f16ff6ea4f53d375d3e95ef010c8ed 11-Oct-2016 Wei Jia <wjia@google.com> MPEG4Extractor: set mime type of fileMetaData correctly. am: 55fe26abb4 am: f9279fbd57
am: d664ec34dc

Change-Id: I69b25594c10a45c2c0b2017260795bfe3b5a55db
d664ec34dc50a2ac4b93123b3fe02735ce27f1e3 11-Oct-2016 Wei Jia <wjia@google.com> MPEG4Extractor: set mime type of fileMetaData correctly. am: 55fe26abb4
am: f9279fbd57

Change-Id: I745cdbbed56521a1babbe01b4d28c886b6a77760
f9279fbd5702f286bbd05196434e181bd1531e61 11-Oct-2016 Wei Jia <wjia@google.com> MPEG4Extractor: set mime type of fileMetaData correctly.
am: 55fe26abb4

Change-Id: Iae30f0bf202196aed7dd155202603c7adb2903e9
6657f7baa8dd85e27b6cd10d5dad471c37246541 11-Oct-2016 TreeHugger Robot <treehugger-gerrit@google.com> Merge "MPEG4Extractor: set mime type of fileMetaData correctly." into nyc-mr1-dev
e480de88a00d44e1c413a7e0902091475bd9bffe 10-Oct-2016 Marco Nelissen <marcone@google.com> Don't CHECK when metadata is missing mime type

Change-Id: I294eb425e258ffe7e83056ea6d96a6ed31d51d93
tagefrightMetadataRetriever.cpp
55fe26abb4e3fe701c01b130fee4a5919f8edcbf 10-Oct-2016 Wei Jia <wjia@google.com> MPEG4Extractor: set mime type of fileMetaData correctly.

Bug: 32045229
Change-Id: Iaf165e4731296175d361e30597b03beaa1e6e833
PEG4Extractor.cpp
nclude/MPEG4Extractor.h
21b46588d022d0c22d7c7c08e919d7a9c5cd76e3 04-Oct-2016 Chong Zhang <chz@google.com> IOMX: remove allocateBufferWithBackup

Only keep useBuffer. Pass in quirks requirement for now, once
we have access to MediaCodecList XML info in OMX, we can remove
the quirks from IOMX.

Also remove a few unused variables on BufferMeta.

bug: 31399200
Change-Id: I93bef964ce034d4aeb1f5d13a75f130108e4e648
Codec.cpp
nclude/OMXNodeInstance.h
mx/OMXNodeInstance.cpp
mx/tests/OMXHarness.cpp
2715aa16d6c43737cb490738bba7b451d89c82f6 07-Oct-2016 Andy Hung <hunga@google.com> MediaCodecSource: Fix buffer allocation am: 01d1e52558 am: 578f4e60cd
am: 811bc42440

Change-Id: I28ff5f5f8f75d47974c4fbe7849c4e1750e7fd9e
811bc424407084dbad79eecec07f2b51bc9fa55a 07-Oct-2016 Andy Hung <hunga@google.com> MediaCodecSource: Fix buffer allocation am: 01d1e52558
am: 578f4e60cd

Change-Id: Ic0c71b9bc0a4762c30f7985de4727b690af9296f
578f4e60cd75b70e9ad3e6f8d1e202598bb5a25d 07-Oct-2016 Andy Hung <hunga@google.com> MediaCodecSource: Fix buffer allocation
am: 01d1e52558

Change-Id: I03f6976b6615672bfa52f0dc5c60abd7b3f2b3bc
054ad5b3f7f90f70342b237a8e1b01305da3d496 07-Oct-2016 Zach Jang <zachjang@google.com> Merge "MediaCodecSource: Fix buffer allocation" into nyc-mr1-dev
0d13824315b0491d44e9c6eb5db06489ab0fcc20 07-Oct-2016 Marco Nelissen <marcone@google.com> Fix divide by zero

and be stricter about the layout of various boxes in mp4 files.

Bug: 31318219
Change-Id: I50034d5b6b1967ca6e88aabeacf49f26ba3c0d32
PEG4Extractor.cpp
2e211d38a3124849ef46376256d01e69549c422f 07-Oct-2016 Marco Nelissen <marcone@google.com> DO NOT MERGE Fix divide by zero

and be stricter about the layout of various boxes in mp4 files.

Bug: 31318219
Change-Id: I50034d5b6b1967ca6e88aabeacf49f26ba3c0d32
PEG4Extractor.cpp
febbd52cd9f8394b113c3771e6a4403e86844e82 07-Oct-2016 Marco Nelissen <marcone@google.com> DO NOT MERGE Fix divide by zero

and be stricter about the layout of various boxes in mp4 files.

Bug: 31318219
Change-Id: I50034d5b6b1967ca6e88aabeacf49f26ba3c0d32
PEG4Extractor.cpp
72e8bfdde091d78796c297ff708febf2a2cbbf6c 06-Oct-2016 Chong Zhang <chz@google.com> Merge "IOMX: remove nodeBinder from allocateNode"
1d2e9cfbe3f2db16ecafd2adafb4c60d7235a2ce 06-Oct-2016 Chong Zhang <chz@google.com> IOMX: remove nodeBinder from allocateNode

This is no longer needed, the IOMXNode is already a binder,
we can just link to that.

bug: 31399200

Change-Id: Ic5dd5330dab448ae126aaec694f71f22857b3169
Codec.cpp
nclude/OMX.h
mx/OMX.cpp
mx/tests/OMXHarness.cpp
01d1e525584d037b80d7c9ab79010fd2a5b9a870 06-Oct-2016 Andy Hung <hunga@google.com> MediaCodecSource: Fix buffer allocation

Bug: 31976029
Change-Id: I2ded0f8f1d51e63639e0f86376557e3d0d4f1cd3
ediaCodecSource.cpp
09316fdbebc8e2e899f663aa1e4b1bcb0531354d 06-Oct-2016 Glenn Kasten <gkasten@google.com> Merge "LOCAL_CLANG := true is now the default"
95890237a25cb40f138d300cefd82764c76ca556 05-Oct-2016 Chong Zhang <chz@google.com> Merge "IOMX: remove getState() and livesLocally()"
5f5ee1110dd85001b43db7637a97474acfe8d681 16-Aug-2016 Glenn Kasten <gkasten@google.com> LOCAL_CLANG := true is now the default

Test: verify that build has no failures
Change-Id: Ib249b276c6295e55eb54fa37b6d15486415dfbed
ndroid.mk
odecs/aacdec/Android.mk
odecs/aacenc/Android.mk
odecs/amrnb/common/Android.mk
odecs/amrnb/dec/Android.mk
odecs/amrnb/enc/Android.mk
odecs/amrwb/Android.mk
odecs/amrwbenc/Android.mk
odecs/avc/common/Android.mk
odecs/avc/enc/Android.mk
odecs/avcdec/Android.mk
odecs/avcenc/Android.mk
odecs/flac/enc/Android.mk
odecs/g711/dec/Android.mk
odecs/gsm/dec/Android.mk
odecs/hevcdec/Android.mk
odecs/m4v_h263/dec/Android.mk
odecs/m4v_h263/enc/Android.mk
odecs/mp3dec/Android.mk
odecs/mpeg2dec/Android.mk
odecs/on2/dec/Android.mk
odecs/on2/enc/Android.mk
odecs/on2/h264dec/Android.mk
odecs/opus/dec/Android.mk
odecs/raw/Android.mk
odecs/vorbis/dec/Android.mk
olorconversion/Android.mk
ilters/Android.mk
ttp/Android.mk
ttplive/Android.mk
d3/Android.mk
atroska/Android.mk
peg2ts/Android.mk
mx/Android.mk
mx/tests/Android.mk
tsp/Android.mk
ests/Android.mk
imedtext/Android.mk
ebm/Android.mk
ifi-display/Android.mk
uv/Android.mk
7dcc5f394b17238f2ae1a9c59f34664d3ad085e7 05-Oct-2016 Chong Zhang <chz@google.com> IOMX: remove getState() and livesLocally()

These are no longer used.

bug: 31399200

Change-Id: Ic61e8c7fa016ccd038e2b2427ccb08b78af34245
nclude/OMXNodeInstance.h
mx/OMXNodeInstance.cpp
c380f611f779dd7dc29ccf80609893d67e78167a 05-Oct-2016 Dan Willemsen <dwillemsen@google.com> Merge "Convert to Android.bp" am: a50b46b7bb am: 8651f91fbd am: 806f548e79
am: 37a767263e

Change-Id: I35e44448c5e7ef813f050d2422286f540b39490b
37a767263e347df05680ae0b8be1619c04a8d6af 05-Oct-2016 Dan Willemsen <dwillemsen@google.com> Merge "Convert to Android.bp" am: a50b46b7bb am: 8651f91fbd
am: 806f548e79

Change-Id: Iba76d5f47e840fc613e9ddcf1a27bb96696d28d1
806f548e797a1c5d4efc0347dbf707082ceaecc4 05-Oct-2016 Dan Willemsen <dwillemsen@google.com> Merge "Convert to Android.bp" am: a50b46b7bb
am: 8651f91fbd

Change-Id: Icdd020775d7a6950f2bcd9450b5acd969add46d0
af26292e0bffda642aed0d51a9f0ac010d8fabf2 05-Oct-2016 Dan Willemsen <dwillemsen@google.com> Convert to Android.bp

See build/soong/README.md for more information

Test: mmma -j frameworks/av
Change-Id: I1b8deeec65e2cfa1633354712004ef87f3ac8b3e
ndroid.bp
a86b65e69f6a76cabab37ef480aaa86dca38b3ea 04-Oct-2016 Hangyu Kuang <hkuang@google.com> Merge "media: Fix mpeg2ts muxer."
bf11e419e7bacef094ee7f9aac44a6d33ae3642a 04-Oct-2016 Wei Jia <wjia@google.com> ATSParser: dequeue pesStartOffset for every access unit. am: b08d83e972 am: 2337c0b779
am: 48b2e3ab9d

Change-Id: I377eee17d8e17f66665486d4f1461920c5c58c9d
48b2e3ab9d07dc9f243b96c75e833a84b9a87a6a 04-Oct-2016 Wei Jia <wjia@google.com> ATSParser: dequeue pesStartOffset for every access unit. am: b08d83e972
am: 2337c0b779

Change-Id: I5747949aff8b66673f53e69953b0b29bfe54a35b
b08d83e972ba8cb08a6e361d5cdaf97857bcf21f 01-Oct-2016 Wei Jia <wjia@google.com> ATSParser: dequeue pesStartOffset for every access unit.

Bug: 27297491
Change-Id: Id960693574679ccc8d3b54be37b0cadf104078bb
peg2ts/ATSParser.cpp
17c9fb736bcc45dfe4db526d12f6396ac0939f20 01-Oct-2016 TreeHugger Robot <treehugger-gerrit@google.com> Merge "IOMX: separate node interface from IOMX"
4c4bf14f5f8ec4bb4b475468b7c76f1f75098a9f 01-Oct-2016 Colin Cross <ccross@android.com> Merge "Rename dump methods to dumpState" am: fb14b87d44
am: cccf9268d5

Change-Id: I068c5f5dc106c5b24d19bc1f4f384caa83c021ef
fd9cc97d4dfe2a2fbce2c0f1704d7a27ce7cbc44 30-Sep-2016 Pawin Vongmasa <pawin@google.com> MPEG4Extractor: Check mLastTrack before parsing btrt box.

Bug: 31449945
Change-Id: I3380d494a57bb81f1a7455c64c3ab78da12c382d
PEG4Extractor.cpp
fb14b87d443be54741a21716fdd7a38e4ce4c406 01-Oct-2016 Colin Cross <ccross@android.com> Merge "Rename dump methods to dumpState"
38b79057138705d98b604254ea6cf4ca07ccd597 28-Sep-2016 Colin Cross <ccross@android.com> Rename dump methods to dumpState

The dump methods shadow the IBinder dump method. The warnings were being
hidden by the use of -isystem to include frameworks/native/include.

Bug: 31752268
Test: m -j
Change-Id: I78136a4baf71630455010e884bc198314cecca7a
(cherry picked from commit 3bcbcab7ef58677b0ae7b0093d7dda6bb196dbb6)
urfaceMediaSource.cpp
f219deac1cc46efe4526069c89e8566f4bb6b17f 01-Oct-2016 Colin Cross <ccross@android.com> Merge "Rename dump methods to dumpState"
d59b97223424a3974d2ac31cff998d02eecf2eed 21-Sep-2016 Chong Zhang <chz@google.com> IOMX: separate node interface from IOMX

- Separate node interface from IOMX. Client allocates the
node through IOMX, and once it has the node interface,
it can interact with the node directly. There is no need
to go through IOMX and refer to the node by id.

- Simplify OMX, remove id-to-instance mapping on server
side, and move the callback dispatch into node instance
(as dispatcher is per-node).

- Keep track of node generation on client side to ensure
that message handling ignores messages directed at an
expired node.

- Remove MuxOMX, always use IOMX from media.codec.

- Minor whitespace reformatting.

bug: 31399200

Change-Id: I8aef6ec1fa5aba861da7d121960ed2974a963d81
Codec.cpp
ediaCodecList.cpp
MXClient.cpp
nclude/OMX.h
nclude/OMXNodeInstance.h
mx/GraphicBufferSource.cpp
mx/GraphicBufferSource.h
mx/OMX.cpp
mx/OMXNodeInstance.cpp
mx/OMXUtils.cpp
mx/OMXUtils.h
mx/tests/OMXHarness.cpp
mx/tests/OMXHarness.h
ad111520f0167c4a0bf6a37fc025e2523c313258 30-Sep-2016 TreeHugger Robot <treehugger-gerrit@google.com> Merge "MediaCodec refactoring part 1-a: buffers become separate class"
7e34bf5af26f8752d4786d3098740cdf51e2438f 22-Aug-2016 Wonsik Kim <wonsik@google.com> MediaCodec refactoring part 1-a: buffers become separate class

MediaCodecBuffer is meant to replace ABuffer and MediaBuffer in
communication between framework components. As the first step, replace
use of ABuffer in MediaCodec with MediaCodecBuffer, and adjust related
classes accordingly.

MediaCodec.getBuffer() and related APIs now returns MediaCodecBuffers;
thus change MediaCodec clients to use MediaCodecBuffer accordingly.

Test: manually tested for key use cases (Camera, YouTube and Play Movies)
Change-Id: Iba7ce131645e75ce5ddbf497fb793ab38b7f245b
Codec.cpp
ndroid.mk
ufferImpl.cpp
ataConverter.cpp
ediaCodec.cpp
ediaCodecSource.cpp
impleDecodingSource.cpp
kipCutBuffer.cpp
tagefrightMetadataRetriever.cpp
vc_utils.cpp
ilters/IntrinsicBlurFilter.cpp
ilters/IntrinsicBlurFilter.h
ilters/MediaFilter.cpp
ilters/RSFilter.cpp
ilters/RSFilter.h
ilters/SaturationFilter.cpp
ilters/SaturationFilter.h
ilters/SimpleFilter.h
ilters/ZeroFilter.cpp
ilters/ZeroFilter.h
nclude/DataConverter.h
nclude/SharedMemoryBuffer.h
nclude/avc_utils.h
ifi-display/source/Converter.cpp
ifi-display/source/Converter.h
de84a76b865d1061cfa9012f91b0aed4595f42cf 30-Sep-2016 Pawin Vongmasa <pawin@google.com> DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing.

Bug: 31449945
Change-Id: If2708b3006c22393e80a2557f93d8a71e4e7bf16
PEG4Extractor.cpp
0338b14e284ee0b81253cf456d0bf78de08743b1 30-Sep-2016 Pawin Vongmasa <pawin@google.com> DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing.

Bug: 31449945
Change-Id: Icc5714bd2459c053c0a913b1c27d9ffbef5b2d2a
PEG4Extractor.cpp
25d34cacdea9160f519865517cdc0ce9ae706b7e 30-Sep-2016 Pawin Vongmasa <pawin@google.com> DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing.

Bug: 31449945
Change-Id: I7fd0bb683819b2e43863b861fb078a6a67fa5317
PEG4Extractor.cpp
3bcbcab7ef58677b0ae7b0093d7dda6bb196dbb6 28-Sep-2016 Colin Cross <ccross@android.com> Rename dump methods to dumpState

The dump methods shadow the IBinder dump method. The warnings were being
hidden by the use of -isystem to include frameworks/native/include.

Bug: 31752268
Test: m -j
Change-Id: I78136a4baf71630455010e884bc198314cecca7a
urfaceMediaSource.cpp
d97f85ceab74b9f39856cca3cb101139b19140b9 30-Sep-2016 Marco Nelissen <marcone@google.com> Handle idle->loaded state transition when loaded->idle is still in progress am: c5e316d4ef am: fd3ca8acd4
am: e1e7a5a1e2

Change-Id: Iccb6a413f3688c74fdcb6b8cc437428aa36bb909
e1e7a5a1e23655257c6424494595c0475f726c8a 30-Sep-2016 Marco Nelissen <marcone@google.com> Handle idle->loaded state transition when loaded->idle is still in progress am: c5e316d4ef
am: fd3ca8acd4

Change-Id: I2a547b679f8027ff635f27593d85bac80fafeae2
87b3303151e964c2619342de84adc2eb751b5c6d 29-Sep-2016 Roger1 Jonsson <roger1.jonsson@sonymobile.com> Merge "Prevent crash for malformed ID3 COMM frame" am: 944706f468 am: 5c487ff344 am: 2e0151903d
am: c81cdd3e8c

Change-Id: I322a90d7a9881d88e84ebf2ed3986eced76b88ec
c81cdd3e8c53399a2902e49123dc9c7170082120 29-Sep-2016 Roger1 Jonsson <roger1.jonsson@sonymobile.com> Merge "Prevent crash for malformed ID3 COMM frame" am: 944706f468 am: 5c487ff344
am: 2e0151903d

Change-Id: I7cf50f96b90c573d437becb478adce718a1d193b
2e0151903d87ca62e9f18bf24dd3e86ac5fae5f2 29-Sep-2016 Roger1 Jonsson <roger1.jonsson@sonymobile.com> Merge "Prevent crash for malformed ID3 COMM frame" am: 944706f468
am: 5c487ff344

Change-Id: I512b4df1b87f9be715896f418fd7618d3d234e82
c5e316d4ef18262d1c3560fc7ac8ecc8df8c96d9 02-Sep-2016 Marco Nelissen <marcone@google.com> Handle idle->loaded state transition when loaded->idle is still in progress

Bug: 31156921
Change-Id: I926cab482fadecb8bb885d85e0d083a4501596fd
mx/SimpleSoftOMXComponent.cpp
e1e791727f709c7ab54d47b9cd46d4326a02e913 21-Sep-2016 Roger1 Jonsson <roger1.jonsson@sonymobile.com> Prevent crash for malformed ID3 COMM frame

When trying to retrieve the full text string from a malformed
ID3 COMM frame, there is a risk of getting a negative index
value if the size of the frame is too small.

Adding a size check to avoid negative indexes.

Bug: 31815576
Test: Playback content with malformed ID3 COMM frame
Change-Id: I21253e104cd76a65f5ab5d03f58490e0f4a4cb65
d3/ID3.cpp
6cd0e573da823a4efd482a7505bb2c2f1b866ca7 28-Sep-2016 Colin Cross <ccross@android.com> Rename dump methods to dumpState

The dump methods shadow the IBinder dump method. The warnings were being
hidden by the use of -isystem to include frameworks/native/include.

Bug: 31752268
Test: m -j
Change-Id: I78136a4baf71630455010e884bc198314cecca7a
urfaceMediaSource.cpp
8f889be4754d40f39c9377b055988f58f3ed64a8 21-Sep-2016 Hangyu Kuang <hkuang@google.com> media: Fix mpeg2ts muxer.

1) Fix the CSD handling due to missing timestamp in CSD buffer.
2) Remove the concatenation of audio frames and write out every audio frame
immediately to unblock the video frame write out.
3) Unblock audio track thread after geting CSD.

Bug:21620607
Change-Id: I4926ef7202e1692a2c50a5e8158a9cfb19d9ed3f
PEG2TSWriter.cpp
ediaCodecSource.cpp
acd619a940dd945cd14bc6f637cc86413c6745ba 22-Sep-2016 Jim Kaye <jameskaye@google.com> Adjust RGB-to-YUV conversion

Round values rather than truncate them. ITU-R BT.601 indicates that
values should be rounded. Also, correct one coefficient value that
was slightly off.

These errors caused some CTS test failures for the Emulator.

BUG: http://b/31497838
Change-Id: I4c15e02dac266e243d3baf015fd3939877ab930c
(cherry picked from commit 36402501e4d94108db9e35fd3bb03c455d6a1635)
mx/SoftVideoEncoderOMXComponent.cpp
ace7be6309f0c1bdf22296a4b64dd24f39146a8c 25-Sep-2016 Craig Donner <cdonner@google.com> Revert "Handle lock() returning a NULL buffer in SurfaceUtils." am: a092e55819 am: 4001a56758
am: f76575620d

Change-Id: Iabb167790602c6b2aa1d04559c7689ad15bfce76
f76575620dec0eebadd8966baac7c7f5fd17076d 24-Sep-2016 Craig Donner <cdonner@google.com> Revert "Handle lock() returning a NULL buffer in SurfaceUtils." am: a092e55819
am: 4001a56758

Change-Id: I5a755c5aadec314bf68490c14780a2b1a9973662
4001a56758d1521f99623111595f95147ed51bbf 24-Sep-2016 Craig Donner <cdonner@google.com> Revert "Handle lock() returning a NULL buffer in SurfaceUtils."
am: a092e55819

Change-Id: I6f5a9999990547c83c4485ff2db4ba51f9802654
9c6c7f370f9b3801caa1e45ac75e0c13619bf10c 24-Sep-2016 Craig Donner <cdonner@google.com> Merge "Revert "Handle lock() returning a NULL buffer in SurfaceUtils."" into nyc-mr1-dev
e880a7cf71409fe13f62b90bdbad37f64889c13b 24-Sep-2016 TreeHugger Robot <treehugger-gerrit@google.com> Merge "stagefright: abstract GraphicBufferSource to interfaces"
6d332d2cdf6e62c2c20ebff220868fe9e3ed7f44 07-Sep-2016 Chong Zhang <chz@google.com> stagefright: abstract GraphicBufferSource to interfaces

Create two interfaces from GraphicBufferSource:

a) IGraphicBufferSource for client (ACodec) to configure the graphic
buffer source. IOMX no longer routes these messages and OMX internal
options are removed.

b) IOMXBufferSource for IOMX to send OMX specific callbacks.

Added an |origTimestamp| argument to emptyGraphicBuffer, and restore
the original PTS inside OMX to avoid going back to GraphicBufferSource
to patch the output PTS. In the longer term, we should consider moving
the max PTS gap entirely into OMX (probably as an extension index).

Define newly introduced interfaces using AIDL to facilitate code
development.

bug: 31399200

Change-Id: Ibaf6ca1a0737ba6ba9f83bedc3b06ef358db36cb
Codec.cpp
ediaCodec.cpp
ediaCodecSource.cpp
MXClient.cpp
nclude/OMX.h
nclude/OMXNodeInstance.h
mx/GraphicBufferSource.cpp
mx/GraphicBufferSource.h
mx/OMX.cpp
mx/OMXNodeInstance.cpp
87eef41a5b81391b10a0f4ad874f6f04e261ed84 24-Sep-2016 Ting-Yuan Huang <laszio@google.com> Fix compiler warnings.

Test: mmm

Change-Id: I937ac6ab2da5530ee249e6e87a90d18e9bd3de6e
odecs/amrwbenc/SampleCode/AMRWB_E_SAMPLE.c
72433b083ccfa3ab55374305b1c2960982ac3e09 29-Oct-2013 Oscar Rydhé <oscar.rydhe@sonymobile.com> Start with segment three times the target duration for HLS live

For HLS live streams the first segment to play should be the
segment closest above three times the target duration from the
end of the playlist.

Bug: 31235498
Change-Id: I86859115460678518385a04379c2016ac0948c07
ttplive/PlaylistFetcher.cpp
ttplive/PlaylistFetcher.h
dbd6d30a9909ae904ce7484230dbd3b9b66052d3 22-Sep-2016 Robert Shih <robertshih@google.com> SampleIterator: clear members on seekTo error am: 03237ce0f9 am: 8468b8980c am: e0d588b892 am: d4ddd555f1 am: f72b9e0011 am: 21beb40cec am: dcaab8eda7 am: a38b5af18b am: 95eb4e7637 am: 4cb3841534 am: 14b2e8b50a am: c8ed1e78eb am: 34b6f250c8 am: 7c80ecab8d am: b5d3f302e0
am: 35766d127d

Change-Id: Ie0187999b5dc17a77f28ac7d171ec964c3139460
35766d127d6aee7315112a526fbf0105e6968d0f 22-Sep-2016 Robert Shih <robertshih@google.com> SampleIterator: clear members on seekTo error am: 03237ce0f9 am: 8468b8980c am: e0d588b892 am: d4ddd555f1 am: f72b9e0011 am: 21beb40cec am: dcaab8eda7 am: a38b5af18b am: 95eb4e7637 am: 4cb3841534 am: 14b2e8b50a am: c8ed1e78eb am: 34b6f250c8 am: 7c80ecab8d
am: b5d3f302e0

Change-Id: I56b06917e1c670f1645c7239747b295903e61093
7c80ecab8df18a8fb2fc6da416ca71072610b60c 22-Sep-2016 Robert Shih <robertshih@google.com> SampleIterator: clear members on seekTo error am: 03237ce0f9 am: 8468b8980c am: e0d588b892 am: d4ddd555f1 am: f72b9e0011 am: 21beb40cec am: dcaab8eda7 am: a38b5af18b am: 95eb4e7637 am: 4cb3841534 am: 14b2e8b50a am: c8ed1e78eb
am: 34b6f250c8

Change-Id: I2944f9a041f1ca847859d27094a14ce5c22793fc
34b6f250c820da336a4cb3275102e3594046e8be 22-Sep-2016 Robert Shih <robertshih@google.com> SampleIterator: clear members on seekTo error am: 03237ce0f9 am: 8468b8980c am: e0d588b892 am: d4ddd555f1 am: f72b9e0011 am: 21beb40cec am: dcaab8eda7 am: a38b5af18b am: 95eb4e7637 am: 4cb3841534 am: 14b2e8b50a
am: c8ed1e78eb

Change-Id: I02bcadd9e02f3b1f24c6cc2cb4a9e7b3ae0958c3
10338330b37a1f2cabab35cbb40ee4d0816275c8 22-Sep-2016 Robert Shih <robertshih@google.com> SampleIterator: clear members on seekTo error am: 03237ce0f9 am: 8468b8980c am: e0d588b892 am: d4ddd555f1 am: f72b9e0011 am: 21beb40cec am: dcaab8eda7 am: a38b5af18b am: 95eb4e7637 am: 4cb3841534 am: 14b2e8b50a
am: c8ed1e78eb

Change-Id: I39668943230b65a5a157a11393e9aa4bef569a4c
c8ed1e78eb7c6de6be33c2ab65ba1aa31ee2828a 22-Sep-2016 Robert Shih <robertshih@google.com> SampleIterator: clear members on seekTo error am: 03237ce0f9 am: 8468b8980c am: e0d588b892 am: d4ddd555f1 am: f72b9e0011 am: 21beb40cec am: dcaab8eda7 am: a38b5af18b am: 95eb4e7637 am: 4cb3841534
am: 14b2e8b50a

Change-Id: I0635e2b2e5cb31601c64533b6e281bd763d56350
14b2e8b50ad25b6929e39296b00ede7b138e2f5d 22-Sep-2016 Robert Shih <robertshih@google.com> SampleIterator: clear members on seekTo error am: 03237ce0f9 am: 8468b8980c am: e0d588b892 am: d4ddd555f1 am: f72b9e0011 am: 21beb40cec am: dcaab8eda7 am: a38b5af18b am: 95eb4e7637
am: 4cb3841534

Change-Id: I8804226ce1fca11e478bda906585b5b065e09124
4cb38415346e7aa01344f09ab081359559f32121 22-Sep-2016 Robert Shih <robertshih@google.com> SampleIterator: clear members on seekTo error am: 03237ce0f9 am: 8468b8980c am: e0d588b892 am: d4ddd555f1 am: f72b9e0011 am: 21beb40cec am: dcaab8eda7 am: a38b5af18b
am: 95eb4e7637

Change-Id: Iea71ed70d99eebd365c69920133d778164c6efdf
95eb4e7637f8241961f89119440f78209257f6f8 22-Sep-2016 Robert Shih <robertshih@google.com> SampleIterator: clear members on seekTo error am: 03237ce0f9 am: 8468b8980c am: e0d588b892 am: d4ddd555f1 am: f72b9e0011 am: 21beb40cec am: dcaab8eda7
am: a38b5af18b

Change-Id: Iffeef9b918d210902e3374359829a5485a3be590
a38b5af18b4c8a1812753bc6339aff694dff390d 22-Sep-2016 Robert Shih <robertshih@google.com> SampleIterator: clear members on seekTo error am: 03237ce0f9 am: 8468b8980c am: e0d588b892 am: d4ddd555f1 am: f72b9e0011 am: 21beb40cec
am: dcaab8eda7

Change-Id: I4ef144d69091234b310769d55d7b72479b98a8bb
dcaab8eda714aadf628378befcf510e4356fe0e6 22-Sep-2016 Robert Shih <robertshih@google.com> SampleIterator: clear members on seekTo error am: 03237ce0f9 am: 8468b8980c am: e0d588b892 am: d4ddd555f1 am: f72b9e0011
am: 21beb40cec

Change-Id: Icf3964eafdaf56c6db6e442908541e3088f71c4e
f72b9e00118253483c78a7f62fb79d7501169c46 22-Sep-2016 Robert Shih <robertshih@google.com> SampleIterator: clear members on seekTo error am: 03237ce0f9 am: 8468b8980c am: e0d588b892
am: d4ddd555f1

Change-Id: I08b5684d546c10a0bc1bd47e74528f9ec7819003
d4ddd555f19df58d4ea462ecdf33b83f2365de29 22-Sep-2016 Robert Shih <robertshih@google.com> SampleIterator: clear members on seekTo error am: 03237ce0f9 am: 8468b8980c
am: e0d588b892

Change-Id: I62d47aa490a6fb62eabd5f80da26e47de69b8b1c
3fb31ed744c5991ccca893f43f0149ba44475fc0 22-Sep-2016 Marco Nelissen <marcone@google.com> Limit mp4 atom size to something reasonable am: cb898dca47 am: 3a8c303038 am: 75e5b60ae9 am: 828c7c2c31 am: c80241d9c3 am: fbe7df6dd0
am: 2950996c2b

Change-Id: Iffe5989f6811ff95c86953eb37ffcd567279e962
2950996c2b552696246ed45f9663a4a9afa3238b 22-Sep-2016 Marco Nelissen <marcone@google.com> Limit mp4 atom size to something reasonable am: cb898dca47 am: 3a8c303038 am: 75e5b60ae9 am: 828c7c2c31 am: c80241d9c3
am: fbe7df6dd0

Change-Id: I65270fb80f75dd063d28c3dff3cc4c06cb861bfa
663837d4414bc90c2472e135b21e898db55b648f 22-Sep-2016 Marco Nelissen <marcone@google.com> Limit mp4 atom size to something reasonable am: 2fae4e4cb6 am: 53e3ccc7ec
am: 8e4099234a

Change-Id: I6ba013aa9938270be4934f42da25a004f901d1f0
8e4099234aa47023d211bedb027c1bfeab1fd038 22-Sep-2016 Marco Nelissen <marcone@google.com> Limit mp4 atom size to something reasonable am: 2fae4e4cb6
am: 53e3ccc7ec

Change-Id: Id2bd546137533096dac39b5b43ef0288b06b17b1
fbe7df6dd0a52a42d90a42338e25a7393e7c88bd 22-Sep-2016 Marco Nelissen <marcone@google.com> Limit mp4 atom size to something reasonable am: cb898dca47 am: 3a8c303038 am: 75e5b60ae9 am: 828c7c2c31
am: c80241d9c3

Change-Id: Ie00c1926aa03df8c221ad42a40d0d735ee8c069d
e0d588b8928b0c87d6a1d4a9b57ca0568dcb8223 22-Sep-2016 Robert Shih <robertshih@google.com> SampleIterator: clear members on seekTo error am: 03237ce0f9
am: 8468b8980c

Change-Id: I4d81b7bd8732f03d0308740b96418203d17cd65b
c80241d9c377d00f7935f459095609e33629f661 22-Sep-2016 Marco Nelissen <marcone@google.com> Limit mp4 atom size to something reasonable am: cb898dca47 am: 3a8c303038 am: 75e5b60ae9
am: 828c7c2c31

Change-Id: I28eec82a69d9f29cf5d26ac0f034397e7ffb7343
8468b8980c73611e7ad9754c9221d4122d5f923b 22-Sep-2016 Robert Shih <robertshih@google.com> SampleIterator: clear members on seekTo error
am: 03237ce0f9

Change-Id: I0dd1251bd8f132b445ebf515e4555e9ec9953269
92eb45488fde45c9eb8a96ce48637656b7aa9e9a 22-Sep-2016 Marco Nelissen <marcone@google.com> Limit mp4 atom size to something reasonable
am: 2fae4e4cb6

Change-Id: I3d443e05aef57006511e137eca1d66146e250bd6
53e3ccc7ec43e4985956fba1f3eb8dc8ef3c6d4c 22-Sep-2016 Marco Nelissen <marcone@google.com> Limit mp4 atom size to something reasonable
am: 2fae4e4cb6

Change-Id: I94df089a80ee1f4b9c99f3b5fe9c1a84a1ca709e
610a9222d6426b386f2ab895ad5df5d393d6b210 22-Sep-2016 Robert Shih <robertshih@google.com> Merge "SampleIterator: clear members on seekTo error" into klp-dev
2fae4e4cb6b3039f28810e827de75b0612fadd83 20-Sep-2016 Marco Nelissen <marcone@google.com> Limit mp4 atom size to something reasonable

Bug: 28615448
Change-Id: I5916f6839b4a9bbee4388a106e7373bcd4154f5a
(cherry picked from commit 7788f1213095ea8495e40cb4cba30bbe7b989118)
PEG4Extractor.cpp
828c7c2c31837e103a39e4516e52c06b5dc36e6b 22-Sep-2016 Marco Nelissen <marcone@google.com> Limit mp4 atom size to something reasonable am: cb898dca47 am: 3a8c303038
am: 75e5b60ae9

Change-Id: Ia8122e73c5157ac2a932c9e7dfdd0f1ed9e94b83
08e1f41731ad95a0019b3733b999958a07f705ac 22-Sep-2016 Marco Nelissen <marcone@google.com> Merge "Limit mp4 atom size to something reasonable" into nyc-mr1-dev
3a8c303038c523b991a3390211237e94cb0cb08e 21-Sep-2016 Marco Nelissen <marcone@google.com> Limit mp4 atom size to something reasonable
am: cb898dca47

Change-Id: I4aedbf522dfabefbe797d37e3a37160c8f210e90
cb898dca47ac03738db91ddc371207435d2a1526 20-Sep-2016 Marco Nelissen <marcone@google.com> Limit mp4 atom size to something reasonable

Bug: 28615448
Change-Id: I5916f6839b4a9bbee4388a106e7373bcd4154f5a
PEG4Extractor.cpp
29ccd8c55d12a6fef6528a15c2a113d9a1dcd602 21-Sep-2016 Marco Nelissen <marcone@google.com> Limit mp4 atom size to something reasonable am: 638c99bad6
am: 569f3db605

Change-Id: Icc063dd70e08fea6320e3d3f64ebbd4ba51d8aa8
638c99bad693a8586a065d93b3d30017208e3067 20-Sep-2016 Marco Nelissen <marcone@google.com> Limit mp4 atom size to something reasonable

Bug: 28615448
Change-Id: I5916f6839b4a9bbee4388a106e7373bcd4154f5a
PEG4Extractor.cpp
7788f1213095ea8495e40cb4cba30bbe7b989118 20-Sep-2016 Marco Nelissen <marcone@google.com> Limit mp4 atom size to something reasonable

Bug: 28615448
Change-Id: I5916f6839b4a9bbee4388a106e7373bcd4154f5a
PEG4Extractor.cpp
03237ce0f9584c98ccda76c2474a4ae84c763f5b 21-Sep-2016 Robert Shih <robertshih@google.com> SampleIterator: clear members on seekTo error

Bug: 31091777
Change-Id: Iddf99d0011961d0fd3d755e57db4365b6a6a1193
ampleIterator.cpp
e20d91ebf23df23b7ed213487af64431d4617e0c 20-Sep-2016 Chong Zhang <chz@google.com> IOMX: do not clear buffer if it's allocated by component am: ea76573aa2 am: 86d9bb9141 am: dfe5b5193c am: b308b1a5d9 am: 87415a74ee am: 130eb563b8 am: 106a9050b9 am: 53de578e88 am: 295244de61 am: 17b0bdf4e8 am: ea65b73f84 am: 58bb33f447 am: 6d50452127
am: b572e4adb8

Change-Id: Ieea0a3c8b54d606bea1d2e0fa99b58de552bc6d3
01a30161dca1ab0324952fa726fbd0776e7277ba 20-Sep-2016 Hangyu Kuang <hkuang@google.com> media: Fix memory leak when recording duration exceeds duration limit. am: d24affe100 am: 92796b05ac
am: 7933840ed8

Change-Id: I1d52814d6294e6df22229702c6020f41e620e07d
e430c3839db26099f7f8bc1e5b32ab77f38d4992 20-Sep-2016 Marco Nelissen <marcone@google.com> Merge "stagefright: fix finding hardware codec" am: 9e43a10577 am: cb31148c4f am: 14e96d2e19
am: f424b71564

Change-Id: I0ab3d07688dacf4ae1b3942e0611e97c6cbbb2fb
b572e4adb8f7645990406e05da3b76ad3d0c0b44 20-Sep-2016 Chong Zhang <chz@google.com> IOMX: do not clear buffer if it's allocated by component am: ea76573aa2 am: 86d9bb9141 am: dfe5b5193c am: b308b1a5d9 am: 87415a74ee am: 130eb563b8 am: 106a9050b9 am: 53de578e88 am: 295244de61 am: 17b0bdf4e8 am: ea65b73f84 am: 58bb33f447
am: 6d50452127

Change-Id: I5ccff32fda63c26a2163d9ca5f471d1644330684
979f7ac5007438ba977454372463a00f08fc625d 20-Sep-2016 Chong Zhang <chz@google.com> IOMX: do not clear buffer if it's allocated by component am: ea76573aa2 am: 86d9bb9141 am: dfe5b5193c am: b308b1a5d9 am: 87415a74ee am: 130eb563b8 am: 106a9050b9 am: 53de578e88 am: 295244de61 am: 17b0bdf4e8 am: ea65b73f84 am: 58bb33f447
am: a2eeb67e3f

Change-Id: Ic8d49e7f585dec1083c6438be09c00859a602eed
a2eeb67e3fadaeb4d8083548bc57440e97698369 20-Sep-2016 Chong Zhang <chz@google.com> IOMX: do not clear buffer if it's allocated by component am: ea76573aa2 am: 86d9bb9141 am: dfe5b5193c am: b308b1a5d9 am: 87415a74ee am: 130eb563b8 am: 106a9050b9 am: 53de578e88 am: 295244de61 am: 17b0bdf4e8 am: ea65b73f84
am: 58bb33f447

Change-Id: Id6e214013c23d323f9e47e3dbc6930d0c72373d0
6d50452127e736319204f70976982d2b1772fce3 20-Sep-2016 Chong Zhang <chz@google.com> IOMX: do not clear buffer if it's allocated by component am: ea76573aa2 am: 86d9bb9141 am: dfe5b5193c am: b308b1a5d9 am: 87415a74ee am: 130eb563b8 am: 106a9050b9 am: 53de578e88 am: 295244de61 am: 17b0bdf4e8 am: ea65b73f84
am: 58bb33f447

Change-Id: Ic92e8fbc87ce94f03a4eaa84fc7676cb5b8f4282
58bb33f447c1a6fd1e64de399f177e6875b2c90d 20-Sep-2016 Chong Zhang <chz@google.com> IOMX: do not clear buffer if it's allocated by component am: ea76573aa2 am: 86d9bb9141 am: dfe5b5193c am: b308b1a5d9 am: 87415a74ee am: 130eb563b8 am: 106a9050b9 am: 53de578e88 am: 295244de61 am: 17b0bdf4e8
am: ea65b73f84

Change-Id: Ib5c4248b350758a4fdb097dfbf15ab66ae976f19
ea65b73f845ca58d96348b3b5f1ea205bf51ca10 20-Sep-2016 Chong Zhang <chz@google.com> IOMX: do not clear buffer if it's allocated by component am: ea76573aa2 am: 86d9bb9141 am: dfe5b5193c am: b308b1a5d9 am: 87415a74ee am: 130eb563b8 am: 106a9050b9 am: 53de578e88 am: 295244de61
am: 17b0bdf4e8

Change-Id: Ibcaca132ec79e508bdec391bd344d600cf112999
17b0bdf4e8bc9d41f2760417865c294d66f25bdb 20-Sep-2016 Chong Zhang <chz@google.com> IOMX: do not clear buffer if it's allocated by component am: ea76573aa2 am: 86d9bb9141 am: dfe5b5193c am: b308b1a5d9 am: 87415a74ee am: 130eb563b8 am: 106a9050b9 am: 53de578e88
am: 295244de61

Change-Id: Ibd2d0fec4c2cacbe0feb78224dce037f6e93c306
295244de614e448e6a20ca141f792605e2bd2fbf 20-Sep-2016 Chong Zhang <chz@google.com> IOMX: do not clear buffer if it's allocated by component am: ea76573aa2 am: 86d9bb9141 am: dfe5b5193c am: b308b1a5d9 am: 87415a74ee am: 130eb563b8 am: 106a9050b9
am: 53de578e88

Change-Id: I1096e2aa34eb9b89495f8ef7d4648ded5ee6381f
7933840ed82f3a1767f83554ebbcdd0323d34b8a 20-Sep-2016 Hangyu Kuang <hkuang@google.com> media: Fix memory leak when recording duration exceeds duration limit. am: d24affe100
am: 92796b05ac

Change-Id: I674fb382de5296f3637e7604c5f66d777f9bc509
53de578e884f12d45eef09312ac51c30d68e079a 20-Sep-2016 Chong Zhang <chz@google.com> IOMX: do not clear buffer if it's allocated by component am: ea76573aa2 am: 86d9bb9141 am: dfe5b5193c am: b308b1a5d9 am: 87415a74ee am: 130eb563b8
am: 106a9050b9

Change-Id: Id244e1a1872462d64da300c0c461ee939a8f1f76
106a9050b939c99c62d80489e3167a04512bf95e 20-Sep-2016 Chong Zhang <chz@google.com> IOMX: do not clear buffer if it's allocated by component am: ea76573aa2 am: 86d9bb9141 am: dfe5b5193c am: b308b1a5d9 am: 87415a74ee
am: 130eb563b8

Change-Id: I8a6ee92a0077102d93f6c9e82b5f439f99e4749c
87415a74ee6ce2618b036a4dcee6015956b072d7 20-Sep-2016 Chong Zhang <chz@google.com> IOMX: do not clear buffer if it's allocated by component am: ea76573aa2 am: 86d9bb9141 am: dfe5b5193c
am: b308b1a5d9

Change-Id: I502080e16a7543aac4b6720283f27b365bac8d52
b308b1a5d95a03d45cf8bfaf4f35debd398f3c20 20-Sep-2016 Chong Zhang <chz@google.com> IOMX: do not clear buffer if it's allocated by component am: ea76573aa2 am: 86d9bb9141
am: dfe5b5193c

Change-Id: Ibd28b74deb652eb61b08e933a5e288d145841a14
dfe5b5193cfc6321a7ddd3a48ceeaf59097cb545 20-Sep-2016 Chong Zhang <chz@google.com> IOMX: do not clear buffer if it's allocated by component am: ea76573aa2
am: 86d9bb9141

Change-Id: Id27e600a2c500634cd56bb8367f8d7ce811d63e8
d24affe100fb9ebcdabef47068e7a0f728a3a44e 20-Sep-2016 Hangyu Kuang <hkuang@google.com> media: Fix memory leak when recording duration exceeds duration limit.

When recording got to the duration limit, MPEG4Writer should also stop the source
before exiting the loop. This will stop the video/audio encoder from copying
and encoding buffer. Otherwise, those encoded buffers will be leaked as they are
not released inside MPEG4Writer.

Also fix the other cases when malformed file is generated.

Bug:31530524
Change-Id: I0233f13e3d2a9110b35375a7394e6c8c36494342
PEG4Writer.cpp
ea76573aa276f51950007217a97903c4fe64f685 20-Sep-2016 Chong Zhang <chz@google.com> IOMX: do not clear buffer if it's allocated by component

The component might depends on their buffers to be initialized
in certain ways to work. Don't clear unless we're allocating it.

bug: 31586647
Change-Id: Ia0a125797e414998ef0cd8ce03672f5b1e0bbf7a
mx/OMXNodeInstance.cpp
879663f51f3255735c1c2806102b43a79c267024 20-Sep-2016 Lajos Molnar <lajos@google.com> Merge "fix build" into nyc-dev-plus-aosp
f424b7156469d292a6ab6890014971e3457a579d 20-Sep-2016 Marco Nelissen <marcone@google.com> Merge "stagefright: fix finding hardware codec" am: 9e43a10577 am: cb31148c4f
am: 14e96d2e19

Change-Id: I4278f7126347c39ee890104d4aa3a852e62a3f57
14e96d2e19e1e94a5b0d83ef1c165da2447bff03 19-Sep-2016 Marco Nelissen <marcone@google.com> Merge "stagefright: fix finding hardware codec" am: 9e43a10577
am: cb31148c4f

Change-Id: Id09d8c44d1a02e0cc17d0bd75f3771cfadf43d34
9e43a105776d108a9a6ab98eea3e805ceb29e593 19-Sep-2016 Marco Nelissen <marcone@google.com> Merge "stagefright: fix finding hardware codec"
d5d60f642d1d2620b120ca46b1d409007f494321 19-Sep-2016 Lajos Molnar <lajos@google.com> fix build

Revert incorrectly merged f8a4cb410115045278f534e54b41ac78d6bf6c07.
Merge 7c3c2fa3e233c656fc8c2fc2a6634b3ecf8a23e8 instead.

Keep fixes to these that were merged in since then.
MXClient.cpp
nclude/OMX.h
nclude/OMXNodeInstance.h
mx/OMXNodeInstance.cpp
a80252eb413a5b3404b0b97adcb9e8c5fd33de4c 19-Sep-2016 Wonsik Kim <wonsik@google.com> omx: prevent crash at MuxOMX::freeNode for already freed nodes am: 6fb1ff39cd am: b6f4a66790
am: 9625f09c6b

Change-Id: I4da2417d724fc9bce0de7f1fb02fe4f1fd951c7a
9625f09c6b6d6504bccb55ff2bf7007a3ca9d678 19-Sep-2016 Wonsik Kim <wonsik@google.com> omx: prevent crash at MuxOMX::freeNode for already freed nodes am: 6fb1ff39cd
am: b6f4a66790

Change-Id: I24d36f30a023eaffeb51bde52db3f31c2a03b149
b6f4a6679002b8b949de8b9f3dcebe6b43cb66df 19-Sep-2016 Wonsik Kim <wonsik@google.com> omx: prevent crash at MuxOMX::freeNode for already freed nodes
am: 6fb1ff39cd

Change-Id: I007b7c0df6280b45b27156c97f7cc92fa2c6afd4
7b973eb89ea7088fe82f457cd10013bbe739bba4 19-Sep-2016 Wonsik Kim <wonsik@google.com> Merge "omx: prevent crash at MuxOMX::freeNode for already freed nodes" into nyc-mr1-dev
7dc9a2cb91daedbc4a8ed8d5ba82a18ac9203fbf 16-Sep-2016 Wei Jia <wjia@google.com> OMXNodeInstance: sanity check portIndex. am: f80a1f5075 am: 42f2e3d01d
am: d6743b21c9

Change-Id: Ifc05bd88225a33d8bf40251d01f490ac5dde2a5b
5d4f50695fde92222105134a5d10a324177f52ba 16-Sep-2016 Wei Jia <wjia@google.com> OMXNodeInstance: sanity check portIndex. am: f80a1f5075
am: fdef4bd6d7

Change-Id: Id57388fa30055457e285945c6ac00d6805d4c9dd
d6743b21c990d4e7d006a02b13ee95a7d301b4c0 16-Sep-2016 Wei Jia <wjia@google.com> OMXNodeInstance: sanity check portIndex. am: f80a1f5075
am: 42f2e3d01d

Change-Id: Ib44a8e7f31f97c26de070fbf0f2bb85ad58f3c1f
fdef4bd6d7ea290483c85fb0d77fa7bae5f5ef4e 16-Sep-2016 Wei Jia <wjia@google.com> OMXNodeInstance: sanity check portIndex.
am: f80a1f5075

Change-Id: I065e500d25a8699845ec00d79f4ff7237f345868
42f2e3d01d1dac5d698bfd5e12c264ec3f4ddcfc 16-Sep-2016 Wei Jia <wjia@google.com> OMXNodeInstance: sanity check portIndex.
am: f80a1f5075

Change-Id: Ia03a18d6aaa65bd40cdcf008bc40ea7013345fb0
0d12304082da254f6165a4edddc573d03dfa9b8a 16-Sep-2016 Wei Jia <wjia@google.com> Merge "OMXNodeInstance: sanity check portIndex." into nyc-dev
0520fa2f690f26d392c716af5863b657e4faadc7 16-Sep-2016 Lajos Molnar <lajos@google.com> IOMX: allow configuration after going to loaded state am: c13904014b am: 99accf6cdc am: 9a565c52b0 am: daa3b8e3fa am: c47a0e4c71
am: 1f05c699bd

Change-Id: I9bd9cbf1623de997afddaff4503bc639b6fd158f
c47a0e4c71e87e73613f3f9ed49b21a3320ad676 16-Sep-2016 Lajos Molnar <lajos@google.com> IOMX: allow configuration after going to loaded state am: c13904014b am: 99accf6cdc am: 9a565c52b0
am: daa3b8e3fa

Change-Id: I163ffc7bb0b794af540653614be05abfe2fb828e
daa3b8e3fae616a73c2087d657a2f2a8afcec62f 16-Sep-2016 Lajos Molnar <lajos@google.com> IOMX: allow configuration after going to loaded state am: c13904014b am: 99accf6cdc
am: 9a565c52b0

Change-Id: If2465b5f16cc58d5d0d7cda3e117ad863dafd479
9a565c52b0ac96adb546af5fd414d82ccc26357f 16-Sep-2016 Lajos Molnar <lajos@google.com> IOMX: allow configuration after going to loaded state am: c13904014b
am: 99accf6cdc

Change-Id: I2f80600bad65948b26e839d8588b98a574ffba9b
fb735e250be26a235ddeb9a0e3db36bef4c7adc1 16-Sep-2016 Lajos Molnar <lajos@google.com> IOMX: allow configuration after going to loaded state am: e03b22839d am: 66b557b3a2 am: 59ae56a5ba am: 860a1a25b5
am: 173bf42e3c

Change-Id: I1a8b2aab0bbc473e044ebd576056e55aacc0b679
6108cb420550a48786435c70f2ef32e9211ef6fe 16-Sep-2016 Lajos Molnar <lajos@google.com> IOMX: allow configuration after going to loaded state am: e03b22839d am: 66b557b3a2 am: 59ae56a5ba am: 860a1a25b5
am: 173bf42e3c

Change-Id: If12b0e8cb68c097d54c30b6f5571bc5a37e698f2
63057d226ec50521450723f25ac8ea708e254cc9 16-Sep-2016 Chih-Hung Hsieh <chh@google.com> resolve merge conflicts of 4646bb6 to master

Change-Id: Ic13f334730af2eea1b4c8d38c158deadd0789a1c
173bf42e3ca7d1875f9c07d252ecf4dd12e5970e 16-Sep-2016 Lajos Molnar <lajos@google.com> IOMX: allow configuration after going to loaded state am: e03b22839d am: 66b557b3a2 am: 59ae56a5ba
am: 860a1a25b5

Change-Id: I619d6cc0b70dc597796afe2c597e44c64e8f8bc3
860a1a25b5ae7dd55044243da214d0b43ba09c5c 16-Sep-2016 Lajos Molnar <lajos@google.com> IOMX: allow configuration after going to loaded state am: e03b22839d am: 66b557b3a2
am: 59ae56a5ba

Change-Id: I46bb45426bf6152d6510385c3e5ddf7b954ad1c1
7a931674473110c2ae47b0f385e66086f22b7648 16-Sep-2016 Lajos Molnar <lajos@google.com> IOMX: restrict conversion of ANWB to gralloc source in emptyBuffer am: 087ff38490 am: d5e14dcd5d
am: 38cd617b13

Change-Id: Ib6f1b6b7ff9d90f1013d6c62c92ade159282f80e
59ae56a5ba640cc0aeb5f84a4bdaa6f823fbb224 16-Sep-2016 Lajos Molnar <lajos@google.com> IOMX: allow configuration after going to loaded state am: e03b22839d
am: 66b557b3a2

Change-Id: I9a82c1682fecc9ab5ad2c6f5f2240a2be3dd11d1
38cd617b13ae0ba48ce5e7760ed56945c7909eef 16-Sep-2016 Lajos Molnar <lajos@google.com> IOMX: restrict conversion of ANWB to gralloc source in emptyBuffer am: 087ff38490
am: d5e14dcd5d

Change-Id: I0322aa56e3ef20e38fd08e304a1126897c026404
4646bb6d3774317ab39f6c4b559184fb98e3ad9c 16-Sep-2016 Chih-Hung Hsieh <chh@google.com> resolve merge conflicts of 2fbcb4f to nyc-mr1-dev-plus-aosp

Change-Id: Ibaccc1290942c18c56e66a754e3df18e8c4cea95
66b557b3a25a956004b262a3822599839c6f0798 16-Sep-2016 Lajos Molnar <lajos@google.com> IOMX: allow configuration after going to loaded state
am: e03b22839d

Change-Id: I7f5c90a48de98c2d936fc4eb975c550f5c7e9e47
d5e14dcd5d0c3f7922befd1677163d9474ebc6dc 16-Sep-2016 Lajos Molnar <lajos@google.com> IOMX: restrict conversion of ANWB to gralloc source in emptyBuffer
am: 087ff38490

Change-Id: I4ed801a106df30ff8bb897b5d714e69224794780
2fbcb4fe6c0726bd7b7b9a48a93b74f57021a4fa 15-Sep-2016 Chih-Hung Hsieh <chh@google.com> Merge "media: Fix graphic buffer leak." am: 4bcdf599a9
am: 4f9ed8b5d6

Change-Id: Ia795ea0637db79bf00050fb5856ebcde1382059d
6a905bc1bc58154ddfc74b884e06c33bf3bfa3af 15-Sep-2016 Ray Essick <essick@google.com> Fix free-after-use for MediaHTTP am: dd81e1592f am: 1e6019cb2c am: e5e80181e5 am: 8bcac1f22e
am: 5fdd88fdaf

Change-Id: I1f1f928912617f6fc0d98fb4e83ac7bec13ded14
5fdd88fdafd009350f4fbcc11beb387a2a71c16f 15-Sep-2016 Ray Essick <essick@google.com> Fix free-after-use for MediaHTTP am: dd81e1592f am: 1e6019cb2c am: e5e80181e5
am: 8bcac1f22e

Change-Id: I43a1e0f147f545fa16725925b8d15e97d99e6a1f
e5e80181e5ae29cc2665c9080afa6828e73d2780 15-Sep-2016 Ray Essick <essick@google.com> Fix free-after-use for MediaHTTP am: dd81e1592f
am: 1e6019cb2c

Change-Id: I446df7b66109b2af3f03d252bb465ac9d366add1
730e0e7d6fbb33df80e2563a7cf85f9afe5a0c68 15-Sep-2016 Ray Essick <essick@google.com> Fix free-after-use for MediaHTTP
am: dd81e1592f

Change-Id: I300fe078c1da655998cd03fd384b1bcd1d07e704
1e6019cb2cd9fa81f3349e0bd9e9086c158b352d 15-Sep-2016 Ray Essick <essick@google.com> Fix free-after-use for MediaHTTP
am: dd81e1592f

Change-Id: I9e0dbd3a91a343de6d607f1f0e00207fdd871f0e
d0b2fa5f3dcee2acb763119b5ab501b2de3c1e73 15-Sep-2016 Ray Essick <essick@google.com> Merge "Fix free-after-use for MediaHTTP" into nyc-dev
00beaa2776382e8fa1844cd85e00813c3f226970 15-Sep-2016 Chih-Hung Hsieh <chh@google.com> media: Fix graphic buffer leak.

Bug: 30882996
Test: build and boot
Change-Id: I673c06b225f55f0d9f15800edb8113abc237c4ce
Merged-In: I571a3a9d1705233029abb92f3752416d55ed1056
mx/GraphicBufferSource.cpp
mx/GraphicBufferSource.h
c8a2fd3fe2dc649b9aefe6f69b3fbc5ee36dbf5c 15-Sep-2016 Lajos Molnar <lajos@google.com> Merge commit '534bb6132a6a664f90b42b3ef81298b42efb3dc2' into HEAD
1658f22ef0f4e4ae5640d2474fc138dab4a84844 02-Aug-2016 Lajos Molnar <lajos@google.com> IOMX: work against metadata buffer spoofing

- Prohibit direct set/getParam/Settings for extensions meant for
OMXNodeInstance alone. This disallows enabling metadata mode
without the knowledge of OMXNodeInstance.
- Do not share metadata mode buffers cross process.
- Disallow setting up metadata mode/tunneling/input surface
after first sendCommand.
- Disallow store-meta for input cross process.
- Disallow emptyBuffer for surface input (via IOMX).
- Fix checking for input surface.

Bug: 29422020
Change-Id: I801c77b80e703903f62e42d76fd2e76a34e4bc8e
MXClient.cpp
nclude/OMX.h
nclude/OMXNodeInstance.h
mx/OMXNodeInstance.cpp
3a8eaeec94e305334e5f4a0000f7e56eb547a482 15-Sep-2016 Lajos Molnar <lajos@google.com> IOMX: do not convert ANWB to gralloc source in emptyBuffer am: 534bb6132a am: c695faf1de am: 6f04c53ef5 am: 69e38e79a9
am: 424dea98b4

Change-Id: Icc3b89cb979d775980b8cd1978a344f6e59bced3
006245d5897b19e26896c1324f52eb33a1a7785f 15-Sep-2016 Chong Zhang <chz@google.com> resolve merge conflicts of ac63f7e to master

Change-Id: Id3dc3f5883052ae59b2861a55b85f21f6c0e26b2
424dea98b4c42961471fdf7ffb2329e8170b517d 15-Sep-2016 Lajos Molnar <lajos@google.com> IOMX: do not convert ANWB to gralloc source in emptyBuffer am: 534bb6132a am: c695faf1de am: 6f04c53ef5
am: 69e38e79a9

Change-Id: I9b3d9b950049eb895e3063adf5fe8e47395bc779
f80a1f5075a7c6e1982d37c68bfed7c9a611bb20 14-Sep-2016 Wei Jia <wjia@google.com> OMXNodeInstance: sanity check portIndex.

Bug: 31385713
Change-Id: Ib91d00eb5cc8c51c84d37f5d36d6b7ca594d201f
mx/OMXNodeInstance.cpp
ac63f7ee23090f2ad9e8b6180440f1fbc8a71e37 15-Sep-2016 Chong Zhang <chz@google.com> resolve merge conflicts of 4743f50 to nyc-mr1-dev-plus-aosp

Change-Id: If67748ece5ec87bd6f272c545e15105c60765473
6f04c53ef5447ea48cc3e7e722e857ef5bc00457 15-Sep-2016 Lajos Molnar <lajos@google.com> IOMX: do not convert ANWB to gralloc source in emptyBuffer am: 534bb6132a
am: c695faf1de

Change-Id: Icd3f99383bb6abede6a18bbdc489bc307c14c550
c695faf1dea6888b805d4a1ab10411d1d52a8fbc 15-Sep-2016 Lajos Molnar <lajos@google.com> IOMX: do not convert ANWB to gralloc source in emptyBuffer
am: 534bb6132a

Change-Id: Icf260f16e4edb7467ad8e96ff67c3709c2a27e28
4743f503d6dc487776e5cb0193f05b9b1140b182 15-Sep-2016 Chong Zhang <chz@google.com> Release buffer slot basing on reference counter
am: fdeac6c97d

Change-Id: Ibc48b472ef28aaae5878046578f0266462287c11
2a327f52fd00a8d709b181e19b0ba4f3bb0e67e7 15-Sep-2016 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Release buffer slot basing on reference counter" into nyc-mr1-dev
828f6254e3ff1b97fa8a4e5cca781d8dc5c2176e 15-Sep-2016 Ray Essick <essick@google.com> NULL pointer dereference in NuMediaExtractor

add a missing null pointer check; found through fuzzing.

Bug: 31114457
Change-Id: I650d6eadf5199c342583acbaae491e7132d03f57
uMediaExtractor.cpp
fdeac6c97d87aff25653d42d24d0c18c568c684a 15-Sep-2016 Chong Zhang <chz@google.com> Release buffer slot basing on reference counter

This patch introduces counter which stores number
of references kept by CodecBuffers for each GraphicBuffer
on given slot.
The counter is decreased after codec buffers emptied
and increased after buffers submitted. When counter
becomes 0 it means that given buffer slot shall be
released.

Bug: 30024369

Cherry-picked with (rebase and fix) from:

https://android-review.googlesource.com/#/c/246510/2

Change-Id: I4ecd7902a6a525f9a598682d9cccc0f771752280
mx/GraphicBufferSource.cpp
mx/GraphicBufferSource.h
c0372cc1422a2627d092703fe0448c7b76d1a222 15-Sep-2016 Marco Nelissen <marcone@google.com> Don't CHECK if the source can't be started am: 6db5763b0c am: 30436d9efb
am: 8914b8c55d

Change-Id: I118c7f7e8fa4df8bfba18c61da9a717d0aef7014
8914b8c55db14db6789a6e4ae64d7d58ca3a0478 15-Sep-2016 Marco Nelissen <marcone@google.com> Don't CHECK if the source can't be started am: 6db5763b0c
am: 30436d9efb

Change-Id: I69a03434461dd9622eaccb3c22f27355c03abd9b
30436d9efb4a5f9e292f572d8d5611244bc0c604 15-Sep-2016 Marco Nelissen <marcone@google.com> Don't CHECK if the source can't be started
am: 6db5763b0c

Change-Id: Icb9760ba93ea8348a12417af82d8e495f618f7e3
41f2c47c0019b2a979ebe79241c5eb6ce14c0a3f 14-Sep-2016 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Don't CHECK if the source can't be started" into nyc-mr1-dev
a092e5581926703ecfe296e64d3a8fe7d7c65984 14-Sep-2016 Craig Donner <cdonner@google.com> Revert "Handle lock() returning a NULL buffer in SurfaceUtils."

This reverts commit afeffa81d06e7ca485f6d13430b8dfc70b4938a1.

Bug: 28526999

Change-Id: I18a073e92b516706c777f121a00d06938fdf35e3
urfaceUtils.cpp
7ef56575285409728278b0eda07c025ee5c5e217 14-Sep-2016 Lajos Molnar <lajos@google.com> IOMX: allow configuration after going to loaded state am: 6392ae13cf am: bb79fb6b49
am: 523227eb02

Change-Id: I989937c02d4a167dcfb19e040d1a7fa177883536
523227eb0209060ab551b661e95a22e415d24930 14-Sep-2016 Lajos Molnar <lajos@google.com> IOMX: allow configuration after going to loaded state am: 6392ae13cf
am: bb79fb6b49

Change-Id: I7e453a4c74d9ee3cdcbb1892f93ff2e258cd42de
e03b22839d78c841ce0a1a0a1ee1960932188b0b 14-Sep-2016 Lajos Molnar <lajos@google.com> IOMX: allow configuration after going to loaded state

This was disallowed recently but we still use it as MediaCodcec.stop
only goes to loaded state, and does not free component.

Bug: 31450460
Change-Id: I72e092e4e55c9f23b1baee3e950d76e84a5ef28d
mx/OMXNodeInstance.cpp
087ff38490016f4a0b6a1e717ae8af781d9b750c 12-Sep-2016 Lajos Molnar <lajos@google.com> IOMX: restrict conversion of ANWB to gralloc source in emptyBuffer

This is only allowed in-process (if backup and codec buffers are
connected.)

Bug: 29422020
Bug: 31412859
Change-Id: If48e3e0b6f1af99a459fdc3f6f03744bbf0dc375
mx/OMXNodeInstance.cpp
c13904014bfeb56b8a3cc372190bb3a2dd8f1e0d 14-Sep-2016 Lajos Molnar <lajos@google.com> IOMX: allow configuration after going to loaded state

This was disallowed recently but we still use it as MediaCodcec.stop
only goes to loaded state, and does not free component.

Bug: 31450460
Change-Id: I72e092e4e55c9f23b1baee3e950d76e84a5ef28d
mx/OMXNodeInstance.cpp
6392ae13cf6e15c706fce45396ec1e79af6171a9 14-Sep-2016 Lajos Molnar <lajos@google.com> IOMX: allow configuration after going to loaded state

This was disallowed recently but we still use it as MediaCodcec.stop
only goes to loaded state, and does not free component.

Bug: 31450460
Change-Id: I72e092e4e55c9f23b1baee3e950d76e84a5ef28d
mx/OMXNodeInstance.cpp
43cace6b1fe5fb952f6be3c312ef6d344a30f68d 14-Sep-2016 Chong Zhang <chz@google.com> stagefright: always add pts info if max pts gap is set am: 718ae52c24 am: 44a98c7807
am: a50d25a4b5

Change-Id: Ie6df6cd4c0b0199a217f9c47e5a0ae9ee1eb4aff
8d80eadc7f0a3aebadfa1ad79bf2dc375b801e83 14-Sep-2016 Takahiro Aizawa <takahiro.aizawa@sonymobile.com> stagefright: Add HLG in ISO transfer table am: de6afd7dcc am: 781c308310
am: 123bac7ab2

Change-Id: I026c67e8290bf4eb6b5cf0bceb0ec9f4fdd52870
a50d25a4b5e5cd0f2c51241e9fb2a0752ce3c6a2 14-Sep-2016 Chong Zhang <chz@google.com> stagefright: always add pts info if max pts gap is set am: 718ae52c24
am: 44a98c7807

Change-Id: I33aec57f1816e208443044b531fafb440804ac4a
44a98c7807ba06d22fe4b62f61562ae04dc94b66 14-Sep-2016 Chong Zhang <chz@google.com> stagefright: always add pts info if max pts gap is set
am: 718ae52c24

Change-Id: I1a9d6cf098e9a11d5f69c48072c6ae2da4a7bedc
7c6bd7b17835cfa615d1f74aa7fe7c45c7190e4d 14-Sep-2016 Chong Zhang <chz@google.com> Merge "stagefright: always add pts info if max pts gap is set" into nyc-mr1-dev
123bac7ab245d600eeb0f3ac6225f7fce92bcf56 14-Sep-2016 Takahiro Aizawa <takahiro.aizawa@sonymobile.com> stagefright: Add HLG in ISO transfer table am: de6afd7dcc
am: 781c308310

Change-Id: I4055dd93664333bb87b319b2adc8d96c1989a413
dd81e1592ffa77812998b05761eb840b70fed121 13-Sep-2016 Ray Essick <essick@google.com> Fix free-after-use for MediaHTTP

fix free-after-use when we reconnect to an HTTP media source.

Change-Id: I96da5a79f5382409a545f8b4e22a24523f287464
Tests: compilation and eyeballs
Bug: 31373622
ttp/MediaHTTP.cpp
718ae52c24b243d19d91dd97c2f6ea37d3524df0 13-Sep-2016 Chong Zhang <chz@google.com> stagefright: always add pts info if max pts gap is set

bug: 31442520
Change-Id: If23d402f6649ad4e8928d14d271accd1f2415a2e
mx/GraphicBufferSource.cpp
534bb6132a6a664f90b42b3ef81298b42efb3dc2 12-Sep-2016 Lajos Molnar <lajos@google.com> IOMX: do not convert ANWB to gralloc source in emptyBuffer

Bug: 29422020
Bug: 31412859
Change-Id: If48e3e0b6f1af99a459fdc3f6f03744bbf0dc375
mx/OMXNodeInstance.cpp
de6afd7dcc484bc867de6a0438ae4be9f2c6aacc 22-Aug-2016 Takahiro Aizawa <takahiro.aizawa@sonymobile.com> stagefright: Add HLG in ISO transfer table

Bug: 30999949

Change-Id: Ia20adbb5e1cd2956387f02f85d9fa5e5cd794cf6
oundation/ColorUtils.cpp
09fcc862f226df509cde12923d92cf6db53c4108 09-Sep-2016 TreeHugger Robot <treehugger-gerrit@google.com> Merge "stagefright: remove OMXNodeInstance usage from GraphicBufferSource"
7f56d5308238fd0d1078f2ac783c1ff77bc37799 09-Sep-2016 Chien-Yu Chen <cychen@google.com> CameraSource: Close native handle if camera is closed am: cb9e825306 am: d120f34f35
am: ac3be681dd

Change-Id: Ib21a76c4d0a7d3aad6ad17012252620d5bc7c00d
ac3be681ddb80890e347ea824304cce3d4b04404 09-Sep-2016 Chien-Yu Chen <cychen@google.com> CameraSource: Close native handle if camera is closed am: cb9e825306
am: d120f34f35

Change-Id: Ic2c6a53efdfa492bbc33edaa5cff184c141a3c25
d120f34f358d22495c4d38aa66ad6482736e1b21 09-Sep-2016 Chien-Yu Chen <cychen@google.com> CameraSource: Close native handle if camera is closed
am: cb9e825306

Change-Id: I2cd63447bdf31296e6e9d91f96c49eb37cc5dcd0
f67622707f184bb0b24da586049e1495713aae39 09-Sep-2016 Chien-Yu Chen <cychen@google.com> Merge "CameraSource: Close native handle if camera is closed" into nyc-mr1-dev
6cf9a1238986880536de705255f7c2c91c1ba719 09-Sep-2016 Chong Zhang <chz@google.com> stagefright: remove OMXNodeInstance usage from GraphicBufferSource

This is a preliminary to separate GraphicBufferSource from IOMX.

- Use IOMX instead of internal OMXNodeInstance.

- Keep track of codec buffers by buffer_id, do not write to the
OMX buffer headers directly

- Upon data space change, notify IOMX to handle it

bug: 31399200

Change-Id: I86534d7602294f70da582457b5af2eb9b6a58eda
Codec.cpp
MXClient.cpp
oundation/ColorUtils.cpp
nclude/OMX.h
nclude/OMXNodeInstance.h
mx/GraphicBufferSource.cpp
mx/GraphicBufferSource.h
mx/OMX.cpp
mx/OMXNodeInstance.cpp
5f7114f27c3ee61d5ccd866c99f3775136b1ab75 09-Sep-2016 Andy Hung <hunga@google.com> Improve MediaBuffer robustness for remote clients am: 9bd3c9b0e8 am: e2538f2f9b
am: ff97bcaf88

Change-Id: I97a2b06342b90949b489f72b9165fe618479fd82
af9f6d3956672ac552e2404e2252f1aa9fc784a6 09-Sep-2016 Lajos Molnar <lajos@google.com> resolve merge conflicts of 35514a3 to nyc-mr1-dev-plus-aosp
am: 71aba39b87

Change-Id: Ia93c60e5e6dc11c94ce0a0b7f30a4372b2423406
13cc65ca64543c77ae7809f1386b77a00cf992a3 09-Sep-2016 Marco Nelissen <marcone@google.com> Parcel albumart as a Blob, to void parceling failures am: cbad976694
am: d3b346dc58

Change-Id: I224d5eb19dabad27d229a401019425301f8bd9bf
ff97bcaf881576703e6a9af014f87529b3af774e 09-Sep-2016 Andy Hung <hunga@google.com> Improve MediaBuffer robustness for remote clients am: 9bd3c9b0e8
am: e2538f2f9b

Change-Id: I8d378f6c64bfe9a97941cddafe6c3163abc7a050
71aba39b8767de04e35b3366a6413928f50582f0 09-Sep-2016 Lajos Molnar <lajos@google.com> resolve merge conflicts of 35514a3 to nyc-mr1-dev-plus-aosp

Change-Id: Id8987a560a26cd02b6ec51be72dd0914f451d800
d3b346dc5887836502f5b637c8f1470840771492 09-Sep-2016 Marco Nelissen <marcone@google.com> Parcel albumart as a Blob, to void parceling failures
am: cbad976694

Change-Id: I1392ebfdd3c1b0f12065cb859f32c8b8c3140025
e2538f2f9b5d81ce53dc13bbf87b2f36f6c45eb5 09-Sep-2016 Andy Hung <hunga@google.com> Improve MediaBuffer robustness for remote clients
am: 9bd3c9b0e8

Change-Id: I3abb06e498b8951e5e934d0127e12b9adb65707c
a3335b6fced383557a3fa4465cbb43de6a4146fd 09-Sep-2016 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Parcel albumart as a Blob, to void parceling failures" into nyc-mr1-dev
9bbafdb5b4266d51d868844c624a33035a2abea1 09-Sep-2016 Andy Hung <hunga@google.com> Merge "Improve MediaBuffer robustness for remote clients" into nyc-mr1-dev
0ede757703730e973b445b0fe0dbbc9ce6939f37 09-Sep-2016 Lajos Molnar <lajos@google.com> IOMX: work against metadata buffer spoofing am: f8a4cb4101 am: 8751b3c3ac
am: b2fcb2c5b0

Change-Id: I1d1ae07b089a5bb83c99d669ab74df5be75ebb1a
61bb7a0d99bcacac5ae4ea2171add8d4dd9ea459 09-Sep-2016 Lajos Molnar <lajos@google.com> DO NOT MERGE: IOMX: work against metadata buffer spoofing am: 9a4768f7bf
am: da3cba194b

Change-Id: I018340e57d237e4d36d68e2cd118336242447b9c
beb7008c2e6c8ee71b5e5aaf101990ea52a67da1 09-Sep-2016 Wonsik Kim <wonsik@google.com> DO NOT MERGE omx: check buffer port before using am: 0e2cc67785
am: 5dd07a6ef3

Change-Id: I3b95ef380f380dac23aaf97be96630ca8bef552c
b2fcb2c5b0964c29a6ed91ca9cfdb9a6e6dc9239 09-Sep-2016 Lajos Molnar <lajos@google.com> IOMX: work against metadata buffer spoofing am: f8a4cb4101
am: 8751b3c3ac

Change-Id: Ic91387f22a93cecf891706db0f50c8ab5de31a3a
c5251a627cd1c4c9403c80458fa10768813e7202 09-Sep-2016 Lajos Molnar <lajos@google.com> DO NOT MERGE: IOMX: work against metadata buffer spoofing am: 807e827d4c
am: ee9effab3d

Change-Id: I64bd10fa5e5e5a020c129c0b77d813a2772376a0
8751b3c3ac6a6cc606a0fce1e8ed0a01a1168c08 09-Sep-2016 Lajos Molnar <lajos@google.com> IOMX: work against metadata buffer spoofing
am: f8a4cb4101

Change-Id: I3aeec794c96fe3b0000546700e010b5ddc6e4f0f
ee9effab3decc4275f4365b78c96911018e8de8c 09-Sep-2016 Lajos Molnar <lajos@google.com> DO NOT MERGE: IOMX: work against metadata buffer spoofing
am: 807e827d4c

Change-Id: I514b6b8fce06d666799fcd5f41238e81598c0aa9
da3cba194bff674f5a3f4b0249a651b00ab00c37 09-Sep-2016 Lajos Molnar <lajos@google.com> DO NOT MERGE: IOMX: work against metadata buffer spoofing
am: 9a4768f7bf

Change-Id: Ib611c8e1abdff62df4f8067c1bb7a5e2dd18c328
5dd07a6ef39c0090df6f774eda7e78b4c9e0d09f 09-Sep-2016 Wonsik Kim <wonsik@google.com> DO NOT MERGE omx: check buffer port before using
am: 0e2cc67785

Change-Id: Ie5692f86d9cbb0b2c890517b6f5f1b0db1e7c281
6e076c0600ece3819d03819f2a7336654e995626 09-Sep-2016 Lajos Molnar <lajos@google.com> DO NOT MERGE: IOMX: work against metadata buffer spoofing
am: 7c3c2fa3e2

Change-Id: Ia4570bec9d092566ab437e46c4030b739160d82e
030fbd4835412d07edcfb80230d930c3819dd2ee 09-Sep-2016 Lajos Molnar <lajos@google.com> Merge "IOMX: work against metadata buffer spoofing" into mnc-dev
425cc025a114692b3bad2262f2549d48b8cea6d7 09-Sep-2016 Lajos Molnar <lajos@google.com> Merge "DO NOT MERGE: IOMX: work against metadata buffer spoofing" into klp-dev
35514a3f80f9c83529f454343b7bc405ccab6ba1 09-Sep-2016 Lajos Molnar <lajos@google.com> IOMX: work against metadata buffer spoofing
am: d32d4030c3

Change-Id: I828a193e45fcf9c5d0ea689b964ece082ad06e43
6981afc6acd9984150526ef5abb483bea6d213d9 09-Sep-2016 Lajos Molnar <lajos@google.com> Merge "DO NOT MERGE: IOMX: work against metadata buffer spoofing" into lmp-dev
7c36c95b19a98a17cc1f132f4818142b3969272d 09-Sep-2016 Lajos Molnar <lajos@google.com> Merge changes I801c77b8,I3d5bad4a into lmp-mr1-dev

* changes:
DO NOT MERGE: IOMX: work against metadata buffer spoofing
DO NOT MERGE omx: check buffer port before using
01b589c3e1976672dc9106d17c6e0095915082be 09-Sep-2016 Lajos Molnar <lajos@google.com> Merge "IOMX: work against metadata buffer spoofing" into nyc-mr1-dev
9bd3c9b0e894c9f6c48a2cfa7c5f21d384b1c596 07-Sep-2016 Andy Hung <hunga@google.com> Improve MediaBuffer robustness for remote clients

Allow remote process to die or behave incorrectly.

Bug: 31060086
Change-Id: I01bc8984287fed61a46083ec090b7773e49158a9
oundation/MediaBuffer.cpp
oundation/MediaBufferGroup.cpp
cb9e825306cd0a97e50a4ef9d7c58f4e961692d9 08-Sep-2016 Chien-Yu Chen <cychen@google.com> CameraSource: Close native handle if camera is closed

When releasing a native handle to camera, close the native
handle if camera is closed to avoid memory leak.

Bug: 30299751
Change-Id: I8e4758308e5efcb1e138aae7134cf71366baf468
ameraSource.cpp
fcf7cf78bc0abc61b86ccb08fb3391f560143ad2 30-Aug-2016 Hangyu Kuang <hkuang@google.com> media: Move video buffer timestamp adjustment from CodecSource to GraphicBufferSource.

Bug:31158120
Bug:30919939
Change-Id: I7c1b626eee8512dac691b03309f724b3351e6e2f
(cherry picked from commit 61fcfd1b0b58dff9284ede8dc49749ca7395856d)
Codec.cpp
ediaCodecSource.cpp
mx/GraphicBufferSource.cpp
mx/GraphicBufferSource.h
mx/OMXNodeInstance.cpp
260d2db90b8982e31ff1789a3a709b2b0b841542 06-Sep-2016 Robert Shih <robertshih@google.com> rtsp: compare AU seq nums only when seekable am: d992b5930e am: 2ccb0218ec
am: 2c69b50c6f

Change-Id: I4072c94621406b8fcbeecb40752d94003a0a402a
2c69b50c6ff88dd212d11ff2569ff27ddaf7d088 06-Sep-2016 Robert Shih <robertshih@google.com> rtsp: compare AU seq nums only when seekable am: d992b5930e
am: 2ccb0218ec

Change-Id: I37c9af704f33cf297504e62d6d882fedefaa798e
2ccb0218ecac6368656e0e64ff6adb2416ad4621 06-Sep-2016 Robert Shih <robertshih@google.com> rtsp: compare AU seq nums only when seekable
am: d992b5930e

Change-Id: Ib45322ca100ec50f938c428bf2bd8149d46bdd38
6ba9b60facdffc9dfdd6e8792798f27d51c104ba 06-Sep-2016 Robert Shih <robertshih@google.com> Merge "rtsp: compare AU seq nums only when seekable" into nyc-mr1-dev
358bbd034f7a77186bbc90eb492fd4711e9a1c5e 06-Sep-2016 Hangyu Kuang <hkuang@google.com> media: Notify main thread error if encounter failure in track worker thread. am: 9db9f8d45e am: cf0f5f0620
am: b9bd9ac946

Change-Id: I60a02991446cd6577e4acd622babbd1a64fac953
b9bd9ac946a373b9b47222228daf8d25658ff63c 06-Sep-2016 Hangyu Kuang <hkuang@google.com> media: Notify main thread error if encounter failure in track worker thread. am: 9db9f8d45e
am: cf0f5f0620

Change-Id: I21b9aefbe5c849a7092cc0e8fe8cea2414dde9d2
cf0f5f062006e7a1ec40c104da05f8212e1a3e21 06-Sep-2016 Hangyu Kuang <hkuang@google.com> media: Notify main thread error if encounter failure in track worker thread.
am: 9db9f8d45e

Change-Id: If610e6a6a92807a840719f36df08a5d0f395ccf9
f1ea248d9e9eea1243387a597ad1d01ca7f22c1d 06-Sep-2016 Hangyu Kuang <hkuang@google.com> Merge "media: Notify main thread error if encounter failure in track worker thread." into nyc-mr1-dev
9db9f8d45ed2f22917dc6cf03b582b98add4510b 02-Sep-2016 Hangyu Kuang <hkuang@google.com> media: Notify main thread error if encounter failure in track worker thread.

Bug:31096780
Related to bug:30919939

Change-Id: I672dcbb01964826f33b7de5b279510fa9bb87986
PEG4Writer.cpp
86f051e812b896e527d890a6da11db8f8909fb1c 02-Sep-2016 Hangyu Kuang <hkuang@google.com> media: Move video buffer timestamp adjustment from CodecSource to GraphicBufferSource. am: 61fcfd1b0b am: 5ed707356a
am: 3dfe842f35

Change-Id: I677321476164b9a1b22c556bd2e5df0d5cea472e
3dfe842f35e2ee752f5b5b860d63b00863ad6179 02-Sep-2016 Hangyu Kuang <hkuang@google.com> media: Move video buffer timestamp adjustment from CodecSource to GraphicBufferSource. am: 61fcfd1b0b
am: 5ed707356a

Change-Id: I9e779e5de2d108a5b0c66c80d0613a3bdaf7fa6e
5ed707356a5454b46d7b7e4da90bc6accee90c57 02-Sep-2016 Hangyu Kuang <hkuang@google.com> media: Move video buffer timestamp adjustment from CodecSource to GraphicBufferSource.
am: 61fcfd1b0b

Change-Id: Ib619d1930213bd632ca3f554e4d9d909ef9d84d3
46c8f2d972e127d40b811dbd300dba6b2c339ba9 02-Sep-2016 TreeHugger Robot <treehugger-gerrit@google.com> Merge "media: Move video buffer timestamp adjustment from CodecSource to GraphicBufferSource." into nyc-mr1-dev
61fcfd1b0b58dff9284ede8dc49749ca7395856d 30-Aug-2016 Hangyu Kuang <hkuang@google.com> media: Move video buffer timestamp adjustment from CodecSource to GraphicBufferSource.

Bug:30919939
Change-Id: I7c1b626eee8512dac691b03309f724b3351e6e2f
Codec.cpp
ediaCodecSource.cpp
mx/GraphicBufferSource.cpp
mx/GraphicBufferSource.h
mx/OMXNodeInstance.cpp
76f8187777a9707abf58ef3efb8515541d7f1188 02-Sep-2016 Robert Shih <robertshih@google.com> rtsp: cancel AU checks when near end am: ae48167abb
am: f9cbd784a1

Change-Id: I03f29ae53b86b655654907a92cf3d2d1dc5ad2f4
237534765b9d90103eb06a3b5202f0bb41dd0337 02-Sep-2016 Robert Shih <robertshih@google.com> rtsp: refactor access unit queue processing am: 40828d674e
am: 1f2b21c630

Change-Id: If2bf1377b0e0ca63511e70446012bf72e9e24292
f9cbd784a12e1f545229e23cf2eb1a02971e4469 02-Sep-2016 Robert Shih <robertshih@google.com> rtsp: cancel AU checks when near end
am: ae48167abb

Change-Id: I49397b0d034fa72fc2af9eef701f8fa2b3c366a8
1f2b21c630e7b7f5bb9484a86186599f874bf145 02-Sep-2016 Robert Shih <robertshih@google.com> rtsp: refactor access unit queue processing
am: 40828d674e

Change-Id: I22b1949661b4fa3edc8217e3f89249338b07991b
d992b5930ea6d2b165d5099ecb436bffd25ef60c 02-Sep-2016 Robert Shih <robertshih@google.com> rtsp: compare AU seq nums only when seekable

Bug: 31205028
Change-Id: Ieae084a81126ce5509a0fb66b7f59b20d0a8df36
tsp/MyHandler.h
aa5b30e7b25040dd1121f106e990f8d39ddf9558 02-Sep-2016 Robert Shih <robertshih@google.com> Merge "rtsp: cancel AU checks when near end" into nyc-mr1-dev
eda5eb5192a559d957f9a662c1ee10c0c931e3f6 02-Sep-2016 Robert Shih <robertshih@google.com> Merge "rtsp: refactor access unit queue processing" into nyc-mr1-dev
e6f96aad0ca0543c024548b92183804f2f3ca01a 02-Sep-2016 Chong Zhang <chz@google.com> Do not set buffer count to 1 if seeking to closest am: ab653c8d63 am: 376e7394f1
am: 637e84555e

Change-Id: Iebf9ee97fc6a4b015fd8c4641bc01e19532b8d3f
637e84555e24f935adde94a9994f11163cce0f37 02-Sep-2016 Chong Zhang <chz@google.com> Do not set buffer count to 1 if seeking to closest am: ab653c8d63
am: 376e7394f1

Change-Id: I87d25b4fd39d2d056875f467330c2ecb2a7fbb76
ab653c8d63b2ee3b859d84d7a6561b2a2c5183a4 01-Sep-2016 Chong Zhang <chz@google.com> Do not set buffer count to 1 if seeking to closest

It's okay to set to 1 when seeking to a sync frame. But for
closest we need to do some decoding, and some decoders might
not work with a single buffer.

bug: 27542615
Change-Id: I66f415ec87118c463f95a82848090842e628401f
tagefrightMetadataRetriever.cpp
6db5763b0cc771278d3ee8ef1bcad945d6d2c430 01-Sep-2016 Marco Nelissen <marcone@google.com> Don't CHECK if the source can't be started

Bug: 19779574
Bug: 31156921
Change-Id: I770619949ed211dab301ee3da10069d319279715
uMediaExtractor.cpp
83d280910c2fada7dc86567301766b2eb29e00de 01-Sep-2016 Chong Zhang <chz@google.com> Fix MediaMetadataRetriever seek option OPTION_CLOSEST am: d2181387cf am: 8c9f6f5231
am: a02b9a3aa5

Change-Id: Iaf912448241fe95896bac067298771cf93bef845
a02b9a3aa526e65867a27641a3987f0eeae88980 01-Sep-2016 Chong Zhang <chz@google.com> Fix MediaMetadataRetriever seek option OPTION_CLOSEST am: d2181387cf
am: 8c9f6f5231

Change-Id: I76359c9caf14319024e20655996031948e90f23c
8c9f6f52315312b35fd426bc671ac56800d6d76b 01-Sep-2016 Chong Zhang <chz@google.com> Fix MediaMetadataRetriever seek option OPTION_CLOSEST
am: d2181387cf

Change-Id: If54c819abe1d1f02995d1d57e06d5aa0ec0bae93
2f9fc81fbcde8fd232fd52959ef3592c8ee7f65e 01-Sep-2016 Chong Zhang <chz@google.com> Merge "Fix MediaMetadataRetriever seek option OPTION_CLOSEST" into nyc-mr1-dev
bcc30e06dd15244e2824161f6898ad6c37f66c92 01-Sep-2016 Wonsik Kim <wonsik@google.com> Merge changes Iafb91645,I56a0ec7b into nyc-dr1-dev

* changes:
mediarecorder: fix timestamp adjustment for early pause/resume
Revert "media: Mediarecorder drops the mediabuffer with negative adjusted timestamp."
d2181387cfc70411fee1e3e2f34623e9d617e3dc 31-Aug-2016 Chong Zhang <chz@google.com> Fix MediaMetadataRetriever seek option OPTION_CLOSEST

When seeking with OPTION_CLOSEST, extractor returns the actual
closest target time via kKeyTargetTime, and read sample is the
sync frame before that. extractVideoFrame() needs to decode to
target time.

bug: 25783325
Change-Id: I94d6c196e2378b5efb608829b11aacf252d1fd46
tagefrightMetadataRetriever.cpp
d41cd05cb32bc904ddf32a339f95c031eb7437a5 30-Aug-2016 Chong Zhang <chz@google.com> stagefright: return an empty array if using surface inputs am: e4aab10641 am: 65da6ecc85
am: 2a5da2a811

Change-Id: I0f410b0a3aaf3d3c4b88426d9f620b5919436fc3
2a5da2a81131bd71395fbc47234ddc77185e8973 30-Aug-2016 Chong Zhang <chz@google.com> stagefright: return an empty array if using surface inputs am: e4aab10641
am: 65da6ecc85

Change-Id: Ic44cc0d201521331346ac77ebddeb4a33f80befc
d7a756ce1c11c17d897117df35dbc217a0c09567 30-Aug-2016 Dan Willemsen <dwillemsen@google.com> Merge "Convert to Android.bp" am: dd780c160d am: 1ee5667b7e am: 04fdc15790
am: 55490dcc95

Change-Id: Ic50254031f6879c696be36a5e7ccbda8533acfb7
e4aab10641a099d8a295b3ed61e2f5248f28a669 30-Aug-2016 Chong Zhang <chz@google.com> stagefright: return an empty array if using surface inputs

bug: 21376040

Change-Id: Iba9d1e7738f6da050bd1df11af75e28d51f69445
ediaCodec.cpp
55490dcc954dc04aaabcaf0bb0dfc44af9bf2c01 30-Aug-2016 Dan Willemsen <dwillemsen@google.com> Merge "Convert to Android.bp" am: dd780c160d am: 1ee5667b7e
am: 04fdc15790

Change-Id: I4f3a0801a6166921ba5bc93abb81dc6abf6121bb
04fdc1579006533a634e7071b02976652b747382 30-Aug-2016 Dan Willemsen <dwillemsen@google.com> Merge "Convert to Android.bp" am: dd780c160d
am: 1ee5667b7e

Change-Id: Ib85518624aedc9099e1aab4757e5e7c95afd6fac
bd152eb21ba91e62c53910c6d511aea2af89b656 26-Aug-2016 Viraj Karandikar <vkarandikar@nvidia.com> WAVExtractor: support ambisonic subformat

Support ambisonic subformat

Change-Id: I4fb35cbac3dd8b97bdda0e4faf4cfc356e2de928
AVExtractor.cpp
40828d674ea3c4a56e8d2454e4dcaefd5f08ebd7 30-Jul-2016 Robert Shih <robertshih@google.com> rtsp: refactor access unit queue processing

All access units must pass through processAccessUnitQueue (which
filters out stale sequence numbers) before being dequeued by NuPlayer.

Bug: 30230942
Change-Id: I87a099ded18324c4844747d901dc17cacfc1a12b
tsp/MyHandler.h
ae48167abbc1570498ae89759fcd5da1d6191388 30-Jul-2016 Robert Shih <robertshih@google.com> rtsp: cancel AU checks when near end

Bug: 30230942
Change-Id: Ie383f332beb7072e586bc95e8e7f2cc770953f7e
tsp/MyHandler.h
442a2ee35a2c3922237540aed8c16481e03dfb0d 27-Aug-2016 Dan Willemsen <dwillemsen@google.com> Convert to Android.bp

See build/soong/README.md for more information.

Change-Id: Ib5abad8bcb63bd3f3aa19a08817276fe21902515
oundation/Android.bp
oundation/Android.mk
ca4c68f25eb61f4d4e339e99cf63f863adc52fdd 09-Aug-2016 Sunghyun Kwon <sh.kwon@lge.com> stagefright: fix finding hardware codec

When findMatchingCodecs(.., kHardwareCodecsOnly,..) was called,
it wouldn't actually match any hardware codecs because of a typo:

if (!(TRUE_prefer_HW_codec && !FALSE_is_SW_codec))
==> if (!(TRUE && TRUE))

Fix logic and clarify statements

Change-Id: Ice725f043475caedd8f7ab961e0bc985db2eba6f
ediaCodecList.cpp
b18b2069710294ed30fcaf7e58776101e1c2d9a8 23-Aug-2016 Bryan Mawhinney <bryanmawhinney@google.com> Allow parsing of xyz chunks containing altitude am: 23b98e3538 am: dedfb43c7c am: 9e3906cd83
am: 8acb47a973

Change-Id: Iacf3c2e9d341327abc0cfadfc05a3f4803304266
8acb47a973c0b0eecdc36f0bccd513a11be9ccd7 23-Aug-2016 Bryan Mawhinney <bryanmawhinney@google.com> Allow parsing of xyz chunks containing altitude am: 23b98e3538 am: dedfb43c7c
am: 9e3906cd83

Change-Id: I36256600bd2a91bed677a83bc9a992731deb279e
dedfb43c7cb81a82e5266e420e96e21703d96084 23-Aug-2016 Bryan Mawhinney <bryanmawhinney@google.com> Allow parsing of xyz chunks containing altitude
am: 23b98e3538

Change-Id: Id8612b0988016524616d0e5b2a1d01b5a297fb51
23b98e3538529f88cdb758adedeee68408635fcb 22-Aug-2016 Bryan Mawhinney <bryanmawhinney@google.com> Allow parsing of ©xyz chunks containing altitude

Bug: 30993991
Change-Id: I54425ed6f28c001b7eb018eace2082c0fe8bcd1b
PEG4Extractor.cpp
7c3c2fa3e233c656fc8c2fc2a6634b3ecf8a23e8 02-Aug-2016 Lajos Molnar <lajos@google.com> DO NOT MERGE: IOMX: work against metadata buffer spoofing

- Prohibit direct set/getParam/Settings for extensions meant for
OMXNodeInstance alone. This disallows enabling metadata mode
without the knowledge of OMXNodeInstance.
- Use a backup buffer for metadata mode buffers and do not directly
share with clients.
- Disallow setting up metadata mode/tunneling/input surface
after first sendCommand.
- Disallow store-meta for input cross process.
- Disallow emptyBuffer for surface input (via IOMX).
- Fix checking for input surface.

Bug: 29422020
Change-Id: I801c77b80e703903f62e42d76fd2e76a34e4bc8e
nclude/OMXNodeInstance.h
mx/OMXNodeInstance.cpp
d32d4030c3778b7947c08e9be7d38c229d8d555d 02-Aug-2016 Lajos Molnar <lajos@google.com> IOMX: work against metadata buffer spoofing

- Prohibit direct set/getParam/Settings for extensions meant for
OMXNodeInstance alone. This disallows enabling metadata mode
without the knowledge of OMXNodeInstance.
- Use a backup buffer for metadata mode buffers and do not directly
share with clients.
- Disallow setting up metadata mode/tunneling/input surface
after first sendCommand.
- Disallow store-meta for input cross process.
- Disallow emptyBuffer for surface input (via IOMX).
- Fix checking for input surface.

Bug: 29422020
Change-Id: I801c77b80e703903f62e42d76fd2e76a34e4bc8e
nclude/OMXNodeInstance.h
mx/OMXNodeInstance.cpp
51a0ff56f49faf1a19281f6d786fe18bf84794c6 19-Aug-2016 Hangyu Kuang <hkuang@google.com> media: Fix a typo in parsing nclc atom.

Bug: 30974361
Change-Id: I12a75ed30d3259d863e744fae3ccff79d8a95f39
PEG4Extractor.cpp
0cbdc6e62fe08c883562c1bf56bf94203a295e77 20-Aug-2016 Wei Jia <wjia@google.com> MPEG4Extractor: support version 1 for trun box. am: 44a9bf5b01 am: 00fd9ee71f
am: 657edb6efb

Change-Id: I114143ddf23efdfacf3607ea700574faaf0dd77d
657edb6efbb973fdd85cd3cca74c8e0ce15d050c 20-Aug-2016 Wei Jia <wjia@google.com> MPEG4Extractor: support version 1 for trun box. am: 44a9bf5b01
am: 00fd9ee71f

Change-Id: I3b018d293340ad9b0ddf0299d6ee82f032de3b09
44a9bf5b013641a55d1784da353461e7446ff756 18-Aug-2016 Wei Jia <wjia@google.com> MPEG4Extractor: support version 1 for trun box.

Bug: 30936893
Change-Id: Ibe1d5683d435b6e7b17784d289e9bb94e89379f3
PEG4Extractor.cpp
080d666878c3f3ad091f85af95b43271a990c8f5 19-Aug-2016 Pawin Vongmasa <pawin@google.com> resolve merge conflicts of f37ad28 to master

Change-Id: I301ca44edf99188636c1113c9a705e8cc292f101
f37ad284433d0b858a1b147ab25a3c767b486689 19-Aug-2016 Pawin Vongmasa <pawin@google.com> Fix build breakage caused by commit 940829f69b52d6038db66a9c727534636ecc456d. am: baa9146401 am: 0aaa2c606c am: 784c8ac91a am: b65f47d30a am: 1cdd3c4262 am: 0954180087 am: be50e42a6c am: d82d9f0b1f am: dd6fc9a192
am: 8ab082c4f5

Change-Id: I9ab308a8f8fbe8579b8748ce1e7758ef1bd5c9f8
f09cd67d64ebc08a89975eeef38614449f55f7c0 19-Aug-2016 Pawin Vongmasa <pawin@google.com> Fix build breakage caused by commit 940829f69b52d6038db66a9c727534636ecc456d. am: baa9146401 am: 0aaa2c606c am: 784c8ac91a am: b65f47d30a am: 1cdd3c4262 am: 0954180087 am: be50e42a6c am: d82d9f0b1f am: dd6fc9a192
am: 941e41588f

Change-Id: I51686def5d8134b6120634f35d575be51aa7c98e
4fbfca07a35fcb539e2d20ab3e394cc689ec9e68 19-Aug-2016 Ray Essick <essick@google.com> better validation lengths of strings in ID3 tags am: d23c01546c am: e3fad118bb am: 019973a8d4 am: d936eadf31 am: 94875f51ca am: 49c95c0e2a am: 6dd5f688e5 am: 9514a61372 am: 1cbdd5a604
am: 75b2dc0dbc

Change-Id: I02443aafc0daa6512a09502fddc1173c1c44d1f2
8ab082c4f56719538c2312ba38440124b8e01af0 19-Aug-2016 Pawin Vongmasa <pawin@google.com> Fix build breakage caused by commit 940829f69b52d6038db66a9c727534636ecc456d. am: baa9146401 am: 0aaa2c606c am: 784c8ac91a am: b65f47d30a am: 1cdd3c4262 am: 0954180087 am: be50e42a6c am: d82d9f0b1f
am: dd6fc9a192

Change-Id: Ice914669970f397c494bda1727a79d912dedc48f
3bc41e29a5bd51b06072097376466c52f373a44e 19-Aug-2016 Hangyu Kuang <hkuang@google.com> Merge "media: Fix graphic buffer leak."
941e41588ffc329d03dd935c62e61838cf9b5728 19-Aug-2016 Pawin Vongmasa <pawin@google.com> Fix build breakage caused by commit 940829f69b52d6038db66a9c727534636ecc456d. am: baa9146401 am: 0aaa2c606c am: 784c8ac91a am: b65f47d30a am: 1cdd3c4262 am: 0954180087 am: be50e42a6c am: d82d9f0b1f
am: dd6fc9a192

Change-Id: Ia7a3d1a4d1cd7d00eb97040171b55dae0a2a4127
dd6fc9a1926e15267caf89bbf1806ff127b798b1 19-Aug-2016 Pawin Vongmasa <pawin@google.com> Fix build breakage caused by commit 940829f69b52d6038db66a9c727534636ecc456d. am: baa9146401 am: 0aaa2c606c am: 784c8ac91a am: b65f47d30a am: 1cdd3c4262 am: 0954180087 am: be50e42a6c
am: d82d9f0b1f

Change-Id: I574b7261bba02014565b3754e75959ec23665164
d82d9f0b1f741888f9d32ad79c4e5490689d4fad 19-Aug-2016 Pawin Vongmasa <pawin@google.com> Fix build breakage caused by commit 940829f69b52d6038db66a9c727534636ecc456d. am: baa9146401 am: 0aaa2c606c am: 784c8ac91a am: b65f47d30a am: 1cdd3c4262 am: 0954180087
am: be50e42a6c

Change-Id: Ifcd8904849429c7fa2b3f40d20080921902d5267
be50e42a6c68fbb3e4d9ed7e4e2d776e77811592 19-Aug-2016 Pawin Vongmasa <pawin@google.com> Fix build breakage caused by commit 940829f69b52d6038db66a9c727534636ecc456d. am: baa9146401 am: 0aaa2c606c am: 784c8ac91a am: b65f47d30a am: 1cdd3c4262
am: 0954180087

Change-Id: Ia1975e0053d3d719ba678abbc7d48d7b74e43357
ba27266dc12284cd12c935c30a06daef1137d101 19-Aug-2016 Ray Essick <essick@google.com> better validation lengths of strings in ID3 tags am: d23c01546c am: e3fad118bb am: 019973a8d4 am: d936eadf31 am: 94875f51ca am: 49c95c0e2a am: 6dd5f688e5 am: 9514a61372 am: 1cbdd5a604
am: 37142c9c73

Change-Id: Ib5af8840b2af33d7dcecada56e90065e86511e93
0954180087158fa81f9ed32bf92e5afe8867be77 19-Aug-2016 Pawin Vongmasa <pawin@google.com> Fix build breakage caused by commit 940829f69b52d6038db66a9c727534636ecc456d. am: baa9146401 am: 0aaa2c606c am: 784c8ac91a am: b65f47d30a
am: 1cdd3c4262

Change-Id: I9c6e65b795a5181ba152ffd4e358b0a25311b22e
75b2dc0dbc8e3cd722a719fb2c97b7fa2ad88ffc 19-Aug-2016 Ray Essick <essick@google.com> better validation lengths of strings in ID3 tags am: d23c01546c am: e3fad118bb am: 019973a8d4 am: d936eadf31 am: 94875f51ca am: 49c95c0e2a am: 6dd5f688e5 am: 9514a61372
am: 1cbdd5a604

Change-Id: I4164ccddcbb1211b215c399fd895e9c01dcd4a39
37142c9c7326cf4e9ca1cdb2855228e7f839fb8d 19-Aug-2016 Ray Essick <essick@google.com> better validation lengths of strings in ID3 tags am: d23c01546c am: e3fad118bb am: 019973a8d4 am: d936eadf31 am: 94875f51ca am: 49c95c0e2a am: 6dd5f688e5 am: 9514a61372
am: 1cbdd5a604

Change-Id: I2725bf11f7c046550e8e957be20586158876344f
1cdd3c42620555c82320ffc2f25d688448c5cc9a 19-Aug-2016 Pawin Vongmasa <pawin@google.com> Fix build breakage caused by commit 940829f69b52d6038db66a9c727534636ecc456d. am: baa9146401 am: 0aaa2c606c am: 784c8ac91a
am: b65f47d30a

Change-Id: I18c74610c4fbbedf047e64c3bd01e5704422234c
1cbdd5a6047f8809cf23825714e1726acae7b24e 19-Aug-2016 Ray Essick <essick@google.com> better validation lengths of strings in ID3 tags am: d23c01546c am: e3fad118bb am: 019973a8d4 am: d936eadf31 am: 94875f51ca am: 49c95c0e2a am: 6dd5f688e5
am: 9514a61372

Change-Id: Iedc52d00b464526b8d1bfde2d1f9fdcdfa8f3fa8
b65f47d30ab56058e23752f0146f359b72bfb9d5 19-Aug-2016 Pawin Vongmasa <pawin@google.com> Fix build breakage caused by commit 940829f69b52d6038db66a9c727534636ecc456d. am: baa9146401 am: 0aaa2c606c
am: 784c8ac91a

Change-Id: I1dd6a8c51d485de7af539339f7c6199935ee9fa8
9514a61372897136dc011bdb9acd11b334697979 19-Aug-2016 Ray Essick <essick@google.com> better validation lengths of strings in ID3 tags am: d23c01546c am: e3fad118bb am: 019973a8d4 am: d936eadf31 am: 94875f51ca am: 49c95c0e2a
am: 6dd5f688e5

Change-Id: I9ea5038a76caa7b0642426618b08f4f36ca6bc91
6dd5f688e5877a5991b6ba55a2791462fa74f760 19-Aug-2016 Ray Essick <essick@google.com> better validation lengths of strings in ID3 tags am: d23c01546c am: e3fad118bb am: 019973a8d4 am: d936eadf31 am: 94875f51ca
am: 49c95c0e2a

Change-Id: Id20117b7a08e6e8858adf2c499ae03cff4189417
0aaa2c606c3e2db24068e0742576e9ea7d1be7b8 19-Aug-2016 Pawin Vongmasa <pawin@google.com> Fix build breakage caused by commit 940829f69b52d6038db66a9c727534636ecc456d.
am: baa9146401

Change-Id: I3c8f4edbc3b75f50bc6393271314a71f681ac43d
2a21f09fff5e80b306ec30a618d54a4827447f3a 19-Aug-2016 Pawin Vongmasa <pawin@google.com> DO NOT MERGE - Fix build breakage caused by commit 940829f69b52d6038db66a9c727534636ecc456d. am: ad929db743
am: 453ba68c65

Change-Id: I833cb55b51e554e6b2ef3227f2923def6643c9e4
49c95c0e2aec93465b022bf9ee9c93bcc366a183 19-Aug-2016 Ray Essick <essick@google.com> better validation lengths of strings in ID3 tags am: d23c01546c am: e3fad118bb am: 019973a8d4 am: d936eadf31
am: 94875f51ca

Change-Id: Id6b1ba9255ca4d3f298ee408231648511e6a0fed
7a66bd2404f2b171f8cb28a8ef7a3c2e6176a2a4 19-Aug-2016 Pawin Vongmasa <pawin@google.com> Merge "Fix build breakage caused by commit 940829f69b52d6038db66a9c727534636ecc456d." into lmp-dev
94875f51caa26ee0de912be49de141f7e592f362 19-Aug-2016 Ray Essick <essick@google.com> better validation lengths of strings in ID3 tags am: d23c01546c am: e3fad118bb am: 019973a8d4
am: d936eadf31

Change-Id: Ic91989dc86a789e282c3b20f253d8591d7bd78a7
d936eadf31e2b12cdfabb0b7e7b1fd3589691a6e 19-Aug-2016 Ray Essick <essick@google.com> better validation lengths of strings in ID3 tags am: d23c01546c am: e3fad118bb
am: 019973a8d4

Change-Id: I19865bbbc4037de800c2a1670de070c5ecc2dbf6
5f50cdfb0cc40bd00d02a9b3519ef0d881b2b67e 19-Aug-2016 Wonsik Kim <wonsik@google.com> mediarecorder: fix timestamp adjustment for early pause/resume am: a5aeb87eab am: 5fe669bafa
am: f5a40c6895

Change-Id: Ic5f48984d0b3652b1b4d58bb53d5292ce51d6b79
887b983efc01ce30ec20640ecd2f5fc741b383a4 19-Aug-2016 Wonsik Kim <wonsik@google.com> Revert "media: Mediarecorder drops the mediabuffer with negative adjusted timestamp." am: e35600eb62 am: 1a9c34d61f
am: daa5dafca5

Change-Id: Icc2a9e7cbf580e457a3003f71dc102a3aec71068
f5a40c689555e845dd79184810355e5307f23e01 19-Aug-2016 Wonsik Kim <wonsik@google.com> mediarecorder: fix timestamp adjustment for early pause/resume am: a5aeb87eab
am: 5fe669bafa

Change-Id: I974f0099a03d7a783aeebbb514b7936f11caa463
daa5dafca558aab3b46204fcee630e3a40ba4823 19-Aug-2016 Wonsik Kim <wonsik@google.com> Revert "media: Mediarecorder drops the mediabuffer with negative adjusted timestamp." am: e35600eb62
am: 1a9c34d61f

Change-Id: I84fb98539b1e98c7e229eaf09f6184e37bb2eca8
5fe669bafa0b553003880a8c786eadd7d5f00b4a 19-Aug-2016 Wonsik Kim <wonsik@google.com> mediarecorder: fix timestamp adjustment for early pause/resume
am: a5aeb87eab

Change-Id: I622904e99552d9451f272abd201c38d1046a3604
1a9c34d61faece07bde28cebda431f9c2b38fe76 19-Aug-2016 Wonsik Kim <wonsik@google.com> Revert "media: Mediarecorder drops the mediabuffer with negative adjusted timestamp."
am: e35600eb62

Change-Id: Iade2645300504e8e6303ad658a56a16fb1731d9d
e3fad118bbbaacfc5f32cbcc1e7f7900316a8175 19-Aug-2016 Ray Essick <essick@google.com> better validation lengths of strings in ID3 tags
am: d23c01546c

Change-Id: Idb8da8a0557349964f862ec1ab9f81542b81c492
ae12b68ba2cca06e696b5f18fba1f513f383da3d 19-Aug-2016 Ray Essick <essick@google.com> Merge "better validation lengths of strings in ID3 tags" into lmp-dev
991d3c37237922a96af883ca056c4393c4654523 19-Aug-2016 TreeHugger Robot <treehugger-gerrit@google.com> Merge changes Iafb91645,I56a0ec7b into nyc-mr1-dev

* changes:
mediarecorder: fix timestamp adjustment for early pause/resume
Revert "media: Mediarecorder drops the mediabuffer with negative adjusted timestamp."
d994ffa4279a60a09b0a419935f4c54bddb2161c 19-Aug-2016 Iliyan Malchev <malchev@google.com> fix the build

Change-Id: I349c3c42b74aa4a6e87bdfb8427012367ae60099
Signed-off-by: Iliyan Malchev <malchev@google.com>
odecs/m4v_h263/dec/SoftMPEG4.cpp
ad929db743806aa55b2b8f795be61d21224b0f05 19-Aug-2016 Pawin Vongmasa <pawin@google.com> DO NOT MERGE - Fix build breakage caused by commit
940829f69b52d6038db66a9c727534636ecc456d.

Change-Id: Ic55a9ab25ddb57f270c21d78ffcb556f3e11dd5d
odecs/m4v_h263/dec/SoftMPEG4.cpp
baa9146401e28c5acf54dea21ddd197f0d3a8fcd 19-Aug-2016 Pawin Vongmasa <pawin@google.com> Fix build breakage caused by commit
940829f69b52d6038db66a9c727534636ecc456d.

Change-Id: I4776db4a26fb3c31bb994d48788373fe569c812a
odecs/m4v_h263/dec/SoftMPEG4.cpp
a0c11a3effdc257da8d95c3f210a80a57e1f1517 29-Jul-2016 Wonsik Kim <wonsik@google.com> mediarecorder: fix timestamp adjustment for early pause/resume

Bug: 30549032
Change-Id: Iafb916454499e9fac3af3b8a6abe06c652f84564
ediaCodecSource.cpp
756a1f3c58272d62ca3fb6e38a2b43c823ac7562 28-Jul-2016 Wonsik Kim <wonsik@google.com> Revert "media: Mediarecorder drops the mediabuffer with negative adjusted timestamp."

This reverts commit 901ca36bf02726ca07d83820c93c76d696549a03.

Change-Id: I56a0ec7b8d70e19cc6009d8fbc4560becf1d04c9
ediaCodecSource.cpp
23caea2f66f72a122d6fcb7fa4c941abd415eed8 19-Aug-2016 Pawin Vongmasa <pawin@google.com> SoftMPEG4: Check the buffer size before writing the reference frame. am: 6951231950 am: af39271e11 am: 3efed2f14c am: 1cfd97c331 am: 792a43273e am: 8c0f6d6ad4 am: f4e8d14499 am: f28464e0e1 am: dd6314bb10
am: 6645f9d62c

Change-Id: I2f7ada71fcdbe891dab25a7ddd753bf7e06cf187
9d84fed5412124881e2ae463c7e1ab26b5363a6d 19-Aug-2016 Pawin Vongmasa <pawin@google.com> SoftMPEG4: Check the buffer size before writing the reference frame. am: 6951231950 am: af39271e11 am: 3efed2f14c am: 1cfd97c331 am: 792a43273e am: 8c0f6d6ad4 am: f4e8d14499
am: f28464e0e1

Change-Id: Ie3b3d459fae620b3dea055e1638970d0abb92fd7
6645f9d62c2633d5e3fe5918c71c0f25c661f004 19-Aug-2016 Pawin Vongmasa <pawin@google.com> SoftMPEG4: Check the buffer size before writing the reference frame. am: 6951231950 am: af39271e11 am: 3efed2f14c am: 1cfd97c331 am: 792a43273e am: 8c0f6d6ad4 am: f4e8d14499 am: f28464e0e1
am: dd6314bb10

Change-Id: Ifa2cf12957d044ae18fd8f425c38629e88c31440
dd6314bb10085dddd457e73d22c29a68e1734053 19-Aug-2016 Pawin Vongmasa <pawin@google.com> SoftMPEG4: Check the buffer size before writing the reference frame. am: 6951231950 am: af39271e11 am: 3efed2f14c am: 1cfd97c331 am: 792a43273e am: 8c0f6d6ad4 am: f4e8d14499
am: f28464e0e1

Change-Id: I5c4bfb0e36c6c1927497be0cadfc6aa1c2c187a3
f28464e0e1711b8b11bc7ec8fb15da9385c5c777 19-Aug-2016 Pawin Vongmasa <pawin@google.com> SoftMPEG4: Check the buffer size before writing the reference frame. am: 6951231950 am: af39271e11 am: 3efed2f14c am: 1cfd97c331 am: 792a43273e am: 8c0f6d6ad4
am: f4e8d14499

Change-Id: I0787c59a4d4094332b4145eac367ba6514fdd04e
f4e8d144996b33809e3795951255da40c0f0c3e3 19-Aug-2016 Pawin Vongmasa <pawin@google.com> SoftMPEG4: Check the buffer size before writing the reference frame. am: 6951231950 am: af39271e11 am: 3efed2f14c am: 1cfd97c331 am: 792a43273e
am: 8c0f6d6ad4

Change-Id: I0e37f171f3ff1dd35baf8a0ea6062555eb69437a
8c0f6d6ad49b5a0c52e40b1abb87848e5e27d272 19-Aug-2016 Pawin Vongmasa <pawin@google.com> SoftMPEG4: Check the buffer size before writing the reference frame. am: 6951231950 am: af39271e11 am: 3efed2f14c am: 1cfd97c331
am: 792a43273e

Change-Id: Ia721ae1add40fea83796817f7f16585450dbbd33
792a43273e20f4ad716542fa21950123970a08f4 19-Aug-2016 Pawin Vongmasa <pawin@google.com> SoftMPEG4: Check the buffer size before writing the reference frame. am: 6951231950 am: af39271e11 am: 3efed2f14c
am: 1cfd97c331

Change-Id: I9648977377ee7a06dff6ff00a4c74e31a0f44a3a
1cfd97c33126ecfc2458470a7ba88c68853e398e 19-Aug-2016 Pawin Vongmasa <pawin@google.com> SoftMPEG4: Check the buffer size before writing the reference frame. am: 6951231950 am: af39271e11
am: 3efed2f14c

Change-Id: I33b4226d5aa42a1adc14988789ac2f0965cfb606
b71a431eabce5983ccd3efadeb024b8ed08bb89d 19-Aug-2016 Pawin Vongmasa <pawin@google.com> DO NOT MERGE - SoftMPEG4: Check the buffer size before writing the reference frame. am: 940829f69b
am: 920b0f7887

Change-Id: I603ab931f82d8a83187be989dccb8686de8bf95e
3efed2f14c5e556b3a14e25a0a83d0bf9492d3ab 19-Aug-2016 Pawin Vongmasa <pawin@google.com> SoftMPEG4: Check the buffer size before writing the reference frame. am: 6951231950
am: af39271e11

Change-Id: I2d263d12fecf7dc3974b665ca568d3db5dcd76b3
50c92866312fa3ef72d1fca53f80cba33f3d092c 19-Aug-2016 Hangyu Kuang <hkuang@google.com> media: Fix graphic buffer leak.

Bug: 30882996
Change-Id: I571a3a9d1705233029abb92f3752416d55ed1056
mx/GraphicBufferSource.cpp
mx/GraphicBufferSource.h
9a4768f7bfcd4654f93ad9b22eff87df493a9d5e 02-Aug-2016 Lajos Molnar <lajos@google.com> DO NOT MERGE: IOMX: work against metadata buffer spoofing

- Prohibit direct set/getParam/Settings for extensions meant for
OMXNodeInstance alone. This disallows enabling metadata mode
without the knowledge of OMXNodeInstance.
- Do not share metadata mode buffers cross process.
- Disallow setting up metadata mode/tunneling/input surface
after first sendCommand. (Except to Idle for OMXCodec quirk.)
- Disallow store-meta for input cross process.
- Disallow emptyBuffer for surface input (via IOMX).
- Fix checking for input surface.

[backported from M]

Bug: 29422020
Change-Id: I801c77b80e703903f62e42d76fd2e76a34e4bc8e
Codec.cpp
MXClient.cpp
nclude/OMX.h
nclude/OMXNodeInstance.h
mx/OMX.cpp
mx/OMXNodeInstance.cpp
86369364a07c85dd8f0e890b783a7bd434b8ef7c 02-Aug-2016 Lajos Molnar <lajos@google.com> DO NOT MERGE: IOMX: work against metadata buffer spoofing

- Prohibit direct set/getParam/Settings for extensions meant for
OMXNodeInstance alone. This disallows enabling metadata mode
without the knowledge of OMXNodeInstance.
- Do not share metadata mode buffers cross process.
- Disallow setting up metadata mode/tunneling/input surface
after first sendCommand. (Except to Idle state for OMXCodec quirk.)
- Disallow store-meta for input cross process.
- Disallow emptyBuffer for surface input (via IOMX).
- Fix checking for input surface.

[backported from L-MR1]

Bug: 29422020
Change-Id: I801c77b80e703903f62e42d76fd2e76a34e4bc8e
Codec.cpp
MXClient.cpp
nclude/OMX.h
nclude/OMXNodeInstance.h
mx/OMX.cpp
mx/OMXNodeInstance.cpp
807e827d4c1196754faaf138cb93c57c5b137e69 02-Aug-2016 Lajos Molnar <lajos@google.com> DO NOT MERGE: IOMX: work against metadata buffer spoofing

- Prohibit direct set/getParam/Settings for extensions meant for
OMXNodeInstance alone. This disallows enabling metadata mode
without the knowledge of OMXNodeInstance.
- Do not share metadata mode buffers cross process.
- Disallow setting up metadata mode/input surface
after first sendCommand (except to Idle for OMXCodec quirk).
- Disallow store-meta for input cross process.
- Disallow emptyBuffer for surface input (via IOMX).
- Fix checking for input surface.

[backported from L]

Bug: 29422020
Change-Id: I801c77b80e703903f62e42d76fd2e76a34e4bc8e
Codec.cpp
MXClient.cpp
nclude/OMX.h
nclude/OMXNodeInstance.h
mx/OMX.cpp
mx/OMXNodeInstance.cpp
a5aeb87eabfda3cb385eed405b843bdcb64252be 29-Jul-2016 Wonsik Kim <wonsik@google.com> mediarecorder: fix timestamp adjustment for early pause/resume

Bug: 30549032
Change-Id: Iafb916454499e9fac3af3b8a6abe06c652f84564
ediaCodecSource.cpp
e35600eb62d4a2dc2dd0cc8c0d0d177cec7ed1cc 28-Jul-2016 Wonsik Kim <wonsik@google.com> Revert "media: Mediarecorder drops the mediabuffer with negative adjusted timestamp."

This reverts commit 901ca36bf02726ca07d83820c93c76d696549a03.

Change-Id: I56a0ec7b8d70e19cc6009d8fbc4560becf1d04c9
ediaCodecSource.cpp
6fb1ff39cd71221c75b8e845c21c7106f386cd9d 27-Jul-2016 Wonsik Kim <wonsik@google.com> omx: prevent crash at MuxOMX::freeNode for already freed nodes

Bug: 29188904
Change-Id: I5c11ad371d6a060c4b201492aac08a8163d1b658
MXClient.cpp
149df9f07107e249acec848c5a53d7b4c0d16a16 18-Aug-2016 Andy Hung <hunga@google.com> MediaBuffer: Only use shared memory for processes that export MediaBuffers am: cfa86b5efa
am: fde5258be5

Change-Id: I63edca0af5b025d650e9409045aa3b691555a21e
cfa86b5efa029391df04182dedfabd72b49a32f5 30-Jul-2016 Andy Hung <hunga@google.com> MediaBuffer: Only use shared memory for processes that export MediaBuffers

Reduces excess file descriptors and shared memory creation and releases.

Bug: 28930897
Bug: 30341084
Change-Id: I8190e22dd800f25be79ec33cb02613d15482e1d4
oundation/MediaBuffer.cpp
180185da195c42d366a16d9c087413dd8c07d58b 19-Jul-2016 Pawin Vongmasa <pawin@google.com> DO NOT MERGE - SoftMPEG4: Check the buffer size before writing the reference frame.

Also prevent overflow in SoftMPEG4 and division by zero in SoftMPEG4Encoder.

Bug: 30033990
Change-Id: I7701f5fc54c2670587d122330e5dc851f64ed3c2
(cherry picked from commit 695123195034402ca76169b195069c28c30342d3)
odecs/m4v_h263/dec/SoftMPEG4.cpp
odecs/m4v_h263/enc/SoftMPEG4Encoder.cpp
940829f69b52d6038db66a9c727534636ecc456d 19-Jul-2016 Pawin Vongmasa <pawin@google.com> DO NOT MERGE - SoftMPEG4: Check the buffer size before writing the reference frame.

Also prevent overflow in SoftMPEG4 and division by zero in SoftMPEG4Encoder.

Bug: 30033990
Change-Id: I7701f5fc54c2670587d122330e5dc851f64ed3c2
(cherry picked from commit 695123195034402ca76169b195069c28c30342d3)
odecs/m4v_h263/dec/SoftMPEG4.cpp
odecs/m4v_h263/enc/SoftMPEG4Encoder.cpp
bcded90c72e5e039fc96e9f6d66f84e915c26563 17-Aug-2016 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Parcel albumart as a Blob, to avoid parceling failures"
72fcc3cebc595b6937fd4e5c4fdd4a59e78cb560 27-Jul-2016 Marco Nelissen <marcone@google.com> Parcel albumart as a Blob, to avoid parceling failures

Bug: 30044214
Change-Id: Iaeb3da674724a63c7bf3a79d9173ab32b1913562
oundation/MetaData.cpp
d23c01546c4f82840a01a380def76ab6cae5d43f 16-Aug-2016 Ray Essick <essick@google.com> better validation lengths of strings in ID3 tags

Validate lengths on strings in ID3 tags, particularly around 0.
Also added code to handle cases when we can't get memory for
copies of strings we want to extract from these tags.

Affects L/M/N/master, same patch for all of them.

Bug: 30744884
Change-Id: I2675a817a39f0927ec1f7e9f9c09f2e61020311e
Test: play mp3 file which caused a <0 length.
d3/ID3.cpp
546bb6d4f003acfea78f129c0d05a15a6ea848e2 15-Aug-2016 Lajos Molnar <lajos@google.com> stagefright: handle NULL format after convertMetaDataToMessage am: 5bd99f9211 am: 775226f35d
am: d97e14c1c2

Change-Id: I1ba4f39cfd7837b5fe007d335962c4175556a39b
d97e14c1c20e3763f2e91e55da3255b55448cbfd 15-Aug-2016 Lajos Molnar <lajos@google.com> stagefright: handle NULL format after convertMetaDataToMessage am: 5bd99f9211
am: 775226f35d

Change-Id: I670fb7014f929c90d2f1d274fb0f6021730c945d
7d64d30d0dcdb97be921790e2702e5adfe751d92 12-Aug-2016 Chih-Hung Hsieh <chh@google.com> resolve merge conflicts of 6ae8c7b to stage-aosp-master am: 32d6e5f0eb
am: a944197b97

Change-Id: I03472be260cbfdaf436514d319e91063c738b82c
a944197b97b4e64ffb3abe91218d1db06ea9d7de 12-Aug-2016 Chih-Hung Hsieh <chh@google.com> resolve merge conflicts of 6ae8c7b to stage-aosp-master
am: 32d6e5f0eb

Change-Id: I200068e27004c5f3c9508a4f46747e0459b31ba8
4160e8dd0c0286736e9cdf3cbd46553f82f541ae 12-Aug-2016 Pawin Vongmasa <pawin@google.com> DO NOT MERGE - ACodec: Save and use the previous crop rectangle. am: 07d73a0a3f am: 5e523ead5a
am: 599dd8a688

Change-Id: I1d3d08c6a76dd5cc12095b23777bcc16d502dae6
599dd8a68841e7e89ac5ad1955f06ec82196d7c3 12-Aug-2016 Pawin Vongmasa <pawin@google.com> DO NOT MERGE - ACodec: Save and use the previous crop rectangle. am: 07d73a0a3f
am: 5e523ead5a

Change-Id: Ie68d73caa56740f8d9273acd3a5888266092a3d4
5e523ead5ae5bf9534174e9a423f84b152c9b576 12-Aug-2016 Pawin Vongmasa <pawin@google.com> DO NOT MERGE - ACodec: Save and use the previous crop rectangle.
am: 07d73a0a3f

Change-Id: I52c3cf5e2ccc0e2c84b0e634dba8e10054d4ff42
32d6e5f0ebe9e00f80401e5f4fd6e285a474590d 12-Aug-2016 Chih-Hung Hsieh <chh@google.com> resolve merge conflicts of 6ae8c7b to stage-aosp-master

Change-Id: Iabb5d9b93b98e428c53f0504fbfe832ed24d988d
e002c39c12c8371fcec57d31ad5d02ccdd82765a 12-Aug-2016 Chih-hung Hsieh <chh@google.com> Merge "Fix clang-tidy warnings in stagefright."
07d73a0a3f20bb089475fe538c9f760eea69f55f 12-Aug-2016 Pawin Vongmasa <pawin@google.com> DO NOT MERGE - ACodec: Save and use the previous crop rectangle.

When the surface changes, set the crop rectangle for the new native
window using the previous crop rectangle if available.

Also prevent null pointer dereferencing in debug mode.

Bug: 30690174

Change-Id: I7a707d661ced5a87fcaa8568cbb903fbc26ea346
Codec.cpp
d2b126291b7cc302ebcef8249bef7813e0dd77dc 11-Aug-2016 Ray Essick <essick@google.com> even better error handling in id3 tag parsing.

This better handles some of the error cases, particularly
when the 'new' operations fail.

Bug: 30744884
Change-Id: Idbc1fd4aef1ee6cc2736057ff09bf870d8fb5da3
d3/ID3.cpp
c54432ae4f3627b1003fa251616b0103dad8b5d0 10-Aug-2016 Ray Essick <essick@google.com> Better handling of empty ID3 tags

Watch for 0 length ID3 tags, avoiding allocations of 0 bytes when
we see these. Change code around "new" invocations so that we won't
throw exceptions and we check for null returns when they do fail.

Bug: 30744884
d3/ID3.cpp
0d1ed381fde5dac12dd84fcf3da66dac46699378 09-Aug-2016 Chih-Hung Hsieh <chh@google.com> Fix clang-tidy warnings in stagefright.

* Add explicit keyword to conversion constructors.
* Or add NOLINT to implicit conversion constructors.
Bug: 28341362
* Use const reference type for read-only parameters.
Bug: 30407689
* Use const reference type to avoid unnecessary copy.
Bug: 30413862
Test: build with WITH_TIDY=1

Change-Id: I7a15ac1e37973fe2c661f577a6106b913653de40
Merged-In: I7a15ac1e37973fe2c661f577a6106b913653de40
PEG4Extractor.cpp
ediaCodec.cpp
ediaCodecList.cpp
ediaCodecListOverrides.cpp
tils.cpp
odecs/m4v_h263/dec/include/m4vh263_decoder_pv_types.h
oundation/ALooperRoster.cpp
ttplive/LiveSession.h
nclude/AMRExtractor.h
nclude/CallbackDataSource.h
nclude/FLACExtractor.h
nclude/ID3.h
nclude/MPEG2PSExtractor.h
nclude/MPEG2TSExtractor.h
nclude/MPEG4Extractor.h
nclude/MidiExtractor.h
nclude/OMXNodeInstance.h
nclude/OggExtractor.h
nclude/SampleIterator.h
nclude/SampleTable.h
nclude/WAVExtractor.h
nclude/WVMExtractor.h
atroska/MatroskaExtractor.h
peg2ts/ATSParser.h
peg2ts/AnotherPacketSource.h
peg2ts/ESQueue.h
mx/GraphicBufferSource.cpp
mx/GraphicBufferSource.h
mx/OMXNodeInstance.cpp
tsp/AAVCAssembler.h
tsp/AH263Assembler.h
tsp/ARTPConnection.h
tsp/ARTPWriter.h
tsp/ARTSPConnection.h
ests/DummyRecorder.h
ests/MediaCodecListOverrides_test.cpp
ebm/WebmElement.h
ebm/WebmWriter.h
ifi-display/source/TSPacketizer.h
40d8899f60c5212af9d727ba0ffaaecf676ebd1d 09-Aug-2016 Chih-Hung Hsieh <chh@google.com> Fix clang-tidy warnings in stagefright.

* Add explicit keyword to conversion constructors.
* Or add NOLINT to implicit conversion constructors.
Bug: 28341362
* Use const reference type for read-only parameters.
Bug: 30407689
* Use const reference type to avoid unnecessary copy.
Bug: 30413862
Test: build with WITH_TIDY=1

Change-Id: I7a15ac1e37973fe2c661f577a6106b913653de40
PEG4Extractor.cpp
ediaCodec.cpp
ediaCodecList.cpp
ediaCodecListOverrides.cpp
tils.cpp
odecs/m4v_h263/dec/include/m4vh263_decoder_pv_types.h
oundation/ALooperRoster.cpp
ttplive/LiveSession.h
nclude/AMRExtractor.h
nclude/CallbackDataSource.h
nclude/FLACExtractor.h
nclude/ID3.h
nclude/MPEG2PSExtractor.h
nclude/MPEG2TSExtractor.h
nclude/MPEG4Extractor.h
nclude/MidiExtractor.h
nclude/OMXNodeInstance.h
nclude/OggExtractor.h
nclude/SampleIterator.h
nclude/SampleTable.h
nclude/WAVExtractor.h
nclude/WVMExtractor.h
atroska/MatroskaExtractor.h
peg2ts/ATSParser.h
peg2ts/AnotherPacketSource.h
peg2ts/ESQueue.h
mx/GraphicBufferSource.cpp
mx/GraphicBufferSource.h
mx/OMXNodeInstance.cpp
tsp/AAVCAssembler.h
tsp/AH263Assembler.h
tsp/ARTPConnection.h
tsp/ARTPWriter.h
tsp/ARTSPConnection.h
ests/DummyRecorder.h
ests/MediaCodecListOverrides_test.cpp
ebm/WebmElement.h
ebm/WebmWriter.h
ifi-display/source/TSPacketizer.h
5bd99f9211c533058be9f41bc966be1f2f501f13 10-Aug-2016 Lajos Molnar <lajos@google.com> stagefright: handle NULL format after convertMetaDataToMessage

Bug: 30421366
Change-Id: I411f9f22b39943f7c8fa4e22fc37efe5f9e0ccb5
impleDecodingSource.cpp
5affeea0e9b39546aa6d50e6ba810d08818f6e8e 09-Aug-2016 Praveen Chavan <pchavan@codeaurora.org> MPEG4Writer: Enforce CSD size check only for MPEG-4 audio/video am: bc4e708bf8 am: 81c65c9bb9
am: c42146f04f

Change-Id: Ia524f2395c68e0c61e3d0b2e17eaf31e4695dda2
c42146f04fbc8729662b8ba2475ca817f59cb316 09-Aug-2016 Praveen Chavan <pchavan@codeaurora.org> MPEG4Writer: Enforce CSD size check only for MPEG-4 audio/video am: bc4e708bf8
am: 81c65c9bb9

Change-Id: I2fcce6a1248f57b813861a7e1b54f8519532b01a
81c65c9bb90c3628cf476462352535356098bdcc 09-Aug-2016 Praveen Chavan <pchavan@codeaurora.org> MPEG4Writer: Enforce CSD size check only for MPEG-4 audio/video
am: bc4e708bf8

Change-Id: Ied3f45483afb1cc3262b62f220acee35f76ece42
4995d513312708632541a3b6400a6a482235bf65 09-Aug-2016 TreeHugger Robot <treehugger-gerrit@google.com> Merge "MPEG4Writer: Enforce CSD size check only for MPEG-4 audio/video" into nyc-mr1-dev
bc4e708bf8c160d8a3388125a8238ea2768aeade 05-Aug-2016 Praveen Chavan <pchavan@codeaurora.org> MPEG4Writer: Enforce CSD size check only for MPEG-4 audio/video

CSD size restriction to accomodate in 1-byte is not applicable
to all codecs. Esp. avc and hevc can easily exceed 128 bytes.
Restrict the 128-byte size-check only for MPEG-4 A/V

Bug: 30684941
Change-Id: I777bb357f72065b6ebe854122f9ee2080efd54aa
PEG4Writer.cpp
695123195034402ca76169b195069c28c30342d3 19-Jul-2016 Pawin Vongmasa <pawin@google.com> SoftMPEG4: Check the buffer size before writing the reference frame.

Also prevent overflow in SoftMPEG4 and division by zero in SoftMPEG4Encoder.

Bug: 30033990
Change-Id: I7701f5fc54c2670587d122330e5dc851f64ed3c2
odecs/m4v_h263/dec/SoftMPEG4.cpp
odecs/m4v_h263/enc/SoftMPEG4Encoder.cpp
4041545ce0bd0e748b49e6a46a8b018753f1a1d6 06-Aug-2016 Robert Shih <robertshih@google.com> Merge "rtsp: cancel AU checks when near end"
f1d261f1b5914ddc219a23b763ab19363eeedd85 30-Jul-2016 Robert Shih <robertshih@google.com> rtsp: cancel AU checks when near end

Bug: 30230942
Change-Id: I772d733c5e32c988d44d25d17e6cc920b55f1cc5
tsp/MyHandler.h
29ac8d5c17fa8d75253e2a4baa70a30075f670af 05-Aug-2016 Andy Hung <hunga@google.com> Merge "MediaBuffer: Only use shared memory for processes that export MediaBuffers"
726bfd3d92968424e2753a26f664c79cb12c8fad 30-Jul-2016 Robert Shih <robertshih@google.com> rtsp: refactor access unit queue processing

All access units must pass through processAccessUnitQueue (which
filters out stale sequence numbers) before being dequeued by NuPlayer.

Bug: 30230942
Change-Id: Ic72106acbb2b524123f3e221e683b77a980026df
tsp/MyHandler.h
f8a4cb410115045278f534e54b41ac78d6bf6c07 02-Aug-2016 Lajos Molnar <lajos@google.com> IOMX: work against metadata buffer spoofing

- Prohibit direct set/getParam/Settings for extensions meant for
OMXNodeInstance alone. This disallows enabling metadata mode
without the knowledge of OMXNodeInstance.
- Do not share metadata mode buffers cross process.
- Disallow setting up metadata mode/tunneling/input surface
after first sendCommand.
- Disallow store-meta for input cross process.
- Disallow emptyBuffer for surface input (via IOMX).
- Fix checking for input surface.

Bug: 29422020
Change-Id: I801c77b80e703903f62e42d76fd2e76a34e4bc8e
MXClient.cpp
nclude/OMX.h
nclude/OMXNodeInstance.h
mx/OMX.cpp
mx/OMXNodeInstance.cpp
0e2cc67785e417da3df72b3e7d8fcb792582b076 25-May-2016 Wonsik Kim <wonsik@google.com> DO NOT MERGE omx: check buffer port before using

Bug: 28816827
Change-Id: I3d5bad4a1ef96dec544b05bb31cc6f7109aae0a5
nclude/OMXNodeInstance.h
mx/OMXNodeInstance.cpp
fdf0437ec1f80af98fc7a7406df8838ace6c58ba 02-Aug-2016 Pawin Vongmasa <pawin@google.com> resolve merge conflicts of 396a570 to nyc-mr1-dev-plus-aosp

Change-Id: Id60ec51922bab1fb2e16256e072e13db8e3e32a0
a81ef2c54813a4b9289ef3b37674094c6dea822c 02-Aug-2016 Pawin Vongmasa <pawin@google.com> resolve merge conflicts of 1ab38dc to nyc-dev-plus-aosp

Change-Id: I2382b584de34d01f37d475457d75f0018a609c50
4c3d1ee7415116f43c71e33ce1b2b2d72a311922 30-Jul-2016 Andy Hung <hunga@google.com> MediaBuffer: Only use shared memory for processes that export MediaBuffers

Reduces excess file descriptors and shared memory creation and releases.

Bug: 28930897
Bug: 30341084
Change-Id: I8190e22dd800f25be79ec33cb02613d15482e1d4
oundation/MediaBuffer.cpp
65cb362eb27601f6b15c9fd7cebee0eeab918b3b 02-Aug-2016 Wonsik Kim <wonsik@google.com> DO NOT MERGE - stagefright: fix integer overflow error
am: 1ab38dcf9b

Change-Id: I733bdcd1b2ac5554bd99380b86f177c5f812b265
a7a43eb6465edd68ba90c746a0c5cbf40a4b9e9c 02-Aug-2016 Wonsik Kim <wonsik@google.com> DO NOT MERGE - stagefright: fix integer overflow error am: 2d58796ded
am: 450fd950d0

Change-Id: I1e9071e2c055795c40d7973fec98c2a8850d7f62
1ab38dcf9bc3388c54adba8c144fd1ee018cd8c5 21-Jul-2016 Wonsik Kim <wonsik@google.com> DO NOT MERGE - stagefright: fix integer overflow error

Bug: 30103394
Change-Id: If449d3e30a0bf2ebea5317f41813bfed094f7408
(cherry picked from commit 2c74a3cd5d1d66b9a35424b9c4443dafa6db5bef)
ampleTable.cpp
2d58796dedf573dbdb8c3fddbee0f7f65083c398 21-Jul-2016 Wonsik Kim <wonsik@google.com> DO NOT MERGE - stagefright: fix integer overflow error

Bug: 30103394
Change-Id: If449d3e30a0bf2ebea5317f41813bfed094f7408
(cherry picked from commit 2c74a3cd5d1d66b9a35424b9c4443dafa6db5bef)
ampleTable.cpp
483a7e47aca204d5e87fec38cb6f57fff191c7a9 01-Aug-2016 Wonsik Kim <wonsik@google.com> DO NOT MERGE - stagefright: fix integer overflow error am: 52780d3ce3 am: b39e9bffc1
am: 21d9f05d94

Change-Id: I5b862d2ab6475fae818b04ffcd1cd2c4556c0369
21d9f05d94f72dedc8a9e7f115cbd90453bc1284 01-Aug-2016 Wonsik Kim <wonsik@google.com> DO NOT MERGE - stagefright: fix integer overflow error am: 52780d3ce3
am: b39e9bffc1

Change-Id: I94081e4d78f974f55132f9ba0ad4d6e33998bb5c
e40e452a3a7ab31e408d023ab7b4ad1fa65d01c5 01-Aug-2016 Wonsik Kim <wonsik@google.com> DO NOT MERGE - stagefright: fix integer overflow error am: 17a10c50e2
am: 8df5df78a3

Change-Id: Iba844e14f530d15531c5b47e7aaaedfd7849813b
b39e9bffc155c6ad69a401f80f367d5835ae6ab4 01-Aug-2016 Wonsik Kim <wonsik@google.com> DO NOT MERGE - stagefright: fix integer overflow error
am: 52780d3ce3

Change-Id: I1faf21de42ce1221174096e26cfc215e945655f0
1589b7c6fcf328b6003eae670b5089707930e587 30-Jul-2016 Craig Donner <cdonner@google.com> Handle lock() returning a NULL buffer in SurfaceUtils. am: afeffa81d0 am: a52e6ddc00
am: 70a5f428b4

Change-Id: Iefe9b76b659009358384e358dea9b9a1ebfcbe8d
70a5f428b4af840bad556203103565f6cfaf8156 30-Jul-2016 Craig Donner <cdonner@google.com> Handle lock() returning a NULL buffer in SurfaceUtils. am: afeffa81d0
am: a52e6ddc00

Change-Id: Idad62baac497d20945c9614b8db212eb039840fa
f4f36a0a313733b191349ac43d7f4d37038569b1 21-Jul-2016 Wonsik Kim <wonsik@google.com> DO NOT MERGE - stagefright: fix integer overflow error

Bug: 30103394
Change-Id: If449d3e30a0bf2ebea5317f41813bfed094f7408
(cherry picked from commit 2c74a3cd5d1d66b9a35424b9c4443dafa6db5bef)
ampleTable.cpp
52780d3ce3b008dd799e42a3a28a40b829a36fe1 21-Jul-2016 Wonsik Kim <wonsik@google.com> DO NOT MERGE - stagefright: fix integer overflow error

Bug: 30103394
Change-Id: If449d3e30a0bf2ebea5317f41813bfed094f7408
(cherry picked from commit 2c74a3cd5d1d66b9a35424b9c4443dafa6db5bef)
ampleTable.cpp
17a10c50e20d934c1ac5956fe9019d3013e3f8b3 21-Jul-2016 Wonsik Kim <wonsik@google.com> DO NOT MERGE - stagefright: fix integer overflow error

Bug: 30103394
Change-Id: If449d3e30a0bf2ebea5317f41813bfed094f7408
(cherry picked from commit 2c74a3cd5d1d66b9a35424b9c4443dafa6db5bef)
ampleTable.cpp
afeffa81d06e7ca485f6d13430b8dfc70b4938a1 13-May-2016 Craig Donner <cdonner@google.com> Handle lock() returning a NULL buffer in SurfaceUtils.

Bug: 28526999
Change-Id: I99fdc100329e3350c9c8aa070779a407eda057ff
(cherry picked from commit 9193bcd60728bac0d5c2059ed2dc878231509c3a)
urfaceUtils.cpp
002566b12d189f5befc7ca2d2d67987eaa1b14d8 27-Jul-2016 Pawin Vongmasa <pawin@google.com> Merge "stagefright: fix integer overflow error"
cbad976694e67e1df3f3a5cec5f1e13344b3f41a 27-Jul-2016 Marco Nelissen <marcone@google.com> Parcel albumart as a Blob, to void parceling failures

Bug: 30044214
Change-Id: Iaeb3da674724a63c7bf3a79d9173ab32b1913562
oundation/MetaData.cpp
887ea38625c8fb2a5e3956058eba5d305043cc6e 26-Jul-2016 Hangyu Kuang <hkuang@google.com> media: Add colorAspect support to SoftMPEG2 decoder. am: 6a9e943d35
am: 84431090b2

Change-Id: I530b877987f643cbe7fc5e2892ad87c5601d3f4e
84431090b2e73676b56c266384408b42aa0ea471 26-Jul-2016 Hangyu Kuang <hkuang@google.com> media: Add colorAspect support to SoftMPEG2 decoder.
am: 6a9e943d35

Change-Id: Ie3384f333acb65dd7d410d27929fea76ccbff183
35b3e0cad6efe0b0d9143e6cc218d5750d03e909 26-Jul-2016 Hangyu Kuang <hkuang@google.com> Merge "media: Add colorAspect support to SoftMPEG2 decoder." into nyc-mr1-dev
2c74a3cd5d1d66b9a35424b9c4443dafa6db5bef 21-Jul-2016 Wonsik Kim <wonsik@google.com> stagefright: fix integer overflow error

Bug: 30103394
Change-Id: If449d3e30a0bf2ebea5317f41813bfed094f7408
ampleTable.cpp
6a9e943d353cfed56017d46aebc2ccdb39fc1d57 26-Jul-2016 Hangyu Kuang <hkuang@google.com> media: Add colorAspect support to SoftMPEG2 decoder.

Bug:27442922
Change-Id: Id78e104c31cd712cdfa546a5f79d7fe823688cf9
odecs/mpeg2dec/SoftMPEG2.cpp
odecs/mpeg2dec/SoftMPEG2.h
38f777f8ad194435f392d39ce4b85bac3b06b68c 22-Jul-2016 Wei Jia <wjia@google.com> AACExtractor: allow prematured AAC stream. am: 40470735df
am: 16097047e4

Change-Id: Ie1ee84f05ff61d997c9563472ce12233a564c6d5
16097047e47adb80dbf1b46f59e4750e3731ee5f 22-Jul-2016 Wei Jia <wjia@google.com> AACExtractor: allow prematured AAC stream.
am: 40470735df

Change-Id: I9ccb8dbe1a6b842d1b1c4422a659cb17e18ef23a
11dd692efa611d129167abea854dc14f0046d727 22-Jul-2016 Wei Jia <wjia@google.com> Merge "AACExtractor: allow prematured AAC stream." into nyc-mr1-dev
f22d2b080aa9ae875b3ff9d17ae7d195e6f2edc0 22-Jul-2016 Hangyu Kuang <hkuang@google.com> media: Add colorAspect support to SoftHEVC decoder. am: af9e7c44f1
am: a76683e189

Change-Id: Iacb61f424a33660be95b1eec7d6ca224eb88fd9d
005b44d09abcb89ad5da5cf1d10fbef5444e319c 22-Jul-2016 Lajos Molnar <lajos@google.com> stagefright: don\\'t yet default to highest AVC profile am: 4c6fe6676e
am: 146de8a381

Change-Id: Ic1c81ae91bbd268b0843f5ec37053bfe6a14ce93
a76683e1890edaf429e4ea1ed2637d4fb4d32abb 22-Jul-2016 Hangyu Kuang <hkuang@google.com> media: Add colorAspect support to SoftHEVC decoder.
am: af9e7c44f1

Change-Id: I1d8e6c6e75fa3586dd52b74aaa8d964432c6b72b
146de8a381ba3c84d68aaac9d242fd7649156a9e 22-Jul-2016 Lajos Molnar <lajos@google.com> stagefright: don\'t yet default to highest AVC profile
am: 4c6fe6676e

Change-Id: I707f0a604ca35af389b3c6519a497fcaed8f3408
b102e47f85e29a516a0d42cc02ef0881b67f87e0 22-Jul-2016 TreeHugger Robot <treehugger-gerrit@google.com> Merge "media: Add colorAspect support to SoftHEVC decoder." into nyc-mr1-dev
4c6fe6676e726c22ed54e3dbe51aae03e902049e 21-Jul-2016 Lajos Molnar <lajos@google.com> stagefright: don't yet default to highest AVC profile

Bug: 30284097
Related-to-Bug: 28027692
Change-Id: I9c69576ad257a32747163af5d1c2a82b7f9ad8b4
Codec.cpp
af9e7c44f14dcb5b9e1c4e24273ca48fca817b53 21-Jul-2016 Hangyu Kuang <hkuang@google.com> media: Add colorAspect support to SoftHEVC decoder.

Bug:27442922
Change-Id: I063791338435b2ee862e2169f8534753c0e91985
odecs/hevcdec/SoftHEVC.cpp
odecs/hevcdec/SoftHEVC.h
eb0010f91904c5d2e36d178e708cf9cdde3cc3c3 21-Jul-2016 Robert Shih <robertshih@google.com> Merge "rtsp: add startup timeout constant property"
0d3c9c033b6d496b4f7d801ef7592a48e52a67ac 20-Jul-2016 Robert Shih <robertshih@google.com> rtsp: add startup timeout constant property

Bug: 7420872
Change-Id: I5186b3ad4d1601c9b954024706673d7e85cdda38
tsp/MyHandler.h
40470735df028b2b9e73afe014ad59cf7b76ad4f 20-Jul-2016 Wei Jia <wjia@google.com> AACExtractor: allow prematured AAC stream.

Bug: 30184000
Change-Id: Ia80cfe2e416200e7b0198cfd7ae53a8ac52ee475
ACExtractor.cpp
400eb12253d91e29f26f76e660c2a07fc78fcfbe 20-Jul-2016 Wei Jia <wjia@google.com> Merge \"RTSPSource: relax error condition.\" into nyc-mr1-dev
am: 3765d3a2b5

Change-Id: I187fae9272c127d761c8b5f7d80133406f62377b
3765d3a2b5e608ead9b9a3b0e0207b420274c439 20-Jul-2016 Wei Jia <wjia@google.com> Merge "RTSPSource: relax error condition." into nyc-mr1-dev
d8f3498bafe4ca04a7c198d329e4a363c076764e 20-Jul-2016 Bryan Mawhinney <bryanmawhinney@google.com> Merge \\"Add .mov to MediaScanner video file types\\" into nyc-mr1-dev am: 8726fa9940
am: 36cfcb9aa8

Change-Id: Ie91843a8223f8ca98f894fa8b04ff36d27f74543
36cfcb9aa8ff68580b4dc8fdce77931a799f0630 20-Jul-2016 Bryan Mawhinney <bryanmawhinney@google.com> Merge \"Add .mov to MediaScanner video file types\" into nyc-mr1-dev
am: 8726fa9940

Change-Id: I524359c9038b6b407a473033881a801fdaded184
abb43cdd2c05980c41a2e39515ccd4aee2e0d08b 13-Jul-2016 Wei Jia <wjia@google.com> RTSPSource: relax error condition.

Allow stream to play when first RTP packet is missed and first arrived packet
is not far away from the expected first seq num.

Bug: 29747759
Bug: 29625129
Change-Id: I0acb839eb4a4d4d24fff4852186f7c8ccd35ac1b
tsp/MyHandler.h
ef6308df6322b9e7ee460a89e7eaea76ff7bc457 19-Jul-2016 Bryan Mawhinney <bryanmawhinney@google.com> Add .mov to MediaScanner video file types

Bug: 16162336
Change-Id: I43f8d27682b4edbfe70bba2fdd66eb7951f70232
tagefrightMediaScanner.cpp
be42ac1fb0d961bb5dc6d19aa9aa8d0440cfdd53 29-Jun-2016 Pirama Arumuga Nainar <pirama@google.com> Fix writeColrBox to write 0x80 instead of 128

Use 0x80 and explicitly cast down to int8_t.

Bug: http://b/29831838
Change-Id: Ibf989863ab2affdc7218f94ca073f37f5192d488
(cherry picked from commit fffb0c8fbe16ac948619b85e1eea9e65a9daa0c9)
PEG4Writer.cpp
e8ae946fb1f19e82d2b784b4f09bbc14f4effacf 20-Jul-2016 Daniel Micay <danielmicay@gmail.com> Merge \\\\"webm: avoid unnecessary variable-length arrays\\\\" am: 67fbddfdc2 am: 92076c3670 am: 214d6b43cf
am: 7a0b6117e0

Change-Id: I169117c838132656e84d18311a242faa8c57e26d
7a0b6117e0db7e0080111ddf9a927c6668e21b71 20-Jul-2016 Daniel Micay <danielmicay@gmail.com> Merge \\\"webm: avoid unnecessary variable-length arrays\\\" am: 67fbddfdc2 am: 92076c3670
am: 214d6b43cf

Change-Id: I865d55a2c948c183857ef9cd1fc37e1cc91719f1
214d6b43cfba00ca3f1e55aa8962a06319a01308 20-Jul-2016 Daniel Micay <danielmicay@gmail.com> Merge \\"webm: avoid unnecessary variable-length arrays\\" am: 67fbddfdc2
am: 92076c3670

Change-Id: I38d4de1c5cd08fc27e45f31ee6a703ae2b09f2d9
92076c3670875872cc5b3a1d7f83d49dc325e25d 20-Jul-2016 Daniel Micay <danielmicay@gmail.com> Merge \"webm: avoid unnecessary variable-length arrays\"
am: 67fbddfdc2

Change-Id: I7f738a3ab2fadf0794da4b5f47c2be259613bf4d
cea142b06013e06f6072639e4e9647392a38ebab 20-Jul-2016 Robert Shih <robertshih@google.com> Merge "MetaData/MPEG4Writer: add language"
d5f9f69122f32d2a43963bdb56a4efd5426e59e6 20-Jul-2016 Wonsik Kim <wonsik@google.com> omx: prevent input port enable/disable for software codecs am: 2b94fa8277 am: c83b53c9e5 am: f054728108 am: 062fd4a341 am: 45fb504379 am: 56fb1ed051 am: e02be17174 am: 7f58e2ec8f am: e262ff5af7 am: 360091a894 am: dfb7744a6a am: 8b825b8445 am: 79d27ec027
am: 5f0a7231bf

Change-Id: I0514ed0ac83248eb70996edcc8f9c45bb39a9d6a
5f0a7231bfd9565e01cb61efae5010b0344e7970 20-Jul-2016 Wonsik Kim <wonsik@google.com> omx: prevent input port enable/disable for software codecs am: 2b94fa8277 am: c83b53c9e5 am: f054728108 am: 062fd4a341 am: 45fb504379 am: 56fb1ed051 am: e02be17174 am: 7f58e2ec8f am: e262ff5af7 am: 360091a894 am: dfb7744a6a am: 8b825b8445
am: 79d27ec027

Change-Id: I4c9ba60e95566f7041e69c7d1b4ed4a66dcd27d0
79d27ec02758b40636a978f853fcdbcfa01a04c9 20-Jul-2016 Wonsik Kim <wonsik@google.com> omx: prevent input port enable/disable for software codecs am: 2b94fa8277 am: c83b53c9e5 am: f054728108 am: 062fd4a341 am: 45fb504379 am: 56fb1ed051 am: e02be17174 am: 7f58e2ec8f am: e262ff5af7 am: 360091a894 am: dfb7744a6a
am: 8b825b8445

Change-Id: I1df813fdb8efb7478432726627eb0b431523804b
38c75d9d30b0b40e3d926503d553c869ce7bec1c 20-Jul-2016 Wonsik Kim <wonsik@google.com> omx: prevent input port enable/disable for software codecs am: 2b94fa8277 am: c83b53c9e5 am: f054728108 am: 062fd4a341 am: 45fb504379 am: 56fb1ed051 am: e02be17174 am: 7f58e2ec8f am: e262ff5af7 am: 360091a894 am: dfb7744a6a
am: 8b825b8445

Change-Id: I52a82f4e6f0e8ea6c3c4dcbc630f8ed9019cf45e
8b825b8445dc792b9a94e6529c6e66777c4cf11c 20-Jul-2016 Wonsik Kim <wonsik@google.com> omx: prevent input port enable/disable for software codecs am: 2b94fa8277 am: c83b53c9e5 am: f054728108 am: 062fd4a341 am: 45fb504379 am: 56fb1ed051 am: e02be17174 am: 7f58e2ec8f am: e262ff5af7 am: 360091a894
am: dfb7744a6a

Change-Id: I33e678d176f2ebf13d423fac968758e1aa003cc1
dfb7744a6acda4170148a31c5241149011785271 20-Jul-2016 Wonsik Kim <wonsik@google.com> omx: prevent input port enable/disable for software codecs am: 2b94fa8277 am: c83b53c9e5 am: f054728108 am: 062fd4a341 am: 45fb504379 am: 56fb1ed051 am: e02be17174 am: 7f58e2ec8f am: e262ff5af7
am: 360091a894

Change-Id: Idbe41f9c23ade65f384f1efe91b40ab81db47a6c
360091a8944f511bc40ed4423b2a0f24422666f4 20-Jul-2016 Wonsik Kim <wonsik@google.com> omx: prevent input port enable/disable for software codecs am: 2b94fa8277 am: c83b53c9e5 am: f054728108 am: 062fd4a341 am: 45fb504379 am: 56fb1ed051 am: e02be17174 am: 7f58e2ec8f
am: e262ff5af7

Change-Id: I635f61882e8946cc7307e09e800eb7aaf70a923d
e262ff5af7dbb285b72143b6240169dcccd4f68c 20-Jul-2016 Wonsik Kim <wonsik@google.com> omx: prevent input port enable/disable for software codecs am: 2b94fa8277 am: c83b53c9e5 am: f054728108 am: 062fd4a341 am: 45fb504379 am: 56fb1ed051 am: e02be17174
am: 7f58e2ec8f

Change-Id: I7bd9e7729139c95eee4fa263174ca3943d28f9c9
7f58e2ec8f37144b6010b8fbc05d98a028d1710e 20-Jul-2016 Wonsik Kim <wonsik@google.com> omx: prevent input port enable/disable for software codecs am: 2b94fa8277 am: c83b53c9e5 am: f054728108 am: 062fd4a341 am: 45fb504379 am: 56fb1ed051
am: e02be17174

Change-Id: I7f452f8033eb9aa1aea4401e803493c5951b0581
e02be171746fa6002eb7ecefdcc741cf30c585d1 20-Jul-2016 Wonsik Kim <wonsik@google.com> omx: prevent input port enable/disable for software codecs am: 2b94fa8277 am: c83b53c9e5 am: f054728108 am: 062fd4a341 am: 45fb504379
am: 56fb1ed051

Change-Id: I79dd256460081f658ed3209204cfd104de708637
45fb50437967d052f0e103395b735c8531d8db31 20-Jul-2016 Wonsik Kim <wonsik@google.com> omx: prevent input port enable/disable for software codecs am: 2b94fa8277 am: c83b53c9e5 am: f054728108
am: 062fd4a341

Change-Id: I979b1c6b415b83d11f1a0c24b7fe54fe79556676
062fd4a341396c77f549d48e3c8afb9baf21ce85 20-Jul-2016 Wonsik Kim <wonsik@google.com> omx: prevent input port enable/disable for software codecs am: 2b94fa8277 am: c83b53c9e5
am: f054728108

Change-Id: I230da4ea86abf01ff9057900f0eea1af151c9a00
f054728108e7ec42d05260c5b1fb045e54553704 20-Jul-2016 Wonsik Kim <wonsik@google.com> omx: prevent input port enable/disable for software codecs am: 2b94fa8277
am: c83b53c9e5

Change-Id: I6eeb301a2418cae6a57e49ed29527edd5e8de2b0
5ef6382ea5681be3952ed9721b5f7088d9ada4a9 19-Jul-2016 Pirama Arumuga Nainar <pirama@google.com> Fix writeColrBox to write 0x80 instead of 128 am: fffb0c8fbe
am: 2f4fbb2621

Change-Id: I70ef442a137d95319075f8244ae826eecbec74ac
2f4fbb2621a96d68f64dd70920e9684f4f24f74c 19-Jul-2016 Pirama Arumuga Nainar <pirama@google.com> Fix writeColrBox to write 0x80 instead of 128
am: fffb0c8fbe

Change-Id: I1182b477f956af6f714daa2adc3564bd889f0ae8
de42eebfa47ce013eb20d159f59e886505b9197d 19-Jul-2016 Lajos Molnar <lajos@google.com> Merge \\"MPEG4Writer: adjust the whole CTTS table\\" into nyc-mr1-dev am: de25663ffc
am: ad16d0cb9e

Change-Id: I766d99c8b91b6a7dbaa27f804f861f5f92a743cf
ad16d0cb9e56ef22266499fd884991360741b451 19-Jul-2016 Lajos Molnar <lajos@google.com> Merge \"MPEG4Writer: adjust the whole CTTS table\" into nyc-mr1-dev
am: de25663ffc

Change-Id: I1f0fc56b3b002092bee22caba0934fdc1534ad97
de25663ffc36936569e04fd4d4442121be07ca9b 19-Jul-2016 TreeHugger Robot <treehugger-gerrit@google.com> Merge "MPEG4Writer: adjust the whole CTTS table" into nyc-mr1-dev
6bb2aa2e95384e413b5d2be6b5110056b2927809 19-Jul-2016 Wei Jia <wjia@google.com> resolve merge conflicts of 54276e9 to master

Change-Id: Iec79f36a551159338b1aa9de7c3524a05f38edee
54276e959cf792291cead394d42bd881602cdc3b 19-Jul-2016 Wei Jia <wjia@google.com> Merge \"MPEG4EXtractor: add support of MP4A QT version 1 and 2.\" into nyc-mr1-dev
am: 449c5619bd

Change-Id: I2643a3400127add7a16f40e031c6a963ad1b431a
449c5619bde58db7c8733524336c53e4a7d3a47c 19-Jul-2016 Wei Jia <wjia@google.com> Merge "MPEG4EXtractor: add support of MP4A QT version 1 and 2." into nyc-mr1-dev
c259a4027f151fc57d7b09b62d62cb133ba11d05 19-Jul-2016 Lajos Molnar <lajos@google.com> MPEG4Writer: adjust the whole CTTS table

- refactor ListTableEntries to use constant entryCapacity

Bug: 30182452
Change-Id: Ib883a8547e198fab85c63ac756117e8e11384c73
PEG4Writer.cpp
2b94fa82778cef72f810035840dd60db189be341 06-Jul-2016 Wonsik Kim <wonsik@google.com> omx: prevent input port enable/disable for software codecs

Bug: 29421804
Change-Id: Iba1011e9af942a6dff7f659af769a51e3f5ba66f
mx/SimpleSoftOMXComponent.cpp
decc50efede28c5d73137c30d1a95d72dd405555 02-Oct-2015 David Yeh <david.yeh@mediatek.com> MetaData/MPEG4Writer: add language

Bug: 21761589
Bug: 24278318
Bug: 24615792
Change-Id: Iea039047c6c63551bcb0e65de9f4b089fd2fc85d
PEG4Writer.cpp
tils.cpp
ce91de36d2b597fe41ad2449354d4a67001df9b0 19-Jul-2016 Daniel Micay <danielmicay@gmail.com> webm: avoid unnecessary variable-length arrays

Change-Id: Ia72df2c208f2b0ebc9c55099dfaabdca97914791
ebm/WebmWriter.cpp
bb0b734ca158c2129d7c31449a3eedcd76dcd03c 27-Jun-2016 Wei Jia <wjia@google.com> MPEG4EXtractor: add support of MP4A QT version 1 and 2.

Also allow parsing QT wave atom.
Bug: 29500382
Bug: 16162336
Change-Id: Ida05a4e3b6286d4c4d5a07fa18e6a719bd0cca9f
PEG4Extractor.cpp
nclude/MPEG4Extractor.h
580baf5c24f47e95eb3aeef94c51a920f1f426b1 18-Apr-2016 Robert Shih <robertshih@google.com> stagefright: support header removal in MKVs

Bug: 14573621
Change-Id: I307fa161db5f5abf22fd65c5fa8a492a1ca93ae8
atroska/MatroskaExtractor.cpp
atroska/MatroskaExtractor.h
fffb0c8fbe16ac948619b85e1eea9e65a9daa0c9 29-Jun-2016 Pirama Arumuga Nainar <pirama@google.com> Fix writeColrBox to write 0x80 instead of 128

Use 0x80 and explicitly cast down to int8_t.

Bug: http://b/29831838
Change-Id: Ibf989863ab2affdc7218f94ca073f37f5192d488
PEG4Writer.cpp
9da9b138b60c2d21afc3e66487c60346ccf75ebd 16-Jul-2016 Robert Shih <robertshih@google.com> Merge \\"rtsp: remove CHECK to ignore unsupported tracks\\" into nyc-mr1-dev am: b800dfd823
am: 77e39d9c06

Change-Id: I32dc5c278999a64e831641466662104e8f1b6f36
77e39d9c068b67e8fa6f78ef79a5126584bdd735 16-Jul-2016 Robert Shih <robertshih@google.com> Merge \"rtsp: remove CHECK to ignore unsupported tracks\" into nyc-mr1-dev
am: b800dfd823

Change-Id: I452abe5221d67979f2ea1d8af562b5279dd63152
30474b19a4f9785494d34c15ee2deabe36970814 15-Jul-2016 Robert Shih <robertshih@google.com> rtsp: remove CHECK to ignore unsupported tracks

RFC 3551 specifies a number of static A/V profiles for media
payload. These don't use the 'rtpmap' or 'fmtp' properties in the
session description, and thus need to be handled differently.
For now, we just ignore these types as they are very rarely used.

The previous paragraph was taken from
https://android-review.googlesource.com/#/c/240630/,
author David Williams <david.williams@sonymobile.com>.

Bug: 29493841
Change-Id: I12581447f18344ac503fe427e3c940a85d44644e
tsp/ASessionDescription.cpp
009c54d610a68a39dc6336c57d491940b4048f01 15-Jul-2016 Lajos Molnar <lajos@google.com> Merge \\"SoftAVCEnc/SoftMPEG4Enc: support updated i-frame interval and encoder settings\\" into nyc-mr1-dev am: 9f6392250b
am: 927326caf3

Change-Id: Ib8b947da0ccf4515098189d24ab6c961cd1b6ac0
927326caf324d555d2966d40ff435222d913066e 15-Jul-2016 Lajos Molnar <lajos@google.com> Merge \"SoftAVCEnc/SoftMPEG4Enc: support updated i-frame interval and encoder settings\" into nyc-mr1-dev
am: 9f6392250b

Change-Id: If3eafbea61f1fdb8e40fb335fe8c9dcf91fa99da
9f6392250bf6d02a514bd83b743906dda748dee9 15-Jul-2016 Lajos Molnar <lajos@google.com> Merge "SoftAVCEnc/SoftMPEG4Enc: support updated i-frame interval and encoder settings" into nyc-mr1-dev
a7edc529e64934aeb2044a6e6e69056f4ccbfea0 15-Jul-2016 Andy Hung <hunga@google.com> Merge \\"GenericSource: Allow multiple buffer reads for video\\" into nyc-mr1-dev am: e98f14ff19
am: 888de371da

Change-Id: I0cb63a7e930acc92408a94fbf2b381f6f1fe2d60
888de371da1b821975506c6013e2013ed6024e02 15-Jul-2016 Andy Hung <hunga@google.com> Merge \"GenericSource: Allow multiple buffer reads for video\" into nyc-mr1-dev
am: e98f14ff19

Change-Id: I8348ecb645e1aef74064bacdbacd8de6c20e4d94
7c8d572e1a5c6646b336a423febb8ebd1d6c15e9 15-Jul-2016 Lajos Molnar <lajos@google.com> stagefright: advertise final VPX temporal layering in output format am: 9bbbdd3cab
am: e3caed1db3

Change-Id: I090a25fc01224dc80e7a4c80fa293bf028e8bd87
e98f14ff194bd00ed71574cff19340c1090c78dd 15-Jul-2016 Andy Hung <hunga@google.com> Merge "GenericSource: Allow multiple buffer reads for video" into nyc-mr1-dev
e3caed1db3de38d1e60403101390392e77adf815 15-Jul-2016 Lajos Molnar <lajos@google.com> stagefright: advertise final VPX temporal layering in output format
am: 9bbbdd3cab

Change-Id: I5f52ab2f083a266f515e2182058fb6bd58d63b7a
d72e751fa185f053773603222fd220ab77c92b2f 15-Jul-2016 Lajos Molnar <lajos@google.com> SoftAVCEnc/SoftMPEG4Enc: support updated i-frame interval and encoder settings

- use key-frame interval in MPEG4 encoder
- use updated definition of nBFrames and nPFrames in AVC encoder

Bug: 30096321
Bug: 28027692
Change-Id: I68d0d5182b462cad567c329a07fdafea55d19ff7
odecs/avcenc/SoftAVCEnc.cpp
odecs/m4v_h263/enc/SoftMPEG4Encoder.cpp
odecs/m4v_h263/enc/SoftMPEG4Encoder.h
9bbbdd3cab5c6b93649cbf31ba3097218944b06a 15-Jul-2016 Lajos Molnar <lajos@google.com> stagefright: advertise final VPX temporal layering in output format

Bug: 30150921
Change-Id: Ic5207c5ce602f5ed8da4cb54de3e3fe692e98492
Codec.cpp
dcf42c4a561352626c2b0671f79c70aead2f097e 15-Jul-2016 Lajos Molnar <lajos@google.com> Merge \\"stagefright: support floating point i-frame-intervals\\" into nyc-mr1-dev am: 210c67fe66
am: bb88069079

Change-Id: I38052fb4b996c509a92fa05eb50258febe84ec40
277d08aa27cad359fc8484f4234ae812795acc8d 15-Jul-2016 Andy Hung <hunga@google.com> resolve merge conflicts of e8d9d6d to master

Change-Id: I85bc31cb4eab680aee2ba409dddd975e0696b37e
bb88069079c3e406d4a72646fc9d65d2e802df90 15-Jul-2016 Lajos Molnar <lajos@google.com> Merge \"stagefright: support floating point i-frame-intervals\" into nyc-mr1-dev
am: 210c67fe66

Change-Id: Ie22063c391da1c84c9188207dccf8d2d62001102
210c67fe664fbe1b2aba4d3980912243b7ca99d3 15-Jul-2016 TreeHugger Robot <treehugger-gerrit@google.com> Merge "stagefright: support floating point i-frame-intervals" into nyc-mr1-dev
e8d9d6d8ff2c229313ab7f079ae52445e8ee6b5a 15-Jul-2016 Andy Hung <hunga@google.com> Merge \"IMediaSource: Improve shared memory buffer transfer\" into nyc-mr1-dev
am: 83efe020b9

Change-Id: I20c727525eb2aa9d9858ee59d699c5ae8b81ef1f
83efe020b94d29132bd4d5cbe049a15abad0095a 15-Jul-2016 Andy Hung <hunga@google.com> Merge "IMediaSource: Improve shared memory buffer transfer" into nyc-mr1-dev
fb4c2f10b60c0fbd1f8940c9be746be89464af9e 15-Jul-2016 Lajos Molnar <lajos@google.com> Merge \\"stagefright: prefer B frames for high frame-rate recording\\" into nyc-mr1-dev am: 87cbfa8c5e
am: 78ef32963c

Change-Id: If7914f6b683ffb814fa39698c1309fab828f05ce
fef09e210a45302fbf6a2bd3608780c7c7653066 15-Jul-2016 Lajos Molnar <lajos@google.com> Merge \\"stagefright: enable B-frames for AVC encoder and MPEG4 writer\\" into nyc-mr1-dev am: db2d2066e6
am: 38667cc8c1

Change-Id: I56ca0431ac3aec8b1f53459cb03f1ab709c15d0c
78ef32963c91d4c2e8d4e1cb361987b0438fc7f3 15-Jul-2016 Lajos Molnar <lajos@google.com> Merge \"stagefright: prefer B frames for high frame-rate recording\" into nyc-mr1-dev
am: 87cbfa8c5e

Change-Id: I7648f002a8c6f8385abcac3b80f768cddc1b3722
38667cc8c1c46b66665e4a17d60e44e708c184b4 15-Jul-2016 Lajos Molnar <lajos@google.com> Merge \"stagefright: enable B-frames for AVC encoder and MPEG4 writer\" into nyc-mr1-dev
am: db2d2066e6

Change-Id: I29b9afbb4c2b98aeef10c769e0283269c7f5b74b
87cbfa8c5ecbe515c380d5592cef20c1fafe36b7 15-Jul-2016 Lajos Molnar <lajos@google.com> Merge "stagefright: prefer B frames for high frame-rate recording" into nyc-mr1-dev
63a4d50f472ca67b3174ae51911091e44db6956e 15-Jul-2016 Lajos Molnar <lajos@google.com> stagefright: support floating point i-frame-intervals

Bug: 30096321
Change-Id: I181db0e03a47de1599c606ce6996e1d16acecda7
Codec.cpp
oundation/AMessage.cpp
db2d2066e6e3f3ce728c2b17ed0923b02834519b 15-Jul-2016 TreeHugger Robot <treehugger-gerrit@google.com> Merge "stagefright: enable B-frames for AVC encoder and MPEG4 writer" into nyc-mr1-dev
89cc6d8d3342dc9f9fad8b3825c647e61e018b0e 15-Jul-2016 Lajos Molnar <lajos@google.com> Merge \\"stagefright: correctly calculate and configure P, B and I-frame spacing\\" into nyc-mr1-dev am: b00a831ccc
am: fc33e4017e

Change-Id: I035bcac140004f1af5c14d2dae8506df2aeca3f0
fc33e4017e2adaeacb0c4deffc762c612d70f256 15-Jul-2016 Lajos Molnar <lajos@google.com> Merge \"stagefright: correctly calculate and configure P, B and I-frame spacing\" into nyc-mr1-dev
am: b00a831ccc

Change-Id: If5f97ea89f70be1c174f8d9fed1c2fb33ed10bde
f4b18f4872d353a1e114c890ec472608ff8f9eda 14-Jul-2016 Lajos Molnar <lajos@google.com> stagefright: correctly calculate and configure P, B and I-frame spacing

- though OMX spec says otherwise, vendors' implementation of nBFrames
is # of B frames between I/P frames.
- nPFrames is # of P frames between I frames.
thus, I-frame interval (nKeyFrameInterval) is
(nPFrames + 1) * nBFrames + nPFrames + 1 =
nPFrames * nBFrames + nBFrames + nPFrames + 1

I P I : I-interval: 8, nPFrames 1, nBFrames 3
BBB BBB

- err on lower P and B-frames values as key-frame-interval is an upper limit.

Bug: 30096321
Change-Id: I1d0c2908007a1a283f36a7c19e85b95465236c7d
Codec.cpp
6833940fba87c373ffac6914abea79e7c94a0c20 13-Jul-2016 Wei Jia <wjia@google.com> RTSPSource: relax error condition.

Allow stream to play when first RTP packet is missed and first arrived packet
is not far away from the expected first seq num.

Bug: 29625129
Change-Id: I0acb839eb4a4d4d24fff4852186f7c8ccd35ac1b
tsp/MyHandler.h
1038762b09aabc3e049b4bdb664c2c6b03008145 15-Jul-2016 Robert Shih <robertshih@google.com> DO NOT MERGE - Fix build am: bf835e4525
am: 98b31b9270

Change-Id: Ib3dd2d315096bcb31dbfcd5be66f00d482594c9b
826cbe4d07c709f647cdd29354434df20e355c9a 14-Jul-2016 Lajos Molnar <lajos@google.com> stagefright: enable B-frames for AVC encoder and MPEG4 writer

If decoding time stamps are not available, synthesize a set of
non-negative, monotonic time stamps.

Bug: 28027692
Change-Id: Ifdbf53802baac59914d021440856d4c310ee8f6e
Codec.cpp
PEG4Writer.cpp
bf835e452528600052fa5607c7bc8ae85bd81d67 15-Jul-2016 Robert Shih <robertshih@google.com> DO NOT MERGE - Fix build

Change-Id: Iff47bb735778fb275abeee573c636856b839feb5
odecs/on2/dec/SoftVPX.cpp
e19f2956de379b9c9a852d50d83d0608ca42bfe9 15-Jul-2016 Lajos Molnar <lajos@google.com> stagefright: prefer B frames for high frame-rate recording

Some codecs do not support B-frames with temporal layering.
- Prefer temporal layering for slow-motion and time lapse videos
(since B-frames are not as useful for time lapse, and layering is
needed for slow-motion)
- Prefer B-frames for HFR capture

Bug: 27596987
Change-Id: I12f530e9f624e2948e176b5548e0d9d65eed95d8
Codec.cpp
3579455dc8e9ef515631fde000ea05782816796e 14-Jul-2016 Robert Shih <robertshih@google.com> Fix build am: 6f85d83163 am: cea6041539 am: ac11d74c81 am: 94742171f1 am: b8d23091df am: 9bed276574
am: de4d4f5247

Change-Id: Ie9b253bcbae964031924e68f51ddd5713dbb6883
de4d4f5247d74b94acdc93f7dd8eef2f90c9272f 14-Jul-2016 Robert Shih <robertshih@google.com> Fix build am: 6f85d83163 am: cea6041539 am: ac11d74c81 am: 94742171f1 am: b8d23091df
am: 9bed276574

Change-Id: I4a7f02313d63ee3bdb609b22093b057cf359c662
9bed276574f931203d3fe658658cfbf6df8aab87 14-Jul-2016 Robert Shih <robertshih@google.com> Fix build am: 6f85d83163 am: cea6041539 am: ac11d74c81 am: 94742171f1
am: b8d23091df

Change-Id: I73aac821554ace865f6f5e0d8641f9422c08aef5
764e119d3bb1016c868b2334056e1e619dd9b3a5 14-Jul-2016 Robert Shih <robertshih@google.com> Fix build am: 6f85d83163 am: cea6041539 am: ac11d74c81 am: 94742171f1
am: b8d23091df

Change-Id: Ia03c876b68026f0a6d70b920893a6f485cc8ae32
b8d23091df36a530f646d9cdec1078fa38f95389 14-Jul-2016 Robert Shih <robertshih@google.com> Fix build am: 6f85d83163 am: cea6041539 am: ac11d74c81
am: 94742171f1

Change-Id: Ifa1e2ab0d259b2919a4f250d84209987aa0eb71a
94742171f17acc8bd39180c5592d23b616b60575 14-Jul-2016 Robert Shih <robertshih@google.com> Fix build am: 6f85d83163 am: cea6041539
am: ac11d74c81

Change-Id: I1ad4e94e71f9a1c50a0a46175cd126d52f28c2e7
ac11d74c81f71a866a6356c7ea3ff2be105f86ef 14-Jul-2016 Robert Shih <robertshih@google.com> Fix build am: 6f85d83163
am: cea6041539

Change-Id: I2daa21c38e0eb0526ccd87520c5381c2a458524e
cea6041539ae6c37a3d8fe2c60c2d5e331f50852 14-Jul-2016 Robert Shih <robertshih@google.com> Fix build
am: 6f85d83163

Change-Id: I0cb54cb073f83f43fb77b979f7b84911125d0969
6f85d831638d271bd5738036ba0969bdb7f3111e 14-Jul-2016 Robert Shih <robertshih@google.com> Fix build

Change-Id: I48ba34b3df9c9a896d4b18c3f48e41744b7dab54
odecs/mp3dec/SoftMP3.cpp
3465684d1457100824f549b5dc60018693aa0a51 14-Jul-2016 Robert Shih <robertshih@google.com> Fix build am: c5b95cd33a am: 4828c2cc73 am: 6f30a038db am: 196add98cc am: a365cebbe4 am: a4895be164
am: c1080cb5df

Change-Id: I791075a742988658b09c424b4a0a42942800f169
c1080cb5df0e54e76fa98d4bf82b379a52480373 14-Jul-2016 Robert Shih <robertshih@google.com> Fix build am: c5b95cd33a am: 4828c2cc73 am: 6f30a038db am: 196add98cc am: a365cebbe4
am: a4895be164

Change-Id: I27606a4a82c018f1ddd9f914020678f9169eafdb
a4895be1641d871c39444506fbe3a0e81026067c 14-Jul-2016 Robert Shih <robertshih@google.com> Fix build am: c5b95cd33a am: 4828c2cc73 am: 6f30a038db am: 196add98cc
am: a365cebbe4

Change-Id: I9d31b5942f8a2c040357136170193cbb48d83d42
e801cc20cb22c1aa69be50ddaaf264dc8ca06f55 14-Jul-2016 Robert Shih <robertshih@google.com> Fix build am: c5b95cd33a am: 4828c2cc73 am: 6f30a038db am: 196add98cc
am: a365cebbe4

Change-Id: I346f952a994d03d185001fb6b1cb53d1c9bd6c9e
5ec4bf07678e4174b30447d77c0675ba4700dcb9 14-Jul-2016 Robert Shih <robertshih@google.com> Merge \\\\\\\"SoftMP3: memset safely\\\\\\\" into mnc-dev am: b2b56d1f0a am: 5d6fe83821 am: 2d09be5831 am: 3c69172940 am: fd778b20ed am: 1a7492b10c
am: 3a0e712414

Change-Id: Ia241dbf94bd8cac10385cda7f704bd58e2beb4cd
a365cebbe489244ea7a63b67e504b85ae4b74b89 14-Jul-2016 Robert Shih <robertshih@google.com> Fix build am: c5b95cd33a am: 4828c2cc73 am: 6f30a038db
am: 196add98cc

Change-Id: I441135beee7144639775ff1999dbe2230246b7b3
196add98cc7d0790908fe11774eac5680d097cc3 14-Jul-2016 Robert Shih <robertshih@google.com> Fix build am: c5b95cd33a am: 4828c2cc73
am: 6f30a038db

Change-Id: Ib8420e606841663686d8bd23ea9ee947244a3476
6f30a038dbb25ac4d74e326f7489305b99d3c343 14-Jul-2016 Robert Shih <robertshih@google.com> Fix build am: c5b95cd33a
am: 4828c2cc73

Change-Id: Ia0a2d000a864970a58dc5d39914f665e2c6baa9e
4828c2cc7351a75e52f35278dcd5ae01df751979 14-Jul-2016 Robert Shih <robertshih@google.com> Fix build
am: c5b95cd33a

Change-Id: I84de0264bae191b5c3ddbb784bf9b9b120754c55
c5b95cd33affabbddc330726ed40d9e174658783 14-Jul-2016 Robert Shih <robertshih@google.com> Fix build

Change-Id: I96a9c437eec53a285ac96794cc1ad0c8954b27e0
odecs/mp3dec/SoftMP3.cpp
3a0e7124145661dfc9461b404d6c5d0192486884 14-Jul-2016 Robert Shih <robertshih@google.com> Merge \\\\\\"SoftMP3: memset safely\\\\\\" into mnc-dev am: b2b56d1f0a am: 5d6fe83821 am: 2d09be5831 am: 3c69172940 am: fd778b20ed
am: 1a7492b10c

Change-Id: I95ed7501db7c7e222ec3c51e7a7b965f18b1115c
1a7492b10c565135407ccd9a7eb7038e44716923 14-Jul-2016 Robert Shih <robertshih@google.com> Merge \\\\\"SoftMP3: memset safely\\\\\" into mnc-dev am: b2b56d1f0a am: 5d6fe83821 am: 2d09be5831 am: 3c69172940
am: fd778b20ed

Change-Id: Ia0048bd1d37ec1c670b184f40423389884a982aa
3315c7f627f7ccca8cf1ca9fd8a6fc19fddaf72c 14-Jul-2016 Robert Shih <robertshih@google.com> Merge \\\\\"SoftMP3: memset safely\\\\\" into mnc-dev am: b2b56d1f0a am: 5d6fe83821 am: 2d09be5831 am: 3c69172940
am: fd778b20ed

Change-Id: Ifd314bbbc70efa4f49a8ef836bfe4530ad56707c
fd778b20ededf0ca94f1e3668665d9fce47bf7b7 14-Jul-2016 Robert Shih <robertshih@google.com> Merge \\\\"SoftMP3: memset safely\\\\" into mnc-dev am: b2b56d1f0a am: 5d6fe83821 am: 2d09be5831
am: 3c69172940

Change-Id: Ifa3581fedd391417e61ad9f576023b8f9e590ea4
3c69172940e6c0c0b99bef3ac66481fd870d4c7b 14-Jul-2016 Robert Shih <robertshih@google.com> Merge \\\"SoftMP3: memset safely\\\" into mnc-dev am: b2b56d1f0a am: 5d6fe83821
am: 2d09be5831

Change-Id: Iddfa06104c9d41d7627efdb2aa970e10b5a1c81b
2d09be5831f7f7dfefccb0a1c45b2c791e98045f 14-Jul-2016 Robert Shih <robertshih@google.com> Merge \\"SoftMP3: memset safely\\" into mnc-dev am: b2b56d1f0a
am: 5d6fe83821

Change-Id: I0c5e6c1a4a36a345b87565c91e692871ed2895f2
5d6fe838213d235af629570b3a5a82c3123177ef 14-Jul-2016 Robert Shih <robertshih@google.com> Merge \"SoftMP3: memset safely\" into mnc-dev
am: b2b56d1f0a

Change-Id: Ied8936092f890fcd213548690cdc591de2af15f5
b2b56d1f0af7db5b817ad516cf8d575e4420e13d 14-Jul-2016 Robert Shih <robertshih@google.com> Merge "SoftMP3: memset safely" into mnc-dev
d5573715d8f93aedfd8aa1db9d42d3089947858d 14-Jul-2016 Robert Shih <robertshih@google.com> Merge "DO NOT MERGE - SoftMP3: memset safely" into lmp-dev
f5ae7b4790fe8e4432dc6270dacf1685d6f97723 14-Jul-2016 Lajos Molnar <lajos@google.com> fix build am: cc17d003ee am: 6007caa57e am: f3c0ccf224 am: 2153931367
am: 786ddba286

Change-Id: Ifb63e62e1fe33e0f9ab1c4003d822ced9442a317
786ddba2862716164920b455c4d5a1b3a7454193 14-Jul-2016 Lajos Molnar <lajos@google.com> fix build am: cc17d003ee am: 6007caa57e am: f3c0ccf224
am: 2153931367

Change-Id: Id42e3136795a130e0404ae684fc5168f0a707438
2153931367cce9dc73cf43e70b5072b8819aed7a 14-Jul-2016 Lajos Molnar <lajos@google.com> fix build am: cc17d003ee am: 6007caa57e
am: f3c0ccf224

Change-Id: I7c2da1c3042db8a5c2dccd5370b2b0f852302808
f3c0ccf224e89e81e733a50e49f2c1cd372ff29a 14-Jul-2016 Lajos Molnar <lajos@google.com> fix build am: cc17d003ee
am: 6007caa57e

Change-Id: I01612087d09d58d053d0161ba0c19959b7a574ef
6007caa57e80d822275f6272ffaa870be2c49f1f 14-Jul-2016 Lajos Molnar <lajos@google.com> fix build
am: cc17d003ee

Change-Id: Id0af1ad23c65f8dc358420e21786f5e7db32fd46
665d431f02054dfbcae1875499d6456b80a069c7 14-Jul-2016 Lajos Molnar <lajos@google.com> Merge \\"stagefright: ACodec: Enable temporal layered encoding for AVC/HEVC\\" into nyc-mr1-dev am: caeb609354
am: 8d1631c1fc

Change-Id: I1d64569ebe285cc93e49ac6889a5796ae4a2e231
e2925172d235b7ef3d166ac3b1c9a4f1740b11d0 14-Jul-2016 Lajos Molnar <lajos@google.com> Merge \\"stagefright: encode number of android.generic temporal layers\\" into nyc-mr1-dev am: af14c09690
am: 989010e171

Change-Id: I432566ed7343649ad99d2f1cb4a52b8e98cbb2b8
051b74c1de54bdc8223a20f44bb13e3850bf475d 14-Jul-2016 Lajos Molnar <lajos@google.com> fix build am: a2c2d1503c
am: eabe3b4a74

Change-Id: I60cfd66e028861f793944273e9cdbf3cdcb7537b
8d1631c1fcbced8c81db8a3f5d86877be7da888d 14-Jul-2016 Lajos Molnar <lajos@google.com> Merge \"stagefright: ACodec: Enable temporal layered encoding for AVC/HEVC\" into nyc-mr1-dev
am: caeb609354

Change-Id: I4da3b8ab4d0b9bd180f51bbb7071859dde7ed980
989010e1711ce462ca7b909178345e5fa62298b3 14-Jul-2016 Lajos Molnar <lajos@google.com> Merge \"stagefright: encode number of android.generic temporal layers\" into nyc-mr1-dev
am: af14c09690

Change-Id: I0c113016312fd6fa6baa046a762efbbbeaba8ea7
eabe3b4a74ea165bb28101f4531ae2ed3c61b7ac 14-Jul-2016 Lajos Molnar <lajos@google.com> fix build
am: a2c2d1503c

Change-Id: Icbee69bce0e75bd9cc42985d24709b4c982879fd
caeb609354c746fd4c5bc2669a42cd95bcabbbee 14-Jul-2016 Lajos Molnar <lajos@google.com> Merge "stagefright: ACodec: Enable temporal layered encoding for AVC/HEVC" into nyc-mr1-dev
af14c096900be5f92795363264a175b518086af0 14-Jul-2016 Lajos Molnar <lajos@google.com> Merge "stagefright: encode number of android.generic temporal layers" into nyc-mr1-dev
a2c2d1503ccc47b508f726652c714863320cb89b 14-Jul-2016 Lajos Molnar <lajos@google.com> fix build

Change-Id: I9bb8c659d3fc97a8e748451d82d0f3448faa242b
odecs/on2/dec/SoftVPX.cpp
cc17d003ee1e0914d046647cd5f27fe2e80dff6b 14-Jul-2016 Lajos Molnar <lajos@google.com> fix build

Change-Id: I9bb8c659d3fc97a8e748451d82d0f3448faa242b
odecs/on2/dec/SoftVPX.cpp
554e02ef5db2f8db3061c194e236840c2ed65281 14-Jul-2016 Lajos Molnar <lajos@google.com> Merge \"Merge \\"MPEG4Writer: Fix writing multiple NAL units in a video sample\\" into nyc-mr1-dev am: 817cdc110d\" into nyc-mr1-dev-plus-aosp
am: 03628bde9a

Change-Id: I1e312c3eac976e38cb9a3bccb1cbf468baca32bc
4a31fe0cce5c82c1695903ec7cb7e5f316341357 14-Jul-2016 Lajos Molnar <lajos@google.com> Merge \"MPEG4Writer: Fix writing multiple NAL units in a video sample\" into nyc-mr1-dev
am: 817cdc110d

Change-Id: Ia1c83d040d3dbc202ca86c6a5438cae2647e0fcd
f92f69623045170d8f6ed019360788657777d11e 14-Jul-2016 Robert Shih <robertshih@google.com> Merge \\\\\\\\\\"OMXCodec: check IMemory::pointer() before using allocation\\\\\\\\\\" into klp-dev am: f545c72b97 am: d89781f3be am: c9c40b829f am: 29f09eb295 am: 5d36fedeb8 am: a17d7c0307 am: 83d7bdbceb am: f43ad654dc am: b2aeed2dc5
am: e46d450cb7

Change-Id: I9cc745c824801e9f15dcef233a87d018e965d758
e46d450cb74d3e6c27b9eadb5e1d90754dcfb9b7 14-Jul-2016 Robert Shih <robertshih@google.com> Merge \\\\\\\\\"OMXCodec: check IMemory::pointer() before using allocation\\\\\\\\\" into klp-dev am: f545c72b97 am: d89781f3be am: c9c40b829f am: 29f09eb295 am: 5d36fedeb8 am: a17d7c0307 am: 83d7bdbceb am: f43ad654dc
am: b2aeed2dc5

Change-Id: I4e1eb4a15485851af5eb2e5aa5861629c64e4d6d
817cdc110d8ee360ce3c6b7c84be559509cb7c37 14-Jul-2016 Lajos Molnar <lajos@google.com> Merge "MPEG4Writer: Fix writing multiple NAL units in a video sample" into nyc-mr1-dev
b2aeed2dc5b436fbdd8e8215e98af6002b85a7e6 14-Jul-2016 Robert Shih <robertshih@google.com> Merge \\\\\\\\"OMXCodec: check IMemory::pointer() before using allocation\\\\\\\\" into klp-dev am: f545c72b97 am: d89781f3be am: c9c40b829f am: 29f09eb295 am: 5d36fedeb8 am: a17d7c0307 am: 83d7bdbceb
am: f43ad654dc

Change-Id: I3d0ff983cdb89fed7bfc80b805e475f3f0289e08
0e131395f8aa75a6d2c5a8b810a9343979d0acd1 14-Jul-2016 Robert Shih <robertshih@google.com> Merge \\\\\\\"SoftVPX: fix nFilledLen overflow\\\\\\\" into mnc-dev am: ab495a88dd am: 0fb0771c86 am: 6b4db071fc am: 5eab23fe18 am: cd7ba625b3 am: 85be008778
am: a4a83c0830

Change-Id: Ia6e69f1471df539f7d86268425ff3e7dabbf729e
f43ad654dc4c950c7080990a300c1671e05774c5 14-Jul-2016 Robert Shih <robertshih@google.com> Merge \\\\\\\"OMXCodec: check IMemory::pointer() before using allocation\\\\\\\" into klp-dev am: f545c72b97 am: d89781f3be am: c9c40b829f am: 29f09eb295 am: 5d36fedeb8 am: a17d7c0307
am: 83d7bdbceb

Change-Id: I1d0e31020d3cf327a552854192dfa5c8e4ca4a09
a4a83c08300ff278a4f46256dc3dd6c57a1d2fa0 14-Jul-2016 Robert Shih <robertshih@google.com> Merge \\\\\\"SoftVPX: fix nFilledLen overflow\\\\\\" into mnc-dev am: ab495a88dd am: 0fb0771c86 am: 6b4db071fc am: 5eab23fe18 am: cd7ba625b3
am: 85be008778

Change-Id: I8a0508fd5f863eda3ae6743da330e41e7624b63e
83d7bdbcebe35bba88fb41015255f808a045f5e4 14-Jul-2016 Robert Shih <robertshih@google.com> Merge \\\\\\"OMXCodec: check IMemory::pointer() before using allocation\\\\\\" into klp-dev am: f545c72b97 am: d89781f3be am: c9c40b829f am: 29f09eb295 am: 5d36fedeb8
am: a17d7c0307

Change-Id: If552708dbdb28fe1b744adbd92790faafbc10783
85be008778ea7b02df34323f7d117791ab9a3979 14-Jul-2016 Robert Shih <robertshih@google.com> Merge \\\\\"SoftVPX: fix nFilledLen overflow\\\\\" into mnc-dev am: ab495a88dd am: 0fb0771c86 am: 6b4db071fc am: 5eab23fe18
am: cd7ba625b3

Change-Id: Id51f734f866ff8ed90ea342bf43ceec2d4153706
54a548de51a95361e43bee2586a8903b835e824f 14-Jul-2016 Robert Shih <robertshih@google.com> Merge \\\\\"SoftVPX: fix nFilledLen overflow\\\\\" into mnc-dev am: ab495a88dd am: 0fb0771c86 am: 6b4db071fc am: 5eab23fe18
am: cd7ba625b3

Change-Id: Ib6dc057398376da9d6c6451cd30a954c20d9fffa
e3c1c2d73474953a953185bd3cb2e9f502d1bdd4 14-Jul-2016 Robert Shih <robertshih@google.com> Merge \\"DO NOT MERGE - SoftMP3: memset safely\\" into klp-dev am: 3242dcf6e9
am: f4ad14f154

Change-Id: Iec5f4a53a3db5fbb40bfecd4bddf4b3f607ae450
cd7ba625b3247d84182455dccac2d0ef0ce60c25 14-Jul-2016 Robert Shih <robertshih@google.com> Merge \\\\"SoftVPX: fix nFilledLen overflow\\\\" into mnc-dev am: ab495a88dd am: 0fb0771c86 am: 6b4db071fc
am: 5eab23fe18

Change-Id: I869d0d567aef13f188e7ac8fe7daf36ef99eca6d
b1803b01ed332aa2ed05536c4486078e9d02760a 14-Jul-2016 Lajos Molnar <lajos@google.com> stagefright: encode number of android.generic temporal layers

Bug: 27596987
Change-Id: Ida24aa9bac004ac9bc7c9e19eea1a55162904dc4
PEG4Writer.cpp
tils.cpp
5eab23fe187d6071c14c27a5ab48c287403f4249 14-Jul-2016 Robert Shih <robertshih@google.com> Merge \\\"SoftVPX: fix nFilledLen overflow\\\" into mnc-dev am: ab495a88dd am: 0fb0771c86
am: 6b4db071fc

Change-Id: Ie628a767c0e1ad6e103e224b5c590602f5cc79a0
5d36fedeb82d15f630594d01fdfc5e92b9890ade 14-Jul-2016 Robert Shih <robertshih@google.com> Merge \\\\"OMXCodec: check IMemory::pointer() before using allocation\\\\" into klp-dev am: f545c72b97 am: d89781f3be am: c9c40b829f
am: 29f09eb295

Change-Id: Ib65bf1a2dd56dfa84881a18acf0ba1871cdff38c
6b4db071fca15ea349c32279cfb90da1a1f72bef 14-Jul-2016 Robert Shih <robertshih@google.com> Merge \\"SoftVPX: fix nFilledLen overflow\\" into mnc-dev am: ab495a88dd
am: 0fb0771c86

Change-Id: I85c24c95c5400b9018b3e38ab3ef43ef5a4ef984
29f09eb29571cf345749ce3a8bc077882c529777 14-Jul-2016 Robert Shih <robertshih@google.com> Merge \\\"OMXCodec: check IMemory::pointer() before using allocation\\\" into klp-dev am: f545c72b97 am: d89781f3be
am: c9c40b829f

Change-Id: I5facfd78f7050928d30c86585036128749b1f292
3242dcf6e9f5e01fa2e4fd78feb5db7ec385469d 14-Jul-2016 Robert Shih <robertshih@google.com> Merge "DO NOT MERGE - SoftMP3: memset safely" into klp-dev
0fb0771c8603fa66383d0e8079a403221d51f666 14-Jul-2016 Robert Shih <robertshih@google.com> Merge \"SoftVPX: fix nFilledLen overflow\" into mnc-dev
am: ab495a88dd

Change-Id: I1007de26163315432decf84d149eae345e7b7a58
6bdf8cb4402fb0ed3b46820e8c19a50d40f19803 14-Jul-2016 Robert Shih <robertshih@google.com> Merge \\"DO NOT MERGE - SoftVPX: fix nFilledLen overflow\\" into klp-dev am: 91ad8847ab
am: 74b10b831c

Change-Id: I2b300c5f4993d4beb866e4f1c94eb4fece1149e2
c9c40b829f4a555fcff520d265e2e60ac40ffb7e 14-Jul-2016 Robert Shih <robertshih@google.com> Merge \\"OMXCodec: check IMemory::pointer() before using allocation\\" into klp-dev am: f545c72b97
am: d89781f3be

Change-Id: Iae2cc6d8f4512e7e1f4273bbb28b292337e291b6
ab495a88dd927bf88ea5daf9e731c9e1c3150822 14-Jul-2016 Robert Shih <robertshih@google.com> Merge "SoftVPX: fix nFilledLen overflow" into mnc-dev
91ad8847ab8c4d6c2e6fadf1978d2dd838eeafeb 14-Jul-2016 Robert Shih <robertshih@google.com> Merge "DO NOT MERGE - SoftVPX: fix nFilledLen overflow" into klp-dev
f545c72b97671b6030946c86758cdb87d22a302d 14-Jul-2016 Robert Shih <robertshih@google.com> Merge "OMXCodec: check IMemory::pointer() before using allocation" into klp-dev
43ef48c3712443f519fe05ceac6f8138b6e73556 14-Jul-2016 Wei Jia <wjia@google.com> Merge \"MediaExtractor: move DRMExtractor to mediaserver process.\" into nyc-dev
am: 59180b3031

Change-Id: I1de4c34ffeeaf04f9052ba6e38424a719b0efeea
2d46f5972c0f7583a36e9df0c9622e91d6a1a5fd 14-Jul-2016 Wei Jia <wjia@google.com> MediaExtractor: add DrmInitialization in IDataSource.
am: 9a1a953745

Change-Id: Ib5a5b4c2989fb9688e53ad4251892b8a6b863f2b
eaf857856e0bfe4ea99723012a4eebcd6603ac25 27-Jun-2016 Robert Shih <robertshih@google.com> DO NOT MERGE - SoftMP3: memset safely

Bug: 29422022
Change-Id: I70c9e33269d16bf8c163815706ac24e18e34fe97
odecs/mp3dec/SoftMP3.cpp
odecs/mp3dec/SoftMP3.h
bce5cc9f9d071e1bd5c6c9194a3c8ee289d2d9a1 27-Jun-2016 Robert Shih <robertshih@google.com> DO NOT MERGE - SoftMP3: memset safely

Bug: 29422022
Change-Id: I70c9e33269d16bf8c163815706ac24e18e34fe97
odecs/mp3dec/SoftMP3.cpp
odecs/mp3dec/SoftMP3.h
59180b3031130c07e387b8217d3062466de6cf0c 14-Jul-2016 TreeHugger Robot <treehugger-gerrit@google.com> Merge "MediaExtractor: move DRMExtractor to mediaserver process." into nyc-dev
b7ba49c1a0463979f11f72d47fda46289e536e41 24-Jun-2016 Robert Shih <robertshih@google.com> DO NOT MERGE - SoftVPX: fix nFilledLen overflow

Bug: 29421675
Change-Id: I25d4cf54a5df22c2130c37e95c7c7f75063111f3
odecs/on2/dec/SoftVPX.cpp
odecs/on2/dec/SoftVPX.h
b8676258c1c04cfb2c5a87d00b1b8fe85309b2a9 24-Jun-2016 Robert Shih <robertshih@google.com> DO NOT MERGE - SoftVPX: fix nFilledLen overflow

Bug: 29421675
Change-Id: I25d4cf54a5df22c2130c37e95c7c7f75063111f3
odecs/on2/dec/SoftVPX.cpp
odecs/on2/dec/SoftVPX.h
a54f2969ff320c55d107c9d1491686bbbb7e7d6e 14-Jul-2016 Lajos Molnar <lajos@google.com> stagefright: enable android.generic temporal layering for vpx am: f1c70d7f54
am: a057d0393f

Change-Id: I185b8318366486e358ae47ed3ba918b9d0dcabe3
a057d0393fd5ed593f163c8235b070e9ad188594 14-Jul-2016 Lajos Molnar <lajos@google.com> stagefright: enable android.generic temporal layering for vpx
am: f1c70d7f54

Change-Id: I01b63c0af8d38f0026b021c3980a4e578797901b
8df936266513e012fa17b421c9ded2784e16f6e3 14-Jul-2016 Ray Essick <essick@google.com> Merge \\\\\\\\\\\\\"Fix corruption via buffer overflow in mediaserver\\\\\\\\\\\\\" into klp-dev am: b5299033ce am: 357e0f132e am: efa1272404 am: e20f434b16 am: 63b7b724b0 am: fbdd8670a0 am: b528c30f00 am: 998e71e187 am: 14a05e250c am: 18b498dc4c am: b0b2bbaf87 am: 25d1b63b7c
am: a27b57921f

Change-Id: Id4df3945684eb274bb68e7978152c1114069cfc0
d9319eb2189eaf33dc285b9b509d42ef1692ffec 08-Jul-2016 Wei Jia <wjia@google.com> MediaExtractor: move DRMExtractor to mediaserver process.

Change-Id: I5785c74191c95e6c8bf6b6a17319e1fc2431241e
(cherry picked from commit d7581056d0962784b50570c7f477b7a406c08a57)
ediaExtractor.cpp
f1c70d7f5472e3f5680144c29c839108993996fd 13-Jul-2016 Lajos Molnar <lajos@google.com> stagefright: enable android.generic temporal layering for vpx

Bug: 27596987
Change-Id: I6fc104bb4f6dd3368ed8888e216cc2e0a796126f
Codec.cpp
10cc12c4eec9ff974edb72f9140b05762fa50907 14-Jul-2016 Lajos Molnar <lajos@google.com> MPEG4Writer: Fix writing multiple NAL units in a video sample

start code is 4-byte long

Bug: 27596987
Change-Id: Ie54167f8f1b5b00679243a41e0203fdf4018f639
PEG4Writer.cpp
0f7442ddb82d5ceba2e0c081dc3d62996f1570a0 07-Apr-2016 Lajos Molnar <lajos@google.com> stagefright: ACodec: Enable temporal layered encoding for AVC/HEVC

Bug: 27596987
Change-Id: Ic81f305aaaa2da6b0084bf59d499fde2e4b43d54
Codec.cpp
9a1a9537456e41cb8450f84a735c3d005a22ffe2 07-Jul-2016 Wei Jia <wjia@google.com> MediaExtractor: add DrmInitialization in IDataSource.

Bug: 28901867
Change-Id: Ic33dc8dc2f5f36239e057d2f2aceeb7738eef968
(cherry picked from commit 2a5e49c984befa066e966cd9af2303a54976f163)
MRExtractor.cpp
allbackDataSource.cpp
ediaExtractor.cpp
nclude/CallbackDataSource.h
a27b57921fa6e6333f6062c8416eaafa08ea08c1 14-Jul-2016 Ray Essick <essick@google.com> Merge \\\\\\\\\\\\"Fix corruption via buffer overflow in mediaserver\\\\\\\\\\\\" into klp-dev am: b5299033ce am: 357e0f132e am: efa1272404 am: e20f434b16 am: 63b7b724b0 am: fbdd8670a0 am: b528c30f00 am: 998e71e187 am: 14a05e250c am: 18b498dc4c am: b0b2bbaf87
am: 25d1b63b7c

Change-Id: I5bc15f591a8d20a847e4f524df6cde053b375b70
7cfc18e680fc295d1975c8da183f0d9df4cab803 24-Jun-2016 Robert Shih <robertshih@google.com> SoftVPX: fix nFilledLen overflow

Bug: 29421675
Change-Id: I25d4cf54a5df22c2130c37e95c7c7f75063111f3
odecs/on2/dec/SoftVPX.cpp
odecs/on2/dec/SoftVPX.h
e4aebb03ae43d22b3d85c6e6913cfb517ae14217 14-Jul-2016 Ray Essick <essick@google.com> Merge \\\\\\\\\\\\"Fix corruption via buffer overflow in mediaserver\\\\\\\\\\\\" into klp-dev am: b5299033ce am: 357e0f132e am: efa1272404 am: e20f434b16 am: 63b7b724b0 am: fbdd8670a0 am: b528c30f00 am: 998e71e187 am: 14a05e250c am: 18b498dc4c am: b0b2bbaf87
am: 25d1b63b7c

Change-Id: Id5f04aafe8ffff6ea462c9696a3c477875a29fa8
25d1b63b7cfbd0083ecd54c589f71664411f9b8c 14-Jul-2016 Ray Essick <essick@google.com> Merge \\\\\\\\\\\"Fix corruption via buffer overflow in mediaserver\\\\\\\\\\\" into klp-dev am: b5299033ce am: 357e0f132e am: efa1272404 am: e20f434b16 am: 63b7b724b0 am: fbdd8670a0 am: b528c30f00 am: 998e71e187 am: 14a05e250c am: 18b498dc4c
am: b0b2bbaf87

Change-Id: I8fb744a8673be4bca158ac7bdd1b0a8573e32fc4
b0b2bbaf87c6d17eda22a56f532e7a37efe20775 14-Jul-2016 Ray Essick <essick@google.com> Merge \\\\\\\\\\"Fix corruption via buffer overflow in mediaserver\\\\\\\\\\" into klp-dev am: b5299033ce am: 357e0f132e am: efa1272404 am: e20f434b16 am: 63b7b724b0 am: fbdd8670a0 am: b528c30f00 am: 998e71e187 am: 14a05e250c
am: 18b498dc4c

Change-Id: I1df83dce4b429708c9d8ecff23f92defd72c5e3c
18b498dc4ce8fb4d772141f550b610bf1335403b 14-Jul-2016 Ray Essick <essick@google.com> Merge \\\\\\\\\"Fix corruption via buffer overflow in mediaserver\\\\\\\\\" into klp-dev am: b5299033ce am: 357e0f132e am: efa1272404 am: e20f434b16 am: 63b7b724b0 am: fbdd8670a0 am: b528c30f00 am: 998e71e187
am: 14a05e250c

Change-Id: Iec37d54ccc7252f8d408695294cc4c93cdb7fd75
14a05e250cdb60ec50bed8073611c6de0dc532b1 14-Jul-2016 Ray Essick <essick@google.com> Merge \\\\\\\\"Fix corruption via buffer overflow in mediaserver\\\\\\\\" into klp-dev am: b5299033ce am: 357e0f132e am: efa1272404 am: e20f434b16 am: 63b7b724b0 am: fbdd8670a0 am: b528c30f00
am: 998e71e187

Change-Id: I8d9d6b52391acf703b2f18f0385648e3ef10d948
998e71e1871040786461f741291af464b1305982 14-Jul-2016 Ray Essick <essick@google.com> Merge \\\\\\\"Fix corruption via buffer overflow in mediaserver\\\\\\\" into klp-dev am: b5299033ce am: 357e0f132e am: efa1272404 am: e20f434b16 am: 63b7b724b0 am: fbdd8670a0
am: b528c30f00

Change-Id: I45609cc7db5ce15b9e3ce02465d5a81e849f445d
b528c30f00a85982036870b9ec7e92b11ce72744 14-Jul-2016 Ray Essick <essick@google.com> Merge \\\\\\"Fix corruption via buffer overflow in mediaserver\\\\\\" into klp-dev am: b5299033ce am: 357e0f132e am: efa1272404 am: e20f434b16 am: 63b7b724b0
am: fbdd8670a0

Change-Id: I42f79dd854a98d8fe20e922a35db372b54fc53b8
63b7b724b02c97b1aa08f7f4dd141b2e2d579fd3 14-Jul-2016 Ray Essick <essick@google.com> Merge \\\\"Fix corruption via buffer overflow in mediaserver\\\\" into klp-dev am: b5299033ce am: 357e0f132e am: efa1272404
am: e20f434b16

Change-Id: I0a68641bab795e8488a4b74050ef8c182cedd02c
e20f434b16c61d03e5313d0166104e1c1cb1faac 14-Jul-2016 Ray Essick <essick@google.com> Merge \\\"Fix corruption via buffer overflow in mediaserver\\\" into klp-dev am: b5299033ce am: 357e0f132e
am: efa1272404

Change-Id: Ia5996291c99df58d5986195424ce98ea354e6a8b
efa1272404186a7c191d120a18b5f4ffcbbccdaf 14-Jul-2016 Ray Essick <essick@google.com> Merge \\"Fix corruption via buffer overflow in mediaserver\\" into klp-dev am: b5299033ce
am: 357e0f132e

Change-Id: Ia387bc54c8d51975aa4c938616a43e47cb3338d9
b5299033cec510aac9b636cb6b5b5458c686f398 14-Jul-2016 Ray Essick <essick@google.com> Merge "Fix corruption via buffer overflow in mediaserver" into klp-dev
cdeb6603d862cec4adac7c39f3b8b240f2b645dc 29-Jun-2016 Andy Hung <hunga@google.com> GenericSource: Allow multiple buffer reads for video

Bug: 29125703
Change-Id: I23490a65ad3968d7be561805c9fa742320b5c78a
PEG4Extractor.cpp
AVExtractor.cpp
oundation/MediaBufferGroup.cpp
f59c0bafebcd795b20141bf928a5cab8ac46e882 16-Jun-2016 Andy Hung <hunga@google.com> IMediaSource: Improve shared memory buffer transfer

Bug: 29125703
Change-Id: Icf1180dee65f6504e6c10dd4d5b28a8e441f67d1
oundation/MediaBuffer.cpp
oundation/MediaBufferGroup.cpp
f9eb4d2ca8eee725a33618da104f843acd3b6ff5 13-Jul-2016 Hangyu Kuang <hkuang@google.com> Merge \\"media: Optimize thumbnail extraction.\\" into nyc-mr1-dev am: 88bd73d9ac
am: 5691e5400a

Change-Id: I8326ab8c0da3ea670f059ed251e794a696e93e23
5691e5400a9cf7aee4c76ded5db7eed53bfb9c8d 13-Jul-2016 Hangyu Kuang <hkuang@google.com> Merge \"media: Optimize thumbnail extraction.\" into nyc-mr1-dev
am: 88bd73d9ac

Change-Id: I775751f4ceec359cee8edce04d71482f0cfa6ae0
88bd73d9acf5011ef40122fa9a1b43195facbe07 13-Jul-2016 Hangyu Kuang <hkuang@google.com> Merge "media: Optimize thumbnail extraction." into nyc-mr1-dev
2c6f11ac1e045e5f14311d524f8e3b3688c4a2a7 13-Jul-2016 Wei Jia <wjia@google.com> Merge \\"MediaExtractor: move DRMExtractor to mediaserver process.\\" into nyc-mr1-dev am: 73e0dd5e12
am: a6e86b51a0

Change-Id: I3734c7a100c8b1ac4eae6ec310234e53a9f3a10d
a6e86b51a079e8b56968f4536e6dbe1dff3883a4 13-Jul-2016 Wei Jia <wjia@google.com> Merge \"MediaExtractor: move DRMExtractor to mediaserver process.\" into nyc-mr1-dev
am: 73e0dd5e12

Change-Id: I63204b174e4462526c7da0b3fda8350444303b26
73e0dd5e12d99005a34f50364d7e513145dbd836 13-Jul-2016 Wei Jia <wjia@google.com> Merge "MediaExtractor: move DRMExtractor to mediaserver process." into nyc-mr1-dev
19ca2d2486746086020e4df31d119e7258ee83db 13-Jul-2016 Wonsik Kim <wonsik@google.com> Merge \\"DO NOT MERGE stagefright: fix possible stack overflow in AVCC reassemble\\" into klp-dev am: b239e27433
am: cc3c549065

Change-Id: I772fba4484975a2f28fc947e4a16296b400f5a99
003f3b3d769cb4f98b75438d21d7b2067efb7c2c 13-Jul-2016 Wonsik Kim <wonsik@google.com> Merge \\\"stagefright: fix possible stack overflow in AVCC reassemble\\\" into nyc-dev am: 8ec880eb85 am: e5e2919b6e
am: 453578523a

Change-Id: I09642c10bd7a073b83f1a1e4fe0f5c17ab8d7aa0
453578523af539d9f0f1b3faa768812854754824 13-Jul-2016 Wonsik Kim <wonsik@google.com> Merge \\"stagefright: fix possible stack overflow in AVCC reassemble\\" into nyc-dev am: 8ec880eb85
am: e5e2919b6e

Change-Id: Ic134d4e9aeec063bc932ad216daa3cca9b454f2e
f667351d11451ad58635fd9b1d93831ae7c990d7 13-Jul-2016 Wonsik Kim <wonsik@google.com> Merge \\\"DO NOT MERGE stagefright: fix possible stack overflow in AVCC reassemble\\\" into mnc-dev am: 77effe4be6 am: 25515c21b4
am: 2728e0fe52

Change-Id: Ief69fa967ec6aac1d71c4d1dc9bd94ba540f6ffd
2728e0fe529b659782e9e8e6f34fc0ca03d9726c 13-Jul-2016 Wonsik Kim <wonsik@google.com> Merge \\"DO NOT MERGE stagefright: fix possible stack overflow in AVCC reassemble\\" into mnc-dev am: 77effe4be6
am: 25515c21b4

Change-Id: Ie724240ac720d27db1111361a8c0d170d4a6834a
e5e2919b6e992188e43a4ee19ba3ee764e56283e 13-Jul-2016 Wonsik Kim <wonsik@google.com> Merge \"stagefright: fix possible stack overflow in AVCC reassemble\" into nyc-dev
am: 8ec880eb85

Change-Id: I0af0334684d72d6b44c2c4c7f0207efbeaf82339
3a03d96407adcd59bcd87879bdf2dab643fcf99a 13-Jul-2016 Wonsik Kim <wonsik@google.com> Merge \"stagefright: fix possible stack overflow in AVCC reassemble\" into nyc-dev
am: 8ec880eb85

Change-Id: I6c5f20894a354a82421a72e6c3db6e11cb31b3eb
25515c21b4635d58b6c267d1aa2b0df660bdd7fb 13-Jul-2016 Wonsik Kim <wonsik@google.com> Merge \"DO NOT MERGE stagefright: fix possible stack overflow in AVCC reassemble\" into mnc-dev
am: 77effe4be6

Change-Id: I2c37ed8a51cca75b9264a9cc66c0453e17154f79
b239e274334e9a363235d77f1439284146b18fb1 13-Jul-2016 Wonsik Kim <wonsik@google.com> Merge "DO NOT MERGE stagefright: fix possible stack overflow in AVCC reassemble" into klp-dev
250935d18aec13609ebca1b4cc55b1267e87114d 13-Jul-2016 Wonsik Kim <wonsik@google.com> Merge "DO NOT MERGE stagefright: fix possible stack overflow in AVCC reassemble" into lmp-dev
77effe4be67dedfcb3936fad090ab1e376df6fab 13-Jul-2016 Wonsik Kim <wonsik@google.com> Merge "DO NOT MERGE stagefright: fix possible stack overflow in AVCC reassemble" into mnc-dev
8ec880eb854ae020819cea55187b2d9d607778f3 13-Jul-2016 Wonsik Kim <wonsik@google.com> Merge "stagefright: fix possible stack overflow in AVCC reassemble" into nyc-dev
b23a8a8d5d56dc308438d523a66554a3a59227cf 13-Jul-2016 Wei Jia <wjia@google.com> Merge \\"MediaExtractor: add DrmInitialization in IDataSource.\\" into nyc-mr1-dev am: 489eb9bfaa
am: 464578df77

Change-Id: I2470062d2da23bd18e647ace03911722f6af6ff9
464578df7725dc452b35466e469b35e6f39d8e8f 13-Jul-2016 Wei Jia <wjia@google.com> Merge \"MediaExtractor: add DrmInitialization in IDataSource.\" into nyc-mr1-dev
am: 489eb9bfaa

Change-Id: I91208fea89388be02550c6c8b7a728dd9dd1ee31
d7581056d0962784b50570c7f477b7a406c08a57 08-Jul-2016 Wei Jia <wjia@google.com> MediaExtractor: move DRMExtractor to mediaserver process.

Change-Id: I5785c74191c95e6c8bf6b6a17319e1fc2431241e
ediaExtractor.cpp
2a14baea6e9bb51de8cb7e130510312be17f8469 13-Jul-2016 Robert Shih <robertshih@google.com> OMXCodec: check IMemory::pointer() before using allocation

Bug: 29421811
Change-Id: I0a73ba12bae4122f1d89fc92e5ea4f6a96cd1ed1
MXCodec.cpp
a6bfb5060824f01041f956c733fec141504c280b 09-Jul-2016 Hangyu Kuang <hkuang@google.com> media: Optimize thumbnail extraction.

When extracting thumbnail image from a video, try to allocate single buffer
in both input and output ports.

Bug:29197670
Change-Id: I7c0722e7fe6f1ecd5f0b8addedeeda8d3b03249f
Codec.cpp
tagefrightMetadataRetriever.cpp
odecs/avcdec/SoftAVCDec.cpp
nclude/SoftVideoDecoderOMXComponent.h
mx/SoftVideoDecoderOMXComponent.cpp
2a5e49c984befa066e966cd9af2303a54976f163 07-Jul-2016 Wei Jia <wjia@google.com> MediaExtractor: add DrmInitialization in IDataSource.

Bug: 28901867
Change-Id: Ic33dc8dc2f5f36239e057d2f2aceeb7738eef968
MRExtractor.cpp
allbackDataSource.cpp
ediaExtractor.cpp
nclude/CallbackDataSource.h
6797293e267d9ee05d976f3c926cc2119af3eb1e 13-Jul-2016 Hangyu Kuang <hkuang@google.com> Merge \\"media: Add colorAspect support to SoftAVC decoder.\\" into nyc-mr1-dev am: 67f98ee9ea
am: e6d34ee345

Change-Id: Iae693b1491efb29f378a7bfc46c1ee2c7a258d3f
e6d34ee345e9a900254b5baae0dbdd4304207259 12-Jul-2016 Hangyu Kuang <hkuang@google.com> Merge \"media: Add colorAspect support to SoftAVC decoder.\" into nyc-mr1-dev
am: 67f98ee9ea

Change-Id: Ie241857c98ffc10fe00412a603e95bb20c0636f5
67f98ee9eafec11a81c018bce170a81481e52a7a 12-Jul-2016 TreeHugger Robot <treehugger-gerrit@google.com> Merge "media: Add colorAspect support to SoftAVC decoder." into nyc-mr1-dev
c2e98f5f60460890195b33abe40e376f800b242e 17-Jun-2016 Hangyu Kuang <hkuang@google.com> media: Add colorAspect support to SoftAVC decoder.

Bug: 27442922
Change-Id: Iad48c1b9dad76cb65530bef274d0d3c5e710e627
odecs/avcdec/SoftAVCDec.cpp
odecs/avcdec/SoftAVCDec.h
nclude/SoftVideoDecoderOMXComponent.h
mx/SoftVideoDecoderOMXComponent.cpp
771955c39a67e0598648f3f416e4209003bb6b14 12-Jul-2016 Wei Jia <wjia@google.com> Merge \\"MPEG4Writer: Handle writing multiple NAL units in a video sample\\" into nyc-mr1-dev am: af0c7dfd57
am: ab99bf8a01

Change-Id: I19460fdda40a859a3fbc6d235c2d72302b8fe757
ab99bf8a017616c73193357c7815f60712570573 12-Jul-2016 Praveen Chavan <pchavan@codeaurora.org> Merge \"MPEG4Writer: Handle writing multiple NAL units in a video sample\" into nyc-mr1-dev
am: af0c7dfd57

Change-Id: I560d5f23bb9385194f506264bd08666bead463da
af0c7dfd5744b7c9e67e9afd26af417aadc6dc20 12-Jul-2016 Wei Jia <wjia@google.com> Merge "MPEG4Writer: Handle writing multiple NAL units in a video sample" into nyc-mr1-dev
0275063d397cfef5808f38ca96a3323ee490ef29 12-Jul-2016 Wei Jia <wjia@google.com> Merge \\"stagefright: Enhance MPEG4 writer/extractor to store/retrieve layer info\\" into nyc-mr1-dev am: 0093efba5a
am: 44fece2cf3

Change-Id: Iee233ea36d574f37fc9ddb4f4eb530c7c7a3dd57
44fece2cf363911efede91f81c7e57236d81f755 12-Jul-2016 Praveen Chavan <pchavan@codeaurora.org> Merge \"stagefright: Enhance MPEG4 writer/extractor to store/retrieve layer info\" into nyc-mr1-dev
am: 0093efba5a

Change-Id: Ia1a316c8dfd13bf146e94037a3743cdab88acdfe
0093efba5a3afae93dcd2664a8a54a8306cb538b 12-Jul-2016 Wei Jia <wjia@google.com> Merge "stagefright: Enhance MPEG4 writer/extractor to store/retrieve layer info" into nyc-mr1-dev
4dbff11975e737482537e1636051690188f3fbc4 08-Apr-2016 Praveen Chavan <pchavan@codeaurora.org> stagefright: Enhance MPEG4 writer/extractor to store/retrieve layer info

Store temporal layer-count in MP4 meta-keys.
Enhance MPEG4Extractor to parse layer-count and make it available in
file-meta.
For AVC, parse SVC-extension NALs (if available), to extract
the layer-id and make it avialble in buffer-meta.

Bug: 27596987
Change-Id: I84a8914b470a0aadec0e02692296b1915a6c776e
(cherry picked from commit 09c8bb3d3b01d213fb845cd9c24c5e18443d7626)
PEG4Extractor.cpp
PEG4Writer.cpp
vc_utils.cpp
nclude/avc_utils.h
80f78b773f92048944a850efb7b60629643370cd 06-Apr-2016 Praveen Chavan <pchavan@codeaurora.org> MPEG4Writer: Handle writing multiple NAL units in a video sample

Encoder may prepend extension NALs (eg: AVC SVC extension NAL
for temporal layer info) to the VCL NAL.
Look out for non-VCL NALUs preceeding the slice NALs and write
them out separately.
Search for a limited size since such NALs are of small size.

Bug: 27596987
Change-Id: I434c5252098faca99c0ee18e6bc5f43a67718eba
(cherry picked from commit 7941196cf2f21c1a59c5cb2e8b93bbb6f7ff463c)
PEG4Writer.cpp
5bbc0f0ac255265dcf1e5f8706f11b6805bb30b7 12-Jul-2016 Pawin Vongmasa <pawin@google.com> resolve merge conflicts of 23332cb to nyc-dev am: 978a6cd087 am: 801d27d4d7
am: 936a5d3bbd

Change-Id: Id69be5cafc56b00a09c32d335800a3a599a921ed
936a5d3bbd5ea7a2900507b2d92cd8d0c156f20c 12-Jul-2016 Pawin Vongmasa <pawin@google.com> resolve merge conflicts of 23332cb to nyc-dev am: 978a6cd087
am: 801d27d4d7

Change-Id: Ia47b1ee90468c097113eda182016010d616221dc
801d27d4d76aa040e83c9d9a2286909fd6661b88 12-Jul-2016 Pawin Vongmasa <pawin@google.com> resolve merge conflicts of 23332cb to nyc-dev
am: 978a6cd087

Change-Id: Ia48baac4feb85234666bcb8f1dca520aee92f729
5067160967972a942093e877260a83436dbd551b 12-Jul-2016 Pawin Vongmasa <pawin@google.com> resolve merge conflicts of 23332cb to nyc-dev
am: 978a6cd087

Change-Id: I150988dc1fa520fdc2036e966b68cc56a0c9511f
146380a099ba9ef30f26e5be069f0dc04a3444e6 12-Jul-2016 Robert Shih <robertshih@google.com> Merge \\"rtsp: check seq # after play response is parsed\\" into nyc-mr1-dev am: 43c913b660
am: fc3e047be9

Change-Id: Ib08b1ffa30504e097442dfa331ecc0c8a6991db0
978a6cd08746164ee1f37405d55e0f0bed8f8c24 12-Jul-2016 Pawin Vongmasa <pawin@google.com> resolve merge conflicts of 23332cb to nyc-dev

Change-Id: I6506243808ac2d76ff0dc25dcd44160c014b00c1
23332cb8a8f39ea5a294d2520919af918a727b82 12-Jul-2016 Pawin Vongmasa <pawin@google.com> resolve merge conflicts of 8fc0fd2 to mnc-dev am: 542a057a22 am: 76f2d69c07
am: 3dee060b80

Change-Id: I4b5c673ed4097e2aff140367f71dc7a61b8f992a
3dee060b809b092918435b8459e7c236286185cb 12-Jul-2016 Pawin Vongmasa <pawin@google.com> resolve merge conflicts of 8fc0fd2 to mnc-dev am: 542a057a22
am: 76f2d69c07

Change-Id: If47c4ba7629d06516845a0477b2ce3a0b1611d82
76f2d69c0712c4491206a224c1e7d1c60dc533da 12-Jul-2016 Pawin Vongmasa <pawin@google.com> resolve merge conflicts of 8fc0fd2 to mnc-dev
am: 542a057a22

Change-Id: I417fd8121614be354ae2e6bda0b3a85e70390878
542a057a2211f5946135dbd8ce3ba79c8a16f7ae 12-Jul-2016 Pawin Vongmasa <pawin@google.com> resolve merge conflicts of 8fc0fd2 to mnc-dev

Change-Id: I1935a500e1d7c1c95a2006f08c98d4d04fb9caba
8fc0fd206113f3ef1dbf865d78e84c9265bf8067 11-Jul-2016 Pawin Vongmasa <pawin@google.com> Impose a size bound for dynamically allocated tables in stbl. am: 583a012a9f am: 34519820bf am: 726010eb1f am: 7a9538cd36 am: 80fa0cde3f
am: e97d67a51c

Change-Id: I7b6aad59efd44d39d6658b9990c11e4f02f76a16
80fa0cde3f4fd8b7ae7c046fcc086ef421dee3de 11-Jul-2016 Pawin Vongmasa <pawin@google.com> Impose a size bound for dynamically allocated tables in stbl. am: 583a012a9f am: 34519820bf am: 726010eb1f
am: 7a9538cd36

Change-Id: I8e2bb6e6f42c8a9a094eafe3c618ed809eb4fd3b
7a9538cd36716c8263d3808edd58bc87cedd8492 11-Jul-2016 Pawin Vongmasa <pawin@google.com> Impose a size bound for dynamically allocated tables in stbl. am: 583a012a9f am: 34519820bf
am: 726010eb1f

Change-Id: Id4fd4a863d083b27286e7b3abf7897ca8f20b798
726010eb1ffee8dfb85ea2871b88eb793baccd0d 11-Jul-2016 Pawin Vongmasa <pawin@google.com> Impose a size bound for dynamically allocated tables in stbl. am: 583a012a9f
am: 34519820bf

Change-Id: Ie338b5b5c726137d173caa97e3a1b428d04d1837
fc3e047be994c07d06cdc56a827be6d3feb26226 11-Jul-2016 Robert Shih <robertshih@google.com> Merge \"rtsp: check seq # after play response is parsed\" into nyc-mr1-dev
am: 43c913b660

Change-Id: I02f32ec88669af26291cc048fc4a4a87b4458cb4
305836564b45b15dd25f95b2632391f188bb6d63 09-Jul-2016 Robert Shih <robertshih@google.com> rtsp: check seq # after play response is parsed

Bug: 29405982
Change-Id: I9218eaeb23046c29ae686ec0a698d53e134f0d4c
tsp/MyHandler.h
b2396a52aa1620a68bba4d776b136b03707f7556 06-Jul-2016 Ray Essick <essick@google.com> Fix corruption via buffer overflow in mediaserver

change unbound sprintf() to snprintf() so network-provided values
can't overflow the buffers.

Applicable to all K/L/M/N branches.

Bug: 25747670
Change-Id: Id6a5120c2d08a6fbbd47deffb680ecf82015f4f6
tsp/ASessionDescription.cpp
635127bc945ae3d9eddf8732a50f7ec2eddaa38c 08-Jul-2016 Hangyu Kuang <hkuang@google.com> Merge \\"media: Use libyuv for color conversion.\\" into nyc-mr1-dev am: ed61dd8752
am: a5cb3f08d5

Change-Id: Ib2bddfe8e0e7187e7b01515e8ab24b3ae62427db
a5cb3f08d5f14991f05749898d9a73e0666707b4 08-Jul-2016 Hangyu Kuang <hkuang@google.com> Merge \"media: Use libyuv for color conversion.\" into nyc-mr1-dev
am: ed61dd8752

Change-Id: Ibc87a02b1cb5481c9e73ce6ffba6a740db2c4b45
ed61dd87524387e9121bbf9633674ebd155ba85f 08-Jul-2016 Hangyu Kuang <hkuang@google.com> Merge "media: Use libyuv for color conversion." into nyc-mr1-dev
3e9bdaea722d9e4813f2dfe1e693e0f3d3663cdb 07-Jul-2016 Bryan Mawhinney <bryanmawhinney@google.com> Merge \\"Make MediaScanner extract \\"date taken\\" from videos, if present\\" into nyc-mr1-dev am: b343e0444a
am: 8d54707d1a

Change-Id: Iaa3da498d120d4069a7acf38523bd4828975fb90
8d54707d1a6219c9b28d851794de831579de3be3 07-Jul-2016 Bryan Mawhinney <bryanmawhinney@google.com> Merge \"Make MediaScanner extract \"date taken\" from videos, if present\" into nyc-mr1-dev
am: b343e0444a

Change-Id: Iad848bc71c8b6157256e03163bc72f85f2c7e92c
b343e0444a3420321c606a827347f18445d76385 07-Jul-2016 Bryan Mawhinney <bryanmawhinney@google.com> Merge "Make MediaScanner extract "date taken" from videos, if present" into nyc-mr1-dev
d36af484a8dd3bbaf7ed7de31852c9f802243392 07-Jul-2016 Hangyu Kuang <hkuang@google.com> media: Use libyuv for color conversion.

Only use libyuv for converting yuv420p to rgb565 now.

Bug:29870647
Change-Id: Ic9f51de78bb1cc9f13ae229b30af66db46ec9b42
related-to-bug:29197670
ndroid.mk
olorconversion/Android.mk
olorconversion/ColorConverter.cpp
a9642ff7f04aa0fbd9cbc47a5180d6cf193b91ea 01-Jul-2016 Lajos Molnar <lajos@google.com> Merge \\\"stagefright: use uniqueId to detect same surface for setSurface\\\" into nyc-dev am: ecc6049ec0 am: cabaa2cd25
am: 921d74fbbb

Change-Id: I6dd65d208ab973df187e9e00d385e773b0974296
921d74fbbb369f1c2a6553e5e2e256f445b59c3a 01-Jul-2016 Wei Jia <wjia@google.com> Merge \\"stagefright: use uniqueId to detect same surface for setSurface\\" into nyc-dev am: ecc6049ec0
am: cabaa2cd25

Change-Id: I163bb7b0c2092924ce8961564b41891e264a71c7
c524d2336022df90786cd627c92e34e5cfba954a 01-Jul-2016 Lajos Molnar <lajos@google.com> Merge \"stagefright: use uniqueId to detect same surface for setSurface\" into nyc-dev
am: ecc6049ec0

Change-Id: I59f712f7ee90fcdb0a8719504570d3dd1650cf18
cabaa2cd256372e737128dc878cdca0b5ad03704 01-Jul-2016 Lajos Molnar <lajos@google.com> Merge \"stagefright: use uniqueId to detect same surface for setSurface\" into nyc-dev
am: ecc6049ec0

Change-Id: Ia81ffff2e54f90f9861792df575951b054dec479
ecc6049ec039e8a917e3670fa030a267f7029e3e 01-Jul-2016 Wei Jia <wjia@google.com> Merge "stagefright: use uniqueId to detect same surface for setSurface" into nyc-dev
1f45624f74b615820fb330faf788ff2e5e6c8e0d 29-Jun-2016 Bryan Mawhinney <bryanmawhinney@google.com> Make MediaScanner extract "date taken" from videos, if present

Bug: 29530912
Change-Id: Ibb85243c3d225faff5f17ec545e395a2e00acd0a
tagefrightMediaScanner.cpp
b66664d23131a255f651737cc5e528a030c489c3 29-Jun-2016 Hangyu Kuang <hkuang@google.com> media: Optimize the thumbnail extraction by sending just one frame. am: 45edc1f700 am: bd794e2be0
am: bbe2c53497

Change-Id: I819ec0f35351dfaa071db9bcf47fd442992120ab
bbe2c53497e69144c91fa11baa0be34ad4328031 29-Jun-2016 Hangyu Kuang <hkuang@google.com> media: Optimize the thumbnail extraction by sending just one frame. am: 45edc1f700
am: bd794e2be0

Change-Id: I41e9a8aad8ef46e99a747107be4ef36857ad3f90
606d04145fd7d12968f0f69c9ea42732ca33ecee 29-Jun-2016 Hangyu Kuang <hkuang@google.com> media: Optimize the thumbnail extraction by sending just one frame.
am: 45edc1f700

Change-Id: I34e45b5dcb4910e6d5756957112aa9e1b7c8f975
bd794e2be050b0001c646c0b98e8a1d7eb1e9377 29-Jun-2016 Hangyu Kuang <hkuang@google.com> media: Optimize the thumbnail extraction by sending just one frame.
am: 45edc1f700

Change-Id: Iaef86ea97370c2e81e2b300e5dcf2c6a63a0fc5c
45edc1f7009a31b21bed7b25314778336f56bfbe 29-Jun-2016 Hangyu Kuang <hkuang@google.com> media: Optimize the thumbnail extraction by sending just one frame.

For thumbnail extraction, MedatadaRetriever only needs to send one frame. This
could lower the CPU usage in extreme usage case.

Bug: 29646892
Change-Id: I86454a58a266a2d8a256a812cd075e401ae778e9
tagefrightMetadataRetriever.cpp
efcafd9117a923d8321d4395b08e69e01d33bb8c 29-Jun-2016 Lajos Molnar <lajos@google.com> stagefright: reconnect to ANW on setup in non-output-meta mode am: 098446ae41 am: c58f76670d
am: 027a6a344f

Change-Id: I9a8cbeb9388c7e3fe6523fd06c2bed795806a457
027a6a344f9fde1d74e9b422e9793927a4f866f4 29-Jun-2016 Lajos Molnar <lajos@google.com> stagefright: reconnect to ANW on setup in non-output-meta mode am: 098446ae41
am: c58f76670d

Change-Id: Ice7e7d10d47e591b626a9ec5a0c15dc31433f7f3
fd75b28a114aeb5f4c02a3c5c8f41fc80051b354 29-Jun-2016 Lajos Molnar <lajos@google.com> stagefright: reconnect to ANW on setup in non-output-meta mode
am: 098446ae41

Change-Id: Ifd107e3eee5d0e38f1e4db75637ae25e78e07e76
c58f76670d68e57ff036cda3b4293a58b210a278 29-Jun-2016 Lajos Molnar <lajos@google.com> stagefright: reconnect to ANW on setup in non-output-meta mode
am: 098446ae41

Change-Id: I09ea4d3c1a245656dedea581328e5b73d18f18cf
1ad5b240bfd49aa918092dbdc18c1a24c5e6c3a4 04-Mar-2016 Wonsik Kim <wonsik@google.com> stagefright: move several static methods out of ACodec

Bug: 24761407
Change-Id: Ica1d0286b1e800f5d4d0f120c043c0a556dab4c2
Codec.cpp
mx/OMXUtils.cpp
mx/OMXUtils.h
ce4df5e534eb86748fe80c84efb6b7fc0b6b5b46 04-Mar-2016 Wonsik Kim <wonsik@google.com> stagefright: move MedaDefs from libstagefright to libmedia

Bug: 24761407
Change-Id: If4914340a645c6f3c14eea0c873c162926d72ca2
ndroid.mk
ediaDefs.cpp
odecs/avc/enc/Android.mk
odecs/avcdec/Android.mk
odecs/avcenc/Android.mk
odecs/flac/enc/Android.mk
odecs/g711/dec/Android.mk
odecs/gsm/dec/Android.mk
odecs/hevcdec/Android.mk
odecs/m4v_h263/dec/Android.mk
odecs/m4v_h263/enc/Android.mk
odecs/mp3dec/Android.mk
odecs/mpeg2dec/Android.mk
odecs/on2/dec/Android.mk
odecs/on2/enc/Android.mk
odecs/on2/h264dec/Android.mk
odecs/opus/dec/Android.mk
odecs/vorbis/dec/Android.mk
dfd6c6b050cc0cb6a7b4eb3b2b69716c7edaef84 16-Jun-2016 Wonsik Kim <wonsik@google.com> DO NOT MERGE stagefright: fix possible stack overflow in AVCC reassemble

Additionally, remove use of variable length array which is
non-standard in C++.

Bug: 29161888
Change-Id: Ifdc3e7435f2225214c053b13f3bfe71c7d0ff506
tils.cpp
7f554618e3091e7c0d6f8eced97d984c33aad08c 16-Jun-2016 Wonsik Kim <wonsik@google.com> DO NOT MERGE stagefright: fix possible stack overflow in AVCC reassemble

Additionally, remove use of variable length array which is
non-standard in C++.

Bug: 29161888
Change-Id: Ifdc3e7435f2225214c053b13f3bfe71c7d0ff506
tils.cpp
9fa97aeeb48e5c72275f5fe67d111a8a65d2d6d1 16-Jun-2016 Wonsik Kim <wonsik@google.com> DO NOT MERGE stagefright: fix possible stack overflow in AVCC reassemble

Additionally, remove use of variable length array which is
non-standard in C++.

Bug: 29161888
Change-Id: Ifdc3e7435f2225214c053b13f3bfe71c7d0ff506
tils.cpp
b9fa58afa4c7772fe3c4cfdea9e45bc85cf43537 28-Jun-2016 Lajos Molnar <lajos@google.com> stagefright: use uniqueId to detect same surface for setSurface

Bug: 29422927
Change-Id: I8b0105f87ca7e8ee745c60ab726b1dffbbd4aa87
ediaCodec.cpp
098446ae4100dfd989c452bb67133559aa892cd3 28-Jun-2016 Lajos Molnar <lajos@google.com> stagefright: reconnect to ANW on setup in non-output-meta mode

BufferQueue now needs reconnect to allow dequeuing all buffers from
a BufferQueue.
Use getConsumerName instead of connect failure to detect that we
are connecting to the same surface.

Bug: 29422927
Change-Id: I4fc4d1ec9fd452ec027cab60b06e4af88d53d830
Codec.cpp
ediaCodec.cpp
urfaceUtils.cpp
38f56e4b988b0fadbf12970b3d69bd3f84da6263 28-Jun-2016 Hangyu Kuang <hkuang@google.com> Merge \\"media: set correct mode if both capture and playback rate are set.\\" into nyc-mr1-dev am: d023a7707f
am: 6851089a7e

Change-Id: I48f692ae2db06a08c5ad24602564ae60abc19bd7
6851089a7eb9e76fe30de0de98ddd32b36c39095 28-Jun-2016 Hangyu Kuang <hkuang@google.com> Merge \"media: set correct mode if both capture and playback rate are set.\" into nyc-mr1-dev
am: d023a7707f

Change-Id: I61be6e2b08da37bfb7b018641d5eb49f4d8633fa
d023a7707fe551817fb3f7539f68a388b3381f41 28-Jun-2016 Hangyu Kuang <hkuang@google.com> Merge "media: set correct mode if both capture and playback rate are set." into nyc-mr1-dev
5a4a0a1e4a44b8e48aff8e74df56d37dc6d7129c 24-Jun-2016 Hangyu Kuang <hkuang@google.com> media: set correct mode if both capture and playback rate are set.

This will avoid the recording operate in slow motion/time-lapse mode even
if capture rate and playback rate diff a little bit.

Bug:28313712
Change-Id: I7b50c6eacbde4189a4d0d76f95861dd029991685
mx/GraphicBufferSource.cpp
b856ef5c45c9e17a3529b1bbc6e349a2902b3317 27-Jun-2016 Robert Shih <robertshih@google.com> SoftMP3: memset safely

Bug: 29422022
Change-Id: I70c9e33269d16bf8c163815706ac24e18e34fe97
odecs/mp3dec/SoftMP3.cpp
odecs/mp3dec/SoftMP3.h
583a012a9fce81162b163d3533e2644d4abad88a 22-Jun-2016 Pawin Vongmasa <pawin@google.com> Impose a size bound for dynamically allocated tables in stbl.

Impose a restriction of 200MiB for tables in stsc, stts, ctts and stss
boxes. Also change mTimeToSample from Vector to array.

Bug: 29367429
Change-Id: I953bea9fe0590268cf27376740f582dc88563d42
ampleTable.cpp
nclude/SampleTable.h
a5ad0383f56b9d4ae31875f6d10f4d9c2d97921a 22-Jun-2016 Wonsik Kim <wonsik@google.com> Merge \\\\\\"Revert \\\\\\"Impose a size bound for dynamically allocated tables in stbl.\\\\\\"\\\\\\" into klp-dev am: 7e6bd6a911 am: 3ad7688745 am: 9d65d13cc7 am: 4ef5122525 am: 77d31bde26
am: b53ba5e7a6

Change-Id: I72a7f15894380adabfc21e017abac88b6fe26348
77d31bde26ba5c3c986fce1dcfa94a2727253f49 22-Jun-2016 Wonsik Kim <wonsik@google.com> Merge \\\\"Revert \\\\"Impose a size bound for dynamically allocated tables in stbl.\\\\"\\\\" into klp-dev am: 7e6bd6a911 am: 3ad7688745 am: 9d65d13cc7
am: 4ef5122525

Change-Id: Ib0106bbe2ffba8de744907a2714eedf207756abe
4ef5122525e0ce7a4d3e16bb07c295340a813b00 22-Jun-2016 Wonsik Kim <wonsik@google.com> Merge \\\"Revert \\\"Impose a size bound for dynamically allocated tables in stbl.\\\"\\\" into klp-dev am: 7e6bd6a911 am: 3ad7688745
am: 9d65d13cc7

Change-Id: Ib8d8f9c58c1ffb169cf488d57fb841f80a664e97
9d65d13cc7c207d4ef877df2834d4fbac74741ad 22-Jun-2016 Wonsik Kim <wonsik@google.com> Merge \\"Revert \\"Impose a size bound for dynamically allocated tables in stbl.\\"\\" into klp-dev am: 7e6bd6a911
am: 3ad7688745

Change-Id: I02de46ed2ce14428a45826270b557426ee2aaf47
7e6bd6a911c5eba7b36b9b01804dd4d00132a175 22-Jun-2016 Wonsik Kim <wonsik@google.com> Merge "Revert "Impose a size bound for dynamically allocated tables in stbl."" into klp-dev
66c4dbb96c38630d0cd6551fc8c9bf8fa3318903 22-Jun-2016 Wonsik Kim <wonsik@google.com> Revert "Impose a size bound for dynamically allocated tables in stbl."

This reverts commit 25e029746796fe88e82417fb01af2e27b8bbadb2.

Change-Id: I91225838a8be72a3cd413f2bcb99e7dca7e62929
ampleTable.cpp
nclude/SampleTable.h
5fa433b8c9ff7d415f5fb1ebefe0d989a7d11432 22-Jun-2016 Wonsik Kim <wonsik@google.com> Merge \\\\\\"Impose a size bound for dynamically allocated tables in stbl.\\\\\\" into klp-dev am: 8f73edb22a am: a263248bf0 am: 4c969bf93f am: 7e06799472 am: fcb008b743
am: 26dc0a2a91

Change-Id: Ic91093f89dad5ada3f6997b7dff1557e726099c4
fcb008b74333b63074144198e1f069473ce5fda0 22-Jun-2016 Wonsik Kim <wonsik@google.com> Merge \\\\"Impose a size bound for dynamically allocated tables in stbl.\\\\" into klp-dev am: 8f73edb22a am: a263248bf0 am: 4c969bf93f
am: 7e06799472

Change-Id: I4c877fcf9839e44ca849d25f46ba55f74cd0064e
7e06799472dd93f3c4e33807ab41256e75287291 22-Jun-2016 Pawin Vongmasa <pawin@google.com> Merge \\\"Impose a size bound for dynamically allocated tables in stbl.\\\" into klp-dev am: 8f73edb22a am: a263248bf0
am: 4c969bf93f

Change-Id: I6258bac89bbe02e47b3c912df26f26033d7b76b4
4c969bf93f71e394de3aa8b08f0ed0f96c48379d 22-Jun-2016 Wonsik Kim <wonsik@google.com> Merge \\"Impose a size bound for dynamically allocated tables in stbl.\\" into klp-dev am: 8f73edb22a
am: a263248bf0

Change-Id: I0389073f6b18450edc8fa70ed3ec72683a166915
8f73edb22a30260a2f4f7946fbedd3fd3005c5b6 22-Jun-2016 Wonsik Kim <wonsik@google.com> Merge "Impose a size bound for dynamically allocated tables in stbl." into klp-dev
25e029746796fe88e82417fb01af2e27b8bbadb2 22-Jun-2016 Pawin Vongmasa <pawin@google.com> Impose a size bound for dynamically allocated tables in stbl.

Impose a restriction of 200MiB for tables in stsc, stts, ctts and stss
boxes. Also change Vector to std::vector for efficiency and consistency.

Bug: 29367429
Change-Id: I175da524612b9fe68496c612966af51f01a5cd5e
ampleTable.cpp
nclude/SampleTable.h
7eebfad940afe9c6254626f13999793ad000023e 22-Jun-2016 Eino-Ville Talvala <etalvala@google.com> Merge \\\"DO NOT MERGE: Camera: Adjust pointers to ANW buffers to avoid infoleak\\\" into mnc-dev am: f0dc08a910 am: 6a2589182d
am: 94763125c7

Change-Id: Ie3fe053c51741c4e80c42b03bd09ee017d4ffbac
94763125c781f59fa774015abce0954368f19d08 22-Jun-2016 Eino-Ville Talvala <etalvala@google.com> Merge \\"DO NOT MERGE: Camera: Adjust pointers to ANW buffers to avoid infoleak\\" into mnc-dev am: f0dc08a910
am: 6a2589182d

Change-Id: Id1e326911bebf1d9ef732eb45faa4119cd83d541
5c1f01675ca0f4f231f206fc7fe64d353592f726 22-Jun-2016 Eino-Ville Talvala <etalvala@google.com> Merge \\"DO NOT MERGE: Camera: Adjust pointers to ANW buffers to avoid infoleak\\" into klp-dev am: 22d6575710
am: 4bec033ded

Change-Id: I68dd7d3ea94b10104c235007fd03230ef5ae0146
6a2589182db02a101a43c0ebcab5b5b9d7d5e082 22-Jun-2016 Eino-Ville Talvala <etalvala@google.com> Merge \"DO NOT MERGE: Camera: Adjust pointers to ANW buffers to avoid infoleak\" into mnc-dev
am: f0dc08a910

Change-Id: I1ce29159fdfc1fe343e91df11d804902720bdcbf
22d65757103e46bef8c6902ea08c84a775b62a0b 21-Jun-2016 Eino-Ville Talvala <etalvala@google.com> Merge "DO NOT MERGE: Camera: Adjust pointers to ANW buffers to avoid infoleak" into klp-dev
f0dc08a910e4e50d1b3b98d1195509a05798dcaf 21-Jun-2016 Eino-Ville Talvala <etalvala@google.com> Merge "DO NOT MERGE: Camera: Adjust pointers to ANW buffers to avoid infoleak" into mnc-dev
f832feb17bd70f84417dc468f573792caf99a127 21-Jun-2016 Eino-Ville Talvala <etalvala@google.com> Merge "DO NOT MERGE: Camera: Adjust pointers to ANW buffers to avoid infoleak" into lmp-dev
f49f1613e14532dd9f9bda7cde66796cba91b8b6 21-Jun-2016 Wonsik Kim <wonsik@google.com> DO NOT MERGE omx: check buffer port before using am: ac26fe3ae7 am: c3e02bb7b0
am: 211f082537

Change-Id: Icabca10af4b243a52fd8ad10428add6f9ae67f1d
211f08253735a1525155d1d8f7fea9ba37ee5a0a 21-Jun-2016 Wonsik Kim <wonsik@google.com> DO NOT MERGE omx: check buffer port before using am: ac26fe3ae7
am: c3e02bb7b0

Change-Id: Id0fb0b675046eb794956ffeb37d1ecd53ac7bc42
8b35cb563de25a0b5f743de2eeb385a87e95ca6c 21-Jun-2016 Wonsik Kim <wonsik@google.com> Merge \\"DO NOT MERGE omx: check buffer port before using\\" into klp-dev am: 5713902f6a
am: 1410b5034f

Change-Id: Ib6d17c24784c51a7301094d69a08d13693a1dd16
c3e02bb7b0b498bab8278797159c971d39c2ca0e 21-Jun-2016 Wonsik Kim <wonsik@google.com> DO NOT MERGE omx: check buffer port before using
am: ac26fe3ae7

Change-Id: I2de3d6296b3b6e287909ebd5f451076e7ac7c7cd
1323780a4e7d8146aa90829ee982f1dca81e298d 21-Jun-2016 Wonsik Kim <wonsik@google.com> resolve merge conflicts of bce0a92 to nyc-mr1-dev-plus-aosp
am: d53e3ba7c7

Change-Id: I54ffe73680cbc0721a05f8fbc94c1dc9cbf9c1fd
d53e3ba7c75cb7ae82702294475a1f85d19aea9f 21-Jun-2016 Wonsik Kim <wonsik@google.com> resolve merge conflicts of bce0a92 to nyc-mr1-dev-plus-aosp

Change-Id: I94f7a7be4ceff016c9779c2898ad3dd8ab1f41b2
79c139a492bdf2977cf07d6faaf1b0268c1026da 21-Jun-2016 Eino-Ville Talvala <etalvala@google.com> DO NOT MERGE: Camera: Adjust pointers to ANW buffers to avoid infoleak

Subtract address of a random static object from pointers being routed
through app process.

Bug: 28466701
Change-Id: Idcbfe81e9507433769672f3dc6d67db5eeed4e04
ameraSource.cpp
54fc49c9f5ac06ea3c21cfe05a00f36c7df91b3f 21-Jun-2016 Eino-Ville Talvala <etalvala@google.com> DO NOT MERGE: Camera: Adjust pointers to ANW buffers to avoid infoleak

Subtract address of a random static object from pointers being routed
through app process.

Bug: 28466701
Change-Id: Idcbfe81e9507433769672f3dc6d67db5eeed4e04
ameraSource.cpp
7a3de84808f700615816397acc7c7927987bab6e 21-Jun-2016 Eino-Ville Talvala <etalvala@google.com> DO NOT MERGE: Camera: Adjust pointers to ANW buffers to avoid infoleak

Subtract address of a random static object from pointers being routed
through app process.

Bug: 28466701
Change-Id: Idcbfe81e9507433769672f3dc6d67db5eeed4e04
ameraSource.cpp
bff5b5a8bb44754e0b51631527de1c49ab7e5a43 20-Jun-2016 Wonsik Kim <wonsik@google.com> resolve merge conflicts of fd15c3f to nyc-dev-plus-aosp

Change-Id: If72b6d7e2985787aa0ba1baf00952524721396c7
bce0a92466d957226b52a69548b5108225ab0159 21-Jun-2016 Wonsik Kim <wonsik@google.com> Merge \"omx: check buffer port before using\" into nyc-dev
am: fd15c3fac9

Change-Id: I7b2a031d4de1ccc48227605efe4e297203ddc3f4
fd15c3fac93c2be5e038a6fa684ca293a8e07af7 21-Jun-2016 Wonsik Kim <wonsik@google.com> Merge "omx: check buffer port before using" into nyc-dev
cb76af124c655e7cd02403c1170df653e3355ef5 25-May-2016 Wonsik Kim <wonsik@google.com> DO NOT MERGE omx: check buffer port before using

Bug: 28816827
Change-Id: I3d5bad4a1ef96dec544b05bb31cc6f7109aae0a5
mx/OMXNodeInstance.cpp
719fd3c0625705777f1ef0667005b111733c2e0b 25-May-2016 Wonsik Kim <wonsik@google.com> DO NOT MERGE omx: check buffer port before using

Bug: 28816827
Change-Id: I3d5bad4a1ef96dec544b05bb31cc6f7109aae0a5
nclude/OMXNodeInstance.h
mx/OMXNodeInstance.cpp
ac26fe3ae73b102b0d50720072dc83b143adeb22 25-May-2016 Wonsik Kim <wonsik@google.com> DO NOT MERGE omx: check buffer port before using

Bug: 28816827
Change-Id: I3d5bad4a1ef96dec544b05bb31cc6f7109aae0a5
nclude/OMXNodeInstance.h
mx/OMXNodeInstance.cpp
ab46eeef8de8c6e1d87c7001ac05800d13b4e610 16-Jun-2016 Wonsik Kim <wonsik@google.com> stagefright: fix possible stack overflow in AVCC reassemble

Additionally, remove use of variable length array which is
non-standard in C++.

Bug: 29161888
Change-Id: Ifdc3e7435f2225214c053b13f3bfe71c7d0ff506
tils.cpp
d12e72f5fdd85dae0e8b2d966cb1ae6505798333 16-Jun-2016 Robert Shih <robertshih@google.com> Merge \\\"HLS: allow audio/subtitles to appear after bitrate variants\\\" into nyc-dev am: 37a9de26f6 am: 0d088dede1
am: 6c79585c46

Change-Id: I3ab2f6e940e98585fc794112865b20c29cd23ae7
6c79585c46c246b9b072d6f1d0c5babca46c8ac7 16-Jun-2016 Robert Shih <robertshih@google.com> Merge \\"HLS: allow audio/subtitles to appear after bitrate variants\\" into nyc-dev am: 37a9de26f6
am: 0d088dede1

Change-Id: I04d1847d59433d7203c6fa99577809e581cf691e
2dd124980b4d90daae60127eec56a88bda7e417b 16-Jun-2016 Robert Shih <robertshih@google.com> Merge \"HLS: allow audio/subtitles to appear after bitrate variants\" into nyc-dev
am: 37a9de26f6

Change-Id: I5356d5635752da90bd101a64c958e8355bac6816
0d088dede12e7bb646665918687c5bd77e7d3a26 16-Jun-2016 Robert Shih <robertshih@google.com> Merge \"HLS: allow audio/subtitles to appear after bitrate variants\" into nyc-dev
am: 37a9de26f6

Change-Id: Idb61d08e5b880dd6c788df71b86f5db0a52bb05d
37a9de26f6403955a19b81ce5ffe87998e9bf46e 16-Jun-2016 Robert Shih <robertshih@google.com> Merge "HLS: allow audio/subtitles to appear after bitrate variants" into nyc-dev
2dbccf8f9178e138e23a68060cc0680be0ed4289 15-Jun-2016 Jean-Michel Trivi <jmtrivi@google.com> Merge "AAC decoder supports ER-AAC-Scalable"
3916e8995d87138825664f166d1df4ec148bda8a 15-Jun-2016 Hangyu Kuang <hkuang@google.com> media: Mediarecorder drops the mediabuffer with negative adjusted timestamp. am: 901ca36bf0
am: 9c9e44a965

Change-Id: I3ebf3116f567b2f94416a0a671481856145aa5b6
9c9e44a9654287866a9a972688b5363f18198bc9 15-Jun-2016 Hangyu Kuang <hkuang@google.com> media: Mediarecorder drops the mediabuffer with negative adjusted timestamp.
am: 901ca36bf0

Change-Id: I349546e2a2d3c6eb6bc6f0f1b2b1c521e25c7650
901ca36bf02726ca07d83820c93c76d696549a03 14-Jun-2016 Hangyu Kuang <hkuang@google.com> media: Mediarecorder drops the mediabuffer with negative adjusted timestamp.

In some rare cases, mediabuffer's adjusted timestamp may become negative due to
the extra delay adjustment at the beginning of start/resume. Drop the buffer in
these cases.

Bug: 29165056
Change-Id: Id8f68c188e76c9c077d41ff9901452f5aeb02d2a
ediaCodecSource.cpp
579e412d461085f43d7da7eda0358fce95d92406 15-Jun-2016 Craig Donner <cdonner@google.com> Merge \\\"Revert \\\"Handle lock() returning a NULL buffer in SurfaceUtils.\\\"\\\" into nyc-dev am: 6aa63c2905 am: dbeeac039e
am: 87dc1524b1

Change-Id: I9826ef824def2424f6a75b1f8696ffdc14847154
87dc1524b1c40469b38859caec5dacc7e457d2ad 15-Jun-2016 Craig Donner <cdonner@google.com> Merge \\"Revert \\"Handle lock() returning a NULL buffer in SurfaceUtils.\\"\\" into nyc-dev am: 6aa63c2905
am: dbeeac039e

Change-Id: I8b9a0f7347d56bc63dd20b036006e54f89273c4f
ffefa2e507219a7b84e9209da53efd801d02ea8b 15-Jun-2016 Craig Donner <cdonner@google.com> Merge \"Revert \"Handle lock() returning a NULL buffer in SurfaceUtils.\"\" into nyc-dev
am: 6aa63c2905

Change-Id: I9252fdc41d2dd0842591b16861eb3289bf8165f4
6aa63c2905bb5cbdd0c1c87071e14a0c4185e693 15-Jun-2016 Craig Donner <cdonner@google.com> Merge "Revert "Handle lock() returning a NULL buffer in SurfaceUtils."" into nyc-dev
6dc88629f3c457b4980d7af6ee1a4a9b211b20a7 14-Jun-2016 Craig Donner <cdonner@google.com> Revert "Handle lock() returning a NULL buffer in SurfaceUtils."

This reverts commit 9193bcd60728bac0d5c2059ed2dc878231509c3a.

Bug: 28526999
Change-Id: I1b2fdd591d1d7a006691d961f4f165270a03285c
urfaceUtils.cpp
af464030d7f0a1d97eb308a06a873b7320f86aa9 11-Jun-2016 Robert Shih <robertshih@google.com> HLS: allow audio/subtitles to appear after bitrate variants

i.e. allow EXT-X-MEDIA to appear after EXT-X-STREAM-INF.

Bug: 29266320
Change-Id: I080a64672a768efdc63abdb9892b8fdd97ffc56f
ttplive/M3UParser.cpp
525e238025bef747531794ab8671cd7f0548cde6 11-Jun-2016 Marco Nelissen <marcone@google.com> Merge \\\\\\\\\\\"SoftAAC2: fix crash on all-zero adts buffer\\\\\\\\\\\" into lmp-dev am: 5979fb9ea9 am: 6f16bd8a7c am: 2b10519836 am: b232a6be76 am: fa35d94564 am: 96deca7752 am: 12d3f3801d am: 6cd7aa7349 am: 54aaaae60f am: 87765026fe
am: 6a5d01aa06

Change-Id: I6923ecebc3b8ea424c27d98af74c0247b1c068d4
87765026fec265d4eae6b298992af28728378e30 11-Jun-2016 Marco Nelissen <marcone@google.com> Merge \\\\\\\\\"SoftAAC2: fix crash on all-zero adts buffer\\\\\\\\\" into lmp-dev am: 5979fb9ea9 am: 6f16bd8a7c am: 2b10519836 am: b232a6be76 am: fa35d94564 am: 96deca7752 am: 12d3f3801d am: 6cd7aa7349
am: 54aaaae60f

Change-Id: Id5109e2f59b2badc596b7cf2729e68b2eb6c2f82
54aaaae60f248a033ddec8d7333f2d1796ef8f79 11-Jun-2016 Marco Nelissen <marcone@google.com> Merge \\\\\\\\"SoftAAC2: fix crash on all-zero adts buffer\\\\\\\\" into lmp-dev am: 5979fb9ea9 am: 6f16bd8a7c am: 2b10519836 am: b232a6be76 am: fa35d94564 am: 96deca7752 am: 12d3f3801d
am: 6cd7aa7349

Change-Id: Id252d1cb02445a5881bd48b212e092ac13a3610a
6cd7aa734985d0dc3771170142b5cf69b80de601 11-Jun-2016 Marco Nelissen <marcone@google.com> Merge \\\\\\\"SoftAAC2: fix crash on all-zero adts buffer\\\\\\\" into lmp-dev am: 5979fb9ea9 am: 6f16bd8a7c am: 2b10519836 am: b232a6be76 am: fa35d94564 am: 96deca7752
am: 12d3f3801d

Change-Id: I78c074c3dad04f4ffb8182361b44b45363a35c6b
12d3f3801d46fbe977c79aa8cb6f352cafa90707 11-Jun-2016 Marco Nelissen <marcone@google.com> Merge \\\\\\"SoftAAC2: fix crash on all-zero adts buffer\\\\\\" into lmp-dev am: 5979fb9ea9 am: 6f16bd8a7c am: 2b10519836 am: b232a6be76 am: fa35d94564
am: 96deca7752

Change-Id: I136001e8650fc5c2497a732d870100c9240c4cfd
96deca775286319147ee51fca78e6eef82a2618c 11-Jun-2016 Marco Nelissen <marcone@google.com> Merge \\\\\"SoftAAC2: fix crash on all-zero adts buffer\\\\\" into lmp-dev am: 5979fb9ea9 am: 6f16bd8a7c am: 2b10519836 am: b232a6be76
am: fa35d94564

Change-Id: I96dbf48acb3344b68dfb3562e2c9ed5517fa505f
fa35d9456414757565eeee848adff1868b0971a1 11-Jun-2016 Marco Nelissen <marcone@google.com> Merge \\\\"SoftAAC2: fix crash on all-zero adts buffer\\\\" into lmp-dev am: 5979fb9ea9 am: 6f16bd8a7c am: 2b10519836
am: b232a6be76

Change-Id: I7f87144778601d7d0050aeaf741d556058da2f67
b232a6be76eaf9aaa99ec180a6ed2f91fe56429a 11-Jun-2016 Marco Nelissen <marcone@google.com> Merge \\\"SoftAAC2: fix crash on all-zero adts buffer\\\" into lmp-dev am: 5979fb9ea9 am: 6f16bd8a7c
am: 2b10519836

Change-Id: I52e689739e5b2d0d328b8cfcb3dc346d0f6266f4
fad42aa98d692c5fd830f7c61b4eb9faf4f7cdca 11-Jun-2016 Marco Nelissen <marcone@google.com> Merge \\"DO NOT MERGE SoftAAC2: fix crash on all-zero adts buffer\\" into klp-dev am: dc7357d201
am: 7e6001b97d

Change-Id: I405712eeccacfe73708b571dd7242ee9eeb96715
6f16bd8a7c4c5d32751d6796912b8c1605161419 11-Jun-2016 Marco Nelissen <marcone@google.com> Merge \"SoftAAC2: fix crash on all-zero adts buffer\" into lmp-dev
am: 5979fb9ea9

Change-Id: Iec42eb1541358d69a2a541ac65efb4c287486bf9
5979fb9ea906697efc0b5ee9d9fd030b549a85fb 11-Jun-2016 Marco Nelissen <marcone@google.com> Merge "SoftAAC2: fix crash on all-zero adts buffer" into lmp-dev
dc7357d20175fadfabd903370094917408bf6e3e 11-Jun-2016 Marco Nelissen <marcone@google.com> Merge "DO NOT MERGE SoftAAC2: fix crash on all-zero adts buffer" into klp-dev
eef1485f4202ee23811b4ca5619f38506e1be5bc 10-Jun-2016 Marco Nelissen <marcone@google.com> Merge \\\\\\"SoftHEVC: Exit gracefully in case of decoder errors\\\\\\" into mnc-dr-dev am: 56317f8d65 am: b13e845dbd am: 2d1be7fe04 am: ef3efe5ab4 am: 075a815a46
am: c77d5d5a45

Change-Id: Ia3972c80c93fdce5bb053bd48608cc10f9e4b89e
075a815a463252d0ed5cfb95d1271eb4605eebe5 10-Jun-2016 Marco Nelissen <marcone@google.com> Merge \\\\"SoftHEVC: Exit gracefully in case of decoder errors\\\\" into mnc-dr-dev am: 56317f8d65 am: b13e845dbd am: 2d1be7fe04
am: ef3efe5ab4

Change-Id: I13bd5ffbbc8119a956eae98c3808d39afd7b89b3
ef3efe5ab414e3ebba7ff74472a32316a7a3a03e 10-Jun-2016 Harish Mahendrakar <harish.mahendrakar@ittiam.com> Merge \\\"SoftHEVC: Exit gracefully in case of decoder errors\\\" into mnc-dr-dev am: 56317f8d65 am: b13e845dbd
am: 2d1be7fe04

Change-Id: I68ef3d1aae802c9ca32cdf182e6f2d8be5398a83
2d1be7fe04452b22a7593cae6cc7077b4936d267 10-Jun-2016 Marco Nelissen <marcone@google.com> Merge \\"SoftHEVC: Exit gracefully in case of decoder errors\\" into mnc-dr-dev am: 56317f8d65
am: b13e845dbd

Change-Id: Id7a6cf3e6619d87e4657332050b91d4c58cb6494
b13e845dbd6909d38f0b23b84168c2e08552fd83 10-Jun-2016 Harish Mahendrakar <harish.mahendrakar@ittiam.com> Merge \"SoftHEVC: Exit gracefully in case of decoder errors\" into mnc-dr-dev
am: 56317f8d65

Change-Id: I2e84595cd8d51b54667cab5810769d4b76d7942f
56317f8d652d805603c271890ff299a685cb2815 10-Jun-2016 Marco Nelissen <marcone@google.com> Merge "SoftHEVC: Exit gracefully in case of decoder errors" into mnc-dr-dev
4cd06c8f3507e3dc4a732fb4cefe3d135fe69e68 12-Oct-2015 Harish Mahendrakar <harish.mahendrakar@ittiam.com> SoftHEVC: Exit gracefully in case of decoder errors

Exit for error in allocation and unsupported resolutions

Bug: 28816956

Change-Id: Ieb830bedeb3a7431d1d21a024927df630f7eda1e
odecs/hevcdec/SoftHEVC.cpp
96dc1e905bde29e1647dec51f819870aff67ea4a 09-Jun-2016 Lajos Molnar <lajos@google.com> Merge \\\"stagefright: do not use default bitrates in MPEG4Writer\\\" into nyc-dev am: eb6dbc646e am: 1d92e72075
am: 2174352a0f

Change-Id: I12ca26050546c399d6f9493309923da017840806
1d92e720753e2890495547629de57000f9677fe2 09-Jun-2016 Lajos Molnar <lajos@google.com> Merge \"stagefright: do not use default bitrates in MPEG4Writer\" into nyc-dev
am: eb6dbc646e

Change-Id: I4d0bab387bc2184dc2d510c1f8bb2e3ff4b8749f
eb6dbc646eb9162fb29ed9fb93aa3b7f19384702 09-Jun-2016 TreeHugger Robot <treehugger-gerrit@google.com> Merge "stagefright: do not use default bitrates in MPEG4Writer" into nyc-dev
f858b4ee1ae61a283008f1d52d491979a8d24ef5 09-Jun-2016 Marco Nelissen <marcone@google.com> Fix potential overflow am: d0090759e7 am: f5d9360be0 am: 08cb85206a am: 20062e9ea6 am: 999c3ea23b am: 7f4bf86afd am: 356a30b4cb am: 9da2f9de13 am: 24a01b2940 am: aae6e3a42a am: 6b478e2c56 am: e358e2190a am: babbe31cee
am: a4bd4462be

Change-Id: I02fbc5af2a88fcc39e4ecbcfb3ffa68700868c5d
babbe31cee8fd5360265c02e307209db172fcca5 09-Jun-2016 Marco Nelissen <marcone@google.com> Fix potential overflow am: d0090759e7 am: f5d9360be0 am: 08cb85206a am: 20062e9ea6 am: 999c3ea23b am: 7f4bf86afd am: 356a30b4cb am: 9da2f9de13 am: 24a01b2940 am: aae6e3a42a am: 6b478e2c56
am: e358e2190a

Change-Id: I00146c97c05de6056c795c72f0db95ec17a036c3
e358e2190aa61e5d8e28b1df698a82eecd47ead2 09-Jun-2016 Marco Nelissen <marcone@google.com> Fix potential overflow am: d0090759e7 am: f5d9360be0 am: 08cb85206a am: 20062e9ea6 am: 999c3ea23b am: 7f4bf86afd am: 356a30b4cb am: 9da2f9de13 am: 24a01b2940 am: aae6e3a42a
am: 6b478e2c56

Change-Id: I8de38ccee100e5f363292f24c8375e05726a154d
6b478e2c566c12d400affc35f102807ef29fc1d3 09-Jun-2016 Marco Nelissen <marcone@google.com> Fix potential overflow am: d0090759e7 am: f5d9360be0 am: 08cb85206a am: 20062e9ea6 am: 999c3ea23b am: 7f4bf86afd am: 356a30b4cb am: 9da2f9de13 am: 24a01b2940
am: aae6e3a42a

Change-Id: I28d63b8c78ff29758876768f130f4058e7819d59
aae6e3a42a7e7c1d5f8943f729c27bbf6331cd8c 09-Jun-2016 Marco Nelissen <marcone@google.com> Fix potential overflow am: d0090759e7 am: f5d9360be0 am: 08cb85206a am: 20062e9ea6 am: 999c3ea23b am: 7f4bf86afd am: 356a30b4cb am: 9da2f9de13
am: 24a01b2940

Change-Id: I835afe7c9e08551455058bbc62fdafb81471e1d1
24a01b29408a87edb0a9b3fad53391b2432e10a0 09-Jun-2016 Marco Nelissen <marcone@google.com> Fix potential overflow am: d0090759e7 am: f5d9360be0 am: 08cb85206a am: 20062e9ea6 am: 999c3ea23b am: 7f4bf86afd am: 356a30b4cb
am: 9da2f9de13

Change-Id: Id52dd25e53e7bf403c3f70fb4b83153ba3e5382a
9da2f9de13e10e72577cbdd6d803bbcbb37cdc5d 09-Jun-2016 Marco Nelissen <marcone@google.com> Fix potential overflow am: d0090759e7 am: f5d9360be0 am: 08cb85206a am: 20062e9ea6 am: 999c3ea23b am: 7f4bf86afd
am: 356a30b4cb

Change-Id: I1e3fe7bb9f204f6938137eca2bada8bd5cd2e8c8
356a30b4cb964d98b90d39774e3aed17c3a2991a 09-Jun-2016 Marco Nelissen <marcone@google.com> Fix potential overflow am: d0090759e7 am: f5d9360be0 am: 08cb85206a am: 20062e9ea6 am: 999c3ea23b
am: 7f4bf86afd

Change-Id: Ic47ed961eca9156e10e960e912e8b98c5485ebe5
999c3ea23b8369cd710524055cca4ec282a332c6 09-Jun-2016 Marco Nelissen <marcone@google.com> Fix potential overflow am: d0090759e7 am: f5d9360be0 am: 08cb85206a
am: 20062e9ea6

Change-Id: I3b1984feedd189530b4cae5719b181aac29fd6ee
20062e9ea6f406bb2e4f5bbbee0845f8fd81eab4 09-Jun-2016 Marco Nelissen <marcone@google.com> Fix potential overflow am: d0090759e7 am: f5d9360be0
am: 08cb85206a

Change-Id: I200011cb9c9c4a71ec71e856bc3d4dd7fdd971b6
08cb85206ab65cc2b9df372e4ae5f75c331ae7a1 09-Jun-2016 Marco Nelissen <marcone@google.com> Fix potential overflow am: d0090759e7
am: f5d9360be0

Change-Id: Ia936e59f80f6a24e449d0aee453956e3be29033a
96bdf620189622005e83b4f1421c4f25b7fa1729 09-Jun-2016 Lajos Molnar <lajos@google.com> stagefright: do not use default bitrates in MPEG4Writer

- this fails the muxer tests that verify that all metadata received
from the extractor was muxed properly.
- instead, propagate bitrate to encoder output formats, so muxer
will have this data during normal processing.

Bug: 29208170
Change-Id: If327d472e3607997840a8d601a453dbb7c625c95
Codec.cpp
PEG4Writer.cpp
ca88ff028bd66db97157270e933e918ef5877c39 09-Jun-2016 Jean-Michel Trivi <jmtrivi@google.com> AAC decoder supports ER-AAC-Scalable

Add OMX_AUDIO_AACObjectER_Scalable in the list of AAC profiles
supported by the FDK AAC decoder wrapper to indicate it supports
ER-AAC-Scalable.

Bug 29221608

Change-Id: Ibef1f868f90f803c92939965def05d7e3217d56f
odecs/aacdec/SoftAAC2.cpp
d85c4490b26d9fcefd32757a624cc4f6fdeb7e84 09-Jun-2016 Marco Nelissen <marcone@google.com> DO NOT MERGE SoftAAC2: fix crash on all-zero adts buffer

Bug: 29153599
Change-Id: Ieb70a90cf31927165de7a840bfdd3ee2c76f4cbd
odecs/aacdec/SoftAAC2.cpp
315ac4a8700bc2d8a1da12b94f3a29e887632ce0 08-Jun-2016 Marco Nelissen <marcone@google.com> SoftAAC2: fix crash on all-zero adts buffer

Bug: 29153599
Change-Id: I1cb81c054098b86cf24f024f8479909ca7bc85a6
odecs/aacdec/SoftAAC2.cpp
1d3490f0d0072b3c5ce4b28a491e77c13aa33869 08-Jun-2016 Marco Nelissen <marcone@google.com> Merge \\\\"Fix undefined behavior\\\\" am: fbd40d6690 am: a636873dca am: 0c39e52f03
am: 85c8bb2fb4

Change-Id: Ia7acaa02910cbeff487833c4e9bf3bdb8cf1787c
0c39e52f03a8020bc17d72a1deb5ef31e61ea53a 08-Jun-2016 Marco Nelissen <marcone@google.com> Merge \\"Fix undefined behavior\\" am: fbd40d6690
am: a636873dca

Change-Id: Ie90ec8966692afc211977d51eb197b1b3fc766b4
f47c471d74f7f7565bd46305a5c14bd1c4daa96b 08-Jun-2016 Marco Nelissen <marcone@google.com> Fix undefined behavior

Bug: 26932980
Change-Id: Id526f47e02d2bc7eb55becc36acac0549c588e61
odecs/amrwbenc/inc/basic_op.h
d0090759e79208d7203280166018bb7d5d4f9d02 08-Jun-2016 Marco Nelissen <marcone@google.com> Fix potential overflow

Bug: 28533562
Change-Id: I798ab24caa4c81f3ba564cad7c9ee019284fb702
odecs/on2/h264dec/source/h264bsd_dpb.c
81d1c1b8e43e26530d4a611a6bb4e3ec573fe97a 04-Jun-2016 Marco Nelissen <marcone@google.com> Merge "Turn off signed integer overflow checking for amrwbenc" into nyc-dev am: 596e81bc4f am: 725c7852e9
am: f58e1f63e1

* commit 'f58e1f63e1dd11b42c0f18e5a2ba5d9bbc55281c':
Turn off signed integer overflow checking for amrwbenc

Change-Id: Ic1b5340c0c106cc4da7a52107c9493f076cdb9d4
401d5d291c159b9ecebe3c6587a908d4f9a9bb57 04-Jun-2016 Hangyu Kuang <hkuang@google.com> Merge "media: Advertise SoftAAC decoder\'s profiles." into nyc-dev am: 156c6cb4b5 am: 89fdae2dce
am: 5bbb4078e3

* commit '5bbb4078e3539675ee46f6b6dff459cbaefd6236':
media: Advertise SoftAAC decoder's profiles.

Change-Id: I35358342c46b49324d3233bb337056cfe88294a8
f58e1f63e1dd11b42c0f18e5a2ba5d9bbc55281c 04-Jun-2016 Marco Nelissen <marcone@google.com> Merge "Turn off signed integer overflow checking for amrwbenc" into nyc-dev am: 596e81bc4f
am: 725c7852e9

* commit '725c7852e952f22edfc3c7d3fda67933cac56999':
Turn off signed integer overflow checking for amrwbenc

Change-Id: I26452180f7e1755883bc0b6bc9e57efdd1eb0f57
5bbb4078e3539675ee46f6b6dff459cbaefd6236 04-Jun-2016 Hangyu Kuang <hkuang@google.com> Merge "media: Advertise SoftAAC decoder\'s profiles." into nyc-dev am: 156c6cb4b5
am: 89fdae2dce

* commit '89fdae2dced9f7bfb46e52f5e81d8a4e5bce231d':
media: Advertise SoftAAC decoder's profiles.

Change-Id: I232996f753a14efd23a3e453ebf912905177e890
3832a6fc827ab7c580117e0cdaff8bb914629d51 03-Jun-2016 Marco Nelissen <marcone@google.com> Merge "Turn off signed integer overflow checking for amrwbenc" into nyc-dev
am: 596e81bc4f

* commit '596e81bc4f32f8a205b4885c03b240b90e7ef090':
Turn off signed integer overflow checking for amrwbenc

Change-Id: Ia5fe0abfe412c500b279711075346e5739da9cf8
596e81bc4f32f8a205b4885c03b240b90e7ef090 03-Jun-2016 Marco Nelissen <marcone@google.com> Merge "Turn off signed integer overflow checking for amrwbenc" into nyc-dev
d18c298df9ce7adf85ef57c8cc7caa6c5c7945fc 03-Jun-2016 Chien-Yu Chen <cychen@google.com> Merge "Camera3Device: Prepare video stream for high speed" into nyc-dev
am: 156c6cb4b5

* commit '156c6cb4b56c9ecb9116b0aa8f506307da29b764':
media: Advertise SoftAAC decoder's profiles.

Change-Id: I7e55089508a7732cb6ba380bcd0af85f57d55ef0
156c6cb4b56c9ecb9116b0aa8f506307da29b764 03-Jun-2016 Hangyu Kuang <hkuang@google.com> Merge "media: Advertise SoftAAC decoder's profiles." into nyc-dev
89334a07cb379c003f626471e4358d7cef99b00a 03-Jun-2016 Hangyu Kuang <hkuang@google.com> media: Advertise SoftAAC decoder's profiles.

bug: 29087598
Change-Id: I59325706c133f6a0fb531a66d8225ed17934e6f0
Related-to-bug: 28671284
odecs/aacdec/SoftAAC2.cpp
cd1dce9f04579468e93ca01e9300696611fde7f8 17-May-2016 Marco Nelissen <marcone@google.com> Fix yet more overflows in amrwbenc

Bug: 28786034
Change-Id: I619e63df93a562a1e3b017d07a8414776a00b855
odecs/amrwbenc/src/convolve.c
odecs/amrwbenc/src/pitch_f4.c
odecs/amrwbenc/src/voAMRWBEnc.c
732009216ddee6c52aba50a89c047085555b9ff8 28-Apr-2016 Marco Nelissen <marcone@google.com> Fix more potential overflows in amrwbenc

Bug: 28268307
Change-Id: Ibe32bee8c73950e3a9cae13bd4b516f9c7428673
odecs/amrwbenc/src/c4t64fx.c
5c93a0655224f4865275a264792ec72384593049 07-Apr-2016 Marco Nelissen <marcone@google.com> Fix AMRWBEnc overflow

Bug: 27898843
Change-Id: Ib36833020e9203ef5e8acf18fdde900c0f102978
odecs/amrwbenc/src/voAMRWBEnc.c
252f1911d2c26701d8342c77cdfa02c7e10d94a2 30-Mar-2016 Marco Nelissen <marcone@google.com> Fix AMRWBEnc overflow

Bug: 27898843
Change-Id: Ibb3506bcfc315b5c816892ba65e157db8ea3fdbe
odecs/amrwbenc/src/voAMRWBEnc.c
41eca4f0ec697529fe8a47f34f43f5ba98a50162 25-May-2016 Wonsik Kim <wonsik@google.com> omx: check buffer port before using

Bug: 28816827
Change-Id: I3d5bad4a1ef96dec544b05bb31cc6f7109aae0a5
nclude/OMXNodeInstance.h
mx/OMXNodeInstance.cpp
20d62aae49e76fc49476378b80ef31d0f4931120 03-Jun-2016 Wei Jia <wjia@google.com> Merge "RTSP: add timeout scheme to handle error cases." into nyc-dev am: 4cf0436f20 am: 87aaf95200
am: e5d7a16e90

* commit 'e5d7a16e90599e882d6ee074cff116e92f4e5c12':
RTSP: add timeout scheme to handle error cases.

Change-Id: I2002a8ab6fb75bc693a5f96f753600ae605436a1
87aaf952004af6ae2b226202b3a24d63999b9aef 03-Jun-2016 Wei Jia <wjia@google.com> Merge "RTSP: add timeout scheme to handle error cases." into nyc-dev
am: 4cf0436f20

* commit '4cf0436f204a4f67debfb7c0022cf7100232c8db':
RTSP: add timeout scheme to handle error cases.

Change-Id: I931ba2872c01bd738ddf0f2db245b875e43fc528
4cf0436f204a4f67debfb7c0022cf7100232c8db 03-Jun-2016 Wei Jia <wjia@google.com> Merge "RTSP: add timeout scheme to handle error cases." into nyc-dev
1708655d68ca9b9800461fe90eed04e38bcfae20 03-Jun-2016 Marco Nelissen <marcone@google.com> Turn off signed integer overflow checking for amrwbenc

which also requires turning off NEON code generation.

Bug: 28992582
Change-Id: I740adefc3f80ac8f66f72d289413d786fc39900c
odecs/amrwbenc/Android.mk
f30460b886b233033ffd30c71614bedc24bed79e 02-Jun-2016 Wei Jia <wjia@google.com> RTSP: add timeout scheme to handle error cases.

Bug: 25473740
Change-Id: Iaba720e5fc26e12028ea8c949c6c2e464d790bbc
tsp/MyHandler.h
47f19e28a15742064ca02fbff49ad93b1d768df3 02-Jun-2016 Hangyu Kuang <hkuang@google.com> Merge "DO NOT MERGE Codecs: Fix EOS handling in soft codecs" into nyc-dev
ad1f50968680dadff590cecf7eec195278a780ab 02-Jun-2016 Lajos Molnar <lajos@google.com> Merge changes Ie3033144,Ib4008117 into nyc-dev am: 6fae62de61 am: 28fc2e570a
am: 831fe19440

* commit '831fe19440eab08f361538f427af6d8b4cd88ff6':
WebmWriter: respect track add order
WebmWriter: do not crash on missing format keys

Change-Id: I2245440657072343627ab9476e78025592b0f08f
28fc2e570a7c93ca38ea5c0d687a7d99ef59395e 02-Jun-2016 Lajos Molnar <lajos@google.com> Merge changes Ie3033144,Ib4008117 into nyc-dev
am: 6fae62de61

* commit '6fae62de61f2315ed43935682b59fe8a5d936cef':
WebmWriter: respect track add order
WebmWriter: do not crash on missing format keys

Change-Id: I869c7ab08db4c9e9600d6504f94e3419d628b29e
6fae62de61f2315ed43935682b59fe8a5d936cef 02-Jun-2016 TreeHugger Robot <treehugger-gerrit@google.com> Merge changes Ie3033144,Ib4008117 into nyc-dev

* changes:
WebmWriter: respect track add order
WebmWriter: do not crash on missing format keys
43c8d86d375c3dfe0118429f508be609bfb8ba89 02-Jun-2016 Wei Jia <wjia@google.com> Merge "RTSP: correctly discard stale access unit after seeking." into nyc-dev am: 505abca79e am: 10e6cadd16
am: a4a489d2d1

* commit 'a4a489d2d11efab2f4d28bbe19dd7f26a4b58283':
RTSP: correctly discard stale access unit after seeking.

Change-Id: I8add7324d8982be75a06861f501accd5cb307ad7
10e6cadd16c9f789025cb113f403c98242c5a03b 02-Jun-2016 Wei Jia <wjia@google.com> Merge "RTSP: correctly discard stale access unit after seeking." into nyc-dev
am: 505abca79e

* commit '505abca79edc7e5e4fcf308ea08745128658ae6d':
RTSP: correctly discard stale access unit after seeking.

Change-Id: Idc102041176d1362686b40c17a6386c5aa3be325
505abca79edc7e5e4fcf308ea08745128658ae6d 02-Jun-2016 Wei Jia <wjia@google.com> Merge "RTSP: correctly discard stale access unit after seeking." into nyc-dev
dca28baf748dc7e6fa9adbaea55f46abca94bc17 02-Jun-2016 Lajos Molnar <lajos@google.com> Merge "stagefright: fix some issues with mkv HDR info conversions" into nyc-dev am: 4c05d48b94 am: 5cd0deb850
am: 6ae82450f5

* commit '6ae82450f5f7c3ea180db02adc4c074020e3c143':
stagefright: fix some issues with mkv HDR info conversions

Change-Id: I80e1cd82e5c3075bf7b05f02bf79a8e38d86283c
bf194d8ea70156a05d0b2fb4ffceceb38528aa44 02-Jun-2016 Lajos Molnar <lajos@google.com> Merge "stagefright: propagate vorbis, opus and vp9 csd to muxer" into nyc-dev am: cdb740a05c am: 34029dd804
am: 58ad26146b

* commit '58ad26146b45d28bfca194b549e81e48e8a54112':
stagefright: propagate vorbis, opus and vp9 csd to muxer

Change-Id: Id20da2881cb681b0eaef633c3f87ff1b77a517b8
5cd0deb85089d788736dde346e2d9887478f8d71 02-Jun-2016 Lajos Molnar <lajos@google.com> Merge "stagefright: fix some issues with mkv HDR info conversions" into nyc-dev
am: 4c05d48b94

* commit '4c05d48b9492364fc7369beefa29980ee28956ee':
stagefright: fix some issues with mkv HDR info conversions

Change-Id: I0981b8ad7896663e9c4a7ff9b1a02161b6a8d631
34029dd804be74afab0559af713775037dc9dcf7 02-Jun-2016 Lajos Molnar <lajos@google.com> Merge "stagefright: propagate vorbis, opus and vp9 csd to muxer" into nyc-dev
am: cdb740a05c

* commit 'cdb740a05c38406d3dbf4c9e894b22784eef9ce7':
stagefright: propagate vorbis, opus and vp9 csd to muxer

Change-Id: I56b92399acba0819a909bfe2b5a80928cf0d1a75
2bae6deec84016b9caaffcb536534820c47b12d2 01-Jun-2016 Lajos Molnar <lajos@google.com> WebmWriter: respect track add order

Add tracks to container in the order the client added them.

Bug: 28931391
Change-Id: Ie303314495ee596b8e3fa03b4c3e51b62b699cc0
ebm/WebmWriter.cpp
ebm/WebmWriter.h
9c876499f869af4010b8fcdca2d9f316a8a91123 01-Jun-2016 Lajos Molnar <lajos@google.com> WebmWriter: do not crash on missing format keys

Bug: 28931391
Change-Id: Ib4008117c60d4ad8badd23da6c72b36db5072db1
ebm/WebmWriter.cpp
4c05d48b9492364fc7369beefa29980ee28956ee 02-Jun-2016 TreeHugger Robot <treehugger-gerrit@google.com> Merge "stagefright: fix some issues with mkv HDR info conversions" into nyc-dev
cdb740a05c38406d3dbf4c9e894b22784eef9ce7 02-Jun-2016 TreeHugger Robot <treehugger-gerrit@google.com> Merge "stagefright: propagate vorbis, opus and vp9 csd to muxer" into nyc-dev
d971f83dda9605b1dcd05746b94d2800ebd8595c 26-May-2016 Harish Mahendrakar <harish.mahendrakar@ittiam.com> DO NOT MERGE Codecs: Fix EOS handling in soft codecs

When EOS is sent along with non-zero length input buffer and if decoder
was still not producing output, due to initial latency, then decoder
would not produce any output. For eg. When only one input buffer with EOS
set is sent to the decoder, decoder was not producing any output.

Applies for SoftHEVC, SoftAVC and SoftMpeg2 decoders.

Bug: 28965335

Change-Id: Ic3a3bb479f9612042afcf02e6fda05c63ce84d70
odecs/avcdec/SoftAVCDec.cpp
odecs/hevcdec/SoftHEVC.cpp
odecs/mpeg2dec/SoftMPEG2.cpp
52d033a88094c0fefc20ef47f2232d7eb027dca7 02-Jun-2016 Hangyu Kuang <hkuang@google.com> Merge "media: Add a workaround to tolerate the CSD buffer sent to VP8 decoder." into nyc-dev am: 71a2b51601 am: 33b99d6668
am: 37f9ca6ce4

* commit '37f9ca6ce4ff4decbae8b5d9c2e2c385b1fde567':
media: Add a workaround to tolerate the CSD buffer sent to VP8 decoder.

Change-Id: I69f031b6ba0e0999214720df156a21658f00cbd6
33b99d666892632c7f07f773c7eb5d5ea3f7fd06 01-Jun-2016 Hangyu Kuang <hkuang@google.com> Merge "media: Add a workaround to tolerate the CSD buffer sent to VP8 decoder." into nyc-dev
am: 71a2b51601

* commit '71a2b51601cd990b98458b37760c2347ce70cff7':
media: Add a workaround to tolerate the CSD buffer sent to VP8 decoder.

Change-Id: I659448aab5da0a5f7d23d8dec9a720e0acb06bee
0aeffde14aceec3272dcbd3d835d4a8663e8b745 01-Jun-2016 Wei Jia <wjia@google.com> RTSP: correctly discard stale access unit after seeking.

Bug: 25473740
Change-Id: I1e1db355516790fa71026805d76300836f704bb4
tsp/MyHandler.h
d218dde936336037026cb45ff5f5748caf73f4f9 01-Jun-2016 Lajos Molnar <lajos@google.com> stagefright: propagate vorbis, opus and vp9 csd to muxer

Bug: 28931391
Change-Id: I9c09fa852e9b79ee4200a2582da97c937123c45b
tils.cpp
ebm/WebmElement.cpp
12c703291529dd19bb83579f1e3b33ecb444340d 01-Jun-2016 Lajos Molnar <lajos@google.com> stagefright: fix some issues with mkv HDR info conversions

- use mkvparser enumeration names
- correctly detect presence of primaries information

Bug: 28931391
Bug: 28671284
Change-Id: I7179a2b59d20c675a118e52520bad715742fd546
atroska/MatroskaExtractor.cpp
ebm/WebmConstants.h
ebm/WebmElement.cpp
5a25d9382cc96f56c6f178c11313eb26ad7000cc 01-Jun-2016 Hangyu Kuang <hkuang@google.com> media: Add a workaround to tolerate the CSD buffer sent to VP8 decoder.

Bug:28689536
Change-Id: I83f696c912dda8273e74c1ff0c68a8007f42b465
odecs/on2/dec/SoftVPX.cpp
9edcac9e6621330bfc7ae5226eac4e64627ba761 28-May-2016 Marco Nelissen <marcone@google.com> Merge "Fix integer overflows" into nyc-dev am: 65f611a0e9 am: 4fd0eb7f66
am: e2cca7baaf

* commit 'e2cca7baaf17de5c46aa6019148b2dc5e512a038':
Fix integer overflows

Change-Id: I0e7a3be561ffba87443fc2d3d47dc46e7d1cd40f
56e44320a4a72849dbcf3577237bb97889e7f1fe 28-May-2016 Lajos Molnar <lajos@google.com> ACodec: track crop and data space for each output graphic buffer am: fe73b95aae am: 27ae987f00
am: ea45d3d838

* commit 'ea45d3d8380225523d1c8b53a96db8f4b3314c53':
ACodec: track crop and data space for each output graphic buffer

Change-Id: I2e7ce09470374080c5130ecca59283adbbed263c
e2cca7baaf17de5c46aa6019148b2dc5e512a038 28-May-2016 Marco Nelissen <marcone@google.com> Merge "Fix integer overflows" into nyc-dev am: 65f611a0e9
am: 4fd0eb7f66

* commit '4fd0eb7f66775783db79741fb70ca0c7d024c0f1':
Fix integer overflows

Change-Id: Ifb0335aae93b960ad1913030755c81461e2ab2ac
ea45d3d8380225523d1c8b53a96db8f4b3314c53 28-May-2016 Lajos Molnar <lajos@google.com> ACodec: track crop and data space for each output graphic buffer am: fe73b95aae
am: 27ae987f00

* commit '27ae987f0067b7adbf0ef28f723b14d8111fd1c9':
ACodec: track crop and data space for each output graphic buffer

Change-Id: I5ee7cf89fc5fce605f87e9fe46143481c617d310
29cc033c02a995e1d02a353627dfe93231239352 28-May-2016 Marco Nelissen <marcone@google.com> Merge "Fix integer overflows" into nyc-dev
am: 65f611a0e9

* commit '65f611a0e99133244f77c853495083733444b231':
Fix integer overflows

Change-Id: I3f5b4ed769aab0e61b47e2f2849edba4dee0a4b6
c79c77bccf09eb6ea12c76e8554ff0c9261908df 28-May-2016 Lajos Molnar <lajos@google.com> ACodec: track crop and data space for each output graphic buffer
am: fe73b95aae

* commit 'fe73b95aaef79ad312d9dfdb6c8873bd50c6c19e':
ACodec: track crop and data space for each output graphic buffer

Change-Id: I981a3aa4739e02ee2335f3a90a0c5f14c6c16581
65f611a0e99133244f77c853495083733444b231 28-May-2016 Marco Nelissen <marcone@google.com> Merge "Fix integer overflows" into nyc-dev
0bdc87aafc5dfe094680c0c7e77131ac20c22a84 27-May-2016 Marco Nelissen <marcone@google.com> Fix integer overflows

Bug: 28938657
Change-Id: I85382a13db254169b03b284568469f0627869021
vc_utils.cpp
664ecd1e28bf8f397f4735d30cc288c9b6f80e72 27-May-2016 Harish Mahendrakar <harish.mahendrakar@ittiam.com> Merge "Codecs: Fix EOS handling in soft codecs" am: 3156b5dc70 am: b46b3b7d0f am: 714a433c87
am: c095bbf00d

* commit 'c095bbf00d8764b3b4ba52bfa2523cea17cab808':
Codecs: Fix EOS handling in soft codecs

Change-Id: I873f6c2e2b3b923207b83b2a8a56c7833cd13f92
714a433c874f8607b6bc7d127e4d83915259c74f 27-May-2016 Harish Mahendrakar <harish.mahendrakar@ittiam.com> Merge "Codecs: Fix EOS handling in soft codecs" am: 3156b5dc70
am: b46b3b7d0f

* commit 'b46b3b7d0f949a1cc1da0a998749415fa861f10d':
Codecs: Fix EOS handling in soft codecs

Change-Id: Ib3056b91a268bf69ebae61d8eb26f1e6d97d8163
8a53462baebeba84397dcd645e43c99bbc4dc21e 27-May-2016 Lajos Molnar <lajos@google.com> stagefright: fix PPS packaging into AVCC am: 7d58810be4 am: 47134b584c
am: a09e52e065

* commit 'a09e52e065af1c16bfb784add678554adc7f4e81':
stagefright: fix PPS packaging into AVCC

Change-Id: I64ac013868df548b1a9fddcae59e95cec9a95060
fe73b95aaef79ad312d9dfdb6c8873bd50c6c19e 27-May-2016 Lajos Molnar <lajos@google.com> ACodec: track crop and data space for each output graphic buffer

- This prevents issues if buffers are rendered out of order, or
if output surface changes during use.
- Remember last crop and data space for native window to avoid
constantly setting them for each frame.

Bug: 28692500
Change-Id: Ie0d771c83007aad585d9db6c0c26fff8b9ed696e
Codec.cpp
47134b584cc0d1104ffae413a5dea836491ae5db 27-May-2016 Lajos Molnar <lajos@google.com> stagefright: fix PPS packaging into AVCC
am: 7d58810be4

* commit '7d58810be46a86fa5c66d6d53d2453a5accc76f8':
stagefright: fix PPS packaging into AVCC

Change-Id: I586d571da83487db7f2ba96571346a2e9fb2ca71
7d58810be46a86fa5c66d6d53d2453a5accc76f8 27-May-2016 Lajos Molnar <lajos@google.com> stagefright: fix PPS packaging into AVCC

Bug: 28943869
Change-Id: Iefe9ef3ec4ec4fe31cd5b0e90f1796130f8e9302
tils.cpp
0faa814f89c91e69fbaff16f68ebc5ce9df4e0dd 26-May-2016 Harish Mahendrakar <harish.mahendrakar@ittiam.com> Codecs: Fix EOS handling in soft codecs

When EOS is sent along with non-zero length input buffer and if decoder
was still not producing output, due to initial latency, then decoder
would not produce any output. For eg. When only one input buffer with EOS
set is sent to the decoder, decoder was not producing any output.

Applies for SoftHEVC, SoftAVC and SoftMpeg2 decoders.

Bug: 28965335

Change-Id: Ic3a3bb479f9612042afcf02e6fda05c63ce84d70
odecs/avcdec/SoftAVCDec.cpp
odecs/hevcdec/SoftHEVC.cpp
odecs/mpeg2dec/SoftMPEG2.cpp
11acf7cfad5437c5e8c86a5181877ae4bd1ddd95 26-May-2016 Lajos Molnar <lajos@google.com> Merge "stagefright: move all codecs into codec process unless excluded" into nyc-dev am: 77404e1a89 am: 597c1c00b7
am: 7ae0cf3863

* commit '7ae0cf38633fa75863aac14013591e55c95d5d42':
stagefright: move all codecs into codec process unless excluded

Change-Id: Ib2bcb26bd6cb10f973561d66f2a61ab433785e4c
7ae0cf38633fa75863aac14013591e55c95d5d42 26-May-2016 Lajos Molnar <lajos@google.com> Merge "stagefright: move all codecs into codec process unless excluded" into nyc-dev am: 77404e1a89
am: 597c1c00b7

* commit '597c1c00b7c2ca10800ecd1c08b5988db72a93ba':
stagefright: move all codecs into codec process unless excluded

Change-Id: I581a35646f3bb749946f9c809becb5eb93a25f5e
7f43c0e9761cbaf7f696600d2988713b7b23b094 26-May-2016 Lajos Molnar <lajos@google.com> stagefright: fix profile handling for HDR streams am: 127a749a59 am: f2ea420b9b
am: 17a7780819

* commit '17a77808196ffd1a225e09dc62820a865d8a34a2':
stagefright: fix profile handling for HDR streams

Change-Id: Ia4f96bde8e0a9b0eced73a08e3ac453ba3f55f47
d0b2548c6fa8c61822fc9d0dfdca998df1c2e072 26-May-2016 Lajos Molnar <lajos@google.com> Merge "stagefright: move all codecs into codec process unless excluded" into nyc-dev
am: 77404e1a89

* commit '77404e1a890060a9cb4da017b660e6554fdc9a6f':
stagefright: move all codecs into codec process unless excluded

Change-Id: I89975ff6eeee0d554ec564520e64e3748dcc6976
f2ea420b9b2afa0b858ac4f3138e381437cd9e50 26-May-2016 Lajos Molnar <lajos@google.com> stagefright: fix profile handling for HDR streams
am: 127a749a59

* commit '127a749a59b1953cb0601f1806c0a0eee92baea9':
stagefright: fix profile handling for HDR streams

Change-Id: Ice6e4649ebbe12f3cbc04326d20c067dce747715
77404e1a890060a9cb4da017b660e6554fdc9a6f 26-May-2016 TreeHugger Robot <treehugger-gerrit@google.com> Merge "stagefright: move all codecs into codec process unless excluded" into nyc-dev
de76068b9bbb6eabc6854e07e6c2d6cf4284d1df 26-May-2016 Lajos Molnar <lajos@google.com> stagefright: determine if an HEVC file is HDR am: 72061e5ab5 am: b22037e06e
am: 0010ac6c17

* commit '0010ac6c17a6d196a236678200c5deb8724a2ab6':
stagefright: determine if an HEVC file is HDR

Change-Id: I154712e0712b6874bb50f842c641974e77ecccca
b22037e06e15027d374f71ce7bdc89c9189b2a28 26-May-2016 Lajos Molnar <lajos@google.com> stagefright: determine if an HEVC file is HDR
am: 72061e5ab5

* commit '72061e5ab52d12c17054aeffbb2299a002b6b53a':
stagefright: determine if an HEVC file is HDR

Change-Id: Idf5747c525ea666c9b8c4c82dd4d9833fb1f4448
1276efd3a0d7b44b2117a66d035d75487dcf5c3e 26-May-2016 Lajos Molnar <lajos@google.com> stagefright: move all codecs into codec process unless excluded

This policy can be turned off by setting the media.stagefright.less-secure
system property to true.

Bug: 22775369
Change-Id: I3f4ff780a615c7fd5fede0ad94c044aec79c7686
MXClient.cpp
2bcf125fb4423976a5402d16772a19bf805fcbb8 26-May-2016 Lajos Molnar <lajos@google.com> Merge "stagefrights: propagate bitrate to muxers" into nyc-dev am: 70bdd112d8 am: efb957f08c
am: ad3889cfb4

* commit 'ad3889cfb4a6b71fb81558455d0cc392a2be8d82':
stagefrights: propagate bitrate to muxers

Change-Id: I635815038f8c270778f2c2ad80daaab820b293b2
89fcf61f2c19fab7c00bda939d6aa1a7392c3561 26-May-2016 Lajos Molnar <lajos@google.com> Merge "stagefright: fix hdr/color metadata handling for .mkv files" into nyc-dev am: 1048f0fdeb am: 2ffdc0bdd4
am: 3f87ac40ee

* commit '3f87ac40eeba5105c67ac035647122b32ddcc572':
stagefright: fix hdr/color metadata handling for .mkv files

Change-Id: I7b79d58c127f35735c30e7f551e99d8a6b09317e
e34b92afb85d71a9c167b58d30aad47ef4a9a98e 26-May-2016 Lajos Molnar <lajos@google.com> Merge changes Ia03716ca,If3d6c8fd into nyc-dev am: 2008b88e58 am: 1d92ce2f68
am: b444ba0530

* commit 'b444ba053072505be521b673719a2a9a4966c996':
stagefright: do not fail on bad bitstreams in HevcParameterSets
stagefright: add safe versions of parseUE and parseSE

Change-Id: Ib121be32a645c19cc72a483d2723e8f6d832af4c
127a749a59b1953cb0601f1806c0a0eee92baea9 25-May-2016 Lajos Molnar <lajos@google.com> stagefright: fix profile handling for HDR streams

Bug: 28671284
Change-Id: Ic7f3b7906f437aec94b0488b480d89a49b404f96
tils.cpp
72061e5ab52d12c17054aeffbb2299a002b6b53a 25-May-2016 Lajos Molnar <lajos@google.com> stagefright: determine if an HEVC file is HDR

Bug: 28671284
Change-Id: Ib567a75c2df759bfef4335d91fd6786946cfee82
evcUtils.cpp
nclude/HevcUtils.h
efb957f08c5c76d6e88a63bd42deefde9efb07c7 26-May-2016 Lajos Molnar <lajos@google.com> Merge "stagefrights: propagate bitrate to muxers" into nyc-dev
am: 70bdd112d8

* commit '70bdd112d885a0e9a3ff2d1d08b2dee990f1f568':
stagefrights: propagate bitrate to muxers

Change-Id: Id8a7bd67a5829ac84c7387e8f62df5d56e797a08
70bdd112d885a0e9a3ff2d1d08b2dee990f1f568 26-May-2016 TreeHugger Robot <treehugger-gerrit@google.com> Merge "stagefrights: propagate bitrate to muxers" into nyc-dev
2ffdc0bdd49dfe4e1578cd3c845904e3e06b5940 26-May-2016 Lajos Molnar <lajos@google.com> Merge "stagefright: fix hdr/color metadata handling for .mkv files" into nyc-dev
am: 1048f0fdeb

* commit '1048f0fdebadd16307dddaf0dd297e7340858218':
stagefright: fix hdr/color metadata handling for .mkv files

Change-Id: I8a45c61a7788e2346c148e4b124d50da748a2c3a
1d92ce2f6876fdb304ddc6b24dea926fbd470238 26-May-2016 Lajos Molnar <lajos@google.com> Merge changes Ia03716ca,If3d6c8fd into nyc-dev
am: 2008b88e58

* commit '2008b88e582b821307201b9c959d2a3819aaa678':
stagefright: do not fail on bad bitstreams in HevcParameterSets
stagefright: add safe versions of parseUE and parseSE

Change-Id: I47f6b29438a5433b08f0dd42cd2ca2884c535832
1048f0fdebadd16307dddaf0dd297e7340858218 26-May-2016 TreeHugger Robot <treehugger-gerrit@google.com> Merge "stagefright: fix hdr/color metadata handling for .mkv files" into nyc-dev
ad91cd24427222dccd90487fba5fef7e9400b5c4 25-May-2016 Lajos Molnar <lajos@google.com> stagefrights: propagate bitrate to muxers

Also enforce max-bitrate >= bitrate.

Bug: 28931391
Change-Id: I64987cda62277f8fe47a89a3360bbeb77cc818d9
tils.cpp
d637d296bb0954756d3d231633fad73fadd70316 25-May-2016 Lajos Molnar <lajos@google.com> stagefright: fix hdr/color metadata handling for .mkv files

This is needed for proper VP9 profile detection

Bug: 28671284
Change-Id: Ief313c9635462db7157988d7446e40f54e4cada7
tils.cpp
atroska/MatroskaExtractor.cpp
atroska/MatroskaExtractor.h
ebm/WebmConstants.h
ebm/WebmElement.cpp
ebm/WebmElement.h
ebm/WebmWriter.cpp
266eacc66e8977c6baf0935bf35b8e74cf89b510 25-May-2016 Wei Jia <wjia@google.com> resolve merge conflicts of 823bd74 to lmp-mr1-dev am: 67ca3caf10 am: 6b52fd6b67 am: f4285f22bf am: 87406db29c am: 5f44938fe9
am: ff8818df6f

* commit 'ff8818df6f6bd07f80b9426af23a5f377e5843d6':
MPEG4Extractor: ensure kKeyTrackID exists before creating an MPEG4Source as track.

Change-Id: Ib96a7f164ba4846f33737f3388ea0c242af38636
ff8818df6f6bd07f80b9426af23a5f377e5843d6 25-May-2016 Wei Jia <wjia@google.com> resolve merge conflicts of 823bd74 to lmp-mr1-dev am: 67ca3caf10 am: 6b52fd6b67 am: f4285f22bf am: 87406db29c
am: 5f44938fe9

* commit '5f44938fe991e19dd694a08c5e8911a9ffa2670b':
MPEG4Extractor: ensure kKeyTrackID exists before creating an MPEG4Source as track.

Change-Id: I961243ce29ba0296ad9aad927424cc67b39489e3
5f44938fe991e19dd694a08c5e8911a9ffa2670b 25-May-2016 Wei Jia <wjia@google.com> resolve merge conflicts of 823bd74 to lmp-mr1-dev am: 67ca3caf10 am: 6b52fd6b67 am: f4285f22bf
am: 87406db29c

* commit '87406db29c09e16df8f0d82dd0547d3fb953ab92':
MPEG4Extractor: ensure kKeyTrackID exists before creating an MPEG4Source as track.

Change-Id: I6f37992a285efbc2fa08da3b0f6e6f0fecb52b07
87406db29c09e16df8f0d82dd0547d3fb953ab92 25-May-2016 Wei Jia <wjia@google.com> resolve merge conflicts of 823bd74 to lmp-mr1-dev am: 67ca3caf10 am: 6b52fd6b67
am: f4285f22bf

* commit 'f4285f22bfe47791a1d21eaa28a4afce23f47c8d':
MPEG4Extractor: ensure kKeyTrackID exists before creating an MPEG4Source as track.

Change-Id: I71b691a769641d3e3137b4fd954d784d073b9074
f4285f22bfe47791a1d21eaa28a4afce23f47c8d 25-May-2016 Wei Jia <wjia@google.com> resolve merge conflicts of 823bd74 to lmp-mr1-dev am: 67ca3caf10
am: 6b52fd6b67

* commit '6b52fd6b673c44afc6fe57e85ef8b6994ea84659':
MPEG4Extractor: ensure kKeyTrackID exists before creating an MPEG4Source as track.

Change-Id: I0e66a037649b0000c90c91b40af6eb587362c00b
67ca3caf10929022b2b742b49a88ff1238d3bbe7 25-May-2016 Wei Jia <wjia@google.com> resolve merge conflicts of 823bd74 to lmp-mr1-dev

Change-Id: Id8f856591eb2a49bf151a9caa6e15f69e6887e4c
2354f92cd7193ff9aba2d2fdc4ddfd3df1174f87 25-May-2016 Lajos Molnar <lajos@google.com> Merge "stagefright: allow ABitReader to fail gracefully" into nyc-dev am: 5c8f37fdc3 am: f4893ba283
am: 8a71f09b95

* commit '8a71f09b95fed252c22e9f1daacedbc3a854441c':
stagefright: allow ABitReader to fail gracefully

Change-Id: Ie4f29af1a51f85c42d03319e35d3ef13111033f2
f4893ba28346acab7b738781d1785b13f35d37bc 25-May-2016 Lajos Molnar <lajos@google.com> Merge "stagefright: allow ABitReader to fail gracefully" into nyc-dev
am: 5c8f37fdc3

* commit '5c8f37fdc332b9882b31497937070f480f2c6016':
stagefright: allow ABitReader to fail gracefully

Change-Id: I2c0830ff9a65d55eb5dc3e6a874924e3b043e8f3
05b849ec0b585412aa0c23a5dad9ca5d9fb28888 25-May-2016 Lajos Molnar <lajos@google.com> stagefright: do not fail on bad bitstreams in HevcParameterSets

Bug: 28938657
Change-Id: Ia03716ca238666e0a2f9e18a565ee24ee882312d
evcUtils.cpp
2f4555e2080b7bd9933924840e70a1d4fc87ecb2 25-May-2016 Lajos Molnar <lajos@google.com> stagefright: add safe versions of parseUE and parseSE

Bug: 28938657
Change-Id: If3d6c8fda14a0f9d9ab7dc6fced530dfb5d51113
vc_utils.cpp
nclude/avc_utils.h
3be85f905e5c63e1552554622a80fd8bee695044 24-May-2016 Lajos Molnar <lajos@google.com> stagefright: allow ABitReader to fail gracefully

Bug: 28938657
Change-Id: I0648e1b1fda13958550ef4470073e12a1ff054fd
oundation/ABitReader.cpp
3d1df4f411a531fb30cc8563cb39e732041d22ad 25-May-2016 Wei Jia <wjia@google.com> DO NOT MERGE MPEG4Extractor: ensure kKeyTrackID exists before creating an MPEG4Source as track. am: b016207fc2
am: e2ca751723

* commit 'e2ca7517232e2df2dc16d358809d7e4723827c42':
DO NOT MERGE MPEG4Extractor: ensure kKeyTrackID exists before creating an MPEG4Source as track.

Change-Id: Ia1dd264fc19f8c82a59a5e2656375f2c2c4403ff
e31eeb4cc65e6b0c98d8476cb89f746ddb79a1b0 28-Aug-2015 Wei Jia <wjia@google.com> MPEG4Extractor: ensure kKeyTrackID exists before creating an MPEG4Source as track.

GenericSource: return error when no track exists.

SampleIterator: make sure mSamplesPerChunk is not zero before using it as divisor.

Bug: 21657957
Bug: 23705695
Bug: 22802344
Bug: 28799341
Change-Id: I7664992ade90b935d3f255dcd43ecc2898f30b04
(cherry picked from commit 0386c91b8a910a134e5898ffa924c1b6c7560b13)
PEG4Extractor.cpp
ampleIterator.cpp
b016207fc2442420e8d3a8633575ffe4fc29fef3 28-Aug-2015 Wei Jia <wjia@google.com> DO NOT MERGE MPEG4Extractor: ensure kKeyTrackID exists before creating an MPEG4Source as track.

GenericSource: return error when no track exists.

SampleIterator: make sure mSamplesPerChunk is not zero before using it as divisor.

Bug: 21657957
Bug: 23705695
Bug: 22802344
Bug: 28799341
Change-Id: I7664992ade90b935d3f255dcd43ecc2898f30b04
(cherry picked from commit 0386c91b8a910a134e5898ffa924c1b6c7560b13)
PEG4Extractor.cpp
ampleIterator.cpp
321ff07dac04f314ae34261d39d4e91aa19e1435 25-May-2016 Lajos Molnar <lajos@google.com> Merge "stagefright: get profile/level from codec-specific-data" into nyc-dev am: 76016ccf97 am: 517f189671
am: dc0f723fbc

* commit 'dc0f723fbc47ddd19fbdbdae9d5f0bf7673d0c53':
stagefright: get profile/level from codec-specific-data

Change-Id: I64cd3d2031a9697f0624d6dbd57b8448adb5b0f2
dc0f723fbc47ddd19fbdbdae9d5f0bf7673d0c53 25-May-2016 Lajos Molnar <lajos@google.com> Merge "stagefright: get profile/level from codec-specific-data" into nyc-dev am: 76016ccf97
am: 517f189671

* commit '517f18967128a267c750d3dce78007bf02bae795':
stagefright: get profile/level from codec-specific-data

Change-Id: I60def2ef022db3ed1fce51ea35db5bc38a8e08d8
394040d4377e375477e30496f2ae01dcd9f59eeb 25-May-2016 Lajos Molnar <lajos@google.com> Merge "stagefright: get profile/level from codec-specific-data" into nyc-dev
am: 76016ccf97

* commit '76016ccf97237b131087651db34bdec9e0c81d43':
stagefright: get profile/level from codec-specific-data

Change-Id: I7c8b65a2e5f9c00df80252f6d015f385ae2a0c7a
07b2fbfb40770f3be0f674596f2e51d257c6d2bd 20-May-2016 Lajos Molnar <lajos@google.com> stagefright: get profile/level from codec-specific-data

- also fix HEVC minimum input buffer size in MP4 extractor

Bug: 28671284
Change-Id: I06d06b9fa0da753333092da16203bdd48d562b0f
PEG4Extractor.cpp
PEG4Writer.cpp
tils.cpp
7118308943d64f8d9e4c63b0e6d49da376be1966 24-May-2016 Eric Laurent <elaurent@google.com> Fix android.permission.CAPTURE_AUDIO_OUTPUT permission check am: b2379ba0a3 am: cc516cdd02
am: e52cab1f56

* commit 'e52cab1f56c39b72090f53ef3b2a187191d13143':
Fix android.permission.CAPTURE_AUDIO_OUTPUT permission check

Change-Id: Ia663aa8d975108cda5f0f2592d4bbf490bf776da
cc516cdd0293fead98ed33fa0334c79a940c8653 24-May-2016 Eric Laurent <elaurent@google.com> Fix android.permission.CAPTURE_AUDIO_OUTPUT permission check
am: b2379ba0a3

* commit 'b2379ba0a32638bae2ea0460644f68cf5a0967ce':
Fix android.permission.CAPTURE_AUDIO_OUTPUT permission check

Change-Id: Iff08e0b44c71b63d101ca26c6ed9972fa030bfb1
b2379ba0a32638bae2ea0460644f68cf5a0967ce 24-May-2016 Eric Laurent <elaurent@google.com> Fix android.permission.CAPTURE_AUDIO_OUTPUT permission check

Make sure we use the correct PID and UID when checking
android.permission.CAPTURE_AUDIO_OUTPUT permission from audio
policy service.

Bug: 28772898
Change-Id: I8f0c45bf7a5728b4364a451eefb6c025892ae9a5
udioSource.cpp
183c50e102a09d0dc87e961c53b086bee1aa680b 24-May-2016 Lajos Molnar <lajos@google.com> stagefright: add flags to NuMediaExtractor::getTrackFormat am: 768a2537a8 am: fe2fc3d630
am: ed8952bd6b

* commit 'ed8952bd6b029765dcaac116a3999668deb97c6b':
stagefright: add flags to NuMediaExtractor::getTrackFormat

Change-Id: I165d8f505bbc7ec0258d9c0d14af1ba076d8e304
9a255cff1c141ff8930f58e0cf2dcb08ddd5bf91 24-May-2016 Lajos Molnar <lajos@google.com> stagefright: get stream header information from MPEG2 video tracks am: 0dc8be97f0 am: c1ae7883b9
am: 9cf8ddda6e

* commit '9cf8ddda6e53059bc4c33d231486524ed975db55':
stagefright: get stream header information from MPEG2 video tracks

Change-Id: I8eed4ae803df03ae7bc402d0d69ee195d89cfbf3
ed8952bd6b029765dcaac116a3999668deb97c6b 24-May-2016 Lajos Molnar <lajos@google.com> stagefright: add flags to NuMediaExtractor::getTrackFormat am: 768a2537a8
am: fe2fc3d630

* commit 'fe2fc3d630f8c28a0f22f4b634fbeff826c2e532':
stagefright: add flags to NuMediaExtractor::getTrackFormat

Change-Id: I6f6ff6b5351d6f5a4a799a683f01b7e4c7d59c2a
9cf8ddda6e53059bc4c33d231486524ed975db55 24-May-2016 Lajos Molnar <lajos@google.com> stagefright: get stream header information from MPEG2 video tracks am: 0dc8be97f0
am: c1ae7883b9

* commit 'c1ae7883b9aeab5ca8563c7d93215f71b1a4f73e':
stagefright: get stream header information from MPEG2 video tracks

Change-Id: I2369bb6e0390f481760ac96e9c78c82e2ee3a7c6
361ba742e2a15b2a6c799a4c6ed8315711a97b96 24-May-2016 Lajos Molnar <lajos@google.com> stagefright: add flags to NuMediaExtractor::getTrackFormat
am: 768a2537a8

* commit '768a2537a86ac2f3513e42aafb5f3b8ee967ef6c':
stagefright: add flags to NuMediaExtractor::getTrackFormat

Change-Id: Ia68a08ffdb81275d73624944aaa732d247549c8e
4bd13b794755832253d864faf4ed23ea9aa678c9 24-May-2016 Lajos Molnar <lajos@google.com> stagefright: get stream header information from MPEG2 video tracks
am: 0dc8be97f0

* commit '0dc8be97f0fbee707b69b24b3a8d914f88c77423':
stagefright: get stream header information from MPEG2 video tracks

Change-Id: I968fe600b13c6f0ba30a016b0c427fce45be1c6b
768a2537a86ac2f3513e42aafb5f3b8ee967ef6c 21-May-2016 Lajos Molnar <lajos@google.com> stagefright: add flags to NuMediaExtractor::getTrackFormat

This is to allow passing mpeg-2 stream headers.

Bug: 28671284
Change-Id: I63abecad58ae346fa12d33896bbd8c970194d7e3
uMediaExtractor.cpp
0dc8be97f0fbee707b69b24b3a8d914f88c77423 21-May-2016 Lajos Molnar <lajos@google.com> stagefright: get stream header information from MPEG2 video tracks

Bug: 28671284
Change-Id: I2367fd49f016b906299137afcabcd5cd1e7af4e3
PEG4Extractor.cpp
d4fba4867bfd2c770bf6ad1d02ef10530ecf7079 23-May-2016 Marco Nelissen <marcone@google.com> Merge "Check malloc result to avoid NPD" into lmp-dev am: e5734d88ad am: f6e3609de2 am: 6d1da7d539 am: 1d45547854 am: 90fe9f1413 am: 3633c0f41e am: bf68540a39 am: 8c6e115c87 am: 5f9925cced am: 606bc6d478
am: 34ba0020e9

* commit '34ba0020e91d6aedda38d41cd1f2d4ee7433a214':
Check malloc result to avoid NPD

Change-Id: I1616c532036b798afba4a883038904177dea98de
34ba0020e91d6aedda38d41cd1f2d4ee7433a214 23-May-2016 Marco Nelissen <marcone@google.com> Merge "Check malloc result to avoid NPD" into lmp-dev am: e5734d88ad am: f6e3609de2 am: 6d1da7d539 am: 1d45547854 am: 90fe9f1413 am: 3633c0f41e am: bf68540a39 am: 8c6e115c87 am: 5f9925cced
am: 606bc6d478

* commit '606bc6d478181b9b40ddf650aa2f758199d97c90':
Check malloc result to avoid NPD

Change-Id: Ia9906d638ebee600409d57729bf8adc6a4f3f9b6
dbc61414d73e2ad2ab3923ac45e8c9da0dfabf3c 23-May-2016 Marco Nelissen <marcone@google.com> Merge "Check malloc result to avoid NPD" into lmp-dev am: e5734d88ad am: f6e3609de2 am: 6d1da7d539 am: 1d45547854 am: 90fe9f1413 am: 3633c0f41e am: bf68540a39 am: 8c6e115c87
am: 5f9925cced

* commit '5f9925cceda1bafb91add1eae0e6e5cfab698c4f':
Check malloc result to avoid NPD

Change-Id: Icc2f6c972262d7c65d465a1e567bbcc99796dab4
5f9925cceda1bafb91add1eae0e6e5cfab698c4f 23-May-2016 Marco Nelissen <marcone@google.com> Merge "Check malloc result to avoid NPD" into lmp-dev am: e5734d88ad am: f6e3609de2 am: 6d1da7d539 am: 1d45547854 am: 90fe9f1413 am: 3633c0f41e am: bf68540a39
am: 8c6e115c87

* commit '8c6e115c87c479999075c785f4c04ec66ad9421e':
Check malloc result to avoid NPD

Change-Id: I56e002bbe453c4c9b4077c4c226c2a82b95c80ea
8c6e115c87c479999075c785f4c04ec66ad9421e 23-May-2016 Marco Nelissen <marcone@google.com> Merge "Check malloc result to avoid NPD" into lmp-dev am: e5734d88ad am: f6e3609de2 am: 6d1da7d539 am: 1d45547854 am: 90fe9f1413 am: 3633c0f41e
am: bf68540a39

* commit 'bf68540a392ef8e4294b13d994069fb99f4db747':
Check malloc result to avoid NPD

Change-Id: Ibf5f7a0ff16743de907378600463ef7c7e892f18
bf68540a392ef8e4294b13d994069fb99f4db747 23-May-2016 Marco Nelissen <marcone@google.com> Merge "Check malloc result to avoid NPD" into lmp-dev am: e5734d88ad am: f6e3609de2 am: 6d1da7d539 am: 1d45547854 am: 90fe9f1413
am: 3633c0f41e

* commit '3633c0f41e134f0673a6b26e613cc3fe3f3bd432':
Check malloc result to avoid NPD

Change-Id: I342b9ad202ab47e020c29d11ebd72a90bf2d69b5
3633c0f41e134f0673a6b26e613cc3fe3f3bd432 23-May-2016 Marco Nelissen <marcone@google.com> Merge "Check malloc result to avoid NPD" into lmp-dev am: e5734d88ad am: f6e3609de2 am: 6d1da7d539 am: 1d45547854
am: 90fe9f1413

* commit '90fe9f14134c1dbec758f0330ac9d11fa8093ecc':
Check malloc result to avoid NPD

Change-Id: I0e8e1265e0f64766eff799ea339d10a489a356b3
90fe9f14134c1dbec758f0330ac9d11fa8093ecc 23-May-2016 Marco Nelissen <marcone@google.com> Merge "Check malloc result to avoid NPD" into lmp-dev am: e5734d88ad am: f6e3609de2 am: 6d1da7d539
am: 1d45547854

* commit '1d4554785472f478acfbf60479cd662475926c74':
Check malloc result to avoid NPD

Change-Id: I9567052999206511d0e00bc1cdfed7d88fd89609
1d4554785472f478acfbf60479cd662475926c74 23-May-2016 Marco Nelissen <marcone@google.com> Merge "Check malloc result to avoid NPD" into lmp-dev am: e5734d88ad am: f6e3609de2
am: 6d1da7d539

* commit '6d1da7d53995c1a171eedc99bd9b17d8dfe3d158':
Check malloc result to avoid NPD

Change-Id: I92303d3c07ff920a4c7e2d1a94bd341102035ba1
8fd8bfdfbd930cdc669c4fc33d7d251f12ec7e5e 23-May-2016 Marco Nelissen <marcone@google.com> Merge "DO NOT MERGE Check malloc result to avoid NPD" into klp-dev am: fddbb1a791
am: 9897bd43a6

* commit '9897bd43a614c28e6c52dcbce817d9ef6f201ccc':
DO NOT MERGE Check malloc result to avoid NPD

Change-Id: Ia9f97994af54fff11644f7d59821e8ddf6fb54f1
f6e3609de238b63860d0892b26c76ee35d24cf06 23-May-2016 Marco Nelissen <marcone@google.com> Merge "Check malloc result to avoid NPD" into lmp-dev
am: e5734d88ad

* commit 'e5734d88ad6e4eacf110ed3f9aa4041b8b5598be':
Check malloc result to avoid NPD

Change-Id: I20f011a5a48128f41c9000818df1c2498621657b
f593071880fff01cd79ce059789a19b1a780d144 23-May-2016 Lajos Molnar <lajos@google.com> stagefright: fill in profile/level when reassembling AVCC am: 47d8891199 am: 023f2a52fa
am: a2b0a86326

* commit 'a2b0a863260b392c0d0e8cec8ea6bf9f53339db2':
stagefright: fill in profile/level when reassembling AVCC

Change-Id: Iaffd479a82df8a45a456f7b1deb083197b082885
023f2a52fa2efd29c2e4fdddbd1a20a91eb608b2 23-May-2016 Lajos Molnar <lajos@google.com> stagefright: fill in profile/level when reassembling AVCC
am: 47d8891199

* commit '47d8891199f40a3a89c2910e4407f82a125df43b':
stagefright: fill in profile/level when reassembling AVCC

Change-Id: I7f14c4b0c320d76f3d87a2cee8474b9060ac36da
e5734d88ad6e4eacf110ed3f9aa4041b8b5598be 23-May-2016 Marco Nelissen <marcone@google.com> Merge "Check malloc result to avoid NPD" into lmp-dev
fddbb1a791975adfa1323377b09606ad44122ff2 23-May-2016 Marco Nelissen <marcone@google.com> Merge "DO NOT MERGE Check malloc result to avoid NPD" into klp-dev
47d8891199f40a3a89c2910e4407f82a125df43b 20-May-2016 Lajos Molnar <lajos@google.com> stagefright: fill in profile/level when reassembling AVCC

Also reuse same findNextNalStartCode code.

Bug: 28671284
Change-Id: I71c8e47a012190ac277eae6d8654579c2b802329
PEG4Writer.cpp
tils.cpp
1249f4e0f85c8add387247fe9770c62116acbe1c 21-May-2016 Lajos Molnar <lajos@google.com> Merge "stagefright: fix issues with bitrate handling" into nyc-dev am: 2b1a242470 am: d681f2a041
am: c41e6c8d62

* commit 'c41e6c8d624a7f33f24f98964d067824421f49ee':
stagefright: fix issues with bitrate handling

Change-Id: I7d64b38b365dd5bc839f9dae0856fdfd9c91d05d
c41e6c8d624a7f33f24f98964d067824421f49ee 21-May-2016 Lajos Molnar <lajos@google.com> Merge "stagefright: fix issues with bitrate handling" into nyc-dev am: 2b1a242470
am: d681f2a041

* commit 'd681f2a041e0fb565e1daacabf2e672f8abfc2d2':
stagefright: fix issues with bitrate handling

Change-Id: Ic2b274331bd4958da01c3a9d13ba62fdc8498700
013ce69d91e05d50d0f6d54943ccc3ba28fbe5e6 21-May-2016 Lajos Molnar <lajos@google.com> Merge "stagefright: fix issues with bitrate handling" into nyc-dev
am: 2b1a242470

* commit '2b1a242470adb3ef4ba3a63c21f5415581324c4f':
stagefright: fix issues with bitrate handling

Change-Id: Ibe48277a28d6cde7c4cd35383f7fb38e126a3153
2b1a242470adb3ef4ba3a63c21f5415581324c4f 21-May-2016 Lajos Molnar <lajos@google.com> Merge "stagefright: fix issues with bitrate handling" into nyc-dev
14ccfd979a7e86cde5ac63132fc74046b7a7c4ed 20-May-2016 Marco Nelissen <marcone@google.com> Merge "Fix yet more overflows in amrwbenc" into nyc-dev am: b4f67b37e9 am: bcd5792162
am: c75d98fea8

* commit 'c75d98fea85b8bd32dc3625f912312aea3ebc35e':
Fix yet more overflows in amrwbenc

Change-Id: I01d9039a5d205ce9a54f134be7c5c059baec49a5
c75d98fea85b8bd32dc3625f912312aea3ebc35e 20-May-2016 Marco Nelissen <marcone@google.com> Merge "Fix yet more overflows in amrwbenc" into nyc-dev am: b4f67b37e9
am: bcd5792162

* commit 'bcd5792162279a4d1ed6e6a0ecef2c6b91b6720c':
Fix yet more overflows in amrwbenc

Change-Id: Iabaef602b0f2ccb4742732a4ee3f5f4d1de7a3b6
5a3b7974a42a8188d7bd5621bcc5b3b8eeac75be 20-May-2016 Marco Nelissen <marcone@google.com> Merge "Fix yet more overflows in amrwbenc" into nyc-dev
am: b4f67b37e9

* commit 'b4f67b37e9c92fae1af4ade10b1a0a95706db9ef':
Fix yet more overflows in amrwbenc

Change-Id: Ia43735805367032522719be6541900dbcc4b93c0
b4f67b37e9c92fae1af4ade10b1a0a95706db9ef 20-May-2016 Marco Nelissen <marcone@google.com> Merge "Fix yet more overflows in amrwbenc" into nyc-dev
46f80165c595d81dda68f8f3fea27f4fb04937dd 20-May-2016 Lajos Molnar <lajos@google.com> stagefright: fix issues with bitrate handling

- parse btrt mp4 box
- write max and avg. bitrates into avcc
- fix the use of "bit-rate" vs. the correct "bitrate"
- document ESDS better
- fix some spacing

Bug: 28671284
Change-Id: I94961a095c6d162af38b7999cc946f899a1b1b09
SDS.cpp
PEG4Extractor.cpp
PEG4Writer.cpp
tils.cpp
d70e36239aa019ca61c7cbdd62f0b879205db3a1 19-May-2016 Chih-hung Hsieh <chh@google.com> Merge "Fix misc-macro-parentheses warnings." am: 8a6d716a1e am: f89b497da8 am: 276b60e1be
am: c8527e5b21

* commit 'c8527e5b215ed877bfe9325cbd47b86e9de85290':
Fix misc-macro-parentheses warnings.

Change-Id: I63eb2532854630e63c64c73712fbc1b591a0c27b
276b60e1be8ed92149411240d95705c642c7531a 19-May-2016 Chih-hung Hsieh <chh@google.com> Merge "Fix misc-macro-parentheses warnings." am: 8a6d716a1e
am: f89b497da8

* commit 'f89b497da89aefbf32b3bdfd62d92c4ca00c4928':
Fix misc-macro-parentheses warnings.

Change-Id: I137b2728a00dbdfdceb44504f4f3f4707c441d93
5d453222ae6dcc10efedb1e4805247d7c22a4168 17-May-2016 Marco Nelissen <marcone@google.com> Fix yet more overflows in amrwbenc

Bug: 28786034
Change-Id: I619e63df93a562a1e3b017d07a8414776a00b855
odecs/amrwbenc/src/convolve.c
odecs/amrwbenc/src/pitch_f4.c
odecs/amrwbenc/src/voAMRWBEnc.c
183d387706417863076873ec566ca5966d8f5560 18-May-2016 Chih-Hung Hsieh <chh@google.com> Fix misc-macro-parentheses warnings.

Bug: 28705665
Change-Id: I9b4b253100cc06a5f37eb3129b0d54991471e382
odecs/aacdec/SoftAAC2.cpp
odecs/aacenc/basic_op/oper_32b.c
odecs/aacenc/basic_op/typedefs.h
odecs/aacenc/inc/psy_const.h
odecs/aacenc/src/bit_cnt.c
odecs/aacenc/src/transform.c
odecs/amrnb/common/src/az_lsp.cpp
odecs/amrnb/common/src/gc_pred.cpp
odecs/amrwb/src/dtx.h
odecs/amrwb/src/homing_amr_wb_dec.cpp
odecs/amrwb/src/pvamrwb_math_op.h
odecs/amrwb/src/pvamrwbdecoder_basic_op.h
odecs/amrwb/src/pvamrwbdecoder_cnst.h
odecs/amrwbenc/inc/basic_op.h
odecs/amrwbenc/inc/bits.h
odecs/amrwbenc/inc/dtx.h
odecs/amrwbenc/inc/homing.tab
odecs/amrwbenc/inc/stream.h
odecs/avc/enc/src/avcenc_int.h
odecs/avc/enc/src/findhalfpel.cpp
odecs/avc/enc/src/intra_est.cpp
odecs/avc/enc/src/motion_comp.cpp
odecs/avcdec/SoftAVCDec.h
odecs/avcenc/SoftAVCEnc.h
odecs/common/include/voAAC.h
odecs/common/include/voAudio.h
odecs/common/include/voIndex.h
odecs/common/include/voMem.h
odecs/hevcdec/SoftHEVC.h
odecs/m4v_h263/dec/src/idct.h
odecs/m4v_h263/dec/src/motion_comp.h
odecs/m4v_h263/dec/src/mp4def.h
odecs/m4v_h263/dec/src/post_proc.h
odecs/m4v_h263/dec/src/vlc_decode.h
odecs/m4v_h263/enc/src/fastidct.cpp
odecs/mp3dec/src/pv_mp3dec_fxd_op_c_equivalent.h
odecs/mp3dec/src/pvmp3_alias_reduction.cpp
odecs/mp3dec/src/pvmp3_dct_16.cpp
odecs/mp3dec/src/pvmp3_dct_6.cpp
odecs/mp3dec/src/pvmp3_dct_9.cpp
odecs/mp3dec/src/pvmp3_dec_defs.h
odecs/mp3dec/src/pvmp3_dequantize_sample.cpp
odecs/mp3dec/src/pvmp3_equalizer.cpp
odecs/mp3dec/src/pvmp3_get_scale_factors.cpp
odecs/mp3dec/src/pvmp3_mdct_18.h
odecs/mp3dec/src/pvmp3_mdct_6.cpp
odecs/mp3dec/src/pvmp3_mdct_6.h
odecs/mp3dec/src/pvmp3_mpeg2_stereo_proc.cpp
odecs/mp3dec/src/pvmp3_stereo_proc.cpp
odecs/mp3dec/src/pvmp3_tables.cpp
odecs/mp3dec/src/pvmp3_tables.h
odecs/mpeg2dec/SoftMPEG2.h
odecs/on2/h264dec/source/h264bsd_cavlc.c
odecs/on2/h264dec/source/h264bsd_util.h
oundation/AMessage.cpp
15bd6f84645a61d99cd56028446ee912f89b6bd5 16-May-2016 Craig Donner <cdonner@google.com> Merge "Handle lock() returning a NULL buffer in SurfaceUtils." into nyc-dev am: d498419257 am: 98695713bd
am: 60e7c59430

* commit '60e7c59430e7acb98bcc4f9e3bc4b87687660853':
Handle lock() returning a NULL buffer in SurfaceUtils.

Change-Id: I9bf13abfc1b3848965c4e68a985bd4172eb36a93
60e7c59430e7acb98bcc4f9e3bc4b87687660853 16-May-2016 Craig Donner <cdonner@google.com> Merge "Handle lock() returning a NULL buffer in SurfaceUtils." into nyc-dev am: d498419257
am: 98695713bd

* commit '98695713bdab3254ce0241eb10d3623d5495f80f':
Handle lock() returning a NULL buffer in SurfaceUtils.

Change-Id: Iab4f77eda0489a7a37d2b929229f659afbb14e34
8244c117585741a298848523e5c7b9ef2a128659 16-May-2016 Craig Donner <cdonner@google.com> Merge "Handle lock() returning a NULL buffer in SurfaceUtils." into nyc-dev
am: d498419257

* commit 'd498419257359b8e95a99bde40795fc53ff57163':
Handle lock() returning a NULL buffer in SurfaceUtils.

Change-Id: Ifd7e931628b140de630479fbbc4b20e1cfa61512
d498419257359b8e95a99bde40795fc53ff57163 16-May-2016 Craig Donner <cdonner@google.com> Merge "Handle lock() returning a NULL buffer in SurfaceUtils." into nyc-dev
9193bcd60728bac0d5c2059ed2dc878231509c3a 13-May-2016 Craig Donner <cdonner@google.com> Handle lock() returning a NULL buffer in SurfaceUtils.

Bug: 28526999
Change-Id: I99fdc100329e3350c9c8aa070779a407eda057ff
urfaceUtils.cpp
3e077799b70249ae73b0903eeff596f1f3ebf58b 13-May-2016 Jeff Tinker <jtinker@google.com> Merge "Fix security vulnerability in libstagefright" into klp-dev am: eb37c37c59 am: 883b244f45 am: 31a3aa5628 am: f11141924a am: 64149d756a am: 16f7ee09b0 am: f518e50178 am: eb919fc1d3 am: 7e580879e0 am: a78d7f2d49 am: e47ede5c6b am: 361c6c4276 am: 5fa6231ed5
am: cd1766167c

* commit 'cd1766167c929c0eaa7748da6be0d389630accef':
Fix security vulnerability in libstagefright

Change-Id: Ibd7ea34aa5ef0f0c727eed6b1d144d337637f657
5fa6231ed57ff435ce6f7b55b9a2de260eb73116 13-May-2016 Jeff Tinker <jtinker@google.com> Merge "Fix security vulnerability in libstagefright" into klp-dev am: eb37c37c59 am: 883b244f45 am: 31a3aa5628 am: f11141924a am: 64149d756a am: 16f7ee09b0 am: f518e50178 am: eb919fc1d3 am: 7e580879e0 am: a78d7f2d49 am: e47ede5c6b
am: 361c6c4276

* commit '361c6c4276b772cc1ef7d7fb67f78d15034ccdd7':
Fix security vulnerability in libstagefright

Change-Id: I5d632112a027f3b76050aaae917f36826b264c86
361c6c4276b772cc1ef7d7fb67f78d15034ccdd7 13-May-2016 Jeff Tinker <jtinker@google.com> Merge "Fix security vulnerability in libstagefright" into klp-dev am: eb37c37c59 am: 883b244f45 am: 31a3aa5628 am: f11141924a am: 64149d756a am: 16f7ee09b0 am: f518e50178 am: eb919fc1d3 am: 7e580879e0 am: a78d7f2d49
am: e47ede5c6b

* commit 'e47ede5c6b67d042a116cca99fd9cb73af84362b':
Fix security vulnerability in libstagefright

Change-Id: I6bd8082f9d3d58d4a00efff41ff785b32800ca67
e47ede5c6b67d042a116cca99fd9cb73af84362b 13-May-2016 Jeff Tinker <jtinker@google.com> Merge "Fix security vulnerability in libstagefright" into klp-dev am: eb37c37c59 am: 883b244f45 am: 31a3aa5628 am: f11141924a am: 64149d756a am: 16f7ee09b0 am: f518e50178 am: eb919fc1d3 am: 7e580879e0
am: a78d7f2d49

* commit 'a78d7f2d49d1d4ca2bf64e4f64ebcc16a008987b':
Fix security vulnerability in libstagefright

Change-Id: I12f1c1c266ae15813bcc2b132b79d0fd8ddeab5c
a78d7f2d49d1d4ca2bf64e4f64ebcc16a008987b 13-May-2016 Jeff Tinker <jtinker@google.com> Merge "Fix security vulnerability in libstagefright" into klp-dev am: eb37c37c59 am: 883b244f45 am: 31a3aa5628 am: f11141924a am: 64149d756a am: 16f7ee09b0 am: f518e50178 am: eb919fc1d3
am: 7e580879e0

* commit '7e580879e0b2c32b0d1e618c700da3040ceadb6b':
Fix security vulnerability in libstagefright

Change-Id: Icb6285ea498c1d1060c374c2def53f3aa9d01946
7e580879e0b2c32b0d1e618c700da3040ceadb6b 13-May-2016 Jeff Tinker <jtinker@google.com> Merge "Fix security vulnerability in libstagefright" into klp-dev am: eb37c37c59 am: 883b244f45 am: 31a3aa5628 am: f11141924a am: 64149d756a am: 16f7ee09b0 am: f518e50178
am: eb919fc1d3

* commit 'eb919fc1d3005b2455f7ee31120da4ef5d292c43':
Fix security vulnerability in libstagefright

Change-Id: I71aa4f5219134ad203fbe6c5122f29fd51445ae1
eb919fc1d3005b2455f7ee31120da4ef5d292c43 13-May-2016 Jeff Tinker <jtinker@google.com> Merge "Fix security vulnerability in libstagefright" into klp-dev am: eb37c37c59 am: 883b244f45 am: 31a3aa5628 am: f11141924a am: 64149d756a am: 16f7ee09b0
am: f518e50178

* commit 'f518e501786c73675605365b829a174e5d5c17df':
Fix security vulnerability in libstagefright

Change-Id: I5b6d66f369510e7e2f7378199a658ec1ec5e0a98
f518e501786c73675605365b829a174e5d5c17df 13-May-2016 Jeff Tinker <jtinker@google.com> Merge "Fix security vulnerability in libstagefright" into klp-dev am: eb37c37c59 am: 883b244f45 am: 31a3aa5628 am: f11141924a am: 64149d756a
am: 16f7ee09b0

* commit '16f7ee09b0ce814c7f45085b095c56ba44ba4133':
Fix security vulnerability in libstagefright

Change-Id: I014e1098165beac42fbe08744911547eec5e16fe
64149d756a3b32635247248419778631daf3e294 13-May-2016 Jeff Tinker <jtinker@google.com> Merge "Fix security vulnerability in libstagefright" into klp-dev am: eb37c37c59 am: 883b244f45 am: 31a3aa5628
am: f11141924a

* commit 'f11141924a3b4208954bedf3dbeb9b7bfaab75c5':
Fix security vulnerability in libstagefright

Change-Id: Ie56f84aae5d2d17a62932f3d2274978f82a34cd4
f11141924a3b4208954bedf3dbeb9b7bfaab75c5 13-May-2016 Jeff Tinker <jtinker@google.com> Merge "Fix security vulnerability in libstagefright" into klp-dev am: eb37c37c59 am: 883b244f45
am: 31a3aa5628

* commit '31a3aa56287d63aaf1ac804cc04154ed779032ff':
Fix security vulnerability in libstagefright

Change-Id: I4d666e42bfc64e384b9fd8c8fad07d645be6a19a
31a3aa56287d63aaf1ac804cc04154ed779032ff 13-May-2016 Jeff Tinker <jtinker@google.com> Merge "Fix security vulnerability in libstagefright" into klp-dev am: eb37c37c59
am: 883b244f45

* commit '883b244f4567fe0cd099f0583940e531eb0e2af4':
Fix security vulnerability in libstagefright

Change-Id: Idd0798f74590e2546c4f0d1b0940ccf7e42f5a17
eb37c37c594604d0e6acbf14be6e04e065fab226 13-May-2016 Jeff Tinker <jtinker@google.com> Merge "Fix security vulnerability in libstagefright" into klp-dev
6a456937c0d42fd8617126afdbf9e41087cf3cbc 11-May-2016 Marco Nelissen <marcone@google.com> Check malloc result to avoid NPD

Bug: 28471206
Change-Id: Id5d055d76893d6f53a2e524ff5f282d1ddca3345
PEG4Extractor.cpp
952046ec035e93a1171220a6dd7e89cbe136bb88 13-May-2016 Pawin Vongmasa <pawin@google.com> h264bsdActivateParamSets: Prevent multiplication overflow. am: 87277aac64 am: 2a68d5279d am: 5dfa5f268e am: a0bb560e3b am: 7c22e59819 am: 548439e243 am: 4d027a6bf5 am: 177aee1b6b am: e9bb4f9b51 am: 60ab0df366 am: ec5e9c0f99 am: e35bcaa2c9 am: 4c9d242156
am: 2b7878308b

* commit '2b7878308b69f3ba4acb048bd26cb1eb9bf6f247':
h264bsdActivateParamSets: Prevent multiplication overflow.

Change-Id: I2c63c08fc3d7b8ff769a6f72145ae96e8130ea35
ad92798cc37677ed14cacf1caf62196612a6b71e 11-May-2016 Marco Nelissen <marcone@google.com> DO NOT MERGE Check malloc result to avoid NPD

Bug: 28471206
Change-Id: Id5d055d76893d6f53a2e524ff5f282d1ddca3345
PEG4Extractor.cpp
4c9d24215642fef7d84f5886fc27d5562f2c1b48 13-May-2016 Pawin Vongmasa <pawin@google.com> h264bsdActivateParamSets: Prevent multiplication overflow. am: 87277aac64 am: 2a68d5279d am: 5dfa5f268e am: a0bb560e3b am: 7c22e59819 am: 548439e243 am: 4d027a6bf5 am: 177aee1b6b am: e9bb4f9b51 am: 60ab0df366 am: ec5e9c0f99
am: e35bcaa2c9

* commit 'e35bcaa2c908c5ef404928412ade7711e6173d35':
h264bsdActivateParamSets: Prevent multiplication overflow.

Change-Id: I84c8be45335e93b4900807260d7cde915dcd541d
e35bcaa2c908c5ef404928412ade7711e6173d35 13-May-2016 Pawin Vongmasa <pawin@google.com> h264bsdActivateParamSets: Prevent multiplication overflow. am: 87277aac64 am: 2a68d5279d am: 5dfa5f268e am: a0bb560e3b am: 7c22e59819 am: 548439e243 am: 4d027a6bf5 am: 177aee1b6b am: e9bb4f9b51 am: 60ab0df366
am: ec5e9c0f99

* commit 'ec5e9c0f9911e280ba8344a40891b7a12a67ec34':
h264bsdActivateParamSets: Prevent multiplication overflow.

Change-Id: I3020d794e03987eb84307d0e004ca951596a7b1d
ec5e9c0f9911e280ba8344a40891b7a12a67ec34 13-May-2016 Pawin Vongmasa <pawin@google.com> h264bsdActivateParamSets: Prevent multiplication overflow. am: 87277aac64 am: 2a68d5279d am: 5dfa5f268e am: a0bb560e3b am: 7c22e59819 am: 548439e243 am: 4d027a6bf5 am: 177aee1b6b am: e9bb4f9b51
am: 60ab0df366

* commit '60ab0df3666877a6d34acc74a07f38ec13927a1c':
h264bsdActivateParamSets: Prevent multiplication overflow.

Change-Id: I714f77542c419fbc58533d3c49e20f593d836607
60ab0df3666877a6d34acc74a07f38ec13927a1c 13-May-2016 Pawin Vongmasa <pawin@google.com> h264bsdActivateParamSets: Prevent multiplication overflow. am: 87277aac64 am: 2a68d5279d am: 5dfa5f268e am: a0bb560e3b am: 7c22e59819 am: 548439e243 am: 4d027a6bf5 am: 177aee1b6b
am: e9bb4f9b51

* commit 'e9bb4f9b51300938b07f71827fac0727c639b64f':
h264bsdActivateParamSets: Prevent multiplication overflow.

Change-Id: Iacc0cb80e5b41b12c1b63a2b071e015ac87ffe60
e9bb4f9b51300938b07f71827fac0727c639b64f 13-May-2016 Pawin Vongmasa <pawin@google.com> h264bsdActivateParamSets: Prevent multiplication overflow. am: 87277aac64 am: 2a68d5279d am: 5dfa5f268e am: a0bb560e3b am: 7c22e59819 am: 548439e243 am: 4d027a6bf5
am: 177aee1b6b

* commit '177aee1b6bd59f2356da732342ac893379505d3b':
h264bsdActivateParamSets: Prevent multiplication overflow.

Change-Id: I1ad9deab3899b720d9ff85ce64ef7234cbe1ae40
177aee1b6bd59f2356da732342ac893379505d3b 13-May-2016 Pawin Vongmasa <pawin@google.com> h264bsdActivateParamSets: Prevent multiplication overflow. am: 87277aac64 am: 2a68d5279d am: 5dfa5f268e am: a0bb560e3b am: 7c22e59819 am: 548439e243
am: 4d027a6bf5

* commit '4d027a6bf52ff3c82bee40594514faaf74cd27ab':
h264bsdActivateParamSets: Prevent multiplication overflow.

Change-Id: I2a131e52d12277e416cc048e26d2bfaeee6ed37d
4d027a6bf52ff3c82bee40594514faaf74cd27ab 13-May-2016 Pawin Vongmasa <pawin@google.com> h264bsdActivateParamSets: Prevent multiplication overflow. am: 87277aac64 am: 2a68d5279d am: 5dfa5f268e am: a0bb560e3b am: 7c22e59819
am: 548439e243

* commit '548439e243accefdb42d318175aedd281a225da4':
h264bsdActivateParamSets: Prevent multiplication overflow.

Change-Id: I6aea83511caf50e10d2e76ccafbecc0bba68cdf9
7c22e598197706108f15fe182c4bf76fc26b105c 13-May-2016 Pawin Vongmasa <pawin@google.com> h264bsdActivateParamSets: Prevent multiplication overflow. am: 87277aac64 am: 2a68d5279d am: 5dfa5f268e
am: a0bb560e3b

* commit 'a0bb560e3bdbfa96c4184545ed82c17d01025294':
h264bsdActivateParamSets: Prevent multiplication overflow.

Change-Id: I24776d732ce661acf0a3ee1bdb31055a39258c98
a0bb560e3bdbfa96c4184545ed82c17d01025294 13-May-2016 Pawin Vongmasa <pawin@google.com> h264bsdActivateParamSets: Prevent multiplication overflow. am: 87277aac64 am: 2a68d5279d
am: 5dfa5f268e

* commit '5dfa5f268e97d862744ffddc4596577495022bea':
h264bsdActivateParamSets: Prevent multiplication overflow.

Change-Id: I30bba39d44061c72485419ac8686fba2427e3328
5dfa5f268e97d862744ffddc4596577495022bea 13-May-2016 Pawin Vongmasa <pawin@google.com> h264bsdActivateParamSets: Prevent multiplication overflow. am: 87277aac64
am: 2a68d5279d

* commit '2a68d5279d714188c50a32819ae0d0ed2535a763':
h264bsdActivateParamSets: Prevent multiplication overflow.

Change-Id: I00c30eb03aab08cb86afa34ab3e7a86a176b4dda
d7d50415082db3191dd108bd94a898763263055b 13-May-2016 Jeff Tinker <jtinker@google.com> Fix security vulnerability in libstagefright

bug: 28175045
Change-Id: Icee6c7eb5b761da4aa3e412fb71825508d74d38f
RMExtractor.cpp
076315dd77430ea1161fe71090af063412c3cad1 12-May-2016 Vignesh Venkatasubramanian <vigneshv@google.com> Merge "libstagefright: Add VP9 software encoder OMX Component"
87277aac64a21461b657298dcdcb809737347980 12-May-2016 Pawin Vongmasa <pawin@google.com> h264bsdActivateParamSets: Prevent multiplication overflow.

Report MEMORY_ALLOCATION_ERROR if pStorage->picSizeInMbs would
exceed UINT32_MAX bytes.

Bug: 28532266
Change-Id: Ia6f11efb18818afcdb5fa2a38a14f2a2d8c8447a
odecs/on2/h264dec/source/h264bsd_storage.c
669129e4126f2a19db2083a23bab518842484825 12-May-2016 Lajos Molnar <lajos@google.com> Merge "stagefright: move encoders to codec process" into nyc-dev am: 8f407986f6 am: c6af48c5e1
am: 0d701a2e4c

* commit '0d701a2e4cff04889d576aa84964280bb786cfd6':
stagefright: move encoders to codec process

Change-Id: I3267942e0f2d3d7c148a966cd588ffa5f1f3be13
c6af48c5e19ad3395901c513bedb430f40ce8310 12-May-2016 Lajos Molnar <lajos@google.com> Merge "stagefright: move encoders to codec process" into nyc-dev
am: 8f407986f6

* commit '8f407986f69c2387ddd6af3ec35d23766c372941':
stagefright: move encoders to codec process

Change-Id: Iae8c900908312555bafa373b854d5ab612727373
8f407986f69c2387ddd6af3ec35d23766c372941 12-May-2016 TreeHugger Robot <treehugger-gerrit@google.com> Merge "stagefright: move encoders to codec process" into nyc-dev
80b6cae1065ba962d819ccf4af7c5c7a2a57c9e5 12-May-2016 Robert Shih <robertshih@google.com> Merge "HLS: remove EOS notification for live streams" into nyc-dev am: 09363972f9 am: e3fe4ffa35
am: 0af8d2c913

* commit '0af8d2c9133c20a18c7b167b9bf3ada694fa07e5':
HLS: remove EOS notification for live streams

Change-Id: I0b8cf162d7587ea0689ddcd4b1fd56c46554e0f3
328597abaecff9722dcfb4bb4c67964bd82a072a 17-Feb-2016 Vignesh Venkatasubramanian <vigneshv@google.com> libstagefright: Add VP9 software encoder OMX Component

Change-Id: I2f2b0e68a114b086cdcd394a3642ed3b1902aceb
odecs/on2/enc/Android.mk
odecs/on2/enc/SoftVP8Encoder.cpp
odecs/on2/enc/SoftVP8Encoder.h
odecs/on2/enc/SoftVP9Encoder.cpp
odecs/on2/enc/SoftVP9Encoder.h
odecs/on2/enc/SoftVPXEncoder.cpp
odecs/on2/enc/SoftVPXEncoder.h
ata/media_codecs_google_video.xml
mx/SoftOMXPlugin.cpp
0af8d2c9133c20a18c7b167b9bf3ada694fa07e5 12-May-2016 Robert Shih <robertshih@google.com> Merge "HLS: remove EOS notification for live streams" into nyc-dev am: 09363972f9
am: e3fe4ffa35

* commit 'e3fe4ffa3522d0f23decc341efec12c0afb404e0':
HLS: remove EOS notification for live streams

Change-Id: Iac850341b1f045d8485412d2f219f6a305a80a9a
88b54dab14db1d05a03915eb6553bc6f7584961c 12-May-2016 Robert Shih <robertshih@google.com> Merge "HLS: remove EOS notification for live streams" into nyc-dev
am: 09363972f9

* commit '09363972f9c8c87ff3ecd77a9690c680d78b21ff':
HLS: remove EOS notification for live streams

Change-Id: Ia5d6285115598d61599312d655a9d588498c15b0
09363972f9c8c87ff3ecd77a9690c680d78b21ff 12-May-2016 Robert Shih <robertshih@google.com> Merge "HLS: remove EOS notification for live streams" into nyc-dev
494ef3bce0be66f22168f539f4a35b020240f0d6 06-Apr-2016 Vignesh Venkatasubramanian <vigneshv@google.com> Update libwebm include path in MatroskaExtractor

(cherry picked from commit 4e0e8e8a861cc26314072f41ec5111a06bea0feb)

Change-Id: I1cd4cd7399748c3871f5fd633e21cd9f0b8e8c24
atroska/MatroskaExtractor.h
331916a279892f7af04071fcbb8c6f704d2daf62 11-May-2016 Treehugger Robot <treehugger-gerrit@google.com> Merge "codecs: fix MPEG2 decoder resolution change"
b58dea70bc7c64abd23ad51d1ecc0679f503462b 11-May-2016 Harish Mahendrakar <harish.mahendrakar@ittiam.com> Merge changes Icd9d4af6,I55f931b3 into nyc-dev am: 4fa4c691b0 am: 1ad6255901
am: 9eb9888de1

* commit '9eb9888de17eeeda54799ec52b6bfb2716aa5397':
codecs: fix MPEG2 decoder resolution change
codecs: fix AVC decoder resolution change

Change-Id: I441f392ca625ce869a25a6af7ce3cb27da4b935e
9eb9888de17eeeda54799ec52b6bfb2716aa5397 11-May-2016 Harish Mahendrakar <harish.mahendrakar@ittiam.com> Merge changes Icd9d4af6,I55f931b3 into nyc-dev am: 4fa4c691b0
am: 1ad6255901

* commit '1ad6255901717f14422e83e2a4e3c42618647a1a':
codecs: fix MPEG2 decoder resolution change
codecs: fix AVC decoder resolution change

Change-Id: I41783f6a110063bb15a1a523600a4f13d757bd8c
4f5e46d2cfef5e8921d6baae4349426ffedb4e81 11-May-2016 Harish Mahendrakar <harish.mahendrakar@ittiam.com> Merge changes Icd9d4af6,I55f931b3 into nyc-dev
am: 4fa4c691b0

* commit '4fa4c691b01a9f64164a38711eedc0b317ab11d3':
codecs: fix MPEG2 decoder resolution change
codecs: fix AVC decoder resolution change

Change-Id: I89c48de626d13cbd2e6a20dc9da9c62a74aed33c
4fa4c691b01a9f64164a38711eedc0b317ab11d3 11-May-2016 TreeHugger Robot <treehugger-gerrit@google.com> Merge changes Icd9d4af6,I55f931b3 into nyc-dev

* changes:
codecs: fix MPEG2 decoder resolution change
codecs: fix AVC decoder resolution change
407455d231f1d0e134435d0f614b4b79600f1741 11-May-2016 Lajos Molnar <lajos@google.com> Merge "stagefright: properly pass metadata buffers into OMX codec am: d34a8c4d9d am: 93aba7362f" into nyc-mr1-dev-plus-aosp
am: 45d55715d4

* commit '45d55715d4a4d0c6cf58aa508d843d9f93fbc2f6':
stagefright: properly pass metadata buffers into OMX codec

Change-Id: If0f48e2719694affd45450f25938aff6a1413920
8f5489c504939db380a89dd43b1949eb77e4a5ff 11-May-2016 Lajos Molnar <lajos@google.com> stagefright: update & pass graphic buffer properly to OMX am: e63de4c601 am: 46d737a803
am: d94d3f972f

* commit 'd94d3f972f29c79da5ae22decd32bf122a0bc037':
stagefright: update & pass graphic buffer properly to OMX

Change-Id: Iefb2892c4ca3fbf83efec6e5646f8cbd6a891d92
0b8e2c11f6a833e861cec2cafb4c2248490d4f0c 11-May-2016 Lajos Molnar <lajos@google.com> stagefright: properly pass metadata buffers into OMX codec am: d34a8c4d9d
am: 93aba7362f

* commit '93aba7362fbc76a1be515b97c1127b988dbc80d9':
stagefright: properly pass metadata buffers into OMX codec

Change-Id: I1c942e8af051be1677487710bcd22a5a05b31f9d
d94d3f972f29c79da5ae22decd32bf122a0bc037 11-May-2016 Lajos Molnar <lajos@google.com> stagefright: update & pass graphic buffer properly to OMX am: e63de4c601
am: 46d737a803

* commit '46d737a80357631ec0e98250be0f23fc084800eb':
stagefright: update & pass graphic buffer properly to OMX

Change-Id: Ib83bc4bf2b721ea6224a2a030c2c595cefc70bf6
b1302149f69689b805362a116c76c33ecc211ab3 11-May-2016 Lajos Molnar <lajos@google.com> stagefright: properly pass metadata buffers into OMX codec
am: d34a8c4d9d

* commit 'd34a8c4d9d7b197a9f5eb0d324273a6cde7e50a6':
stagefright: properly pass metadata buffers into OMX codec

Change-Id: Ic5fe0737bf6f12099b414cba4de671540e68aabc
d37e1c1070bd777aa6d50afbca4ec7f69bacab07 11-May-2016 Lajos Molnar <lajos@google.com> stagefright: update & pass graphic buffer properly to OMX
am: e63de4c601

* commit 'e63de4c60116261b90bc93b608ccd4bd182f3484':
stagefright: update & pass graphic buffer properly to OMX

Change-Id: Icb837524ce5b9ec1fda7a49006582e5bcbe7bafe
94fc18a6b57e8044f98ae3391f703af93cf17668 09-May-2016 Lajos Molnar <lajos@google.com> stagefright: move encoders to codec process

Also move persistent input surface to the codec process as keeping
it in the media server may impact BQ performance.

Bug: 22775369
Change-Id: Iaedba8011495a598d96e849cc3aee0941ff509b7
MXClient.cpp
d34a8c4d9d7b197a9f5eb0d324273a6cde7e50a6 09-May-2016 Lajos Molnar <lajos@google.com> stagefright: properly pass metadata buffers into OMX codec

Note that android._store-metadata-in-buffers-output remains a
boolean flag.

Bug: 22775369
Change-Id: I77c1ae502634488be15cedff7a6a3b59cf7cd03f
Codec.cpp
e63de4c60116261b90bc93b608ccd4bd182f3484 09-May-2016 Lajos Molnar <lajos@google.com> stagefright: update & pass graphic buffer properly to OMX

Update graphic buffer must update the handle in the proper buffer.
E.g. if using emptyBuffer later, it must update the backup buffer
and use the backup buffer's metadata mode which may differ from the
codec buffer's mode. Also use proper size for filled graphicbuffer.

Bug: 22775369
Change-Id: I9ec7032ed5db4c0636e2e2a4bad32022d251d66b
nclude/OMXNodeInstance.h
mx/OMXNodeInstance.cpp
6b487161fa8d926939327e78c6a6b222b8d13b91 10-May-2016 Vignesh Venkatasubramanian <vigneshv@google.com> Merge "Pass VP9 Codec Specific Data from the Container" into nyc-dev am: 98268270da am: a8a9879879
am: ef50e1545b

* commit 'ef50e1545b4271071a66b6b34a59a71cb96b0ad9':
Pass VP9 Codec Specific Data from the Container

Change-Id: I828fcc2963fdedca75c1bdc096f4cb6f6b0695ec
ef50e1545b4271071a66b6b34a59a71cb96b0ad9 10-May-2016 Vignesh Venkatasubramanian <vigneshv@google.com> Merge "Pass VP9 Codec Specific Data from the Container" into nyc-dev am: 98268270da
am: a8a9879879

* commit 'a8a9879879738f3b790ccd4ce405b2ce1e5dd4ab':
Pass VP9 Codec Specific Data from the Container

Change-Id: I354a2b0bcf6baff05d200743608414b4681e6303
d2119f3976fb93e9e1c2aa1be52adae3df2ca73f 10-May-2016 Vignesh Venkatasubramanian <vigneshv@google.com> Merge "Pass VP9 Codec Specific Data from the Container" into nyc-dev
am: 98268270da

* commit '98268270da9e728f706d4d44260950dc5d1ed6c4':
Pass VP9 Codec Specific Data from the Container

Change-Id: I112db5e859ed47776ca2b1b022c8dc618eb37bab
98268270da9e728f706d4d44260950dc5d1ed6c4 10-May-2016 Vignesh Venkatasubramanian <vigneshv@google.com> Merge "Pass VP9 Codec Specific Data from the Container" into nyc-dev
1ef423ccd884679893b3622c86aae9792b345088 13-Apr-2016 Harish Mahendrakar <harish.mahendrakar@ittiam.com> codecs: fix MPEG2 decoder resolution change

Bug: 28679582
Change-Id: Icd9d4af6552820e6d0ee1a2f7915258613a4901b
(cherry picked from commit 903bac1de1b0763c227464bac46bc5111eba9609)
odecs/mpeg2dec/SoftMPEG2.cpp
odecs/mpeg2dec/SoftMPEG2.h
a34a5cca7791d80bdbfe0ef9659e1f991ad23e78 13-Apr-2016 Harish Mahendrakar <harish.mahendrakar@ittiam.com> codecs: fix AVC decoder resolution change

Bug: 28679582
Change-Id: I55f931b39fbeb78b908c5658fca5a11fe7a61380
(cherry picked from commit 8e749bc7a29044529792b8f32e37b349647855bc)
odecs/avcdec/SoftAVCDec.cpp
c5911aa82343907ad9c8254847673fa5c2101d62 10-May-2016 Lajos Molnar <lajos@google.com> Merge "stagefright: IOMX: pass native handle in sp<NativeHandle>" into nyc-dev am: 038ccfd6ff am: 10dac29441
am: 4c23141394

* commit '4c2314139420e78284d4a36674a903aa210c8657':
stagefright: IOMX: pass native handle in sp<NativeHandle>

Change-Id: Ida0bc478ea3cd02a978f4af1ac9c824f12c146c2
10dac29441a24144029e8a194d07eb17db40b7e5 10-May-2016 Lajos Molnar <lajos@google.com> Merge "stagefright: IOMX: pass native handle in sp<NativeHandle>" into nyc-dev
am: 038ccfd6ff

* commit '038ccfd6ff5a32d6f559e5b479d6f8e55d0b5133':
stagefright: IOMX: pass native handle in sp<NativeHandle>

Change-Id: I31d255bea906aca9ae23f5f4678d6557bc84052b
038ccfd6ff5a32d6f559e5b479d6f8e55d0b5133 10-May-2016 Lajos Molnar <lajos@google.com> Merge "stagefright: IOMX: pass native handle in sp<NativeHandle>" into nyc-dev
1b40f2804a27b695e9e53fb1699b64cb0dd387f9 10-May-2016 Lajos Molnar <lajos@google.com> stagefright: IOMX: pass native handle in sp<NativeHandle>

This clarifies ownership of the native handle

Bug: 28644266
Bug: 27856976
Change-Id: I7a617513d7ac93dd58d74af9469663418735aaf3
Codec.cpp
MXClient.cpp
nclude/OMX.h
nclude/OMXNodeInstance.h
mx/OMX.cpp
mx/OMXNodeInstance.cpp
57c7f5a7cf8b52a3f14954071598179818a60b18 10-May-2016 Lajos Molnar <lajos@google.com> Merge changes I58b03acd,I7d7eb086 into nyc-dev am: 0d0a8b48d2 am: f1a0ec37b9
am: f2a4c632b2

* commit 'f2a4c632b254a176ddccb4d78af2d2a8c7231060':
stagefright: untangle metadata-mode handling
stagefright: add a way to update native handle in OMX buffers

Change-Id: I7953e6e5317121098e82f5cb9abfac4c4255d203
f2a4c632b254a176ddccb4d78af2d2a8c7231060 10-May-2016 Lajos Molnar <lajos@google.com> Merge changes I58b03acd,I7d7eb086 into nyc-dev am: 0d0a8b48d2
am: f1a0ec37b9

* commit 'f1a0ec37b9edd755ba95835acedd6673dfd947e2':
stagefright: untangle metadata-mode handling
stagefright: add a way to update native handle in OMX buffers

Change-Id: I9d1b51e1c6f486f1c8fe36383adcc4261b056256
b7e75437b160fd8fe239f62f690af6ff0c2a7df6 10-May-2016 Lajos Molnar <lajos@google.com> Merge changes I58b03acd,I7d7eb086 into nyc-dev
am: 0d0a8b48d2

* commit '0d0a8b48d267a1980cfd9507b51d173756835f34':
stagefright: untangle metadata-mode handling
stagefright: add a way to update native handle in OMX buffers

Change-Id: I857573724b0a4f7b38832777b12caa8666ac210b
0d0a8b48d267a1980cfd9507b51d173756835f34 10-May-2016 TreeHugger Robot <treehugger-gerrit@google.com> Merge changes I58b03acd,I7d7eb086 into nyc-dev

* changes:
stagefright: untangle metadata-mode handling
stagefright: add a way to update native handle in OMX buffers
c523447fac5c93306ad0be1b4ff40a476f7483b8 10-May-2016 Pawin Vongmasa <pawin@google.com> Merge "AMessage::FromParcel(): Limit recursion depth; report NULL on failure." into nyc-dev am: 6393ea6915 am: 38616ced5b
am: 68616ca46b

* commit '68616ca46bc838d0ebccb6d2a107aa6288b04a57':
AMessage::FromParcel(): Limit recursion depth; report NULL on failure.

Change-Id: I683de3cffeb77ae8cd496fdcd92482b5c416ca60
38616ced5b3d0e19389a20c7f7472d842bae1990 10-May-2016 Pawin Vongmasa <pawin@google.com> Merge "AMessage::FromParcel(): Limit recursion depth; report NULL on failure." into nyc-dev
am: 6393ea6915

* commit '6393ea6915e7e6fede4cee31bab0d373ce90211b':
AMessage::FromParcel(): Limit recursion depth; report NULL on failure.

Change-Id: I9cef657c3701d0443d21476c81c8cd1ed62b637b
3e328782f1e1061d08ea0c45b855cc418a2d9ea6 09-May-2016 Lajos Molnar <lajos@google.com> stagefright: untangle metadata-mode handling

- specify requested metadata mode from producers to OMX
- (pass requested metadata in IOMX::storeMetadataInBuffers)
- use correct logic for native handle source
- use native handle source for encoded meta buffers

Bug: 22775369
Change-Id: I58b03acd3e9a5367d5010d7f87b7af5cae23362c
Codec.cpp
ameraSource.cpp
ediaCodecSource.cpp
urfaceMediaSource.cpp
mx/OMXNodeInstance.cpp
ests/Android.mk
ifi-display/Android.mk
ifi-display/source/PlaybackSession.cpp
7e0bef8aa6bf9db06079b743794ec2712ad84431 09-May-2016 Lajos Molnar <lajos@google.com> stagefright: add a way to update native handle in OMX buffers

Bug: 22775369
Change-Id: I7d7eb0868fef896d1cb0a45bec759a00f0783673
MXClient.cpp
nclude/OMX.h
nclude/OMXNodeInstance.h
mx/OMX.cpp
mx/OMXNodeInstance.cpp
d0d32c0d39b56d7e85fcaa61f3245ac7bbb1f9eb 26-Apr-2016 Vignesh Venkatasubramanian <vigneshv@google.com> Pass VP9 Codec Specific Data from the Container

WebM container now has a provision to specify the VP9 Profile
and Level information in the container. Pass it to the Decoder as
Codec-Specific-Data. The software VP9 decoder will merely ignore
it.

Bug: 28152818
Bug: 28380207
Bug: 25684127

Change-Id: I77e2dc333093a346df6671e5f8d6d918ed45f7fb
tils.cpp
odecs/on2/dec/SoftVPX.cpp
atroska/MatroskaExtractor.cpp
8dab17305ff72298e2b4874592ac72c004c392d8 03-May-2016 Pawin Vongmasa <pawin@google.com> AMessage::FromParcel(): Limit recursion depth; report NULL on failure.

- FromParcel() now takes as an optional parameter the maximum recursion depth.
(The default value is currently set to 255.) On the event that the input
parcel has AMessage nested deeper than the maximum recursion depth,
FromParcel() will return NULL.
- Also, when the input parcel has items that are not recognized by FromParcel(),
NULL will be returned. (The old behavior was to invoke TRESPASS, which would
cause the process to stop.)

Bug: 28332724
Change-Id: I722097f7d1711668f197651d7e8135d703f6c91f
oundation/AMessage.cpp
5f5a47570ff5b17b90c0a8646ac5be645bbd8f45 06-May-2016 Hangyu Kuang <hkuang@google.com> Merge "media: Drop CSD buffer if VP9 decoder does not advertise profiles." into nyc-dev am: 260ae76207 am: d434543850
am: da089da926

* commit 'da089da9266689343d20871b7fc36a3e2a98efeb':
media: Drop CSD buffer if VP9 decoder does not advertise profiles.

Change-Id: I55c9bc286ed7096243a7a95afda8d034a4a42408
da089da9266689343d20871b7fc36a3e2a98efeb 06-May-2016 Hangyu Kuang <hkuang@google.com> Merge "media: Drop CSD buffer if VP9 decoder does not advertise profiles." into nyc-dev am: 260ae76207
am: d434543850

* commit 'd434543850b90e325e7c99ef512abef061ecde32':
media: Drop CSD buffer if VP9 decoder does not advertise profiles.

Change-Id: Ibbbad531f354eeb9d60db288d27af0d67183598a
4ae323feec80305ec7616ed021e01928c86e7653 06-May-2016 Hangyu Kuang <hkuang@google.com> Merge "media: Drop CSD buffer if VP9 decoder does not advertise profiles." into nyc-dev
am: 260ae76207

* commit '260ae76207ab15948113418e7ea05f1ca2dae71b':
media: Drop CSD buffer if VP9 decoder does not advertise profiles.

Change-Id: I93cec7f910a72e64e52baed6e75194a24e137f26
260ae76207ab15948113418e7ea05f1ca2dae71b 06-May-2016 Hangyu Kuang <hkuang@google.com> Merge "media: Drop CSD buffer if VP9 decoder does not advertise profiles." into nyc-dev
da048fbdfe9a835edad8879bda07d80714a9c24f 06-May-2016 Marco Nelissen <marcone@google.com> Merge "Determine frame rate from trex box if stsz box is empty" into nyc-dev am: e0c4cfee54 am: a3e5d028f5
am: 12c8906faf

* commit '12c8906faf44737365b43bce33d8a75b6f486d3c':
Determine frame rate from trex box if stsz box is empty

Change-Id: I36a6b19003638973d11ed6fd6953949c2d914159
a3e5d028f5257f6a81335766672a85da95ff647d 06-May-2016 Marco Nelissen <marcone@google.com> Merge "Determine frame rate from trex box if stsz box is empty" into nyc-dev
am: e0c4cfee54

* commit 'e0c4cfee5429d166abdeb95405f9dbe76615575b':
Determine frame rate from trex box if stsz box is empty

Change-Id: Ifcdfea63a35b3a198bf41e7f9adfc24555271bc1
4f601e8c9a9203aab38e0c6ac61b9fa65effcd33 06-May-2016 Robert Shih <robertshih@google.com> HLS: remove EOS notification for live streams

If fetched beyond the end of a live playlist, refresh the playlist and
retry the download after appropriate delay.

Bug: 28320768
Change-Id: I073f3b80b06a4731049793bc5efe50974c153a6c
ttplive/PlaylistFetcher.cpp
949d857ea24950ff920820b4ccf78133dcc737d1 06-May-2016 Marco Nelissen <marcone@google.com> Determine frame rate from trex box if stsz box is empty

Bug: 28591845
Change-Id: I7deaa78815c5b1a3f8dac8604f0f236c6a4dc0c5
PEG4Extractor.cpp
f88dc1865408506f69c858818ea05f5248ff4462 03-May-2016 Hangyu Kuang <hkuang@google.com> media: Drop CSD buffer if VP9 decoder does not advertise profiles.

Bug:28380207
Change-Id: I055a803ce07e7169d5de8da7143e9601352e103b
Codec.cpp
4346f25b0c5477b2839d64277aaf1546f8440cc6 05-May-2016 Chih-hung Hsieh <chh@google.com> Merge "Fix google-explicit-constructor warnings."
cf0c1b2356f59cfd6760513237812f8da55613fd 05-May-2016 Marco Nelissen <marcone@google.com> Merge "Prevent NULL pointer access via implicit conversion"
d6bd6f34cf63f873472545b95c4c1cd0f5991abf 04-May-2016 Justin Chuang <jchuang@google.com> Merge "Allow RGBX8888 in soft video encoder" into nyc-dev am: 0277976e81 am: 2232e34d8b
am: fb0876fc68

* commit 'fb0876fc68cba2ac9c519f9b7561210ad0ae1c81':
Allow RGBX8888 in soft video encoder

Change-Id: Ie143daf350cb34a8d01797208ccd5a84aac1d081
fb0876fc68cba2ac9c519f9b7561210ad0ae1c81 04-May-2016 Sheng-hao Tsao <shenghao@google.com> Merge "Allow RGBX8888 in soft video encoder" into nyc-dev am: 0277976e81
am: 2232e34d8b

* commit '2232e34d8bcc796833e37a2303ccf71f58b8fc26':
Allow RGBX8888 in soft video encoder

Change-Id: Ifece7d68387c522f68b2b78e053ed9c8179af22d
5fa779d9c1acbebc562dabefc1f6d857b22fe4fb 04-May-2016 Justin Chuang <jchuang@google.com> Merge "Allow RGBX8888 in soft video encoder" into nyc-dev
am: 0277976e81

* commit '0277976e8118ac493440049affeb1fce1f08598e':
Allow RGBX8888 in soft video encoder

Change-Id: I437c37da24c91bfe706aef873ea97c864ddd9e50
0277976e8118ac493440049affeb1fce1f08598e 04-May-2016 Sheng-hao Tsao <shenghao@google.com> Merge "Allow RGBX8888 in soft video encoder" into nyc-dev
075999616e5764462316f31ce628146c1174b1d5 29-Apr-2016 Justin Chuang <jchuang@google.com> Allow RGBX8888 in soft video encoder

BUG=27844478,28550227
TEST=android.hardware.camera2.cts.RecordingTest will pass
Change-Id: Ib669d4a2447bb5d76b9d0cdc34469cad77a98ee2
mx/SoftVideoEncoderOMXComponent.cpp
36834798830a892be330eb0b2978f4a8561e3b79 04-May-2016 Marco Nelissen <marcone@google.com> Merge "Check section size when verifying CRC" into mnc-dev am: fd9e18a00d am: 4a46a277f8 am: 8f53b71bf3 am: c920b2c27f am: b2e7ceb874 am: c6e6d22382
am: 67f3fe9694

* commit '67f3fe9694f2850c9cc330f1956431f08a698073':
Check section size when verifying CRC

Change-Id: Ic0a65f8383fee420525fa328e5d38f83b5c60bee
67f3fe9694f2850c9cc330f1956431f08a698073 04-May-2016 Marco Nelissen <marcone@google.com> Merge "Check section size when verifying CRC" into mnc-dev am: fd9e18a00d am: 4a46a277f8 am: 8f53b71bf3 am: c920b2c27f am: b2e7ceb874
am: c6e6d22382

* commit 'c6e6d22382c5ffc6d28bdfa0e835c1e6f7eecd4f':
Check section size when verifying CRC

Change-Id: I4ccba6733b397654381fe4200d0a92ec84826dd1
efee87b357d09e09aa58bcee2b5fb19154c666c4 04-May-2016 Marco Nelissen <marcone@google.com> Merge "Check section size when verifying CRC" into mnc-dev am: fd9e18a00d am: 4a46a277f8 am: 8f53b71bf3 am: c920b2c27f
am: b2e7ceb874

* commit 'b2e7ceb874b7fe5a6c1b3a72a42f09969edf445f':
Check section size when verifying CRC

Change-Id: I9e183d87625f252868b3f888de837659cf292343
b2e7ceb874b7fe5a6c1b3a72a42f09969edf445f 04-May-2016 Marco Nelissen <marcone@google.com> Merge "Check section size when verifying CRC" into mnc-dev am: fd9e18a00d am: 4a46a277f8 am: 8f53b71bf3
am: c920b2c27f

* commit 'c920b2c27fc81b9ae305f8213fedb48803facee5':
Check section size when verifying CRC

Change-Id: I6ef0f68ff63469c1e6da0b7eab3fe946058573ac
c920b2c27fc81b9ae305f8213fedb48803facee5 04-May-2016 Marco Nelissen <marcone@google.com> Merge "Check section size when verifying CRC" into mnc-dev am: fd9e18a00d am: 4a46a277f8
am: 8f53b71bf3

* commit '8f53b71bf345c5e0306d0f1078dd745e316c69c4':
Check section size when verifying CRC

Change-Id: I87a5a52e2dfe99a4be2457a39185e3828e6c7c9f
8f53b71bf345c5e0306d0f1078dd745e316c69c4 04-May-2016 Marco Nelissen <marcone@google.com> Merge "Check section size when verifying CRC" into mnc-dev am: fd9e18a00d
am: 4a46a277f8

* commit '4a46a277f82d738e27ec0866a9f5b30d55b19526':
Check section size when verifying CRC

Change-Id: I20c63cff2b29723437ebafe44bf7b6b9e8333ead
4a46a277f82d738e27ec0866a9f5b30d55b19526 04-May-2016 Marco Nelissen <marcone@google.com> Merge "Check section size when verifying CRC" into mnc-dev
am: fd9e18a00d

* commit 'fd9e18a00d84557d3f8caadc6eacd1a5c587fff9':
Check section size when verifying CRC

Change-Id: If74362153115c89dec30899ca8ce2e0bcd9976b1
29c9121904ca8f6b230ead9a8967996df9ac0a06 13-Apr-2016 Harish Mahendrakar <harish.mahendrakar@ittiam.com> codecs: fix AVC decoder resolution change

Change-Id: I55f931b39fbeb78b908c5658fca5a11fe7a61380
odecs/avcdec/SoftAVCDec.cpp
e098bb4ea33852f3a3c61901aab6800a2d497109 13-Apr-2016 Harish Mahendrakar <harish.mahendrakar@ittiam.com> codecs: fix MPEG2 decoder resolution change

Change-Id: Icd9d4af6552820e6d0ee1a2f7915258613a4901b
odecs/mpeg2dec/SoftMPEG2.cpp
odecs/mpeg2dec/SoftMPEG2.h
89b2a0ad367cdff5ff4e70036311ecf82921a829 03-May-2016 Marco Nelissen <marcone@google.com> Prevent NULL pointer access via implicit conversion

Prevent implicit conversion of a NULL char* to AString in MediaCodecInfo,
and make AString itself more robust.

Bug: 26385693
Change-Id: I4b6185bdf7c3390d571c71e94fd531bafc3f813e
oundation/AString.cpp
64a2870d8515fd914638c60803db86dbd92f5b06 03-May-2016 Chih-Hung Hsieh <chh@google.com> Fix google-explicit-constructor warnings.

Bug: 28341362
Change-Id: I11fe54e9e968d8a53a66d5b1cefca9026d5a9d7a
ediaExtractor.cpp
7fa2b55d87a4e9123bfe890ebd6ab023929999a9 03-May-2016 Marco Nelissen <marcone@google.com> Merge "MPEG4Extractor: limit recursion depth when parsing"
dd2d81b49d22642b15ac6dcbc5ad59d0c6f5c227 03-May-2016 Marco Nelissen <marcone@google.com> MPEG4Extractor: limit recursion depth when parsing

to avoid stack exhaustion.

Bug: 27456299
Change-Id: Iac61e75066f620a89e42d4f2af3f63e0fb4927fd
PEG4Extractor.cpp
49ac2a724c82f5670a811ae74551a5e9c529bb69 02-May-2016 Chih-Hung Hsieh <chh@google.com> resolve merge conflicts of 98a9b2a to nyc-dev-plus-aosp am: 47734c9509
am: 7e34612e2b

* commit '7e34612e2b5db65ecff13ff65b3816fffb7a0974':
Fix google-explicit-constructor warnings.

Change-Id: I5b1e3eae1348800c288e30845c6eb6d1bf69e72f
47734c9509ecb472c2844cae46e2d916b9358321 02-May-2016 Chih-Hung Hsieh <chh@google.com> resolve merge conflicts of 98a9b2a to nyc-dev-plus-aosp

Change-Id: Iae0a5cb698807d74ba28878d7ce1f69b6ba5219a
97b2c330950d7b01352933fbab2ac9123728f9a1 02-May-2016 Chien-Yu Chen <cychen@google.com> Merge "Camera: Fix passing video native handle for 64-bit app" into nyc-dev am: 9e23567ed0 am: e7adbfb233
am: e6eff1af18

* commit 'e6eff1af18bf6410a1afa062f3503f00c88d1cbc':
Camera: Fix passing video native handle for 64-bit app

Change-Id: Ic67211603f3d260520e2aed2069f15a21ab70695
e6eff1af18bf6410a1afa062f3503f00c88d1cbc 02-May-2016 Chien-Yu Chen <cychen@google.com> Merge "Camera: Fix passing video native handle for 64-bit app" into nyc-dev am: 9e23567ed0
am: e7adbfb233

* commit 'e7adbfb233b4784dad0dbe0f873297895e8330c5':
Camera: Fix passing video native handle for 64-bit app

Change-Id: If940696a1ebd4c2b3294151627a63d2daecd581f
20be7bf5ba6f3d4db36686d5af4316006cf9bb27 02-May-2016 Chien-Yu Chen <cychen@google.com> Merge "Camera: Fix passing video native handle for 64-bit app" into nyc-dev
am: 9e23567ed0

* commit '9e23567ed02c30bb390ffe56b25f59b626cd9eab':
Camera: Fix passing video native handle for 64-bit app

Change-Id: I1bc16ac12f98f969ab9d54b43fdda90fc462c300
9e23567ed02c30bb390ffe56b25f59b626cd9eab 02-May-2016 Chien-Yu Chen <cychen@google.com> Merge "Camera: Fix passing video native handle for 64-bit app" into nyc-dev
2d13b1d3eeaba31d8c15acc6037fd68b150a9a66 28-Apr-2016 Chien-Yu Chen <cychen@google.com> Camera: Fix passing video native handle for 64-bit app

Add new binder calls to pass video native handle so the video native
handle can be passed between 32-bit and 64-bit processes.

Remove problematic code that used IMemory to pass video native
handle because the sizes of VideoNativeMetadata are different in
32-bit and 64-bit processes.

Bug: 28403412
Change-Id: I3341b1812ecc41d61846bb72ca926ecb1674c9ec
ameraSource.cpp
ameraSourceTimeLapse.cpp
32201eaa3582044bc6e83584ea5a8eed26036b8b 29-Apr-2016 Marco Nelissen <marcone@google.com> Merge "Fix more potential overflows in amrwbenc" into nyc-dev am: 5bdfad1a45 am: 8ec0473565
am: 4a5531015c

* commit '4a5531015c5439f683280a388ca8e978c153093e':
Fix more potential overflows in amrwbenc

Change-Id: Id3af2404f8cd6d9035aafcd448f8420522aefb16
4a5531015c5439f683280a388ca8e978c153093e 29-Apr-2016 Marco Nelissen <marcone@google.com> Merge "Fix more potential overflows in amrwbenc" into nyc-dev am: 5bdfad1a45
am: 8ec0473565

* commit '8ec0473565236063e149e8c005e7c6bc039402ed':
Fix more potential overflows in amrwbenc

Change-Id: Ideb0e977d6a2d9af0190246814f34d7a0aa965ac
267acea1a23175731f32b53e0019fd1c168da187 29-Apr-2016 Marco Nelissen <marcone@google.com> Merge "Fix more potential overflows in amrwbenc" into nyc-dev
am: 5bdfad1a45

* commit '5bdfad1a45a7d5fd03732c75768eef65975660dc':
Fix more potential overflows in amrwbenc

Change-Id: Ieb9c17d1045b373b2b7fbb4704e3de076f62ae39
5bdfad1a45a7d5fd03732c75768eef65975660dc 29-Apr-2016 Marco Nelissen <marcone@google.com> Merge "Fix more potential overflows in amrwbenc" into nyc-dev
753f14711df8c15eb8469b348f2b775ca4e59d9d 29-Apr-2016 Marco Nelissen <marcone@google.com> Merge "Fix integer overflow in amrwbdec" into nyc-dev am: 30dfd456ff am: d59d562d68
am: 2286cf8b3e

* commit '2286cf8b3efc5997070a3020740952f854c73f9a':
Fix integer overflow in amrwbdec

Change-Id: I8ed47669d740d4161745bac36926ea9ee0be88ff
2286cf8b3efc5997070a3020740952f854c73f9a 29-Apr-2016 Marco Nelissen <marcone@google.com> Merge "Fix integer overflow in amrwbdec" into nyc-dev am: 30dfd456ff
am: d59d562d68

* commit 'd59d562d688cc5d4a965966c7cbe3ad490bc52d7':
Fix integer overflow in amrwbdec

Change-Id: I0828e450e878c8c6f4566fb1da4a6d6fada87dc5
272164c3c28c8110dd1867cd713dc09d23756d6c 29-Apr-2016 Marco Nelissen <marcone@google.com> Merge "Fix integer overflow in amrwbdec" into nyc-dev
am: 30dfd456ff

* commit '30dfd456ff3a37fd95b1d12ad2ef3282126ad260':
Fix integer overflow in amrwbdec

Change-Id: I4e273f9a8f4aa6b1c8ca05fca2254e87621d138b
30dfd456ff3a37fd95b1d12ad2ef3282126ad260 29-Apr-2016 Marco Nelissen <marcone@google.com> Merge "Fix integer overflow in amrwbdec" into nyc-dev
ef384d17fb870ba3c196b29b858a015c76864578 28-Apr-2016 Marco Nelissen <marcone@google.com> Fix more potential overflows in amrwbenc

Bug: 28268307
Change-Id: Ibe32bee8c73950e3a9cae13bd4b516f9c7428673
odecs/amrwbenc/src/c4t64fx.c
51fb5e9931b5585cd4ff60328a93fdf30752eea4 28-Apr-2016 Marco Nelissen <marcone@google.com> Fix integer overflow in amrwbdec

The existing code did its own after-the-fact overflow checks.
Replace it with before-the-fact checks.

Bug: 28387859
Change-Id: Iea7e2055d0c0de54120b09a7a00df8a0a9192388
odecs/amrwb/src/pvamrwbdecoder_basic_op_cequivalent.h
c0c9f50d15f7b9ed539c0c6277296d083f41b293 28-Apr-2016 Marco Nelissen <marcone@google.com> Check section size when verifying CRC

Bug: 28333006
Change-Id: Ief7a2da848face78f0edde21e2f2009316076679
peg2ts/ATSParser.cpp
090ef604f81447eab4aa0a5b45d6307482573560 27-Apr-2016 Chih-Hung Hsieh <chh@google.com> Fix google-explicit-constructor warnings.

Bug: 28341362
Change-Id: I625fbab25f16282c2ea929cd16283d9d146fa17b
Codec.cpp
ameraSource.cpp
LACExtractor.cpp
PEG2TSWriter.cpp
PEG4Extractor.cpp
ediaCodec.cpp
ediaCodecSource.cpp
uCachedSource2.cpp
MXClient.cpp
ggExtractor.cpp
oundation/ANetworkSession.cpp
ttplive/M3UParser.cpp
atroska/MatroskaExtractor.cpp
mx/OMX.cpp
mx/OMXNodeInstance.cpp
ests/SurfaceMediaSource_test.cpp
ifi-display/source/WifiDisplaySource.cpp
3e2ddbe3635f372da03b0e1c7735ec7414472e87 26-Apr-2016 Hangyu Kuang <hkuang@google.com> Merge "Stagefright: Add HDRStaticInfo support for encoder." into nyc-dev am: 1302f9d am: 725b5ed
am: 581c123

* commit '581c1234e911075937665f53999312d486452f63':
Stagefright: Add HDRStaticInfo support for encoder.

Change-Id: I2bb591660462f73999dbea80b4a2c6bdcaf46ada
581c1234e911075937665f53999312d486452f63 26-Apr-2016 Hangyu Kuang <hkuang@google.com> Merge "Stagefright: Add HDRStaticInfo support for encoder." into nyc-dev am: 1302f9d
am: 725b5ed

* commit '725b5edd4aa6efd0de837efa55b86583b75ec9fd':
Stagefright: Add HDRStaticInfo support for encoder.

Change-Id: I609794f452174c6213effea821d08c23396aef02
ba890f84a37e49e5876fc446b73d7ec01d70578b 26-Apr-2016 Hangyu Kuang <hkuang@google.com> Merge "Stagefright: Add HDRStaticInfo support for encoder." into nyc-dev
am: 1302f9d

* commit '1302f9ddd27c89f73cc7790d518f8fc88d89560c':
Stagefright: Add HDRStaticInfo support for encoder.

Change-Id: I342b60a212d3c1ffb757d97179a5c12b0a53a4a4
1302f9ddd27c89f73cc7790d518f8fc88d89560c 26-Apr-2016 Hangyu Kuang <hkuang@google.com> Merge "Stagefright: Add HDRStaticInfo support for encoder." into nyc-dev
04600141a488e1ea4c9b7492414fd61bbc35bdea 26-Apr-2016 Marco Nelissen <marcone@google.com> Fix build am: 84d7e87
am: 292d3b8

* commit '292d3b885fa24b34fd481a4723badb8307086c8c':
Fix build

Change-Id: I4d477259fdfd278a666495d448e1680967c770ea
611b799749d11b1788f743417f88e4f09ca9c06f 25-Apr-2016 Marco Nelissen <marcone@google.com> resolve merge conflicts of 89c03a3 to nyc-dev-plus-aosp am: 20cb827
am: 9cd049b

* commit '9cd049b8adea2a21fbbb5e792b3bec3f1d2aa53a':
Fix gapless SBR

Change-Id: If68e4598a8014778747f6841e06a2811053be2ed
84d7e874983ee0d66db328c454fa603374d4635f 25-Apr-2016 Marco Nelissen <marcone@google.com> Fix build

Change-Id: I2d95eb0ce701e3998366f675c86647e1cb3f343c
Codec.cpp
20cb827ac527bb3f62e6009470ad0d595240807e 25-Apr-2016 Marco Nelissen <marcone@google.com> resolve merge conflicts of 89c03a3 to nyc-dev-plus-aosp

Change-Id: Iadc9712436524303be184c60a622ef79f0efb3e7
b6e9b8919c9ba25afc0f7f55ee3933f5d9f24dc8 25-Apr-2016 Marco Nelissen <marcone@google.com> Fix gapless SBR

Padding and delay in the file are expressed in terms of the base
sample rate, not in terms of the (doubled) SBR rate.

Change-Id: I3b59ec6281889d24a888c6a079731b05a120807f
Codec.cpp
d591289446ad9d9b42a9c1336023b07278000d63 25-Apr-2016 Marco Nelissen <marcone@google.com> Merge "Fix overflow in PCR calculations" into nyc-dev am: 35443e3 am: 0f75d20
am: 506a86c

* commit '506a86c278d76442764f4144c2bd141c8f266cec':
Fix overflow in PCR calculations

Change-Id: I6a28c85f496e6201ee35748579d403491e06812e
0f75d202d4c2f8bc190e5356fd00073363a76845 25-Apr-2016 Marco Nelissen <marcone@google.com> Merge "Fix overflow in PCR calculations" into nyc-dev
am: 35443e3

* commit '35443e32bfe0960dc6a6564426054b104977b143':
Fix overflow in PCR calculations

Change-Id: I1bda281a4cc1567e4588ad27a7bf705eb06d7f46
35443e32bfe0960dc6a6564426054b104977b143 25-Apr-2016 Marco Nelissen <marcone@google.com> Merge "Fix overflow in PCR calculations" into nyc-dev
995d39cc23949569ea3a689985812ee923da5d4f 23-Apr-2016 Marco Nelissen <marcone@google.com> Merge "DO NOT MERGE Verify OMX buffer sizes prior to access" into lmp-mr1-dev am: 0822864
am: c90ba30

* commit 'c90ba3056712a9c0ef6383fb00dc3b9c9b0edbc7':
DO NOT MERGE Verify OMX buffer sizes prior to access

Change-Id: I42551c5f62380f422257f80a933ccd301674a041
4e7e759a493d5fbb449917283d79ab4e4dfe3eae 22-Apr-2016 Marco Nelissen <marcone@google.com> Merge "More OMX struct checking" into mnc-dev am: 4040b13b07 am: 05202f5 am: ff5d1bb am: 8b5f271 am: 861f358 am: 16bacd9
am: 677140a

* commit '677140a4720e0030ba39547fd9950322062c0247':
More OMX struct checking

Change-Id: I34cfe58fa5f9f05c7485399896fc33011bbae39e
16bacd9c825b99bbf53b42271f9dc2546347154b 22-Apr-2016 Marco Nelissen <marcone@google.com> Merge "More OMX struct checking" into mnc-dev am: 4040b13b07 am: 05202f5 am: ff5d1bb am: 8b5f271
am: 861f358

* commit '861f358a4b420517c2fbc9a33558fe5c964ccbd8':
More OMX struct checking

Change-Id: Iba1ebfe17aeabd5a22b1ae72eb6017d7471e6303
861f358a4b420517c2fbc9a33558fe5c964ccbd8 22-Apr-2016 Marco Nelissen <marcone@google.com> Merge "More OMX struct checking" into mnc-dev am: 4040b13b07 am: 05202f5 am: ff5d1bb
am: 8b5f271

* commit '8b5f271f006dc07d2875bfebe32f59e8f1230ab2':
More OMX struct checking

Change-Id: I6e98cb098254e9ad10ae7d4ae3eaf84b3f76928c
8b5f271f006dc07d2875bfebe32f59e8f1230ab2 22-Apr-2016 Marco Nelissen <marcone@google.com> Merge "More OMX struct checking" into mnc-dev am: 4040b13b07 am: 05202f5
am: ff5d1bb

* commit 'ff5d1bb0ea9e377cae80c9255758b037692ab25d':
More OMX struct checking

Change-Id: Ic831540ff9a78c16e65c07dda7c6095c5171f194
ff5d1bb0ea9e377cae80c9255758b037692ab25d 22-Apr-2016 Marco Nelissen <marcone@google.com> Merge "More OMX struct checking" into mnc-dev am: 4040b13b07
am: 05202f5

* commit '05202f57f291d78c502bdf4228bd871ba224b7df':
More OMX struct checking

Change-Id: Id4afbbc1ed61a030bd7376fec96db209f51019ec
05202f57f291d78c502bdf4228bd871ba224b7df 22-Apr-2016 Marco Nelissen <marcone@google.com> Merge "More OMX struct checking" into mnc-dev
am: 4040b13b07

* commit '4040b13b07b5990cd1eb14ff8661aee18d4c3ab9':
More OMX struct checking

Change-Id: Ib9e2bf593ce250b01f8e5dabcae557bd719e12e1
f54f5b54bd5bd78e045fbf9dbc6462d0720f1ff6 22-Apr-2016 Marco Nelissen <marcone@google.com> Merge "DO NOT MERGE More OMX struct checking" into klp-dev am: c002126cb0
am: e25ff0130e

* commit 'e25ff0130ef9fa184afb87e92c184172c8a96f71':
DO NOT MERGE More OMX struct checking

Change-Id: Ia9767e906a247c330031837c3b0b6415e319c836
4040b13b07b5990cd1eb14ff8661aee18d4c3ab9 22-Apr-2016 Marco Nelissen <marcone@google.com> Merge "More OMX struct checking" into mnc-dev
c002126cb05b1d640c0a0b51bc0de810a62ab2b1 22-Apr-2016 Marco Nelissen <marcone@google.com> Merge "DO NOT MERGE More OMX struct checking" into klp-dev
21f6a618b5a2969ba5892f35db22cd24eaf88353 22-Apr-2016 Robert Shih <robertshih@google.com> Merge "Merge "HLS: clear ATSParser fully on explicit discontinuity" into nyc-dev am: 7d1daf4ff0 am: d966c6c024" into nyc-mr1-dev-plus-aosp
am: c7ad679605

* commit 'c7ad679605fd14c7f777ae124e1d342cb41b7c32':
HLS: clear ATSParser fully on explicit discontinuity

Change-Id: Ia43e6de95094c4bfb24bee65dca2dc82708ffe36
6934d8f57175d95d40b00e09af962141dd728c3d 22-Apr-2016 Robert Shih <robertshih@google.com> Merge "Merge "HLS: left zero fill 128 bit AES IV" into nyc-dev am: 9c1b24689f am: 5501207ce6" into nyc-mr1-dev-plus-aosp
am: 14d55b2de3

* commit '14d55b2de30ae2e5545e23feda781692f8baeaef':
HLS: left zero fill 128 bit AES IV

Change-Id: I9bcf98bc47d7c42e2aef2678f5c2958b153f30ae
d3a0ce898821e96b5070549993d37edc950cd44b 22-Apr-2016 Robert Shih <robertshih@google.com> Merge "HLS: handle EXT-X-DISCONTINUITY-SEQUENCE correctly" into nyc-dev am: 10486e556d am: e662bd5c99
am: 11265757de

* commit '11265757de095bbdce4029a6c30e31ebcfacdbdb':
HLS: handle EXT-X-DISCONTINUITY-SEQUENCE correctly

Change-Id: Ifbbb1ad883c936db687bac7f13cdf0abf62bdb8a
d966c6c024dee77ab3d0812acd3cce3dfef3c606 22-Apr-2016 Robert Shih <robertshih@google.com> Merge "HLS: clear ATSParser fully on explicit discontinuity" into nyc-dev
am: 7d1daf4ff0

* commit '7d1daf4ff0f2f1127581a279c6c5a9f92ec20966':
HLS: clear ATSParser fully on explicit discontinuity

Change-Id: I2e5d36a2481f0f9c1a296bc61b4b6774a0c96da9
5501207ce67869277f939422b3b0e192609c20ea 22-Apr-2016 Robert Shih <robertshih@google.com> Merge "HLS: left zero fill 128 bit AES IV" into nyc-dev
am: 9c1b24689f

* commit '9c1b24689f6b75713509e9be9a8443df35e74416':
HLS: left zero fill 128 bit AES IV

Change-Id: I90f07f91c8a2f956f25691c8c44d9f91bb991c26
e662bd5c9957c0bc4a17455c03d9b08731a0e079 22-Apr-2016 Robert Shih <robertshih@google.com> Merge "HLS: handle EXT-X-DISCONTINUITY-SEQUENCE correctly" into nyc-dev
am: 10486e556d

* commit '10486e556d9314f4a60a3576a843498a6ef910d3':
HLS: handle EXT-X-DISCONTINUITY-SEQUENCE correctly

Change-Id: Ic2dc46bbb8aab673a1da71ae8ae1242f5b52015c
7d1daf4ff0f2f1127581a279c6c5a9f92ec20966 22-Apr-2016 Robert Shih <robertshih@google.com> Merge "HLS: clear ATSParser fully on explicit discontinuity" into nyc-dev
9c1b24689f6b75713509e9be9a8443df35e74416 22-Apr-2016 Robert Shih <robertshih@google.com> Merge "HLS: left zero fill 128 bit AES IV" into nyc-dev
10486e556d9314f4a60a3576a843498a6ef910d3 22-Apr-2016 Robert Shih <robertshih@google.com> Merge "HLS: handle EXT-X-DISCONTINUITY-SEQUENCE correctly" into nyc-dev
a21bed3d626d148e584bdddeeecf287b782b3fcb 22-Apr-2016 Marco Nelissen <marcone@google.com> More OMX struct checking

These were lost due to bad merges.

Bug: 27207275
Change-Id: I2fd6fa0edda83ff8d5db07fce34db2f1df0a1735
mx/SoftVideoEncoderOMXComponent.cpp
1fdf00971ba4419f102e5e2c29975ae238eaaa3c 22-Apr-2016 Marco Nelissen <marcone@google.com> DO NOT MERGE More OMX struct checking

These were lost due to bad merges.

Bug: 27207275
Change-Id: Ia0f403d7aef79a8e0ac618eb49b34dbf9faa25c2
MXCodec.cpp
odecs/avc/enc/SoftAVCEncoder.cpp
odecs/m4v_h263/enc/SoftMPEG4Encoder.cpp
odecs/on2/enc/SoftVPXEncoder.cpp
dfb280d3975afdce4da87602577d2814cb9eb30d 22-Apr-2016 Marco Nelissen <marcone@google.com> DO NOT MERGE More OMX struct checking

These were lost due to bad merges.

Bug: 27207275
Change-Id: Idc7a9fc75376a88b91e9e259d664d6ee54c77330
odecs/aacdec/SoftAAC2.cpp
odecs/avc/enc/SoftAVCEncoder.cpp
odecs/m4v_h263/enc/SoftMPEG4Encoder.cpp
odecs/on2/enc/SoftVPXEncoder.cpp
odecs/opus/dec/SoftOpus.cpp
mx/SoftVideoDecoderOMXComponent.cpp
67ef30185837950144d30e5a73d852eb9a7a0a89 29-Feb-2016 Marco Nelissen <marcone@google.com> DO NOT MERGE Verify OMX buffer sizes prior to access

Bug: 27207275
Change-Id: I4412825d1ee233d993af0a67708bea54304ff62d
odecs/aacdec/SoftAAC2.cpp
odecs/aacenc/SoftAACEncoder.cpp
odecs/aacenc/SoftAACEncoder2.cpp
odecs/amrnb/dec/SoftAMR.cpp
odecs/amrnb/enc/SoftAMRNBEncoder.cpp
odecs/amrwbenc/SoftAMRWBEncoder.cpp
odecs/avc/enc/SoftAVCEncoder.cpp
odecs/flac/enc/SoftFlacEncoder.cpp
odecs/g711/dec/SoftG711.cpp
odecs/gsm/dec/SoftGSM.cpp
odecs/m4v_h263/enc/SoftMPEG4Encoder.cpp
odecs/mp3dec/SoftMP3.cpp
odecs/on2/enc/SoftVPXEncoder.cpp
odecs/opus/dec/SoftOpus.cpp
odecs/raw/SoftRaw.cpp
odecs/vorbis/dec/SoftVorbis.cpp
nclude/SoftOMXComponent.h
mx/SimpleSoftOMXComponent.cpp
mx/SoftVideoDecoderOMXComponent.cpp
mx/SoftVideoEncoderOMXComponent.cpp
4a3108a4464490a57bbe2854d1b47df8336bd471 21-Apr-2016 Robert Shih <robertshih@google.com> HLS: left zero fill 128 bit AES IV

Bug: 28320768
Change-Id: I9195b87f742f83d3e4c4201642463881303ae3e6
ttplive/PlaylistFetcher.cpp
a722375a32e9a0febc3770513647dc32bf88ccc0 21-Apr-2016 Robert Shih <robertshih@google.com> HLS: clear ATSParser fully on explicit discontinuity

After a discontinuity stream PIDs might change in a way that we cannot
recover; creating a brand new parser avoids this potential issue.

Bug: 28320768
Change-Id: I387a9cd2371b11c2b1c0b8b81b85999033e22f7f
ttplive/PlaylistFetcher.cpp
985746d11c888e110d5ea34d815efeb1115de0c6 22-Apr-2016 Robert Shih <robertshih@google.com> HLS: handle EXT-X-DISCONTINUITY-SEQUENCE correctly

Because EXT-X-DISCONTINUITY is a prefix of EXT-X-DISCONTINUITY-SEQUENCE,
putting EXT-X-DISCONTINUITY first in an if-startsWith/else-if-startsWith
block would cause EXT-X-DISCONTINUITY-SEQUENCE be parsed as
EXT-X-DISCONTINUITY.

Bug: 28320768
Change-Id: I667b97b0e2050324eec26779e6a2dae7900e96b8
ttplive/M3UParser.cpp
55e50f8c29198d612648ecb556bb25c7389fac2e 21-Apr-2016 Pawin Vongmasa <pawin@google.com> SampleTable.cpp: Fixed a regression caused by a fix for bug 28076789. am: 70dec4dc7d am: a1e309beb9 am: 63e9b57353 am: ef21738066 am: 59f9cc2a46 am: 9be65cb007 am: 9b449c48be am: 7a33c06204 am: f0eb48c896 am: 64cb47eeba am: 54355d98e0 am: 17cb0490ff am: f242406ee4
am: a26048a9fd

* commit 'a26048a9fdc8db29882edd436a8c596466289bac':
SampleTable.cpp: Fixed a regression caused by a fix for bug 28076789.

Change-Id: Ib08755e019cd7c77c1729e143b701ae25067dec9
a26048a9fdc8db29882edd436a8c596466289bac 21-Apr-2016 Pawin Vongmasa <pawin@google.com> SampleTable.cpp: Fixed a regression caused by a fix for bug 28076789. am: 70dec4dc7d am: a1e309beb9 am: 63e9b57353 am: ef21738066 am: 59f9cc2a46 am: 9be65cb007 am: 9b449c48be am: 7a33c06204 am: f0eb48c896 am: 64cb47eeba am: 54355d98e0 am: 17cb0490ff
am: f242406ee4

* commit 'f242406ee442477bb105d444ea5c0b2ade904b12':
SampleTable.cpp: Fixed a regression caused by a fix for bug 28076789.

Change-Id: If776eb4dbddad6c9ef2286dc0e7be75e69fba04b
e6baf22d0741ad9e750d6e806d30372d4a124d31 21-Apr-2016 Pawin Vongmasa <pawin@google.com> SampleTable.cpp: Fixed a regression caused by a fix for bug 28076789. am: 70dec4dc7d am: a1e309beb9 am: 63e9b57353 am: ef21738066 am: 59f9cc2a46 am: 9be65cb007 am: 9b449c48be am: 7a33c06204 am: f0eb48c896 am: 64cb47eeba am: 54355d98e0
am: 17cb0490ff

* commit '17cb0490ffffafc13c47260d51bbcbf2509e1d79':
SampleTable.cpp: Fixed a regression caused by a fix for bug 28076789.

Change-Id: If34212a5485d9040cc502467658093f90376b98b
17cb0490ffffafc13c47260d51bbcbf2509e1d79 21-Apr-2016 Pawin Vongmasa <pawin@google.com> SampleTable.cpp: Fixed a regression caused by a fix for bug 28076789. am: 70dec4dc7d am: a1e309beb9 am: 63e9b57353 am: ef21738066 am: 59f9cc2a46 am: 9be65cb007 am: 9b449c48be am: 7a33c06204 am: f0eb48c896 am: 64cb47eeba
am: 54355d98e0

* commit '54355d98e0a4417cde0479e3fd4399edbc11586b':
SampleTable.cpp: Fixed a regression caused by a fix for bug 28076789.

Change-Id: If0135d9ba79df9e71803f34a3c80da03f723d655
54355d98e0a4417cde0479e3fd4399edbc11586b 21-Apr-2016 Pawin Vongmasa <pawin@google.com> SampleTable.cpp: Fixed a regression caused by a fix for bug 28076789. am: 70dec4dc7d am: a1e309beb9 am: 63e9b57353 am: ef21738066 am: 59f9cc2a46 am: 9be65cb007 am: 9b449c48be am: 7a33c06204 am: f0eb48c896
am: 64cb47eeba

* commit '64cb47eebab3ca226781cc5b5147b739883ed8d7':
SampleTable.cpp: Fixed a regression caused by a fix for bug 28076789.

Change-Id: I584bd7c2688d837a3ed502d1f29f20d14d6561c5
64cb47eebab3ca226781cc5b5147b739883ed8d7 21-Apr-2016 Pawin Vongmasa <pawin@google.com> SampleTable.cpp: Fixed a regression caused by a fix for bug 28076789. am: 70dec4dc7d am: a1e309beb9 am: 63e9b57353 am: ef21738066 am: 59f9cc2a46 am: 9be65cb007 am: 9b449c48be am: 7a33c06204
am: f0eb48c896

* commit 'f0eb48c8964006ec446451dbdb35f4dc9cbf0d04':
SampleTable.cpp: Fixed a regression caused by a fix for bug 28076789.

Change-Id: Icad72619b7914f06c601d1c79198942611e4a1af
f0eb48c8964006ec446451dbdb35f4dc9cbf0d04 21-Apr-2016 Pawin Vongmasa <pawin@google.com> SampleTable.cpp: Fixed a regression caused by a fix for bug 28076789. am: 70dec4dc7d am: a1e309beb9 am: 63e9b57353 am: ef21738066 am: 59f9cc2a46 am: 9be65cb007 am: 9b449c48be
am: 7a33c06204

* commit '7a33c062046a6b38cbe12c2f9928a0f1f0e82ebc':
SampleTable.cpp: Fixed a regression caused by a fix for bug 28076789.

Change-Id: I1bf9fdd3c59b48e661e3dd47386d3aae716609ec
7a33c062046a6b38cbe12c2f9928a0f1f0e82ebc 21-Apr-2016 Pawin Vongmasa <pawin@google.com> SampleTable.cpp: Fixed a regression caused by a fix for bug 28076789. am: 70dec4dc7d am: a1e309beb9 am: 63e9b57353 am: ef21738066 am: 59f9cc2a46 am: 9be65cb007
am: 9b449c48be

* commit '9b449c48bea200b1f642148797a3bb43f555356d':
SampleTable.cpp: Fixed a regression caused by a fix for bug 28076789.

Change-Id: I6c2a13f8844d2405da3ef14ac8f960734419fd07
9b449c48bea200b1f642148797a3bb43f555356d 21-Apr-2016 Pawin Vongmasa <pawin@google.com> SampleTable.cpp: Fixed a regression caused by a fix for bug 28076789. am: 70dec4dc7d am: a1e309beb9 am: 63e9b57353 am: ef21738066 am: 59f9cc2a46
am: 9be65cb007

* commit '9be65cb007a1525cae776c155144d73e23f10ada':
SampleTable.cpp: Fixed a regression caused by a fix for bug 28076789.

Change-Id: Icc2ba78e6bd4c4fbd401c13c8d09e5f5eb686373
59f9cc2a46281fd9e491f3e6631d3a34b9f6c84d 21-Apr-2016 Pawin Vongmasa <pawin@google.com> SampleTable.cpp: Fixed a regression caused by a fix for bug 28076789. am: 70dec4dc7d am: a1e309beb9 am: 63e9b57353
am: ef21738066

* commit 'ef21738066caa918b34c57844d3e0f6cebbce86a':
SampleTable.cpp: Fixed a regression caused by a fix for bug 28076789.

Change-Id: I32d931ef1d2ac785f5d5e024786cb54ca833dbf7
ef21738066caa918b34c57844d3e0f6cebbce86a 21-Apr-2016 Pawin Vongmasa <pawin@google.com> SampleTable.cpp: Fixed a regression caused by a fix for bug 28076789. am: 70dec4dc7d am: a1e309beb9
am: 63e9b57353

* commit '63e9b573530837702e42e00900407bbe9fdae952':
SampleTable.cpp: Fixed a regression caused by a fix for bug 28076789.

Change-Id: Idcf74c810152b7160cf99aa25fe664c6b40f0750
63e9b573530837702e42e00900407bbe9fdae952 21-Apr-2016 Pawin Vongmasa <pawin@google.com> SampleTable.cpp: Fixed a regression caused by a fix for bug 28076789. am: 70dec4dc7d
am: a1e309beb9

* commit 'a1e309beb98e8fb35422102717af4f973ef1f34b':
SampleTable.cpp: Fixed a regression caused by a fix for bug 28076789.

Change-Id: I1dd3ffd9a489453d0f66c0344f52c6efecf31b2e
70dec4dc7d1d813afaff58fb26b0fd7127e897bf 21-Apr-2016 Pawin Vongmasa <pawin@google.com> SampleTable.cpp: Fixed a regression caused by a fix for bug
28076789.

Detail: Before the original fix
(Id207f369ab7b27787d83f5d8fc48dc53ed9fcdc9) for 28076789, the
code allowed a time-to-sample table size to be 0. The change
made in that fix disallowed such situation, which in fact should
be allowed. This current patch allows it again while maintaining
the security of the previous fix.

Bug: 28288202
Bug: 28076789
Change-Id: I1c9a60c7f0cfcbd3d908f24998dde15d5136a295
ampleTable.cpp
nclude/SampleTable.h
19cec89f8b05fd05f8034ee1a4cd39ee09c33f02 21-Apr-2016 Marco Nelissen <marcone@google.com> Fix overflow in PCR calculations

Bug: 28283706
Change-Id: I46fe99f43433a1f3a61e168136e17beb13b92156
peg2ts/ATSParser.cpp
peg2ts/ATSParser.h
c6e67c0a7287d662064bf8d5598cc6c2dac459c2 20-Apr-2016 Christopher Wiley <wiley@google.com> Merge "libstagefright_foundation: Export libbinder headers" am: 2e70dd6 am: 5f19268 am: e2a5d52
am: 7182b2a

* commit '7182b2ac9191414d5fe68f50ad2a9a48f124b578':
libstagefright_foundation: Export libbinder headers

Change-Id: I26765eacf3a11aee686af8223ee2810d6c3facd1
e2a5d52e83cc26be29cac7f4efa49bd1b4f99fe1 20-Apr-2016 Christopher Wiley <wiley@google.com> Merge "libstagefright_foundation: Export libbinder headers" am: 2e70dd6
am: 5f19268

* commit '5f1926814ae3c22c867acc018ed2c0f93f10d7b5':
libstagefright_foundation: Export libbinder headers

Change-Id: Ie39355783012cd0883fe46d2879684832440a66c
9fc603a82acc6c2fa14afbc69614d6727971c3c1 19-Apr-2016 Christopher Wiley <wiley@google.com> libstagefright_foundation: Export libbinder headers

MetaData.h includes libbinder headers, and this library
should re-export libbinder's include path.

Bug: 27804373
Change-Id: Ic3107e8b077a11e23797b73cbf0b2ce086ce3681
oundation/Android.mk
cf3d3de0ee44b3053d35e49867406eb75a7c74b4 18-Apr-2016 Pawin Vongmasa <pawin@google.com> Merge "resolve merge conflicts of 87695f6 to mnc-dev" into mnc-dev am: a265388 am: 93cfc25 am: 35ee496 am: d059fde am: b151194 am: 3784db4
am: 8e65d5f

* commit '8e65d5f6de6028183f9cc73b8c2ad8d6ecf0f175':
SampleTable.cpp: Prevent corrupted stts block from causing excessive memory allocation.

Change-Id: I9033d5825424c316cc695702fc17088b513105c7
8e65d5f6de6028183f9cc73b8c2ad8d6ecf0f175 18-Apr-2016 Pawin Vongmasa <pawin@google.com> Merge "resolve merge conflicts of 87695f6 to mnc-dev" into mnc-dev am: a265388 am: 93cfc25 am: 35ee496 am: d059fde am: b151194
am: 3784db4

* commit '3784db4ea0b2a7e4e779135d9a71dbae4d833b0d':
SampleTable.cpp: Prevent corrupted stts block from causing excessive memory allocation.

Change-Id: I18b1b67f76003f6104fea3f850234f84572e0c1a
c59e36ea5e84d6c2e0bd99f8de13cdb6a3a72b96 18-Apr-2016 Pawin Vongmasa <pawin@google.com> Merge "resolve merge conflicts of 87695f6 to mnc-dev" into mnc-dev am: a265388 am: 93cfc25 am: 35ee496 am: d059fde
am: b151194

* commit 'b151194ce1cbf77cd9da87ce6fc895278977b0f4':
SampleTable.cpp: Prevent corrupted stts block from causing excessive memory allocation.

Change-Id: I35baa29d0b7aabf5a395d1b767fecf6f9bebad16
b151194ce1cbf77cd9da87ce6fc895278977b0f4 18-Apr-2016 Pawin Vongmasa <pawin@google.com> Merge "resolve merge conflicts of 87695f6 to mnc-dev" into mnc-dev am: a265388 am: 93cfc25 am: 35ee496
am: d059fde

* commit 'd059fde3f068700f73970dcce5255efb72c29f13':
SampleTable.cpp: Prevent corrupted stts block from causing excessive memory allocation.

Change-Id: Ifdf3b0bd637332f9962eff593e6086fcd3830c00
d059fde3f068700f73970dcce5255efb72c29f13 18-Apr-2016 Pawin Vongmasa <pawin@google.com> Merge "resolve merge conflicts of 87695f6 to mnc-dev" into mnc-dev am: a265388 am: 93cfc25
am: 35ee496

* commit '35ee496debc05431eb00d83ced6d312d39648131':
SampleTable.cpp: Prevent corrupted stts block from causing excessive memory allocation.

Change-Id: I9ec2fb9e1d493c28f7356e8bbc305e3a16a19ab3
35ee496debc05431eb00d83ced6d312d39648131 18-Apr-2016 Pawin Vongmasa <pawin@google.com> Merge "resolve merge conflicts of 87695f6 to mnc-dev" into mnc-dev am: a265388
am: 93cfc25

* commit '93cfc25deb117d6724aaf01be92054884178b7f2':
SampleTable.cpp: Prevent corrupted stts block from causing excessive memory allocation.

Change-Id: Ide6b4c809eee7029fdfc048e1bc590d34979f030
93cfc25deb117d6724aaf01be92054884178b7f2 18-Apr-2016 Pawin Vongmasa <pawin@google.com> Merge "resolve merge conflicts of 87695f6 to mnc-dev" into mnc-dev
am: a265388

* commit 'a265388ac9c5c6c64272fd0d143f8ed79f4edd3e':
SampleTable.cpp: Prevent corrupted stts block from causing excessive memory allocation.

Change-Id: Ib9f67677abf99a315669975a386d615fe682a954
a265388ac9c5c6c64272fd0d143f8ed79f4edd3e 18-Apr-2016 Pawin Vongmasa <pawin@google.com> Merge "resolve merge conflicts of 87695f6 to mnc-dev" into mnc-dev
6daa05d8acd847baedcdcb1309db1f11d0e2413a 18-Apr-2016 Christopher Wiley <wiley@google.com> Merge "Make libstagefright_aacenc depend on libbinder" am: 997ceb3 am: b6263ad am: 95f3338
am: 81c29fa

* commit '81c29fa9ba16cc74dec36d6e1f567627bcf89083':
Make libstagefright_aacenc depend on libbinder

Change-Id: I02928844ab95ee24b9ce4820a37de9a5e67c2b75
95f3338a0c8bc6a71d6090a516b7c93d992ffb99 18-Apr-2016 Christopher Wiley <wiley@google.com> Merge "Make libstagefright_aacenc depend on libbinder" am: 997ceb3
am: b6263ad

* commit 'b6263adb4eb722766ae79f62cccb671962eccc90':
Make libstagefright_aacenc depend on libbinder

Change-Id: I09e2bc76aa565c8db24d1b3b4189c6216a23c32d
74ff6db39d937eb17fde69831c46a1799de7b4fc 18-Apr-2016 Christopher Wiley <wiley@google.com> Make libstagefright_aacenc depend on libbinder

This library includes libstagefright headers, which in turn
include libbinder headers. Unfortunately, introducing a
dependency on libstagefright directly introduces a circular dependency.

Bug: 27804373
Change-Id: Id1e65f99b63275ffdccb05638412f43825f8ec1c
Test: Compiles with accompanying changes.
odecs/aacenc/Android.mk
eaf41c105bedf00e8f74aff90720335910449c18 18-Apr-2016 Marco Nelissen <marcone@google.com> Merge "Fix integer overflow in estimateMoovBoxSize" am: 800f9d7 am: b7d15a8 am: db0d88e
am: 4e519a5

* commit '4e519a506f89711155a8157ee762760bdd8af91c':
Fix integer overflow in estimateMoovBoxSize

Change-Id: I90d90bf6c19f2862544ad0d7daf128462af6c9f7
db0d88e55b569962ed535f4449c4217037cc31fd 18-Apr-2016 Marco Nelissen <marcone@google.com> Merge "Fix integer overflow in estimateMoovBoxSize" am: 800f9d7
am: b7d15a8

* commit 'b7d15a83adee4221ba05c3de5147cf051030a095':
Fix integer overflow in estimateMoovBoxSize

Change-Id: I0c29c6abec8cce58f628af7eddffe6351bf67aac
0ca31521644b9396829850f7400d23f9b107cc64 18-Apr-2016 Johan Redestig <johan.redestig@sonymobile.com> Fix integer overflow in estimateMoovBoxSize

On 200GB SD Card the Camera reported an expected max file duration
of 89158000000 us, this later overflowed the calculation in
estimateMoovBoxSize. Move the division in before the multiplication
to avoid the overflow (this gives different result for <1ms duration
limits but this should not be noticeable in the end).

Change-Id: I53e8238745ef86282483b617df5dcbd3562907fc
PEG4Writer.cpp
ab61845430e23ef7325eb8c821d4a908f327bba3 18-Apr-2016 Treehugger Robot <treehugger-gerrit@google.com> Merge "codecs: fix HEVC resolution change"
ca0fcc3382b4a99612655c261b430a6dcb832f4f 18-Apr-2016 Wonsik Kim <wonsik@google.com> Merge "codecs: check OMX buffer size before use in (gsm|g711)dec" into mnc-dev am: 3cd871d am: 20f9cec am: f22f681 am: 987974f am: 3dc9194 am: 3262f28
am: cac1bd2

* commit 'cac1bd2d23e459aa12ea448f347c0d54494b8e23':
codecs: check OMX buffer size before use in (gsm|g711)dec

Change-Id: I5985efc6f7899a818c4b890148533a0ecb7426dc
cac1bd2d23e459aa12ea448f347c0d54494b8e23 18-Apr-2016 Wonsik Kim <wonsik@google.com> Merge "codecs: check OMX buffer size before use in (gsm|g711)dec" into mnc-dev am: 3cd871d am: 20f9cec am: f22f681 am: 987974f am: 3dc9194
am: 3262f28

* commit '3262f2842a84089ace8b45e8ffb6a6694f3d1617':
codecs: check OMX buffer size before use in (gsm|g711)dec

Change-Id: I4dd64f1c011bd82772521961e3e5451158cae20a
9f3ba4b0eb52a88fe6b782616ea4c32542c6f844 18-Apr-2016 Wonsik Kim <wonsik@google.com> Merge "codecs: check OMX buffer size before use in (gsm|g711)dec" into mnc-dev am: 3cd871d am: 20f9cec am: f22f681 am: 987974f
am: 3dc9194

* commit '3dc91949b0b20a986146f318b6da6a2703c418ca':
codecs: check OMX buffer size before use in (gsm|g711)dec

Change-Id: Ibfa9a765afe6f64c6601eece6c4de84e607cf3e6
3dc91949b0b20a986146f318b6da6a2703c418ca 18-Apr-2016 Wonsik Kim <wonsik@google.com> Merge "codecs: check OMX buffer size before use in (gsm|g711)dec" into mnc-dev am: 3cd871d am: 20f9cec am: f22f681
am: 987974f

* commit '987974fd29f662552d2f0861500e4aac6628af5c':
codecs: check OMX buffer size before use in (gsm|g711)dec

Change-Id: Ic9c77c65aafd3d266b4ff9fb9f3c2f38ffac7db5
987974fd29f662552d2f0861500e4aac6628af5c 18-Apr-2016 Wonsik Kim <wonsik@google.com> Merge "codecs: check OMX buffer size before use in (gsm|g711)dec" into mnc-dev am: 3cd871d am: 20f9cec
am: f22f681

* commit 'f22f681d5cf79fbcfbaa5572ffbc106d414cabe4':
codecs: check OMX buffer size before use in (gsm|g711)dec

Change-Id: Idc4218c1af0e3ea6fbc9c249d3d96b0a46c4bf15
09cf2d39998b50e00192fca168bf3c9809de5c05 18-Apr-2016 Wonsik Kim <wonsik@google.com> Merge "stagefright: fix typo in HEVC handing at MPEG4Writer" into nyc-dev am: 690e367 am: 08cf45f
am: df187ed

* commit 'df187ed0bbc75d288ebf5cb72ff4f79fe3af13aa':
stagefright: fix typo in HEVC handing at MPEG4Writer

Change-Id: If6f2eba2ff341828197995662a80eb4160feae32
f22f681d5cf79fbcfbaa5572ffbc106d414cabe4 18-Apr-2016 Wonsik Kim <wonsik@google.com> Merge "codecs: check OMX buffer size before use in (gsm|g711)dec" into mnc-dev am: 3cd871d
am: 20f9cec

* commit '20f9cec4ba05217873a3e748da810da3642a83eb':
codecs: check OMX buffer size before use in (gsm|g711)dec

Change-Id: I7ce36702a3a8f2a57c04d12441b2af29b8c8f14c
9345299e27e68b524c4b606d178802a4e7289aa1 18-Apr-2016 Wonsik Kim <wonsik@google.com> Merge "DO NOT MERGE codecs: check OMX buffer size before use in (gsm|g711)dec" into klp-dev am: 7cab953
am: f249b0f

* commit 'f249b0fe1d2602d07da8bfeb64bc64518a0ec46a':
DO NOT MERGE codecs: check OMX buffer size before use in (gsm|g711)dec

Change-Id: I87ec36dcfaccae4fa8d7cb247651704c7ef0e4d3
20f9cec4ba05217873a3e748da810da3642a83eb 18-Apr-2016 Wonsik Kim <wonsik@google.com> Merge "codecs: check OMX buffer size before use in (gsm|g711)dec" into mnc-dev
am: 3cd871d

* commit '3cd871d3b4ab56f336c5727ab7ff069e062c5951':
codecs: check OMX buffer size before use in (gsm|g711)dec

Change-Id: Ica0871792f709ea69e9dc82434cd678130bedacb
08cf45fffbb5ff7943f9cffcf0e4acfbf9b68797 18-Apr-2016 Wonsik Kim <wonsik@google.com> Merge "stagefright: fix typo in HEVC handing at MPEG4Writer" into nyc-dev
am: 690e367

* commit '690e3676838187a096365a0bf80755898140bd33':
stagefright: fix typo in HEVC handing at MPEG4Writer

Change-Id: I61e17fae78c85f5ac13a950f1e462378f410ae04
690e3676838187a096365a0bf80755898140bd33 18-Apr-2016 Wonsik Kim <wonsik@google.com> Merge "stagefright: fix typo in HEVC handing at MPEG4Writer" into nyc-dev
3cd871d3b4ab56f336c5727ab7ff069e062c5951 18-Apr-2016 Wonsik Kim <wonsik@google.com> Merge "codecs: check OMX buffer size before use in (gsm|g711)dec" into mnc-dev
406a06f89815e7a4dca2d9d4d0828f1516c4e20d 18-Apr-2016 Wonsik Kim <wonsik@google.com> Merge "DO NOT MERGE codecs: check OMX buffer size before use in (gsm|g711)dec" into lmp-dev
7cab953629b615cfe5fec8f56266996bc17307b5 18-Apr-2016 Wonsik Kim <wonsik@google.com> Merge "DO NOT MERGE codecs: check OMX buffer size before use in (gsm|g711)dec" into klp-dev
44a1dc40b0c66ca2f66c4be4debdcc908a3c5f8b 16-Apr-2016 Pawin Vongmasa <pawin@google.com> resolve merge conflicts of 87695f6 to mnc-dev

Change-Id: I14bcb8f00724f9dc09ae8ec85d403f06f354db47
87695f6695d184a1b7c47b6957ae106049494901 16-Apr-2016 Pawin Vongmasa <pawin@google.com> Merge "SampleTable.cpp: Prevent corrupted stts block from causing excessive memory allocation." into klp-dev am: 5964527 am: e896c41 am: a0970c9 am: ab72763 am: 8cf4bf3
am: f720186

* commit 'f7201862c852cbf780e546c0e23e23cd7dcab4a1':
SampleTable.cpp: Prevent corrupted stts block from causing excessive memory allocation.

Change-Id: I3b26c1a4781e38d2b327b09972091d169bba1338
8cf4bf38b13adb805746a3f3e172670b1af7c9fd 16-Apr-2016 Pawin Vongmasa <pawin@google.com> Merge "SampleTable.cpp: Prevent corrupted stts block from causing excessive memory allocation." into klp-dev am: 5964527 am: e896c41 am: a0970c9
am: ab72763

* commit 'ab7276351e41bc0d40d28c231993ba240b5f21a0':
SampleTable.cpp: Prevent corrupted stts block from causing excessive memory allocation.

Change-Id: I3dc4066c53dfeb3fc07ee31431ee5a5571c89528
ab7276351e41bc0d40d28c231993ba240b5f21a0 16-Apr-2016 Pawin Vongmasa <pawin@google.com> Merge "SampleTable.cpp: Prevent corrupted stts block from causing excessive memory allocation." into klp-dev am: 5964527 am: e896c41
am: a0970c9

* commit 'a0970c9faabdaca647cb22b78432511de3220399':
SampleTable.cpp: Prevent corrupted stts block from causing excessive memory allocation.

Change-Id: I7d7e410e25d8a5b1066251cae8cddfa050b07f71
a0970c9faabdaca647cb22b78432511de3220399 16-Apr-2016 Pawin Vongmasa <pawin@google.com> Merge "SampleTable.cpp: Prevent corrupted stts block from causing excessive memory allocation." into klp-dev am: 5964527
am: e896c41

* commit 'e896c41d85a15de06c74885fe040f3f57b63cd5d':
SampleTable.cpp: Prevent corrupted stts block from causing excessive memory allocation.

Change-Id: I5f23c14d155ea5a64b00d877a329c77cfc5b55f7
59645279f48b3ae83ab42445148ea236c5dc72c4 16-Apr-2016 Pawin Vongmasa <pawin@google.com> Merge "SampleTable.cpp: Prevent corrupted stts block from causing excessive memory allocation." into klp-dev
3d53e1c0dd7760f3ca58ff75e74cd7fcf4bc08cc 15-Apr-2016 Wonsik Kim <wonsik@google.com> stagefright: fix typo in HEVC handing at MPEG4Writer

Bug: 28193653
Change-Id: I6181c0b5e9ff00aea373b6b58d8d096024002c3f
PEG4Writer.cpp
a3630a418b4f65277a42cd4018cd3b0b7e134d0c 14-Apr-2016 Pawin Vongmasa <pawin@google.com> SampleTable.cpp: Prevent corrupted stts block from causing
excessive memory allocation.

Details:

DataSource.h
- Added function getVector() for reading from a data source into
a Vector object, whose capacity grows only as much as needed
(in case of EOS or reading error).
SampleTable.h
- Changed the type of mTimeToSample from uint32_t* to
Vector<uint32_t>.
SampleTable.cpp
- In setTimeToSample, modified the code to use getVector()
instead of readAt(). If the input source has a corrupt
time-to-sample table size that is too big, EOS will be reached
before the whole table is read, and the return value from
getVector() will be false.
- Also, tightened the bound for the provided time-to-sample table
size to guarantee that the table does not take more than
UINT_MAX32 bytes in memory.

Bug: 28076789
Change-Id: Id207f369ab7b27787d83f5d8fc48dc53ed9fcdc9
ampleTable.cpp
nclude/SampleTable.h
25c9c60d91aa71b372961b6bf5fe3f23279ccc70 14-Apr-2016 Wei Jia <wjia@google.com> Merge "OggExtractor: fix memory leak (MediaBuffer)." into nyc-dev am: bc0c73e
am: b5b6e73

* commit 'b5b6e73546590bac6011c3c582d2f1e802133a90':
OggExtractor: fix memory leak (MediaBuffer).

Change-Id: I0cfefdaf995ec938f7e62bab4985a1f71e05423a
b5b6e73546590bac6011c3c582d2f1e802133a90 14-Apr-2016 Wei Jia <wjia@google.com> Merge "OggExtractor: fix memory leak (MediaBuffer)." into nyc-dev
am: bc0c73e

* commit 'bc0c73e05ec935bc478ee0e40aee79f80771a482':
OggExtractor: fix memory leak (MediaBuffer).

Change-Id: I88cd5c164d3921a25bd34f8f2fc619c3d2e53378
bc0c73e05ec935bc478ee0e40aee79f80771a482 14-Apr-2016 Wei Jia <wjia@google.com> Merge "OggExtractor: fix memory leak (MediaBuffer)." into nyc-dev
a6f2946f15be11db7c2b013fbe69126a799cbf97 14-Apr-2016 Wei Jia <wjia@google.com> OggExtractor: fix memory leak (MediaBuffer).

Change-Id: Iadf8633615f1813b4611c748f08d08f4f7dfd9ab
ggExtractor.cpp
cd26579aeb516f70498a260059211c7b4256772d 14-Apr-2016 Marco Nelissen <marcone@google.com> h264dec: check for overflows when calculating allocation size. am: a3dd713 am: d504c68 am: 9f3762d am: 76f606b am: 9d9ebc9 am: 8e46016 am: 3e1803f am: 13d3588 am: fa12d6f am: 1c6e052 am: ed99ef7 am: 5b817c5
am: 212fa4a

* commit '212fa4adc0a08e043b586f8abbf6d14ce863f5ad':
h264dec: check for overflows when calculating allocation size.

Change-Id: I36c1fd9af2651ba0d6a2d87f287bdd688f8f2d7a
212fa4adc0a08e043b586f8abbf6d14ce863f5ad 14-Apr-2016 Marco Nelissen <marcone@google.com> h264dec: check for overflows when calculating allocation size. am: a3dd713 am: d504c68 am: 9f3762d am: 76f606b am: 9d9ebc9 am: 8e46016 am: 3e1803f am: 13d3588 am: fa12d6f am: 1c6e052 am: ed99ef7
am: 5b817c5

* commit '5b817c598754e0895ee43bd2f6a9954a25d8979a':
h264dec: check for overflows when calculating allocation size.

Change-Id: I3131d965af779086440db306c7b37b5d4bde6dce
5b817c598754e0895ee43bd2f6a9954a25d8979a 14-Apr-2016 Marco Nelissen <marcone@google.com> h264dec: check for overflows when calculating allocation size. am: a3dd713 am: d504c68 am: 9f3762d am: 76f606b am: 9d9ebc9 am: 8e46016 am: 3e1803f am: 13d3588 am: fa12d6f am: 1c6e052
am: ed99ef7

* commit 'ed99ef7997d57b53d3b1d85cb4ae043110d3b68a':
h264dec: check for overflows when calculating allocation size.

Change-Id: If9969bddb7c33f7e3145542da278e36261c21ff3
ed99ef7997d57b53d3b1d85cb4ae043110d3b68a 14-Apr-2016 Marco Nelissen <marcone@google.com> h264dec: check for overflows when calculating allocation size. am: a3dd713 am: d504c68 am: 9f3762d am: 76f606b am: 9d9ebc9 am: 8e46016 am: 3e1803f am: 13d3588 am: fa12d6f
am: 1c6e052

* commit '1c6e052a29e3940df98ad808a1aa20ba122550f5':
h264dec: check for overflows when calculating allocation size.

Change-Id: I0ff41780384535f43aa2d415c045249b7c42d783
1c6e052a29e3940df98ad808a1aa20ba122550f5 14-Apr-2016 Marco Nelissen <marcone@google.com> h264dec: check for overflows when calculating allocation size. am: a3dd713 am: d504c68 am: 9f3762d am: 76f606b am: 9d9ebc9 am: 8e46016 am: 3e1803f am: 13d3588
am: fa12d6f

* commit 'fa12d6f86c042545ab9c34928e18aa98b88adfaa':
h264dec: check for overflows when calculating allocation size.

Change-Id: I2726781ccf48c38769cd9a52545e50701c0528d2
c4dcfd8e3949572f6172da35a4ee789c521643e5 14-Apr-2016 Vignesh Venkatasubramanian <vigneshv@google.com> Merge "Update libwebm include path in MatroskaExtractor" into nyc-dev
am: 82de7e8

* commit '82de7e8678f6912c9b2355efedb02da19153f5e3':
Update libwebm include path in MatroskaExtractor

Change-Id: I6efa00bc363d944c0ddcab10094b81c052737066
fa12d6f86c042545ab9c34928e18aa98b88adfaa 14-Apr-2016 Marco Nelissen <marcone@google.com> h264dec: check for overflows when calculating allocation size. am: a3dd713 am: d504c68 am: 9f3762d am: 76f606b am: 9d9ebc9 am: 8e46016 am: 3e1803f
am: 13d3588

* commit '13d35885fed6e00ec7ac3493dd3fb7bdb98a8cf8':
h264dec: check for overflows when calculating allocation size.

Change-Id: Iecbc7be1f71a863ed1c7e5b3d5647946828614fa
13d35885fed6e00ec7ac3493dd3fb7bdb98a8cf8 14-Apr-2016 Marco Nelissen <marcone@google.com> h264dec: check for overflows when calculating allocation size. am: a3dd713 am: d504c68 am: 9f3762d am: 76f606b am: 9d9ebc9 am: 8e46016
am: 3e1803f

* commit '3e1803fc40052b5cf6f3f7a63aa82bf446749724':
h264dec: check for overflows when calculating allocation size.

Change-Id: I9cb9096087befb29caab7325fae0f0b9d8e0133d
3e1803fc40052b5cf6f3f7a63aa82bf446749724 14-Apr-2016 Marco Nelissen <marcone@google.com> h264dec: check for overflows when calculating allocation size. am: a3dd713 am: d504c68 am: 9f3762d am: 76f606b am: 9d9ebc9
am: 8e46016

* commit '8e4601608f3ecbc7b5b40c6b6efe3290104aa743':
h264dec: check for overflows when calculating allocation size.

Change-Id: Icac8c5785b5c15c1e882a5ced0f536c3501e1159
9d9ebc990f4b4b18f48d09232b053b3cb69dbb6b 14-Apr-2016 Marco Nelissen <marcone@google.com> h264dec: check for overflows when calculating allocation size. am: a3dd713 am: d504c68 am: 9f3762d
am: 76f606b

* commit '76f606bdf9d52a4406dc285e06a0f15b13903bac':
h264dec: check for overflows when calculating allocation size.

Change-Id: I1ae828ed17ca9df7b3097cdb1acaf06e0202321d
76f606bdf9d52a4406dc285e06a0f15b13903bac 14-Apr-2016 Marco Nelissen <marcone@google.com> h264dec: check for overflows when calculating allocation size. am: a3dd713 am: d504c68
am: 9f3762d

* commit '9f3762d8c76b778c8f600486a464838731105b09':
h264dec: check for overflows when calculating allocation size.

Change-Id: Iefdde609316ffa6fb9037f24d3865980633cd4b9
9f3762d8c76b778c8f600486a464838731105b09 14-Apr-2016 Marco Nelissen <marcone@google.com> h264dec: check for overflows when calculating allocation size. am: a3dd713
am: d504c68

* commit 'd504c68310bf86e24321a7260c2ecdd9962c8b3b':
h264dec: check for overflows when calculating allocation size.

Change-Id: Iabbe0fcaf14241d1aa01184c61f1ecb134c16fe8
a0723e8cf511cf516d9bcfeb24787c0652f0eee8 06-Apr-2016 Vignesh Venkatasubramanian <vigneshv@google.com> Update libwebm include path in MatroskaExtractor


Bug: 27681071

Change-Id: I38d305aa864495e696954932db1202320672aaf3
(cherry picked from commit 4e0e8e8a861cc26314072f41ec5111a06bea0feb)
atroska/MatroskaExtractor.h
754a318cea314611b4be90d34900e7daf87af368 13-Apr-2016 Christopher Wiley <wiley@google.com> Merge "Express libmedia dependencies in stagefright components" am: fa0fa45 am: 14a8a99
am: 1cea82d

* commit '1cea82dd71daefcdc7bb19f1f2dfab59fd8f0cd7':
Express libmedia dependencies in stagefright components

Change-Id: I3777a83f3ff06312580e493d72199afcadbc7dd2
1cea82dd71daefcdc7bb19f1f2dfab59fd8f0cd7 13-Apr-2016 Treehugger Robot <treehugger-gerrit@google.com> Merge "Express libmedia dependencies in stagefright components" am: fa0fa45
am: 14a8a99

* commit '14a8a99ce2d422340bdfeb4c47c74182633138fa':
Express libmedia dependencies in stagefright components

Change-Id: Iedccaa16c0749f1865d66e4a67bca58a75e0fe87
e4bbb6a0805cdfccda54560d2a638faa25b5efca 13-Apr-2016 Christopher Wiley <wiley@google.com> Express libmedia dependencies in stagefright components

libstagefright includes a number of static libraries, each of which
includes eventually includes headers from libmedia. Express this
dependency explicitly so that the static libraries can pick up
libmedia's header include path.

Bug: 27804373
Test: Compiles.

Change-Id: I0cb17327202f5b8b840eba6fdbd8768e203f16de
ndroid.mk
ilters/Android.mk
d3/Android.mk
atroska/Android.mk
peg2ts/Android.mk
tsp/Android.mk
imedtext/Android.mk
1f84ffcbdbedb102828c9f47c14e09279c6da8d2 12-Apr-2016 Wonsik Kim <wonsik@google.com> codecs: fix HEVC resolution change

Bug: 28086758
Change-Id: I3c38b91365b67f2b2125bd1f0876b8080c3eaf64
odecs/hevcdec/SoftHEVC.cpp
2d8170b827e64584283c67e16936d56aaf2cce9e 13-Apr-2016 Wonsik Kim <wonsik@google.com> Merge "codecs: fix HEVC resolution change" into nyc-dev am: b818309
am: ca30989

* commit 'ca309892ed5b6b2417e3ab96375638a6752e7bb8':
codecs: fix HEVC resolution change

Change-Id: Ic81a29a69fc162ac8289b938470c20e6c2c805a4
ca309892ed5b6b2417e3ab96375638a6752e7bb8 13-Apr-2016 Wonsik Kim <wonsik@google.com> Merge "codecs: fix HEVC resolution change" into nyc-dev
am: b818309

* commit 'b818309e1dc687e952b3151b71eecdf15ec92abf':
codecs: fix HEVC resolution change

Change-Id: I53e347e8a8db6474047d4817dc9efba9e6eaaf6c
b818309e1dc687e952b3151b71eecdf15ec92abf 13-Apr-2016 Wonsik Kim <wonsik@google.com> Merge "codecs: fix HEVC resolution change" into nyc-dev
cef23c50917dab794d39e40156fea325440ef72c 12-Apr-2016 Robert Shih <robertshih@google.com> Merge "SoftVorbis: increase input buffer size" into nyc-dev am: a49dd2a
am: ad4c8ed

* commit 'ad4c8eded7017b893a6318a6bdc474f38018c11e':
SoftVorbis: increase input buffer size

Change-Id: Iba75f236bb1a83bf096fc1023447cab132dda98f
ad4c8eded7017b893a6318a6bdc474f38018c11e 12-Apr-2016 Robert Shih <robertshih@google.com> Merge "SoftVorbis: increase input buffer size" into nyc-dev
am: a49dd2a

* commit 'a49dd2a001debc1da76b510f8379c9deea6f0bce':
SoftVorbis: increase input buffer size

Change-Id: I351384c70881ee85beeceaf1ce8fc8261a859e3e
a49dd2a001debc1da76b510f8379c9deea6f0bce 12-Apr-2016 Robert Shih <robertshih@google.com> Merge "SoftVorbis: increase input buffer size" into nyc-dev
02fd609b7fd54c471ab1f5e77567d60c98e943d1 12-Apr-2016 Wonsik Kim <wonsik@google.com> codecs: fix HEVC resolution change

Bug: 28086758
Change-Id: I3c38b91365b67f2b2125bd1f0876b8080c3eaf64
odecs/hevcdec/SoftHEVC.cpp
e609fce7eb89da7a7445460493564cef724a7a3f 12-Apr-2016 Robert Shih <robertshih@google.com> SoftVorbis: increase input buffer size

Bug: 27923985
Change-Id: Ifd8d78361a5b0f6ef7d1615f91db5475d8fadc1f
odecs/vorbis/dec/SoftVorbis.cpp
7718ce56f70b5669c1f4efef853b769f92aae09f 09-Apr-2016 Lajos Molnar <lajos@google.com> Merge "stagefright: propagate float frame rates to MetaData" into nyc-dev am: 25df0fc
am: db5e97d

* commit 'db5e97dd1e17e8463d55d630ab3ae745be9fd47e':
stagefright: propagate float frame rates to MetaData

Change-Id: I1a14e1c78c93dffeb5215ebb228c7c22437ddeda
db5e97dd1e17e8463d55d630ab3ae745be9fd47e 09-Apr-2016 Lajos Molnar <lajos@google.com> Merge "stagefright: propagate float frame rates to MetaData" into nyc-dev
am: 25df0fc

* commit '25df0fc0328920c585eb30cc21eb85b74d103eb2':
stagefright: propagate float frame rates to MetaData

Change-Id: Ifa1234eb9c8200d1ef5379cce8b6a68bccaf3164
25df0fc0328920c585eb30cc21eb85b74d103eb2 09-Apr-2016 Lajos Molnar <lajos@google.com> Merge "stagefright: propagate float frame rates to MetaData" into nyc-dev
ac4311b869febc090e2d0a99ceae0896a50973d1 09-Apr-2016 Lajos Molnar <lajos@google.com> Merge "StagefrightMetadataRetriever: handle mSource being NULL" into nyc-dev am: c280a25
am: d531edb

* commit 'd531edbfb584935fe22d8bc972704cf6ef2cac9d':
StagefrightMetadataRetriever: handle mSource being NULL

Change-Id: Id192bc3dfc291f186ac18a236d22163835f09dd0
5e2f5c10dcedbddd0ea0255f049468760aa09048 08-Apr-2016 Hangyu Kuang <hkuang@google.com> Stagefright: Add HDRStaticInfo support for encoder.

Bug:25684127
Change-Id: I6bc74cf4915d1e42432f8da767bb84e3e8f2153f
Codec.cpp
d531edbfb584935fe22d8bc972704cf6ef2cac9d 09-Apr-2016 Lajos Molnar <lajos@google.com> Merge "StagefrightMetadataRetriever: handle mSource being NULL" into nyc-dev
am: c280a25

* commit 'c280a25f5a7d36bc2f395c2e6c294d62785ca276':
StagefrightMetadataRetriever: handle mSource being NULL

Change-Id: I38e01d01da43daf89bef7f09f607c6e4582bfe8b
94e5455150064f40041dddf7a1a83b8414f01b91 08-Apr-2016 Lajos Molnar <lajos@google.com> stagefright: propagate float frame rates to MetaData

These are rounded as MetaData only handles integer values.

Bug: 27126548
Change-Id: I7971c4f35a14f282ea2cb76b99893f3c6dd5752e
tils.cpp
665df6f7c5b3189f9555ebe14cde3d0d24a5a024 09-Apr-2016 Lajos Molnar <lajos@google.com> StagefrightMetadataRetriever: handle mSource being NULL

Bug: 28071699
Change-Id: I480c803b73774e1db332b6ce981ea1b448ca1ff8
tagefrightMetadataRetriever.cpp
4cbdab3f3be8a9507df2135160f9266e35d48b47 08-Apr-2016 Marco Nelissen <marcone@google.com> Merge "codecs: check OMX buffer size before use in (avc|hevc|mpeg2)dec" into mnc-dr-dev am: 8d4cad0
am: 29840b6

* commit '29840b664044bdf51bb844dbf2a6e4b3e33e1b07':
codecs: check OMX buffer size before use in (avc|hevc|mpeg2)dec

Change-Id: Ia1326166f7b9dbf6c37bbb98a56624ccbe951d0f
29840b664044bdf51bb844dbf2a6e4b3e33e1b07 08-Apr-2016 Wonsik Kim <wonsik@google.com> Merge "codecs: check OMX buffer size before use in (avc|hevc|mpeg2)dec" into mnc-dr-dev
am: 8d4cad0

* commit '8d4cad0058233d010145f7ac78523b3be7b959fa':
codecs: check OMX buffer size before use in (avc|hevc|mpeg2)dec

Change-Id: I5dd3b7d9bce1439e0af76c34bb3a92b3c1942347
8d4cad0058233d010145f7ac78523b3be7b959fa 08-Apr-2016 Marco Nelissen <marcone@google.com> Merge "codecs: check OMX buffer size before use in (avc|hevc|mpeg2)dec" into mnc-dr-dev
a3dd713893658baf50df88b261aba83bb0c40687 08-Apr-2016 Marco Nelissen <marcone@google.com> h264dec: check for overflows when calculating allocation size.

Bug: 27855419
Change-Id: Idabedca52913ec31ea5cb6a6109ab94e3fb2badd
odecs/on2/h264dec/inc/H264SwDecApi.h
odecs/on2/h264dec/source/DecTestBench.c
odecs/on2/h264dec/source/EvaluationTestBench.c
odecs/on2/h264dec/source/H264SwDecApi.c
odecs/on2/h264dec/source/TestBenchMultipleInstance.c
odecs/on2/h264dec/source/h264bsd_decoder.c
odecs/on2/h264dec/source/h264bsd_util.h
b9f2740b4f0323fbb2cc4c024ce3209fae2d6386 08-Apr-2016 Wonsik Kim <wonsik@google.com> Merge "codecs: check OMX buffer size before use in (h263|h264)dec" into lmp-dev am: c3cd9ea am: 590fce5 am: b00d2bd am: acd0b16 am: 4c40196 am: d1d5b74 am: d3e5897 am: 796a58e am: 88d291c
am: 8729f7f

* commit '8729f7fb56ddf895e30f29a4626c8c749dc8423d':
codecs: check OMX buffer size before use in (h263|h264)dec

Change-Id: Icdd13593cc19a48befdc6da1d3725a740e5592ed
8729f7fb56ddf895e30f29a4626c8c749dc8423d 08-Apr-2016 Wonsik Kim <wonsik@google.com> Merge "codecs: check OMX buffer size before use in (h263|h264)dec" into lmp-dev am: c3cd9ea am: 590fce5 am: b00d2bd am: acd0b16 am: 4c40196 am: d1d5b74 am: d3e5897 am: 796a58e
am: 88d291c

* commit '88d291c4026a83800697d044dd1bd3e47be47233':
codecs: check OMX buffer size before use in (h263|h264)dec

Change-Id: I9c91e264e18918a83e160b265d7f5f4a4cadc2ed
88d291c4026a83800697d044dd1bd3e47be47233 08-Apr-2016 Wonsik Kim <wonsik@google.com> Merge "codecs: check OMX buffer size before use in (h263|h264)dec" into lmp-dev am: c3cd9ea am: 590fce5 am: b00d2bd am: acd0b16 am: 4c40196 am: d1d5b74 am: d3e5897
am: 796a58e

* commit '796a58e33c4a955319141d3f7dda9844a2e1e361':
codecs: check OMX buffer size before use in (h263|h264)dec

Change-Id: Idf6503629c5a2e8979f59204a6db75e5af7af783
796a58e33c4a955319141d3f7dda9844a2e1e361 08-Apr-2016 Wonsik Kim <wonsik@google.com> Merge "codecs: check OMX buffer size before use in (h263|h264)dec" into lmp-dev am: c3cd9ea am: 590fce5 am: b00d2bd am: acd0b16 am: 4c40196 am: d1d5b74
am: d3e5897

* commit 'd3e58975f4e0e7cd9a872a7431482b703a4b6488':
codecs: check OMX buffer size before use in (h263|h264)dec

Change-Id: I585e26c9c474463ce68cfc7b25ca4dce08897dd8
7da36071d710e98c0ab7aa8958fdfd5e1857652f 08-Apr-2016 Wonsik Kim <wonsik@google.com> Merge "DO NOT MERGE codecs: check OMX buffer size before use in (vorbis|opus)dec" into mnc-dev am: efdf1bb am: a63e6a3
am: 25c084a

* commit '25c084ac1396aba13e867fa287eac92cd8f77c48':
DO NOT MERGE codecs: check OMX buffer size before use in (vorbis|opus)dec

Change-Id: I1fc5928a89200d63cdeb4c0c79a17e033aa0eb81
d3e58975f4e0e7cd9a872a7431482b703a4b6488 08-Apr-2016 Wonsik Kim <wonsik@google.com> Merge "codecs: check OMX buffer size before use in (h263|h264)dec" into lmp-dev am: c3cd9ea am: 590fce5 am: b00d2bd am: acd0b16 am: 4c40196
am: d1d5b74

* commit 'd1d5b74dbe568c46d036481f0a7d3a620650ae71':
codecs: check OMX buffer size before use in (h263|h264)dec

Change-Id: I4dc6c403ba2be28efe11f2a547dc26b512fa855b
25c084ac1396aba13e867fa287eac92cd8f77c48 08-Apr-2016 Wonsik Kim <wonsik@google.com> Merge "DO NOT MERGE codecs: check OMX buffer size before use in (vorbis|opus)dec" into mnc-dev am: efdf1bb
am: a63e6a3

* commit 'a63e6a3627dceaca8bcefc2efc9827f2da53e992':
DO NOT MERGE codecs: check OMX buffer size before use in (vorbis|opus)dec

Change-Id: Ide635920a103b199a77b4ddfbd4c58750cbb49c4
d1d5b74dbe568c46d036481f0a7d3a620650ae71 08-Apr-2016 Wonsik Kim <wonsik@google.com> Merge "codecs: check OMX buffer size before use in (h263|h264)dec" into lmp-dev am: c3cd9ea am: 590fce5 am: b00d2bd am: acd0b16
am: 4c40196

* commit '4c401960d2e0b1662447fa43e8cafcb066ca43a0':
codecs: check OMX buffer size before use in (h263|h264)dec

Change-Id: I6944b35d803f08b795d4d0bb276b9f04f3df5ab9
a63e6a3627dceaca8bcefc2efc9827f2da53e992 08-Apr-2016 Wonsik Kim <wonsik@google.com> Merge "DO NOT MERGE codecs: check OMX buffer size before use in (vorbis|opus)dec" into mnc-dev
am: efdf1bb

* commit 'efdf1bb423c57349bed6629a9668907179771c4a':
DO NOT MERGE codecs: check OMX buffer size before use in (vorbis|opus)dec

Change-Id: I07c9e86f41f1b15638785a2138d5c47c4c5b54c6
9e18c578276311318201e2423c93728cf81f0400 20-Mar-2016 Wonsik Kim <wonsik@google.com> codecs: check OMX buffer size before use in (avc|hevc|mpeg2)dec

Bug: 27833616
Change-Id: Ic4045a3f56f53b08d0b1264b2a91b8f43e91b738
(cherry picked from commit 87fdee0bc9e3ac4d2a88ef0a8e150cfdf08c161d)
odecs/avcdec/SoftAVCDec.cpp
odecs/avcdec/SoftAVCDec.h
odecs/hevcdec/SoftHEVC.cpp
odecs/hevcdec/SoftHEVC.h
odecs/mpeg2dec/SoftMPEG2.cpp
odecs/mpeg2dec/SoftMPEG2.h
4c401960d2e0b1662447fa43e8cafcb066ca43a0 08-Apr-2016 Wonsik Kim <wonsik@google.com> Merge "codecs: check OMX buffer size before use in (h263|h264)dec" into lmp-dev am: c3cd9ea am: 590fce5 am: b00d2bd
am: acd0b16

* commit 'acd0b166826a8be93f423580cc966b680f780a8c':
codecs: check OMX buffer size before use in (h263|h264)dec

Change-Id: I299854447bf920a58fcfc619a7feabc9c5bb188a
acd0b166826a8be93f423580cc966b680f780a8c 08-Apr-2016 Wonsik Kim <wonsik@google.com> Merge "codecs: check OMX buffer size before use in (h263|h264)dec" into lmp-dev am: c3cd9ea am: 590fce5
am: b00d2bd

* commit 'b00d2bd2bc8e4084ca244775eb90b5b001f4e6cd':
codecs: check OMX buffer size before use in (h263|h264)dec

Change-Id: I6d49ed7ab40e374c77887cdccf0a7510f7dd277b
eedc29f89632a98ada144ed149550c172d8094e0 08-Apr-2016 Wonsik Kim <wonsik@google.com> Merge "DO NOT MERGE codecs: check OMX buffer size before use in vorbisdec" into klp-dev am: 52636f8
am: 9f83485

* commit '9f834853a28d20ee9b218b0c8e68ff38b48f5743':
DO NOT MERGE codecs: check OMX buffer size before use in vorbisdec

Change-Id: I6cd36d4986fb6c96b7e01d9cdff3e7cd77f0f951
d3e0de0d55027eeb2744d464a6ad0cdb7d47f826 08-Apr-2016 Wonsik Kim <wonsik@google.com> Merge "DO NOT MERGE codecs: check OMX buffer size before use in (h263|h264)dec" into klp-dev am: f81eab3
am: eec4dd5

* commit 'eec4dd5f859d6e8d0d77f03c1ad27ba720bf2e04':
DO NOT MERGE codecs: check OMX buffer size before use in (h263|h264)dec

Change-Id: I85cbc2e7d30332bf163599b36a518387796658c6
590fce51b958ab882e6e43f79151382fcef22623 08-Apr-2016 Wonsik Kim <wonsik@google.com> Merge "codecs: check OMX buffer size before use in (h263|h264)dec" into lmp-dev
am: c3cd9ea

* commit 'c3cd9ea24d2eef42881f948f5b0278c6cd9023bb':
codecs: check OMX buffer size before use in (h263|h264)dec

Change-Id: I93a3b15a6a7804502638b484bb6b45790cd374fc
52636f8462b2a24f77524ca912e3579c33ac113e 08-Apr-2016 Wonsik Kim <wonsik@google.com> Merge "DO NOT MERGE codecs: check OMX buffer size before use in vorbisdec" into klp-dev
7e217db163197b9a72f9147a57c3bc635896d382 08-Apr-2016 Wonsik Kim <wonsik@google.com> Merge "DO NOT MERGE codecs: check OMX buffer size before use in (vorbis|opus)dec" into lmp-dev
efdf1bb423c57349bed6629a9668907179771c4a 08-Apr-2016 Wonsik Kim <wonsik@google.com> Merge "DO NOT MERGE codecs: check OMX buffer size before use in (vorbis|opus)dec" into mnc-dev
a62b75a7f5c959da498210761ea248c2425cd258 08-Apr-2016 Wonsik Kim <wonsik@google.com> Merge "DO NOT MERGE codecs: check OMX buffer size before use in (avc|hevc|mpeg2)dec" into mnc-dev
316be4cf419f083ffc5ba7e2feb93ca5dc71f0d7 08-Apr-2016 Wonsik Kim <wonsik@google.com> Merge "DO NOT MERGE codecs: check OMX buffer size before use in hevcdec" into lmp-dev
c3cd9ea24d2eef42881f948f5b0278c6cd9023bb 08-Apr-2016 Wonsik Kim <wonsik@google.com> Merge "codecs: check OMX buffer size before use in (h263|h264)dec" into lmp-dev
f81eab31874a6cf40e1f265b0c47cbe6b137d407 08-Apr-2016 Wonsik Kim <wonsik@google.com> Merge "DO NOT MERGE codecs: check OMX buffer size before use in (h263|h264)dec" into klp-dev
ecdd01b4c7624a13f0c22f110907758f7344171a 07-Apr-2016 Wonsik Kim <wonsik@google.com> DO NOT MERGE codecs: check OMX buffer size before use in (gsm|g711)dec

Bug: 27793163
Bug: 27793367
Change-Id: Iec3de8a237ee2379d87a8371c13e543878c6652c
odecs/g711/dec/SoftG711.cpp
odecs/gsm/dec/SoftGSM.cpp
0490fe25b580546f54d4d5bdb184fa8df091dfc5 07-Apr-2016 Wonsik Kim <wonsik@google.com> DO NOT MERGE codecs: check OMX buffer size before use in (gsm|g711)dec

Bug: 27793163
Bug: 27793367
Change-Id: Iec3de8a237ee2379d87a8371c13e543878c6652c
odecs/g711/dec/SoftG711.cpp
odecs/gsm/dec/SoftGSM.cpp
d211045926b78d2bc82611c97a7cfd18a9790c4b 07-Apr-2016 Wonsik Kim <wonsik@google.com> codecs: check OMX buffer size before use in (gsm|g711)dec

Bug: 27793163
Bug: 27793367
Change-Id: Iec3de8a237ee2379d87a8371c13e543878c6652c
odecs/g711/dec/SoftG711.cpp
odecs/gsm/dec/SoftGSM.cpp
ee8b78e4775dee03fb35ce7a162d3f60b8d69308 08-Apr-2016 Robert Shih <robertshih@google.com> Merge "NuMediaExtractor: NULL check before closing data source" into nyc-dev am: 58e8d02
am: 522e0a5

* commit '522e0a5a199d13d5fe791cf669e6253d3063f258':
NuMediaExtractor: NULL check before closing data source

Change-Id: Idb5e108fb006e8a477fc55502ed01efd59c80ff7
522e0a5a199d13d5fe791cf669e6253d3063f258 08-Apr-2016 Robert Shih <robertshih@google.com> Merge "NuMediaExtractor: NULL check before closing data source" into nyc-dev
am: 58e8d02

* commit '58e8d02eeb905eb275c63da3e7e3da0d67b2c242':
NuMediaExtractor: NULL check before closing data source

Change-Id: Iecd2c89efce511b7e4b52fe9fe75122d066934ae
58e8d02eeb905eb275c63da3e7e3da0d67b2c242 08-Apr-2016 Robert Shih <robertshih@google.com> Merge "NuMediaExtractor: NULL check before closing data source" into nyc-dev
0f02416a0b21b0aea727a7c9bc9fd49c2fb30dd0 08-Apr-2016 Marco Nelissen <marcone@google.com> Fix print format specifier am: 9fde506
am: a39941a

* commit 'a39941a99313126668a9cd4f50230b366b1bd636':
Fix print format specifier

Change-Id: I2f5fdf7a1c5d878f83ca9ed30d7c854768240d49
a39941a99313126668a9cd4f50230b366b1bd636 08-Apr-2016 Marco Nelissen <marcone@google.com> Fix print format specifier
am: 9fde506

* commit '9fde506b8d37bd472969524bcef1d03b24c39c6c':
Fix print format specifier

Change-Id: I37fd65d1c5ec40c5d6fbf40b2d98e6be095b2165
9fde506b8d37bd472969524bcef1d03b24c39c6c 08-Apr-2016 Marco Nelissen <marcone@google.com> Fix print format specifier

Bug: 27793371
Change-Id: Id1bb10e41c2d9107a53dd807a3b7bd83dfafd49c
odecs/mp3dec/SoftMP3.cpp
5395821168c13ad7496a52129c4de264ba02d426 08-Apr-2016 Hangyu Kuang <hkuang@google.com> Merge "Stagefright: Add HDRStaticInfo support for decoder." into nyc-dev am: d77a954
am: da277e7

* commit 'da277e7e0f47781f4034df8afbc2b53dfd40a431':
Stagefright: Add HDRStaticInfo support for decoder.

Change-Id: I76ec3704113c44e6edebf02430e6e65fd1f258aa
da277e7e0f47781f4034df8afbc2b53dfd40a431 08-Apr-2016 Hangyu Kuang <hkuang@google.com> Merge "Stagefright: Add HDRStaticInfo support for decoder." into nyc-dev
am: d77a954

* commit 'd77a954c1e6c3524ee2b61cba639e24b6d3320f7':
Stagefright: Add HDRStaticInfo support for decoder.

Change-Id: I02c7cf583411c38573f2c0a4b52ab80e242455a1
d77a954c1e6c3524ee2b61cba639e24b6d3320f7 08-Apr-2016 Hangyu Kuang <hkuang@google.com> Merge "Stagefright: Add HDRStaticInfo support for decoder." into nyc-dev
b5d77ec981ad4d50d2f6d847597d0edf998bffa9 08-Apr-2016 Marco Nelissen <marcone@google.com> Merge "AudioSource: initialize variables" into mnc-dev am: d31f7db am: 96beb1b am: 503a93a am: 62ccd40 am: 49d9f9a
am: 2f65ca6

* commit '2f65ca6d726e7bfdede43fc24c30d6988d8686a8':
AudioSource: initialize variables

Change-Id: Id29f4002fa6b2f841efd4ad774257f87bc6eeeb1
2f65ca6d726e7bfdede43fc24c30d6988d8686a8 08-Apr-2016 Marco Nelissen <marcone@google.com> Merge "AudioSource: initialize variables" into mnc-dev am: d31f7db am: 96beb1b am: 503a93a am: 62ccd40
am: 49d9f9a

* commit '49d9f9a0ce21bcb8670019ff1365d1015da32e19':
AudioSource: initialize variables

Change-Id: I58875ab6145fc3b3e51974286390f0e097efee64
49d9f9a0ce21bcb8670019ff1365d1015da32e19 08-Apr-2016 Marco Nelissen <marcone@google.com> Merge "AudioSource: initialize variables" into mnc-dev am: d31f7db am: 96beb1b am: 503a93a
am: 62ccd40

* commit '62ccd40deb94ea58ca6ea870d46dbc002dd31175':
AudioSource: initialize variables

Change-Id: I3cdbb76aea2c199f06a03e24972f1a469cff26c5
62ccd40deb94ea58ca6ea870d46dbc002dd31175 08-Apr-2016 Marco Nelissen <marcone@google.com> Merge "AudioSource: initialize variables" into mnc-dev am: d31f7db am: 96beb1b
am: 503a93a

* commit '503a93a6f4c3913a5fb103b86849fa09e0a0a223':
AudioSource: initialize variables

Change-Id: I178dd68683eb8c1a08c5238ec98a7f9d6cb464e1
e041db4a549bb18e3d4949bbefbe6d9a969df5f0 08-Apr-2016 Marco Nelissen <marcone@google.com> Merge "Check mp3 output buffer size" into klp-dev am: bc736f6 am: 44ef399 am: a70a752 am: 2a05d85 am: 5a42238 am: 847d335 am: 7a22114 am: 94dd823 am: 738e290 am: 434aa91 am: 65688b0 am: 8a0b060f
am: f61bb46

* commit 'f61bb464079da4ba3ea8a38018af840e7162fb44':
Check mp3 output buffer size

Change-Id: Ie8506234a2cd875f6254a4406bce723ac04d2e41
503a93a6f4c3913a5fb103b86849fa09e0a0a223 08-Apr-2016 Marco Nelissen <marcone@google.com> Merge "AudioSource: initialize variables" into mnc-dev am: d31f7db
am: 96beb1b

* commit '96beb1b1359fe5cd4a9f2babb18fef443ea0afdd':
AudioSource: initialize variables

Change-Id: I24262f146cdcce7bedbe38a42393d6e78c728b4b
f61bb464079da4ba3ea8a38018af840e7162fb44 08-Apr-2016 Marco Nelissen <marcone@google.com> Merge "Check mp3 output buffer size" into klp-dev am: bc736f6 am: 44ef399 am: a70a752 am: 2a05d85 am: 5a42238 am: 847d335 am: 7a22114 am: 94dd823 am: 738e290 am: 434aa91 am: 65688b0
am: 8a0b060f

* commit '8a0b060fef33216acb2509792a8480da1a604101':
Check mp3 output buffer size

Change-Id: I0d7c7253f60e527a79f3b8d999e578a4fccb3530
8a0b060fef33216acb2509792a8480da1a604101 08-Apr-2016 Marco Nelissen <marcone@google.com> Merge "Check mp3 output buffer size" into klp-dev am: bc736f6 am: 44ef399 am: a70a752 am: 2a05d85 am: 5a42238 am: 847d335 am: 7a22114 am: 94dd823 am: 738e290 am: 434aa91
am: 65688b0

* commit '65688b02a17e33a8b3f39fbc38b39657b5d03872':
Check mp3 output buffer size

Change-Id: I0cfc271bd397a2bdc3591ace1ef45ea1c8c0b817
96beb1b1359fe5cd4a9f2babb18fef443ea0afdd 08-Apr-2016 Marco Nelissen <marcone@google.com> Merge "AudioSource: initialize variables" into mnc-dev
am: d31f7db

* commit 'd31f7dbe92d7f54466ea962d3477c0ff293849c5':
AudioSource: initialize variables

Change-Id: I32890ae78f27060cbc1bea4e2f1a49fca29fe7e1
4a631e84df76e97fa3424970a1a625dc9f1f5b9d 08-Apr-2016 Robert Shih <robertshih@google.com> NuMediaExtractor: NULL check before closing data source

Bug: 28063322
Change-Id: Id62952110c3f2736780bc2fd9f9111affa3bb04d
uMediaExtractor.cpp
65688b02a17e33a8b3f39fbc38b39657b5d03872 08-Apr-2016 Marco Nelissen <marcone@google.com> Merge "Check mp3 output buffer size" into klp-dev am: bc736f6 am: 44ef399 am: a70a752 am: 2a05d85 am: 5a42238 am: 847d335 am: 7a22114 am: 94dd823 am: 738e290
am: 434aa91

* commit '434aa919606a3ce3920d9172905b411ceb271434':
Check mp3 output buffer size

Change-Id: Ie8eab4be3e5105e39def3115403cffabc1ce9b4e
434aa919606a3ce3920d9172905b411ceb271434 07-Apr-2016 Marco Nelissen <marcone@google.com> Merge "Check mp3 output buffer size" into klp-dev am: bc736f6 am: 44ef399 am: a70a752 am: 2a05d85 am: 5a42238 am: 847d335 am: 7a22114 am: 94dd823
am: 738e290

* commit '738e29011494641658196d4c27ad4f81f6a2b528':
Check mp3 output buffer size

Change-Id: If4a007bffe13d380f960cfb5216c8bb424833285
d31f7dbe92d7f54466ea962d3477c0ff293849c5 07-Apr-2016 Marco Nelissen <marcone@google.com> Merge "AudioSource: initialize variables" into mnc-dev
738e29011494641658196d4c27ad4f81f6a2b528 07-Apr-2016 Marco Nelissen <marcone@google.com> Merge "Check mp3 output buffer size" into klp-dev am: bc736f6 am: 44ef399 am: a70a752 am: 2a05d85 am: 5a42238 am: 847d335 am: 7a22114
am: 94dd823

* commit '94dd8230619f38bb3bc988e9e4cdb367d56f415d':
Check mp3 output buffer size

Change-Id: I1206a9156c9fb1ff87441906bb2bdedb5c031da3
94dd8230619f38bb3bc988e9e4cdb367d56f415d 07-Apr-2016 Marco Nelissen <marcone@google.com> Merge "Check mp3 output buffer size" into klp-dev am: bc736f6 am: 44ef399 am: a70a752 am: 2a05d85 am: 5a42238 am: 847d335
am: 7a22114

* commit '7a2211482120203c21248cc645828175175bb75e':
Check mp3 output buffer size

Change-Id: I948d0ad2db0820f1c36b720634f7c7c156566e18
7a2211482120203c21248cc645828175175bb75e 07-Apr-2016 Marco Nelissen <marcone@google.com> Merge "Check mp3 output buffer size" into klp-dev am: bc736f6 am: 44ef399 am: a70a752 am: 2a05d85 am: 5a42238
am: 847d335

* commit '847d3358be4d4f407459f35c12bd9b5f74794b9a':
Check mp3 output buffer size

Change-Id: I57706fd383d88fdd591eaae4be639094826eac90
5a42238be6f0feff9e16a4ae245e394abc78c2ef 07-Apr-2016 Marco Nelissen <marcone@google.com> Merge "Check mp3 output buffer size" into klp-dev am: bc736f6 am: 44ef399 am: a70a752
am: 2a05d85

* commit '2a05d85b98361d4e1f24fbb2ae19873ce7db6db4':
Check mp3 output buffer size

Change-Id: Ia0d6f0d0e0458cb341c1ae546c2c6951d4db8a72
2a05d85b98361d4e1f24fbb2ae19873ce7db6db4 07-Apr-2016 Marco Nelissen <marcone@google.com> Merge "Check mp3 output buffer size" into klp-dev am: bc736f6 am: 44ef399
am: a70a752

* commit 'a70a752e110d436c24195037e3ade612fe2d15bd':
Check mp3 output buffer size

Change-Id: Ic909905135d8871ebbef12515b69761bf3e42452
f656b97e7af7ae626a4a09c777b700e21fcd0cab 07-Apr-2016 Marco Nelissen <marcone@google.com> Merge "Fix AMRWBEnc overflow" into nyc-dev am: e7abcf0
am: e198f76

* commit 'e198f76987ce74211d4ac66b062a494805a284ca':
Fix AMRWBEnc overflow

Change-Id: I0212bf74029b5e4ab0cadae2c6e7fa8fb0bb332c
a70a752e110d436c24195037e3ade612fe2d15bd 07-Apr-2016 Marco Nelissen <marcone@google.com> Merge "Check mp3 output buffer size" into klp-dev am: bc736f6
am: 44ef399

* commit '44ef399573ddf6be54f4ab1c049a9d022a44bb60':
Check mp3 output buffer size

Change-Id: Ie3514d66b68a9add1e4c24b940f41df9cf31fb6e
e198f76987ce74211d4ac66b062a494805a284ca 07-Apr-2016 Marco Nelissen <marcone@google.com> Merge "Fix AMRWBEnc overflow" into nyc-dev
am: e7abcf0

* commit 'e7abcf0e0c5bfd86b9e89d37dc89e4cd8c6957d0':
Fix AMRWBEnc overflow

Change-Id: I29dc3105fd0b8e9e1c3d0a8b98a449c58c38b528
bc736f650daeacce241c1f1e9c1b3ac28b5befe1 07-Apr-2016 Marco Nelissen <marcone@google.com> Merge "Check mp3 output buffer size" into klp-dev
f88d1d8e63442d09303ca1090e1ee12e22040500 05-Apr-2016 Marco Nelissen <marcone@google.com> AudioSource: initialize variables

to prevent info leak

Bug: 27855172
Change-Id: I3d33e0a9cc5cf8a758d7b0794590b09c43a24561
udioSource.cpp
25bf5e20ef69cc8944c72d0eb6a4fb58d4bacbfd 07-Apr-2016 Marco Nelissen <marcone@google.com> Fix AMRWBEnc overflow

Bug: 27898843
Change-Id: Ib36833020e9203ef5e8acf18fdde900c0f102978
odecs/amrwbenc/src/voAMRWBEnc.c
bbe7dfd0be12eaf89bde28253ccaed5b0b4c262e 07-Apr-2016 Marco Nelissen <marcone@google.com> AudioSource: initialize variables am: a2f5b80 am: 67e0eb7 am: 9c67287 am: 211ec4d am: 1bc35dd
am: 8cb55c6

* commit '8cb55c68dcecb3f417eb47490cff2d447e787f2b':
AudioSource: initialize variables

Change-Id: I40aca09c325bbeb0c0c6bd4e76ba1912db3c29ab
1bc35dd09ea3e92c410e88360aea9be8da3aac5a 07-Apr-2016 Marco Nelissen <marcone@google.com> AudioSource: initialize variables am: a2f5b80 am: 67e0eb7 am: 9c67287
am: 211ec4d

* commit '211ec4d5a50b9833accc1885a19e9811cf9c59bf':
AudioSource: initialize variables

Change-Id: Id2246823e62161f86d5fe4d490d09e7ac1d6acca
211ec4d5a50b9833accc1885a19e9811cf9c59bf 07-Apr-2016 Marco Nelissen <marcone@google.com> AudioSource: initialize variables am: a2f5b80 am: 67e0eb7
am: 9c67287

* commit '9c67287c64a8535b86aa4a46ca4fdbc9859b40b5':
AudioSource: initialize variables

Change-Id: I55e1d069317e6a0e9da0ff8babead6d0248287dd
9c67287c64a8535b86aa4a46ca4fdbc9859b40b5 07-Apr-2016 Marco Nelissen <marcone@google.com> AudioSource: initialize variables am: a2f5b80
am: 67e0eb7

* commit '67e0eb763d50b7811176f97553934dcc8dca4328':
AudioSource: initialize variables

Change-Id: Ia3456efeff3fa722b93510a2428ec88e86394bce
e3230df9add3752e20224c23a27422c59815e2c2 07-Apr-2016 Marco Nelissen <marcone@google.com> Merge "Expand mediaextractor dumpsys" into nyc-dev am: b7b06be
am: 89a2919

* commit '89a29193cbb89c2120b32bb79640befeaa92b8c2':
Expand mediaextractor dumpsys

Change-Id: I5a98267fbea6feb00216bd088dc7889dd695217e
89a29193cbb89c2120b32bb79640befeaa92b8c2 07-Apr-2016 Marco Nelissen <marcone@google.com> Merge "Expand mediaextractor dumpsys" into nyc-dev
am: b7b06be

* commit 'b7b06be6ff2e6034a18986f94c76940b13ef4183':
Expand mediaextractor dumpsys

Change-Id: If6ecdcf4d51da03f7704f5fbe97c85154a18d35d
b7b06be6ff2e6034a18986f94c76940b13ef4183 07-Apr-2016 Marco Nelissen <marcone@google.com> Merge "Expand mediaextractor dumpsys" into nyc-dev
b8f88bf8c8d5786eff5cd4100e51cc0aa3593262 07-Apr-2016 Vignesh Venkatasubramanian <vigneshv@google.com> Merge "Update libwebm include path in MatroskaExtractor"
e8abccb927c5fa8aaa4690a2dd034999a5ce2d91 07-Apr-2016 Jean-Michel Trivi <jmtrivi@google.com> Merge "Always enable multichannel AAC decoding" into nyc-dev am: c8bc097
am: 1e577f3

* commit '1e577f360e33d1f4da3c93ef267668486248897f':
Always enable multichannel AAC decoding

Change-Id: I25065af5e0bf357ab167cd8fdb6508237d460b97
1e577f360e33d1f4da3c93ef267668486248897f 07-Apr-2016 Jean-Michel Trivi <jmtrivi@google.com> Merge "Always enable multichannel AAC decoding" into nyc-dev
am: c8bc097

* commit 'c8bc097237c43cabe52ec3a0424fda7f562e0c05':
Always enable multichannel AAC decoding

Change-Id: I74d281c5377641f46fc58168f9020973cdfd65e8
c8bc097237c43cabe52ec3a0424fda7f562e0c05 07-Apr-2016 Jean-Michel Trivi <jmtrivi@google.com> Merge "Always enable multichannel AAC decoding" into nyc-dev
db318d40b90a456311b3920c605e33b763ca79f9 06-Apr-2016 Hangyu Kuang <hkuang@google.com> Stagefright: Add HDRStaticInfo support for decoder.

Bug:25684127
Change-Id: Ic11190c4622bc0db4ef30958879829d09dd628a7
Codec.cpp
oundation/ColorUtils.cpp
4e0e8e8a861cc26314072f41ec5111a06bea0feb 06-Apr-2016 Vignesh Venkatasubramanian <vigneshv@google.com> Update libwebm include path in MatroskaExtractor

Change-Id: I38d305aa864495e696954932db1202320672aaf3
atroska/MatroskaExtractor.h
385a176b017eb9b8132f2adc953cf48320cb899c 06-Apr-2016 Pawin Vongmasa <pawin@google.com> Merge "ACodec.cpp: Removed a null pointer dereference triggered in an ALOGV statement." into nyc-dev am: 953c59c
am: 25d7862

* commit '25d7862329a460ce4cd2fe094713eb89e2136ded':
ACodec.cpp: Removed a null pointer dereference triggered in an ALOGV statement.

Change-Id: I5702d207cbf561a56876ae27edef2d3945325b23
25d7862329a460ce4cd2fe094713eb89e2136ded 06-Apr-2016 Pawin Vongmasa <pawin@google.com> Merge "ACodec.cpp: Removed a null pointer dereference triggered in an ALOGV statement." into nyc-dev
am: 953c59c

* commit '953c59c51da938fdcaf3801de89edb736c249c6f':
ACodec.cpp: Removed a null pointer dereference triggered in an ALOGV statement.

Change-Id: Iec9bc92787323d950401f6176af7cb81a65579ca
69d3d8a9540b0da787ea0beccad2517f057dd54d 07-Mar-2016 Marco Nelissen <marcone@google.com> Expand mediaextractor dumpsys

Bug: 22775369
Change-Id: I3366a52ba7a00d1685a2211465f2f18f143d0efc
allbackDataSource.cpp
ileSource.cpp
TTPBase.cpp
ediaExtractor.cpp
uCachedSource2.cpp
oundation/MetaData.cpp
ttp/MediaHTTP.cpp
nclude/CallbackDataSource.h
nclude/HTTPBase.h
nclude/NuCachedSource2.h
953c59c51da938fdcaf3801de89edb736c249c6f 06-Apr-2016 Pawin Vongmasa <pawin@google.com> Merge "ACodec.cpp: Removed a null pointer dereference triggered in an ALOGV statement." into nyc-dev
2386a120998bbdb7a92156891835fc30feac8d7a 06-Apr-2016 Jean-Michel Trivi <jmtrivi@google.com> Always enable multichannel AAC decoding

There is no need to limit the number of channels at the output
of the decoder.

Bug 25842037

Change-Id: I7b3ba4872c0d990c50662e76c9ff44bcb49a0653
odecs/aacdec/SoftAAC2.cpp
odecs/aacdec/SoftAAC2.h
8e150860f270b3e3901055c2e4a6f268454f9513 06-Apr-2016 Marco Nelissen <marcone@google.com> Merge "MP3Extractor: fix overflow on duration estimation" into nyc-dev am: 8905fc7
am: 6b49f65

* commit '6b49f65c6315ac5d1fb83682f6bef78502b5384e':
MP3Extractor: fix overflow on duration estimation

Change-Id: Icd6498bd46945139006f1d494723f148a00e0610
6b49f65c6315ac5d1fb83682f6bef78502b5384e 06-Apr-2016 Marco Nelissen <marcone@google.com> Merge "MP3Extractor: fix overflow on duration estimation" into nyc-dev
am: 8905fc7

* commit '8905fc7a0ca6582a8998b067ad5322a569ff5cc5':
MP3Extractor: fix overflow on duration estimation

Change-Id: I8587ee79dedc3f1e3336c0fbe8b440c5de6dd7fe
63690d1588cb24929da7ced24ec341ed2a003825 06-Apr-2016 Marco Nelissen <marcone@google.com> MP3Extractor: fix overflow on duration estimation

also make FileSource adjust offset and length to match the actual length
of the file.

Bug: 27665235
Change-Id: Ib08ee3bb30bc027adc9d3b1f5c88cd099fc4cf9e
ileSource.cpp
P3Extractor.cpp
598c14420eefb2df4b50d9dd55bbf99bbc35e95e 06-Apr-2016 Pawin Vongmasa <pawin@google.com> ACodec.cpp: Removed a null pointer dereference triggered in an
ALOGV statement.

Note: mGraphicBuffer is expected to be NULL on the modified
line.

Bug: 27977709
Change-Id: I26c502ee1d0fb47e06cce1c042fb55de11c92b89
Codec.cpp
a2f5b80a54ac3cd0f7dcfbb4d87eaf2f5ab99557 05-Apr-2016 Marco Nelissen <marcone@google.com> AudioSource: initialize variables

to prevent info leak

Bug: 27855172
Change-Id: I3d33e0a9cc5cf8a758d7b0794590b09c43a24561
udioSource.cpp
30940b31b21f47eaa15786764e013d0a283d7d49 23-Mar-2016 Marco Nelissen <marcone@google.com> Check mp3 output buffer size

Bug: 27793371
Change-Id: I0fe40a4cfd0a5b488f93d3f3ba6f9495235926ac
odecs/mp3dec/SoftMP3.cpp
cb593d3836a157375b99057f04b5d1ad353a502a 05-Apr-2016 Robert Shih <robertshih@google.com> Merge "ANetworkSession: avoid overflow in readMore" into nyc-dev am: 2d597d4
am: 1ab268e

* commit '1ab268e7b37aa919bfa72f557abb4f4be8451655':
ANetworkSession: avoid overflow in readMore

Change-Id: I98bbba4810d11ef52be634e749effeaaad2096e8
1ab268e7b37aa919bfa72f557abb4f4be8451655 05-Apr-2016 Robert Shih <robertshih@google.com> Merge "ANetworkSession: avoid overflow in readMore" into nyc-dev
am: 2d597d4

* commit '2d597d470f10ef072bb9e6906baa80d782a93b8a':
ANetworkSession: avoid overflow in readMore

Change-Id: I52c00c27ccf27781b01319201ea7cffa3bbe8158
2d597d470f10ef072bb9e6906baa80d782a93b8a 05-Apr-2016 Robert Shih <robertshih@google.com> Merge "ANetworkSession: avoid overflow in readMore" into nyc-dev
37328ac298990f7e6a52e92fc25d26da9c702763 05-Apr-2016 Robert Shih <robertshih@google.com> Merge "WebmWriter: avoid overflow when bit twiddling" into nyc-dev am: 1bb5062
am: d997a4f

* commit 'd997a4f3e411156c011ac69c1785b2c478949425':
WebmWriter: avoid overflow when bit twiddling

Change-Id: I2ee7cb219d07d11fce247d44e4dd0cf2d10dd82d
d997a4f3e411156c011ac69c1785b2c478949425 05-Apr-2016 Robert Shih <robertshih@google.com> Merge "WebmWriter: avoid overflow when bit twiddling" into nyc-dev
am: 1bb5062

* commit '1bb5062a2265f2c9e051352f0550457c0c0c0fef':
WebmWriter: avoid overflow when bit twiddling

Change-Id: I43fde8cfa974328402f57cef21283c30b02ed129
1bb5062a2265f2c9e051352f0550457c0c0c0fef 05-Apr-2016 Robert Shih <robertshih@google.com> Merge "WebmWriter: avoid overflow when bit twiddling" into nyc-dev
1f87316768127dc569135f8a488786135b88c221 05-Apr-2016 Robert Shih <robertshih@google.com> ANetworkSession: avoid overflow in readMore

Bug: 25111892
Change-Id: I359c307d605069ec5a484aa18ff54e07f8e923a9
oundation/ANetworkSession.cpp
15e6f84247e2283af5dafb4da465fa8519a58fdc 05-Apr-2016 Marco Nelissen <marcone@google.com> Close MediaDataSource on extractor/retriever release am: fbe7fcf
am: 8ffffec

* commit '8ffffec44ea59955d9440c7b5a11e51755d2dfdb':
Close MediaDataSource on extractor/retriever release

Change-Id: Id265ac6a4fbc310e2ab040a46c221829cc6e338b
8ffffec44ea59955d9440c7b5a11e51755d2dfdb 05-Apr-2016 Marco Nelissen <marcone@google.com> Close MediaDataSource on extractor/retriever release
am: fbe7fcf

* commit 'fbe7fcfe818b6f68e352c7c450d4fe15a543b801':
Close MediaDataSource on extractor/retriever release

Change-Id: Idee11c47cd7dd8c6242a8f795fe3e90f4c5bf2b9
fbe7fcfe818b6f68e352c7c450d4fe15a543b801 05-Apr-2016 Marco Nelissen <marcone@google.com> Close MediaDataSource on extractor/retriever release

instead of waiting for garbage collection.

Bug: 26911216
bug: 26741307
Change-Id: I79010066962a1bdb9cb8bf74ba9a7997abb82fd4
allbackDataSource.cpp
ileSource.cpp
uMediaExtractor.cpp
tagefrightMetadataRetriever.cpp
nclude/CallbackDataSource.h
b8310d431ff5ca29b605e1877ffb30a2177436b5 05-Apr-2016 Pawin Vongmasa <pawin@google.com> Merge "SoftAAC2: Modified conditions for format change notification after decoding each frame." into nyc-dev am: 6d40663
am: 8739bc7

* commit '8739bc7cf5802e6e151f9d6301188f5a36b2a09e':
SoftAAC2: Modified conditions for format change notification after decoding each frame.

Change-Id: Iaadc57744e741dc755ac7f2cd21c47098df25894
8739bc7cf5802e6e151f9d6301188f5a36b2a09e 05-Apr-2016 Pawin Vongmasa <pawin@google.com> Merge "SoftAAC2: Modified conditions for format change notification after decoding each frame." into nyc-dev
am: 6d40663

* commit '6d40663b36510725de72fd440cbf2fc731c24830':
SoftAAC2: Modified conditions for format change notification after decoding each frame.

Change-Id: If90c85c44f5725d9d64da1bed712f68999aa86d4
6d40663b36510725de72fd440cbf2fc731c24830 05-Apr-2016 Pawin Vongmasa <pawin@google.com> Merge "SoftAAC2: Modified conditions for format change notification after decoding each frame." into nyc-dev
7797ca07ed18087704b51072e718a44fe9604dad 05-Apr-2016 Robert Shih <robertshih@google.com> WebmWriter: avoid overflow when bit twiddling

Bug: 27799294
Change-Id: I17b7fc42d0eaae12f487273362d8d1b9bb80ae7f
ebm/EbmlUtil.cpp
716e56bc1c6fa268980f9de3b3f3b1e9c8e9293c 05-Apr-2016 Robert Shih <robertshih@google.com> Merge "HLS: gracefully handle illegal buffer sizes" into nyc-dev am: c3ae7ae
am: 124c090

* commit '124c090333a2f56f5fc23a694484716c03e8de76':
HLS: gracefully handle illegal buffer sizes

Change-Id: Iac95843fb61167e4f19b3ca61e6c0935bdf85868
124c090333a2f56f5fc23a694484716c03e8de76 05-Apr-2016 Robert Shih <robertshih@google.com> Merge "HLS: gracefully handle illegal buffer sizes" into nyc-dev
am: c3ae7ae

* commit 'c3ae7ae564b53a71c69ac07e29c7f6f262eb6391':
HLS: gracefully handle illegal buffer sizes

Change-Id: I487cc7eb1d2c8f2397a06fdd6ac9e583040e13f8
c3ae7ae564b53a71c69ac07e29c7f6f262eb6391 05-Apr-2016 Robert Shih <robertshih@google.com> Merge "HLS: gracefully handle illegal buffer sizes" into nyc-dev
743aeb892fb5006c48eec5afd12d0f93a0b7a66b 01-Apr-2016 Pawin Vongmasa <pawin@google.com> SoftAAC2: Modified conditions for format change notification
after decoding each frame.

Before: The format change notification would not be sent if
mInputBufferCount and mOutputBufferCount do not satisfy
(mInputBufferCount <= 2 || mOutputBufferCount > 1) even when sampleRate
and numChannels are valid and do not match the previous values.

Change: Check sampleRate and numChannels first. If they are valid and
do not match their previous values, the format change notification will
be sent regardless of the values of mInputBufferCount and
mOutputBufferCount. The OMX_EventError will still be sent under the same
condition.

Bug: 27645138
Change-Id: I5499b8495675744e04905c2d94c176fa1ada08e5
odecs/aacdec/SoftAAC2.cpp
fbe6a51d5841c865b870bab1da7d828caa78a7ca 04-Apr-2016 Robert Shih <robertshih@google.com> HLS: gracefully handle illegal buffer sizes

Bug: 23277632
Change-Id: Ib1066a3d9c1ee125b0de7a1f1fe3e79c0168014f
ttplive/PlaylistFetcher.cpp
28ffe5aa10c1252b6ac9cca127090f29f240f3c0 02-Apr-2016 Wonsik Kim <wonsik@google.com> Merge "stagefright: request IDR on MediaRecorder.resume" into nyc-dev am: c190198
am: a6078f7

* commit 'a6078f7c4bfa03c5f744e5fe57272606fb12b6a8':
stagefright: request IDR on MediaRecorder.resume

Change-Id: Ib0853a6a42020e2188d37d77fb5056feb1ee6a8a
c11a969d8c727db204eeb15b2f781497ad9a55fb 02-Apr-2016 Wonsik Kim <wonsik@google.com> Merge "codecs: fix wrong bug reference" into nyc-dev am: 6e55f31
am: c943e48

* commit 'c943e48f8501cd0b69574743afbf87aeb45d66db':
codecs: fix wrong bug reference

Change-Id: If2eb78a95f8676d08e1dd1f70303dee1e178a5a3
a6078f7c4bfa03c5f744e5fe57272606fb12b6a8 02-Apr-2016 Wonsik Kim <wonsik@google.com> Merge "stagefright: request IDR on MediaRecorder.resume" into nyc-dev
am: c190198

* commit 'c190198e5ed92d66424f1f9d54f18c38e3e2009f':
stagefright: request IDR on MediaRecorder.resume

Change-Id: I90f785fe058749f21c2f22aa8494ab967319750b
c943e48f8501cd0b69574743afbf87aeb45d66db 02-Apr-2016 Wonsik Kim <wonsik@google.com> Merge "codecs: fix wrong bug reference" into nyc-dev
am: 6e55f31

* commit '6e55f31c9e5e38e3a223b9408bfd1e3640c49bb2':
codecs: fix wrong bug reference

Change-Id: Ib2bb3886849f557edb690edc4f254a9a4d7267a7
c190198e5ed92d66424f1f9d54f18c38e3e2009f 02-Apr-2016 Wonsik Kim <wonsik@google.com> Merge "stagefright: request IDR on MediaRecorder.resume" into nyc-dev
6e55f31c9e5e38e3a223b9408bfd1e3640c49bb2 02-Apr-2016 Wonsik Kim <wonsik@google.com> Merge "codecs: fix wrong bug reference" into nyc-dev
44372f1010cdb79e8502b0eb00f22d58c6d74ec0 01-Apr-2016 Hangyu Kuang <hkuang@google.com> Merge "stagefright: Document that MPEG4Writer does not support muxing out of order frames." into nyc-dev am: 1e47cb0
am: 0589c76

* commit '0589c76f105a8c996ab9fe58ff49c04ca5d2d6a6':
stagefright: Document that MPEG4Writer does not support muxing out of order frames.

Change-Id: Ib4958d9c935dddb7c9ccedfb220ce9d85a283b95
0589c76f105a8c996ab9fe58ff49c04ca5d2d6a6 01-Apr-2016 Hangyu Kuang <hkuang@google.com> Merge "stagefright: Document that MPEG4Writer does not support muxing out of order frames." into nyc-dev
am: 1e47cb0

* commit '1e47cb09db479f29d80c5354a5f5ddc4973ef6a5':
stagefright: Document that MPEG4Writer does not support muxing out of order frames.

Change-Id: Icfbf7f1951584aa558b9a7bd701c2d18668e504e
1e47cb09db479f29d80c5354a5f5ddc4973ef6a5 01-Apr-2016 Hangyu Kuang <hkuang@google.com> Merge "stagefright: Document that MPEG4Writer does not support muxing out of order frames." into nyc-dev
e75d53abb2f986cf07476d1430eb9981a79b2d2f 20-Mar-2016 Wonsik Kim <wonsik@google.com> DO NOT MERGE codecs: check OMX buffer size before use in (h263|h264)dec

Bug: 27833616
Change-Id: I0fd599b3da431425d89236ffdd9df423c11947c0
odecs/m4v_h263/dec/SoftMPEG4.cpp
odecs/on2/h264dec/SoftAVC.cpp
odecs/on2/h264dec/SoftAVC.h
3a3c3f7fc658ef874f82e46857ad9df3616aac95 20-Mar-2016 Wonsik Kim <wonsik@google.com> codecs: check OMX buffer size before use in (h263|h264)dec

Bug: 27833616
Change-Id: I0fd599b3da431425d89236ffdd9df423c11947c0
odecs/m4v_h263/dec/SoftMPEG4.cpp
odecs/on2/h264dec/SoftAVC.cpp
odecs/on2/h264dec/SoftAVC.h
ff64ea33382081f46d4b1061df00298bbbe3dd65 01-Apr-2016 Wonsik Kim <wonsik@google.com> codecs: fix wrong bug reference

Bug: 27833616
Change-Id: If5f1828ccff1e06aef2040234b86e73cbeba3326
odecs/avcdec/SoftAVCDec.cpp
odecs/hevcdec/SoftHEVC.cpp
odecs/mpeg2dec/SoftMPEG2.cpp
odecs/opus/dec/SoftOpus.cpp
odecs/vorbis/dec/SoftVorbis.cpp
1e9c0558ca8b9a7937088c5b7d9df23313cc2f1c 20-Mar-2016 Wonsik Kim <wonsik@google.com> DO NOT MERGE codecs: check OMX buffer size before use in hevcdec

Bug: 27833616
Change-Id: Ic4045a3f56f53b08d0b1264b2a91b8f43e91b738
odecs/hevcdec/SoftHEVC.cpp
odecs/hevcdec/SoftHEVC.h
f5a92a768f8d2058d09c9b6d3d370b64723887bd 20-Mar-2016 Wonsik Kim <wonsik@google.com> DO NOT MERGE codecs: check OMX buffer size before use in (avc|hevc|mpeg2)dec

Bug: 27833616
Change-Id: Ic4045a3f56f53b08d0b1264b2a91b8f43e91b738
odecs/avcdec/SoftAVCDec.cpp
odecs/avcdec/SoftAVCDec.h
odecs/hevcdec/SoftHEVC.cpp
odecs/hevcdec/SoftHEVC.h
odecs/mpeg2dec/SoftMPEG2.cpp
odecs/mpeg2dec/SoftMPEG2.h
6a0a4703140204270642fb75b9920654a8a44ffb 31-Mar-2016 Hangyu Kuang <hkuang@google.com> Merge "Remove AVC Base Profile restriction in ACodec encoder setup." into nyc-dev am: 22f2688
am: f5256fe

* commit 'f5256feb381b6b9749c116c2ce97fdd5f60dfa5d':
Remove AVC Base Profile restriction in ACodec encoder setup.

Change-Id: Ia9afc284b773a94a8f67d43d0f1ceaf0236f2dde
f5256feb381b6b9749c116c2ce97fdd5f60dfa5d 31-Mar-2016 Hangyu Kuang <hkuang@google.com> Merge "Remove AVC Base Profile restriction in ACodec encoder setup." into nyc-dev
am: 22f2688

* commit '22f2688a8e813ee55c62d1e2fa132b78c1e33eb1':
Remove AVC Base Profile restriction in ACodec encoder setup.

Change-Id: I318bfb4d57ee3d7e4e143c91973369cc9c8f4a07
f85a83af8c6a98b46c394c32b90b09214a68f3e4 31-Mar-2016 Hangyu Kuang <hkuang@google.com> stagefright: Document that MPEG4Writer does not support muxing out of order frames.

Bug:27597166
Change-Id: I6a771a39022d26d70007058b418b96c3b4387d87
PEG4Writer.cpp
67e58393b4b3be841a65173f274114b3869382da 30-Mar-2016 Wonsik Kim <wonsik@google.com> DO NOT MERGE codecs: check OMX buffer size before use in (vorbis|opus)dec

Bug: 27833616
Change-Id: I1ccdd16a00741da072527a6d13e87fd7c7fe8c54
odecs/opus/dec/SoftOpus.cpp
odecs/vorbis/dec/SoftVorbis.cpp
8d055459fe88267f445521673ac9771ba53f8638 30-Mar-2016 Wonsik Kim <wonsik@google.com> DO NOT MERGE codecs: check OMX buffer size before use in (vorbis|opus)dec

Bug: 27833616
Change-Id: I1ccdd16a00741da072527a6d13e87fd7c7fe8c54
odecs/opus/dec/SoftOpus.cpp
odecs/vorbis/dec/SoftVorbis.cpp
006e6f165a016e3fd74867269bc1286c013be752 30-Mar-2016 Wonsik Kim <wonsik@google.com> DO NOT MERGE codecs: check OMX buffer size before use in vorbisdec

Bug: 27833616
Change-Id: I1ccdd16a00741da072527a6d13e87fd7c7fe8c54
odecs/vorbis/dec/SoftVorbis.cpp
02b010837690a3b86420988243aa85623a21463d 31-Mar-2016 Wonsik Kim <wonsik@google.com> Merge "codecs: check OMX buffer size before use in (vorbis|opus)dec" into nyc-dev am: b06b9df
am: 479d479

* commit '479d479a76e325c68746fa80b99ffbf4fd33b9af':
codecs: check OMX buffer size before use in (vorbis|opus)dec

Change-Id: I375146aac9233953cb8298b0dab80ea5ca175a54
479d479a76e325c68746fa80b99ffbf4fd33b9af 31-Mar-2016 Wonsik Kim <wonsik@google.com> Merge "codecs: check OMX buffer size before use in (vorbis|opus)dec" into nyc-dev
am: b06b9df

* commit 'b06b9dfc27ec6e58a7aebb82e0d30d32eb95c080':
codecs: check OMX buffer size before use in (vorbis|opus)dec

Change-Id: I29248513bb052ccd4b523721e3cf9ac52fcbb87e
e98883f809d3eb7502f29d977a68179b3998e0d3 30-Mar-2016 Hangyu Kuang <hkuang@google.com> Remove AVC Base Profile restriction in ACodec encoder setup.

Use Baseline profile for AVC by default if profile and level are not defined.

Bug:27597166
Change-Id: Ic30c62ffc9740f79f9d602348fe98186cd6377f3
Codec.cpp
b06b9dfc27ec6e58a7aebb82e0d30d32eb95c080 31-Mar-2016 Wonsik Kim <wonsik@google.com> Merge "codecs: check OMX buffer size before use in (vorbis|opus)dec" into nyc-dev
2921973d16833e9b59a3f680eef094f1080fa204 31-Mar-2016 Marco Nelissen <marcone@google.com> Merge "Fix AMRWBEnc overflow" into nyc-dev am: 1645a53
am: 0a6f43b

* commit '0a6f43bf176961be301841692fb3cab64df4c862':
Fix AMRWBEnc overflow

Change-Id: I8bf4f8e4142e1b7ce8f565eed28d9a387af50ee4
0a6f43bf176961be301841692fb3cab64df4c862 31-Mar-2016 Marco Nelissen <marcone@google.com> Merge "Fix AMRWBEnc overflow" into nyc-dev
am: 1645a53

* commit '1645a53748e7688acd2b76144b88e3617005e462':
Fix AMRWBEnc overflow

Change-Id: Ie01e1e3be716d6c38e4f97630866cd3ad5d3b501
1645a53748e7688acd2b76144b88e3617005e462 31-Mar-2016 Marco Nelissen <marcone@google.com> Merge "Fix AMRWBEnc overflow" into nyc-dev
033b6f7ffdb1ac9e1d2a652e3f5998bf442c0f7b 30-Mar-2016 Marco Nelissen <marcone@google.com> Fix AMRWBEnc overflow

Bug: 27898843
Change-Id: Ibb3506bcfc315b5c816892ba65e157db8ea3fdbe
odecs/amrwbenc/src/voAMRWBEnc.c
e6a2b5d7d2e9fa8db10ccb911d472c0fefa77557 30-Mar-2016 Wonsik Kim <wonsik@google.com> codecs: check OMX buffer size before use in (vorbis|opus)dec

Bug: 27833616
Change-Id: I1ccdd16a00741da072527a6d13e87fd7c7fe8c54
odecs/opus/dec/SoftOpus.cpp
odecs/vorbis/dec/SoftVorbis.cpp
1bae91c22696235431e248c8154eec1b363d2e4c 30-Mar-2016 Wonsik Kim <wonsik@google.com> Merge "codecs: check OMX buffer size before use in (avc|hevc|mpeg2)dec" into nyc-dev am: 138cfd7
am: 1b420c6

* commit '1b420c6f7d4e71fc980d3f001e88210e6361d434':
codecs: check OMX buffer size before use in (avc|hevc|mpeg2)dec

Change-Id: I7ad5b56c2dd88c5acd0c4000cce8c7b5df97678e
1b420c6f7d4e71fc980d3f001e88210e6361d434 30-Mar-2016 Wonsik Kim <wonsik@google.com> Merge "codecs: check OMX buffer size before use in (avc|hevc|mpeg2)dec" into nyc-dev
am: 138cfd7

* commit '138cfd7d521bb0561333b3f1dd5076cbbbb15d04':
codecs: check OMX buffer size before use in (avc|hevc|mpeg2)dec

Change-Id: I80b7b8052cc5ea7515afb3f93e0c57fd131c6f3b
138cfd7d521bb0561333b3f1dd5076cbbbb15d04 30-Mar-2016 Wonsik Kim <wonsik@google.com> Merge "codecs: check OMX buffer size before use in (avc|hevc|mpeg2)dec" into nyc-dev
87fdee0bc9e3ac4d2a88ef0a8e150cfdf08c161d 20-Mar-2016 Wonsik Kim <wonsik@google.com> codecs: check OMX buffer size before use in (avc|hevc|mpeg2)dec

Bug: 27833616
Change-Id: Ic4045a3f56f53b08d0b1264b2a91b8f43e91b738
odecs/avcdec/SoftAVCDec.cpp
odecs/avcdec/SoftAVCDec.h
odecs/hevcdec/SoftHEVC.cpp
odecs/hevcdec/SoftHEVC.h
odecs/mpeg2dec/SoftMPEG2.cpp
odecs/mpeg2dec/SoftMPEG2.h
d9114cbe50b4a7be06c738581879c9a19f1d39ee 29-Mar-2016 Robert Shih <robertshih@google.com> Merge "stagefright: fix ABitReader integer over/underflow" into nyc-dev am: 034c20e
am: 538a779

* commit '538a7799970cb171c68fb9c15ad9134063fd6302':
stagefright: fix ABitReader integer over/underflow

Change-Id: Ib14bf149a3888fb5acf14ec116f05bfdec1d84f6
538a7799970cb171c68fb9c15ad9134063fd6302 29-Mar-2016 Robert Shih <robertshih@google.com> Merge "stagefright: fix ABitReader integer over/underflow" into nyc-dev
am: 034c20e

* commit '034c20eab5e5d13591278bd415ea78fe0bb779b7':
stagefright: fix ABitReader integer over/underflow

Change-Id: I8e0d74177794ec21a9d63294cf76b63439f4606d
034c20eab5e5d13591278bd415ea78fe0bb779b7 29-Mar-2016 Robert Shih <robertshih@google.com> Merge "stagefright: fix ABitReader integer over/underflow" into nyc-dev
37e88380a9c3bdc9519cb5ad06ad7056973351c2 29-Mar-2016 Michal Piechowski <michal.piechowski@sonymobile.com> Merge "Don\'t print both current and new URIs by default" am: bf1e74e am: e03fe51
am: f834ca5

* commit 'f834ca5ed5dd748f4dd02654cc7e8d76c1a2c0ec':
Don't print both current and new URIs by default

Change-Id: Id242a4199a14aa05f2c0be04e27538d7b6779a44
f834ca5ed5dd748f4dd02654cc7e8d76c1a2c0ec 29-Mar-2016 Michal Piechowski <michal.piechowski@sonymobile.com> Merge "Don\'t print both current and new URIs by default" am: bf1e74e
am: e03fe51

* commit 'e03fe519db8496448edf9a2d28dcaefa20a927d6':
Don't print both current and new URIs by default

Change-Id: I737307813a1cc8119d84127f7d741382c3ece44c
94e2db71cf1ce90f8a74632895e2766b24a80d7f 19-Nov-2015 Michal Piechowski <michal.piechowski@sonymobile.com> Don't print both current and new URIs by default

User may don't want to leak URIs used by him and ALOGI is visible from
default so changing it to ALOGV.

Change-Id: I14f2de3441f76207f6d404efb509e87cdca2b0e3
ttplive/LiveSession.cpp
4cca134f0a775808458622490886d775c59bcc54 28-Mar-2016 Wonsik Kim <wonsik@google.com> stagefright: request IDR on MediaRecorder.resume

Bug: 27658238
Change-Id: I7c7150fcbe980fadf65821028bb99144774dcb69
ediaCodecSource.cpp
61458f0faf97951e6b3e6dabb739a63a668b2df1 16-Mar-2016 Wei Jia <wjia@google.com> amrwbenc: fix possible signed integer overflow in ACELP_4t64_fx.

Bug: 27657270
Change-Id: Iad98ad520e9c99a433842b1a3841e288013fb1c9
(cherry picked from commit a93d5b263f3f374c5d3081297f504504203000da)
odecs/amrwbenc/inc/basic_op.h
odecs/amrwbenc/src/c4t64fx.c
4f73b1e4cd41a7cc6ccba8f28dc36e828b00ffee 29-Mar-2016 Wei Jia <wjia@google.com> Merge "SoftVorbis: fail gracefully when hitting invalid parameter." into nyc-dev am: ca0cde2
am: d2f920c

* commit 'd2f920c82b1824f2332d7b11ae75875c8022f923':
SoftVorbis: fail gracefully when hitting invalid parameter.
d2f920c82b1824f2332d7b11ae75875c8022f923 29-Mar-2016 Wei Jia <wjia@google.com> Merge "SoftVorbis: fail gracefully when hitting invalid parameter." into nyc-dev
am: ca0cde2

* commit 'ca0cde2597b527083a2f86bda4db00dccaf394d6':
SoftVorbis: fail gracefully when hitting invalid parameter.
7eed97b2ed9c788d661cf3a464dc0c2543460742 28-Mar-2016 Dan Austin <danielaustin@google.com> Merge "Address const issues in preparation for libcxx rebase." am: bbc96be
am: 491c331

* commit '491c331401f46dd8a425d34b3749dbfe44320b20':
Address const issues in preparation for libcxx rebase.
5a0272b56d7d823111c09ac1de8c039cad27b11a 28-Mar-2016 Dan Austin <danielaustin@google.com> Merge "Address const issues in preparation for libcxx rebase." am: 231938c
am: 59d25ca

* commit '59d25cacdf92d787ac7ee07b144604c701ab776e':
Address const issues in preparation for libcxx rebase.
5d0beb1236fed08635c5bb3eb2c941f71beccfd9 28-Mar-2016 Dan Austin <danielaustin@google.com> Merge "Address const issues in preparation for libcxx rebase." am: b969335
am: b26f943

* commit 'b26f9434d0857d45415dbb02feb2d848be82240d':
Address const issues in preparation for libcxx rebase.
491c331401f46dd8a425d34b3749dbfe44320b20 28-Mar-2016 Dan Austin <danielaustin@google.com> Merge "Address const issues in preparation for libcxx rebase."
am: bbc96be

* commit 'bbc96beb74c771f392d1325e83d8bd2b0b508b7d':
Address const issues in preparation for libcxx rebase.
59d25cacdf92d787ac7ee07b144604c701ab776e 28-Mar-2016 Dan Austin <danielaustin@google.com> Merge "Address const issues in preparation for libcxx rebase."
am: 231938c

* commit '231938cab5fc8253d9f428f18f8b6e657ae196fe':
Address const issues in preparation for libcxx rebase.
b26f9434d0857d45415dbb02feb2d848be82240d 28-Mar-2016 Dan Austin <danielaustin@google.com> Merge "Address const issues in preparation for libcxx rebase."
am: b969335

* commit 'b9693358f51ac591276a4529e63c123c9801e64d':
Address const issues in preparation for libcxx rebase.
bbc96beb74c771f392d1325e83d8bd2b0b508b7d 28-Mar-2016 Dan Austin <danielaustin@google.com> Merge "Address const issues in preparation for libcxx rebase."
231938cab5fc8253d9f428f18f8b6e657ae196fe 28-Mar-2016 Dan Austin <danielaustin@google.com> Merge "Address const issues in preparation for libcxx rebase."
b9693358f51ac591276a4529e63c123c9801e64d 28-Mar-2016 Dan Austin <danielaustin@google.com> Merge "Address const issues in preparation for libcxx rebase."
8ba494db49c15a84c312dde8879392c8e55753f0 28-Mar-2016 Dan Austin <danielaustin@google.com> Merge "Address const issues in preparation for libcxx rebase." am: cc50ea5
am: abb3346

* commit 'abb3346d8cc107899a70e673cf38b9a65f6b4d44':
Address const issues in preparation for libcxx rebase.
8fa3eafbab8d4e60a074a71b79ea5650a5e20bd9 28-Mar-2016 Dan Austin <danielaustin@google.com> Merge "Address const issues in preparation for libcxx rebase." am: 1c0d845
am: d1c6a1a

* commit 'd1c6a1a7429238ab4c832c4b4cdfc1de8b7ddacb':
Address const issues in preparation for libcxx rebase.
abb3346d8cc107899a70e673cf38b9a65f6b4d44 28-Mar-2016 Dan Austin <danielaustin@google.com> Merge "Address const issues in preparation for libcxx rebase."
am: cc50ea5

* commit 'cc50ea592f9b67b37d61a1952fc174489c588f80':
Address const issues in preparation for libcxx rebase.
d1c6a1a7429238ab4c832c4b4cdfc1de8b7ddacb 28-Mar-2016 Dan Austin <danielaustin@google.com> Merge "Address const issues in preparation for libcxx rebase."
am: 1c0d845

* commit '1c0d8453f8162d6e89d0baf8ae0e066afcf99ca5':
Address const issues in preparation for libcxx rebase.
cc50ea592f9b67b37d61a1952fc174489c588f80 28-Mar-2016 Dan Austin <danielaustin@google.com> Merge "Address const issues in preparation for libcxx rebase."
1c0d8453f8162d6e89d0baf8ae0e066afcf99ca5 28-Mar-2016 Dan Austin <danielaustin@google.com> Merge "Address const issues in preparation for libcxx rebase."
d66f8623745d62af00c4e2677010aa654f0eee5d 24-Mar-2016 Dan Austin <danielaustin@google.com> Address const issues in preparation for libcxx rebase.

Change-Id: I069b4c9c2e50569b7cf49b25c8c87e7f36833ab5
ifi-display/source/WifiDisplaySource.cpp
e15b5678f81b4fb845b89878692d4001ede70587 24-Mar-2016 Dan Austin <danielaustin@google.com> Address const issues in preparation for libcxx rebase.

Change-Id: I61777e557738b2df8b6037a6f71a2cf0a24967dd
ttplive/M3UParser.cpp
8abaa35abb968af749a55d53fded0c1c9d37c48c 24-Mar-2016 Dan Austin <danielaustin@google.com> Address const issues in preparation for libcxx rebase.

Change-Id: I389e585b11647763f7b4f4dbf1181acc85ba36d4
ataURISource.cpp
51df8dfdf4901e09c72afccdaf07cad3550b6961 24-Mar-2016 Dan Austin <danielaustin@google.com> Address const issues in preparation for libcxx rebase.

Change-Id: I044a41c6876a008f3f5011e2649d8557d702e802
ediaCodecList.cpp
a40d49b7b2c83fff03b152ae29e5723f751b9073 24-Mar-2016 Dan Austin <danielaustin@google.com> Address const issues in preparation for libcxx rebase.

Change-Id: I475253079dd49f34be10aa18e2b34a4e9be7c126
oundation/ADebug.cpp
ca0cde2597b527083a2f86bda4db00dccaf394d6 28-Mar-2016 Wei Jia <wjia@google.com> Merge "SoftVorbis: fail gracefully when hitting invalid parameter." into nyc-dev
bdfbe69f164e6045ed33306ae487a826a386259c 25-Mar-2016 Wei Jia <wjia@google.com> Merge "SampleTable: reduce unnecessary logging message." into klp-dev am: f305afb am: e678675 am: 9574bfe am: 1f74760 am: 820d28e am: b1d4bac am: 89aeba6 am: 9ba4799 am: e68a8eb am: 837b350 am: d9bd004
am: edc2c43

* commit 'edc2c43dfa0ce8050517935b1c2692186deb340b':
SampleTable: reduce unnecessary logging message.
edc2c43dfa0ce8050517935b1c2692186deb340b 25-Mar-2016 Wei Jia <wjia@google.com> Merge "SampleTable: reduce unnecessary logging message." into klp-dev am: f305afb am: e678675 am: 9574bfe am: 1f74760 am: 820d28e am: b1d4bac am: 89aeba6 am: 9ba4799 am: e68a8eb am: 837b350
am: d9bd004

* commit 'd9bd004bbe426978a2de8ee7d0489317b7580bdf':
SampleTable: reduce unnecessary logging message.
d9bd004bbe426978a2de8ee7d0489317b7580bdf 25-Mar-2016 Wei Jia <wjia@google.com> Merge "SampleTable: reduce unnecessary logging message." into klp-dev am: f305afb am: e678675 am: 9574bfe am: 1f74760 am: 820d28e am: b1d4bac am: 89aeba6 am: 9ba4799 am: e68a8eb
am: 837b350

* commit '837b3502d9b19aaf17c4a3cf42db1a670f644a9f':
SampleTable: reduce unnecessary logging message.
837b3502d9b19aaf17c4a3cf42db1a670f644a9f 25-Mar-2016 Wei Jia <wjia@google.com> Merge "SampleTable: reduce unnecessary logging message." into klp-dev am: f305afb am: e678675 am: 9574bfe am: 1f74760 am: 820d28e am: b1d4bac am: 89aeba6 am: 9ba4799
am: e68a8eb

* commit 'e68a8ebfaeb2a38858a52d2259796fb1db918fb5':
SampleTable: reduce unnecessary logging message.
e68a8ebfaeb2a38858a52d2259796fb1db918fb5 25-Mar-2016 Wei Jia <wjia@google.com> Merge "SampleTable: reduce unnecessary logging message." into klp-dev am: f305afb am: e678675 am: 9574bfe am: 1f74760 am: 820d28e am: b1d4bac am: 89aeba6
am: 9ba4799

* commit '9ba47991ecbce628f13b4febc23bac6e3804cdf3':
SampleTable: reduce unnecessary logging message.
9ba47991ecbce628f13b4febc23bac6e3804cdf3 25-Mar-2016 Wei Jia <wjia@google.com> Merge "SampleTable: reduce unnecessary logging message." into klp-dev am: f305afb am: e678675 am: 9574bfe am: 1f74760 am: 820d28e am: b1d4bac
am: 89aeba6

* commit '89aeba6ab926a0d249bc6b93450892247697eed3':
SampleTable: reduce unnecessary logging message.
89aeba6ab926a0d249bc6b93450892247697eed3 25-Mar-2016 Wei Jia <wjia@google.com> Merge "SampleTable: reduce unnecessary logging message." into klp-dev am: f305afb am: e678675 am: 9574bfe am: 1f74760 am: 820d28e
am: b1d4bac

* commit 'b1d4bac8705f2254f39eea613472f0a9b948871f':
SampleTable: reduce unnecessary logging message.
b1d4bac8705f2254f39eea613472f0a9b948871f 25-Mar-2016 Wei Jia <wjia@google.com> Merge "SampleTable: reduce unnecessary logging message." into klp-dev am: f305afb am: e678675 am: 9574bfe am: 1f74760
am: 820d28e

* commit '820d28e6dbcd68df096f34afcca356fc5b8b33b4':
SampleTable: reduce unnecessary logging message.
1f74760917ca0f05136542c0fef7f3bdfe408769 25-Mar-2016 Wei Jia <wjia@google.com> Merge "SampleTable: reduce unnecessary logging message." into klp-dev am: f305afb am: e678675
am: 9574bfe

* commit '9574bfe117ca6d173c780afa187dfd9dbfc15611':
SampleTable: reduce unnecessary logging message.
9574bfe117ca6d173c780afa187dfd9dbfc15611 25-Mar-2016 Wei Jia <wjia@google.com> Merge "SampleTable: reduce unnecessary logging message." into klp-dev am: f305afb
am: e678675

* commit 'e678675e63e927d6b16123d40981c3a36e95d0b0':
SampleTable: reduce unnecessary logging message.
e678675e63e927d6b16123d40981c3a36e95d0b0 25-Mar-2016 Wei Jia <wjia@google.com> Merge "SampleTable: reduce unnecessary logging message." into klp-dev
am: f305afb

* commit 'f305afb6eeeebd066f34c2b2c514bd4342182200':
SampleTable: reduce unnecessary logging message.
f305afb6eeeebd066f34c2b2c514bd4342182200 25-Mar-2016 Wei Jia <wjia@google.com> Merge "SampleTable: reduce unnecessary logging message." into klp-dev
b5ce7ae2857d0ab1767244b9f212f5f3799f5aba 25-Mar-2016 Wei Jia <wjia@google.com> SoftVorbis: fail gracefully when hitting invalid parameter.

Bug: 27843650
Change-Id: I0150414854da6a5e61bc13f5cb5ff470b8e35894
odecs/vorbis/dec/SoftVorbis.cpp
db95aeb80e63c9d49c6e56d302bd21de8258876a 25-Mar-2016 Marco Nelissen <marcone@google.com> Fix AMR decoder am: d061b5b am: 988aae8 am: f36a731 am: 01e0796 am: e0a31e4 am: ce23e72 am: e72ae58 am: 41afb3f am: b512ae9 am: caa31fc am: 33d5232
am: 2f88a86

* commit '2f88a86e5ae17845ff9e8214cb76d34956b39e47':
Fix AMR decoder
2f88a86e5ae17845ff9e8214cb76d34956b39e47 25-Mar-2016 Marco Nelissen <marcone@google.com> Fix AMR decoder am: d061b5b am: 988aae8 am: f36a731 am: 01e0796 am: e0a31e4 am: ce23e72 am: e72ae58 am: 41afb3f am: b512ae9 am: caa31fc
am: 33d5232

* commit '33d5232d17345fcfe2b4c538a726186474f06ed5':
Fix AMR decoder
33d5232d17345fcfe2b4c538a726186474f06ed5 25-Mar-2016 Marco Nelissen <marcone@google.com> Fix AMR decoder am: d061b5b am: 988aae8 am: f36a731 am: 01e0796 am: e0a31e4 am: ce23e72 am: e72ae58 am: 41afb3f am: b512ae9
am: caa31fc

* commit 'caa31fc96dce2b90ddce574ca8e8c733a332b818':
Fix AMR decoder
caa31fc96dce2b90ddce574ca8e8c733a332b818 25-Mar-2016 Marco Nelissen <marcone@google.com> Fix AMR decoder am: d061b5b am: 988aae8 am: f36a731 am: 01e0796 am: e0a31e4 am: ce23e72 am: e72ae58 am: 41afb3f
am: b512ae9

* commit 'b512ae9bca37bc3b60385b71658755e345f2c726':
Fix AMR decoder
b512ae9bca37bc3b60385b71658755e345f2c726 25-Mar-2016 Marco Nelissen <marcone@google.com> Fix AMR decoder am: d061b5b am: 988aae8 am: f36a731 am: 01e0796 am: e0a31e4 am: ce23e72 am: e72ae58
am: 41afb3f

* commit '41afb3f25c29111d086878ca4d2bf5c1294d7562':
Fix AMR decoder
41afb3f25c29111d086878ca4d2bf5c1294d7562 25-Mar-2016 Marco Nelissen <marcone@google.com> Fix AMR decoder am: d061b5b am: 988aae8 am: f36a731 am: 01e0796 am: e0a31e4 am: ce23e72
am: e72ae58

* commit 'e72ae5854c80dc537607da6c5592c8179f3cb928':
Fix AMR decoder
e72ae5854c80dc537607da6c5592c8179f3cb928 25-Mar-2016 Marco Nelissen <marcone@google.com> Fix AMR decoder am: d061b5b am: 988aae8 am: f36a731 am: 01e0796 am: e0a31e4
am: ce23e72

* commit 'ce23e726b65d7dd50b97b422041a85d7bd5825ef':
Fix AMR decoder
ce23e726b65d7dd50b97b422041a85d7bd5825ef 25-Mar-2016 Marco Nelissen <marcone@google.com> Fix AMR decoder am: d061b5b am: 988aae8 am: f36a731 am: 01e0796
am: e0a31e4

* commit 'e0a31e4bcc7c4c1053081b947aa2fe1001575afb':
Fix AMR decoder
01e07967840027ff8f51f7f348378e2f628e0473 25-Mar-2016 Marco Nelissen <marcone@google.com> Fix AMR decoder am: d061b5b am: 988aae8
am: f36a731

* commit 'f36a731ada0f914a0a6724c58d0d4f71cbde6766':
Fix AMR decoder
f36a731ada0f914a0a6724c58d0d4f71cbde6766 25-Mar-2016 Marco Nelissen <marcone@google.com> Fix AMR decoder am: d061b5b
am: 988aae8

* commit '988aae8467be145c0513b8f5abb0f76f87112492':
Fix AMR decoder
988aae8467be145c0513b8f5abb0f76f87112492 25-Mar-2016 Marco Nelissen <marcone@google.com> Fix AMR decoder
am: d061b5b

* commit 'd061b5b120082c9445670ebc95c5edade9ea4505':
Fix AMR decoder
d061b5b120082c9445670ebc95c5edade9ea4505 25-Mar-2016 Marco Nelissen <marcone@google.com> Fix AMR decoder

Previous change caused EOS to be ignored.

Bug: 27843673
Related-to-bug: 27662364
Change-Id: Ia148a88abc861a9b393f42bc7cd63d8d3ae349bc
odecs/amrnb/dec/SoftAMR.cpp
7cf6b434a082a4cefe4796c9b9d9914bc23881f3 25-Mar-2016 Lajos Molnar <lajos@google.com> Merge "stagefright: expose track ID-s in track format" into nyc-dev am: 63870fa
am: 890710b

* commit '890710b133f3f8e908b427f46c185160b0d9c05e':
stagefright: expose track ID-s in track format
28c61e58bc07f139e9b5afa803b74e87fcb1c96c 25-Mar-2016 Lajos Molnar <lajos@google.com> Merge "stagefright: MediaCodecSource: protect output format updates" into nyc-dev am: 1483d31
am: 5d8d433

* commit '5d8d433e755d3858dc087719525e700013365a39':
stagefright: MediaCodecSource: protect output format updates
890710b133f3f8e908b427f46c185160b0d9c05e 25-Mar-2016 Lajos Molnar <lajos@google.com> Merge "stagefright: expose track ID-s in track format" into nyc-dev
am: 63870fa

* commit '63870fafe3347c9b92af95dc7131595c07f5cda4':
stagefright: expose track ID-s in track format
5d8d433e755d3858dc087719525e700013365a39 25-Mar-2016 Lajos Molnar <lajos@google.com> Merge "stagefright: MediaCodecSource: protect output format updates" into nyc-dev
am: 1483d31

* commit '1483d3187e368dc740242d84a50a7b5ddbb5b378':
stagefright: MediaCodecSource: protect output format updates
63870fafe3347c9b92af95dc7131595c07f5cda4 25-Mar-2016 Lajos Molnar <lajos@google.com> Merge "stagefright: expose track ID-s in track format" into nyc-dev
1483d3187e368dc740242d84a50a7b5ddbb5b378 25-Mar-2016 Lajos Molnar <lajos@google.com> Merge "stagefright: MediaCodecSource: protect output format updates" into nyc-dev
ce00fe384b19824772a750d924424fc0ddf3ae0b 25-Mar-2016 Lajos Molnar <lajos@google.com> Merge "stagefright: detect output format changes without event" into nyc-dev am: 478b252
am: cfaaabd

* commit 'cfaaabde72ecc4eab3fb3e64ed28633b30e3c6e6':
stagefright: detect output format changes without event
cfaaabde72ecc4eab3fb3e64ed28633b30e3c6e6 25-Mar-2016 Lajos Molnar <lajos@google.com> Merge "stagefright: detect output format changes without event" into nyc-dev
am: 478b252

* commit '478b2521f5defb356b0dd44313288852b2c5e0ee':
stagefright: detect output format changes without event
1734c7d01c1567568ced29398b23abd601fd44cb 23-Mar-2016 Lajos Molnar <lajos@google.com> stagefright: detect output format changes without event

Bug: 27688967
Change-Id: I538560e61928903160333866886dbc763503546f
Codec.cpp
oundation/AMessage.cpp
faf35c0c279114b11a36615dc6630c126e767da0 26-Feb-2016 Lajos Molnar <lajos@google.com> stagefright: expose track ID-s in track format

Bug: 25684127
Change-Id: I334c493ea4317ffc6a26b9a370f751705cd1e200
uMediaExtractor.cpp
tils.cpp
ee0eba046f666303741a5a5f70afad17030cc8b1 22-Mar-2016 Lajos Molnar <lajos@google.com> stagefright: MediaCodecSource: protect output format updates

avoid race condition between format updates and reads.

Bug: 27477022
Change-Id: Ie4aee2d902296db8a8c055a7016acd1b879f437a
ediaCodecSource.cpp
4ea9fdbbe6d735a057af1a1e3677512b49dbcb66 24-Mar-2016 Marco Nelissen <marcone@google.com> Merge "SimpleSoftOMXComponent: check struct size"
f093e06bf006fa5342088e2d78ce123de6ff5ea3 24-Mar-2016 Marco Nelissen <marcone@google.com> Merge "Use uint32_t for NAL offset and size" am: 52ffc55
am: a6ef715

* commit 'a6ef715610913c9c835906802058ab8fa3e0dcf3':
Use uint32_t for NAL offset and size
a6ef715610913c9c835906802058ab8fa3e0dcf3 24-Mar-2016 Marco Nelissen <marcone@google.com> Merge "Use uint32_t for NAL offset and size"
am: 52ffc55

* commit '52ffc55fae0ea6bc3784a841340d52f45b88f009':
Use uint32_t for NAL offset and size
ee46821af16a12e24e23d2516222e5cf513919ec 24-Mar-2016 Marco Nelissen <marcone@google.com> SimpleSoftOMXComponent: check struct size

Change-Id: I8e4e0742bde7f82686cc067b9090f19ed240e5d1
mx/SimpleSoftOMXComponent.cpp
cccd2e5e3aa015d6ce96ba0245b7161c077cdba2 24-Mar-2016 Wei Jia <wjia@google.com> SampleTable: reduce unnecessary logging message.

Bug: 23247055
Change-Id: Ida0021160532623c6e72bd5bb0bb2a24332d1c34
ampleTable.cpp
2be91d08d677445064979cb82ff0b885c19b4770 24-Mar-2016 Wei Jia <wjia@google.com> SampleTable: add logging. am: c27cee3 am: 6f12959 am: 7596ce3 am: 2db502e am: d9f239c am: eaa913f am: 20dfd15 am: dc03c90 am: 4e1d36a am: 8a80a9c am: 390b90c
am: 56cbd34

* commit '56cbd3493e659ab983377f20d17c73a1d9ff054e':
SampleTable: add logging.
56cbd3493e659ab983377f20d17c73a1d9ff054e 24-Mar-2016 Wei Jia <wjia@google.com> SampleTable: add logging. am: c27cee3 am: 6f12959 am: 7596ce3 am: 2db502e am: d9f239c am: eaa913f am: 20dfd15 am: dc03c90 am: 4e1d36a am: 8a80a9c
am: 390b90c

* commit '390b90c852c681a107b39622f3db4beb300105fa':
SampleTable: add logging.
390b90c852c681a107b39622f3db4beb300105fa 24-Mar-2016 Wei Jia <wjia@google.com> SampleTable: add logging. am: c27cee3 am: 6f12959 am: 7596ce3 am: 2db502e am: d9f239c am: eaa913f am: 20dfd15 am: dc03c90 am: 4e1d36a
am: 8a80a9c

* commit '8a80a9cf05c32e983a1bfd5b34cbba727451d1d4':
SampleTable: add logging.
8a80a9cf05c32e983a1bfd5b34cbba727451d1d4 24-Mar-2016 Wei Jia <wjia@google.com> SampleTable: add logging. am: c27cee3 am: 6f12959 am: 7596ce3 am: 2db502e am: d9f239c am: eaa913f am: 20dfd15 am: dc03c90
am: 4e1d36a

* commit '4e1d36a0823a12e5aeaacba25d5c39373de7940f':
SampleTable: add logging.
4e1d36a0823a12e5aeaacba25d5c39373de7940f 24-Mar-2016 Wei Jia <wjia@google.com> SampleTable: add logging. am: c27cee3 am: 6f12959 am: 7596ce3 am: 2db502e am: d9f239c am: eaa913f am: 20dfd15
am: dc03c90

* commit 'dc03c904965c1a892d1bdf809b97c8794d6f8fbd':
SampleTable: add logging.
dc03c904965c1a892d1bdf809b97c8794d6f8fbd 24-Mar-2016 Wei Jia <wjia@google.com> SampleTable: add logging. am: c27cee3 am: 6f12959 am: 7596ce3 am: 2db502e am: d9f239c am: eaa913f
am: 20dfd15

* commit '20dfd1547445eca8853b7cde0a11aa11d28bf8d2':
SampleTable: add logging.
20dfd1547445eca8853b7cde0a11aa11d28bf8d2 24-Mar-2016 Wei Jia <wjia@google.com> SampleTable: add logging. am: c27cee3 am: 6f12959 am: 7596ce3 am: 2db502e am: d9f239c
am: eaa913f

* commit 'eaa913fc496189107e759d93e1906fdff2b6b9c6':
SampleTable: add logging.
eaa913fc496189107e759d93e1906fdff2b6b9c6 24-Mar-2016 Wei Jia <wjia@google.com> SampleTable: add logging. am: c27cee3 am: 6f12959 am: 7596ce3 am: 2db502e
am: d9f239c

* commit 'd9f239c6f3624f8329cf194138a03a9ccbcb49e3':
SampleTable: add logging.
2db502ed9891803339b47e701d143eddf12a237f 24-Mar-2016 Wei Jia <wjia@google.com> SampleTable: add logging. am: c27cee3 am: 6f12959
am: 7596ce3

* commit '7596ce3a9c6ddbc833653a1337887ac707630961':
SampleTable: add logging.
7596ce3a9c6ddbc833653a1337887ac707630961 24-Mar-2016 Wei Jia <wjia@google.com> SampleTable: add logging. am: c27cee3
am: 6f12959

* commit '6f129593720f80ecce9fa1d9f6d4012b197411b7':
SampleTable: add logging.
6f129593720f80ecce9fa1d9f6d4012b197411b7 24-Mar-2016 Wei Jia <wjia@google.com> SampleTable: add logging.
am: c27cee3

* commit 'c27cee30d9359fa83e33b4f87f88e6bb9ef66341':
SampleTable: add logging.
c27cee30d9359fa83e33b4f87f88e6bb9ef66341 24-Mar-2016 Wei Jia <wjia@google.com> SampleTable: add logging.

Bug: 23247055
Change-Id: Id45f9815c1b3cdfaae664508204a6ce1c1da4532
ampleTable.cpp
b271e49817367a3aa4d8994872f5793fcdbb41d7 24-Mar-2016 Pawin Vongmasa <pawin@google.com> Merge "VideoFrameScheduler: Fixed integer underflow due to mismatched signedness." into nyc-dev am: e492507
am: 66ff831

* commit '66ff831b79da06e902345c84c556a6129cd23fec':
VideoFrameScheduler: Fixed integer underflow due to mismatched signedness.
66ff831b79da06e902345c84c556a6129cd23fec 24-Mar-2016 Pawin Vongmasa <pawin@google.com> Merge "VideoFrameScheduler: Fixed integer underflow due to mismatched signedness." into nyc-dev
am: e492507

* commit 'e492507c661ada669cd769c58b0e8bd2a05970e6':
VideoFrameScheduler: Fixed integer underflow due to mismatched signedness.
e492507c661ada669cd769c58b0e8bd2a05970e6 24-Mar-2016 Pawin Vongmasa <pawin@google.com> Merge "VideoFrameScheduler: Fixed integer underflow due to mismatched signedness." into nyc-dev
8ad17045788590ffecb5ca847e63379a49463457 23-Mar-2016 Hangyu Kuang <hkuang@google.com> Merge "Revert "stagefright: Remove AVC Base Profile restriction in ACodec encoder setup."" into nyc-dev am: 3e03f09
am: d9fc9d9

* commit 'd9fc9d908977ab7c410718f6b51e5acb7fb9d588':
Revert "stagefright: Remove AVC Base Profile restriction in ACodec encoder setup."
d9fc9d908977ab7c410718f6b51e5acb7fb9d588 23-Mar-2016 Hangyu Kuang <hkuang@google.com> Merge "Revert "stagefright: Remove AVC Base Profile restriction in ACodec encoder setup."" into nyc-dev
am: 3e03f09

* commit '3e03f09c45f1442b14cae964de6dad4e7928c15e':
Revert "stagefright: Remove AVC Base Profile restriction in ACodec encoder setup."
3e03f09c45f1442b14cae964de6dad4e7928c15e 23-Mar-2016 Hangyu Kuang <hkuang@google.com> Merge "Revert "stagefright: Remove AVC Base Profile restriction in ACodec encoder setup."" into nyc-dev
702ca6fa3349ebe01f47aeca773ce42820fe559c 23-Mar-2016 Pawin Vongmasa <pawin@google.com> VideoFrameScheduler: Fixed integer underflow due to mismatched
signedness.

Action: Added explicit unsigned->signed conversions in
schedule() and addSample() to prevent automatic signed->unsigned
conversion. (nsecs_t is signed.)

Bug: 26962365
Change-Id: I090aecce2c729af9bc10de32bf5e74d282d02e8c
ideoFrameScheduler.cpp
6510efa3775418714c598e4ad8243cc5497cfc12 23-Mar-2016 Wei Jia <wjia@google.com> Merge "MPEG2TSExtractor: add syncPoint after mSourceImpls has been updated." into nyc-dev am: a5547e5
am: 94f1605

* commit '94f160519c65640292948c36e4bc509b722118b0':
MPEG2TSExtractor: add syncPoint after mSourceImpls has been updated.
94f160519c65640292948c36e4bc509b722118b0 23-Mar-2016 Wei Jia <wjia@google.com> Merge "MPEG2TSExtractor: add syncPoint after mSourceImpls has been updated." into nyc-dev
am: a5547e5

* commit 'a5547e58c11c1266c69783650be4f26ad67e6653':
MPEG2TSExtractor: add syncPoint after mSourceImpls has been updated.
a5547e58c11c1266c69783650be4f26ad67e6653 23-Mar-2016 Wei Jia <wjia@google.com> Merge "MPEG2TSExtractor: add syncPoint after mSourceImpls has been updated." into nyc-dev
8eadd7737f422b0477bbacbb2663e3ef42c9fe51 23-Mar-2016 Hangyu Kuang <hkuang@google.com> Revert "stagefright: Remove AVC Base Profile restriction in ACodec encoder setup."

This reverts commit 5207ffe7a35148a1e4ea188cf2224fb230a92a0e.

Bug: 27664349
Related-to-bug: 27597166
Change-Id: Ia14a13df5b6cef2a69a2812ef5ea634189357721
Codec.cpp
9558f6dd733dc450270f38b9a139d384d273ce0a 09-Mar-2016 Wei Jia <wjia@google.com> MPEG2TSExtractor: add syncPoint after mSourceImpls has been updated.

ATSParser: fix the pesStartOffset for each syncEvent.

Bug: 27297491
Change-Id: I5a994db52a58bbbb61c1a3e37e9bd9a327a8587e
nclude/MPEG2TSExtractor.h
peg2ts/ATSParser.cpp
peg2ts/ATSParser.h
peg2ts/MPEG2TSExtractor.cpp
6ce6ae382b649bcc7a30d5ee9cbd93561cfd1f46 23-Mar-2016 Lajos Molnar <lajos@google.com> Merge "stagefright: ACodec: read output port format on first frame" into nyc-dev am: 5048de3
am: 8db6cd3

* commit '8db6cd3134b564f5f0b76db6e4ea755c52d8e124':
stagefright: ACodec: read output port format on first frame
8db6cd3134b564f5f0b76db6e4ea755c52d8e124 23-Mar-2016 Lajos Molnar <lajos@google.com> Merge "stagefright: ACodec: read output port format on first frame" into nyc-dev
am: 5048de3

* commit '5048de32f603c00926d61b928616e679ce88d693':
stagefright: ACodec: read output port format on first frame
5048de32f603c00926d61b928616e679ce88d693 23-Mar-2016 Lajos Molnar <lajos@google.com> Merge "stagefright: ACodec: read output port format on first frame" into nyc-dev
80d4bf2122c0045da2c6c9f714efe9d2a37520fa 23-Mar-2016 Lajos Molnar <lajos@google.com> Merge "ACodec: enable support for non-16bit PCM data" into nyc-dev am: 14cbc37
am: ca38806

* commit 'ca38806dbcdeac6e702986a888da47ef7f2a4fc5':
ACodec: enable support for non-16bit PCM data
ca38806dbcdeac6e702986a888da47ef7f2a4fc5 23-Mar-2016 Lajos Molnar <lajos@google.com> Merge "ACodec: enable support for non-16bit PCM data" into nyc-dev
am: 14cbc37

* commit '14cbc370f37e0ab84b7b470470310a985526cf26':
ACodec: enable support for non-16bit PCM data
14cbc370f37e0ab84b7b470470310a985526cf26 23-Mar-2016 Lajos Molnar <lajos@google.com> Merge "ACodec: enable support for non-16bit PCM data" into nyc-dev
697aedf61d6180e72102068a969383018eedfa1e 23-Mar-2016 Lajos Molnar <lajos@google.com> stagefright: ACodec: read output port format on first frame

We used to do this regardless of whether we received a
PortSettingsChanged event, and some codecs may have relied on this

TODO: add a big warning if format actually changed

Bug: 27688967
Change-Id: Ia29514a572950d80cf0a02004e01095043715dcd
Codec.cpp
c9ebf170814765f60383ee291d09ec361a81035e 23-Mar-2016 Wonsik Kim <wonsik@google.com> Merge "codecs: check OMX buffer size before use in VP8 encoder." into lmp-dev am: 19a06a9 am: 881b227 am: ead21ce am: 800e972 am: 73acbbb am: 274250f am: b8b11e9 am: b90fab2 am: 89a676c
am: d1aba88

* commit 'd1aba88820c160341e7b9bcbaf572360484a13a4':
codecs: check OMX buffer size before use in VP8 encoder.
d1aba88820c160341e7b9bcbaf572360484a13a4 23-Mar-2016 Wonsik Kim <wonsik@google.com> Merge "codecs: check OMX buffer size before use in VP8 encoder." into lmp-dev am: 19a06a9 am: 881b227 am: ead21ce am: 800e972 am: 73acbbb am: 274250f am: b8b11e9 am: b90fab2
am: 89a676c

* commit '89a676cb3276143c15cd14572d0e62ef7d210ac1':
codecs: check OMX buffer size before use in VP8 encoder.
89a676cb3276143c15cd14572d0e62ef7d210ac1 23-Mar-2016 Wonsik Kim <wonsik@google.com> Merge "codecs: check OMX buffer size before use in VP8 encoder." into lmp-dev am: 19a06a9 am: 881b227 am: ead21ce am: 800e972 am: 73acbbb am: 274250f am: b8b11e9
am: b90fab2

* commit 'b90fab227c4e3b48d27289233a9f7395ceecdcae':
codecs: check OMX buffer size before use in VP8 encoder.
b90fab227c4e3b48d27289233a9f7395ceecdcae 23-Mar-2016 Wonsik Kim <wonsik@google.com> Merge "codecs: check OMX buffer size before use in VP8 encoder." into lmp-dev am: 19a06a9 am: 881b227 am: ead21ce am: 800e972 am: 73acbbb am: 274250f
am: b8b11e9

* commit 'b8b11e9ef1a6b91bd1a285a0c868c4cbcb1043d3':
codecs: check OMX buffer size before use in VP8 encoder.
b8b11e9ef1a6b91bd1a285a0c868c4cbcb1043d3 22-Mar-2016 Wonsik Kim <wonsik@google.com> Merge "codecs: check OMX buffer size before use in VP8 encoder." into lmp-dev am: 19a06a9 am: 881b227 am: ead21ce am: 800e972 am: 73acbbb
am: 274250f

* commit '274250ffad2812ee6d2c7cdd5a5575493bf7b1fb':
codecs: check OMX buffer size before use in VP8 encoder.
274250ffad2812ee6d2c7cdd5a5575493bf7b1fb 22-Mar-2016 Wonsik Kim <wonsik@google.com> Merge "codecs: check OMX buffer size before use in VP8 encoder." into lmp-dev am: 19a06a9 am: 881b227 am: ead21ce am: 800e972
am: 73acbbb

* commit '73acbbb249beb9d4f76c9e67244dc6ba12d67222':
codecs: check OMX buffer size before use in VP8 encoder.
73acbbb249beb9d4f76c9e67244dc6ba12d67222 22-Mar-2016 Wonsik Kim <wonsik@google.com> Merge "codecs: check OMX buffer size before use in VP8 encoder." into lmp-dev am: 19a06a9 am: 881b227 am: ead21ce
am: 800e972

* commit '800e972c7c4ec89c401e33174aa5b697400bcd1f':
codecs: check OMX buffer size before use in VP8 encoder.
800e972c7c4ec89c401e33174aa5b697400bcd1f 22-Mar-2016 Wonsik Kim <wonsik@google.com> Merge "codecs: check OMX buffer size before use in VP8 encoder." into lmp-dev am: 19a06a9 am: 881b227
am: ead21ce

* commit 'ead21cee2d5cb2a3acdb742ed391c55b8bd88011':
codecs: check OMX buffer size before use in VP8 encoder.
a573cea08c59f0b40a572930c22a0debeca664b9 22-Mar-2016 Wonsik Kim <wonsik@google.com> Merge "DO NOT MERGE codecs: check OMX buffer size before use in VP8 encoder." into klp-dev
am: 4f99823

* commit '4f99823535e09f1a72231b48551b3162d1c5060e':
DO NOT MERGE codecs: check OMX buffer size before use in VP8 encoder.
881b227441b039dca510e04c74a92cd99c6e45cf 22-Mar-2016 Wonsik Kim <wonsik@google.com> Merge "codecs: check OMX buffer size before use in VP8 encoder." into lmp-dev
am: 19a06a9

* commit '19a06a9cfeb97a1c1dfb7eeccc75d66f61dd2a83':
codecs: check OMX buffer size before use in VP8 encoder.
19a06a9cfeb97a1c1dfb7eeccc75d66f61dd2a83 22-Mar-2016 Wonsik Kim <wonsik@google.com> Merge "codecs: check OMX buffer size before use in VP8 encoder." into lmp-dev
4f99823535e09f1a72231b48551b3162d1c5060e 22-Mar-2016 Wonsik Kim <wonsik@google.com> Merge "DO NOT MERGE codecs: check OMX buffer size before use in VP8 encoder." into klp-dev
5b4401b28990107bb797dc0d5f3904cf27417e98 18-Mar-2016 Lajos Molnar <lajos@google.com> ACodec: enable support for non-16bit PCM data

Bug: 27172163
Change-Id: Ia5c824f64a6f26b45da9969eb7a85e09abbd5800
Codec.cpp
ndroid.mk
ataConverter.cpp
odecs/raw/SoftRaw.cpp
odecs/raw/SoftRaw.h
nclude/DataConverter.h
12054ac3a69fb5209325ad467d7b3128388836e7 22-Mar-2016 Marco Nelissen <marcone@google.com> Merge "Don\'t crash on invalid datestamp" into nyc-dev am: 5e5cdca
am: 79bb449

* commit '79bb449e8dcbad82340af824ea0930f16e9ee734':
Don't crash on invalid datestamp
79bb449e8dcbad82340af824ea0930f16e9ee734 22-Mar-2016 Marco Nelissen <marcone@google.com> Merge "Don\'t crash on invalid datestamp" into nyc-dev
am: 5e5cdca

* commit '5e5cdcac7f4a11400976ab44382429a640a4a9b5':
Don't crash on invalid datestamp
0b8dec713aee5b6fde8c4aedee91674795004725 22-Mar-2016 Marco Nelissen <marcone@google.com> Use uint32_t for NAL offset and size

This is enough for the offsets/sizes within a single buffer, and
prevents miscommunication between 64-bit and 32-bit processes.

Bug: 27785687
Change-Id: I4e6c3edbb7e740324c9ff7f8ae539d41ea3be4e2
nclude/avc_utils.h
5e5cdcac7f4a11400976ab44382429a640a4a9b5 22-Mar-2016 Marco Nelissen <marcone@google.com> Merge "Don't crash on invalid datestamp" into nyc-dev
0ae58f2f15bcb0e486f7c0479371d0ed9408137e 22-Mar-2016 Pawin Vongmasa <pawin@google.com> Merge "Fix convertMetaDataToMessage as suggested." into nyc-dev am: ab67a3d
am: 05f4b72

* commit '05f4b72242605e36f4838c71ae83c8c8e0778d0b':
Fix convertMetaDataToMessage as suggested.
05f4b72242605e36f4838c71ae83c8c8e0778d0b 22-Mar-2016 Pawin Vongmasa <pawin@google.com> Merge "Fix convertMetaDataToMessage as suggested." into nyc-dev
am: ab67a3d

* commit 'ab67a3d24a73d8847b91ef3508bd53541ce5ee15':
Fix convertMetaDataToMessage as suggested.
e3f3864ce16de644567a47f7f8647fe17938e6b8 22-Mar-2016 Wei Jia <wjia@google.com> SoftAMR: check input buffer size to avoid overflow. am: 55e5218 am: 4a9d762 am: d82ca56 am: 7840f05 am: adb7d9c am: 9eedbf4 am: e00b888 am: 18fedd0 am: 717d980 am: 26c1725 am: b04509b
am: 0d08fea

* commit '0d08fea76624ff88e54ab4d72220dab6747a336a':
SoftAMR: check input buffer size to avoid overflow.
ab67a3d24a73d8847b91ef3508bd53541ce5ee15 22-Mar-2016 Pawin Vongmasa <pawin@google.com> Merge "Fix convertMetaDataToMessage as suggested." into nyc-dev
0d08fea76624ff88e54ab4d72220dab6747a336a 22-Mar-2016 Wei Jia <wjia@google.com> SoftAMR: check input buffer size to avoid overflow. am: 55e5218 am: 4a9d762 am: d82ca56 am: 7840f05 am: adb7d9c am: 9eedbf4 am: e00b888 am: 18fedd0 am: 717d980 am: 26c1725
am: b04509b

* commit 'b04509bd84b3f7a7d3c78bfc54e8160d9dc34887':
SoftAMR: check input buffer size to avoid overflow.
b04509bd84b3f7a7d3c78bfc54e8160d9dc34887 22-Mar-2016 Wei Jia <wjia@google.com> SoftAMR: check input buffer size to avoid overflow. am: 55e5218 am: 4a9d762 am: d82ca56 am: 7840f05 am: adb7d9c am: 9eedbf4 am: e00b888 am: 18fedd0 am: 717d980
am: 26c1725

* commit '26c172519a0eae22bd240f9a9a960714d384a789':
SoftAMR: check input buffer size to avoid overflow.
26c172519a0eae22bd240f9a9a960714d384a789 22-Mar-2016 Wei Jia <wjia@google.com> SoftAMR: check input buffer size to avoid overflow. am: 55e5218 am: 4a9d762 am: d82ca56 am: 7840f05 am: adb7d9c am: 9eedbf4 am: e00b888 am: 18fedd0
am: 717d980

* commit '717d980d2a05095916e8ba84c54f5fc4a6b02f8e':
SoftAMR: check input buffer size to avoid overflow.
717d980d2a05095916e8ba84c54f5fc4a6b02f8e 22-Mar-2016 Wei Jia <wjia@google.com> SoftAMR: check input buffer size to avoid overflow. am: 55e5218 am: 4a9d762 am: d82ca56 am: 7840f05 am: adb7d9c am: 9eedbf4 am: e00b888
am: 18fedd0

* commit '18fedd0fd651a12843aec36a8fe1d7873a08b78d':
SoftAMR: check input buffer size to avoid overflow.
18fedd0fd651a12843aec36a8fe1d7873a08b78d 22-Mar-2016 Wei Jia <wjia@google.com> SoftAMR: check input buffer size to avoid overflow. am: 55e5218 am: 4a9d762 am: d82ca56 am: 7840f05 am: adb7d9c am: 9eedbf4
am: e00b888

* commit 'e00b888d4f87688fd92d4d23fc049614aef90c2f':
SoftAMR: check input buffer size to avoid overflow.
e00b888d4f87688fd92d4d23fc049614aef90c2f 22-Mar-2016 Wei Jia <wjia@google.com> SoftAMR: check input buffer size to avoid overflow. am: 55e5218 am: 4a9d762 am: d82ca56 am: 7840f05 am: adb7d9c
am: 9eedbf4

* commit '9eedbf45eeaad2717b6f3b0fba53b264f691eef3':
SoftAMR: check input buffer size to avoid overflow.
9393f3fd6e591dbc93196944f1efc9d90889255e 22-Mar-2016 Wei Jia <wjia@google.com> SoftAMR: check output buffer size to avoid overflow. am: a3536c6 am: 1d8b35d am: 7837c49 am: 9e5c82b am: 84c5e67 am: baec8f6 am: aca925d am: 5de7130 am: 30ae831 am: c4ff254 am: ecebf1d
am: 89d633a

* commit '89d633aa3621478aad2d7e464d3050c5fca3157c':
SoftAMR: check output buffer size to avoid overflow.
9eedbf45eeaad2717b6f3b0fba53b264f691eef3 22-Mar-2016 Wei Jia <wjia@google.com> SoftAMR: check input buffer size to avoid overflow. am: 55e5218 am: 4a9d762 am: d82ca56 am: 7840f05
am: adb7d9c

* commit 'adb7d9c716748f310a76338f25203b8ea58da620':
SoftAMR: check input buffer size to avoid overflow.
89d633aa3621478aad2d7e464d3050c5fca3157c 22-Mar-2016 Wei Jia <wjia@google.com> SoftAMR: check output buffer size to avoid overflow. am: a3536c6 am: 1d8b35d am: 7837c49 am: 9e5c82b am: 84c5e67 am: baec8f6 am: aca925d am: 5de7130 am: 30ae831 am: c4ff254
am: ecebf1d

* commit 'ecebf1d3053f1b046d3322315d07105cbabf555b':
SoftAMR: check output buffer size to avoid overflow.
ecebf1d3053f1b046d3322315d07105cbabf555b 22-Mar-2016 Wei Jia <wjia@google.com> SoftAMR: check output buffer size to avoid overflow. am: a3536c6 am: 1d8b35d am: 7837c49 am: 9e5c82b am: 84c5e67 am: baec8f6 am: aca925d am: 5de7130 am: 30ae831
am: c4ff254

* commit 'c4ff254271a695ee0c96f4addaf256bf6f78abe7':
SoftAMR: check output buffer size to avoid overflow.
7840f059175ee89235567845cc151fb6de1a1b24 22-Mar-2016 Wei Jia <wjia@google.com> SoftAMR: check input buffer size to avoid overflow. am: 55e5218 am: 4a9d762
am: d82ca56

* commit 'd82ca561cb58280640c51bb53a416f5f79278c3c':
SoftAMR: check input buffer size to avoid overflow.
c4ff254271a695ee0c96f4addaf256bf6f78abe7 22-Mar-2016 Wei Jia <wjia@google.com> SoftAMR: check output buffer size to avoid overflow. am: a3536c6 am: 1d8b35d am: 7837c49 am: 9e5c82b am: 84c5e67 am: baec8f6 am: aca925d am: 5de7130
am: 30ae831

* commit '30ae831af8b5170396d157e25fda8e2868177953':
SoftAMR: check output buffer size to avoid overflow.
d82ca561cb58280640c51bb53a416f5f79278c3c 22-Mar-2016 Wei Jia <wjia@google.com> SoftAMR: check input buffer size to avoid overflow. am: 55e5218
am: 4a9d762

* commit '4a9d762d2539fd2108803741da4366500253c564':
SoftAMR: check input buffer size to avoid overflow.
30ae831af8b5170396d157e25fda8e2868177953 22-Mar-2016 Wei Jia <wjia@google.com> SoftAMR: check output buffer size to avoid overflow. am: a3536c6 am: 1d8b35d am: 7837c49 am: 9e5c82b am: 84c5e67 am: baec8f6 am: aca925d
am: 5de7130

* commit '5de7130b22b6985cbe2dc1b5fe6d168b10b35cc3':
SoftAMR: check output buffer size to avoid overflow.
4a9d762d2539fd2108803741da4366500253c564 22-Mar-2016 Wei Jia <wjia@google.com> SoftAMR: check input buffer size to avoid overflow.
am: 55e5218

* commit '55e5218fd53f4da5c1fbad539ed960c04a883b0b':
SoftAMR: check input buffer size to avoid overflow.
5de7130b22b6985cbe2dc1b5fe6d168b10b35cc3 22-Mar-2016 Wei Jia <wjia@google.com> SoftAMR: check output buffer size to avoid overflow. am: a3536c6 am: 1d8b35d am: 7837c49 am: 9e5c82b am: 84c5e67 am: baec8f6
am: aca925d

* commit 'aca925dabcd794b356058354cefa08529b4b7e4d':
SoftAMR: check output buffer size to avoid overflow.
aca925dabcd794b356058354cefa08529b4b7e4d 22-Mar-2016 Wei Jia <wjia@google.com> SoftAMR: check output buffer size to avoid overflow. am: a3536c6 am: 1d8b35d am: 7837c49 am: 9e5c82b am: 84c5e67
am: baec8f6

* commit 'baec8f6834c3d7dd91b096579f4a0016c78ef903':
SoftAMR: check output buffer size to avoid overflow.
baec8f6834c3d7dd91b096579f4a0016c78ef903 22-Mar-2016 Wei Jia <wjia@google.com> SoftAMR: check output buffer size to avoid overflow. am: a3536c6 am: 1d8b35d am: 7837c49 am: 9e5c82b
am: 84c5e67

* commit '84c5e675e0928d65b64a4480ee4d963e507b312d':
SoftAMR: check output buffer size to avoid overflow.
9e5c82b82a54120d7ae66c54b1fc996ac93721a5 22-Mar-2016 Wei Jia <wjia@google.com> SoftAMR: check output buffer size to avoid overflow. am: a3536c6 am: 1d8b35d
am: 7837c49

* commit '7837c4920113d44a93425c89055c57853985d0e9':
SoftAMR: check output buffer size to avoid overflow.
7837c4920113d44a93425c89055c57853985d0e9 22-Mar-2016 Wei Jia <wjia@google.com> SoftAMR: check output buffer size to avoid overflow. am: a3536c6
am: 1d8b35d

* commit '1d8b35d7f0af76778ad355543b6f2eb88c6316e3':
SoftAMR: check output buffer size to avoid overflow.
1d8b35d7f0af76778ad355543b6f2eb88c6316e3 22-Mar-2016 Wei Jia <wjia@google.com> SoftAMR: check output buffer size to avoid overflow.
am: a3536c6

* commit 'a3536c61c6b6c77e199cc207cbf1e5c5b063cf91':
SoftAMR: check output buffer size to avoid overflow.
55e5218fd53f4da5c1fbad539ed960c04a883b0b 19-Mar-2016 Wei Jia <wjia@google.com> SoftAMR: check input buffer size to avoid overflow.

Bug: 27662364
Change-Id: I47380545ea7d85845e141e722b0d84f498d27145
odecs/amrnb/dec/SoftAMR.cpp
odecs/amrnb/dec/src/amrdecode.h
odecs/amrnb/dec/src/gsmamr_dec.h
a3536c61c6b6c77e199cc207cbf1e5c5b063cf91 17-Mar-2016 Wei Jia <wjia@google.com> SoftAMR: check output buffer size to avoid overflow.

Bug: 27662364
Change-Id: I7b26892c41d6f2e690e77478ab855c2fed1ff6b0
odecs/amrnb/dec/SoftAMR.cpp
13fe6cd19e8bc62c6d7fce1d8c279996f19b12a5 20-Mar-2016 Wonsik Kim <wonsik@google.com> DO NOT MERGE codecs: check OMX buffer size before use in VP8 encoder.

Bug: 27569635
Change-Id: I469573f40e21dc9f4c200749d4f220e3a2d31761
odecs/on2/enc/SoftVPXEncoder.cpp
e5b67490353efa67496d1c907edaab0cf5a41d2e 20-Mar-2016 Wonsik Kim <wonsik@google.com> codecs: check OMX buffer size before use in VP8 encoder.

Bug: 27569635
Change-Id: I469573f40e21dc9f4c200749d4f220e3a2d31761
odecs/on2/enc/SoftVPXEncoder.cpp
2954bca7bdec618da2b94a7e8ac62595b56598a3 22-Mar-2016 Pawin Vongmasa <pawin@google.com> Fix convertMetaDataToMessage as suggested.

Bug: 25462400
Change-Id: I101f972b9e9fa92d189ec57161061647fe212eab
tils.cpp
a6af9b9e4d3379ccfb740c5a8320ce877068ba3e 21-Mar-2016 Pawin Vongmasa <pawin@google.com> Merge "MPEG4Extractor: add AC3/EAC3 support"
a3a6c93219054bdb0ee3d96328af477d6893e21b 21-Mar-2016 Marco Nelissen <marcone@google.com> Merge "Fix 64-bit comparison" am: f903306
am: 23fc0da

* commit '23fc0dafa8e1d53343790fb576731784e8bdd3b7':
Fix 64-bit comparison
23fc0dafa8e1d53343790fb576731784e8bdd3b7 21-Mar-2016 Marco Nelissen <marcone@google.com> Merge "Fix 64-bit comparison"
am: f903306

* commit 'f903306aeb7ea2b0ab5d50437fdcb2b819a8f99e':
Fix 64-bit comparison
1cb23b033987e86827a4fa96550c6a3670b688f1 21-Mar-2016 Marco Nelissen <marcone@google.com> Fix 64-bit comparison

A 64-bit SIZE_MAX value cast to off64_t is always negative, causing valid
files to be rejected in 64-bit mode.

Change-Id: I8f61c19951f9c73292fa917081b8b2f3bfc405a0
ampleTable.cpp
35738c6e64dbcfe62f832ace599d5fbb84dc0e98 25-Sep-2015 Chad Brubaker <cbrubaker@google.com> Fix benign overflow in verifyOpusHeader

Bug: 24404248
Bug: 23110888
Change-Id: I9052383f6fe28f0eca558d4374c49f5a67ce11ce
ggExtractor.cpp
3724c1c9ab40ce2cc313686cd2532c79c025ca6a 21-Mar-2016 Marco Nelissen <marcone@google.com> Don't crash on invalid datestamp

Bug: 27212093
Change-Id: Icbaf4e55a71b1d2a32da803fc2cf3ddbdfff071c
PEG4Extractor.cpp
9321d44538c0112b5e39679731fd8bbbec98ee89 18-Mar-2016 Marco Nelissen <marcone@google.com> Merge "Add VPX output buffer size check" into mnc-dev am: 68a43d3 am: 562cf01 am: 8e55cd3 am: 0ee25ef am: 17ec7d7
am: 3b7c222

* commit '3b7c22257a3e64d60fab5b30150e005508125b80':
Add VPX output buffer size check
3b7c22257a3e64d60fab5b30150e005508125b80 18-Mar-2016 Marco Nelissen <marcone@google.com> Merge "Add VPX output buffer size check" into mnc-dev am: 68a43d3 am: 562cf01 am: 8e55cd3 am: 0ee25ef
am: 17ec7d7

* commit '17ec7d74fd490179459cd139fa3a9c146dc00726':
Add VPX output buffer size check
17ec7d74fd490179459cd139fa3a9c146dc00726 18-Mar-2016 Marco Nelissen <marcone@google.com> Merge "Add VPX output buffer size check" into mnc-dev am: 68a43d3 am: 562cf01 am: 8e55cd3
am: 0ee25ef

* commit '0ee25ef2cff43e8ea5e183e049e05c4df277c20c':
Add VPX output buffer size check
0ee25ef2cff43e8ea5e183e049e05c4df277c20c 18-Mar-2016 Marco Nelissen <marcone@google.com> Merge "Add VPX output buffer size check" into mnc-dev am: 68a43d3 am: 562cf01
am: 8e55cd3

* commit '8e55cd3f9586924f4b41cac14f3f0db11311bde8':
Add VPX output buffer size check
8e55cd3f9586924f4b41cac14f3f0db11311bde8 18-Mar-2016 Marco Nelissen <marcone@google.com> Merge "Add VPX output buffer size check" into mnc-dev am: 68a43d3
am: 562cf01

* commit '562cf01b2190bfc8fa3017597b954298d132c8bb':
Add VPX output buffer size check
562cf01b2190bfc8fa3017597b954298d132c8bb 18-Mar-2016 Marco Nelissen <marcone@google.com> Merge "Add VPX output buffer size check" into mnc-dev
am: 68a43d3

* commit '68a43d37a35af06d5775811c064072b84900d41a':
Add VPX output buffer size check
68a43d37a35af06d5775811c064072b84900d41a 18-Mar-2016 Marco Nelissen <marcone@google.com> Merge "Add VPX output buffer size check" into mnc-dev
37090fad728bff61acd0cf8fdcafef30b67e80de 18-Mar-2016 Marco Nelissen <marcone@google.com> Merge "Fix initialization of AAC presentation struct" into lmp-dev am: 2b9a3e1 am: 4f0585c am: 2828c06 am: df7dbf9 am: 30e2c0d am: 4f38da4
am: 81361a5

* commit '81361a50f06f0f173f754655fadc3638b8d19ade':
Fix initialization of AAC presentation struct
81361a50f06f0f173f754655fadc3638b8d19ade 18-Mar-2016 Marco Nelissen <marcone@google.com> Merge "Fix initialization of AAC presentation struct" into lmp-dev am: 2b9a3e1 am: 4f0585c am: 2828c06 am: df7dbf9 am: 30e2c0d
am: 4f38da4

* commit '4f38da4c59e8f2a84c523cc7bd30dc095ca9d72e':
Fix initialization of AAC presentation struct
4f38da4c59e8f2a84c523cc7bd30dc095ca9d72e 18-Mar-2016 Marco Nelissen <marcone@google.com> Merge "Fix initialization of AAC presentation struct" into lmp-dev am: 2b9a3e1 am: 4f0585c am: 2828c06 am: df7dbf9
am: 30e2c0d

* commit '30e2c0df049978b21da54c00b465039adc3da28e':
Fix initialization of AAC presentation struct
30e2c0df049978b21da54c00b465039adc3da28e 18-Mar-2016 Marco Nelissen <marcone@google.com> Merge "Fix initialization of AAC presentation struct" into lmp-dev am: 2b9a3e1 am: 4f0585c am: 2828c06
am: df7dbf9

* commit 'df7dbf9b825ba2d61e21a986d4ba295580f47472':
Fix initialization of AAC presentation struct
36c4f0c3d8500ea4eac8482f91fdc50d829c6b65 18-Mar-2016 Lajos Molnar <lajos@google.com> Merge "stagefright: set pcm-encoding for raw audio tracks" into nyc-dev am: cbdc988
am: 78ac0e7

* commit '78ac0e736a36cb9f881bb2b357b4117dbedf5a19':
stagefright: set pcm-encoding for raw audio tracks
4eba960d952f4ae2d0311a2749e8a36bad8b0f7d 18-Mar-2016 Lajos Molnar <lajos@google.com> Merge "stagefright: account for alignment in MemoryDealer" into nyc-dev am: d40ea87
am: a558bf1

* commit 'a558bf1bafa9485151b5b4a07f94d23808cc5e64':
stagefright: account for alignment in MemoryDealer
78ac0e736a36cb9f881bb2b357b4117dbedf5a19 18-Mar-2016 Lajos Molnar <lajos@google.com> Merge "stagefright: set pcm-encoding for raw audio tracks" into nyc-dev
am: cbdc988

* commit 'cbdc9882c12b04672da614e6ff0546813f28107f':
stagefright: set pcm-encoding for raw audio tracks
a558bf1bafa9485151b5b4a07f94d23808cc5e64 18-Mar-2016 Lajos Molnar <lajos@google.com> Merge "stagefright: account for alignment in MemoryDealer" into nyc-dev
am: d40ea87

* commit 'd40ea87fe7982d81aa760a1403e369ec478a4b0c':
stagefright: account for alignment in MemoryDealer
cbdc9882c12b04672da614e6ff0546813f28107f 18-Mar-2016 Lajos Molnar <lajos@google.com> Merge "stagefright: set pcm-encoding for raw audio tracks" into nyc-dev
d40ea87fe7982d81aa760a1403e369ec478a4b0c 18-Mar-2016 Lajos Molnar <lajos@google.com> Merge "stagefright: account for alignment in MemoryDealer" into nyc-dev
099db6603689e6ebf79da7b4ac7b014dba4b5211 18-Mar-2016 Marco Nelissen <marcone@google.com> resolve merge conflicts of c66f8dd to lmp-mr1-dev am: 77e43fa
am: f79ccd5

* commit 'f79ccd551e6829566243d4cd53c516251e54276d':
Add VPX output buffer size check
77e43fac7fa608e36dfa907ed2032292795fa88a 18-Mar-2016 Marco Nelissen <marcone@google.com> resolve merge conflicts of c66f8dd to lmp-mr1-dev

Change-Id: Ic9af33596a60f310bc8e0624bde17578f2cf7bc3
df7dbf9b825ba2d61e21a986d4ba295580f47472 18-Mar-2016 Marco Nelissen <marcone@google.com> Merge "Fix initialization of AAC presentation struct" into lmp-dev am: 2b9a3e1 am: 4f0585c
am: 2828c06

* commit '2828c067f8b2dd492bd794de39ea9d2d6112c43a':
Fix initialization of AAC presentation struct
4f0585cb6f0a51502de462d9af4abc867d5d2d6d 18-Mar-2016 Marco Nelissen <marcone@google.com> Merge "Fix initialization of AAC presentation struct" into lmp-dev
am: 2b9a3e1

* commit '2b9a3e133e52046abc5e4c832d732a677a4fcdab':
Fix initialization of AAC presentation struct
5d44fff74dea989e51236d89b5ca19f37cae2ef3 18-Mar-2016 Marco Nelissen <marcone@google.com> DO NOT MERGE Add VPX output buffer size check
am: 1595f8a

* commit '1595f8ac7ab412e81e0565e1347edaeedf9f2832':
DO NOT MERGE Add VPX output buffer size check
5b2749edb1b6c00875f64a3ebbe64d11ee00fd4d 18-Mar-2016 Lajos Molnar <lajos@google.com> MPEG4Writer: allow both input format and stream to specify CSD am: 7c9ea89
am: d3934c4

* commit 'd3934c422bd3a4661d46be1671f1b121c63bb983':
MPEG4Writer: allow both input format and stream to specify CSD
d3934c422bd3a4661d46be1671f1b121c63bb983 18-Mar-2016 Lajos Molnar <lajos@google.com> MPEG4Writer: allow both input format and stream to specify CSD
am: 7c9ea89

* commit '7c9ea89cbe3e42e0d94b1790ae1d424a9c16ce08':
MPEG4Writer: allow both input format and stream to specify CSD
78bd91b15ee8ea5aa2ab5a8cad7e892cb2d01c1b 26-Feb-2016 Lajos Molnar <lajos@google.com> stagefright: set pcm-encoding for raw audio tracks

Bug: 27172163
Change-Id: I4db7ace4e8cbf01939dedefbb1c54730e393530f
Codec.cpp
udioPlayer.cpp
udioSource.cpp
LACExtractor.cpp
idiExtractor.cpp
tils.cpp
AVExtractor.cpp
peg2ts/ESQueue.cpp
ifi-display/source/PlaybackSession.cpp
28edbba6aa6c1a9bbea76da2f5cc3cd73af8eb4c 17-Mar-2016 Lajos Molnar <lajos@google.com> stagefright: account for alignment in MemoryDealer

Bug: 27722308
Change-Id: I4e4f08db36e8311d71374e7de096480047bbb6cf
Codec.cpp
7c9ea89cbe3e42e0d94b1790ae1d424a9c16ce08 18-Mar-2016 Lajos Molnar <lajos@google.com> MPEG4Writer: allow both input format and stream to specify CSD

There is a race condition now that MediaCodecSource updates its
output format on output format change, so MPEG4Writer must be able
to support subsequent CSD updates before the first frame.

Bug: 27719322
Change-Id: Ic705c3adddf07af471205adf027b6caef098fa4d
PEG4Writer.cpp
a7fc93bf76bbb7c2c67f0f2c1c224d217e02dedd 17-Mar-2016 Marco Nelissen <marcone@google.com> Fix initialization of AAC presentation struct am: dabb051
am: f91072a

* commit 'f91072ab57f9fadade6c3eba2aabb1a914a94345':
Fix initialization of AAC presentation struct
4851174ff75cf835c5ee198efd08be068219de8f 17-Mar-2016 Eino-Ville Talvala <etalvala@google.com> Merge "Camera: Update dataspace to new spec, convert for older HALs" into nyc-dev am: 68a91b9
am: d1cb162

* commit 'd1cb1629ace4a9c327b6d148df2e93148d7c35cc':
Camera: Update dataspace to new spec, convert for older HALs
f91072ab57f9fadade6c3eba2aabb1a914a94345 17-Mar-2016 Marco Nelissen <marcone@google.com> Fix initialization of AAC presentation struct
am: dabb051

* commit 'dabb051cf03b5ccc994c769a1cd23f9e6c378dee':
Fix initialization of AAC presentation struct
d1cb1629ace4a9c327b6d148df2e93148d7c35cc 17-Mar-2016 Eino-Ville Talvala <etalvala@google.com> Merge "Camera: Update dataspace to new spec, convert for older HALs" into nyc-dev
am: 68a91b9

* commit '68a91b9dbe8d70c5542df4f3eb5f9a4f803ba10a':
Camera: Update dataspace to new spec, convert for older HALs
dabb051cf03b5ccc994c769a1cd23f9e6c378dee 10-Mar-2016 Marco Nelissen <marcone@google.com> Fix initialization of AAC presentation struct

Otherwise the new size checks trip on this.

Bug: 27207275
Change-Id: I1f8f01097e3a88ff041b69279a6121be842f1766
(cherry picked from commit 3e5d6d1b67a542d6e066b1e67857ca20dd7872b7)
Codec.cpp
bcbd7bce03772a22c2965dab636c1f67b7a655f5 16-Mar-2016 Pawin Vongmasa <pawin@google.com> MPEG4Extractor: add AC3/EAC3 support

Bug: 16847897
Change-Id: Iaf2f379f45aaab372ce6567cb0d60fad1978bfdd
PEG4Extractor.cpp
tils.cpp
nclude/MPEG4Extractor.h
68a91b9dbe8d70c5542df4f3eb5f9a4f803ba10a 16-Mar-2016 Eino-Ville Talvala <etalvala@google.com> Merge "Camera: Update dataspace to new spec, convert for older HALs" into nyc-dev
9eefe579117e17200645d662206210a3c722fee4 16-Mar-2016 Wei Jia <wjia@google.com> Merge "amrwbenc: fix possible signed integer overflow in ACELP_4t64_fx." into nyc-dev am: 77c8648
am: 0782f70

* commit '0782f70d662c0c0ff151beb750e9bec972d31628':
amrwbenc: fix possible signed integer overflow in ACELP_4t64_fx.
0782f70d662c0c0ff151beb750e9bec972d31628 16-Mar-2016 Wei Jia <wjia@google.com> Merge "amrwbenc: fix possible signed integer overflow in ACELP_4t64_fx." into nyc-dev
am: 77c8648

* commit '77c86487f6c7ec825df85c3cb0f8fab2dd1c185e':
amrwbenc: fix possible signed integer overflow in ACELP_4t64_fx.
77c86487f6c7ec825df85c3cb0f8fab2dd1c185e 16-Mar-2016 Wei Jia <wjia@google.com> Merge "amrwbenc: fix possible signed integer overflow in ACELP_4t64_fx." into nyc-dev
a93d5b263f3f374c5d3081297f504504203000da 16-Mar-2016 Wei Jia <wjia@google.com> amrwbenc: fix possible signed integer overflow in ACELP_4t64_fx.

Bug: 27657270
Change-Id: Iad98ad520e9c99a433842b1a3841e288013fb1c9
odecs/amrwbenc/inc/basic_op.h
odecs/amrwbenc/src/c4t64fx.c
c66f8ddd2094090b655c3701fd9ce49ada4c6fb4 16-Mar-2016 Marco Nelissen <marcone@google.com> Add VPX output buffer size check

and handle dead observers more gracefully

Bug: 27597103
Change-Id: Id7acb25d5ef69b197da15ec200a9e4f9e7b03518
odecs/on2/dec/SoftVPX.cpp
mx/OMX.cpp
1595f8ac7ab412e81e0565e1347edaeedf9f2832 16-Mar-2016 Marco Nelissen <marcone@google.com> DO NOT MERGE Add VPX output buffer size check

and handle dead observers more gracefully

Bug: 27597103
Change-Id: Id7acb25d5ef69b197da15ec200a9e4f9e7b03518
odecs/on2/dec/SoftVPX.cpp
mx/OMX.cpp
ca00182c94d2ec1bdc9baeb1385e0cf3de9171d1 16-Mar-2016 Marco Nelissen <marcone@google.com> Add VPX output buffer size check

and handle dead observers more gracefully

Bug: 27597103
Change-Id: Id7acb25d5ef69b197da15ec200a9e4f9e7b03518
odecs/on2/dec/SoftVPX.cpp
mx/OMX.cpp
edb14117b608eac37a331379b4f92bb7a051bac4 15-Mar-2016 Marco Nelissen <marcone@google.com> Fix size check for OMX_IndexParamConsumerUsageBits am: c1c50e7b47 am: 31e2a27f87
am: 72a3bb913a

* commit '72a3bb913ab4ee2ab9d94cda42aae4aa0171eb83':
Fix size check for OMX_IndexParamConsumerUsageBits
72a3bb913ab4ee2ab9d94cda42aae4aa0171eb83 15-Mar-2016 Marco Nelissen <marcone@google.com> Fix size check for OMX_IndexParamConsumerUsageBits am: c1c50e7b47
am: 31e2a27f87

* commit '31e2a27f876edbe49988bd4307365d481c1de7e8':
Fix size check for OMX_IndexParamConsumerUsageBits
31e2a27f876edbe49988bd4307365d481c1de7e8 15-Mar-2016 Marco Nelissen <marcone@google.com> Fix size check for OMX_IndexParamConsumerUsageBits
am: c1c50e7b47

* commit 'c1c50e7b47784c5e6978eda67db68ef4951144c6':
Fix size check for OMX_IndexParamConsumerUsageBits
1640501b3a62a5b551d2733450062afc29d4d251 15-Mar-2016 Lajos Molnar <lajos@google.com> stagefright: use colr box for color aspects am: 58fb7c6e1a
am: 33ffab3e97

* commit '33ffab3e972683889ea77bdd376456995c62ec93':
stagefright: use colr box for color aspects
33ffab3e972683889ea77bdd376456995c62ec93 15-Mar-2016 Lajos Molnar <lajos@google.com> stagefright: use colr box for color aspects
am: 58fb7c6e1a

* commit '58fb7c6e1a9244dd7215a647388c440d8d75851b':
stagefright: use colr box for color aspects
58fb7c6e1a9244dd7215a647388c440d8d75851b 15-Mar-2016 Lajos Molnar <lajos@google.com> stagefright: use colr box for color aspects

Bug: 25684127
Change-Id: I105294ce0d41ac58d80a2a4a74d35a9b78536790
PEG4Extractor.cpp
PEG4Writer.cpp
ediaCodecSource.cpp
oundation/ColorUtils.cpp
nclude/MPEG4Extractor.h
2cbf6cea23539bfe99e36d1d221de62255452e86 14-Mar-2016 Eino-Ville Talvala <etalvala@google.com> Camera: Update dataspace to new spec, convert for older HALs

- Switch clients of camera devices to use new dataspace values
- For older HALs, map to legacy dataspace values

Bug: 27344373
Change-Id: Icabc345025383f987ef4472cd26182a580dc8b3c
ameraSource.cpp
ediaCodecSource.cpp
76f83dfa233ae7178c55892e355c1e19abd49b1c 14-Mar-2016 Hangyu Kuang <hkuang@google.com> Merge "stagefright: Remove AVC Base Profile restriction in ACodec encoder setup." into nyc-dev am: c63f91525c
am: b70ac0c204

* commit 'b70ac0c2041194b00abf1e7a069a99cb1406f7fd':
stagefright: Remove AVC Base Profile restriction in ACodec encoder setup.
b70ac0c2041194b00abf1e7a069a99cb1406f7fd 14-Mar-2016 Hangyu Kuang <hkuang@google.com> Merge "stagefright: Remove AVC Base Profile restriction in ACodec encoder setup." into nyc-dev
am: c63f91525c

* commit 'c63f91525c793e8bb06ce805d6161965e85571d2':
stagefright: Remove AVC Base Profile restriction in ACodec encoder setup.
c63f91525c793e8bb06ce805d6161965e85571d2 14-Mar-2016 Hangyu Kuang <hkuang@google.com> Merge "stagefright: Remove AVC Base Profile restriction in ACodec encoder setup." into nyc-dev
b484433047a1ed8491114b2dbaaa592e2668bed0 14-Mar-2016 Lajos Molnar <lajos@google.com> stagefright: connect color aspects and surface dataspace am: b77d03b62c
am: 11c09d9c5e

* commit '11c09d9c5ef5b081c6afdcbf6794fd8784eaef72':
stagefright: connect color aspects and surface dataspace
f886997e5528d30386f4973a57a09cf531042b77 14-Mar-2016 Hangyu Kuang <hkuang@google.com> Merge "DO NOT MERGE SoftAvcEnc:Configured constrained_intra_pred flag in internalSetParameter" into nyc-dev
11c09d9c5ef5b081c6afdcbf6794fd8784eaef72 14-Mar-2016 Lajos Molnar <lajos@google.com> stagefright: connect color aspects and surface dataspace
am: b77d03b62c

* commit 'b77d03b62cb743d0faf74b54aa466b4d220b5e61':
stagefright: connect color aspects and surface dataspace
b77d03b62cb743d0faf74b54aa466b4d220b5e61 03-Mar-2016 Lajos Molnar <lajos@google.com> stagefright: connect color aspects and surface dataspace

1. Keep configuration format as video decoder and encoder will need
it to reset their default color aspects on mode/size change.

2. Separate color aspect handling for decoder and encoder as they
are quite different. Update decoder and encoder color aspect setting
to latest policy.

3. propagate dataspace to GraphicBufferSource, MediaCodecSource,
CameraSource and SoftwareRenderer

Bug: 25684127
Change-Id: Ie9a7528af36ed44605a7ce3e69b5794ef16b1c66
Codec.cpp
ameraSource.cpp
ediaCodec.cpp
ediaCodecSource.cpp
olorconversion/SoftwareRenderer.cpp
oundation/ColorUtils.cpp
nclude/OMXNodeInstance.h
nclude/SoftwareRenderer.h
mx/GraphicBufferSource.cpp
mx/GraphicBufferSource.h
mx/OMXNodeInstance.cpp
e353d1181a4837f35f7b20d3623f77adb78bf937 14-Mar-2016 Marco Nelissen <marcone@google.com> Merge "Fix StagefrightMetadataRetriever calling MediaSource::start twice" into nyc-dev am: f56a02a5e7
am: 3022c55c89

* commit '3022c55c89d436af708b6aa5b2374c1c98459f04':
Fix StagefrightMetadataRetriever calling MediaSource::start twice
3022c55c89d436af708b6aa5b2374c1c98459f04 14-Mar-2016 Marco Nelissen <marcone@google.com> Merge "Fix StagefrightMetadataRetriever calling MediaSource::start twice" into nyc-dev
am: f56a02a5e7

* commit 'f56a02a5e7d1bfaeabf8b918e56bf49ea509bd42':
Fix StagefrightMetadataRetriever calling MediaSource::start twice
f56a02a5e7d1bfaeabf8b918e56bf49ea509bd42 14-Mar-2016 Marco Nelissen <marcone@google.com> Merge "Fix StagefrightMetadataRetriever calling MediaSource::start twice" into nyc-dev
e7d8e71e45028cbe51839c23f922ba8c506cba82 14-Mar-2016 Marco Nelissen <marcone@google.com> Fix StagefrightMetadataRetriever calling MediaSource::start twice

and revert the previously added debug logging.

Bug: 27324401
Change-Id: I6bd938c6667153022a971389023afbc731486ca0
tagefrightMetadataRetriever.cpp
972f653af6288f8dbb3ebd205c599e0cbb23456a 11-Mar-2016 Doney Alex <doney.alex@ittiam.com> DO NOT MERGE SoftAvcEnc:Configured constrained_intra_pred flag in internalSetParameter

Change-Id: Idbc2a0ee413651e2b6b1c82b7496507906c222c2
odecs/avcenc/SoftAVCEnc.cpp
5207ffe7a35148a1e4ea188cf2224fb230a92a0e 10-Mar-2016 Hangyu Kuang <hkuang@google.com> stagefright: Remove AVC Base Profile restriction in ACodec encoder setup.

Also add encoder config for main and high profile.

Bug:27597166
Change-Id: I8d55e1b56a007061179a01c7313cfd9c60e1bd1c
Codec.cpp
9515aca0c07a32128a65a68749bda3ea6851c109 24-Feb-2016 Doney Alex <doney.alex@ittiam.com> DO NOT MERGE SoftAvcEnc: Added support for Constrained intra prediction.

Change-Id: I1a3e8fbad0bea728311c2b4b0513c9565ecf9a14
odecs/avcenc/SoftAVCEnc.cpp
odecs/avcenc/SoftAVCEnc.h
c1c50e7b47784c5e6978eda67db68ef4951144c6 11-Mar-2016 Marco Nelissen <marcone@google.com> Fix size check for OMX_IndexParamConsumerUsageBits

since it doesn't follow the OMX convention. And remove support
for the kClientNeedsFrameBuffer flag.

Bug: 27207275
Change-Id: Ia2c119e2456ebf9e2f4e1de5104ef9032a212255
MXCodec.cpp
1c2c1049e18bd99c58df311ad8cd43dfe69c950d 11-Mar-2016 Lajos Molnar <lajos@google.com> Merge "ACodec: move getPortFormat closer to PortSettingsChanged event" into nyc-dev am: d5ef65ea89
am: ec3bb515a8

* commit 'ec3bb515a8761d8e11f14e4e5e036d13d57df070':
ACodec: move getPortFormat closer to PortSettingsChanged event
ec3bb515a8761d8e11f14e4e5e036d13d57df070 11-Mar-2016 Lajos Molnar <lajos@google.com> Merge "ACodec: move getPortFormat closer to PortSettingsChanged event" into nyc-dev
am: d5ef65ea89

* commit 'd5ef65ea897a7c0e3704000e33975f357bfc1c56':
ACodec: move getPortFormat closer to PortSettingsChanged event
d5ef65ea897a7c0e3704000e33975f357bfc1c56 11-Mar-2016 Lajos Molnar <lajos@google.com> Merge "ACodec: move getPortFormat closer to PortSettingsChanged event" into nyc-dev
3044e7acfddac57d53693b39d9ee664b5d8b647f 11-Mar-2016 Doney Alex <doney.alex@ittiam.com> Merge "SoftAvcEnc:Configured constrained_intra_pred flag in internalSetParameter" am: ebc0faffd2
am: c33a41e38d

* commit 'c33a41e38d414e3d2f0266d522ed42cdf7ac1e62':
SoftAvcEnc:Configured constrained_intra_pred flag in internalSetParameter
c33a41e38d414e3d2f0266d522ed42cdf7ac1e62 11-Mar-2016 Doney Alex <doney.alex@ittiam.com> Merge "SoftAvcEnc:Configured constrained_intra_pred flag in internalSetParameter"
am: ebc0faffd2

* commit 'ebc0faffd2a11a770614e699bb1e8beb51af87e1':
SoftAvcEnc:Configured constrained_intra_pred flag in internalSetParameter
ebc0faffd2a11a770614e699bb1e8beb51af87e1 11-Mar-2016 Hangyu Kuang <hkuang@google.com> Merge "SoftAvcEnc:Configured constrained_intra_pred flag in internalSetParameter"
003d9abe2ed022d040e22ff115fc4bb5bb4de3af 11-Mar-2016 Hangyu Kuang <hkuang@google.com> Merge "stagefright: Fix a bug in getting intra refresh period through getConfig." into nyc-dev am: 0d390f6da4
am: c2902b852a

* commit 'c2902b852a086169f3c53a89fb07cfb14cad5ebd':
stagefright: Fix a bug in getting intra refresh period through getConfig.
c2902b852a086169f3c53a89fb07cfb14cad5ebd 11-Mar-2016 Hangyu Kuang <hkuang@google.com> Merge "stagefright: Fix a bug in getting intra refresh period through getConfig." into nyc-dev
am: 0d390f6da4

* commit '0d390f6da426255d8a962d36b6086f4ea2e1a07d':
stagefright: Fix a bug in getting intra refresh period through getConfig.
0d390f6da426255d8a962d36b6086f4ea2e1a07d 11-Mar-2016 Hangyu Kuang <hkuang@google.com> Merge "stagefright: Fix a bug in getting intra refresh period through getConfig." into nyc-dev
df13812f2011c2247a1d8b9888a50bc01bf8f888 11-Mar-2016 Lajos Molnar <lajos@google.com> Merge "IOMX: add INTERNAL_OPTION_COLOR_ASPECTS to setParamaters" into nyc-dev am: 356d3f5285
am: 6ef1a8ed8f

* commit '6ef1a8ed8fe10952609eb606711979912c97da25':
IOMX: add INTERNAL_OPTION_COLOR_ASPECTS to setParamaters
82ef28e44bbf190d6345e5f3b1ae91adecfce5f7 11-Mar-2016 Lajos Molnar <lajos@google.com> Merge "IOMX: add dataspace to createInputSurface" into nyc-dev am: b34bcea794
am: 37f5c6cca7

* commit '37f5c6cca7d2109123364b2dfeaaee7e34d293a6':
IOMX: add dataspace to createInputSurface
b0a4b9e917bd26bf366fb20c48315f51285c18f9 08-Mar-2016 Lajos Molnar <lajos@google.com> ACodec: move getPortFormat closer to PortSettingsChanged event

Per OMX spec, we should read the new format even before disabling
the port.

Bug: 25684127
Change-Id: I78fc0d85dbf8e2d7e2c670c33e70fed6d79cf3c7
Codec.cpp
ediaCodec.cpp
6ef1a8ed8fe10952609eb606711979912c97da25 11-Mar-2016 Lajos Molnar <lajos@google.com> Merge "IOMX: add INTERNAL_OPTION_COLOR_ASPECTS to setParamaters" into nyc-dev
am: 356d3f5285

* commit '356d3f528514f0f06e6ae1bccf0bed7be9fd1fcb':
IOMX: add INTERNAL_OPTION_COLOR_ASPECTS to setParamaters
37f5c6cca7d2109123364b2dfeaaee7e34d293a6 11-Mar-2016 Lajos Molnar <lajos@google.com> Merge "IOMX: add dataspace to createInputSurface" into nyc-dev
am: b34bcea794

* commit 'b34bcea7945fb63af52c4b6e87757882b0df37eb':
IOMX: add dataspace to createInputSurface
356d3f528514f0f06e6ae1bccf0bed7be9fd1fcb 11-Mar-2016 Lajos Molnar <lajos@google.com> Merge "IOMX: add INTERNAL_OPTION_COLOR_ASPECTS to setParamaters" into nyc-dev
dd81af7ef969981748f35ec839869d34ed0cc768 11-Mar-2016 Lajos Molnar <lajos@google.com> IOMX: add INTERNAL_OPTION_COLOR_ASPECTS to setParamaters

Bug: 25684127
Change-Id: I140a26eb958d0c42f54faf2b20af636857e886f7
mx/GraphicBufferSource.cpp
mx/GraphicBufferSource.h
mx/OMXNodeInstance.cpp
b34bcea7945fb63af52c4b6e87757882b0df37eb 11-Mar-2016 Lajos Molnar <lajos@google.com> Merge "IOMX: add dataspace to createInputSurface" into nyc-dev
047ccc77b65a6a062dd88622e583b3d47f496927 11-Mar-2016 Doney Alex <doney.alex@ittiam.com> SoftAvcEnc:Configured constrained_intra_pred flag in internalSetParameter

Change-Id: Idbc2a0ee413651e2b6b1c82b7496507906c222c2
odecs/avcenc/SoftAVCEnc.cpp
3e5d6d1b67a542d6e066b1e67857ca20dd7872b7 10-Mar-2016 Marco Nelissen <marcone@google.com> Fix initialization of AAC presentation struct

Otherwise the new size checks trip on this.

Bug: 27207275
Change-Id: I1f8f01097e3a88ff041b69279a6121be842f1766
Codec.cpp
c4e63c0dde2f35389776ed95d1a8a06f2a35c881 10-Mar-2016 Ronghua Wu <ronghuawu@google.com> Merge "media: changed resource type from String8 to enum." into nyc-dev am: 98783a370f
am: 38fadcbfe5

* commit '38fadcbfe51d75f3f835c7427899894f52a5c33b':
media: changed resource type from String8 to enum.
38fadcbfe51d75f3f835c7427899894f52a5c33b 10-Mar-2016 Ronghua Wu <ronghuawu@google.com> Merge "media: changed resource type from String8 to enum." into nyc-dev
am: 98783a370f

* commit '98783a370f3f35058b42534d7d1d05e0fb7e9f5a':
media: changed resource type from String8 to enum.
98783a370f3f35058b42534d7d1d05e0fb7e9f5a 10-Mar-2016 Ronghua Wu <ronghuawu@google.com> Merge "media: changed resource type from String8 to enum." into nyc-dev
ea15fd29af81490311af9e12949b43524c39400e 03-Mar-2016 Ronghua Wu <ronghuawu@google.com> media: changed resource type from String8 to enum.

Bug: 27338692
Change-Id: I0161de084682e2317cba81dc5f55c17d5d478570
ediaCodec.cpp
d08a068bee8396b2ccdd819920b4496de2309a68 10-Mar-2016 Hangyu Kuang <hkuang@google.com> stagefright: Fix a bug in getting intra refresh period through getConfig.

When intra refresh mode is disable, getConfig should return '0' instead of
default intra refresh period.

Bug:26587630
Change-Id: I16d9f20d74b405f60be6bda18abd103d99a3ab28
odecs/avcenc/SoftAVCEnc.cpp
57fad3c31f46ec98d15bc253c16f9d269aeb8ea7 08-Mar-2016 Lajos Molnar <lajos@google.com> IOMX: add dataspace to createInputSurface

Bug: 25684127
Change-Id: Ibe746d7d077f32b0f2ecfb8494f415a6bf0bd673
Codec.cpp
MXClient.cpp
nclude/OMX.h
nclude/OMXNodeInstance.h
mx/GraphicBufferSource.cpp
mx/GraphicBufferSource.h
mx/OMX.cpp
mx/OMXNodeInstance.cpp
6b8ad52942623e2ed5e417f2607e556b6e008ca5 09-Mar-2016 Lajos Molnar <lajos@google.com> stagefright: move ColorUtils to foundation am: 3a09d8d6f9
am: 4123458817

* commit '4123458817e5f9cd8e694568efc9ed59df796adb':
stagefright: move ColorUtils to foundation
4123458817e5f9cd8e694568efc9ed59df796adb 09-Mar-2016 Lajos Molnar <lajos@google.com> stagefright: move ColorUtils to foundation
am: 3a09d8d6f9

* commit '3a09d8d6f909063990a5681b15a442b2ba8ce54a':
stagefright: move ColorUtils to foundation
3a09d8d6f909063990a5681b15a442b2ba8ce54a 08-Mar-2016 Lajos Molnar <lajos@google.com> stagefright: move ColorUtils to foundation

These are needed by OMX, which cannot depend on stagefright.

Bug: 25684127
Change-Id: I1784be72368e667404229d338b9c18df917ac2ed
odecBase.cpp
oundation/Android.mk
oundation/ColorUtils.cpp
67f5f3d4bd5dd677fa4ea68a28221e5c362a53f5 08-Mar-2016 Vignesh Venkatasubramanian <vigneshv@google.com> Merge "libstagefright: Refactor vp8 specific settings"
02587522e342093fd7bdf99f0e3d7eb1fedc5a63 08-Mar-2016 Wonsik Kim <wonsik@google.com> Merge "stagefright: fix MediaCodecSource.pause() behavior" into nyc-dev am: 7e258e8536
am: 5150524542

* commit '51505245428709f5f2bdbe815a0422d2ac68c436':
stagefright: fix MediaCodecSource.pause() behavior
51505245428709f5f2bdbe815a0422d2ac68c436 08-Mar-2016 Wonsik Kim <wonsik@google.com> Merge "stagefright: fix MediaCodecSource.pause() behavior" into nyc-dev
am: 7e258e8536

* commit '7e258e85368ccc8e714235a22206527090685a9b':
stagefright: fix MediaCodecSource.pause() behavior
6d6c21b8d2ed66007833dae0451b0a211c97e592 07-Mar-2016 Wonsik Kim <wonsik@google.com> stagefright: fix MediaCodecSource.pause() behavior

Don't signal EOS when the source is simply paused.

Bug: 27290834
Change-Id: Id8f0697a3761ae96bfa617fceb1c54558ab82090
ediaCodecSource.cpp
37ad16a6e4cbbb00c804da8833b3e832db7ff5eb 05-Mar-2016 Marco Nelissen <marcone@google.com> DO NOT MERGE Verify OMX buffer sizes prior to access am: f1a2668f4f am: 9222aaf44d
am: 94d23a9c88

* commit '94d23a9c883f592b173f6107ab0212dae20c09ec':
DO NOT MERGE Verify OMX buffer sizes prior to access
f0e76eb64b49f84a4b299ed0573144b9278bb92c 05-Mar-2016 Marco Nelissen <marcone@google.com> Merge "DO NOT MERGE Verify OMX buffer sizes prior to access" into klp-dev
am: d579ad0639

* commit 'd579ad0639c6df7f4648047992aaaf00f107799c':
DO NOT MERGE Verify OMX buffer sizes prior to access
94d23a9c883f592b173f6107ab0212dae20c09ec 05-Mar-2016 Marco Nelissen <marcone@google.com> DO NOT MERGE Verify OMX buffer sizes prior to access am: f1a2668f4f
am: 9222aaf44d

* commit '9222aaf44d79e501c513887f74979f16226b2fc7':
DO NOT MERGE Verify OMX buffer sizes prior to access
9222aaf44d79e501c513887f74979f16226b2fc7 05-Mar-2016 Marco Nelissen <marcone@google.com> DO NOT MERGE Verify OMX buffer sizes prior to access
am: f1a2668f4f

* commit 'f1a2668f4f09e38722424a6a74f0ea26f49e4110':
DO NOT MERGE Verify OMX buffer sizes prior to access
d579ad0639c6df7f4648047992aaaf00f107799c 05-Mar-2016 Marco Nelissen <marcone@google.com> Merge "DO NOT MERGE Verify OMX buffer sizes prior to access" into klp-dev
ae323d9aca09be01fc401a37953672a288790a16 04-Mar-2016 Ronghua Wu <ronghuawu@google.com> Merge "media: add hdr and color aspects metadata" into nyc-dev am: ccd783b48a
am: eb64ac64dc

* commit 'eb64ac64dc1f5987d9d47de7b35389b00a0aac96':
media: add hdr and color aspects metadata
eb64ac64dc1f5987d9d47de7b35389b00a0aac96 04-Mar-2016 Ronghua Wu <ronghuawu@google.com> Merge "media: add hdr and color aspects metadata" into nyc-dev
am: ccd783b48a

* commit 'ccd783b48ad50f8c1e90585a0d2278f9a1490de1':
media: add hdr and color aspects metadata
5fb742600236e0e6c0953eec0ad11c45cd00afc0 04-Mar-2016 Dimitry Ivanov <dimitry@google.com> Merge "Add missing liblog dependency" am: fedc6921db am: c25afe54c3
am: fc12f241ec

* commit 'fc12f241ecde66122ad16129aff8acb3e3898289':
Add missing liblog dependency
fc12f241ecde66122ad16129aff8acb3e3898289 04-Mar-2016 Dimitry Ivanov <dimitry@google.com> Merge "Add missing liblog dependency" am: fedc6921db
am: c25afe54c3

* commit 'c25afe54c3d04acb44aba3330043e39f087c2b0a':
Add missing liblog dependency
c25afe54c3d04acb44aba3330043e39f087c2b0a 04-Mar-2016 Dimitry Ivanov <dimitry@google.com> Merge "Add missing liblog dependency"
am: fedc6921db

* commit 'fedc6921dbd807e39c811b99466b875f909ad99e':
Add missing liblog dependency
fedc6921dbd807e39c811b99466b875f909ad99e 04-Mar-2016 Dimitry Ivanov <dimitry@google.com> Merge "Add missing liblog dependency"
afe8d851a19f10f86726591bb684ecb515ac6974 04-Mar-2016 Robert Shih <robertshih@google.com> stagefright: fix ABitReader integer over/underflow

Bug: 25856613
Change-Id: I2f3dbca218fbeb31b2dced97c85e763f68376eeb
oundation/ABitReader.cpp
423766ca07beb7e3e9cd301385708ca13fcce3e1 29-Feb-2016 Marco Nelissen <marcone@google.com> DO NOT MERGE Verify OMX buffer sizes prior to access

Bug: 27207275
Change-Id: I4412825d1ee233d993af0a67708bea54304ff62d
odecs/aacdec/SoftAAC2.cpp
odecs/aacenc/SoftAACEncoder.cpp
odecs/aacenc/SoftAACEncoder2.cpp
odecs/amrnb/dec/SoftAMR.cpp
odecs/amrnb/enc/SoftAMRNBEncoder.cpp
odecs/amrwbenc/SoftAMRWBEncoder.cpp
odecs/avc/enc/SoftAVCEncoder.cpp
odecs/flac/enc/SoftFlacEncoder.cpp
odecs/g711/dec/SoftG711.cpp
odecs/gsm/dec/SoftGSM.cpp
odecs/m4v_h263/enc/SoftMPEG4Encoder.cpp
odecs/mp3dec/SoftMP3.cpp
odecs/on2/enc/SoftVPXEncoder.cpp
odecs/raw/SoftRaw.cpp
odecs/vorbis/dec/SoftVorbis.cpp
nclude/SoftOMXComponent.h
mx/SimpleSoftOMXComponent.cpp
mx/SoftVideoDecoderOMXComponent.cpp
c95e06c2091525eb8c396e151da24adc5132341d 04-Mar-2016 Lajos Molnar <lajos@google.com> Merge "stagefright: pass color aspects into codecs" into nyc-dev am: 97d5e4eb77
am: 8e0858605b

* commit '8e0858605bacff4478a1afdf163f45498ca7dbf2':
stagefright: pass color aspects into codecs
51f59b41eae9c4f493ebfd0972cee951895bdf19 29-Feb-2016 Marco Nelissen <marcone@google.com> DO NOT MERGE Verify OMX buffer sizes prior to access

Bug: 27207275
Change-Id: I4412825d1ee233d993af0a67708bea54304ff62d
odecs/aacdec/SoftAAC2.cpp
odecs/aacenc/SoftAACEncoder.cpp
odecs/aacenc/SoftAACEncoder2.cpp
odecs/amrnb/dec/SoftAMR.cpp
odecs/amrnb/enc/SoftAMRNBEncoder.cpp
odecs/amrwbenc/SoftAMRWBEncoder.cpp
odecs/avc/enc/SoftAVCEncoder.cpp
odecs/flac/enc/SoftFlacEncoder.cpp
odecs/g711/dec/SoftG711.cpp
odecs/gsm/dec/SoftGSM.cpp
odecs/m4v_h263/enc/SoftMPEG4Encoder.cpp
odecs/mp3dec/SoftMP3.cpp
odecs/on2/enc/SoftVPXEncoder.cpp
odecs/raw/SoftRaw.cpp
odecs/vorbis/dec/SoftVorbis.cpp
nclude/SoftOMXComponent.h
mx/SimpleSoftOMXComponent.cpp
mx/SoftVideoDecoderOMXComponent.cpp
2afab54525bed658d1422cd339d6aa85af639305 03-Mar-2016 Marco Nelissen <marcone@google.com> resolve merge conflicts of f4fac7abff to master

Change-Id: I5159bef6c7853b7336c972308baced6cd8b03392
caaa15b1c8ca1632100cf8e64e82007239210339 26-Jan-2016 Ronghua Wu <ronghuawu@google.com> media: add hdr and color aspects metadata

Bug: 25684127
Change-Id: Idf5076a4d54bef0847523bf461e442f9e45b8f59
tils.cpp
8e0858605bacff4478a1afdf163f45498ca7dbf2 03-Mar-2016 Lajos Molnar <lajos@google.com> Merge "stagefright: pass color aspects into codecs" into nyc-dev
am: 97d5e4eb77

* commit '97d5e4eb77687288b463f300912f6eb5c2b5b60e':
stagefright: pass color aspects into codecs
f4fac7abff648b75310fd715576c161c2ae6525d 03-Mar-2016 Marco Nelissen <marcone@google.com> Merge "Verify OMX buffer sizes prior to access" into nyc-dev
am: f4cf8817de

* commit 'f4cf8817de14d2a14dbef3e6f319d65dbfba6e47':
Verify OMX buffer sizes prior to access
f1a2668f4f09e38722424a6a74f0ea26f49e4110 29-Feb-2016 Marco Nelissen <marcone@google.com> DO NOT MERGE Verify OMX buffer sizes prior to access

Bug: 27207275
Change-Id: I4412825d1ee233d993af0a67708bea54304ff62d
odecs/aacdec/SoftAAC2.cpp
odecs/aacenc/SoftAACEncoder.cpp
odecs/aacenc/SoftAACEncoder2.cpp
odecs/amrnb/dec/SoftAMR.cpp
odecs/amrnb/enc/SoftAMRNBEncoder.cpp
odecs/amrwbenc/SoftAMRWBEncoder.cpp
odecs/avc/enc/SoftAVCEncoder.cpp
odecs/avcenc/SoftAVCEnc.cpp
odecs/flac/enc/SoftFlacEncoder.cpp
odecs/g711/dec/SoftG711.cpp
odecs/gsm/dec/SoftGSM.cpp
odecs/m4v_h263/enc/SoftMPEG4Encoder.cpp
odecs/mp3dec/SoftMP3.cpp
odecs/on2/enc/SoftVPXEncoder.cpp
odecs/opus/dec/SoftOpus.cpp
odecs/raw/SoftRaw.cpp
odecs/vorbis/dec/SoftVorbis.cpp
nclude/SoftOMXComponent.h
mx/SimpleSoftOMXComponent.cpp
mx/SoftVideoDecoderOMXComponent.cpp
97d5e4eb77687288b463f300912f6eb5c2b5b60e 03-Mar-2016 Lajos Molnar <lajos@google.com> Merge "stagefright: pass color aspects into codecs" into nyc-dev
f4cf8817de14d2a14dbef3e6f319d65dbfba6e47 03-Mar-2016 Marco Nelissen <marcone@google.com> Merge "Verify OMX buffer sizes prior to access" into nyc-dev
8338519ba2d8d731072c4edf7b9953787ce834cf 26-Feb-2016 Lajos Molnar <lajos@google.com> stagefright: pass color aspects into codecs

Bug: 25975353
Change-Id: Ie2cdb845769f5ec3561a099f96e8f4dd406299ef
Codec.cpp
odecBase.cpp
2b79658dd13cb988771e45263b0ea4929e974a1d 03-Mar-2016 Eino-Ville Talvala <etalvala@google.com> resolve merge conflicts of 6e0c00ba53 to nyc-dev-plus-aosp
am: 0492686c47

* commit '0492686c4703b3ddbff52d047ef226b973a3388a':
Camera: Clean up warnings and set -Werror
Camera: Switch camera2 to auto-gen C++ binder interfaces
1547303acea4431bddc1e0496ec5558ce446f437 03-Mar-2016 George Burgess <gbiv@google.com> Merge "Cleanup uses of sprintf so we can deprecate it."
0492686c4703b3ddbff52d047ef226b973a3388a 03-Mar-2016 Eino-Ville Talvala <etalvala@google.com> resolve merge conflicts of 6e0c00ba53 to nyc-dev-plus-aosp

Change-Id: I123a42e8cd1439177ea75a3c0aba7dca0b2f31fe
2c9cb62d0160fc4353d89fd9d648725794e7995e 29-Feb-2016 George Burgess IV <gbiv@google.com> Cleanup uses of sprintf so we can deprecate it.

Also removes a seemingly useless branch.

Change-Id: Icd61d4facd64985f4c73e9876569e1ae1a74ee83
oundation/ALooperRoster.cpp
oundation/hexdump.cpp
d3/ID3.cpp
mx/OMXMaster.cpp
tsp/ASessionDescription.cpp
6e0c00ba53d8e5ad14d9e447c3c040ce6fd81a47 02-Mar-2016 Eino-Ville Talvala <etalvala@google.com> Merge changes from topic 'camera-native-aidl' into nyc-dev

* changes:
Camera: Clean up warnings and set -Werror
Camera: Switch camera2 to auto-gen C++ binder interfaces
a88c8730b8e4add77b729e00eae0299d16c8447f 02-Mar-2016 Chien-Yu Chen <cychen@google.com> Merge "CameraSource: Fix time lapse video recording" into nyc-dev am: 7eb42678f6
am: c3aef0156a

* commit 'c3aef0156a1d52315098de7fb2e311f50b16970e':
CameraSource: Fix time lapse video recording
c3aef0156a1d52315098de7fb2e311f50b16970e 02-Mar-2016 Chien-Yu Chen <cychen@google.com> Merge "CameraSource: Fix time lapse video recording" into nyc-dev
am: 7eb42678f6

* commit '7eb42678f6f7fa3f6f0b530144eced69c98069fe':
CameraSource: Fix time lapse video recording
7eb42678f6f7fa3f6f0b530144eced69c98069fe 02-Mar-2016 Chien-Yu Chen <cychen@google.com> Merge "CameraSource: Fix time lapse video recording" into nyc-dev
d56db1d2bee182d1851097a9c712712fc094d117 18-Dec-2015 Eino-Ville Talvala <etalvala@google.com> Camera: Switch camera2 to auto-gen C++ binder interfaces

- Move camera service AIDL files to frameworks/av
- Build C++ interface stubs with AIDL tools
- Add necessary native-side parcelables and update existing ones
- Remove manually-written stubs, rearrange remaining manual stubs
- Adjust implementations to work with auto-generated stubs
- Adjust method signatures for auto-gen differences
- Add rich error messages using binder::Status

Bug: 25091611
Change-Id: I6f69f34b9d1a3f8d1fb7db87357363f8fa8483ff
ameraSource.cpp
ameraSourceTimeLapse.cpp
2720c8b094cfa58de314daa8e5e4fb4fa81fe3b2 29-Feb-2016 Marco Nelissen <marcone@google.com> Verify OMX buffer sizes prior to access

Bug: 27207275
Change-Id: I4412825d1ee233d993af0a67708bea54304ff62d
odecs/aacdec/SoftAAC2.cpp
odecs/aacenc/SoftAACEncoder.cpp
odecs/aacenc/SoftAACEncoder2.cpp
odecs/amrnb/dec/SoftAMR.cpp
odecs/amrnb/enc/SoftAMRNBEncoder.cpp
odecs/amrwbenc/SoftAMRWBEncoder.cpp
odecs/avc/enc/SoftAVCEncoder.cpp
odecs/avcdec/SoftAVCDec.cpp
odecs/avcenc/SoftAVCEnc.cpp
odecs/flac/enc/SoftFlacEncoder.cpp
odecs/g711/dec/SoftG711.cpp
odecs/gsm/dec/SoftGSM.cpp
odecs/hevcdec/SoftHEVC.cpp
odecs/m4v_h263/enc/SoftMPEG4Encoder.cpp
odecs/mp3dec/SoftMP3.cpp
odecs/on2/enc/SoftVPXEncoder.cpp
odecs/opus/dec/SoftOpus.cpp
odecs/raw/SoftRaw.cpp
odecs/vorbis/dec/SoftVorbis.cpp
nclude/SoftOMXComponent.h
mx/SimpleSoftOMXComponent.cpp
mx/SoftVideoDecoderOMXComponent.cpp
7e1375fea2b436dfc6b92531af79b839860f0c23 02-Mar-2016 Chien-Yu Chen <cychen@google.com> Merge "CameraSource: Wait before dropping a frame" into nyc-dev am: 9670850d01
am: bdf926c80f

* commit 'bdf926c80fdef661f29a616535df25967c4125ed':
CameraSource: Wait before dropping a frame
970a0d9887456988966693abf2025ea8e14de136 02-Mar-2016 Andy Hung <hunga@google.com> Merge "Support 32 bit WAV formats" into nyc-dev am: 2af5b1d81b
am: 26ac45e9d5

* commit '26ac45e9d5ed503cfa9dcd877d4a6420798f7ca0':
Support 32 bit WAV formats
bdf926c80fdef661f29a616535df25967c4125ed 02-Mar-2016 Chien-Yu Chen <cychen@google.com> Merge "CameraSource: Wait before dropping a frame" into nyc-dev
am: 9670850d01

* commit '9670850d0178ced404cca2c101708d7c5876bc6d':
CameraSource: Wait before dropping a frame
26ac45e9d5ed503cfa9dcd877d4a6420798f7ca0 02-Mar-2016 Andy Hung <hunga@google.com> Merge "Support 32 bit WAV formats" into nyc-dev
am: 2af5b1d81b

* commit '2af5b1d81b3e796d40aebd0ca3bedee19812299d':
Support 32 bit WAV formats
8fc3c670fff26cb21d1e16dbfcbc4410d7758574 01-Mar-2016 Chien-Yu Chen <cychen@google.com> CameraSource: Fix time lapse video recording

Add processBufferQueueFrame() to CameraSourceTimeLapse so it
can decide whether to skip current frame and change the timestamps.

Bug: 26525150
Change-Id: If499cba62c6569a72bb271d3e0b4c38862650f1a
ameraSource.cpp
ameraSourceTimeLapse.cpp
9670850d0178ced404cca2c101708d7c5876bc6d 01-Mar-2016 Chien-Yu Chen <cychen@google.com> Merge "CameraSource: Wait before dropping a frame" into nyc-dev
2af5b1d81b3e796d40aebd0ca3bedee19812299d 01-Mar-2016 Andy Hung <hunga@google.com> Merge "Support 32 bit WAV formats" into nyc-dev
0419ba7b1c1bd4f19b2fab06234eacb4547a7c04 24-Feb-2016 Chien-Yu Chen <cychen@google.com> CameraSource: Wait before dropping a frame

If there is no available memory base to send a frame, wait until
a memory base becomes available or the wait times out before
dropping a frame.

Bug: 26525150
Change-Id: Ifd8703abceee89a556adda182a0ca4eda91782fc
ameraSource.cpp
cd22ee6aa5a3ce57530f54b60347d655afc87045 01-Mar-2016 Hangyu Kuang <hkuang@google.com> Merge "stagefright: Add warning log in MPEG4Writer." into nyc-dev am: ddfef426b5
am: 1d633e3929

* commit '1d633e39295b2feae447841a934a75b994fd8668':
stagefright: Add warning log in MPEG4Writer.
1d633e39295b2feae447841a934a75b994fd8668 01-Mar-2016 Hangyu Kuang <hkuang@google.com> Merge "stagefright: Add warning log in MPEG4Writer." into nyc-dev
am: ddfef426b5

* commit 'ddfef426b54153f04150596619cf9f1ad88afe9c':
stagefright: Add warning log in MPEG4Writer.
ddfef426b54153f04150596619cf9f1ad88afe9c 01-Mar-2016 Hangyu Kuang <hkuang@google.com> Merge "stagefright: Add warning log in MPEG4Writer." into nyc-dev
27fbeb1385059823ef7f3a8120c66578e22f1532 01-Mar-2016 Jeff Tinker <jtinker@google.com> Merge "Fix alternative signaling for native handles" into nyc-dev am: 4e82dc4004
am: 9fc2cb5937

* commit '9fc2cb5937728373375950255a00f0b6e91fa86b':
Fix alternative signaling for native handles
9fc2cb5937728373375950255a00f0b6e91fa86b 01-Mar-2016 Jeff Tinker <jtinker@google.com> Merge "Fix alternative signaling for native handles" into nyc-dev
am: 4e82dc4004

* commit '4e82dc4004ed361057d418c08e2b3b698a75e261':
Fix alternative signaling for native handles
4e82dc4004ed361057d418c08e2b3b698a75e261 01-Mar-2016 Jeff Tinker <jtinker@google.com> Merge "Fix alternative signaling for native handles" into nyc-dev
643787b2d4bf14b497c2858e97154c21cd56f3fd 01-Mar-2016 Lajos Molnar <lajos@google.com> Merge "stagefright: use MediaImage2" into nyc-dev am: 1c0de60e80
am: 112619b08c

* commit '112619b08cb7adb80fd163aafaf99a12c58502d9':
stagefright: use MediaImage2
112619b08cb7adb80fd163aafaf99a12c58502d9 01-Mar-2016 Lajos Molnar <lajos@google.com> Merge "stagefright: use MediaImage2" into nyc-dev
am: 1c0de60e80

* commit '1c0de60e809c116fb8cb0eded39270c6eb060a3b':
stagefright: use MediaImage2
1c0de60e809c116fb8cb0eded39270c6eb060a3b 01-Mar-2016 Lajos Molnar <lajos@google.com> Merge "stagefright: use MediaImage2" into nyc-dev
75e6e22434d6fb3021738dcef644109374e75643 27-Feb-2016 Andy Hung <hunga@google.com> Support 32 bit WAV formats

Fix format checking.

Bug: 8722713
Change-Id: Id0dfd725bb4e455ae34b1d68e81b4d70738408ea
ndroid.mk
AVExtractor.cpp
316d08c1f115499fb0ccd82d22592bed7e54aad7 29-Feb-2016 Hangyu Kuang <hkuang@google.com> stagefright: Add warning log in MPEG4Writer.

This will greatly help debug the problem when MPEG4Writer exit silently.

Bug: 26525150
Change-Id: Id1e356277fdbbf009d5020b29117a5472a7e0ae4
PEG4Writer.cpp
592915af1e398e8d7a9d4632e59a8377420c9b58 29-Feb-2016 Marco Nelissen <marcone@google.com> Merge "media.extractor dumpsys to show recent extractors" into nyc-dev am: e385a78e97
am: 0cfae5863b

* commit '0cfae5863be38dec0247b3f8b88e6c5914dcb6bb':
media.extractor dumpsys to show recent extractors
0cfae5863be38dec0247b3f8b88e6c5914dcb6bb 29-Feb-2016 Marco Nelissen <marcone@google.com> Merge "media.extractor dumpsys to show recent extractors" into nyc-dev
am: e385a78e97

* commit 'e385a78e97c55d2298c867335264736c8ef366ed':
media.extractor dumpsys to show recent extractors
e385a78e97c55d2298c867335264736c8ef366ed 29-Feb-2016 Marco Nelissen <marcone@google.com> Merge "media.extractor dumpsys to show recent extractors" into nyc-dev
a48a51c056198a778755cbed52884dc30b74ac0a 25-Feb-2016 Marco Nelissen <marcone@google.com> media.extractor dumpsys to show recent extractors

Bug: 22775369
Change-Id: Ie68484985567896a00d5c193d1853a8f2e3b3964
nclude/AACExtractor.h
nclude/AMRExtractor.h
nclude/AVIExtractor.h
nclude/DRMExtractor.h
nclude/FLACExtractor.h
nclude/MPEG2PSExtractor.h
nclude/MPEG2TSExtractor.h
nclude/MPEG4Extractor.h
nclude/MidiExtractor.h
atroska/MatroskaExtractor.h
4f61e52d32f05db3cb04a0e29f9a2507ceffaf99 16-Feb-2016 Vignesh Venkatasubramanian <vigneshv@google.com> libstagefright: Refactor vp8 specific settings

Move some more VP8 specific settings and parameters from SoftVPXEncoder
to SoftVP8Encoder.

Change-Id: I480316ee01ce1ac38120b407bc029737db591cc5
odecs/on2/enc/SoftVP8Encoder.cpp
odecs/on2/enc/SoftVP8Encoder.h
odecs/on2/enc/SoftVPXEncoder.cpp
odecs/on2/enc/SoftVPXEncoder.h
a94c49819fd1513f1d60dbfb433017ca64bbd7db 26-Feb-2016 Jeff Tinker <jtinker@google.com> Fix alternative signaling for native handles

bug: 27371660
Change-Id: Icbf64c99cad524c080859c1b4ee031af97880568
mx/OMXNodeInstance.cpp
b2396a3991f726f96499ff479737ad7f51f21b86 26-Feb-2016 Doney Alex <doney.alex@ittiam.com> Merge "SoftAvcEnc: Added support for Constrained intra prediction." am: f125dacbe5 am: 4a18e69c8d
am: a151bf331e

* commit 'a151bf331e801bba1d0a2c99d53b24584f0c4507':
SoftAvcEnc: Added support for Constrained intra prediction.
a151bf331e801bba1d0a2c99d53b24584f0c4507 26-Feb-2016 Doney Alex <doney.alex@ittiam.com> Merge "SoftAvcEnc: Added support for Constrained intra prediction." am: f125dacbe5
am: 4a18e69c8d

* commit '4a18e69c8dc8d25327c2580aded543c52ee96559':
SoftAvcEnc: Added support for Constrained intra prediction.
4a18e69c8dc8d25327c2580aded543c52ee96559 26-Feb-2016 Doney Alex <doney.alex@ittiam.com> Merge "SoftAvcEnc: Added support for Constrained intra prediction."
am: f125dacbe5

* commit 'f125dacbe505f97f4d8e051ecac49c571750dc95':
SoftAvcEnc: Added support for Constrained intra prediction.
f125dacbe505f97f4d8e051ecac49c571750dc95 26-Feb-2016 Hangyu Kuang <hkuang@google.com> Merge "SoftAvcEnc: Added support for Constrained intra prediction."
cf01363c1656d63efa3aa45b4e818b71bf5a67c9 26-Feb-2016 Lajos Molnar <lajos@google.com> Merge "stagefright: propagate nativeHandle properly for secure playback" into nyc-dev am: ecc8bbbf8a
am: ca5b28b8dc

* commit 'ca5b28b8dc66a872065f9a7bc2db33e7056708ab':
stagefright: propagate nativeHandle properly for secure playback
c6e96a912c2cdedf853e3bd7b68c953fa818ff40 26-Feb-2016 Lajos Molnar <lajos@google.com> stagefright: propagate nativeHandle properly for secure playback

- fix prototype constness (so ACodec can pass handle to client)
- fix handle passing to decrypt

Bug: 26782004
Change-Id: Ia2f85ded66fbb459a9db8096eb5b9e34ef45ce16
ediaCodec.cpp
ab0bd5d96290b55217f31d8fb885bbff257f81d8 25-Feb-2016 Robert Shih <robertshih@google.com> Merge "Miscellaneous RTSP improvements" into nyc-dev am: f013dc41d9
am: 276baf0a4d

* commit '276baf0a4d69d5bd7b48f83ad5d3537a190ece62':
Miscellaneous RTSP improvements
f013dc41d9ac1e295c91594e6f2ebc1455af5f41 25-Feb-2016 Robert Shih <robertshih@google.com> Merge "Miscellaneous RTSP improvements" into nyc-dev
641e0c718da1c58e5b89379f60465c4e564ebb73 22-Feb-2016 Robert Shih <robertshih@google.com> Miscellaneous RTSP improvements

1. Server side management based on buffer monitoring
2. Notify prepared after more buffering
3. Drop stale access units after seek

Bug: 27292698
Change-Id: Ic41686bb3514eb1d4c206bb155d45f34b6350810
tsp/MyHandler.h
73dd808754c641fe798273d356ee38368715fa7b 25-Feb-2016 Lajos Molnar <lajos@google.com> stagefright: use MediaImage2

Bug: 25684127
Change-Id: I2f8b672a191ee4e60c9364e826cae34089ef5f9c
Codec.cpp
nclude/OMXNodeInstance.h
mx/Android.mk
mx/OMX.cpp
mx/OMXNodeInstance.cpp
mx/OMXUtils.cpp
mx/OMXUtils.h
b9a479649a0b51cfcbfcbc2b8f4190749fcebb1e 25-Feb-2016 Marco Nelissen <marcone@google.com> Merge "Also fix out of bounds access for normal read" into klp-dev am: dc17049b02 am: fc4f739667 am: 2bb66e2541 am: 5371723cf3 am: 9f31a89385 am: 037bdfc7e4 am: 1a9b5e0fa3 am: 3c69e8d5fd am: 8aa22eeac9 am: 23020eade4 am: 9d537cb793 am: 57374fb97b
am: 3e843d25b3

* commit '3e843d25b3b33b1627f5d980bb0fb80c2686483e':
Also fix out of bounds access for normal read
57374fb97bbdfcfab19d3b6ded4a9e5f69a709b8 24-Feb-2016 Marco Nelissen <marcone@google.com> Merge "Also fix out of bounds access for normal read" into klp-dev am: dc17049b02 am: fc4f739667 am: 2bb66e2541 am: 5371723cf3 am: 9f31a89385 am: 037bdfc7e4 am: 1a9b5e0fa3 am: 3c69e8d5fd am: 8aa22eeac9 am: 23020eade4
am: 9d537cb793

* commit '9d537cb7933729b9114e5bc394d6ab35f906b20c':
Also fix out of bounds access for normal read
9d537cb7933729b9114e5bc394d6ab35f906b20c 24-Feb-2016 Marco Nelissen <marcone@google.com> Merge "Also fix out of bounds access for normal read" into klp-dev am: dc17049b02 am: fc4f739667 am: 2bb66e2541 am: 5371723cf3 am: 9f31a89385 am: 037bdfc7e4 am: 1a9b5e0fa3 am: 3c69e8d5fd am: 8aa22eeac9
am: 23020eade4

* commit '23020eade458001f2a5b25e04852d86d4f8dde9e':
Also fix out of bounds access for normal read
23020eade458001f2a5b25e04852d86d4f8dde9e 24-Feb-2016 Marco Nelissen <marcone@google.com> Merge "Also fix out of bounds access for normal read" into klp-dev am: dc17049b02 am: fc4f739667 am: 2bb66e2541 am: 5371723cf3 am: 9f31a89385 am: 037bdfc7e4 am: 1a9b5e0fa3 am: 3c69e8d5fd
am: 8aa22eeac9

* commit '8aa22eeac9972de855d9b7b64bd9fb0eece0aaeb':
Also fix out of bounds access for normal read
8aa22eeac9972de855d9b7b64bd9fb0eece0aaeb 24-Feb-2016 Marco Nelissen <marcone@google.com> Merge "Also fix out of bounds access for normal read" into klp-dev am: dc17049b02 am: fc4f739667 am: 2bb66e2541 am: 5371723cf3 am: 9f31a89385 am: 037bdfc7e4 am: 1a9b5e0fa3
am: 3c69e8d5fd

* commit '3c69e8d5fdddff1230938f7051caf88ae0944999':
Also fix out of bounds access for normal read
3c69e8d5fdddff1230938f7051caf88ae0944999 24-Feb-2016 Marco Nelissen <marcone@google.com> Merge "Also fix out of bounds access for normal read" into klp-dev am: dc17049b02 am: fc4f739667 am: 2bb66e2541 am: 5371723cf3 am: 9f31a89385 am: 037bdfc7e4
am: 1a9b5e0fa3

* commit '1a9b5e0fa3518a00102dac5893e6c479b87bbb36':
Also fix out of bounds access for normal read
1a9b5e0fa3518a00102dac5893e6c479b87bbb36 24-Feb-2016 Marco Nelissen <marcone@google.com> Merge "Also fix out of bounds access for normal read" into klp-dev am: dc17049b02 am: fc4f739667 am: 2bb66e2541 am: 5371723cf3 am: 9f31a89385
am: 037bdfc7e4

* commit '037bdfc7e4bf5ec10e251b6ae6d2b07542291248':
Also fix out of bounds access for normal read
9f31a89385897b1477ede926e858423e7e13d149 24-Feb-2016 Marco Nelissen <marcone@google.com> Merge "Also fix out of bounds access for normal read" into klp-dev am: dc17049b02 am: fc4f739667 am: 2bb66e2541
am: 5371723cf3

* commit '5371723cf39d62c1b7a99054ccb3ab8721e372cd':
Also fix out of bounds access for normal read
2bb66e254111abf2e8e462a44bc2deb2508207ba 24-Feb-2016 Marco Nelissen <marcone@google.com> Merge "Also fix out of bounds access for normal read" into klp-dev am: dc17049b02
am: fc4f739667

* commit 'fc4f739667f3eaa06f28a883f72a798db3e98027':
Also fix out of bounds access for normal read
fc4f739667f3eaa06f28a883f72a798db3e98027 24-Feb-2016 Marco Nelissen <marcone@google.com> Merge "Also fix out of bounds access for normal read" into klp-dev
am: dc17049b02

* commit 'dc17049b0294dd6b0b2156783d83333cca37fc4b':
Also fix out of bounds access for normal read
0bd7c01a505359bab21712f88aa113e4f1330aa9 24-Feb-2016 Hangyu Kuang <hkuang@google.com> Merge "stagefright: MPEG4Writer stops the source before exiting the thread." into nyc-dev am: 040546bdfa
am: b9c17fcff7

* commit 'b9c17fcff7b14b2c20bd368dcd15c30986b08a90':
stagefright: MPEG4Writer stops the source before exiting the thread.
040546bdfaf33e76dce35f77e814824ff88b0909 24-Feb-2016 Hangyu Kuang <hkuang@google.com> Merge "stagefright: MPEG4Writer stops the source before exiting the thread." into nyc-dev
9795eb9180e2dfea9400fbb71394f1c000c0413e 24-Feb-2016 Marco Nelissen <marcone@google.com> Merge "Always treat composition time offsets as signed" into nyc-dev am: f967be0330
am: 021287f18f

* commit '021287f18f36ff135701ae09145824e2524c97dd':
Always treat composition time offsets as signed
f967be033092c68fa611bff6803f32fc46d9ea8a 24-Feb-2016 Marco Nelissen <marcone@google.com> Merge "Always treat composition time offsets as signed" into nyc-dev
e239dc16d5dd5a977908a96b363dd2279b6db969 24-Feb-2016 Doney Alex <doney.alex@ittiam.com> SoftAvcEnc: Added support for Constrained intra prediction.

Change-Id: I1a3e8fbad0bea728311c2b4b0513c9565ecf9a14
odecs/avcenc/SoftAVCEnc.cpp
odecs/avcenc/SoftAVCEnc.h
87afa840a40af570278e93251cfc5e55a6a3d92e 23-Feb-2016 Marco Nelissen <marcone@google.com> Also fix out of bounds access for normal read

Previous fix accidentally only fixed the fragmented read case.

Bug: 27208621
Change-Id: Ie16f1920b84c8aba613842659238fcd5925694ad
PEG4Extractor.cpp
2d758217fd8cd582a5f66b45ea63f0bae63cb688 23-Feb-2016 Max Spector <mspector@google.com> Merge "Revert "Fixing safteynet logging bug from ag/862848 - DO NOT MERGE"" into mnc-dev am: 957c386860 am: 00ff259b1a
am: 1f9691a159

* commit '1f9691a1590790f89022f4bb92dee28c2c1ff9ac':
Revert "Fixing safteynet logging bug from ag/862848 - DO NOT MERGE"
1f9691a1590790f89022f4bb92dee28c2c1ff9ac 23-Feb-2016 Max Spector <mspector@google.com> Merge "Revert "Fixing safteynet logging bug from ag/862848 - DO NOT MERGE"" into mnc-dev am: 957c386860
am: 00ff259b1a

* commit '00ff259b1ac53d39cd46846b06532781b1ed95bd':
Revert "Fixing safteynet logging bug from ag/862848 - DO NOT MERGE"
00ff259b1ac53d39cd46846b06532781b1ed95bd 23-Feb-2016 Max Spector <mspector@google.com> Merge "Revert "Fixing safteynet logging bug from ag/862848 - DO NOT MERGE"" into mnc-dev
am: 957c386860

* commit '957c386860aa8af0505c67b2dcbd3fe371abb7eb':
Revert "Fixing safteynet logging bug from ag/862848 - DO NOT MERGE"
0332fadec6e91c37fe39ab92b2c02922370bc853 23-Feb-2016 Hangyu Kuang <hkuang@google.com> stagefright: MPEG4Writer stops the source before exiting the thread.

While pushBuffer is waiting for a condition that need to be signaled by the
writer thread, it is possible that the writer thread has already exited due to
error that happend during processing previous buffer. In this case, the muxer
thread will hang over this function.
So the writer thread needs to stop the source from feeding more buffer to it.

Bug: 26928205
Change-Id: Ifd35c29176fb817ed0f718f8f60a03bef6dea7ce
PEG4Writer.cpp
22cc29a7fd4f8ae4cf2fdc82febaaedb523cb915 23-Feb-2016 Max Spector <mspector@google.com> Revert "Fixing safteynet logging bug from ag/862848 - DO NOT MERGE"

This reverts commit, useless safteynet log, this will NPD first
b3cc78f9c48d85a5580ba69539120fd7b1150e9c.

Change-Id: I8264500d3c4631e01aa6ed2629f3f4d9b409ce6f
mx/OMX.cpp
987d80fc3db1125ed99c79c46ab4342842e8a87f 23-Feb-2016 Ronghua Wu <ronghuawu@google.com> Merge "mediaresourcemanager: verify the input calling pid" into nyc-dev am: eafe1f9734
am: d7a0d6f15a

* commit 'd7a0d6f15aa459e858b181ea26d011b92a827f66':
mediaresourcemanager: verify the input calling pid
eafe1f9734af31730790b0abaf8c6aae01bfee77 23-Feb-2016 Ronghua Wu <ronghuawu@google.com> Merge "mediaresourcemanager: verify the input calling pid" into nyc-dev
c7fd1d9fbccd8b3c372ef796e9f72a9264f56387 23-Feb-2016 Max Spector <mspector@google.com> Merge "Fixing safteynet logging bug introduced in ag/862848" into mnc-dev am: 93edd483f6 am: 032fcf3034 am: c802d2091a am: 81b6cc61f0 am: 1c9ba65e44
am: 6bb8e4c85b

* commit '6bb8e4c85b7e51a885dc90e0be5c4caadb51d7f5':
Fixing safteynet logging bug introduced in ag/862848
1c9ba65e447104bfcdbe0cb16a9f3cc5bad2da39 23-Feb-2016 Max Spector <mspector@google.com> Merge "Fixing safteynet logging bug introduced in ag/862848" into mnc-dev am: 93edd483f6 am: 032fcf3034 am: c802d2091a
am: 81b6cc61f0

* commit '81b6cc61f0bef255f725ec9e56659d1caba227c2':
Fixing safteynet logging bug introduced in ag/862848
571c285ca6d81f28c4423cddf5f334e5ef9711d1 23-Feb-2016 Max Spector <mspector@google.com> Merge "Fixing safteynet logging bug from ag/862848 - DO NOT MERGE" into mnc-dev am: 49c04280f2 am: 97f1356544
am: 89896480e0

* commit '89896480e0d69d5f564b208da1d4845ef4cbb730':
Fixing safteynet logging bug from ag/862848 - DO NOT MERGE
81b6cc61f0bef255f725ec9e56659d1caba227c2 23-Feb-2016 Max Spector <mspector@google.com> Merge "Fixing safteynet logging bug introduced in ag/862848" into mnc-dev am: 93edd483f6 am: 032fcf3034
am: c802d2091a

* commit 'c802d2091a5efb6dfbe6cd7867e08e2e3b8eed61':
Fixing safteynet logging bug introduced in ag/862848
89896480e0d69d5f564b208da1d4845ef4cbb730 23-Feb-2016 Max Spector <mspector@google.com> Merge "Fixing safteynet logging bug from ag/862848 - DO NOT MERGE" into mnc-dev am: 49c04280f2
am: 97f1356544

* commit '97f1356544f32cc8c5fc2b778b8e1aab11b13a6c':
Fixing safteynet logging bug from ag/862848 - DO NOT MERGE
c802d2091a5efb6dfbe6cd7867e08e2e3b8eed61 23-Feb-2016 Max Spector <mspector@google.com> Merge "Fixing safteynet logging bug introduced in ag/862848" into mnc-dev am: 93edd483f6
am: 032fcf3034

* commit '032fcf3034b79ea2a221d73c9f01202a4a709273':
Fixing safteynet logging bug introduced in ag/862848
97f1356544f32cc8c5fc2b778b8e1aab11b13a6c 23-Feb-2016 Max Spector <mspector@google.com> Merge "Fixing safteynet logging bug from ag/862848 - DO NOT MERGE" into mnc-dev
am: 49c04280f2

* commit '49c04280f24b17e7493a357089587add5046b573':
Fixing safteynet logging bug from ag/862848 - DO NOT MERGE
032fcf3034b79ea2a221d73c9f01202a4a709273 23-Feb-2016 Max Spector <mspector@google.com> Merge "Fixing safteynet logging bug introduced in ag/862848" into mnc-dev
am: 93edd483f6

* commit '93edd483f645fe30cc508ade82ea1ffe60e74cbb':
Fixing safteynet logging bug introduced in ag/862848
dc23697d8df1edb51ccd2ed99c6359c87c8cff12 23-Feb-2016 Lajos Molnar <lajos@google.com> Merge "stagefright: MediaCodecSource: wait till upstream source stops on stop" into nyc-dev am: 0d0a9e2f9f
am: dd00377282

* commit 'dd00377282313e756aab5f9f2db0472600caa80a':
stagefright: MediaCodecSource: wait till upstream source stops on stop
72e9ab92e0dbee8d19ae2ec92ecd0a172b231b44 23-Feb-2016 Lajos Molnar <lajos@google.com> stagefright: MediaCodecSource: wait till upstream source stops on stop

Bug: 27221797
Change-Id: I906a37f5072b1a885fc475132d641c9444290c45
ediaCodecSource.cpp
39dfe702f15b053704341b10fdedcd1d2327f109 23-Feb-2016 Marco Nelissen <marcone@google.com> Merge "Move (some) codecs into the codec process" into nyc-dev am: 012883fdf6
am: e71d95d3c8

* commit 'e71d95d3c8c609a83c328964ca0193ded2932f76':
Move (some) codecs into the codec process
012883fdf691b1e9dcaf769b8dfe948af1b12a38 23-Feb-2016 Marco Nelissen <marcone@google.com> Merge "Move (some) codecs into the codec process" into nyc-dev
4bcd3f51058c5032fdbf87a56566199c15d61087 13-Feb-2016 Dimitry Ivanov <dimitry@google.com> Add missing liblog dependency

Bug: http://b/27171986
Change-Id: Iedc22252183269e36f2f01570c5fa37bf1099f90
ttplive/Android.mk
b3cc78f9c48d85a5580ba69539120fd7b1150e9c 20-Feb-2016 mspector@google.com <mspector@google.com> Fixing safteynet logging bug from ag/862848 - DO NOT MERGE

We moved the safteynet logging into OMX::storeMetaDataInBuffers
Bug: 26324358

Change-Id: Ia622cbe8f7b0009b7fa55517f7424ecfb82a51c0
mx/OMX.cpp
d11c43a12917e017d715db88c13e4e7550eb9151 28-Jan-2016 Ronghua Wu <ronghuawu@google.com> mediaresourcemanager: verify the input calling pid

Bug: 26830615
Change-Id: I2e9c579b3bdd86a90b08fa161206d32527390bb5
rocessInfo.cpp
1a19076c36cbe76a537b5742e96747135b4f0d46 19-Feb-2016 mspector@google.com <mspector@google.com> Fixing safteynet logging bug introduced in ag/862848

We moved the safteynet logging into storeMetaDataInBuffers_l
Bug: 26324358
Change-Id: I2171742b53192ebb71d546bcb8970bb3c68f366f
mx/OMXNodeInstance.cpp
b1dc9e07c084d0df17de71b54f8340c0b8917824 17-Feb-2016 Marco Nelissen <marcone@google.com> Always treat composition time offsets as signed

even for version 0 ctts atoms that technically should contain only
unsigned values.

Bug: 27174229
Change-Id: I7309222f5fe646c25c45ff5351bfc310759ef542
ampleIterator.cpp
ampleTable.cpp
nclude/SampleTable.h
57c95251be487316fb698b77e2a592bacb448c0c 19-Feb-2016 Wei Jia <wjia@google.com> Merge "IMediaSource: use shared memory to transfer large buffer." into nyc-dev am: 56d65dc0b4
am: 8f441a4587

* commit '8f441a458719bc2637a9776ae2f3594c449f8daf':
IMediaSource: use shared memory to transfer large buffer.
e9a5b96e7927fd4e38623e17ac73e8e4e25877ee 12-Feb-2016 Wei Jia <wjia@google.com> IMediaSource: use shared memory to transfer large buffer.

Also move MediaBufferGroup to libstagefright/foundation/.

Bug: 26295488
Change-Id: I88f4e6bf83ffb2b196628a2d4d83ea7b1f6ad9c2
ndroid.mk
ediaBufferGroup.cpp
oundation/Android.mk
oundation/MediaBuffer.cpp
oundation/MediaBufferGroup.cpp
23858874bbce68fb5ac83250087fa7788c97dd12 17-Feb-2016 Marco Nelissen <marcone@google.com> Move (some) codecs into the codec process

Encoders and secure decoders still run in the mediaserver, while
all other codecs run in a separate codec process.

Bug: 22775369

Change-Id: Ie2ac87d53edbcf7c8f46a68a15857c9940f6d00d
Codec.cpp
MXClient.cpp
nclude/OMX.h
mx/OMX.cpp
mx/tests/OMXHarness.cpp
55363176be0ad1fe75d97276547929b4ca971f56 17-Feb-2016 Bill Yi <byi@google.com> Merge commit '813ac23bee5b3519c2b7f410a2b24b3a94075b22' into HEAD
d7c1329ed66a4b09eb604fffdc23db8893d0b4e2 17-Feb-2016 Jeff Tinker <jtinker@google.com> stagefright: ICrypto: enable passing secure buffers in native_handle am: 9ac86b3cae
am: b0b3aef485

* commit 'b0b3aef485c0f83028e09c91ccb0a79366f04013':
stagefright: ICrypto: enable passing secure buffers in native_handle
56d5460dc022848b789899bbc5a13cccf52cfcc1 17-Feb-2016 Lajos Molnar <lajos@google.com> stagefright: allow system property to signal native handle use am: aef47bf801
am: 36516754e7

* commit '36516754e7bae0cdd42ed6a8b8185d9623849181':
stagefright: allow system property to signal native handle use
9ac86b3cae9a1e14b12bf97223ddde96142aae43 24-Jan-2016 Jeff Tinker <jtinker@google.com> stagefright: ICrypto: enable passing secure buffers in native_handle

Previously secure buffers were passed as opaque
void * values, which no longer works since
mediadrmserver is now a separate process from
mediaserver.

Bug: 22990512
Change-Id: I5c458ba19e78e20d1bd5a5899df0bce16f71bfd8
ediaCodec.cpp
aef47bf801dcbcb88cec8426c03237c6313da1c2 13-Feb-2016 Lajos Molnar <lajos@google.com> stagefright: allow system property to signal native handle use

Bug: 26782004
Change-Id: I0ca38c25e2886ff260aec441e1d49048c38ff47c
mx/OMXNodeInstance.cpp
fb1c9848e359afe38c3cbed85829abc6749d92d5 17-Feb-2016 Lajos Molnar <lajos@google.com> stagefright: enable native handles for secure buffers am: a63141af8f
am: abc2cb6b72

* commit 'abc2cb6b7242d197c71530f98a1e22718f48aa7b':
stagefright: enable native handles for secure buffers
a63141af8f036bda0b8f7800107ca8a0e0623135 12-Feb-2016 Lajos Molnar <lajos@google.com> stagefright: enable native handles for secure buffers

- rename IOMX::allocateBuffer to allocateSecureBuffer as ACodec
only uses allocateBuffer for secure compressed buffers.
- add argument to return native_handle if component supports it.
- rename IOMX::enableGraphicBuffers to enableNativeBuffers.
- add argument to select graphic vs. native handle mode
- request native handles for secure input buffers, but allow
fallback

Bug: 26782004
Change-Id: Ide9d07f54d2e7e3e6a82dbca011f4db9a5630950
Codec.cpp
ediaCodec.cpp
MXClient.cpp
nclude/OMX.h
nclude/OMXNodeInstance.h
mx/OMX.cpp
mx/OMXNodeInstance.cpp
55747ce170256d003034eed3ef4a2effc242fb96 17-Feb-2016 Wonsik Kim <wonsik@google.com> Merge "stagefright: add null guard for CameraSource::stopCameraRecording" into nyc-dev am: c52198dc51
am: d6f90c9665

* commit 'd6f90c96654484a269b335ed2c1a6c60d9f4ac5d':
stagefright: add null guard for CameraSource::stopCameraRecording
c52198dc514cb3f790c3d814b279faa27d07a36b 17-Feb-2016 Wonsik Kim <wonsik@google.com> Merge "stagefright: add null guard for CameraSource::stopCameraRecording" into nyc-dev
34ff951bce95bee8797aaecbbb6927fc2089f429 16-Feb-2016 Hangyu Kuang <hkuang@google.com> Merge "stagefright: Add VP9 profile and level to SoftVP9 decoder." into nyc-dev am: b74e696c13
am: 90651ff4a2

* commit '90651ff4a2c424cc1556ab30b08405a984b4b541':
stagefright: Add VP9 profile and level to SoftVP9 decoder.
b74e696c13ea2e84fe808e874c520f189f806577 16-Feb-2016 Hangyu Kuang <hkuang@google.com> Merge "stagefright: Add VP9 profile and level to SoftVP9 decoder." into nyc-dev
9486e0a16e9ad4d4f6bd5047a3cbb1b3f2008d65 13-Feb-2016 Hangyu Kuang <hkuang@google.com> stagefright: Add VP9 profile and level to SoftVP9 decoder.

Bug:26642766
Bug:25684127
Change-Id: I29293bd9c526f2b63289f41ac0c68a0933e1bf3a
odecs/on2/dec/SoftVPX.cpp
adcff753468ab0345c494cbf987eb48413fabbfb 16-Feb-2016 Vignesh Venkatasubramanian <vigneshv@google.com> Merge "libstagefright: Refactor vpx encoder into two classes"
2da037b416ad30b7d9a7447d17435026ddc77727 16-Feb-2016 Wonsik Kim <wonsik@google.com> stagefright: add null guard for CameraSource::stopCameraRecording

Bug: 27120259
Change-Id: I2e081404fa4a74b286918374e7da8361c0f59d22
ameraSource.cpp
1d975c4b9a0cf77845b15eff41a1f076fd8f309a 13-Feb-2016 Lajos Molnar <lajos@google.com> Merge changes from topic 'rm-awesome'

* changes:
stagefright: Remove OMXCodec object
stagefright: allow selecting codec by name in SimpleDecodingSource
f4d7011d71c52647f0d41daa1b5dd41759d429ec 12-Feb-2016 Lajos Molnar <lajos@google.com> stagefright: use small timeout for input buffer in SimpleDecodingSource

An input is not immediately available after MediaCodec.flush, resulting
in needlessly waiting for an output buffer.

Bug: 27169137
Change-Id: I3aa5872ee4f570d9da63a4cc87f3beeff61c43b0
impleDecodingSource.cpp
ef2bdbc3ee1d7ccfdccdc2e58c1135d7b19660fd 12-Feb-2016 Lajos Molnar <lajos@google.com> stagefright: CodecCapabilities: fix missing capabilities

mCurrentCaps is a reference, so copy codec capabilities into it
vs. replacing it.

Bug: 27142863
Change-Id: I914bcc882d5f9049bc9eb8b31913b07ae572b441
ediaCodecList.cpp
66092fdb46bf93c9247e86ed7788f764f670a01c 10-Feb-2016 Lajos Molnar <lajos@google.com> stagefright: ACodec: remove infinite loops

Bug: 27114487
Change-Id: Icc6d023f8c990235031cde0c2daed41cc7d75c88
Codec.cpp
e4abb2a991ad36976a6ca75e9c738d14069572e2 10-Feb-2016 Lajos Molnar <lajos@google.com> stagefright: ACodec: query color format support on specific port

This field was uninitialized prior.
Some components did not validate this field resulting in an infinite
query.

Bug: 27114487
Change-Id: Ic262482a17e675c4e5f198661fad96269cf1febc
Codec.cpp
2a2b768e903fb69d9d83963834af571e8dd13276 13-Feb-2016 Lajos Molnar <lajos@google.com> Merge "stagefright: don't use allocateBuffer for encoder metadata mode" into nyc-dev
28b86916ebd70841594a505fc79bd9fd908fda70 13-Feb-2016 Lajos Molnar <lajos@google.com> Merge "stagefright: Remove OMXCodec object" into nyc-dev
42e896baa42e7bddfa0a8af6dbcb84da010fe7ae 12-Feb-2016 Marco Nelissen <marcone@google.com> Merge "Ensure OMX node ids are unique across processes" into nyc-dev
cf3abd4875fd54ba40fccdbd90755d2a5ecfca60 12-Feb-2016 Marco Nelissen <marcone@google.com> Ensure OMX node ids are unique across processes

Change-Id: I2418616a998ad6faa8b22dcd8ac4ef08b9354aa9
nclude/OMX.h
mx/OMX.cpp
7f308c3e0556a5e704bcb3b341842ed50ba80b0a 12-Feb-2016 Lajos Molnar <lajos@google.com> Merge "stagefright: use small timeout for input buffer in SimpleDecodingSource" into nyc-dev
7564e3e76f6e1ec06dd86f3cf83b16ccd17124bd 12-Feb-2016 Lajos Molnar <lajos@google.com> Merge "stagefright: allow selecting codec by name in SimpleDecodingSource" into nyc-dev
a6b1e1c63eb8914ee175913b684fce367948915b 12-Feb-2016 Lajos Molnar <lajos@google.com> Merge "stagefright: use MediaCodec::QueryCapabilities" into nyc-dev
217fab8d2831b87477a92c8b814ee4795149ecf7 12-Feb-2016 Lajos Molnar <lajos@google.com> Merge "stagefright: ACodec: query color format support on specific port" into nyc-dev
90048aadfa1bc690a9a4189139591d70d3390531 12-Feb-2016 Hangyu Kuang <hkuang@google.com> Merge "Stagefright: Advertise SoftAVC encoder's intra refresh capability." into nyc-dev
ff72f77633c37f7930a5afd518163269c4ddf9cc 12-Feb-2016 Hangyu Kuang <hkuang@google.com> Merge "stagefright: Support changing refresh mode during runtime in SoftAVC encoder." into nyc-dev
e33d922fd86699c664a15f09e6d8b2e422736a40 12-Feb-2016 Lajos Molnar <lajos@google.com> stagefright: don't use allocateBuffer for encoder metadata mode

encoder metadata mode does not need protected buffers, especially,
since we read the contents of the metadata in ACodec.

Change-Id: I5cf8198228d26e38a8225285dabdb6dc39fbbb8e
Related-to-Bug: 8968123
Bug: 26782004
Codec.cpp
708336fec4e4620dafa32c4b4b2dc3230a120961 13-Jan-2016 Lajos Molnar <lajos@google.com> stagefright: Remove OMXCodec object

This is no longer used or supported.

Bug: 17108024
Change-Id: I57e5b2368e3df138645ef73121603d19cd5c59ce
ndroid.mk
MXCodec.cpp
mx/tests/OMXHarness.cpp
3ca8f9cc3024b3306bd3782fc7d234570051a534 12-Feb-2016 Lajos Molnar <lajos@google.com> stagefright: use small timeout for input buffer in SimpleDecodingSource

An input is not immediately available after MediaCodec.flush, resulting
in needlessly waiting for an output buffer.

Bug: 27169137
Change-Id: I3aa5872ee4f570d9da63a4cc87f3beeff61c43b0
impleDecodingSource.cpp
963f181c57a26dd23bd9dff263614bbb38960888 09-Feb-2016 Lajos Molnar <lajos@google.com> stagefright: allow selecting codec by name in SimpleDecodingSource

Bug: 17108024
Change-Id: I78f2ef45ec6cf746535e05f4166717829e642b19
impleDecodingSource.cpp
0a4427bb91e72a4dfece276521d7f21fbb6c7846 12-Feb-2016 Lajos Molnar <lajos@google.com> stagefright: use MediaCodec::QueryCapabilities

This reverts commit cfb71f189ca620b7b2caf213572849bf59b50231
and still fixes b/27142863.

Bug: 27142863
Change-Id: I914bcc882d5f9049bc9eb8b31913b07ae572b441
ediaCodecList.cpp
36e4e1592bb07e1fdf8d4324f65a66ba332d75f2 10-Feb-2016 Lajos Molnar <lajos@google.com> stagefright: ACodec: query color format support on specific port

This field got uninitialized again due to a wrong merge conflict resolution.

Bug: 27114487
Change-Id: Ie993d3e87e921963e1d76d782b42796069771852
Codec.cpp
7c36a6bc3f3fe4fe6d1d36b92c3a203de654b012 11-Feb-2016 Hangyu Kuang <hkuang@google.com> stagefright: Support changing refresh mode during runtime in SoftAVC encoder.

Bug: 26587630
Change-Id: I595bdefb84d7da583361da12f793be15c51f4cdf
Codec.cpp
odecs/avcenc/SoftAVCEnc.cpp
odecs/avcenc/SoftAVCEnc.h
e8c8ed47ca15aa6be83c6feef89e27a832e763e9 11-Feb-2016 Lajos Molnar <lajos@google.com> Merge "stagefright: use OMXCodec's QueryCodec for capabilities" into nyc-dev
7f2262fc7d038a0d42def7d769bb9e816e292785 11-Feb-2016 Lajos Molnar <lajos@google.com> stagefright: use OMXCodec's QueryCodec for capabilities

Bug: 27142863
Change-Id: Ica00f5395477a416e1ca4db2697310eef3d635a0
ediaCodecList.cpp
3ea4f828a6906e9931f96ebdcae9c63e14b86cbd 11-Feb-2016 Hangyu Kuang <hkuang@google.com> Merge "SoftAVCEnc: Modified the code for runtime change in params to be generic" into nyc-dev
30fecffdba48c63c2c14783d1eef08b82f422c89 05-Feb-2016 Harish Mahendrakar <harish.mahendrakar@ittiam.com> SoftAVCEnc: Modified the code for runtime change in params to be generic

mBitrateUpdated and mKeyFrameRequested are removed and instead mUpdateFlag
with one bit for each param, will be used to configure the codec in runtime.
This change will make it cleaner to configure more parameters in run-time

Change-Id: I935827b54b0de469fa3c83237cccd4b5e4dcedd6
odecs/avcenc/SoftAVCEnc.cpp
odecs/avcenc/SoftAVCEnc.h
e3b06f27668901d3d7ae53b6d77aafd4181045ad 11-Feb-2016 Marco Nelissen <marcone@google.com> Revert more of the codec process logic

This reverts MuxOMX to its pre-codecprocess state, so while the codec
process/service still exists, it won't be used.

Change-Id: I424bbb2a8118ca7ccadf1fca7112021be187fe3d
MXClient.cpp
1d422e9480a4d2eb839950d3117ec40409bc73fb 11-Feb-2016 Marco Nelissen <marcone@google.com> Don't use codec process by default

Change-Id: I4151f90aa9266ff814198c3c1d1154a8931008a5
MXClient.cpp
5b991c8dcd8805b9db4f4e498abb82bc6c6aef9e 11-Feb-2016 Lajos Molnar <lajos@google.com> Merge "MediaCodecInfo: keep capabilities from XML when updating them from codec" into nyc-dev
69bebe8d87e95a026d14f0a7cd68d8f954dc51c8 11-Feb-2016 Lajos Molnar <lajos@google.com> MediaCodecInfo: keep capabilities from XML when updating them from codec

Bug: 27115490
Change-Id: Ie15bf538a3026829ff8029fb8b96b8d254517d1c
ediaCodecList.cpp
c10899dc623a61f5f48bb00568a3f6a70f2f22b6 11-Feb-2016 Lajos Molnar <lajos@google.com> Merge "stagefright: ACodec: remove infinite loops" into nyc-dev
4ad74b2b4507c8b2714b7b7584578d2d43ae2633 06-Feb-2016 Wei Jia <wjia@google.com> RTSP: increase mCheckGeneration when mCheckPending is set to false.

This will ensure there is only one 'chek' message.
Also delay notification of seek done till kWhatSeekDone, instead of
kWhatSeekPaused. This allows back-to-back multiple seeks.

Bug: 25727912
Change-Id: If873bfaf1c37790e520f1f659ab26148b0c8cd1c
tsp/MyHandler.h
6e6d429f8001e831b23c3505824e016a681fcf90 10-Feb-2016 Lajos Molnar <lajos@google.com> stagefright: ACodec: remove infinite loops

Bug: 27114487
Change-Id: Icc6d023f8c990235031cde0c2daed41cc7d75c88
Codec.cpp
3aaa699a46edb4f47d0cd5a11d57eba93493bd90 10-Feb-2016 Lajos Molnar <lajos@google.com> stagefright: ACodec: query color format support on specific port

This field was uninitialized prior.
Some components did not validate this field resulting in an infinite
query.

Bug: 27114487
Change-Id: Ic262482a17e675c4e5f198661fad96269cf1febc
Codec.cpp
d4456ec782fc8a7d95a569614af91e81b4a58560 05-Feb-2016 Harish Mahendrakar <harish.mahendrakar@ittiam.com> SoftAVCEnc: Modified the code for runtime change in params to be generic

mBitrateUpdated and mKeyFrameRequested are removed and instead mUpdateFlag
with one bit for each param, will be used to configure the codec in runtime.
This change will make it cleaner to configure more parameters in run-time

Change-Id: I935827b54b0de469fa3c83237cccd4b5e4dcedd6
odecs/avcenc/SoftAVCEnc.cpp
odecs/avcenc/SoftAVCEnc.h
00803f7e94052144ecf476268bc717191ee29865 10-Feb-2016 Lajos Molnar <lajos@google.com> Merge changes I3b93c2b8,Ia8e83727 into nyc-dev

* changes:
stagefright: Remove unused ClockEstimator and TimeSource
stagefright: Remove unused TimedTextDriver and Sources
6665703177d33f69007a0877de46431b90e8726b 10-Feb-2016 Lajos Molnar <lajos@google.com> Merge "stagefright: Move CodecCapabilities querying into MediaCodec" into nyc-dev
66c28b191a60fcd2228ec41d9a0292d987cfd39a 10-Feb-2016 Hangyu Kuang <hkuang@google.com> Stagefright: Advertise SoftAVC encoder's intra refresh capability.

Bug:26587630
Change-Id: I0006707a93c00c18f4769d1bf870d4bada0bc336
ata/media_codecs_google_video.xml
1900e77bac4276f247f80fd06d19316cac598f57 03-Feb-2016 Marco Nelissen <marcone@google.com> Run codecs in a separate process

Encoders and secure decoders still run in the mediaserver, while
all other codecs run in a separate codec process.

Bug: 22775369

Change-Id: Ifbcab8a8f2fe77d2567830ac88f0d982e77f7b00
MXClient.cpp
mx/OMXMaster.cpp
mx/OMXMaster.h
mx/tests/OMXHarness.cpp
f76ecd3cf14944647d767ba3dadfa12a451c28bb 13-Jan-2016 Lajos Molnar <lajos@google.com> stagefright: Remove unused ClockEstimator and TimeSource

This was only used by AwesomePlayer

Bug: 17108024
Change-Id: I3b93c2b84e417a688d69d79debaa738caa8b8b7d
ndroid.mk
lockEstimator.cpp
imeSource.cpp
0e449bc8062ca8baec83c7796fbbc13f001caf1b 13-Jan-2016 Lajos Molnar <lajos@google.com> stagefright: Remove unused TimedTextDriver and Sources

These were only used by AwesomePlayer

Bug: 17108024
Change-Id: Ia8e8372743ef7c568f852f8ad416a2b1811a5c89
imedtext/Android.mk
imedtext/TimedText3GPPSource.cpp
imedtext/TimedText3GPPSource.h
imedtext/TimedTextDriver.cpp
imedtext/TimedTextPlayer.cpp
imedtext/TimedTextPlayer.h
imedtext/TimedTextSRTSource.cpp
imedtext/TimedTextSRTSource.h
imedtext/TimedTextSource.cpp
imedtext/TimedTextSource.h
imedtext/test/Android.mk
imedtext/test/TimedTextSRTSource_test.cpp
11d72e1d305a80643996b659eed8ba13dba39212 13-Jan-2016 Lajos Molnar <lajos@google.com> stagefright: Remove OMXCodec object

This is no longer used or supported.

Bug: 17108024
Change-Id: I57e5b2368e3df138645ef73121603d19cd5c59ce
ndroid.mk
MXCodec.cpp
mx/tests/OMXHarness.cpp
65dd3eeef54cf1d1c4edf2f966d3dabb508d3cb9 05-Feb-2016 Lajos Molnar <lajos@google.com> stagefright: Move CodecCapabilities querying into MediaCodec

1. We cannot assume that codecs are OMX based
2. We still have a strange dependency where MediaCodec's
create methods depend on MediaCodecList, which depends on
MediaCodec's static method. This is to be untangled later.

Bug: 17108024
Change-Id: Idd619ee959627539a65f5f7da586108883dcb5f2
Codec.cpp
ediaCodec.cpp
ediaCodecList.cpp
96a875ef0b209c2bc5c91ae7826a79372d541c2d 09-Feb-2016 Lajos Molnar <lajos@google.com> stagefright: allow selecting codec by name in SimpleDecodingSource

Bug: 17108024
Change-Id: I78f2ef45ec6cf746535e05f4166717829e642b19
impleDecodingSource.cpp
ea1a45dbdf7fd6f435f92d20a95f432cf3f147b5 31-Aug-2015 Lajos Molnar <lajos@google.com> stagefright: rework MediaCodecSource

Redesigned MediaCodecSource to fix issues with source::stop(), where
there were still outstanding input buffers when the input source was
closed.

- moved input queue and state inside Puller
- Puller::pause, resume and stop is now atomic from caller's thread
- input source is accessed from Puller's looper, unless a blocked read
operation is detected.
- added stop timeout, so if Puller's looper is blocked, but it is not
yet detected, input source->stop is still called.

- using Mutexed helper class to ensure locked member access

Bug: 26964806
Change-Id: Icd6d4fc42a7c8e08b54e856c028f3d1fed5ae32d
ediaCodecSource.cpp
5a1d255eb2b88d68a0b0b699793f14cca5ba4635 05-Feb-2016 Lajos Molnar <lajos@google.com> stagefright/rtsp: Remove dependence on OMXSource

Use MediaCodecSource and SimpleDecodingSource instead.

Bug: 17108024
Change-Id: Idff221fc7131b1622af97bc3c5aa952afcd3d22b
tsp/Android.mk
tsp/MyTransmitter.h
tsp/rtp_test.cpp
f8d84b0faf036fe2934f283edc33985f9e001626 05-Feb-2016 Lajos Molnar <lajos@google.com> stagefright: add SimpleDecodingSource

SimpleDecodingSource is a lightweight replacement for OMXCodec
for decoding use. It does not support pause, secure content or
precise seeking. It also does not support start after stop.

Bug: 17108024
Change-Id: Ic310f9372ebf214cbd73118b18e5d2abcc4426cf
ndroid.mk
impleDecodingSource.cpp
2e18508d33b845ef77676559d3bb70acc37b39ee 05-Feb-2016 Lajos Molnar <lajos@google.com> stagefright: add PREFER_SOFTWARE_CODEC flag to MediaCodecSource

Bug: 17108024
Change-Id: I553d7ccf9df9d4eb3d8bffa2f11ae32d03b9d6c3
ediaCodecSource.cpp
9d73ec661e34f91f8d80a11cc5208a23997b75a0 04-Feb-2016 Lajos Molnar <lajos@google.com> stagefright: move MetadataRetriever off of OMXCodec

Also remove some unneeded OMXCodec includes.

Bug: 17108024
Change-Id: I1e4b32d83216e9c6b1d76a18fb346dc632be4b1d
ediaCodec.cpp
tagefrightMetadataRetriever.cpp
nclude/StagefrightMetadataRetriever.h
ests/SurfaceMediaSource_test.cpp
6880f83431e54765364664d9ec50ce0d748bdfae 04-Feb-2016 Lajos Molnar <lajos@google.com> stagefright: change signature of MediaCodec::Create methods

Most clients already have AString when creating codecs, and
internally we use AString.

const char * automatically casts to AString, but it does incur a
copy cost, so we incur it on every MediaCodec::Create call.

Bug: 17108024
Change-Id: I213dde7a6fc3cf3756eee6afd7194413bcca54a5
ediaCodec.cpp
f035bc642f2895e142caa13cb3e72af85f011657 04-Feb-2016 Lajos Molnar <lajos@google.com> stagefright: create findCodec methods in MediaCodecList

This is to delete them from OMXCodec later.
Use ACodec-specific quirks.

Bug: 17108024
Change-Id: I670b104cff5ef37f155a9843f68d291aa943d1c1
Codec.cpp
ediaCodecList.cpp
MXCodec.cpp
f39989a3371bcb11458941bcc49d545225b55c82 04-Feb-2016 Lajos Molnar <lajos@google.com> stagefright: move getOMXChannelMapping to ACodec

Bug: 17108024
Change-Id: I9b9f3adaf5d3c2aa41e9998cfe719b995e72b608
Codec.cpp
MXCodec.cpp
b8d11c1f2cf11a2757ec1482b9700d16765012d7 13-Jan-2016 Lajos Molnar <lajos@google.com> stagefright: Remove unused ClockEstimator and TimeSource

This was only used by AwesomePlayer

Bug: 17108024
Change-Id: I3b93c2b84e417a688d69d79debaa738caa8b8b7d
ndroid.mk
lockEstimator.cpp
imeSource.cpp
6984437d4ff87044a67ee2c693d34a2c50517bdd 13-Jan-2016 Lajos Molnar <lajos@google.com> stagefright: Remove unused TimedTextDriver and Sources

These were only used by AwesomePlayer

Bug: 17108024
Change-Id: Ia8e8372743ef7c568f852f8ad416a2b1811a5c89
imedtext/Android.mk
imedtext/TimedText3GPPSource.cpp
imedtext/TimedText3GPPSource.h
imedtext/TimedTextDriver.cpp
imedtext/TimedTextPlayer.cpp
imedtext/TimedTextPlayer.h
imedtext/TimedTextSRTSource.cpp
imedtext/TimedTextSRTSource.h
imedtext/TimedTextSource.cpp
imedtext/TimedTextSource.h
imedtext/test/Android.mk
imedtext/test/TimedTextSRTSource_test.cpp
9b6ecba5f9d8018f0807f656e4b16ab3b8d99c5b 09-Feb-2016 Lajos Molnar <lajos@google.com> stagefright: Remove unused hooks from AudioPlayer

These were used by AwesomePlayer.

Bug: 17108024
Change-Id: I9fbea10172628d80e93451d9b38d245fd3f3b20f
udioPlayer.cpp
01854c0129245d034bd99d64817dce06df20c5a6 13-Jan-2016 Lajos Molnar <lajos@google.com> stagefright: Remove deprecated AwesomePlayer

Bug: 17108024
Change-Id: Ia721bdfa87b07612ad8e76cbdcda6de2b8ce2a74
ndroid.mk
udioPlayer.cpp
wesomePlayer.cpp
uMediaExtractor.cpp
imedEventQueue.cpp
nclude/AwesomePlayer.h
nclude/TimedEventQueue.h
d8274ce8759faa21b10e9c027745774fefc9d993 29-Jan-2016 Vignesh Venkatasubramanian <vigneshv@google.com> libstagefright: Refactor vpx encoder into two classes

Refactoring the VPX encoder omx component into two classes. Base
class contains the codec-independent configurations and the
sub-class contains vp8 specific configuration. This will make way
to add the vp9 encoder in a follow-up without code duplication.

Change-Id: I05d2c79d7fbdb3332a43c0c72d37c72ee8708dd3
odecs/on2/enc/Android.mk
odecs/on2/enc/SoftVP8Encoder.cpp
odecs/on2/enc/SoftVP8Encoder.h
odecs/on2/enc/SoftVPXEncoder.cpp
odecs/on2/enc/SoftVPXEncoder.h
742a9baf0fbecd01a27b8741ab370552d1ab1771 09-Feb-2016 Lajos Molnar <lajos@google.com> stagefright: Remove unused hooks from AudioPlayer

These were used by AwesomePlayer.

Bug: 17108024
Change-Id: I9fbea10172628d80e93451d9b38d245fd3f3b20f
udioPlayer.cpp
e4d40ad91f3516bde106658673b2cb076b5dfcb7 13-Jan-2016 Lajos Molnar <lajos@google.com> stagefright: Remove deprecated AwesomePlayer

Bug: 17108024
Change-Id: Ia721bdfa87b07612ad8e76cbdcda6de2b8ce2a74
ndroid.mk
udioPlayer.cpp
wesomePlayer.cpp
uMediaExtractor.cpp
imedEventQueue.cpp
nclude/AwesomePlayer.h
nclude/TimedEventQueue.h
43e08e0146b825cde52480b64764765d9a61f97c 09-Feb-2016 Lajos Molnar <lajos@google.com> Merge "stagefright: rework MediaCodecSource" into nyc-dev
0d2ef4b9c10f35b0673c4fbbd9e0e621b6460db5 09-Feb-2016 Lajos Molnar <lajos@google.com> Merge "stagefright/rtsp: Remove dependence on OMXSource" into nyc-dev
5b05e49e6550cb2abf1a88272d6cd460b8957176 05-Feb-2016 Lajos Molnar <lajos@google.com> stagefright: Move CodecCapabilities querying into MediaCodec

1. We cannot assume that codecs are OMX based
2. We still have a strange dependency where MediaCodec's
create methods depend on MediaCodecList, which depends on
MediaCodec's static method. This is to be untangled later.

Bug: 17108024
Change-Id: Idd619ee959627539a65f5f7da586108883dcb5f2
Codec.cpp
ediaCodec.cpp
ediaCodecList.cpp
27b70ced96371d261d2c04b583c6d68d55637301 05-Feb-2016 Lajos Molnar <lajos@google.com> stagefright/rtsp: Remove dependence on OMXSource

Use MediaCodecSource and SimpleDecodingSource instead.

Bug: 17108024
Change-Id: Idff221fc7131b1622af97bc3c5aa952afcd3d22b
(cherry picked from commit a2b4bcf6562de3f8528fc139ec202bd73fa340c7)
tsp/Android.mk
tsp/MyTransmitter.h
tsp/rtp_test.cpp
6a3a56fbcd6c01c3895f14e43858971b0edca9b2 03-Feb-2016 Lajos Molnar <lajos@google.com> stagefright: rework MediaCodecSource

Redesigned MediaCodecSource to fix issues with source::stop(), where
there were still outstanding input buffers when the input source was
closed.

- moved input queue and state inside Puller
- Puller::pause, resume and stop is now atomic from caller's thread
- input source is accessed from Puller's looper, unless a blocked read
operation is detected.
- added stop timeout, so if Puller's looper is blocked, but it is not
yet detected, input source->stop is still called.

- using Mutexed helper class to ensure locked member access

Bug: 26964806
Change-Id: Icd6d4fc42a7c8e08b54e856c028f3d1fed5ae32d
(cherry picked from commit 6d26518f0c3872bc54ececb0fbbba0c006d72553)
ediaCodecSource.cpp
00eb2fdb2b8f108e74c32e03b2a0e5bab3f107b6 05-Feb-2016 Lajos Molnar <lajos@google.com> stagefright: add SimpleDecodingSource

SimpleDecodingSource is a lightweight replacement for OMXCodec
for decoding use. It does not support pause, secure content or
precise seeking. It also does not support start after stop.

Bug: 17108024
Change-Id: Ic310f9372ebf214cbd73118b18e5d2abcc4426cf
(cherry picked from commit 25a21c4bc7434ab0646d9f98bf6c52c387b4f28c)
ndroid.mk
impleDecodingSource.cpp
664041339740874917944c850b113656236edda6 06-Feb-2016 Hangyu Kuang <hkuang@google.com> Merge "stagefright: Support intra refresh in SoftAVC video encoder."
cf64aab04838133e3c9f96584ba8ee7a1ff422f9 06-Feb-2016 Wei Jia <wjia@google.com> Merge "RTSP: add more info for PLAY command."
9955f00adf5c947c0af39db1c038778e13975ffb 06-Feb-2016 Wei Jia <wjia@google.com> RTSP: add more info for PLAY command.

Change-Id: Id22eaf546aff06397321342d4d86cd8ddcb243da
tsp/MyHandler.h
870aff9bd2442c8877f5d6b12c73032b5f24535a 28-Jan-2016 Hangyu Kuang <hkuang@google.com> stagefright: Support intra refresh in SoftAVC video encoder.

Bug: 26587630

Change-Id: Ia04dab11978fd8cc5d68bf721900775e13987a9a
Codec.cpp
odecs/avcenc/SoftAVCEnc.cpp
odecs/avcenc/SoftAVCEnc.h
a26bbc80ba2aa2ff08d487b53f663fb83f4601a2 05-Feb-2016 Lajos Molnar <lajos@google.com> Merge "stagefright: add PREFER_SOFTWARE_CODEC flag to MediaCodecSource"
d100a1e67d754239c0d2f13b512003c08f3da15d 05-Feb-2016 Lajos Molnar <lajos@google.com> Merge "stagefright: move MetadataRetriever off of OMXCodec"
5405b7f0c1e1859d036951a1ddba0fb222a11934 05-Feb-2016 Lajos Molnar <lajos@google.com> Merge "stagefright: change signature of MediaCodec::Create methods"
6fffe207977e29dd3461d36a3e4547909223dee8 05-Feb-2016 Lajos Molnar <lajos@google.com> Merge "stagefright: create findCodec methods in MediaCodecList"
16fcc47c113e63efa69f5af5decf1ad46ec653a9 05-Feb-2016 Lajos Molnar <lajos@google.com> stagefright: add PREFER_SOFTWARE_CODEC flag to MediaCodecSource

Bug: 17108024
Change-Id: I553d7ccf9df9d4eb3d8bffa2f11ae32d03b9d6c3
ediaCodecSource.cpp
6b0795009b8f53ab771e0074b76381977d016f4b 04-Feb-2016 Lajos Molnar <lajos@google.com> stagefright: move MetadataRetriever off of OMXCodec

Also remove some unneeded OMXCodec includes.

Bug: 17108024
Change-Id: I1e4b32d83216e9c6b1d76a18fb346dc632be4b1d
ediaCodec.cpp
tagefrightMetadataRetriever.cpp
nclude/StagefrightMetadataRetriever.h
ests/SurfaceMediaSource_test.cpp
cdd7e744fd50cfcaf14e07dc6df1d17199ef8c38 05-Feb-2016 Hangyu Kuang <hkuang@google.com> Merge "stagefright: Print warning when configure with empty CSD string."
6fc17d1a7c5d2fb117491b2e9f66c6236b526508 04-Feb-2016 Lajos Molnar <lajos@google.com> stagefright: change signature of MediaCodec::Create methods

Most clients already have AString when creating codecs, and
internally we use AString.

const char * automatically casts to AString, but it does incur a
copy cost, so we incur it on every MediaCodec::Create call.

Bug: 17108024
Change-Id: I213dde7a6fc3cf3756eee6afd7194413bcca54a5
ediaCodec.cpp
b60521e269e5aeca773853dfeb150e9a512c7334 04-Feb-2016 Lajos Molnar <lajos@google.com> stagefright: create findCodec methods in MediaCodecList

This is to delete them from OMXCodec later.
Use ACodec-specific quirks.

Bug: 17108024
Change-Id: I670b104cff5ef37f155a9843f68d291aa943d1c1
Codec.cpp
ediaCodecList.cpp
MXCodec.cpp
4f59c7e373a7e883f21ba33d44ea7caa86b65b02 04-Feb-2016 Hangyu Kuang <hkuang@google.com> stagefright: Print warning when configure with empty CSD string.

Change-Id: I82ed59e449419ea380b93bb798ab66e7bcac9f66
ediaCodec.cpp
a485208faef579d3d20ee56f29e81d9a5e32e14d 04-Feb-2016 Lajos Molnar <lajos@google.com> stagefright: move getOMXChannelMapping to ACodec

Bug: 17108024
Change-Id: I9b9f3adaf5d3c2aa41e9998cfe719b995e72b608
Codec.cpp
MXCodec.cpp
4be8c6d6337c1aa9d80430c3de4fc7251cd52af9 04-Feb-2016 Wei Jia <wjia@google.com> Merge "MPEG4Extractor: cast media time to int64_t in order to avoid check on unsigned integer overflow." am: ee38fad5e9
am: 4ec776ebf7

* commit '4ec776ebf7cc746dca49c81bce884e534b066f3c':
MPEG4Extractor: cast media time to int64_t in order to avoid check on unsigned integer overflow.
4ec776ebf7cc746dca49c81bce884e534b066f3c 04-Feb-2016 Wei Jia <wjia@google.com> Merge "MPEG4Extractor: cast media time to int64_t in order to avoid check on unsigned integer overflow."
am: ee38fad5e9

* commit 'ee38fad5e9109f92b24c0e4d6d0d021b3d20e4e0':
MPEG4Extractor: cast media time to int64_t in order to avoid check on unsigned integer overflow.
608fe1d6b2ea4d88245a109afe2bfba580881a16 03-Feb-2016 Wei Jia <wjia@google.com> MPEG4Extractor: cast media time to int64_t in order to avoid check on unsigned integer overflow.

Change-Id: Iad5ae41f0bbfc5e837b4b78e8acaa3f9462329e6
PEG4Extractor.cpp
da53ce37c5283fad74d213f855ed8f4a078b860c 03-Feb-2016 Wonsik Kim <wonsik@google.com> Merge "stagefright: add profile capability check for audio codecs"
ed2a94af7d53374d40c346cd4771ca168924e1e2 26-Jan-2016 Wonsik Kim <wonsik@google.com> stagefright: add profile capability check for audio codecs

Bug: 26742857
Change-Id: I237691a7520054930e3935559e33a464b947f111
MXCodec.cpp
odecs/aacenc/SoftAACEncoder2.cpp
58cc8d62be9d4bd5f732d39c3e298ef7b5307a4b 02-Feb-2016 Marco Nelissen <marcone@google.com> Merge "Overflow fixes for amrwbenc" am: eb0482990a
am: 520603c886

* commit '520603c88667df38616724f6c963a5a422bd2856':
Overflow fixes for amrwbenc
520603c88667df38616724f6c963a5a422bd2856 02-Feb-2016 Marco Nelissen <marcone@google.com> Merge "Overflow fixes for amrwbenc"
am: eb0482990a

* commit 'eb0482990aaf115ac351cbf8751d7536cb5036d4':
Overflow fixes for amrwbenc
eb0482990aaf115ac351cbf8751d7536cb5036d4 02-Feb-2016 Marco Nelissen <marcone@google.com> Merge "Overflow fixes for amrwbenc"
a87228e3e3f42d3676ced0d38ad9913d7bef9de6 27-Jan-2016 Marco Nelissen <marcone@google.com> Overflow fixes for amrwbenc

Most of these were encountered while running a mixed sanitized/unsanitized
AMR encoder, so may not be reachable in real conditions.

Change-Id: I85af7d40214133234009323e7e64432fc1be39ca
odecs/amrwbenc/inc/basic_op.h
odecs/amrwbenc/src/c2t64fx.c
odecs/amrwbenc/src/c4t64fx.c
odecs/amrwbenc/src/cor_h_x.c
0b6e47ad74f5e1671d54c8411d487b30780e2e2c 30-Jan-2016 Wei Jia <wjia@google.com> Merge "ACodec: free buffers when allocateBuffers failed."
c673de8067ad53f96b3fcd2b7b24b066303a32aa 30-Jan-2016 Wei Jia <wjia@google.com> ACodec: free buffers when allocateBuffers failed.

This fixes ashmem leakage.

Bug: 26797136
Change-Id: I17d61d50e67501ece6a3547eeb33d53279162e71
Codec.cpp
37dfacdf3e66516bd4b0c7d08e1aad5869bf5825 29-Jan-2016 Dan Stoza <stoza@google.com> Merge "Add cast to make room for naming pixel_format_t" am: 6d51c0c1f2
am: bb3e2fcfb0

* commit 'bb3e2fcfb05adfbacbf71fbff4e06800d624eb55':
Add cast to make room for naming pixel_format_t
bb3e2fcfb05adfbacbf71fbff4e06800d624eb55 29-Jan-2016 Dan Stoza <stoza@google.com> Merge "Add cast to make room for naming pixel_format_t"
am: 6d51c0c1f2

* commit '6d51c0c1f279d1e2db4f0b1067efb01070b4d8fb':
Add cast to make room for naming pixel_format_t
6d51c0c1f279d1e2db4f0b1067efb01070b4d8fb 29-Jan-2016 Dan Stoza <stoza@google.com> Merge "Add cast to make room for naming pixel_format_t"
254012a040733ec2476171d311005168810d1d01 28-Jan-2016 Marco Nelissen <marcone@google.com> Merge "Revert "Run codecs in a separate process""
260e56c9a17737bf280d776797d6dee411c9b4da 28-Jan-2016 Marco Nelissen <marcone@google.com> Revert "Run codecs in a separate process"

This reverts commit 4f12d94fc26df1d0c7a566792711b8863fd39fe9.

Change-Id: Ic850a950119a45efd3042f40147253b37c328853
MXClient.cpp
mx/tests/OMXHarness.cpp
2b7893250228abb63dd7ca577d8c7769dcff2344 28-Jan-2016 Wei Jia <wjia@google.com> Merge "IDataSource: add getFlags() to expose DataSource::flags()."
10551fcd58b3807fc7351d88e6127ec227b993d1 27-Jan-2016 Wei Jia <wjia@google.com> IDataSource: add getFlags() to expose DataSource::flags().

This will let MPEG4Extractor cache stbl data. Therefore it can avoid data
flushing in data source (NuCachedSource2) due to reading stbl and access
unit data alternatively when the stream is larger than max cache size.

Bug: 26533748
Change-Id: Ia534755ab9130e4dcee94d53ca3c933d1b9eb566
allbackDataSource.cpp
ediaExtractor.cpp
nclude/CallbackDataSource.h
2b2af5291a7792d3c5c43895757e923cb49ce72b 28-Jan-2016 Robert Shih <robertshih@google.com> Merge "stagefright: remove CHECKs in convertMetaDataToMessage"
feb76cc0340f3eb4c9ae91cbfab4dcea449422f5 28-Jan-2016 Chien-Yu Chen <cychen@google.com> Merge changes from topic 'camera-hardening'

* changes:
camera: Add support to pass native handles across binders
Camera: Fix client permission check
Add cameraserver process
5bae3d6b17d7eb90b52174f8149aaa7c7ff334d6 27-Jan-2016 Vignesh Venkatasubramanian <vigneshv@google.com> Merge "libstagefright/webm: Add support for VP9 in webm muxer"
26736fd21faada79c4fb91cb6ef91582c113e9eb 27-Jan-2016 Marco Nelissen <marcone@google.com> Merge "Run codecs in a separate process"
70b22a024d75bce04575c16ed49fc7991c8544a6 21-Jan-2016 Vignesh Venkatasubramanian <vigneshv@google.com> libstagefright/webm: Add support for VP9 in webm muxer

WebM muxer cannot write out VP9 files. This CL adds support for
that. It will be useful when VP9 hardware encoders come out and
also when we add the software encoder for VP9.

Change-Id: Ie24d0f928a7421d8e6a53073b4cae45fba01d45b
ebm/WebmElement.cpp
ebm/WebmElement.h
ebm/WebmWriter.cpp
93ec0d71800824481b41b883739c9ab1d0559c27 27-Jan-2016 Craig Donner <cdonner@google.com> Merge "Allows protected content when the consumer has USAGE_PROTECTED set, even if the native window does not queue to the window composer."
1e0745544cf6328ba5957748328651c3cfb5b6b6 27-Jan-2016 Wonsik Kim <wonsik@google.com> Merge "stagefright: add HEVC support to MediaRecorder"
7f1a5dfba49f0fee266c95afe2a66e48d4a0fe63 27-Jan-2016 Marco Nelissen <marcone@google.com> Merge "Revert "Disable integer sanitization for amrwbenc"" am: d86e4cb4e3
am: 7c8053cf7f

* commit '7c8053cf7fe281db34d7494433a5a3231afa3b24':
Revert "Disable integer sanitization for amrwbenc"
7c8053cf7fe281db34d7494433a5a3231afa3b24 26-Jan-2016 Marco Nelissen <marcone@google.com> Merge "Revert "Disable integer sanitization for amrwbenc""
am: d86e4cb4e3

* commit 'd86e4cb4e3ea635567faa476218a01d88e31d0d0':
Revert "Disable integer sanitization for amrwbenc"
81f8b15dd98f2bc62ee3d77211ac09a71bbc7578 25-Jan-2016 Eric Laurent <elaurent@google.com> Revert "Disable integer sanitization for amrwbenc"

Fix some more overflows, and turn sanitize back on.

Bug: 26416048
Change-Id: I17d3b8a975770c6b5778610c1ff7928fce598e21
odecs/amrwbenc/Android.mk
odecs/amrwbenc/src/c4t64fx.c
f4101f746a4a2c407a220dd61860a2b742eade51 26-Jan-2016 Robert Shih <robertshih@google.com> stagefright: remove CHECKs in convertMetaDataToMessage

Bug: 26457124
Change-Id: I05cc47b8b72d1ee181daf73f2b2b96a222fbf700
wesomePlayer.cpp
tils.cpp
98a668f6ea51e4d894d2ebb61a0e18287fb14008 18-Dec-2015 Chien-Yu Chen <cychen@google.com> Camera: Fix client permission check

Modify StageFright's CameraSource to forward calling PID as
client PID when connecting to CameraService so CameraService
can check if the client PID has permission to use camera.

Change CameraService to check calling UID is trusted before
using the passed in client PID and client UID to verify permission.

Bug: 24511454
Change-Id: I4906ab73510e2c75714690bed675e3c13aca3ccf
ameraSource.cpp
ameraSourceTimeLapse.cpp
52a942055bcc4a96b6e281a54a70a53b6fca5798 25-Jan-2016 Dan Austin <danielaustin@google.com> Merge "Revert "Disable integer sanitization for amrwbenc""
09baae86eb0cd947a1059401723928d0f1aadfc4 25-Jan-2016 Eric Laurent <elaurent@google.com> Revert "Disable integer sanitization for amrwbenc"

This reverts commit be773c3a8f86a6ee8a0e36c9f9c18055d97edb6f.

Reverting while investigating regression in AMR-WB encoding.

Bug: 26416048
Change-Id: I17d3b8a975770c6b5778610c1ff7928fce598e21
odecs/amrwbenc/Android.mk
4f12d94fc26df1d0c7a566792711b8863fd39fe9 16-Dec-2015 Marco Nelissen <marcone@google.com> Run codecs in a separate process

For now this only runs decoders and Google encoders in the codec process.

Bug: 22775369
Change-Id: Iadd8b6bc2873ddcfaee3e68866642ba74c6949aa
MXClient.cpp
mx/tests/OMXHarness.cpp
b397a2a9923dcf0bec088e06df7dbe8eb128b677 12-Jan-2016 Craig Donner <cdonner@google.com> Allows protected content when the consumer has USAGE_PROTECTED set, even if the native window does not queue to the window composer.

Bug: 22775237
Bug: 22855417

Change-Id: I2aa9d8c724efcf1be5debdb69b1ca0bd3be18bb5
urfaceUtils.cpp
4f2559d3cdeb7187dedca186d5abc65af4bdb031 11-Dec-2015 Robert Shih <robertshih@google.com> matroska: accept MKVs whose AVC CSD is in the 1st frame

Bug: 25936003
Change-Id: Ied4e7e8b1d3e79195124d57abae2eaa208c9c88a
atroska/Android.mk
atroska/MatroskaExtractor.cpp
atroska/MatroskaExtractor.h
49712cddf096e38abd513386d5726b30f4a1dc6f 22-Jan-2016 Robert Shih <robertshih@google.com> Merge "stagefright: encrypted webm support"
9aa87d4ef502c9700a31fe46dc6e1d6f99cf4e5e 07-Dec-2015 Wonsik Kim <wonsik@google.com> stagefright: add HEVC support to MediaRecorder

Bug: 22879917
Change-Id: I6c97b051467de44c506a8ff021321e5953a63fc3
Codec.cpp
ndroid.mk
evcUtils.cpp
PEG4Writer.cpp
tils.cpp
nclude/HevcUtils.h
05b7b2d33816a4bf9592ec82639a7bcf06166157 21-Jan-2016 Jaesung Chung <jaesung@google.com> Merge "Support for CEA-708 closed caption"
87ca2397c48faf480f6f9f532e4a1c04aeface2a 21-Jan-2016 Vignesh Venkatasubramanian <vigneshv@google.com> DO NOT MERGE - Remove deprecated image defines
am: c73b811066

* commit 'c73b811066319b2c7bbd1bc876a73f53a16f07e0':
DO NOT MERGE - Remove deprecated image defines
78c12ed04e8b7e1f417d61e2a61e1070e3fb7bf2 21-Jan-2016 Wonsik Kim <wonsik@google.com> Merge "stagefright: set OMX.google.raw.decoder output buffer size"
c6c6d6baf934a594fc4f81b7c4d9289a4c5962f4 12-Jan-2016 Wonsik Kim <wonsik@google.com> stagefright: set OMX.google.raw.decoder output buffer size

Set it to the input buffer size as this codec just performs a buffer
copy.

Bug: 25858835
Change-Id: I75592723a104e0300162b73d13482f114750a6ed
odecs/raw/SoftRaw.cpp
8ac1a9f6d00193ab38feefed25cd4bcdbd7f045e 15-Jan-2016 Vignesh Venkatasubramanian <vigneshv@google.com> DO NOT MERGE - Remove deprecated image defines

libvpx has always supported the VPX_ prefixed versions of these defines.
The unprefixed versions have been removed in the most recent release.

https://chromium.googlesource.com/webm/libvpx/+/9cdaa3d72eade9ad162ef8f78a93bd8f85c6de10

BUG=23452792

Change-Id: I8a656f2262f117d7a95271f45100b8c6fd0a470f
odecs/on2/dec/SoftVPX.cpp
c73b811066319b2c7bbd1bc876a73f53a16f07e0 13-Jan-2016 Vignesh Venkatasubramanian <vigneshv@google.com> DO NOT MERGE - Remove deprecated image defines

libvpx has always supported the VPX_ prefixed versions of these defines.
The unprefixed versions have been removed in the most recent release.

https://chromium.googlesource.com/webm/libvpx/+/9cdaa3d72eade9ad162ef8f78a93bd8f85c6de10

BUG=23452792

Change-Id: Ib02073f42d545e6c08f9bd4a4fc868e3be886c1b
odecs/on2/dec/SoftVPX.cpp
64cb1ba9caf15ef43eb8063132d5098929b983e9 21-Jan-2016 Ronghua Wu <ronghuawu@google.com> Merge "libstagefright: Add MEDIA_MIMETYPE_VIDEO_DOLBY_VISION."
0c353b583daa4dcd149d933f187307c71d8a991d 21-Jan-2016 Ronghua Wu <ronghuawu@google.com> Merge "libstagefright: keep reference to the codec memory on reclaim"
793c9fb11114c7be4636b8cae5477995aadeb71d 07-Jan-2016 Robert Shih <robertshih@google.com> stagefright: encrypted webm support

Bug: 26070802
Change-Id: I82cc3d4cfbe82c971a10074ba60498149df6ba10
uMediaExtractor.cpp
tils.cpp
atroska/MatroskaExtractor.cpp
atroska/MatroskaExtractor.h
d9f1f950d18b4e166b178d93260074019588c956 13-Jan-2016 Jeff Tinker <jtinker@google.com> Fix protected content playback

bug: 26532678
Change-Id: I402a4b3aef126a0f6b35c1d68d3def12be3789b3
ediaCodec.cpp
05dc55452066f01b1c941ae0ef3c50a732dccede 13-Jan-2016 Ronghua Wu <ronghuawu@google.com> Merge "vorbis: reset codec state after a flush"
869b7a50b76cf4172c46f660c298114fb54ca178 13-Jan-2016 Marco Nelissen <marcone@google.com> Fix out-of-bounds write am: 5403587a74 am: fb2eb86102 am: e6bd186c7e am: a8ac8f617b am: e2e46f5fa1 am: 2304c606eb am: 0945199000 am: a39f981875 am: e463301aa4 am: 0dd00d9b19 am: 827e12087d am: 300cd21e59
am: d69128a851

* commit 'd69128a8519e02cbfe5a14220f14f2fa63eec297':
Fix out-of-bounds write
3d827263f2f471d65f8b5c0ee57cae77f0f8f343 13-Jan-2016 Ronghua Wu <ronghuawu@google.com> vorbis: reset codec state after a flush

Bug: 23361053
Change-Id: I163b356935a8574b3bfff94e9bcdeff08e6e0ddb
odecs/vorbis/dec/SoftVorbis.cpp
d69128a8519e02cbfe5a14220f14f2fa63eec297 13-Jan-2016 Marco Nelissen <marcone@google.com> Fix out-of-bounds write am: 5403587a74 am: fb2eb86102 am: e6bd186c7e am: a8ac8f617b am: e2e46f5fa1 am: 2304c606eb am: 0945199000 am: a39f981875 am: e463301aa4 am: 0dd00d9b19 am: 827e12087d
am: 300cd21e59

* commit '300cd21e598a965fdd7590fbf363210babc5ad54':
Fix out-of-bounds write
827e12087d583d76e4caec3090df9aea7b7a4e01 13-Jan-2016 Marco Nelissen <marcone@google.com> Fix out-of-bounds write am: 5403587a74 am: fb2eb86102 am: e6bd186c7e am: a8ac8f617b am: e2e46f5fa1 am: 2304c606eb am: 0945199000 am: a39f981875 am: e463301aa4
am: 0dd00d9b19

* commit '0dd00d9b1986cd2cc4f45bdb96266dee01f20d72':
Fix out-of-bounds write
0dd00d9b1986cd2cc4f45bdb96266dee01f20d72 13-Jan-2016 Marco Nelissen <marcone@google.com> Fix out-of-bounds write am: 5403587a74 am: fb2eb86102 am: e6bd186c7e am: a8ac8f617b am: e2e46f5fa1 am: 2304c606eb am: 0945199000 am: a39f981875
am: e463301aa4

* commit 'e463301aa44f0ea0ae1a2399bf8800d94cf6ce3e':
Fix out-of-bounds write
e463301aa44f0ea0ae1a2399bf8800d94cf6ce3e 13-Jan-2016 Marco Nelissen <marcone@google.com> Fix out-of-bounds write am: 5403587a74 am: fb2eb86102 am: e6bd186c7e am: a8ac8f617b am: e2e46f5fa1 am: 2304c606eb am: 0945199000
am: a39f981875

* commit 'a39f9818759155a2651995d6844f9821d83e3f0d':
Fix out-of-bounds write
a39f9818759155a2651995d6844f9821d83e3f0d 13-Jan-2016 Marco Nelissen <marcone@google.com> Fix out-of-bounds write am: 5403587a74 am: fb2eb86102 am: e6bd186c7e am: a8ac8f617b am: e2e46f5fa1 am: 2304c606eb
am: 0945199000

* commit '0945199000aaa5a628705de69f17d28a5c04cc36':
Fix out-of-bounds write
0945199000aaa5a628705de69f17d28a5c04cc36 13-Jan-2016 Marco Nelissen <marcone@google.com> Fix out-of-bounds write am: 5403587a74 am: fb2eb86102 am: e6bd186c7e am: a8ac8f617b am: e2e46f5fa1
am: 2304c606eb

* commit '2304c606eb2eb9e6f21fcca0e6dcd4ac8156779a':
Fix out-of-bounds write
e2e46f5fa1e669fb7f00b3ed2bbc37390e0a5a68 13-Jan-2016 Marco Nelissen <marcone@google.com> Fix out-of-bounds write am: 5403587a74 am: fb2eb86102 am: e6bd186c7e
am: a8ac8f617b

* commit 'a8ac8f617b2df8f07935d3e1e47189dee2381b88':
Fix out-of-bounds write
e6bd186c7e2a3b948fdd27a4b71048ee85229e7c 12-Jan-2016 Marco Nelissen <marcone@google.com> Fix out-of-bounds write am: 5403587a74
am: fb2eb86102

* commit 'fb2eb8610208d3ad2ea69f57a151ffe436c6c6e6':
Fix out-of-bounds write
fb2eb8610208d3ad2ea69f57a151ffe436c6c6e6 12-Jan-2016 Marco Nelissen <marcone@google.com> Fix out-of-bounds write
am: 5403587a74

* commit '5403587a74aee2fb57076528c3927851531c8afb':
Fix out-of-bounds write
2ad160ba086f0504cf56dcc24619a0cee2546a23 17-Dec-2015 Dan Stoza <stoza@google.com> Add cast to make room for naming pixel_format_t

Fixes a compiler warning/error about comparing two different enum
types so that the HAL_PIXEL_FORMAT_* enum in system/graphics.h can be
named.

Change-Id: I7acb5f67c66e42a4e556ff53c1e59cee40c7d585
Codec.cpp
5403587a74aee2fb57076528c3927851531c8afb 12-Jan-2016 Marco Nelissen <marcone@google.com> Fix out-of-bounds write

Bug: 26365349
Change-Id: Ia363d9f8c231cf255dea852e0bbf5ca466c7990b
PEG4Extractor.cpp
31fc66042d4241f443ebbd2c7b37946edf35b8e9 12-Jan-2016 Jeff Tinker <jtinker@google.com> Merge "Support AES-CBC sample encryption in MediaDrm"
18cb1eca504817b5b144a023ae2792d90e74c9a5 18-Dec-2015 Jeff Tinker <jtinker@google.com> Support AES-CBC sample encryption in MediaDrm

bug:23719082
Change-Id: I3028452f315122b65296881aed1fbf66c3ceeebc
ediaCodec.cpp
a29c2b203d8bea8c21564765da5c9d7087448340 10-Dec-2015 Ronghua Wu <ronghuawu@google.com> libstagefright: Add MEDIA_MIMETYPE_VIDEO_DOLBY_VISION.

Bug: 25684127
Change-Id: I123390e358ea6830708382456b7d92f0f32b3cb1
Codec.cpp
ediaDefs.cpp
MXCodec.cpp
3f1ee7c73eb26f339e3307b894115e46b00e2bf1 11-Jan-2016 Dan Stoza <stoza@google.com> Merge "Revert "Revert "libstagefright: Remove direct access to gralloc"""
fe7df6220dbdd2ada97bf195c542c5e399695ed0 11-Jan-2016 Dan Stoza <stoza@google.com> Revert "Revert "libstagefright: Remove direct access to gralloc""

This reverts commit 4de16e73025bca0d8a094576ebff973319ec4ba4.

Change-Id: I3224132ea4e3556a583b0b40d743a3c60f7a32c7
mx/SoftVideoEncoderOMXComponent.cpp
c315acb97bbf3eff3074ac6142d138ab821b63c6 08-Jan-2016 Ying Wang <wangying@android.com> Merge "codecs: update for check ifeq (,arm)" am: 7abffd68a7
am: 899cce3292

* commit '899cce3292319367cb06f8a411c760b20cbd7ee9':
codecs: update for check ifeq ($(TARGET_ARCH),arm)
899cce3292319367cb06f8a411c760b20cbd7ee9 08-Jan-2016 Ying Wang <wangying@android.com> Merge "codecs: update for check ifeq (,arm)"
am: 7abffd68a7

* commit '7abffd68a77a7ed89b75361a671ce4a4cdacd142':
codecs: update for check ifeq ($(TARGET_ARCH),arm)
a14f82000acc7b5f2999e985a0daea22fcd9e914 08-Jan-2016 Dan Stoza <stoza@google.com> Merge "Revert "libstagefright: Remove direct access to gralloc""
4de16e73025bca0d8a094576ebff973319ec4ba4 08-Jan-2016 Dan Stoza <stoza@google.com> Revert "libstagefright: Remove direct access to gralloc"

This reverts commit 8c953e45f3431f8e1c04f8973fe8bdebf7e61033.

Change-Id: I83b3a7c3edf565cb62ea50332025558b5ea3bf2e
mx/SoftVideoEncoderOMXComponent.cpp
48c0e4d19769e176ca23223a667c53958e15b84e 08-Jan-2016 Dan Stoza <stoza@google.com> Merge "libstagefright: Remove direct access to gralloc"
8c953e45f3431f8e1c04f8973fe8bdebf7e61033 08-Jan-2016 Dan Stoza <stoza@google.com> libstagefright: Remove direct access to gralloc

Switches from loading the gralloc module directly to using
GraphicBufferMapper.

Change-Id: Ib4f6e0d5b3fd1cb1747a1a78959e9fa8f3c6864a
mx/SoftVideoEncoderOMXComponent.cpp
86b997dcf1101cdd259460fb4f82204200a9a993 23-Dec-2015 Ronghua Wu <ronghuawu@google.com> libstagefright: keep reference to the codec memory on reclaim

Bug: 26309822
Change-Id: I98b48ad38cf0834c08e004027cb2b5c187c198a0
Codec.cpp
ediaCodec.cpp
dd715cea770697ab6f424df74d69f37def701b30 07-Jan-2016 Hangyu Kuang <hkuang@google.com> Merge "Fix a bug that happend when frame size changed between inter frames."
2339dc7eb6f7d549cae931a16f16099ac3bed13b 03-Nov-2015 Yongqin Liu <yongqin.liu@linaro.org> codecs: update for check ifeq ($(TARGET_ARCH),arm)

This condition check will only pass when compile for 32bit platform.
It will not pass when generate the 32bit binary or libarary for 64bit platform.
update it with variants like LOCAL_SRC_FILES_arm to make it used by
32bit binary or library on 64biy platform as well

Change-Id: Ia887610a97c68fa58925d2d86c5eb29cb397d6ef
Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
ndroid.mk
odecs/aacenc/Android.mk
odecs/amrwbenc/Android.mk
odecs/common/Config.mk
odecs/mp3dec/Android.mk
odecs/on2/h264dec/Android.mk
7c98ddc18d699660bf89df598fb2c13870e85aae 02-Oct-2015 Hangyu Kuang <hkuang@google.com> Fix a bug that happend when frame size changed between inter frames.

Bug: 24270716
Change-Id: I39b133dbeba569acca9b3d733ed6a409d7f6d5e2
odecs/on2/dec/SoftVPX.cpp
265952145aaf24d8b6e002d49675449a85e5ec1d 05-Jan-2016 Marco Nelissen <marcone@google.com> Merge changes I3c40e478,I18003aa2,I16aa3eb0 am: e0d88c4c3b
am: e1b588839c

* commit 'e1b588839ce7b46446ae308e2aa7d17f501319ea':
Disable integer sanitization for amrwbenc
Fix more potential (benign) AMRWB overflows
Fix more amrwbenc overflows
e1b588839ce7b46446ae308e2aa7d17f501319ea 05-Jan-2016 Marco Nelissen <marcone@google.com> Merge changes I3c40e478,I18003aa2,I16aa3eb0
am: e0d88c4c3b

* commit 'e0d88c4c3bb85cf8a60ee26837e6236b53f45cf5':
Disable integer sanitization for amrwbenc
Fix more potential (benign) AMRWB overflows
Fix more amrwbenc overflows
be773c3a8f86a6ee8a0e36c9f9c18055d97edb6f 05-Jan-2016 Marco Nelissen <marcone@google.com> Disable integer sanitization for amrwbenc

Integer sanitization causes too many false positives, and so far all
have been benign or intentional.

Change-Id: I3c40e478e3da31023a635f4ef212873c1fb644f3
odecs/amrwbenc/Android.mk
89a3d233da8c7166e64afe4249130ceda670339c 05-Jan-2016 Marco Nelissen <marcone@google.com> Fix more potential (benign) AMRWB overflows

Bug: 25843966
Change-Id: I18003aa20be1ff0a93473ecd8b4995861bed8c89
odecs/amrwbenc/inc/basic_op.h
odecs/amrwbenc/src/updt_tar.c
9f6cffe4ffbbe354187c241f3a7b14ae7c252726 12-Dec-2015 Marco Nelissen <marcone@google.com> Fix more amrwbenc overflows

Bug: 25843966
Change-Id: I16aa3eb0fc4c8d507b92d3a84139cfef6302c96c
odecs/amrwbenc/src/deemph.c
odecs/amrwbenc/src/math_op.c
odecs/amrwbenc/src/p_med_ol.c
odecs/amrwbenc/src/voAMRWBEnc.c
df9e6aaf716279baf0e27b99acf10005924245ed 29-Dec-2015 Robert Shih <robertshih@google.com> ARTPSource: avoid over/underflow in seq # recovery

Bug: 25801317
Change-Id: Id9a5ad2d6c27f64b502c78f06174b29edb486134
tsp/ARTPSource.cpp
0852f0192662bbdc6572db20e75d921e6d07330f 19-Dec-2015 Marco Nelissen <marcone@google.com> Merge "Don't sniff or create WVM in extractor process"
3001a8a6ed6cdd8cbf6e1ef85c5f47b4825f46db 18-Dec-2015 Marco Nelissen <marcone@google.com> Don't sniff or create WVM in extractor process

Bug: 26071231
Bug: 25995779

Change-Id: I44d93879fe488b1a1156260cb7da9b81722d16f4
ataSource.cpp
ediaExtractor.cpp
ea3c3804cb71dbc0549594ad5ff1790f3f7f74f0 17-Dec-2015 Robert Shih <robertshih@google.com> Merge "CallbackDataSource: return bytes read instead of eos on short read"
40a3f52cc7d4f657f963d9c2b47007fdfd3fc9dd 16-Dec-2015 Robert Shih <robertshih@google.com> CallbackDataSource: return bytes read instead of eos on short read

Bug: 25800374
Change-Id: I17af28f85d68dc964179dda8ddf8874c02f202a5
allbackDataSource.cpp
44333e51c62643e7581022495a2a1f410dd62e27 15-Dec-2015 Marco Nelissen <marcone@google.com> Merge "MediaSource: use shared memory for transferring larger buffers"
83923a3060c471b13d5a103852b3a3979ee5b35e 12-Dec-2015 Marco Nelissen <marcone@google.com> Merge "Fix more amrwbenc overflows"
58996b6fa078bde4b8a68891962b43383848c190 12-Dec-2015 Marco Nelissen <marcone@google.com> Fix more amrwbenc overflows

Bug: 25843966
Change-Id: I16aa3eb0fc4c8d507b92d3a84139cfef6302c96c
odecs/amrwbenc/src/deemph.c
odecs/amrwbenc/src/math_op.c
odecs/amrwbenc/src/p_med_ol.c
odecs/amrwbenc/src/voAMRWBEnc.c
e35ff4de22fec058d57f694e86b906ca8b8007dd 10-Dec-2015 Wei Jia <wjia@google.com> SoftVPXEncoder: keep mCodecContext as NULL when initEncoder fail.

Change-Id: I7d66942f03fee05959a9fe3a3013f0a70594c954
odecs/on2/enc/SoftVPXEncoder.cpp
2c59cc083d471fe55abc61870d05952bd242b738 10-Dec-2015 Wei Jia <wjia@google.com> DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. am: 50270d98e2
am: 1856f1fe34

* commit '1856f1fe348e25c7080c9c8cbd75da21409c179c':
DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder.
50270d98e26fa18b20ca88216c3526667b724ba7 20-Nov-2015 Wei Jia <wjia@google.com> DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder.

Bug: 25812794
Change-Id: I96dc74734380d462583f6efa33d09946f9532809
(cherry picked from commit 87f8cbb223ee516803dbb99699320c2484cbf3ba)
(cherry picked from commit 0462975291796e414891e04bcec9da993914e458)
odecs/m4v_h263/enc/SoftMPEG4Encoder.cpp
odecs/on2/enc/SoftVPXEncoder.cpp
2034457336d28124e0f9f3c625978052ae03fcea 10-Dec-2015 Wei Jia <wjia@google.com> MediaCodec: check buffer size to prevent possible integer overflow for video encoder.

Bug: 25812794

Change-Id: Ib32053bc4d6a2ebe69aa4993dc32f5ab1b13ae81
ediaCodec.cpp
9f2e05eb78524d30b4196cc635bb16daf7557428 09-Dec-2015 Marco Nelissen <marcone@google.com> Merge "Fix overflow in amrwbenc"
am: b135d0e6fb

* commit 'b135d0e6fb57a810882a1488cb0ff670d0e25219':
Fix overflow in amrwbenc
bc8c47e13630ce7cc26f50cfcdfbcd75eb83c754 09-Dec-2015 Marco Nelissen <marcone@google.com> Fix overflow in amrwbenc

This got dropped in a previous merge.

Change-Id: Ic5ec1f6662944deee32e740697fc55774c894033
odecs/amrwbenc/src/preemph.c
7c1615d0009a5e4583d273e4a24bd0b5be2c4f53 09-Dec-2015 Marco Nelissen <marcone@google.com> resolve merge conflicts of 85234a9133 to master.

Change-Id: I6b1b51ac4f15f936e42fadd48deb32e205dfa163
85234a913369fc9182dedfe846efbcf35a4271a1 09-Dec-2015 Marco Nelissen <marcone@google.com> Merge "Tabs -> spaces"
am: e491d0baa3

* commit 'e491d0baa3ed0977182372d84343f5a4025b31cb':
Tabs -> spaces
caf74f7732bcea4fb1a574fe01d93dcf80423cea 09-Dec-2015 Marco Nelissen <marcone@google.com> Merge "Fix overflows in amrwbenc"
am: bcd54f426f

* commit 'bcd54f426f3b7ac18db390cacaf3233225a19253':
Fix overflows in amrwbenc
5d5c3a132bb446ac78a37dfaac24a46cacf0dd73 09-Dec-2015 Marco Nelissen <marcone@google.com> Tabs -> spaces

Change-Id: I706d7ef81a138739996e0fbb2759348c7a4be8a6
odecs/amrwbenc/inc/acelp.h
odecs/amrwbenc/inc/basic_op.h
odecs/amrwbenc/inc/bits.h
odecs/amrwbenc/inc/cod_main.h
odecs/amrwbenc/inc/dtx.h
odecs/amrwbenc/inc/log2.h
odecs/amrwbenc/inc/main.h
odecs/amrwbenc/inc/math_op.h
odecs/amrwbenc/inc/mem_align.h
odecs/amrwbenc/inc/p_med_o.h
odecs/amrwbenc/inc/q_pulse.h
odecs/amrwbenc/inc/stream.h
odecs/amrwbenc/inc/wb_vad.h
odecs/amrwbenc/inc/wb_vad_c.h
odecs/amrwbenc/src/autocorr.c
odecs/amrwbenc/src/az_isp.c
odecs/amrwbenc/src/bits.c
odecs/amrwbenc/src/c2t64fx.c
odecs/amrwbenc/src/c4t64fx.c
odecs/amrwbenc/src/convolve.c
odecs/amrwbenc/src/cor_h_x.c
odecs/amrwbenc/src/decim54.c
odecs/amrwbenc/src/deemph.c
odecs/amrwbenc/src/dtx.c
odecs/amrwbenc/src/g_pitch.c
odecs/amrwbenc/src/gpclip.c
odecs/amrwbenc/src/homing.c
odecs/amrwbenc/src/hp400.c
odecs/amrwbenc/src/hp50.c
odecs/amrwbenc/src/hp6k.c
odecs/amrwbenc/src/hp_wsp.c
odecs/amrwbenc/src/int_lpc.c
odecs/amrwbenc/src/isp_az.c
odecs/amrwbenc/src/isp_isf.c
odecs/amrwbenc/src/lag_wind.c
odecs/amrwbenc/src/levinson.c
odecs/amrwbenc/src/log2.c
odecs/amrwbenc/src/lp_dec2.c
odecs/amrwbenc/src/math_op.c
odecs/amrwbenc/src/mem_align.c
odecs/amrwbenc/src/oper_32b.c
odecs/amrwbenc/src/p_med_ol.c
odecs/amrwbenc/src/pit_shrp.c
odecs/amrwbenc/src/pitch_f4.c
odecs/amrwbenc/src/pred_lt4.c
odecs/amrwbenc/src/preemph.c
odecs/amrwbenc/src/q_gain2.c
odecs/amrwbenc/src/q_pulse.c
odecs/amrwbenc/src/qisf_ns.c
odecs/amrwbenc/src/qpisf_2s.c
odecs/amrwbenc/src/random.c
odecs/amrwbenc/src/residu.c
odecs/amrwbenc/src/scale.c
odecs/amrwbenc/src/stream.c
odecs/amrwbenc/src/syn_filt.c
odecs/amrwbenc/src/updt_tar.c
odecs/amrwbenc/src/util.c
odecs/amrwbenc/src/voAMRWBEnc.c
odecs/amrwbenc/src/voicefac.c
odecs/amrwbenc/src/wb_vad.c
odecs/amrwbenc/src/weight_a.c
13158e7c748c760d238fd5e965805d251fcf2776 08-Dec-2015 Marco Nelissen <marcone@google.com> Fix overflows in amrwbenc

Revert 3cdaed88daeeebfe05e7913837f41c2d92f411cc and
883ff4f4c41ae9bf84d1912ab054fe38f7505dd0, and fix the overflows that
should have been clamped instead of allowed to overflow.

Bug: 25843966
Bug: 23752600

Change-Id: I9af1726d058eb8eeaa80fa8df74fe0a3759486c1
odecs/amrwbenc/src/c2t64fx.c
odecs/amrwbenc/src/c4t64fx.c
odecs/amrwbenc/src/deemph.c
odecs/amrwbenc/src/preemph.c
96d4f4a52e7e5195e5a70c8b6ce1121a2729bfc1 09-Dec-2015 Dan Austin <danielaustin@google.com> Merge "Fix overflows in amrwbenc"
d23f7ef608b3ef917a6f9b371feebc98b74ee485 08-Dec-2015 Marco Nelissen <marcone@google.com> Fix overflows in amrwbenc

Revert 3cdaed88daeeebfe05e7913837f41c2d92f411cc and
883ff4f4c41ae9bf84d1912ab054fe38f7505dd0, and fix the overflows that
should have been clamped instead of allowed to overflow.

Bug: 25843966
Bug: 23752600

Change-Id: I9af1726d058eb8eeaa80fa8df74fe0a3759486c1
odecs/amrwbenc/src/c2t64fx.c
odecs/amrwbenc/src/c4t64fx.c
odecs/amrwbenc/src/deemph.c
odecs/amrwbenc/src/preemph.c
d0ef20e9e91afa734078bc229a5ded8e7e3ab944 09-Dec-2015 Chien-Yu Chen <cychen@google.com> Merge "Camera: Support BufferQueue between Camera and StageFright"
bbe860d522c7ce46eff6de49dab2ff7e4059a3d8 08-Dec-2015 Marco Nelissen <marcone@google.com> Fix integer overflow in amrwbenc

Bug: 25843966
Change-Id: Ib9b37712819d776496b7a06b9e85c5d1e43f9d25
odecs/amrwbenc/src/preemph.c
8cca0750a84c2d97224c0cfef7cf255308ee80b3 14-Nov-2015 Chien-Yu Chen <cychen@google.com> Camera: Support BufferQueue between Camera and StageFright

Use a BufferQueue between Camera and StageFright to pass video
buffers for Camera HALv3 devices.

CameraSource in StageFright will try to use "buffer queue" mode
if it is supported by the camera device. In "buffer queue" mode,
CameraSource creates a buffer queue and a listener thread to recieve
video buffers from camera device. CameraSource then wraps the
ANWBuffer in MediaBuffer. If the camera device doesn't support
"buffer queue" mode, it falls back to "metadata in video buffer"
mode or "real YUV data" mode.

"Metadata in video buffer" mode is removed from Camera2Client and
only "buffer queue" mode is supported.

Bug: 24511454

Change-Id: Ice833b57bcd8d91852d6415402013f56f3e3970a
ameraSource.cpp
3694d7cf40d1645bf05246cf38595eed606bb650 21-Oct-2015 Jaesung Chung <jaesung@google.com> Support for CEA-708 closed caption

Bug: 24314667, Bug: 24889604
Change-Id: Ica8a8405b143921de82ca6075a1f7b1f6f9ff345
ediaDefs.cpp
peg2ts/AnotherPacketSource.cpp
peg2ts/ESQueue.cpp
0a62162accbce87db829869a15eab72eca2607b2 04-Dec-2015 Jean-Michel Trivi <jmtrivi@google.com> Merge "Validation of Number of Channels on WAV files." am: 8ec6ab3bfa am: bc6d05bac1
am: e6b4530d75

* commit 'e6b4530d758f411907ce737b7475c7dc22551a78':
Validation of Number of Channels on WAV files.
e6b4530d758f411907ce737b7475c7dc22551a78 04-Dec-2015 Jean-Michel Trivi <jmtrivi@google.com> Merge "Validation of Number of Channels on WAV files." am: 8ec6ab3bfa
am: bc6d05bac1

* commit 'bc6d05bac14e2a3e7e4a104f6b7e9260b42320f5':
Validation of Number of Channels on WAV files.
bc6d05bac14e2a3e7e4a104f6b7e9260b42320f5 04-Dec-2015 Jean-Michel Trivi <jmtrivi@google.com> Merge "Validation of Number of Channels on WAV files."
am: 8ec6ab3bfa

* commit '8ec6ab3bfa96316fabde6c23acb1e2630acac99b':
Validation of Number of Channels on WAV files.
778d09b607bd01888698c2110b05d3fc86c3b6ec 15-Jun-2015 Niel Alejandro Paz <niel.paz.hernandez@intel.com> Validation of Number of Channels on WAV files.

Corrects the validation of the number of channels that was causing a floating
point exception when this number is zero.
It also corrects the range of admitted channels on WAV files.

Change-Id: I21f005d1f30c1fd93206c6bce0d3be4b8307059c
Signed-off-by: Niel Alejandro Paz <niel.paz.hernandez@intel.com>
Signed-off-by: Vineela Tummalapalli <vineela.tummalapalli@intel.com>
Signed-off-by: Zhiquan Liu <zhiquan.liu@intel.com>
AVExtractor.cpp
9e1d7751b12ea976323abc1fe7760323ab142d39 03-Dec-2015 Wei Jia <wjia@google.com> DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder.
am: 6afc659b00

* commit '6afc659b00c3f4a83b9f5f3c744b7119b33340b4':
DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder.
6afc659b00c3f4a83b9f5f3c744b7119b33340b4 20-Nov-2015 Wei Jia <wjia@google.com> DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder.

Bug: 25812794
Change-Id: I96dc74734380d462583f6efa33d09946f9532809
(cherry picked from commit 87f8cbb223ee516803dbb99699320c2484cbf3ba)
odecs/m4v_h263/enc/SoftMPEG4Encoder.cpp
odecs/on2/enc/SoftVPXEncoder.cpp
0462975291796e414891e04bcec9da993914e458 20-Nov-2015 Wei Jia <wjia@google.com> DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder.

Bug: 25812794
Change-Id: I96dc74734380d462583f6efa33d09946f9532809
(cherry picked from commit 87f8cbb223ee516803dbb99699320c2484cbf3ba)
odecs/m4v_h263/enc/SoftMPEG4Encoder.cpp
odecs/on2/enc/SoftVPXEncoder.cpp
69bd1cf225328e64a5b4ae6935d2b7fe0b7b6400 20-Nov-2015 Wei Jia <wjia@google.com> libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder.

Bug: 25812794
Change-Id: I96dc74734380d462583f6efa33d09946f9532809
(cherry picked from commit 87f8cbb223ee516803dbb99699320c2484cbf3ba)
odecs/m4v_h263/enc/SoftMPEG4Encoder.cpp
odecs/on2/enc/SoftVPXEncoder.cpp
ee25a737a29f6300d52b6dd31ce4c78b73e3cad7 03-Dec-2015 Wei Jia <wjia@google.com> libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. am: 87f8cbb223 am: a022f6e7b7 am: 27affe9ed6
am: 6c44b53bfd

* commit '6c44b53bfd9f3e532c9ac96ddc6e3c3ba36a4ec2':
libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder.
6c44b53bfd9f3e532c9ac96ddc6e3c3ba36a4ec2 03-Dec-2015 Wei Jia <wjia@google.com> libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. am: 87f8cbb223 am: a022f6e7b7
am: 27affe9ed6

* commit '27affe9ed6ca7c25618911e017722e5cfd89e756':
libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder.
27affe9ed6ca7c25618911e017722e5cfd89e756 03-Dec-2015 Wei Jia <wjia@google.com> libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. am: 87f8cbb223
am: a022f6e7b7

* commit 'a022f6e7b7f3ef86095199ef02903051c9a6a08c':
libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder.
a022f6e7b7f3ef86095199ef02903051c9a6a08c 03-Dec-2015 Wei Jia <wjia@google.com> libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder.
am: 87f8cbb223

* commit '87f8cbb223ee516803dbb99699320c2484cbf3ba':
libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder.
d08bf350e15dd7bf47466bdc8efbd23d3272a687 03-Dec-2015 Dan Austin <danielaustin@google.com> Merge "Ignore benign overflows"
883ff4f4c41ae9bf84d1912ab054fe38f7505dd0 03-Dec-2015 Marco Nelissen <marcone@google.com> Ignore benign overflows

Bug: 25843966
Change-Id: I40fe7aee3f40f224c0984a9bbeefb99d364345ac
odecs/amrwbenc/src/c4t64fx.c
327c68cffe13da1614f2fe30f8aad6a8f557af0a 02-Dec-2015 Ronghua Wu <ronghuawu@google.com> Merge "Use oom score instead of process state to indicate process priority."
fa81e4dfe69c972a7da44b0bc945a6ef12366e35 02-Dec-2015 Chris Elliott <chriselliott@google.com> DO NOT MERGE Revert "AwesomePlayer: Separate cache buffer watermarks for offload audio"
am: 3599745287

* commit '35997452876b7ec164534b5267535076597495cd':
DO NOT MERGE Revert "AwesomePlayer: Separate cache buffer watermarks for offload audio"
abab38e493b0efa24bfda1edec3d9d11c32789a6 02-Dec-2015 Chris Elliott <chriselliott@google.com> DO NOT MERGE Revert "AwesomePlayer: Stop posting buffering events once at EOS"
am: 92e4151434

* commit '92e41514344227f0c0cf09e9a989b455c8490fda':
DO NOT MERGE Revert "AwesomePlayer: Stop posting buffering events once at EOS"
35997452876b7ec164534b5267535076597495cd 02-Dec-2015 Chris Elliott <chriselliott@google.com> DO NOT MERGE Revert "AwesomePlayer: Separate cache buffer watermarks for offload audio"

This reverts commit ddbebb92f831784dc143d2cd8492ce690e238744.
wesomePlayer.cpp
92e41514344227f0c0cf09e9a989b455c8490fda 02-Dec-2015 Chris Elliott <chriselliott@google.com> DO NOT MERGE Revert "AwesomePlayer: Stop posting buffering events once at EOS"

This reverts commit 701cac1716d5ddb867a5444ea152d26741f3b397.
wesomePlayer.cpp
221761b3aa3fb5b0160dfef3bab414fcc348dd56 02-Dec-2015 Ronghua Wu <ronghuawu@google.com> Use oom score instead of process state to indicate process priority.

Bug: 25853091
Change-Id: I33fff1b376aa8409914fbae50a9038625cfc5762
rocessInfo.cpp
3f273d10817ddb2f792ae043de692efcdf1988ae 24-Nov-2015 Wei Jia <wjia@google.com> Uses AudioFlinger to signal battery stats for audio.

Bug: 18177221
Change-Id: I704010c037cb99bb74b98798ee8e494fa8bdc875
ediaCodec.cpp
aade72e422e866a24596bd06730b29dba127b9c1 01-Dec-2015 Sridhar Vashist <svashist@motorola.com> AwesomePlayer: Separate cache buffer watermarks for offload audio am: ddbebb92f8
am: c71f9a1b36

* commit 'c71f9a1b36ac8b5dcde889b954f7f35e107b084a':
AwesomePlayer: Separate cache buffer watermarks for offload audio
899e45f5f00e26a7e96be9d9a2ace667db478fab 01-Dec-2015 Sridhar Vashist <svashist@motorola.com> AwesomePlayer: Stop posting buffering events once at EOS am: 701cac1716
am: 586e336c55

* commit '586e336c55b8b6d4db19d62d853382757736f574':
AwesomePlayer: Stop posting buffering events once at EOS
c71f9a1b36ac8b5dcde889b954f7f35e107b084a 01-Dec-2015 Sridhar Vashist <svashist@motorola.com> AwesomePlayer: Separate cache buffer watermarks for offload audio
am: ddbebb92f8

* commit 'ddbebb92f831784dc143d2cd8492ce690e238744':
AwesomePlayer: Separate cache buffer watermarks for offload audio
586e336c55b8b6d4db19d62d853382757736f574 01-Dec-2015 Sridhar Vashist <svashist@motorola.com> AwesomePlayer: Stop posting buffering events once at EOS
am: 701cac1716

* commit '701cac1716d5ddb867a5444ea152d26741f3b397':
AwesomePlayer: Stop posting buffering events once at EOS
5f80c6f508ebafbe81d42177907035731e854c5b 30-Nov-2015 Marco Nelissen <marcone@google.com> Merge "Handle error result from DrmManagerClient correctly" am: f0d7854e93 am: b84a4f9d23
am: 3f27a44e8e

* commit '3f27a44e8ee013527f927cc61f5d765c8b79c590':
Handle error result from DrmManagerClient correctly
3f27a44e8ee013527f927cc61f5d765c8b79c590 30-Nov-2015 Marco Nelissen <marcone@google.com> Merge "Handle error result from DrmManagerClient correctly" am: f0d7854e93
am: b84a4f9d23

* commit 'b84a4f9d23ce757ffc77044725c8beb21d2f859b':
Handle error result from DrmManagerClient correctly
b84a4f9d23ce757ffc77044725c8beb21d2f859b 30-Nov-2015 Marco Nelissen <marcone@google.com> Merge "Handle error result from DrmManagerClient correctly"
am: f0d7854e93

* commit 'f0d7854e93696c4a10c98bc94d7b5f869c80493a':
Handle error result from DrmManagerClient correctly
f0d7854e93696c4a10c98bc94d7b5f869c80493a 30-Nov-2015 Marco Nelissen <marcone@google.com> Merge "Handle error result from DrmManagerClient correctly"
298f3c866c5cdb987d15e1e4fc12692fc971ad63 25-Nov-2015 Wei Jia <wjia@google.com> OMXNodeInstance: check pointers before dereferencing them.

Bug: 25884056
Change-Id: I0c3a717db56d99d3cdf069c1c40a93c4d6391f0b
mx/OMXNodeInstance.cpp
ddbebb92f831784dc143d2cd8492ce690e238744 23-Jul-2015 Sridhar Vashist <svashist@motorola.com> AwesomePlayer: Separate cache buffer watermarks for offload audio

- Using normal playback cache watermarks for offload playback leads to
cache underruns & buffering pauses resulting in choppy audio.
- Add new properties to define cache hi/low watermarks for offload audio.
- Calculate cache buffer levels only based on size for offload audio.

Change-Id: Idb8c1be351678d57490939187079f452a65aebc3
Signed-off-by: Sridhar Vashist <svashist@motorola.com>
wesomePlayer.cpp
701cac1716d5ddb867a5444ea152d26741f3b397 23-Jul-2015 Sridhar Vashist <svashist@motorola.com> AwesomePlayer: Stop posting buffering events once at EOS

Stop posting buffering events once at end of stream to avoid
perpetually holding the 'TimedEventQueue' wakelock in libstagefright.

Change-Id: I3b8012886f2c27e830ce215b14090c35825635cd
Signed-off-by: Sridhar Vashist <svashist@motorola.com>
wesomePlayer.cpp
87f8cbb223ee516803dbb99699320c2484cbf3ba 20-Nov-2015 Wei Jia <wjia@google.com> libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder.

Bug: 25812794
Change-Id: I96dc74734380d462583f6efa33d09946f9532809
odecs/m4v_h263/enc/SoftMPEG4Encoder.cpp
odecs/on2/enc/SoftVPXEncoder.cpp
371ed17f26d789c485f9a082f65e2c80ca651489 19-Nov-2015 Nick Kralevich <nnk@google.com> Merge "Disabling signed integer sanitization in AMR-NB to address MMS audio recording SIGABRT crashes."
f61642b643ba5d694dffd81b6f27b8d90d5700f5 18-Nov-2015 Eino-Ville Talvala <etalvala@google.com> Revert "Enable fsanitize unsigned-integer-overflow in soft MP3 decoder."

Bug: 25737210

This reverts commit 468cbb068efad9a0422d55ed117515184730e9e3.

Change-Id: Ib381000a3b70f71d99d06c197397bb65392748ff
odecs/mp3dec/Android.mk
8fbf6a5f0e33b3d4702b77ff2aa5c44d41dc85fa 18-Nov-2015 Dan Austin <danielaustin@google.com> Disabling signed integer sanitization in AMR-NB to address MMS audio
recording SIGABRT crashes.

Bug: 25656537
Change-Id: I401b2fc8dc0703033d5353b4b69ca12a5e2bd66c
odecs/amrnb/dec/Android.mk
959606c5a5d856ec958708985c101792d3445511 18-Nov-2015 Eino-Ville Talvala <etalvala@google.com> Merge "Revert "Enable fsanitize unsigned-integer-overflow in soft MP3 decoder."" am: bca41e308f
am: 310706d108

* commit '310706d108cd086e148bfbca3a1400ddd98de82c':
Revert "Enable fsanitize unsigned-integer-overflow in soft MP3 decoder."
310706d108cd086e148bfbca3a1400ddd98de82c 18-Nov-2015 Eino-Ville Talvala <etalvala@google.com> Merge "Revert "Enable fsanitize unsigned-integer-overflow in soft MP3 decoder.""
am: bca41e308f

* commit 'bca41e308fc322e27a839448f5eae3337f66b8b7':
Revert "Enable fsanitize unsigned-integer-overflow in soft MP3 decoder."
d5ae360e883215b7862b1f8d318fe469940fe146 18-Nov-2015 Eino-Ville Talvala <etalvala@google.com> Revert "Enable fsanitize unsigned-integer-overflow in soft MP3 decoder."

Bug: 25737210

This reverts commit 468cbb068efad9a0422d55ed117515184730e9e3.

Change-Id: Ib381000a3b70f71d99d06c197397bb65392748ff
odecs/mp3dec/Android.mk
b65990f4a0cf01db0b9f21c68fcf8824ae03a178 10-Nov-2015 Marco Nelissen <marcone@google.com> MediaSource: use shared memory for transferring larger buffers

For small buffers we still copy the data as part of the binder transaction,
since that saves one extra binder call, but for buffers > 64KB we now use
shared memory.

Change-Id: I19aad7ea7f6104991b9b6b4f24ea880b54f739be
oundation/MediaBuffer.cpp
ce2178be50a097a690ed26f940e5d5630ed2dbb1 13-Nov-2015 Dan Austin <danielaustin@google.com> Merge "Enable fsanitize unsigned-integer-overflow in all parts of AAC encoder." am: 34a2040fc9 am: d0bdb58f37
am: 20f8564924

* commit '20f8564924e688c74570a6c66b8c0cb966948fec':
Enable fsanitize unsigned-integer-overflow in all parts of AAC encoder.
8ff247e1faa4f545289e246510cdf91cfec1a34b 13-Nov-2015 Dan Austin <danielaustin@google.com> Merge "Enable fsanitize unsigned-integer-overflow in Vorbis soft decoder." am: 9322fa0cca am: f6d3d31276
am: c243b0f78a

* commit 'c243b0f78ab09a2fce36d4e77f2fcbd4f9f18786':
Enable fsanitize unsigned-integer-overflow in Vorbis soft decoder.
5c67b425b482e14cad0d6a157b5d0041cf8af60e 13-Nov-2015 Dan Austin <danielaustin@google.com> Merge "Enable fsanitize unsigned-integer-overflow in raw codecs." am: c8ab43aefb am: 25a9cf2138
am: d76ea7b740

* commit 'd76ea7b7402f44cf943f2bd161fa35c72475a563':
Enable fsanitize unsigned-integer-overflow in raw codecs.
ea3b9bb5ac821b213a4b1089bf5523a5c86f971b 13-Nov-2015 Dan Austin <danielaustin@google.com> Merge "Enable fsanitize unsigned-integer-overflow in soft Opus decoder." am: 89a1faee2c am: 787aca9d4f
am: e7c3c65da7

* commit 'e7c3c65da734ebb070d0d56db5bf94bc2f572dd5':
Enable fsanitize unsigned-integer-overflow in soft Opus decoder.
e98e7d2dcb30dd5a90bc2819fa5092963ac04080 13-Nov-2015 Dan Austin <danielaustin@google.com> Merge "Enable fsanitize unsigned-integer-overflow in Soft VPX codec." am: aa7ce1c4b0 am: e371100e74
am: 4c08b4bd1d

* commit '4c08b4bd1dfbb6e8e49492b7f7fc9dc8ed204f5d':
Enable fsanitize unsigned-integer-overflow in Soft VPX codec.
eaa5c12286a5d1a6f7773dccbe71f75454e54c70 13-Nov-2015 Dan Austin <danielaustin@google.com> Merge "Enable fsanitize unsigned-integer-overflow in soft MP3 decoder." am: 7683f00f3c am: 5b85c3410f
am: cabb9123b6

* commit 'cabb9123b60f5bf8125690d16b891a0996db063c':
Enable fsanitize unsigned-integer-overflow in soft MP3 decoder.
ce4d7aabeb93620efd0eb8d5c66e4cad5b8e053d 13-Nov-2015 Dan Austin <danielaustin@google.com> Merge "Enable fsanitize unsigned-integer-overflow in soft FLAC encoder." am: d03078bc7b am: f1a3aa633c
am: 714685656c

* commit '714685656c8ae56ca35e57cd56fa842574adfed1':
Enable fsanitize unsigned-integer-overflow in soft FLAC encoder.
20f8564924e688c74570a6c66b8c0cb966948fec 12-Nov-2015 Dan Austin <danielaustin@google.com> Merge "Enable fsanitize unsigned-integer-overflow in all parts of AAC encoder." am: 34a2040fc9
am: d0bdb58f37

* commit 'd0bdb58f37742a6ce7986dc2d96294e7925264aa':
Enable fsanitize unsigned-integer-overflow in all parts of AAC encoder.
c243b0f78ab09a2fce36d4e77f2fcbd4f9f18786 12-Nov-2015 Dan Austin <danielaustin@google.com> Merge "Enable fsanitize unsigned-integer-overflow in Vorbis soft decoder." am: 9322fa0cca
am: f6d3d31276

* commit 'f6d3d312768509d1cc2a4bcb23586263dbfb312e':
Enable fsanitize unsigned-integer-overflow in Vorbis soft decoder.
d76ea7b7402f44cf943f2bd161fa35c72475a563 12-Nov-2015 Dan Austin <danielaustin@google.com> Merge "Enable fsanitize unsigned-integer-overflow in raw codecs." am: c8ab43aefb
am: 25a9cf2138

* commit '25a9cf21381ef0bdb1afd8883c4ed2723d4bfdd3':
Enable fsanitize unsigned-integer-overflow in raw codecs.
e7c3c65da734ebb070d0d56db5bf94bc2f572dd5 12-Nov-2015 Dan Austin <danielaustin@google.com> Merge "Enable fsanitize unsigned-integer-overflow in soft Opus decoder." am: 89a1faee2c
am: 787aca9d4f

* commit '787aca9d4fdc43bc0e68ca27d1bbff939e02d9de':
Enable fsanitize unsigned-integer-overflow in soft Opus decoder.
4c08b4bd1dfbb6e8e49492b7f7fc9dc8ed204f5d 12-Nov-2015 Dan Austin <danielaustin@google.com> Merge "Enable fsanitize unsigned-integer-overflow in Soft VPX codec." am: aa7ce1c4b0
am: e371100e74

* commit 'e371100e745aec1f5b0ee1a3f7a2cdd9f1702b4f':
Enable fsanitize unsigned-integer-overflow in Soft VPX codec.
cabb9123b60f5bf8125690d16b891a0996db063c 12-Nov-2015 Dan Austin <danielaustin@google.com> Merge "Enable fsanitize unsigned-integer-overflow in soft MP3 decoder." am: 7683f00f3c
am: 5b85c3410f

* commit '5b85c3410f8ca90a43b7a3d0b93ed6628d1291f2':
Enable fsanitize unsigned-integer-overflow in soft MP3 decoder.
714685656c8ae56ca35e57cd56fa842574adfed1 12-Nov-2015 Dan Austin <danielaustin@google.com> Merge "Enable fsanitize unsigned-integer-overflow in soft FLAC encoder." am: d03078bc7b
am: f1a3aa633c

* commit 'f1a3aa633caa066adc75cb566caa53b6999ce6fc':
Enable fsanitize unsigned-integer-overflow in soft FLAC encoder.
d0bdb58f37742a6ce7986dc2d96294e7925264aa 12-Nov-2015 Dan Austin <danielaustin@google.com> Merge "Enable fsanitize unsigned-integer-overflow in all parts of AAC encoder."
am: 34a2040fc9

* commit '34a2040fc9276c4a9d9adec94845d75584b3b620':
Enable fsanitize unsigned-integer-overflow in all parts of AAC encoder.
f6d3d312768509d1cc2a4bcb23586263dbfb312e 12-Nov-2015 Dan Austin <danielaustin@google.com> Merge "Enable fsanitize unsigned-integer-overflow in Vorbis soft decoder."
am: 9322fa0cca

* commit '9322fa0cca6e538353983f4aa33c2eead594e269':
Enable fsanitize unsigned-integer-overflow in Vorbis soft decoder.
25a9cf21381ef0bdb1afd8883c4ed2723d4bfdd3 12-Nov-2015 Dan Austin <danielaustin@google.com> Merge "Enable fsanitize unsigned-integer-overflow in raw codecs."
am: c8ab43aefb

* commit 'c8ab43aefbeb1cc76288c12acbf8234f34b8cf04':
Enable fsanitize unsigned-integer-overflow in raw codecs.
787aca9d4fdc43bc0e68ca27d1bbff939e02d9de 12-Nov-2015 Dan Austin <danielaustin@google.com> Merge "Enable fsanitize unsigned-integer-overflow in soft Opus decoder."
am: 89a1faee2c

* commit '89a1faee2c9f155bc51adbb574ccaf0e4080d563':
Enable fsanitize unsigned-integer-overflow in soft Opus decoder.
e371100e745aec1f5b0ee1a3f7a2cdd9f1702b4f 12-Nov-2015 Dan Austin <danielaustin@google.com> Merge "Enable fsanitize unsigned-integer-overflow in Soft VPX codec."
am: aa7ce1c4b0

* commit 'aa7ce1c4b0099c5449aa2db9636610c10621864a':
Enable fsanitize unsigned-integer-overflow in Soft VPX codec.
5b85c3410f8ca90a43b7a3d0b93ed6628d1291f2 12-Nov-2015 Dan Austin <danielaustin@google.com> Merge "Enable fsanitize unsigned-integer-overflow in soft MP3 decoder."
am: 7683f00f3c

* commit '7683f00f3ca2d29889edd4dc00789f41025c75bb':
Enable fsanitize unsigned-integer-overflow in soft MP3 decoder.
f1a3aa633caa066adc75cb566caa53b6999ce6fc 12-Nov-2015 Dan Austin <danielaustin@google.com> Merge "Enable fsanitize unsigned-integer-overflow in soft FLAC encoder."
am: d03078bc7b

* commit 'd03078bc7bf490a60bc08763c7d0b5798892a854':
Enable fsanitize unsigned-integer-overflow in soft FLAC encoder.
34a2040fc9276c4a9d9adec94845d75584b3b620 12-Nov-2015 Dan Austin <danielaustin@google.com> Merge "Enable fsanitize unsigned-integer-overflow in all parts of AAC encoder."
9322fa0cca6e538353983f4aa33c2eead594e269 12-Nov-2015 Dan Austin <danielaustin@google.com> Merge "Enable fsanitize unsigned-integer-overflow in Vorbis soft decoder."
c8ab43aefbeb1cc76288c12acbf8234f34b8cf04 12-Nov-2015 Dan Austin <danielaustin@google.com> Merge "Enable fsanitize unsigned-integer-overflow in raw codecs."
89a1faee2c9f155bc51adbb574ccaf0e4080d563 12-Nov-2015 Dan Austin <danielaustin@google.com> Merge "Enable fsanitize unsigned-integer-overflow in soft Opus decoder."
aa7ce1c4b0099c5449aa2db9636610c10621864a 12-Nov-2015 Dan Austin <danielaustin@google.com> Merge "Enable fsanitize unsigned-integer-overflow in Soft VPX codec."
7683f00f3ca2d29889edd4dc00789f41025c75bb 12-Nov-2015 Dan Austin <danielaustin@google.com> Merge "Enable fsanitize unsigned-integer-overflow in soft MP3 decoder."
d03078bc7bf490a60bc08763c7d0b5798892a854 12-Nov-2015 Dan Austin <danielaustin@google.com> Merge "Enable fsanitize unsigned-integer-overflow in soft FLAC encoder."
e8b0ace57c2614374decc6f8d1c1daa32fc8a361 12-Nov-2015 Marco Nelissen <marcone@google.com> Merge "Handle malformed audio packets received during RTSP stream switching" am: 6e9e6336e8 am: 5be284fc4a
am: 11999d96cf

* commit '11999d96cf59c4e9ae79a323f233b455f36cae2a':
Handle malformed audio packets received during RTSP stream switching
11999d96cf59c4e9ae79a323f233b455f36cae2a 12-Nov-2015 Marco Nelissen <marcone@google.com> Merge "Handle malformed audio packets received during RTSP stream switching" am: 6e9e6336e8
am: 5be284fc4a

* commit '5be284fc4a827d24804c6d56b0803f129a44163b':
Handle malformed audio packets received during RTSP stream switching
5be284fc4a827d24804c6d56b0803f129a44163b 12-Nov-2015 Marco Nelissen <marcone@google.com> Merge "Handle malformed audio packets received during RTSP stream switching"
am: 6e9e6336e8

* commit '6e9e6336e8c7fb3277ff1f1bd880cd74bececef9':
Handle malformed audio packets received during RTSP stream switching
6e9e6336e8c7fb3277ff1f1bd880cd74bececef9 12-Nov-2015 Marco Nelissen <marcone@google.com> Merge "Handle malformed audio packets received during RTSP stream switching"
863a726ba8853ba7daba1e792d257be82ef0cdbb 07-Nov-2015 Dan Austin <danielaustin@google.com> Enable fsanitize unsigned-integer-overflow in soft FLAC encoder.

Bug: 23110888
Change-Id: I4c06c4c77207264c6b7bda925903a7ae07dc9b39
odecs/flac/enc/Android.mk
468cbb068efad9a0422d55ed117515184730e9e3 07-Nov-2015 Dan Austin <danielaustin@google.com> Enable fsanitize unsigned-integer-overflow in soft MP3 decoder.

Bug: 23110888
Change-Id: Ife8172c2d76638d61691a18b11aad1b70bb0c537
odecs/mp3dec/Android.mk
d3fa4ab911d9d501b966048cc2e5a1901fcae8a6 07-Nov-2015 Dan Austin <danielaustin@google.com> Enable fsanitize unsigned-integer-overflow in Soft VPX codec.

Bug: 23110888
Change-Id: Iad62446c2f06992defcead0630ec578e897174e0
odecs/on2/dec/Android.mk
odecs/on2/enc/Android.mk
ba495a171ee009ffed33fed81f76d980a5b65ce0 07-Nov-2015 Dan Austin <danielaustin@google.com> Enable fsanitize unsigned-integer-overflow in soft Opus decoder.

Bug: 23110888
Change-Id: I8ba2b743aa9bfb2afcd6fa611f6d3d00f550fbc6
odecs/opus/dec/Android.mk
c256e33edca8dcadefe660a5358b503c91471a74 07-Nov-2015 Dan Austin <danielaustin@google.com> Enable fsanitize unsigned-integer-overflow in raw codecs.

Bug: 23110888
Change-Id: I60baa1243ce012d635c365fb9c8c7b492971f886
odecs/raw/Android.mk
6d78f10b716c67782ccb2d8479c976eb72c434e6 07-Nov-2015 Dan Austin <danielaustin@google.com> Enable fsanitize unsigned-integer-overflow in Vorbis soft decoder.

Bug: 23110888
Change-Id: I76cde1090f4c76147ec7c4ce21a34dddbe1e0e13
odecs/vorbis/dec/Android.mk
8b8614209a17941feb0ca1bc844c97355b71fbf6 07-Nov-2015 Dan Austin <danielaustin@google.com> Enable fsanitize unsigned-integer-overflow in all parts of AAC encoder.

Bug: 23110888
Change-Id: I19915a4990de29101ec64d38c034cb8dad628662
odecs/aacenc/Android.mk
808e3d55dfafd6fc8f53827c668668144a706253 11-Nov-2015 Dan Austin <danielaustin@google.com> Disabling signed integer overflow protection.

Likely benign integer overflows in the AMR-NB encoder are
causing SIGABRTs under normal speech processing. Disabling
this protection until bug 25597150 is resolved and further
testing can be performed.

Bug: 25409744
Change-Id: Ib40d2e03b84c73c573eca637253ed68977986b11
odecs/amrnb/common/Android.mk
odecs/amrnb/enc/Android.mk
25283404e022cd23d61befaa3c7ba379c05e8f99 10-Nov-2015 Marco Nelissen <marcone@google.com> Merge "Fix overflow check so it doesn\'t reject legitimate files" am: 7534cb3a36 am: 7e15026485
am: e00d020b52

* commit 'e00d020b52894a001b25fddff511238f259a6f6c':
Fix overflow check so it doesn't reject legitimate files
e00d020b52894a001b25fddff511238f259a6f6c 10-Nov-2015 Marco Nelissen <marcone@google.com> Merge "Fix overflow check so it doesn\'t reject legitimate files" am: 7534cb3a36
am: 7e15026485

* commit '7e150264857034bd308fdb791e0de0d618f3e231':
Fix overflow check so it doesn't reject legitimate files
7e150264857034bd308fdb791e0de0d618f3e231 10-Nov-2015 Marco Nelissen <marcone@google.com> Merge "Fix overflow check so it doesn\'t reject legitimate files"
am: 7534cb3a36

* commit '7534cb3a36f506f6e2e1cec2e823dad35c5393e9':
Fix overflow check so it doesn't reject legitimate files
929c486b9c33e7c533c363e408614e7083c17156 10-Nov-2015 Marco Nelissen <marcone@google.com> Fix overflow check so it doesn't reject legitimate files

Change-Id: Id2a25af287f2d06755ebdf133fcea166a6767a27
ampleTable.cpp
74e0f3a620bd0cdfb153728e99a17a96ca3db0de 03-Nov-2015 Bill Yi <byi@google.com> Merge commit 'f71d2618532e73db5c01e3c00595d7d2ab2cff3e' into HEAD
107911856908c27228a9e0d1a9b9f0ce120ee383 03-Nov-2015 Dan Austin <danielaustin@google.com> Merge "Enable fsanitize unsigned-integer-overflow in GSM soft decoder" am: 9cc6bb627e
am: 9a7661ae0a

* commit '9a7661ae0a0fba9a8b4c20b73e9c29d894a96d25':
Enable fsanitize unsigned-integer-overflow in GSM soft decoder
1613cfb84df57e8e62785ef4707cb317681902e4 03-Nov-2015 Dan Austin <danielaustin@google.com> Merge "Enable fsanitize-unsigned-integer for G711 soft decoder." am: f2adcac323
am: 158e65e4ae

* commit '158e65e4ae68925e5bad201f16834f1f02bd61f3':
Enable fsanitize-unsigned-integer for G711 soft decoder.
860ddc47ccc09913c8af36e2e2fcdac45084229d 03-Nov-2015 Dan Austin <danielaustin@google.com> Merge "Enabling fsanitize unsigned-integer-overflow in AMR-NB codecs" am: 51305b8831
am: 6daf873296

* commit '6daf873296d1a8f5ea69d3615831bbe9f9056b42':
Enabling fsanitize unsigned-integer-overflow in AMR-NB codecs
9a7661ae0a0fba9a8b4c20b73e9c29d894a96d25 03-Nov-2015 Dan Austin <danielaustin@google.com> Merge "Enable fsanitize unsigned-integer-overflow in GSM soft decoder"
am: 9cc6bb627e

* commit '9cc6bb627e9683149f3d3f0609a83b8f14be7fde':
Enable fsanitize unsigned-integer-overflow in GSM soft decoder
9cc6bb627e9683149f3d3f0609a83b8f14be7fde 03-Nov-2015 Dan Austin <danielaustin@google.com> Merge "Enable fsanitize unsigned-integer-overflow in GSM soft decoder"
158e65e4ae68925e5bad201f16834f1f02bd61f3 03-Nov-2015 Dan Austin <danielaustin@google.com> Merge "Enable fsanitize-unsigned-integer for G711 soft decoder."
am: f2adcac323

* commit 'f2adcac3233c0ca68f7a882bfb9ecacb5c2331af':
Enable fsanitize-unsigned-integer for G711 soft decoder.
73ba11ec73c24060111eb849787f7004d243b76d 03-Nov-2015 Dan Austin <danielaustin@google.com> Enable fsanitize unsigned-integer-overflow in GSM soft decoder

Bug: 23110888
Change-Id: I7361eb0253408c6d50a01d67db6f380a39cb2074
odecs/gsm/dec/Android.mk
6daf873296d1a8f5ea69d3615831bbe9f9056b42 03-Nov-2015 Dan Austin <danielaustin@google.com> Merge "Enabling fsanitize unsigned-integer-overflow in AMR-NB codecs"
am: 51305b8831

* commit '51305b8831aaaf4ef4dbc52e29c6b897bac25b18':
Enabling fsanitize unsigned-integer-overflow in AMR-NB codecs
f2adcac3233c0ca68f7a882bfb9ecacb5c2331af 03-Nov-2015 Dan Austin <danielaustin@google.com> Merge "Enable fsanitize-unsigned-integer for G711 soft decoder."
fc37612e6838d9d9435bbee147c8b0a57d86de18 03-Nov-2015 Dan Austin <danielaustin@google.com> Enable fsanitize-unsigned-integer for G711 soft decoder.

Enable fsanitize-unsigned-integer for the G711 soft decoder
and refactor the while loops in DecodeALaw and DecodeMLaw
to not trigger the sanitizer upon completion.

Bug: 23110888
Change-Id: I473b430279ab21e9e7c4f854cdae449a53ad82bc
odecs/g711/dec/Android.mk
odecs/g711/dec/SoftG711.cpp
b875f69d8e867cb64bd101e66d85a880537c2b72 03-Nov-2015 Dan Austin <danielaustin@google.com> Enabling fsanitize unsigned-integer-overflow in AMR-NB codecs

Enables fsanitize unsigned integer overflow in the AMR-NB codecs
and disables integer sanitization for the Chebps, sub, and
Syn_filt functions which contain controlled integer overflow
conditions.

Bug: 23110888
Change-Id: I036aa0e94f39e30c2d90be86d9b8f1b169f56245
odecs/amrnb/common/Android.mk
odecs/amrnb/common/src/az_lsp.cpp
odecs/amrnb/common/src/sub.cpp
odecs/amrnb/common/src/syn_filt.cpp
ae0dd12d85bdf93a20be49e0bbc9b97a2dd3c3e7 30-Oct-2015 Marco Nelissen <marcone@google.com> Merge "MatroskaExtractor: don\'t use new buffer unless necessary" am: 8e3db8fc87 am: 28c7c2e598
am: e9ce1b1476

* commit 'e9ce1b1476ecaa29a845213de9ae1e749fb7d7b6':
MatroskaExtractor: don't use new buffer unless necessary
e9ce1b1476ecaa29a845213de9ae1e749fb7d7b6 30-Oct-2015 Marco Nelissen <marcone@google.com> Merge "MatroskaExtractor: don\'t use new buffer unless necessary" am: 8e3db8fc87
am: 28c7c2e598

* commit '28c7c2e598caab793291bc6bffde0efedf235d87':
MatroskaExtractor: don't use new buffer unless necessary
28c7c2e598caab793291bc6bffde0efedf235d87 30-Oct-2015 Marco Nelissen <marcone@google.com> Merge "MatroskaExtractor: don\'t use new buffer unless necessary"
am: 8e3db8fc87

* commit '8e3db8fc87e5028f02134fa791834f57faafb637':
MatroskaExtractor: don't use new buffer unless necessary
4c9512845dd21c865fcbcb5518800783db010809 30-Oct-2015 Ronghua Wu <ronghuawu@google.com> Merge "ALooper::awaitResponse gets reply and returns immediately if the looper is stopped." into mnc-dr-dev am: 1d29e126cf am: 06195062e6
am: f2f0745681

* commit 'f2f0745681801741fe4511dbc767acd3fd09f81d':
ALooper::awaitResponse gets reply and returns immediately if the looper is stopped.
f2f0745681801741fe4511dbc767acd3fd09f81d 30-Oct-2015 Ronghua Wu <ronghuawu@google.com> Merge "ALooper::awaitResponse gets reply and returns immediately if the looper is stopped." into mnc-dr-dev am: 1d29e126cf
am: 06195062e6

* commit '06195062e6b65b342b70cb1299ff278340eba9ff':
ALooper::awaitResponse gets reply and returns immediately if the looper is stopped.
ba29bb20a18aa98813ce42f99cff4910a153e87c 29-Oct-2015 Marco Nelissen <marcone@google.com> MatroskaExtractor: don't use new buffer unless necessary

When the NAL size length is 4 bytes, we can store the start code in the space
occupied by the NAL size length and avoid allocating a new buffer and copying
the data into it.
Also fix potential memory leak.

Change-Id: I29dd72a0616dfae66ddd7b7f9478678e356df440
atroska/MatroskaExtractor.cpp
d5e5b15ddb2fe23dd7183c03cdaf16c67cb35d7c 28-Oct-2015 Marco Nelissen <marcone@google.com> Fix 64 bit build

Change-Id: Iab51e61e649c322dbe3c592ee0f3bfb3c273af05
ediaExtractor.cpp
9a40167c3dc32fccc72abd96f03df6ea5676793b 28-Oct-2015 Marco Nelissen <marcone@google.com> Merge "Extractor service"
b2487f03f12dcafdb801fc0007c8df8412397f44 01-Sep-2015 Marco Nelissen <marcone@google.com> Extractor service

Run extractors in a separate process. Currently all data is copied through a
binder transaction, and WVMExtractor is still run in the mediaserver process.

Change-Id: Ic5dbce87126dd321ad792f4dd540c2ff6b068d13
ACExtractor.cpp
ACWriter.cpp
MRExtractor.cpp
MRWriter.cpp
ndroid.mk
udioPlayer.cpp
wesomePlayer.cpp
RMExtractor.cpp
LACExtractor.cpp
P3Extractor.cpp
PEG2TSWriter.cpp
PEG4Extractor.cpp
PEG4Writer.cpp
ediaBuffer.cpp
ediaExtractor.cpp
ediaSource.cpp
etaData.cpp
idiExtractor.cpp
uMediaExtractor.cpp
MXCodec.cpp
ggExtractor.cpp
tagefrightMetadataRetriever.cpp
AVExtractor.cpp
VMExtractor.cpp
odecs/aacenc/AACEncoder.cpp
oundation/Android.mk
oundation/MediaBuffer.cpp
oundation/MetaData.cpp
nclude/AACEncoder.h
nclude/AACExtractor.h
nclude/AMRExtractor.h
nclude/AwesomePlayer.h
nclude/DRMExtractor.h
nclude/FLACExtractor.h
nclude/MP3Extractor.h
nclude/MPEG2PSExtractor.h
nclude/MPEG2TSExtractor.h
nclude/MPEG4Extractor.h
nclude/MidiExtractor.h
nclude/OggExtractor.h
nclude/StagefrightMetadataRetriever.h
nclude/WAVExtractor.h
nclude/WVMExtractor.h
atroska/MatroskaExtractor.cpp
atroska/MatroskaExtractor.h
peg2ts/MPEG2PSExtractor.cpp
peg2ts/MPEG2TSExtractor.cpp
mx/tests/OMXHarness.cpp
tsp/ARTPWriter.cpp
tsp/ARTPWriter.h
imedtext/TimedText3GPPSource.cpp
imedtext/TimedText3GPPSource.h
imedtext/TimedTextDriver.cpp
imedtext/TimedTextSource.cpp
imedtext/TimedTextSource.h
ebm/WebmFrameThread.cpp
ebm/WebmFrameThread.h
ebm/WebmWriter.cpp
ebm/WebmWriter.h
7350b057ca864f5dc9e53d48e34710a8e81133f8 02-Oct-2015 Robert Shih <robertshih@google.com> Don't re-scan sources if no new ones will appear

The only scenario we might need to re-scan is when switching between
bitrate variants in HTTPLiveSources.

Bug: 23313819
Change-Id: I892033c8698f985de74801c39ac5b5417ed19e89
ttplive/LiveSession.cpp
146427dcdad5c3b23d9ab1a5a6416551f1f110af 27-Oct-2015 Marco Nelissen <marcone@google.com> Merge "Remove possible div by zero in WavExtractor" am: acd2186aa2 am: b8e13b1b1a
am: ce92aba3ab

* commit 'ce92aba3ab05f7d653908acc7e9be73128dd5ccd':
Remove possible div by zero in WavExtractor
ce92aba3ab05f7d653908acc7e9be73128dd5ccd 27-Oct-2015 Marco Nelissen <marcone@google.com> Merge "Remove possible div by zero in WavExtractor" am: acd2186aa2
am: b8e13b1b1a

* commit 'b8e13b1b1a7749e54641efbef32d5cf49933cba2':
Remove possible div by zero in WavExtractor
b8e13b1b1a7749e54641efbef32d5cf49933cba2 27-Oct-2015 Marco Nelissen <marcone@google.com> Merge "Remove possible div by zero in WavExtractor"
am: acd2186aa2

* commit 'acd2186aa239efa58b202823083c1b8dbc1c8a16':
Remove possible div by zero in WavExtractor
acd2186aa239efa58b202823083c1b8dbc1c8a16 27-Oct-2015 Marco Nelissen <marcone@google.com> Merge "Remove possible div by zero in WavExtractor"
762b56bc316c484b9e7f199416e4c8e107bb7331 27-Oct-2015 Dan Austin <danielaustin@google.com> Merge "Enable fsanitize signed-integer-overflow in Soft MPEG3 decoder" am: 58fdf7cc01 am: 6b72f15d56
am: 603bcd1409

* commit '603bcd140906924c56eed51e012713862185ddb7':
Enable fsanitize signed-integer-overflow in Soft MPEG3 decoder
eb6be4c83fddc47f666ed8e1f126aeacc7cd62e3 27-Oct-2015 Dan Austin <danielaustin@google.com> Merge "Enable fsanitize signed-integer-overflow in Soft MPEG2 decoder" am: 571590fd92 am: 0f7c7fb8be
am: b59d9a87ac

* commit 'b59d9a87ac3bf2c2981e49bab31ed7e89398b38a':
Enable fsanitize signed-integer-overflow in Soft MPEG2 decoder
976c68be3d04f80f26d7f772cc5f925e46bc16d5 27-Oct-2015 Dan Austin <danielaustin@google.com> Merge "Enable fsanitize signed-integer-overflow in Soft VPX decoder" am: 3e292cb4b1 am: a848be06f0
am: 78b0170c16

* commit '78b0170c16b450f339f42afb422ffe2de3930216':
Enable fsanitize signed-integer-overflow in Soft VPX decoder
f87142415abc152dcfe25d3e520d7d7c477cbe71 27-Oct-2015 Dan Austin <danielaustin@google.com> Merge "Enable fsanitize signed-integer-overflow in Soft VPX encoder" am: 6cd07e81ad am: bfc066c23e
am: 09bfcbe1b4

* commit '09bfcbe1b4d1c14a526b4bc27cbaba70785dcaca':
Enable fsanitize signed-integer-overflow in Soft VPX encoder
d27db106bd683915b24a54891958a526f85df047 27-Oct-2015 Dan Austin <danielaustin@google.com> Merge "Enable fsanitize signed-integer-overflow in on2 soft H.264 decoder" am: 0fa22e8fbc am: c46b63fc3b
am: b8b88337c6

* commit 'b8b88337c6260cf7c4152a380ac7a344dd649272':
Enable fsanitize signed-integer-overflow in on2 soft H.264 decoder
a2b81b6447958ceb50c8d7347a7a0ad465b88f5c 27-Oct-2015 Dan Austin <danielaustin@google.com> Merge "Enable fsanitize signed-integer-overflow in Soft MPEG4 encoder" am: a6d91eea06 am: 2ded8a0dd9
am: 31eebbb0c5

* commit '31eebbb0c5e9653e5eaf7d34ff1f88cf9ef4727e':
Enable fsanitize signed-integer-overflow in Soft MPEG4 encoder
603bcd140906924c56eed51e012713862185ddb7 27-Oct-2015 Dan Austin <danielaustin@google.com> Merge "Enable fsanitize signed-integer-overflow in Soft MPEG3 decoder" am: 58fdf7cc01
am: 6b72f15d56

* commit '6b72f15d56a8ec9b37b8aa48d9b75ac26ddd3d7e':
Enable fsanitize signed-integer-overflow in Soft MPEG3 decoder
f851c2ad6a0477da0dd52768c4e00a01b22a365f 27-Oct-2015 Dan Austin <danielaustin@google.com> Merge "Enable fsanitize signed-integer-overflow in Soft MPEG4 decoder." am: 5b2454f61b am: 3ebba77e5e
am: 94d40720ca

* commit '94d40720ca7f0210e35abb89b0014b84a04cfd19':
Enable fsanitize signed-integer-overflow in Soft MPEG4 decoder.
b59d9a87ac3bf2c2981e49bab31ed7e89398b38a 27-Oct-2015 Dan Austin <danielaustin@google.com> Merge "Enable fsanitize signed-integer-overflow in Soft MPEG2 decoder" am: 571590fd92
am: 0f7c7fb8be

* commit '0f7c7fb8befd004760b12acf1d4e66dc1514d8b8':
Enable fsanitize signed-integer-overflow in Soft MPEG2 decoder
f0dacf28d686282358335b1a2f9a01bd9331c83d 27-Oct-2015 Dan Austin <danielaustin@google.com> Merge "Disable integer overflow sanitization in select functions." am: ab8685d990 am: cdd878b3a1
am: 1df2378d8e

* commit '1df2378d8e7d70d11088de877a1c23e7b30e2f38':
Disable integer overflow sanitization in select functions.
78b0170c16b450f339f42afb422ffe2de3930216 27-Oct-2015 Dan Austin <danielaustin@google.com> Merge "Enable fsanitize signed-integer-overflow in Soft VPX decoder" am: 3e292cb4b1
am: a848be06f0

* commit 'a848be06f05a264b70bcc54eb604e74a4e19ae1e':
Enable fsanitize signed-integer-overflow in Soft VPX decoder
09bfcbe1b4d1c14a526b4bc27cbaba70785dcaca 27-Oct-2015 Dan Austin <danielaustin@google.com> Merge "Enable fsanitize signed-integer-overflow in Soft VPX encoder" am: 6cd07e81ad
am: bfc066c23e

* commit 'bfc066c23e576abdc8165977cc71b18ac4bfcf54':
Enable fsanitize signed-integer-overflow in Soft VPX encoder
b8b88337c6260cf7c4152a380ac7a344dd649272 27-Oct-2015 Dan Austin <danielaustin@google.com> Merge "Enable fsanitize signed-integer-overflow in on2 soft H.264 decoder" am: 0fa22e8fbc
am: c46b63fc3b

* commit 'c46b63fc3bd603bb76d124a8be04a026d52b3cae':
Enable fsanitize signed-integer-overflow in on2 soft H.264 decoder
31eebbb0c5e9653e5eaf7d34ff1f88cf9ef4727e 27-Oct-2015 Dan Austin <danielaustin@google.com> Merge "Enable fsanitize signed-integer-overflow in Soft MPEG4 encoder" am: a6d91eea06
am: 2ded8a0dd9

* commit '2ded8a0dd9aba74c92a238f220e41e6ef7d91a83':
Enable fsanitize signed-integer-overflow in Soft MPEG4 encoder
6b72f15d56a8ec9b37b8aa48d9b75ac26ddd3d7e 27-Oct-2015 Dan Austin <danielaustin@google.com> Merge "Enable fsanitize signed-integer-overflow in Soft MPEG3 decoder"
am: 58fdf7cc01

* commit '58fdf7cc01a5b81d40c0bb2f0aeb7c4d23ae5244':
Enable fsanitize signed-integer-overflow in Soft MPEG3 decoder
94d40720ca7f0210e35abb89b0014b84a04cfd19 27-Oct-2015 Dan Austin <danielaustin@google.com> Merge "Enable fsanitize signed-integer-overflow in Soft MPEG4 decoder." am: 5b2454f61b
am: 3ebba77e5e

* commit '3ebba77e5e47b0ea8b03f7c09a3f79c1fe5c8d54':
Enable fsanitize signed-integer-overflow in Soft MPEG4 decoder.
0f7c7fb8befd004760b12acf1d4e66dc1514d8b8 27-Oct-2015 Dan Austin <danielaustin@google.com> Merge "Enable fsanitize signed-integer-overflow in Soft MPEG2 decoder"
am: 571590fd92

* commit '571590fd92ac2ac6b45a8610e26097f1ef4ff2b3':
Enable fsanitize signed-integer-overflow in Soft MPEG2 decoder
1df2378d8e7d70d11088de877a1c23e7b30e2f38 27-Oct-2015 Dan Austin <danielaustin@google.com> Merge "Disable integer overflow sanitization in select functions." am: ab8685d990
am: cdd878b3a1

* commit 'cdd878b3a1b23f296e99da28b412b8150bd5f74e':
Disable integer overflow sanitization in select functions.
58fdf7cc01a5b81d40c0bb2f0aeb7c4d23ae5244 27-Oct-2015 Dan Austin <danielaustin@google.com> Merge "Enable fsanitize signed-integer-overflow in Soft MPEG3 decoder"
571590fd92ac2ac6b45a8610e26097f1ef4ff2b3 27-Oct-2015 Dan Austin <danielaustin@google.com> Merge "Enable fsanitize signed-integer-overflow in Soft MPEG2 decoder"
a848be06f05a264b70bcc54eb604e74a4e19ae1e 27-Oct-2015 Dan Austin <danielaustin@google.com> Merge "Enable fsanitize signed-integer-overflow in Soft VPX decoder"
am: 3e292cb4b1

* commit '3e292cb4b19ed2c8fbc6061b0dd425ff11fec7a3':
Enable fsanitize signed-integer-overflow in Soft VPX decoder
bfc066c23e576abdc8165977cc71b18ac4bfcf54 27-Oct-2015 Dan Austin <danielaustin@google.com> Merge "Enable fsanitize signed-integer-overflow in Soft VPX encoder"
am: 6cd07e81ad

* commit '6cd07e81adc3ff1faa9f2b4639770ad451943a05':
Enable fsanitize signed-integer-overflow in Soft VPX encoder
c46b63fc3bd603bb76d124a8be04a026d52b3cae 27-Oct-2015 Dan Austin <danielaustin@google.com> Merge "Enable fsanitize signed-integer-overflow in on2 soft H.264 decoder"
am: 0fa22e8fbc

* commit '0fa22e8fbc464daef9b63b7eac6d2a62fe76be63':
Enable fsanitize signed-integer-overflow in on2 soft H.264 decoder
2ded8a0dd9aba74c92a238f220e41e6ef7d91a83 27-Oct-2015 Dan Austin <danielaustin@google.com> Merge "Enable fsanitize signed-integer-overflow in Soft MPEG4 encoder"
am: a6d91eea06

* commit 'a6d91eea064d0d6df520f6c408d04e8d9193768c':
Enable fsanitize signed-integer-overflow in Soft MPEG4 encoder
3ebba77e5e47b0ea8b03f7c09a3f79c1fe5c8d54 27-Oct-2015 Dan Austin <danielaustin@google.com> Merge "Enable fsanitize signed-integer-overflow in Soft MPEG4 decoder."
am: 5b2454f61b

* commit '5b2454f61b5f20771ed5e0b90b4809c25b8a3f44':
Enable fsanitize signed-integer-overflow in Soft MPEG4 decoder.
cdd878b3a1b23f296e99da28b412b8150bd5f74e 27-Oct-2015 Dan Austin <danielaustin@google.com> Merge "Disable integer overflow sanitization in select functions."
am: ab8685d990

* commit 'ab8685d990ef3381024833d5c84c70e8a7d5f18d':
Disable integer overflow sanitization in select functions.
3e292cb4b19ed2c8fbc6061b0dd425ff11fec7a3 27-Oct-2015 Dan Austin <danielaustin@google.com> Merge "Enable fsanitize signed-integer-overflow in Soft VPX decoder"
6cd07e81adc3ff1faa9f2b4639770ad451943a05 27-Oct-2015 Dan Austin <danielaustin@google.com> Merge "Enable fsanitize signed-integer-overflow in Soft VPX encoder"
0fa22e8fbc464daef9b63b7eac6d2a62fe76be63 27-Oct-2015 Dan Austin <danielaustin@google.com> Merge "Enable fsanitize signed-integer-overflow in on2 soft H.264 decoder"
a6d91eea064d0d6df520f6c408d04e8d9193768c 27-Oct-2015 Dan Austin <danielaustin@google.com> Merge "Enable fsanitize signed-integer-overflow in Soft MPEG4 encoder"
8009d3ba666f6f414b30ae7a701c36dccdebcc76 27-Oct-2015 Dan Austin <danielaustin@google.com> Enable fsanitize signed-integer-overflow in Soft MPEG4 encoder

Bug: 23756200
Change-Id: Ie4693bc0be1f06c89e23ffe033caa346a9690ec3
odecs/m4v_h263/enc/Android.mk
b3ce3fd86ec9fbfbd9d64be7b2ffc7e765bb70a9 27-Oct-2015 Dan Austin <danielaustin@google.com> Enable fsanitize signed-integer-overflow in Soft MPEG4 decoder.

Bug: 23756200
Change-Id: I580dc916dfda4c5b787f9077a319ee187eeaf997
odecs/m4v_h263/dec/Android.mk
ab8685d990ef3381024833d5c84c70e8a7d5f18d 27-Oct-2015 Dan Austin <danielaustin@google.com> Merge "Disable integer overflow sanitization in select functions."
488d3706adb6d4c16fb14712412bc4945f13ff83 27-Oct-2015 Dan Austin <danielaustin@google.com> Disable integer overflow sanitization in select functions.

There are multiple benign integer overflows in the Sad8x8 and
getBlockSum functions. Disable integer overflow sanitization
to avoid potential SIGABRTs within these functions.

Bug: 23756200
Change-Id: Idf0c4a803d56862997b9cd542eda14251b84ee19
odecs/m4v_h263/enc/src/fastcodemb.cpp
219d824d3312b53bf82435012f61d3fd02afa20b 26-Oct-2015 Dan Austin <danielaustin@google.com> Enable fsanitize signed-integer-overflow in Soft VPX decoder

Bug: 23756200
Change-Id: Ie6ec1eee0aeae6196c71ee3da2c9bb13ccf0ec2c
odecs/on2/dec/Android.mk
7c895d69711dd8e8367e372c5216d9199218b81d 26-Oct-2015 Dan Austin <danielaustin@google.com> Enable fsanitize signed-integer-overflow in Soft VPX encoder

Bug: 23756200
Change-Id: Ice3cb3a07aa74f596b40de01efadbce7dab20858
odecs/on2/enc/Android.mk
47e75ca7eaf76546e1cf5d4428b3b47732e701f5 26-Oct-2015 Dan Austin <danielaustin@google.com> Enable fsanitize signed-integer-overflow in on2 soft H.264 decoder

Bug: 23756200
Change-Id: Id7a3a62d9edb86d41ba21deca3294b8406e2fa47
odecs/on2/h264dec/Android.mk
d373ede5e7737f7fec936f4c37f64805a538d584 26-Oct-2015 Marco Nelissen <marcone@google.com> Merge "ABuffer: remove unused code" am: d0f8fa383e am: cb0f20a313
am: 81f93f8176

* commit '81f93f8176fa30083b3fbf641278b8e17ccd6144':
ABuffer: remove unused code
81f93f8176fa30083b3fbf641278b8e17ccd6144 26-Oct-2015 Marco Nelissen <marcone@google.com> Merge "ABuffer: remove unused code" am: d0f8fa383e
am: cb0f20a313

* commit 'cb0f20a3138d3e1d5586fd127c4f2f6c05e78a48':
ABuffer: remove unused code
cb0f20a3138d3e1d5586fd127c4f2f6c05e78a48 26-Oct-2015 Marco Nelissen <marcone@google.com> Merge "ABuffer: remove unused code"
am: d0f8fa383e

* commit 'd0f8fa383e0f91b8a249729193f6f29ca55e1bed':
ABuffer: remove unused code
d0f8fa383e0f91b8a249729193f6f29ca55e1bed 26-Oct-2015 Marco Nelissen <marcone@google.com> Merge "ABuffer: remove unused code"
1c38d8d16b6a44d64b3fb14d24f339971848c085 26-Oct-2015 Dan Austin <danielaustin@google.com> Enable fsanitize signed-integer-overflow in Soft MPEG3 decoder

Bug: 23752600
Change-Id: I9922b1b670d142c060764aada1670f38e7ce5de4
odecs/mp3dec/Android.mk
4bee5919e4cef49a198378c04be62da69e3f3290 26-Oct-2015 Dan Austin <danielaustin@google.com> Enable fsanitize signed-integer-overflow in Soft MPEG2 decoder

Bug: 23756200
Change-Id: Ia61648459447f39845ba23845614e1858a80ff40
odecs/mpeg2dec/Android.mk
87783b8fdfe175915d0fc3f3c7f8e208dae99ac6 26-Oct-2015 Dan Austin <danielaustin@google.com> Merge "Enable fsanitize signed-integer-overflow in raw decoder." am: 0ca175b8e7 am: 16ce397122
am: b2d37608d3

* commit 'b2d37608d3881dcf4455fc43b51c38e0fcebba95':
Enable fsanitize signed-integer-overflow in raw decoder.
b2d37608d3881dcf4455fc43b51c38e0fcebba95 26-Oct-2015 Dan Austin <danielaustin@google.com> Merge "Enable fsanitize signed-integer-overflow in raw decoder." am: 0ca175b8e7
am: 16ce397122

* commit '16ce397122fd0e05d88ffd8a70e7fb349562787b':
Enable fsanitize signed-integer-overflow in raw decoder.
16ce397122fd0e05d88ffd8a70e7fb349562787b 26-Oct-2015 Dan Austin <danielaustin@google.com> Merge "Enable fsanitize signed-integer-overflow in raw decoder."
am: 0ca175b8e7

* commit '0ca175b8e7e4d3bb93f180fdc8e05a5bbf01c2b5':
Enable fsanitize signed-integer-overflow in raw decoder.
0ca175b8e7e4d3bb93f180fdc8e05a5bbf01c2b5 26-Oct-2015 Dan Austin <danielaustin@google.com> Merge "Enable fsanitize signed-integer-overflow in raw decoder."
3bf27fff139c1061d0becaa56f2468983a18bb81 26-Oct-2015 Dan Austin <danielaustin@google.com> Enable fsanitize signed-integer-overflow in raw decoder.

Bug: 23756200
Change-Id: Iade14944c3b8dd79a806ccc22b033c9bb30a1b2a
odecs/raw/Android.mk
4cfc1d17c4767dc6ae39ed64391e95cdf7e025a8 26-Oct-2015 Dan Austin <danielaustin@google.com> Merge "Enable fsanitize signed-integer-overflow in Soft Opus decoder" am: d67372dcea am: 1e08dd95eb
am: c20c08fb7a

* commit 'c20c08fb7acbe7da99a9b37331b6e93e692953c1':
Enable fsanitize signed-integer-overflow in Soft Opus decoder
cd17e8937a63c517942317ae90fa9d4d5b88b9bd 26-Oct-2015 Dan Austin <danielaustin@google.com> Merge "Enable fsanitize signed-integer-overflow in Soft Vorbis decoder" am: 2ebf8c4d59 am: d2ea9a50e8
am: 5704e218fb

* commit '5704e218fb35a080e53907c81b757092e3c12312':
Enable fsanitize signed-integer-overflow in Soft Vorbis decoder
c20c08fb7acbe7da99a9b37331b6e93e692953c1 26-Oct-2015 Dan Austin <danielaustin@google.com> Merge "Enable fsanitize signed-integer-overflow in Soft Opus decoder" am: d67372dcea
am: 1e08dd95eb

* commit '1e08dd95eb0ae5a2f6e3406b1a49278162e9b89b':
Enable fsanitize signed-integer-overflow in Soft Opus decoder
5704e218fb35a080e53907c81b757092e3c12312 26-Oct-2015 Dan Austin <danielaustin@google.com> Merge "Enable fsanitize signed-integer-overflow in Soft Vorbis decoder" am: 2ebf8c4d59
am: d2ea9a50e8

* commit 'd2ea9a50e859866db3a17ea16fc5cd3486420aca':
Enable fsanitize signed-integer-overflow in Soft Vorbis decoder
1e08dd95eb0ae5a2f6e3406b1a49278162e9b89b 26-Oct-2015 Dan Austin <danielaustin@google.com> Merge "Enable fsanitize signed-integer-overflow in Soft Opus decoder"
am: d67372dcea

* commit 'd67372dcea24ed03008b51503822e434b6ac4d10':
Enable fsanitize signed-integer-overflow in Soft Opus decoder
d2ea9a50e859866db3a17ea16fc5cd3486420aca 26-Oct-2015 Dan Austin <danielaustin@google.com> Merge "Enable fsanitize signed-integer-overflow in Soft Vorbis decoder"
am: 2ebf8c4d59

* commit '2ebf8c4d59ed43cfd66ebd0cf55bcdbd97a3ce0b':
Enable fsanitize signed-integer-overflow in Soft Vorbis decoder
d67372dcea24ed03008b51503822e434b6ac4d10 26-Oct-2015 Dan Austin <danielaustin@google.com> Merge "Enable fsanitize signed-integer-overflow in Soft Opus decoder"
dcf34249e4bbd80d9229ce80f3fa1133e36f20c3 26-Oct-2015 Dan Austin <danielaustin@google.com> Merge "Enable fsanitize signed-integer-overflow in GSM decoder" am: dd81129f1f am: 59702d190c
am: 6116877764

* commit '611687776418a047f1e5fb3b84950988355bd208':
Enable fsanitize signed-integer-overflow in GSM decoder
97069408c6faa538b51543d4666700a98e4966b6 26-Oct-2015 Dan Austin <danielaustin@google.com> Merge "Enable fsanitize signed-integer-overflow in HEVC decoder" am: 16427a1d17 am: 214a0405a0
am: dd543ebbc5

* commit 'dd543ebbc5b9992eb33a66dc55f54b44f4b8f158':
Enable fsanitize signed-integer-overflow in HEVC decoder
611687776418a047f1e5fb3b84950988355bd208 26-Oct-2015 Dan Austin <danielaustin@google.com> Merge "Enable fsanitize signed-integer-overflow in GSM decoder" am: dd81129f1f
am: 59702d190c

* commit '59702d190c959149feff1c50bb097e822c5aaf59':
Enable fsanitize signed-integer-overflow in GSM decoder
dd543ebbc5b9992eb33a66dc55f54b44f4b8f158 26-Oct-2015 Dan Austin <danielaustin@google.com> Merge "Enable fsanitize signed-integer-overflow in HEVC decoder" am: 16427a1d17
am: 214a0405a0

* commit '214a0405a0a3bb61f1dbba86f5cd3711b2f62442':
Enable fsanitize signed-integer-overflow in HEVC decoder
3ae0a38a076d1a99d323c955d2d236bc7e53b460 26-Oct-2015 Dan Austin <danielaustin@google.com> Enable fsanitize signed-integer-overflow in Soft Opus decoder

Bug: 23756200
Change-Id: If4ace61bbf55424866fbf21a20007eac55dbd8ba
odecs/opus/dec/Android.mk
59702d190c959149feff1c50bb097e822c5aaf59 26-Oct-2015 Dan Austin <danielaustin@google.com> Merge "Enable fsanitize signed-integer-overflow in GSM decoder"
am: dd81129f1f

* commit 'dd81129f1fa69a93a5ae2f4615da77e057b5a523':
Enable fsanitize signed-integer-overflow in GSM decoder
214a0405a0a3bb61f1dbba86f5cd3711b2f62442 26-Oct-2015 Dan Austin <danielaustin@google.com> Merge "Enable fsanitize signed-integer-overflow in HEVC decoder"
am: 16427a1d17

* commit '16427a1d178b6d829ca946962a7d6977a0d765bc':
Enable fsanitize signed-integer-overflow in HEVC decoder
cc57a8cf22f53639db1215d0e388ec7bc1b9f927 26-Oct-2015 Dan Austin <danielaustin@google.com> Enable fsanitize signed-integer-overflow in Soft Vorbis decoder

Bug: 23746200
Change-Id: Iabc605223a829344c3709fde5f99a3892379f756
odecs/vorbis/dec/Android.mk
dd81129f1fa69a93a5ae2f4615da77e057b5a523 26-Oct-2015 Dan Austin <danielaustin@google.com> Merge "Enable fsanitize signed-integer-overflow in GSM decoder"
bd66383fdde32f57d51f03ff711ed2de2c890e92 26-Oct-2015 Dan Austin <danielaustin@google.com> Enable fsanitize signed-integer-overflow in HEVC decoder

Bug: 23752600
Change-Id: I58eece654b3eb89affc56d432a9c4ebbb2247013
odecs/hevcdec/Android.mk
b64694b04abe4a6da350d4a89c36cf888425bd60 26-Oct-2015 Dan Austin <danielaustin@google.com> Enable fsanitize signed-integer-overflow in GSM decoder

Bug: 23752600
Change-Id: I1585689e35e3677dfef2e12115922d1ba18c26c0
odecs/gsm/dec/Android.mk
b49c385232adfc7f82d7194c7b19b5966499f66b 26-Oct-2015 Ronghua Wu <ronghuawu@google.com> ALooper::awaitResponse gets reply and returns immediately if the looper is stopped.

Bug: 25088488
Change-Id: Id33d5d75f1173db52d00f4ff71d4c2c4f27f72f5
oundation/ALooper.cpp
d9400a8b62241304566f2184268e3a283bcfa666 24-Oct-2015 Dan Austin <danielaustin@google.com> Merge "Enable fsanitize signed-integer-overflow in G711 decoder" am: 5c7d8e2da0 am: ba07fec87e
am: 439f8b6c02

* commit '439f8b6c0224c7847204adc9c2e8e01684e54b34':
Enable fsanitize signed-integer-overflow in G711 decoder
439f8b6c0224c7847204adc9c2e8e01684e54b34 24-Oct-2015 Dan Austin <danielaustin@google.com> Merge "Enable fsanitize signed-integer-overflow in G711 decoder" am: 5c7d8e2da0
am: ba07fec87e

* commit 'ba07fec87ea7966f4d34030b391ff9a6fb976fa2':
Enable fsanitize signed-integer-overflow in G711 decoder
ba07fec87ea7966f4d34030b391ff9a6fb976fa2 24-Oct-2015 Dan Austin <danielaustin@google.com> Merge "Enable fsanitize signed-integer-overflow in G711 decoder"
am: 5c7d8e2da0

* commit '5c7d8e2da0674625c2474c6664f81558a0f5a30c':
Enable fsanitize signed-integer-overflow in G711 decoder
1af053f94b4fcf373f1a2d2fd4bd6cee00249b88 24-Oct-2015 Dan Austin <danielaustin@google.com> Enable fsanitize signed-integer-overflow in G711 decoder

Bug: 23752600
Change-Id: I67556b00e9e14c70355995d4d0dc3ed9d40f8888
odecs/g711/dec/Android.mk
ce96da2afc1dbc8462dcd848ed39afdfe42f7554 23-Oct-2015 Dan Austin <danielaustin@google.com> Merge "Fix benign integer overflow conditions for VSYNC add and removal." am: 34efca1644 am: 7e6af7326e
am: 904fb9aacc

* commit '904fb9aacc4c104170f31f6a6fd0a1092deaf07f':
Fix benign integer overflow conditions for VSYNC add and removal.
04491658c416c16fb07dce7d3990bebda039f710 23-Oct-2015 Dan Austin <danielaustin@google.com> Merge "Enable fsanitize signed-integer-overflow in AVC common" am: b2350f2e2e am: 2872879d5d
am: 1274bd5584

* commit '1274bd55840b1c35a469b44307f67432c5bbea32':
Enable fsanitize signed-integer-overflow in AVC common
186fde62fc4dbb50fe91924eaaf0f691dbca1548 23-Oct-2015 Dan Austin <danielaustin@google.com> Merge "Enable fsanitize signed-integer-overflow in AVC encoder" am: d80cb0555e am: f6214f037e
am: 6762461dcd

* commit '6762461dcd1350c38b960c7e5133cfb980228281':
Enable fsanitize signed-integer-overflow in AVC encoder
2b320e2c93e484f93a90463eb1b7420c9594cf6b 23-Oct-2015 Dan Austin <danielaustin@google.com> Merge "Enable fsanitize signed-integer-overflow in AVC soft decoder" am: 2333d2389f am: 62dc295dca
am: e5e386f714

* commit 'e5e386f714747f4626d2c9cb3ac2783b1306b18a':
Enable fsanitize signed-integer-overflow in AVC soft decoder
a78f4057af6ca41d610e4a0bd42c7bc5a418553a 23-Oct-2015 Dan Austin <danielaustin@google.com> Merge "Enable fsanitize signed-integer-overflow in AVC soft encoder" am: f2944a0e68 am: faef8c5256
am: b4349c3b69

* commit 'b4349c3b69f72d51ebcffe24a2bce9a63c53177c':
Enable fsanitize signed-integer-overflow in AVC soft encoder
904fb9aacc4c104170f31f6a6fd0a1092deaf07f 23-Oct-2015 Dan Austin <danielaustin@google.com> Merge "Fix benign integer overflow conditions for VSYNC add and removal." am: 34efca1644
am: 7e6af7326e

* commit '7e6af7326ed965c7912cdf3747982eb330ed1f53':
Fix benign integer overflow conditions for VSYNC add and removal.
1274bd55840b1c35a469b44307f67432c5bbea32 23-Oct-2015 Dan Austin <danielaustin@google.com> Merge "Enable fsanitize signed-integer-overflow in AVC common" am: b2350f2e2e
am: 2872879d5d

* commit '2872879d5db6206383c2dd14835a3b39c3ba32ff':
Enable fsanitize signed-integer-overflow in AVC common
6762461dcd1350c38b960c7e5133cfb980228281 23-Oct-2015 Dan Austin <danielaustin@google.com> Merge "Enable fsanitize signed-integer-overflow in AVC encoder" am: d80cb0555e
am: f6214f037e

* commit 'f6214f037ee3f1536c18acb34c3406e2056b92cd':
Enable fsanitize signed-integer-overflow in AVC encoder
e5e386f714747f4626d2c9cb3ac2783b1306b18a 23-Oct-2015 Dan Austin <danielaustin@google.com> Merge "Enable fsanitize signed-integer-overflow in AVC soft decoder" am: 2333d2389f
am: 62dc295dca

* commit '62dc295dcaa9937a3ee178be00029c4675524abb':
Enable fsanitize signed-integer-overflow in AVC soft decoder
b4349c3b69f72d51ebcffe24a2bce9a63c53177c 23-Oct-2015 Dan Austin <danielaustin@google.com> Merge "Enable fsanitize signed-integer-overflow in AVC soft encoder" am: f2944a0e68
am: faef8c5256

* commit 'faef8c52569ebfe700ea42d9b7578f67004ff480':
Enable fsanitize signed-integer-overflow in AVC soft encoder
7e6af7326ed965c7912cdf3747982eb330ed1f53 23-Oct-2015 Dan Austin <danielaustin@google.com> Merge "Fix benign integer overflow conditions for VSYNC add and removal."
am: 34efca1644

* commit '34efca1644412505079d8610e1f6365bfc03c505':
Fix benign integer overflow conditions for VSYNC add and removal.
2872879d5db6206383c2dd14835a3b39c3ba32ff 23-Oct-2015 Dan Austin <danielaustin@google.com> Merge "Enable fsanitize signed-integer-overflow in AVC common"
am: b2350f2e2e

* commit 'b2350f2e2e9ef0f3eb1d3a50a4efab1c6b48356e':
Enable fsanitize signed-integer-overflow in AVC common
f6214f037ee3f1536c18acb34c3406e2056b92cd 23-Oct-2015 Dan Austin <danielaustin@google.com> Merge "Enable fsanitize signed-integer-overflow in AVC encoder"
am: d80cb0555e

* commit 'd80cb0555edff5244ecd42d9cb1e0c0d1e52628e':
Enable fsanitize signed-integer-overflow in AVC encoder
62dc295dcaa9937a3ee178be00029c4675524abb 23-Oct-2015 Dan Austin <danielaustin@google.com> Merge "Enable fsanitize signed-integer-overflow in AVC soft decoder"
am: 2333d2389f

* commit '2333d2389f01af40da8b9b1b03ceaf3973b7834d':
Enable fsanitize signed-integer-overflow in AVC soft decoder
faef8c52569ebfe700ea42d9b7578f67004ff480 23-Oct-2015 Dan Austin <danielaustin@google.com> Merge "Enable fsanitize signed-integer-overflow in AVC soft encoder"
am: f2944a0e68

* commit 'f2944a0e682258ae281813c0644f2a668b906cb8':
Enable fsanitize signed-integer-overflow in AVC soft encoder
34efca1644412505079d8610e1f6365bfc03c505 23-Oct-2015 Dan Austin <danielaustin@google.com> Merge "Fix benign integer overflow conditions for VSYNC add and removal."
b2350f2e2e9ef0f3eb1d3a50a4efab1c6b48356e 23-Oct-2015 Dan Austin <danielaustin@google.com> Merge "Enable fsanitize signed-integer-overflow in AVC common"
d80cb0555edff5244ecd42d9cb1e0c0d1e52628e 23-Oct-2015 Dan Austin <danielaustin@google.com> Merge "Enable fsanitize signed-integer-overflow in AVC encoder"
2333d2389f01af40da8b9b1b03ceaf3973b7834d 23-Oct-2015 Dan Austin <danielaustin@google.com> Merge "Enable fsanitize signed-integer-overflow in AVC soft decoder"
f2944a0e682258ae281813c0644f2a668b906cb8 23-Oct-2015 Dan Austin <danielaustin@google.com> Merge "Enable fsanitize signed-integer-overflow in AVC soft encoder"
8aa5af703ba29d7bd7b5efaefd76aac2d568f11f 19-Apr-2011 Sunil Shah <sunil.shah@sonyericsson.com> Handle malformed audio packets received during RTSP stream switching

During RTSP stream switching (for example channel switching in a
Mobile TV application) we occasionally receive packets that
don't contain valid data, so we cannot remove LATM framing (as per
the MPEG4 Audio Assembler). This fix allows the frame remover
to exit gracefully (instead of crashing), when such frames are
encountered, and as a consequence, Mobile TV apps can change
channels properly.

Change-Id: Ie4c3d2766c87b43f31624192de96bc47180ca514
tsp/AMPEG4AudioAssembler.cpp
9fe846e4ff3df00b5d46766555e124040d01f939 10-Jun-2015 Roger I Nilsson <roger2.nilsson@sonymobile.com> Remove possible div by zero in WavExtractor

Do not accept 0 channels as a valid wav format.

Change-Id: I8d03d68f58d023b039503732736cc3a82ea560eb
AVExtractor.cpp
d066bc8faf68b9fcb034ceb203e8d7e8213dc1ce 22-Dec-2014 Patrik Lindgren <patrik2.lindgren@sonymobile.com> Handle error result from DrmManagerClient correctly

readAtDRM() must handle the case when DrmManagerClient::pread()
returns an error (-1) correctly. This is a degrade in Android L.

Change-Id: Id7ff124d178e26931dddac5ac73697cfe6da501c
ileSource.cpp
ece0e6e40fbd34c83c4906346f26e546f1d7b161 23-Oct-2015 Ronghua Wu <ronghuawu@google.com> Merge "Allow ALooper::awaitResponse to return immediately if the looper is stopped." into mnc-dr-dev am: 0983d691b7 am: 72920648c7
am: 69f028a231

* commit '69f028a23114439bf2a5a72b511ffef6a5549903':
Allow ALooper::awaitResponse to return immediately if the looper is stopped.
69f028a23114439bf2a5a72b511ffef6a5549903 22-Oct-2015 Ronghua Wu <ronghuawu@google.com> Merge "Allow ALooper::awaitResponse to return immediately if the looper is stopped." into mnc-dr-dev am: 0983d691b7
am: 72920648c7

* commit '72920648c7a30b89c4dbcb1ea3389949e27c7944':
Allow ALooper::awaitResponse to return immediately if the looper is stopped.
0983d691b7b442d376628bf009299acf5247c44f 22-Oct-2015 Ronghua Wu <ronghuawu@google.com> Merge "Allow ALooper::awaitResponse to return immediately if the looper is stopped." into mnc-dr-dev
0abb2aa4859ced9165c77324cb83d1cd94f5f20c 21-Oct-2015 Ronghua Wu <ronghuawu@google.com> Allow ALooper::awaitResponse to return immediately if the looper is stopped.

Bug: 25088488
Change-Id: I63e69886a8e9cffcaad675ca1a5642c0abf3b466
ediaCodec.cpp
oundation/ALooper.cpp
64c67fad3c9ed5e23f3e5932f49277fdc8802286 22-Oct-2015 Marco Nelissen <marcone@google.com> Merge "Fix offset adjustment when skipping off-spec meta chunk" into mnc-dr-dev am: 78c164c238 am: 0935e8d731
am: 570364ddbf

* commit '570364ddbf85ed99ac909d534b1a966de5b20b73':
Fix offset adjustment when skipping off-spec meta chunk
570364ddbf85ed99ac909d534b1a966de5b20b73 22-Oct-2015 Marco Nelissen <marcone@google.com> Merge "Fix offset adjustment when skipping off-spec meta chunk" into mnc-dr-dev am: 78c164c238
am: 0935e8d731

* commit '0935e8d73136ad42462c3b16f73dc202d4d1f471':
Fix offset adjustment when skipping off-spec meta chunk
3ad0caffbb78b8fe838c6c8d8c7a2d1bcf1fcc06 22-Oct-2015 Marco Nelissen <marcone@google.com> Merge "Fix offset adjustment when skipping off-spec meta chunk"
am: 7e9b93421e

* commit '7e9b93421ef9b9839320d98887c2cc0ac50b71a1':
Fix offset adjustment when skipping off-spec meta chunk
bedd86772a7cc0529f4231521f96eb86e14f587a 22-Oct-2015 Marco Nelissen <marcone@google.com> Fix offset adjustment when skipping off-spec meta chunk

Bug: 25172843
Change-Id: Ibbfe4369176f2a367eab5a39fd742f425b017288
PEG4Extractor.cpp
9ff1e728de605c4cbc61bc95bb36e515b93654fb 21-Oct-2015 Robert Shih <robertshih@google.com> Return sources from the same program if possible

Also simplify control flows where branch conditions are already known.

Bug: 24407652
Change-Id: Id3c4d47000576db2f5e28063aaaef5936b08fb84
peg2ts/ATSParser.cpp
8ee368522ca7df126033a05dc3c430182b4495c9 22-Oct-2015 Marco Nelissen <marcone@google.com> Fix offset adjustment when skipping off-spec meta chunk

Bug: 25172843
Change-Id: Ibbfe4369176f2a367eab5a39fd742f425b017288
PEG4Extractor.cpp
4ecbea3ae1fcefb082dc419cb663909536138ddb 21-Oct-2015 Wei Jia <wjia@google.com> MediaClock: prevent media time from going backwards.

Media Clock is started only when AudioSink has rendered some frames.

Bug: 25074321
Change-Id: Ic09fc666eed019e24f5b6a4b8929021eab87ca41
ediaClock.cpp
13b0a36a5dd1a92e2a49536e0668b81b9fd8e589 21-Oct-2015 Marco Nelissen <marcone@google.com> Merge "Move overflow checks into SkipCutBuffer" am: 8be95ca80a am: 1f410f44a1
am: c396adf7c4

* commit 'c396adf7c434abb687e1dbce63fa084b6b6ec05e':
Move overflow checks into SkipCutBuffer
8fbf202f7b9fa461f07b49470c2a6afe39ca6afd 21-Oct-2015 Jon Larimer <jlarimer@google.com> Merge "stagefright: MPEG4Extractor: allow \'hdlr\' box before first track" into klp-dev am: b1a13d01dc am: 781cd4f37d am: 8565726f57 am: b44e95da77 am: 699e9b0749
am: 8e4f53159c

* commit '8e4f53159c64996e1617ec589977c290fa233010':
stagefright: MPEG4Extractor: allow 'hdlr' box before first track
699e9b0749bda03d12d6aaea9632b28d2bd9e6fb 21-Oct-2015 Jon Larimer <jlarimer@google.com> Merge "stagefright: MPEG4Extractor: allow \'hdlr\' box before first track" into klp-dev am: b1a13d01dc am: 781cd4f37d am: 8565726f57
am: b44e95da77

* commit 'b44e95da772bb26fa9fc4cdc04cf51b7d42344ae':
stagefright: MPEG4Extractor: allow 'hdlr' box before first track
8565726f5775a6db97a394aa18a1f6b0e1ce69b7 20-Oct-2015 Jon Larimer <jlarimer@google.com> Merge "stagefright: MPEG4Extractor: allow \'hdlr\' box before first track" into klp-dev am: b1a13d01dc
am: 781cd4f37d

* commit '781cd4f37d4b81a8e5af45a3ba6cdd4cdd209a3e':
stagefright: MPEG4Extractor: allow 'hdlr' box before first track
781cd4f37d4b81a8e5af45a3ba6cdd4cdd209a3e 20-Oct-2015 Jon Larimer <jlarimer@google.com> Merge "stagefright: MPEG4Extractor: allow \'hdlr\' box before first track" into klp-dev
am: b1a13d01dc

* commit 'b1a13d01dccbc48ea54aeb4a4ba7fce636ff1daa':
stagefright: MPEG4Extractor: allow 'hdlr' box before first track
b1a13d01dccbc48ea54aeb4a4ba7fce636ff1daa 20-Oct-2015 Jon Larimer <jlarimer@google.com> Merge "stagefright: MPEG4Extractor: allow 'hdlr' box before first track" into klp-dev
c396adf7c434abb687e1dbce63fa084b6b6ec05e 20-Oct-2015 Marco Nelissen <marcone@google.com> Merge "Move overflow checks into SkipCutBuffer" am: 8be95ca80a
am: 1f410f44a1

* commit '1f410f44a17a01890244270b034cb00f74fedce7':
Move overflow checks into SkipCutBuffer
1f410f44a17a01890244270b034cb00f74fedce7 20-Oct-2015 Marco Nelissen <marcone@google.com> Merge "Move overflow checks into SkipCutBuffer"
am: 8be95ca80a

* commit '8be95ca80ab8db3f8355b04f867e0bd42c22feeb':
Move overflow checks into SkipCutBuffer
f43f2cf4ae771069a86ffeaf732b53eb90191219 20-Oct-2015 Marco Nelissen <marcone@google.com> am a1563026: am 5642a2e0: Merge "Revert "Move overflow checks into SkipCutBuffer""
am: 5700f3eb20

* commit '5700f3eb20ac31fd1839e78364a60bb718e919cf':
Revert "Move overflow checks into SkipCutBuffer"
b1cf03160fa7e7bc6e5cf138db07a7e1ab2ecb26 17-Oct-2015 Marco Nelissen <marcone@google.com> Move overflow checks into SkipCutBuffer

Previously SkipCutBuffer would check its input parameters to ensure
they were sane, however since bogus values might be the result of
overflows, and overflow protection was recently turned on for
libstagefright, the compiler's overflow checks were performed before
SkipCutBuffer's, resulting in abort rather than just ignoring the
bogus values.
Moving the multiplication by framesize into SkipCutBuffer fixes this.

Change-Id: I1ad6744bb045a5212701bbf6ee44eecb5f318210
Codec.cpp
MXCodec.cpp
kipCutBuffer.cpp
5700f3eb20ac31fd1839e78364a60bb718e919cf 19-Oct-2015 Marco Nelissen <marcone@google.com> am a1563026: am 5642a2e0: Merge "Revert "Move overflow checks into SkipCutBuffer""

* commit 'a1563026c59471183bbc3bc5f6183e663fa5099d':
Revert "Move overflow checks into SkipCutBuffer"
a1563026c59471183bbc3bc5f6183e663fa5099d 19-Oct-2015 Marco Nelissen <marcone@google.com> am 5642a2e0: Merge "Revert "Move overflow checks into SkipCutBuffer""

* commit '5642a2e06c7be0697ab5079dc8484ec3e3c6ecfa':
Revert "Move overflow checks into SkipCutBuffer"
e1054e74bb02ad4789bfce1e3a04f04825a572db 19-Oct-2015 Marco Nelissen <marcone@google.com> Revert "Move overflow checks into SkipCutBuffer"

This reverts commit 6867e1a1e25d4ec5344eae070f0fbc284bb92876.

Change-Id: I90d479dac014c72ffa7151a30e79e68d9ce967ac
Codec.cpp
MXCodec.cpp
kipCutBuffer.cpp
74ee3ba4177c705e08b9af3bb94551f7f87dc5b3 19-Oct-2015 Marco Nelissen <marcone@google.com> am c6308741: am 510f7aca: am afd238af: Merge "Move overflow checks into SkipCutBuffer"

* commit 'c63087411817addc29d61d33a6d06089278bdbb4':
Move overflow checks into SkipCutBuffer
c63087411817addc29d61d33a6d06089278bdbb4 19-Oct-2015 Marco Nelissen <marcone@google.com> am 510f7aca: am afd238af: Merge "Move overflow checks into SkipCutBuffer"

* commit '510f7aca71dfa914869bd9709fc96e69d312e44f':
Move overflow checks into SkipCutBuffer
510f7aca71dfa914869bd9709fc96e69d312e44f 19-Oct-2015 Marco Nelissen <marcone@google.com> am afd238af: Merge "Move overflow checks into SkipCutBuffer"

* commit 'afd238af51e92e44c7b431b8ed9e148b8d8a52d2':
Move overflow checks into SkipCutBuffer
6867e1a1e25d4ec5344eae070f0fbc284bb92876 17-Oct-2015 Marco Nelissen <marcone@google.com> Move overflow checks into SkipCutBuffer

Previously SkipCutBuffer would check its input parameters to ensure
they were sane, however since bogus values might be the result of
overflows, and overflow protection was recently turned on for
libstagefright, the compiler's overflow checks were performed before
SkipCutBuffer's, resulting in abort rather than just ignoring the
bogus values.
Moving the multiplication by framesize into SkipCutBuffer fixes this.

Change-Id: I82497a05af17c91a8d271882f7354fae6497382a
Codec.cpp
MXCodec.cpp
kipCutBuffer.cpp
25cf8fe362e3fb57e7abdf2930be9f40296fb450 19-Oct-2015 Wei Jia <wjia@google.com> Merge "stagefright: Handle missing text track language"
504d108e07586a9ce7ef6a710ed61f5128a10054 17-Oct-2015 Dan Austin <danielaustin@google.com> am 2022f6f8: am bd92424d: am dc897061: Merge "Fixed comparison so that both operands are treated as 64 bit."

* commit '2022f6f8f6df75eac878fac0cd5338f878700fc6':
Fixed comparison so that both operands are treated as 64 bit.
2022f6f8f6df75eac878fac0cd5338f878700fc6 17-Oct-2015 Dan Austin <danielaustin@google.com> am bd92424d: am dc897061: Merge "Fixed comparison so that both operands are treated as 64 bit."

* commit 'bd92424dd9fbe4c3905ec01b52ab33a4c408078b':
Fixed comparison so that both operands are treated as 64 bit.
bd92424dd9fbe4c3905ec01b52ab33a4c408078b 17-Oct-2015 Dan Austin <danielaustin@google.com> am dc897061: Merge "Fixed comparison so that both operands are treated as 64 bit."

* commit 'dc897061d8bb9c2fe8c5d0afee1664cdfaaeeea4':
Fixed comparison so that both operands are treated as 64 bit.
a14a576ca9a9201405b60ec2e0626e1612111bce 17-Oct-2015 Dan Austin <danielaustin@google.com> Fixed comparison so that both operands are treated as 64 bit.

Fixed comparison in setSampleToChunkParams so that both
operands are treated as 64-bit to address build breakage.

Change-Id: I4b2bc52e9fc61b7e00898928a09e134e88b179f9
ampleTable.cpp
13758331f9db389271c1cb432f1a11edbf073ab2 17-Oct-2015 Dan Austin <danielaustin@google.com> am 4e027b58: am a80a60fe: am 34f70071: Merge "Fixed benign overflows triggered by tests CVE-2015-1538-1 and CVE-2015-1538-2 in CTS."

* commit '4e027b587f6b05999ed10f14c4f8ccf0cd7a1f02':
Fixed benign overflows triggered by tests CVE-2015-1538-1 and CVE-2015-1538-2 in CTS.
4e027b587f6b05999ed10f14c4f8ccf0cd7a1f02 17-Oct-2015 Dan Austin <danielaustin@google.com> am a80a60fe: am 34f70071: Merge "Fixed benign overflows triggered by tests CVE-2015-1538-1 and CVE-2015-1538-2 in CTS."

* commit 'a80a60fe98b49a85368ebfe454ccf9d276d95813':
Fixed benign overflows triggered by tests CVE-2015-1538-1 and CVE-2015-1538-2 in CTS.
a80a60fe98b49a85368ebfe454ccf9d276d95813 17-Oct-2015 Dan Austin <danielaustin@google.com> am 34f70071: Merge "Fixed benign overflows triggered by tests CVE-2015-1538-1 and CVE-2015-1538-2 in CTS."

* commit '34f7007194bcc6a27cafc93e2a15eee468b3d746':
Fixed benign overflows triggered by tests CVE-2015-1538-1 and CVE-2015-1538-2 in CTS.
06abc34e0d9d049e37fa1807cab21ac099b33981 17-Oct-2015 Dan Austin <danielaustin@google.com> am 4c1460ff: am 3622d650: Merge "Benign integer overflow in PlaylistFetcher"

* commit '4c1460ff34a74a73f0da721806d04c9bead10379':
Benign integer overflow in PlaylistFetcher
34f7007194bcc6a27cafc93e2a15eee468b3d746 17-Oct-2015 Dan Austin <danielaustin@google.com> Merge "Fixed benign overflows triggered by tests CVE-2015-1538-1 and CVE-2015-1538-2 in CTS."
4c1460ff34a74a73f0da721806d04c9bead10379 16-Oct-2015 Dan Austin <danielaustin@google.com> am 3622d650: Merge "Benign integer overflow in PlaylistFetcher"

* commit '3622d65057cb338440dce268bddc2f59969cda46':
Benign integer overflow in PlaylistFetcher
ffd7950633edeb8e990770e4c8abb81bdcaa6f32 16-Oct-2015 Dan Austin <danielaustin@google.com> Fixed benign overflows triggered by tests CVE-2015-1538-1 and
CVE-2015-1538-2 in CTS.

Bug: 25016754
Change-Id: I0ceb2c799899015be6b37d5e94fe306d0037a8d2
ampleTable.cpp
b3d9f56313f1838649712297ebc8205c4ec14870 09-Oct-2015 Marco Nelissen <marcone@google.com> Reconcile with master after mass cherrypicks

Change-Id: I74649c9771212aa6309ea16c253723994b8e3622
odecs/avcenc/SoftAVCEnc.cpp
d538baad390c1fe5abb13fe821b4ac3d0006d431 16-Oct-2015 Marco Nelissen <marcone@google.com> Merge "SoftAVCDec: Exit gracefully when memory allocation fails in the decoder" into mnc-dr-dev
e5d82cbafcd7bf13bcd23ca6a0066d7444c6332b 16-Oct-2015 Marco Nelissen <marcone@google.com> Merge "SoftAVCDec: Added a check for unsupported resolutions" into mnc-dr-dev
83835653e47c09f1d2257d4847cd95080a0673a2 02-Oct-2015 Harish Mahendrakar <harish.mahendrakar@ittiam.com> SoftAVCDec: Exit gracefully when memory allocation fails in the decoder

Change-Id: Ib6e16be3f128e4fc97f8f05b794da980341c81cc
odecs/avcdec/SoftAVCDec.cpp
b4ec8d0558c78b94ec7bf09018a7bf653cfca525 02-Oct-2015 Harish Mahendrakar <harish.mahendrakar@ittiam.com> SoftAVCDec: Added a check for unsupported resolutions

Bug: 24542936

Change-Id: I97203353c7d026e02c8aad0f2c820a641e453c7c
odecs/avcdec/SoftAVCDec.cpp
ec62e13719cfbd663fd8b63a110747a2630e582c 01-Sep-2015 Harish Mahendrakar <harish.mahendrakar@ittiam.com> SoftHEVCDec: Reduced memory requirements

Change-Id: I8b5205dd8a149a02f78fb55fc3121daf4e69791a
odecs/hevcdec/SoftHEVC.cpp
odecs/hevcdec/SoftHEVC.h
a3f29527044ad61ae8e38b93ab9355a20c5fd2c0 13-Aug-2015 Harish Mahendrakar <harish.mahendrakar@ittiam.com> SoftMPEG2Dec: Added support for deinterlacer

Bug: 20932810

Change-Id: I16eadda6f26e73ed89c878d52c38bb43d84bfe40
odecs/mpeg2dec/SoftMPEG2.cpp
33b2f14a64949f4b4e615c131d0c147873e9d787 16-Oct-2015 Dan Austin <danielaustin@google.com> Benign integer overflow in PlaylistFetcher

There is a benign integer overflow in the loop that finds the
smallest first PTS from all streams in the current parser. The
loop has been refactored to eliminate the integer overflow.

Bug: 25008541
Change-Id: Ie2c0f1d360023cad960e071d810dddb1b5420470
ttplive/PlaylistFetcher.cpp
c1d653bbb1a99908aaf385a830aa101a3c5f1aa8 15-Oct-2015 Dan Austin <danielaustin@google.com> Fix benign integer overflow conditions for VSYNC add and removal.

There are integer overflow conditions that could occur on
vsyncsForLastFrame in VideoFrameScheduler::schedule upon a VSYNC
add or removal. Additional checks have been put in place to
remove the overflowable conditions.

Bug: 24980200
Change-Id: I7dfc25ae1d2f3e3b3382e990adb3c56518c64e8d
ideoFrameScheduler.cpp
62a6fab6dd04c1f28476cbff0c75cdeb21e204fe 14-Oct-2015 Dan Austin <danielaustin@google.com> am 9959fd4c: am 2e17dc2b: am ba1869ef: Merge "Setting ACELP_2t64_fx to not be integer sanitized due to multiple benign integer overflow conditions."

* commit '9959fd4cc1a9ccdeaab664356e908101ee3c4b72':
Setting ACELP_2t64_fx to not be integer sanitized due to multiple benign integer overflow conditions.
9959fd4cc1a9ccdeaab664356e908101ee3c4b72 14-Oct-2015 Dan Austin <danielaustin@google.com> am 2e17dc2b: am ba1869ef: Merge "Setting ACELP_2t64_fx to not be integer sanitized due to multiple benign integer overflow conditions."

* commit '2e17dc2b0221efcfa148f2b7991b88ea97547628':
Setting ACELP_2t64_fx to not be integer sanitized due to multiple benign integer overflow conditions.
2e17dc2b0221efcfa148f2b7991b88ea97547628 14-Oct-2015 Dan Austin <danielaustin@google.com> am ba1869ef: Merge "Setting ACELP_2t64_fx to not be integer sanitized due to multiple benign integer overflow conditions."

* commit 'ba1869ef90dcb7f2f3eb420878a483a529156e26':
Setting ACELP_2t64_fx to not be integer sanitized due to multiple benign integer overflow conditions.
3cdaed88daeeebfe05e7913837f41c2d92f411cc 14-Oct-2015 Dan Austin <danielaustin@google.com> Setting ACELP_2t64_fx to not be integer sanitized due to multiple benign
integer overflow conditions.

Bug: 23752600
Change-Id: I0c2ece5de6ca66086643d7dd45fb3fe44d57b0fc
odecs/amrwbenc/src/c2t64fx.c
c4b3c2a7737039d0fcbceaa36590468926bdd1d3 13-Oct-2015 Ronghua Wu <ronghuawu@google.com> am cb9124f5: am 5e20fad6: am e5200ea7: Merge "libstagefright: don\'t reclaim codec when there\'s buffer owned by client. Notify the client and try to reclaim again in 0.5s." into mnc-dr-dev

* commit 'cb9124f5c810b4777f8c6644135531477eeed79a':
libstagefright: don't reclaim codec when there's buffer owned by client. Notify the client and try to reclaim again in 0.5s.
cb9124f5c810b4777f8c6644135531477eeed79a 13-Oct-2015 Ronghua Wu <ronghuawu@google.com> am 5e20fad6: am e5200ea7: Merge "libstagefright: don\'t reclaim codec when there\'s buffer owned by client. Notify the client and try to reclaim again in 0.5s." into mnc-dr-dev

* commit '5e20fad6f5b37f269285684beb611932577b12c3':
libstagefright: don't reclaim codec when there's buffer owned by client. Notify the client and try to reclaim again in 0.5s.
e5200ea76c5d180b53087ae7825326ec61cc4687 13-Oct-2015 Ronghua Wu <ronghuawu@google.com> Merge "libstagefright: don't reclaim codec when there's buffer owned by client. Notify the client and try to reclaim again in 0.5s." into mnc-dr-dev
f8a36b5850fa6f793f1d26ca9e35afd5f8d704d5 12-Oct-2015 Marco Nelissen <marcone@google.com> ABuffer: remove unused code

Change-Id: I88d6869578acf719a42c40b98946c9337fce98d5
oundation/ABuffer.cpp
71a17c88ff929a79f67384602ab94e4e210dae71 12-Oct-2015 Chad Brubaker <cbrubaker@google.com> am 8956531f: am a831710b: am 3cce4937: Merge "Fix benign overflow in SampleIterator"

* commit '8956531f3c5231ac8203df03038a3e3c65f81a98':
Fix benign overflow in SampleIterator
a831710b8980b887441a03a0743f84f2c6e46f1f 09-Oct-2015 Chad Brubaker <cbrubaker@google.com> am 3cce4937: Merge "Fix benign overflow in SampleIterator"

* commit '3cce4937ae9bb3a522bee74a47807c8cf0b462d5':
Fix benign overflow in SampleIterator
cbcd8dd1967af30ff035132328002c0ec9a8872e 09-Oct-2015 Chad Brubaker <cbrubaker@google.com> Fix benign overflow in SampleIterator

Bug:24807954
Change-Id: I83fe1990408c5f1da7cf46ff2a2cafb96b3e8cdd
ampleIterator.cpp
43dcf600b7d6f1fdf0e8db4b9c68dfa11da5878c 22-Jul-2015 Apurupa Pattapu <apurupa@codeaurora.org> stagefright: Handle missing text track language

Only set timed text language if kKeyMediaLanguage is found.

Author: Leena Winterrowd <lenhardw@codeaurora.org>
Change-Id: Ie471bc458e42f5728064e447ac5c33b07311d3fd
tagefrightMetadataRetriever.cpp
fe26fcb2b4e78b53ab843bd1cf1a67c5bccd7a5f 09-Oct-2015 Marco Nelissen <marcone@google.com> am 1a155c35: am 72497b7c: am 8c02c891: Merge "SoftAVCDec: Exit gracefully when memory allocation fails in the decoder"

* commit '1a155c35a75c2bfb309c265ea4079669c5b3d1ab':
SoftAVCDec: Exit gracefully when memory allocation fails in the decoder
72497b7c9c61895995458cd90584b9b17b9a5f53 09-Oct-2015 Marco Nelissen <marcone@google.com> am 8c02c891: Merge "SoftAVCDec: Exit gracefully when memory allocation fails in the decoder"

* commit '8c02c891b7035199f841890f00f34cbec3c25598':
SoftAVCDec: Exit gracefully when memory allocation fails in the decoder
c7e892937448915a89d3aaef369ecfe3999bd4eb 02-Oct-2015 Harish Mahendrakar <harish.mahendrakar@ittiam.com> SoftAVCDec: Exit gracefully when memory allocation fails in the decoder

Change-Id: Ib6e16be3f128e4fc97f8f05b794da980341c81cc
odecs/avcdec/SoftAVCDec.cpp
97bf902e1791640598db951ae8df85f237759f86 09-Oct-2015 Marco Nelissen <marcone@google.com> am a91acba9: am 195ffcb8: am 9f815974: Merge "SoftHEVCDec: Reduced memory requirements"

* commit 'a91acba9651cbbb77755f0ed06081e311a930c3c':
SoftHEVCDec: Reduced memory requirements
195ffcb8f9af1501a2e28406de7b9876ed9250a1 09-Oct-2015 Marco Nelissen <marcone@google.com> am 9f815974: Merge "SoftHEVCDec: Reduced memory requirements"

* commit '9f815974d05cb5b70c8328f6facc3392c23ae675':
SoftHEVCDec: Reduced memory requirements
8e43919f1f65f4cd3d98fc3cd2b83bf3cd666d39 01-Sep-2015 Harish Mahendrakar <harish.mahendrakar@ittiam.com> SoftHEVCDec: Reduced memory requirements

Change-Id: I8b5205dd8a149a02f78fb55fc3121daf4e69791a
odecs/hevcdec/SoftHEVC.cpp
odecs/hevcdec/SoftHEVC.h
ba80f4fd7a0e803969179d2cceeac74851e78e58 09-Oct-2015 Marco Nelissen <marcone@google.com> am 1dca1a68: am 4a63cb42: am a8426bfb: Merge "SoftMPEG2Dec: Added support for deinterlacer"

* commit '1dca1a6861be1815075a1b70059946d506104587':
SoftMPEG2Dec: Added support for deinterlacer
68a57ae82b49e3ab21d90fc8f73933a3e602c508 09-Oct-2015 Marco Nelissen <marcone@google.com> am 00756daf: am db8884f1: am 85949f65: Merge "SoftAVCDec: Added a check for unsupported resolutions"

* commit '00756dafa8ac86760a0bc477f8059740463a073d':
SoftAVCDec: Added a check for unsupported resolutions
4a63cb4239b890099a6f091b9003368d1f538aac 09-Oct-2015 Marco Nelissen <marcone@google.com> am a8426bfb: Merge "SoftMPEG2Dec: Added support for deinterlacer"

* commit 'a8426bfbccef7a3057bac1c02f941fa38427a72a':
SoftMPEG2Dec: Added support for deinterlacer
db8884f1689feaae3f5af9b10db76ce06201f4aa 09-Oct-2015 Marco Nelissen <marcone@google.com> am 85949f65: Merge "SoftAVCDec: Added a check for unsupported resolutions"

* commit '85949f65a78d101c33195337bf051d39d74c5f9c':
SoftAVCDec: Added a check for unsupported resolutions
a8426bfbccef7a3057bac1c02f941fa38427a72a 08-Oct-2015 Marco Nelissen <marcone@google.com> Merge "SoftMPEG2Dec: Added support for deinterlacer"
85949f65a78d101c33195337bf051d39d74c5f9c 08-Oct-2015 Marco Nelissen <marcone@google.com> Merge "SoftAVCDec: Added a check for unsupported resolutions"
91aa4a0aefa43ad53a20b3d4538a6a986c902818 08-Oct-2015 Wei Jia <wjia@google.com> am f106f9e4: am 15e991bd: resolved conflicts for 0b09da7a to lmp-mr1-dev

* commit 'f106f9e4eacc1cb10ccc851a37619ed4b37bbb1b':
DO NOT MERGE - OMX: allow only secure codec to remotely call allocateBuffer.
15e991bdf8870c2c9820c2d98e0d30dae2e05a25 08-Oct-2015 Wei Jia <wjia@google.com> resolved conflicts for 0b09da7a to lmp-mr1-dev

Change-Id: Ib6a1aa4cee00e0449da30ae158d71403d6236487
dd184a4824acc31160895e2c6f8d93a7facfc2c8 08-Oct-2015 Wei Jia <wjia@google.com> am 3b4a72ac: Merge "DO NOT MERGE - OMX: allow only secure codec to remotely call allocateBuffer." into klp-dev

* commit '3b4a72acf039c58c33807b6d6fcdd5e09eafb1df':
DO NOT MERGE - OMX: allow only secure codec to remotely call allocateBuffer.
04c02eeb0e5e5e4829df6946b275a770a8443330 08-Oct-2015 Wei Jia <wjia@google.com> Merge "DO NOT MERGE - OMX: allow only secure codec to remotely call allocateBuffer." into lmp-dev
3b4a72acf039c58c33807b6d6fcdd5e09eafb1df 08-Oct-2015 Wei Jia <wjia@google.com> Merge "DO NOT MERGE - OMX: allow only secure codec to remotely call allocateBuffer." into klp-dev
d008275796ac4cccf85fefce53cef733a49bc1fa 31-Aug-2015 Wonsik Kim <wonsik@google.com> Implement pause/resume functionality to MediaRecorder

Bug: 20092236
Change-Id: Ia0e92ff246302fd5fdef53c4f961d6645cc26a86
ediaCodecSource.cpp
a7e3bfbf4b0e610d0fbe745475a53f377bf7e74a 08-Oct-2015 Chad Brubaker <cbrubaker@google.com> am f7ec627f: am 1127e1b6: Merge "Fix benign overflow in getTimeUsOfGranule"

* commit 'f7ec627f451abbd17ee0c2cb57e07700cf671f2f':
Fix benign overflow in getTimeUsOfGranule
f7ec627f451abbd17ee0c2cb57e07700cf671f2f 08-Oct-2015 Chad Brubaker <cbrubaker@google.com> am 1127e1b6: Merge "Fix benign overflow in getTimeUsOfGranule"

* commit '1127e1b62db92a47688a6fd4df5fd0800b8295a1':
Fix benign overflow in getTimeUsOfGranule
894aa94e101f9ff9a074f2bcc4d1fb989cf9ea04 08-Oct-2015 Chad Brubaker <cbrubaker@google.com> Fix benign overflow in getTimeUsOfGranule

Bug: 24748446
Change-Id: I1f8e3927e9a8f646a0d804161924ae0dcc5ab75d
ggExtractor.cpp
2482595baadd16f20d3992c8c9d6a14061836872 28-Sep-2015 Wei Jia <wjia@google.com> DO NOT MERGE - OMX: allow only secure codec to remotely call allocateBuffer.

Bug: 24310423
Change-Id: Iebcfc58b447f925ec2134898060af2ef227266a3
(cherry picked from commit 8dde7269a5356503d2b283234b6cb46d0c3f214e)
nclude/OMX.h
nclude/OMXNodeInstance.h
mx/OMX.cpp
mx/OMXNodeInstance.cpp
4a03d784f7c0e3a9685d182eee92ba6580eaf5a1 28-Sep-2015 Wei Jia <wjia@google.com> DO NOT MERGE - OMX: allow only secure codec to remotely call allocateBuffer.

Bug: 24310423
Change-Id: Iebcfc58b447f925ec2134898060af2ef227266a3
(cherry picked from commit 8dde7269a5356503d2b283234b6cb46d0c3f214e)
nclude/OMX.h
nclude/OMXNodeInstance.h
mx/OMX.cpp
mx/OMXNodeInstance.cpp
a641ad59d5a115bb5d4178725a01898f397f0306 07-Oct-2015 Marco Nelissen <marcone@google.com> am 0daa5e96: am de835045: Merge "Disable integer sanitization checks for the *other* L_add function"

* commit '0daa5e9607b0e68cec2bac20d16f88c561c12549':
Disable integer sanitization checks for the *other* L_add function
0daa5e9607b0e68cec2bac20d16f88c561c12549 07-Oct-2015 Marco Nelissen <marcone@google.com> am de835045: Merge "Disable integer sanitization checks for the *other* L_add function"

* commit 'de83504563a01201511657d1824fe2e23f1d7916':
Disable integer sanitization checks for the *other* L_add function
1d00430722b24499373c40c6521be4eb41916f0e 07-Oct-2015 Marco Nelissen <marcone@google.com> Disable integer sanitization checks for the *other* L_add function

Change-Id: I014e82b72dadedad06ad374fa616b772b09a3cd7
odecs/amrwbenc/inc/basic_op.h
3b52853d5689032557449090a60606bbf0786c24 07-Oct-2015 Marco Nelissen <marcone@google.com> am 9589b468: Merge "Fix harmless unsigned overflow in recoverPTS"

* commit '9589b4683cbce551eaafde67cb2af94773a9f51d':
Fix harmless unsigned overflow in recoverPTS
a6b9d752e7e266b63a2d9a694b3422198cb512a1 07-Oct-2015 Wei Jia <wjia@google.com> am d4df7559: am 39f64a1e: am 8b713f11: am b75a78db: am fc0e2a87: am 7ed8d1ef: ID3: check possible integer overflow for extendedHeaderSize and paddingSize.

* commit 'd4df7559c32d95707d2c04cbf8612db37d682ef6':
ID3: check possible integer overflow for extendedHeaderSize and paddingSize.
39f64a1e4903624bd6395aa2a1c6875a10ed489d 07-Oct-2015 Wei Jia <wjia@google.com> am 8b713f11: am b75a78db: am fc0e2a87: am 7ed8d1ef: ID3: check possible integer overflow for extendedHeaderSize and paddingSize.

* commit '8b713f11afc2cd5bf4252022c84bb480a8dd492b':
ID3: check possible integer overflow for extendedHeaderSize and paddingSize.
46357d5512ed1ca697239214ad84804d4766b31b 01-Aug-2015 Chad Brubaker <cbrubaker@google.com> Fix harmless unsigned overflow in recoverPTS

Change-Id: I89e3a827cf566421e8dd9b6a3c842e73a19c140f
peg2ts/ATSParser.cpp
b75a78db916a7becf7e1b5ad15c0b4e667ef4661 07-Oct-2015 Wei Jia <wjia@google.com> am fc0e2a87: am 7ed8d1ef: ID3: check possible integer overflow for extendedHeaderSize and paddingSize.

* commit 'fc0e2a87c17b1f326b5e3302e8f534c143fd5784':
ID3: check possible integer overflow for extendedHeaderSize and paddingSize.
fc0e2a87c17b1f326b5e3302e8f534c143fd5784 07-Oct-2015 Wei Jia <wjia@google.com> am 7ed8d1ef: ID3: check possible integer overflow for extendedHeaderSize and paddingSize.

* commit '7ed8d1eff9b292b3c65a875b13a549e29654534b':
ID3: check possible integer overflow for extendedHeaderSize and paddingSize.
8eb5f7425c1c170423209d1593b254de2622ca2a 07-Oct-2015 Wei Jia <wjia@google.com> am b6495718: am b39b25a2: am d9a22c51: am 39d91e7b: Merge "ID3: check possible integer overflow for extendedHeaderSize and paddingSize." into mnc-dev

* commit 'b6495718dc3f3269a862843762e4809cc26fcae6':
ID3: check possible integer overflow for extendedHeaderSize and paddingSize.
b6495718dc3f3269a862843762e4809cc26fcae6 07-Oct-2015 Wei Jia <wjia@google.com> am b39b25a2: am d9a22c51: am 39d91e7b: Merge "ID3: check possible integer overflow for extendedHeaderSize and paddingSize." into mnc-dev

* commit 'b39b25a2b9ceb5b3e1d32ddbead10b907e5c87a1':
ID3: check possible integer overflow for extendedHeaderSize and paddingSize.
017c35af4ab5caabcc81c7869dde58b9d96f86b3 07-Oct-2015 Marco Nelissen <marcone@google.com> am 56b87a46: am 21f633e1: am bf42e44c: am 6f14568b: am f1790258: am 5e92fded: am 64cdd5f2: am f2cf2bd7: am 07395f4c: am 00f5fa82: am 74d1927e: Merge "Check NAL size before use" into klp-dev

* commit '56b87a460b7638ac8ec6b03177266d59a3d9c807':
Check NAL size before use
b88cc8dc252965c76472e91cb81dbe94fb4f64d0 06-Oct-2015 Marco Nelissen <marcone@google.com> am 2db3734e: Merge "Fix benign overflows in ACodec"

* commit '2db3734ec6e985fc0edbf66c235711037e28a3de':
Fix benign overflows in ACodec
56b87a460b7638ac8ec6b03177266d59a3d9c807 06-Oct-2015 Marco Nelissen <marcone@google.com> am 21f633e1: am bf42e44c: am 6f14568b: am f1790258: am 5e92fded: am 64cdd5f2: am f2cf2bd7: am 07395f4c: am 00f5fa82: am 74d1927e: Merge "Check NAL size before use" into klp-dev

* commit '21f633e1090de1e8adf8578e2bbd4dc810d2563d':
Check NAL size before use
d9a22c51c2f06384ec617f32e6c1e02e3207de26 06-Oct-2015 Wei Jia <wjia@google.com> am 39d91e7b: Merge "ID3: check possible integer overflow for extendedHeaderSize and paddingSize." into mnc-dev

* commit '39d91e7bc5c62cf7349cf34ba91ae45f9eb12283':
ID3: check possible integer overflow for extendedHeaderSize and paddingSize.
198446e81eaddf8a57d0ac809569ae26dd5ceaeb 06-Oct-2015 Marco Nelissen <marcone@google.com> am 28dd6059: Merge "Fix benign overflow in OMXNodeInstance"

* commit '28dd605906a0e44361caffc65bce2edb14c661f3':
Fix benign overflow in OMXNodeInstance
7ed8d1eff9b292b3c65a875b13a549e29654534b 05-Oct-2015 Wei Jia <wjia@google.com> ID3: check possible integer overflow for extendedHeaderSize and paddingSize.

Bug: 24623447
Change-Id: Ifbc74454d6e28ad7136efe35ab638a07e46398b1
(cherry picked from commit b3694ff5a5bcecd4b6cedca156f6effb55bbf4ca)
d3/ID3.cpp
39d91e7bc5c62cf7349cf34ba91ae45f9eb12283 06-Oct-2015 Wei Jia <wjia@google.com> Merge "ID3: check possible integer overflow for extendedHeaderSize and paddingSize." into mnc-dev
ad69e73b660ac2ee2ac32f7c58632b6e223c9218 06-Oct-2015 Marco Nelissen <marcone@google.com> Fix benign overflows in ACodec

Change-Id: Ia699f8a9f5367a9b38aaa6bbbdb0097c3e2ab551
Codec.cpp
bf42e44c04ca08394a98eb8dda9ae8f9096dd396 06-Oct-2015 Marco Nelissen <marcone@google.com> am 6f14568b: am f1790258: am 5e92fded: am 64cdd5f2: am f2cf2bd7: am 07395f4c: am 00f5fa82: am 74d1927e: Merge "Check NAL size before use" into klp-dev

* commit '6f14568be83995a0ee0104f521f93e1e4d9902f3':
Check NAL size before use
e4a595cb4af87725cbe071ebf69ba7118186680f 06-Oct-2015 Marco Nelissen <marcone@google.com> Fix benign overflow in OMXNodeInstance

Change-Id: I7470bddb7ade97143ba70c026e3b7d61dd8d97b0
mx/OMXNodeInstance.cpp
6f14568be83995a0ee0104f521f93e1e4d9902f3 06-Oct-2015 Marco Nelissen <marcone@google.com> am f1790258: am 5e92fded: am 64cdd5f2: am f2cf2bd7: am 07395f4c: am 00f5fa82: am 74d1927e: Merge "Check NAL size before use" into klp-dev

* commit 'f1790258494751adc629126666e7dd81bbc8afbd':
Check NAL size before use
f1790258494751adc629126666e7dd81bbc8afbd 06-Oct-2015 Marco Nelissen <marcone@google.com> am 5e92fded: am 64cdd5f2: am f2cf2bd7: am 07395f4c: am 00f5fa82: am 74d1927e: Merge "Check NAL size before use" into klp-dev

* commit '5e92fdede2391b77cff5fe914d748e1023d0ef90':
Check NAL size before use
64cdd5f243ffdb9460ae3d17bd2a732560fc8395 06-Oct-2015 Marco Nelissen <marcone@google.com> am f2cf2bd7: am 07395f4c: am 00f5fa82: am 74d1927e: Merge "Check NAL size before use" into klp-dev

* commit 'f2cf2bd7448734c6881e3bea2b758f2bf9feeed9':
Check NAL size before use
b8f5d50cd652b4ff6121b9107b5dd7d91ca5929e 06-Oct-2015 Wei Jia <wjia@google.com> am 3674abc0: am fb0d63df: am 62d89908: am df68d9d5: am 60b25aa0: am 9ab9c85e: Merge "MPEG4Extractor: ensure buffer size is not less than 8 for LastCommentData." into klp-dev

* commit '3674abc050997e664c3906b8507d9d4b63d52e9d':
MPEG4Extractor: ensure buffer size is not less than 8 for LastCommentData.
99e5e3b00291f2f7010a96dcdf014f4aa337ee23 02-Oct-2015 Harish Mahendrakar <harish.mahendrakar@ittiam.com> SoftAVCDec: Added a check for unsupported resolutions

Change-Id: I97203353c7d026e02c8aad0f2c820a641e453c7c
odecs/avcdec/SoftAVCDec.cpp
69d5c03e54c4741075562250e129d3ac271fb1ab 06-Oct-2015 Marco Nelissen <marcone@google.com> am c0432b0d: am e7f020fa: am cb71c4f2: am 711e9dfc: am 8b3aa04a: am a0c94bc6: am 567ad5c6: am 7ce82583: am 13b6b51e: am f7d1f627: am 257b3bc5: Don\'t crash when there\'s no conceal frame

* commit 'c0432b0d313d4a96854e27ab9d26a2d76473da60':
Don't crash when there's no conceal frame
fb0d63df2393a5e20cbb16d90ed5c01295a81836 06-Oct-2015 Wei Jia <wjia@google.com> am 62d89908: am df68d9d5: am 60b25aa0: am 9ab9c85e: Merge "MPEG4Extractor: ensure buffer size is not less than 8 for LastCommentData." into klp-dev

* commit '62d89908f6c7e3da9dac36aa439ceb1c2522b86d':
MPEG4Extractor: ensure buffer size is not less than 8 for LastCommentData.
07395f4cd72cf29d1de2864cde42876db4e54411 06-Oct-2015 Marco Nelissen <marcone@google.com> am 00f5fa82: am 74d1927e: Merge "Check NAL size before use" into klp-dev

* commit '00f5fa82d884c0ca41ee08e7a67ab54238109083':
Check NAL size before use
c0432b0d313d4a96854e27ab9d26a2d76473da60 06-Oct-2015 Marco Nelissen <marcone@google.com> am e7f020fa: am cb71c4f2: am 711e9dfc: am 8b3aa04a: am a0c94bc6: am 567ad5c6: am 7ce82583: am 13b6b51e: am f7d1f627: am 257b3bc5: Don\'t crash when there\'s no conceal frame

* commit 'e7f020fa0dcc7418c240a3681af0a21cb6bf93bd':
Don't crash when there's no conceal frame
00f5fa82d884c0ca41ee08e7a67ab54238109083 06-Oct-2015 Marco Nelissen <marcone@google.com> am 74d1927e: Merge "Check NAL size before use" into klp-dev

* commit '74d1927e4122a1748f89ca2ef79406fc06ee94b2':
Check NAL size before use
df68d9d5bf5329bc2f7effb6afa1d3904eaf30d8 06-Oct-2015 Wei Jia <wjia@google.com> am 60b25aa0: am 9ab9c85e: Merge "MPEG4Extractor: ensure buffer size is not less than 8 for LastCommentData." into klp-dev

* commit '60b25aa0c173854593743dd85588c7449baf87c0':
MPEG4Extractor: ensure buffer size is not less than 8 for LastCommentData.
74d1927e4122a1748f89ca2ef79406fc06ee94b2 06-Oct-2015 Marco Nelissen <marcone@google.com> Merge "Check NAL size before use" into klp-dev
60b25aa0c173854593743dd85588c7449baf87c0 06-Oct-2015 Wei Jia <wjia@google.com> am 9ab9c85e: Merge "MPEG4Extractor: ensure buffer size is not less than 8 for LastCommentData." into klp-dev

* commit '9ab9c85e39f089f355faa9cd9db6d113dc482e61':
MPEG4Extractor: ensure buffer size is not less than 8 for LastCommentData.
cb71c4f2ec08511499f0fbc23ca0fbab30bac729 06-Oct-2015 Marco Nelissen <marcone@google.com> am 711e9dfc: am 8b3aa04a: am a0c94bc6: am 567ad5c6: am 7ce82583: am 13b6b51e: am f7d1f627: am 257b3bc5: Don\'t crash when there\'s no conceal frame

* commit '711e9dfc85dfa41c8c840103bd510e98d9b663da':
Don't crash when there's no conceal frame
9ab9c85e39f089f355faa9cd9db6d113dc482e61 06-Oct-2015 Wei Jia <wjia@google.com> Merge "MPEG4Extractor: ensure buffer size is not less than 8 for LastCommentData." into klp-dev
711e9dfc85dfa41c8c840103bd510e98d9b663da 06-Oct-2015 Marco Nelissen <marcone@google.com> am 8b3aa04a: am a0c94bc6: am 567ad5c6: am 7ce82583: am 13b6b51e: am f7d1f627: am 257b3bc5: Don\'t crash when there\'s no conceal frame

* commit '8b3aa04a625dfd3adf68118e64da1eafec9db594':
Don't crash when there's no conceal frame
8b3aa04a625dfd3adf68118e64da1eafec9db594 06-Oct-2015 Marco Nelissen <marcone@google.com> am a0c94bc6: am 567ad5c6: am 7ce82583: am 13b6b51e: am f7d1f627: am 257b3bc5: Don\'t crash when there\'s no conceal frame

* commit 'a0c94bc6582dde27ed31fbb771d7eb758fb9adbe':
Don't crash when there's no conceal frame
567ad5c622c5dd809e2fae0cec93a545723a2f86 06-Oct-2015 Marco Nelissen <marcone@google.com> am 7ce82583: am 13b6b51e: am f7d1f627: am 257b3bc5: Don\'t crash when there\'s no conceal frame

* commit '7ce825833ad65cebfded3f35457925ae9e00124a':
Don't crash when there's no conceal frame
13b6b51e6d9c399f0bfa55be4eecaf47b63845f2 06-Oct-2015 Marco Nelissen <marcone@google.com> am f7d1f627: am 257b3bc5: Don\'t crash when there\'s no conceal frame

* commit 'f7d1f627b0b1139f82f16baee482476cc10ccde4':
Don't crash when there's no conceal frame
f7d1f627b0b1139f82f16baee482476cc10ccde4 06-Oct-2015 Marco Nelissen <marcone@google.com> am 257b3bc5: Don\'t crash when there\'s no conceal frame

* commit '257b3bc581bbc65318a4cc2d3c22a07a4429dc1d':
Don't crash when there's no conceal frame
5d101298d8b0a78a1dc5bd26dbdada411f4ecd4d 03-Oct-2015 Marco Nelissen <marcone@google.com> Check NAL size before use

Bug: 24441553
Bug: 24445122
Change-Id: Ib7f025769adbafd5a2cb64fae5562a0a565945c2
PEG4Extractor.cpp
f470bf3f3788062f77a0614ec693583fd85716c6 06-Oct-2015 Wei Jia <wjia@google.com> am 031e841e: am 8656914f: am b90b8291: am cb70fdbe: Merge "OMX: allow only secure codec to remotely call allocateBuffer." into mnc-dev

* commit '031e841e34f2358a71cc63ad8192e0f48a9f63a7':
OMX: allow only secure codec to remotely call allocateBuffer.
280ac6b1bd710dac1678cc0bfa75ce6a78a83a27 06-Oct-2015 Wei Jia <wjia@google.com> am 78fd5432: am 0721bec2: am ee481c9b: am 47abfa32: Merge "MPEG4Extractor: ensure buffer size is not less than 8 for LastCommentData." into mnc-dev

* commit '78fd543275430b44fe3053d6f57f43655cd7bcb1':
MPEG4Extractor: ensure buffer size is not less than 8 for LastCommentData.
031e841e34f2358a71cc63ad8192e0f48a9f63a7 06-Oct-2015 Wei Jia <wjia@google.com> am 8656914f: am b90b8291: am cb70fdbe: Merge "OMX: allow only secure codec to remotely call allocateBuffer." into mnc-dev

* commit '8656914fa29bbd72512752e221837333c672a188':
OMX: allow only secure codec to remotely call allocateBuffer.
78fd543275430b44fe3053d6f57f43655cd7bcb1 06-Oct-2015 Wei Jia <wjia@google.com> am 0721bec2: am ee481c9b: am 47abfa32: Merge "MPEG4Extractor: ensure buffer size is not less than 8 for LastCommentData." into mnc-dev

* commit '0721bec210aa6bf969a6e50b4406434c3608a742':
MPEG4Extractor: ensure buffer size is not less than 8 for LastCommentData.
b90b8291e36ae079ac0ccd029bb6e6a987036f7c 06-Oct-2015 Wei Jia <wjia@google.com> am cb70fdbe: Merge "OMX: allow only secure codec to remotely call allocateBuffer." into mnc-dev

* commit 'cb70fdbe9be14002a4303a93f07a13c508c00d89':
OMX: allow only secure codec to remotely call allocateBuffer.
ee481c9b172f90f507d505c9b32620cc1d062c83 06-Oct-2015 Wei Jia <wjia@google.com> am 47abfa32: Merge "MPEG4Extractor: ensure buffer size is not less than 8 for LastCommentData." into mnc-dev

* commit '47abfa32aad8acf2f483a3c9802120ffa0c0a332':
MPEG4Extractor: ensure buffer size is not less than 8 for LastCommentData.
e6d904fe5f6e7c7fc1d5fca2798dd3512468b118 28-Sep-2015 Wei Jia <wjia@google.com> MPEG4Extractor: ensure buffer size is not less than 8 for LastCommentData.

Bug: 24346430
Change-Id: I897a724e968841d9160f819d06c0ce22f6d743c4
(cherry picked from commit 5cae16bdce77b0a3ba590b55637f7d55a2f35402)
PEG4Extractor.cpp
cb70fdbe9be14002a4303a93f07a13c508c00d89 06-Oct-2015 Wei Jia <wjia@google.com> Merge "OMX: allow only secure codec to remotely call allocateBuffer." into mnc-dev
47abfa32aad8acf2f483a3c9802120ffa0c0a332 06-Oct-2015 Wei Jia <wjia@google.com> Merge "MPEG4Extractor: ensure buffer size is not less than 8 for LastCommentData." into mnc-dev
b3694ff5a5bcecd4b6cedca156f6effb55bbf4ca 05-Oct-2015 Wei Jia <wjia@google.com> ID3: check possible integer overflow for extendedHeaderSize and paddingSize.

Bug: 24623447
Change-Id: Ifbc74454d6e28ad7136efe35ab638a07e46398b1
d3/ID3.cpp
257b3bc581bbc65318a4cc2d3c22a07a4429dc1d 05-Oct-2015 Marco Nelissen <marcone@google.com> Don't crash when there's no conceal frame

Bug: 24630158
Change-Id: If042aebebb58c218eb7bbf01dcddbcbd05dca1d6
odecs/m4v_h263/dec/src/conceal.cpp
7dd210a940c9f1e6e0a2ca7dfc9a5d0f09fe1b83 05-Oct-2015 Pablo Ceballos <pceballos@google.com> Merge "stagefright: update to QueueBufferInput interface"
4b710f086070fabe022b3a1f474bfcbec842b8fc 15-Sep-2015 Ronghua Wu <ronghuawu@google.com> libstagefright: don't reclaim codec when there's buffer owned
by client.
Notify the client and try to reclaim again in 0.5s.

Bug: 23703241
Bug: 23949540
Change-Id: I1afe50c71635645668bfb73ffa0d801765b5ae3c
ediaCodec.cpp
0d3ba5028e8ba1b9cf35df288140b6d7a721dfe7 03-Oct-2015 Wei Jia <wjia@google.com> Merge "VBRISeeker: check mSegments.size() before using it."
e206ba0720bad1e29912a0ec359f451672c0bc95 03-Oct-2015 Wei Jia <wjia@google.com> VBRISeeker: check mSegments.size() before using it.

Bug: 24426211
Change-Id: I325380be0714d531bdd7f488f6720f6b4578a678
BRISeeker.cpp
302b546bdccc777c1d3100510cd928e8bdf55fa5 01-Sep-2015 Lajos Molnar <lajos@google.com> stagefright: MPEG4Extractor: allow 'hdlr' box before first track

Bug: 21725583
Change-Id: I799c1967759c7e49fb50281a1708188450caac77
(cherry picked from commit cf75af8f76265fb2909028f5dc68c7029dbe5f49)
PEG4Extractor.cpp
8dde7269a5356503d2b283234b6cb46d0c3f214e 28-Sep-2015 Wei Jia <wjia@google.com> OMX: allow only secure codec to remotely call allocateBuffer.

Bug: 24310423
Change-Id: Iebcfc58b447f925ec2134898060af2ef227266a3
nclude/OMX.h
nclude/OMXNodeInstance.h
mx/OMX.cpp
mx/OMXNodeInstance.cpp
5cae16bdce77b0a3ba590b55637f7d55a2f35402 28-Sep-2015 Wei Jia <wjia@google.com> MPEG4Extractor: ensure buffer size is not less than 8 for LastCommentData.

Bug: 24346430
Change-Id: I897a724e968841d9160f819d06c0ce22f6d743c4
PEG4Extractor.cpp
be094287351c59fe06b4c8d3aa73f7f7de0522d0 02-Oct-2015 Wei Jia <wjia@google.com> StagefrightMetadataRetriever: add bug number for security fix.

Bug: 23680780
Change-Id: I8967eb5f12ec9ef75cb192cdf3768f8f5b3e8362
tagefrightMetadataRetriever.cpp
d9b1b54b872a97e53ddadf71d7898327d762ef8c 01-Oct-2015 Dan Austin <danielaustin@google.com> am eb77ffcc: am 992debec: am 2dbb06b2: Merge "Disable integer sanitization checks for L_add function, which performs controlled integer overflows."

* commit 'eb77ffccc9167cc14984edede8012b714554be98':
Disable integer sanitization checks for L_add function, which performs controlled integer overflows.
ffbe18df67425757ee2abde8878ae848134f954b 01-Oct-2015 Dan Austin <danielaustin@google.com> am 6d02d132: am 9ce5e730: am 91f21e16: Merge "Enable fsanitize signed-integer-overflow in AMR-WB decoder"

* commit '6d02d132afdd00ddf90262afa984cbb07a8bcf8b':
Enable fsanitize signed-integer-overflow in AMR-WB decoder
eb77ffccc9167cc14984edede8012b714554be98 01-Oct-2015 Dan Austin <danielaustin@google.com> am 992debec: am 2dbb06b2: Merge "Disable integer sanitization checks for L_add function, which performs controlled integer overflows."

* commit '992debec973f4143e12a812ea4ebd7dc1d299042':
Disable integer sanitization checks for L_add function, which performs controlled integer overflows.
6d02d132afdd00ddf90262afa984cbb07a8bcf8b 01-Oct-2015 Dan Austin <danielaustin@google.com> am 9ce5e730: am 91f21e16: Merge "Enable fsanitize signed-integer-overflow in AMR-WB decoder"

* commit '9ce5e73094838d5598a148199191d7fd78de948c':
Enable fsanitize signed-integer-overflow in AMR-WB decoder
992debec973f4143e12a812ea4ebd7dc1d299042 01-Oct-2015 Dan Austin <danielaustin@google.com> am 2dbb06b2: Merge "Disable integer sanitization checks for L_add function, which performs controlled integer overflows."

* commit '2dbb06b28a8ae82d7cfd7ca2028ce8227b074e53':
Disable integer sanitization checks for L_add function, which performs controlled integer overflows.
9ce5e73094838d5598a148199191d7fd78de948c 01-Oct-2015 Dan Austin <danielaustin@google.com> am 91f21e16: Merge "Enable fsanitize signed-integer-overflow in AMR-WB decoder"

* commit '91f21e1615c43db98df384ab0774030830572c7f':
Enable fsanitize signed-integer-overflow in AMR-WB decoder
2dbb06b28a8ae82d7cfd7ca2028ce8227b074e53 01-Oct-2015 Dan Austin <danielaustin@google.com> Merge "Disable integer sanitization checks for L_add function, which performs controlled integer overflows."
91f21e1615c43db98df384ab0774030830572c7f 01-Oct-2015 Dan Austin <danielaustin@google.com> Merge "Enable fsanitize signed-integer-overflow in AMR-WB decoder"
2f996c9514f4255ed693c860631e4634d20de8bd 30-Sep-2015 Dan Austin <danielaustin@google.com> am 798218c1: am 36656097: am 33b439be: Merge "Enable fsanitize signed-integer-overflow in AMR-WB encoder"

* commit '798218c1575a2fb86fb5e5dd0f29e4bc581cfd62':
Enable fsanitize signed-integer-overflow in AMR-WB encoder
ef979f034a8ea6d37a4b6b68ae1d955605cda2f4 30-Sep-2015 Dan Austin <danielaustin@google.com> am f4e64af8: am 2d843dc5: am e271ed49: Merge "Enable fsanitize signed-integer-overflow in FLAC encoder"

* commit 'f4e64af8c01832c8cc9d17f765279368c071d43c':
Enable fsanitize signed-integer-overflow in FLAC encoder
798218c1575a2fb86fb5e5dd0f29e4bc581cfd62 30-Sep-2015 Dan Austin <danielaustin@google.com> am 36656097: am 33b439be: Merge "Enable fsanitize signed-integer-overflow in AMR-WB encoder"

* commit '36656097ff0912939b450cf9b34977b86635ab40':
Enable fsanitize signed-integer-overflow in AMR-WB encoder
f4e64af8c01832c8cc9d17f765279368c071d43c 30-Sep-2015 Dan Austin <danielaustin@google.com> am 2d843dc5: am e271ed49: Merge "Enable fsanitize signed-integer-overflow in FLAC encoder"

* commit '2d843dc5f34aa450842ce739b83ddbe364bf822e':
Enable fsanitize signed-integer-overflow in FLAC encoder
36656097ff0912939b450cf9b34977b86635ab40 30-Sep-2015 Dan Austin <danielaustin@google.com> am 33b439be: Merge "Enable fsanitize signed-integer-overflow in AMR-WB encoder"

* commit '33b439be3fd389ac2d4c4200177a616bcb8ee13e':
Enable fsanitize signed-integer-overflow in AMR-WB encoder
2d843dc5f34aa450842ce739b83ddbe364bf822e 30-Sep-2015 Dan Austin <danielaustin@google.com> am e271ed49: Merge "Enable fsanitize signed-integer-overflow in FLAC encoder"

* commit 'e271ed4971a2e941022a824c23e54fa05ade69d0':
Enable fsanitize signed-integer-overflow in FLAC encoder
33b439be3fd389ac2d4c4200177a616bcb8ee13e 30-Sep-2015 Dan Austin <danielaustin@google.com> Merge "Enable fsanitize signed-integer-overflow in AMR-WB encoder"
e271ed4971a2e941022a824c23e54fa05ade69d0 30-Sep-2015 Dan Austin <danielaustin@google.com> Merge "Enable fsanitize signed-integer-overflow in FLAC encoder"
b6617aefae36af35f45ea139bc9698ed13c3396f 26-Sep-2015 Dan Austin <danielaustin@google.com> Disable integer sanitization checks for L_add function, which
performs controlled integer overflows.

Bug: 23752600
Change-Id: Idffc9b93ff447c0db6434f83572bc6ec5edc10b6
odecs/amrnb/common/include/basic_op_c_equivalent.h
390a7d7f5a7fec637d3cf4765e08e315f18e178e 11-Sep-2015 Dan Austin <danielaustin@google.com> Enable fsanitize signed-integer-overflow in AMR-WB decoder

Bug: 23752600
Change-Id: I2f663d24f71a2045aa979a696e47c5aabad03cd1
odecs/amrwb/Android.mk
8ce86eac4329b512b2ba2f153ea164470a84f648 29-Sep-2015 Flanker <i@flanker017.me> am fff6a689: am b9fd3616: am e7cd6e51: am ddd346c7: stagefright: fix AMessage::FromParcel

* commit 'fff6a689ae0b5116c6c1a57fa17f40f94152c078':
stagefright: fix AMessage::FromParcel
0f8f3bd0ae66a05ddc85eab84767da034532a56c 29-Sep-2015 Flanker <i@flanker017.me> am 99214848: am 5226d6b7: am e64d4870: am 2b8cd9cb: stagefright: fix AMessage::FromParcel

* commit '992148484a286dab886dd4d1b58dabacf1c1920f':
stagefright: fix AMessage::FromParcel
fff6a689ae0b5116c6c1a57fa17f40f94152c078 29-Sep-2015 Flanker <i@flanker017.me> am b9fd3616: am e7cd6e51: am ddd346c7: stagefright: fix AMessage::FromParcel

* commit 'b9fd3616a1ac97e48e5130879797d87d177eb832':
stagefright: fix AMessage::FromParcel
bdaee5eaa345ee9b1e5ddcb921565c4d127ceb8d 29-Sep-2015 Flanker <i@flanker017.me> am 3737a3fa: DO NOT MERGE stagefright: fix AMessage::FromParcel

* commit '3737a3fa121796131ea5b782230e65dad9ccf90f':
DO NOT MERGE stagefright: fix AMessage::FromParcel
5226d6b7b0fbe40ed1450f6a9d2567aa513e8d79 29-Sep-2015 Flanker <i@flanker017.me> am e64d4870: am 2b8cd9cb: stagefright: fix AMessage::FromParcel

* commit 'e64d4870a543803d8172b80ad8eb198dfde6f361':
stagefright: fix AMessage::FromParcel
e7cd6e516cec0af1542ace9df4f75d9bd3e9ae5f 29-Sep-2015 Flanker <i@flanker017.me> am ddd346c7: stagefright: fix AMessage::FromParcel

* commit 'ddd346c7d54519e056b5b8b6d58b647770b3bb01':
stagefright: fix AMessage::FromParcel
386d2fe3c282899f5395a120121e082f8eca1dc6 28-Sep-2015 Dan Austin <danielaustin@google.com> am 03399836: am 71dc6101: am 167dffbf: Merge changes I6eb5d2c6,Iae2103c4

* commit '03399836e6ec6587f9e52cd4c408af5122b79fe8':
Enable fsanitize signed-integer-overflow in AMR-NB decoder
Enable fsanitize signed-integer-overflow in AMR-NB encoder
03399836e6ec6587f9e52cd4c408af5122b79fe8 28-Sep-2015 Dan Austin <danielaustin@google.com> am 71dc6101: am 167dffbf: Merge changes I6eb5d2c6,Iae2103c4

* commit '71dc61018eb7e93321dd1bde18bf7b4269f9ba7f':
Enable fsanitize signed-integer-overflow in AMR-NB decoder
Enable fsanitize signed-integer-overflow in AMR-NB encoder
1d85800a9ef52f2ce4b551052bf9d02d097f3a7c 28-Sep-2015 Dan Austin <danielaustin@google.com> am 172f5736: am 095779c4: am 6a869df9: Merge "Enable fsanitize signed-integer-overflow in AMR-NB common"

* commit '172f57364684997a7a1b43636e23ae1c43d4755c':
Enable fsanitize signed-integer-overflow in AMR-NB common
172f57364684997a7a1b43636e23ae1c43d4755c 28-Sep-2015 Dan Austin <danielaustin@google.com> am 095779c4: am 6a869df9: Merge "Enable fsanitize signed-integer-overflow in AMR-NB common"

* commit '095779c4041d83d3acf500cb94b13625cd51d3ed':
Enable fsanitize signed-integer-overflow in AMR-NB common
71dc61018eb7e93321dd1bde18bf7b4269f9ba7f 28-Sep-2015 Dan Austin <danielaustin@google.com> am 167dffbf: Merge changes I6eb5d2c6,Iae2103c4

* commit '167dffbfb4f3819d07d5e37acc9fbef16e98deb6':
Enable fsanitize signed-integer-overflow in AMR-NB decoder
Enable fsanitize signed-integer-overflow in AMR-NB encoder
095779c4041d83d3acf500cb94b13625cd51d3ed 28-Sep-2015 Dan Austin <danielaustin@google.com> am 6a869df9: Merge "Enable fsanitize signed-integer-overflow in AMR-NB common"

* commit '6a869df9ec1dbd8cab1ef4f68e9190baa6da5f50':
Enable fsanitize signed-integer-overflow in AMR-NB common
0186438dd43c4708aaf1da6b56ce0e274b090a1a 11-Sep-2015 Dan Austin <danielaustin@google.com> Enable fsanitize signed-integer-overflow in FLAC encoder

Bug: 23752600
Change-Id: Ifdfc2de9ea2076749d0deea78e736b6f5b4bd0ea
odecs/flac/enc/Android.mk
3543aa1f9853ac086059f14561be0cb47d0b52c9 11-Sep-2015 Dan Austin <danielaustin@google.com> Enable fsanitize signed-integer-overflow in AVC common

Bug: 23752600
Change-Id: Ia6b20fbc284d22aba8a8500c723191cc634814ab
odecs/avc/common/Android.mk
39eef27b70c10d4a8a0961fcfd8e6a3d86ead5c3 11-Sep-2015 Dan Austin <danielaustin@google.com> Enable fsanitize signed-integer-overflow in AVC encoder

Bug: 23752600
Change-Id: Ia880dd9a578abe545b7f792d2150e6374ab4b813
odecs/avc/enc/Android.mk
a47eb0f0c1b477289f6cd22e31e785559c51ac05 11-Sep-2015 Dan Austin <danielaustin@google.com> Enable fsanitize signed-integer-overflow in AVC soft decoder

Bug: 23752600
Change-Id: I401b186e7b3de613fa91d9ed8bebf0e4500c77b3
odecs/avcdec/Android.mk
dd7610b3141e757c2f076dec1d5b0b8a6e8607f9 11-Sep-2015 Dan Austin <danielaustin@google.com> Enable fsanitize signed-integer-overflow in AVC soft encoder

Bug: 23752600
Change-Id: I29a57d07e41bd63a81adf89f42f596c91f580eed
odecs/avcenc/Android.mk
a49c705c7855f1cb74a24b90630ed82640f89905 11-Sep-2015 Dan Austin <danielaustin@google.com> Enable fsanitize signed-integer-overflow in AMR-NB decoder

Bug: 23752600
Change-Id: I6eb5d2c631071c3b05d4a1404c3d9011d54f0e1f
odecs/amrnb/dec/Android.mk
4a80c9a616ccc2d1d27d66873e75aedd19fc386d 11-Sep-2015 Dan Austin <danielaustin@google.com> Enable fsanitize signed-integer-overflow in AMR-WB encoder

Bug: 23752600
Change-Id: I0f84cceae262e3df6626ceedb1370709ea140259
odecs/amrwbenc/Android.mk
2d93abfb06455176b7f2fcde0d9fd4dfe7a0973c 25-Sep-2015 Chad Brubaker <cbrubaker@google.com> Fix benign overflow in verifyOpusHeader

Bug: 24404248
Bug: 23110888
Change-Id: I9052383f6fe28f0eca558d4374c49f5a67ce11ce
ggExtractor.cpp
3737a3fa121796131ea5b782230e65dad9ccf90f 11-Sep-2015 Flanker <i@flanker017.me> DO NOT MERGE stagefright: fix AMessage::FromParcel

Add check for incoming mNumItems. Also add check readCString return
value.

Fix style & add log.

Bug: 24123723

Change-Id: If41a5312c27d868f481893eef56019b6807c39b7
oundation/AMessage.cpp
2b8cd9cbb3e72ffd048ffdd1609fac74f61a22ac 11-Sep-2015 Flanker <i@flanker017.me> stagefright: fix AMessage::FromParcel

Add check for incoming mNumItems. Also add check readCString return
value.

Fix style & add log.

Bug: 24123723

Change-Id: If41a5312c27d868f481893eef56019b6807c39b7
oundation/AMessage.cpp
ab9362826ee8957d77706d6d807db515768bfa89 11-Sep-2015 Dan Austin <danielaustin@google.com> Enable fsanitize signed-integer-overflow in AMR-NB common

Bug: 23752600
Change-Id: Idde4f45210d45965e687a52dd5d257a1909c2cdd
odecs/amrnb/common/Android.mk
7a9ca6760b377cead6adcf2abf26ae930490da51 11-Sep-2015 Dan Austin <danielaustin@google.com> Enable fsanitize signed-integer-overflow in AMR-NB encoder

Bug: 23752600
Change-Id: Iae2103c4b9dfa0532093e4d923bdcfb90ddde822
odecs/amrnb/enc/Android.mk
ddd346c7d54519e056b5b8b6d58b647770b3bb01 11-Sep-2015 Flanker <i@flanker017.me> stagefright: fix AMessage::FromParcel

Add check for incoming mNumItems. Also add check readCString return
value.

Fix style & add log.

Bug: 24123723

Change-Id: If41a5312c27d868f481893eef56019b6807c39b7
oundation/AMessage.cpp
cb1cdf9e6a2e3f07396416f3d2e6ba1bdd2fec51 24-Sep-2015 Dan Austin <danielaustin@google.com> am 5765687d: am f600f143: am b1d28b20: Merge "Enable fsanitize unsigned-integer-overflow in AAC encoder"

* commit '5765687d8da7bac4f62a2039f68f32dc0a3c9130':
Enable fsanitize unsigned-integer-overflow in AAC encoder
5aae19af4805ea325bb4bd65ffab021a5ab154df 24-Sep-2015 Dan Austin <danielaustin@google.com> am 3ce721d1: am 471f00ef: am 99c1f89b: Merge "Enable fsanitize unsigned-integer-overflow in AAC decoder"

* commit '3ce721d1390e89584768123d50fbe49b2951709f':
Enable fsanitize unsigned-integer-overflow in AAC decoder
5765687d8da7bac4f62a2039f68f32dc0a3c9130 24-Sep-2015 Dan Austin <danielaustin@google.com> am f600f143: am b1d28b20: Merge "Enable fsanitize unsigned-integer-overflow in AAC encoder"

* commit 'f600f143f1f178f75dea248f82859549d96958d5':
Enable fsanitize unsigned-integer-overflow in AAC encoder
3ce721d1390e89584768123d50fbe49b2951709f 24-Sep-2015 Dan Austin <danielaustin@google.com> am 471f00ef: am 99c1f89b: Merge "Enable fsanitize unsigned-integer-overflow in AAC decoder"

* commit '471f00efafcd310dd3978c69e136808f0630af85':
Enable fsanitize unsigned-integer-overflow in AAC decoder
f600f143f1f178f75dea248f82859549d96958d5 24-Sep-2015 Dan Austin <danielaustin@google.com> am b1d28b20: Merge "Enable fsanitize unsigned-integer-overflow in AAC encoder"

* commit 'b1d28b20efa1eb2d11ec41fbc72b8c4f78fccbed':
Enable fsanitize unsigned-integer-overflow in AAC encoder
471f00efafcd310dd3978c69e136808f0630af85 24-Sep-2015 Dan Austin <danielaustin@google.com> am 99c1f89b: Merge "Enable fsanitize unsigned-integer-overflow in AAC decoder"

* commit '99c1f89b50c80e9ed55700d12624f5371e780d59':
Enable fsanitize unsigned-integer-overflow in AAC decoder
263b8b605f0310bf32c861ba43beb9a0dedc0428 24-Sep-2015 Dan Austin <danielaustin@google.com> am f4371c8e: am a0f7d418: am 0dd0d7a3: Merge "Enable fsanitize signed-integer-overflow in AAC encoder"

* commit 'f4371c8e58a47e20c886e6a9052284e3af0d953c':
Enable fsanitize signed-integer-overflow in AAC encoder
b661d8c10c726813e4e52d04dd71e008cbf52332 24-Sep-2015 Dan Austin <danielaustin@google.com> am dbba66c8: am a6b09a9a: am 142aa0a5: Merge "Enable fsanitize signed-integer-overflow in AAC decoder"

* commit 'dbba66c87a5568f525c96a687ea47d5dd4f55660':
Enable fsanitize signed-integer-overflow in AAC decoder
f4371c8e58a47e20c886e6a9052284e3af0d953c 24-Sep-2015 Dan Austin <danielaustin@google.com> am a0f7d418: am 0dd0d7a3: Merge "Enable fsanitize signed-integer-overflow in AAC encoder"

* commit 'a0f7d41818880e9df0c568790e126387c74a5fb7':
Enable fsanitize signed-integer-overflow in AAC encoder
dbba66c87a5568f525c96a687ea47d5dd4f55660 24-Sep-2015 Dan Austin <danielaustin@google.com> am a6b09a9a: am 142aa0a5: Merge "Enable fsanitize signed-integer-overflow in AAC decoder"

* commit 'a6b09a9a1ded6d36f3e040cfd85158c092e8b3b3':
Enable fsanitize signed-integer-overflow in AAC decoder
a0f7d41818880e9df0c568790e126387c74a5fb7 24-Sep-2015 Dan Austin <danielaustin@google.com> am 0dd0d7a3: Merge "Enable fsanitize signed-integer-overflow in AAC encoder"

* commit '0dd0d7a338fbd3fbfacf849727f4363469ade80c':
Enable fsanitize signed-integer-overflow in AAC encoder
a6b09a9a1ded6d36f3e040cfd85158c092e8b3b3 24-Sep-2015 Dan Austin <danielaustin@google.com> am 142aa0a5: Merge "Enable fsanitize signed-integer-overflow in AAC decoder"

* commit '142aa0a5994a3f979dd3529cb3f4c89032bf03cd':
Enable fsanitize signed-integer-overflow in AAC decoder
3aa7b8e130560c5ee103018bceb2f255cfe3bcdd 24-Sep-2015 Dan Austin <danielaustin@google.com> Enable fsanitize unsigned-integer-overflow in AAC encoder

Bug: 23110888
Change-Id: I213c7fdd3e1e6496ba37a9f29bd6e5ae62dcecd0
odecs/aacenc/Android.mk
d056e252969203c4627a870227448b118067a18e 24-Sep-2015 Dan Austin <danielaustin@google.com> Enable fsanitize unsigned-integer-overflow in AAC decoder

Bug: 23110888
Change-Id: I61a96900d79d244f04f83ba2d5ca8afde8db68a5
odecs/aacdec/Android.mk
e6acb3859969660b7888fc949d69880f5e1a1d0a 11-Sep-2015 Dan Austin <danielaustin@google.com> Enable fsanitize signed-integer-overflow in AAC encoder

Bug: 23752600
Change-Id: I9f607d60b8c7bc93cb34af5f70305caf56df57ec
odecs/aacenc/Android.mk
90e1e02ae6dc5379d479709c0283c2ef057d7376 11-Sep-2015 Dan Austin <danielaustin@google.com> Enable fsanitize signed-integer-overflow in AAC decoder

Bug: 23752600
Change-Id: Iede249b25e7a6977c20bbcce30f8fb7475d2fa84
odecs/aacdec/Android.mk
6eda0b5770eeb215d0a37ef1478c5541bd8067fd 04-Aug-2015 Harish Mahendrakar <harish.mahendrakar@ittiam.com> SoftAVCDec: Reduced memory requirements

Bug: 24221026

Change-Id: I2aaaf88e7dc9a30156764f83a81fc0cad00142f9
odecs/avcdec/SoftAVCDec.cpp
odecs/avcdec/SoftAVCDec.h
e22f5f490cb69e30e8a2630868e58db41838bcb3 22-Sep-2015 Andy Hung <hunga@google.com> DO NOT MERGE - Fix build for commit 69ae6a87

test app on lmp-mr1-ub-dev but not on lmp-mr1-dev
now needs liblog.

Change-Id: Ia995d9101e85f6a68c85d3156fd6b78fa96c87e0
odecs/amrnb/dec/Android.mk
6de291a6e6700a675b776ca182f525ba3a70aee9 21-Sep-2015 Wei Jia <wjia@google.com> am 71aaf985: am 7a0c1949: am cc1a4208: am 3662ca10: Merge "StagefrightMetadataRetriever: handle error returned from convertMetaDataToMessage()." into mnc-dev

* commit '71aaf985cf47b18165d2718c7a8a5f2b4956feef':
StagefrightMetadataRetriever: handle error returned from convertMetaDataToMessage().
71aaf985cf47b18165d2718c7a8a5f2b4956feef 21-Sep-2015 Wei Jia <wjia@google.com> am 7a0c1949: am cc1a4208: am 3662ca10: Merge "StagefrightMetadataRetriever: handle error returned from convertMetaDataToMessage()." into mnc-dev

* commit '7a0c194909e6c5748fd1e0fc6135c6008f1098ed':
StagefrightMetadataRetriever: handle error returned from convertMetaDataToMessage().
cc1a42080b32c65f2874dd17746504b330551c37 21-Sep-2015 Wei Jia <wjia@google.com> am 3662ca10: Merge "StagefrightMetadataRetriever: handle error returned from convertMetaDataToMessage()." into mnc-dev

* commit '3662ca1098676ed254dae8ffc014d60311d31b7e':
StagefrightMetadataRetriever: handle error returned from convertMetaDataToMessage().
3662ca1098676ed254dae8ffc014d60311d31b7e 21-Sep-2015 Wei Jia <wjia@google.com> Merge "StagefrightMetadataRetriever: handle error returned from convertMetaDataToMessage()." into mnc-dev
ed2f82a560ab3f05d1f8e611b1cdce25c06beba2 21-Sep-2015 Wonsik Kim <wonsik@google.com> am e2cc5db8: am 6961db7e: am 04bbef0b: am 5c09132b: Merge "DO NOT MERGE NuCachedSource2: fix possible erroneous early free" into lmp-dev

* commit 'e2cc5db8b09adb9d968f033f8e57674878054a8b':
DO NOT MERGE NuCachedSource2: fix possible erroneous early free
6961db7ee1953f996afd9e0fa4377f4c31c69144 21-Sep-2015 Wonsik Kim <wonsik@google.com> am 04bbef0b: am 5c09132b: Merge "DO NOT MERGE NuCachedSource2: fix possible erroneous early free" into lmp-dev

* commit '04bbef0b298bdbb76dbd6577cf00977ad496710d':
DO NOT MERGE NuCachedSource2: fix possible erroneous early free
3371ce02b725abbd5304933862fc8e02821197c4 20-Sep-2015 Wonsik Kim <wonsik@google.com> am 93c38623: am c3708121: am 2d945b6a: am 4855cc3d: Merge "DO NOT MERGE Avoid size_t overflow in base64 decoding once again" into lmp-dev

* commit '93c3862303d7139cd60f5811e67eeafd0f30d38a':
DO NOT MERGE Avoid size_t overflow in base64 decoding once again
b9930418b1f3c2057623915eec76f944f386e577 20-Sep-2015 Wei Jia <wjia@google.com> am eed3955c: am 5e46ca5a: am 3b130dbd: am c5121002: am c256004a: am 69ae6a87: libstagefright: fix A_Refl to return immediately when there is an error.

* commit 'eed3955cb25731319444d9d17d74013c972499ab':
libstagefright: fix A_Refl to return immediately when there is an error.
848cd7720944f16224053096335304351ab7a02e 19-Sep-2015 Colin Cross <ccross@android.com> Fix typo in xml file to fix build

Fixes:
frameworks/av/media/libstagefright/data/media_codecs_google_tv.xml:28: parser error : Opening and ending tag mismatch: Decoders line 18 and Encoders

Change-Id: If5887c225abf70d2e36d4b85605ac9364e7b07ac
ata/media_codecs_google_tv.xml
9c1107fef3e766db186a68f6ccf6669109d25576 19-Sep-2015 Ian Pedowitz <ijpedowitz@google.com> am 005eda6a: am 6f7fb401: Fix Build

* commit '005eda6a0f3eb9b2a9b9525d62e811ab16ad4293':
Fix Build
6f7fb4012b51b8dbebb53e88f8d8d1ee4f717f29 19-Sep-2015 Ian Pedowitz <ijpedowitz@google.com> Fix Build

Decoders/Encoders tags were mismatched when ag/770962 was submitted

Change-Id: I58654b5df172d28ac4ccebde1a615c485479a2db
ata/media_codecs_google_tv.xml
ba92a65e4e96f764c8bd7a8085e9b5106d9d3e78 18-Sep-2015 Marco Nelissen <marcone@google.com> am 0425327d: am 318dd9b8: Merge "Fix integer overflow in time conversion"

* commit '0425327d16974e73ada8674ac3b1268485508adb':
Fix integer overflow in time conversion
0425327d16974e73ada8674ac3b1268485508adb 18-Sep-2015 Marco Nelissen <marcone@google.com> am 318dd9b8: Merge "Fix integer overflow in time conversion"

* commit '318dd9b80789bdb30a7cf828a7ca18f6422c95c4':
Fix integer overflow in time conversion
1b3a49fd2fd6e6c7d60b3a455a37c54c641f4c08 27-Aug-2015 Pablo Ceballos <pceballos@google.com> stagefright: update to QueueBufferInput interface

Bug 13174928

Change-Id: I43db00683d62971d90548b568cc0f517817e4d26
ediaSync.cpp
869afe1298d4f06c4bbb759285939e42c00a2fe9 18-Sep-2015 Lajos Molnar <lajos@google.com> am 3ae88bed: am 90d6b27a: am c83d228e: Merge "stagefright: Move google mpeg2 codec into media_codecs_google_tv.xml" into mnc-dr-dev

* commit '3ae88bedf687088755cd69613fb09fed8047944b':
stagefright: Move google mpeg2 codec into media_codecs_google_tv.xml
e53cd113dc82477b73b42f9226538f419ea53bad 18-Sep-2015 Lajos Molnar <lajos@google.com> am 29a7fb33: am 5259aaac: am c4706396: Merge "stagefright: only pass valid framerates in msg and meta" into mnc-dr-dev

* commit '29a7fb336ad5ea868814b378b7f23c84fe52c373':
stagefright: only pass valid framerates in msg and meta
3ae88bedf687088755cd69613fb09fed8047944b 18-Sep-2015 Lajos Molnar <lajos@google.com> am 90d6b27a: am c83d228e: Merge "stagefright: Move google mpeg2 codec into media_codecs_google_tv.xml" into mnc-dr-dev

* commit '90d6b27aba756d382fd2f73ff741c28acb5a5d59':
stagefright: Move google mpeg2 codec into media_codecs_google_tv.xml
29a7fb336ad5ea868814b378b7f23c84fe52c373 18-Sep-2015 Lajos Molnar <lajos@google.com> am 5259aaac: am c4706396: Merge "stagefright: only pass valid framerates in msg and meta" into mnc-dr-dev

* commit '5259aaac3e90414cbb7c60e780d90125ca70dc88':
stagefright: only pass valid framerates in msg and meta
c83d228e85b187e3112f10003282c8270d18ef71 18-Sep-2015 Lajos Molnar <lajos@google.com> Merge "stagefright: Move google mpeg2 codec into media_codecs_google_tv.xml" into mnc-dr-dev
c47063966377145dece7e65dca533a9833d1d2e0 18-Sep-2015 Lajos Molnar <lajos@google.com> Merge "stagefright: only pass valid framerates in msg and meta" into mnc-dr-dev
ed78e2fdf53b72be4647be88a02a120869415015 18-Sep-2015 Wei Jia <wjia@google.com> StagefrightMetadataRetriever: handle error returned from convertMetaDataToMessage().

Bug: 23680780
Change-Id: I09dbbf95b2c874b9760938646e48a7ed543f1577
tagefrightMetadataRetriever.cpp
ecf509a9211ca168ffa98c5992f3a4f5f32106cf 18-Sep-2015 Marco Nelissen <marcone@google.com> Fix integer overflow in time conversion

Converting unix epoch time to mpeg4 time requires adding over 2B seconds,
which caused an overflow in a calculation involving time_t, which is signed.

Bug: 23574783
Change-Id: I21bacc9f5a422091f3c903fb8cf1c760fc078953
PEG4Writer.cpp
6e72cad9ead9e12d73e635a70ffe93d52f6f7a8d 18-Sep-2015 Wonsik Kim <wonsik@google.com> am 49d1087f: am 6fe78a87: am 12d4a6a2: DO NOT MERGE Avoid size_t overflow in base64 decoding once again

* commit '49d1087f84e4f75f937662d51b43dc2c33e3af42':
DO NOT MERGE Avoid size_t overflow in base64 decoding once again
6fe78a875793188ff80512db247312109038f181 18-Sep-2015 Wonsik Kim <wonsik@google.com> am 12d4a6a2: DO NOT MERGE Avoid size_t overflow in base64 decoding once again

* commit '12d4a6a2636f41d1ee1bc10a23df13ce09efbff6':
DO NOT MERGE Avoid size_t overflow in base64 decoding once again
12d4a6a2636f41d1ee1bc10a23df13ce09efbff6 07-Sep-2015 Wonsik Kim <wonsik@google.com> DO NOT MERGE Avoid size_t overflow in base64 decoding once again

Switch to foundation base64 function in OggExtractor and fix the
issue there.

Bug: 23707088
Change-Id: If8ba3347c213fe7a36668c943ed264f2871ad468
ggExtractor.cpp
oundation/base64.cpp
e1c9766e23a1e5084d9fdbcc0b2005406627f1d4 14-Sep-2015 Sungmin Choi <sungmin.choi@lge.com> stagefright: Move google mpeg2 codec into media_codecs_google_tv.xml

Only TV devices need to support MPEG2 decoder.

Bug: 23885483
Change-Id: Ic9dd03f9433c41bda1b5b6be3285499ebfd1d0e6
ata/media_codecs_google_tv.xml
ata/media_codecs_google_video.xml
2a886d196ae717adc353a9fb4371b6a5abbd89a5 18-Sep-2015 Lajos Molnar <lajos@google.com> stagefright: only pass valid framerates in msg and meta

Bug: 21573897
Change-Id: Ide83419fa0c92726a33bad2570321e0df2558429
tils.cpp
8832482264bd066c6ec7becf797fdf97f19c34b9 18-Sep-2015 Marco Nelissen <marcone@google.com> Merge "Fix integer overflow in time conversion"
c37081212ab588ae9e7488312501e1182f3f8f04 18-Sep-2015 Wonsik Kim <wonsik@google.com> am 2d945b6a: am 4855cc3d: Merge "DO NOT MERGE Avoid size_t overflow in base64 decoding once again" into lmp-dev

* commit '2d945b6a5c348953f468a2cf22254bff874d5ae1':
DO NOT MERGE Avoid size_t overflow in base64 decoding once again
5e46ca5a301250e51e57fb7bc39b08ff1eadc748 18-Sep-2015 Wei Jia <wjia@google.com> am 3b130dbd: am c5121002: am c256004a: am 69ae6a87: libstagefright: fix A_Refl to return immediately when there is an error.

* commit '3b130dbd985653e4ffc301bce1a63aab28ecc704':
libstagefright: fix A_Refl to return immediately when there is an error.
2b3b672cf57657640ece98810cb34ae2bfa91e14 18-Sep-2015 Marco Nelissen <marcone@google.com> Fix integer overflow in time conversion

Converting unix epoch time to mpeg4 time requires adding over 2B seconds,
which caused an overflow in a calculation involving time_t, which is signed.

Bug: 23574783
Change-Id: I21bacc9f5a422091f3c903fb8cf1c760fc078953
PEG4Writer.cpp
f8418d3364394db8318123da5bcaf8bac4d84345 17-Sep-2015 Vishwath Mohan <vishwath@google.com> am 94aa9d87: am 6b043757: Merge "stagefright: Enable unsigned-integer-overflow for some projects"

* commit '94aa9d8736d97271576eec0474abca9067f0fff8':
stagefright: Enable unsigned-integer-overflow for some projects
94aa9d8736d97271576eec0474abca9067f0fff8 17-Sep-2015 Vishwath Mohan <vishwath@google.com> am 6b043757: Merge "stagefright: Enable unsigned-integer-overflow for some projects"

* commit '6b0437578df6ca2d3bde5a7e770ec9de8bb5a457':
stagefright: Enable unsigned-integer-overflow for some projects
6b0437578df6ca2d3bde5a7e770ec9de8bb5a457 17-Sep-2015 Vishwath Mohan <vishwath@google.com> Merge "stagefright: Enable unsigned-integer-overflow for some projects"
12a0657c1f2713b18c233212d8a2beea2573226d 17-Sep-2015 Dan Austin <danielaustin@google.com> am ca12ea72: am cc503471: resolved conflicts for 619e79a2 to stage-aosp-master

* commit 'ca12ea7257079a9aaef14ee661550ba1d7130454':
Enable signed-integer-overflow in wifi-display
ca12ea7257079a9aaef14ee661550ba1d7130454 17-Sep-2015 Dan Austin <danielaustin@google.com> am cc503471: resolved conflicts for 619e79a2 to stage-aosp-master

* commit 'cc503471b9ca78d86ad8a53cb271361276190fee':
Enable signed-integer-overflow in wifi-display
cc503471b9ca78d86ad8a53cb271361276190fee 17-Sep-2015 Dan Austin <danielaustin@google.com> resolved conflicts for 619e79a2 to stage-aosp-master

Change-Id: I74c0f17059db87fbd8b83e7f82e42b6ff76e7b9d
dc74672f73cf7cdafefc8f3037720b4bae5a6126 17-Sep-2015 Wonsik Kim <wonsik@google.com> am 4617a7ab: am 35c94832: am 866a12a7: am 3c4216e5: am 2fa6a5ad: am 4d27a468: am 92efd0c5: am b5611b84: Merge "Revert "Avoid size_t overflow in base64 decoding once again"" into lmp-dev

* commit '4617a7abb0ed3c7d7c67f3633f4b334894d5020d':
Revert "Avoid size_t overflow in base64 decoding once again"
35c9483278cc50f7063955fe76c67305606fc13e 17-Sep-2015 Wonsik Kim <wonsik@google.com> am 866a12a7: am 3c4216e5: am 2fa6a5ad: am 4d27a468: am 92efd0c5: am b5611b84: Merge "Revert "Avoid size_t overflow in base64 decoding once again"" into lmp-dev

* commit '866a12a7c85da35479871428e1236b1b4ff0683b':
Revert "Avoid size_t overflow in base64 decoding once again"
866a12a7c85da35479871428e1236b1b4ff0683b 17-Sep-2015 Wonsik Kim <wonsik@google.com> am 3c4216e5: am 2fa6a5ad: am 4d27a468: am 92efd0c5: am b5611b84: Merge "Revert "Avoid size_t overflow in base64 decoding once again"" into lmp-dev

* commit '3c4216e5c76727f4af229e8b2a338e15f67e1ee9':
Revert "Avoid size_t overflow in base64 decoding once again"
3c4216e5c76727f4af229e8b2a338e15f67e1ee9 17-Sep-2015 Wonsik Kim <wonsik@google.com> am 2fa6a5ad: am 4d27a468: am 92efd0c5: am b5611b84: Merge "Revert "Avoid size_t overflow in base64 decoding once again"" into lmp-dev

* commit '2fa6a5ad06e696627b0ca495a031531ac47ddd6d':
Revert "Avoid size_t overflow in base64 decoding once again"
fd92e4d3e9648c520dc289f951dc7527a0424f38 17-Sep-2015 Wonsik Kim <wonsik@google.com> am c259acce: am f7c40163: am 5f5fc26c: am 322e2dc5: Merge "Avoid size_t overflow in base64 decoding once again" into lmp-dev

* commit 'c259acce721bdc6095ae0d5d7b35aea24f2b68c7':
Avoid size_t overflow in base64 decoding once again
4d27a468c09bebe8c5f179af4a66882f01d55644 17-Sep-2015 Wonsik Kim <wonsik@google.com> am 92efd0c5: am b5611b84: Merge "Revert "Avoid size_t overflow in base64 decoding once again"" into lmp-dev

* commit '92efd0c559d4d78880fc06544c662129fe7f6e1d':
Revert "Avoid size_t overflow in base64 decoding once again"
f7c401634ee821a9b04b068a7121cd5386a189f0 17-Sep-2015 Wonsik Kim <wonsik@google.com> am 5f5fc26c: am 322e2dc5: Merge "Avoid size_t overflow in base64 decoding once again" into lmp-dev

* commit '5f5fc26cfb4f8db965d6ded855ce60ee87ff90ac':
Avoid size_t overflow in base64 decoding once again
937234117035960336e1eb91c5277a554af871c5 16-Sep-2015 Dan Austin <danielaustin@google.com> am ad1e13c9: am a90a8a34: resolved conflicts for 60d65657 to stage-aosp-master

* commit 'ad1e13c97e9d988f4a1f3e94756dca923f564fa1':
Enable signed-integer-overflow in yuv
ad1e13c97e9d988f4a1f3e94756dca923f564fa1 16-Sep-2015 Dan Austin <danielaustin@google.com> am a90a8a34: resolved conflicts for 60d65657 to stage-aosp-master

* commit 'a90a8a3411fd4e251fda780b1549525e43fb9643':
Enable signed-integer-overflow in yuv
f43a9396e53d257ed31a52be984675b6ba0e0459 08-Sep-2015 Dan Austin <danielaustin@google.com> Enable signed-integer-overflow in wifi-display

BUG: 23752600
Change-Id: Ib222e8733cf57ea0e1e1e4f40651fce169b63c79
ifi-display/Android.mk
7a772896f1e364a999d6774ba69fae8add01da44 16-Sep-2015 Marco Nelissen <marcone@google.com> Merge "Optionally print name for fd"
83b0fd9997b558f6c2ebf5e6e4db20570cb233b8 16-Sep-2015 Marco Nelissen <marcone@google.com> Optionally print name for fd

Add utility function to get the file name for a file descriptor,
and use it in various places.

Change-Id: I196b557a56d5ef0ef89e2020aab2699eafae61b0
ileSource.cpp
uMediaExtractor.cpp
tils.cpp
a90a8a3411fd4e251fda780b1549525e43fb9643 16-Sep-2015 Dan Austin <danielaustin@google.com> resolved conflicts for 60d65657 to stage-aosp-master

Change-Id: I22eae9ec9332182b575df0965dcb034530b76bd4
6dc5a7bce1fdb89aae91967fc984da521e6ca2b2 16-Sep-2015 Marco Nelissen <marcone@google.com> Merge "Validate resolution and stride"
34e63e9ffe6496d9180c825dc119c1fd1020ef8b 16-Sep-2015 Marco Nelissen <marcone@google.com> Validate resolution and stride

Now that integer overflow protection has been turned on, we need to validate
some values a little earlier.

Bug: 22885421
Change-Id: I5398f3961eaa74f0702511a748b99114840efade
Codec.cpp
mx/SoftVideoDecoderOMXComponent.cpp
58498df5f02d495cd3cb0bca7d7363ede23ae145 08-Sep-2015 Dan Austin <danielaustin@google.com> Enable signed-integer-overflow in yuv

BUG: 23752600
Change-Id: I1e855b0ebf6478882c4a08d97c6101ee801fa571
uv/Android.mk
ea56b569bb1082a24382ab5748572918037ffaeb 16-Sep-2015 Dan Austin <danielaustin@google.com> resolved conflicts for 5cfb105b to master

Change-Id: Ib8db576bfa4a0091b15abcd80ea22348102df47c
5cfb105b839aab28d4b0f4932662a3d5cd33b25d 16-Sep-2015 Dan Austin <danielaustin@google.com> am f9ecac70: Enable signed-integer-overflow in rtsp

* commit 'f9ecac709222be2eb49f06f18f3df75840b44cef':
Enable signed-integer-overflow in rtsp
45409868318b8a273f3fbb395a0c4387840a80e6 16-Sep-2015 Dan Albert <danalbert@google.com> am 34e96e7e: am 99405e1f: am 97ed4e73: Merge "Add include guard into SampleIterator.h"

* commit '34e96e7efd1edf6778784b3ea64fc5308779e2d3':
Add include guard into SampleIterator.h
2b1ec058eb50844fec9ef1ecd690778b6dac4309 16-Sep-2015 Dan Austin <danielaustin@google.com> am b14ccf22: am b41f9421: Merge "resolved conflicts for b6c719ec to stage-aosp-master" into stage-aosp-master

* commit 'b14ccf228cab22e471ad400445210e6fe807cf20':
Enable signed-integer-overflow in timedtext
f9ecac709222be2eb49f06f18f3df75840b44cef 08-Sep-2015 Dan Austin <danielaustin@google.com> Enable signed-integer-overflow in rtsp

BUG: 23752600
Change-Id: Ia74283e8cb74f4943d9ffc3561523e4deea6d7a6
tsp/Android.mk
34e96e7efd1edf6778784b3ea64fc5308779e2d3 16-Sep-2015 Dan Albert <danalbert@google.com> am 99405e1f: am 97ed4e73: Merge "Add include guard into SampleIterator.h"

* commit '99405e1f8fb6d9e33f8791a54dd9416754caf573':
Add include guard into SampleIterator.h
b14ccf228cab22e471ad400445210e6fe807cf20 16-Sep-2015 Dan Austin <danielaustin@google.com> am b41f9421: Merge "resolved conflicts for b6c719ec to stage-aosp-master" into stage-aosp-master

* commit 'b41f94219d6a9c93803ea1897b0efba15a50efac':
Enable signed-integer-overflow in timedtext
99405e1f8fb6d9e33f8791a54dd9416754caf573 16-Sep-2015 Dan Albert <danalbert@google.com> am 97ed4e73: Merge "Add include guard into SampleIterator.h"

* commit '97ed4e73c8bc114f5950885dc289c42c2a12a38a':
Add include guard into SampleIterator.h
b41f94219d6a9c93803ea1897b0efba15a50efac 16-Sep-2015 Dan Austin <danielaustin@google.com> Merge "resolved conflicts for b6c719ec to stage-aosp-master" into stage-aosp-master
a209e45b900b8153e05afb2f378267f827394da4 16-Sep-2015 Dan Austin <danielaustin@google.com> am 7dbed399: Merge "Revert "resolved conflicts for c82fcdda to stage-aosp-master"" into stage-aosp-master

* commit '7dbed399cbef000e3131464f9051db6aceffda7e':
Revert "resolved conflicts for c82fcdda to stage-aosp-master"
33cb1ec2386e3d41c5c5eeff5a904dd13772aa93 16-Sep-2015 Dan Austin <danielaustin@google.com> Revert "resolved conflicts for c82fcdda to stage-aosp-master"

This reverts commit bd4e0384334f0d185edd5161fad89f662dd9b60c.

Change-Id: I60d1bf66e4b5f1b9cce82748b5e93166077b79c6
atroska/Android.mk
tsp/Android.mk
97ed4e73c8bc114f5950885dc289c42c2a12a38a 16-Sep-2015 Dan Albert <danalbert@google.com> Merge "Add include guard into SampleIterator.h"
031af4d5004972331828fdf75e8e1f3fa79d20dd 16-Sep-2015 Dan Austin <danielaustin@google.com> resolved conflicts for b6c719ec to stage-aosp-master

Change-Id: Ia6a7719a637bbe84bd3320a2ab997e5651e552fd
164ee879a796f198b1a38f5ab406055a4a5ef2c8 16-Sep-2015 Dan Austin <danielaustin@google.com> resolved conflicts for c41a35e8 to master

Change-Id: I074fa628d85716fc31041f8b88b9d82b8ced00f3
683c0daa1294acaa023d976eef51850519c4cb17 16-Sep-2015 Dan Austin <danielaustin@google.com> am 9d46697e: Merge "resolved conflicts for c82fcdda to stage-aosp-master" into stage-aosp-master

* commit '9d46697e3bd1af0f7150703a0b6b3ab17fa630c3':
Enable signed-integer-overflow in rtsp
25671ba776ad331755dbeb178d44300ca1bb7429 08-Sep-2015 Dan Austin <danielaustin@google.com> Enable signed-integer-overflow in timedtext

BUG: 23752600
Change-Id: Ide618695c5fd11dec282a552d5993c97808411a2
imedtext/Android.mk
c41a35e8e583f7c6d3742b80667be80d4a2c7efb 16-Sep-2015 Dan Austin <danielaustin@google.com> am 80bee1ee: resolved conflicts for f49f5d1f to stage-aosp-master

* commit '80bee1ee989a9522fc58c66fc8d6c0f40d7e630e':
Enable signed-integer-overflow in matroska
bd4e0384334f0d185edd5161fad89f662dd9b60c 16-Sep-2015 Dan Austin <danielaustin@google.com> resolved conflicts for c82fcdda to stage-aosp-master

Change-Id: Icd3053becb307835f925d14bf7d1db91c3652562
4201d687e5a9e24dda65483e16f38ecce7391323 08-Sep-2015 Dan Austin <danielaustin@google.com> Enable signed-integer-overflow in rtsp

BUG: 23752600
Change-Id: Ia74283e8cb74f4943d9ffc3561523e4deea6d7a6
tsp/Android.mk
80bee1ee989a9522fc58c66fc8d6c0f40d7e630e 16-Sep-2015 Dan Austin <danielaustin@google.com> resolved conflicts for f49f5d1f to stage-aosp-master

Change-Id: I35836b08d8ead64af04729f7e39cc5b79b97d38c
9860dcdf427d70e6aef4ce082be40a5459c466f4 16-Sep-2015 Wonsik Kim <wonsik@google.com> am b21a6420: Merge "DO NOT MERGE NuCachedSource2: fix possible erroneous early free" into klp-dev

* commit 'b21a642067477c72f419956da0ca8dafe0c04eab':
DO NOT MERGE NuCachedSource2: fix possible erroneous early free
5c09132bf4d7e789256c9723fe2dfa15a6947bbb 16-Sep-2015 Wonsik Kim <wonsik@google.com> Merge "DO NOT MERGE NuCachedSource2: fix possible erroneous early free" into lmp-dev
b21a642067477c72f419956da0ca8dafe0c04eab 16-Sep-2015 Wonsik Kim <wonsik@google.com> Merge "DO NOT MERGE NuCachedSource2: fix possible erroneous early free" into klp-dev
ed40f45d59fe948ceb9ae6774ba1866f24e2d2b1 12-Aug-2015 Vishwath Mohan <vishwath@google.com> stagefright: Enable unsigned-integer-overflow for some projects

Enables unsigned integer overflow for the httplive and foundation
components in stagefright.

Bug: 23110888
Change-Id: I07875e3e7da3dc4a4fbfb94dd0e6853dc190e2db
oundation/Android.mk
ttplive/Android.mk
40e1e3bdf6f5e070fdca8ae6e5ee91bf577622eb 16-Sep-2015 Dan Austin <danielaustin@google.com> resolved conflicts for 3fc9361f to master

Change-Id: Id2674d4402451f1d0679b77cdea76f5cf324ebed
3fc9361f675e8446d4ec0aa0129a7d1f78d664b5 16-Sep-2015 Dan Austin <danielaustin@google.com> am 0bd64076: resolved conflicts for c1d15931 to stage-aosp-master

* commit '0bd6407666aa4d7b0a031900b4bb1c9103eb9bc5':
Enable signed-integer-overflow in httplive
0bd6407666aa4d7b0a031900b4bb1c9103eb9bc5 16-Sep-2015 Dan Austin <danielaustin@google.com> resolved conflicts for c1d15931 to stage-aosp-master

Change-Id: Ifa38320051015548d04be30b4278adb34a4654a6
982c03405e6aab4c0e1a78dccb0d937f830697cc 16-Sep-2015 Dan Austin <danielaustin@google.com> am 60c356d2: am 86dbc0d6: resolved conflicts for fd86dd2d to stage-aosp-master

* commit '60c356d2bf7dd7d3a47da15394ee4f954814b489':
Enable signed-integer-overflow in http
ac26e0f0b016324e1ba19c0005c5fd3066eb0aed 15-Sep-2015 Dan Austin <danielaustin@google.com> resolved conflicts for 331f8ee5 to master

Change-Id: I1970a657cf2e775a82b909028065b8f9cc4f5a68
3bfa9e2e8e518f057672566c5dfbca29a9594a8c 15-Sep-2015 Dan Austin <danielaustin@google.com> am 498ddf8f: am 0f97cc30: resolved conflicts for 27f09f91 to stage-aosp-master

* commit '498ddf8fba0cb13c8ddabbc08a080a8c9b42d25b':
Enable signed-intger-overflow in colorconversion.
81d0d537e3c9597e194a1ce135f9b43590995e53 08-Sep-2015 Dan Austin <danielaustin@google.com> Enable signed-integer-overflow in matroska

BUG: 23752600
Change-Id: I6a43d6c2b01fe935b8e68e20d9c2f7420a41fe9f
atroska/Android.mk
60c356d2bf7dd7d3a47da15394ee4f954814b489 15-Sep-2015 Dan Austin <danielaustin@google.com> am 86dbc0d6: resolved conflicts for fd86dd2d to stage-aosp-master

* commit '86dbc0d62126868368b35a6127a7317248925247':
Enable signed-integer-overflow in http
331f8ee538b5e49f416000c54dada8322ca7e8ee 15-Sep-2015 Dan Austin <danielaustin@google.com> am bb6d1fac: resolved conflicts for 85dc1577 to stage-aosp-master

* commit 'bb6d1facef2d04798dc10ad5146bb4383e5259ca':
Enable signed-integer-overflow in foundation
498ddf8fba0cb13c8ddabbc08a080a8c9b42d25b 15-Sep-2015 Dan Austin <danielaustin@google.com> am 0f97cc30: resolved conflicts for 27f09f91 to stage-aosp-master

* commit '0f97cc30663d3a4f636463124c04763c509eab40':
Enable signed-intger-overflow in colorconversion.
86dbc0d62126868368b35a6127a7317248925247 15-Sep-2015 Dan Austin <danielaustin@google.com> resolved conflicts for fd86dd2d to stage-aosp-master

Change-Id: I0428b0655d49295ed09e21d62d41851f76a76c26
bb6d1facef2d04798dc10ad5146bb4383e5259ca 15-Sep-2015 Dan Austin <danielaustin@google.com> resolved conflicts for 85dc1577 to stage-aosp-master

Change-Id: If4b17fec174a920866a3d56c39db983ccb665679
0f97cc30663d3a4f636463124c04763c509eab40 15-Sep-2015 Dan Austin <danielaustin@google.com> resolved conflicts for 27f09f91 to stage-aosp-master

Change-Id: I4a3efc888ccb019f1d971bbc3ce7a4f090a3a97c
1277aea8405ea3256a2b0f730506c4610cadafa4 15-Sep-2015 Marco Nelissen <marcone@google.com> Make SoftVorbis fail more gracefully on errors

Change-Id: Idf047810580387a9e04a71ec27a5dd0cd910bc43
odecs/vorbis/dec/SoftVorbis.cpp
odecs/vorbis/dec/SoftVorbis.h
c1d159316d0a42066ffa124aab14e5f05b9d1c1f 15-Sep-2015 Dan Austin <danielaustin@google.com> Merge "Enable signed-integer-overflow in httplive"
fc629c1881538c8280105ed86507476d500e744f 08-Sep-2015 Dan Austin <danielaustin@google.com> Enable signed-integer-overflow in httplive

BUG: 23752600
Change-Id: I0683547462f04ff727e67604a5f186eed613524b
ttplive/Android.mk
2cf7f7e2ea8ada86b6eab641ac18481a2850f568 08-Sep-2015 Dan Austin <danielaustin@google.com> Enable signed-integer-overflow in http

BUG: 23752600
Change-Id: I25d3bd360754dd4d13539d5cbd962a3838ee54bd
ttp/Android.mk
85dc1577c22d0045513d7adbce77964a61b43367 15-Sep-2015 Dan Austin <danielaustin@google.com> Merge "Enable signed-integer-overflow in foundation"
69c24d3c6e42472f3e4e155559be100dd6f7121a 14-Sep-2015 Pablo Ceballos <pceballos@google.com> Merge changes from topic 'Bug 19769719'

* changes:
stagefright: Rename mBuf to mSlot
camera: Rename mBuf to mSlot
5d16a6ee52b691ee14f00a620cb4fa051b5e0890 13-Sep-2015 Masaichi Toki <masaichi.x.toki@sonymobile.com> Add include guard into SampleIterator.h

Include guard is added to have SampleIterator.h safer.

Change-Id: Ib773a529cb7ab9d55524951f8bd8ed37f58c1cad
nclude/SampleIterator.h
3deaec1c1cd2f4c0fc35d186608814921f3efc30 14-Sep-2015 Wonsik Kim <wonsik@google.com> am 13511716: am eab8c009: am 2cea090c: am 4374b187: Merge "NuCachedSource2: fix possible erroneous early free" into mnc-dev

* commit '1351171663f3ff82b958b713a8bca381847cca21':
NuCachedSource2: fix possible erroneous early free
1351171663f3ff82b958b713a8bca381847cca21 14-Sep-2015 Wonsik Kim <wonsik@google.com> am eab8c009: am 2cea090c: am 4374b187: Merge "NuCachedSource2: fix possible erroneous early free" into mnc-dev

* commit 'eab8c009157a81c878c877af9c44c45e710801f5':
NuCachedSource2: fix possible erroneous early free
2cea090cc76ad85938ac951a9126112684c5763d 14-Sep-2015 Wonsik Kim <wonsik@google.com> am 4374b187: Merge "NuCachedSource2: fix possible erroneous early free" into mnc-dev

* commit '4374b187e5e72056f8e814dae752b62cb60fc9a4':
NuCachedSource2: fix possible erroneous early free
4855cc3dd5a057f435c5ce540a844e46ea76d758 14-Sep-2015 Wonsik Kim <wonsik@google.com> Merge "DO NOT MERGE Avoid size_t overflow in base64 decoding once again" into lmp-dev
0d35dd2068d6422c3c77fb68f248cbabf3d0b10c 08-Sep-2015 Wonsik Kim <wonsik@google.com> DO NOT MERGE NuCachedSource2: fix possible erroneous early free

Because the constructor of NuCachedSource2 sent a message to
AHandlerReflector object, AHandlerReflector::onMessageReceived could
have executed just before the object gets wrapped in a strong
pointer, resulting in erroneous early free. Fix the issue by using
static Create function to ensure the message is sent after the
object is wrapped in a sp.

Bug: 23882800
Change-Id: I38a9d7a3083f184b4c81d0b00ba1661721278855
wesomePlayer.cpp
ataSource.cpp
uCachedSource2.cpp
nclude/NuCachedSource2.h
4374b187e5e72056f8e814dae752b62cb60fc9a4 14-Sep-2015 Wonsik Kim <wonsik@google.com> Merge "NuCachedSource2: fix possible erroneous early free" into mnc-dev
c894f81bdf106f648561e569e0dc97fc6046115b 08-Sep-2015 Wonsik Kim <wonsik@google.com> DO NOT MERGE NuCachedSource2: fix possible erroneous early free

Because the constructor of NuCachedSource2 sent a message to
AHandlerReflector object, AHandlerReflector::onMessageReceived could
have executed just before the object gets wrapped in a strong
pointer, resulting in erroneous early free. Fix the issue by using
static Create function to ensure the message is sent after the
object is wrapped in a sp.

Bug: 23882800
Change-Id: I38a9d7a3083f184b4c81d0b00ba1661721278855
wesomePlayer.cpp
ataSource.cpp
uCachedSource2.cpp
nclude/NuCachedSource2.h
820c105f7a4dc0971ee563caea4c9b346854a2f7 11-Sep-2015 Wonsik Kim <wonsik@google.com> DO NOT MERGE Avoid size_t overflow in base64 decoding once again

Switch to foundation base64 function in OggExtractor and fix the
issue there.

This reverts commit 28314aef9e8a666dbb75bbd555f6566a6c991f1c.

Bug: 23707088
Change-Id: I268bd50431de5b5e579343bf1b425c42ada6daba
ggExtractor.cpp
oundation/base64.cpp
59acbe2b82b2678d5614c7bfdd8684521bed23fc 07-Sep-2015 Wonsik Kim <wonsik@google.com> Avoid size_t overflow in base64 decoding once again

Switch to foundation base64 function in OggExtractor and fix the
issue there.

Bug: 23707088
Change-Id: I999ae911177c88dc13f9ee9796ca93c5928b20b0
ggExtractor.cpp
oundation/base64.cpp
c5121002e5988ba1be660f3fbdb2067776b079fe 12-Sep-2015 Wei Jia <wjia@google.com> am c256004a: am 69ae6a87: libstagefright: fix A_Refl to return immediately when there is an error.

* commit 'c256004a8cbf4dc1d647957243cf8be1a3c7bec4':
libstagefright: fix A_Refl to return immediately when there is an error.
59e469e0b0d95bba2aee3bbda003b7042fd1cdd9 11-Sep-2015 Marco Nelissen <marcone@google.com> Fix a few potential crashes

Change-Id: Icb71cb07495406be756e195f2578b6e3aa8b1163
uMediaExtractor.cpp
tils.cpp
44da08ed957157645e1c8776bb59924b1bb7f61c 11-Sep-2015 Wonsik Kim <wonsik@google.com> am b659b4c7: Merge "DO NOT MERGE fix build" into klp-dev

* commit 'b659b4c7e1405056d189b44bd96036b6500dd378':
DO NOT MERGE fix build
b659b4c7e1405056d189b44bd96036b6500dd378 11-Sep-2015 Wonsik Kim <wonsik@google.com> Merge "DO NOT MERGE fix build" into klp-dev
9104e704e43c9a6e691af52bb6f0aca71467979b 11-Sep-2015 Wonsik Kim <wonsik@google.com> DO NOT MERGE fix build

Bug: 23707088

Change-Id: Ib0d6cbc52710f33310d21b2eae1f243f0f8e8bca
ggExtractor.cpp
1507bbb00e78c297b1aca01f580f529b55009f94 11-Sep-2015 Wonsik Kim <wonsik@google.com> am 1784a8db: Merge "DO NOT MERGE Avoid size_t overflow in base64 decoding once again" into klp-dev

* commit '1784a8dbbc73b3e6033340d107b6c08478b962c8':
DO NOT MERGE Avoid size_t overflow in base64 decoding once again
d788d1940898fa250733d5dd6473eef62e9b3dcc 11-Sep-2015 Wonsik Kim <wonsik@google.com> am 60351eeb: am a89ee9ef: am 393eb647: Merge "Avoid size_t overflow in base64 decoding once again" into mnc-dev

* commit '60351eebb4bf5677b4e4ca675f8fa0c6a6ee42ea':
Avoid size_t overflow in base64 decoding once again
a89ee9ef8ee7774c1ea2d64c7f24c870fcc791ca 11-Sep-2015 Wonsik Kim <wonsik@google.com> am 393eb647: Merge "Avoid size_t overflow in base64 decoding once again" into mnc-dev

* commit '393eb6471e08dd0c2f9b8187721d02e978491cba':
Avoid size_t overflow in base64 decoding once again
28314aef9e8a666dbb75bbd555f6566a6c991f1c 11-Sep-2015 Wonsik Kim <wonsik@google.com> Revert "Avoid size_t overflow in base64 decoding once again"

This reverts commit c9ac5dfdafed1c66beae090cafa97002764e0ca3.

Change-Id: Iae9707bbd8641a0bb00fcda39a20eb8b8f4f5232
ggExtractor.cpp
oundation/base64.cpp
1784a8dbbc73b3e6033340d107b6c08478b962c8 11-Sep-2015 Wonsik Kim <wonsik@google.com> Merge "DO NOT MERGE Avoid size_t overflow in base64 decoding once again" into klp-dev
393eb6471e08dd0c2f9b8187721d02e978491cba 11-Sep-2015 Wonsik Kim <wonsik@google.com> Merge "Avoid size_t overflow in base64 decoding once again" into mnc-dev
b4b5d529dca327ae93e26a8bc0cb54cadf6bb354 11-Sep-2015 Ronghua Wu <ronghuawu@google.com> am c5c0e4ec: am 885dedb4: am ad26bbdd: Merge "libstagefright: Do not add audio codecs to resource manager. They are too small anyhow." into mnc-dr-dev

* commit 'c5c0e4ec73d25543693e4902c19f239671ede94b':
libstagefright: Do not add audio codecs to resource manager. They are too small anyhow.
c5c0e4ec73d25543693e4902c19f239671ede94b 11-Sep-2015 Ronghua Wu <ronghuawu@google.com> am 885dedb4: am ad26bbdd: Merge "libstagefright: Do not add audio codecs to resource manager. They are too small anyhow." into mnc-dr-dev

* commit '885dedb4cf335ef07204279e7ff08d80e55e29c6':
libstagefright: Do not add audio codecs to resource manager. They are too small anyhow.
ad26bbdd44a0bf7e6fc93c76607cdcab25bc1617 11-Sep-2015 Ronghua Wu <ronghuawu@google.com> Merge "libstagefright: Do not add audio codecs to resource manager. They are too small anyhow." into mnc-dr-dev
8c15e7bcefac0e03ee290714b7dc1a2f7db7f08c 08-Sep-2015 Dan Austin <danielaustin@google.com> Enable signed-integer-overflow in foundation

BUG: 23752600
Change-Id: I0ec2402ccdcf464fa6b5c3e0d1d97f96c201840d
oundation/Android.mk
c256004a8cbf4dc1d647957243cf8be1a3c7bec4 10-Sep-2015 Wei Jia <wjia@google.com> am 69ae6a87: libstagefright: fix A_Refl to return immediately when there is an error.

* commit '69ae6a87342d5260d8d8660accc8aa1b9367dbbe':
libstagefright: fix A_Refl to return immediately when there is an error.
58828196edf2fc4debbd7913198a8149f039b4a9 10-Sep-2015 Ronghua Wu <ronghuawu@google.com> libstagefright: Do not add audio codecs to resource manager. They are too small anyhow.

Bug: 23703241
Change-Id: I3c2882a1d6736bb8a4099289d8bab4974343586d
ediaCodec.cpp
74adefb32f6694d45416d11b5c3000b404e94506 10-Sep-2015 Robert Shih <robertshih@google.com> Merge "Fix NULL dereferences in OMX.cpp"
fdc6e509ce99682de9b6fbcaeb0f7b66eb4b8d89 10-Sep-2015 Robert Shih <robertshih@google.com> Fix NULL dereferences in OMX.cpp

Bug: 23484160
Change-Id: Ic42bca2a0079e0dd33f1476174e928991eed6265
mx/OMX.cpp
60f3e2bae776f9289746f2f9bebb7d2f6b03355e 10-Sep-2015 Robert Shih <robertshih@google.com> Merge "fix NPE in freeNode"
1dadfe4fd466b5eab10e5aefa1343e53fbf4cb17 22-Aug-2015 Flanker <i@flanker017.me> fix NPE in freeNode

Bug: 23484160
Change-Id: I634e312d04ba437b6afcf0ede34fc19ea850c944
mx/OMX.cpp
3a9c0cb5d84315619dee686496325a66924c6062 08-Sep-2015 Dan Austin <danielaustin@google.com> Enable signed-intger-overflow in colorconversion.

BUG: 23752600
Change-Id: I70fe20cb46efa2b189621d45ff74efffe0f50e77
olorconversion/Android.mk
b06a77e2968ec5cf5d116f7cd633afc1fe065ae6 09-Sep-2015 Marco Nelissen <marcone@google.com> Merge "Make NuPlayer send global timed text info too"
278ed118d5e6b0e216668551a5b8becdabd9aade 07-Sep-2015 Wonsik Kim <wonsik@google.com> DO NOT MERGE Avoid size_t overflow in base64 decoding once again

Switch to foundation base64 function in OggExtractor and fix the
issue there.

Bug: 23707088
Change-Id: I999ae911177c88dc13f9ee9796ca93c5928b20b0
ggExtractor.cpp
oundation/base64.cpp
c9ac5dfdafed1c66beae090cafa97002764e0ca3 07-Sep-2015 Wonsik Kim <wonsik@google.com> Avoid size_t overflow in base64 decoding once again

Switch to foundation base64 function in OggExtractor and fix the
issue there.

Bug: 23707088
Change-Id: I999ae911177c88dc13f9ee9796ca93c5928b20b0
ggExtractor.cpp
oundation/base64.cpp
316c3d929ffb004b0150d515e82aede02208ce97 08-Sep-2015 Wonsik Kim <wonsik@google.com> NuCachedSource2: fix possible erroneous early free

Because the constructor of NuCachedSource2 sent a message to
AHandlerReflector object, AHandlerReflector::onMessageReceived could
have executed just before the object gets wrapped in a strong
pointer, resulting in erroneous early free. Fix the issue by using
static Create function to ensure the message is sent after the
object is wrapped in a sp.

Bug: 23882800
Change-Id: I38a9d7a3083f184b4c81d0b00ba1661721278855
wesomePlayer.cpp
ataSource.cpp
uCachedSource2.cpp
nclude/NuCachedSource2.h
0362655ca9494052f348f83dabecf9ea27003976 09-Sep-2015 Aaron Vaage <vaage@google.com> Fixing string format that was breaking build.

Change-Id: Ic3e3127914e76cd3608795b94c1172807064bd89
ediaCodec.cpp
05406cdb531d230477870bf9e785a2ce27114bfb 08-Sep-2015 Aaron Vaage <vaage@google.com> Merge "Fixing MediaCodec::getBufferAndFormat returns OK on invalid state"
b22909302f02bb33ee6264f9a64cd0a4f3790f48 04-Sep-2015 Aaron Vaage <vaage@google.com> Fixing MediaCodec::getBufferAndFormat returns OK on invalid state

Defined safe outcomes for when given an index that is out of
bounds or when the index points to a buffer that is not owned
by the client.

While at it, added guards against NULL parameters.

Bug: 23112275
Change-Id: I7919e75a0bb91dc2c97736623624ecbbdbe6ea4b
ediaCodec.cpp
e3ae7b4a6a299a591ee3390c39ec1e3ac00cdd21 08-Sep-2015 Marco Nelissen <marcone@google.com> Merge "Fail gracefully on allocation failure"
8672fb35b4fe514d32c5f0b32578524551c4502a 08-Sep-2015 Marco Nelissen <marcone@google.com> Fail gracefully on allocation failure

Bug: 23540411
Change-Id: Ief53134304aa6005b1b2c48cf453267e17d63e23
MXCodec.cpp
dafa42d49dd70d745697662750bb6040429ee76c 08-Sep-2015 Marco Nelissen <marcone@google.com> Fail gracefully if sample table chunk index is out of range

instead of asserting

Bug: 23534160
Change-Id: I749fab9e5dc2cae9d3c1e2cac0fb9818e1b8e94f
ampleTable.cpp
1f04884c0f4d0eafe7ce8f09b0e5302ff3a86ea6 08-Sep-2015 Wei Jia <wjia@google.com> am 430519bf: am 0cf901dd: am c336136d: Merge "libstagefright: fix A_Refl to return immediately when there is an error." into mnc-dev

* commit '430519bf12a1e885ab2cd9913aec3956f776da75':
libstagefright: fix A_Refl to return immediately when there is an error.
430519bf12a1e885ab2cd9913aec3956f776da75 08-Sep-2015 Wei Jia <wjia@google.com> am 0cf901dd: am c336136d: Merge "libstagefright: fix A_Refl to return immediately when there is an error." into mnc-dev

* commit '0cf901dd983e1a6b37eba2ab4414d647494588f1':
libstagefright: fix A_Refl to return immediately when there is an error.
69ae6a87342d5260d8d8660accc8aa1b9367dbbe 04-Sep-2015 Wei Jia <wjia@google.com> libstagefright: fix A_Refl to return immediately when there is an error.

Bug: 23609206
Change-Id: I2ad25fb208df17f5a5b6d6b356eff2f400627f22
(cherry picked from commit 715dcb9c90d86c1a02a0da056f3cee8875ad1230)
odecs/amrnb/dec/src/a_refl.cpp
0cf901dd983e1a6b37eba2ab4414d647494588f1 08-Sep-2015 Wei Jia <wjia@google.com> am c336136d: Merge "libstagefright: fix A_Refl to return immediately when there is an error." into mnc-dev

* commit 'c336136d8a86a8a95047949955a9bb749af247ab':
libstagefright: fix A_Refl to return immediately when there is an error.
c336136d8a86a8a95047949955a9bb749af247ab 08-Sep-2015 Wei Jia <wjia@google.com> Merge "libstagefright: fix A_Refl to return immediately when there is an error." into mnc-dev
9c99c92af255ae64fe222245f15ad30b92a1fc8c 07-Sep-2015 Wonsik Kim <wonsik@google.com> Avoid size_t overflow in base64 decoding once again

Switch to foundation base64 function in OggExtractor and fix the
issue there.

Bug: 23707088
Change-Id: I999ae911177c88dc13f9ee9796ca93c5928b20b0
ggExtractor.cpp
oundation/base64.cpp
61f247931572dc9287cb373b7f4e4661e0037783 07-Sep-2015 Marco Nelissen <marcone@google.com> am c1cfba43: am dda925c0: am 3af22d1f: am a6e476cb: am 2cec2b4c: am 9bbc490e: am facd279e: am 7d34959b: am 16e12007: am 74888428: Merge "Fix timedtext parsing" into klp-dev

* commit 'c1cfba43293771b62cb2670682279f49a61d8b9a':
Fix timedtext parsing
ad78169f6dd3abd27498a68d8988e8cece44fed0 05-Sep-2015 Wei Jia <wjia@google.com> AMRExtractor: treat partial frame as EOS.

Bug: 23729692
Change-Id: I5e72c994780174173e78c30ebbcf138f7831782d
MRExtractor.cpp
55e2f4ca5bb23ce32fbdd627b0f648c27106b98e 05-Sep-2015 Marco Nelissen <marcone@google.com> Make NuPlayer send global timed text info too

For feature parity with AwesomePlayer. Also add a small hack to
AwesomePlayer to make timed text track selection work again, so
the timed text CTS test can run with both AwesomePlayer and NuPlayer

Change-Id: I1be451c4b3191cae65bc46b3b721a1924b4fadc8
wesomePlayer.cpp
nclude/AwesomePlayer.h
c1cfba43293771b62cb2670682279f49a61d8b9a 04-Sep-2015 Marco Nelissen <marcone@google.com> am dda925c0: am 3af22d1f: am a6e476cb: am 2cec2b4c: am 9bbc490e: am facd279e: am 7d34959b: am 16e12007: am 74888428: Merge "Fix timedtext parsing" into klp-dev

* commit 'dda925c04de62f67fc1128a5c1b655df59fca138':
Fix timedtext parsing
dda925c04de62f67fc1128a5c1b655df59fca138 04-Sep-2015 Marco Nelissen <marcone@google.com> am 3af22d1f: am a6e476cb: am 2cec2b4c: am 9bbc490e: am facd279e: am 7d34959b: am 16e12007: am 74888428: Merge "Fix timedtext parsing" into klp-dev

* commit '3af22d1fea1abc4b1cc1c682e4ffaa9e6462a173':
Fix timedtext parsing
3af22d1fea1abc4b1cc1c682e4ffaa9e6462a173 04-Sep-2015 Marco Nelissen <marcone@google.com> am a6e476cb: am 2cec2b4c: am 9bbc490e: am facd279e: am 7d34959b: am 16e12007: am 74888428: Merge "Fix timedtext parsing" into klp-dev

* commit 'a6e476cb04dfccd5adde467b9b55ecb1f48dff58':
Fix timedtext parsing
0386c91b8a910a134e5898ffa924c1b6c7560b13 28-Aug-2015 Wei Jia <wjia@google.com> MPEG4Extractor: ensure kKeyTrackID exists before creating an MPEG4Source as track.

GenericSource: return error when no track exists.

SampleIterator: make sure mSamplesPerChunk is not zero before using it as divisor.

Bug: 21657957
Bug: 23705695
Bug: 22802344
Change-Id: I7664992ade90b935d3f255dcd43ecc2898f30b04
PEG4Extractor.cpp
ampleIterator.cpp
a6e476cb04dfccd5adde467b9b55ecb1f48dff58 04-Sep-2015 Marco Nelissen <marcone@google.com> am 2cec2b4c: am 9bbc490e: am facd279e: am 7d34959b: am 16e12007: am 74888428: Merge "Fix timedtext parsing" into klp-dev

* commit '2cec2b4c179b1a946b6f745a8404bf1ee70f825c':
Fix timedtext parsing
a44ad9cefb0e2ff4091c8f58368c8b94779212aa 04-Sep-2015 Wei Jia <wjia@google.com> MPEG4Extractor: sanity check all conditions before creating MPEG4Source.

Bug: 23532209
Change-Id: I761481293fa963c3e0c4c4ad76b8aa7eac3cddfd
PEG4Extractor.cpp
715dcb9c90d86c1a02a0da056f3cee8875ad1230 04-Sep-2015 Wei Jia <wjia@google.com> libstagefright: fix A_Refl to return immediately when there is an error.

Bug: 23609206
Change-Id: I2ad25fb208df17f5a5b6d6b356eff2f400627f22
odecs/amrnb/dec/Android.mk
odecs/amrnb/dec/src/a_refl.cpp
e457eb058643d3e2b305a477e5c7d4dbd9e4a165 04-Sep-2015 Wei Jia <wjia@google.com> resolved conflicts for 3b8747ca to lmp-mr1-ub-dev

Merge commit '3b8747ca601175da0c94537e49f3097769a09501' into HEAD

libstagefright: sanity check size before dereferencing pointer in Utils.cpp

Also remove some CHECK's.

Bug: 23680780
(cherry picked from commit 7bb772e0c643ff3292599cf485b9dbf232bf39a4)

Change-Id: I5b919716178eb3ba844b21e497b792e6ac61554d
3f0c878e0fb20e9ffd9886aae184c28f5b90c79a 04-Sep-2015 Dan Austin <danielaustin@google.com> am b0409099: am 6cc8d71b: am 38711b52: Merge "Enable fsanitize signed-integer-overflow in mpeg2ts"

* commit 'b04090999f3988452ba3f81b0d583ed6eef37d6d':
Enable fsanitize signed-integer-overflow in mpeg2ts
b356a37526bc6e44085c2e65b8f4e043a299b50d 04-Sep-2015 Dan Austin <danielaustin@google.com> am b7bf7114: am 9d2e1967: am 6f49c32d: Merge "Enable fsanitize signed-integer-overflow in webm"

* commit 'b7bf7114f72f9654b8fcdc3dca1df6b4d9cb6f29':
Enable fsanitize signed-integer-overflow in webm
b846283ece8726ef1c96db78c3461bbaf2ae813c 04-Sep-2015 Dan Austin <danielaustin@google.com> am a017119b: am a1297b84: am f70c71fb: Merge "Enable fsanitize signed-integer-overflow in id3"

* commit 'a017119bcf0d7bcaf89085793931bff15d568a1e':
Enable fsanitize signed-integer-overflow in id3
b04090999f3988452ba3f81b0d583ed6eef37d6d 04-Sep-2015 Dan Austin <danielaustin@google.com> am 6cc8d71b: am 38711b52: Merge "Enable fsanitize signed-integer-overflow in mpeg2ts"

* commit '6cc8d71b942f509b2f96e1ba75119f97ae1b10ee':
Enable fsanitize signed-integer-overflow in mpeg2ts
b7bf7114f72f9654b8fcdc3dca1df6b4d9cb6f29 04-Sep-2015 Dan Austin <danielaustin@google.com> am 9d2e1967: am 6f49c32d: Merge "Enable fsanitize signed-integer-overflow in webm"

* commit '9d2e1967080f8061910b84e31639398d1542dc7e':
Enable fsanitize signed-integer-overflow in webm
a017119bcf0d7bcaf89085793931bff15d568a1e 04-Sep-2015 Dan Austin <danielaustin@google.com> am a1297b84: am f70c71fb: Merge "Enable fsanitize signed-integer-overflow in id3"

* commit 'a1297b844f7a058a962ba501769929f4a7883e53':
Enable fsanitize signed-integer-overflow in id3
6cc8d71b942f509b2f96e1ba75119f97ae1b10ee 04-Sep-2015 Dan Austin <danielaustin@google.com> am 38711b52: Merge "Enable fsanitize signed-integer-overflow in mpeg2ts"

* commit '38711b52fe2060bee6549afdfe25bace9a5cdea4':
Enable fsanitize signed-integer-overflow in mpeg2ts
9d2e1967080f8061910b84e31639398d1542dc7e 04-Sep-2015 Dan Austin <danielaustin@google.com> am 6f49c32d: Merge "Enable fsanitize signed-integer-overflow in webm"

* commit '6f49c32dac2c98ee14f4d2ada912f5d77e31e921':
Enable fsanitize signed-integer-overflow in webm
a1297b844f7a058a962ba501769929f4a7883e53 04-Sep-2015 Dan Austin <danielaustin@google.com> am f70c71fb: Merge "Enable fsanitize signed-integer-overflow in id3"

* commit 'f70c71fb75321fdee5020ffd1bb106e159d13bed':
Enable fsanitize signed-integer-overflow in id3
9bbc490e17d38a9734a2b95a308100a7d0ec6dcd 04-Sep-2015 Marco Nelissen <marcone@google.com> am facd279e: am 7d34959b: am 16e12007: am 74888428: Merge "Fix timedtext parsing" into klp-dev

* commit 'facd279ed552416adcf0ff4ef22b7a9cd166ccea':
Fix timedtext parsing
ce34a82fe2b5b2b955600fbfab1df964aa4934eb 04-Sep-2015 Wei Jia <wjia@google.com> am 7ea22fce: am c6a2815e: DO NOT MERGE - libstagefright: sanity check size before dereferencing pointer in Utils.cpp

* commit '7ea22fce4fe6ac361fce1df3b583366933848b17':
DO NOT MERGE - libstagefright: sanity check size before dereferencing pointer in Utils.cpp
222354b14cbb0d9e0b214c8fd561bbfa6e9a0606 04-Sep-2015 Dan Austin <danielaustin@google.com> Enable fsanitize signed-integer-overflow in mpeg2ts

Bug: 23752600
Change-Id: I6b593e085889bf36ebd8eff4dd4f9abc83c0e499
peg2ts/Android.mk
8c1dafea687db593ee8047ff71eb0b2e4307a506 04-Sep-2015 Dan Austin <danielaustin@google.com> Enable fsanitize signed-integer-overflow in webm

Bug: 23752600
Change-Id: I181f7cfa6ed9d27ada2235a8d6ead0d7c9bef75e
ebm/Android.mk
9247fab2ec4ffaf9d0a8ff1b310fd2e352e8174f 04-Sep-2015 Dan Austin <danielaustin@google.com> Enable fsanitize signed-integer-overflow in id3

Bug: 23752600
Change-Id: I463c62aee7760e74b8f72f060e1169e38dbc817c
d3/Android.mk
a86fef32894a90811c2e175152763bc3994c769f 02-Sep-2015 Wonsik Kim <wonsik@google.com> Ogg: fix possible read overflow

Bug: 23607712
Change-Id: I03547179cc4480b6fd081384a2a06369e178bdec
ggExtractor.cpp
7d34959b10e0e8a9ac4cdd5e10a6d016513aa03f 03-Sep-2015 Marco Nelissen <marcone@google.com> am 16e12007: am 74888428: Merge "Fix timedtext parsing" into klp-dev

* commit '16e12007ab1581e1b6aa973f3c83b2a45a816881':
Fix timedtext parsing
16e12007ab1581e1b6aa973f3c83b2a45a816881 03-Sep-2015 Marco Nelissen <marcone@google.com> am 74888428: Merge "Fix timedtext parsing" into klp-dev

* commit '74888428e51a2aa123e301912d09973bd9310c33':
Fix timedtext parsing
c4f9e20b4eedd3faff4e0fe3193d9d74be61297b 03-Sep-2015 Dan Austin <danielaustin@google.com> am ca920aeb: am 021158d9: am 2e2cbaa2: Merge "Enable fsanitize signed-integer-overflow in omx"

* commit 'ca920aeb8d523c1604709016056120036e0c19c4':
Enable fsanitize signed-integer-overflow in omx
6edf1175214f0da5d7827264ebf04a1ac2e8eb4d 03-Sep-2015 Wei Jia <wjia@google.com> am 96445972: am b553ce14: am f9156653: Merge "libstagefright: sanity check size before dereferencing pointer in Utils.cpp" into mnc-dev

* commit '9644597227defd7c38662825ba2f2be91efc5e7e':
libstagefright: sanity check size before dereferencing pointer in Utils.cpp
e4af81bcb4f6ae90bd62ddc8ac90f3bb253a1de9 03-Sep-2015 Wonsik Kim <wonsik@google.com> am 90bfe4d7: am d35e4c12: am bc9ab7cd: Merge "Ogg: avoid size_t overflow in base64 decoding" into mnc-dev

* commit '90bfe4d7e79f5b313ea577fd8600178d10cfc9b7':
Ogg: avoid size_t overflow in base64 decoding
a968636510ef95246473062c60bfe91eccef5109 03-Sep-2015 Lajos Molnar <lajos@google.com> am f8fcf620: am dcdfe1a1: am d35955dd: Merge "stagefright: MPEG4Extractor: allow \'hdlr\' box before first track" into mnc-dev

* commit 'f8fcf620459fd58834bfbdc1396a0687cb986eeb':
stagefright: MPEG4Extractor: allow 'hdlr' box before first track
c4b1a9e35dae2bd10bd80bddbf060ebd436f3427 03-Sep-2015 Marco Nelissen <marcone@google.com> Merge "Work around compiler issue that confuses valgrind"
ca920aeb8d523c1604709016056120036e0c19c4 03-Sep-2015 Dan Austin <danielaustin@google.com> am 021158d9: am 2e2cbaa2: Merge "Enable fsanitize signed-integer-overflow in omx"

* commit '021158d9d1546a997a48553e187ea3b5cb9a2bc3':
Enable fsanitize signed-integer-overflow in omx
03b7f72b98ef0a4fa58a84a27d2f8735342faf58 03-Sep-2015 Wei Jia <wjia@google.com> am 9d916c77: DO NOT MERGE - libstagefright: sanity check size before dereferencing pointer in Utils.cpp

* commit '9d916c771ca32cb2d0df27b85ce3e17bb6b48eaf':
DO NOT MERGE - libstagefright: sanity check size before dereferencing pointer in Utils.cpp
74888428e51a2aa123e301912d09973bd9310c33 03-Sep-2015 Marco Nelissen <marcone@google.com> Merge "Fix timedtext parsing" into klp-dev
021158d9d1546a997a48553e187ea3b5cb9a2bc3 03-Sep-2015 Dan Austin <danielaustin@google.com> am 2e2cbaa2: Merge "Enable fsanitize signed-integer-overflow in omx"

* commit '2e2cbaa256c061dc9207f8bb8a770a2a3107c3de':
Enable fsanitize signed-integer-overflow in omx
2e2cbaa256c061dc9207f8bb8a770a2a3107c3de 03-Sep-2015 Dan Austin <danielaustin@google.com> Merge "Enable fsanitize signed-integer-overflow in omx"
64ed43b316718ecc4a70d7d1c5410aaa3c85ef0a 03-Sep-2015 Dan Austin <danielaustin@google.com> Enable fsanitize signed-integer-overflow in omx

Bug: 23752600
Change-Id: I811238cf041e437dcaedef6f43bfefd281d04131
mx/Android.mk
9644597227defd7c38662825ba2f2be91efc5e7e 03-Sep-2015 Wei Jia <wjia@google.com> am b553ce14: am f9156653: Merge "libstagefright: sanity check size before dereferencing pointer in Utils.cpp" into mnc-dev

* commit 'b553ce1489d217ed2d1484d940832333a97c584d':
libstagefright: sanity check size before dereferencing pointer in Utils.cpp
c6a2815eadfce62702d58b3fa3887f24c49e1864 01-Sep-2015 Wei Jia <wjia@google.com> DO NOT MERGE - libstagefright: sanity check size before dereferencing pointer in Utils.cpp

Also remove some CHECK's.

Bug: 23680780
Change-Id: I62d0941e203e40209fa6fbe3f923f3efdc5a6c23
(cherry picked from commit 7bb772e0c643ff3292599cf485b9dbf232bf39a4)
tils.cpp
b553ce1489d217ed2d1484d940832333a97c584d 03-Sep-2015 Wei Jia <wjia@google.com> am f9156653: Merge "libstagefright: sanity check size before dereferencing pointer in Utils.cpp" into mnc-dev

* commit 'f9156653832ddb8ad0888004cb555bcb4ce88269':
libstagefright: sanity check size before dereferencing pointer in Utils.cpp
9d916c771ca32cb2d0df27b85ce3e17bb6b48eaf 01-Sep-2015 Wei Jia <wjia@google.com> DO NOT MERGE - libstagefright: sanity check size before dereferencing pointer in Utils.cpp

Also remove some CHECK's.

Bug: 23680780
Change-Id: I62d0941e203e40209fa6fbe3f923f3efdc5a6c23
(cherry picked from commit 7bb772e0c643ff3292599cf485b9dbf232bf39a4)
tils.cpp
f9156653832ddb8ad0888004cb555bcb4ce88269 03-Sep-2015 Wei Jia <wjia@google.com> Merge "libstagefright: sanity check size before dereferencing pointer in Utils.cpp" into mnc-dev
ac774d53fff5a580b9fe41ac4a7c6bb96b5137ef 03-Sep-2015 Wonsik Kim <wonsik@google.com> am eda49b16: am 3f79dbfc: am d77786c6: am a6c650a9: am 436b32d1: am d2605273: Ogg: avoid size_t overflow in base64 decoding

* commit 'eda49b160b0d730140f0ab48cf7a4013f2d97f30':
Ogg: avoid size_t overflow in base64 decoding
3f79dbfcb1a62c28094b403ba954ab4543d709f7 03-Sep-2015 Wonsik Kim <wonsik@google.com> am d77786c6: am a6c650a9: am 436b32d1: am d2605273: Ogg: avoid size_t overflow in base64 decoding

* commit 'd77786c699c3f846b57b8a8ea00f20749f550960':
Ogg: avoid size_t overflow in base64 decoding
90bfe4d7e79f5b313ea577fd8600178d10cfc9b7 03-Sep-2015 Wonsik Kim <wonsik@google.com> am d35e4c12: am bc9ab7cd: Merge "Ogg: avoid size_t overflow in base64 decoding" into mnc-dev

* commit 'd35e4c12342b8bf18c8a9c640331e8051f69f7da':
Ogg: avoid size_t overflow in base64 decoding
a6c650a9e7927c7d640828cea66fc96e0bf762ce 03-Sep-2015 Wonsik Kim <wonsik@google.com> am 436b32d1: am d2605273: Ogg: avoid size_t overflow in base64 decoding

* commit '436b32d1eb75cf20d09776549bd7f7a11fa569a1':
Ogg: avoid size_t overflow in base64 decoding
436b32d1eb75cf20d09776549bd7f7a11fa569a1 03-Sep-2015 Wonsik Kim <wonsik@google.com> am d2605273: Ogg: avoid size_t overflow in base64 decoding

* commit 'd26052738f7b095b7e318c8dde7f32db0a48450c':
Ogg: avoid size_t overflow in base64 decoding
d35e4c12342b8bf18c8a9c640331e8051f69f7da 03-Sep-2015 Wonsik Kim <wonsik@google.com> am bc9ab7cd: Merge "Ogg: avoid size_t overflow in base64 decoding" into mnc-dev

* commit 'bc9ab7cdb3475567af390c83c64157aa7f9e2f19':
Ogg: avoid size_t overflow in base64 decoding
bc9ab7cdb3475567af390c83c64157aa7f9e2f19 03-Sep-2015 Wonsik Kim <wonsik@google.com> Merge "Ogg: avoid size_t overflow in base64 decoding" into mnc-dev
f8fcf620459fd58834bfbdc1396a0687cb986eeb 03-Sep-2015 Lajos Molnar <lajos@google.com> am dcdfe1a1: am d35955dd: Merge "stagefright: MPEG4Extractor: allow \'hdlr\' box before first track" into mnc-dev

* commit 'dcdfe1a176a29ba03698473c1e77c953fbda2cb5':
stagefright: MPEG4Extractor: allow 'hdlr' box before first track
d26052738f7b095b7e318c8dde7f32db0a48450c 02-Sep-2015 Wonsik Kim <wonsik@google.com> Ogg: avoid size_t overflow in base64 decoding

Bug: 23707088
Change-Id: I8d32841fee3213c721cdcc57788807ea64d19d74
ggExtractor.cpp
76483691ea93aed0433dee050abfc9fa934c4f62 02-Sep-2015 Wonsik Kim <wonsik@google.com> Ogg: avoid size_t overflow in base64 decoding

Bug: 23707088
Change-Id: I8d32841fee3213c721cdcc57788807ea64d19d74
ggExtractor.cpp
bf88817708af863683bc0d48dad991a4985d6c33 02-Sep-2015 Chad Brubaker <cbrubaker@google.com> am a4e9d09e: resolved conflicts for merge of 520d9ab3 to stage-aosp-master

* commit 'a4e9d09ea9a3195e5ba93ffafb54fc15fc109f2b':
Enable fsanitize unsigned-integer-overflow in webm
a4e9d09ea9a3195e5ba93ffafb54fc15fc109f2b 02-Sep-2015 Chad Brubaker <cbrubaker@google.com> resolved conflicts for merge of 520d9ab3 to stage-aosp-master

Change-Id: I4dc12386a7ca9b814c674f0d9a44acfb817e8762
520d9ab35592c182fee61f9722e62d1acc9a37e8 02-Sep-2015 Chad Brubaker <cbrubaker@google.com> Merge "Enable fsanitize unsigned-integer-overflow in webm"
78351ab0d8ba3b67d7875f149d6fd7bb54b08274 02-Sep-2015 Dan Austin <danielaustin@google.com> am 94a2aa7a: am 29ad827a: am c8c5253f: Merge "Enable signed-integer-overflow"

* commit '94a2aa7ab88eadfeb904f3a132a1ec3cb518ec28':
Enable signed-integer-overflow
94a2aa7ab88eadfeb904f3a132a1ec3cb518ec28 02-Sep-2015 Dan Austin <danielaustin@google.com> am 29ad827a: am c8c5253f: Merge "Enable signed-integer-overflow"

* commit '29ad827a0486a083d50256be1b77c08a352e4446':
Enable signed-integer-overflow
29ad827a0486a083d50256be1b77c08a352e4446 02-Sep-2015 Dan Austin <danielaustin@google.com> am c8c5253f: Merge "Enable signed-integer-overflow"

* commit 'c8c5253fedefabbebb5d7b900b92a443ed7dfa16':
Enable signed-integer-overflow
a3592f26e7edebd4e7a7745fd107f45dbac71879 02-Sep-2015 Dan Austin <danielaustin@google.com> Enable signed-integer-overflow

Turn on signed-integer-overflow for libstagefright.so. This is only
for the top level Android.mk, and does not turn on signed overflow
checking in the included libraries and codecs.

Bug: 23752600
Change-Id: I9095a002d003da416db1a72f0edc197d19489945
ndroid.mk
dcdfe1a176a29ba03698473c1e77c953fbda2cb5 02-Sep-2015 Lajos Molnar <lajos@google.com> am d35955dd: Merge "stagefright: MPEG4Extractor: allow \'hdlr\' box before first track" into mnc-dev

* commit 'd35955dd6ccdb4aecdf8217f708b9f8015fc9957':
stagefright: MPEG4Extractor: allow 'hdlr' box before first track
211b2eed992a0343530254b8254072f7d1686f87 01-Sep-2015 Chad Brubaker <cbrubaker@google.com> Enable fsanitize unsigned-integer-overflow in webm

Bug: 23110888
Change-Id: I44553c6f60f2dc394faddc66b0e9016db7b99dd0
ebm/Android.mk
1f0f86ada6da516cb5b88d6f951c7071bfb8517e 27-Aug-2015 Elliott Hughes <enh@google.com> Replace HAVE_ANDROID_OS with __ANDROID__.

Change-Id: I99d63bb7f36c274fd2142823f357963257406ced
(cherry picked from commit ab38ad99ff57816354f2ee5c742a0bc220f216b3)
ttplive/HTTPDownloader.cpp
7bb772e0c643ff3292599cf485b9dbf232bf39a4 01-Sep-2015 Wei Jia <wjia@google.com> libstagefright: sanity check size before dereferencing pointer in Utils.cpp

Also remove some CHECK's.

Bug: 23680780
Change-Id: I62d0941e203e40209fa6fbe3f923f3efdc5a6c23
tils.cpp
5b5d1f87f1cfdd631c5d4ea5c60e1dae910a9203 01-Sep-2015 Marco Nelissen <marcone@google.com> Work around compiler issue that confuses valgrind

For something like "if (a(&b) && b)", the compiler will generate code that
always checks both "b" and "a()", but then ignores "b" if "a()" returned
false. Since "b" is only initialized if "a()" returned true, the result is
valid, but confuses valgrind as it sees use of uninitialized memory.

Bug: 20950574
Change-Id: I1d173bbb32cc22f31d498f74677dc8be6bbe8df7
etaData.cpp
cf75af8f76265fb2909028f5dc68c7029dbe5f49 01-Sep-2015 Lajos Molnar <lajos@google.com> stagefright: MPEG4Extractor: allow 'hdlr' box before first track

Bug: 21725583
Change-Id: I799c1967759c7e49fb50281a1708188450caac77
PEG4Extractor.cpp
452599f23a36207d436f7275ebc7e3ccac6ca76c 29-Aug-2015 Marco Nelissen <marcone@google.com> Prevent infinite loops when parsing files

Bug: 23540914
Change-Id: I5d7c63cbb697c99cc3746e3c96f7c1f720896eba
PEG4Extractor.cpp
d53aced041b7214a92b1f2fd5970d895bb9934e5 27-Aug-2015 Marco Nelissen <marcone@google.com> Fix timedtext parsing

Add bounds checking and fix other bugs.

Bug: 23284974
Bug: 23541506
Bug: 23542351
Bug: 23542352
Change-Id: I53551efdf109ce1833e0c361efaf4cee7a851023
imedtext/TextDescriptions.cpp
imedtext/TextDescriptions.h
125e47913eb4c51b3c03a2953b6100df97da2c59 28-Aug-2015 Elliott Hughes <enh@google.com> am 9d65efac: Replace HAVE_ANDROID_OS with __ANDROID__.

* commit '9d65efac5bbf88c03f7fa5e95120e2fbae35aa9b':
Replace HAVE_ANDROID_OS with __ANDROID__.
9d65efac5bbf88c03f7fa5e95120e2fbae35aa9b 27-Aug-2015 Elliott Hughes <enh@google.com> Replace HAVE_ANDROID_OS with __ANDROID__.

Change-Id: I99d63bb7f36c274fd2142823f357963257406ced
(cherry picked from commit ab38ad99ff57816354f2ee5c742a0bc220f216b3)
ttplive/HTTPDownloader.cpp
f1dc8e29649b51010bdac55d4f509b2a1fdad922 26-Aug-2015 Abhishek Arya <aarya@google.com> am 524f9946: am 76b3fb29: am 4fd0696a: am 4f797b92: Merge "DO NOT MERGE - Fix software video decoder buffer size calculation" into lmp-dev

* commit '524f99469df44f47fd21d160b8434d40dd11bd65':
DO NOT MERGE - Fix software video decoder buffer size calculation
74d08b264718cd4026ec3acb918ae5c72adbb68f 26-Aug-2015 Wei Jia <wjia@google.com> am fb385ac6: am 571d9731: Merge commit \'c642d411\' into HEAD

* commit 'fb385ac653b4850fbb4565118c828aa285176a3e':
DO NOT MERGE - SoftwareRenderer: sanity check buffer size before copying data.
6a84e6dc7fc1cb5892a345e7d6465f556f5b174b 25-Aug-2015 Chad Brubaker <cbrubaker@google.com> am 20e7a377: am fc608967: am d98db140: Merge "Fix benign unsigned overflow in OggExtractor"

* commit '20e7a377ce22e260772f0c0276870cee5a92648e':
Fix benign unsigned overflow in OggExtractor
20e7a377ce22e260772f0c0276870cee5a92648e 25-Aug-2015 Chad Brubaker <cbrubaker@google.com> am fc608967: am d98db140: Merge "Fix benign unsigned overflow in OggExtractor"

* commit 'fc608967dfab429e505aafc7574d0d13dc609662':
Fix benign unsigned overflow in OggExtractor
f86c0757747f32fcabb6260d997c9e066399f528 25-Aug-2015 Chad Brubaker <cbrubaker@google.com> am fc608967: am d98db140: Merge "Fix benign unsigned overflow in OggExtractor"

* commit 'fc608967dfab429e505aafc7574d0d13dc609662':
Fix benign unsigned overflow in OggExtractor
d98db140a47931e275a74144d163cb27fbd8015d 25-Aug-2015 Chad Brubaker <cbrubaker@google.com> Merge "Fix benign unsigned overflow in OggExtractor"
76b3fb292dcda8f56543be10b9e135cce117e210 25-Aug-2015 Abhishek Arya <aarya@google.com> am 4fd0696a: am 4f797b92: Merge "DO NOT MERGE - Fix software video decoder buffer size calculation" into lmp-dev

* commit '4fd0696a8f849d80c725322739ba260421299e0b':
DO NOT MERGE - Fix software video decoder buffer size calculation
571d9731c06decc19b55617be85eb0df70fa94cb 25-Aug-2015 Wei Jia <wjia@google.com> Merge commit 'c642d411' into HEAD

DO NOT MERGE - SoftwareRenderer: sanity check buffer size before copying data.

Bug: 21443020
(cherry picked from commit 760f92f8b6da9c9cf128cb18fe3c09402fdde6cd)

Change-Id: I5bc68e3e7f0278b8bbbe0ad5b87d6e8e2dbabd42
f9a51893d739000cd70caf10c83d0e603371f5b1 25-Aug-2015 Abhishek Arya <aarya@google.com> am 9a2be5d4: Merge "DO NOT MERGE - Fix software video decoder buffer size calculation" into klp-dev

* commit '9a2be5d49d57b239bf6345f033eab01ba98f3889':
DO NOT MERGE - Fix software video decoder buffer size calculation
3a7ff4c754fcb99c29621ed94b08ed6fb65f6495 25-Aug-2015 Wei Jia <wjia@google.com> am a5f50e98: DO NOT MERGE - SoftwareRenderer: sanity check buffer size before copying data.

* commit 'a5f50e98d1408addcaaac27e4d13981163d12a15':
DO NOT MERGE - SoftwareRenderer: sanity check buffer size before copying data.
4f797b92b6e6d21a88c6b9b85a6cba38bfd04e3a 25-Aug-2015 Abhishek Arya <aarya@google.com> Merge "DO NOT MERGE - Fix software video decoder buffer size calculation" into lmp-dev
9a2be5d49d57b239bf6345f033eab01ba98f3889 25-Aug-2015 Abhishek Arya <aarya@google.com> Merge "DO NOT MERGE - Fix software video decoder buffer size calculation" into klp-dev
2369bda581ddd379296b57098e119afb0cfa0952 25-Aug-2015 Chad Brubaker <cbrubaker@google.com> Fix benign unsigned overflow in OggExtractor

When computing mCurrentPageSamples it was possible to have a harmless
unsigned integer overflow during the conf pages leading to false
positives with fsanitize integer. To prevent the false positives clamp
the result to 0.

Bug: 23488745
Bug: 23110888
Change-Id: I0769cb4a915d45b00ea43f2abbefe9ee46165cc7
ggExtractor.cpp
5ee7be7e80158a58ef97e8d40c979a82dd7da827 25-Aug-2015 Chih-hung Hsieh <chh@google.com> am ace3e2ec: am d436030f: am b55897a7: Merge "Use unified syntax to compile with both llvm and gas."

* commit 'ace3e2ec7ef78432ca92996d78ef95f981c06b93':
Use unified syntax to compile with both llvm and gas.
dddf932f2e58dab3ae183f720f44ca35fca52765 25-Aug-2015 Wei Jia <wjia@google.com> am 41de4ba1: am cf69487d: am 6f80b09f: am 252a8c09: am 0f3ab16c: am af7e33f6: libstagefright: check overflow before memory allocation in OMXCodec.cpp

* commit '41de4ba1d896c4e8ab7df24d10ca7d5109fbd323':
libstagefright: check overflow before memory allocation in OMXCodec.cpp
a6bafbc5da25db600d7311c0ba47a3fe034b4471 25-Aug-2015 Marco Nelissen <marcone@google.com> am 2c02f5ee: am 719cd33e: am 492bba08: am d18bb120: am 09f71c56: am dedaca6f: Limit allocations to avoid out-of-memory

* commit '2c02f5eeec639825ece4acbca0d1969da192dca0':
Limit allocations to avoid out-of-memory
7aa86ecdf4a8b981aed2b6717e6a104a360d18c0 16-Jun-2015 Marco Nelissen <marcone@google.com> DO NOT MERGE - Fix software video decoder buffer size calculation

Various software video decoders would specify the buffer size as if it were
fully cropped, which then failed a sanity check in SoftwareRenderer.
They now return the full buffer size.

Bug: 21717327
Bug: 21443020
Change-Id: I19fcd091827ebd52a95a5509281a07ccc156e0e5
(cherry picked from commit 3ecc9db40b1fb9c7f807a5892e5c9625aac1fb06)
odecs/on2/dec/SoftVPX.cpp
0f3e2daa1d56c98196a719a6e641f3ed67b8e7bf 16-Jun-2015 Marco Nelissen <marcone@google.com> DO NOT MERGE - Fix software video decoder buffer size calculation

Various software video decoders would specify the buffer size as if it were
fully cropped, which then failed a sanity check in SoftwareRenderer.
They now return the full buffer size.

Bug: 21717327
Bug: 21443020
Change-Id: I19fcd091827ebd52a95a5509281a07ccc156e0e5
(cherry picked from commit 3ecc9db40b1fb9c7f807a5892e5c9625aac1fb06)
odecs/on2/dec/SoftVPX.cpp
dc5e47f013bfbb74c5c35ad976aa98d480cb351b 08-Jun-2015 Wei Jia <wjia@google.com> DO NOT MERGE - SoftwareRenderer: sanity check buffer size before copying data.

Bug: 21443020
Change-Id: I63cf86217b8201fb41809c23e4b752b845a93ee2
(cherry picked from commit 760f92f8b6da9c9cf128cb18fe3c09402fdde6cd)
olorconversion/SoftwareRenderer.cpp
a5f50e98d1408addcaaac27e4d13981163d12a15 08-Jun-2015 Wei Jia <wjia@google.com> DO NOT MERGE - SoftwareRenderer: sanity check buffer size before copying data.

Bug: 21443020
Change-Id: I63cf86217b8201fb41809c23e4b752b845a93ee2
(cherry picked from commit 760f92f8b6da9c9cf128cb18fe3c09402fdde6cd)
olorconversion/SoftwareRenderer.cpp
ace3e2ec7ef78432ca92996d78ef95f981c06b93 24-Aug-2015 Chih-hung Hsieh <chh@google.com> am d436030f: am b55897a7: Merge "Use unified syntax to compile with both llvm and gas."

* commit 'd436030f2df4b68b68fbd7adb36316c298392ade':
Use unified syntax to compile with both llvm and gas.
e9cc4c3a0ac91af05bdb7b6bcc850e55b9e258f0 24-Aug-2015 Chih-hung Hsieh <chh@google.com> am d436030f: am b55897a7: Merge "Use unified syntax to compile with both llvm and gas."

* commit 'd436030f2df4b68b68fbd7adb36316c298392ade':
Use unified syntax to compile with both llvm and gas.
b55897a7e23b12ba5a131c8613fc5073cd96dc6b 24-Aug-2015 Chih-hung Hsieh <chh@google.com> Merge "Use unified syntax to compile with both llvm and gas."
9bb2ae4a924cfd67803c75b7e360afb0ddf88e03 24-Aug-2015 Robert Shih <robertshih@google.com> am 1c425b65: am b3b34074: am 7b06f9ba: am fa11fd5b: resolved conflicts for merge of 327afffb to lmp-mr1-ub-dev

* commit '1c425b65186bb64b5c5e32194b3db3df4a5378b1':
Prevent integer issues in ID3::Iterator::findFrame
1c425b65186bb64b5c5e32194b3db3df4a5378b1 24-Aug-2015 Robert Shih <robertshih@google.com> am b3b34074: am 7b06f9ba: am fa11fd5b: resolved conflicts for merge of 327afffb to lmp-mr1-ub-dev

* commit 'b3b34074477b9f8713924e18f7a0120965112720':
Prevent integer issues in ID3::Iterator::findFrame
b3b34074477b9f8713924e18f7a0120965112720 24-Aug-2015 Robert Shih <robertshih@google.com> am 7b06f9ba: am fa11fd5b: resolved conflicts for merge of 327afffb to lmp-mr1-ub-dev

* commit '7b06f9ba19a9945355d634ddafaaa351681b6f9b':
Prevent integer issues in ID3::Iterator::findFrame
af1b5f0dfe3928cbabc3b1c602faa642d7835272 24-Aug-2015 Robert Shih <robertshih@google.com> am 7b06f9ba: am fa11fd5b: resolved conflicts for merge of 327afffb to lmp-mr1-ub-dev

* commit '7b06f9ba19a9945355d634ddafaaa351681b6f9b':
Prevent integer issues in ID3::Iterator::findFrame
7b06f9ba19a9945355d634ddafaaa351681b6f9b 24-Aug-2015 Robert Shih <robertshih@google.com> am fa11fd5b: resolved conflicts for merge of 327afffb to lmp-mr1-ub-dev

* commit 'fa11fd5bb2e9c5e00f7fecbbe76c279193182cee':
Prevent integer issues in ID3::Iterator::findFrame
fa11fd5bb2e9c5e00f7fecbbe76c279193182cee 24-Aug-2015 Robert Shih <robertshih@google.com> resolved conflicts for merge of 327afffb to lmp-mr1-ub-dev

Change-Id: I6c1369f05bbeb83e2152b8dae35f7a53328f7239
e7ab63414c13e5d2f312e145bc3c784d570b8962 24-Aug-2015 Wei Jia <wjia@google.com> am 5e511526: am 37f10abe: am 76dea1de: libstagefright: check overflow before memory allocation in OMXCodec.cpp

* commit '5e5115268e3512c2b9a2a17b05328e73b86cb289':
libstagefright: check overflow before memory allocation in OMXCodec.cpp
5e5115268e3512c2b9a2a17b05328e73b86cb289 24-Aug-2015 Wei Jia <wjia@google.com> am 37f10abe: am 76dea1de: libstagefright: check overflow before memory allocation in OMXCodec.cpp

* commit '37f10abe2eaf9af764f73bba195a86d737df43c6':
libstagefright: check overflow before memory allocation in OMXCodec.cpp
0985407736ad314a089051fb28abfc78b34b29ba 24-Aug-2015 Wei Jia <wjia@google.com> am 76dea1de: libstagefright: check overflow before memory allocation in OMXCodec.cpp

* commit '76dea1de8c92588358923300cbbc038144d302eb':
libstagefright: check overflow before memory allocation in OMXCodec.cpp
37f10abe2eaf9af764f73bba195a86d737df43c6 24-Aug-2015 Wei Jia <wjia@google.com> am 76dea1de: libstagefright: check overflow before memory allocation in OMXCodec.cpp

* commit '76dea1de8c92588358923300cbbc038144d302eb':
libstagefright: check overflow before memory allocation in OMXCodec.cpp
cf69487d1af3eeba724b65716a63ae13238e6e4a 23-Aug-2015 Wei Jia <wjia@google.com> am 6f80b09f: am 252a8c09: am 0f3ab16c: am af7e33f6: libstagefright: check overflow before memory allocation in OMXCodec.cpp

* commit '6f80b09f61da018d2f05e5303c0a798f9011d667':
libstagefright: check overflow before memory allocation in OMXCodec.cpp
719cd33e4ebc1c600772f81db28f81ccfe99ec4e 23-Aug-2015 Marco Nelissen <marcone@google.com> am 492bba08: am d18bb120: am 09f71c56: am dedaca6f: Limit allocations to avoid out-of-memory

* commit '492bba08202a601e96a13b26422c85b3fb1a5ee0':
Limit allocations to avoid out-of-memory
252a8c0956fe5a10bc18d9d4c6337edf29657d72 23-Aug-2015 Wei Jia <wjia@google.com> am 0f3ab16c: am af7e33f6: libstagefright: check overflow before memory allocation in OMXCodec.cpp

* commit '0f3ab16c827a43534597cb38515951ff736f9740':
libstagefright: check overflow before memory allocation in OMXCodec.cpp
d18bb120442fcc04efe269e6a26f83265eea40c8 23-Aug-2015 Marco Nelissen <marcone@google.com> am 09f71c56: am dedaca6f: Limit allocations to avoid out-of-memory

* commit '09f71c5621799e0f030b4a8058d2fb4df5977de0':
Limit allocations to avoid out-of-memory
0f3ab16c827a43534597cb38515951ff736f9740 23-Aug-2015 Wei Jia <wjia@google.com> am af7e33f6: libstagefright: check overflow before memory allocation in OMXCodec.cpp

* commit 'af7e33f6043c0be1c0310d675884e3b263ca2438':
libstagefright: check overflow before memory allocation in OMXCodec.cpp
09f71c5621799e0f030b4a8058d2fb4df5977de0 23-Aug-2015 Marco Nelissen <marcone@google.com> am dedaca6f: Limit allocations to avoid out-of-memory

* commit 'dedaca6f04ac9f95fabe3b64d44cd1a2050f079e':
Limit allocations to avoid out-of-memory
af7e33f6043c0be1c0310d675884e3b263ca2438 22-Aug-2015 Wei Jia <wjia@google.com> libstagefright: check overflow before memory allocation in OMXCodec.cpp

Bug: 23416608
Change-Id: I4dacd38ed42db8f4887c3ee386dc909451f4346f
MXCodec.cpp
dedaca6f04ac9f95fabe3b64d44cd1a2050f079e 04-Jun-2015 Marco Nelissen <marcone@google.com> Limit allocations to avoid out-of-memory

Corrupt files could cause very large allocations, limit them to something
more reasonable.

Bug: 17769851
Change-Id: Ib0f722fd6fddff873bd7a547aac456e608c34c84
PEG4Extractor.cpp
4bb4736eb6b5038385c2c0e8c28e4d2df9add929 22-Aug-2015 Robert Shih <robertshih@google.com> am 4c6556d1: am 8cf3564d: am eecc406f: am 3b42241a: Merge "Prevent integer issues in ID3::Iterator::findFrame" into klp-dev

* commit '4c6556d17f4073ed0b4d11abf42df9c32c339291':
Prevent integer issues in ID3::Iterator::findFrame
8cf3564d2dd522f7a707a8fd109d415dab3def47 22-Aug-2015 Robert Shih <robertshih@google.com> am eecc406f: am 3b42241a: Merge "Prevent integer issues in ID3::Iterator::findFrame" into klp-dev

* commit 'eecc406f462ef2b3a73cd6bf3c05f7cb45382276':
Prevent integer issues in ID3::Iterator::findFrame
eecc406f462ef2b3a73cd6bf3c05f7cb45382276 22-Aug-2015 Robert Shih <robertshih@google.com> am 3b42241a: Merge "Prevent integer issues in ID3::Iterator::findFrame" into klp-dev

* commit '3b42241aab5855964d1bd60268ae21c2d9cc6065':
Prevent integer issues in ID3::Iterator::findFrame
3b42241aab5855964d1bd60268ae21c2d9cc6065 22-Aug-2015 Robert Shih <robertshih@google.com> Merge "Prevent integer issues in ID3::Iterator::findFrame" into klp-dev
76dea1de8c92588358923300cbbc038144d302eb 22-Aug-2015 Wei Jia <wjia@google.com> libstagefright: check overflow before memory allocation in OMXCodec.cpp

Bug: 23416608
Change-Id: I4dacd38ed42db8f4887c3ee386dc909451f4346f
MXCodec.cpp
c580c836c1941fb4912e1dd4e08626caf98a62c7 15-Aug-2015 Joshua J. Drake <android-open-source@qoop.org> Prevent integer issues in ID3::Iterator::findFrame

Integer overflows could occur a few places within findFrame. These can lead to
out-of-bounds reads and potentially infinite loops. Ensure that arithmetic does
not wrap around to prevent these behaviors.

Bug: 23285192
Change-Id: I72a61df7d5719d1d3f2bd0b37fba86f0f4bbedee
d3/ID3.cpp
6ba10181ea148be7e1bd7f60dbd9830b1579eb1a 22-Aug-2015 Chad Brubaker <cbrubaker@google.com> am 5d929557: am 819b89aa: am 84c1e5a9: Merge "Whitelist *ToPlanar from integer sanitization"

* commit '5d929557d4f990605eac0f5e217df75665e96178':
Whitelist *ToPlanar from integer sanitization
5d929557d4f990605eac0f5e217df75665e96178 22-Aug-2015 Chad Brubaker <cbrubaker@google.com> am 819b89aa: am 84c1e5a9: Merge "Whitelist *ToPlanar from integer sanitization"

* commit '819b89aac84f84d6022a9b3389b7e83a6ee93e37':
Whitelist *ToPlanar from integer sanitization
189f7e4302b261572ceb26f39138a1ad8eb34814 22-Aug-2015 Chad Brubaker <cbrubaker@google.com> am 819b89aa: am 84c1e5a9: Merge "Whitelist *ToPlanar from integer sanitization"

* commit '819b89aac84f84d6022a9b3389b7e83a6ee93e37':
Whitelist *ToPlanar from integer sanitization
e9f2ed5fe3a85c2f86b4026dc50cf5a2aecf036d 11-Aug-2015 Chad Brubaker <cbrubaker@google.com> Enable unsigned-integer-overflow

Turn on unsigned-integer-overflow for libstagefright.so. This is only
for the top level Android.mk and doesn't turn on overflow checking in
all the libaries and codecs included.

This causes unsigned integer overflows to abort the process instead of
potentially being security bugs.

Bug: 23110888
Change-Id: I719ae48c4c3f940a9431d173621885bd344a8401
(cherry picked from commit 70794607c8f23e58a81b543945264a7e17275760)
ndroid.mk
371da9af723d65690f0d624e19a5b2d875570f1f 11-Aug-2015 Chad Brubaker <cbrubaker@google.com> Enable unsigned-integer-overflow

Turn on unsigned-integer-overflow for libstagefright.so. This is only
for the top level Android.mk and doesn't turn on overflow checking in
all the libaries and codecs included.

This causes unsigned integer overflows to abort the process instead of
potentially being security bugs.

Bug: 23110888
Change-Id: I719ae48c4c3f940a9431d173621885bd344a8401
(cherry picked from commit 70794607c8f23e58a81b543945264a7e17275760)
ndroid.mk
e21dfd028d218ccc19be6a52cc9c4050cf429378 21-Aug-2015 Chad Brubaker <cbrubaker@google.com> resolved conflicts for merge of b571ecfd to mnc-dev-plus-aosp

Change-Id: I085da358f0ec517c0e6530eb22b5206981d1a8db
0c9e64b3b451f95db8d1cb5ca5bf1449ea97d480 21-Aug-2015 Chad Brubaker <cbrubaker@google.com> am 4a3bb67a: am 73dd4321: Merge "Whitelist updatePCR from fsanitize=integer"

* commit '4a3bb67a5c57af1fe1f31277b823cca8fd490d51':
Whitelist updatePCR from fsanitize=integer
af6d5b30b85b5db3278afaf272f5e2076577041d 21-Aug-2015 Chad Brubaker <cbrubaker@google.com> resolved conflicts for merge of b571ecfd to mnc-dr-dev-plus-aosp

Change-Id: Idae924d1298d02a4a51dbfaf37dac12e676f566d
7e7a4e32fbf912c45fbfbab7d084d31814c0ea23 21-Aug-2015 Chad Brubaker <cbrubaker@google.com> resolved conflicts for merge of 3554658d to mnc-dev-plus-aosp

Change-Id: I056eaf233868cd1b0173dfc7faa531503ca3c43e
f57b93813a4c8a3783cc765422556a4d748897d9 21-Aug-2015 Chad Brubaker <cbrubaker@google.com> am 4a3bb67a: am 73dd4321: Merge "Whitelist updatePCR from fsanitize=integer"

* commit '4a3bb67a5c57af1fe1f31277b823cca8fd490d51':
Whitelist updatePCR from fsanitize=integer
23d3f4bbe40b48022969750da172b26ba46a1ca3 21-Aug-2015 Chad Brubaker <cbrubaker@google.com> resolved conflicts for merge of 3554658d to mnc-dev-plus-aosp

Change-Id: I405620d8414c05cb959b3ab5d6fdd9b883f1fa06
55a422a30ffb085ee26d98cab71b785787b8dfae 21-Aug-2015 Nick Kralevich <nnk@google.com> resolved conflicts for merge of 6dd63b23 to mnc-dev-plus-aosp

Change-Id: I52c5738351ed5cad2fbc64272af4eb47b3417dff
ade728d8757feca6017fc09a764d23d46f04cebb 21-Aug-2015 Nick Kralevich <nnk@google.com> resolved conflicts for merge of 6dd63b23 to mnc-dr-dev-plus-aosp

Change-Id: Ie83d181719af1ff2b9fa4d36bc99dea8709231cb
12826a541ece33266cbc4f73753ffde930162e23 21-Aug-2015 Chad Brubaker <cbrubaker@google.com> am 38253353: am bde8adfe: Merge "Fix benign unsigned integer overflow"

* commit '38253353a6ad45a78ac0e1ae48c6e20b6400283d':
Fix benign unsigned integer overflow
dea36068c9486f5985f872266cd47c73ca652dee 21-Aug-2015 Chad Brubaker <cbrubaker@google.com> am 230fc5a9: am e89f6562: Merge "Fix benign unsigned integer overflows"

* commit '230fc5a93d2a6c518992ef68e1f9369db1716de5':
Fix benign unsigned integer overflows
d919f6c90d4602305cda040d8d246ecafae4fb2c 21-Aug-2015 Chad Brubaker <cbrubaker@google.com> am 8d692386: am 0351b0e2: Merge "Fix benign unsigned integer overflow"

* commit '8d6923861139f250dd33dafd65d295f9c5162ada':
Fix benign unsigned integer overflow
eccf3f8d86c7a613538d1eef35d49e4cf76aebe7 21-Aug-2015 Chad Brubaker <cbrubaker@google.com> am 38253353: am bde8adfe: Merge "Fix benign unsigned integer overflow"

* commit '38253353a6ad45a78ac0e1ae48c6e20b6400283d':
Fix benign unsigned integer overflow
d76f0c9feb9992e52102ef6b060cca7e5bf614a1 21-Aug-2015 Chad Brubaker <cbrubaker@google.com> am 230fc5a9: am e89f6562: Merge "Fix benign unsigned integer overflows"

* commit '230fc5a93d2a6c518992ef68e1f9369db1716de5':
Fix benign unsigned integer overflows
e0f22d3ca1d1492352009b6095b15a9801116a92 21-Aug-2015 Chad Brubaker <cbrubaker@google.com> am 8d692386: am 0351b0e2: Merge "Fix benign unsigned integer overflow"

* commit '8d6923861139f250dd33dafd65d295f9c5162ada':
Fix benign unsigned integer overflow
f814f84e09191af23bbf8d307f02704e20cc887c 21-Aug-2015 Wei Jia <wjia@google.com> am d8816a13: DO NOT MERGE libstagefright: Fix crash in convertMetaDataToMessage

* commit 'd8816a13dbcafd5d61d26a8a6b2e892452bca1a7':
DO NOT MERGE libstagefright: Fix crash in convertMetaDataToMessage
92f9f71ee45a260aed552c18ac5112f7672859ed 21-Aug-2015 Chad Brubaker <cbrubaker@google.com> Whitelist *ToPlanar from integer sanitization

SoftVideoEncoderOMXComponent::Convert*ToPlanar methods use overflow in
value computation when converting between formats. These methods are
safe so whitelist them from unsigned overflow sanitization.
Bug: 23110888

Change-Id: Ia9978b54b0171a51a49723ec50d959808b086124
mx/SoftVideoEncoderOMXComponent.cpp
072d9eb2468c46de7446590c237185f9442fe483 21-Aug-2015 Chad Brubaker <cbrubaker@google.com> Merge "Enable fsanitize unsigned-overflow-detection in id3"
73dd432185ed6275fc9bf00c029547affed07525 21-Aug-2015 Chad Brubaker <cbrubaker@google.com> Merge "Whitelist updatePCR from fsanitize=integer"
32083ef53153a463705ddbb9861b5b834b10e91d 21-Aug-2015 Chad Brubaker <cbrubaker@google.com> Merge "Enable fsanitize unsigned-integer-overflow in MPEG2"
5664c0a977e2b62aae2dc873634a02a0282a497d 21-Aug-2015 Chad Brubaker <cbrubaker@google.com> Merge "Enable fsanitize unsigned-integer-overflow in omx"
2c99211dfc8192a31fb6bf134f40ebb08fa80d76 21-Aug-2015 Chad Brubaker <cbrubaker@google.com> Merge "Enable unsigned-integer-overflow"
bde8adfe5bdfea8492843a067e38bd28798c960f 21-Aug-2015 Chad Brubaker <cbrubaker@google.com> Merge "Fix benign unsigned integer overflow"
e89f6562a2de1b734388210fec9565e82aba2259 21-Aug-2015 Chad Brubaker <cbrubaker@google.com> Merge "Fix benign unsigned integer overflows"
0351b0e26c5d68185594d82a307ece4c95e280f7 21-Aug-2015 Chad Brubaker <cbrubaker@google.com> Merge "Fix benign unsigned integer overflow"
e117ee90326cfa39e8f401313df21612e89b5eea 21-Aug-2015 Chad Brubaker <cbrubaker@google.com> Merge "Fix benign unsigned integer overflows in loop conditions"
aaf36e2f8e5a393fe34b7d6dda3788ec4d570895 21-Aug-2015 Chad Brubaker <cbrubaker@google.com> Merge "don't trigger an integer underflow when decrementing."
d8816a13dbcafd5d61d26a8a6b2e892452bca1a7 25-Jun-2015 Wei Jia <wjia@google.com> DO NOT MERGE libstagefright: Fix crash in convertMetaDataToMessage

- The ABuffer used for the Message has a preset value of 1024, if
flattening the meta data exceeds this value, a check fails hence
the crash.
- This change creates a new ABuffer if the buffer size would exceed
the buffer capacity.

Bug: 22771132

CRs-Fixed: 857850

(cherry picked from commit 4bce636865bdf0e2a79fc9a5d9a69107649c850d)

Change-Id: Ia0a963e9872f646791e75b710ff9e227a66af4f9
tils.cpp
71db26c6ec7e3c1025a913a270574fcebd5db65e 21-Aug-2015 Marco Nelissen <marcone@google.com> am e6d2838d: am ba67d2fe: am 93eb5ecf: Merge "Prevent divide by zero in WAVExtractor"

* commit 'e6d2838dcb92a3277c59f4a13c4703b98b837bce':
Prevent divide by zero in WAVExtractor
0b76f47dd10c3c0421508a4195683347bd909c69 12-Aug-2015 Chad Brubaker <cbrubaker@google.com> Enable fsanitize unsigned-overflow-detection in id3

Tested using the id3v1_test_suite and cts and found no issues.
Bug:23110888

Change-Id: I6b876340914904abeb7035df004d7467ed4992ef
(cherry picked from commit 6325a7384138a73bb1fb34b776f0bb8b1dc94e60)
d3/Android.mk
208d08725512fe79c2a68f02324bc517e475cf0e 19-Aug-2015 Chad Brubaker <cbrubaker@google.com> Whitelist updatePCR from fsanitize=integer

updatePCR does some math to compute transport rate for logging that can
cause an unsigned overflow. Since this is harmless and only for logging
whitelist the function as its otherwise safe from integer issues.

Bug:23110888

Change-Id: I0686afeef99ccf636701d687e5628ae057f60e4c
(cherry picked from commit c9fa35cf7c9c11a8acb77128db1a6a13f1befe3c)
peg2ts/ATSParser.cpp
f3ff858fc380fa9d01c6d688a4f594e2a315c095 12-Aug-2015 Chad Brubaker <cbrubaker@google.com> Enable fsanitize unsigned-integer-overflow in MPEG2

Bug: 23110888
Change-Id: I224596af776d362bc8d0d72138695c3f7f21759b
(cherry picked from commit 6325a7384138a73bb1fb34b776f0bb8b1dc94e60)
peg2ts/Android.mk
peg2ts/MPEG2PSExtractor.cpp
7c7094ec0f20e189551c5534efd171acf77c0e69 12-Aug-2015 Chad Brubaker <cbrubaker@google.com> Enable fsanitize unsigned-integer-overflow in omx

Bug: 23110888
Change-Id: Ifa159e1b87ae627584516d84a36dc3bc88fad5c9
(cherry picked from commit ebe84f078e61ae319df42bed61e1fd862982e549)
mx/Android.mk
a398511c5f7a5c8fa8be853473fd274a0891a07b 11-Aug-2015 Chad Brubaker <cbrubaker@google.com> Enable unsigned-integer-overflow

Turn on unsigned-integer-overflow for libstagefright.so. This is only
for the top level Android.mk and doesn't turn on overflow checking in
all the libaries and codecs included.

This causes unsigned integer overflows to abort the process instead of
potentially being security bugs.

Bug: 23110888
Change-Id: I719ae48c4c3f940a9431d173621885bd344a8401
(cherry picked from commit 70794607c8f23e58a81b543945264a7e17275760)
ndroid.mk
679d5e6473dd37fcdc546e69d61eeecbc82a143a 12-Aug-2015 Vishwath Mohan <vishwath@google.com> Fix benign unsigned integer overflow

Fixes a benign overflow error in ANetworkSession.cpp

Bug: 23110888
Change-Id: Ic64f5100ab1e3f2ffe247ca4f7b40d38c1ff0c2a
(cherry picked from cfe302317c873001b0b35352d9f4f52c39f6f4b7)
oundation/ANetworkSession.cpp
aa606b14bcf0adfc7650f61a2b8068e931586edf 12-Aug-2015 Vishwath Mohan <vishwath@google.com> Fix benign unsigned integer overflows

Bug: 23110888
Change-Id: I1894a61e94a274795cab7fb23a81f3a611717c1d
(cherry picked from 25f191c5cb2ec532e534be646c32806f9f85e196)
ttplive/PlaylistFetcher.cpp
622ff28c492bacd7dcd2caa52386be8d7ce5276c 12-Aug-2015 Chad Brubaker <cbrubaker@google.com> Fix benign unsigned integer overflow

Bug:23110888
Change-Id: Ibd6f1c7a9204cf584536c1ee63f6a8e5c6e4aa59
(cherry picked from commit 69c1e038717d3462ea5991425ba009f0aed148d2)
ataURISource.cpp
MXCodec.cpp
5915ce01d5aeaa78ca07d2b443366788d284e448 31-Jul-2015 Chad Brubaker <cbrubaker@google.com> Fix benign unsigned integer overflows in loop conditions

This is causing an abort when running with unsigned integer overflow
detection, change the code to no longer do i-- when i = 0.

Change-Id: I0ab786cabb3a3d37fa24a3b8da0c35dd475ca273
(cerry picked from commit b92add32c22656dedfb82d26ccc168c43c92b8eb)
Codec.cpp
mx/OMXNodeInstance.cpp
4e854bf585054e909e1effb9ffcef32a6d001f04 14-Jun-2015 Nick Kralevich <nnk@google.com> don't trigger an integer underflow when decrementing.

When decrementing "i", eventually i will equal zero. When that
happens, i-- underflows. This causes a crash when code which uses
clang's -fsanitize=unsigned-integer-overflow is run.

Avoid trigging an unsigned integer underflow.

Change-Id: I61709cb01f56fdb36d631aa95579e8bd09cafd12
(cherry picked from commit 938e2b34b16c3c1fd29c753eeb53ee95a2b2e2b3)
Codec.cpp
ediaCodecList.cpp
oundation/AHierarchicalStateMachine.cpp
oundation/ALooperRoster.cpp
e6d2838dcb92a3277c59f4a13c4703b98b837bce 21-Aug-2015 Marco Nelissen <marcone@google.com> am ba67d2fe: am 93eb5ecf: Merge "Prevent divide by zero in WAVExtractor"

* commit 'ba67d2fe6fba7da911535b46c7d3b9501e6d1d05':
Prevent divide by zero in WAVExtractor
128aa320242fb4c125c1727f10c60422280f8545 21-Aug-2015 Marco Nelissen <marcone@google.com> am ba67d2fe: am 93eb5ecf: Merge "Prevent divide by zero in WAVExtractor"

* commit 'ba67d2fe6fba7da911535b46c7d3b9501e6d1d05':
Prevent divide by zero in WAVExtractor
93eb5ecfc9a6a8694266ea0e792e3dbe05f86638 21-Aug-2015 Marco Nelissen <marcone@google.com> Merge "Prevent divide by zero in WAVExtractor"
53766eb16e1e98bd101a7f8942fc16270febc0c6 13-Aug-2015 Harish Mahendrakar <harish.mahendrakar@ittiam.com> SoftMPEG2Dec: Added support for deinterlacer

Change-Id: I16eadda6f26e73ed89c878d52c38bb43d84bfe40
odecs/mpeg2dec/SoftMPEG2.cpp
6d5a0de5177bccc17d0eb1b69a8ed88d620884a5 21-Aug-2015 Robert Shih <robertshih@google.com> am 46eee08a: am c9a3ea62: am b70b09c9: Merge "OMXCodec: fix potential OOB read in parseHEVCCodecSpecificData"

* commit '46eee08ad8469174e8572853c70db23802863726':
OMXCodec: fix potential OOB read in parseHEVCCodecSpecificData
46eee08ad8469174e8572853c70db23802863726 21-Aug-2015 Robert Shih <robertshih@google.com> am c9a3ea62: am b70b09c9: Merge "OMXCodec: fix potential OOB read in parseHEVCCodecSpecificData"

* commit 'c9a3ea628f3507ff8dba4321d067a19f30c66250':
OMXCodec: fix potential OOB read in parseHEVCCodecSpecificData
71dc45649b49c76def40024186a6850a8f459cad 21-Aug-2015 Robert Shih <robertshih@google.com> am c9a3ea62: am b70b09c9: Merge "OMXCodec: fix potential OOB read in parseHEVCCodecSpecificData"

* commit 'c9a3ea628f3507ff8dba4321d067a19f30c66250':
OMXCodec: fix potential OOB read in parseHEVCCodecSpecificData
b70b09c9f96e78a45332c93a0eadd99cf6fe9645 21-Aug-2015 Robert Shih <robertshih@google.com> Merge "OMXCodec: fix potential OOB read in parseHEVCCodecSpecificData"
88cac38ee21b96ac041b9b349a733a5b441b6b1c 21-Aug-2015 Marco Nelissen <marcone@google.com> am 5aaecd4c: resolved conflicts for merge of 69a4f949 to mnc-dr-dev-plus-aosp

* commit '5aaecd4cf7b9b96a13f61416f10b3022a30274ce':
SoftAVCDec: Reduced memory requirements
5aaecd4cf7b9b96a13f61416f10b3022a30274ce 21-Aug-2015 Marco Nelissen <marcone@google.com> resolved conflicts for merge of 69a4f949 to mnc-dr-dev-plus-aosp

Change-Id: I8b8c17f74a3de3d9f8a9696c0895e62019f831a7
de29bee23b2de8347f24287f4b04be89a7f55dab 21-Aug-2015 Marco Nelissen <marcone@google.com> resolved conflicts for merge of 69a4f949 to mnc-dev-plus-aosp

Change-Id: I7eada1ff8c56c06d9de16009136b35115bc4a43a
20989efec1eaceb439cfdc98c0709114f84c9117 21-Aug-2015 Marco Nelissen <marcone@google.com> Merge "SoftAVCDec: Reduced memory requirements"
6514ad8f7b8158dfed570a17dac6a7173833e52d 21-Aug-2015 Robert Shih <robertshih@google.com> OMXCodec: fix potential OOB read in parseHEVCCodecSpecificData

Bug: 23279597
Change-Id: Ibaa3d52e586e65230ec6df3680d9456ce873390c
MXCodec.cpp
d918122453fb71379774668b7fe1101f6525d432 20-Aug-2015 Abhishek Arya <aarya@google.com> am 8c55f6e1: am 4a5a99d9: am fb5c8f44: am 99187615: am d3b6f9c1: am c5b9a48f: am a27fe8d7: am 2fd79fa3: am cb2acbfe: am 635d38a8: Merge "Check RTSP payload length" into klp-dev

* commit '8c55f6e19d02c5959f78c46bd19297d1ab0cd5be':
Check RTSP payload length
e73b32e6af3ab57956f5a247313ca8778ea94570 20-Aug-2015 Wei Jia <wjia@google.com> am e8e71d5f: am 8a5b2b2b: am ddb63b46: am f8f0e0b7: am 562be234: am f076fabf: am 0af43510: am 2562495d: am a590baca: Merge commit \'6ae815e0\' into HEAD

* commit 'e8e71d5f079503bd40f4b920b3b45b3853560f40':
libstagefright: fix overflow in MPEG4Source::parseSampleAuxiliaryInformationOffsets.
8c55f6e19d02c5959f78c46bd19297d1ab0cd5be 20-Aug-2015 Abhishek Arya <aarya@google.com> am 4a5a99d9: am fb5c8f44: am 99187615: am d3b6f9c1: am c5b9a48f: am a27fe8d7: am 2fd79fa3: am cb2acbfe: am 635d38a8: Merge "Check RTSP payload length" into klp-dev

* commit '4a5a99d91e7d071823bb9c97c80bee602d74f808':
Check RTSP payload length
e8e71d5f079503bd40f4b920b3b45b3853560f40 20-Aug-2015 Wei Jia <wjia@google.com> am 8a5b2b2b: am ddb63b46: am f8f0e0b7: am 562be234: am f076fabf: am 0af43510: am 2562495d: am a590baca: Merge commit \'6ae815e0\' into HEAD

* commit '8a5b2b2b8b29f194fb45c5a96f824222ea7575e7':
libstagefright: fix overflow in MPEG4Source::parseSampleAuxiliaryInformationOffsets.
4a5a99d91e7d071823bb9c97c80bee602d74f808 20-Aug-2015 Abhishek Arya <aarya@google.com> am fb5c8f44: am 99187615: am d3b6f9c1: am c5b9a48f: am a27fe8d7: am 2fd79fa3: am cb2acbfe: am 635d38a8: Merge "Check RTSP payload length" into klp-dev

* commit 'fb5c8f444cedd9be166e68631cb876f2b3e6f257':
Check RTSP payload length
8a5b2b2b8b29f194fb45c5a96f824222ea7575e7 20-Aug-2015 Wei Jia <wjia@google.com> am ddb63b46: am f8f0e0b7: am 562be234: am f076fabf: am 0af43510: am 2562495d: am a590baca: Merge commit \'6ae815e0\' into HEAD

* commit 'ddb63b46279a1bb3698cebb6c744013fc3bb17e2':
libstagefright: fix overflow in MPEG4Source::parseSampleAuxiliaryInformationOffsets.
3504b95775d0e4c1d56b8079a54a06a6882de9a6 20-Aug-2015 Abhishek Arya <aarya@google.com> am fb5c8f44: am 99187615: am d3b6f9c1: am c5b9a48f: am a27fe8d7: am 2fd79fa3: am cb2acbfe: am 635d38a8: Merge "Check RTSP payload length" into klp-dev

* commit 'fb5c8f444cedd9be166e68631cb876f2b3e6f257':
Check RTSP payload length
c5fe92c9e37c5bf3d7d3adaf6e855d71c5eae6c2 20-Aug-2015 Wei Jia <wjia@google.com> am ddb63b46: am f8f0e0b7: am 562be234: am f076fabf: am 0af43510: am 2562495d: am a590baca: Merge commit \'6ae815e0\' into HEAD

* commit 'ddb63b46279a1bb3698cebb6c744013fc3bb17e2':
libstagefright: fix overflow in MPEG4Source::parseSampleAuxiliaryInformationOffsets.
fb5c8f444cedd9be166e68631cb876f2b3e6f257 20-Aug-2015 Abhishek Arya <aarya@google.com> am 99187615: am d3b6f9c1: am c5b9a48f: am a27fe8d7: am 2fd79fa3: am cb2acbfe: am 635d38a8: Merge "Check RTSP payload length" into klp-dev

* commit '99187615b2cb42e39842083c2998a97e8277a5d5':
Check RTSP payload length
ddb63b46279a1bb3698cebb6c744013fc3bb17e2 20-Aug-2015 Wei Jia <wjia@google.com> am f8f0e0b7: am 562be234: am f076fabf: am 0af43510: am 2562495d: am a590baca: Merge commit \'6ae815e0\' into HEAD

* commit 'f8f0e0b756b0f96eccc94af89a0087c146232b26':
libstagefright: fix overflow in MPEG4Source::parseSampleAuxiliaryInformationOffsets.
49cfd20030d335356e350f6417c690af7f175ea7 20-Aug-2015 Nick Kralevich <nnk@google.com> am 35fbcdd6: am 3d97de8c: am b8a84e59: am ef87594b: Merge "libstagefright: Fix crash in convertMetaDataToMessage" into lmp-dev

* commit '35fbcdd63b3961e98797a738c138698a8bcf4258':
libstagefright: Fix crash in convertMetaDataToMessage
99187615b2cb42e39842083c2998a97e8277a5d5 20-Aug-2015 Abhishek Arya <aarya@google.com> am d3b6f9c1: am c5b9a48f: am a27fe8d7: am 2fd79fa3: am cb2acbfe: am 635d38a8: Merge "Check RTSP payload length" into klp-dev

* commit 'd3b6f9c17ed10df01d682b0fac6b13fca396e5fb':
Check RTSP payload length
b49b1af06952c310dd715234e30e646db3d525b0 20-Aug-2015 Marco Nelissen <marcone@google.com> am f526f687: am a07ad890: am 776bfd80: am 8a55bcb6: resolved conflicts for merge of ced2dd3c to lmp-dev

* commit 'f526f687a686201cae03dfa6d59917b91294e913':
Sanity check padding/delay values for gapless playback
f8f0e0b756b0f96eccc94af89a0087c146232b26 20-Aug-2015 Wei Jia <wjia@google.com> am 562be234: am f076fabf: am 0af43510: am 2562495d: am a590baca: Merge commit \'6ae815e0\' into HEAD

* commit '562be234743f7d82f8ee45cf0258e9db8239a817':
libstagefright: fix overflow in MPEG4Source::parseSampleAuxiliaryInformationOffsets.
7c6a8141b4ceac5d343ab14cc025411c845a83d2 20-Aug-2015 Wei Jia <wjia@google.com> am e4bcb3f8: am 238a487a: am e3cb2507: am 4b995f73: Merge "libstagefright: fix handling of mSampleTimeEntries and mNumSampleSizes in SampleTable." into lmp-dev

* commit 'e4bcb3f8d444a11afad90b22fbde051c81c295c8':
libstagefright: fix handling of mSampleTimeEntries and mNumSampleSizes in SampleTable.
34272233640d38d904f2b75cc1a914012b424c71 20-Aug-2015 Wei Jia <wjia@google.com> am 3dcb448f: am 4bb01def: am 84a4221e: am a9b3cd3c: am 5221133b: am b2ae4351: libstagefright: fix overflow in pvdec_api.cpp.

* commit '3dcb448f52cf05e7e0434c28bade68e898707053':
libstagefright: fix overflow in pvdec_api.cpp.
eb10ccbc9dcab8ec3ee22a1c2b2db4a673c6fdc2 20-Aug-2015 Marco Nelissen <marcone@google.com> resolved conflicts for merge of 8a064aa8 to klp-modular-dev

Change-Id: If031955c9edca657401831fbfa5a128f0b4c6d86
3d97de8c77b214d865a52fb1a36541d6359b2872 20-Aug-2015 Nick Kralevich <nnk@google.com> am b8a84e59: am ef87594b: Merge "libstagefright: Fix crash in convertMetaDataToMessage" into lmp-dev

* commit 'b8a84e59ed3724a2e220dbda49dc5478334e9bad':
libstagefright: Fix crash in convertMetaDataToMessage
18b7186ce7bc2df1f4f33b57fc323bf68feb2852 20-Aug-2015 Robert Shih <robertshih@google.com> WAVExtractor: fix always-false mNumChannels range check

Bug: 23314110
Change-Id: Ic641dd15e942fdd7268f057f9643dce21a81ae3b
AVExtractor.cpp
ef87594bd821520cdc46e30036c16ee2eb5becb3 20-Aug-2015 Nick Kralevich <nnk@google.com> Merge "libstagefright: Fix crash in convertMetaDataToMessage" into lmp-dev
c5b9a48f7a54bfb8d2f5000dabfeeed5da9d54f4 20-Aug-2015 Abhishek Arya <aarya@google.com> am a27fe8d7: am 2fd79fa3: am cb2acbfe: am 635d38a8: Merge "Check RTSP payload length" into klp-dev

* commit 'a27fe8d7cc1413041e38f8c74f1f6510bdc44627':
Check RTSP payload length
8a064aa83ad590b61ddd84e678c59f0d1f68106c 20-Aug-2015 Marco Nelissen <marcone@google.com> Merge "Fail more gracefully on allocation failure" into klp-dev
a07ad8901acd0b4c1eeab5e0c44b56b692662a92 20-Aug-2015 Marco Nelissen <marcone@google.com> am 776bfd80: am 8a55bcb6: resolved conflicts for merge of ced2dd3c to lmp-dev

* commit '776bfd806a1619ac0944d4ea36330c4cde4d665d':
Sanity check padding/delay values for gapless playback
2fd79fa39a0ec347a80ceb5b056ed5053002f59e 20-Aug-2015 Abhishek Arya <aarya@google.com> am cb2acbfe: am 635d38a8: Merge "Check RTSP payload length" into klp-dev

* commit 'cb2acbfed69d18aa4693c03d8a77cd45daf8af8d':
Check RTSP payload length
e52267adab4c89169aafd10a0fa2656ccb02c039 15-Aug-2015 Joshua J. Drake <android-open-source@qoop.org> Prevent divide by zero in WAVExtractor

In the case that mNumChannels, bytesPerSample, or mSampleRate are
zero, a divide by zero occurs. None of these parameters of a WAV
file should ever be zero. Check that they aren't and return an error
otherwise.

Bug: 23285883

Change-Id: Id67b8620944405ca59572221f6f1c2b19c363e69
AVExtractor.cpp
8a55bcb640c8842348eb41495fdb8fe82cb0465d 20-Aug-2015 Marco Nelissen <marcone@google.com> resolved conflicts for merge of ced2dd3c to lmp-dev

Change-Id: I5dbb4f7d6c38c75a54c59d5e59305657bc50ab10
f076fabff7a518ed5668a9a1be03dd729b8cbfb6 20-Aug-2015 Wei Jia <wjia@google.com> am 0af43510: am 2562495d: am a590baca: Merge commit \'6ae815e0\' into HEAD

* commit '0af43510cc45373614cdfce7d014283100e96cb9':
libstagefright: fix overflow in MPEG4Source::parseSampleAuxiliaryInformationOffsets.
d7c205fe1f7cda2cdcb3062b548c0777402bab38 20-Aug-2015 Wei Jia <wjia@google.com> am 522019f1: Merge "libstagefright: fix handling of mSampleTimeEntries and mNumSampleSizes in SampleTable." into klp-dev

* commit '522019f15b3c191b73d1a0ddb56aeb3dd6b7ce31':
libstagefright: fix handling of mSampleTimeEntries and mNumSampleSizes in SampleTable.
cb2acbfed69d18aa4693c03d8a77cd45daf8af8d 20-Aug-2015 Abhishek Arya <aarya@google.com> am 635d38a8: Merge "Check RTSP payload length" into klp-dev

* commit '635d38a84414e26aaf6c4b5df7859fde196adeaf':
Check RTSP payload length
ced2dd3ccf8920621b931bb4b5d9df9a9a23449a 20-Aug-2015 Abhishek Arya <aarya@google.com> am 2c880dde: Merge "Sanity check padding/delay values for gapless playback" into klp-dev

* commit '2c880dde90e4303f9201f46124ee879325c57ba0':
Sanity check padding/delay values for gapless playback
2562495de9338e14ca3a3ef74ce07a7b310cd1fb 20-Aug-2015 Wei Jia <wjia@google.com> am a590baca: Merge commit \'6ae815e0\' into HEAD

* commit 'a590baca031199327f6382347625dd232de2c95c':
libstagefright: fix overflow in MPEG4Source::parseSampleAuxiliaryInformationOffsets.
a590baca031199327f6382347625dd232de2c95c 20-Aug-2015 Wei Jia <wjia@google.com> Merge commit '6ae815e0' into HEAD

libstagefright: fix overflow in MPEG4Source::parseSampleAuxiliaryInformationOffsets.

Bug: 23270724
(cherry picked from commit c51ab7dd82bf4e24666fc72a55e03e2f530204d5)

Change-Id: I44c642548ee6ba3745fb1f46d8645bece231035a
238a487a0cf0fde606a27ea1f00bad5d92589161 20-Aug-2015 Wei Jia <wjia@google.com> am e3cb2507: am 4b995f73: Merge "libstagefright: fix handling of mSampleTimeEntries and mNumSampleSizes in SampleTable." into lmp-dev

* commit 'e3cb25078b814b40f8e1506514bd17066935a51f':
libstagefright: fix handling of mSampleTimeEntries and mNumSampleSizes in SampleTable.
522019f15b3c191b73d1a0ddb56aeb3dd6b7ce31 20-Aug-2015 Wei Jia <wjia@google.com> Merge "libstagefright: fix handling of mSampleTimeEntries and mNumSampleSizes in SampleTable." into klp-dev
4b995f73b581ce0705b537317f32ad76bddb55fa 20-Aug-2015 Wei Jia <wjia@google.com> Merge "libstagefright: fix handling of mSampleTimeEntries and mNumSampleSizes in SampleTable." into lmp-dev
4bb01def2c34e8b92a6640190b42f8555e989d60 20-Aug-2015 Wei Jia <wjia@google.com> am 84a4221e: am a9b3cd3c: am 5221133b: am b2ae4351: libstagefright: fix overflow in pvdec_api.cpp.

* commit '84a4221e305847fb0c8846122fe8f2bc7c2fda0a':
libstagefright: fix overflow in pvdec_api.cpp.
a9b3cd3c101b68522a3d8492cb3a19d8b5409329 20-Aug-2015 Wei Jia <wjia@google.com> am 5221133b: am b2ae4351: libstagefright: fix overflow in pvdec_api.cpp.

* commit '5221133bfa1585b4488b01cad165627b1cd17077':
libstagefright: fix overflow in pvdec_api.cpp.
635d38a84414e26aaf6c4b5df7859fde196adeaf 20-Aug-2015 Abhishek Arya <aarya@google.com> Merge "Check RTSP payload length" into klp-dev
3fe79a26bb59593be9e3f7dfc5d704866fa95577 20-Aug-2015 Wei Jia <wjia@google.com> am c559b461: am de6b1a52: am 3ec4f550: Merge "libstagefright: fix overflow in pvdec_api.cpp." into mnc-dev

* commit 'c559b461f48ffe35a8865bbcc90724549d3c1332':
libstagefright: fix overflow in pvdec_api.cpp.
2c880dde90e4303f9201f46124ee879325c57ba0 20-Aug-2015 Abhishek Arya <aarya@google.com> Merge "Sanity check padding/delay values for gapless playback" into klp-dev
5221133bfa1585b4488b01cad165627b1cd17077 20-Aug-2015 Wei Jia <wjia@google.com> am b2ae4351: libstagefright: fix overflow in pvdec_api.cpp.

* commit 'b2ae4351539de9aa4667fcb3e02ba40d9c6bd094':
libstagefright: fix overflow in pvdec_api.cpp.
c559b461f48ffe35a8865bbcc90724549d3c1332 20-Aug-2015 Wei Jia <wjia@google.com> am de6b1a52: am 3ec4f550: Merge "libstagefright: fix overflow in pvdec_api.cpp." into mnc-dev

* commit 'de6b1a52889223a25e48b5119fd191d0ed58ecdc':
libstagefright: fix overflow in pvdec_api.cpp.
6ae815e04f618207da9ce52e3c828492c33a7107 20-Aug-2015 Wei Jia <wjia@google.com> Merge "libstagefright: fix overflow in MPEG4Source::parseSampleAuxiliaryInformationOffsets." into klp-dev
937c6bedd4b6e5c6cb29a238eb459047dedd3486 18-Aug-2015 Wei Jia <wjia@google.com> libstagefright: fix overflow in MPEG4Source::parseSampleAuxiliaryInformationOffsets.

Bug: 23270724
Change-Id: Id7ba55c7bf6860fbfc892bbb6378aac644c82da4
(cherry picked from commit c51ab7dd82bf4e24666fc72a55e03e2f530204d5)
PEG4Extractor.cpp
89ca07cd5ee98151657a516561df21062c28c594 20-Aug-2015 Abhishek Arya <aarya@google.com> am 9c8f6704: am 00a5d79d: am 1bbf2488: Merge "libstagefright: fix overflow in MPEG4Source::parseSampleAuxiliaryInformationOffsets." into mnc-dev

* commit '9c8f67042455588f7b8ffca4ef4318663ee1636e':
libstagefright: fix overflow in MPEG4Source::parseSampleAuxiliaryInformationOffsets.
a48f431f7dd172e6cb5b6a8426098a5b1c485b4e 20-Aug-2015 Wei Jia <wjia@google.com> am 3ec4f550: Merge "libstagefright: fix overflow in pvdec_api.cpp." into mnc-dev

* commit '3ec4f55039b29c132b4ed3a86048e278fe95248b':
libstagefright: fix overflow in pvdec_api.cpp.
de6b1a52889223a25e48b5119fd191d0ed58ecdc 20-Aug-2015 Wei Jia <wjia@google.com> am 3ec4f550: Merge "libstagefright: fix overflow in pvdec_api.cpp." into mnc-dev

* commit '3ec4f55039b29c132b4ed3a86048e278fe95248b':
libstagefright: fix overflow in pvdec_api.cpp.
9c8f67042455588f7b8ffca4ef4318663ee1636e 20-Aug-2015 Abhishek Arya <aarya@google.com> am 00a5d79d: am 1bbf2488: Merge "libstagefright: fix overflow in MPEG4Source::parseSampleAuxiliaryInformationOffsets." into mnc-dev

* commit '00a5d79d271c4388815c6c854dfb082eaf4afcb7':
libstagefright: fix overflow in MPEG4Source::parseSampleAuxiliaryInformationOffsets.
0eaf820756bf584284f246b6ba79968efbd08faf 20-Aug-2015 Wei Jia <wjia@google.com> libstagefright: fix overflow in FileSource::readAt.

Bug: 23275093
Change-Id: I1826ff101a9a3da9f50cf4feaae8b5a0a29f98c2
ileSource.cpp
b2ae4351539de9aa4667fcb3e02ba40d9c6bd094 20-Aug-2015 Wei Jia <wjia@google.com> libstagefright: fix overflow in pvdec_api.cpp.

Bug: 20674086
Change-Id: Ie2c711865c3b92f3fa2f3c7a436fa0e3687eb8b3
(cherry picked from commit d7bb1cd786e5ea4ac61119cc1a08082474f7787b)
odecs/m4v_h263/dec/src/pvdec_api.cpp
3ec4f55039b29c132b4ed3a86048e278fe95248b 20-Aug-2015 Wei Jia <wjia@google.com> Merge "libstagefright: fix overflow in pvdec_api.cpp." into mnc-dev
cfc3246a71e5b813e350f57a63c65f09fbd2658c 20-Aug-2015 Abhishek Arya <aarya@google.com> am 1bbf2488: Merge "libstagefright: fix overflow in MPEG4Source::parseSampleAuxiliaryInformationOffsets." into mnc-dev

* commit '1bbf2488ba4d9b5230f0274308bdd5bffb2ffeb3':
libstagefright: fix overflow in MPEG4Source::parseSampleAuxiliaryInformationOffsets.
00a5d79d271c4388815c6c854dfb082eaf4afcb7 20-Aug-2015 Abhishek Arya <aarya@google.com> am 1bbf2488: Merge "libstagefright: fix overflow in MPEG4Source::parseSampleAuxiliaryInformationOffsets." into mnc-dev

* commit '1bbf2488ba4d9b5230f0274308bdd5bffb2ffeb3':
libstagefright: fix overflow in MPEG4Source::parseSampleAuxiliaryInformationOffsets.
1bbf2488ba4d9b5230f0274308bdd5bffb2ffeb3 20-Aug-2015 Abhishek Arya <aarya@google.com> Merge "libstagefright: fix overflow in MPEG4Source::parseSampleAuxiliaryInformationOffsets." into mnc-dev
ef1ad99e337e7b61c3c2b39ad08eae46343f11e9 20-Aug-2015 Abhishek Arya <aarya@google.com> am 76e7a593: am 2b3bae61: am 3c376c6f: am 3e15e6d7: am 6e2dd587: am 8b0660e0: am 3c803e7f: am 6afd8574: am 073a656d: am deba0610: Merge "Revert "Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4"" into klp-dev

* commit '76e7a593d2a9451cac0652533f28ebc62be157ec':
Revert "Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4"
0f2674adb4c320b826e5048e40e86a8a41be01d8 20-Aug-2015 Abhishek Arya <aarya@google.com> am faf6d63c: am c538a531: am 647adb51: am 39f23993: am 06a1b202: am 5d629bf2: am 93bc6176: am 01841c73: am af46239a: am 9abb7401: Fix compile failure after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4

* commit 'faf6d63c778b5390b0432aab25eac419e022eac1':
Fix compile failure after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4
f6f8af6cd8060f35eda840ba8dbaa7be15fd2181 20-Aug-2015 Abhishek Arya <aarya@google.com> am 3391200b: am ae991514: am 81d1f324: am 123c013b: am 7bc20ac5: am cc3411e3: am 0bf31aeb: am 9359e822: am 8a34499a: am c23e3dd8: Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4

* commit '3391200ba36f04a6307246016f8f7fe84f868c82':
Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4
b331898e0d8472d9712d81c746af43a8bf4e5636 20-Aug-2015 Wei Jia <wjia@google.com> am c5f03bc8: am 4c836c6f: am bc76a890: am 4ac61017: am 051b8572: am 91860b89: SoftAVCEncoder: fix auto merge error, member names have changed.

* commit 'c5f03bc8c29978b2025d95e5f741952044952942':
SoftAVCEncoder: fix auto merge error, member names have changed.
90695badc0f848aae7727f45a8bfebc6ddb6d1be 20-Aug-2015 Wei Jia <wjia@google.com> am 48de3288: am 53e8e726: am bfadc03a: am 5bb0a2cf: am e264b770: am d9d6c465: am 5d1e62e2: am 9cebcc5f: Merge "SoftAVCEncoder: fix mismatched type for comparison." into lmp-dev

* commit '48de32881fb2f1b758fd9e91d465aa9cbdcf9536':
SoftAVCEncoder: fix mismatched type for comparison.
979e5838db0efb2e1159f85e183731d998c17e02 20-Aug-2015 Wei Jia <wjia@google.com> am 1d450520: am 1abcf556: am ad1ce71a: am 96a09849: am 50b600d6: am ab33de61: am 78df80c2: am 65842db0: Merge commit \'b46eb8d9\' into HEAD

* commit '1d450520682d6f430e44929567c25cefe10b9251':
SoftAVCEnc: check requested memory size before allocation.
e8314e1e558a72d0dbc0ffabd4f01b9a3051b476 20-Aug-2015 Neel Mehta <nmehta@google.com> am ed0c67a8: am a4ebdaad: am 0cc0d158: am 06682f94: am 48bdf782: am 00887af1: am e9a8362e: am a2a68264: am c37f7f6f: Fix for memory corruption in ID3::removeUnsynchronizationV2_4(). Bug: 23227354

* commit 'ed0c67a8d0e501bd02c8eb811dfcb215a8c47ada':
Fix for memory corruption in ID3::removeUnsynchronizationV2_4(). Bug: 23227354
76e7a593d2a9451cac0652533f28ebc62be157ec 20-Aug-2015 Abhishek Arya <aarya@google.com> am 2b3bae61: am 3c376c6f: am 3e15e6d7: am 6e2dd587: am 8b0660e0: am 3c803e7f: am 6afd8574: am 073a656d: am deba0610: Merge "Revert "Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4"" into klp-dev

* commit '2b3bae61e4b9b360512ab649b25043ee8e990bcc':
Revert "Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4"
faf6d63c778b5390b0432aab25eac419e022eac1 20-Aug-2015 Abhishek Arya <aarya@google.com> am c538a531: am 647adb51: am 39f23993: am 06a1b202: am 5d629bf2: am 93bc6176: am 01841c73: am af46239a: am 9abb7401: Fix compile failure after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4

* commit 'c538a53127f69f45141664013bbe0bda6d259e3a':
Fix compile failure after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4
3391200ba36f04a6307246016f8f7fe84f868c82 20-Aug-2015 Abhishek Arya <aarya@google.com> am ae991514: am 81d1f324: am 123c013b: am 7bc20ac5: am cc3411e3: am 0bf31aeb: am 9359e822: am 8a34499a: am c23e3dd8: Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4

* commit 'ae991514cf422f5cfb27b280557b07fb7de7d821':
Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4
c5f03bc8c29978b2025d95e5f741952044952942 20-Aug-2015 Wei Jia <wjia@google.com> am 4c836c6f: am bc76a890: am 4ac61017: am 051b8572: am 91860b89: SoftAVCEncoder: fix auto merge error, member names have changed.

* commit '4c836c6f94283cdccf3b630fbd81e8fc9de0b2b7':
SoftAVCEncoder: fix auto merge error, member names have changed.
48de32881fb2f1b758fd9e91d465aa9cbdcf9536 20-Aug-2015 Wei Jia <wjia@google.com> am 53e8e726: am bfadc03a: am 5bb0a2cf: am e264b770: am d9d6c465: am 5d1e62e2: am 9cebcc5f: Merge "SoftAVCEncoder: fix mismatched type for comparison." into lmp-dev

* commit '53e8e7266a47ddcb0e0c63fa352a7e157144ec67':
SoftAVCEncoder: fix mismatched type for comparison.
1d450520682d6f430e44929567c25cefe10b9251 20-Aug-2015 Wei Jia <wjia@google.com> am 1abcf556: am ad1ce71a: am 96a09849: am 50b600d6: am ab33de61: am 78df80c2: am 65842db0: Merge commit \'b46eb8d9\' into HEAD

* commit '1abcf5564574873b6eb0ef2970427b9c4ddf9505':
SoftAVCEnc: check requested memory size before allocation.
8b15052c8e32a7783be8f263bbacdc2f9c6967e8 20-Aug-2015 Neel Mehta <nmehta@google.com> am a4ebdaad: am 0cc0d158: am 06682f94: am 48bdf782: am 00887af1: am e9a8362e: am a2a68264: am c37f7f6f: Fix for memory corruption in ID3::removeUnsynchronizationV2_4(). Bug: 23227354

* commit 'a4ebdaadd831b457b57ee4402bb5014fae04abe2':
Fix for memory corruption in ID3::removeUnsynchronizationV2_4(). Bug: 23227354
7e767298ef350534cdce83a8c1c647cd02636248 20-Aug-2015 Abhishek Arya <aarya@google.com> am 3c376c6f: am 3e15e6d7: am 6e2dd587: am 8b0660e0: am 3c803e7f: am 6afd8574: am 073a656d: am deba0610: Merge "Revert "Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4"" into klp-dev

* commit '3c376c6fac2497640e68c75fd4a0e1fa0d79c3b0':
Revert "Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4"
9dffcd286b920105538726b18ea05e840ba99f64 20-Aug-2015 Abhishek Arya <aarya@google.com> am 647adb51: am 39f23993: am 06a1b202: am 5d629bf2: am 93bc6176: am 01841c73: am af46239a: am 9abb7401: Fix compile failure after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4

* commit '647adb5154454912e33d8fdaab70ea7fedb280b4':
Fix compile failure after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4
f4332740f3842a9c8a28c3ca7cac8e92b62b8dd0 20-Aug-2015 Abhishek Arya <aarya@google.com> am 81d1f324: am 123c013b: am 7bc20ac5: am cc3411e3: am 0bf31aeb: am 9359e822: am 8a34499a: am c23e3dd8: Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4

* commit '81d1f32429559cf8039bc2d2e746b0e4c63fa8fd':
Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4
22f74ac175f998ec0df5967b9c95ec9257caa72a 20-Aug-2015 Wei Jia <wjia@google.com> am bc76a890: am 4ac61017: am 051b8572: am 91860b89: SoftAVCEncoder: fix auto merge error, member names have changed.

* commit 'bc76a8902d39a057b02b180e8f18520d8e9f701b':
SoftAVCEncoder: fix auto merge error, member names have changed.
b7b1a854b4db14d418ba6996eb0a50e4ce6521ec 20-Aug-2015 Wei Jia <wjia@google.com> am bfadc03a: am 5bb0a2cf: am e264b770: am d9d6c465: am 5d1e62e2: am 9cebcc5f: Merge "SoftAVCEncoder: fix mismatched type for comparison." into lmp-dev

* commit 'bfadc03a90ffa00a7296a2a9cda88a5a29d96d31':
SoftAVCEncoder: fix mismatched type for comparison.
dc664276f12cf66076775f5d222ec93ac5efb8fc 20-Aug-2015 Wei Jia <wjia@google.com> am ad1ce71a: am 96a09849: am 50b600d6: am ab33de61: am 78df80c2: am 65842db0: Merge commit \'b46eb8d9\' into HEAD

* commit 'ad1ce71a4372cf26877c33967a09bb16147cbf6b':
SoftAVCEnc: check requested memory size before allocation.
ed0c67a8d0e501bd02c8eb811dfcb215a8c47ada 20-Aug-2015 Neel Mehta <nmehta@google.com> am a4ebdaad: am 0cc0d158: am 06682f94: am 48bdf782: am 00887af1: am e9a8362e: am a2a68264: am c37f7f6f: Fix for memory corruption in ID3::removeUnsynchronizationV2_4(). Bug: 23227354

* commit 'a4ebdaadd831b457b57ee4402bb5014fae04abe2':
Fix for memory corruption in ID3::removeUnsynchronizationV2_4(). Bug: 23227354
2b3bae61e4b9b360512ab649b25043ee8e990bcc 20-Aug-2015 Abhishek Arya <aarya@google.com> am 3c376c6f: am 3e15e6d7: am 6e2dd587: am 8b0660e0: am 3c803e7f: am 6afd8574: am 073a656d: am deba0610: Merge "Revert "Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4"" into klp-dev

* commit '3c376c6fac2497640e68c75fd4a0e1fa0d79c3b0':
Revert "Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4"
c538a53127f69f45141664013bbe0bda6d259e3a 20-Aug-2015 Abhishek Arya <aarya@google.com> am 647adb51: am 39f23993: am 06a1b202: am 5d629bf2: am 93bc6176: am 01841c73: am af46239a: am 9abb7401: Fix compile failure after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4

* commit '647adb5154454912e33d8fdaab70ea7fedb280b4':
Fix compile failure after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4
ae991514cf422f5cfb27b280557b07fb7de7d821 20-Aug-2015 Abhishek Arya <aarya@google.com> am 81d1f324: am 123c013b: am 7bc20ac5: am cc3411e3: am 0bf31aeb: am 9359e822: am 8a34499a: am c23e3dd8: Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4

* commit '81d1f32429559cf8039bc2d2e746b0e4c63fa8fd':
Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4
4c836c6f94283cdccf3b630fbd81e8fc9de0b2b7 20-Aug-2015 Wei Jia <wjia@google.com> am bc76a890: am 4ac61017: am 051b8572: am 91860b89: SoftAVCEncoder: fix auto merge error, member names have changed.

* commit 'bc76a8902d39a057b02b180e8f18520d8e9f701b':
SoftAVCEncoder: fix auto merge error, member names have changed.
53e8e7266a47ddcb0e0c63fa352a7e157144ec67 20-Aug-2015 Wei Jia <wjia@google.com> am bfadc03a: am 5bb0a2cf: am e264b770: am d9d6c465: am 5d1e62e2: am 9cebcc5f: Merge "SoftAVCEncoder: fix mismatched type for comparison." into lmp-dev

* commit 'bfadc03a90ffa00a7296a2a9cda88a5a29d96d31':
SoftAVCEncoder: fix mismatched type for comparison.
1abcf5564574873b6eb0ef2970427b9c4ddf9505 20-Aug-2015 Wei Jia <wjia@google.com> am ad1ce71a: am 96a09849: am 50b600d6: am ab33de61: am 78df80c2: am 65842db0: Merge commit \'b46eb8d9\' into HEAD

* commit 'ad1ce71a4372cf26877c33967a09bb16147cbf6b':
SoftAVCEnc: check requested memory size before allocation.
a4ebdaadd831b457b57ee4402bb5014fae04abe2 20-Aug-2015 Neel Mehta <nmehta@google.com> am 0cc0d158: am 06682f94: am 48bdf782: am 00887af1: am e9a8362e: am a2a68264: am c37f7f6f: Fix for memory corruption in ID3::removeUnsynchronizationV2_4(). Bug: 23227354

* commit '0cc0d158694b20f210ba4ad41fe4adc5bda57402':
Fix for memory corruption in ID3::removeUnsynchronizationV2_4(). Bug: 23227354
3c376c6fac2497640e68c75fd4a0e1fa0d79c3b0 20-Aug-2015 Abhishek Arya <aarya@google.com> am 3e15e6d7: am 6e2dd587: am 8b0660e0: am 3c803e7f: am 6afd8574: am 073a656d: am deba0610: Merge "Revert "Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4"" into klp-dev

* commit '3e15e6d738d02efb4108251cdc75240569916b69':
Revert "Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4"
647adb5154454912e33d8fdaab70ea7fedb280b4 20-Aug-2015 Abhishek Arya <aarya@google.com> am 39f23993: am 06a1b202: am 5d629bf2: am 93bc6176: am 01841c73: am af46239a: am 9abb7401: Fix compile failure after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4

* commit '39f239932e94cb47a984ce50393beba5d5a8564a':
Fix compile failure after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4
81d1f32429559cf8039bc2d2e746b0e4c63fa8fd 20-Aug-2015 Abhishek Arya <aarya@google.com> am 123c013b: am 7bc20ac5: am cc3411e3: am 0bf31aeb: am 9359e822: am 8a34499a: am c23e3dd8: Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4

* commit '123c013b14313f7824c0787e3b034af7913f4283':
Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4
bc76a8902d39a057b02b180e8f18520d8e9f701b 20-Aug-2015 Wei Jia <wjia@google.com> am 4ac61017: am 051b8572: am 91860b89: SoftAVCEncoder: fix auto merge error, member names have changed.

* commit '4ac610178525c6c439f595f07da9a5828efe5449':
SoftAVCEncoder: fix auto merge error, member names have changed.
bfadc03a90ffa00a7296a2a9cda88a5a29d96d31 20-Aug-2015 Wei Jia <wjia@google.com> am 5bb0a2cf: am e264b770: am d9d6c465: am 5d1e62e2: am 9cebcc5f: Merge "SoftAVCEncoder: fix mismatched type for comparison." into lmp-dev

* commit '5bb0a2cff01db0731e9d40bf3cd723b76352a16b':
SoftAVCEncoder: fix mismatched type for comparison.
ad1ce71a4372cf26877c33967a09bb16147cbf6b 20-Aug-2015 Wei Jia <wjia@google.com> am 96a09849: am 50b600d6: am ab33de61: am 78df80c2: am 65842db0: Merge commit \'b46eb8d9\' into HEAD

* commit '96a09849ee1729f6aa69da9e60f6b4556c898057':
SoftAVCEnc: check requested memory size before allocation.
d9f0be89f812883128683776498b3387abbf63b5 20-Aug-2015 Chong Zhang <chz@google.com> am d1884052: am bfadec12: am 25c00122: am 4ce86e78: am 5d7a381b: am 877c76ac: Merge "stagefright: check IMemory::pointer() before using the allocation" into klp-dev

* commit 'd188405205be7658c24909b8610bee285bcab6aa':
stagefright: check IMemory::pointer() before using the allocation
c8d5d07804790b250d5adcfb976bd8023b67cd9f 20-Aug-2015 Jon Larimer <jlarimer@google.com> am 9e01d68b: am 64459f96: am 3e9ed500: am 8a1a5d17: am 9707195b: am f97b6bee: Merge "Check integer overflow to prevent memory corruption" into klp-dev

* commit '9e01d68bbfc54893865f8186cff5596ee3427f63':
Check integer overflow to prevent memory corruption
23565920c34c8163520342c4906b52a0e20aeb67 20-Aug-2015 Nick Kralevich <nnk@google.com> am a598bac2: am a3a29952: am 4b153ff9: am 2f3c04a4: resolved conflicts for merge of 6035c811 to lmp-dev

* commit 'a598bac211012fa1b4bd603f47755781ffb2e38c':
MPEG4Source::fragmentedRead: check range before writing into buffers
c5a1824fce1228ed93aef4d3abe34ffeffd9e663 20-Aug-2015 Jon Larimer <jlarimer@google.com> am ccf0e448: am 6f0b1b3e: am 484ebc81: am a1e462e5: am 0afecdeb: am aa1cc741: Merge "Check buffer size before using it" into klp-dev

* commit 'ccf0e44889f1d4cf5707081556a8b7b62707d62d':
Check buffer size before using it
75f6043574256313de760628806df441566fd114 20-Aug-2015 Abhishek Arya <aarya@google.com> am 527ad688: am 8a83ce9c: am 54ea6c02: am 5ff4bb7a: am 8026ad38: am 6efa86be: Merge "Check vector size before accessing" into klp-dev

* commit '527ad688e8d1e89d903351c5fbf39514da52adbe':
Check vector size before accessing
0742dd1d9a6fab54c6f71ea7d44deb24d291adaa 20-Aug-2015 Abhishek Arya <aarya@google.com> am cce066d6: am 3459ea26: am de47cd3c: am 3b77e940: am d146d466: am 6f561b93: Merge "MatroskaExtractor: detect infinite loop when parsing NALs" into klp-dev

* commit 'cce066d61dd80549dd2f087fdb9299106ede59ce':
MatroskaExtractor: detect infinite loop when parsing NALs
0cc0d158694b20f210ba4ad41fe4adc5bda57402 20-Aug-2015 Neel Mehta <nmehta@google.com> am 06682f94: am 48bdf782: am 00887af1: am e9a8362e: am a2a68264: am c37f7f6f: Fix for memory corruption in ID3::removeUnsynchronizationV2_4(). Bug: 23227354

* commit '06682f94d84f97df0d826f9b15d4c2e861ba4045':
Fix for memory corruption in ID3::removeUnsynchronizationV2_4(). Bug: 23227354
3e15e6d738d02efb4108251cdc75240569916b69 20-Aug-2015 Abhishek Arya <aarya@google.com> am 6e2dd587: am 8b0660e0: am 3c803e7f: am 6afd8574: am 073a656d: am deba0610: Merge "Revert "Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4"" into klp-dev

* commit '6e2dd5874a9ee2eccb339187a936ef38dfa8634b':
Revert "Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4"
39f239932e94cb47a984ce50393beba5d5a8564a 20-Aug-2015 Abhishek Arya <aarya@google.com> am 06a1b202: am 5d629bf2: am 93bc6176: am 01841c73: am af46239a: am 9abb7401: Fix compile failure after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4

* commit '06a1b202613b861ae43d39510cdd47d0d1c84893':
Fix compile failure after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4
a6f0b0417aa3005151757e7c8064f6328a4f5246 20-Aug-2015 Wei Jia <wjia@google.com> am f153ecd2: am 91c71293: am 91fc84f2: am de5c4c46: am 43131299: am 1a09d352: Merge "libstagefright: check remaining data size before parsing it." into klp-dev

* commit 'f153ecd2c1b503a404bbb7d1db0fcc19b7bcda0e':
libstagefright: check remaining data size before parsing it.
123c013b14313f7824c0787e3b034af7913f4283 20-Aug-2015 Abhishek Arya <aarya@google.com> am 7bc20ac5: am cc3411e3: am 0bf31aeb: am 9359e822: am 8a34499a: am c23e3dd8: Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4

* commit '7bc20ac542e65af6f8f248031805632a55934f67':
Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4
02a65c4f599035bf6d58ceda766311f8cb188ba3 20-Aug-2015 Jon Larimer <jlarimer@google.com> am 8910f92a: am 2ea335b1: am fecbc5da: am 5b4a5cce: Merge "do not dequeue from native window after we hit fatal error -- DO NOT MERGE" into lmp-dev

* commit '8910f92aea5791f245da2c69a8c2ad3fb92bb310':
do not dequeue from native window after we hit fatal error -- DO NOT MERGE
612cf86e53f48cd347cf9b5a87e1d91d3d1dc601 20-Aug-2015 Jon Larimer <jlarimer@google.com> am a2c49ff4: am afa0e369: am cad46fbd: am f1a93e47: Merge "SoftOpus: Fix output buffer capacity." into lmp-dev

* commit 'a2c49ff4e71d33e76fcbc57526a2141a623efc56':
SoftOpus: Fix output buffer capacity.
90be27c638576fa5fb3f279e51b013ee3fbe463b 20-Aug-2015 Abhishek Arya <aarya@google.com> am 4c5695d8: am f248e3ae: am 8369ac13: am 33235986: am 09c29ec4: am 94c1969c: Merge "libstagefright: check memory size for overflow before allocation." into klp-dev

* commit '4c5695d820723d9ce7f097fb6c40c09f21b13cd1':
libstagefright: check memory size for overflow before allocation.
f81667bc5f7c7114c5cdfb39b6b8017854632be8 20-Aug-2015 Wei Jia <wjia@google.com> am 228c3de3: am ccc02053: am ef2c6e04: am 45e493e4: Merge "Merge commit \'5a289b87\' into HEAD" into lmp-dev

* commit '228c3de31bc7c8087b78169cc30974b5d99a47fa':
ABuffer: reset members when memory allocation fails.
4ac610178525c6c439f595f07da9a5828efe5449 20-Aug-2015 Wei Jia <wjia@google.com> am 051b8572: am 91860b89: SoftAVCEncoder: fix auto merge error, member names have changed.

* commit '051b8572c2751781925c0e58698dcbb52c8e268e':
SoftAVCEncoder: fix auto merge error, member names have changed.
5bb0a2cff01db0731e9d40bf3cd723b76352a16b 20-Aug-2015 Wei Jia <wjia@google.com> am e264b770: am d9d6c465: am 5d1e62e2: am 9cebcc5f: Merge "SoftAVCEncoder: fix mismatched type for comparison." into lmp-dev

* commit 'e264b770b41eff604ca730ef9172c249b652557b':
SoftAVCEncoder: fix mismatched type for comparison.
dc9533064a989ad1726f9f89ed43115fee019fb2 20-Aug-2015 Wei Jia <wjia@google.com> am 4f0ff02b: am 46f7acbb: am 3175ff3f: am 90eee339: am 652926c8: am 74d3170f: Merge "Fix comparison sign warnings." into klp-dev

* commit '4f0ff02b159892bfa5d3d298efc165e96f93288b':
Fix comparison sign warnings.
96a09849ee1729f6aa69da9e60f6b4556c898057 20-Aug-2015 Wei Jia <wjia@google.com> am 50b600d6: am ab33de61: am 78df80c2: am 65842db0: Merge commit \'b46eb8d9\' into HEAD

* commit '50b600d66eb87bccf8010f30bece4e1f135322d1':
SoftAVCEnc: check requested memory size before allocation.
18d595911673434fb8fa5c2b386fd970ca2d7b0d 20-Aug-2015 Marco Nelissen <marcone@google.com> am 86068c1e: am f6131ce3: am 4a6807bb: Merge "Sanity check padding/delay values for gapless playback" into mnc-dev

* commit '86068c1e2d0981d18b0cd8489604e5d3cbf2db37':
Sanity check padding/delay values for gapless playback
86068c1e2d0981d18b0cd8489604e5d3cbf2db37 20-Aug-2015 Marco Nelissen <marcone@google.com> am f6131ce3: am 4a6807bb: Merge "Sanity check padding/delay values for gapless playback" into mnc-dev

* commit 'f6131ce323496c5e079f37616595f9e2c5bf6a7b':
Sanity check padding/delay values for gapless playback
09ec9f206f46aef176fe59da1e45e3c4f6a8f383 20-Aug-2015 Chong Zhang <chz@google.com> am 5de68b1a: am 684dfb93: am ce0e36be: Merge "skip dropped frame without timestamp checking" into mnc-dev

* commit '5de68b1a98b96b5ecc69b6e2718f850f1fdd654e':
skip dropped frame without timestamp checking
5de68b1a98b96b5ecc69b6e2718f850f1fdd654e 20-Aug-2015 Chong Zhang <chz@google.com> am 684dfb93: am ce0e36be: Merge "skip dropped frame without timestamp checking" into mnc-dev

* commit '684dfb93be22ea3a3929c90f5c7c397d3f48e38c':
skip dropped frame without timestamp checking
1dfbd76bf3bb91ccfdf95ee318d59b7cac1063c6 20-Aug-2015 Marco Nelissen <marcone@google.com> am 4a6807bb: Merge "Sanity check padding/delay values for gapless playback" into mnc-dev

* commit '4a6807bb16ba21059b1c810f3e8585f1373c112a':
Sanity check padding/delay values for gapless playback
f6131ce323496c5e079f37616595f9e2c5bf6a7b 20-Aug-2015 Marco Nelissen <marcone@google.com> am 4a6807bb: Merge "Sanity check padding/delay values for gapless playback" into mnc-dev

* commit '4a6807bb16ba21059b1c810f3e8585f1373c112a':
Sanity check padding/delay values for gapless playback
d7bb1cd786e5ea4ac61119cc1a08082474f7787b 20-Aug-2015 Wei Jia <wjia@google.com> libstagefright: fix overflow in pvdec_api.cpp.

Bug: 20674086
Change-Id: Ie2c711865c3b92f3fa2f3c7a436fa0e3687eb8b3
odecs/m4v_h263/dec/src/pvdec_api.cpp
684dfb93be22ea3a3929c90f5c7c397d3f48e38c 20-Aug-2015 Chong Zhang <chz@google.com> am ce0e36be: Merge "skip dropped frame without timestamp checking" into mnc-dev

* commit 'ce0e36bef67fed98b9037bcac765dab130e83363':
skip dropped frame without timestamp checking
4a6807bb16ba21059b1c810f3e8585f1373c112a 20-Aug-2015 Marco Nelissen <marcone@google.com> Merge "Sanity check padding/delay values for gapless playback" into mnc-dev
932d7c1572daeb116c97f832a7c8b1b46c1252cc 20-Aug-2015 Chong Zhang <chz@google.com> am ce0e36be: Merge "skip dropped frame without timestamp checking" into mnc-dev

* commit 'ce0e36bef67fed98b9037bcac765dab130e83363':
skip dropped frame without timestamp checking
c51ab7dd82bf4e24666fc72a55e03e2f530204d5 18-Aug-2015 Wei Jia <wjia@google.com> libstagefright: fix overflow in MPEG4Source::parseSampleAuxiliaryInformationOffsets.

Bug: 23270724
Change-Id: Id7ba55c7bf6860fbfc892bbb6378aac644c82da4
PEG4Extractor.cpp
b5da4faf36f82762a6adfd1b8a6354d9d3ef8c2e 20-Aug-2015 Robert Shih <robertshih@google.com> am 60345c67: am 3ad0357a: am d7c2effc: Merge "Prevent integer underflows in ID3::Iterator"

* commit '60345c67f522bd5287a62387a34c0efc521b2a71':
Prevent integer underflows in ID3::Iterator
60345c67f522bd5287a62387a34c0efc521b2a71 20-Aug-2015 Robert Shih <robertshih@google.com> am 3ad0357a: am d7c2effc: Merge "Prevent integer underflows in ID3::Iterator"

* commit '3ad0357a3a6fd89fdbedd269186f49a867a031ba':
Prevent integer underflows in ID3::Iterator
fd930f1bc3953217c2b4085f63bd1b84c8d7683b 20-Aug-2015 Robert Shih <robertshih@google.com> am 3ad0357a: am d7c2effc: Merge "Prevent integer underflows in ID3::Iterator"

* commit '3ad0357a3a6fd89fdbedd269186f49a867a031ba':
Prevent integer underflows in ID3::Iterator
4d46f6f18f5160b8992ec1e66ef1844212fc7d48 20-Aug-2015 Marco Nelissen <marcone@google.com> Check RTSP payload length

Bug: 23346388
Change-Id: Ifd918cefc90527c2f52177c3ce0da7a13259ad08
tsp/AMPEG4AudioAssembler.cpp
be7b5e253f85132683826f305e5dcdaf83f0b300 15-Aug-2015 Joshua J. Drake <android-open-source@qoop.org> Prevent integer underflows in ID3::Iterator

If mFrameSize is less than or equal to getHeaderLength(), an integer underflow
will occur. This typically leads to a crash reading out of bounds in the
following code. Prevent this from happening by validating mFrameSize.

Also add NULL checks after references to ID3::Iterator::getData.

Bug: 23285887
Change-Id: I35eeda3c5349ebbd9ffb3ea49b79af6a940d1395
ttplive/PlaylistFetcher.cpp
d3/ID3.cpp
4bce636865bdf0e2a79fc9a5d9a69107649c850d 25-Jun-2015 Wei Jia <wjia@google.com> libstagefright: Fix crash in convertMetaDataToMessage

- The ABuffer used for the Message has a preset value of 1024, if
flattening the meta data exceeds this value, a check fails hence
the crash.
- This change creates a new ABuffer if the buffer size would exceed
the buffer capacity.

Bug: 22771132

CRs-Fixed: 857850

(cherry picked from commit 9c170c076382096b9e767da0e3f9f37dafa76546)

Change-Id: I056ade2f95bc8d82dfe092de7ecddba588cc5b72
tils.cpp
7ea582e1dbdd9a88b2105fbe29ed0ec92cbf70c6 19-Aug-2015 Chih-Hung Hsieh <chh@google.com> Use unified syntax to compile with both llvm and gas.

* Remove useless stab debug info directives .func and .endfunc,
which are not recognized by clang/llvm integrated assembler.
* Replace require8 with REQUIRE8, preserve8 with PRESERVE8.
* Replace LDRNESB with LDRSBNE, LDREQSB with LDRSBEQ, etc.
* Replace VST1 {*.U8} with VST1.8 ..., VLD1 {*.U8} with VLD1.8,
and VMOV with VMOV.I8.
* New assembler output code is identical or equivalent to old gas output.
For example, the 3 references of
LDR r7, =0x80808080
in omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_Average_4x_Align_unsafe_s.S
produced 3 instances of
.word 0x80808080
by llvm integrated assembler but only one by gas.

Change-Id: Ifdcd5bee915a7534198d7f219bceab72045f6a22
odecs/on2/h264dec/Android.mk
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_Average_4x_Align_unsafe_s.S
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_DeblockingChroma_unsafe_s.S
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_DeblockingLuma_unsafe_s.S
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_DecodeCoeffsToPair_s.S
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_InterpolateLuma_Align_unsafe_s.S
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_InterpolateLuma_Copy_unsafe_s.S
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_InterpolateLuma_DiagCopy_unsafe_s.S
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_InterpolateLuma_HalfDiagHorVer4x4_unsafe_s.S
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_InterpolateLuma_HalfDiagVerHor4x4_unsafe_s.S
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_InterpolateLuma_HalfHor4x4_unsafe_s.S
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_InterpolateLuma_HalfVer4x4_unsafe_s.S
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_Interpolate_Chroma_s.S
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_TransformResidual4x4_s.S
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_UnpackBlock4x4_s.S
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/omxVCM4P10_DeblockLuma_I.S
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/omxVCM4P10_DequantTransformResidualFromPairAndAdd_s.S
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/omxVCM4P10_FilterDeblockingChroma_HorEdge_I_s.S
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/omxVCM4P10_FilterDeblockingChroma_VerEdge_I_s.S
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/omxVCM4P10_FilterDeblockingLuma_HorEdge_I_s.S
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/omxVCM4P10_FilterDeblockingLuma_VerEdge_I_s.S
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/omxVCM4P10_InterpolateLuma_s.S
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/omxVCM4P10_PredictIntraChroma_8x8_s.S
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/omxVCM4P10_PredictIntra_16x16_s.S
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/omxVCM4P10_PredictIntra_4x4_s.S
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/omxVCM4P10_TransformDequantChromaDCFromPair_s.S
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/omxVCM4P10_TransformDequantLumaDCFromPair_s.S
odecs/on2/h264dec/source/arm_neon_asm_gcc/asm_common.S
odecs/on2/h264dec/source/arm_neon_asm_gcc/h264bsdClearMbLayer.S
odecs/on2/h264dec/source/arm_neon_asm_gcc/h264bsdCountLeadingZeros.S
odecs/on2/h264dec/source/arm_neon_asm_gcc/h264bsdFillRow7.S
odecs/on2/h264dec/source/arm_neon_asm_gcc/h264bsdFlushBits.S
odecs/on2/h264dec/source/arm_neon_asm_gcc/h264bsdWriteMacroblock.S
0aaff700f6c7885887bbf42f7bb64754e21e5fce 19-Aug-2015 Chong Zhang <chz@google.com> skip dropped frame without timestamp checking

also skip frame if timestamp is going backward, instead of crash.

bug: 23191439
Change-Id: I179157bf67bc972b8ebf852d80653daa6e496f1c
ameraSource.cpp
5a132594b531f1f48098a790927f82080cc27f61 18-Aug-2015 Wei Jia <wjia@google.com> libstagefright: fix handling of mSampleTimeEntries and mNumSampleSizes in SampleTable.

Bug: 23247055
Change-Id: I29ef59c7ff09248063714e5013f7c33f66c5eebd
(cherry picked from commit 3564c4562f46bede6ef1ea716c4fd4f77e470ae8)
(cherry picked from commit 108cd2dc8df55f3f2ecdfbb4bb0ae981a74b6860)
ampleTable.cpp
nclude/SampleTable.h
108cd2dc8df55f3f2ecdfbb4bb0ae981a74b6860 18-Aug-2015 Wei Jia <wjia@google.com> libstagefright: fix handling of mSampleTimeEntries and mNumSampleSizes in SampleTable.

Bug: 23247055
Change-Id: I29ef59c7ff09248063714e5013f7c33f66c5eebd
(cherry picked from commit 3564c4562f46bede6ef1ea716c4fd4f77e470ae8)
ampleTable.cpp
3878b990f7d53eae7c2cf9246b6ef2db5a049872 13-Jun-2014 Marco Nelissen <marcone@google.com> Fail more gracefully on allocation failure

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

b/14388161

Change-Id: Ia08cc0a6107f275a70e793ef3b50c0ce16ceeee0
PEG4Extractor.cpp
ec5ea2436f8ad792f6fecc6668104dcad1374996 19-Aug-2015 Chad Brubaker <cbrubaker@google.com> Merge "Whitelist updatePCR from fsanitize=integer"
c9fa35cf7c9c11a8acb77128db1a6a13f1befe3c 19-Aug-2015 Chad Brubaker <cbrubaker@google.com> Whitelist updatePCR from fsanitize=integer

updatePCR does some math to compute transport rate for logging that can
cause an unsigned overflow. Since this is harmless and only for logging
whitelist the function as its otherwise safe from integer issues.

Bug:23110888

Change-Id: I0686afeef99ccf636701d687e5628ae057f60e4c
peg2ts/ATSParser.cpp
1bc6f9f3397e05f765f14bf15dce70457c3457aa 19-Aug-2015 Wei Jia <wjia@google.com> am 5301f272: am 50dbdc80: am f271ddd4: Merge "libstagefright: fix handling of mSampleTimeEntries and mNumSampleSizes in SampleTable." into mnc-dev

* commit '5301f272c2cbdfd12138d90a159af43bf2d56ea3':
libstagefright: fix handling of mSampleTimeEntries and mNumSampleSizes in SampleTable.
4ff0a0fff558187bd615808c131f7454d6b4abe4 19-Aug-2015 Wei Jia <wjia@google.com> am 692c7ccc: am f8df2755: am 1cb6d761: Merge "libstagefright: fix overflow in SoftAVCEnc." into mnc-dev

* commit '692c7ccc6709ffd112c6dc40bdf84fa4adc53911':
libstagefright: fix overflow in SoftAVCEnc.
5301f272c2cbdfd12138d90a159af43bf2d56ea3 19-Aug-2015 Wei Jia <wjia@google.com> am 50dbdc80: am f271ddd4: Merge "libstagefright: fix handling of mSampleTimeEntries and mNumSampleSizes in SampleTable." into mnc-dev

* commit '50dbdc805421e2b577542f646c889727e3845351':
libstagefright: fix handling of mSampleTimeEntries and mNumSampleSizes in SampleTable.
692c7ccc6709ffd112c6dc40bdf84fa4adc53911 19-Aug-2015 Wei Jia <wjia@google.com> am f8df2755: am 1cb6d761: Merge "libstagefright: fix overflow in SoftAVCEnc." into mnc-dev

* commit 'f8df2755f413813d397360ffb4358c2f0ab22dfe':
libstagefright: fix overflow in SoftAVCEnc.
8c444ed7aa43f5b45dab016f3f0e89c067916095 19-Aug-2015 Wei Jia <wjia@google.com> am f271ddd4: Merge "libstagefright: fix handling of mSampleTimeEntries and mNumSampleSizes in SampleTable." into mnc-dev

* commit 'f271ddd4fece6fcdccf3fc2707e35bed66ac4ca1':
libstagefright: fix handling of mSampleTimeEntries and mNumSampleSizes in SampleTable.
d5037b3576f9621c1ac16086bd9d9337890f3b77 19-Aug-2015 Wei Jia <wjia@google.com> am 1cb6d761: Merge "libstagefright: fix overflow in SoftAVCEnc." into mnc-dev

* commit '1cb6d761be0bf58aa48d9032c0704d8e31553906':
libstagefright: fix overflow in SoftAVCEnc.
50dbdc805421e2b577542f646c889727e3845351 19-Aug-2015 Wei Jia <wjia@google.com> am f271ddd4: Merge "libstagefright: fix handling of mSampleTimeEntries and mNumSampleSizes in SampleTable." into mnc-dev

* commit 'f271ddd4fece6fcdccf3fc2707e35bed66ac4ca1':
libstagefright: fix handling of mSampleTimeEntries and mNumSampleSizes in SampleTable.
f8df2755f413813d397360ffb4358c2f0ab22dfe 19-Aug-2015 Wei Jia <wjia@google.com> am 1cb6d761: Merge "libstagefright: fix overflow in SoftAVCEnc." into mnc-dev

* commit '1cb6d761be0bf58aa48d9032c0704d8e31553906':
libstagefright: fix overflow in SoftAVCEnc.
766f2be66c5c5b88855ed8353ca1bb7580538765 19-Aug-2015 Robert Shih <robertshih@google.com> Merge "HTTPDownloader: bail out when buffer ranges wrap around"
f271ddd4fece6fcdccf3fc2707e35bed66ac4ca1 19-Aug-2015 Wei Jia <wjia@google.com> Merge "libstagefright: fix handling of mSampleTimeEntries and mNumSampleSizes in SampleTable." into mnc-dev
3564c4562f46bede6ef1ea716c4fd4f77e470ae8 18-Aug-2015 Wei Jia <wjia@google.com> libstagefright: fix handling of mSampleTimeEntries and mNumSampleSizes in SampleTable.

Bug: 23247055
Change-Id: I29ef59c7ff09248063714e5013f7c33f66c5eebd
ampleTable.cpp
nclude/SampleTable.h
8a414a2b8dc21143e13b9b75980aba68435a8a8e 15-Aug-2015 Robert Shih <robertshih@google.com> HTTPDownloader: bail out when buffer ranges wrap around

Bug: 23224421
Change-Id: I3ab1cc86d38028955a0752aa880477c5a57b02a1
ttplive/HTTPDownloader.cpp
9c6aeb7cc344f3e994b651ea4c70155c4071258a 18-Aug-2015 Vishwath Mohan <vishwath@google.com> Merge "Revert "Revert "Enable unsigned-integer-overflow"""
1352054462f282c07657c0e2ea841d7f206f7820 18-Aug-2015 Vishwath Mohan <vishwath@google.com> Revert "Revert "Enable unsigned-integer-overflow""

This reverts commit 76643ba7cf6ed74562389a19fbc8bf2b915011b1.

Change-Id: Iecea773af797c6a677456aadc34aa3eb82ebe5f6
oundation/Android.mk
ttplive/Android.mk
595fede0cf7b53b4d3f51d72df8d66fd7ff14d1c 18-Aug-2015 Wei Jia <wjia@google.com> libstagefright: fix overflow in SoftAVCEnc.

Bug: 20674674
Change-Id: I8e320218180926d46d223cb72523118079f72342
odecs/avcenc/SoftAVCEnc.cpp
bfadec126c43cff30aa8445d8d42265c39a03ad5 18-Aug-2015 Chong Zhang <chz@google.com> am 25c00122: am 4ce86e78: am 5d7a381b: am 877c76ac: Merge "stagefright: check IMemory::pointer() before using the allocation" into klp-dev

* commit '25c00122a640ee311e6e72df401c362ec798617d':
stagefright: check IMemory::pointer() before using the allocation
64459f96001c4cd38fa28946fc805f022d3676b5 18-Aug-2015 Jon Larimer <jlarimer@google.com> am 3e9ed500: am 8a1a5d17: am 9707195b: am f97b6bee: Merge "Check integer overflow to prevent memory corruption" into klp-dev

* commit '3e9ed500718386db2d70d555098fa1e931e75d28':
Check integer overflow to prevent memory corruption
a3a29952f485cd2ebf521273a7b36aac586451cf 18-Aug-2015 Nick Kralevich <nnk@google.com> am 4b153ff9: am 2f3c04a4: resolved conflicts for merge of 6035c811 to lmp-dev

* commit '4b153ff9b5c979684ed0a53d52a3ad90ec7f7d22':
MPEG4Source::fragmentedRead: check range before writing into buffers
4ce86e781bf5ac7ef047cdb81db858fae12fd334 18-Aug-2015 Chong Zhang <chz@google.com> am 5d7a381b: am 877c76ac: Merge "stagefright: check IMemory::pointer() before using the allocation" into klp-dev

* commit '5d7a381b9c86ff4f00a95063d57ad0a80467799c':
stagefright: check IMemory::pointer() before using the allocation
8a1a5d17ddc3ff902a9d9e1858713ed9406c45c8 18-Aug-2015 Jon Larimer <jlarimer@google.com> am 9707195b: am f97b6bee: Merge "Check integer overflow to prevent memory corruption" into klp-dev

* commit '9707195bf18fed1318e5c747db82f9783262a137':
Check integer overflow to prevent memory corruption
5d7a381b9c86ff4f00a95063d57ad0a80467799c 18-Aug-2015 Chong Zhang <chz@google.com> am 877c76ac: Merge "stagefright: check IMemory::pointer() before using the allocation" into klp-dev

* commit '877c76ac42701859fb8185f05c4724a06867fc07':
stagefright: check IMemory::pointer() before using the allocation
2f3c04a4e92aabea09325cd6870d74a705d98dd8 18-Aug-2015 Nick Kralevich <nnk@google.com> resolved conflicts for merge of 6035c811 to lmp-dev

Change-Id: Icf911f31e207c4c658047f6bfe8088d697b04ed6
877c76ac42701859fb8185f05c4724a06867fc07 18-Aug-2015 Chong Zhang <chz@google.com> Merge "stagefright: check IMemory::pointer() before using the allocation" into klp-dev
ba6093a4c6997b9d36d9700ee8c974941bf82e3a 18-Aug-2015 Marco Nelissen <marcone@google.com> Sanity check padding/delay values for gapless playback

Bug: 23306638
Change-Id: I2b5160e0f58f90d3f67c3964f41f5734ec0da053
kipCutBuffer.cpp
d5fa8d5dcdf8742f03fdc165f7529d7627b0eb01 18-Aug-2015 Marco Nelissen <marcone@google.com> Sanity check padding/delay values for gapless playback

Bug: 23306638
Change-Id: Id77637eb897d9e484f1b32e022c99c51c1bd9a1e
kipCutBuffer.cpp
6f0b1b3e25eb2db2e8465f13268c297fa9070012 18-Aug-2015 Jon Larimer <jlarimer@google.com> am 484ebc81: am a1e462e5: am 0afecdeb: am aa1cc741: Merge "Check buffer size before using it" into klp-dev

* commit '484ebc81263a627b5e24e65373ab0752996ca0c8':
Check buffer size before using it
8a83ce9cf5487921596161c31714ae1a5e8db6b7 18-Aug-2015 Abhishek Arya <aarya@google.com> am 54ea6c02: am 5ff4bb7a: am 8026ad38: am 6efa86be: Merge "Check vector size before accessing" into klp-dev

* commit '54ea6c02570ca87e94b03e0a8468dfc2f20536b7':
Check vector size before accessing
3459ea265ab8c61cca1b2ed97162fe3c3d05a698 18-Aug-2015 Abhishek Arya <aarya@google.com> am de47cd3c: am 3b77e940: am d146d466: am 6f561b93: Merge "MatroskaExtractor: detect infinite loop when parsing NALs" into klp-dev

* commit 'de47cd3c5223bb0fdd7376f8ea21ba2f857bafbe':
MatroskaExtractor: detect infinite loop when parsing NALs
48bdf782f92a975f3597c40d175fa579adfd74d4 18-Aug-2015 Neel Mehta <nmehta@google.com> am 00887af1: am e9a8362e: am a2a68264: am c37f7f6f: Fix for memory corruption in ID3::removeUnsynchronizationV2_4(). Bug: 23227354

* commit '00887af170d5302d1030e107ed3db969b05edcb4':
Fix for memory corruption in ID3::removeUnsynchronizationV2_4(). Bug: 23227354
8b0660e0b4335d1a594602715da92e7b52c66260 18-Aug-2015 Abhishek Arya <aarya@google.com> am 3c803e7f: am 6afd8574: am 073a656d: am deba0610: Merge "Revert "Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4"" into klp-dev

* commit '3c803e7f777ad745b1b2cae0bdb2a31b11d47e80':
Revert "Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4"
5d629bf257ee2568d665d2c1d2a5a9fcd15c1ece 18-Aug-2015 Abhishek Arya <aarya@google.com> am 93bc6176: am 01841c73: am af46239a: am 9abb7401: Fix compile failure after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4

* commit '93bc61764eb8417165de2bbaa6384165f7298a32':
Fix compile failure after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4
91c712933ceb90d815f6447716409a4f1a2cc148 18-Aug-2015 Wei Jia <wjia@google.com> am 91fc84f2: am de5c4c46: am 43131299: am 1a09d352: Merge "libstagefright: check remaining data size before parsing it." into klp-dev

* commit '91fc84f2102f222607d402953d9c1d4383e15a71':
libstagefright: check remaining data size before parsing it.
cc3411e3539a6c762404ca2ca92a6649862745ba 18-Aug-2015 Abhishek Arya <aarya@google.com> am 0bf31aeb: am 9359e822: am 8a34499a: am c23e3dd8: Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4

* commit '0bf31aeb5b0e58cd167aaee2a6cb4d9248e0e66b':
Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4
a1e462e5531db20d1dc70c3e24c82879a0a90870 18-Aug-2015 Jon Larimer <jlarimer@google.com> am 0afecdeb: am aa1cc741: Merge "Check buffer size before using it" into klp-dev

* commit '0afecdebaea1982ead120a701ddd24f2b0ff3897':
Check buffer size before using it
5ff4bb7a65f0495c2cd79413ef3001b208ae7e2c 18-Aug-2015 Abhishek Arya <aarya@google.com> am 8026ad38: am 6efa86be: Merge "Check vector size before accessing" into klp-dev

* commit '8026ad3838e2f7367e8ff616f66b2c2f8bc8488c':
Check vector size before accessing
3b77e940822e8a5ef4953b709bdae00fa1bcca43 18-Aug-2015 Abhishek Arya <aarya@google.com> am d146d466: am 6f561b93: Merge "MatroskaExtractor: detect infinite loop when parsing NALs" into klp-dev

* commit 'd146d4660451fb04c039f4ac8554103876fa4722':
MatroskaExtractor: detect infinite loop when parsing NALs
e9a8362e1d379e90655e904ca49d6333e4218eda 18-Aug-2015 Neel Mehta <nmehta@google.com> am a2a68264: am c37f7f6f: Fix for memory corruption in ID3::removeUnsynchronizationV2_4(). Bug: 23227354

* commit 'a2a6826494dec4a8fab6bd6828828fae886e516a':
Fix for memory corruption in ID3::removeUnsynchronizationV2_4(). Bug: 23227354
6afd8574d44ae158bed9cafe1c74dd1bfc5573b6 18-Aug-2015 Abhishek Arya <aarya@google.com> am 073a656d: am deba0610: Merge "Revert "Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4"" into klp-dev

* commit '073a656d7dd0b432e7c8d508745d9fb552955b9e':
Revert "Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4"
01841c73a5a824a34d794ec69e2769b088306485 18-Aug-2015 Abhishek Arya <aarya@google.com> am af46239a: am 9abb7401: Fix compile failure after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4

* commit 'af46239a10921980f5030222dff147a592480248':
Fix compile failure after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4
de5c4c4671f63457151fce7b4ad7963518f8ce36 18-Aug-2015 Wei Jia <wjia@google.com> am 43131299: am 1a09d352: Merge "libstagefright: check remaining data size before parsing it." into klp-dev

* commit '431312997856ce689e683ee0639cf1f4bedab7f0':
libstagefright: check remaining data size before parsing it.
9359e82213e6027b2390b76ba30e2e44f0d5cec6 18-Aug-2015 Abhishek Arya <aarya@google.com> am 8a34499a: am c23e3dd8: Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4

* commit '8a34499ab9987d962040881b4c8d66b655f65ae0':
Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4
9707195bf18fed1318e5c747db82f9783262a137 18-Aug-2015 Jon Larimer <jlarimer@google.com> am f97b6bee: Merge "Check integer overflow to prevent memory corruption" into klp-dev

* commit 'f97b6beeb2e2f0977d1c7fa8d2aaafe4e2f4d68a':
Check integer overflow to prevent memory corruption
27362395cec5673a9cbfe7179ad5490c4e475329 18-Aug-2015 Jon Larimer <jlarimer@google.com> am 2ed42aea: Merge "do not dequeue from native window after we hit fatal error -- DO NOT MERGE" into klp-dev

* commit '2ed42aea9c6fbca4bde52d647ff082b997b5968c':
do not dequeue from native window after we hit fatal error -- DO NOT MERGE
2ea335b11c1e328896a6c7a2e6d2bc190b7f06fc 18-Aug-2015 Jon Larimer <jlarimer@google.com> am fecbc5da: am 5b4a5cce: Merge "do not dequeue from native window after we hit fatal error -- DO NOT MERGE" into lmp-dev

* commit 'fecbc5da64a992f91f74ef6c67a7e247b0da7777':
do not dequeue from native window after we hit fatal error -- DO NOT MERGE
f97b6beeb2e2f0977d1c7fa8d2aaafe4e2f4d68a 18-Aug-2015 Jon Larimer <jlarimer@google.com> Merge "Check integer overflow to prevent memory corruption" into klp-dev
5b4a5cce6eb17ef5d0b37cfb4ad7e617eb978423 18-Aug-2015 Jon Larimer <jlarimer@google.com> Merge "do not dequeue from native window after we hit fatal error -- DO NOT MERGE" into lmp-dev
2ed42aea9c6fbca4bde52d647ff082b997b5968c 18-Aug-2015 Jon Larimer <jlarimer@google.com> Merge "do not dequeue from native window after we hit fatal error -- DO NOT MERGE" into klp-dev
afa0e3698355f341009a8042d62c82016f86a1c8 18-Aug-2015 Jon Larimer <jlarimer@google.com> am cad46fbd: am f1a93e47: Merge "SoftOpus: Fix output buffer capacity." into lmp-dev

* commit 'cad46fbde4961d5374c27f9d85cd8f2b6822ffa7':
SoftOpus: Fix output buffer capacity.
f1a93e4720a71c308c3d88a9f751555ff532a01c 18-Aug-2015 Jon Larimer <jlarimer@google.com> Merge "SoftOpus: Fix output buffer capacity." into lmp-dev
6035c811849a8475697268cf71b5cf923705abe8 18-Aug-2015 Jon Larimer <jlarimer@google.com> am 0d46c937: Merge "MPEG4Source::fragmentedRead: check range before writing into buffers" into klp-dev

* commit '0d46c93785e2c426be11172bec0489b698fea6c3':
MPEG4Source::fragmentedRead: check range before writing into buffers
0afecdebaea1982ead120a701ddd24f2b0ff3897 18-Aug-2015 Jon Larimer <jlarimer@google.com> am aa1cc741: Merge "Check buffer size before using it" into klp-dev

* commit 'aa1cc74139341eb3ae9511af5310b965dbf890f4':
Check buffer size before using it
0d46c93785e2c426be11172bec0489b698fea6c3 18-Aug-2015 Jon Larimer <jlarimer@google.com> Merge "MPEG4Source::fragmentedRead: check range before writing into buffers" into klp-dev
aa1cc74139341eb3ae9511af5310b965dbf890f4 18-Aug-2015 Jon Larimer <jlarimer@google.com> Merge "Check buffer size before using it" into klp-dev
8026ad3838e2f7367e8ff616f66b2c2f8bc8488c 18-Aug-2015 Abhishek Arya <aarya@google.com> am 6efa86be: Merge "Check vector size before accessing" into klp-dev

* commit '6efa86beff54332cbf7bbd4949b0c38c1ec8c5cd':
Check vector size before accessing
d146d4660451fb04c039f4ac8554103876fa4722 18-Aug-2015 Abhishek Arya <aarya@google.com> am 6f561b93: Merge "MatroskaExtractor: detect infinite loop when parsing NALs" into klp-dev

* commit '6f561b93d8c6473fa0baa281ad4a53f882e656cc':
MatroskaExtractor: detect infinite loop when parsing NALs
a2a6826494dec4a8fab6bd6828828fae886e516a 18-Aug-2015 Neel Mehta <nmehta@google.com> am c37f7f6f: Fix for memory corruption in ID3::removeUnsynchronizationV2_4(). Bug: 23227354

* commit 'c37f7f6fa0cb7f55cdc5b2d4ccbf2c87c3bc6c3b':
Fix for memory corruption in ID3::removeUnsynchronizationV2_4(). Bug: 23227354
6efa86beff54332cbf7bbd4949b0c38c1ec8c5cd 18-Aug-2015 Abhishek Arya <aarya@google.com> Merge "Check vector size before accessing" into klp-dev
6f561b93d8c6473fa0baa281ad4a53f882e656cc 18-Aug-2015 Abhishek Arya <aarya@google.com> Merge "MatroskaExtractor: detect infinite loop when parsing NALs" into klp-dev
f248e3ae0c2016b11d01ee87f5bbb1211b10ee8a 18-Aug-2015 Abhishek Arya <aarya@google.com> am 8369ac13: am 33235986: am 09c29ec4: am 94c1969c: Merge "libstagefright: check memory size for overflow before allocation." into klp-dev

* commit '8369ac13ad207baebbaf4cd7b357a35dd54408c6':
libstagefright: check memory size for overflow before allocation.
ccc02053f07ea9c1d24678a2b191c5b6cef28094 18-Aug-2015 Wei Jia <wjia@google.com> am ef2c6e04: am 45e493e4: Merge "Merge commit \'5a289b87\' into HEAD" into lmp-dev

* commit 'ef2c6e044676bf9f0ead4359d7a1840236150e4d':
ABuffer: reset members when memory allocation fails.
33235986a7490b569c859e5555328cbe1bae2748 18-Aug-2015 Abhishek Arya <aarya@google.com> am 09c29ec4: am 94c1969c: Merge "libstagefright: check memory size for overflow before allocation." into klp-dev

* commit '09c29ec42df51ae807725d4eea52c4cc305c13a0':
libstagefright: check memory size for overflow before allocation.
45e493e40ca5497cc7c21c3c683145d87bd37364 18-Aug-2015 Wei Jia <wjia@google.com> Merge "Merge commit '5a289b87' into HEAD" into lmp-dev
91860b89488b3ee4644c539e89e657fbb79fb6ad 18-Aug-2015 Wei Jia <wjia@google.com> SoftAVCEncoder: fix auto merge error, member names have changed.

Bug: 20674674
Change-Id: I511c22d59789e1cc3a21fe13ea08ac3752e737c6
odecs/avc/enc/SoftAVCEncoder.cpp
d9d6c465d94f64e3705f234fa3f53e0341bc2b41 18-Aug-2015 Wei Jia <wjia@google.com> am 5d1e62e2: am 9cebcc5f: Merge "SoftAVCEncoder: fix mismatched type for comparison." into lmp-dev

* commit '5d1e62e24628e86fc0485113db18b31973a5cf4b':
SoftAVCEncoder: fix mismatched type for comparison.
407d475b797fdc595299d67151230dc6e3835ccd 17-Jul-2015 Robert Shih <robertshih@google.com> MatroskaExtractor: detect infinite loop when parsing NALs

Bug: 21335999
Change-Id: I76bd34610e52048ffcf16e41aa6175afc8a14ee4
(cherry picked from commit 2dcf6138ebc9c5688aeae151d2fbde55a2826128)
atroska/MatroskaExtractor.cpp
dd7c0dd903ef6617d020c13f11b84996addff3c7 18-Aug-2015 Wei Jia <wjia@google.com> Merge commit '5a289b87' into HEAD

ABuffer: reset members when memory allocation fails.

Bug: 22077698
(cherry picked from commit 94b0badc025b14141ff234e3e4e2745411742bac)

Change-Id: I359ec16e524ffb298c143c3d72fbf1a3af72d663
c37f7f6fa0cb7f55cdc5b2d4ccbf2c87c3bc6c3b 15-Aug-2015 Neel Mehta <nmehta@google.com> Fix for memory corruption in ID3::removeUnsynchronizationV2_4().
Bug: 23227354

Change-Id: Iaa36cfda4fd84ca7e039f56086fd61b4118020db
(cherry picked from commit 77e23413a539df16503e356bd4df4a952f3abc47)
d3/ID3.cpp
38eff9af5c032bf12f89d6e94df05f65eef51afc 18-Aug-2015 Wei Jia <wjia@google.com> SoftAVCEncoder: fix mismatched type for comparison.

Bug: 20674674
Change-Id: Iace5b8c882339b3a9d2e706375255aeeeb0532fe
odecs/avc/enc/SoftAVCEncoder.cpp
073a656d7dd0b432e7c8d508745d9fb552955b9e 18-Aug-2015 Abhishek Arya <aarya@google.com> am deba0610: Merge "Revert "Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4"" into klp-dev

* commit 'deba0610c89d54390c9d2d0a0f3b79fd7679779c':
Revert "Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4"
46f7acbb3d323a3f67ba1f91494b7466676b7122 18-Aug-2015 Wei Jia <wjia@google.com> am 3175ff3f: am 90eee339: am 652926c8: am 74d3170f: Merge "Fix comparison sign warnings." into klp-dev

* commit '3175ff3f343ecd85700e2029d7709ce960272967':
Fix comparison sign warnings.
af46239a10921980f5030222dff147a592480248 18-Aug-2015 Abhishek Arya <aarya@google.com> am 9abb7401: Fix compile failure after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4

* commit '9abb7401df730b5c510f6b8dac2716a0928d9623':
Fix compile failure after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4
ab33de61ccf1d0fab39573a79cf8372045bbda1a 18-Aug-2015 Wei Jia <wjia@google.com> am 78df80c2: am 65842db0: Merge commit \'b46eb8d9\' into HEAD

* commit '78df80c26352bdbe3dc3725a6d937f60fc340127':
SoftAVCEnc: check requested memory size before allocation.
90eee3397ad45bdae462f9f2ce0ef7d3b1e2957d 18-Aug-2015 Wei Jia <wjia@google.com> am 652926c8: am 74d3170f: Merge "Fix comparison sign warnings." into klp-dev

* commit '652926c8a37fb904aaa0756a0d0bae0574f308c5':
Fix comparison sign warnings.
deba0610c89d54390c9d2d0a0f3b79fd7679779c 18-Aug-2015 Abhishek Arya <aarya@google.com> Merge "Revert "Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4"" into klp-dev
9abb7401df730b5c510f6b8dac2716a0928d9623 18-Aug-2015 Abhishek Arya <aarya@google.com> Fix compile failure after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4

Bug: 20674086
Change-Id: I2ee6b7e0eabbf696c0986d08b2d759d48cb9eb7b
odecs/m4v_h263/dec/src/pvdec_api.cpp
odecs/m4v_h263/enc/src/mp4enc_api.cpp
65842db06c2d77e53cc5ac61692160d844cc7d0a 18-Aug-2015 Wei Jia <wjia@google.com> Merge commit 'b46eb8d9' into HEAD

SoftAVCEnc: check requested memory size before allocation.

Bug: 20674674
(cherry picked from commit f6fe4340219a8e674f3250fe32d4697ec8184b24)

Change-Id: Ib52a26de912fd5a9a08dd9948885fb4a9b32e9e6
431312997856ce689e683ee0639cf1f4bedab7f0 18-Aug-2015 Wei Jia <wjia@google.com> am 1a09d352: Merge "libstagefright: check remaining data size before parsing it." into klp-dev

* commit '1a09d3521e8849dcb1090ecb50393f6e9ee140ec':
libstagefright: check remaining data size before parsing it.
8a34499ab9987d962040881b4c8d66b655f65ae0 18-Aug-2015 Abhishek Arya <aarya@google.com> am c23e3dd8: Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4

* commit 'c23e3dd8af7397f023aae040c4a03dd14091cbed':
Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4
ce3802906214ec1ae2ac78d765b8480a2ebe295a 18-Aug-2015 Wei Jia <wjia@google.com> am 567b6551: Merge "SoftAVCEnc: check requested memory size before allocation." into klp-dev

* commit '567b6551f8bc240cc267054ea5de55c46f10cc29':
SoftAVCEnc: check requested memory size before allocation.
09c29ec42df51ae807725d4eea52c4cc305c13a0 18-Aug-2015 Abhishek Arya <aarya@google.com> am 94c1969c: Merge "libstagefright: check memory size for overflow before allocation." into klp-dev

* commit '94c1969c38d4386933ed5cad7f625029442f6331':
libstagefright: check memory size for overflow before allocation.
5a289b87952f1cafbdcf604ad5e6da20403b38d5 18-Aug-2015 Wei Jia <wjia@google.com> am 120f259d: Merge "ABuffer: reset members when memory allocation fails." into klp-dev

* commit '120f259d0de4dc048a2b9007c0f19b8808e59021':
ABuffer: reset members when memory allocation fails.
6d59c11c0dfa5aee2ebbadcf282b512cb55be9c2 18-Aug-2015 Wei Jia <wjia@google.com> am fc8c226b: Merge "Revert "SoftAVCEnc: check requested memory size before allocation."" into klp-dev

* commit 'fc8c226b75a45876e6545c3a217698ada52bd2d6':
Revert "SoftAVCEnc: check requested memory size before allocation."
652926c8a37fb904aaa0756a0d0bae0574f308c5 18-Aug-2015 Wei Jia <wjia@google.com> am 74d3170f: Merge "Fix comparison sign warnings." into klp-dev

* commit '74d3170ffc02620fcedb5a98c7a66e83ee2faa87':
Fix comparison sign warnings.
b46eb8d9f8bff2e6ddec1902acc9d2ad65147d68 18-Aug-2015 Wei Jia <wjia@google.com> am 479b4de0: SoftAVCEnc: check requested memory size before allocation.

* commit '479b4de0d267eb7d4c419f4da0069186a952ad17':
SoftAVCEnc: check requested memory size before allocation.
1a09d3521e8849dcb1090ecb50393f6e9ee140ec 18-Aug-2015 Wei Jia <wjia@google.com> Merge "libstagefright: check remaining data size before parsing it." into klp-dev
55de93cf9bf0465f5bd6bb0f413b90bea41b4642 18-Aug-2015 Chad Brubaker <cbrubaker@google.com> Merge "Enable fsanitize unsigned-integer-overflow in rtsp"
27bf9d29134ce70a3a2f3c78795fa388ae4379f8 18-Aug-2015 Chad Brubaker <cbrubaker@google.com> Merge "Enable fsanitize unsigned-integer-overflow in matroska"
b959bede6f84979519cc87e6eb5900f20bcef2f5 18-Aug-2015 Chad Brubaker <cbrubaker@google.com> Merge "Enable fsanitize unsigned-integer-overflow in webm"
12bd1d2697f0d39f6c70f31d06f2f74c57e1d89f 18-Aug-2015 Abhishek Arya <aarya@google.com> Revert "Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4"

This reverts commit c23e3dd8af7397f023aae040c4a03dd14091cbed.

This speculative fix didn't fix the compile failure, do checking locally.

Change-Id: I1598f7208c8232ca38c0fcad17f211598591594e
odecs/m4v_h263/dec/src/pvdec_api.cpp
odecs/m4v_h263/enc/src/mp4enc_api.cpp
f810a8298aea13fa177060cdc10c8297eac69c49 23-Jun-2015 Robert Shih <robertshih@google.com> MPEG4Source::fragmentedRead: check range before writing into buffers

Bug: 22008959
Change-Id: I5f6e188adcc593796455bdaf7b0b8aba672b106e
PEG4Extractor.cpp
f34fbe80f12be26087a6dbc15f11d9ece2b90679 18-Aug-2015 Chad Brubaker <cbrubaker@google.com> Enable fsanitize unsigned-integer-overflow in rtsp

Change-Id: Ie8569394461f4f2d89b9ec5b7cfe34bc28056471
tsp/Android.mk
bbaa82ad97e7bb754e9b19d4d09246e7dd4b8e0a 18-Aug-2015 Chad Brubaker <cbrubaker@google.com> Enable fsanitize unsigned-integer-overflow in matroska

Change-Id: Iac00492f66da9d28a641ec016ccaa2278deb6bdf
atroska/Android.mk
07c906d8301e89ea9a6f21460a275bac7a9024ad 18-Aug-2015 Neel Mehta <nmehta@google.com> Merge "Retry on broken fix for OOB read in ElementaryStreamQueue::dequeueAccessUnitMPEGVideo(). Bug: 23221340"
182236f65588f0d45c86a4c8324349f1f2cdffa3 18-Aug-2015 Chad Brubaker <cbrubaker@google.com> Enable fsanitize unsigned-integer-overflow in webm

Change-Id: If1024d67fb5fcc1444f4e07f83a9552684252c42
ebm/Android.mk
c23e3dd8af7397f023aae040c4a03dd14091cbed 17-Aug-2015 Abhishek Arya <aarya@google.com> Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4

BUG: 20674086
Change-Id: Idaff17975b327adea65c39bdba1ab4e88789c0cd
odecs/m4v_h263/dec/src/pvdec_api.cpp
odecs/m4v_h263/enc/src/mp4enc_api.cpp
ae9494bb8f3a27ba9c4efd63084e1da22fa8baa6 17-Aug-2015 Wei Jia <wjia@google.com> am 47bfaf57: am 3264b251: am 39ff8149: Merge "libstagefright: fix possible overflow in SampleTable.cpp" into mnc-dev

* commit '47bfaf57c2fe88b29a1d6e05dfc1fc35e7d08697':
libstagefright: fix possible overflow in SampleTable.cpp
47bfaf57c2fe88b29a1d6e05dfc1fc35e7d08697 17-Aug-2015 Wei Jia <wjia@google.com> am 3264b251: am 39ff8149: Merge "libstagefright: fix possible overflow in SampleTable.cpp" into mnc-dev

* commit '3264b251353c37d7efc8ffb6e420dd71b6b62349':
libstagefright: fix possible overflow in SampleTable.cpp
3264b251353c37d7efc8ffb6e420dd71b6b62349 17-Aug-2015 Wei Jia <wjia@google.com> am 39ff8149: Merge "libstagefright: fix possible overflow in SampleTable.cpp" into mnc-dev

* commit '39ff8149466ee8e86c0336f706cd4dd3713f359f':
libstagefright: fix possible overflow in SampleTable.cpp
dd53622c5838d2c7d0ccce13b378c094b67554ed 17-Aug-2015 Wei Jia <wjia@google.com> am 39ff8149: Merge "libstagefright: fix possible overflow in SampleTable.cpp" into mnc-dev

* commit '39ff8149466ee8e86c0336f706cd4dd3713f359f':
libstagefright: fix possible overflow in SampleTable.cpp
39ff8149466ee8e86c0336f706cd4dd3713f359f 17-Aug-2015 Wei Jia <wjia@google.com> Merge "libstagefright: fix possible overflow in SampleTable.cpp" into mnc-dev
152cbce078cb08b7a1540cafdbb3c18e317cc785 17-Aug-2015 Chad Brubaker <cbrubaker@google.com> Merge "Enable fsanitize unsigned-integer-overflow in omx"
0adc442a6408e079a6d7f35b24546cf5181101f6 17-Aug-2015 Chad Brubaker <cbrubaker@google.com> Merge "Enable fsanitize unsigned-integer-overflow in MPEG2"
db8c0912b9199b1a58f5a641ec2391ccbafeb90b 17-Aug-2015 Chad Brubaker <cbrubaker@google.com> Merge "Enable fsanitize unsigned-overflow-detection in id3"
4d747c01e1fab04d79b56595a9801715f3a5a03a 17-Aug-2015 Chad Brubaker <cbrubaker@google.com> Merge "Revert "Revert "Enable unsigned-integer-overflow"""
2c5fb0c7249ba7e5d79236c61a1c94a489041e65 14-Aug-2015 Wei Jia <wjia@google.com> libstagefright: fix possible overflow in SampleTable.cpp

Bug: 23197952
Change-Id: I83afe5aad74a41102b127c4e46799ebc317cd96c
ampleTable.cpp
567b6551f8bc240cc267054ea5de55c46f10cc29 17-Aug-2015 Wei Jia <wjia@google.com> Merge "SoftAVCEnc: check requested memory size before allocation." into klp-dev
30cfe1d70876034cd341fa62ec5abe7a6758d4e4 17-Aug-2015 Neel Mehta <nmehta@google.com> Retry on broken fix for OOB read in ElementaryStreamQueue::dequeueAccessUnitMPEGVideo().
Bug: 23221340

Change-Id: I6c963821677b2a9b728ca7b635df2f94af1fe374
peg2ts/ESQueue.cpp
c16c41bc5286baf8564afc0ecd8d2dc871587aee 17-Aug-2015 Neel Mehta <nmehta@google.com> Merge "Fix for memory corruption in ID3::removeUnsynchronizationV2_4(). Bug: 23227354"
94c1969c38d4386933ed5cad7f625029442f6331 17-Aug-2015 Abhishek Arya <aarya@google.com> Merge "libstagefright: check memory size for overflow before allocation." into klp-dev
8ec845c8fe0f03bc57c901bc484541bdd6a7cf80 15-May-2015 Chong Zhang <chz@google.com> stagefright: check IMemory::pointer() before using the allocation

bug: 19779574
Change-Id: I4ffe8c3fadc07da211f421e75ee83010b01d9cbb
Codec.cpp
ebe84f078e61ae319df42bed61e1fd862982e549 12-Aug-2015 Chad Brubaker <cbrubaker@google.com> Enable fsanitize unsigned-integer-overflow in omx

Bug: 23110888
Change-Id: Ifa159e1b87ae627584516d84a36dc3bc88fad5c9
mx/Android.mk
6325a7384138a73bb1fb34b776f0bb8b1dc94e60 12-Aug-2015 Chad Brubaker <cbrubaker@google.com> Enable fsanitize unsigned-integer-overflow in MPEG2

Bug: 23110888
Change-Id: I224596af776d362bc8d0d72138695c3f7f21759b
peg2ts/Android.mk
peg2ts/MPEG2PSExtractor.cpp
40b8053c5dff8efa1f5064874580961cd8aed6ba 12-Aug-2015 Chad Brubaker <cbrubaker@google.com> Enable fsanitize unsigned-overflow-detection in id3

Tested using the id3v1_test_suite and cts and found no issues.
Bug:23110888

Change-Id: I6b876340914904abeb7035df004d7467ed4992ef
d3/Android.mk
29d833623c92c4c45530375a03a07aafa243c6b0 17-Aug-2015 Chad Brubaker <cbrubaker@google.com> Revert "Revert "Enable unsigned-integer-overflow""

This reverts commit bade336e33c29c840067787374d4316c7b71c3c3.
ndroid.mk
bf47eb9c67ed364f3c288954857aab9d9311db4c 14-Aug-2015 Chong Zhang <chz@google.com> do not dequeue from native window after we hit fatal error -- DO NOT MERGE

bug: 22845824
Change-Id: I8c375790c697e02b6ab3ea54b84d3f70d5e78141
(cherry picked from commit 346de3c26a8fbd0fa0c8102f4a21ea4dcee4432a)
Codec.cpp
734e65e6e7e1ee863781c1ebd87003933bb4a752 14-Aug-2015 Chong Zhang <chz@google.com> do not dequeue from native window after we hit fatal error -- DO NOT MERGE

bug: 22845824
Change-Id: I8c375790c697e02b6ab3ea54b84d3f70d5e78141
(cherry picked from commit 346de3c26a8fbd0fa0c8102f4a21ea4dcee4432a)
Codec.cpp
22e109b98ec1b3223666ebe748497257f8e5ceca 17-Aug-2015 Wei Jia <wjia@google.com> am c7fe8e9d: am 5f7d4b95: am 3bf1e0fd: libstagefright: check remaining data size before parsing it.

* commit 'c7fe8e9d91350ec4868e801114e5fcfe44064fba':
libstagefright: check remaining data size before parsing it.
d2ebc0b9e147f9406db20ec4df61da50e3614ee4 17-Aug-2015 Wei Jia <wjia@google.com> libstagefright: check remaining data size before parsing it.

Bug: 23248776
Change-Id: I45cf53e58e4375afcf260b122264c968ec0ff6c8
(cherry picked from commit 3bf1e0fdf27e1188b8d3574ed073595b8eacb114)
d3/ID3.cpp
c7fe8e9d91350ec4868e801114e5fcfe44064fba 17-Aug-2015 Wei Jia <wjia@google.com> am 5f7d4b95: am 3bf1e0fd: libstagefright: check remaining data size before parsing it.

* commit '5f7d4b957a4b41eaee3bcfbe8cb5a2f8f3dc8dc0':
libstagefright: check remaining data size before parsing it.
5f7d4b957a4b41eaee3bcfbe8cb5a2f8f3dc8dc0 17-Aug-2015 Wei Jia <wjia@google.com> am 3bf1e0fd: libstagefright: check remaining data size before parsing it.

* commit '3bf1e0fdf27e1188b8d3574ed073595b8eacb114':
libstagefright: check remaining data size before parsing it.
50369c5d269f18f10794d52aa3356f460eb4c41e 17-Aug-2015 Wei Jia <wjia@google.com> am 3bf1e0fd: libstagefright: check remaining data size before parsing it.

* commit '3bf1e0fdf27e1188b8d3574ed073595b8eacb114':
libstagefright: check remaining data size before parsing it.
3fd96683850cf27648e036180acb149fac362242 17-Aug-2015 Wei Jia <wjia@google.com> SoftAVCEnc: check requested memory size before allocation.

Bug: 20674674

Change-Id: If80186a7b9078e575d389220f3bebe9f7630a956
(cherry picked from commit f6fe4340219a8e674f3250fe32d4697ec8184b24)
odecs/avc/enc/SoftAVCEncoder.cpp
3bf1e0fdf27e1188b8d3574ed073595b8eacb114 17-Aug-2015 Wei Jia <wjia@google.com> libstagefright: check remaining data size before parsing it.

Bug: 23248776
Change-Id: I45cf53e58e4375afcf260b122264c968ec0ff6c8
d3/ID3.cpp
120f259d0de4dc048a2b9007c0f19b8808e59021 16-Aug-2015 Wei Jia <wjia@google.com> Merge "ABuffer: reset members when memory allocation fails." into klp-dev
fc8c226b75a45876e6545c3a217698ada52bd2d6 16-Aug-2015 Wei Jia <wjia@google.com> Merge "Revert "SoftAVCEnc: check requested memory size before allocation."" into klp-dev
98e68e84f173aba6967770629d3ea7991a1dfb91 16-Aug-2015 Wei Jia <wjia@google.com> Revert "SoftAVCEnc: check requested memory size before allocation."

This reverts commit 479b4de0d267eb7d4c419f4da0069186a952ad17.

Change-Id: I014746db3f861cb1cd5bf1b76f86b0356836a128
odecs/avc/enc/SoftAVCEncoder.cpp
74d3170ffc02620fcedb5a98c7a66e83ee2faa87 16-Aug-2015 Wei Jia <wjia@google.com> Merge "Fix comparison sign warnings." into klp-dev
b158a9a5bcfe21480f57bc58d45517f1a81cca39 12-Aug-2015 Jeff Tinker <jtinker@google.com> Check integer overflow to prevent memory corruption

bug: 23016072
Change-Id: If3c9a835408773847c0024a812bd8b4915ebd680
(cherry picked from commit fa8ebb45fd850f56ca1bf64fbed3ac11e10c7d3d)
RMExtractor.cpp
e689a9db5779496f8eaf93dc91fda40476699941 16-Aug-2015 Chong Zhang <chz@google.com> am a3c601e7: am 4883125b: Merge "do not dequeue from native window after we hit fatal error" into mnc-dev

* commit 'a3c601e70c8119a8c3dcc2026c4fb9875308b94c':
do not dequeue from native window after we hit fatal error
a3c601e70c8119a8c3dcc2026c4fb9875308b94c 16-Aug-2015 Chong Zhang <chz@google.com> am 4883125b: Merge "do not dequeue from native window after we hit fatal error" into mnc-dev

* commit '4883125b0df72ee404de8b244c3e6511f62947ee':
do not dequeue from native window after we hit fatal error
ca04965574f29d105b7e0f9ec6f083eb7d7765fa 15-Aug-2015 Wei Jia <wjia@google.com> Merge "Revert "Check for out of bounds reads in ESQueue. Bug: 23221340""
26cdc940b3cf956481674b24793e01849d2a3181 15-Aug-2015 Abhishek Arya <aarya@google.com> Revert "Check for out of bounds reads in ESQueue. Bug: 23221340"

This reverts commit 4d344327a093d98b0b83a476f9359cf3c1b79c82.

Change-Id: Ibe4c9c3aa1546e10139e69fa906eb67b154520ff
peg2ts/ESQueue.cpp
3179e3b3531b5fe93dc7f5b2c378e27010a406d5 11-Jun-2015 Vignesh Venkatasubramanian <vigneshv@google.com> SoftOpus: Fix output buffer capacity.

The output buffer size as per opus project's sample decoder [1] is
960*6*channel_count. Whereas in SoftOpus, we use 960*6 (without the
channel count multiplier. Fixing it to include maximum number of
channels possible as the multiplier.

[1] http://git.xiph.org/?p=opus-tools.git;a=blob;f=src/opusdec.c;h=d085f04eacdfd49759ffdb73db805562ba396720;hb=f2a2e88b47f6f24083a37be476f140f677fe7160#l571

BUG=20721050

Change-Id: I323891a1b11491782bc093477b09e7757b885674
(cherry picked from commit 08e8227514f5ab99822dfae8b4d39414646ff59d)
odecs/opus/dec/SoftOpus.cpp
f11e95b21007f24e5ab77298370855f9f085b2d7 01-Jul-2015 Marco Nelissen <marcone@google.com> Check buffer size before using it

Bug: 21814993
Change-Id: Idaac61b4b9f4058b94e84093644593ba315d72ff
(cherry picked from commit c1a104aaad2d84a57bf5d87dd030d2bef56bf541)
PEG4Extractor.cpp
7e9ac3509d72e8dc6f1316b5ce0a0066638b9737 08-May-2015 Dan Albert <danalbert@google.com> Fix comparison sign warnings.

Bug:23213430

Change-Id: I6f2e2b03b968a569b122004b4803c5d17fccfb12
(cherry picked from commit 635bc8f90429b2fdcaf7f8d43f7f59bcd0fe951c)
PEG4Extractor.cpp
4da4c47cb38a7cb58a0dfdaee9dece2c5def6ce9 15-Aug-2015 Chong Zhang <chz@google.com> am 4883125b: Merge "do not dequeue from native window after we hit fatal error" into mnc-dev

* commit '4883125b0df72ee404de8b244c3e6511f62947ee':
do not dequeue from native window after we hit fatal error
7913508110c80da87fb085514208adbd874d7d54 20-Jul-2015 Wei Jia <wjia@google.com> ABuffer: reset members when memory allocation fails.

Bug: 22077698
Change-Id: I2beb724662d041ad2339d0f4c7f983e7ac5e5e6f
(cherry picked from commit 94b0badc025b14141ff234e3e4e2745411742bac)
oundation/ABuffer.cpp
77e23413a539df16503e356bd4df4a952f3abc47 15-Aug-2015 Neel Mehta <nmehta@google.com> Fix for memory corruption in ID3::removeUnsynchronizationV2_4().
Bug: 23227354

Change-Id: Iaa36cfda4fd84ca7e039f56086fd61b4118020db
d3/ID3.cpp
479b4de0d267eb7d4c419f4da0069186a952ad17 15-Aug-2015 Wei Jia <wjia@google.com> SoftAVCEnc: check requested memory size before allocation.

Bug: 20674674
Change-Id: I569e7a9b33fe64779a40e55539929c3dc4303c19
(cherry picked from commit f6fe4340219a8e674f3250fe32d4697ec8184b24)
odecs/avc/enc/SoftAVCEncoder.cpp
dd665ff244ef21e4af5cd0127f67c7157e9b8ff5 15-Aug-2015 Neel Mehta <nmehta@google.com> Merge "Check for out of bounds reads in ESQueue. Bug: 23221340"
073e4f6748f5d7deb095c42fad9271cb99e22d07 24-Jul-2015 Marco Nelissen <marcone@google.com> Check vector size before accessing

Bug: 22388975
Change-Id: I3c157b1029d37f6a22e6302ea7b52077fe27ce53
(cherry picked from commit 529c595b083f8a4c3175e2350fba5547e6008e00)
PEG4Extractor.cpp
b62a73b860757143d3b140b2985fdae71e18d675 03-Jun-2015 Wei Jia <wjia@google.com> libstagefright: check memory size for overflow before allocation.

Bug: 20674086
Change-Id: I431aa2b7d30a942350ab6d105451c6b77e2f99d4
(cherry picked from commit 42cccd7c8811597d56fb86afeacf6231d693dea6)
odecs/m4v_h263/dec/src/pvdec_api.cpp
odecs/m4v_h263/enc/src/mp4enc_api.cpp
a89cfb6cab17700efa62665cda3bc4b87c6f1ad8 14-Aug-2015 Chong Zhang <chz@google.com> do not dequeue from native window after we hit fatal error

bug: 22845824
Change-Id: I8c375790c697e02b6ab3ea54b84d3f70d5e78141
(cherry picked from commit 346de3c26a8fbd0fa0c8102f4a21ea4dcee4432a)
Codec.cpp
10cf816f9d7d2127d10f717ade69fa400ca6e5a8 14-Aug-2015 Chong Zhang <chz@google.com> Merge "do not dequeue from native window after we hit fatal error"
4d344327a093d98b0b83a476f9359cf3c1b79c82 14-Aug-2015 Neel Mehta <nmehta@google.com> Check for out of bounds reads in ESQueue.
Bug: 23221340

Change-Id: Ie77d176410d0aa5e79624082c578cc3eaa6c1726
peg2ts/ESQueue.cpp
346de3c26a8fbd0fa0c8102f4a21ea4dcee4432a 14-Aug-2015 Chong Zhang <chz@google.com> do not dequeue from native window after we hit fatal error

bug: 22845824
Change-Id: I8c375790c697e02b6ab3ea54b84d3f70d5e78141
Codec.cpp
407b871be7772e93afbb4ccf0249bc81916c6e63 13-Aug-2015 Chong Zhang <chz@google.com> am aaa0144c: am afd9b0b6: Merge "adjust audio timestamp to account for AudioRecord latency" into mnc-dr-dev

* commit 'aaa0144cad0b31bfa7ba7559353b7852901227c6':
adjust audio timestamp to account for AudioRecord latency
c7a58efaa8276036ae307a16bc9ee2411926ff9e 13-Aug-2015 Wei Jia <wjia@google.com> am def6aff8: am 1c4549c3: am 84a131f2: am 39ab7cea: am 88aa97ea: am 3ce29384: libstagefright: fix possible overflow in amrwbenc.

* commit 'def6aff8b8d9e38019f5fc0dccf9c24f48ad4d4a':
libstagefright: fix possible overflow in amrwbenc.
1c4549c38b7056ae6a4415eb65123d23d86c7b97 13-Aug-2015 Wei Jia <wjia@google.com> am 84a131f2: am 39ab7cea: am 88aa97ea: am 3ce29384: libstagefright: fix possible overflow in amrwbenc.

* commit '84a131f227398bd217f9c4ce91ff6fec13b29df4':
libstagefright: fix possible overflow in amrwbenc.
39ab7cea0e3c14181e3e68b0f1bb5fa20a434b35 13-Aug-2015 Wei Jia <wjia@google.com> am 88aa97ea: am 3ce29384: libstagefright: fix possible overflow in amrwbenc.

* commit '88aa97ea87b7e4f7b4f82df3500754e03205ef60':
libstagefright: fix possible overflow in amrwbenc.
88aa97ea87b7e4f7b4f82df3500754e03205ef60 13-Aug-2015 Wei Jia <wjia@google.com> am 3ce29384: libstagefright: fix possible overflow in amrwbenc.

* commit '3ce293842fed1b3abd2ff0aecd2a0c70a55086ee':
libstagefright: fix possible overflow in amrwbenc.
aaa0144cad0b31bfa7ba7559353b7852901227c6 13-Aug-2015 Chong Zhang <chz@google.com> am afd9b0b6: Merge "adjust audio timestamp to account for AudioRecord latency" into mnc-dr-dev

* commit 'afd9b0b6e13b1d5f37f23c833037c7ed0f1f6809':
adjust audio timestamp to account for AudioRecord latency
afd9b0b6e13b1d5f37f23c833037c7ed0f1f6809 13-Aug-2015 Chong Zhang <chz@google.com> Merge "adjust audio timestamp to account for AudioRecord latency" into mnc-dr-dev
59a385e41be35b25422bbdf27ba5f3f894081671 13-Aug-2015 Wei Jia <wjia@google.com> am f66b81e7: am f22da1cf: am d7146ce7: am 3bb658ac: am 4e86a483: am f51115bd: libstagefright: fix possible overflow in ID3.

* commit 'f66b81e7c05f62105e7a8deefeaf395b28cb4bb3':
libstagefright: fix possible overflow in ID3.
f22da1cf931bb9ae5d964106a138672ebb04fc02 13-Aug-2015 Wei Jia <wjia@google.com> am d7146ce7: am 3bb658ac: am 4e86a483: am f51115bd: libstagefright: fix possible overflow in ID3.

* commit 'd7146ce70c892e65ff3aa38af3d0afc18d49dd8c':
libstagefright: fix possible overflow in ID3.
fa4303dcbeac79452f35c078c8008f5c2e7622b7 13-Aug-2015 Chong Zhang <chz@google.com> adjust audio timestamp to account for AudioRecord latency

bug: 22953017
Change-Id: Iccd1bb406ff68aa8bc3ccec35c8128625894f6ae
udioSource.cpp
3ce293842fed1b3abd2ff0aecd2a0c70a55086ee 12-Aug-2015 Wei Jia <wjia@google.com> libstagefright: fix possible overflow in amrwbenc.

Bug: 23142203
Change-Id: I309df51e4df6412655f04cc093d792bf6c7944f7
(cherry picked from commit 9dd01777aa14bbb90a6cdccf97383bb4e3d717a5)
odecs/amrwbenc/src/util.c
3bb658acd971414b15b0957e131294db33f7b75b 13-Aug-2015 Wei Jia <wjia@google.com> am 4e86a483: am f51115bd: libstagefright: fix possible overflow in ID3.

* commit '4e86a483a12b0139a8babf4754e5de340eaccd40':
libstagefright: fix possible overflow in ID3.
4e86a483a12b0139a8babf4754e5de340eaccd40 13-Aug-2015 Wei Jia <wjia@google.com> am f51115bd: libstagefright: fix possible overflow in ID3.

* commit 'f51115bd8e44c2779b74477277c6f6046916e7cf':
libstagefright: fix possible overflow in ID3.
c4717852eeb9eaa567990af14b7b4116e2d682f7 07-Aug-2015 Nick Kralevich <nnk@google.com> MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX

chunk_size is a uint64_t, so it can legitimately be bigger
than SIZE_MAX, which would cause the subtraction to underflow.

https://code.google.com/p/android/issues/detail?id=182251

Bug: 23034759
Change-Id: Ic1637fb26bf6edb0feb1bcf2876fd370db1ed547
PEG4Extractor.cpp
98841d360524c3049a3b205cb975d937e2619700 13-Aug-2015 Ian Pedowitz <ijpedowitz@google.com> resolved conflicts for merge of bb37e84f to mnc-dev-plus-aosp

Change-Id: I90940a50d55395bfd61d5a5e21fac3aa0982ba40
61205a3bd5b6d09b1a745162a641369c0423431f 13-Aug-2015 Bart Sears <bsears@google.com> am 5c4a35a9: resolved conflicts for merge of c1fdbd41 to mnc-dr-dev-plus-aosp

* commit '5c4a35a9f58bd97b44e0905639b7f4f20d92cda0':
libstagefright: fix possible overflow in amrwbenc.
5c4a35a9f58bd97b44e0905639b7f4f20d92cda0 13-Aug-2015 Bart Sears <bsears@google.com> resolved conflicts for merge of c1fdbd41 to mnc-dr-dev-plus-aosp

Change-Id: I96731df91a7f2646de26f21d3b984c3f58da3373
bb37e84f8d45c34ec86485632e861914ac0473a0 13-Aug-2015 Wei Jia <wjia@google.com> Merge "libstagefright: fix possible overflow in amrwbenc." into mnc-dev
3c23af85baa6e248681ca98f857c4af84b5ebffc 30-Jul-2015 Andreas Gampe <agampe@google.com> Stagefright: Remove unused variables and files

For build-system CFLAGS clean-up.

Bug: 18632512

(cherry picked from commit 765b4172f1ffb2c4e2de89163bb888fa352de664)

Change-Id: I765dc394f39f60801843851760fdf9838958d7a4
odecs/amrnb/common/Android.mk
odecs/amrnb/common/include/bytesused.h
odecs/amrnb/common/src/bytesused.cpp
odecs/amrnb/common/src/overflow_tbl.cpp
odecs/avc/enc/src/findhalfpel.cpp
odecs/on2/dec/SoftVPX.cpp
e913bc85ef07aeafdea19cf40c5a078e5792b713 13-Aug-2015 Andy Hung <hunga@google.com> am a8d8bce2: am 67072a8a: am 913efd2b: Merge "h264dec: Use intptr_t when a pointer is treated as an integer"

* commit 'a8d8bce2b2c75a4091d1297a186533de83df2654':
h264dec: Use intptr_t when a pointer is treated as an integer
6beba4feba12a7b947f0fac01248e07be362b58e 13-Aug-2015 Elliott Hughes <enh@google.com> am f9e3617a: resolved conflicts for merge of ab3df6d8 to mnc-dr-dev-plus-aosp

* commit 'f9e3617a4cc035446329be45f8b078dd917c7388':
frameworks/av doesn't need to support the long-dead simulator.
a8d8bce2b2c75a4091d1297a186533de83df2654 13-Aug-2015 Andy Hung <hunga@google.com> am 67072a8a: am 913efd2b: Merge "h264dec: Use intptr_t when a pointer is treated as an integer"

* commit '67072a8a3d52c48db21272bdd98ffff5a9cda817':
h264dec: Use intptr_t when a pointer is treated as an integer
f9e3617a4cc035446329be45f8b078dd917c7388 13-Aug-2015 Elliott Hughes <enh@google.com> resolved conflicts for merge of ab3df6d8 to mnc-dr-dev-plus-aosp

Change-Id: I2f6ef2d43275739d24ad8b79270f18e374d88e55
d6847e108409e7fd6163828a1cdd757e2e546584 13-Aug-2015 Andy Hung <hunga@google.com> am 67072a8a: am 913efd2b: Merge "h264dec: Use intptr_t when a pointer is treated as an integer"

* commit '67072a8a3d52c48db21272bdd98ffff5a9cda817':
h264dec: Use intptr_t when a pointer is treated as an integer
08fd70bff164361f613e8115fab78b9127d117b3 13-Aug-2015 Elliott Hughes <enh@google.com> resolved conflicts for merge of ab3df6d8 to mnc-dev-plus-aosp

Change-Id: Ib1399fd4f7b02ef064a0c29ad3056296bed4e267
913efd2bb99a056eb44395a93c6aa361a96dde6a 13-Aug-2015 Andy Hung <hunga@google.com> Merge "h264dec: Use intptr_t when a pointer is treated as an integer"
9dd01777aa14bbb90a6cdccf97383bb4e3d717a5 12-Aug-2015 Wei Jia <wjia@google.com> libstagefright: fix possible overflow in amrwbenc.

Bug: 23142203
Change-Id: I309df51e4df6412655f04cc093d792bf6c7944f7
odecs/amrwbenc/src/util.c
308f3927dee3861586c17df267265ae0c86d79f7 12-Aug-2015 Elliott Hughes <enh@google.com> frameworks/av doesn't need to support the long-dead simulator.

Change-Id: I43678ee1da57e7f42670f6042b2acc14db50d750
ttplive/LiveSession.cpp
tsp/ARTSPConnection.cpp
a36610fb577cf6e4d0e8e88b181e8ff6746af395 12-Aug-2015 Wei Jia <wjia@google.com> am fb5d2674: am 87f15e01: am 09da8691: libstagefright: fix possible overflow in ID3.

* commit 'fb5d26744b845a3546bc057df81cf35d70b0e2a0':
libstagefright: fix possible overflow in ID3.
fb5d26744b845a3546bc057df81cf35d70b0e2a0 12-Aug-2015 Wei Jia <wjia@google.com> am 87f15e01: am 09da8691: libstagefright: fix possible overflow in ID3.

* commit '87f15e01dc04cca537422849c4e4349013b6b4a6':
libstagefright: fix possible overflow in ID3.
c85c0d96c29a0c215094252cc5d4a26df07f9de8 12-Aug-2015 Andreas Gampe <agampe@google.com> Merge "Stagefright: Remove unused variables and files" into mnc-dev-plus-aosp
5c8fe7d6f2a89725eba2cf0a7bc8370ae7f0e1b5 30-Jul-2015 Andreas Gampe <agampe@google.com> Stagefright: Remove unused variables and files

For build-system CFLAGS clean-up.

Bug: 18632512

(cherry picked from commit 765b4172f1ffb2c4e2de89163bb888fa352de664)

Change-Id: I765dc394f39f60801843851760fdf9838958d7a4
odecs/amrnb/common/Android.mk
odecs/amrnb/common/include/bytesused.h
odecs/amrnb/common/src/bytesused.cpp
odecs/amrnb/common/src/overflow_tbl.cpp
odecs/avc/enc/src/findhalfpel.cpp
odecs/on2/dec/SoftVPX.cpp
f51115bd8e44c2779b74477277c6f6046916e7cf 12-Aug-2015 Wei Jia <wjia@google.com> libstagefright: fix possible overflow in ID3.

Bug: 23129786
Change-Id: I2e6b7a6927aa4362ab49dd6824bbb1abf7b4e661
(cherry picked from commit 09da86913ca97d7a818a8917b6601527e5e18a24)
d3/ID3.cpp
070e8001ab9c6e1a1c875843f378f414f0614a20 12-Aug-2015 Wei Jia <wjia@google.com> am 09da8691: libstagefright: fix possible overflow in ID3.

* commit '09da86913ca97d7a818a8917b6601527e5e18a24':
libstagefright: fix possible overflow in ID3.
9343be95b80d8fa02ce9ef7540b3373e58d0f0bf 12-Aug-2015 Vishwath Mohan <vishwath@google.com> Merge "Fix benign unsigned integer overflow"
09da86913ca97d7a818a8917b6601527e5e18a24 12-Aug-2015 Wei Jia <wjia@google.com> libstagefright: fix possible overflow in ID3.

Bug: 23129786
Change-Id: I2e6b7a6927aa4362ab49dd6824bbb1abf7b4e661
d3/ID3.cpp
fa7d97fa4ad7210b9378dcebd7aa14b72a59423a 12-Aug-2015 Vishwath Mohan <vishwath@google.com> Merge "Revert "Enable unsigned-integer-overflow""
76643ba7cf6ed74562389a19fbc8bf2b915011b1 12-Aug-2015 Vishwath Mohan <vishwath@google.com> Revert "Enable unsigned-integer-overflow"

This reverts commit 936cbb03a25e847a33c224fb2ad2143e787d9f81.

Change-Id: I5179930a0353a1b95d085ded28f31aa565534d1d
oundation/Android.mk
ttplive/Android.mk
698545a05cb683ae6f3491d512e5777fbe7495a9 12-Aug-2015 Jeff Tinker <jtinker@google.com> am 68eee27e: am 45d31391: am fa8ebb45: Check integer overflow to prevent memory corruption

* commit '68eee27ea6a22844b7569ba9ae5a892333073bca':
Check integer overflow to prevent memory corruption
68eee27ea6a22844b7569ba9ae5a892333073bca 12-Aug-2015 Jeff Tinker <jtinker@google.com> am 45d31391: am fa8ebb45: Check integer overflow to prevent memory corruption

* commit '45d31391e6922dee2bbf9f6745f0a5545858eb63':
Check integer overflow to prevent memory corruption
4b9f255fa50b317245ca0fe7c56cfefe09c19cf5 12-Aug-2015 Chad Brubaker <cbrubaker@google.com> Merge "Revert "Enable unsigned-integer-overflow""
bade336e33c29c840067787374d4316c7b71c3c3 12-Aug-2015 Chad Brubaker <cbrubaker@google.com> Revert "Enable unsigned-integer-overflow"

This reverts commit 70794607c8f23e58a81b543945264a7e17275760.

Change-Id: I65099799694b8d237c5c59fb5063be2c3a8a234f
ndroid.mk
aba5df316b1dbd850711510a80bff9ed476ba59a 12-Aug-2015 Jeff Tinker <jtinker@google.com> am fa8ebb45: Check integer overflow to prevent memory corruption

* commit 'fa8ebb45fd850f56ca1bf64fbed3ac11e10c7d3d':
Check integer overflow to prevent memory corruption
cfe302317c873001b0b35352d9f4f52c39f6f4b7 12-Aug-2015 Vishwath Mohan <vishwath@google.com> Fix benign unsigned integer overflow

Fixes a benign overflow error in ANetworkSession.cpp

Bug: 23110888
Change-Id: Ic64f5100ab1e3f2ffe247ca4f7b40d38c1ff0c2a
oundation/ANetworkSession.cpp
084571cde7a61aa7f98dd2fc48eea1d963ca831a 12-Aug-2015 Andy Hung <hunga@google.com> am e8a23de3: am 0a1318c8: am bc2d3eba: Merge "h264_enc: Add test"

* commit 'e8a23de33d05b12086cd2cc54dd00dc4bcabbb3d':
h264_enc: Add test
56a97e5f31667244210b0ea60ceeb0a05908ef20 12-Aug-2015 Andy Hung <hunga@google.com> Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/av
2e7b96766df2ba3ecd830935feb2668ef8162706 12-Aug-2015 Vishwath Mohan <vishwath@google.com> Merge "Enable unsigned-integer-overflow"
7c82ff1c0fd5ba65d0ca523ef3f1be795bcb110c 12-Aug-2015 Andy Hung <hunga@google.com> am 5f5bdb6a: am d199a019: am ff30d69c: Merge "h263_enc: Add test"

* commit '5f5bdb6a4ec5d86358f5772a4b1f7a06a6d285c8':
h263_enc: Add test
e8a23de33d05b12086cd2cc54dd00dc4bcabbb3d 12-Aug-2015 Andy Hung <hunga@google.com> am 0a1318c8: am bc2d3eba: Merge "h264_enc: Add test"

* commit '0a1318c84a36b6006f1140ac87238f5cab673fc6':
h264_enc: Add test
5d247833f5f1e45250bce0848027eac2d6f13adb 12-Aug-2015 Andy Hung <hunga@google.com> am 0a1318c8: am bc2d3eba: Merge "h264_enc: Add test"

* commit '0a1318c84a36b6006f1140ac87238f5cab673fc6':
h264_enc: Add test
5f5bdb6a4ec5d86358f5772a4b1f7a06a6d285c8 12-Aug-2015 Andy Hung <hunga@google.com> am d199a019: am ff30d69c: Merge "h263_enc: Add test"

* commit 'd199a019dee70f6f30e7ecb46253560529e8949c':
h263_enc: Add test
61473913cfc719770b7c5b7b640c0eb0e4eb6ef6 12-Aug-2015 Andy Hung <hunga@google.com> am d199a019: am ff30d69c: Merge "h263_enc: Add test"

* commit 'd199a019dee70f6f30e7ecb46253560529e8949c':
h263_enc: Add test
bc2d3eba6b10c4dca96b0202a58d56b04464dfb4 12-Aug-2015 Andy Hung <hunga@google.com> Merge "h264_enc: Add test"
e1fdfd0342c232382581c62de1c27754337f4fd1 18-Jun-2014 Ashok Bhat <ashok.bhat@arm.com> h264_enc: Add test

The test accepts a raw YUV file, encoding parameters as input
and dumps encoded bitstream to a file.

To run the test, use following command
h264_enc_test <input yuv> <output file> <width> <height> <frame rate> <bitrate in kbps>

Bug: 17722566
Change-Id: I3711d455550ddfaa47003e10453ef1adc50f0d6f
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
odecs/avc/enc/Android.mk
odecs/avc/enc/test/h264_enc_test.cpp
ff30d69c2275ffb8ffc2977082cdfe72109ba400 12-Aug-2015 Andy Hung <hunga@google.com> Merge "h263_enc: Add test"
044c6ae441f14102551c1ba918d02d5c8d12c21e 16-Jun-2014 Ashok Bhat <ashok.bhat@arm.com> h263_enc: Add test

The test accepts a raw YUV file, encoding parameters as input
and dumps encoded bitstream to a file.

To run the test, use following command
m4v_h263_enc_test <input yuv> <output file> <mode> <width> <height> <frame rate> <bitrate in kbps>

Bug: 17722566
Change-Id: I68155c4bb181c1330f49f46aa1d28ff17b3bf03a
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
odecs/m4v_h263/enc/Android.mk
odecs/m4v_h263/enc/test/m4v_h263_enc_test.cpp
c92d887aaf17720d0c00d597a46af0c1ba0c7f5f 12-Aug-2015 Vishwath Mohan <vishwath@google.com> Merge "Fix benign unsigned integer overflows"
fa8ebb45fd850f56ca1bf64fbed3ac11e10c7d3d 12-Aug-2015 Jeff Tinker <jtinker@google.com> Check integer overflow to prevent memory corruption

bug: 23016072
Change-Id: If3c9a835408773847c0024a812bd8b4915ebd680
RMExtractor.cpp
25f191c5cb2ec532e534be646c32806f9f85e196 12-Aug-2015 Vishwath Mohan <vishwath@google.com> Fix benign unsigned integer overflows

Bug: 23110888
Change-Id: I1894a61e94a274795cab7fb23a81f3a611717c1d
ttplive/PlaylistFetcher.cpp
936cbb03a25e847a33c224fb2ad2143e787d9f81 12-Aug-2015 Vishwath Mohan <vishwath@google.com> Enable unsigned-integer-overflow

Enables unsigned integer overflow for the httplive and foundation projects.

Bug: 23110888
Change-Id: I07875e3e7da3dc4a4fbfb94dd0e6853dc190e2db
oundation/Android.mk
ttplive/Android.mk
4f138199e43e39b780cccded9d60439663c45f75 12-Aug-2015 Chad Brubaker <cbrubaker@google.com> Merge "Enable unsigned-integer-overflow"
ed25adfda1af26671e67ede525d1cf6421e15e24 12-Aug-2015 Chad Brubaker <cbrubaker@google.com> Merge "Fix benign unsigned integer overflow"
70794607c8f23e58a81b543945264a7e17275760 11-Aug-2015 Chad Brubaker <cbrubaker@google.com> Enable unsigned-integer-overflow

Turn on unsigned-integer-overflow for libstagefright.so. This is only
for the top level Android.mk and doesn't turn on overflow checking in
all the libaries and codecs included.

Bug: 23110888
Change-Id: I719ae48c4c3f940a9431d173621885bd344a8401
ndroid.mk
69c1e038717d3462ea5991425ba009f0aed148d2 12-Aug-2015 Chad Brubaker <cbrubaker@google.com> Fix benign unsigned integer overflow

Bug:23110888
Change-Id: Ibd6f1c7a9204cf584536c1ee63f6a8e5c6e4aa59
ataURISource.cpp
MXCodec.cpp
ad4dcbd083702623c81077335ab6c44b1560c32c 12-Aug-2015 Andy Hung <hunga@google.com> am 25312896: am 093c1cbf: am 8fb933c6: Merge "Add test for AMR-WB decoder"

* commit '25312896208d0ab4d05d0db44cec1da4f539e45e':
Add test for AMR-WB decoder
25312896208d0ab4d05d0db44cec1da4f539e45e 12-Aug-2015 Andy Hung <hunga@google.com> am 093c1cbf: am 8fb933c6: Merge "Add test for AMR-WB decoder"

* commit '093c1cbf7e9e4f6e747264e665fe9c632e158e17':
Add test for AMR-WB decoder
63c70b46bb96ddaaa6fca5828137eab6923a0c40 12-Aug-2015 Andy Hung <hunga@google.com> am 093c1cbf: am 8fb933c6: Merge "Add test for AMR-WB decoder"

* commit '093c1cbf7e9e4f6e747264e665fe9c632e158e17':
Add test for AMR-WB decoder
2277a54c659dab987bfcca9184e8b788860691cf 12-Aug-2015 Andy Hung <hunga@google.com> am 79479da8: am 88122d1c: am bb3e69de: Merge "AMR-WB Encoder: Enable sample app"

* commit '79479da87c43b93a24eaaead4f3e7372611acb2c':
AMR-WB Encoder: Enable sample app
79479da87c43b93a24eaaead4f3e7372611acb2c 12-Aug-2015 Andy Hung <hunga@google.com> am 88122d1c: am bb3e69de: Merge "AMR-WB Encoder: Enable sample app"

* commit '88122d1ce78a5b97bab1f4e15cd60b101ea65740':
AMR-WB Encoder: Enable sample app
e9ea92c67ea2224f402c9bab79b104664e3fdc07 11-Aug-2015 Andy Hung <hunga@google.com> am 88122d1c: am bb3e69de: Merge "AMR-WB Encoder: Enable sample app"

* commit '88122d1ce78a5b97bab1f4e15cd60b101ea65740':
AMR-WB Encoder: Enable sample app
8fb933c6fccc527f53c4b0ca7c786a492819e096 11-Aug-2015 Andy Hung <hunga@google.com> Merge "Add test for AMR-WB decoder"
98ec7d4997f061e45b997b4795a153bff08101b9 21-May-2014 Ashok Bhat <ashok.bhat@arm.com> Add test for AMR-WB decoder

The test accepts a .amr file as input and dumps output PCM
in a wav file.

To run the test, use following command
libstagefright_amrwbdec_test <input amr> <output wav>

Bug: 17722566
Change-Id: Icbc780561b774cf02b48a6a23fd7c04e8e984ab6
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
odecs/amrwb/Android.mk
odecs/amrwb/test/amrwbdec_test.cpp
bb3e69dec3a2a47a1dfae0591f9e39a550e44ea3 11-Aug-2015 Andy Hung <hunga@google.com> Merge "AMR-WB Encoder: Enable sample app"
3c6813df08299433a32e56e90e2820b25346d07a 27-May-2014 Ashok Bhat <ashok.bhat@arm.com> AMR-WB Encoder: Enable sample app

[x] Changes to SampleCode/Android.mk
Sample code now statically links to AMR WB encoder rather
than dynamically loading AMR WB encoder library. This is done
by not defining LINUX in Android.mk.

[x] Changes to Android.mk
Sample code make file is now included in the overall build,
allowing it to built from the root directory.

Bug: 17722566
Change-Id: I0a5960b20069e223bba388e38c8465bde144426f
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
odecs/amrwbenc/Android.mk
odecs/amrwbenc/SampleCode/AMRWB_E_SAMPLE.c
odecs/amrwbenc/SampleCode/Android.mk
360dbe4985eb26e06b02a095060b64b7467fe1c7 11-Aug-2015 Andy Hung <hunga@google.com> am 7797b66a: am 3192cbda: am 5cc5fd61: Merge "AMR-NB encoder: Add test"

* commit '7797b66a480109406403f9b8785fe06fa3dff2e9':
AMR-NB encoder: Add test
7797b66a480109406403f9b8785fe06fa3dff2e9 11-Aug-2015 Andy Hung <hunga@google.com> am 3192cbda: am 5cc5fd61: Merge "AMR-NB encoder: Add test"

* commit '3192cbda623e55a8c47925aa77df68c729d91c1a':
AMR-NB encoder: Add test
060abccce3b8f897d4c688336fa3d17dbe331c88 11-Aug-2015 Andy Hung <hunga@google.com> am 3192cbda: am 5cc5fd61: Merge "AMR-NB encoder: Add test"

* commit '3192cbda623e55a8c47925aa77df68c729d91c1a':
AMR-NB encoder: Add test
355de17f2ab85441f71f7fd68e88a9d9c300e715 11-Aug-2015 Andy Hung <hunga@google.com> am b0de31a0: am 11f84239: am f98021ce: Merge "Add test for mp3 decoder"

* commit 'b0de31a021471421bf8007b04487cdf20329c754':
Add test for mp3 decoder
5cc5fd61d46f8e120e583595d6ce1cccc387c4af 11-Aug-2015 Andy Hung <hunga@google.com> Merge "AMR-NB encoder: Add test"
b0de31a021471421bf8007b04487cdf20329c754 11-Aug-2015 Andy Hung <hunga@google.com> am 11f84239: am f98021ce: Merge "Add test for mp3 decoder"

* commit '11f84239b9c926aaca74c1e952f10c7aaec7f385':
Add test for mp3 decoder
f1333994d6ca35dc75a47808cf3a8037d012f3cc 11-Aug-2015 Andy Hung <hunga@google.com> am 11f84239: am f98021ce: Merge "Add test for mp3 decoder"

* commit '11f84239b9c926aaca74c1e952f10c7aaec7f385':
Add test for mp3 decoder
ab44ed5712c23577b9dc3ab2ee469f27298b77e5 27-May-2014 Ashok Bhat <ashok.bhat@arm.com> AMR-NB encoder: Add test

The test accepts a raw PCM file as input and generates
.amr file as output.

To run the test, use following command
libstagefright_amrnbenc_test [options] <input pcm file> <output amr file>

Bug: 17722566
Change-Id: I4429af482223a1b28e847f91349900706c468d75
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
odecs/amrnb/enc/Android.mk
odecs/amrnb/enc/test/amrnb_enc_test.cpp
3508d77cf7b619d33d236533a45eea1a7321cc5a 12-May-2014 Ashok Bhat <ashok.bhat@arm.com> Add test for mp3 decoder

The test accepts a mp3 file as an input and
dumps output PCM in a wav file.

[x] Command to run the test
libstagefright_mp3dec_test <input mp3> <output wav>

[x] Sources
MP3 reader portion of test contains code from
frameworks/av/media/libstagefright/MP3Extractor.cpp.

Bug: 17722566
Change-Id: If4586a7cd6d5bc9cecea34aacfb89db458ea3814
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
odecs/mp3dec/Android.mk
odecs/mp3dec/test/mp3dec_test.cpp
odecs/mp3dec/test/mp3reader.cpp
odecs/mp3dec/test/mp3reader.h
94f8150be2041f73c2f185f2c3622a9537d47454 11-Aug-2015 Nick Kralevich <nnk@google.com> resolved conflicts for merge of c86eae32 to klp-modular-dev

Change-Id: I127912aed9c9e57a985c46bee13d111e159d2c6f
c86eae32ebb0cc580a13dde30fe765a96b8e701c 11-Aug-2015 Nick Kralevich <nnk@google.com> am 9d9491f9: am 0dbd0d7b: am c9924410: am 2fe61ed0: am 3b8d3fa0: am 186d1fb9: am f4dfe12e: am 54d88fe2: am aa8dab77: Merge "MPEG4Extractor.cpp: Add check for size == SIZE_MAX" into jb-dev

* commit '9d9491f9fb83523cfe68f2aa26c14f72f70812fc':
MPEG4Extractor.cpp: Add check for size == SIZE_MAX
9d9491f9fb83523cfe68f2aa26c14f72f70812fc 11-Aug-2015 Nick Kralevich <nnk@google.com> am 0dbd0d7b: am c9924410: am 2fe61ed0: am 3b8d3fa0: am 186d1fb9: am f4dfe12e: am 54d88fe2: am aa8dab77: Merge "MPEG4Extractor.cpp: Add check for size == SIZE_MAX" into jb-dev

* commit '0dbd0d7bfe340ac46271c7f87969431b62a023ed':
MPEG4Extractor.cpp: Add check for size == SIZE_MAX
0dbd0d7bfe340ac46271c7f87969431b62a023ed 11-Aug-2015 Nick Kralevich <nnk@google.com> am c9924410: am 2fe61ed0: am 3b8d3fa0: am 186d1fb9: am f4dfe12e: am 54d88fe2: am aa8dab77: Merge "MPEG4Extractor.cpp: Add check for size == SIZE_MAX" into jb-dev

* commit 'c99244105803ac32f4cc698b5b2a85b225d925a2':
MPEG4Extractor.cpp: Add check for size == SIZE_MAX
c99244105803ac32f4cc698b5b2a85b225d925a2 11-Aug-2015 Nick Kralevich <nnk@google.com> am 2fe61ed0: am 3b8d3fa0: am 186d1fb9: am f4dfe12e: am 54d88fe2: am aa8dab77: Merge "MPEG4Extractor.cpp: Add check for size == SIZE_MAX" into jb-dev

* commit '2fe61ed032e083dc39265f3b88274fcb8fbeed9b':
MPEG4Extractor.cpp: Add check for size == SIZE_MAX
186d1fb9b72439c1c3317d72e4a0f52f466e6861 11-Aug-2015 Nick Kralevich <nnk@google.com> am f4dfe12e: am 54d88fe2: am aa8dab77: Merge "MPEG4Extractor.cpp: Add check for size == SIZE_MAX" into jb-dev

* commit 'f4dfe12ecd26e7d6965a2abc062709b6d7d942c4':
MPEG4Extractor.cpp: Add check for size == SIZE_MAX
f4dfe12ecd26e7d6965a2abc062709b6d7d942c4 11-Aug-2015 Nick Kralevich <nnk@google.com> am 54d88fe2: am aa8dab77: Merge "MPEG4Extractor.cpp: Add check for size == SIZE_MAX" into jb-dev

* commit '54d88fe2f17b1c5c6e4d0d1d1e36089fea3a1df0':
MPEG4Extractor.cpp: Add check for size == SIZE_MAX
54d88fe2f17b1c5c6e4d0d1d1e36089fea3a1df0 11-Aug-2015 Nick Kralevich <nnk@google.com> am aa8dab77: Merge "MPEG4Extractor.cpp: Add check for size == SIZE_MAX" into jb-dev

* commit 'aa8dab77aa9ef1bb6e5414ee5e773001de725bef':
MPEG4Extractor.cpp: Add check for size == SIZE_MAX
c054b102e7d6c757fa2182ecfdf36a6dd172537f 11-Aug-2015 Dan Albert <danalbert@google.com> am d2de4564: am 725569fd: am e3884972: Merge "Don\'t use `register`."

* commit 'd2de4564d092234999d846d1382796c1a05e92b3':
Don't use `register`.
d2de4564d092234999d846d1382796c1a05e92b3 11-Aug-2015 Dan Albert <danalbert@google.com> am 725569fd: am e3884972: Merge "Don\'t use `register`."

* commit '725569fdbf0181903363ad28127526ac182b0e4f':
Don't use `register`.
dfd2e4534aae59ac4bc5c99bbb76a16aa2024158 11-Aug-2015 Dan Albert <danalbert@google.com> am 725569fd: am e3884972: Merge "Don\'t use `register`."

* commit '725569fdbf0181903363ad28127526ac182b0e4f':
Don't use `register`.
28af4c3993e18559099401cbf65dade17b80c181 11-Aug-2015 Dan Albert <danalbert@google.com> Don't use `register`.

This causes a build failure with GCC and C++14. Fix by just not using
the register keyword.

"Guideline: Never write register. It's exactly as meaningful as
whitespace."
http://www.drdobbs.com/keywords-that-arent-or-comments-by-anoth/184403859

Change-Id: I275735c55e97e613e1704c1b896793740db8f404
odecs/amrnb/enc/src/l_negate.cpp
44acf85580f1b03a1165ee01f75f212f564c567d 08-Aug-2015 Nick Kralevich <nnk@google.com> am 75d1f42a: am 15054fac: am 9872cdce: am 5aa85d05: am 74cda34a: am 41d93c2f: am c88ddfc0: am 2abbc048: am ba34c2ba: am f59348ed: am 0080e03e: am 3ebcce0e: am 2c0f9591: am fea5921b: am 9fff1d37: am d9d35098: am af6b3a6b: am bce77a36: am 0e20b209: MPEG4Extractor.cpp: h

* commit '75d1f42aa4716823f08af625f1146c9121ad22da':
MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX
75d1f42aa4716823f08af625f1146c9121ad22da 08-Aug-2015 Nick Kralevich <nnk@google.com> am 15054fac: am 9872cdce: am 5aa85d05: am 74cda34a: am 41d93c2f: am c88ddfc0: am 2abbc048: am ba34c2ba: am f59348ed: am 0080e03e: am 3ebcce0e: am 2c0f9591: am fea5921b: am 9fff1d37: am d9d35098: am af6b3a6b: am bce77a36: am 0e20b209: MPEG4Extractor.cpp: handle chunk_s

* commit '15054fac95cd9e1c6b3db52f215f284f1a3658c8':
MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX
f817c9c56915799008c2f2c346a9d2bfbf488e71 08-Aug-2015 Nick Kralevich <nnk@google.com> am 9872cdce: am 5aa85d05: am 74cda34a: am 41d93c2f: am c88ddfc0: am 2abbc048: am ba34c2ba: am f59348ed: am 0080e03e: am 3ebcce0e: am 2c0f9591: am fea5921b: am 9fff1d37: am d9d35098: am af6b3a6b: am bce77a36: am 0e20b209: MPEG4Extractor.cpp: handle chunk_size > SIZE_MA

* commit '9872cdceaf76727e9ccc353ee41957b957b76566':
MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX
9872cdceaf76727e9ccc353ee41957b957b76566 08-Aug-2015 Nick Kralevich <nnk@google.com> am 5aa85d05: am 74cda34a: am 41d93c2f: am c88ddfc0: am 2abbc048: am ba34c2ba: am f59348ed: am 0080e03e: am 3ebcce0e: am 2c0f9591: am fea5921b: am 9fff1d37: am d9d35098: am af6b3a6b: am bce77a36: am 0e20b209: MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX

* commit '5aa85d05aaeb5509597b7876942b6f5e543a451c':
MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX
5aa85d05aaeb5509597b7876942b6f5e543a451c 08-Aug-2015 Nick Kralevich <nnk@google.com> am 74cda34a: am 41d93c2f: am c88ddfc0: am 2abbc048: am ba34c2ba: am f59348ed: am 0080e03e: am 3ebcce0e: am 2c0f9591: am fea5921b: am 9fff1d37: am d9d35098: am af6b3a6b: am bce77a36: am 0e20b209: MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX

* commit '74cda34ac909eb713cec22bebb08ecaeefd8f7dd':
MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX
41d93c2f0a744fc6cd1aafce9a0eef57355bbf0f 08-Aug-2015 Nick Kralevich <nnk@google.com> am c88ddfc0: am 2abbc048: am ba34c2ba: am f59348ed: am 0080e03e: am 3ebcce0e: am 2c0f9591: am fea5921b: am 9fff1d37: am d9d35098: am af6b3a6b: am bce77a36: am 0e20b209: MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX

* commit 'c88ddfc09338969a4c8fc32be1d3dffb9022a237':
MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX
2abbc048837182bda04037f53309cde4c73f017d 08-Aug-2015 Nick Kralevich <nnk@google.com> am ba34c2ba: am f59348ed: am 0080e03e: am 3ebcce0e: am 2c0f9591: am fea5921b: am 9fff1d37: am d9d35098: am af6b3a6b: am bce77a36: am 0e20b209: MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX

* commit 'ba34c2ba414352ed0c1b9188f51c5445b04af2c6':
MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX
ba34c2ba414352ed0c1b9188f51c5445b04af2c6 08-Aug-2015 Nick Kralevich <nnk@google.com> am f59348ed: am 0080e03e: am 3ebcce0e: am 2c0f9591: am fea5921b: am 9fff1d37: am d9d35098: am af6b3a6b: am bce77a36: am 0e20b209: MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX

* commit 'f59348edfc54baa8f6e6532c6484656cf444d199':
MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX
f59348edfc54baa8f6e6532c6484656cf444d199 08-Aug-2015 Nick Kralevich <nnk@google.com> am 0080e03e: am 3ebcce0e: am 2c0f9591: am fea5921b: am 9fff1d37: am d9d35098: am af6b3a6b: am bce77a36: am 0e20b209: MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX

* commit '0080e03e2a69dcb5ecbcb2848f358ca73163714c':
MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX
0080e03e2a69dcb5ecbcb2848f358ca73163714c 08-Aug-2015 Nick Kralevich <nnk@google.com> am 3ebcce0e: am 2c0f9591: am fea5921b: am 9fff1d37: am d9d35098: am af6b3a6b: am bce77a36: am 0e20b209: MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX

* commit '3ebcce0e3fda1ffae9453ca0cc389ee852e1d0a2':
MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX
3ebcce0e3fda1ffae9453ca0cc389ee852e1d0a2 08-Aug-2015 Nick Kralevich <nnk@google.com> am 2c0f9591: am fea5921b: am 9fff1d37: am d9d35098: am af6b3a6b: am bce77a36: am 0e20b209: MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX

* commit '2c0f959112a1d9048e8dc527f2f9dc0cc3e490c9':
MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX
2c0f959112a1d9048e8dc527f2f9dc0cc3e490c9 08-Aug-2015 Nick Kralevich <nnk@google.com> am fea5921b: am 9fff1d37: am d9d35098: am af6b3a6b: am bce77a36: am 0e20b209: MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX

* commit 'fea5921b975cf43c88b8f93d4f2500abde6088be':
MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX
d9d35098aaaa546d79d0707734aac9b4b12c5be1 08-Aug-2015 Nick Kralevich <nnk@google.com> am af6b3a6b: am bce77a36: am 0e20b209: MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX

* commit 'af6b3a6bc44e65e6dbf95c1e5dadf76aa78018d9':
MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX
aa8dab77aa9ef1bb6e5414ee5e773001de725bef 08-Aug-2015 Nick Kralevich <nnk@google.com> Merge "MPEG4Extractor.cpp: Add check for size == SIZE_MAX" into jb-dev
f647c38a3e4b065fc26d0a8bb55071dae1028ac2 08-Aug-2015 Marco Nelissen <marcone@google.com> am 648ec9da: am 92b5c47a: am 32739430: am fbf55d85: am 80c17e0d: am 450e1015: Fix Ogg album art

* commit '648ec9da3bcf1b9b47f2abf6bfcb2fdf54db7b09':
Fix Ogg album art
92b5c47a21d2966348c77e86d5361e41731fb48c 08-Aug-2015 Marco Nelissen <marcone@google.com> am 32739430: am fbf55d85: am 80c17e0d: am 450e1015: Fix Ogg album art

* commit '32739430ee20467debd6279d472d976e9f8d6a9f':
Fix Ogg album art
fbf55d85b398fc7ddd6b4d7442dca932bc1593e6 08-Aug-2015 Marco Nelissen <marcone@google.com> am 80c17e0d: am 450e1015: Fix Ogg album art

* commit '80c17e0d42248053edf7243e026995fefcf6aabd':
Fix Ogg album art
781b777331ac161e92f4e1fb049fc71a5a4c20cc 08-Aug-2015 Marco Nelissen <marcone@google.com> am 4b87b005: am 74b8de33: am 190dfbdb: Merge "Fix Ogg album art" into mnc-dev

* commit '4b87b0056c017a3a5fcbb5f355987294d4d70ec6':
Fix Ogg album art
80c17e0d42248053edf7243e026995fefcf6aabd 08-Aug-2015 Marco Nelissen <marcone@google.com> am 450e1015: Fix Ogg album art

* commit '450e1015b7939292ca988dd1b4f0303a094478e9':
Fix Ogg album art
b3adb709bd278004de5764ce45b51140aefcc4c8 08-Aug-2015 Marco Nelissen <marcone@google.com> am 6323529b: am 2424d28b: am c40ef744: am af3c0475: am 9c67741f: am 2e637bfd: Merge "Extra sanity checks on sample size and resolution" into klp-dev

* commit '6323529b60f29ad1e18757f4aadc08f2aa0e846b':
Extra sanity checks on sample size and resolution
2424d28b42edd66e6806244cddf2a5eb8675f652 08-Aug-2015 Marco Nelissen <marcone@google.com> am c40ef744: am af3c0475: am 9c67741f: am 2e637bfd: Merge "Extra sanity checks on sample size and resolution" into klp-dev

* commit 'c40ef74448ddb09b676cc4c79a202ee73fccad39':
Extra sanity checks on sample size and resolution
4b87b0056c017a3a5fcbb5f355987294d4d70ec6 08-Aug-2015 Marco Nelissen <marcone@google.com> am 74b8de33: am 190dfbdb: Merge "Fix Ogg album art" into mnc-dev

* commit '74b8de336254c335e126e7cee2c282e0e8113357':
Fix Ogg album art
af3c0475b9ee8b9e69e435b2bdd11e5c9172b050 08-Aug-2015 Marco Nelissen <marcone@google.com> am 9c67741f: am 2e637bfd: Merge "Extra sanity checks on sample size and resolution" into klp-dev

* commit '9c67741f9f7ccc1007c7ecb44b8037210c733723':
Extra sanity checks on sample size and resolution
9c67741f9f7ccc1007c7ecb44b8037210c733723 08-Aug-2015 Marco Nelissen <marcone@google.com> am 2e637bfd: Merge "Extra sanity checks on sample size and resolution" into klp-dev

* commit '2e637bfd64c59200414130671e32e3e087e9f147':
Extra sanity checks on sample size and resolution
4b4cd28e78148fb9e20d0a2409c0b54d9a9b2e91 08-Aug-2015 Marco Nelissen <marcone@google.com> am 190dfbdb: Merge "Fix Ogg album art" into mnc-dev

* commit '190dfbdbef28b34c2dcd155f2c9d815cc17141cc':
Fix Ogg album art
450e1015b7939292ca988dd1b4f0303a094478e9 06-Aug-2015 Marco Nelissen <marcone@google.com> Fix Ogg album art

Bug: 23036083
Bug: https://code.google.com/p/android/issues/detail?id=182053
Change-Id: I1a5cbe06990900160c2addade238c1e9feab8f71
(cherry picked from commit c63cc509404b9328aedd1be3adc4e87cd07b4eb1)
ggExtractor.cpp
190dfbdbef28b34c2dcd155f2c9d815cc17141cc 08-Aug-2015 Marco Nelissen <marcone@google.com> Merge "Fix Ogg album art" into mnc-dev
2e637bfd64c59200414130671e32e3e087e9f147 08-Aug-2015 Marco Nelissen <marcone@google.com> Merge "Extra sanity checks on sample size and resolution" into klp-dev
af6b3a6bc44e65e6dbf95c1e5dadf76aa78018d9 08-Aug-2015 Nick Kralevich <nnk@google.com> am bce77a36: am 0e20b209: MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX

* commit 'bce77a36125b25ce864b40bd5938ca89becea898':
MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX
a8f5e0c24143299e3b3d722487de7322f7761559 08-Aug-2015 Pablo Ceballos <pceballos@google.com> stagefright: Rename mBuf to mSlot

Bug: 19769719
Change-Id: I224b5fcf9548f067fc36f61595282e671b4bb1db
ediaSync.cpp
urfaceMediaSource.cpp
ilters/GraphicBufferListener.cpp
ilters/MediaFilter.cpp
mx/GraphicBufferSource.cpp
mx/GraphicBufferSource.h
c63cc509404b9328aedd1be3adc4e87cd07b4eb1 06-Aug-2015 Marco Nelissen <marcone@google.com> Fix Ogg album art

Bug: 23036083
Bug: https://code.google.com/p/android/issues/detail?id=182053
Change-Id: I1a5cbe06990900160c2addade238c1e9feab8f71
ggExtractor.cpp
ba43a07ffbee60cb7e2fe1d786c127913adf5982 07-Aug-2015 Nick Kralevich <nnk@google.com> am 2ca9865e: am 1a053a0a: am 6f3dc2f3: am c253c1fd: am b449e469: am c5707784: MPEG4Extractor.cpp: Add check for size == SIZE_MAX

* commit '2ca9865ea0c8124c6cbb48c023aec267d3e78978':
MPEG4Extractor.cpp: Add check for size == SIZE_MAX
bce77a36125b25ce864b40bd5938ca89becea898 07-Aug-2015 Nick Kralevich <nnk@google.com> am 0e20b209: MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX

* commit '0e20b2093aa2bbc93afed8d68d3765d18a431b74':
MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX
0e20b2093aa2bbc93afed8d68d3765d18a431b74 07-Aug-2015 Nick Kralevich <nnk@google.com> MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX

chunk_size is a uint64_t, so it can legitimately be bigger
than SIZE_MAX, which would cause the subtraction to underflow.

https://code.google.com/p/android/issues/detail?id=182251

Bug: 23034759
Change-Id: Ic1637fb26bf6edb0feb1bcf2876fd370db1ed547
PEG4Extractor.cpp
67630f47356b35ba3cf25ff0cd9ffc9b91c1ac45 07-Aug-2015 Nick Kralevich <nnk@google.com> am 2ca9865e: am 1a053a0a: am 6f3dc2f3: am c253c1fd: am b449e469: am c5707784: MPEG4Extractor.cpp: Add check for size == SIZE_MAX

* commit '2ca9865ea0c8124c6cbb48c023aec267d3e78978':
MPEG4Extractor.cpp: Add check for size == SIZE_MAX
2ca9865ea0c8124c6cbb48c023aec267d3e78978 07-Aug-2015 Nick Kralevich <nnk@google.com> am 1a053a0a: am 6f3dc2f3: am c253c1fd: am b449e469: am c5707784: MPEG4Extractor.cpp: Add check for size == SIZE_MAX

* commit '1a053a0ae002cdda31c39d4c7447b1f7e65dfec6':
MPEG4Extractor.cpp: Add check for size == SIZE_MAX
1a053a0ae002cdda31c39d4c7447b1f7e65dfec6 07-Aug-2015 Nick Kralevich <nnk@google.com> am 6f3dc2f3: am c253c1fd: am b449e469: am c5707784: MPEG4Extractor.cpp: Add check for size == SIZE_MAX

* commit '6f3dc2f34ed8043d30937f436979ef360dcf3774':
MPEG4Extractor.cpp: Add check for size == SIZE_MAX
8ae31aa2497a6f786b4ab1bfa48a36ab3f82c9c3 07-Aug-2015 Marco Nelissen <marcone@google.com> am a3faa098: am e0e37e13: am 48192b84: am 0625841d: am dfaea255: am 578d5b66: am 171b5fad: am d6ea7f65: am f26400c9: Fix crash on malformed id3

* commit 'a3faa0987de4a140c091767086fb697212193f14':
Fix crash on malformed id3
a3faa0987de4a140c091767086fb697212193f14 07-Aug-2015 Marco Nelissen <marcone@google.com> am e0e37e13: am 48192b84: am 0625841d: am dfaea255: am 578d5b66: am 171b5fad: am d6ea7f65: am f26400c9: Fix crash on malformed id3

* commit 'e0e37e13bc9e62e58484d1e54e66eaf506744548':
Fix crash on malformed id3
a1e21653e86d21a4ab0946ee2761b6f0163d5742 07-Aug-2015 Nick Kralevich <nnk@google.com> MPEG4Extractor.cpp: Add check for size == SIZE_MAX

If size == SIZE_MAX, the line:

uint8_t *buffer = new (std::nothrow) uint8_t[size + 1];

ends up allocating zero bytes, which is obviously incorrect.

This is conceptually a cherrypick of commit
b2d33aee5122c91a59c2a676c0b89ad340232450 , but specifically for
Android 4.1 through Android 4.4. In Android 5.0, new code
was introduced which caused the function parseMetaData()
to be renamed.

Bug: 23031033
Change-Id: Ib34e740f3292a484f8a24e513c1cce58f2f33ecb
PEG4Extractor.cpp
c253c1fdfebf6c9f6f7ee8ebbf6e0759c431e947 07-Aug-2015 Nick Kralevich <nnk@google.com> am b449e469: am c5707784: MPEG4Extractor.cpp: Add check for size == SIZE_MAX

* commit 'b449e46904854eccea79a40e16b2ba5132611bf3':
MPEG4Extractor.cpp: Add check for size == SIZE_MAX
9504f73ea57e43d5065219829857829c5289d519 07-Aug-2015 Marco Nelissen <marcone@google.com> am e0e37e13: am 48192b84: am 0625841d: am dfaea255: am 578d5b66: am 171b5fad: am d6ea7f65: am f26400c9: Fix crash on malformed id3

* commit 'e0e37e13bc9e62e58484d1e54e66eaf506744548':
Fix crash on malformed id3
e0e37e13bc9e62e58484d1e54e66eaf506744548 07-Aug-2015 Marco Nelissen <marcone@google.com> am 48192b84: am 0625841d: am dfaea255: am 578d5b66: am 171b5fad: am d6ea7f65: am f26400c9: Fix crash on malformed id3

* commit '48192b84db39879e7d83a2f4e7023048fb81ee8e':
Fix crash on malformed id3
9364bdc9a1298a609eb825be051c393cbf3d7a38 07-Aug-2015 Joshua J. Drake <android-open-source@qoop.org> am 905aae46: am 11c88f66: am 2796ba1c: am a555788d: am 0e33cb2d: am e4ccf3a1: am 3329a19b: am c87faed6: Fix integer underflow in covr MPEG4 processing

* commit '905aae465fa88d6d793c670c08c360900c6cb3f7':
Fix integer underflow in covr MPEG4 processing
3621c05605c5a3f2c452668beacb71a08dc2d7c8 07-Aug-2015 Joshua J. Drake <android-open-source@qoop.org> am bcc8e581: am bb99a362: am 8d60fc3e: am 338bbf53: am fd334e34: am 03d539a7: am a5b9055d: am f1ce97dd: Fix integer overflow when handling MPEG4 tx3g atom

* commit 'bcc8e5817fa3dc624f214e58f756098053ac5682':
Fix integer overflow when handling MPEG4 tx3g atom
d0af1dedf5d903a52fac58f694b3f8edbf20e656 07-Aug-2015 Nick Kralevich <nnk@google.com> am a421314f: am 430475da: resolved conflicts for merge of 0b3eca88 to jb-mr1-dev-plus-aosp

* commit 'a421314f9cc1b061d94a79e2aa1a92916ea4b9bf':
Prevent integer overflow when processing covr MPEG4 atoms
c570778430a22b5488cae72982cf9fb8033dbda3 04-Aug-2015 Nick Kralevich <nnk@google.com> MPEG4Extractor.cpp: Add check for size == SIZE_MAX

If size == SIZE_MAX, the line:

uint8_t *buffer = new (std::nothrow) uint8_t[size + 1];

ends up allocating zero bytes, which is obviously incorrect.

(cherry picked from commit b2d33aee5122c91a59c2a676c0b89ad340232450)

Bug: 23031033
Change-Id: I8027247a4e24d2c8a8b4eac88c3643eccda108b9
PEG4Extractor.cpp
905aae465fa88d6d793c670c08c360900c6cb3f7 07-Aug-2015 Joshua J. Drake <android-open-source@qoop.org> am 11c88f66: am 2796ba1c: am a555788d: am 0e33cb2d: am e4ccf3a1: am 3329a19b: am c87faed6: Fix integer underflow in covr MPEG4 processing

* commit '11c88f66205dd9095cbe87f3486ef7262e4d2e22':
Fix integer underflow in covr MPEG4 processing
bcc8e5817fa3dc624f214e58f756098053ac5682 07-Aug-2015 Joshua J. Drake <android-open-source@qoop.org> am bb99a362: am 8d60fc3e: am 338bbf53: am fd334e34: am 03d539a7: am a5b9055d: am f1ce97dd: Fix integer overflow when handling MPEG4 tx3g atom

* commit 'bb99a362dc76f9bf040f6256369fabf27ad1c2f5':
Fix integer overflow when handling MPEG4 tx3g atom
a421314f9cc1b061d94a79e2aa1a92916ea4b9bf 07-Aug-2015 Nick Kralevich <nnk@google.com> am 430475da: resolved conflicts for merge of 0b3eca88 to jb-mr1-dev-plus-aosp

* commit '430475da7f0edb86ee6a85378d1583ab07f7f93d':
Prevent integer overflow when processing covr MPEG4 atoms
11c88f66205dd9095cbe87f3486ef7262e4d2e22 07-Aug-2015 Joshua J. Drake <android-open-source@qoop.org> am 2796ba1c: am a555788d: am 0e33cb2d: am e4ccf3a1: am 3329a19b: am c87faed6: Fix integer underflow in covr MPEG4 processing

* commit '2796ba1c511517a4904d10d1fdc830c86d161342':
Fix integer underflow in covr MPEG4 processing
bb99a362dc76f9bf040f6256369fabf27ad1c2f5 07-Aug-2015 Joshua J. Drake <android-open-source@qoop.org> am 8d60fc3e: am 338bbf53: am fd334e34: am 03d539a7: am a5b9055d: am f1ce97dd: Fix integer overflow when handling MPEG4 tx3g atom

* commit '8d60fc3e3ecd4d7c2b18f25962f0ea42f3644ebd':
Fix integer overflow when handling MPEG4 tx3g atom
430475da7f0edb86ee6a85378d1583ab07f7f93d 07-Aug-2015 Nick Kralevich <nnk@google.com> resolved conflicts for merge of 0b3eca88 to jb-mr1-dev-plus-aosp

Bug: 20923261
Change-Id: I6fe12a7c5768f77454bd0391b07f4c3181607d14
2b50b7aa7d16014ccf35db7a7b4b5e84f7b4027c 04-Aug-2015 Nick Kralevich <nnk@google.com> MPEG4Extractor.cpp: Add check for size == SIZE_MAX

If size == SIZE_MAX, the line:

uint8_t *buffer = new (std::nothrow) uint8_t[size + 1];

ends up allocating zero bytes, which is obviously incorrect.

(cherrypicked from commit b2d33aee5122c91a59c2a676c0b89ad340232450)

Change-Id: I7d44a66b67c590041572e25d1fbd1de94401a77f
PEG4Extractor.cpp
48192b84db39879e7d83a2f4e7023048fb81ee8e 07-Aug-2015 Marco Nelissen <marcone@google.com> am 0625841d: am dfaea255: am 578d5b66: am 171b5fad: am d6ea7f65: am f26400c9: Fix crash on malformed id3

* commit '0625841daae5bb1351034909ce705aab517eea2d':
Fix crash on malformed id3
dfaea255546340742b42c216663f61c6b7301c4f 07-Aug-2015 Marco Nelissen <marcone@google.com> am 578d5b66: am 171b5fad: am d6ea7f65: am f26400c9: Fix crash on malformed id3

* commit '578d5b66fc9f5e36ca0cb19b21771aa85ec131ee':
Fix crash on malformed id3
171b5fadb9d304f5e06686e4f3d060ef335d7250 07-Aug-2015 Marco Nelissen <marcone@google.com> am d6ea7f65: am f26400c9: Fix crash on malformed id3

* commit 'd6ea7f65dd31d5dacf497cc3c494d4fa3910f7c3':
Fix crash on malformed id3
d6ea7f65dd31d5dacf497cc3c494d4fa3910f7c3 07-Aug-2015 Marco Nelissen <marcone@google.com> am f26400c9: Fix crash on malformed id3

* commit 'f26400c9d01a0e2f71690d5ebc644270f098d590':
Fix crash on malformed id3
823b29a19ae0481384b7c1ce512f5a3bbd248acd 07-Aug-2015 Marco Nelissen <marcone@google.com> am 0f95f8a7: am dc21af06: Merge "Check that we have enough bits to read" into mnc-dev

* commit '0f95f8a77d1425b69c6309e4f0a892813ad6ba03':
Check that we have enough bits to read
0f95f8a77d1425b69c6309e4f0a892813ad6ba03 07-Aug-2015 Marco Nelissen <marcone@google.com> am dc21af06: Merge "Check that we have enough bits to read" into mnc-dev

* commit 'dc21af06560005f5e1cbb29ad60555ea08a5cf93':
Check that we have enough bits to read
3e763b6751c11ad62deda7f7de16f4ec4b38c87e 07-Aug-2015 Marco Nelissen <marcone@google.com> am dc21af06: Merge "Check that we have enough bits to read" into mnc-dev

* commit 'dc21af06560005f5e1cbb29ad60555ea08a5cf93':
Check that we have enough bits to read
dc21af06560005f5e1cbb29ad60555ea08a5cf93 07-Aug-2015 Marco Nelissen <marcone@google.com> Merge "Check that we have enough bits to read" into mnc-dev
1bab5c5d3a9272548b595f2b495c201c9c5d6543 07-Aug-2015 Marco Nelissen <marcone@google.com> am be273aee: am 51a87ac3: Merge "Guard against pssh overflows" into mnc-dev

* commit 'be273aee106e7023a05dbf641e886bcaec7a7a07':
Guard against pssh overflows
be273aee106e7023a05dbf641e886bcaec7a7a07 07-Aug-2015 Marco Nelissen <marcone@google.com> am 51a87ac3: Merge "Guard against pssh overflows" into mnc-dev

* commit '51a87ac31186204090f6e3d6570f7767b0a053a5':
Guard against pssh overflows
8e0cc331a5b2e24016d8c5b8da11591cdd7c0fc0 06-Aug-2015 Marco Nelissen <marcone@google.com> Check that we have enough bits to read

ABitReader doesn't like running out of bits.

Bug: 23010169
Change-Id: I11fc82834eec19617e63fc7817388391ed7a0634
PEG4Extractor.cpp
080f38bdb05f0f1732112d797623518a0bf57ed0 06-Aug-2015 Marco Nelissen <marcone@google.com> am 51a87ac3: Merge "Guard against pssh overflows" into mnc-dev

* commit '51a87ac31186204090f6e3d6570f7767b0a053a5':
Guard against pssh overflows
51a87ac31186204090f6e3d6570f7767b0a053a5 06-Aug-2015 Marco Nelissen <marcone@google.com> Merge "Guard against pssh overflows" into mnc-dev
ff76c1ed16b2056f6a118dfa18968c8653ad90ec 05-Aug-2015 Marco Nelissen <marcone@google.com> am 7173454f: am d24b430c: Merge "Extra sanity checks on sample size and resolution" into mnc-dev

* commit '7173454f27b64eec80b13cbde0f7d3d62f8abb20':
Extra sanity checks on sample size and resolution
7173454f27b64eec80b13cbde0f7d3d62f8abb20 05-Aug-2015 Marco Nelissen <marcone@google.com> am d24b430c: Merge "Extra sanity checks on sample size and resolution" into mnc-dev

* commit 'd24b430c3fc82e9288e9072971c9a185a18abd89':
Extra sanity checks on sample size and resolution
dfffbc11bb34f0a795570599a21d475e8cc20994 05-Aug-2015 Marco Nelissen <marcone@google.com> am d24b430c: Merge "Extra sanity checks on sample size and resolution" into mnc-dev

* commit 'd24b430c3fc82e9288e9072971c9a185a18abd89':
Extra sanity checks on sample size and resolution
e6f5d47a7f9eab8a0009f8a563de473cd47d3110 04-Aug-2015 Marco Nelissen <marcone@google.com> Extra sanity checks on sample size and resolution

Instead of rejecting the samples later when they don't fit in the
buffer, reject the entire file early.

Bug: 22882938
Change-Id: I748153b0e9e827e3f2526468756295b4b5000de6
(cherry picked from commit beef7e58c1f1837bdaed6ac37414d8c48a133813)
PEG4Extractor.cpp
d24b430c3fc82e9288e9072971c9a185a18abd89 05-Aug-2015 Marco Nelissen <marcone@google.com> Merge "Extra sanity checks on sample size and resolution" into mnc-dev
b3138e847bd53f99e1533d0d3ac7949e193d893a 05-Aug-2015 Wei Jia <wjia@google.com> am b275f875: am af7d7370: Merge "ACodec: send format change for video tunneled mode when omx has output crop change." into mnc-dev

* commit 'b275f87510c647d41993ef4d122ad4f99b215bab':
ACodec: send format change for video tunneled mode when omx has output crop change.
b275f87510c647d41993ef4d122ad4f99b215bab 05-Aug-2015 Wei Jia <wjia@google.com> am af7d7370: Merge "ACodec: send format change for video tunneled mode when omx has output crop change." into mnc-dev

* commit 'af7d737090a5c1d499b7dcbf54b795ad2f979ec2':
ACodec: send format change for video tunneled mode when omx has output crop change.
015544091f3568d464f8d2689983af7607c605a1 05-Aug-2015 Wei Jia <wjia@google.com> am af7d7370: Merge "ACodec: send format change for video tunneled mode when omx has output crop change." into mnc-dev

* commit 'af7d737090a5c1d499b7dcbf54b795ad2f979ec2':
ACodec: send format change for video tunneled mode when omx has output crop change.
af7d737090a5c1d499b7dcbf54b795ad2f979ec2 05-Aug-2015 Wei Jia <wjia@google.com> Merge "ACodec: send format change for video tunneled mode when omx has output crop change." into mnc-dev
9ac30bd4a43e025ce27c0a78bbe2ac05a66bcbda 05-Aug-2015 Wei Jia <wjia@google.com> am 9f7bceff: am fbf1c8d6: am 660620d4: am d8bb17e3: am 42bd61d7: am d9a9a324: am 10ef7f75: am b0924c63: am 7af634e1: am 8ec119d2: am d138024f: am b32957db: am a9d7c917: am a99d3d83: am 738a753a: SampleTable: fix integer overflow checks.

* commit '9f7bceff18052171b3042bda945d7e4e94b60f1c':
SampleTable: fix integer overflow checks.
4a10bddeee36039fbb915b35d0c7f9536446558c 05-Aug-2015 Marco Nelissen <marcone@google.com> am 79c896ea: am 26b7dfcf: am 0bde48f5: am 99a1a6a7: am e6ca5b2d: am 566c70ca: Guard against codecinfo overflow

* commit '79c896eab1626cc91d7d1942476e445e5a788239':
Guard against codecinfo overflow
98a421bfffe6b3a1b762d11740e90787bdfeac08 05-Aug-2015 Wei Jia <wjia@google.com> ACodec: send format change for video tunneled mode when omx has output crop change.

Bug: 21906777
Change-Id: Id6674a76e8f2620dd24bac9210cf8885fbd384bb
Codec.cpp
e1df7aa55be8ba6ddb31f47edca190edb662a5b1 05-Aug-2015 Marco Nelissen <marcone@google.com> am de267aef: am 0805add7: Merge "Guard against codecinfo overflow" into mnc-dev

* commit 'de267aefb3d366e1594ce1a924e0d05db2277aec':
Guard against codecinfo overflow
de267aefb3d366e1594ce1a924e0d05db2277aec 05-Aug-2015 Marco Nelissen <marcone@google.com> am 0805add7: Merge "Guard against codecinfo overflow" into mnc-dev

* commit '0805add748f6857cb7537a1e16562f59dc96e334':
Guard against codecinfo overflow
f26400c9d01a0e2f71690d5ebc644270f098d590 05-Aug-2015 Marco Nelissen <marcone@google.com> Fix crash on malformed id3

Bug: 22954006
Change-Id: I488cb1e2c69fc7043b6040481b30fa866000515d
etaData.cpp
d3/ID3.cpp
c63fbd6ec5db90dd180a132c699a0a9f1107160f 05-Aug-2015 Marco Nelissen <marcone@google.com> am 0805add7: Merge "Guard against codecinfo overflow" into mnc-dev

* commit '0805add748f6857cb7537a1e16562f59dc96e334':
Guard against codecinfo overflow
0805add748f6857cb7537a1e16562f59dc96e334 05-Aug-2015 Marco Nelissen <marcone@google.com> Merge "Guard against codecinfo overflow" into mnc-dev
0e33cb2dd5ccf6f4db8c694cb2c233bb1d2a2d0b 04-Aug-2015 Joshua J. Drake <android-open-source@qoop.org> am e4ccf3a1: am 3329a19b: am c87faed6: Fix integer underflow in covr MPEG4 processing

* commit 'e4ccf3a14beabfeeb6c7df47ae118f3db999c1ce':
Fix integer underflow in covr MPEG4 processing
fd334e346bd0fc9b11756539d1635eabdb6b04cb 04-Aug-2015 Joshua J. Drake <android-open-source@qoop.org> am 03d539a7: am a5b9055d: am f1ce97dd: Fix integer overflow when handling MPEG4 tx3g atom

* commit '03d539a7a9c8ae7aef9cb8bda9042187327566a2':
Fix integer overflow when handling MPEG4 tx3g atom
df1ecfe3913b9c3bce17947d877498093a42a56f 04-Aug-2015 Joshua J. Drake <android-open-source@qoop.org> am 52d1defc: am 9481a101: am a81b3779: Prevent integer overflow when processing covr MPEG4 atoms

* commit '52d1defcfe51bd3b5f4e191fb70a0a0a406c33dc':
Prevent integer overflow when processing covr MPEG4 atoms
e4ccf3a14beabfeeb6c7df47ae118f3db999c1ce 04-Aug-2015 Joshua J. Drake <android-open-source@qoop.org> am 3329a19b: am c87faed6: Fix integer underflow in covr MPEG4 processing

* commit '3329a19b4d11d3c1310bbe9aa54b6a66488ab862':
Fix integer underflow in covr MPEG4 processing
03d539a7a9c8ae7aef9cb8bda9042187327566a2 04-Aug-2015 Joshua J. Drake <android-open-source@qoop.org> am a5b9055d: am f1ce97dd: Fix integer overflow when handling MPEG4 tx3g atom

* commit 'a5b9055d7ce1d82ee29ed2f45aa4f8a82ccc76f2':
Fix integer overflow when handling MPEG4 tx3g atom
52d1defcfe51bd3b5f4e191fb70a0a0a406c33dc 04-Aug-2015 Joshua J. Drake <android-open-source@qoop.org> am 9481a101: am a81b3779: Prevent integer overflow when processing covr MPEG4 atoms

* commit '9481a101f8246263d969af66a7b39fad7346772e':
Prevent integer overflow when processing covr MPEG4 atoms
3329a19b4d11d3c1310bbe9aa54b6a66488ab862 04-Aug-2015 Joshua J. Drake <android-open-source@qoop.org> am c87faed6: Fix integer underflow in covr MPEG4 processing

* commit 'c87faed60483afb2466e03892bda80b72e5822c7':
Fix integer underflow in covr MPEG4 processing
a5b9055d7ce1d82ee29ed2f45aa4f8a82ccc76f2 04-Aug-2015 Joshua J. Drake <android-open-source@qoop.org> am f1ce97dd: Fix integer overflow when handling MPEG4 tx3g atom

* commit 'f1ce97ddc2f82d844a6fb8341585eb7b2e655f44':
Fix integer overflow when handling MPEG4 tx3g atom
9481a101f8246263d969af66a7b39fad7346772e 04-Aug-2015 Joshua J. Drake <android-open-source@qoop.org> am a81b3779: Prevent integer overflow when processing covr MPEG4 atoms

* commit 'a81b3779cc6f6046c8a9149bf544e9d726c9b2b2':
Prevent integer overflow when processing covr MPEG4 atoms
c87faed60483afb2466e03892bda80b72e5822c7 05-May-2015 Joshua J. Drake <android-open-source@qoop.org> Fix integer underflow in covr MPEG4 processing

When the 'chunk_data_size' variable is less than 'kSkipBytesOfDataBox', an
integer underflow can occur. This causes an extraordinarily large value to
be passed to MetaData::setData, leading to a buffer overflow.

Bug: 20923261
(cherry picked from commit 4a492bf2ac47b9844d2527e1fcdf0064c3d8d52e)

Change-Id: I83490cbaf5b368073fcd8668a9241dfc90bebd90
PEG4Extractor.cpp
f1ce97ddc2f82d844a6fb8341585eb7b2e655f44 05-May-2015 Joshua J. Drake <android-open-source@qoop.org> Fix integer overflow when handling MPEG4 tx3g atom

When the sum of the 'size' and 'chunk_size' variables is larger than 2^32,
an integer overflow occurs. Using the result value to allocate memory
leads to an undersized buffer allocation and later a potentially
exploitable heap corruption condition. Ensure that integer overflow does
not occur.

Bug: 20923261
(cherry picked from commit e5f0966c76bd0a7e81e4205c8d8b55e6b34c833e)

Change-Id: I3f240f75fd681becbf89cb7e7554388471c28059
PEG4Extractor.cpp
a81b3779cc6f6046c8a9149bf544e9d726c9b2b2 05-May-2015 Joshua J. Drake <android-open-source@qoop.org> Prevent integer overflow when processing covr MPEG4 atoms

If the 'chunk_data_size' value is SIZE_MAX, an integer overflow will occur
and cause an undersized buffer to be allocated. The following processing
then overfills the resulting memory and creates a potentially exploitable
condition. Ensure that integer overflow does not occur.

(cherrypicked from commit 05ddc499b9d50c90f552ed1333110f28a1406e7c)

Bug: 20923261
Change-Id: If09a02738759acdff8d95149bb9cb5f18a0a123e
PEG4Extractor.cpp
bb6854684d6470d7a3685134c792ca2e904f6e27 04-Aug-2015 Nick Kralevich <nnk@google.com> Merge "Revert "libstagefright: remove left shifts causing unsigned int overflow""
7cb0c2d8d87e5b82832875450b2f9184dab9e208 04-Aug-2015 Nick Kralevich <nnk@google.com> Revert "libstagefright: remove left shifts causing unsigned int overflow"

Causing the following build breakage:

frameworks/av/media/libstagefright/codecs/mp3dec/src/pvmp3_get_side_info.cpp:113:58: error: suggest parentheses around '-' inside '<<' [-Werror=parentheses]
#define mask_and_shift(tmp, a, b) ((tmp >> (b - a)) & (1 << (32 - b) - 1))
^
frameworks/av/media/libstagefright/codecs/mp3dec/src/pvmp3_get_side_info.cpp:222:52: note: in expansion of macro 'mask_and_shift'
si->ch[ch].gran[0].part2_3_length = mask_and_shift(tmp, 11, 20); /* 12 */
^
frameworks/av/media/libstagefright/codecs/mp3dec/src/pvmp3_get_side_info.cpp:113:58: error: suggest parentheses around '-' inside '<<' [-Werror=parentheses]
#define mask_and_shift(tmp, a, b) ((tmp >> (b - a)) & (1 << (32 - b) - 1))
^
frameworks/av/media/libstagefright/codecs/mp3dec/src/pvmp3_get_side_info.cpp:223:52: note: in expansion of macro 'mask_and_shift'
si->ch[ch].gran[0].big_values = mask_and_shift(tmp, 23, 23); /* 9 */
^

This reverts commit 18d5c836b74fa6e74806c8fb30bf33b7caeaabac.

Change-Id: I64fc05f92ffb22b79575ecc978d8b2bc2a95c5cc
odecs/mp3dec/src/pvmp3_get_side_info.cpp
be74af6496cca7590aff521b9ff6856ae48349ea 04-Aug-2015 Nick Kralevich <nnk@google.com> Merge "libstagefright: remove left shifts causing unsigned int overflow"
5ced6f837d1b09e13d1ee4ed83501ecd1d9c538b 04-Aug-2015 Nick Kralevich <nnk@google.com> Merge changes I89e3a827,I0ab786ca

* changes:
Fix harmless unsigned overflow in recoverPTS
Fix benign unsigned integer overflows in loop conditions
fbf1c8d65fe257847b35ec7289f9450ac34c8034 04-Aug-2015 Wei Jia <wjia@google.com> am 660620d4: am d8bb17e3: am 42bd61d7: am d9a9a324: am 10ef7f75: am b0924c63: am 7af634e1: am 8ec119d2: am d138024f: am b32957db: am a9d7c917: am a99d3d83: am 738a753a: SampleTable: fix integer overflow checks.

* commit '660620d43898b09126f54a7ca27ca34b011f4726':
SampleTable: fix integer overflow checks.
0f9936217148b5d45b48dc47313bf2d993fbab8c 04-Aug-2015 Marco Nelissen <marcone@google.com> am 61dfe1a6: am d2d16b93: Merge "We don\'t support mid-stream format changes" into mnc-dev

* commit '61dfe1a6b85844397749362d7eda749f7c57ac4c':
We don't support mid-stream format changes
61dfe1a6b85844397749362d7eda749f7c57ac4c 04-Aug-2015 Marco Nelissen <marcone@google.com> am d2d16b93: Merge "We don\'t support mid-stream format changes" into mnc-dev

* commit 'd2d16b937d66e2ce031d018d8cf8072914cd56ec':
We don't support mid-stream format changes
d8bb17e33ef33ce173fa2d096211785145d41921 04-Aug-2015 Wei Jia <wjia@google.com> am 42bd61d7: am d9a9a324: am 10ef7f75: am b0924c63: am 7af634e1: am 8ec119d2: am d138024f: am b32957db: am a9d7c917: am a99d3d83: am 738a753a: SampleTable: fix integer overflow checks.

* commit '42bd61d73e8b4d0b1101e73324a59fde51077112':
SampleTable: fix integer overflow checks.
42bd61d73e8b4d0b1101e73324a59fde51077112 04-Aug-2015 Wei Jia <wjia@google.com> am d9a9a324: am 10ef7f75: am b0924c63: am 7af634e1: am 8ec119d2: am d138024f: am b32957db: am a9d7c917: am a99d3d83: am 738a753a: SampleTable: fix integer overflow checks.

* commit 'd9a9a324766b26be2ff0d10537ea0b215b0261e3':
SampleTable: fix integer overflow checks.
26ade0b4ec7532757e74949760ba19a4b87fd9c9 04-Aug-2015 Marco Nelissen <marcone@google.com> am d2d16b93: Merge "We don\'t support mid-stream format changes" into mnc-dev

* commit 'd2d16b937d66e2ce031d018d8cf8072914cd56ec':
We don't support mid-stream format changes
d2d16b937d66e2ce031d018d8cf8072914cd56ec 04-Aug-2015 Marco Nelissen <marcone@google.com> Merge "We don't support mid-stream format changes" into mnc-dev
d9a9a324766b26be2ff0d10537ea0b215b0261e3 04-Aug-2015 Wei Jia <wjia@google.com> am 10ef7f75: am b0924c63: am 7af634e1: am 8ec119d2: am d138024f: am b32957db: am a9d7c917: am a99d3d83: am 738a753a: SampleTable: fix integer overflow checks.

* commit '10ef7f7514bdf6d9c38c93d9bb0194c0920d152f':
SampleTable: fix integer overflow checks.
10ef7f7514bdf6d9c38c93d9bb0194c0920d152f 04-Aug-2015 Wei Jia <wjia@google.com> am b0924c63: am 7af634e1: am 8ec119d2: am d138024f: am b32957db: am a9d7c917: am a99d3d83: am 738a753a: SampleTable: fix integer overflow checks.

* commit 'b0924c631cfccd10c1f95d6ae44c8cd852e14a9f':
SampleTable: fix integer overflow checks.
b0924c631cfccd10c1f95d6ae44c8cd852e14a9f 04-Aug-2015 Wei Jia <wjia@google.com> am 7af634e1: am 8ec119d2: am d138024f: am b32957db: am a9d7c917: am a99d3d83: am 738a753a: SampleTable: fix integer overflow checks.

* commit '7af634e131361862d2e47fb344278e31ed05be4f':
SampleTable: fix integer overflow checks.
7af634e131361862d2e47fb344278e31ed05be4f 04-Aug-2015 Wei Jia <wjia@google.com> am 8ec119d2: am d138024f: am b32957db: am a9d7c917: am a99d3d83: am 738a753a: SampleTable: fix integer overflow checks.

* commit '8ec119d2f033221e4cb0fd2b2948e780581b3d35':
SampleTable: fix integer overflow checks.
13d36a7a69e480da48119eea0bc9d43851543794 04-Jun-2015 Wei Jia <wjia@google.com> SampleTable: fix integer overflow checks.

Bug: 20139950
Change-Id: I6f4e3d4c734872074475d9346ed692a4baf77d79
ampleTable.cpp
b32957dbf4527251ad3b2bbda4ccc5fff4df0718 04-Aug-2015 Wei Jia <wjia@google.com> am a9d7c917: am a99d3d83: am 738a753a: SampleTable: fix integer overflow checks.

* commit 'a9d7c917d3a76d0bef9b8afe7ade206534be68a4':
SampleTable: fix integer overflow checks.
a9d7c917d3a76d0bef9b8afe7ade206534be68a4 04-Aug-2015 Wei Jia <wjia@google.com> am a99d3d83: am 738a753a: SampleTable: fix integer overflow checks.

* commit 'a99d3d8327d60c8f8ef3e34fc4b81ef382e9e6d2':
SampleTable: fix integer overflow checks.
a99d3d8327d60c8f8ef3e34fc4b81ef382e9e6d2 04-Aug-2015 Wei Jia <wjia@google.com> am 738a753a: SampleTable: fix integer overflow checks.

* commit '738a753a3ca7bf8f9f608ca941575626265294e4':
SampleTable: fix integer overflow checks.
beef7e58c1f1837bdaed6ac37414d8c48a133813 04-Aug-2015 Marco Nelissen <marcone@google.com> Extra sanity checks on sample size and resolution

Instead of rejecting the samples later when they don't fit in the
buffer, reject the entire file early.

Bug: 22882938
Change-Id: I748153b0e9e827e3f2526468756295b4b5000de6
PEG4Extractor.cpp
4d29fa302b4a93de9f4fc92b8054bae7b42688ac 04-Aug-2015 Harish Mahendrakar <harish.mahendrakar@ittiam.com> SoftAVCDec: Reduced memory requirements

Change-Id: I2aaaf88e7dc9a30156764f83a81fc0cad00142f9
odecs/avcdec/SoftAVCDec.cpp
odecs/avcdec/SoftAVCDec.h
738a753a3ca7bf8f9f608ca941575626265294e4 04-Jun-2015 Wei Jia <wjia@google.com> SampleTable: fix integer overflow checks.

Bug: 20139950
Bug: 22935234
(cherry picked from commit a105482ae577852ffd08ce88ae5d1ba81db875ac)

Change-Id: I408d261de1a6dd5c4343bcf3a7dfd8a259e0e2f3
ampleTable.cpp
cfc121128aef10a98e5ad9162f43e3f368abd103 04-Aug-2015 Joshua J. Drake <android-open-source@qoop.org> am ac7cb990: am b417986c: am d1c08d6b: am efa73c2e: am 2e24d091: am a59d5e66: am 8ef5da3d: am 4dd7cb69: Fix integer underflow in ESDS processing

* commit 'ac7cb990cc4c8a59a945ce36e5702e0adb213db4':
Fix integer underflow in ESDS processing
a9f1e993fa7849bc658d89a2faa58344faa88a5f 04-Aug-2015 Joshua J. Drake <android-open-source@qoop.org> am 134dc311: am 80a6d9f3: am e10c2e62: am 74ebcd65: am 272f4056: am 52302d91: am f354c48e: am 5c4428f6: Fix integer overflow during MP4 atom processing

* commit '134dc3110c401544e4d3a3a1deab1c131fb77720':
Fix integer overflow during MP4 atom processing
b77a6189a468a90fe74fafca862a31c3bf899ceb 04-Aug-2015 Joshua J. Drake <android-open-source@qoop.org> am 4837e90f: am 9c5578c1: am 36617c67: am 7374360f: am 4e44b2ee: am 4534ec1a: am 4a5fbf74: am 3cc11bfc: Fix several ineffective integer overflow checks

* commit '4837e90fd1d3fa127ef99652d314ad70f4776221':
Fix several ineffective integer overflow checks
ac7cb990cc4c8a59a945ce36e5702e0adb213db4 04-Aug-2015 Joshua J. Drake <android-open-source@qoop.org> am b417986c: am d1c08d6b: am efa73c2e: am 2e24d091: am a59d5e66: am 8ef5da3d: am 4dd7cb69: Fix integer underflow in ESDS processing

* commit 'b417986c3a3a6bb9ca33657385a3433ff54090b2':
Fix integer underflow in ESDS processing
134dc3110c401544e4d3a3a1deab1c131fb77720 04-Aug-2015 Joshua J. Drake <android-open-source@qoop.org> am 80a6d9f3: am e10c2e62: am 74ebcd65: am 272f4056: am 52302d91: am f354c48e: am 5c4428f6: Fix integer overflow during MP4 atom processing

* commit '80a6d9f37571c89905b8ae4074529a960a5f2194':
Fix integer overflow during MP4 atom processing
4837e90fd1d3fa127ef99652d314ad70f4776221 04-Aug-2015 Joshua J. Drake <android-open-source@qoop.org> am 9c5578c1: am 36617c67: am 7374360f: am 4e44b2ee: am 4534ec1a: am 4a5fbf74: am 3cc11bfc: Fix several ineffective integer overflow checks

* commit '9c5578c1a3bb00623d6ee99340ce0ce290e6c5a1':
Fix several ineffective integer overflow checks
b417986c3a3a6bb9ca33657385a3433ff54090b2 04-Aug-2015 Joshua J. Drake <android-open-source@qoop.org> am d1c08d6b: am efa73c2e: am 2e24d091: am a59d5e66: am 8ef5da3d: am 4dd7cb69: Fix integer underflow in ESDS processing

* commit 'd1c08d6bff6d1936cf0e9cbfa5054128f5280ef3':
Fix integer underflow in ESDS processing
80a6d9f37571c89905b8ae4074529a960a5f2194 04-Aug-2015 Joshua J. Drake <android-open-source@qoop.org> am e10c2e62: am 74ebcd65: am 272f4056: am 52302d91: am f354c48e: am 5c4428f6: Fix integer overflow during MP4 atom processing

* commit 'e10c2e621a0a49618c9d69a7dd09400c23464ced':
Fix integer overflow during MP4 atom processing
9c5578c1a3bb00623d6ee99340ce0ce290e6c5a1 04-Aug-2015 Joshua J. Drake <android-open-source@qoop.org> am 36617c67: am 7374360f: am 4e44b2ee: am 4534ec1a: am 4a5fbf74: am 3cc11bfc: Fix several ineffective integer overflow checks

* commit '36617c67a9c29d7f9798972b6514086b22b731f8':
Fix several ineffective integer overflow checks
2e24d0911ee585cbd447efe6150bafaaf8f9ef66 04-Aug-2015 Joshua J. Drake <android-open-source@qoop.org> am a59d5e66: am 8ef5da3d: am 4dd7cb69: Fix integer underflow in ESDS processing

* commit 'a59d5e6692d0b0dc0924144f596d09e7dd2b193c':
Fix integer underflow in ESDS processing
272f4056162e119db61fb304b01f0152c07b8e02 04-Aug-2015 Joshua J. Drake <android-open-source@qoop.org> am 52302d91: am f354c48e: am 5c4428f6: Fix integer overflow during MP4 atom processing

* commit '52302d917b06b11625b9de686153d1e2520f42cd':
Fix integer overflow during MP4 atom processing
4e44b2ee286bd993210aa81ad20ebbf1d1a816c6 04-Aug-2015 Joshua J. Drake <android-open-source@qoop.org> am 4534ec1a: am 4a5fbf74: am 3cc11bfc: Fix several ineffective integer overflow checks

* commit '4534ec1a552c125ef7eea0990a84fcefb58335b9':
Fix several ineffective integer overflow checks
a59d5e6692d0b0dc0924144f596d09e7dd2b193c 04-Aug-2015 Joshua J. Drake <android-open-source@qoop.org> am 8ef5da3d: am 4dd7cb69: Fix integer underflow in ESDS processing

* commit '8ef5da3ddddd1bb4356d9cc6df4d52ad8afc4459':
Fix integer underflow in ESDS processing
52302d917b06b11625b9de686153d1e2520f42cd 04-Aug-2015 Joshua J. Drake <android-open-source@qoop.org> am f354c48e: am 5c4428f6: Fix integer overflow during MP4 atom processing

* commit 'f354c48e386d1405d67882c382e26e3e4598e797':
Fix integer overflow during MP4 atom processing
4534ec1a552c125ef7eea0990a84fcefb58335b9 04-Aug-2015 Joshua J. Drake <android-open-source@qoop.org> am 4a5fbf74: am 3cc11bfc: Fix several ineffective integer overflow checks

* commit '4a5fbf74b493eb293918c41a5b5f60dd7b8ebb58':
Fix several ineffective integer overflow checks
8ef5da3ddddd1bb4356d9cc6df4d52ad8afc4459 04-Aug-2015 Joshua J. Drake <android-open-source@qoop.org> am 4dd7cb69: Fix integer underflow in ESDS processing

* commit '4dd7cb699f49b56f94a32080fdac7f0ec8237ff4':
Fix integer underflow in ESDS processing
f354c48e386d1405d67882c382e26e3e4598e797 04-Aug-2015 Joshua J. Drake <android-open-source@qoop.org> am 5c4428f6: Fix integer overflow during MP4 atom processing

* commit '5c4428f6391478ae983e1fcf7c42c832aa1a5e69':
Fix integer overflow during MP4 atom processing
4a5fbf74b493eb293918c41a5b5f60dd7b8ebb58 04-Aug-2015 Joshua J. Drake <android-open-source@qoop.org> am 3cc11bfc: Fix several ineffective integer overflow checks

* commit '3cc11bfc00cbb3ed87a4464777a75606b4973b51':
Fix several ineffective integer overflow checks
4dd7cb699f49b56f94a32080fdac7f0ec8237ff4 09-Apr-2015 Joshua J. Drake <android-open-source@qoop.org> Fix integer underflow in ESDS processing

Several arithmetic operations within parseESDescriptor could underflow, leading
to an out-of-bounds read operation. Ensure that subtractions from 'size' do not
cause it to wrap around.

Bug: 20139950
Change-Id: I0d1b136ce68fd7c6f606ce66714bf644cfb2961c
(cherry picked from commit 07c0f59d6c48874982d2b5c713487612e5af465a)
SDS.cpp
5c4428f6391478ae983e1fcf7c42c832aa1a5e69 09-Apr-2015 Joshua J. Drake <android-open-source@qoop.org> Fix integer overflow during MP4 atom processing

A few sample table related FourCC values are handled by the
setSampleToChunkParams function. An integer overflow exists within this
function. Validate that mNumSampleToChunkOffets will not cause an integer
overflow.

Bug: 20139950
Change-Id: I1972cc185fce5e058afa143ad5eabcc269ad324d
(cherry picked from commit c24607c29c96f939aed9e33bfa702b1dd79da4b7)
ampleTable.cpp
3cc11bfc00cbb3ed87a4464777a75606b4973b51 09-Apr-2015 Joshua J. Drake <android-open-source@qoop.org> Fix several ineffective integer overflow checks

Commit edd4a76 (which addressed bugs 15328708, 15342615, 15342751) added
several integer overflow checks. Unfortunately, those checks fail to take into
account integer promotion rules and are thus themselves subject to an integer
overflow. Cast the sizeof() operator to a uint64_t to force promotion while
multiplying.

Bug: 20139950
Change-Id: Ieb29a170edb805c722fc5658935f2390003e5260
(cherry picked from commit e2e812e58e8d2716b00d7d82db99b08d3afb4b32)
ampleTable.cpp
b2d33aee5122c91a59c2a676c0b89ad340232450 04-Aug-2015 Nick Kralevich <nnk@google.com> MPEG4Extractor.cpp: Add check for size == SIZE_MAX

If size == SIZE_MAX, the line:

uint8_t *buffer = new (std::nothrow) uint8_t[size + 1];

ends up allocating zero bytes, which is obviously incorrect.

Change-Id: I7d44a66b67c590041572e25d1fbd1de94401a77f
PEG4Extractor.cpp
3728ba367f1e23e652c5539d9488aa0d0d4ec9d7 01-Aug-2015 Chad Brubaker <cbrubaker@google.com> Fix harmless unsigned overflow in recoverPTS

Change-Id: I89e3a827cf566421e8dd9b6a3c842e73a19c140f
peg2ts/ATSParser.cpp
b92add32c22656dedfb82d26ccc168c43c92b8eb 31-Jul-2015 Chad Brubaker <cbrubaker@google.com> Fix benign unsigned integer overflows in loop conditions

This is causing an abort when running with unsigned integer overflow
detection, change the code to no longer do i-- when i = 0.

Change-Id: I0ab786cabb3a3d37fa24a3b8da0c35dd475ca273
Codec.cpp
mx/OMXNodeInstance.cpp
26b7dfcf65899b79fd339cad62eee293be6b2901 03-Aug-2015 Marco Nelissen <marcone@google.com> am 0bde48f5: am 99a1a6a7: am e6ca5b2d: am 566c70ca: Guard against codecinfo overflow

* commit '0bde48f53c285780c1e95fa55bcc7e46f8730320':
Guard against codecinfo overflow
99a1a6a79ca14554d2951101008348a9e2acbb8c 03-Aug-2015 Marco Nelissen <marcone@google.com> am e6ca5b2d: am 566c70ca: Guard against codecinfo overflow

* commit 'e6ca5b2d97f61e96af35fabed8c2ba352b8b5b99':
Guard against codecinfo overflow
e6ca5b2d97f61e96af35fabed8c2ba352b8b5b99 03-Aug-2015 Marco Nelissen <marcone@google.com> am 566c70ca: Guard against codecinfo overflow

* commit '566c70caff87c710e659c5aaad0692e031d93ded':
Guard against codecinfo overflow
18d5c836b74fa6e74806c8fb30bf33b7caeaabac 31-Jul-2015 Jeff Vander Stoep <jeffv@google.com> libstagefright: remove left shifts causing unsigned int overflow

Change-Id: Ib81bfb9a90fc81ad9a60e2bb8eac78219b1128e6
odecs/mp3dec/src/pvmp3_get_side_info.cpp
55e47ec203e284a75c1dc171242164d42fc34013 09-Apr-2015 Joshua J. Drake <android-open-source@qoop.org> Fix several ineffective integer overflow checks

Commit edd4a76 (which addressed bugs 15328708, 15342615, 15342751) added
several integer overflow checks. Unfortunately, those checks fail to take into
account integer promotion rules and are thus themselves subject to an integer
overflow. Cast the sizeof() operator to a uint64_t to force promotion while
multiplying.

Bug: 20139950
Change-Id: Ieb29a170edb805c722fc5658935f2390003e5260
ampleTable.cpp
9a3cbe46866927feb070c11cb7b36f097db37a13 09-Apr-2015 Joshua J. Drake <android-open-source@qoop.org> Detect allocation failures and bail gracefully

During the processing of several sample table related MP4 atoms, allocation
sizes could be large enough cause a std::bad_alloc exception to be raised. This
typically causes a crash (denial of service condition). Use std::nothrow to
catch allocation failures and return gracefully.

Bug: 20139950
Change-Id: I03d3f01b24e5fe3fa38985914bcfa694ea3dc09e
ampleTable.cpp
0b572f5d7bc0aff37d6b39841249defaadc569d5 09-Apr-2015 Joshua J. Drake <android-open-source@qoop.org> Fix integer overflow during MP4 atom processing

A few sample table related FourCC values are handled by the
setSampleToChunkParams function. An integer overflow exists within this
function. Validate that mNumSampleToChunkOffets will not cause an integer
overflow.

Bug: 20139950
Change-Id: I1972cc185fce5e058afa143ad5eabcc269ad324d
ampleTable.cpp
0a279c25db5d4539ef731e4f3b9d772b71d3dc46 09-Apr-2015 Joshua J. Drake <android-open-source@qoop.org> Fix integer underflow in ESDS processing

Several arithmetic operations within parseESDescriptor could underflow, leading
to an out-of-bounds read operation. Ensure that subtractions from 'size' do not
cause it to wrap around.

Bug: 20139950
Change-Id: I0d1b136ce68fd7c6f606ce66714bf644cfb2961c
SDS.cpp
44276537919e5ecae6ef879c093ff50aae36336f 09-Apr-2015 Joshua J. Drake <android-open-source@qoop.org> MPEG4Extractor: still more NULL dereference fixes

When processing various FourCC values within MP4 media, mLastTrack is accessed
without first ensuring that a track has been encoutered. Check for NULL and
bail out instead of crashing.

Bug: 20139950
Change-Id: Ie16687024d17348f576a0e13bd60bd4d6898de91
PEG4Extractor.cpp
86aa1534d25e9bebedc0cfcc7734617401470da6 09-Apr-2015 Joshua J. Drake <android-open-source@qoop.org> Fix null-pointer-dereferences accessing the SampleTable

While processing various sample table related FourCC values, methods are called
on a NULL mLastTrack or sampleTable object. This leads to undefined behavior
which typically results in a crash (denial of service condition).

Bug: 20139950
Change-Id: Ie2dd8222e702d8bf95faf7d2bd44e6303cd21f68
PEG4Extractor.cpp
2c184d8b3df586cf3db46948c46da9362b96b605 09-Apr-2015 Joshua J. Drake <android-open-source@qoop.org> Fix multiple division-by-zero conditions in MPEG4 parsing

Several situations arise processing MP4 atoms that lead to undefined behavior
when dividing by zero. Typically this results in a crash (denial of service
condition).

NOTE: In most cases we simply avoid the division, leaving kKeyDuration unset.
It may be more desirable to bail out, as we do in the parseSegmentIndex case.

Bug: 20139950
Change-Id: I62e1b977f0e5ed0094094a55d300bac76b476c7b
PEG4Extractor.cpp
9ad031163bab5066619e75de768106ee57b39dcf 05-May-2015 Joshua J. Drake <android-open-source@qoop.org> Prevent integer overflow when processing covr MPEG4 atoms

If the 'chunk_data_size' value is SIZE_MAX, an integer overflow will occur
and cause an undersized buffer to be allocated. The following processing
then overfills the resulting memory and creates a potentially exploitable
condition. Ensure that integer overflow does not occur.

Bug: 20923261
Change-Id: I75cce323aec04a612e5a230ecd7c2077ce06035f
PEG4Extractor.cpp
f6dda8df18979200a27ca462a9dfa38c11a0e80c 05-May-2015 Joshua J. Drake <android-open-source@qoop.org> Fix integer overflow when handling MPEG4 tx3g atom

When the sum of the 'size' and 'chunk_size' variables is larger than 2^32,
an integer overflow occurs. Using the result value to allocate memory
leads to an undersized buffer allocation and later a potentially
exploitable heap corruption condition. Ensure that integer overflow does
not occur.

Bug: 20923261
Change-Id: Id050a36b33196864bdd98b5ea24241f95a0b5d1f
PEG4Extractor.cpp
7c6f217fe717b3287c17bf75983843efad4885c2 05-May-2015 Joshua J. Drake <android-open-source@qoop.org> Prevent integer underflow if size is below 6

When processing 3GPP metadata, a subtraction operation may underflow and
lead to a rather large linear byteswap operation in the subsequent
framedata decoding code. Bound the 'size' value to prevent this from
occurring.

Bug: 20923261
Change-Id: I35dfbc8878c6b65cfe8b8adb7351a77ad4d604e5
PEG4Extractor.cpp
4ec8ab47998f9660ad15061d3e39c419cf283a8e 05-May-2015 Joshua J. Drake <android-open-source@qoop.org> Fix integer underflow in covr MPEG4 processing

When the 'chunk_data_size' variable is less than 'kSkipBytesOfDataBox', an
integer underflow can occur. This causes an extraordinarily large value to
be passed to MetaData::setData, leading to a buffer overflow.

Bug: 20923261
Change-Id: Icd28f63594ad941eabb3a12c750a4a2d5d2bf94b
PEG4Extractor.cpp
1760fbf496acfbc0f808baea5461e02158b6faa5 05-May-2015 Joshua J. Drake <android-open-source@qoop.org> Prevent reading past the end of the buffer in 3GPP

Metadata processed within the parse3GPPMetaData function may not be NUL
terminated and thus calling setCString may read out of bounds. Ensure
proper NUL termination, but take care not to interfere with other special
cases (ie, albm).

Bug: 20923261
Change-Id: Ie93b3038b534b4c4460571a68f4d734cff7ad324
PEG4Extractor.cpp
7406bc75c086534d574bee1e608de863fb276170 01-Jul-2015 Martin Storsjo <martin@martin.st> Don't include ithread.h in decoder omx wrappers

ithread.h probably should be considered an internal, private header.
These omx wrappers don't use anything from this header anyway, so
stop including it.

Bug: 22860270

Change-Id: I5f14f3eae86c6b5f6ffa193d4b97f483d9be6fb0
odecs/avcdec/SoftAVCDec.cpp
odecs/hevcdec/SoftHEVC.cpp
odecs/mpeg2dec/SoftMPEG2.cpp
39a535d46df5146f6dc64049092a039cc8044101 31-Jul-2015 Marco Nelissen <marcone@google.com> Merge "SoftAVCEnc: Stop using the u4_strd field in the set dimensions struct" into mnc-dev
4cb9ac63bbef5da1963a0c8313e5869fd1e1e877 31-Jul-2015 Andreas Gampe <agampe@google.com> Merge "Stagefright: Remove unused variables and files"
c2d3b25ac4c42ba4827ed0c77a52a6a85cdca435 27-Jun-2015 Martin Storsjo <martin@martin.st> SoftAVCEnc: Stop using the u4_strd field in the set dimensions struct

Since 90a3904fd3 in external/libavc, this field isn't used any longer.
After SoftAVCEnc stops using it, it can be removed from the library
altogether.

Bug: 22860270

Change-Id: I0e0fcab6740ef420df7776ede11b35aa1a383a48
odecs/avcenc/SoftAVCEnc.cpp
566c70caff87c710e659c5aaad0692e031d93ded 30-Jul-2015 Marco Nelissen <marcone@google.com> Guard against codecinfo overflow

Bug: 21296336
Change-Id: I78be5141b3108142f12d7cb94839fa50f776d84a
etaData.cpp
atroska/MatroskaExtractor.cpp
765b4172f1ffb2c4e2de89163bb888fa352de664 30-Jul-2015 Andreas Gampe <agampe@google.com> Stagefright: Remove unused variables and files

For build-system CFLAGS clean-up.

Bug: 18632512
Change-Id: I765dc394f39f60801843851760fdf9838958d7a4
odecs/amrnb/common/Android.mk
odecs/amrnb/common/include/bytesused.h
odecs/amrnb/common/src/bytesused.cpp
odecs/amrnb/common/src/overflow_tbl.cpp
odecs/avc/enc/src/findhalfpel.cpp
odecs/on2/dec/SoftVPX.cpp
4eff0a2b6a648ee07fbbc62a2e726461a4077461 30-Jul-2015 Wei Jia <wjia@google.com> am a42856b2: Merge "ACodec: notify resolution change earlier for tunneled mode." into mnc-dev

* commit 'a42856b22c5f4e5a3da72e05999dbf2322a20d70':
ACodec: notify resolution change earlier for tunneled mode.
9302a447673075a8b270c764f2c7c44a5ab2cfca 30-Jul-2015 Wei Jia <wjia@google.com> am a42856b2: Merge "ACodec: notify resolution change earlier for tunneled mode." into mnc-dev

* commit 'a42856b22c5f4e5a3da72e05999dbf2322a20d70':
ACodec: notify resolution change earlier for tunneled mode.
a42856b22c5f4e5a3da72e05999dbf2322a20d70 30-Jul-2015 Wei Jia <wjia@google.com> Merge "ACodec: notify resolution change earlier for tunneled mode." into mnc-dev
014e6f52719d05acc988ad5623b5228e7b374ca7 30-Jul-2015 Lajos Molnar <lajos@google.com> am c20cf8b5: Merge "stagefright: disable automatic experiments" into mnc-dev

* commit 'c20cf8b58b75ab6d5775af14e1b0773b3e580334':
stagefright: disable automatic experiments
5798be0b1c5d8b909c1f91c3fd1bb28b5ac4ffeb 30-Jul-2015 Lajos Molnar <lajos@google.com> am c20cf8b5: Merge "stagefright: disable automatic experiments" into mnc-dev

* commit 'c20cf8b58b75ab6d5775af14e1b0773b3e580334':
stagefright: disable automatic experiments
c20cf8b58b75ab6d5775af14e1b0773b3e580334 30-Jul-2015 Lajos Molnar <lajos@google.com> Merge "stagefright: disable automatic experiments" into mnc-dev
0fb43efc54ffd8d3133635ee3934d83c9987081b 30-Jul-2015 Wei Jia <wjia@google.com> ACodec: notify resolution change earlier for tunneled mode.

Bug: 21906777
Change-Id: I73c265ba8e76b8a9cddcfdec28e783e30c52acaf
Codec.cpp
73eb3798d920ff2df031f6c86d253942a93f351c 30-Jul-2015 Bart Sears <bsears@google.com> am 7525395f: Merge "Revert "ACodec: notify resolution change earlier for tunneled mode."" into mnc-dev

* commit '7525395f8b2bcfaf49d9bdb0bbb31b3b816994d7':
Revert "ACodec: notify resolution change earlier for tunneled mode."
c8c999d1519a75e402aed95f2e86924f58d81340 30-Jul-2015 Wei Jia <wjia@google.com> am dbe49e44: Merge "ACodec: notify resolution change earlier for tunneled mode." into mnc-dev

* commit 'dbe49e4401642cf1ab64a6ac4c01032cb9f04d40':
ACodec: notify resolution change earlier for tunneled mode.
a775aa01b0ff337cb69c7e0436f515121cb83bfc 30-Jul-2015 Bart Sears <bsears@google.com> am 7525395f: Merge "Revert "ACodec: notify resolution change earlier for tunneled mode."" into mnc-dev

* commit '7525395f8b2bcfaf49d9bdb0bbb31b3b816994d7':
Revert "ACodec: notify resolution change earlier for tunneled mode."
7525395f8b2bcfaf49d9bdb0bbb31b3b816994d7 30-Jul-2015 Bart Sears <bsears@google.com> Merge "Revert "ACodec: notify resolution change earlier for tunneled mode."" into mnc-dev
35a30f4214812c269584086aaa61de99f329d50f 30-Jul-2015 Bart Sears <bsears@google.com> Revert "ACodec: notify resolution change earlier for tunneled mode."

This reverts commit 7cb3aff491b7f01ded5f1efe90ce1125dd33023f.

Change-Id: I232d6af852ca78727caf4847855d762e08355506
Codec.cpp
ac4230c7db0e76357c2c9694a715ce6af8b88e51 30-Jul-2015 Wei Jia <wjia@google.com> am dbe49e44: Merge "ACodec: notify resolution change earlier for tunneled mode." into mnc-dev

* commit 'dbe49e4401642cf1ab64a6ac4c01032cb9f04d40':
ACodec: notify resolution change earlier for tunneled mode.
dbe49e4401642cf1ab64a6ac4c01032cb9f04d40 30-Jul-2015 Wei Jia <wjia@google.com> Merge "ACodec: notify resolution change earlier for tunneled mode." into mnc-dev
3071937ac64ec743632984b4f32c04a2cd87fac6 30-Jul-2015 Robert Shih <robertshih@google.com> am 9a750f1e: Merge "HLS: preserve old format in onChangeConfiguration2" into mnc-dev

* commit '9a750f1eb017de506bfc40916359ed8cf1f91ab2':
HLS: preserve old format in onChangeConfiguration2
3e3c9e3ba3290fcd66055027f2c1d5b4b0667efe 30-Jul-2015 Robert Shih <robertshih@google.com> am 9a750f1e: Merge "HLS: preserve old format in onChangeConfiguration2" into mnc-dev

* commit '9a750f1eb017de506bfc40916359ed8cf1f91ab2':
HLS: preserve old format in onChangeConfiguration2
9a750f1eb017de506bfc40916359ed8cf1f91ab2 30-Jul-2015 Robert Shih <robertshih@google.com> Merge "HLS: preserve old format in onChangeConfiguration2" into mnc-dev
7d681539b821664d0417f8dd6beaed3352b34787 30-Jul-2015 Marco Nelissen <marcone@google.com> Guard against codecinfo overflow

Bug: 21296336
Change-Id: I78be5141b3108142f12d7cb94839fa50f776d84a
etaData.cpp
atroska/MatroskaExtractor.cpp
7c3c275b4d0100eec36f7b66637a7aace7971466 29-Jul-2015 Lajos Molnar <lajos@google.com> stagefright: disable automatic experiments

allow manually-enabled experiments only in eng and userdebug builds

Bug: 20894667
Change-Id: Ie6c93e9482a84ed3aaf6aa0abd909f14cfea4e9b
ndroid.mk
oundation/ADebug.cpp
8af1b90d4161e287bdcb03c91832c425363ded16 29-Jul-2015 Marco Nelissen <marcone@google.com> We don't support mid-stream format changes

Bug: 22808150
Change-Id: If6354b3be19110020eeb29f02e76c8a16e57b837
LACExtractor.cpp
7b03ea2dc1500c08286ba882f0065e84ddc0d3c6 29-Jul-2015 Wei Jia <wjia@google.com> am a7d36c18: Merge "libstagefright: Fix crash in convertMetaDataToMessage" into mnc-dev

* commit 'a7d36c184562cc15b2d665ff25c485fefdcfbabd':
libstagefright: Fix crash in convertMetaDataToMessage
53137c21e6d55a9f07ba49fddab970be9645f5d9 29-Jul-2015 Wei Jia <wjia@google.com> am a7d36c18: Merge "libstagefright: Fix crash in convertMetaDataToMessage" into mnc-dev

* commit 'a7d36c184562cc15b2d665ff25c485fefdcfbabd':
libstagefright: Fix crash in convertMetaDataToMessage
a7d36c184562cc15b2d665ff25c485fefdcfbabd 29-Jul-2015 Wei Jia <wjia@google.com> Merge "libstagefright: Fix crash in convertMetaDataToMessage" into mnc-dev
7cb3aff491b7f01ded5f1efe90ce1125dd33023f 29-Jul-2015 Wei Jia <wjia@google.com> ACodec: notify resolution change earlier for tunneled mode.

Bug: 21906777
Change-Id: If8c107d4d5267173a3f2de08ec9038d3451a21d3
Codec.cpp
91abac4aa5527becb46c4c6a16d613f39194d00c 29-Jul-2015 Marco Nelissen <marcone@google.com> am f09d59b9: Merge "Check vector size before accessing" into mnc-dev

* commit 'f09d59b9c03d3ac3523517ea587e7587e669b6a4':
Check vector size before accessing
7f3bb5ad9dfb30388b69166e58391ff3aa6f00a3 28-Jul-2015 Robert Shih <robertshih@google.com> HLS: preserve old format in onChangeConfiguration2

`onChangeConfiguration2` is only called during seek.

Bug: 22698650
Change-Id: I715fa51d04d503f49d678eaea08f2b63dce4e01e
ttplive/LiveSession.cpp
9c170c076382096b9e767da0e3f9f37dafa76546 25-Jun-2015 Wei Jia <wjia@google.com> libstagefright: Fix crash in convertMetaDataToMessage

- The ABuffer used for the Message has a preset value of 1024, if
flattening the meta data exceeds this value, a check fails hence
the crash.
- This change creates a new ABuffer if the buffer size would exceed
the buffer capacity.

Bug: 22771132

CRs-Fixed: 857850

Change-Id: Iaa7374a4734a49db257a3f102a88412fde672260
tils.cpp
d26d6a5a83161fca6497686fa80722ed90f0e064 29-Jul-2015 Marco Nelissen <marcone@google.com> am f09d59b9: Merge "Check vector size before accessing" into mnc-dev

* commit 'f09d59b9c03d3ac3523517ea587e7587e669b6a4':
Check vector size before accessing
f09d59b9c03d3ac3523517ea587e7587e669b6a4 29-Jul-2015 Marco Nelissen <marcone@google.com> Merge "Check vector size before accessing" into mnc-dev
2c26ebf409094ccfff9eb34ee8546d2501dc36e7 29-Jul-2015 Chong Zhang <chz@google.com> am f5b8005b: Merge "add GRALLOC_USAGE_HW_COMPOSER flag to video usage bits" into mnc-dev

* commit 'f5b8005b024316febc9d8428092fef68f4b2ea2e':
add GRALLOC_USAGE_HW_COMPOSER flag to video usage bits
06e1e78489634aab05ffc67fa790b508a4dde296 29-Jul-2015 Chong Zhang <chz@google.com> am f5b8005b: Merge "add GRALLOC_USAGE_HW_COMPOSER flag to video usage bits" into mnc-dev

* commit 'f5b8005b024316febc9d8428092fef68f4b2ea2e':
add GRALLOC_USAGE_HW_COMPOSER flag to video usage bits
f42917964a76720932b23e67a05d034cd0cf346b 29-Jul-2015 Chong Zhang <chz@google.com> add GRALLOC_USAGE_HW_COMPOSER flag to video usage bits

bug: 22657091
Change-Id: I6a11bc15bba34035ef31c2f4d41196ece60d4ad9
Codec.cpp
c9b255b7f771f55462cadd34e109bfee3bf80a3a 28-Jul-2015 Marco Nelissen <marcone@google.com> Guard against pssh overflows

Bug: 22796712
Change-Id: Ia6cad09101a7e354f9ced624302ec3af25d81078
PEG4Extractor.cpp
f051e83e1a44d0e68bc458dbd1a9acfc38bf9dd6 28-Jul-2015 Marco Nelissen <marcone@google.com> am 20c63346: am 8fddd03a: Merge "Don\'t include ithread.h in decoder omx wrappers"

* commit '20c63346c29d9dacc472b9459574630fd26c216c':
Don't include ithread.h in decoder omx wrappers
b980c92b0f0a831251a094e61dcf0eedd2e9e7c9 28-Jul-2015 Marco Nelissen <marcone@google.com> am 23d74231: am 4c04495f: Merge "SoftAVCEnc: Stop using the u4_strd field in the set dimensions struct"

* commit '23d74231963e2ca21384e06eec1962ac46d47ce0':
SoftAVCEnc: Stop using the u4_strd field in the set dimensions struct
9a2f829633be47369139ffa036336248f360283c 28-Jul-2015 Marco Nelissen <marcone@google.com> am 20c63346: am 8fddd03a: Merge "Don\'t include ithread.h in decoder omx wrappers"

* commit '20c63346c29d9dacc472b9459574630fd26c216c':
Don't include ithread.h in decoder omx wrappers
08bf77b45306ca1f1a11bd1a4d11ea03fbb5f836 28-Jul-2015 Marco Nelissen <marcone@google.com> am 23d74231: am 4c04495f: Merge "SoftAVCEnc: Stop using the u4_strd field in the set dimensions struct"

* commit '23d74231963e2ca21384e06eec1962ac46d47ce0':
SoftAVCEnc: Stop using the u4_strd field in the set dimensions struct
8fddd03a20d6e4c0a339d68387933135a08873da 28-Jul-2015 Marco Nelissen <marcone@google.com> Merge "Don't include ithread.h in decoder omx wrappers"
4c04495f4dfc9377890df1d8fcb92e481bd70f37 28-Jul-2015 Marco Nelissen <marcone@google.com> Merge "SoftAVCEnc: Stop using the u4_strd field in the set dimensions struct"
529c595b083f8a4c3175e2350fba5547e6008e00 24-Jul-2015 Marco Nelissen <marcone@google.com> Check vector size before accessing

Bug: 22388975
Change-Id: I3c157b1029d37f6a22e6302ea7b52077fe27ce53
PEG4Extractor.cpp
66f1d3f01eb4d745e4abd3b96eca961e200efc3f 23-Jul-2015 Ronghua Wu <ronghuawu@google.com> am f87d8341: Merge "libmediaplayerservice: propagate caller pid to MediaCodec." into mnc-dev

* commit 'f87d8341df3445fb4931a39deec2ec1d00c30918':
libmediaplayerservice: propagate caller pid to MediaCodec.
df7dacfcf4f7b2feeb96f6af3542064714f1a33c 22-Jul-2015 Ronghua Wu <ronghuawu@google.com> am f87d8341: Merge "libmediaplayerservice: propagate caller pid to MediaCodec." into mnc-dev

* commit 'f87d8341df3445fb4931a39deec2ec1d00c30918':
libmediaplayerservice: propagate caller pid to MediaCodec.
f87d8341df3445fb4931a39deec2ec1d00c30918 22-Jul-2015 Ronghua Wu <ronghuawu@google.com> Merge "libmediaplayerservice: propagate caller pid to MediaCodec." into mnc-dev
68845c14ebf2c7282800b1abffde38d8e9a57aab 21-Jul-2015 Ronghua Wu <ronghuawu@google.com> libmediaplayerservice: propagate caller pid to MediaCodec.

Bug: 22630317
Change-Id: I0337d74f4ef04bf96f2de83f33d98d0d7da47c12
ediaCodec.cpp
41a54d70adda8e99be8fec06253ab050d4b49271 21-Jul-2015 Chong Zhang <chz@google.com> am 8f0547a9: Merge "SoftAVCDec: init decoder using updated size" into mnc-dev

* commit '8f0547a954b39d5750488be7e060ebe1ebfdf666':
SoftAVCDec: init decoder using updated size
81dbb59f83dba913aa944de3b9d8e5ce0a672ad2 21-Jul-2015 Chong Zhang <chz@google.com> am 8f0547a9: Merge "SoftAVCDec: init decoder using updated size" into mnc-dev

* commit '8f0547a954b39d5750488be7e060ebe1ebfdf666':
SoftAVCDec: init decoder using updated size
8f0547a954b39d5750488be7e060ebe1ebfdf666 21-Jul-2015 Chong Zhang <chz@google.com> Merge "SoftAVCDec: init decoder using updated size" into mnc-dev
87aed14c3d1462eaa92ddd00ca0b1167a2e5749e 21-Jul-2015 Chong Zhang <chz@google.com> SoftAVCDec: init decoder using updated size

bug: 22451704
Change-Id: I29ba0c1e280f57ba9abc86ddd7eef6fb46df6d19
odecs/avcdec/SoftAVCDec.cpp
96beb91bfcbd1acd2d90088250d8c3e0a6cf821b 21-Jul-2015 Lajos Molnar <lajos@google.com> am 17d0efd1: Merge "stagefright: remove workaround for BQ not reporting dropped frames" into mnc-dev

* commit '17d0efd17fbb2573adcde8dcbe77726f622817da':
stagefright: remove workaround for BQ not reporting dropped frames
90c3669b9b934881f8dc00a072d88ffcb602842c 21-Jul-2015 Lajos Molnar <lajos@google.com> am 7c77f9ca: stagefright: allow access of 32-bit pointers from 64-bit code

* commit '7c77f9ca649f321374118937bcdaca14a7e5684b':
stagefright: allow access of 32-bit pointers from 64-bit code
d42e5484397684c9ba6852b3be102fe2cf12b69e 21-Jul-2015 Lajos Molnar <lajos@google.com> am 17d0efd1: Merge "stagefright: remove workaround for BQ not reporting dropped frames" into mnc-dev

* commit '17d0efd17fbb2573adcde8dcbe77726f622817da':
stagefright: remove workaround for BQ not reporting dropped frames
23a79fbd9ea732ea148992f18f0af44180e54e44 21-Jul-2015 Lajos Molnar <lajos@google.com> am 7c77f9ca: stagefright: allow access of 32-bit pointers from 64-bit code

* commit '7c77f9ca649f321374118937bcdaca14a7e5684b':
stagefright: allow access of 32-bit pointers from 64-bit code
17d0efd17fbb2573adcde8dcbe77726f622817da 21-Jul-2015 Lajos Molnar <lajos@google.com> Merge "stagefright: remove workaround for BQ not reporting dropped frames" into mnc-dev
4005367e8d1ccb910c7d02bcaaf4d96253df2ed5 21-Jul-2015 Robert Shih <robertshih@google.com> am 84e4987f: Merge "MatroskaExtractor: detect infinite loop when parsing NALs" into mnc-dev

* commit '84e4987ffc8d4bb6731bcb28d69a7ff37a0e9921':
MatroskaExtractor: detect infinite loop when parsing NALs
82a633b602a7ffe1efd9886744393f52a093a2f3 21-Jul-2015 Lajos Molnar <lajos@google.com> stagefright: remove workaround for BQ not reporting dropped frames

Bug: 22234976
Related-bug: 22552826
Change-Id: Ic29b8d8533a4df8c15bcf3a9dab924aa24428304
ediaSync.cpp
df41f19ea763ba36a71938ca5e91d9ca24fd3ded 21-Jul-2015 Wei Jia <wjia@google.com> am 94b0badc: ABuffer: reset members when memory allocation fails.

* commit '94b0badc025b14141ff234e3e4e2745411742bac':
ABuffer: reset members when memory allocation fails.
3262ac022d937219bc5fa161fab7c589a29e633b 21-Jul-2015 Robert Shih <robertshih@google.com> am 84e4987f: Merge "MatroskaExtractor: detect infinite loop when parsing NALs" into mnc-dev

* commit '84e4987ffc8d4bb6731bcb28d69a7ff37a0e9921':
MatroskaExtractor: detect infinite loop when parsing NALs
7c77f9ca649f321374118937bcdaca14a7e5684b 21-Jul-2015 Lajos Molnar <lajos@google.com> stagefright: allow access of 32-bit pointers from 64-bit code

Bug: 22512621
Change-Id: I19f3fc92ef597029d4ae7e1cd9ca19f21661d2db
Codec.cpp
84e4987ffc8d4bb6731bcb28d69a7ff37a0e9921 21-Jul-2015 Robert Shih <robertshih@google.com> Merge "MatroskaExtractor: detect infinite loop when parsing NALs" into mnc-dev
1686fd61d37aaaec64ad1d4769cf67ea81347ea3 21-Jul-2015 Wei Jia <wjia@google.com> am 94b0badc: ABuffer: reset members when memory allocation fails.

* commit '94b0badc025b14141ff234e3e4e2745411742bac':
ABuffer: reset members when memory allocation fails.
2dcf6138ebc9c5688aeae151d2fbde55a2826128 17-Jul-2015 Robert Shih <robertshih@google.com> MatroskaExtractor: detect infinite loop when parsing NALs

Bug: 21335999
Change-Id: I76bd34610e52048ffcf16e41aa6175afc8a14ee4
atroska/MatroskaExtractor.cpp
94b0badc025b14141ff234e3e4e2745411742bac 20-Jul-2015 Wei Jia <wjia@google.com> ABuffer: reset members when memory allocation fails.

Bug: 22077698
Change-Id: I2beb724662d041ad2339d0f4c7f983e7ac5e5e6f
oundation/ABuffer.cpp
168b16daf3d11f5117a6ed21299b55f19ad27919 18-Jul-2015 Chong Zhang <chz@google.com> am f8f669d7: Merge "fix soft renderer rotation" into mnc-dev

* commit 'f8f669d7a727e4ad5505cd85741f4d50dbaffbf9':
fix soft renderer rotation
64ee64e527a643bbef0f091b7976528b5b78393b 18-Jul-2015 Chong Zhang <chz@google.com> am f8f669d7: Merge "fix soft renderer rotation" into mnc-dev

* commit 'f8f669d7a727e4ad5505cd85741f4d50dbaffbf9':
fix soft renderer rotation
f8f669d7a727e4ad5505cd85741f4d50dbaffbf9 18-Jul-2015 Chong Zhang <chz@google.com> Merge "fix soft renderer rotation" into mnc-dev
f42d2eecfaf17367e094040906dad44f1e6b464d 18-Jul-2015 Ronghua Wu <ronghuawu@google.com> am 51390b48: Merge "mediaresourcemanager: add pid to removeResource method" into mnc-dev

* commit '51390b48d311d1164a6638d3fe0b4a48aaa9028f':
mediaresourcemanager: add pid to removeResource method
e4b62f7c0766f799b41e4ce9ad98735156ac64ac 18-Jul-2015 Ronghua Wu <ronghuawu@google.com> am 51390b48: Merge "mediaresourcemanager: add pid to removeResource method" into mnc-dev

* commit '51390b48d311d1164a6638d3fe0b4a48aaa9028f':
mediaresourcemanager: add pid to removeResource method
51390b48d311d1164a6638d3fe0b4a48aaa9028f 18-Jul-2015 Ronghua Wu <ronghuawu@google.com> Merge "mediaresourcemanager: add pid to removeResource method" into mnc-dev
505aab41c0e8e79a49d4506344fcd9d220d5965b 18-Jul-2015 Chong Zhang <chz@google.com> fix soft renderer rotation

bug: 13222807
Change-Id: I6f6f417422d3a18117b594670bb23e3019d449bb
ediaCodec.cpp
olorconversion/SoftwareRenderer.cpp
nclude/SoftwareRenderer.h
2d94132330acf97581c38faa6e9f6ea3710879ef 18-Jul-2015 Chong Zhang <chz@google.com> am dd761ece: Merge "MediaRecorder: enable audio for slow motion recording" into mnc-dev

* commit 'dd761ecee86cc24ac8774bf1f004ea29b1e0d3f7':
MediaRecorder: enable audio for slow motion recording
0966f665cb30eaf50d9e329f0222359019b1b4fb 17-Jul-2015 Chong Zhang <chz@google.com> am dd761ece: Merge "MediaRecorder: enable audio for slow motion recording" into mnc-dev

* commit 'dd761ecee86cc24ac8774bf1f004ea29b1e0d3f7':
MediaRecorder: enable audio for slow motion recording
dd761ecee86cc24ac8774bf1f004ea29b1e0d3f7 17-Jul-2015 Chong Zhang <chz@google.com> Merge "MediaRecorder: enable audio for slow motion recording" into mnc-dev
46d26dd29195450db15704e84d65740628a821fb 16-Jul-2015 Chong Zhang <chz@google.com> MediaRecorder: enable audio for slow motion recording

bug:22460747

Change-Id: I23f773ecf7b86928a8eacd25a481636e645affbe
udioSource.cpp
489aaa45dd1be0f5261001e583088815f5706932 17-Jul-2015 Robert Shih <robertshih@google.com> am 9febc8a6: Merge "RTSP: clear data/eos status before returning from seek" into mnc-dev

* commit '9febc8a664d25eaa699134682aa455ab4d7f62a2':
RTSP: clear data/eos status before returning from seek
37c8924c508a7c9b8bd3c8ce80fc005070531902 15-Jul-2015 Ronghua Wu <ronghuawu@google.com> mediaresourcemanager: add pid to removeResource method

Bug: 22496209
Change-Id: I73311573e8d1ac15fec668a9ef6e6af7a07a1d30
ediaCodec.cpp
fbfdd2c4ba0bed13b989c6d3850b754def91f4db 17-Jul-2015 Robert Shih <robertshih@google.com> am 9febc8a6: Merge "RTSP: clear data/eos status before returning from seek" into mnc-dev

* commit '9febc8a664d25eaa699134682aa455ab4d7f62a2':
RTSP: clear data/eos status before returning from seek
9febc8a664d25eaa699134682aa455ab4d7f62a2 17-Jul-2015 Robert Shih <robertshih@google.com> Merge "RTSP: clear data/eos status before returning from seek" into mnc-dev
8a54641306ad4ba8bc009de2a5e533b1e876774c 17-Jul-2015 Lajos Molnar <lajos@google.com> am 08dc42c4: stagefright: flush pending video frames for MediaSync

* commit '08dc42c46c942ff316a69be1cf74f3c60cf53e7f':
stagefright: flush pending video frames for MediaSync
63f393dbc64cc7a9ae17bfa5760f5f25a03563c7 17-Jul-2015 Lajos Molnar <lajos@google.com> am a3725d7b: stagefright: MediaSync: use VideoFrameScheduler

* commit 'a3725d7b0cb79ddb49f81cba00a0164d8e645acd':
stagefright: MediaSync: use VideoFrameScheduler
9172fc55fdbc09e43631df07fa5ed7af9f25733f 17-Jul-2015 Lajos Molnar <lajos@google.com> am 08dc42c4: stagefright: flush pending video frames for MediaSync

* commit '08dc42c46c942ff316a69be1cf74f3c60cf53e7f':
stagefright: flush pending video frames for MediaSync
7ca9677e1bd30303126f70d79ae1e819a1e341a7 17-Jul-2015 Lajos Molnar <lajos@google.com> am a3725d7b: stagefright: MediaSync: use VideoFrameScheduler

* commit 'a3725d7b0cb79ddb49f81cba00a0164d8e645acd':
stagefright: MediaSync: use VideoFrameScheduler
08dc42c46c942ff316a69be1cf74f3c60cf53e7f 02-Jul-2015 Lajos Molnar <lajos@google.com> stagefright: flush pending video frames for MediaSync

Bug: 22234976
Change-Id: Ib63c2286610181968658fb38f5526a489635cf3e
ediaSync.cpp
a3725d7b0cb79ddb49f81cba00a0164d8e645acd 02-Jul-2015 Lajos Molnar <lajos@google.com> stagefright: MediaSync: use VideoFrameScheduler

Move VideoFrameScheduler to libstagefright as part of this change.

Bug: 22234976
Change-Id: Ib23fb52399cb700a1dcf789e8486b94a3edf9d95
ndroid.mk
ediaSync.cpp
ideoFrameScheduler.cpp
8d237a5ce1e3c1dbc1d538f47e68cff2cc52d799 14-Jul-2015 Robert Shih <robertshih@google.com> RTSP: clear data/eos status before returning from seek

The original RTSP seek implementation involves pausing and restarting
a session. This change clears data/eos status after an rtsp session
is paused for a seek, and delays the seek to return after data/eos
status are cleared.

Bug: 22207372
Change-Id: I1bdf65653f90436f7ee5d7fe85eeadc1598a0d56
tsp/MyHandler.h
3379efeb605ee26e3adff2b293f9b130ef0360e4 16-Jul-2015 Ronghua Wu <ronghuawu@google.com> am 4d9492f1: Merge "libstagefright: remove CHECK from SoftHEVC ctor." into mnc-dev

* commit '4d9492f1bf9fd36aa5991153705657f9212b2d4c':
libstagefright: remove CHECK from SoftHEVC ctor.
29580820d6b7424d3ad19e048775ccc048e99b9a 16-Jul-2015 Ronghua Wu <ronghuawu@google.com> am 4d9492f1: Merge "libstagefright: remove CHECK from SoftHEVC ctor." into mnc-dev

* commit '4d9492f1bf9fd36aa5991153705657f9212b2d4c':
libstagefright: remove CHECK from SoftHEVC ctor.
4d9492f1bf9fd36aa5991153705657f9212b2d4c 16-Jul-2015 Ronghua Wu <ronghuawu@google.com> Merge "libstagefright: remove CHECK from SoftHEVC ctor." into mnc-dev
c8f54dcf238c2194d2d1c131aa55ebe0795ae1cb 15-Jul-2015 Chong Zhang <chz@google.com> am 1bc88814: Merge "NuPlayer: pull more video buffers in advance in GenericSource" into mnc-dev

* commit '1bc88814f530bf67e425cfb8cea0f2b8dce3c03f':
NuPlayer: pull more video buffers in advance in GenericSource
92392261c91f854bc3977d861ec3ab23e7577443 15-Jul-2015 Chong Zhang <chz@google.com> am 7f4e78fe: Merge "HLS: temporarily blacklist a variant if failed to fetch" into mnc-dev

* commit '7f4e78fedf1dbcd175a52b17d46a658218ed7453':
HLS: temporarily blacklist a variant if failed to fetch
d45203ca27d76c8f7bbccfb8d4a752c25f882d1b 15-Jul-2015 Chong Zhang <chz@google.com> am 1bc88814: Merge "NuPlayer: pull more video buffers in advance in GenericSource" into mnc-dev

* commit '1bc88814f530bf67e425cfb8cea0f2b8dce3c03f':
NuPlayer: pull more video buffers in advance in GenericSource
1bc88814f530bf67e425cfb8cea0f2b8dce3c03f 15-Jul-2015 Chong Zhang <chz@google.com> Merge "NuPlayer: pull more video buffers in advance in GenericSource" into mnc-dev
4d9b301e2a1427d5892a249d32508fb941dd4070 15-Jul-2015 Chong Zhang <chz@google.com> am 7f4e78fe: Merge "HLS: temporarily blacklist a variant if failed to fetch" into mnc-dev

* commit '7f4e78fedf1dbcd175a52b17d46a658218ed7453':
HLS: temporarily blacklist a variant if failed to fetch
fcf044a9c5624395d24eb6181e67163ce169458b 15-Jul-2015 Chong Zhang <chz@google.com> NuPlayer: pull more video buffers in advance in GenericSource

pull 4 video buffers at a time, and start pulling when we're down
to 1 buffers to avoid starving the decoder.

bug: 22320866
Change-Id: I10914dc092f3830ecb6296e2d9ebf9064ff7a5dc
peg2ts/AnotherPacketSource.cpp
peg2ts/AnotherPacketSource.h
7f4e78fedf1dbcd175a52b17d46a658218ed7453 15-Jul-2015 Chong Zhang <chz@google.com> Merge "HLS: temporarily blacklist a variant if failed to fetch" into mnc-dev
5ef659e010e90175eb5282d9642a02f6105189bf 14-Jul-2015 Chong Zhang <chz@google.com> HLS: temporarily blacklist a variant if failed to fetch

- abort high bandwidth immediately when bandwidth is fluctuating
- use short-term bandwidth estimate for downswitch if bandwidth
is not stable
- discard bandwidth samples that's too old in absolute time
- if already underflow, switch to lowest bandwidth to catch up
- if error happened during bandwidth switch (likely due to new
variant link is broken), switch to lowest bandwidth to catch up

bug: 21754330

Change-Id: Ifd16d75e261cefb93b989829bf35a36783142ae0
ttplive/LiveSession.cpp
ttplive/LiveSession.h
ttplive/PlaylistFetcher.cpp
1640bd2d959432ce2b06a99e2a14e8c5c74efce2 14-Jul-2015 Ronghua Wu <ronghuawu@google.com> libstagefright: remove CHECK from SoftHEVC ctor.

Bug: 22478679
Change-Id: I81933856d1217a23b256cac83a6ee3924b409d31
odecs/hevcdec/SoftHEVC.cpp
odecs/hevcdec/SoftHEVC.h
b9b4c9804a4aff8751993a364d62de06141136cc 14-Jul-2015 Ronghua Wu <ronghuawu@google.com> am 710c8e9d: Merge "libstagefright: get secure and non-secure codec policy from mediacodec list global settings" into mnc-dev

* commit '710c8e9d3ebe9d3687c4cb0cfdae83e4dc7d628a':
libstagefright: get secure and non-secure codec policy from mediacodec list global settings
619d1965a15e46bc9b8a0a2de8ab005acbbf015e 14-Jul-2015 Lajos Molnar <lajos@google.com> am 6a8995e0: Merge "Check buffer size before using it" into mnc-dev

* commit '6a8995e020e76ee7ffd0f1c9bb8e51d5881cf7e6':
Check buffer size before using it
5a9bfc1971750fac31295f1d12a75d9c9aff7a35 14-Jul-2015 Lajos Molnar <lajos@google.com> am 8ffab243: Merge "MediaCodec: remove legacy-setsurface experiment from setOutputSurface" into mnc-dev

* commit '8ffab2434a6f22da9eac2083993e1988767d5f5b':
MediaCodec: remove legacy-setsurface experiment from setOutputSurface
305f17c3d5b3aec679b4bd09a4987957e653b65b 14-Jul-2015 Lajos Molnar <lajos@google.com> am a7c2db72: Merge "nuplayer: use codec->setSurface when possible to avoid seeking" into mnc-dev

* commit 'a7c2db7226b23dfe6ad0c7c1cccc073dab2f97bd':
nuplayer: use codec->setSurface when possible to avoid seeking
40ec6c3ad31daaa790a7bb9ebfe55de268eab31f 14-Jul-2015 Lajos Molnar <lajos@google.com> am df31e36a: Merge "MediaCodec: consider usage bits when changing surface." into mnc-dev

* commit 'df31e36a225e3f036be379f4542d7d4992c7af4c':
MediaCodec: consider usage bits when changing surface.
5d4851c95ff48e242a300d0fa261f05205b87aa3 14-Jul-2015 Lajos Molnar <lajos@google.com> am 1ec856e6: Merge "stagefright: allow controlling experiments from property" into mnc-dev

* commit '1ec856e6e0955a3cc09fb5aae920aa1b3329773b':
stagefright: allow controlling experiments from property
f238a017c43b8f0e18f28132450d667d6c4e95b5 14-Jul-2015 Jinsuk Kim <jinsukkim@google.com> am 73be71d4: Merge "mpeg2ts: keep the size of the sync points at most 5mb per a track" into mnc-dev

* commit '73be71d440a84341df6d327ec4fe70ebedf31d2f':
mpeg2ts: keep the size of the sync points at most 5mb per a track
4c57b530df5b098574e2df00debb4541a09e4793 14-Jul-2015 Wei Jia <wjia@google.com> am 14ae2c0d: Merge "ACodec: call cancelBufferToNativeWindow() only when the buffer is owned by us." into mnc-dev

* commit '14ae2c0d1aa6e32e97cbb62dabb604820e1e5152':
ACodec: call cancelBufferToNativeWindow() only when the buffer is owned by us.
fb3552c8cee454342949ddad28814189e7516b5f 14-Jul-2015 Ronghua Wu <ronghuawu@google.com> am 710c8e9d: Merge "libstagefright: get secure and non-secure codec policy from mediacodec list global settings" into mnc-dev

* commit '710c8e9d3ebe9d3687c4cb0cfdae83e4dc7d628a':
libstagefright: get secure and non-secure codec policy from mediacodec list global settings
710c8e9d3ebe9d3687c4cb0cfdae83e4dc7d628a 14-Jul-2015 Ronghua Wu <ronghuawu@google.com> Merge "libstagefright: get secure and non-secure codec policy from mediacodec list global settings" into mnc-dev
db3eda42a4fb1e15be72230af8a30307aedf33ad 14-Jul-2015 Lajos Molnar <lajos@google.com> am 6a8995e0: Merge "Check buffer size before using it" into mnc-dev

* commit '6a8995e020e76ee7ffd0f1c9bb8e51d5881cf7e6':
Check buffer size before using it
6a8995e020e76ee7ffd0f1c9bb8e51d5881cf7e6 14-Jul-2015 Lajos Molnar <lajos@google.com> Merge "Check buffer size before using it" into mnc-dev
5a60fd1c3cadb49d3757f62749abfe3dfee16091 14-Jul-2015 Lajos Molnar <lajos@google.com> am 8ffab243: Merge "MediaCodec: remove legacy-setsurface experiment from setOutputSurface" into mnc-dev

* commit '8ffab2434a6f22da9eac2083993e1988767d5f5b':
MediaCodec: remove legacy-setsurface experiment from setOutputSurface
59322ac64a9589c3600d0d4e163900211c857138 14-Jul-2015 Lajos Molnar <lajos@google.com> am a7c2db72: Merge "nuplayer: use codec->setSurface when possible to avoid seeking" into mnc-dev

* commit 'a7c2db7226b23dfe6ad0c7c1cccc073dab2f97bd':
nuplayer: use codec->setSurface when possible to avoid seeking
b3ebda3245b03cb1a9bcdeac2167cfecad54cb5b 14-Jul-2015 Lajos Molnar <lajos@google.com> am df31e36a: Merge "MediaCodec: consider usage bits when changing surface." into mnc-dev

* commit 'df31e36a225e3f036be379f4542d7d4992c7af4c':
MediaCodec: consider usage bits when changing surface.
8ffab2434a6f22da9eac2083993e1988767d5f5b 14-Jul-2015 Lajos Molnar <lajos@google.com> Merge "MediaCodec: remove legacy-setsurface experiment from setOutputSurface" into mnc-dev
a7c2db7226b23dfe6ad0c7c1cccc073dab2f97bd 14-Jul-2015 Lajos Molnar <lajos@google.com> Merge "nuplayer: use codec->setSurface when possible to avoid seeking" into mnc-dev
a81c6229638a4db56752dd77a6610e0f0971e877 11-Jul-2015 Lajos Molnar <lajos@google.com> nuplayer: use codec->setSurface when possible to avoid seeking

Bug: 22414719
Change-Id: I0442e12af960f86a0fc090b4a469c62ba638a1a0
ediaCodec.cpp
e3635355e4cae5af7550b49888c6a0e3530b8aea 11-Jul-2015 Lajos Molnar <lajos@google.com> MediaCodec: consider usage bits when changing surface.

The new surface cannot add usage bits not already present (as
already existing buffers may become unusable for the surface).

Bug: 22414343
Change-Id: Id8169c79cd0994be134a16782dd04687e46ca1dd
Codec.cpp
e6684188a0097a5474845959f6ed33bf73f51eb3 13-Jul-2015 Lajos Molnar <lajos@google.com> am 1ec856e6: Merge "stagefright: allow controlling experiments from property" into mnc-dev

* commit '1ec856e6e0955a3cc09fb5aae920aa1b3329773b':
stagefright: allow controlling experiments from property
05d7d33b1c1059ff37a60d9ad2298b3c24061452 13-Jul-2015 Jinsuk Kim <jinsukkim@google.com> am 73be71d4: Merge "mpeg2ts: keep the size of the sync points at most 5mb per a track" into mnc-dev

* commit '73be71d440a84341df6d327ec4fe70ebedf31d2f':
mpeg2ts: keep the size of the sync points at most 5mb per a track
f18b1a3954a3c894ff3a14f64bacd1922374ecbb 13-Jul-2015 Wei Jia <wjia@google.com> am 14ae2c0d: Merge "ACodec: call cancelBufferToNativeWindow() only when the buffer is owned by us." into mnc-dev

* commit '14ae2c0d1aa6e32e97cbb62dabb604820e1e5152':
ACodec: call cancelBufferToNativeWindow() only when the buffer is owned by us.
2235b4efd3b8149e09c666e2235530f3e6ed9c9a 11-Jul-2015 Lajos Molnar <lajos@google.com> MediaCodec: remove legacy-setsurface experiment from setOutputSurface

This belongs to NuPlayerDecoder.

Bug: 20894667
Change-Id: Iac52a51834e0a11ff206c6b03ea56ceda9c8ae61
Codec.cpp
0d0da9b40469b847f9913dd97805b7bd99b1aeb9 11-Jul-2015 Elliott Hughes <enh@google.com> resolved conflicts for merge of 6052c89f to mnc-dr-dev-plus-aosp

Change-Id: If44e52b1dad6e5210931452fb160e64c7becbfc7
9bd9ed11ed5b3aa00aaaf32bae708158fd2f33ca 11-Jul-2015 Elliott Hughes <enh@google.com> resolved conflicts for merge of 6052c89f to mnc-dev-plus-aosp

Change-Id: I54bfc78454ff0ecba68f08879cab7097b9d7a7f6
1ec856e6e0955a3cc09fb5aae920aa1b3329773b 11-Jul-2015 Lajos Molnar <lajos@google.com> Merge "stagefright: allow controlling experiments from property" into mnc-dev
73be71d440a84341df6d327ec4fe70ebedf31d2f 11-Jul-2015 Jinsuk Kim <jinsukkim@google.com> Merge "mpeg2ts: keep the size of the sync points at most 5mb per a track" into mnc-dev
9903589eacc655481acebc5b85632b3b84418bc9 27-Jun-2015 Lajos Molnar <lajos@google.com> stagefright: allow controlling experiments from property

Bug: 20894667
Change-Id: Icb2209e12ed6a1820b8f33626ca02aabcff03321
oundation/ADebug.cpp
ests/Utils_test.cpp
3175d2babfcdcb64f41309157e0436d00375ae4b 10-Jul-2015 Wei Jia <wjia@google.com> ACodec: call cancelBufferToNativeWindow() only when the buffer is owned by us.

Bug: 22316379
Change-Id: I0b63e507b97b5c93f06ed6b5e0b38075fccfbe8d
Codec.cpp
242b400fc6e360d9444335a3fab296d96db024d8 10-Jul-2015 Elliott Hughes <enh@google.com> frameworks/av: libexpat now exports its includes.

Change-Id: I89412ddbe855af1b39636afbe98408321bb4a8be
ediaCodecList.cpp
af94b8cb64f01ab6c63c38dd6b1041f2f761e423 10-Jul-2015 Wei Jia <wjia@google.com> am 11addc1d: Merge "SimpleSoftOMXComponent: change CHECK to error notification." into mnc-dev

* commit '11addc1d922efa0bf12e261481bba11024c7c7ab':
SimpleSoftOMXComponent: change CHECK to error notification.
96f237ab8e898abcf89bbf7e514425c495154716 10-Jul-2015 Wei Jia <wjia@google.com> am 11addc1d: Merge "SimpleSoftOMXComponent: change CHECK to error notification." into mnc-dev

* commit '11addc1d922efa0bf12e261481bba11024c7c7ab':
SimpleSoftOMXComponent: change CHECK to error notification.
11addc1d922efa0bf12e261481bba11024c7c7ab 10-Jul-2015 Wei Jia <wjia@google.com> Merge "SimpleSoftOMXComponent: change CHECK to error notification." into mnc-dev
fbd2e4fd1668d45d148377cefc06e703613f7471 09-Jul-2015 Robert Shih <robertshih@google.com> am 1f25b061: am f54bd640: Merge "SoftAVCDec: fail gracefully in onQueueFilled"

* commit '1f25b0611be0f6e002748ad881c98d93a0f01ee0':
SoftAVCDec: fail gracefully in onQueueFilled
e99f96594fdf65bb938f67a9f2efc2f923419cad 09-Jul-2015 Robert Shih <robertshih@google.com> am db7733ad: Merge "SoftAVCDec: fail gracefully in onQueueFilled" into mnc-dev

* commit 'db7733ad21ce3369030746d7dcd6684334d6ce20':
SoftAVCDec: fail gracefully in onQueueFilled
f54bd64018c166e2e7c0de5951115a8f3fb965fa 09-Jul-2015 Robert Shih <robertshih@google.com> Merge "SoftAVCDec: fail gracefully in onQueueFilled"
db7733ad21ce3369030746d7dcd6684334d6ce20 09-Jul-2015 Robert Shih <robertshih@google.com> Merge "SoftAVCDec: fail gracefully in onQueueFilled" into mnc-dev
90599b61289fbeda8312e6633c551a6e3d1a0ada 25-Jun-2015 Hamsalekha S <hamsalekha.s@ittiam.com> SoftAVCDec: fail gracefully in onQueueFilled

Bug: 21942104
Change-Id: Ia3b16b39b53c3a4678f4bba9e80dd0a715409520
odecs/avcdec/SoftAVCDec.cpp
odecs/avcdec/SoftAVCDec.h
faf755df5654c6ea0080e2af39c3d6810c0a2f14 09-Jul-2015 Jaesung Chung <jaesung@google.com> mpeg2ts: keep the size of the sync points at most 5mb per a track

Bug: 21901470
Change-Id: I1506d3c73a213ff29e3b0adb8b0a1e7571e583aa
peg2ts/MPEG2TSExtractor.cpp
e9e2b6a3cdb8dad754f05dad50adc616ce5effa3 09-Jul-2015 Robert Shih <robertshih@google.com> am 4b83fecf: Merge "MPEG4Source::fragmentedRead: check range before writing into buffers" into mnc-dev

* commit '4b83fecfb551b4ab31e9bd87bc48063932e1a204':
MPEG4Source::fragmentedRead: check range before writing into buffers
fd866b3aa0d97375de08f8888b95669026c83361 07-Jul-2015 Wei Jia <wjia@google.com> SimpleSoftOMXComponent: change CHECK to error notification.

SoftAVCDec, SoftMPEG4: fix handling of zero-byte input buffer.

ACodec: do not send empty input buffer without EOS to the omx component.

Bug: 22199127
Change-Id: I0bbcf5778f969ba6e30d0db31770c4289e2b64a4
Codec.cpp
odecs/avcdec/SoftAVCDec.cpp
odecs/m4v_h263/dec/SoftMPEG4.cpp
mx/SimpleSoftOMXComponent.cpp
e38c669a6544daaa9e4ad4cd8dc67944b8211146 08-Jul-2015 Robert Shih <robertshih@google.com> am 4b83fecf: Merge "MPEG4Source::fragmentedRead: check range before writing into buffers" into mnc-dev

* commit '4b83fecfb551b4ab31e9bd87bc48063932e1a204':
MPEG4Source::fragmentedRead: check range before writing into buffers
4b83fecfb551b4ab31e9bd87bc48063932e1a204 08-Jul-2015 Robert Shih <robertshih@google.com> Merge "MPEG4Source::fragmentedRead: check range before writing into buffers" into mnc-dev
ac31c61f808ad5cf86920d9e95ca56e79e377534 08-Jul-2015 Evgenii Stepanov <eugenis@google.com> am 0080e695: am 8f92950b: Merge "Fix global-buffer-overflow in voAWB_Copy."

* commit '0080e695ac927a669dc98979e97bddf0e3ae8325':
Fix global-buffer-overflow in voAWB_Copy.
4c5c7e4a2f41f4eabf009367368f1e6ace2490a9 08-Jul-2015 Evgenii Stepanov <eugenis@google.com> am 0080e695: am 8f92950b: Merge "Fix global-buffer-overflow in voAWB_Copy."

* commit '0080e695ac927a669dc98979e97bddf0e3ae8325':
Fix global-buffer-overflow in voAWB_Copy.
3bb9e7444850eb999fdc924496b237693856ef24 08-Jul-2015 Ronghua Wu <ronghuawu@google.com> libstagefright: get secure and non-secure codec policy from mediacodec list global settings

Bug: 21171205
Change-Id: Ie30f5234c2a7c0103138b85cc7360f9e3f470088
ediaCodecList.cpp
f3a5cf243fc2608c0d5dc4984806a4a8176455cf 25-Jun-2015 Robert Shih <robertshih@google.com> SoftAVCDec: fail gracefully in onQueueFilled

Bug: 21942104
Change-Id: Ia3b16b39b53c3a4678f4bba9e80dd0a715409520
odecs/avcdec/SoftAVCDec.cpp
odecs/avcdec/SoftAVCDec.h
da93c7a3bd0da4acb2d920d4549ad9e302690af1 23-Jun-2015 Robert Shih <robertshih@google.com> MPEG4Source::fragmentedRead: check range before writing into buffers

Bug: 22008959
Change-Id: I5f6e188adcc593796455bdaf7b0b8aba672b106e
PEG4Extractor.cpp
dae006d1def007dddad9a202a0593b478eab503f 08-Jul-2015 Evgenii Stepanov <eugenis@google.com> Fix global-buffer-overflow in voAWB_Copy.

Copy() in frameworks/av/media/libstagefright/codecs/amrwbenc/src/util.c always
overreads the buffer by 4 bytes to the right, which, if we are very unlucky,
can even hit an unmapped memory page (in this case it is just a global
variable).

Bug: 22331081
Change-Id: I3d5d7f94c7248967518bf4d0faf34c364e431135
odecs/amrwbenc/src/util.c
adb1b8b1b58aeebdd950cfe725537530f817cffc 02-Jul-2015 Lajos Molnar <lajos@google.com> am dfad5454: Merge "stagefright: prevent allocating stale buffers for OMX decoders" into mnc-dev

* commit 'dfad5454e0caf46f8732f1415d3b9a76f2a1242e':
stagefright: prevent allocating stale buffers for OMX decoders
b37a263fe42997495fce6f36086d429cca9e9308 02-Jul-2015 Lajos Molnar <lajos@google.com> am 49605e8a: stagefright: fix deadlock and NPE in GraphicBufferSource

* commit '49605e8ab171a2b1f474645d632d3982f5f7b8e6':
stagefright: fix deadlock and NPE in GraphicBufferSource
c1a104aaad2d84a57bf5d87dd030d2bef56bf541 01-Jul-2015 Marco Nelissen <marcone@google.com> Check buffer size before using it

Bug: 21814993
Change-Id: Idaac61b4b9f4058b94e84093644593ba315d72ff
PEG4Extractor.cpp
dfad5454e0caf46f8732f1415d3b9a76f2a1242e 01-Jul-2015 Lajos Molnar <lajos@google.com> Merge "stagefright: prevent allocating stale buffers for OMX decoders" into mnc-dev
49605e8ab171a2b1f474645d632d3982f5f7b8e6 01-Jul-2015 Lajos Molnar <lajos@google.com> stagefright: fix deadlock and NPE in GraphicBufferSource

Bug: 22202388
Change-Id: I04f2f783ecc0e0c50adf16a666f6d7ab4221e285
mx/GraphicBufferSource.cpp
mx/GraphicBufferSource.h
mx/OMXNodeInstance.cpp
65354ffb8a8a339c05e1882ae06c8d39e70e6f2f 01-Jul-2015 Ronghua Wu <ronghuawu@google.com> am b848dbb0: Merge "libstagefright: parse /etc/media_codecs_performance.xml for performance data." into mnc-dev

* commit 'b848dbb05b6a03dbe439298e6f9de7ce072c965f':
libstagefright: parse /etc/media_codecs_performance.xml for performance data.
b848dbb05b6a03dbe439298e6f9de7ce072c965f 01-Jul-2015 Ronghua Wu <ronghuawu@google.com> Merge "libstagefright: parse /etc/media_codecs_performance.xml for performance data." into mnc-dev
3f0aae62ca3660a90647f08087de7a70a12cfd70 01-Jul-2015 Martin Storsjo <martin@martin.st> Don't include ithread.h in decoder omx wrappers

ithread.h probably should be considered an internal, private header.
These omx wrappers don't use anything from this header anyway, so
stop including it.

Change-Id: I5f14f3eae86c6b5f6ffa193d4b97f483d9be6fb0
odecs/avcdec/SoftAVCDec.cpp
odecs/hevcdec/SoftHEVC.cpp
odecs/mpeg2dec/SoftMPEG2.cpp
7621a438e17d36ddc49c6b03d239d971eb4a7a8d 01-Jul-2015 Andy Hung <hunga@google.com> am 0852646a: Merge "Fix SoftMP3 divide by 0" into mnc-dev

* commit '0852646a7bfb2a43a0d24d3d42bd101065e684f4':
Fix SoftMP3 divide by 0
0852646a7bfb2a43a0d24d3d42bd101065e684f4 01-Jul-2015 Andy Hung <hunga@google.com> Merge "Fix SoftMP3 divide by 0" into mnc-dev
264bac95912efe121d6a60026612617f04f42966 27-Jun-2015 Lajos Molnar <lajos@google.com> stagefright: prevent allocating stale buffers for OMX decoders

Also fix some issues encountered once using generationNumbers:
- properly account outstanding buffers in MediaSync
- don't release arbitrary frame if attach fails

Bug: 11990461
Change-Id: Icee5ea188ca4eb856138feb5e6ec5d4ee5e44008
Codec.cpp
ediaCodec.cpp
ediaSync.cpp
mx/GraphicBufferSource.cpp
ca12af3ff5b7b9c37150209f6369ec511e010ffa 01-Jul-2015 Wei Jia <wjia@google.com> am 2d80c0a1: am a549658b: am 7397892d: am 402eaab9: am 370290f4: am bcd5edf9: am 13c925ca: am 6ff53b96: Merge "Prevent integer overflow when processing covr MPEG4 atoms" into klp-dev

* commit '2d80c0a13c40f29d2a4b4aca8765705cbb4b2fe8':
Prevent integer overflow when processing covr MPEG4 atoms
c015b84e5d6f5d1e116d71bfbd3bd8edc3b06511 01-Jun-2015 Andy Hung <hunga@google.com> Fix SoftMP3 divide by 0

Bug: 21525346
Change-Id: I19f1ec0f4e9571bd6aeb26efbcba5f16dc664e47
odecs/mp3dec/SoftMP3.cpp
0755f84d29ac1bf654a15303ca78ba3087298314 30-Jun-2015 Chong Zhang <chz@google.com> am b483c6aa: Merge "ignore buffers that\'s already removed" into mnc-dev

* commit 'b483c6aa4aacb0ec271b03648fd6eaadc938d995':
ignore buffers that's already removed
stagefright: allow state change while handling OMX message list
stagefright: handle removal of a tracked buffer in ACodec
Fix clamp issue with AudioMixer with float input and int16 output
fix buffer leak due to unreleased last repeat frame
Revert "stagefright: relax check of OMX buffer header"
Revert "stagefright: relax check of OMX buffer header"
stagefright: relax check of OMX buffer header
stagefright: fix legacy support for CameraSource
camera: Add AIDL interface for CameraServiceProxy.
stagefright: don't use stale pointer after disconnecting NuCachedSource2
camera2: Fix work-profile eviction handling.
camera2: Fix empty set handling for eviction.
Revert "Enable full floating point path in AudioMixer"
stagefright: fix pushBlankBuffersToNW for non-meta decoders
Camera: API1 shim: Don't tightly apply crop region
402eaab965809c09f1fdbd79533444d8b21b9afa 30-Jun-2015 Wei Jia <wjia@google.com> am 370290f4: am bcd5edf9: am 13c925ca: am 6ff53b96: Merge "Prevent integer overflow when processing covr MPEG4 atoms" into klp-dev

* commit '370290f400ff3057a71a192a70dfd69499aa8937':
Prevent integer overflow when processing covr MPEG4 atoms
b483c6aa4aacb0ec271b03648fd6eaadc938d995 30-Jun-2015 Chong Zhang <chz@google.com> Merge "ignore buffers that's already removed" into mnc-dev
bcd5edf99867b7bc10a3847d17cfb1e63b3b1764 30-Jun-2015 Wei Jia <wjia@google.com> am 13c925ca: am 6ff53b96: Merge "Prevent integer overflow when processing covr MPEG4 atoms" into klp-dev

* commit '13c925cab2decaed6786b0642f2b5a9f8516e71a':
Prevent integer overflow when processing covr MPEG4 atoms
4b6160142a377b920cd7d2ecd0b15aac05cc8b87 30-Jun-2015 Lajos Molnar <lajos@google.com> am ad949cd4: Merge "stagefright: ask for flex-YUV camera buffers for software encoders" into mnc-dev

* commit 'ad949cd4ca52d19ea5e7a5c5dce84d1410fe5244':
stagefright: ask for flex-YUV camera buffers for software encoders
ad949cd4ca52d19ea5e7a5c5dce84d1410fe5244 30-Jun-2015 Lajos Molnar <lajos@google.com> Merge "stagefright: ask for flex-YUV camera buffers for software encoders" into mnc-dev
5419242328f33f4d126a22ef6296c99353f4dfb4 29-Jun-2015 Chong Zhang <chz@google.com> ignore buffers that's already removed

bug: 22005018
Change-Id: I892a0fe77519d5fb996bcb4cc95e0d10e859000c
mx/OMXNodeInstance.cpp
c884adf00fce70170003d6f18ad65c8912535ac8 27-Jun-2015 Martin Storsjo <martin@martin.st> SoftAVCEnc: Stop using the u4_strd field in the set dimensions struct

Since 90a3904fd3 in external/libavc, this field isn't used any longer.
After SoftAVCEnc stops using it, it can be removed from the library
altogether.

Change-Id: I0e0fcab6740ef420df7776ede11b35aa1a383a48
odecs/avcenc/SoftAVCEnc.cpp
43e519745373336f0e0c77107ab7a75198a1d2f2 27-Jun-2015 Ronghua Wu <ronghuawu@google.com> am 29b7cec9: Merge "libstagefright: only do boot time codec profiling for debugging." into mnc-dev

* commit '29b7cec9a248828d2371bc8758d819308d0e84a4':
libstagefright: only do boot time codec profiling for debugging.
c93a13669ce1b5a9e6527b4c86c9d8f5e92be828 26-Jun-2015 Lajos Molnar <lajos@google.com> stagefright: ask for flex-YUV camera buffers for software encoders

Bug: 13222807
Change-Id: I854b73a63cf9239311729598241725d84e8513aa
Codec.cpp
ameraSource.cpp
ediaCodecSource.cpp
mx/GraphicBufferSource.cpp
mx/SoftVideoEncoderOMXComponent.cpp
50cf65497283aa324c5c28aa69a3895644574885 26-Jun-2015 Ronghua Wu <ronghuawu@google.com> libstagefright: only do boot time codec profiling for debugging.

and remove "max-supported-instances".

Bug: 22089269
Change-Id: Ia786105d3371926b90a559649b9495f5c1397cea
ediaCodecList.cpp
dc9a65ff4c02b361af49c82c54b03a37f072fc26 26-Jun-2015 Ronghua Wu <ronghuawu@google.com> am 064b2bf7: Merge "libstagefright: parse concurrent-instances." into mnc-dev

* commit '064b2bf712788d30928b9a8bafecd0f3308d7aa4':
libstagefright: parse concurrent-instances.
064b2bf712788d30928b9a8bafecd0f3308d7aa4 26-Jun-2015 Ronghua Wu <ronghuawu@google.com> Merge "libstagefright: parse concurrent-instances." into mnc-dev
0f29c9d205ff03286da629d30fddd5dd5ca020db 25-Jun-2015 Ronghua Wu <ronghuawu@google.com> libstagefright: parse concurrent-instances.

Bug: 22089269
Change-Id: I43c04e7fbc88dd1ec3fe21bcf4acf2e2e8cab25a
ediaCodecList.cpp
ediaCodecListOverrides.cpp
1ad56353aec03b0255d5cd5b67f9e6df780d9b65 01-Jun-2015 Doney Alex <doney.alex@ittiam.com> SoftAVCEnc: Added support for Main Profile encoding.

Configured intra frame interval and deblock in setParams.

Change-Id: If501fa0ac42f2c4bf6604ea84715f7f13f707e74
odecs/avcenc/SoftAVCEnc.cpp
odecs/avcenc/SoftAVCEnc.h
defb2374a0e0adbd3714a2cd02be3c309cde4875 09-Jun-2015 Martin Storsjo <martin@martin.st> Clear the executable bit from source files

The executable bit was accidentally set on these files in commits
eedcd5cccc and ec7398f37.

Change-Id: I057e8841ad12561b05c4dc9553ca1cd664c7f59c
odecs/avcdec/SoftAVCDec.cpp
odecs/avcdec/SoftAVCDec.h
odecs/avcenc/SoftAVCEnc.cpp
7099d9b5f3761dbe3f76166129c3f0a22d2470ef 24-Jun-2015 Marco Nelissen <marcone@google.com> resolved conflicts for merge of 697a449f to mnc-dev-plus-aosp

Change-Id: Id6e85e5e6ed10c3103dc7591508e95735a0c5153
c0c51cbd26523fdf30bb19aa3d75c6b7dcc9daee 24-Jun-2015 Marco Nelissen <marcone@google.com> am 53670d35: am c182ac9a: Merge "Clear the executable bit from source files"

* commit '53670d357f1d2321841d6fc898d8caeee82390d0':
Clear the executable bit from source files
37009e46e5e935849384819d5db3e8b83d554947 24-Jun-2015 Marco Nelissen <marcone@google.com> Merge "SoftAVCEnc: Added support for Main Profile encoding."
e032faee45712ce3a3f8e7e51a2305e79a74d247 22-Jun-2015 Lajos Molnar <lajos@google.com> am 4d622375: Merge "stagefright: relax check of OMX buffer header - again" into mnc-dev

* commit '4d622375dc6c9d6b6b817cce598692ae491b2496':
stagefright: relax check of OMX buffer header - again
36d44c4e30a55c4d215fdb7a9f593e73c5f4e06e 22-Jun-2015 Lajos Molnar <lajos@google.com> am 5cecaa94: Merge "stagefright: allow state change while handling OMX message list" into mnc-dev

* commit '5cecaa9430ef1d721968f1cd621c1c45c52190ce':
stagefright: allow state change while handling OMX message list
4d622375dc6c9d6b6b817cce598692ae491b2496 22-Jun-2015 Lajos Molnar <lajos@google.com> Merge "stagefright: relax check of OMX buffer header - again" into mnc-dev
5cecaa9430ef1d721968f1cd621c1c45c52190ce 22-Jun-2015 Lajos Molnar <lajos@google.com> Merge "stagefright: allow state change while handling OMX message list" into mnc-dev
ec4ed7d541f48d1d0af8f93cd26ec291ca82061b 12-Jun-2015 Lajos Molnar <lajos@google.com> stagefright: relax check of OMX buffer header - again

- move check to after FillBufferDone only.
- add support for NULL graphicBuffer - just in case

Bug: 21773260
Change-Id: Ibf03511f1d04425e29b63fe4e560e0d8ba6ea20e
mx/OMXNodeInstance.cpp
0512bd43d57405fe15c0e883b18fdce5940dabf9 20-Jun-2015 Lajos Molnar <lajos@google.com> am 07c408ad: Merge "stagefright: handle removal of a tracked buffer in ACodec" into mnc-dev

* commit '07c408add715af3929caad025190809398715777':
stagefright: handle removal of a tracked buffer in ACodec
e421a32aa696cd8abbf8fdc97cc8f37dbf372cac 20-Jun-2015 Lajos Molnar <lajos@google.com> stagefright: allow state change while handling OMX message list

Bug: 21724210
Bug: 21925253
Change-Id: Id1c055ce611d4632ae13fbc69d79b65caf657a2a
Codec.cpp
f5fee04696215cf7d4da9af2025109c7ed4318a4 20-Jun-2015 Andy Hung <hunga@google.com> am 9a922554: Merge "MediaCodec: handle a spontaneous error while configuring" into mnc-dev

* commit '9a92255484adef1ae82f4c77d654ad47997c0439':
MediaCodec: handle a spontaneous error while configuring
604bb9ea6e9bec763ae231330066ecffa90a2786 20-Jun-2015 Lajos Molnar <lajos@google.com> stagefright: handle removal of a tracked buffer in ACodec

Bug: 21815057
Change-Id: Idd1c71b4b0b68028020c3e10615936870ffd2dec
Codec.cpp
rameRenderTracker.cpp
9a92255484adef1ae82f4c77d654ad47997c0439 20-Jun-2015 Andy Hung <hunga@google.com> Merge "MediaCodec: handle a spontaneous error while configuring" into mnc-dev
deb3dba24b8be8fb64945db5b594184e922faeaa 19-Jun-2015 Chong Zhang <chz@google.com> am 652c2207: Merge "fix buffer leak due to unreleased last repeat frame" into mnc-dev

* commit '652c2207fe19bef3657a5abe865f9f9b2a4cd866':
fix buffer leak due to unreleased last repeat frame
652c2207fe19bef3657a5abe865f9f9b2a4cd866 18-Jun-2015 Chong Zhang <chz@google.com> Merge "fix buffer leak due to unreleased last repeat frame" into mnc-dev
9700f5fe4b3becfe858cbf5aa7964296975081bb 13-Jun-2015 Chong Zhang <chz@google.com> fix buffer leak due to unreleased last repeat frame

bug: 21659689
bug: 21473584
Change-Id: I9e3dabd1be33352fdacd38797bc9fce91ecc7ee2
mx/GraphicBufferSource.cpp
mx/GraphicBufferSource.h
cadc1505ab1a91a509c0138ab03e099e636b1f04 18-Jun-2015 Marco Nelissen <marcone@google.com> am 3ecc9db4: Fix software video decoder buffer size calculation

* commit '3ecc9db40b1fb9c7f807a5892e5c9625aac1fb06':
Fix software video decoder buffer size calculation
3ecc9db40b1fb9c7f807a5892e5c9625aac1fb06 16-Jun-2015 Marco Nelissen <marcone@google.com> Fix software video decoder buffer size calculation

Various software video decoders would specify the buffer size as if it were
fully cropped, which then failed a sanity check in SoftwareRenderer.
They now return the full buffer size.

Bug: 21717327
Bug: 21443020
Change-Id: I19fcd091827ebd52a95a5509281a07ccc156e0e5
odecs/avcdec/SoftAVCDec.cpp
odecs/on2/dec/SoftVPX.cpp
c6044a135324979e62cc59db9dbde8b11c4bb74b 17-Jun-2015 Andy Hung <hunga@google.com> MediaCodec: handle a spontaneous error while configuring

Allow the INITIALIZED and UNINITIALIZED state to prevent
a CHECK() from aborting the thread. This state flexibility
makes the handling for kWhatComponentConfigured similar
to kWhatFlushCompleted.

Bug: 21840990
Change-Id: I57e08cfb146b0b9a355061e4f9ffbe176f213cf6
ediaCodec.cpp
3d81831baab39a0ac692c752ddf159488a76278c 15-Jun-2015 Rachad Alao <rachad@google.com> am bd974011: Merge "Revert "stagefright: relax check of OMX buffer header"" into mnc-dev

* commit 'bd974011599b6d4ff47c1cee36d617f191dc0c2f':
Revert "stagefright: relax check of OMX buffer header"
bd974011599b6d4ff47c1cee36d617f191dc0c2f 15-Jun-2015 Rachad Alao <rachad@google.com> Merge "Revert "stagefright: relax check of OMX buffer header"" into mnc-dev
1ff26b038c646414c450bae5277b7a726b3322b7 15-Jun-2015 Rachad Alao <rachad@google.com> Revert "stagefright: relax check of OMX buffer header"

This reverts commit 652bc0197341337bb07fc4f87f168167fb3f47dc pending
the complete investigation of b/21837661

Change-Id: I9c2825fd98ff7e9898c319ee66c0e3a3466c2093
mx/OMXNodeInstance.cpp
f6f621cff6a48680ac321485ce63c7a9419eaab0 15-Jun-2015 Nick Kralevich <nnk@google.com> am 938e2b34: don\'t trigger an integer underflow when decrementing.

* commit '938e2b34b16c3c1fd29c753eeb53ee95a2b2e2b3':
don't trigger an integer underflow when decrementing.
938e2b34b16c3c1fd29c753eeb53ee95a2b2e2b3 14-Jun-2015 Nick Kralevich <nnk@google.com> don't trigger an integer underflow when decrementing.

When decrementing "i", eventually i will equal zero. When that
happens, i-- underflows. This causes a crash when code which uses
clang's -fsanitize=unsigned-integer-overflow is run.

Avoid trigging an unsigned integer underflow.

Change-Id: I61709cb01f56fdb36d631aa95579e8bd09cafd12
Codec.cpp
ediaCodecList.cpp
oundation/AHierarchicalStateMachine.cpp
oundation/ALooperRoster.cpp
86a6292fe111533937d9557cc33b1f06ad82d40f 13-Jun-2015 Lajos Molnar <lajos@google.com> am 95ca9aa2: Merge "stagefright: use media timestamp for default render timestamp" into mnc-dev

* commit '95ca9aa2e1a5b42695113a1260a5e2fd81e4a80f':
stagefright: use media timestamp for default render timestamp
95ca9aa2e1a5b42695113a1260a5e2fd81e4a80f 13-Jun-2015 Lajos Molnar <lajos@google.com> Merge "stagefright: use media timestamp for default render timestamp" into mnc-dev
77aea92c9e29110a008b9e7f5d517b4451c26617 10-Jun-2015 Ronghua Wu <ronghuawu@google.com> libstagefright: parse /etc/media_codecs_performance.xml for performance data.

Bug: 20507129
Change-Id: I138df61ba3b4e6c73d3e1bd83f1fb22321f58c73
ediaCodecList.cpp
f202611d07875a2dd957801e3b579e3a1b94e067 13-Jun-2015 Ronghua Wu <ronghuawu@google.com> am 7bf8e1c2: Merge "libstagefright: remove out of date profiling result before doing a new profiling." into mnc-dev

* commit '7bf8e1c28ba7ba6eb0c677d9ca749e4238fa43f4':
libstagefright: remove out of date profiling result before doing a new profiling.
7bf8e1c28ba7ba6eb0c677d9ca749e4238fa43f4 13-Jun-2015 Ronghua Wu <ronghuawu@google.com> Merge "libstagefright: remove out of date profiling result before doing a new profiling." into mnc-dev
c8edf5af010ac24a99b302a18e7b84e8b4b2b783 12-Jun-2015 Lajos Molnar <lajos@google.com> stagefright: use media timestamp for default render timestamp

Bug: 21814308
Change-Id: I897bc4878c0b3a758d630e9c117b746ef7e55146
Codec.cpp
ediaCodec.cpp
290d01f37e6ac8d706dc9f06cc4460017ba0d7b1 13-Jun-2015 Ronghua Wu <ronghuawu@google.com> libstagefright: remove out of date profiling result before doing a new profiling.

Bug: 21333717
Change-Id: Iaeff615fccf87b3aceed6fa566f82c06a981e030
ediaCodecList.cpp
5fc3854742e1712f947c8d249db31b18ae0dcbba 12-Jun-2015 Lajos Molnar <lajos@google.com> am 652bc019: stagefright: relax check of OMX buffer header

* commit '652bc0197341337bb07fc4f87f168167fb3f47dc':
stagefright: relax check of OMX buffer header
458f36747fee21282fa8e9d09bddbc73dc11cd60 12-Jun-2015 Lajos Molnar <lajos@google.com> am 5011629a: fix build: use proper fmt in StagefrightMetadataRetriever.cpp log

* commit '5011629ad8212397263702f6b585547767f30726':
fix build: use proper fmt in StagefrightMetadataRetriever.cpp log
652bc0197341337bb07fc4f87f168167fb3f47dc 12-Jun-2015 Lajos Molnar <lajos@google.com> stagefright: relax check of OMX buffer header

- move check to after FillBufferDone only.
- add support for NULL graphicBuffer - just in case

Bug: 21773260
Change-Id: I804574c30ce47fd98bf09f5fe8ad00ae454ed1af
mx/OMXNodeInstance.cpp
5011629ad8212397263702f6b585547767f30726 12-Jun-2015 Lajos Molnar <lajos@google.com> fix build: use proper fmt in StagefrightMetadataRetriever.cpp log

Change-Id: Iadf74ed8c5b3a3bdb799c6e926fb7bea02511071
tagefrightMetadataRetriever.cpp
6f29fa5a6b8dc08b9b853a14c3f4d45b5aaef437 12-Jun-2015 Lajos Molnar <lajos@google.com> am ab1b39c6: Merge "stagefright: Decode video thumbnail using MediaCodec" into mnc-dev

* commit 'ab1b39c6328cd5471d164890e46bb54315b4c542':
stagefright: Decode video thumbnail using MediaCodec
ab1b39c6328cd5471d164890e46bb54315b4c542 12-Jun-2015 Lajos Molnar <lajos@google.com> Merge "stagefright: Decode video thumbnail using MediaCodec" into mnc-dev
36dee23baca299f38c134b18f4deb36862bdd89d 15-Apr-2015 Praveen Chavan <pchavan@codeaurora.org> stagefright: Decode video thumbnail using MediaCodec

Use MediaCodec (in place of OMXCodec) to decode video
thumbnail

Change-Id: I05beaa3d67edff51aa17f58444fd34afb3933580
tagefrightMetadataRetriever.cpp
7d3be41436e91a1d79b3a38c651bcd0d2c221f6d 12-Jun-2015 Wei Jia <wjia@google.com> am f475f6c0: am e168bdd2: am f19acf48: am 66b91b34: am e6382cb0: am 115e995c: resolved conflicts for merge of 1f44d837 to lmp-dev

* commit 'f475f6c0cf28f3b4c1ae677febb7590c70865f81':
Fix integer overflow when handling MPEG4 tx3g atom
7e2d436ff3338e42df5f31cf2aea4d0d19886b0c 12-Jun-2015 Joshua J. Drake <android-open-source@qoop.org> am 06880580: am 9784b406: am 49029189: am 30b72fcf: am 0773dc37: am 768a8fb4: am f0e1fb59: am 4a492bf2: Fix integer underflow in covr MPEG4 processing

* commit '068805802f78ff82e4ba40adffc33ddcd3b0eb8f':
Fix integer underflow in covr MPEG4 processing
3056e554741facd48cec8247790bb091d574972f 12-Jun-2015 Wei Jia <wjia@google.com> am c1768c9d: am 268b9692: am 9a4da6b1: am c98f2a0a: am e0095a19: am 86174e2c: Merge "Prevent reading past the end of the buffer in 3GPP" into lmp-dev

* commit 'c1768c9dae4e4ad1f92759c9c981d2d6e5bd29d6':
Prevent reading past the end of the buffer in 3GPP
acf52af62fcf14d18e4a557319a7307b7ed02c94 12-Jun-2015 Joshua J. Drake <android-open-source@qoop.org> am a2a912a7: am cacf9084: am 534ab954: am 10441a6f: am f02c5c9e: am 4d8ed149: Prevent integer underflow if size is below 6

* commit 'a2a912a71e97b92edd7a73452587e0897026ec1e':
Prevent integer underflow if size is below 6
09fec7c14b3eeba465b1f382f71a88540008a3b5 12-Jun-2015 Andy Hung <hunga@google.com> am 47e94277: am d3061951: am 4bd813f6: am e0e50f2a: am e5ca9a20: am 375e3495: IOMX: Clear buffer id for arm32

* commit '47e94277d1e0b6f581072db8f2b5406eb30dc685':
IOMX: Clear buffer id for arm32
bbcf86662874cd1c716cffdede3c4034cdfd9654 12-Jun-2015 Lajos Molnar <lajos@google.com> am c6512256: Merge "SoftOpus: Fix output buffer capacity." into mnc-dev

* commit 'c6512256ae3481c94f827bdee31abe6b5e6000f3':
SoftOpus: Fix output buffer capacity.
08e8227514f5ab99822dfae8b4d39414646ff59d 11-Jun-2015 Vignesh Venkatasubramanian <vigneshv@google.com> SoftOpus: Fix output buffer capacity.

The output buffer size as per opus project's sample decoder [1] is
960*6*channel_count. Whereas in SoftOpus, we use 960*6 (without the
channel count multiplier. Fixing it to include maximum number of
channels possible as the multiplier.

[1] http://git.xiph.org/?p=opus-tools.git;a=blob;f=src/opusdec.c;h=d085f04eacdfd49759ffdb73db805562ba396720;hb=f2a2e88b47f6f24083a37be476f140f677fe7160#l571

BUG=20721050

Change-Id: I323891a1b11491782bc093477b09e7757b885674
odecs/opus/dec/SoftOpus.cpp
114041d746956f6fd582a6bdc41626919cb0b857 11-Jun-2015 Wonsik Kim <wonsik@google.com> am 71ec3dfc: stagefright: fix clang build

* commit '71ec3dfc1d8d53bdc8f99b69286b60ecb926d7ff':
stagefright: fix clang build
395321dad8e1e9037e9ec572dc1d4856023c2ee8 11-Jun-2015 Wonsik Kim <wonsik@google.com> am 054bf835: Merge "stagefright: TinyCacheSource to read continuously" into mnc-dev

* commit '054bf835731c0fa5e6c2fbee93b0befa74c10119':
stagefright: TinyCacheSource to read continuously
6564461db1a76b8704dbc63e3d65c4ca6dd123e8 11-Jun-2015 Wonsik Kim <wonsik@google.com> am f4b30c20: Merge "mpeg2ts: more error tolerance" into mnc-dev

* commit 'f4b30c200cfc7c8c502f759dcb90979586e43b27':
mpeg2ts: more error tolerance
15a2cb0082d7c0a004c2fdc563c153f4781437d2 01-Jun-2015 Doney Alex <doney.alex@ittiam.com> SoftAVCEnc: Added support for Main Profile encoding.

Configured intra frame interval and deblock in setParams.

Change-Id: If501fa0ac42f2c4bf6604ea84715f7f13f707e74
odecs/avcenc/SoftAVCEnc.cpp
odecs/avcenc/SoftAVCEnc.h
71ec3dfc1d8d53bdc8f99b69286b60ecb926d7ff 11-Jun-2015 Wonsik Kim <wonsik@google.com> stagefright: fix clang build

Change-Id: I4f10e4af6f0b5fb0b90513ad516b36b444d3bd68
allbackDataSource.cpp
054bf835731c0fa5e6c2fbee93b0befa74c10119 11-Jun-2015 Wonsik Kim <wonsik@google.com> Merge "stagefright: TinyCacheSource to read continuously" into mnc-dev
f4b30c200cfc7c8c502f759dcb90979586e43b27 11-Jun-2015 Wonsik Kim <wonsik@google.com> Merge "mpeg2ts: more error tolerance" into mnc-dev
65959d34fdab8319dbf765be5fbf7ff8051eedf1 10-Jun-2015 Wonsik Kim <wonsik@google.com> mpeg2ts: more error tolerance

Be more tolerant with corrupt packet. Instead of reporting EOS,
simply discard the damaged packet and continue.

Bug: 21764375

Change-Id: Ibfd112db884732a082371c1abbd047077d1bf57e
peg2ts/ATSParser.cpp
06ec7f3ef28ee68714d323ca9e2d3cab2165dfe8 09-Jun-2015 Wonsik Kim <wonsik@google.com> stagefright: TinyCacheSource to read continuously

If the seek operation of underlying MediaDataSource implementation is
expensive and each read is relatively small (e.g. Live MPEG2 TS
stream), current TinyCacheSource implementation requests seek too
frequently.

Bug: 21764375

Change-Id: Ic620bf027bc4ef48822549c83c5c98109986884a
allbackDataSource.cpp
979ff4c303ac57bb61f62701e29527d280b0738e 11-Jun-2015 Lajos Molnar <lajos@google.com> am 4a4265e9: Merge "Added support for MPEG2 video in MPEG4Extractor" into mnc-dev

* commit '4a4265e9fc4e72d069eb2de37c8484d67fd3a9fc':
Added support for MPEG2 video in MPEG4Extractor
79b5c59e1fd250c7dd6d340949e6ce1491fc88b3 11-Jun-2015 Lajos Molnar <lajos@google.com> am 984a5432: stagefright: fix issues with OMX message passing

* commit '984a54322f7c70bc75e862d91bdd975814872aff':
stagefright: fix issues with OMX message passing
4a4265e9fc4e72d069eb2de37c8484d67fd3a9fc 11-Jun-2015 Lajos Molnar <lajos@google.com> Merge "Added support for MPEG2 video in MPEG4Extractor" into mnc-dev
9872d145ae44d7a9b1d247653c83a670b29459a6 11-Jun-2015 Lajos Molnar <lajos@google.com> am 5fb8b298: stagefright: fix legacy support for CameraSource

* commit '5fb8b2987ab96ad65dc4b046616607ece16d6fb3':
stagefright: fix legacy support for CameraSource
66b91b348d66102c8deb652929150446223ec767 11-Jun-2015 Wei Jia <wjia@google.com> am e6382cb0: am 115e995c: resolved conflicts for merge of 1f44d837 to lmp-dev

* commit 'e6382cb0e9e3fcf730faac3be661c9facd939d49':
Fix integer overflow when handling MPEG4 tx3g atom
30b72fcf1fbb4191fb5986eade487becc39cfcd1 11-Jun-2015 Joshua J. Drake <android-open-source@qoop.org> am 0773dc37: am 768a8fb4: am f0e1fb59: am 4a492bf2: Fix integer underflow in covr MPEG4 processing

* commit '0773dc374056f46ff2d98f6421e12365968ba423':
Fix integer underflow in covr MPEG4 processing
c98f2a0aa96c07aae6218e9e804ab18e9b50de3e 11-Jun-2015 Wei Jia <wjia@google.com> am e0095a19: am 86174e2c: Merge "Prevent reading past the end of the buffer in 3GPP" into lmp-dev

* commit 'e0095a19666afbab36dd0e8e4544e7f4ec9f890c':
Prevent reading past the end of the buffer in 3GPP
10441a6f3066d9ce279c478062a35a7e4e236e73 11-Jun-2015 Joshua J. Drake <android-open-source@qoop.org> am f02c5c9e: am 4d8ed149: Prevent integer underflow if size is below 6

* commit 'f02c5c9e4e13a493adcf39d0cba2a549d8caa4de':
Prevent integer underflow if size is below 6
984a54322f7c70bc75e862d91bdd975814872aff 10-Jun-2015 Lajos Molnar <lajos@google.com> stagefright: fix issues with OMX message passing

- added destructor for MessageList so messages are freed
- check if notify has been initialized
- do not call onMessages if there are no messages

Bug: 21659665
Change-Id: Idb4eaa63dc2f8be8b282be79e6234f83a7669481
Codec.cpp
mx/OMXNodeInstance.cpp
5fb8b2987ab96ad65dc4b046616607ece16d6fb3 10-Jun-2015 Lajos Molnar <lajos@google.com> stagefright: fix legacy support for CameraSource

- allocate big enough buffers for native metadata source even in
CameraSource mode
- don't check range when using native metadata mode (and converting
it to GrallocSource) as OMX buffer will be smaller than input
- log allocated vs. OMX reported sizes in OMXNodeInstance logs

Bug: 21708032
Change-Id: I7eeffc5116079e5b368f84980e8e7524260aaccf
Codec.cpp
mx/OMXNodeInstance.cpp
a48d67114bdae2771c2d3bafae78130aba418936 10-Jun-2015 Lajos Molnar <lajos@google.com> am 356f0847: Merge "stagefright: add support for output frame rendered callback" into mnc-dev

* commit '356f08476db6191cdcbad20caf69d7bd642a09b2':
stagefright: add support for output frame rendered callback
356f08476db6191cdcbad20caf69d7bd642a09b2 10-Jun-2015 Lajos Molnar <lajos@google.com> Merge "stagefright: add support for output frame rendered callback" into mnc-dev
7ad1667690966b620f2e2912b970f2a815449bfe 09-Jun-2015 Martin Storsjo <martin@martin.st> Clear the executable bit from source files

The executable bit was accidentally set on these files in commits
eedcd5cccc and ec7398f37.

Change-Id: I057e8841ad12561b05c4dc9553ca1cd664c7f59c
odecs/avcdec/SoftAVCDec.cpp
odecs/avcdec/SoftAVCDec.h
odecs/avcenc/SoftAVCEnc.cpp
6cf14f7bf4ce301d1a847d38a69f3d012d53224e 09-Jun-2015 Robert Shih <robertshih@google.com> am f028dad7: Merge "Ogg Opus: handle cases where first sample has non 0 time" into mnc-dev

* commit 'f028dad745f85066abc0229d61c0d837f40dc000':
Ogg Opus: handle cases where first sample has non 0 time
f028dad745f85066abc0229d61c0d837f40dc000 09-Jun-2015 Robert Shih <robertshih@google.com> Merge "Ogg Opus: handle cases where first sample has non 0 time" into mnc-dev
90fcf68fd29f3cb695bd53a830ad984cb7d430c0 04-Jun-2015 Lajos Molnar <lajos@google.com> stagefright: add support for output frame rendered callback

- Added FRAME_RENDERED event in OMX, used by tunneled video decoders
to signal rendered event timing
- Track buffers sent for rendering in ACodec and in SoftwareRenderer, and
determine when they have rendered
- Propagate render times to MediaCodec

Bug: 20503131
Change-Id: Idf0a8714d5368b237c2285dd39fa82db847c232f
Codec.cpp
ndroid.mk
wesomePlayer.cpp
rameRenderTracker.cpp
ediaCodec.cpp
olorconversion/SoftwareRenderer.cpp
nclude/SoftwareRenderer.h
mx/OMX.cpp
9f0b9eb47afa9a1d4e7ae2bcf3b57e669621f36b 09-Jun-2015 Jaesung Chung <jaesung@google.com> am 9b132a7b: Merge "stagefright: check the validity of the range of adaptation field" into mnc-dev

* commit '9b132a7bdde8388f124e4db5ff54a88a93f8cdb6':
stagefright: check the validity of the range of adaptation field
9b132a7bdde8388f124e4db5ff54a88a93f8cdb6 09-Jun-2015 Jaesung Chung <jaesung@google.com> Merge "stagefright: check the validity of the range of adaptation field" into mnc-dev
819bcef03907c8df8fc0fa78c0d43db98279ffa9 03-Jun-2015 Robert Shih <robertshih@google.com> Ogg Opus: handle cases where first sample has non 0 time

Bug: 19286916
Change-Id: I660daae57e7b7e793f55154c74347e9d53627324
ggExtractor.cpp
a617ff8e1286b25d9ac2e15c67ec6f1fa87389b1 09-Jun-2015 Wei Jia <wjia@google.com> am ca097142: Merge "libstagefright: check memory size for overflow before allocation." into mnc-dev

* commit 'ca097142ba4664858bc29bb538bcfcf5ea03ebe7':
libstagefright: check memory size for overflow before allocation.
c89d0cc7e20d369c08831b048c8fedd592d32069 09-Jun-2015 Wei Jia <wjia@google.com> am 2126927d: Merge "SoftwareRenderer: sanity check buffer size before copying data." into mnc-dev

* commit '2126927d93d129d9a3446034a279572837428df3':
SoftwareRenderer: sanity check buffer size before copying data.
ca097142ba4664858bc29bb538bcfcf5ea03ebe7 09-Jun-2015 Wei Jia <wjia@google.com> Merge "libstagefright: check memory size for overflow before allocation." into mnc-dev
4606e068dde25629636e09b2936bd0edfd0b0bd6 09-Jun-2015 Chong Zhang <chz@google.com> am dd488a23: Merge "fix graphic buffer leak with persistent input surface" into mnc-dev

* commit 'dd488a23d37b71e3f87fe70bf966a6c967e14b60':
fix graphic buffer leak with persistent input surface
7ecbce4367c1cc1b04a25cd84d464b1c34a90d2b 09-Jun-2015 Wei Jia <wjia@google.com> am 0b305f2d: Merge "MPEG4Writer: add check to ensure no integer overflow on allocation." into mnc-dev

* commit '0b305f2d8f328426f5c59b5d5f2707ffefe35a5c':
MPEG4Writer: add check to ensure no integer overflow on allocation.
2126927d93d129d9a3446034a279572837428df3 09-Jun-2015 Wei Jia <wjia@google.com> Merge "SoftwareRenderer: sanity check buffer size before copying data." into mnc-dev
42cccd7c8811597d56fb86afeacf6231d693dea6 03-Jun-2015 Wei Jia <wjia@google.com> libstagefright: check memory size for overflow before allocation.

Bug: 20674086
Change-Id: I431aa2b7d30a942350ab6d105451c6b77e2f99d4
odecs/m4v_h263/dec/src/pvdec_api.cpp
odecs/m4v_h263/enc/src/mp4enc_api.cpp
dd488a23d37b71e3f87fe70bf966a6c967e14b60 09-Jun-2015 Chong Zhang <chz@google.com> Merge "fix graphic buffer leak with persistent input surface" into mnc-dev
0b305f2d8f328426f5c59b5d5f2707ffefe35a5c 09-Jun-2015 Wei Jia <wjia@google.com> Merge "MPEG4Writer: add check to ensure no integer overflow on allocation." into mnc-dev
760f92f8b6da9c9cf128cb18fe3c09402fdde6cd 08-Jun-2015 Wei Jia <wjia@google.com> SoftwareRenderer: sanity check buffer size before copying data.

Bug: 21443020
Change-Id: I63cf86217b8201fb41809c23e4b752b845a93ee2
olorconversion/SoftwareRenderer.cpp
5661f63ad3a09de0de410a1658e7a9f3e563b193 08-Jun-2015 Eino-Ville Talvala <etalvala@google.com> am d46a6b9f: Camera1 API: Support SW encoders for new camera HALs

* commit 'd46a6b9fd8b2a4f9098757384711e2cd03a91651':
Camera1 API: Support SW encoders for new camera HALs
ffd8cbb288f096b53df0392bf40d99b89e34bea7 06-Jun-2015 Chong Zhang <chz@google.com> fix graphic buffer leak with persistent input surface

implement PersistentProxyListener that returns buffers during period
when actual listener is not connected.

also clear old buffer slot in GraphicBufferSource when re-attaching.

bug: 21473584
Change-Id: I3bcf1a208e745397d6cc6ce9aef9e4f5aa604f3c
mx/GraphicBufferSource.cpp
mx/GraphicBufferSource.h
d46a6b9fd8b2a4f9098757384711e2cd03a91651 15-May-2015 Eino-Ville Talvala <etalvala@google.com> Camera1 API: Support SW encoders for new camera HALs

- Support new set video format/dataspace command in camera service
- HALv3: Select gralloc usage flags based on format
- HALv1: Pass format command directly to HAL layer
- Use format/dataspace command in CameraSource
- Switch all API1 recording to use metadata mode
- Switch all >= HALv2 API1 recording to use kMetadataBufferTypeANWBuffer

Bug: 13222807
Change-Id: I2e609b92c65792611bb1dab09e0c41c363ebbc42
ameraSource.cpp
92eef1e088ec5f372b6a3f019c698533fce82f14 08-Jun-2015 Ronghua Wu <ronghuawu@google.com> am b4b4cd11: Merge "libstagefright: run codec profiling in worker thread." into mnc-dev

* commit 'b4b4cd11c9b95af613f5c0f14f93e3c9590fda7c':
libstagefright: run codec profiling in worker thread.
b4b4cd11c9b95af613f5c0f14f93e3c9590fda7c 08-Jun-2015 Ronghua Wu <ronghuawu@google.com> Merge "libstagefright: run codec profiling in worker thread." into mnc-dev
6105ca3aa12ab1cf776eabcab6915dee59763855 08-Jun-2015 Wei Jia <wjia@google.com> am a31d2372: Merge "SoftAVCEnc: check requested memory size before allocation." into mnc-dev

* commit 'a31d237241545d7d2e1b5663426de06dea2426d4':
SoftAVCEnc: check requested memory size before allocation.
a31d237241545d7d2e1b5663426de06dea2426d4 08-Jun-2015 Wei Jia <wjia@google.com> Merge "SoftAVCEnc: check requested memory size before allocation." into mnc-dev
a09152c6317e0295773b91f529e63c4d7c107752 05-Jun-2015 Ronghua Wu <ronghuawu@google.com> libstagefright: run codec profiling in worker thread.

Bug: 21645841
Change-Id: Ia15eb3b064b671c569afb0742db7535f6b03232e
ediaCodecList.cpp
d9ce7987403185c9a571169a4118a168f6065f22 06-Jun-2015 Robert Shih <robertshih@google.com> am 53d35030: Merge "MPEG4Writer: fail init check if output fd is not seekable" into mnc-dev

* commit '53d350308fea376f3fa8bef76c28b654d1d39766':
MPEG4Writer: fail init check if output fd is not seekable
53d350308fea376f3fa8bef76c28b654d1d39766 06-Jun-2015 Robert Shih <robertshih@google.com> Merge "MPEG4Writer: fail init check if output fd is not seekable" into mnc-dev
cb39c917ead7f7e2ad8e9113a9936a16f501a5ca 06-Jun-2015 Lajos Molnar <lajos@google.com> am 26a48f30: stagefright: add support for batching OMX events

* commit '26a48f304a8754d655e554178ffb6d7ba4c5aac3':
stagefright: add support for batching OMX events
2aa74dc097fe860abc84769abf2b6e0962718471 04-Jun-2015 Robert Shih <robertshih@google.com> MPEG4Writer: fail init check if output fd is not seekable

Bug: 12239375
Change-Id: Id1e23b3803f0ed48e4d1ad3ec4b84c4a39325ddd
PEG4Writer.cpp
26a48f304a8754d655e554178ffb6d7ba4c5aac3 04-Jun-2015 Lajos Molnar <lajos@google.com> stagefright: add support for batching OMX events

Bug: 20503131
Change-Id: I762c419ed1245f8b83fb1f6bf61e5557213ca07b
Codec.cpp
MXCodec.cpp
nclude/OMXNodeInstance.h
mx/OMX.cpp
mx/OMXNodeInstance.cpp
mx/tests/OMXHarness.cpp
mx/tests/OMXHarness.h
115e995c6b3fe7ed33e2d5d88872cb87ab4e63f0 06-Jun-2015 Wei Jia <wjia@google.com> resolved conflicts for merge of 1f44d837 to lmp-dev

Change-Id: Id60c2470ec2afebdbc1c0c995b90e294c9c879eb
d697bb9caa9a786ca03ea20fb5635ddf840ede26 06-Jun-2015 Robert Shih <robertshih@google.com> am 23b6ee36: Merge "stagefright: initial Ogg Opus support" into mnc-dev

* commit '23b6ee36e0d453d5ca9ff6b91e287a2be2325582':
stagefright: initial Ogg Opus support
23b6ee36e0d453d5ca9ff6b91e287a2be2325582 06-Jun-2015 Robert Shih <robertshih@google.com> Merge "stagefright: initial Ogg Opus support" into mnc-dev
1d4938fa85536873927c2af27ba91a7e16adb524 05-Jun-2015 Marco Nelissen <marcone@google.com> am afd49243: Limit allocations to avoid out-of-memory

* commit 'afd492436efc7f66b958da14659b52232efa5910':
Limit allocations to avoid out-of-memory
afd492436efc7f66b958da14659b52232efa5910 04-Jun-2015 Marco Nelissen <marcone@google.com> Limit allocations to avoid out-of-memory

Corrupt files could cause very large allocations, limit them to something
more reasonable.

Bug: 17769851
Change-Id: Ib0f722fd6fddff873bd7a547aac456e608c34c84
PEG4Extractor.cpp
768a8fb4c05f524c802f8e97c9e07b73d1a196ff 05-Jun-2015 Joshua J. Drake <android-open-source@qoop.org> am f0e1fb59: am 4a492bf2: Fix integer underflow in covr MPEG4 processing

* commit 'f0e1fb59f3ea24ce4f7f10d156bf8470a7236445':
Fix integer underflow in covr MPEG4 processing
13c925cab2decaed6786b0642f2b5a9f8516e71a 05-Jun-2015 Wei Jia <wjia@google.com> am 6ff53b96: Merge "Prevent integer overflow when processing covr MPEG4 atoms" into klp-dev

* commit '6ff53b96235bf99cdc1023b99d44f1c4cade1c0a':
Prevent integer overflow when processing covr MPEG4 atoms
1f44d837a9273dc86bf0c928c2ead313d71d1464 05-Jun-2015 Wei Jia <wjia@google.com> am 82e90e10: Merge "Fix integer overflow when handling MPEG4 tx3g atom" into klp-dev

* commit '82e90e10481c334bb5f2cecf1621cb8f9308c21c':
Fix integer overflow when handling MPEG4 tx3g atom
f0e1fb59f3ea24ce4f7f10d156bf8470a7236445 05-Jun-2015 Joshua J. Drake <android-open-source@qoop.org> am 4a492bf2: Fix integer underflow in covr MPEG4 processing

* commit '4a492bf2ac47b9844d2527e1fcdf0064c3d8d52e':
Fix integer underflow in covr MPEG4 processing
86174e2c09986b2d2ebcaf95a4a3e614bcf134ef 05-Jun-2015 Wei Jia <wjia@google.com> Merge "Prevent reading past the end of the buffer in 3GPP" into lmp-dev
6ff53b96235bf99cdc1023b99d44f1c4cade1c0a 05-Jun-2015 Wei Jia <wjia@google.com> Merge "Prevent integer overflow when processing covr MPEG4 atoms" into klp-dev
82e90e10481c334bb5f2cecf1621cb8f9308c21c 05-Jun-2015 Wei Jia <wjia@google.com> Merge "Fix integer overflow when handling MPEG4 tx3g atom" into klp-dev
1a7db0f8eddbf661252addb6c30877d2f836cb3c 04-Jun-2015 Wei Jia <wjia@google.com> am 374f0f48: Merge "SampleTable: fix integer overflow checks." into mnc-dev

* commit '374f0f48d21a642ba442597a92f5a169b70e0cf0':
SampleTable: fix integer overflow checks.
374f0f48d21a642ba442597a92f5a169b70e0cf0 04-Jun-2015 Wei Jia <wjia@google.com> Merge "SampleTable: fix integer overflow checks." into mnc-dev
a105482ae577852ffd08ce88ae5d1ba81db875ac 04-Jun-2015 Wei Jia <wjia@google.com> SampleTable: fix integer overflow checks.

Bug: 20139950
Change-Id: I6f4e3d4c734872074475d9346ed692a4baf77d79
ampleTable.cpp
f6fe4340219a8e674f3250fe32d4697ec8184b24 04-Jun-2015 Wei Jia <wjia@google.com> SoftAVCEnc: check requested memory size before allocation.

Bug: 20674674
Change-Id: I569e7a9b33fe64779a40e55539929c3dc4303c19
odecs/avcenc/SoftAVCEnc.cpp
2177f21c1ae5bf5cb8c1113a1adbe1fd7db34206 04-Jun-2015 Wei Jia <wjia@google.com> MPEG4Writer: add check to ensure no integer overflow on allocation.

Bug: 20674584
Change-Id: I77ef1891abf0a20994840a87fa99e55a62f40a70
PEG4Writer.cpp
3b6df523db299df78052e5d2f17b0039b7523c06 04-Jun-2015 Marco Nelissen <marcone@google.com> Merge "Don't overwrite user agent header if app specified one" into mnc-dev
4136329b28f5b301cb9123009a3635a9db4a0a04 22-Jan-2015 Marco Nelissen <marcone@google.com> Don't overwrite user agent header if app specified one

Bug: 19100078
https://code.google.com/p/android/issues/detail?id=103266

Change-Id: I321935a7e7a217328a5704c94e92f763c8742767
ttp/MediaHTTP.cpp
304c746091a9c4f1dc5d7c4fda74c078b69134b5 04-Jun-2015 Glenn Kasten <gkasten@android.com> am b21ef04c: am ed2abf42: Merge "Use standard arm assembly syntax."

* commit 'b21ef04c9a669c47a5ed31161dc30eb785a9ac79':
Use standard arm assembly syntax.
ed2abf42e155909c8da201a7b8b06e527fe07cfb 04-Jun-2015 Glenn Kasten <gkasten@android.com> Merge "Use standard arm assembly syntax."
4d8ed149894eff1e21195a29d939f2ec389fe5d7 05-May-2015 Joshua J. Drake <android-open-source@qoop.org> Prevent integer underflow if size is below 6

When processing 3GPP metadata, a subtraction operation may underflow and
lead to a rather large linear byteswap operation in the subsequent
framedata decoding code. Bound the 'size' value to prevent this from
occurring.

Bug: 20923261
Change-Id: I35dfbc8878c6b65cfe8b8adb7351a77ad4d604e5
(cherry picked from commit 9458e715d391ee8fe455fc31f07ff35ce12e0531)
PEG4Extractor.cpp
d89104a3d5a16298742110bff1d10b43d16fef7b 05-May-2015 Joshua J. Drake <android-open-source@qoop.org> Prevent reading past the end of the buffer in 3GPP

Metadata processed within the parse3GPPMetaData function may not be NUL
terminated and thus calling setCString may read out of bounds. Ensure
proper NUL termination, but take care not to interfere with other special
cases (ie, albm).

Bug: 20923261
Change-Id: Ie93b3038b534b4c4460571a68f4d734cff7ad324
(cherry picked from commit 5cea0155cfc41f67e91343c342f44251c03fde3a)
PEG4Extractor.cpp
8c10a80cf1af68f15eb39552ca116ec6f04fc173 01-Jun-2015 Robert Shih <robertshih@google.com> stagefright: initial Ogg Opus support

Bug: 19286916
Change-Id: I176d803aa5a16038d074aa06b41fc76da0be8952
ggExtractor.cpp
nclude/OggExtractor.h
05ddc499b9d50c90f552ed1333110f28a1406e7c 05-May-2015 Joshua J. Drake <android-open-source@qoop.org> Prevent integer overflow when processing covr MPEG4 atoms

If the 'chunk_data_size' value is SIZE_MAX, an integer overflow will occur
and cause an undersized buffer to be allocated. The following processing
then overfills the resulting memory and creates a potentially exploitable
condition. Ensure that integer overflow does not occur.

Bug: 20923261
Change-Id: I75cce323aec04a612e5a230ecd7c2077ce06035f
PEG4Extractor.cpp
e5f0966c76bd0a7e81e4205c8d8b55e6b34c833e 05-May-2015 Joshua J. Drake <android-open-source@qoop.org> Fix integer overflow when handling MPEG4 tx3g atom

When the sum of the 'size' and 'chunk_size' variables is larger than 2^32,
an integer overflow occurs. Using the result value to allocate memory
leads to an undersized buffer allocation and later a potentially
exploitable heap corruption condition. Ensure that integer overflow does
not occur.

Bug: 20923261
Change-Id: Id050a36b33196864bdd98b5ea24241f95a0b5d1f
PEG4Extractor.cpp
4a492bf2ac47b9844d2527e1fcdf0064c3d8d52e 05-May-2015 Joshua J. Drake <android-open-source@qoop.org> Fix integer underflow in covr MPEG4 processing

When the 'chunk_data_size' variable is less than 'kSkipBytesOfDataBox', an
integer underflow can occur. This causes an extraordinarily large value to
be passed to MetaData::setData, leading to a buffer overflow.

Bug: 20923261
Change-Id: Icd28f63594ad941eabb3a12c750a4a2d5d2bf94b
PEG4Extractor.cpp
207918d92a9280e4b6d94ba3430b3abd95a6ff59 03-Jun-2015 Marco Nelissen <marcone@google.com> am 672a10bc: am e41b7810: Merge "Don\'t overwrite user agent header if app specified one"

* commit '672a10bcab5c63b1f812b0c12613c3b87c34e156':
Don't overwrite user agent header if app specified one
e41b78106f10b72d9347356efe5dabc76c607b68 03-Jun-2015 Marco Nelissen <marcone@google.com> Merge "Don't overwrite user agent header if app specified one"
76fe8349d70eb166b996e94dae708ee08077faed 03-Jun-2015 Vignesh Venkatasubramanian <vigneshv@google.com> am 1b30bde3: libstagefright/SoftOpus: Ignore CSD resubmissions

* commit '1b30bde3d4447e4c9b767c68584b8997bd930720':
libstagefright/SoftOpus: Ignore CSD resubmissions
2bc0304e980712f2d6e96b02a034e921f64cb06d 03-Jun-2015 Lajos Molnar <lajos@google.com> am 186e9c45: Merge "stagefright: rename VideoGrallocMetadata.hHandle to pHandle" into mnc-dev

* commit '186e9c456945f642107ec1d9990068ea36772d25':
stagefright: rename VideoGrallocMetadata.hHandle to pHandle
1b30bde3d4447e4c9b767c68584b8997bd930720 03-Jun-2015 Vignesh Venkatasubramanian <vigneshv@google.com> libstagefright/SoftOpus: Ignore CSD resubmissions

NuPlayerDecoder re-submits the CSDs on seek. Opus decoder does not
need the CSDs on seek. So, we merely ignore the resubmissions of
CSD in SoftOpus so that it is not passed to the decoder thereby
screwing up its state.

Bug: 21565945
Change-Id: Ia74f4b1733e42171131484a6a7f3fd923fe26434
odecs/opus/dec/SoftOpus.cpp
77f101b342b6d206b6f530991f3333dfedeebab6 27-Dec-2014 Martin Storsjo <martin@martin.st> Translate codec specific data for mp4v-es for MediaMuxer

The existing translations for H264 and AAC are written too broadly,
matching any video or audio codec, while they in fact are very
specific for these codecs.

This fixes muxing mp4v-es into .mp4 files using MediaMuxer.

Bug: 17956215
Bug: http://b.android.com/90138
Change-Id: I7de04c5e517a1cde07c8fc18463053355d7cf6ae
tils.cpp
186e9c456945f642107ec1d9990068ea36772d25 03-Jun-2015 Lajos Molnar <lajos@google.com> Merge "stagefright: rename VideoGrallocMetadata.hHandle to pHandle" into mnc-dev
9c21131f254383b39b954e36df8ec57164e102c6 03-Jun-2015 Marco Nelissen <marcone@google.com> Merge "SoftAVCDec: Added support for level greater than level at init" into mnc-dev
11aaefb57fdd0076eb5484c3c5bd3bff5f6cb5e0 03-Jun-2015 Marco Nelissen <marcone@google.com> SoftAVCDec: Added support for level greater than level at init

Bug: 21144884

Change-Id: Idda3fbf6c30e99d6df2b1e53a1f65c8ec55586ce
odecs/avcdec/SoftAVCDec.cpp
odecs/avcdec/SoftAVCDec.h
f4bc7dac039cb3b762f23dc758172597f51c3d82 03-Jun-2015 Lajos Molnar <lajos@google.com> am 15ab4996: stagefright: add support for fences in OMX

* commit '15ab4996019387f27a48b81cb4774c21502bc0e5':
stagefright: add support for fences in OMX
9847fcefb183e1cb09eb48e17a09577392b0e8f4 03-Jun-2015 Lajos Molnar <lajos@google.com> stagefright: rename VideoGrallocMetadata.hHandle to pHandle

This is so that it can be equivalent to the previously named
VideoDecoderOutputMetaData struct.

Bug: 13222807
Change-Id: I38831e19a76f49cc7e8385c079817c538d18f0ff
Codec.cpp
mx/GraphicBufferSource.cpp
mx/OMXNodeInstance.cpp
mx/SoftVideoEncoderOMXComponent.cpp
15ab4996019387f27a48b81cb4774c21502bc0e5 01-Jun-2015 Lajos Molnar <lajos@google.com> stagefright: add support for fences in OMX

Pass Fence between Surface and ACodec, and between ACodec and IOMX.

Bug: 12386081
Change-Id: Ifdc566979dec0d91ed8b07c3b69d2cf092accc73
Codec.cpp
MXClient.cpp
nclude/OMX.h
nclude/OMXNodeInstance.h
mx/GraphicBufferSource.cpp
mx/GraphicBufferSource.h
mx/OMX.cpp
mx/OMXNodeInstance.cpp
mx/SoftVideoEncoderOMXComponent.cpp
b72321f5f3c717d34b0a6c2c2796fd240ff4fba0 03-Jun-2015 Marco Nelissen <marcone@google.com> am c46058b5: am e91e3550: Merge "SoftAVCDec: Added support for level greater than level at init"

* commit 'c46058b5ec406bc585c7c13c4e039b0074304760':
SoftAVCDec: Added support for level greater than level at init
e91e3550564d99a00f6dac25b92e816664a9392a 03-Jun-2015 Marco Nelissen <marcone@google.com> Merge "SoftAVCDec: Added support for level greater than level at init"
bf39c11f89aeb008b4edfce93218aead5048dd1f 02-Jun-2015 Lajos Molnar <lajos@google.com> am 05421987: stagefright: rework metadata buffer support

* commit '054219874873b41f1c815552987c10465c34ba2b':
stagefright: rework metadata buffer support
1bf65efd28fffbbc600177c11799a8d7c3cb2477 02-Jun-2015 Ruben Brunk <rubenbrunk@google.com> am cb18ec05: Merge "Track camera and flashlight usage in battery stats." into mnc-dev

* commit 'cb18ec05b7097a63262b81afe1e866105d400f4a':
Track camera and flashlight usage in battery stats.
7fcc4ef203515737cd9a8f85277aaeee6123591e 02-Jun-2015 Lajos Molnar <lajos@google.com> am cc7cc673: stagefright: allow to overallocate OMX codec buffers

* commit 'cc7cc67349b7a3f498882087aa42ffc05a2daf11':
stagefright: allow to overallocate OMX codec buffers
054219874873b41f1c815552987c10465c34ba2b 16-May-2015 Lajos Molnar <lajos@google.com> stagefright: rework metadata buffer support

- Add fence to new metadata buffer mode structure, but don't use it
yet, so that we don't have to add another mode soon.
- Change GraphicBuffers to ANativeWindowBuffer in new metadata mode.
This removes internal depencency from vendor codecs.
- Extend new metadata mode from SW encoders to all codecs.
- Fallback from new metadata mode to old mode (so Camera can always
use the new mode even with legacy codecs)

Related-bug: 19614055
Bug: 13222807
Change-Id: I405a21dd6ce8e99808f633bfeab8f14278eb7079
Codec.cpp
MXClient.cpp
nclude/OMX.h
nclude/OMXNodeInstance.h
mx/GraphicBufferSource.cpp
mx/GraphicBufferSource.h
mx/OMX.cpp
mx/OMXNodeInstance.cpp
mx/SoftVideoEncoderOMXComponent.cpp
cb18ec05b7097a63262b81afe1e866105d400f4a 02-Jun-2015 Ruben Brunk <rubenbrunk@google.com> Merge "Track camera and flashlight usage in battery stats." into mnc-dev
99e69716215cd0665379bc90d708f2ea8689831d 27-May-2015 Ruben Brunk <rubenbrunk@google.com> Track camera and flashlight usage in battery stats.

Bug: 15986092

Change-Id: I9dc6828332e4091fd93bf2d82839e8e3862a2fc2
ndroid.mk
ediaCodec.cpp
cc7cc67349b7a3f498882087aa42ffc05a2daf11 01-Jun-2015 Lajos Molnar <lajos@google.com> stagefright: allow to overallocate OMX codec buffers

Specify allottedSize for useBuffer and allocateBufferWithBackup,
where OMX will see only the allottedSize, even though framework may
allocate and use a bigger buffer.

Bug: 13222807
Change-Id: Ibfa93f6c7b7c8ca0853ef17d4a0758e496eaf921
Codec.cpp
MXClient.cpp
MXCodec.cpp
nclude/OMX.h
nclude/OMXNodeInstance.h
mx/OMX.cpp
mx/OMXNodeInstance.cpp
mx/tests/OMXHarness.cpp
ae6bfd4223a911ce29252cf7043e9e291fc91ebd 01-Jun-2015 Ronghua Wu <ronghuawu@google.com> am bac850e6: Merge "libstagefright: add version string to profile results." into mnc-dev

* commit 'bac850e61b63f6932aa880924c5d8effd0bb8079':
libstagefright: add version string to profile results.
bf1d5d8a4a7b529102f5b22b327434697f943140 01-Jun-2015 Wonsik Kim <wonsik@google.com> am 11804f5c: Merge "mpeg2ts: revise duration estimation logic" into mnc-dev

* commit '11804f5ca4ebd3527e7cc3bcc529e8358a519f8e':
mpeg2ts: revise duration estimation logic
eab921a411739d170c145b94067fea1ea57888de 01-Jun-2015 Andy Hung <hunga@google.com> am 305a12e4: Merge "libstagefright: Reset AMR decoder on input port flush" into mnc-dev

* commit '305a12e403d3ae7e12df0d9218c152f9bb423af0':
libstagefright: Reset AMR decoder on input port flush
279795ceacea01dd05cd7c19783f3f68cb7a8e9f 01-Jun-2015 Glenn Kasten <gkasten@google.com> am db431db5: Merge "Deprecations are warnings not errors" into mnc-dev

* commit 'db431db53fbbb9024b6e72c528e2d195d63ad544':
Deprecations are warnings not errors
bac850e61b63f6932aa880924c5d8effd0bb8079 01-Jun-2015 Ronghua Wu <ronghuawu@google.com> Merge "libstagefright: add version string to profile results." into mnc-dev
11804f5ca4ebd3527e7cc3bcc529e8358a519f8e 01-Jun-2015 Wonsik Kim <wonsik@google.com> Merge "mpeg2ts: revise duration estimation logic" into mnc-dev
305a12e403d3ae7e12df0d9218c152f9bb423af0 30-May-2015 Andy Hung <hunga@google.com> Merge "libstagefright: Reset AMR decoder on input port flush" into mnc-dev
3d83a2089f7000180a1a3ff5a9d376efe92f596c 29-May-2015 Wonsik Kim <wonsik@google.com> mpeg2ts: revise duration estimation logic

Estimate duration based on GOP duration and size to yield more
accurate result. For a fully buffered stream, just use the buffered
duration.

Bug: 21391417
Change-Id: I116ae8f596007a0b9fca427a4875c10820ddfea2
peg2ts/MPEG2TSExtractor.cpp
db431db53fbbb9024b6e72c528e2d195d63ad544 29-May-2015 Glenn Kasten <gkasten@google.com> Merge "Deprecations are warnings not errors" into mnc-dev
e0e50f2a7bea366c208e694f4c0abd5ec2baeb69 29-May-2015 Andy Hung <hunga@google.com> am e5ca9a20: am 375e3495: IOMX: Clear buffer id for arm32

* commit 'e5ca9a209af40000ad41c461ae1178f479e01a62':
IOMX: Clear buffer id for arm32
375e349556baa6a8ea59e963c33824e9063a0eca 27-May-2015 Andy Hung <hunga@google.com> IOMX: Clear buffer id for arm32

Initial counter needs to be cleared for ease of debugging.

Bug: 20634516
Change-Id: I4131d759b9cc296bbecf25a53433d42b22ef228f
(cherry picked from commit 9113c1e619fd78fe53b548180fdc02300d33303d)
mx/OMXNodeInstance.cpp
7c60ccbf7bb528d479e7243b7a4c547b37b4d9b9 28-May-2015 Andy Hung <hunga@google.com> am f928c23a: Merge "IOMX: Clear buffer id for arm32" into mnc-dev

* commit 'f928c23acb7201c19b2541d057db5a5fc638babc':
IOMX: Clear buffer id for arm32
2dcec6ae30b50d611758f8ee492901bf2235a8dc 12-May-2015 Chaithanya Krishna Bacharaju <chaithan@codeaurora.org> libstagefright: Reset AMR decoder on input port flush

Fix issue of noise being observed when seeking AMR clip because
the AMR decoder states were not reset.
Reset decoder state on input port flush, as that is the best indication
of a seek.

Change-Id: Ic71a014f9a87ebfe5b8520d44420716f7099f5e7
odecs/amrnb/dec/SoftAMR.cpp
f928c23acb7201c19b2541d057db5a5fc638babc 28-May-2015 Andy Hung <hunga@google.com> Merge "IOMX: Clear buffer id for arm32" into mnc-dev
f6b3e7db0b18a7d187d026dd729ae12fd521005e 18-May-2015 Glenn Kasten <gkasten@google.com> Deprecations are warnings not errors

Change-Id: Ib77f45fdc27ea53f1dd181f48c76810d03f8dcdb
ndroid.mk
9113c1e619fd78fe53b548180fdc02300d33303d 27-May-2015 Andy Hung <hunga@google.com> IOMX: Clear buffer id for arm32

Initial counter needs to be cleared for ease of debugging.

Bug: 20634516
Change-Id: I4131d759b9cc296bbecf25a53433d42b22ef228f
mx/OMXNodeInstance.cpp
c5764065504ca22fb164fe8f05aa32d7cc5ac88e 27-May-2015 Chong Zhang <chz@google.com> am 07195f6d: Merge "SoftAVCEnc: encode EOS frame is size is non-zero" into mnc-dev

* commit '07195f6df54b693e082fa6aa383b004bb5aa0e06':
SoftAVCEnc: encode EOS frame is size is non-zero
cbe6ac2f281362d9dfbff867dd414d5cc2f6d21e 27-May-2015 Chong Zhang <chz@google.com> SoftAVCEnc: encode EOS frame is size is non-zero

bug: 20947883
bug: 20507129
Change-Id: I557584e8566b8529329f35e0949cb3ee24965ff4
odecs/avcenc/SoftAVCEnc.cpp
389379c4ccc0d09fbb54c510550ff6a895a319a1 27-May-2015 Andy Hung <hunga@google.com> am c796a24d: am 3d2874f2: am c356d596: am dd527c20: am f7198f86: Merge "IOMX: Enable buffer ptr to buffer id translation for arm32" into lmp-dev

* commit 'c796a24d577673044083634304c54f9e5b29f32a':
IOMX: Enable buffer ptr to buffer id translation for arm32
6b09a1e61353b9d61880a110a47e6ffc31034d9e 27-May-2015 Andy Hung <hunga@google.com> am f90bd074: am 06713b48: am 6c9994d3: am 6f4e0b1c: am 566b3576: IOMX: Add buffer range check to emptyBuffer

* commit 'f90bd07424a16343ec66ef99fa4a379b7910e955':
IOMX: Add buffer range check to emptyBuffer
9d038ba466df9179f1ec0d2b58dcabf19761bf24 27-May-2015 Andy Hung <hunga@google.com> am 0e27e080: DO NOT MERGE - IOMX: Add buffer range check to emptyBuffer

* commit '0e27e080c255b23b4b0e19cb3bc9519cc162b73f':
DO NOT MERGE - IOMX: Add buffer range check to emptyBuffer
c356d596d9e2c01817adfa2448c5210c575ae729 27-May-2015 Andy Hung <hunga@google.com> am dd527c20: am f7198f86: Merge "IOMX: Enable buffer ptr to buffer id translation for arm32" into lmp-dev

* commit 'dd527c20a3c61864d02637202ed1c5c1f3ff8de8':
IOMX: Enable buffer ptr to buffer id translation for arm32
6c9994d381aa817ba7a4ad8c94ce28240e65be54 27-May-2015 Andy Hung <hunga@google.com> am 6f4e0b1c: am 566b3576: IOMX: Add buffer range check to emptyBuffer

* commit '6f4e0b1c99679d770247bfe748642805cfd3ffb3':
IOMX: Add buffer range check to emptyBuffer
f7198f863f6eb25d586efa1bf28f7d5dc07697e8 27-May-2015 Andy Hung <hunga@google.com> Merge "IOMX: Enable buffer ptr to buffer id translation for arm32" into lmp-dev
0e27e080c255b23b4b0e19cb3bc9519cc162b73f 26-May-2015 Andy Hung <hunga@google.com> DO NOT MERGE - IOMX: Add buffer range check to emptyBuffer

Bug: 20634516
Change-Id: If351dbd573bb4aeb6968bfa33f6d407225bc752c
mx/OMXNodeInstance.cpp
447a5628a4138f4bed11121d56965aff31bc765a 26-May-2015 Andy Hung <hunga@google.com> IOMX: Enable buffer ptr to buffer id translation for arm32

Bug: 20634516
Change-Id: Iac9eac3cb251eccd9bbad5df7421a07edc21da0c
(cherry picked from commit 2d6b6601743c3c6960c6511a2cb774ef902759f4)
nclude/OMXNodeInstance.h
mx/OMXNodeInstance.cpp
566b357611eea481772e77f49a1ab446fe75b07b 26-May-2015 Andy Hung <hunga@google.com> IOMX: Add buffer range check to emptyBuffer

Bug: 20634516
Change-Id: If351dbd573bb4aeb6968bfa33f6d407225bc752c
(cherry picked from commit d971df0eb300356b3c995d533289216f43aa60de)
mx/OMXNodeInstance.cpp
f1b094990600fee3ba17ab516a8b68c01e715ead 26-May-2015 Andy Hung <hunga@google.com> am 2d6b6601: IOMX: Enable buffer ptr to buffer id translation for arm32

* commit '2d6b6601743c3c6960c6511a2cb774ef902759f4':
IOMX: Enable buffer ptr to buffer id translation for arm32
e32c116c16c9fdff72074a1d82367f889ed2fa64 26-May-2015 Andy Hung <hunga@google.com> am d971df0e: IOMX: Add buffer range check to emptyBuffer

* commit 'd971df0eb300356b3c995d533289216f43aa60de':
IOMX: Add buffer range check to emptyBuffer
2d6b6601743c3c6960c6511a2cb774ef902759f4 26-May-2015 Andy Hung <hunga@google.com> IOMX: Enable buffer ptr to buffer id translation for arm32

Bug: 20634516
Change-Id: Iac9eac3cb251eccd9bbad5df7421a07edc21da0c
nclude/OMXNodeInstance.h
mx/OMXNodeInstance.cpp
d971df0eb300356b3c995d533289216f43aa60de 26-May-2015 Andy Hung <hunga@google.com> IOMX: Add buffer range check to emptyBuffer

Bug: 20634516
Change-Id: If351dbd573bb4aeb6968bfa33f6d407225bc752c
mx/OMXNodeInstance.cpp
19352b3287480394aa9963276305d5168a7adf85 21-May-2015 Ronghua Wu <ronghuawu@google.com> libstagefright: add version string to profile results.

Bug: 21333717
Change-Id: I79966be5ba355633f83885844165b7d9a6b2643f
ediaCodecList.cpp
ediaCodecListOverrides.cpp
ediaCodecListOverrides.h
ests/MediaCodecListOverrides_test.cpp
90430fd13a29ca8e964b357cf4054e6960ba9dbf 22-May-2015 Jaesung Chung <jaesung@google.com> am f748dd8c: mpeg2ts: fixing build breakage due to an unmatched argument type

* commit 'f748dd8cac87ef0bd1deb78a6c8c71e5a9bbe36b':
mpeg2ts: fixing build breakage due to an unmatched argument type
caa77c690f8d56478385c67a08804b315535edea 22-May-2015 Jaesung Chung <jaesung@google.com> am 5bb07a3b: Merge "mpeg2ts: Fix SIGEGV on ATSParser::Stream::flush()" into mnc-dev

* commit '5bb07a3bb49f6d96bd182ad0e6b36a67f306096d':
mpeg2ts: Fix SIGEGV on ATSParser::Stream::flush()
65777f15b2eb1114ea79bc3028eed6baee5a1876 22-May-2015 Jaesung Chung <jaesung@google.com> am 0075debd: Fixing build breakage due to removal of numPacketsParsed

* commit '0075debd2c559904ee8a2a4e4706ed5af0abaeb9':
Fixing build breakage due to removal of numPacketsParsed
2b42063147cd9a914b4d1384b0b168b11c6c18fe 22-May-2015 Jaesung Chung <jaesung@google.com> am 4a98dab6: Merge "mpeg2ts: MPEG2TSExtractor detects A/V streams until timed out" into mnc-dev

* commit '4a98dab613da4d9bc9b93da9de43a815da49febc':
mpeg2ts: MPEG2TSExtractor detects A/V streams until timed out
f748dd8cac87ef0bd1deb78a6c8c71e5a9bbe36b 22-May-2015 Jaesung Chung <jaesung@google.com> mpeg2ts: fixing build breakage due to an unmatched argument type

Change-Id: I30e5093d55c29fa62fe8c19095c006861c0ee5a0
peg2ts/MPEG2TSExtractor.cpp
5bb07a3bb49f6d96bd182ad0e6b36a67f306096d 22-May-2015 Jaesung Chung <jaesung@google.com> Merge "mpeg2ts: Fix SIGEGV on ATSParser::Stream::flush()" into mnc-dev
0075debd2c559904ee8a2a4e4706ed5af0abaeb9 22-May-2015 Jaesung Chung <jaesung@google.com> Fixing build breakage due to removal of numPacketsParsed

Change-Id: Ia888b5865691a3b916aceff064a9b25b3118e2b0
peg2ts/MPEG2TSExtractor.cpp
f2cecd570c35d3b6422396dd51c0b4202732bcea 21-May-2015 Jaesung Chung <jaesung@google.com> mpeg2ts: Fix SIGEGV on ATSParser::Stream::flush()

Bug: 21340130
Change-Id: I4c7eeaf1e35a93400adc87af4eea1902d89d2630
peg2ts/ATSParser.cpp
4a98dab613da4d9bc9b93da9de43a815da49febc 22-May-2015 Jaesung Chung <jaesung@google.com> Merge "mpeg2ts: MPEG2TSExtractor detects A/V streams until timed out" into mnc-dev
a31911a0bea4230eea707da258595944c1e9fe01 22-May-2015 Wonsik Kim <wonsik@google.com> am 70b23133: Merge "Implement seek for MPEG2TSExtractor" into mnc-dev

* commit '70b2313318aaf245d185b6ddb188606608bdf7c9':
Implement seek for MPEG2TSExtractor
fec8f588732799843bcff0a71dca2fe5543f03f5 22-May-2015 Chong Zhang <chz@google.com> am 4b6a2d71: Merge "stagefright: measure max encoder buffer count for persistent surface" into mnc-dev

* commit '4b6a2d71c2b1acd5ef5340b392f362c8cd09c176':
stagefright: measure max encoder buffer count for persistent surface
70b2313318aaf245d185b6ddb188606608bdf7c9 22-May-2015 Wonsik Kim <wonsik@google.com> Merge "Implement seek for MPEG2TSExtractor" into mnc-dev
79608158c2254fe1357959157f2d0c1560a8a6c6 20-May-2015 Chong Zhang <chz@google.com> stagefright: measure max encoder buffer count for persistent surface

bug: 19127604

Change-Id: I9a9b29b527d20f43a5a0188380baf2242bd31507
ediaCodec.cpp
ediaCodecList.cpp
ediaCodecListOverrides.cpp
mx/OMXNodeInstance.cpp
3f7149c1c8f211c9ef5eb6c4012f078d9d08387b 15-May-2015 Chih-Hung Hsieh <chh@google.com> Use standard arm assembly syntax.

The output from gcc before and after this change,
and from llvm are identical, except the ADRL to ADR change.

In this case, old "ADRL r8, Table" is translated into
add r8, pc, #1184 ; 0x4a0
nop ; (mov r0, r0)
and new "ADR r8, Table; NOP" is translated into equivalent:
add r8, pc, #1184 ; 0x4a0
nop {0}

BUG: 21169627

Change-Id: I64130e99f6506494b9c4a6e0f1f850491d481242
odecs/amrwbenc/Android.mk
odecs/amrwbenc/src/asm/ARMV5E/Deemph_32_opt.s
odecs/amrwbenc/src/asm/ARMV5E/Dot_p_opt.s
odecs/amrwbenc/src/asm/ARMV5E/Filt_6k_7k_opt.s
odecs/amrwbenc/src/asm/ARMV5E/Norm_Corr_opt.s
odecs/amrwbenc/src/asm/ARMV5E/Syn_filt_32_opt.s
odecs/amrwbenc/src/asm/ARMV5E/convolve_opt.s
odecs/amrwbenc/src/asm/ARMV5E/cor_h_vec_opt.s
odecs/amrwbenc/src/asm/ARMV5E/pred_lt4_1_opt.s
odecs/amrwbenc/src/asm/ARMV5E/residu_asm_opt.s
odecs/amrwbenc/src/asm/ARMV5E/scale_sig_opt.s
odecs/amrwbenc/src/asm/ARMV5E/syn_filt_opt.s
odecs/amrwbenc/src/asm/ARMV7/Deemph_32_neon.s
odecs/amrwbenc/src/asm/ARMV7/Dot_p_neon.s
odecs/amrwbenc/src/asm/ARMV7/Filt_6k_7k_neon.s
odecs/amrwbenc/src/asm/ARMV7/Norm_Corr_neon.s
odecs/amrwbenc/src/asm/ARMV7/Syn_filt_32_neon.s
odecs/amrwbenc/src/asm/ARMV7/convolve_neon.s
odecs/amrwbenc/src/asm/ARMV7/cor_h_vec_neon.s
odecs/amrwbenc/src/asm/ARMV7/pred_lt4_1_neon.s
odecs/amrwbenc/src/asm/ARMV7/residu_asm_neon.s
odecs/amrwbenc/src/asm/ARMV7/scale_sig_neon.s
odecs/amrwbenc/src/asm/ARMV7/syn_filt_neon.s
6b9ab9bf948e4faf1da6d67c80b22804c80a544e 20-May-2015 Marco Nelissen <marcone@google.com> am 6191691c: am 1d82e69d: Merge "Translate codec specific data for mp4v-es for MediaMuxer"

* commit '6191691cd3d3903606f30ccde0d849701356503b':
Translate codec specific data for mp4v-es for MediaMuxer
1d82e69dffe9214fd35d0ec75ce9b957da7fc50b 20-May-2015 Marco Nelissen <marcone@google.com> Merge "Translate codec specific data for mp4v-es for MediaMuxer"
540006666b4191cd78391378f1c66c21bcf0c4cd 13-Apr-2015 Wonsik Kim <wonsik@google.com> Implement seek for MPEG2TSExtractor

TODO: Use bandwidth-based estimation to seek forward long period.

Bug: 20126845
Change-Id: I5e2f90784a9ce0dce348715dfcfc4f83ee196170
nclude/MPEG2TSExtractor.h
peg2ts/ATSParser.cpp
peg2ts/ATSParser.h
peg2ts/MPEG2TSExtractor.cpp
12a3d2f50dc52d8d05f5d0e932445f368248f520 18-May-2015 Jaesung Chung <jaesung@google.com> mpeg2ts: MPEG2TSExtractor detects A/V streams until timed out

Bug: 20433028
Change-Id: I6145eae8d64ad9150477a8ac52545e68768c75eb
peg2ts/MPEG2TSExtractor.cpp
89fdd54db676dbc7d29aa30cb185432e5046566b 20-May-2015 Wei Jia <wjia@google.com> am 8f9dd2c4: Merge "RTSPSource: Do not update time when there are no tracks, i.e., when aborted." into mnc-dev

* commit '8f9dd2c40b8ab996e71d6835c379a5d4a8551b00':
RTSPSource: Do not update time when there are no tracks, i.e., when aborted.
8f9dd2c40b8ab996e71d6835c379a5d4a8551b00 20-May-2015 Wei Jia <wjia@google.com> Merge "RTSPSource: Do not update time when there are no tracks, i.e., when aborted." into mnc-dev
48910f120c59bfcbbe298fdd4a72c6e72e8945e9 15-May-2015 Wei Jia <wjia@google.com> RTSPSource: Do not update time when there are no tracks, i.e., when aborted.

Bug: 17474566
Change-Id: I0dbd7a6a54edaf5b4fe5bd324d38f791a346b2fd
tsp/MyHandler.h
b77376cb5e18236d89c0b49893140c972aaf0130 20-May-2015 Chong Zhang <chz@google.com> am 6471747c: Merge "stagefright: don\'t use stale pointer after disconnecting NuCachedSource2" into mnc-dev

* commit '6471747c2fedd4106df608a263af474e345d41ba':
stagefright: don't use stale pointer after disconnecting NuCachedSource2
7a7d700a05183e9d8f3e6ee7a43c3a2791e3d4e1 20-May-2015 Wei Jia <wjia@google.com> am df3e7e89: Merge "ACodec: fix error conversion." into mnc-dev

* commit 'df3e7e8912ad8fcc268852fd016723850aae7fd1':
ACodec: fix error conversion.
6471747c2fedd4106df608a263af474e345d41ba 19-May-2015 Chong Zhang <chz@google.com> Merge "stagefright: don't use stale pointer after disconnecting NuCachedSource2" into mnc-dev
df3e7e8912ad8fcc268852fd016723850aae7fd1 19-May-2015 Wei Jia <wjia@google.com> Merge "ACodec: fix error conversion." into mnc-dev
201d8d400eb037547f4f476a838475b13a446007 19-May-2015 Wei Jia <wjia@google.com> ACodec: fix error conversion.

When mime is not supported, need to signal error NAME_NOT_FOUND.

Bug: 19620911
Bug: 21207639
Change-Id: Ifd651858827c47a71b3087b914ad1e1e8606183c
Codec.cpp
2c878cfdf36b896abb99e62a37188cc92cd4fe6e 19-May-2015 Chong Zhang <chz@google.com> stagefright: don't use stale pointer after disconnecting NuCachedSource2

bug: 20858729
Change-Id: I7d680accb43a4aa08620acd96659b97e80d1a5e8
uCachedSource2.cpp
eedcd5cccc2be322e34d725759c2d01c227b89e4 19-May-2015 Hamsalekha S <hamsalekha.s@ittiam.com> SoftAVCDec: Added support for level greater than level at init

Bugfix: 21144884

Change-Id: Idda3fbf6c30e99d6df2b1e53a1f65c8ec55586ce
odecs/avcdec/SoftAVCDec.cpp
odecs/avcdec/SoftAVCDec.h
3d4d897cf6a933dd02e8d83e674a4ecfe2ea578b 19-May-2015 Glenn Kasten <gkasten@google.com> am d45d75d7: Merge "Clear mAudioRecord and mAudioTrack on set() failure" into mnc-dev

* commit 'd45d75d7c19811c5afe9b115c7282f9aa4e1ee4d':
Clear mAudioRecord and mAudioTrack on set() failure
d45d75d7c19811c5afe9b115c7282f9aa4e1ee4d 19-May-2015 Glenn Kasten <gkasten@google.com> Merge "Clear mAudioRecord and mAudioTrack on set() failure" into mnc-dev
3e98ecd18c906dc3ac2ff1a890f0b3163447272d 18-May-2015 Glenn Kasten <gkasten@google.com> Clear mAudioRecord and mAudioTrack on set() failure

Bug: 20818955
Bug: 20890069
Change-Id: I243205b99b198eb1b5a1a027b27cbb7d5aaaa8db
udioSource.cpp
672a5ddac8ef8eeb144a1248045ed9ffd82e5dec 18-May-2015 Ronghua Wu <ronghuawu@google.com> am 098f9836: Merge "libstagefright: only log succeeded when return is OK." into mnc-dev

* commit '098f98364517415481dd6fdea678322553f51035':
libstagefright: only log succeeded when return is OK.
098f98364517415481dd6fdea678322553f51035 18-May-2015 Ronghua Wu <ronghuawu@google.com> Merge "libstagefright: only log succeeded when return is OK." into mnc-dev
d36a023778256f0550e9a09e9993c066e8a3c7d7 18-May-2015 Ronghua Wu <ronghuawu@google.com> libstagefright: only log succeeded when return is OK.

Bug: 19300493
Change-Id: I84a2caa3450d2dbccecbed5fd12de6e1b898d6d4
Codec.cpp
c5636afbe7b3d52a5c77c2ce4a09b64f8a24186b 16-May-2015 Chong Zhang <chz@google.com> am f71f5afc: Merge "MPEG4Writer: fix unintiialized member variables" into mnc-dev

* commit 'f71f5afcd87e8037350f8630e6d40da0a9b2aa60':
MPEG4Writer: fix unintiialized member variables
f71f5afcd87e8037350f8630e6d40da0a9b2aa60 16-May-2015 Chong Zhang <chz@google.com> Merge "MPEG4Writer: fix unintiialized member variables" into mnc-dev
e502b443ce9d229d1e9108834887c6e520948816 16-May-2015 Chong Zhang <chz@google.com> MPEG4Writer: fix unintiialized member variables

bug: 20858729
Change-Id: Iccd62dca311fa66cb52ef53ed703719ddcf92cc8
PEG4Writer.cpp
ae0a0cd5ca109610b1a223efb4cadd5a19ccbd2e 16-May-2015 Robert Shih <robertshih@google.com> am eca01264: Merge "Change mime for HLS timed ID3 stream to application/x-id3v4" into mnc-dev

* commit 'eca012646226d397a7076ff8d6da026db5d11d5b':
Change mime for HLS timed ID3 stream to application/x-id3v4
eca012646226d397a7076ff8d6da026db5d11d5b 16-May-2015 Robert Shih <robertshih@google.com> Merge "Change mime for HLS timed ID3 stream to application/x-id3v4" into mnc-dev
b14168661e699c0081a68ce815cbba1dec2dc52e 15-May-2015 Chong Zhang <chz@google.com> am 641d56b1: Merge "stagefright: check IMemory::pointer() before using the allocation" into mnc-dev

* commit '641d56b15d11ba806b60f1f32543444016bf045a':
stagefright: check IMemory::pointer() before using the allocation
5581770ee0dde70e2e9c50533be35e537a5800ef 15-May-2015 Chong Zhang <chz@google.com> stagefright: check IMemory::pointer() before using the allocation

bug: 19779574
Change-Id: I4ffe8c3fadc07da211f421e75ee83010b01d9cbb
Codec.cpp
8a1fa1ebc2375c9dcaca2b78918c6740fff2ca74 15-May-2015 Jaesung Chung <jaesung@google.com> stagefright: check the validity of the range of adaptation field

Bug: 20439174
Change-Id: I76a9a3cd1669164cee921191d27d4c669eeb9ae0
peg2ts/ATSParser.cpp
6f9c5e26c710dbee50e57316f1c460dda4850fa5 15-May-2015 Robert Shih <robertshih@google.com> Change mime for HLS timed ID3 stream to application/x-id3v4

Bug: 21151892
Change-Id: I6a243b0edbbb445df0caf65f395f81926fd515f0
ediaDefs.cpp
ttplive/LiveSession.cpp
peg2ts/ESQueue.cpp
0e59905af4df56e3b54441c72d1225a1467667db 14-May-2015 Lajos Molnar <lajos@google.com> am e6858d59: Merge "stagefright: prevent more crashes in ACodec" into mnc-dev

* commit 'e6858d597ca98ce7e68e10545dfb604ed572d46a':
stagefright: prevent more crashes in ACodec
e6858d597ca98ce7e68e10545dfb604ed572d46a 14-May-2015 Lajos Molnar <lajos@google.com> Merge "stagefright: prevent more crashes in ACodec" into mnc-dev
bdf9e2822a2fda6982393ca2ddb137678a27c5ae 13-May-2015 Jinsuk Kim <jinsukkim@google.com> am 9997183b: Merge "stagefright: Prevent crashes in ACodec - part 1" into mnc-dev

* commit '9997183bc4e7fa11d35eeb8d58d27aa32a4140d5':
stagefright: Prevent crashes in ACodec - part 1
9997183bc4e7fa11d35eeb8d58d27aa32a4140d5 13-May-2015 Jinsuk Kim <jinsukkim@google.com> Merge "stagefright: Prevent crashes in ACodec - part 1" into mnc-dev
0806340688c937e7b78c2d89db3809274130df4e 13-May-2015 Lajos Molnar <lajos@google.com> stagefright: prevent more crashes in ACodec

Signal errors if OMX or native window reports an error

Bug: 20439174
Change-Id: Iebeb16f5a29c6819d39568a184b921799a234686
Codec.cpp
f2b90f170a3afad1ab5f8fbdf20c23284189c213 13-May-2015 Chong Zhang <chz@google.com> am 55c3bd0c: Merge "stagefright: rename usePersistentInputSurface to setInputSurface" into mnc-dev

* commit '55c3bd0cacfb6e1601cd03fdba814be544a34326':
stagefright: rename usePersistentInputSurface to setInputSurface
55c3bd0cacfb6e1601cd03fdba814be544a34326 13-May-2015 Chong Zhang <chz@google.com> Merge "stagefright: rename usePersistentInputSurface to setInputSurface" into mnc-dev
777cf6d2788b12bbd68f620cda94a128462a208d 28-Apr-2015 Jinsuk Kim <jinsukkim@google.com> stagefright: Prevent crashes in ACodec - part 1

Replaced CHECK_ macros with return statements to avoid crashing.

Bug: 20439174
Change-Id: I124297674d5654b62382457e4fcc937d79b163ff
Codec.cpp
8f469e18c307cb9dc0d16ed9225972aa8be4516f 13-May-2015 Chong Zhang <chz@google.com> stagefright: rename usePersistentInputSurface to setInputSurface

and clear persistent surface pointer when MediaRecorder is reset

bug: 21045118
bug: 21045402
Change-Id: Ifd0d6deeb969f2252123929541b30b518cecbf9a
Codec.cpp
ediaCodec.cpp
ediaCodecSource.cpp
MXClient.cpp
ilters/MediaFilter.cpp
nclude/OMX.h
nclude/OMXNodeInstance.h
mx/OMX.cpp
mx/OMXNodeInstance.cpp
6c67dd51e2d6a29e5bd1b57a054f1f9315a69f4d 13-May-2015 Lajos Molnar <lajos@google.com> am 81446325: am 0eb7c793: am b5fbb811: am c8c86c1d: am bcf2becf: am c531d995: am 438217a0: Merge "Add AUtils::isInRange, and use it to detect malformed MPEG4 nal sizes" into lmp-dev

* commit '814463259cfc0b3c30535e6cba89a736f56c4a16':
Add AUtils::isInRange, and use it to detect malformed MPEG4 nal sizes
814463259cfc0b3c30535e6cba89a736f56c4a16 13-May-2015 Lajos Molnar <lajos@google.com> am 0eb7c793: am b5fbb811: am c8c86c1d: am bcf2becf: am c531d995: am 438217a0: Merge "Add AUtils::isInRange, and use it to detect malformed MPEG4 nal sizes" into lmp-dev

* commit '0eb7c79398ef04e457c76f117feef6d7bcbbc684':
Add AUtils::isInRange, and use it to detect malformed MPEG4 nal sizes
65d9625708b333571f0682209cf87df306abb665 13-May-2015 Wei Jia <wjia@google.com> am 94183482: Merge "MediaSync: support changing surface on the fly." into mnc-dev

* commit '94183482a089690278fbe2346fa6946c9c7d97ef':
MediaSync: support changing surface on the fly.
94183482a089690278fbe2346fa6946c9c7d97ef 13-May-2015 Wei Jia <wjia@google.com> Merge "MediaSync: support changing surface on the fly." into mnc-dev
0eb7c79398ef04e457c76f117feef6d7bcbbc684 13-May-2015 Lajos Molnar <lajos@google.com> am b5fbb811: am c8c86c1d: am bcf2becf: am c531d995: am 438217a0: Merge "Add AUtils::isInRange, and use it to detect malformed MPEG4 nal sizes" into lmp-dev

* commit 'b5fbb81157eaab594bb37275176a0a178098dc46':
Add AUtils::isInRange, and use it to detect malformed MPEG4 nal sizes
883cc24817551459fe72994dcff4fc6f54f88538 24-Apr-2015 Evgenii Stepanov <eugenis@google.com> Fix new[] vs delete mismatch.

Detected with AddressSanitizer.

Bug: 18202869
Change-Id: I7fa9ee722766968e33faa4d9312385ca303ca274
(cherry picked from commit a37f84ecce59a0d11a687b55527ccb18d4db7f52)
odecs/aacdec/SoftAAC2.cpp
bcf2becf206b5d56c89bf2b43356fd7995003302 13-May-2015 Lajos Molnar <lajos@google.com> am c531d995: am 438217a0: Merge "Add AUtils::isInRange, and use it to detect malformed MPEG4 nal sizes" into lmp-dev

* commit 'c531d9956513b9b82dad84aeb507b866e6b3951a':
Add AUtils::isInRange, and use it to detect malformed MPEG4 nal sizes
438217a0a5b3d2bfc6e7cd10c395c7b642013758 12-May-2015 Lajos Molnar <lajos@google.com> Merge "Add AUtils::isInRange, and use it to detect malformed MPEG4 nal sizes" into lmp-dev
b6ea1292f8adae45d95c6f37d50c96534219b6d2 08-May-2015 Wei Jia <wjia@google.com> MediaSync: support changing surface on the fly.

Bug: 19666434
Change-Id: I5809df2d3bb0dd6b4a982f11d62c4b7a452ed6fb
ediaSync.cpp
2db33d7c68607a570a6488bf037165027017321d 11-May-2015 Robert Shih <robertshih@google.com> am a540058e: Merge "HLS: invoke signalEOS on ATSParser to flush out final samples" into mnc-dev

* commit 'a540058ec00b6d147f40a7cdcf6f47acbd70f6c9':
HLS: invoke signalEOS on ATSParser to flush out final samples
a540058ec00b6d147f40a7cdcf6f47acbd70f6c9 11-May-2015 Robert Shih <robertshih@google.com> Merge "HLS: invoke signalEOS on ATSParser to flush out final samples" into mnc-dev
aabbdc7401ae24a4199f12a283985deb648673c0 09-May-2015 Robert Shih <robertshih@google.com> HLS: invoke signalEOS on ATSParser to flush out final samples

Also clear EOS status when we reset ATSParser.

Bug: 20959760
Change-Id: I730234acf3cdbee08affe0f28b7e8759e11059cb
ttplive/PlaylistFetcher.cpp
peg2ts/ATSParser.cpp
peg2ts/ESQueue.cpp
a3e8f60f5e409f65f12636df5fad7f20ff736df5 11-May-2015 Robert Shih <robertshih@google.com> am 7acac10a: Merge "DO NOT MERGE: Add AUtils::isInRange, and use it to detect malformed MPEG4 nal sizes" into klp-dev

* commit '7acac10aae34da5ae4d628c5a270e7e3e94f7598':
DO NOT MERGE: Add AUtils::isInRange, and use it to detect malformed MPEG4 nal sizes
7acac10aae34da5ae4d628c5a270e7e3e94f7598 11-May-2015 Robert Shih <robertshih@google.com> Merge "DO NOT MERGE: Add AUtils::isInRange, and use it to detect malformed MPEG4 nal sizes" into klp-dev
8110aed1594a199f7e8ffebb0a580aeb2b5f81b1 09-May-2015 Lajos Molnar <lajos@google.com> am e66c5a42: stagefright: fix legacy-adaptive experiment

* commit 'e66c5a42f01e2f445857b54a9d7bbb8ee062edeb':
stagefright: fix legacy-adaptive experiment
e66c5a42f01e2f445857b54a9d7bbb8ee062edeb 09-May-2015 Lajos Molnar <lajos@google.com> stagefright: fix legacy-adaptive experiment

Now that we are checking for unregistered buffers, we need to
preregister the buffers on allocation.

Bug: 20894716
Change-Id: Ie89663232c4c0d5bc2dfbd58c3347581c25fb041
Codec.cpp
8b4cdf4afe30bff67fd3edc86d05a3ba9ba4b854 08-May-2015 Ronghua Wu <ronghuawu@google.com> am 8bae3aa3: Merge "libstagefright: report special error when codec is released by resource manager." into mnc-dev

* commit '8bae3aa349f9d03934a170d3bafbf0008bfc3a9d':
libstagefright: report special error when codec is released by resource manager.
8bae3aa349f9d03934a170d3bafbf0008bfc3a9d 08-May-2015 Ronghua Wu <ronghuawu@google.com> Merge "libstagefright: report special error when codec is released by resource manager." into mnc-dev
cd9bc3bc21d5d21d95cd38ac485fa706cd3f6501 08-May-2015 Lajos Molnar <lajos@google.com> am 3af8a321: Merge changes from topic \'codec-surface\' into mnc-dev

* commit '3af8a321d06b3ee59afe159479c58e6b549c7b8f':
stagefright: enable experiments
stagefright: allow connecting to surfaces that attach buffers
3af8a321d06b3ee59afe159479c58e6b549c7b8f 08-May-2015 Lajos Molnar <lajos@google.com> Merge changes from topic 'codec-surface' into mnc-dev

* changes:
stagefright: enable experiments
stagefright: allow connecting to surfaces that attach buffers
fed340ad6dfe62a7b150a2fe5d0eaa0b6c108696 08-May-2015 Dan Albert <danalbert@google.com> am 635bc8f9: Fix comparison sign warnings.

* commit '635bc8f90429b2fdcaf7f8d43f7f59bcd0fe951c':
Fix comparison sign warnings.
635bc8f90429b2fdcaf7f8d43f7f59bcd0fe951c 08-May-2015 Dan Albert <danalbert@google.com> Fix comparison sign warnings.

Change-Id: I6f2e2b03b968a569b122004b4803c5d17fccfb12
PEG4Extractor.cpp
d82d34c319e89cd043af5ca2f3ffd4ebf2da8228 08-May-2015 Ronghua Wu <ronghuawu@google.com> am 9ba21b94: libstagefright: config resource manager with secure codec co-existing policy.

* commit '9ba21b9418d10ddcc39f08901e24fbf43d82b2bc':
libstagefright: config resource manager with secure codec co-existing policy.
47a2e875bdd2bd25cb8500208940ff1488b01e08 13-Mar-2015 Ronghua Wu <ronghuawu@google.com> libstagefright: report special error when codec is released by resource manager.

Bug: 19620911
Change-Id: I3403da361adbf2ea6979fcadb0d5ad0889d3513e
ediaCodec.cpp
9ba21b9418d10ddcc39f08901e24fbf43d82b2bc 21-Apr-2015 Ronghua Wu <ronghuawu@google.com> libstagefright: config resource manager with secure codec co-existing policy.

Bug: 19620911
Change-Id: I0d729782c1622f23e9c37b7a9231e58e3f807470
ediaCodecList.cpp
ediaCodecListOverrides.cpp
ediaCodecListOverrides.h
ests/MediaCodecListOverrides_test.cpp
9cb22c38ded7dce33325b74721a8dc21951188fb 08-May-2015 Nick Kralevich <nnk@google.com> am ba21a9ac: Merge "Prevent integer overflow when processing covr MPEG4 atoms" into mnc-dev

* commit 'ba21a9ac7b6b76f85681cfb5e756e947c0ae3b53':
Prevent integer overflow when processing covr MPEG4 atoms
27b2bc575b7e77ab0c081f2a76124e32c69097f0 08-May-2015 Nick Kralevich <nnk@google.com> am f9d108ce: Merge "Fix integer overflow when handling MPEG4 tx3g atom" into mnc-dev

* commit 'f9d108cec6710dd35baaa8573eb6d38161240b98':
Fix integer overflow when handling MPEG4 tx3g atom
88b6454bd66995a691a93926fb212e660a732f16 08-May-2015 Nick Kralevich <nnk@google.com> am f7cd8bfd: Merge "Prevent integer underflow if size is below 6" into mnc-dev

* commit 'f7cd8bfdb48c4237969bc16d25b6bec204073340':
Prevent integer underflow if size is below 6
82c6a5deb86b8d937101a5878f279ee71e15b73e 08-May-2015 Nick Kralevich <nnk@google.com> am 0d342b9a: Merge "Fix integer underflow in covr MPEG4 processing" into mnc-dev

* commit '0d342b9a11557e228d6c94be92579d891ba830d8':
Fix integer underflow in covr MPEG4 processing
5b720757913768ce36968c6096e1c13c104b52e8 08-May-2015 Nick Kralevich <nnk@google.com> am 22bd7a63: Merge "Prevent reading past the end of the buffer in 3GPP" into mnc-dev

* commit '22bd7a63667893255b7b7714246084d0cf654cb8':
Prevent reading past the end of the buffer in 3GPP
ae1dee1050a2d5374cae47f71829ef5e1ec6525d 08-May-2015 Ronghua Wu <ronghuawu@google.com> am 2a834fc0: Merge "libstagefright: export profiling results directly to xml." into mnc-dev

* commit '2a834fc09e1b22e7f70250c55ae2f462f5f60987':
libstagefright: export profiling results directly to xml.
fb22fbb8d28e1be91d0f158943af91571a227ac8 08-May-2015 Chong Zhang <chz@google.com> am e5e9a0df: Merge "nuplayer: fixes for subtitle pause/resume" into mnc-dev

* commit 'e5e9a0df67ae23d16bf48e4a8fd652684434a3b6':
nuplayer: fixes for subtitle pause/resume
1e51401794ff830c912c21123c321b83c17b491d 05-May-2015 Joshua J. Drake <android-open-source@qoop.org> Prevent integer overflow when processing covr MPEG4 atoms

If the 'chunk_data_size' value is SIZE_MAX, an integer overflow will occur
and cause an undersized buffer to be allocated. The following processing
then overfills the resulting memory and creates a potentially exploitable
condition. Ensure that integer overflow does not occur.

Bug: 20923261
Change-Id: I75cce323aec04a612e5a230ecd7c2077ce06035f
PEG4Extractor.cpp
f9d108cec6710dd35baaa8573eb6d38161240b98 08-May-2015 Nick Kralevich <nnk@google.com> Merge "Fix integer overflow when handling MPEG4 tx3g atom" into mnc-dev
dc69f4856187904bfb0d12a72cdf5a563a0deff2 05-May-2015 Joshua J. Drake <android-open-source@qoop.org> Fix integer overflow when handling MPEG4 tx3g atom

When the sum of the 'size' and 'chunk_size' variables is larger than 2^32,
an integer overflow occurs. Using the result value to allocate memory
leads to an undersized buffer allocation and later a potentially
exploitable heap corruption condition. Ensure that integer overflow does
not occur.

Bug: 20923261
Change-Id: Id050a36b33196864bdd98b5ea24241f95a0b5d1f
PEG4Extractor.cpp
f7cd8bfdb48c4237969bc16d25b6bec204073340 08-May-2015 Nick Kralevich <nnk@google.com> Merge "Prevent integer underflow if size is below 6" into mnc-dev
9458e715d391ee8fe455fc31f07ff35ce12e0531 05-May-2015 Joshua J. Drake <android-open-source@qoop.org> Prevent integer underflow if size is below 6

When processing 3GPP metadata, a subtraction operation may underflow and
lead to a rather large linear byteswap operation in the subsequent
framedata decoding code. Bound the 'size' value to prevent this from
occurring.

Bug: 20923261
Change-Id: I35dfbc8878c6b65cfe8b8adb7351a77ad4d604e5
PEG4Extractor.cpp
0d342b9a11557e228d6c94be92579d891ba830d8 08-May-2015 Nick Kralevich <nnk@google.com> Merge "Fix integer underflow in covr MPEG4 processing" into mnc-dev
97d45dbfdfc9018f1cbf72641c1447ff59431ae3 05-May-2015 Joshua J. Drake <android-open-source@qoop.org> Fix integer underflow in covr MPEG4 processing

When the 'chunk_data_size' variable is less than 'kSkipBytesOfDataBox', an
integer underflow can occur. This causes an extraordinarily large value to
be passed to MetaData::setData, leading to a buffer overflow.

Bug: 20923261
Change-Id: Icd28f63594ad941eabb3a12c750a4a2d5d2bf94b
PEG4Extractor.cpp
22bd7a63667893255b7b7714246084d0cf654cb8 08-May-2015 Nick Kralevich <nnk@google.com> Merge "Prevent reading past the end of the buffer in 3GPP" into mnc-dev
2a834fc09e1b22e7f70250c55ae2f462f5f60987 08-May-2015 Ronghua Wu <ronghuawu@google.com> Merge "libstagefright: export profiling results directly to xml." into mnc-dev
5cea0155cfc41f67e91343c342f44251c03fde3a 05-May-2015 Joshua J. Drake <android-open-source@qoop.org> Prevent reading past the end of the buffer in 3GPP

Metadata processed within the parse3GPPMetaData function may not be NUL
terminated and thus calling setCString may read out of bounds. Ensure
proper NUL termination, but take care not to interfere with other special
cases (ie, albm).

Bug: 20923261
Change-Id: Ie93b3038b534b4c4460571a68f4d734cff7ad324
PEG4Extractor.cpp
e5e9a0df67ae23d16bf48e4a8fd652684434a3b6 08-May-2015 Chong Zhang <chz@google.com> Merge "nuplayer: fixes for subtitle pause/resume" into mnc-dev
e22302afcff80b86ae5d5d49118e9882e210ad17 07-May-2015 Lajos Molnar <lajos@google.com> am f52b2284: Merge changes from topic \'codec-setsurface\' into mnc-dev

* commit 'f52b2284405ec1d8941334718f580157417f9d60':
stagefright: support push-blank-buffers-on-shutdown for SW renderer
ACodec: blank surface when switching to another surface
stagefright: move native window helpers into SurfaceUtils
011778fd4cb9606b68bfea1ed483d73c04fc6dcd 06-May-2015 Lajos Molnar <lajos@google.com> stagefright: enable experiments

Bug: 20894716
Change-Id: I8c05b99dca8b3099a3a1b2b465f0f58bef786572
Codec.cpp
ndroid.mk
oundation/ADebug.cpp
dd248abd2c3e5e82b0049d40c7e9fb741fd4540c 07-May-2015 Lajos Molnar <lajos@google.com> stagefright: allow connecting to surfaces that attach buffers

Now that consumers can attach buffers to BufferQueues, we cannot
assert if an unknown buffer is dequeud, or if a buffer is dequeued
from a BufferQueue multiple times.

Also, when attaching to such surfaces, allocation must be enabled
as attach will lock for a free buffer slot.

Bug: 20885565
Change-Id: Ied466c5a848facf3149ad8bf0d18a0095da21e40
Codec.cpp
f52b2284405ec1d8941334718f580157417f9d60 07-May-2015 Lajos Molnar <lajos@google.com> Merge changes from topic 'codec-setsurface' into mnc-dev

* changes:
stagefright: support push-blank-buffers-on-shutdown for SW renderer
ACodec: blank surface when switching to another surface
stagefright: move native window helpers into SurfaceUtils
0460d51dd85680b2335d670f9197848cf7ac6866 07-May-2015 Chong Zhang <chz@google.com> am d975e98a: Merge "MediaHTTP: add more null ptr and init checks" into mnc-dev

* commit 'd975e98aac096b8b0ed600f39c18630ba234ef7d':
MediaHTTP: add more null ptr and init checks
d975e98aac096b8b0ed600f39c18630ba234ef7d 07-May-2015 Chong Zhang <chz@google.com> Merge "MediaHTTP: add more null ptr and init checks" into mnc-dev
8480005863816fc3a5dcc74b4131728f82686a0a 07-May-2015 Chong Zhang <chz@google.com> am 70c75d8c: Merge "RTSP: append track URL to base URL" into mnc-dev

* commit '70c75d8c15707d5eade38fe3e622f8500c29556b':
RTSP: append track URL to base URL
37d8b27e5470d8243288a87e90871efd43f29606 07-May-2015 Chong Zhang <chz@google.com> MediaHTTP: add more null ptr and init checks

bug: 20912192
Change-Id: I83cf59ff85fd8aa3a19a696ceb97cd8aa922b8ba
ttp/MediaHTTP.cpp
8b23759763dbf11b0c628a7e62dc5b3dea7dc188 06-May-2015 Lajos Molnar <lajos@google.com> stagefright: support push-blank-buffers-on-shutdown for SW renderer

Bug: 20885565
Change-Id: I2a361b8dd6d39d2cf994f6748ed562be4c642b77
ediaCodec.cpp
484979b1ab25aa41f503bd846323ab93b46d37e5 06-May-2015 Lajos Molnar <lajos@google.com> ACodec: blank surface when switching to another surface

Bug: 20885565
Change-Id: I9b0d279724aab24e0a270770258716d115ef15bc
Codec.cpp
b2d0b487efd40700199852c9a18b369b1651f15b 06-May-2015 Lajos Molnar <lajos@google.com> stagefright: move native window helpers into SurfaceUtils

Bug: 20885565
Change-Id: I2ed14be8a7cb08b1ed4ea65cb9286dc1384fe64a
Codec.cpp
ndroid.mk
MXCodec.cpp
urfaceUtils.cpp
70c75d8c15707d5eade38fe3e622f8500c29556b 07-May-2015 Chong Zhang <chz@google.com> Merge "RTSP: append track URL to base URL" into mnc-dev
003de828bddcb087c761e9f9996c44f19fcb197e 07-May-2015 Marco Nelissen <marcone@google.com> am 3f4431e9: am 959d3179: am 07d4f27b: am f14555b0: am 3fdb2cbb: am d638e735: am 0d9eb04f: am 5a75b421: am 30d77e2c: Fix potential buffer overrun

* commit '3f4431e97376b8a315ad8862724e1e1fb34c9292':
Fix potential buffer overrun
3f4431e97376b8a315ad8862724e1e1fb34c9292 07-May-2015 Marco Nelissen <marcone@google.com> am 959d3179: am 07d4f27b: am f14555b0: am 3fdb2cbb: am d638e735: am 0d9eb04f: am 5a75b421: am 30d77e2c: Fix potential buffer overrun

* commit '959d31794fca9091ff066d6e90457e66d1e5d4a6':
Fix potential buffer overrun
959d31794fca9091ff066d6e90457e66d1e5d4a6 07-May-2015 Marco Nelissen <marcone@google.com> am 07d4f27b: am f14555b0: am 3fdb2cbb: am d638e735: am 0d9eb04f: am 5a75b421: am 30d77e2c: Fix potential buffer overrun

* commit '07d4f27b150bdba4107d54d71a70e94a3900e95c':
Fix potential buffer overrun
3fdb2cbb16e7c347d8013cb85b5d29f106c50cf9 07-May-2015 Marco Nelissen <marcone@google.com> am d638e735: am 0d9eb04f: am 5a75b421: am 30d77e2c: Fix potential buffer overrun

* commit 'd638e73568fa43eb964a305ed438603ae5900264':
Fix potential buffer overrun
0d9eb04fa1d7d2b524587fa3372381a30067fc15 07-May-2015 Marco Nelissen <marcone@google.com> am 5a75b421: am 30d77e2c: Fix potential buffer overrun

* commit '5a75b4215821d633af18dd8dae2495299c070bf0':
Fix potential buffer overrun
5a75b4215821d633af18dd8dae2495299c070bf0 07-May-2015 Marco Nelissen <marcone@google.com> am 30d77e2c: Fix potential buffer overrun

* commit '30d77e2c75c1973f9fb363717af92cf640685da3':
Fix potential buffer overrun
8a048338d9291b2db1b3a325fff58cb1aa69f04d 07-May-2015 Chong Zhang <chz@google.com> nuplayer: fixes for subtitle pause/resume

- pause after the current block when select track
- ignore metadata timestamps as they're too sparse
- use smaller range when searching for next segment to prevent
resumeUntil from downloading too much data

bug: 20500732
Change-Id: Ibda57a39ec86efd96a8dd0db95adeb92d076697a
ttplive/LiveSession.cpp
ttplive/PlaylistFetcher.cpp
0fc4e47c39cd7d57ce3c3babc902872e492cd4af 06-May-2015 Lajos Molnar <lajos@google.com> am d02ac2c7: stagefright: fix pushBlankBuffersToNW for non-meta decoders

* commit 'd02ac2c7286ca7190ddaf861095cd0b16e28da1e':
stagefright: fix pushBlankBuffersToNW for non-meta decoders
d02ac2c7286ca7190ddaf861095cd0b16e28da1e 06-May-2015 Lajos Molnar <lajos@google.com> stagefright: fix pushBlankBuffersToNW for non-meta decoders

Bug: 20709429
Change-Id: Ifaee74083dedecb755e5c8ba3369cf90dfd74035
Codec.cpp
65c8fbcf91f0f0b5f60a45d2777c36d396c4ba16 21-Apr-2015 Ronghua Wu <ronghuawu@google.com> libstagefright: export profiling results directly to xml.

Bug: 19620911
Change-Id: Icdeb1c30816d6de120ea0acd0880b3a9614bea8f
ediaCodecList.cpp
ediaCodecListOverrides.cpp
ediaCodecListOverrides.h
ests/MediaCodecListOverrides_test.cpp
304e3c8f96ce865015643f9d16f546cff3405e51 05-May-2015 Marco Nelissen <marcone@google.com> am 464c7e08: Merge "OggExtractor::verifyHeader: return errors instead of asserting" into mnc-dev

* commit '464c7e085b68dd63ce8cdbb2c389d3827f8d586a':
OggExtractor::verifyHeader: return errors instead of asserting
464c7e085b68dd63ce8cdbb2c389d3827f8d586a 05-May-2015 Marco Nelissen <marcone@google.com> Merge "OggExtractor::verifyHeader: return errors instead of asserting" into mnc-dev
ae0c0a17e824356eb55a6692ff8dee6cdc050401 06-Apr-2015 Harish Mahendrakar <harish.mahendrakar@ittiam.com> Added support for MPEG2 video in MPEG4Extractor

Change-Id: I70b1c3a07062526fc6d5333f70f4f1d792834e7f
PEG4Extractor.cpp
a69f4a664463a19d1b0ad4c9e1eede4020e6ec6f 05-May-2015 Praveen Chavan <pchavan@codeaurora.org> am 8b07404c: stagefright: Validate track formats passed to MPEG4Writer

* commit '8b07404cfe564885045a63bb592d6b6dc838b408':
stagefright: Validate track formats passed to MPEG4Writer
3706edf898a134992ed07e3a7e27e91cad8260b7 05-May-2015 Ronghua Wu <ronghuawu@google.com> am ebea5e7d: Merge "Stagefright: propagate InsufficientResources error" into mnc-dev

* commit 'ebea5e7d0697c024c1ddf6001dcd33036e9bd95f':
Stagefright: propagate InsufficientResources error
9218e4d2bdd6a1c1a65a3c4127790cbe18af1711 05-May-2015 Ronghua Wu <ronghuawu@google.com> am 48d41f65: Merge "SoftVPXEncoder: don\'t skip the last input buffer with eos flag." into mnc-dev

* commit '48d41f651f4ef761a7477eac404e195a7fac0c8f':
SoftVPXEncoder: don't skip the last input buffer with eos flag.
4d05aa7093385b015701609b7646a37fb367c2dc 05-May-2015 Harish Mahendrakar <harish.mahendrakar@ittiam.com> am df0ebf5f: SoftAVCEnc: Removed alignment requirement on input width

* commit 'df0ebf5f9ea5c16aaec4752bdf06af101cc541b8':
SoftAVCEnc: Removed alignment requirement on input width
8b07404cfe564885045a63bb592d6b6dc838b408 13-Aug-2014 Praveen Chavan <pchavan@codeaurora.org> stagefright: Validate track formats passed to MPEG4Writer

Validate the mime type for tracks to start with; and throw
an error for unsupported types rather than let apps re-mux/encode
the whole clip and assert towards the end while writing the header.
The writer asserts if provided with an unsupported mime when
authoring the fourcc, which is done at the end of muxing.

Bug: 17007397
Change-Id: Ie80372940a46038db73107101a2ae6fdecf72eaa
PEG4Writer.cpp
fe7186bb1567b5725eb8ce61e3267a1733e90c53 05-May-2015 Marco Nelissen <marcone@google.com> OggExtractor::verifyHeader: return errors instead of asserting

Bug: 16631522
Change-Id: I619455af64cad04a0f4fd35e52e3f3709efad8b4
ggExtractor.cpp
ebea5e7d0697c024c1ddf6001dcd33036e9bd95f 05-May-2015 Ronghua Wu <ronghuawu@google.com> Merge "Stagefright: propagate InsufficientResources error" into mnc-dev
48d41f651f4ef761a7477eac404e195a7fac0c8f 05-May-2015 Ronghua Wu <ronghuawu@google.com> Merge "SoftVPXEncoder: don't skip the last input buffer with eos flag." into mnc-dev
fafcc219184223ab584eac3b03ee807e2798207a 01-May-2015 Praveen Chavan <pchavan@codeaurora.org> Stagefright: propagate InsufficientResources error

Propagate OMX_ErrorInsufficientResources when handling
node-allocation failure any other error from the component.

bug: 20132289

Change-Id: I1ed9626dab947227e3d5e983bbbeee89ad7b2d2a
nclude/OMXNodeInstance.h
mx/OMX.cpp
mx/OMXNodeInstance.cpp
df0ebf5f9ea5c16aaec4752bdf06af101cc541b8 28-Apr-2015 Harish Mahendrakar <harish.mahendrakar@ittiam.com> SoftAVCEnc: Removed alignment requirement on input width

Change-Id: Id6e1abf588420beec6f1af4394b69b2e53487299
odecs/avcenc/SoftAVCEnc.cpp
eb1e82d71ec30eaad9e11f3b0dedef0d895035f8 05-May-2015 Lajos Molnar <lajos@google.com> Merge "SoftAVCEnc: Removed alignment requirement on input width"
30d77e2c75c1973f9fb363717af92cf640685da3 02-May-2015 Marco Nelissen <marcone@google.com> Fix potential buffer overrun

The "samples" parameter indicates the max number of sample tuples, not
the max number of samples.

Bug: 16183063
Change-Id: I5347497bbbe65910b8489d354e985ebc90d65516
odecs/vorbis/dec/SoftVorbis.cpp
8ef524627297a0fb60724d432cb8058f891af788 05-May-2015 Wei Jia <wjia@google.com> am 78d9a2e7: Merge "MediaSync: clean up configureAudioTrack and configureSurface." into mnc-dev

* commit '78d9a2e77e8ee153945d93624b01f0525f979299':
MediaSync: clean up configureAudioTrack and configureSurface.
5efccd8da813133060c089c647b07434116406cb 05-May-2015 Chong Zhang <chz@google.com> RTSP: append track URL to base URL

bug: 17310253
Change-Id: I6ce8c4740a3509d82323ccc05f82cb842368caee
tsp/MyHandler.h
2d3ad4087c2231542f07854d3b9ff5b4cae9fd69 05-May-2015 Ronghua Wu <ronghuawu@google.com> SoftVPXEncoder: don't skip the last input buffer with eos flag.

Bug: 20507129
Change-Id: I4016727cbae54e2d29c3c6ab5cd8c47826070bf4
odecs/on2/enc/SoftVPXEncoder.cpp
ce8c218ec9db7acd86f9f8929f8bbb668151b53d 05-May-2015 Wei Jia <wjia@google.com> MediaSync: clean up configureAudioTrack and configureSurface.

Bug: 19666434
Change-Id: I579956aad4a6d591b5338d518e610b8532a72402
ediaSync.cpp
599a45afbf8b0b195176130fe207551e252ece4d 02-May-2015 Lajos Molnar <lajos@google.com> am 4068b139: Merge "stagefright: propagate consumer usage flags in MediaSync" into mnc-dev

* commit '4068b1392b18d9f0d9e866b50d716e2ef8dfa37c':
stagefright: propagate consumer usage flags in MediaSync
4068b1392b18d9f0d9e866b50d716e2ef8dfa37c 02-May-2015 Lajos Molnar <lajos@google.com> Merge "stagefright: propagate consumer usage flags in MediaSync" into mnc-dev
64f17259478bfa559ecfa84d22a0694194dcb5d6 02-May-2015 Lajos Molnar <lajos@google.com> am 8651c6f5: Merge "stagefright: add support for dynamically setting MediaCodec output surface" into mnc-dev

* commit '8651c6f5069cca40ef805b800a9730617ff7f9b8':
stagefright: add support for dynamically setting MediaCodec output surface
b7e16c36e19859e1f702581f30c42e85e52010fa 02-May-2015 Chong Zhang <chz@google.com> am e2a2dfcb: MediaRecorder: implement persistent input surface APIs

* commit 'e2a2dfcbf0c9d6bb7139263ecf0d8e53b4ca1049':
MediaRecorder: implement persistent input surface APIs
a4ea4775492cd94fafb38f69dfb8f3591e8bbc50 02-May-2015 Chong Zhang <chz@google.com> am d291c222: MediaCodec: implement persistent input surface APIs

* commit 'd291c222357303b9611cab89d0c3b047584ef377':
MediaCodec: implement persistent input surface APIs
8651c6f5069cca40ef805b800a9730617ff7f9b8 02-May-2015 Lajos Molnar <lajos@google.com> Merge "stagefright: add support for dynamically setting MediaCodec output surface" into mnc-dev
9b73fa9a02b7234b43ac2be66a3328ff36d39c2d 02-May-2015 Lajos Molnar <lajos@google.com> stagefright: propagate consumer usage flags in MediaSync

Bug: 19666434
Change-Id: I20533904d1591f2abeb1db5497fc5c143ed5b2e2
ediaSync.cpp
e2a2dfcbf0c9d6bb7139263ecf0d8e53b4ca1049 01-May-2015 Chong Zhang <chz@google.com> MediaRecorder: implement persistent input surface APIs

Bug: 19127604
Bug: 19489395

Change-Id: I7dd8015a8fe029f9867fcdb52322629c77eff50b
ediaCodecSource.cpp
d291c222357303b9611cab89d0c3b047584ef377 01-May-2015 Chong Zhang <chz@google.com> MediaCodec: implement persistent input surface APIs

Bug: 19127604
Bug: 19489395

Change-Id: Idaf1cc9008016f66903e93907a676f54e342e1a3
Codec.cpp
ediaCodec.cpp
MXClient.cpp
ilters/MediaFilter.cpp
nclude/OMX.h
nclude/OMXNodeInstance.h
mx/GraphicBufferSource.cpp
mx/GraphicBufferSource.h
mx/OMX.cpp
mx/OMXNodeInstance.cpp
1dcdfead2971c1fa7c02f24ba86f706890c9f99e 30-Apr-2015 Lajos Molnar <lajos@google.com> stagefright: add support for dynamically setting MediaCodec output surface

Bug: 11990461
Change-Id: I2aee89ef504234dc66eb5fcf6e62e1706088f758
Codec.cpp
ediaCodec.cpp
f064f9df327ecdae3a0e2f2ddb7e36220759ceeb 02-May-2015 Lajos Molnar <lajos@google.com> am 64da6f04: Merge "stagefright: MediaCodec: rename mNativeWindow to mSurface" into mnc-dev

* commit '64da6f045b1a1d1b8f01391b6e37287f77f85d1e':
stagefright: MediaCodec: rename mNativeWindow to mSurface
ab4bc7a6caead4954550a3dc330ed6de3c9bcd4a 01-May-2015 Lajos Molnar <lajos@google.com> am 1de1e25c: stagefright: remove NativeWindowWrapper

* commit '1de1e25cba872bd4c077c2e394f8ca9c70b65856':
stagefright: remove NativeWindowWrapper
f06cc24ce7aeb5ff6f45b770a15286c95f8cc9ff 01-May-2015 Lajos Molnar <lajos@google.com> stagefright: MediaCodec: rename mNativeWindow to mSurface

because mNativeWindow is of type sp<Surface>

Bug: 19489395
Change-Id: I5ddc78b04e387915a2293b71195d7a6494986356
ediaCodec.cpp
1de1e25cba872bd4c077c2e394f8ca9c70b65856 01-May-2015 Lajos Molnar <lajos@google.com> stagefright: remove NativeWindowWrapper

Now that Surface and SurfaceTextureClient are the same and Surface,
it does not add value.

Bug: 19489395
Change-Id: I016ecd1cf5cc51ce6244b6fa34ecd75f84e3db01
Codec.cpp
ediaCodec.cpp
0ab2c4ce6f669722c055f1f4d35d6a79d21ba7c7 01-May-2015 Lajos Molnar <lajos@google.com> am 3a474aa6: stagefright: support setting/getting playback/sync config in MediaSync

* commit '3a474aa67fc31505740526dd249d96204c08bf79':
stagefright: support setting/getting playback/sync config in MediaSync
3a474aa67fc31505740526dd249d96204c08bf79 25-Apr-2015 Lajos Molnar <lajos@google.com> stagefright: support setting/getting playback/sync config in MediaSync

Bug: 18249558
Bug: 19666434
Bug: 20057497
Change-Id: I5868b17423d7c20cfaf4a399f3eb67bfba440605
udioPlayer.cpp
wesomePlayer.cpp
ediaSync.cpp
tils.cpp
nclude/AwesomePlayer.h
f33bdde6b987470ddaccf5e8033ca9e269c05156 30-Apr-2015 Wei Jia <wjia@google.com> am 457e8258: Merge "MediaSync: map returned output buffers to previously received input buffers." into mnc-dev

* commit '457e82586d51c6d360ce4feb4c1dff1a31dcb8d3':
MediaSync: map returned output buffers to previously received input buffers.
457e82586d51c6d360ce4feb4c1dff1a31dcb8d3 30-Apr-2015 Wei Jia <wjia@google.com> Merge "MediaSync: map returned output buffers to previously received input buffers." into mnc-dev
88db1a0ac74d71e040bd95dd6072720ea68e6547 30-Apr-2015 Robert Shih <robertshih@google.com> am 1471e7a1: Merge "MPEG2PSExtractor: check number of bits left before skipping" into mnc-dev

* commit '1471e7a112aed5ff120c2b97bced9523ed39fe6c':
MPEG2PSExtractor: check number of bits left before skipping
1471e7a112aed5ff120c2b97bced9523ed39fe6c 30-Apr-2015 Robert Shih <robertshih@google.com> Merge "MPEG2PSExtractor: check number of bits left before skipping" into mnc-dev
bac588208fadec78e3fa205c238089df277d3817 29-Apr-2015 Wei Jia <wjia@google.com> MediaSync: map returned output buffers to previously received input buffers.

Bug: 19666434
Change-Id: I81e9cb8e73d950b3be5d29cf010c6793894ad802
ediaSync.cpp
9269b9ba446e88f133d86a5e162d1e18ffe35d91 30-Apr-2015 Ronghua Wu <ronghuawu@google.com> am d707ac5a: Merge "libstagefright: add xml parsing for measured-frame-rate and measured-blocks-per-second." into mnc-dev

* commit 'd707ac5a0494398cb1306ead0ba587034f610f30':
libstagefright: add xml parsing for measured-frame-rate and measured-blocks-per-second.
d707ac5a0494398cb1306ead0ba587034f610f30 30-Apr-2015 Ronghua Wu <ronghuawu@google.com> Merge "libstagefright: add xml parsing for measured-frame-rate and measured-blocks-per-second." into mnc-dev
c3429415023aeef0ac669fadcd11d4511b9a54a5 30-Apr-2015 Marco Nelissen <marcone@google.com> Merge "Don't use the bitrate of the xing header"
731481504427a29d542e73a0877920173740d8b7 30-Apr-2015 Marco Nelissen <marcone@google.com> am 11bf6d35: Merge "Don\'t use the bitrate of the xing header" into mnc-dev

* commit '11bf6d35c3916b99c06de27302d9296c43b6ce50':
Don't use the bitrate of the xing header
11bf6d35c3916b99c06de27302d9296c43b6ce50 30-Apr-2015 Marco Nelissen <marcone@google.com> Merge "Don't use the bitrate of the xing header" into mnc-dev
9ae62202b2bb19cc870361af7edd8e43f823d372 30-Apr-2015 Robert Shih <robertshih@google.com> MPEG2PSExtractor: check number of bits left before skipping

Bug: 18752034
Change-Id: Ie185ebac8324b4fd6dbb68d7cc53124dfe97cbc2
peg2ts/MPEG2PSExtractor.cpp
4be9bb9ca538b3e1407cc80fe76f1232130e67a2 30-Apr-2015 Wei Jia <wjia@google.com> am 7b21efcf: Merge "stagefright: make BufferQueueProducer not re-allocate buffer when trying to dequeue a buffer on devices not supporting meta data buffer mode." into mnc-dev

* commit '7b21efcf733b59ea317fc6dba267c79ac1ed5d5d':
stagefright: make BufferQueueProducer not re-allocate buffer when trying to dequeue a buffer on devices not supporting meta data buffer mode.
fc6c981c46aaf1416726c4ba56693c813af987b1 30-Apr-2015 Andy Hung <hunga@google.com> am 291a39b9: Merge "Omx: Return an error if no IOMX is available" into mnc-dev

* commit '291a39b967fcef0ae5bf0dc924587e8cdde6148a':
Omx: Return an error if no IOMX is available
7b21efcf733b59ea317fc6dba267c79ac1ed5d5d 30-Apr-2015 Wei Jia <wjia@google.com> Merge "stagefright: make BufferQueueProducer not re-allocate buffer when trying to dequeue a buffer on devices not supporting meta data buffer mode." into mnc-dev
291a39b967fcef0ae5bf0dc924587e8cdde6148a 30-Apr-2015 Andy Hung <hunga@google.com> Merge "Omx: Return an error if no IOMX is available" into mnc-dev
a478723e55e2e602477cb41389253e1fa1977f2d 30-Apr-2015 Jinsuk Kim <jinsukkim@google.com> am 424eaef5: Merge "DO NOT MERGE: Prevent crash at erroneous MPEG2TS bitstream" into mnc-dev

* commit '424eaef5c2d4df8750dc46b9bba886ce06e67902':
DO NOT MERGE: Prevent crash at erroneous MPEG2TS bitstream
424eaef5c2d4df8750dc46b9bba886ce06e67902 30-Apr-2015 Jinsuk Kim <jinsukkim@google.com> Merge "DO NOT MERGE: Prevent crash at erroneous MPEG2TS bitstream" into mnc-dev
46acb8810c8150cd63faa731266639fffdde7967 30-Apr-2015 Chong Zhang <chz@google.com> am 5f88cdae: Merge "stagefright: convert kKeyFrameRate between msg and meta" into mnc-dev

* commit '5f88cdae61079be7920aee166eaac4941f65fb9f':
stagefright: convert kKeyFrameRate between msg and meta
5f88cdae61079be7920aee166eaac4941f65fb9f 30-Apr-2015 Chong Zhang <chz@google.com> Merge "stagefright: convert kKeyFrameRate between msg and meta" into mnc-dev
8f5919da04fb6aa7eb7cff70b061d8702627436c 30-Apr-2015 Chong Zhang <chz@google.com> stagefright: convert kKeyFrameRate between msg and meta

bug: 20431757
Change-Id: I2d00e9914550ba3e62bc5ac8604ba44bcbb6026a
tils.cpp
4f13fde7fe1d88aa259d566d8837d97b07703205 30-Apr-2015 Marco Nelissen <marcone@google.com> Don't use the bitrate of the xing header

Use the one for the mp3 frame that follows instead.

Bug: 19622311
Bug: https://code.google.com/p/android/issues/detail?id=158627

Change-Id: I7f1ad702cad06aa29100a66f9796ca920aaa0592
P3Extractor.cpp
f16f9953be8430bb1577fabd7678e09e555e9d6b 30-Apr-2015 Marco Nelissen <marcone@google.com> Don't use the bitrate of the xing header

Use the one for the mp3 frame that follows instead.

Bug: 19622311
Bug: https://code.google.com/p/android/issues/detail?id=158627

Change-Id: I7f1ad702cad06aa29100a66f9796ca920aaa0592
P3Extractor.cpp
48a31bf3f1c1ed5953a4e64f71cdf528f3a38ee5 29-Apr-2015 Andy Hung <hunga@google.com> Omx: Return an error if no IOMX is available

Previously caused fatal crash.

Bug: 20566134
Change-Id: I9761d043422954615dbe81b301401765146a7283
Codec.cpp
ediaCodec.cpp
ediaCodecList.cpp
MXClient.cpp
7cc31f737508b7fd3205b9d8f971bffb71498740 29-Apr-2015 Svet Ganov <svetoslavganov@google.com> am afc750aa: Merge "Respect the record audio app op - media" into mnc-dev

* commit 'afc750aa3ac536067180f9714e34f626f8c981b3':
Respect the record audio app op - media
afc750aa3ac536067180f9714e34f626f8c981b3 29-Apr-2015 Svet Ganov <svetoslavganov@google.com> Merge "Respect the record audio app op - media" into mnc-dev
be71aa29a3c86d2e01cd17839d2a72ab09a1bce5 28-Apr-2015 Svet Ganov <svetoslavganov@google.com> Respect the record audio app op - media

Change-Id: I3a97977b6e9a09355e2008f780d22d480fb7308b
udioSource.cpp
ests/SurfaceMediaSource_test.cpp
ifi-display/source/PlaybackSession.cpp
ifi-display/source/PlaybackSession.h
ifi-display/source/WifiDisplaySource.cpp
ifi-display/source/WifiDisplaySource.h
3298d6fa642c11c5b004bdfc375252ff4c4536e3 29-Apr-2015 Wei Jia <wjia@google.com> stagefright: make BufferQueueProducer not re-allocate buffer when trying to dequeue a buffer on devices not supporting meta data buffer mode.

Bug: 19666434
Change-Id: Id676486d6d4543af7c4da9553134082ab67a9699
Codec.cpp
795697e9012213979e4cf904d1a39ecf007223b6 29-Apr-2015 Ronghua Wu <ronghuawu@google.com> libstagefright: add xml parsing for measured-frame-rate and measured-blocks-per-second.

Bug: 20507129
Change-Id: I4623d2bd93670283d6c82c9bf9acfd00e214c4f0
ediaCodecList.cpp
e314c678ea0b53dd9296ba6b5c3272c702433b47 22-Apr-2015 Jinsuk Kim <jinsukkim@google.com> DO NOT MERGE: Prevent crash at erroneous MPEG2TS bitstream

Used new RCHECK_ macros for drop-in replacements for CHECK_
to avoid crashing at bit errors encountered while parsing
MPEG2 transport packets.

Also removed CHECK_ macros in PSI table processing as errors
would have been already filtered out by CRC check.

Bug: 20274977
Change-Id: I5ca810df3c4295142610bbd1d586d7529bb9f303
(cherry picked from commit e84ab89a2cdae1d1828225f88d895882d716f90e)
peg2ts/ATSParser.cpp
peg2ts/ATSParser.h
peg2ts/ESQueue.cpp
peg2ts/MPEG2PSExtractor.cpp
peg2ts/MPEG2TSExtractor.cpp
6fdbb3e4337722c9bdbc9a1399c1076e51c83d9a 29-Apr-2015 Robert Shih <robertshih@google.com> am 1e2a0e6a: MatroskaExtractor: skip track when codec id is NULL in addTracks

* commit '1e2a0e6adc3d70879b00e5295c54a74209b71e1b':
MatroskaExtractor: skip track when codec id is NULL in addTracks
1e2a0e6adc3d70879b00e5295c54a74209b71e1b 25-Apr-2015 Robert Shih <robertshih@google.com> MatroskaExtractor: skip track when codec id is NULL in addTracks

This is a more thorough version of commit
ea9ac8bf7f6a7ae1424c6cade64b004caa7c3681
in that it applies to both video and audio.

Bug: 17702053
Bug: 18872598
Change-Id: Idcea77bb7133ea0d02da8c484b4a0791db42740e
atroska/MatroskaExtractor.cpp
c0a7e49606b051399341b15856770230061972f5 28-Apr-2015 Ronghua Wu <ronghuawu@google.com> am 4275065e: Merge "DO NOT MERGE libmediaplayerservice: set priority and operating rate for the codec used by nuplayer." into mnc-dev

* commit '4275065e89b121fd2f9bd4e0440577348d5ce663':
DO NOT MERGE libmediaplayerservice: set priority and operating rate for the codec used by nuplayer.
580387a47e1e7419d9d9afc1dc2605759650b229 28-Apr-2015 Ronghua Wu <ronghuawu@google.com> am c721e71f: DO NOT MERGE libmedia: add sub resource type audio-codec and video-codec.

* commit 'c721e71f4d7e3cd4fc9332fd55fb6942f54cec39':
DO NOT MERGE libmedia: add sub resource type audio-codec and video-codec.
ec7398f371d35a8801c29eb303c14ec85a6e5a9e 28-Apr-2015 Harish Mahendrakar <harish.mahendrakar@ittiam.com> SoftAVCEnc: Removed alignment requirement on input width

Change-Id: Id6e1abf588420beec6f1af4394b69b2e53487299
odecs/avcenc/SoftAVCEnc.cpp
9c3e9c4ffd385abf12823cd3ffe0ee0bc688af76 28-Apr-2015 Marco Nelissen <marcone@google.com> am 31c81e9e: am b8111f83: Merge "Fix potential double close in IMediaMetadataRetriever::setDataSource"

* commit '31c81e9e4a468a448b387d5c905b4ac5c6a014fc':
Fix potential double close in IMediaMetadataRetriever::setDataSource
b8111f8314553504c5872ec2705bfaefa93cf3a9 28-Apr-2015 Marco Nelissen <marcone@google.com> Merge "Fix potential double close in IMediaMetadataRetriever::setDataSource"
4275065e89b121fd2f9bd4e0440577348d5ce663 28-Apr-2015 Ronghua Wu <ronghuawu@google.com> Merge "DO NOT MERGE libmediaplayerservice: set priority and operating rate for the codec used by nuplayer." into mnc-dev
c721e71f4d7e3cd4fc9332fd55fb6942f54cec39 25-Apr-2015 Ronghua Wu <ronghuawu@google.com> DO NOT MERGE libmedia: add sub resource type audio-codec and video-codec.

Bug: 20559813
Change-Id: If231cb44337ca7dc74c39fc3cd73e2b6f3cb85b8
(cherry picked from commit d4c1f6b4ecfef7323422359fc38bd1edb1abf205)
ediaCodec.cpp
8db8813d39e3c8b5fbd580dfc3062830744afd63 22-Apr-2015 Ronghua Wu <ronghuawu@google.com> DO NOT MERGE libmediaplayerservice: set priority and operating rate for the codec used by nuplayer.

Bug: 20481562
Change-Id: I9806414962352fbcda726f8274f1cd348c961de0
(cherry picked from commit f19f5d716b39a5d9dc1abdcd5a16a7aaf1b1ab8b)
Codec.cpp
56f3de5e5bf164b36521a3f90033df77e49cfd64 27-Apr-2015 Dan Albert <danalbert@google.com> am 33e4119e: am 75781346: Merge "Fix new[] vs delete mismatch."

* commit '33e4119ee1bccb203aa89d417028d9ea9d0720e5':
Fix new[] vs delete mismatch.
a37f84ecce59a0d11a687b55527ccb18d4db7f52 24-Apr-2015 Evgenii Stepanov <eugenis@google.com> Fix new[] vs delete mismatch.

Detected with AddressSanitizer.

Bug: 18202869
Change-Id: I7fa9ee722766968e33faa4d9312385ca303ca274
odecs/aacdec/SoftAAC2.cpp
67a30ebfe785f7cd5ecfb0d2fb487e54536a3d48 02-Apr-2015 Lajos Molnar <lajos@google.com> DO NOT MERGE: Add AUtils::isInRange, and use it to detect malformed MPEG4 nal sizes

Bug: 19641538
Change-Id: I5aae3f100846c125decc61eec7cd6563e3f33777
PEG4Extractor.cpp
ests/Utils_test.cpp
ea9ac8bf7f6a7ae1424c6cade64b004caa7c3681 25-Apr-2015 Robert Shih <robertshih@google.com> MatroskaExtractor: skip track when codec id is NULL in addTracks

Bug: 18872598
Change-Id: I0cdb2ffae202fc06b068c57dafae7523981b6000
atroska/MatroskaExtractor.cpp
bfed843041b6aaec13ee19996748a7a1476db9c8 02-Apr-2015 Lajos Molnar <lajos@google.com> Add AUtils::isInRange, and use it to detect malformed MPEG4 nal sizes

Bug: 19641538
Change-Id: I5aae3f100846c125decc61eec7cd6563e3f33777
PEG4Extractor.cpp
ests/Utils_test.cpp
21db57282da8b3daba1549f3a8e41c4fbaf80059 24-Apr-2015 Ronghua Wu <ronghuawu@google.com> Merge "mediaresourcemanager: add dumpsys support."
11f88677e9a9405d2b5d7f7bf9b6eec035b6331d 24-Apr-2015 Chong Zhang <chz@google.com> Merge "MediaCodec: ignore error when linkToDeath to batterystats"
bb6635d0aa35d6d31ec7de7c0d957720983fdc55 24-Apr-2015 Chong Zhang <chz@google.com> Merge "HLS: make disconnect faster to prevent ANR"
45c765da4d67088ea7ce0fab438300682c3914f0 24-Apr-2015 Chong Zhang <chz@google.com> MediaCodec: ignore error when linkToDeath to batterystats

bug: 20071299
Change-Id: I932b40e46312db467fe88f8ff6cea028b63785cd
ediaCodec.cpp
a739165147bd58f7396d605fed1dfa8b68aaf6a8 24-Apr-2015 Robert Shih <robertshih@google.com> Merge "Copy sei offset/size during ABuffer/MediaBuffer conversion"
5abbd3dcbb0bb32a3d4b90dddbcf90458967eb6f 21-Apr-2015 Chong Zhang <chz@google.com> HLS: make disconnect faster to prevent ANR

disconnect HTTP connection when we absolutely won't resume

bug: 19890444
Change-Id: Idee36b48741f6f8eb1d65bca32156e9e18349c67
ttplive/Android.mk
ttplive/HTTPDownloader.cpp
ttplive/HTTPDownloader.h
ttplive/LiveSession.cpp
ttplive/LiveSession.h
ttplive/PlaylistFetcher.cpp
ttplive/PlaylistFetcher.h
f8bd851cc652501239a8e3759b21890dfa2afdea 24-Apr-2015 Robert Shih <robertshih@google.com> Copy sei offset/size during ABuffer/MediaBuffer conversion

Bug: 20537676
Change-Id: I0bd11527ccd022c39d94b7877df81de4da1b14a6
peg2ts/AnotherPacketSource.cpp
8f9dd872366f54b6260506c75c3d0cc3f9f73f81 24-Apr-2015 Ronghua Wu <ronghuawu@google.com> mediaresourcemanager: add dumpsys support.

Bug: 20233206
Change-Id: Ic253985e408b05b488e87cd5c50c0d619ac568ef
ediaCodec.cpp
99d1f78c9b16b5668e78c353373e0e7f4592cab9 23-Apr-2015 Wei Jia <wjia@google.com> MediaSync: allow users to query play time for pending audio frames.

Bug: 19666434
Change-Id: I5cfd3e1a9b4f56aaa6482facd55a22ed1e7ed3e6
ediaSync.cpp
1ac91ed2c67245ea5052182212463d3f0afe8b5a 23-Apr-2015 Wei Jia <wjia@google.com> Merge "MediaSync: fix the optimization code path to reduce messages posted to drain video."
80243639b0aa2c7c941c23c1aaeaa75de38c148c 21-Apr-2015 Wei Jia <wjia@google.com> MediaSync: fix the optimization code path to reduce messages posted to drain video.

Bug: 19666434
Change-Id: I195a896033855ab3bfa43791b3c99f66776b007a
ediaSync.cpp
0dd229bb306df68b88e7419b3cc11fc6175be1da 07-Mar-2015 Robert Shih <robertshih@google.com> AnotherPacketSource: make getBufferedDurationUs more discontinuity-aware

The new getBufferedDurationUs implementation obsoletes the purpose of
getEstimatedDurationUs; remove getEstimatedDurationUs and its
associated member variables. Finally replace calls to
getEstimatedDurationUs with getBufferedDurationUs.

Change-Id: I38f20df8e177ffbfe299b203d99076fc98dcd274
ttplive/LiveSession.cpp
peg2ts/AnotherPacketSource.cpp
peg2ts/AnotherPacketSource.h
81636761bead03f13b4ed9320a7f25ce1354f1ae 21-Apr-2015 Chong Zhang <chz@google.com> HLS: remove no more than 10% of bandwidth history at a time

- fix a 'possible video time jump' after seek, don't update
renderer anchor time for 0-sized audio buffers

- fix another 'possible video time jump' caused by some states
not reset in mStreams

- bandwidth estimator changes to not remove more than 10%
of total transfer duration at a time to avoid jumping up
too quickly

bug: 20267388
related-to-bug: 19864613
related-to-bug: 20138395

Change-Id: I8812332cd1e26bf562acfaf086fd679a3549debc
ttplive/LiveSession.cpp
ttplive/LiveSession.h
55203e2e29428c2c7bd830d731f5e6ed890d9a10 21-Apr-2015 Taiju Tsuiki <tzik@google.com> Fix potential double close in IMediaMetadataRetriever::setDataSource

IMediaMetadataRetriever::setDataSource(fd, offset, length) takes the ownership
of |fd| on the direct invocation, and doesn't take the ownership on invocation
from Binder. This is inconsintent to other similar methods like
IMediaPlayer::setDataSource, and causes potential double close of |fd|.

This CL changes the caller and implementations to leave the ownership to make
them consistent.
Also, fixes a double close in IMediaPlayerService::setDataSource in an error
case.

Change-Id: Id551a1e725c4392b0fe6b7293871212eb101c0a5
wesomePlayer.cpp
ea44f41bb142555e747cc11382296e94af99d312 21-Apr-2015 Ronghua Wu <ronghuawu@google.com> Merge "media: ignore the result of linkToDeath, which can fail if called from same process."
e4237177a4a3eea059cd74247b2d770d301a8230 21-Apr-2015 Ronghua Wu <ronghuawu@google.com> media: ignore the result of linkToDeath, which can fail if called from same process.

Bug: 19620911
Change-Id: I6a25ed1ef1b2790d0976943ec129f31972e27714
ediaCodec.cpp
a7346034d597c18b63bc63fdfea8360f8b6c1283 20-Apr-2015 Chris Watkins <watk@google.com> Merge "stagefright: add a 2kb cache for CallbackDataSource."
da7e453e1d1c77959822cf9602ddfed1c50be445 07-Apr-2015 Chris Watkins <watk@google.com> stagefright: add a 2kb cache for CallbackDataSource.

Without a cache the mediaserver does a lot of small reads which result
in round trips through binder and jni to the app MediaDataSource.

On a Nexus 5 I measured time to first frame from MediaPlayer for
1) 1350kbps h264, and 2) 20480kbps vp8. Without a cache, MediaDataSource
was ~250ms slower than an fd. With a 2kb cache it's 30ms slower for (1)
and 70ms slower for (2).

Change-Id: If1e811db7b853c4f79430603318d4744ac30acb9
allbackDataSource.cpp
ataSource.cpp
nclude/CallbackDataSource.h
7184bab920699d49718e8fc3cf8a23d3c9d8d54a 18-Apr-2015 Chong Zhang <chz@google.com> Merge "HLS: reduce number of guessed wrong seq numbers"
5030647ab3860575312532655ccf2ea3cc96088f 18-Apr-2015 Lajos Molnar <lajos@google.com> am 4c85e16c: am d2dc1ea3: am 88574352: am 7725022e: Merge "SoftMPEG2: start output at first I-frame"

* commit '4c85e16c9f7cbd9e9fa4713d62ed2c7f4da2f7d3':
SoftMPEG2: start output at first I-frame
d2dc1ea3a3426238b9dcb4b2fa17f98a1ac5beec 18-Apr-2015 Lajos Molnar <lajos@google.com> am 88574352: am 7725022e: Merge "SoftMPEG2: start output at first I-frame"

* commit '88574352adec1af117d21bb6fadf85b3b9b2f4bc':
SoftMPEG2: start output at first I-frame
8f81045b9219cada36c7be7e6f0541cfa7bd94c8 17-Apr-2015 Venkatarama Avadhani <venkatarama.avadhani@ittiam.com> SoftMPEG2: start output at first I-frame

This fixes thumbnail generation for open GOP sequences

Also add -Werror to this library to detect issues.

Change-Id: I0136ca05070326c895fb3010b8e9557eac2d25df
odecs/mpeg2dec/SoftMPEG2.cpp
odecs/mpeg2dec/SoftMPEG2.h
f65f03bcc8b09820f81b90d8c0d3da6b66546aaf 18-Apr-2015 Lajos Molnar <lajos@google.com> Merge "libmediaplayerservice: fix warnings, make warnings errors, use clang"
6d339f1f764bbd32e3381dae7bfa7c6c575bb493 18-Apr-2015 Lajos Molnar <lajos@google.com> libmediaplayerservice: fix warnings, make warnings errors, use clang

Change-Id: I1b2f6b65c5abbc366068a60b8909104f31b94228
tsp/MyHandler.h
ifi-display/source/WifiDisplaySource.h
3b0da19c78f6a61ed343a07f2448b94faafe4c02 18-Apr-2015 Lajos Molnar <lajos@google.com> stagefright: make more warnings errors

Change-Id: I9b1ad60fbfb866dbf9c00843e06553c3eb25c113
ndroid.mk
PEG4Writer.cpp
ediaCodecListOverrides.cpp
ediaCodecSource.cpp
ilters/Android.mk
oundation/Android.mk
ttp/Android.mk
ttplive/Android.mk
ttplive/PlaylistFetcher.cpp
d3/Android.mk
atroska/Android.mk
peg2ts/Android.mk
mx/Android.mk
mx/tests/Android.mk
tsp/Android.mk
ests/Android.mk
imedtext/Android.mk
imedtext/test/Android.mk
ebm/Android.mk
ifi-display/Android.mk
ifi-display/VideoFormats.cpp
ifi-display/rtp/RTPSender.cpp
ifi-display/source/PlaybackSession.cpp
uv/Android.mk
978449984366946a2e5c9f7cf350746f4306caf8 12-Apr-2015 Chong Zhang <chz@google.com> HLS: reduce number of guessed wrong seq numbers

- account for playlist age in live streaming when calculating
segment time

- be more conservative on downswitching if bandwidth is unstable

- adjust forward or backward if guessed wrong seq number

- code refactor

bug: 19567254

Change-Id: I0b61cea888fdffd1b3ee2446747ed10152e9e7d7
tils.cpp
ttplive/LiveSession.cpp
ttplive/M3UParser.cpp
ttplive/M3UParser.h
ttplive/PlaylistFetcher.cpp
ttplive/PlaylistFetcher.h
ee4e1b1a63758941460ae79a064249d3a5189443 17-Apr-2015 Lajos Molnar <lajos@google.com> stagefright: warnings be gone, some are now errors, use clang

Change-Id: I81f438ae444f04c12ae27ae4ef6d073033de172c
ACExtractor.cpp
Codec.cpp
ndroid.mk
wesomePlayer.cpp
allbackDataSource.cpp
ameraSource.cpp
LACExtractor.cpp
ileSource.cpp
TTPBase.cpp
P3Extractor.cpp
PEG4Extractor.cpp
PEG4Writer.cpp
ediaCodec.cpp
ediaCodecListOverrides.cpp
ediaCodecListOverrides.h
idiExtractor.cpp
uCachedSource2.cpp
MXCodec.cpp
ggExtractor.cpp
ampleTable.cpp
BRISeeker.cpp
odecs/avcdec/SoftAVCDec.cpp
odecs/avcenc/SoftAVCEnc.cpp
odecs/avcenc/SoftAVCEnc.h
odecs/hevcdec/SoftHEVC.cpp
odecs/mpeg2dec/SoftMPEG2.cpp
olorconversion/Android.mk
ilters/Android.mk
ilters/ColorConvert.cpp
ilters/GraphicBufferListener.cpp
ilters/MediaFilter.cpp
oundation/Android.mk
ttp/Android.mk
ttplive/Android.mk
ttplive/LiveSession.h
ttplive/PlaylistFetcher.h
d3/Android.mk
nclude/AwesomePlayer.h
nclude/MPEG2PSExtractor.h
nclude/MPEG2TSExtractor.h
nclude/OMX.h
nclude/OMXNodeInstance.h
nclude/SampleIterator.h
nclude/StagefrightMetadataRetriever.h
nclude/TimedEventQueue.h
nclude/VBRISeeker.h
nclude/XINGSeeker.h
atroska/Android.mk
peg2ts/Android.mk
mx/Android.mk
mx/FrameDropper.cpp
mx/GraphicBufferSource.h
mx/SimpleSoftOMXComponent.cpp
mx/tests/Android.mk
mx/tests/FrameDropper_test.cpp
tsp/ARTPWriter.h
tsp/Android.mk
ests/Android.mk
ests/DummyRecorder.h
ests/MediaCodecListOverrides_test.cpp
imedtext/Android.mk
imedtext/test/Android.mk
imedtext/test/TimedTextSRTSource_test.cpp
ebm/Android.mk
ifi-display/Android.mk
ifi-display/VideoFormats.cpp
ifi-display/rtp/RTPSender.cpp
ifi-display/source/Converter.cpp
ifi-display/source/Converter.h
ifi-display/source/PlaybackSession.cpp
ifi-display/source/PlaybackSession.h
ifi-display/source/WifiDisplaySource.cpp
uv/Android.mk
bfb03d2486e3c5dd21120bf403d68fa36323b102 17-Apr-2015 Robert Shih <robertshih@google.com> Merge "stagefright: initial timed id3 support in hls"
0852843d304006e3ab333081fddda13b07193de8 08-Apr-2015 Robert Shih <robertshih@google.com> stagefright: initial timed id3 support in hls

Change-Id: I00a8a786b3f4b74742c34770edd94e937abe20a8
ediaDefs.cpp
ttplive/LiveSession.cpp
ttplive/LiveSession.h
ttplive/PlaylistFetcher.cpp
ttplive/PlaylistFetcher.h
peg2ts/ATSParser.cpp
peg2ts/ATSParser.h
peg2ts/AnotherPacketSource.cpp
peg2ts/AnotherPacketSource.h
peg2ts/ESQueue.cpp
peg2ts/ESQueue.h
9767a47dcf9bbe090045ab99e0290d73289c704f 17-Apr-2015 Wei Jia <wjia@google.com> MediaSync: sanity check native sample rate.

Bug: 19666434
Change-Id: I0eb7a70c81c4fcc336f52f014eeb6d261ac2c501
ediaSync.cpp
3d66eb4128aebef31bb0fa44c4d53d6122294a26 16-Apr-2015 Chong Zhang <chz@google.com> MediaCodec: hold input buffers during FLUSHED state

bug: 20267388
Change-Id: I21a12cb2ebb74e17dcdb7b502c3f674e9e64b5dc
ediaCodec.cpp
ff9863b206cd5d1e856dbfdf66bc85581aee7608 16-Apr-2015 Marco Nelissen <marcone@google.com> am 6705a49f: am 541a9ac7: am 8cd4132a: am 3f22f5a2: Merge "Signal EOS at end of mpeg video to flush out final sample"

* commit '6705a49f6481ad1728215a2a72472fe43c786cd0':
Signal EOS at end of mpeg video to flush out final sample
541a9ac77ecaa26449fcad5c116fb93657ca17c1 16-Apr-2015 Marco Nelissen <marcone@google.com> am 8cd4132a: am 3f22f5a2: Merge "Signal EOS at end of mpeg video to flush out final sample"

* commit '8cd4132a85239fd318193e10c0817ac7784c304a':
Signal EOS at end of mpeg video to flush out final sample
3f22f5a2d95699650a454041bcaa1d5a248cca88 16-Apr-2015 Marco Nelissen <marcone@google.com> Merge "Signal EOS at end of mpeg video to flush out final sample"
c224ec53a17994fa97ab2f29304647c9f195c51c 16-Apr-2015 Chris Watkins <watk@google.com> Merge "Unhide the android.media.[Media]DataSource interface."
ffb9710d2c6a323519f499e5900b16cd3cd067bd 16-Apr-2015 Lajos Molnar <lajos@google.com> am 5c16a387: am 382bcd5a: am 6a2dffb1: am 4491a4ab: Merge "libstagefright: free mMoovBoxBuffer"

* commit '5c16a3877c0b32f21cbee7f1bdc77a2a4d2b79c6':
libstagefright: free mMoovBoxBuffer
c08efe00b75f86dfdf92a6c2a996f8099af21e09 16-Apr-2015 Lajos Molnar <lajos@google.com> am f16511ca: am 0a4d22e5: am 9985f6af: am 30d7b488: Merge "MPEG4Writer: Set the correct audio bit rate for camera recorded content"

* commit 'f16511ca737b8bf8a33ce589a28630e98c3aaae5':
MPEG4Writer: Set the correct audio bit rate for camera recorded content
3409cc3405d5a2553e524b56d831d0218f5b906c 16-Apr-2015 Lajos Molnar <lajos@google.com> am 655084f9: am e7a53499: am 0a45cda6: am 187b196e: Merge changes Ic51e92e9,Ie808aa82,I74f5f4a1

* commit '655084f979b3067cb5a6fd2d4de148b411fbec23':
stagefright: add SoftAVCEnc using libavc
stagefright: add SoftAVCDec using libavc
stagefright: add SoftMPEG2 decoder using libmpeg2
382bcd5a63d3edba3950e120e452f4dd42c608c2 16-Apr-2015 Lajos Molnar <lajos@google.com> am 6a2dffb1: am 4491a4ab: Merge "libstagefright: free mMoovBoxBuffer"

* commit '6a2dffb1c7a0e45388257bc5d2ec763f234f8cca':
libstagefright: free mMoovBoxBuffer
0a4d22e5385755049bb2ebc684255ba5e9ae2ec7 16-Apr-2015 Lajos Molnar <lajos@google.com> am 9985f6af: am 30d7b488: Merge "MPEG4Writer: Set the correct audio bit rate for camera recorded content"

* commit '9985f6af71061c9340fffa9a6e7c8fea5dac04ab':
MPEG4Writer: Set the correct audio bit rate for camera recorded content
e7a53499125586272adb2c7592db5c4038dabe3b 16-Apr-2015 Lajos Molnar <lajos@google.com> am 0a45cda6: am 187b196e: Merge changes Ic51e92e9,Ie808aa82,I74f5f4a1

* commit '0a45cda68209717767412d040c24e8253c1b5847':
stagefright: add SoftAVCEnc using libavc
stagefright: add SoftAVCDec using libavc
stagefright: add SoftMPEG2 decoder using libmpeg2
4491a4ab2d6991baa1ce15f24025aa24430d15d1 16-Apr-2015 Lajos Molnar <lajos@google.com> Merge "libstagefright: free mMoovBoxBuffer"
4c845fde3d60ad93984879f69b164e35536e080d 18-Mar-2014 Suresh Choudhary <sureshc@nvidia.com> libstagefright: free mMoovBoxBuffer

Add free(mMoovBoxBuffer) in MPEG4Writer::release()

Change-Id: Ic396e64e9e238bdc23cb0b02b7aa341d879d2237
PEG4Writer.cpp
30d7b4883bf3198bfba0d0acf14e0bcbb67716d1 16-Apr-2015 Lajos Molnar <lajos@google.com> Merge "MPEG4Writer: Set the correct audio bit rate for camera recorded content"
99f31604136d66ae10e20669fb6b5716f342bde0 20-Mar-2015 Chris Watkins <watk@google.com> Unhide the android.media.[Media]DataSource interface.

This allows apps to implement MediaDataSource, which is modeled on
stagefright's DataSource, to supply media data to the framework. This
was already implemented for MediaExtractor, but it was renamed from
DataSource.

MediaExtractor, MediaPlayer and MediaMetadataRetriever each have a new
overload: #setDataSource(android.media.MediaDataSource)

Only NuPlayer supports this new data source.

The change introduces:
* IDataSource: The binder interface for DataSource.
* JMediaDataSource: The native counterpart to the java interface. It
implements IDataSource.
* CallbackDataSource: A stagefright DataSource that wraps an
IDataSource.

Change-Id: Ib3c944b49cc8a792c8eb9c85e5015c07f298ebc1
ndroid.mk
allbackDataSource.cpp
ataSource.cpp
tagefrightMetadataRetriever.cpp
nclude/AwesomePlayer.h
nclude/CallbackDataSource.h
nclude/StagefrightMetadataRetriever.h
22b3b44ae459974794403ed0f76d95ae43d92985 03-Apr-2015 Venkatarama Avadhani <venkatarama.avadhani@ittiam.com> stagefright: add SoftAVCEnc using libavc

Change-Id: Ic51e92e9d86db21109b8714e822697869e184cd1
odecs/avcenc/Android.mk
odecs/avcenc/SoftAVCEnc.cpp
odecs/avcenc/SoftAVCEnc.h
ata/media_codecs_google_video.xml
mx/SoftOMXPlugin.cpp
e5b9b3db87a55d3430f881ba59ba95f7d6ae41d0 02-Apr-2015 Venkatarama Avadhani <venkatarama.avadhani@ittiam.com> stagefright: add SoftAVCDec using libavc

Change-Id: Ie808aa82c624dbbcaeb6b41662c9b7770bc80bd9
odecs/avcdec/Android.mk
odecs/avcdec/SoftAVCDec.cpp
odecs/avcdec/SoftAVCDec.h
ata/media_codecs_google_video.xml
mx/SoftOMXPlugin.cpp
8f9d9d06ed6c8447c7fd02745b2a22dd4bba8e7e 31-Mar-2015 Venkatarama Avadhani <venkatarama.avadhani@ittiam.com> stagefright: add SoftMPEG2 decoder using libmpeg2

Change-Id: I74f5f4a1e6d7be8df45bcbc83a965111454b97ea
odecs/mpeg2dec/Android.mk
odecs/mpeg2dec/SoftMPEG2.cpp
odecs/mpeg2dec/SoftMPEG2.h
ata/media_codecs_google_video.xml
mx/SoftOMXPlugin.cpp
be9634d071e79b72a42a4504f64eda9e2a0bceb8 15-Apr-2015 Marco Nelissen <marcone@google.com> Signal EOS at end of mpeg video to flush out final sample

Change-Id: I27196a4a4b7fe37da52d3ee99da8cb80294d36d0
peg2ts/ATSParser.cpp
peg2ts/ESQueue.cpp
peg2ts/ESQueue.h
peg2ts/MPEG2TSExtractor.cpp
ef185e94ce624146e3b1f3cbdb2404e833a0f81d 15-Apr-2015 Chong Zhang <chz@google.com> skip parsing of 'hdlr' atom when parsing QT meta

bug: 20244718
Change-Id: Ifb8a6d450a2f1ad2833301f492dc0ccfe1cd34d4
PEG4Extractor.cpp
7233234a32d22d2ffb63ed4e92df339458047887 15-Apr-2015 Ronghua Wu <ronghuawu@google.com> Merge "media: use ResourceManagerService with MediaCodec"
be39e102a64f48fb3afe6ca412231f17df3c3c87 15-Apr-2015 Chong Zhang <chz@google.com> Merge "HLS: parse stream resolution and set maxWidth/maxHeight"
ebada74ec20c6bd46e81d2f4c160ac176c10784d 11-Feb-2014 Daniel Bonnevier <daniel.bonnevier@sonymobile.com> MPEG4Writer: Set the correct audio bit rate for camera recorded content

Remove the hard coded value for bit rate. Use the audio bit rate from
the stream format, if it is specified, otherwise default to 96kpbs.

Change-Id: Ib643c79bbdddaafb3dc703448645606267f7ca4d
PEG4Writer.cpp
948dbbbe0d75f1975a80eafd53d6b8daa8f92223 15-Apr-2015 Chong Zhang <chz@google.com> Merge "stagefright: metadata retriever changes for capture fps"
4123d6db0642cd13e69230705b12d6b6fee6f73f 14-Apr-2015 Jinsuk Kim <jinsukkim@google.com> Merge "mpeg2ts: Set SAMPLE_FLAG_SYNC for mpeg2ts stream"
67e7f543c7f1c4fe4ee1989ceb0aebe44a63b49e 13-Mar-2015 Ronghua Wu <ronghuawu@google.com> media: use ResourceManagerService with MediaCodec

Bug: 19620911
Change-Id: I235a97e5195b28645b7834dda0dd77307d93f4a8
ediaCodec.cpp
a0d0ba51ad60a68117a0ee78e37ab78715b8a069 11-Apr-2015 Chong Zhang <chz@google.com> HLS: parse stream resolution and set maxWidth/maxHeight

bug: 20160436

Change-Id: Ic3adb84d3c65cc65f62fc509a99d09602db862a1
tils.cpp
ttplive/LiveSession.cpp
ttplive/LiveSession.h
ttplive/M3UParser.cpp
37746afe186ce04f0f6252900b79726040d89a0d 25-Mar-2015 Terry Heo <terryheo@google.com> mpeg2ts: Set SAMPLE_FLAG_SYNC for mpeg2ts stream

Added logic to find sync frame of mpeg2, mpeg4 and h264

Bug: 19940277
Change-Id: I4d95ae247f590b831bf11ff8c9c6fe45d21dab56
peg2ts/AnotherPacketSource.cpp
peg2ts/ESQueue.cpp
8cfad968d5ec429b033caff9743f1ef15090be61 08-Apr-2015 Chong Zhang <chz@google.com> stagefright: metadata retriever changes for capture fps

bug: 19460202
Change-Id: I20afded0b7eec45b2f25b51cf59d9f48eada74d8
PEG4Extractor.cpp
tagefrightMetadataRetriever.cpp
nclude/MPEG4Extractor.h
9e6955a19bf77ebf27b770e910efbe1ebf1ceac0 26-Mar-2015 Ronghua Wu <ronghuawu@google.com> media: handle overrides and measure max codec instance.

Bug: 19620911
Change-Id: I68d5919284700f37ccc6c6b9f96cd87ccdd40e6a
ndroid.mk
ediaCodecList.cpp
ediaCodecListOverrides.cpp
ediaCodecListOverrides.h
ests/Android.mk
ests/MediaCodecListOverrides_test.cpp
5795cb168634680fd5c835849c8fcf48dd6f532b 14-Apr-2015 Ronghua Wu <ronghuawu@google.com> Merge "libstagefright: parse global settings from codec xml file."
c1f5cb4b11d0c9f52f69aec4fe2d36da2f8139c9 26-Mar-2015 Ronghua Wu <ronghuawu@google.com> libstagefright: parse global settings from codec xml file.

Also parse a new codec limit "max-supported-instances".

Bug: 19620911
Change-Id: I6574c168b0c2b1aa649883958d3073edc01a4a03
ediaCodecList.cpp
af52793677e26d76788fc63d2df08d0c141013bc 14-Apr-2015 Lajos Molnar <lajos@google.com> Merge "Remove deprecated image defines"
db93079daf06a94e50622d0383b9ed8e767e2f92 13-Apr-2015 Chong Zhang <chz@google.com> Merge "MediaCodec: add DeathNotifier to BatteryNotifier"
252e0d8ae9fae7711800dac01bd851a3ebc23135 11-Apr-2015 Johann <johannkoenig@google.com> Remove deprecated image defines

libvpx has always supported the VPX_ prefixed versions of these defines.
The unprefixed versions have been removed in the most recent release.

https://chromium.googlesource.com/webm/libvpx/+/9cdaa3d72eade9ad162ef8f78a93bd8f85c6de10

Change-Id: Idae747eb9f6e71a41a63c6b326af36dc52f5446d
odecs/on2/dec/SoftVPX.cpp
e6109e2f10b43c2cc2561c6fd6633b5f988bd7a9 11-Apr-2015 Lajos Molnar <lajos@google.com> mediaplayer: support async mode for widevine legacy mode

Bug: 14679336
Change-Id: Id224eb8c31ec148ca9a144758cc56ddbf5465f5c
ediaCodec.cpp
e1650d00185ca1121aceecc236cdea107a8247b0 11-Apr-2015 Nick Kralevich <nnk@google.com> am 85bb3235: am 8eae9223: am a05bd3c1: am 2f47bb53: am eb204f82: am b919a3a3: am 64290793: Merge "Fix integer underflow in ESDS processing" into klp-dev

* commit '85bb3235ef58120131e20801dd37eb9708ddc570':
Fix integer underflow in ESDS processing
17b6f9b0b5c53a46dc1a04162f32d5785e01e58d 11-Apr-2015 Nick Kralevich <nnk@google.com> am 3b042ea5: am 7d62a918: am 14c686c0: am 940189d9: am 475de998: am 47759307: am 17b625b7: Merge "Fix integer overflow during MP4 atom processing" into klp-dev

* commit '3b042ea54bbaf75bac63bd4d3d7064007b4b0d8d':
Fix integer overflow during MP4 atom processing
892e06d1c92e2ea4fbf0a13a785c8235382f6e23 11-Apr-2015 Joshua J. Drake <android-open-source@qoop.org> am 86fb9185: am 75a8776e: am 3cff4324: am 520434cd: am 24acf11d: am 4a131250: am 030d8d0a: Fix several ineffective integer overflow checks

* commit '86fb91857ecaca2a0dc27abcd369c5f35203e922':
Fix several ineffective integer overflow checks
421f47ca9c2dcc78584b2bb609c3755483b55155 25-Mar-2015 Marco Nelissen <marcone@google.com> mediaplayer: use async mode in NuPlayer

Bug: 14679336
Change-Id: I5e471a6e13be82a375afc2718599f27cd0255bf5
ediaCodecSource.cpp
a05bd3c1cdff400ad92532b06d40ddc5c638c284 11-Apr-2015 Nick Kralevich <nnk@google.com> am 2f47bb53: am eb204f82: am b919a3a3: am 64290793: Merge "Fix integer underflow in ESDS processing" into klp-dev

* commit '2f47bb53f65e34ba9cff66106390351440b9409b':
Fix integer underflow in ESDS processing
14c686c0f6eb3e9ac5774bbfa7b5f2fa4e04ce80 11-Apr-2015 Nick Kralevich <nnk@google.com> am 940189d9: am 475de998: am 47759307: am 17b625b7: Merge "Fix integer overflow during MP4 atom processing" into klp-dev

* commit '940189d991f9f7eb55d8a379cf6fda6ec486ceb5':
Fix integer overflow during MP4 atom processing
3cff43241858431ab1e209012dcdcdee0e34c364 11-Apr-2015 Joshua J. Drake <android-open-source@qoop.org> am 520434cd: am 24acf11d: am 4a131250: am 030d8d0a: Fix several ineffective integer overflow checks

* commit '520434cdf572d13efbca693ae9e42bfe42211b85':
Fix several ineffective integer overflow checks
eb204f82afd5519eb544bf8bee692e7152820c3b 11-Apr-2015 Nick Kralevich <nnk@google.com> am b919a3a3: am 64290793: Merge "Fix integer underflow in ESDS processing" into klp-dev

* commit 'b919a3a3d38c4b1cbb378c38cc6154a81ebe01c7':
Fix integer underflow in ESDS processing
475de998b755f0995645e979501f59fca135009c 11-Apr-2015 Nick Kralevich <nnk@google.com> am 47759307: am 17b625b7: Merge "Fix integer overflow during MP4 atom processing" into klp-dev

* commit '4775930799bd9a9fbad8efe5d338e890dd7444ed':
Fix integer overflow during MP4 atom processing
24acf11dbec8e7071f9adcc24fa883c71d005215 11-Apr-2015 Joshua J. Drake <android-open-source@qoop.org> am 4a131250: am 030d8d0a: Fix several ineffective integer overflow checks

* commit '4a13125033f2130cadb4c48b3e6e0085d8c98829':
Fix several ineffective integer overflow checks
b919a3a3d38c4b1cbb378c38cc6154a81ebe01c7 11-Apr-2015 Nick Kralevich <nnk@google.com> am 64290793: Merge "Fix integer underflow in ESDS processing" into klp-dev

* commit '6429079345404932c5be5956efc7154390d2ed0e':
Fix integer underflow in ESDS processing
4775930799bd9a9fbad8efe5d338e890dd7444ed 11-Apr-2015 Nick Kralevich <nnk@google.com> am 17b625b7: Merge "Fix integer overflow during MP4 atom processing" into klp-dev

* commit '17b625b7f51b75fde6640c737474b8b2c51412bf':
Fix integer overflow during MP4 atom processing
4a13125033f2130cadb4c48b3e6e0085d8c98829 11-Apr-2015 Joshua J. Drake <android-open-source@qoop.org> am 030d8d0a: Fix several ineffective integer overflow checks

* commit '030d8d0a557097b88d6ecbf6d04823213512b620':
Fix several ineffective integer overflow checks
6429079345404932c5be5956efc7154390d2ed0e 11-Apr-2015 Nick Kralevich <nnk@google.com> Merge "Fix integer underflow in ESDS processing" into klp-dev
17b625b7f51b75fde6640c737474b8b2c51412bf 11-Apr-2015 Nick Kralevich <nnk@google.com> Merge "Fix integer overflow during MP4 atom processing" into klp-dev
d7ed649cfeff62680b8edb4cb86ce239116d8c8b 10-Apr-2015 Chong Zhang <chz@google.com> MediaCodec: add DeathNotifier to BatteryNotifier

make the battery notifier more robust

bug: 20071299

Change-Id: I0ecfecc787c88ace26dba5e235aa0c345bcace6d
ediaCodec.cpp
ed5554fb1c837f6b1008d3910018c979c57da502 06-Apr-2015 Ronghua Wu <ronghuawu@google.com> libstagefright: handle MediaFormat "operating-rate" key.

Bug: 19620911
Change-Id: I846d3cc10308a13f2ed92bb82ba7e8236d9c67d1
Codec.cpp
52e88b2986536e83a7a6da63461556b8734a85f3 10-Apr-2015 Ronghua Wu <ronghuawu@google.com> libstagefright: convert status_t to OMX_ERRORTYPE.

Bug: 19620911
Change-Id: I32369b2e812c7f3ef6953b13a1dae046b8dc24f1
Codec.cpp
cc0cb8a14acc8ed1760b929fd7f706d800a6ff99 10-Apr-2015 Ronghua Wu <ronghuawu@google.com> Merge "libstagefright: propagate error from allocateNode."
c255757c795e5db87bafa6609c4ae052cf38b45b 10-Apr-2015 Chong Zhang <chz@google.com> Merge "HLS: allow down switch during prepare"
9f41ee5a4dd73093d107bc80df5cebb9a273cc72 09-Apr-2015 Ronghua Wu <ronghuawu@google.com> libstagefright: propagate error from allocateNode.

Bug: 19620911
Change-Id: Iee288343d7d851a395052e1b3354eb98b026e4fb
Codec.cpp
0e4e5a8c09c63548f2a00c77ab5038b7703384bc 09-Apr-2015 Joshua J. Drake <android-open-source@qoop.org> Fix integer underflow in ESDS processing

Several arithmetic operations within parseESDescriptor could underflow, leading
to an out-of-bounds read operation. Ensure that subtractions from 'size' do not
cause it to wrap around.

Bug: 20139950

(cherry picked from commit 07c0f59d6c48874982d2b5c713487612e5af465a)

Change-Id: I377d21051e07ca654ea1f7037120429d3f71924a
SDS.cpp
5c134e6b2047b10877f02a46f4bb293537269f00 09-Apr-2015 Joshua J. Drake <android-open-source@qoop.org> Fix integer overflow during MP4 atom processing

A few sample table related FourCC values are handled by the
setSampleToChunkParams function. An integer overflow exists within this
function. Validate that mNumSampleToChunkOffets will not cause an integer
overflow.

Bug: 20139950

(cherry picked from commit c24607c29c96f939aed9e33bfa702b1dd79da4b7)

Change-Id: I49086952451b09a234d8b82669251ab9f1ef58d9
ampleTable.cpp
030d8d0a557097b88d6ecbf6d04823213512b620 09-Apr-2015 Joshua J. Drake <android-open-source@qoop.org> Fix several ineffective integer overflow checks

Commit edd4a76 (which addressed bugs 15328708, 15342615, 15342751) added
several integer overflow checks. Unfortunately, those checks fail to take into
account integer promotion rules and are thus themselves subject to an integer
overflow. Cast the sizeof() operator to a uint64_t to force promotion while
multiplying.

Bug: 20139950

(cherry picked from commit e2e812e58e8d2716b00d7d82db99b08d3afb4b32)

Change-Id: I080eb3fa147601f18cedab86e0360406c3963d7b
ampleTable.cpp
1c2dc0643141483cb7f90ee032845a1c38fe093a 10-Apr-2015 Nick Kralevich <nnk@google.com> Merge "Fix integer underflow in ESDS processing"
3ab51eece858f1ebc4d9c4e10bb368620d6ad713 10-Apr-2015 Nick Kralevich <nnk@google.com> Merge "Fix integer overflow during MP4 atom processing"
8b882f23e045c929946d42b9b126de6e35356f0c 10-Apr-2015 Nick Kralevich <nnk@google.com> Merge "Detect allocation failures and bail gracefully"
199f0e5dbdc75fb85df13be4fa9d83d31e2ece43 10-Apr-2015 Nick Kralevich <nnk@google.com> Merge "Fix several ineffective integer overflow checks"
98336a769a3a54070c73fa44d7d776a407b55458 10-Apr-2015 Nick Kralevich <nnk@google.com> Merge "Fix multiple division-by-zero conditions in MPEG4 parsing"
d36122b4f10beef6d9f78b5a9b37a5748ba41fa0 10-Apr-2015 Nick Kralevich <nnk@google.com> Merge "Fix null-pointer-dereferences accessing the SampleTable"
0c30a9861244f79bdc95f5c36216acfebb7ac76e 10-Apr-2015 Nick Kralevich <nnk@google.com> Merge "MPEG4Extractor: still more NULL dereference fixes"
07c0f59d6c48874982d2b5c713487612e5af465a 09-Apr-2015 Joshua J. Drake <android-open-source@qoop.org> Fix integer underflow in ESDS processing

Several arithmetic operations within parseESDescriptor could underflow, leading
to an out-of-bounds read operation. Ensure that subtractions from 'size' do not
cause it to wrap around.

Bug: 20139950
Change-Id: I0d1b136ce68fd7c6f606ce66714bf644cfb2961c
SDS.cpp
c24607c29c96f939aed9e33bfa702b1dd79da4b7 09-Apr-2015 Joshua J. Drake <android-open-source@qoop.org> Fix integer overflow during MP4 atom processing

A few sample table related FourCC values are handled by the
setSampleToChunkParams function. An integer overflow exists within this
function. Validate that mNumSampleToChunkOffets will not cause an integer
overflow.

Bug: 20139950
Change-Id: I1972cc185fce5e058afa143ad5eabcc269ad324d
ampleTable.cpp
ad435371a4b95e16ceb49ab28efc04da8b3680e1 09-Apr-2015 Joshua J. Drake <android-open-source@qoop.org> Detect allocation failures and bail gracefully

During the processing of several sample table related MP4 atoms, allocation
sizes could be large enough cause a std::bad_alloc exception to be raised. This
typically causes a crash (denial of service condition). Use std::nothrow to
catch allocation failures and return gracefully.

Bug: 20139950
Change-Id: I03d3f01b24e5fe3fa38985914bcfa694ea3dc09e
ampleTable.cpp
e2e812e58e8d2716b00d7d82db99b08d3afb4b32 09-Apr-2015 Joshua J. Drake <android-open-source@qoop.org> Fix several ineffective integer overflow checks

Commit edd4a76 (which addressed bugs 15328708, 15342615, 15342751) added
several integer overflow checks. Unfortunately, those checks fail to take into
account integer promotion rules and are thus themselves subject to an integer
overflow. Cast the sizeof() operator to a uint64_t to force promotion while
multiplying.

Bug: 20139950
Change-Id: Ieb29a170edb805c722fc5658935f2390003e5260
ampleTable.cpp
e3e82d54c51a3130badcd9e433fe808d965f15c2 09-Apr-2015 Joshua J. Drake <android-open-source@qoop.org> Fix multiple division-by-zero conditions in MPEG4 parsing

Several situations arise processing MP4 atoms that lead to undefined behavior
when dividing by zero. Typically this results in a crash (denial of service
condition).

NOTE: In most cases we simply avoid the division, leaving kKeyDuration unset.
It may be more desirable to bail out, as we do in the parseSegmentIndex case.

Bug: 20139950
Change-Id: I62e1b977f0e5ed0094094a55d300bac76b476c7b
PEG4Extractor.cpp
274f64c7d6367f13c7852256b10339a3b75529f2 09-Apr-2015 Joshua J. Drake <android-open-source@qoop.org> Fix null-pointer-dereferences accessing the SampleTable

While processing various sample table related FourCC values, methods are called
on a NULL mLastTrack or sampleTable object. This leads to undefined behavior
which typically results in a crash (denial of service condition).

Bug: 20139950
Change-Id: Ie2dd8222e702d8bf95faf7d2bd44e6303cd21f68
PEG4Extractor.cpp
541c1721e517a44127f0086f77b4e679849bb8cc 10-Apr-2015 Wei Jia <wjia@google.com> Merge "MediaClock: allow user to query playback rate."
f35ff157134456d30f4cd32b463e32bbbf796cc9 09-Apr-2015 Joshua J. Drake <android-open-source@qoop.org> MPEG4Extractor: still more NULL dereference fixes

When processing various FourCC values within MP4 media, mLastTrack is accessed
without first ensuring that a track has been encoutered. Check for NULL and
bail out instead of crashing.

Bug: 20139950
Change-Id: Ie16687024d17348f576a0e13bd60bd4d6898de91
PEG4Extractor.cpp
fa6a06765e7b92b7ba265482bd4cf3074f9ff6cc 09-Apr-2015 Wei Jia <wjia@google.com> MediaClock: allow user to query playback rate.

Bug: 19666434
Change-Id: I306579e481cfcf923422d50d3d5cfae045ef2227
ediaClock.cpp
bd903e363faeacaeae98252bfc753d5cac9de602 09-Apr-2015 Lajos Molnar <lajos@google.com> Merge "stagefright: LiveSession: delay consuming reply ID for seek"
9db4d29fe4b113a63f0c1701a067d044c8c596f6 09-Apr-2015 Marco Nelissen <marcone@google.com> am 3f14f569: am de2faabb: am d661654a: am 0958e926: Merge "Log cause of failure to dlopen"

* commit '3f14f5692ab396bfd0193a280311a600abeabeaa':
Log cause of failure to dlopen
e7043b5ec21dbc0e836889840cf3c98faa777e0b 09-Apr-2015 Marco Nelissen <marcone@google.com> am fdbafc07: am da589e3d: am fc33bb3f: am e686cc09: Merge "Don\'t fail read when "seeking" to current position"

* commit 'fdbafc0728380645ee2194e2ccfe72b12c65fccf':
Don't fail read when "seeking" to current position
8464d7decb34a3044e92b4085f1bbaafb51410e8 09-Apr-2015 Chong Zhang <chz@google.com> HLS: allow down switch during prepare

to avoid having to immediately down switch (and pause)
after playback starts.

do not count "discard" packet when estimating duration.

bug: 19567254

Change-Id: I0cdd37a06ca800dd81a91cca5eb9b46a1eab7b20
ttplive/LiveSession.cpp
ttplive/LiveSession.h
peg2ts/AnotherPacketSource.cpp
0958e926fef85d7e1e0eb08f330ff46218b72822 09-Apr-2015 Marco Nelissen <marcone@google.com> Merge "Log cause of failure to dlopen"
6b4d13df54cb7eb605d259c5f3c4a37eb34857cc 09-Apr-2015 Marco Nelissen <marcone@google.com> Log cause of failure to dlopen

Bug: 19782799
Change-Id: Idba3d802debb12bb4986c525bb9bb5e3cec09f7d
mx/SoftOMXPlugin.cpp
e686cc0952176964684ce2487c5170e41d03c057 09-Apr-2015 Marco Nelissen <marcone@google.com> Merge "Don't fail read when "seeking" to current position"
38c9d6cfd2db353ebebf291589fcceceebb9f2b8 09-Apr-2015 Marco Nelissen <marcone@google.com> Merge "ESQueue:use 0x000001 instead of 0x00000001 as sync word in H264/MPEG_VIDEO"
03763a9573fcfdd0f85dd9ac0203e7da525a6c98 09-Apr-2015 Jeff Tinker <jtinker@google.com> Merge "Pass crypto source data using a shared buffer"
31ffe45a22b72ee5d25bb4932d0525e90dbc19fe 09-Apr-2015 Marco Nelissen <marcone@google.com> am f5e63398: am 65b351c9: am 5a5e2f41: am 1c4eddb1: Merge "Fix div zero error in corrupted media file"

* commit 'f5e633989263f03c469d676246fbf003f3bb1acc':
Fix div zero error in corrupted media file
c481b5012a5f6cf72e5e93b36f1ed4c9169916f2 07-Apr-2015 Jeff Tinker <jtinker@google.com> Pass crypto source data using a shared buffer

MediaCodec was using a binder transaction buffer
to pass encryption source data for protected content.
On some 4K content, the max binder transaction buffer
size was being exceeded. This change uses a shared
buffer for the encryption source data instead of a
binder transaction buffer, which avoids the problem and
may be more efficient.

bug: 20027687
Change-Id: I36a24ebf600d7e1064b78e48b167fdc29b2c65e9
ediaCodec.cpp
a1151185c7eb3b4c483f7067deba1775fd0a2510 09-Apr-2015 Lajos Molnar <lajos@google.com> stagefright: LiveSession: delay consuming reply ID for seek

Only consume reply ID when actually handling the seek.

Bug: 20123914
Change-Id: I2112ee1b89f8193b487ea2b0b3b7050ba3413864
ttplive/LiveSession.cpp
ttplive/LiveSession.h
25f82752942b1c78aec8ee303d61afff85cff9d1 08-Apr-2015 Chong Zhang <chz@google.com> HLS: traces in LiveSession and PlaylistFetcher for easier debugging

bug: 19567254
Change-Id: I4305d37cb74279ccd435f99483231cd1dcf42fc9
ttplive/LiveSession.cpp
ttplive/LiveSession.h
ttplive/PlaylistFetcher.cpp
ttplive/PlaylistFetcher.h
peg2ts/AnotherPacketSource.cpp
2e81b588f2cc54eaa4f9c83cce279589fb221523 07-Apr-2015 Dan Liang <dan.liang@intel.com> Fix div zero error in corrupted media file

Some corrupted media file has timescale value as zero and shouldn't be used.

Change-Id: I8f6a347f8651cdc7e8c370ab1881e1a5fcb30839
Signed-off-by: Dan Liang <dan.liang@intel.com>
PEG4Extractor.cpp
f876b18295d3e5d9a3ce8d0be59694e4635d6024 03-Apr-2015 Robert Shih <robertshih@google.com> Merge "ESQueue:use 0x000001 instead of 0x00000001 as sync word in H264/MPEG_VIDEO"
5d7c3eef1985ff15a56920c548cc4e41d6c9627a 03-Apr-2015 Marco Nelissen <marcone@google.com> Don't fail read when "seeking" to current position

Fixes thumbnails for MPEG2TS files.

Bug: 19583374
Change-Id: I66e5ca014e2f32ba2566c6f511b6e8859d5a97dc
peg2ts/MPEG2TSExtractor.cpp
34630194376f3a0c204dc452f2652859367a6296 30-Mar-2015 Robert Shih <robertshih@google.com> ESQueue:use 0x000001 instead of 0x00000001 as sync word in H264/MPEG_VIDEO

H264/MPEG_VIDEO sync words can be either 0x000001 (3 bytes) or
0x00000001 (4 bytes); simply searching for 0x000001 in appendData
suffices because:

1. 0x000001 is a suffix of 0x00000001, as such we would continue to
identify all sync words that we used to identify originally.

2. the parsing logic downstream of appendData in
dequeueAccessUnitMPEGVideo and dequeueAccessUnitH264
can both handle 0x000001.

Bug: 19900317
Change-Id: Iac42aad74563d056a443b4396eacbae0f7a4738b
peg2ts/ESQueue.cpp
002135d149d8604e972d1b353d768f293fbce15f 03-Apr-2015 Chong Zhang <chz@google.com> Merge "HLS: misc bug fixes"
d47dfcb5a2e5901c96fc92662cec7aa30f7f8843 27-Mar-2015 Chong Zhang <chz@google.com> HLS: misc bug fixes

- fix no target-duration case

- fix for audio-only <=> audio/video switching

- disable audio-only variants if there is at least
one variant with video

- fix mpeg2ts PTS wraparound when bandwidth adapting

- tweak up/down switch marks

bug: 19567254

Change-Id: Ib46144203c56dfc96eccd6ddaa3867e8a4f2c6a9
tils.cpp
ttplive/LiveSession.cpp
ttplive/LiveSession.h
ttplive/M3UParser.cpp
ttplive/M3UParser.h
ttplive/PlaylistFetcher.cpp
peg2ts/ATSParser.cpp
peg2ts/ATSParser.h
peg2ts/AnotherPacketSource.cpp
peg2ts/AnotherPacketSource.h
13561c89d6d8f6980625192bd75f9fd6cfb102a3 30-Mar-2015 Robert Shih <robertshih@google.com> ESQueue:use 0x000001 instead of 0x00000001 as sync word in H264/MPEG_VIDEO

H264/MPEG_VIDEO sync words can be either 0x000001 (3 bytes) or
0x00000001 (4 bytes); simply searching for 0x000001 in appendData
suffices because:

1. 0x000001 is a suffix of 0x00000001, as such we would continue to
identify all sync words that we used to identify originally.

2. the parsing logic downstream of appendData in
dequeueAccessUnitMPEGVideo and dequeueAccessUnitH264
can both handle 0x000001.

Bug: 19900317
Change-Id: Iac42aad74563d056a443b4396eacbae0f7a4738b
peg2ts/ESQueue.cpp
983e2be81f9ea767ae4d8b19669c1c080ecf58d4 20-Mar-2015 Dan Stoza <stoza@google.com> DO NOT MERGE libstagefright: Stop using IGBC::BufferItem

Switches all uses of IGraphicBufferConsumer::BufferItem (and
BufferQueue::BufferItem) to the BufferItem in libgui.

Similar to I0ddd38df37500cfd6b21d1e768ed14e39c5cd9fc, but not a
cherry-pick.

Change-Id: I9b16c81bd3bdacdba86eb8fb9b216b295a44b1cb
urfaceMediaSource.cpp
mx/GraphicBufferSource.cpp
mx/GraphicBufferSource.h
41919bfa827b310d56e46fd1340494990ecde144 31-Mar-2015 Jinsuk Kim <jinsukkim@google.com> Merge "Do CRC check for MPEG2TS PSI sections"
9ca7b9c74e882526ee5810ff62f203bf75cd3f1a 20-Mar-2015 Jinsuk Kim <jinsukkim@google.com> Do CRC check for MPEG2TS PSI sections

CRC checking helps the parser avoid getting wrong values from
corrupted data in the stream transmitted over a noisy channel.

Bug: 19821428
Change-Id: I7f589a66a781298c039124a4bd1c9453e77b1bf3
peg2ts/ATSParser.cpp
765f27c2376e83766d9e1d8f8136025c5437ce49 30-Mar-2015 Chong Zhang <chz@google.com> fix build break in clang

Change-Id: Iff2ca5d1e800d30943de12191bfe6c43d6a2c7f6
ttplive/LiveSession.cpp
ttplive/LiveSession.h
9bb23ff63e17b91a8480b142975067e8b6ab69ec 27-Mar-2015 Chong Zhang <chz@google.com> Merge "HLS: faster switching and pause/resume on low buffer"
7c8708046117e03c0d38006bdd9685139df3ac6b 18-Mar-2015 Chong Zhang <chz@google.com> HLS: faster switching and pause/resume on low buffer

- when upswitching, discard excessive buffering on low
bandwidth variant, switch to new variant earlier

- when downswitching, report newly found IDR positions
continuously, and switch as soon as new fetcher passes
playback position. This allows us to skip time-consuming
resumeUntil() of old fetcher most of the time

- implement pause/resume on low buffering, and notify
buffering percentage

- buffering parameter tuning, separate pause/resume/ready
buffer level and up/down switch buffer level, boost up
fetcher buffering significantly

bug: 19567254

Change-Id: I750dfcc6f861d78d16a71f501beb86d8129cb048
ttplive/LiveSession.cpp
ttplive/LiveSession.h
ttplive/PlaylistFetcher.cpp
ttplive/PlaylistFetcher.h
peg2ts/AnotherPacketSource.cpp
peg2ts/AnotherPacketSource.h
6ce2ed7e9d003c4580e2813d657660ef18865df6 24-Mar-2015 Wei Jia <wjia@google.com> Merge "MediaSync: support MediaSync in native code."
76fa9ec3e831ce97aeb2f1aa688972f5b85d9c30 22-Mar-2015 Marco Nelissen <marcone@google.com> am f1300d31: am cdf96ffa: Merge "ulaw and alaw aren\'t limited to 8kHz"

* commit 'f1300d31fe80c8e14cf2bbca6c7b6768110cd5ba':
ulaw and alaw aren't limited to 8kHz
a48d372833ccec13c96ece9efcc226e8beac7f59 18-Mar-2015 Chong Zhang <chz@google.com> HLS: allow pause/resume in the middle of a segment

- when down switching, decide whether to finish current segment
based on bandwidth settings, abort current segment if needed.

- when switching, pause new fetcher after the first 47K chunk,
and go back to resume old fethcer to stop point immediately.

- when old fetcher reaches stop point, swap packet sources and
resume new fetcher.

- mark switching as done as soon as old fecther reaches stop
point. This allows us to resume bandwidth monitoring earlier,
and do subsequent switches sooner.

bug: 19567254
Change-Id: Iba4b5fb9b06541bb1e49592536648f5d4cbc69ab
ttplive/LiveSession.cpp
ttplive/LiveSession.h
ttplive/PlaylistFetcher.cpp
ttplive/PlaylistFetcher.h
peg2ts/ATSParser.h
peg2ts/AnotherPacketSource.cpp
peg2ts/AnotherPacketSource.h
c8db9712d9abe9b0d74193ea7d7cff428e32e62c 10-Mar-2015 Wei Jia <wjia@google.com> MediaSync: support MediaSync in native code.

Bug: 19666434
Change-Id: Ib6678153f43f5063bdaaf53dd8ad5e8d26434e1e
ndroid.mk
ediaClock.cpp
ediaSync.cpp
17c39e708ed657b8fa66f8acce5128e51696915c 20-Mar-2015 Marco Nelissen <marcone@google.com> ulaw and alaw aren't limited to 8kHz

Bug: https://code.google.com/p/android/issues/detail?id=158490
Change-Id: Ib30e156c99a997db861bb85e17244a5effdd55cf
Codec.cpp
MXCodec.cpp
odecs/g711/dec/SoftG711.cpp
odecs/g711/dec/SoftG711.h
ata/media_codecs_google_audio.xml
538b6d22a3578c0201d48f8548289aa254d81484 17-Mar-2015 Chong Zhang <chz@google.com> HLS: bandwidth estimator changes

- separate bandwidth estimator from HTTPBase, so that we have
better control on which samples to use, it also allows bandiwdth
history across multiple HTTPBase objects (which we'll use later).

- use min buffer duration among the streams to decide whether to
download next segment.

- maintain constant buffer level, time next download to happen
when buffer just goes below kMinBufferedDurationUs.

bug: 19567254

Change-Id: I5c481ad1f7ff3f084d57ec68856e12ae6b40ce41
ttplive/LiveSession.cpp
ttplive/LiveSession.h
ttplive/PlaylistFetcher.cpp
4604458dfe57b0e91a464aefafea50ae7b9876c1 17-Mar-2015 Chong Zhang <chz@google.com> Fix 64-bit build break caused by print type

Change-Id: I2239d875420f6926918c1a0dcab31b71c8329d1f
ttplive/LiveSession.cpp
ttplive/PlaylistFetcher.h
17c9985894e6b8f148245bd3c72fec33e09c2c6a 17-Mar-2015 Chong Zhang <chz@google.com> Merge "HLS: some fixes for seek with discontinuity."
c4547ba77f78632172db3647a09659d9863d3b5c 06-Mar-2015 Chong Zhang <chz@google.com> HLS: some fixes for seek with discontinuity.

- keep old fetcher when seeking, unless the URI is changing.

- when restarting after a seek, check discontinuity seq, and
queue format change if it's changed.

- add a simple kill switch to abort when stop (or pause for seek).

- when seeking, if searching for start time goes into 2nd segment,
do not signal time discontinuity or reset first PTS.

- use setFormat() to set format in AnotherPacketSource, otherwise
video/audio flags are not updated and format are not cleared on
discontinuities.

- do not start queueing video access unit until first IDR after start

bug: 19656539

Change-Id: I79108d26964f59ea00d2eeac8f5f9318747f8541
ttplive/LiveSession.cpp
ttplive/M3UParser.cpp
ttplive/M3UParser.h
ttplive/PlaylistFetcher.cpp
ttplive/PlaylistFetcher.h
peg2ts/AnotherPacketSource.cpp
14bcacaed718a506f59e8f3af66e9e0137789da6 16-Mar-2015 Ronghua Wu <ronghuawu@google.com> libstagefright: add ProcessInfo to get process priority.

Bug: 19620911
Change-Id: I240b814b8925b1d6266e6f998a7debd654a2145a
ndroid.mk
rocessInfo.cpp
eb0ee0e842d3b8294aa6c0b797eaf7aff3fd2f89 16-Mar-2015 Ronghua Wu <ronghuawu@google.com> Merge "libstagefright: handle MediaFormat "priority" key."
e5909807588053e610952479f47ebae10230197a 16-Mar-2015 Dan Stoza <stoza@google.com> Merge "libstagefright: Stop using IGBC::BufferItem"
d2c8413d26c9c24d7c6458dfd1fd273b73d968d9 13-Mar-2015 Chong Zhang <chz@google.com> avc_util: fix aspect_ratio_idc 14~16

bug: 19702519
Change-Id: I00772fe70be27f6a6a051fc0d18ebca64bbac43e
vc_utils.cpp
8ed8ceda7cfe29e8417142ef460cd70060204459 12-Mar-2015 Dan Stoza <stoza@google.com> libstagefright: Stop using IGBC::BufferItem

Switches all uses of IGraphicBufferConsumer::BufferItem (and
BufferQueue::BufferItem) to the BufferItem in libgui. Depends on
frameworks/native I699ed0a6837076867ca756b28d1ffb2238f7a0d9. This
is a member of I187b3a7d05196b6289596afac8fb9a9d4aebff76, but since
it was split out from the camera change in frameworks/av, they have
to have different change IDs.

Change-Id: I0ddd38df37500cfd6b21d1e768ed14e39c5cd9fc
urfaceMediaSource.cpp
ilters/GraphicBufferListener.cpp
ilters/GraphicBufferListener.h
ilters/MediaFilter.cpp
mx/GraphicBufferSource.cpp
mx/GraphicBufferSource.h
5c9054bc6efc080b265e028f2ebb1abd2a2e3953 12-Mar-2015 Chih-Hung Hsieh <chh@google.com> Fix print format error.

Change-Id: Ie3b754e22a4f858a35159abc8eaf00aa4949ab24
peg2ts/ATSParser.cpp
8b806ea894ca098366629458bfdd1df4866afcdf 10-Mar-2015 Ronghua Wu <ronghuawu@google.com> libstagefright: handle MediaFormat "priority" key.

Bug: 19620911
Change-Id: I73675c7cc3d742b9a1a98d6c0f48dcf17557e2ad
Codec.cpp
0911783d3cd2a14bb0fb0b1839c2b85a8e5e2649 11-Mar-2015 Chong Zhang <chz@google.com> Merge "ATSParser: handle PID change"
98d53011c390ab0c3cb8d5d9e47251876174d5d4 11-Mar-2015 Chong Zhang <chz@google.com> Merge "HLS: misc changes in LiveSession buffering logic"
964adb17885185808398507d2de88665fe193ee2 02-Mar-2015 Chong Zhang <chz@google.com> HLS: misc changes in LiveSession buffering logic

remove unnecessary time discontinuity

move fetcher to separate looper so that download won't
block LiveSession

poll buffering at 1 sec interval in LiveSession, and
switch bandwidth if necessary

use fixed 100ms threshold for resumeUntil

bug: 19567254
Change-Id: I911e5041364f0858b43f2312756e173db5870a1e
ttplive/LiveSession.cpp
ttplive/LiveSession.h
ttplive/PlaylistFetcher.cpp
ttplive/PlaylistFetcher.h
3f27436a9346f043f52265da1e6a74cde2bffd4d 05-Mar-2015 Lajos Molnar <lajos@google.com> stagefright: don't use ALooperRoster mutex for reply handling

Change replyID-s from uint32_t to an object
Move reply handling into the loopers (to reuse a common mutex)

Bug: 19607784
Change-Id: Iaa035b846c424c5687ed17ce1079b325e86c54be
ediaCodec.cpp
ediaCodecSource.cpp
oundation/ALooper.cpp
oundation/ALooperRoster.cpp
oundation/AMessage.cpp
ttplive/LiveSession.cpp
ttplive/LiveSession.h
ifi-display/source/MediaPuller.cpp
ifi-display/source/WifiDisplaySource.cpp
ifi-display/source/WifiDisplaySource.h
1c2a7a6391a5465cb5b059bb004fbbc884ce1a29 10-Mar-2015 Wei Jia <wjia@google.com> Merge "mediaplayer: move MediaClock from NuPlayer to libstagefright."
0ad38cd9674f2f7180d3310820d7dd2820159320 10-Mar-2015 Chong Zhang <chz@google.com> Merge "do not do bandwidth estimation if total data downloaded is too small"
5833b6aad2c46ba516bdc8262f4fc4667e8018ed 10-Mar-2015 Wei Jia <wjia@google.com> mediaplayer: move MediaClock from NuPlayer to libstagefright.

Bug: 19666434
Change-Id: I86865e594226419bbbbee217098f96434e43afbe
ndroid.mk
ediaClock.cpp
64c4e0264a5fb1bf4700b85668d0fb50146f28e9 09-Mar-2015 Chong Zhang <chz@google.com> Merge "AnotherPacketSource: return format of first non-discontinuity packet"
5bb7e181d9156135e56ce44a3d0bd42eb31a9ee8 09-Mar-2015 Chong Zhang <chz@google.com> AnotherPacketSource: return format of first non-discontinuity packet

bug: 19656539
Change-Id: I41a36a48274616c3a65a79bf8446eeadb5595915
peg2ts/AnotherPacketSource.cpp
434a6094f69542257864b4f4223ce915c77976b1 08-Mar-2015 Chong Zhang <chz@google.com> SoftAAC2: reset EOS status after a flush

bug:19656539
Change-Id: I27f41d885f4fd5bb5a0e29510f808fb84a0f75f3
odecs/aacdec/SoftAAC2.cpp
9bcf3ae6c9a413afc7accb5b48db3e5c3c829785 08-Mar-2015 Chong Zhang <chz@google.com> ATSParser: handle PID change

also use original 33bit PTS on first frame, only do wrap around
starting from second frame.

bug: 19656539

Change-Id: I3733e0f60fe4b9275bef4aef819777852c112710
peg2ts/ATSParser.cpp
358e71747a4707f9429b8565a05482c1f68d0ed3 09-Mar-2015 Chong Zhang <chz@google.com> do not do bandwidth estimation if total data downloaded is too small

bug: 19656539

Change-Id: I0ab9baad31e8953224a37d5aaf816e44780191c0
TTPBase.cpp
fa8b4792228083a4c95e8bd1c28690d44bb48bd6 05-Mar-2015 Lajos Molnar <lajos@google.com> stagefright: remove AMessage methods using id()

Bug: 19607784
Change-Id: I4b2ca396fb50cde5e7dc9801add69037febe698d
oundation/ALooperRoster.cpp
oundation/AMessage.cpp
1d15ab58bf8239069ef343de6cb21aabf3ef7d78 05-Mar-2015 Lajos Molnar <lajos@google.com> media: switch to new AMessage handling

Bug: 19607784
Change-Id: I94cddcb81f671422ad4982a23dc4acfe57a9f1aa
Codec.cpp
PEG2TSWriter.cpp
ediaCodec.cpp
ediaCodecSource.cpp
uCachedSource2.cpp
ilters/MediaFilter.cpp
ttplive/LiveSession.cpp
ttplive/PlaylistFetcher.cpp
mx/GraphicBufferSource.cpp
mx/SimpleSoftOMXComponent.cpp
tsp/ARTPConnection.cpp
tsp/ARTPSession.cpp
tsp/ARTPWriter.cpp
tsp/ARTSPConnection.cpp
tsp/MyHandler.h
tsp/MyTransmitter.h
tsp/SDPLoader.cpp
tsp/UDPPusher.cpp
imedtext/TimedTextPlayer.cpp
ifi-display/MediaSender.cpp
ifi-display/rtp/RTPSender.cpp
ifi-display/source/Converter.cpp
ifi-display/source/MediaPuller.cpp
ifi-display/source/PlaybackSession.cpp
ifi-display/source/RepeaterSource.cpp
ifi-display/source/WifiDisplaySource.cpp
5804a76ac5f9f3c311f1bbbcc5ebdc8f8568ae14 05-Mar-2015 Lajos Molnar <lajos@google.com> stagefright: use handler instead of handler-id in AMessage

This avoids locking gLooperRoster mutex on post() and deliver().

Bug: 19607784
Change-Id: If6d9d7884dbb08fc390983bda896d223803476ba
oundation/AHandler.cpp
oundation/ALooper.cpp
oundation/ALooperRoster.cpp
oundation/AMessage.cpp
74b19286cfeb952adf4711ef4a3e18a1ea9ff03f 04-Mar-2015 Chong Zhang <chz@google.com> Merge "SoftAAC2: calculate timestamp from aacSampleRate"
0e225c442d8603afb55dc2567a7144ccb675b01e 04-Mar-2015 Chong Zhang <chz@google.com> SoftAAC2: calculate timestamp from aacSampleRate

bug: 19602975
Change-Id: Ie2e5a61d627980762080c4a8701b578143d123fa
odecs/aacdec/SoftAAC2.cpp
32580ec89077947274bd161b379ab0410838dd8e 04-Mar-2015 Ying Wang <wangying@google.com> Remove manta support in MNC.

Bug: 19548232
Change-Id: I5fd341c7cf55792c4b2c9a4928f1ad21308c4469
mx/Android.mk
c33752349705068728b9b6e0cf5ac8f8252947ae 04-Mar-2015 Chong Zhang <chz@google.com> Merge "handle mpeg2ts PTS wraparound"
799c9682b3776a55d234396aee4a302437150c26 03-Mar-2015 Chong Zhang <chz@google.com> handle mpeg2ts PTS wraparound

bug: 19587682
Change-Id: I805ed6aa330bda3dc0ec8bd3519fb1ffeaa81ca9
peg2ts/ATSParser.cpp
d7e1d08c2ac21cdd2f3b7f83fec7094f6a98fc08 03-Mar-2015 Rachad <rachad@google.com> YUVImage.cpp: Fix hidden overflow error in YUV to RGB conversion

Bug: 19573730
Change-Id: I4a233d9dd49fc590df33258b6a288ad058f11f73
uv/YUVImage.cpp
7c4820d23b68f748b8dfff3d4bb5b13e9d4811a8 24-Feb-2015 Chong Zhang <chz@google.com> MPEG4Writer: add software version to mp4 meta

and account for meta data and geo data when estimating moov size

bug: 19460202

Change-Id: I094d15f47dda5e41217181cdb3ac519c00330de5
PEG4Writer.cpp
e76dba7af9589d9ed7b116eec3a74168a8352925 19-Feb-2015 Chong Zhang <chz@google.com> MPEG4Writer: add capture fps in meta data

bug: 19460202

Change-Id: I3a6ea3a5149d124ca9a2487a300dcc2db4405d0f
PEG4Writer.cpp
07aed75a681793474487e7e5e100d21c2f31de9c 20-Feb-2015 Dan Albert <danalbert@google.com> am 76b54aa5: am 340cebda: Fix mismatched type tag clang warning.

* commit '76b54aa5240ee2052aabe7b671965a0836159fdb':
Fix mismatched type tag clang warning.
340cebdaa2875ba2ab9725b81218ebc59d84164b 20-Feb-2015 Dan Albert <danalbert@google.com> Fix mismatched type tag clang warning.

Parcel is a struct, not a class. However, Parcel isn't used in this
file, so just kill it.

Change-Id: I575cae8b3c5dd13dd9b03fccfe7423e1f17f62f5
ttplive/LiveSession.h
9d19e392f61de3e8cd365afa12d7836bd3721602 20-Feb-2015 Bill Yi <byi@google.com> am 935b4750: am 011734f0: Fix clang build error

* commit '935b47504411b6ac69f708ba698a72b7282aada1':
Fix clang build error
011734f0ce7e8b2e3066f90ef51c323ee7d4dea2 20-Feb-2015 Bill Yi <byi@google.com> Fix clang build error

Change-Id: I294903dcf3ce3aa6a3b2f50364067e701a33d327
mx/OMXNodeInstance.cpp
1f9b6745d7c88dac2bfd19d583c3d98b361f67b3 19-Feb-2015 Bill Yi <byi@google.com> Merge commit '56fbb4d7bcb34af71a08cd126891afafdec217f1' into HEAD
4fe86290794e593159c0798cb86efdf99df098d3 19-Feb-2015 Marco Nelissen <marcone@google.com> am cf09e292: am 2d9ded1d: am d607e5a5: Merge "Fixes for GSM decoder"

* commit 'cf09e2926e3f76ac54a6efb6626a7eb256d2aaff':
Fixes for GSM decoder
cf09e2926e3f76ac54a6efb6626a7eb256d2aaff 19-Feb-2015 Marco Nelissen <marcone@google.com> am 2d9ded1d: am d607e5a5: Merge "Fixes for GSM decoder"

* commit '2d9ded1d03653c747ba173f622e19ed6d56f26f4':
Fixes for GSM decoder
cafe4d8511d4e8185d177b367c1f0b764f9a1789 19-Feb-2015 Marco Nelissen <marcone@google.com> Fixes for GSM decoder

Use larger buffer size, since otherwise it won't work with MediaExtractor
which batches up GSM frames.
Support reset and flush.

Change-Id: I3a87e3744c088f7a40bbc428187fc44c073c63ec
odecs/gsm/dec/SoftGSM.cpp
odecs/gsm/dec/SoftGSM.h
1fb8290c1f99e1db96b681e6eaae0193ea81674e 19-Feb-2015 Marco Nelissen <marcone@google.com> am a7c1df10: am a963dacc: am 64753517: Merge "Add dumpsys info"

* commit 'a7c1df10d39a8056ca755ccd77b06816c6de3225':
Add dumpsys info
a7c1df10d39a8056ca755ccd77b06816c6de3225 18-Feb-2015 Marco Nelissen <marcone@google.com> am a963dacc: am 64753517: Merge "Add dumpsys info"

* commit 'a963dacc1b44ec80742c86ce75611eb9cfa936ea':
Add dumpsys info
f09611f2f33752afc28141e1bbaa897651c05d6f 13-Feb-2015 Marco Nelissen <marcone@google.com> Add dumpsys info

Print a list of looper-handler pairs and the number of messages
they've processed, and optionally break those stats out by
message type.

Change-Id: I68ce4a7003152d5c9b5cb3f42e6f3949b471aa6e
oundation/ALooperRoster.cpp
2441f2b68ab2b141b2b0c1652173693de8a2cb04 13-Feb-2015 Chong Zhang <chz@google.com> Merge "stagefright: stop reading meta data after MDAT or MOOF"
928da1e9631bc7f5a5484c4668646c161515aee6 13-Feb-2015 Chong Zhang <chz@google.com> stagefright: stop reading meta data after MDAT or MOOF

bug: 18520722

Change-Id: I213e4bde92a7830543c1815b324164b27d853049
PEG4Extractor.cpp
nclude/MPEG4Extractor.h
37b2b389139ed638831e49708c947863eef631ef 27-Jan-2015 Ronghua Wu <ronghuawu@google.com> stagefright: add support for limiting framerate in GraphicBufferSource

Bug: 19014096
Change-Id: I6de781e4d140a247dfd8fd8f12c3ddd7baa39ad4
Codec.cpp
mx/Android.mk
mx/FrameDropper.cpp
mx/FrameDropper.h
mx/GraphicBufferSource.cpp
mx/GraphicBufferSource.h
mx/OMXNodeInstance.cpp
mx/tests/Android.mk
mx/tests/FrameDropper_test.cpp
e2cce8139fb5a205170d4e878cc9fea5493755d1 12-Feb-2015 Chong Zhang <chz@google.com> Merge "process all SEI messages for CC extraction"
78acc89eae9789366b6384707861f4563addf2d3 07-Feb-2015 Chong Zhang <chz@google.com> process all SEI messages for CC extraction

bug: 19297083
Change-Id: I5b89e35cc2bd5fb2f332872941e7978f15a6f403
nclude/avc_utils.h
peg2ts/ESQueue.cpp
56fbb4d7bcb34af71a08cd126891afafdec217f1 11-Feb-2015 Lajos Molnar <lajos@google.com> am 5f136027: am faefd08b: Revert "DO NOT MERGE: stagefright: add support for Intel\'s YUV420SP format in SoftwareRenderer"

* commit '5f13602782e10b331b962bd94f7d8eb3d73c772e':
Revert "DO NOT MERGE: stagefright: add support for Intel's YUV420SP format in SoftwareRenderer"
faefd08b11d1f4955b5da6c10e1a9be1a5cbefad 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
olorconversion/SoftwareRenderer.cpp
c17943863c068bf370b713873f185f027649704d 10-Feb-2015 Brian Carlstrom <bdc@google.com> Track change of IInterface::asBinder from instance method to static method

(cherry picked from commit 99c678fb5c159f67cd545d928267dcfdff12cdb4)

Change-Id: I517fa6b810f01ec5a4fb2bd295f16ed5cacf95ea
oundation/AWakeLock.cpp
49c9a53d098091791b0e6e2d97ce6bf0d562d17e 11-Feb-2015 Lajos Molnar <lajos@google.com> resolved conflicts for merge of 157defdd to master

Change-Id: I14fd8063fa052f16868b8053a211190092131317
99c678fb5c159f67cd545d928267dcfdff12cdb4 10-Feb-2015 Brian Carlstrom <bdc@google.com> Track change of IInterface::asBinder from instance method to static method

Change-Id: Iee262d4223ec3c61dab5ca8d9d7e4a14795da1c3
oundation/AWakeLock.cpp
157defdde7013062bbd04f7e873b6856adce14ca 10-Feb-2015 Lajos Molnar <lajos@google.com> am 4fc5d758: am 0c11f31b: Merge "nuplayer: acquire wakelock during offload pause timeout" into lmp-mr1-dev

* commit '4fc5d758d6722bedf341e5d93a0ba5698c658c29':
nuplayer: acquire wakelock during offload pause timeout
0c11f31b610534754f48b40d0a6ccdd311d43fcf 10-Feb-2015 Lajos Molnar <lajos@google.com> Merge "nuplayer: acquire wakelock during offload pause timeout" into lmp-mr1-dev
aafc11b3d8564b078e98007bb27a3a41b4f535ee 09-Feb-2015 Lajos Molnar <lajos@google.com> am 6d5a1afa: am 6d5a063d: am 0c11001c: Merge "stagefright: change licensing headers on h264dec omxdl sources" into lmp-mr1-dev

* commit '6d5a1afac2a7bca6b171261ca9b237c3a516e567':
stagefright: change licensing headers on h264dec omxdl sources
9026ea6d9891fdc9d6e39318b1f152671fc5502b 09-Feb-2015 Lajos Molnar <lajos@google.com> am 5421d5b2: am bff77217: am 17e95f40: stagefright: add media_codecs_google_video_le.xml

* commit '5421d5b23d2fcea6ba5573bf3490c65f97c2e730':
stagefright: add media_codecs_google_video_le.xml
2308d92b43fa97f25f27818b0dcfda3af7447f55 09-Feb-2015 Marco Nelissen <marcone@google.com> am a23eea5d: am 5dc38beb: am 41d3f579: Fix GSM WAV playback

* commit 'a23eea5d6160e2ebddb925f20becfc3c52639243':
Fix GSM WAV playback
6d5a1afac2a7bca6b171261ca9b237c3a516e567 07-Feb-2015 Lajos Molnar <lajos@google.com> am 6d5a063d: am 0c11001c: Merge "stagefright: change licensing headers on h264dec omxdl sources" into lmp-mr1-dev

* commit '6d5a063de358312e6d133f8937ffb1b795116129':
stagefright: change licensing headers on h264dec omxdl sources
0c11001c58526cddc7f6135982f456fff6e34aeb 07-Feb-2015 Lajos Molnar <lajos@google.com> Merge "stagefright: change licensing headers on h264dec omxdl sources" into lmp-mr1-dev
5421d5b23d2fcea6ba5573bf3490c65f97c2e730 07-Feb-2015 Lajos Molnar <lajos@google.com> am bff77217: am 17e95f40: stagefright: add media_codecs_google_video_le.xml

* commit 'bff7721722138b652e9a8f38e9d36a0ea12c38f1':
stagefright: add media_codecs_google_video_le.xml
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
oundation/AWakeLock.cpp
oundation/Android.mk
a23eea5d6160e2ebddb925f20becfc3c52639243 07-Feb-2015 Marco Nelissen <marcone@google.com> am 5dc38beb: am 41d3f579: Fix GSM WAV playback

* commit '5dc38bebd45edbcc17b2f5cf3c3b2929b5842f3c':
Fix GSM WAV playback
a1d50ea76418a9effbb341a82f5df6f77efbfec4 07-Feb-2015 Lajos Molnar <lajos@google.com> am bdb1112d: am 35395ea6: DO NOT MERGE: stagefright: add support for Intel\'s YUV420SP format in SoftwareRenderer

* commit 'bdb1112d2c9a818d34094e58c74055131fc27f45':
DO NOT MERGE: stagefright: add support for Intel's YUV420SP format in SoftwareRenderer
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
ata/media_codecs_google_video_le.xml
41d3f579d2c166984958263533284209b90c87d5 06-Feb-2015 Marco Nelissen <marcone@google.com> Fix GSM WAV playback

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

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

* commit 'bb7ea7fd0e8738043a13c7c25178e2acc54796cc':
allow HLS streams with CLOSED-CAPTIONS tag to play
bb7ea7fd0e8738043a13c7c25178e2acc54796cc 06-Feb-2015 Chong Zhang <chz@google.com> am 29eb8045: am 99cef1ef: allow HLS streams with CLOSED-CAPTIONS tag to play

* commit '29eb804501a993ecdd4d1073240f2998264508ff':
allow HLS streams with CLOSED-CAPTIONS tag to play
3f9b0cc8c71ce6064bf2ed5c3ab5b48e74937385 06-Feb-2015 Lajos Molnar <lajos@google.com> resolved conflicts for merge of ca509506 to master

Change-Id: I93a81bf167407307f209cf46249a8d65d26589f3
eac728dcf35de0f74f46c9b65bde43ab6361c176 06-Feb-2015 Lajos Molnar <lajos@google.com> am 2b0fc07a: am c5a6db8d: am 5a52a060: stagefright: set consumer usage flags and desribe YV12 HAL format

* commit '2b0fc07a5f87d15ef9ccb7f682a811bf7121c636':
stagefright: set consumer usage flags and desribe YV12 HAL format
5549bb5b651db8465ac846b3490eee9378253a76 06-Feb-2015 Lajos Molnar <lajos@google.com> am e5760862: am bcd22f0f: am 0662f5b0: Merge "stagefright: add fallback for native flex-YUV support" into lmp-mr1-dev

* commit 'e576086224f6e630159eaeec59ab5146c8533dc7':
stagefright: add fallback for native flex-YUV support
99cef1ef1cf1232966fabf3793ce7964c01474d7 06-Feb-2015 Chong Zhang <chz@google.com> allow HLS streams with CLOSED-CAPTIONS tag to play

bug: 19284568
Change-Id: I2ccf1c5952c13d1332b6a91f967af0bd3ee67451
ttplive/M3UParser.cpp
ca50950615848b02bee9ab5f2463ede6cc016bf0 06-Feb-2015 Lajos Molnar <lajos@google.com> am 696cfefd: am 9578a90c: stagefright: add software renderer support to OMX_COLOR_YUV420SemiPlanar

* commit '696cfefd49335fef13414d52daa95544298359e5':
stagefright: add software renderer support to OMX_COLOR_YUV420SemiPlanar
2b0fc07a5f87d15ef9ccb7f682a811bf7121c636 06-Feb-2015 Lajos Molnar <lajos@google.com> am c5a6db8d: am 5a52a060: stagefright: set consumer usage flags and desribe YV12 HAL format

* commit 'c5a6db8de459f25c72b0ca7b55942ddd4f90b1a8':
stagefright: set consumer usage flags and desribe YV12 HAL format
e576086224f6e630159eaeec59ab5146c8533dc7 06-Feb-2015 Lajos Molnar <lajos@google.com> am bcd22f0f: am 0662f5b0: Merge "stagefright: add fallback for native flex-YUV support" into lmp-mr1-dev

* commit 'bcd22f0f3a4cd5f78e03af23aafadb2d1aec6794':
stagefright: add fallback for native flex-YUV support
9578a90c214e430334b8696999f921290c35d067 05-Feb-2015 Lajos Molnar <lajos@google.com> stagefright: add software renderer support to OMX_COLOR_YUV420SemiPlanar

Bug: 19179927
Change-Id: I3accaa655e9bad2b0efcac98c5dd95a23f8d6671
olorconversion/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
Codec.cpp
olorconversion/SoftwareRenderer.cpp
9fdb3bd42af0876a9b76bae42d7aba2287b53af4 05-Feb-2015 Vignesh Venkatasubramanian <vigneshv@google.com> Merge "opus: Support for > 2 channels"
0662f5b0c43fcfdf055704d02ea41202c9b6094a 04-Feb-2015 Lajos Molnar <lajos@google.com> Merge "stagefright: add fallback for native flex-YUV support" into lmp-mr1-dev
c42ab4fcd42875ef74f8e9b8d8150f7bcfd0cd3b 04-Feb-2015 Robert Shih <robertshih@google.com> am 7dbbc7ec: am a291dabc: am 6fbcf633: Merge "httplive: Set start time and segment start time in conjunction." into lmp-mr1-dev

* commit '7dbbc7ec95c3040668388162a0ffbc45b68af6f1':
httplive: Set start time and segment start time in conjunction.
7dbbc7ec95c3040668388162a0ffbc45b68af6f1 04-Feb-2015 Robert Shih <robertshih@google.com> am a291dabc: am 6fbcf633: Merge "httplive: Set start time and segment start time in conjunction." into lmp-mr1-dev

* commit 'a291dabcab10cafc1749d1d9493d269049502256':
httplive: Set start time and segment start time in conjunction.
6fbcf6331abfbbc935bf89332f84303733e578b2 04-Feb-2015 Robert Shih <robertshih@google.com> Merge "httplive: Set start time and segment start time in conjunction." into lmp-mr1-dev
d6ad19fef4d5230f1003a3adc756d30b9338cdcf 04-Feb-2015 Lajos Molnar <lajos@google.com> am 3b5d1195: am 7b66f713: am 57f75272: Merge "stagefright: add support for native flex-YUV formats" into lmp-mr1-dev

* commit '3b5d119522bdf9c23be622be395d7a95d465616e':
stagefright: add support for native flex-YUV formats
3b5d119522bdf9c23be622be395d7a95d465616e 04-Feb-2015 Lajos Molnar <lajos@google.com> am 7b66f713: am 57f75272: Merge "stagefright: add support for native flex-YUV formats" into lmp-mr1-dev

* commit '7b66f713fc53ee81453763788c02f3c741d19520':
stagefright: add support for native flex-YUV formats
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
Codec.cpp
ediaCodec.cpp
0a08a1e0dd576f0682cf7d665fe940bc26af52d7 04-Feb-2015 Elliott Hughes <enh@google.com> am e91c3dd0: am 6a025acb: am ec0472ba: Merge "Move AString\'s StringPrintf out of the way."

* commit 'e91c3dd028c6cf551e905c5d2cfb5d1fc0c8bcb7':
Move AString's StringPrintf out of the way.
e91c3dd028c6cf551e905c5d2cfb5d1fc0c8bcb7 04-Feb-2015 Elliott Hughes <enh@google.com> am 6a025acb: am ec0472ba: Merge "Move AString\'s StringPrintf out of the way."

* commit '6a025acb630a3ac4a84715d188aeb48f1946bc3f':
Move AString's StringPrintf out of the way.
a1e8944a21e5833b7aadc451776f11797f5f9273 04-Feb-2015 Elliott Hughes <enh@google.com> Move AString's StringPrintf out of the way.

We should come back and replace AString with std::string and switch to the
"real" StringPrintf family, but this fixes the ODR violation that was
preventing us from booting.

Bug: 19265750
Change-Id: I798eb9ca5dd634e44625af5e583439ef9f0cdc35
ediaCodec.cpp
oundation/AMessage.cpp
oundation/ANetworkSession.cpp
oundation/AString.cpp
ttplive/LiveSession.cpp
tsp/ARTPWriter.cpp
tsp/ARTSPConnection.cpp
tsp/MyHandler.h
imedtext/test/TimedTextSRTSource_test.cpp
ifi-display/VideoFormats.cpp
ifi-display/source/TSPacketizer.cpp
ifi-display/source/WifiDisplaySource.cpp
afcc4fcbb3a094ec2221d6e523772e76894d1f00 04-Feb-2015 Robert Shih <robertshih@google.com> httplive: Set start time and segment start time in conjunction.

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

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

Bug: 18821145
Change-Id: I14cf1186d0daf517a24e8423c3a708b4c9ba06c4
ttplive/LiveSession.cpp
ttplive/PlaylistFetcher.cpp
c9fcfb923bb891d980238d47f33fdf488f758dc2 04-Feb-2015 Chong Zhang <chz@google.com> am 07840f75: am 3a7ed550: am efbb6195: NuPlayer: pause playback when buffering is low

* commit '07840f7544de883fe5c00cbd18bc6458a20e2691':
NuPlayer: pause playback when buffering is low
0d09182a1dde960f7acda1c28469e5deead1b996 30-Jan-2015 Lajos Molnar <lajos@google.com> stagefright: add support for native flex-YUV formats

Bug: 17906609
Change-Id: I14116796eaa94aa8ae62dcc29f67cb7d2c060d34
Codec.cpp
MXCodec.cpp
07840f7544de883fe5c00cbd18bc6458a20e2691 04-Feb-2015 Chong Zhang <chz@google.com> am 3a7ed550: am efbb6195: NuPlayer: pause playback when buffering is low

* commit '3a7ed550579b5ecd99439c44ce13a48b3f0639ae':
NuPlayer: pause playback when buffering is low
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
uCachedSource2.cpp
8517576f7ee1fcb72655b91ff18390a514858cf3 02-Feb-2015 Rachad <rachad@google.com> am 3097dafa: am 0d8e85f9: am 77f877f8: Merge "Acodec: reset sideband handle for all non tunneled mode video playback" into lmp-mr1-dev

* commit '3097dafa3ee60440c10b5bf9ed4d355fee1c1ae5':
Acodec: reset sideband handle for all non tunneled mode video playback
82a4ca039f600569726df0326269b4ac1a78fc6c 02-Feb-2015 Rachad <rachad@google.com> am a601b862: am c9e11696: am 36dca156: Merge "Acodec: Send framerate information to OMX decoder if available" into lmp-mr1-dev

* commit 'a601b86287ab5437a7e9aaf6f09bc171803cdc3d':
Acodec: Send framerate information to OMX decoder if available
5aa874ad77f366d93abe118b1edab1511ec04dec 02-Feb-2015 Robert Shih <robertshih@google.com> am f5a60185: am 9787254f: am 296a0d03: Merge "PlaylistFetcher: clear packet sources when adjusting starting sequence number" into lmp-mr1-dev

* commit 'f5a60185ec550d8447a44172027925550e6849d9':
PlaylistFetcher: clear packet sources when adjusting starting sequence number
aaefb9372fdd326a832354e5b926eea6da16ff9f 02-Feb-2015 Apurupa Pattapu <apurupa@codeaurora.org> am ff430c63: am e3ada5d5: am 678bcdc8: httplive: Defer switch down if a switch is in progress

* commit 'ff430c633e52f15acdd305953e6071b75f1e700c':
httplive: Defer switch down if a switch is in progress
3097dafa3ee60440c10b5bf9ed4d355fee1c1ae5 02-Feb-2015 Rachad <rachad@google.com> am 0d8e85f9: am 77f877f8: Merge "Acodec: reset sideband handle for all non tunneled mode video playback" into lmp-mr1-dev

* commit '0d8e85f929f0257a3af5ec743365b0140b5e75b4':
Acodec: reset sideband handle for all non tunneled mode video playback
a601b86287ab5437a7e9aaf6f09bc171803cdc3d 02-Feb-2015 Rachad <rachad@google.com> am c9e11696: am 36dca156: Merge "Acodec: Send framerate information to OMX decoder if available" into lmp-mr1-dev

* commit 'c9e11696c4f80e9803f7e65e29af962f199a574d':
Acodec: Send framerate information to OMX decoder if available
f5a60185ec550d8447a44172027925550e6849d9 02-Feb-2015 Robert Shih <robertshih@google.com> am 9787254f: am 296a0d03: Merge "PlaylistFetcher: clear packet sources when adjusting starting sequence number" into lmp-mr1-dev

* commit '9787254f1ef27e86390a31a7ef05d94ff2f65232':
PlaylistFetcher: clear packet sources when adjusting starting sequence number
ff430c633e52f15acdd305953e6071b75f1e700c 02-Feb-2015 Apurupa Pattapu <apurupa@codeaurora.org> am e3ada5d5: am 678bcdc8: httplive: Defer switch down if a switch is in progress

* commit 'e3ada5d580a32b0133ac3db881e1574af57cb4fc':
httplive: Defer switch down if a switch is in progress
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
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
Codec.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
ttplive/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
ttplive/PlaylistFetcher.cpp
e0360d0e86fed644e6cbe406de66d77d7ae9e697 30-Jan-2015 Elliott Hughes <enh@google.com> am 172f2578: am 3e7e574b: am 434c80e5: Merge "Add missing includes."

* commit '172f257811886a216bf528006fc8445cec9d5480':
Add missing includes.
172f257811886a216bf528006fc8445cec9d5480 30-Jan-2015 Elliott Hughes <enh@google.com> am 3e7e574b: am 434c80e5: Merge "Add missing includes."

* commit '3e7e574b682603dc7431fbfc377c2fb107d378f1':
Add missing includes.
3e255fa2dbe9d7b05818964ddc9f6ea6bf24ec14 30-Jan-2015 Elliott Hughes <enh@google.com> Add missing includes.

Change-Id: I54abc8fbf9d4d48f747b6aac2ce42c23c7568c25
odecs/on2/h264dec/source/H264SwDecApi.c
78b01639c08fe5e7e9c1be5e9dc5de560f1383f9 30-Jan-2015 Rachad <rachad@google.com> Acodec: Send framerate information to OMX decoder if available

Bug: 19110889
Change-Id: Ia8dbe1b77aaac421ec9415884e1248b9b68168dc
Codec.cpp
e7331bcb1482b26ddb8a90431fd6d700a5a80a01 29-Jan-2015 Leena Winterrowd <lenhardw@codeaurora.org> am 1eda9bfb: am ce25d85a: am a93fd2be: stagefright: httplive: Decouple block size from bandwidth estimate

* commit '1eda9bfba04043c380666ba1ee86fd285b8ffbca':
stagefright: httplive: Decouple block size from bandwidth estimate
f99b139cf60865f673175162488d3462fff54694 29-Jan-2015 Leena Winterrowd <lenhardw@codeaurora.org> am 00dfe843: am 0512881b: am 9aff25fb: stagefright: httplive: Reduce memcpy calls for chunked content

* commit '00dfe8432618c1d512557b2ed5910c44fc293948':
stagefright: httplive: Reduce memcpy calls for chunked content
2af6048454f6f6aa9a4d7ccf5fccdb3f8d47ac27 29-Jan-2015 Lajos Molnar <lajos@google.com> am 46246e5b: resolved conflicts for merge of 59d1d010 to lmp-mr1-dev-plus-aosp

* commit '46246e5b1725a8a1868dbd9f37fffe33c19672fc':
httplive: Dont resume if we have almost fetched till stop time
de3f8a1ed744eb89ae59b3fde9774a52802d2a4c 29-Jan-2015 Leena Winterrowd <lenhardw@codeaurora.org> am 9c8bce57: am 3606efd1: am 9dee2e59: stagefright: httplive: Propagate target duration to LiveSession

* commit '9c8bce57d37e36f473499f064e787e6ba7fed4ed':
stagefright: httplive: Propagate target duration to LiveSession
c4e498ad670d2b62238f038fd9e162e5ac6ff621 29-Jan-2015 Apurupa Pattapu <apurupa@codeaurora.org> am 980ca102: am b2f95a1f: am 2a66207f: httplive: Create a copy of last enqueued metadata

* commit '980ca102913dce40e213fe7c501f0adca615e146':
httplive: Create a copy of last enqueued metadata
70088b5f14a77154dccbf368099e30cb10b8ee69 29-Jan-2015 Leena Winterrowd <lenhardw@codeaurora.org> am a7a1df05: am 958a5432: am 17460976: stagefright: httplive: Fix deadlock for low duration clips

* commit 'a7a1df0589048a675759ebf44f9794b0c613f3fe':
stagefright: httplive: Fix deadlock for low duration clips
31a4b373689a91446d50885e7d79b54d6bbfb3dd 29-Jan-2015 Leena Winterrowd <lenhardw@codeaurora.org> am c1626c83: am 2899991e: am 5cf91c50: libstagefright: httplive: Add NULL check for empty playlist

* commit 'c1626c8352d0256baa195e5eb804e37c3fd05560':
libstagefright: httplive: Add NULL check for empty playlist
594d5d94c77b7c13a43f34db7d4e487e86ec6149 29-Jan-2015 Lajos Molnar <lajos@google.com> am ea5c0286: resolved conflicts for merge of 44a2390b to lmp-mr1-dev-plus-aosp

* commit 'ea5c0286e8a18e71608e6c6e5758b167fe0d6c26':
Revert "HLS: QCom enhancements"
f26334cf7d60060e0e33b037dd9504c81b2e10eb 29-Jan-2015 Elliott Hughes <enh@google.com> am 6a0fbc68: am a3c9d5c3: am 166776fb: Merge "Add missing includes."

* commit '6a0fbc68e203058e3b7d62e95d46f2415bc3ed95':
Add missing includes.
5ba2e2cbb6ae3d470bf3031507ea938be6066ed7 29-Jan-2015 Ronghua Wu <ronghuawu@google.com> am 2588b453: am 29e609a8: am 628d4ea1: Merge "stagefright: do not reject SPL5 files outright in SoftMpeg4 decoder" into lmp-mr1-dev

* commit '2588b453fc170f0691d5c503dab2285fef6976c2':
stagefright: do not reject SPL5 files outright in SoftMpeg4 decoder
1eda9bfba04043c380666ba1ee86fd285b8ffbca 29-Jan-2015 Leena Winterrowd <lenhardw@codeaurora.org> am ce25d85a: am a93fd2be: stagefright: httplive: Decouple block size from bandwidth estimate

* commit 'ce25d85ad22e6df4b861d17e9e67cb6d0e62c363':
stagefright: httplive: Decouple block size from bandwidth estimate
00dfe8432618c1d512557b2ed5910c44fc293948 29-Jan-2015 Leena Winterrowd <lenhardw@codeaurora.org> am 0512881b: am 9aff25fb: stagefright: httplive: Reduce memcpy calls for chunked content

* commit '0512881b08d03d10d6f164566c9a787d2f56ab6d':
stagefright: httplive: Reduce memcpy calls for chunked content
46246e5b1725a8a1868dbd9f37fffe33c19672fc 29-Jan-2015 Lajos Molnar <lajos@google.com> resolved conflicts for merge of 59d1d010 to lmp-mr1-dev-plus-aosp

Change-Id: I52e17685b3aa058d6c6b0c023659231fa00a8f71
9c8bce57d37e36f473499f064e787e6ba7fed4ed 29-Jan-2015 Leena Winterrowd <lenhardw@codeaurora.org> am 3606efd1: am 9dee2e59: stagefright: httplive: Propagate target duration to LiveSession

* commit '3606efd19a7dee847d3d4db41e8300ba7b451f81':
stagefright: httplive: Propagate target duration to LiveSession
980ca102913dce40e213fe7c501f0adca615e146 29-Jan-2015 Apurupa Pattapu <apurupa@codeaurora.org> am b2f95a1f: am 2a66207f: httplive: Create a copy of last enqueued metadata

* commit 'b2f95a1fa129ca0b5a1fdac64c203c2159b3947e':
httplive: Create a copy of last enqueued metadata
a7a1df0589048a675759ebf44f9794b0c613f3fe 29-Jan-2015 Leena Winterrowd <lenhardw@codeaurora.org> am 958a5432: am 17460976: stagefright: httplive: Fix deadlock for low duration clips

* commit '958a54322ea3ff2ad8ed0ac6e229c90c638f8a7f':
stagefright: httplive: Fix deadlock for low duration clips
c1626c8352d0256baa195e5eb804e37c3fd05560 29-Jan-2015 Leena Winterrowd <lenhardw@codeaurora.org> am 2899991e: am 5cf91c50: libstagefright: httplive: Add NULL check for empty playlist

* commit '2899991eb8ca8ebe5da7acd74e0b3bd9743a8724':
libstagefright: httplive: Add NULL check for empty playlist
ea5c0286e8a18e71608e6c6e5758b167fe0d6c26 29-Jan-2015 Lajos Molnar <lajos@google.com> resolved conflicts for merge of 44a2390b to lmp-mr1-dev-plus-aosp

Change-Id: I39fdc2e8895e1e943749b9a2628656a8fa5bb72b
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
TTPBase.cpp
ttplive/LiveSession.cpp
ttplive/LiveSession.h
ttplive/PlaylistFetcher.cpp
ttplive/PlaylistFetcher.h
nclude/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
ttplive/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
ttplive/PlaylistFetcher.cpp
peg2ts/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
ttplive/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
peg2ts/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
ttplive/LiveSession.cpp
ttplive/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
ttplive/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
TTPBase.cpp
ttplive/LiveSession.cpp
ttplive/LiveSession.h
ttplive/PlaylistFetcher.cpp
ttplive/PlaylistFetcher.h
nclude/HTTPBase.h
peg2ts/AnotherPacketSource.cpp
6a0fbc68e203058e3b7d62e95d46f2415bc3ed95 29-Jan-2015 Elliott Hughes <enh@google.com> am a3c9d5c3: am 166776fb: Merge "Add missing includes."

* commit 'a3c9d5c3982591042c7c6cb5fb7c32fbd4765832':
Add missing includes.
166776fbbeb74e28a736681a5edd355013b976ad 29-Jan-2015 Elliott Hughes <enh@google.com> Merge "Add missing includes."
9d014d04bd1e26b68ea979885ccbc6f131a7eda3 29-Jan-2015 Elliott Hughes <enh@google.com> Add missing includes.

Change-Id: Ib697ce44243e7cb07aee60944238e0854d82e9de
odecs/amrnb/dec/test/amrnbdec_test.cpp
2588b453fc170f0691d5c503dab2285fef6976c2 29-Jan-2015 Ronghua Wu <ronghuawu@google.com> am 29e609a8: am 628d4ea1: Merge "stagefright: do not reject SPL5 files outright in SoftMpeg4 decoder" into lmp-mr1-dev

* commit '29e609a8c61b7c02d57495b71a4f82e7eb053dd6':
stagefright: do not reject SPL5 files outright in SoftMpeg4 decoder
1338e177ad49369e83ff724ee8428b0b833d48d1 29-Jan-2015 Ronghua Wu <ronghuawu@google.com> stagefright: do not reject SPL5 files outright in SoftMpeg4 decoder

Bug:19013118
Change-Id: I58f63ae13559c93ea5e627b658c9919e86769076
odecs/m4v_h263/dec/src/vop.cpp
dee9d798a3434bde96852c60953cb531bf9fd18a 28-Jan-2015 Andreas Gampe <agampe@google.com> am 0566949e: am ba553472: am aeccbffd: Merge "Avoid mixing declarations and statements in C89 source files"

* commit '0566949e25bdd541e969af0b5ce1aca405666d5a':
Avoid mixing declarations and statements in C89 source files
0566949e25bdd541e969af0b5ce1aca405666d5a 28-Jan-2015 Andreas Gampe <agampe@google.com> am ba553472: am aeccbffd: Merge "Avoid mixing declarations and statements in C89 source files"

* commit 'ba553472948080e05c653c44ece1357946c6efcb':
Avoid mixing declarations and statements in C89 source files
aeccbffde62b717c96a5285448a4943b366bd586 28-Jan-2015 Andreas Gampe <agampe@google.com> Merge "Avoid mixing declarations and statements in C89 source files"
980b106908cb8e105bb8849749722c5088e2f6eb 28-Jan-2015 Marco Nelissen <marcone@google.com> resolved conflicts for merge of 9391844d to master

Change-Id: I348a71d1b3e3238bc3871a69454edc8247d03111
9391844deb3f6a442745cea62f78aca2cea19e50 27-Jan-2015 Marco Nelissen <marcone@google.com> resolved conflicts for merge of b955b722 to lmp-mr1-dev-plus-aosp

Change-Id: I385371869169eee4fe6330ffe0abc5eda4cb4f72
47deb15e99cbf60e558027e074b7415c95637943 27-Jan-2015 Marco Nelissen <marcone@google.com> Merge "Remove MediaPlayerService::decode()"
9b4b24a46f3f76ebb186df8bc01c58848af02108 27-Jan-2015 Vignesh Venkatasubramanian <vigneshv@google.com> opus: Support for > 2 channels

This CL adds support for Opus streams that have more than 2 channels. It also
fixes a bug where codec delay and seek preroll are not transferred during
metadata to message conversion.

Change-Id: Ia9748d4f7024368b2aa3c5cbd27f8016c859ea00
tils.cpp
odecs/opus/dec/SoftOpus.cpp
5c2be9eddba74a503c55808816aa37cc8ce18c50 26-Jan-2015 Kenny Root <kroot@google.com> am b7909adc: am 64b08d23: am cbb803a5: Merge "Remove superfluous OpenSSL include paths."

* commit 'b7909adcef247c627fbe8026624b9ecbeba47655':
Remove superfluous OpenSSL include paths.
b7909adcef247c627fbe8026624b9ecbeba47655 26-Jan-2015 Kenny Root <kroot@google.com> am 64b08d23: am cbb803a5: Merge "Remove superfluous OpenSSL include paths."

* commit '64b08d230c94872e014831bdb7b8a323c4b584ec':
Remove superfluous OpenSSL include paths.
b7848f1c442bc8c71020957948d1b003a62a25b7 04-Dec-2014 Marco Nelissen <marcone@google.com> Remove MediaPlayerService::decode()

and make SoundPool use MediaCodec for decoding files to PCM.

Bug: 18239054
Change-Id: Ia144fc1bbb0d2787638ee972e2224339b4965310
wesomePlayer.cpp
5ee088f7a73d3afa052dff21a64f2b582497ef70 23-Jan-2015 Robert Shih <robertshih@google.com> am 882ffba6: am d8aff827: am ddc1216d: Merge "MPEG4Extractor: more NULL derefernce fixes in parseChunk" into lmp-mr1-dev

* commit '882ffba6a98dbe97a07f094ce87d9b81b756971e':
MPEG4Extractor: more NULL derefernce fixes in parseChunk
do not use paused postition if it's not available
Use aligned width and height to compute size.
882ffba6a98dbe97a07f094ce87d9b81b756971e 23-Jan-2015 Robert Shih <robertshih@google.com> am d8aff827: am ddc1216d: Merge "MPEG4Extractor: more NULL derefernce fixes in parseChunk" into lmp-mr1-dev

* commit 'd8aff827c3c7d1396b624b1462c81e415ef3c160':
MPEG4Extractor: more NULL derefernce fixes in parseChunk
do not use paused postition if it's not available
Use aligned width and height to compute size.
0a953586cdc498a2df6f8562d6e2b9c39594738c 23-Jan-2015 Ronghua Wu <ronghuawu@google.com> am 40a0ac3a: am 0fe24de8: am c0c2366c: Merge "stagefright: do not reject SPL4 files outright in SoftMpeg4 decoder" into lmp-mr1-dev

* commit '40a0ac3aba5ff8fc44e51ba4f7b0bac3448818c9':
stagefright: do not reject SPL4 files outright in SoftMpeg4 decoder
c079c5db8057d0ab602841f47fef1b40faaeccb3 23-Jan-2015 Ronghua Wu <ronghuawu@google.com> am d9e8b820: am b3e1f71b: am 841d22b0: libstagefright: Use aligned width and height.

* commit 'd9e8b820116ee48237507da5ce0ffb29bc73350b':
libstagefright: Use aligned width and height.
ddc1216dcf8f9dc1a1340ed4bc6c6f28f29b1076 23-Jan-2015 Robert Shih <robertshih@google.com> Merge "MPEG4Extractor: more NULL derefernce fixes in parseChunk" into lmp-mr1-dev
40a0ac3aba5ff8fc44e51ba4f7b0bac3448818c9 23-Jan-2015 Ronghua Wu <ronghuawu@google.com> am 0fe24de8: am c0c2366c: Merge "stagefright: do not reject SPL4 files outright in SoftMpeg4 decoder" into lmp-mr1-dev

* commit '0fe24de8e5a077a8220542db282c06852aaff109':
stagefright: do not reject SPL4 files outright in SoftMpeg4 decoder
c0c2366c180e06f03cbd1c1a4020bdc26f1002f7 23-Jan-2015 Ronghua Wu <ronghuawu@google.com> Merge "stagefright: do not reject SPL4 files outright in SoftMpeg4 decoder" into lmp-mr1-dev
d9e8b820116ee48237507da5ce0ffb29bc73350b 23-Jan-2015 Ronghua Wu <ronghuawu@google.com> am b3e1f71b: am 841d22b0: libstagefright: Use aligned width and height.

* commit 'b3e1f71bbc154f35a5c0b113bb923ac9bf9d33dd':
libstagefright: Use aligned width and height.
683202e1d42d2642f7471272b4a3b5d64525a7bf 23-Jan-2015 Adam Langley <agl@google.com> Remove superfluous OpenSSL include paths.

The libcrypto and libssl modules (and their respective static and host
versions) use LOCAL_EXPORT_C_INCLUDE_DIRS thus just including the module
is sufficient.

Change-Id: If9df76e6fefb7419cbb2fb33a0264626c748561e
odecs/on2/enc/Android.mk
ttplive/Android.mk
tsp/Android.mk
841d22b0645ff48a03e7f500f95458f3d70a0a61 23-Jan-2015 Ronghua Wu <ronghuawu@google.com> libstagefright: Use aligned width and height.

Bug: 19014147
Change-Id: I33314b02448e436c43fcfad086b5edfa650dcf83
odecs/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
odecs/m4v_h263/dec/src/vop.cpp
b074c3ce4dd157b656e4e8c66bc228ee2a1be5db 22-Jan-2015 Marco Nelissen <marcone@google.com> Don't overwrite user agent header if app specified one

Bug: 19100078
https://code.google.com/p/android/issues/detail?id=103266

Change-Id: I321935a7e7a217328a5704c94e92f763c8742767
ttp/MediaHTTP.cpp
202fbed96db40ec5fb43d633fc97601a15a6dd7a 21-Jan-2015 Robert Shih <robertshih@google.com> MPEG4Extractor: more NULL derefernce fixes in parseChunk

Bug: 18771789
Change-Id: Ie0511ed3a885dbf64a7472e8fa74d15b0e87778d
PEG4Extractor.cpp
1509765f2262e4582cdcfdb064417884a3efa04c 15-Jan-2015 Marco Nelissen <marcone@google.com> am e680491e: am 1efe46de: Merge "Fix id3 parser crash"

* commit 'e680491ef752256d0d0d39fc77cd7495e580adea':
Fix id3 parser crash
ba6e982635f11bced34897f4317cbe8ff1c89483 15-Jan-2015 Marco Nelissen <marcone@google.com> Fix id3 parser crash

Bug: 18872896
Change-Id: I953f58f35a76590701234d5707e060499acfc069
d3/ID3.cpp
d488982887e24f4a8e61f68d945a2f113f43579e 15-Jan-2015 Marco Nelissen <marcone@google.com> Fix id3 parser crash

Bug: 18872896
Change-Id: I953f58f35a76590701234d5707e060499acfc069
d3/ID3.cpp
17c933cc07be9656aee8afc82dc866a67b3fd78e 14-Jan-2015 Marco Nelissen <marcone@google.com> am cec272df: am 724b9ea5: Merge "Replace MidiFile player with a Midi extractor"

* commit 'cec272dfe2cf6bf6cdb8a4afa5afdd0e910c915f':
Replace MidiFile player with a Midi extractor
724b9ea51db0c191cc3184319719a38b5a1f6502 14-Jan-2015 Marco Nelissen <marcone@google.com> Merge "Replace MidiFile player with a Midi extractor"
b60bf91d2b1b2e45166cbb1eff9499de8b1c1105 10-Jan-2015 Rachad <rachad@google.com> am 7e85361e: am 26c73acb: am 0b460ad7: Merge "ACodec: Added support for E-AC3 decoders" into lmp-mr1-dev

* commit '7e85361e364bf8f80ab43dd5feb0f584e481019e':
ACodec: Added support for E-AC3 decoders
8b5fa52002319b7c808cac468292af8527e2b858 10-Jan-2015 Lajos Molnar <lajos@google.com> am e6453027: am d8ba6ef1: am 38a97bd7: stagefright: keep alignment restrictions for SoftVideoDecoder

* commit 'e6453027baf4c79e95b31aa602b18621e3118423':
stagefright: keep alignment restrictions for SoftVideoDecoder
7e85361e364bf8f80ab43dd5feb0f584e481019e 10-Jan-2015 Rachad <rachad@google.com> am 26c73acb: am 0b460ad7: Merge "ACodec: Added support for E-AC3 decoders" into lmp-mr1-dev

* commit '26c73acb73b5af94cb27e5d285d1708d25eb6892':
ACodec: Added support for E-AC3 decoders
e6453027baf4c79e95b31aa602b18621e3118423 10-Jan-2015 Lajos Molnar <lajos@google.com> am d8ba6ef1: am 38a97bd7: stagefright: keep alignment restrictions for SoftVideoDecoder

* commit 'd8ba6ef11cb89672ee121ec7f4ee527446aa5dbf':
stagefright: keep alignment restrictions for SoftVideoDecoder
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
mx/SoftVideoDecoderOMXComponent.cpp
a2d2c48a7ca3331ee77421d776e9849651b488c1 09-Jan-2015 Marco Nelissen <marcone@google.com> Merge "Don't signal an error at the end of a short file"
5bc678de3c4386874b516e5cfae8ff9d5d7865ed 08-Jan-2015 Ronghua Wu <ronghuawu@google.com> am 9a9c9be1: am d18196a1: am c8c68c88: Merge "Use aligned width and height to compute size." into lmp-mr1-dev

* commit '9a9c9be1f8c1664253d11f8913a30998a2950521':
Use aligned width and height to compute size.
9a9c9be1f8c1664253d11f8913a30998a2950521 08-Jan-2015 Ronghua Wu <ronghuawu@google.com> am d18196a1: am c8c68c88: Merge "Use aligned width and height to compute size." into lmp-mr1-dev

* commit 'd18196a140ea8eee971508ca4a9fcc5f060fe94b':
Use aligned width and height to compute size.
c8c68c88c1f0eed0c647b0a9cdf1c402aecb2667 08-Jan-2015 Ronghua Wu <ronghuawu@google.com> Merge "Use aligned width and height to compute size." into lmp-mr1-dev
8840754c5bc44c7e11ed5e9acc15e9569f5814c5 08-Jan-2015 Marco Nelissen <marcone@google.com> resolved conflicts for merge of 2702d5a0 to lmp-mr1-dev-plus-aosp

Change-Id: Ic9841f0a66930f57a5ebea527c6a841d7c49cccf
0e8928bf4f2b01b783f6da97d15e8f1abb0fd7d7 08-Jan-2015 Marco Nelissen <marcone@google.com> Replace MidiFile player with a Midi extractor

This gets rids of a bunch of special midi handling and replaces it
with an extractor that works with NuPlayer and MediaMetadataRetriever.

Change-Id: I8d0f5bbdde2ca24267cf4d62ab26afe9630e0217
ndroid.mk
ataSource.cpp
ediaDefs.cpp
ediaExtractor.cpp
idiExtractor.cpp
tagefrightMediaScanner.cpp
nclude/MidiExtractor.h
bc11e713063f3f96f98256abc81c0d8ee1ddb312 08-Jan-2015 Marco Nelissen <marcone@google.com> Use callbacks for Midi I/O

Instead of having the Sonivox engine directly open the file and
use stdio to read from it, use caller-provided callbacks.

Change-Id: Ie55129109060a4a7862fee3177f994401e00b6c1
tagefrightMediaScanner.cpp
32479c9f7a004d2c1daeac015684529b0158f8a4 08-Jan-2015 Chong Zhang <chz@google.com> am 7993d6b3: am e0344754: am 468977f0: Merge "mark any copyrighted content as protected to disable capture" into lmp-mr1-dev

* commit '7993d6b343f2723872dac085756743630371454d':
mark any copyrighted content as protected to disable capture
7993d6b343f2723872dac085756743630371454d 08-Jan-2015 Chong Zhang <chz@google.com> am e0344754: am 468977f0: Merge "mark any copyrighted content as protected to disable capture" into lmp-mr1-dev

* commit 'e03447548d1c56fa9875cac7d500f1012a6b5c26':
mark any copyrighted content as protected to disable capture
468977f0fecaa983f712d9eacb80a73d3de807ae 08-Jan-2015 Chong Zhang <chz@google.com> Merge "mark any copyrighted content as protected to disable capture" into lmp-mr1-dev
1713460104b86f6be3a5d9993d9ace864d889b2d 08-Jan-2015 Chong Zhang <chz@google.com> mark any copyrighted content as protected to disable capture

bug: 18916274
Change-Id: I23f096b51433bf18a10dc5fe6dc6b75c3881c340
Codec.cpp
55dfeeb53fdd2e940d0b7c7e3661152ca51ed85e 07-Jan-2015 Ronghua Wu <ronghuawu@google.com> Use aligned width and height to compute size.

Bug: 18528130
Change-Id: I4d2304d8c8919c1cde60676848cfe2e4f2061a87
odecs/m4v_h263/dec/src/pvdec_api.cpp
197f84845ccea9319a1589b85edeb2dcf56b81b3 07-Jan-2015 Lajos Molnar <lajos@google.com> am 644afb88: am 9fc2f470: am 8140a2b7: stagefright: report crop rectangle as codec resolution if exists

* commit '644afb88421ac0e71d526f9b6726404a90c7cccd':
stagefright: report crop rectangle as codec resolution if exists
644afb88421ac0e71d526f9b6726404a90c7cccd 07-Jan-2015 Lajos Molnar <lajos@google.com> am 9fc2f470: am 8140a2b7: stagefright: report crop rectangle as codec resolution if exists

* commit '9fc2f470c3f350357366dc50620eba038326b02d':
stagefright: report crop rectangle as codec resolution if exists
8140a2b7ef0650e8cce6be16efcbfce56d0ed1e4 07-Jan-2015 Lajos Molnar <lajos@google.com> stagefright: report crop rectangle as codec resolution if exists

Bug: 18789054
Change-Id: I08b82a400541b5e09580801473c34ce56bfef5db
ediaCodec.cpp
7e7f3ce6b5e6cafc8187b4c62c3d78cd6064f421 05-Jan-2015 Narayan Kamath <narayan@google.com> am 991aa3a7: am bef17542: am 5c97c4e1: Merge "Remove hardcoded ICU & OpenSSL include paths."

* commit '991aa3a70b26c7d9c93361394a43a95355c1c26e':
Remove hardcoded ICU & OpenSSL include paths.
991aa3a70b26c7d9c93361394a43a95355c1c26e 05-Jan-2015 Narayan Kamath <narayan@google.com> am bef17542: am 5c97c4e1: Merge "Remove hardcoded ICU & OpenSSL include paths."

* commit 'bef17542c7e0563c6004463b1ede18a404a17c89':
Remove hardcoded ICU & OpenSSL include paths.
f84f7c527427b521fd833210c23008ae3a7c09b8 05-Jan-2015 Narayan Kamath <narayan@google.com> Remove hardcoded ICU & OpenSSL include paths.

They're exported using LOCAL_EXPORT_C_INCLUDE_DIRS.

bug: 18581021
Change-Id: I9593422b9eddb8203bee88d60e31a03b4a5f976b
ndroid.mk
f23c2bad9a588f52dbafea6d3f27bdd2f91db62e 29-Dec-2014 Martin Storsjo <martin@martin.st> Avoid mixing declarations and statements in C89 source files

Prior to adding the UNUSED macro, this file built just fine in C89
mode. Move the macro call to after the local variable declarations,
to avoid mixing declarations and statements (which isn't allowed
in C89 mode).

Change-Id: I09299a07103d47298a0086f7c639d2be696b19ce
odecs/aacenc/basic_op/oper_32b.c
5d0937c663a9c3a20ca981bedf0b75e7d110eb34 29-Dec-2014 Narayan Kamath <narayan@google.com> am 8564e13b: resolved conflicts for merge of 2efb9566 to lmp-mr1-dev-plus-aosp

* commit '8564e13b37d372da78bce08f34a3610795ae173c':
HLS: QCom enhancements
8564e13b37d372da78bce08f34a3610795ae173c 29-Dec-2014 Narayan Kamath <narayan@google.com> resolved conflicts for merge of 2efb9566 to lmp-mr1-dev-plus-aosp

Change-Id: I4313941f3561176ce9f6ab055678fb626e570107
d570fd0775c340bcde48c53b599081d7d1704455 27-Dec-2014 Martin Storsjo <martin@martin.st> Translate codec specific data for mp4v-es for MediaMuxer

The existing translations for H264 and AAC are written too broadly,
matching any video or audio codec, while they in fact are very
specific for these codecs.

This fixes muxing mp4v-es into .mp4 files using MediaMuxer.

Bug: http://b.android.com/90138
Change-Id: I7de04c5e517a1cde07c8fc18463053355d7cf6ae
tils.cpp
8a4728966dc9c78e21c3c93a927707e93c05e5e0 24-Dec-2014 Rachad <rachad@google.com> ACodec: Added support for E-AC3 decoders

Bug: 17883772

Change-Id: I05f674c33522eec0e6ceeece88dd800b1857b3ab
Codec.cpp
ediaDefs.cpp
ca6630c6065a9c93dde7b08b267c4d18314f935e 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
odecs/aacdec/SoftAAC2.cpp
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
TTPBase.cpp
ttplive/LiveSession.cpp
ttplive/LiveSession.h
ttplive/PlaylistFetcher.cpp
ttplive/PlaylistFetcher.h
nclude/HTTPBase.h
peg2ts/AnotherPacketSource.cpp
4f82a25c07c3ffc8d44d61797043f9864058afdf 22-Dec-2014 Marco Nelissen <marcone@google.com> Add log tag to FileSource

Change-Id: Id3435bbaede2fee0a780e7d7570218c5a9a1c4a0
ileSource.cpp
8f26056ce83bc50da4751be20b8defc08f55294e 22-Dec-2014 Marco Nelissen <marcone@google.com> Merge "Replace MidiFile player with a Midi extractor"
8bcd9e06bec53bf671e18c13294be8f539b072f5 19-Dec-2014 Robert Shih <robertshih@google.com> am a07593a1: am c9330d9a: am 89ee55cb: Merge "OggExtractor: ignore timestamp calculation for configuration packets" into lmp-mr1-dev

* commit 'a07593a1c167c775279226c6c8f36d9087d2e3e6':
OggExtractor: ignore timestamp calculation for configuration packets
a07593a1c167c775279226c6c8f36d9087d2e3e6 19-Dec-2014 Robert Shih <robertshih@google.com> am c9330d9a: am 89ee55cb: Merge "OggExtractor: ignore timestamp calculation for configuration packets" into lmp-mr1-dev

* commit 'c9330d9ad01f0703a8f8cf5a1dbe20a9eab7ec06':
OggExtractor: ignore timestamp calculation for configuration packets
89ee55cb01f6e230990eb344718627c8fcbec349 19-Dec-2014 Robert Shih <robertshih@google.com> Merge "OggExtractor: ignore timestamp calculation for configuration packets" into lmp-mr1-dev
ab6884505e0904f868c44797d7b06b1187ab8ec0 19-Dec-2014 Robert Shih <robertshih@google.com> am fd923e98: am 9dcc312a: am 1391f933: MPEG4Extractor: null check in MPEG4Source::parseChunk

* commit 'fd923e98c0f63c67fa8972dcc733951b9aa85da1':
MPEG4Extractor: null check in MPEG4Source::parseChunk
fd923e98c0f63c67fa8972dcc733951b9aa85da1 19-Dec-2014 Robert Shih <robertshih@google.com> am 9dcc312a: am 1391f933: MPEG4Extractor: null check in MPEG4Source::parseChunk

* commit '9dcc312a98288b5456d3322d8393cc25c795032c':
MPEG4Extractor: null check in MPEG4Source::parseChunk
9fc1bf138ed0b2b375a5d71e9d9e661ff30b49f5 18-Dec-2014 Robert Shih <robertshih@google.com> OggExtractor: ignore timestamp calculation for configuration packets

Bug: 18801155
Change-Id: Ib0b5a03fa4cf2c75d79be2df939257835259deed
ggExtractor.cpp
fe25cf395e2dae8c2e62dc4d80678a585f1b01fd 19-Dec-2014 Chih-Hung Hsieh <chh@google.com> am af86e017: am 1c2e3113: am 6f3b732b: Merge "Fix wrong int argument of FOURCC."

* commit 'af86e017ade98afe061030c03285ed3fe971ef36':
Fix wrong int argument of FOURCC.
faf4efc6a41e88adf85f76f48f020a6d681f5ff1 17-Dec-2014 Marco Nelissen <marcone@google.com> Replace MidiFile player with a Midi extractor

This gets rids of a bunch of special midi handling and replaces it
with an extractor that works with NuPlayer and MediaMetadataRetriever.

Change-Id: I8d0f5bbdde2ca24267cf4d62ab26afe9630e0217
ndroid.mk
ataSource.cpp
ediaDefs.cpp
ediaExtractor.cpp
idiExtractor.cpp
tagefrightMediaScanner.cpp
nclude/MidiExtractor.h
1391f933b49cfb56da9aa63f723de83b076cf888 18-Dec-2014 Robert Shih <robertshih@google.com> MPEG4Extractor: null check in MPEG4Source::parseChunk

Bug: 18771789
Change-Id: Ic12bf565be23eba39b49930c7ce43372fce4f826
PEG4Extractor.cpp
af86e017ade98afe061030c03285ed3fe971ef36 18-Dec-2014 Chih-Hung Hsieh <chh@google.com> am 1c2e3113: am 6f3b732b: Merge "Fix wrong int argument of FOURCC."

* commit '1c2e3113fa2120b0eb8cb5b7733c816df432f7b5':
Fix wrong int argument of FOURCC.
64c1c172cffeed79150b63469b06b253cace3c0f 17-Dec-2014 Wei Jia <wjia@google.com> am 3feb7bd0: am 5c82407e: am 184e63ff: Merge "ESQueue: change warning message of one buffer containing multiple ADTS frames into verbose." into lmp-mr1-dev

* commit '3feb7bd0670b6e85d6eec25309d8606a99f1af31':
ESQueue: change warning message of one buffer containing multiple ADTS frames into verbose.
3feb7bd0670b6e85d6eec25309d8606a99f1af31 17-Dec-2014 Wei Jia <wjia@google.com> am 5c82407e: am 184e63ff: Merge "ESQueue: change warning message of one buffer containing multiple ADTS frames into verbose." into lmp-mr1-dev

* commit '5c82407e3bb202c20c01107a4549f0d80d719ad8':
ESQueue: change warning message of one buffer containing multiple ADTS frames into verbose.
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
peg2ts/ESQueue.cpp
cb57f34c3933e68e65f37f494b797f00063082a2 16-Dec-2014 Marco Nelissen <marcone@google.com> Merge "Use callbacks for Midi I/O"
e1b2ccf317301af42bb4b6631a3bcd7d8f519d00 09-Dec-2014 Chih-Hung Hsieh <chh@google.com> Fix wrong int argument of FOURCC.

Clang compiler reports error for aosp_x86-eng target:

.../MPEG4Extractor.cpp:1538:14: error: case value is not a constant expression
case FOURCC('\xA9', 'x', 'y', 'z'):
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
..../MPEG4Extractor.cpp:1538:14: note: left shift of negative value -87

Change-Id: I3ef1aa710cd1ce84ca46cdfbe37876bb9a1140bd
PEG4Extractor.cpp
08b9e2d113213c37506a416bc95a36789bcab4ca 16-Dec-2014 Marco Nelissen <marcone@google.com> Use callbacks for Midi I/O

Instead of having the Sonivox engine directly open the file and
use stdio to read from it, use caller-provided callbacks.

Change-Id: I4d775c8458c48c591a15794c4517e006dcf034e1
tagefrightMediaScanner.cpp
a683bb2a7f92b44e9b04752a8126106ce3b0ecca 15-Dec-2014 Lajos Molnar <lajos@google.com> am d7aa535f: am 06f99521: am 2aa82e78: Merge "MediaCodecList: handle binder death" into lmp-mr1-dev

* commit 'd7aa535fc6ed1f4f0ee68bd3c7c483717d30205e':
MediaCodecList: handle binder death
d7aa535fc6ed1f4f0ee68bd3c7c483717d30205e 15-Dec-2014 Lajos Molnar <lajos@google.com> am 06f99521: am 2aa82e78: Merge "MediaCodecList: handle binder death" into lmp-mr1-dev

* commit '06f9952190357426445344090b4e20b8758a118a':
MediaCodecList: handle binder death
f1596a66a32072d8cdf7b5e877bdaea7033b761b 15-Dec-2014 Wei Jia <wjia@google.com> am dc039672: am a0b3a0a4: am 6e430fbd: Merge "NuPlayer: send NOT_SEEKABLE media info to client when the source is not seekable." into lmp-mr1-dev

* commit 'dc039672b8fad7746200ecc36304d0e85db4f367':
NuPlayer: send NOT_SEEKABLE media info to client when the source is not seekable.
2aa82e786be2e986be1ecb48d72b095b040efe9a 15-Dec-2014 Lajos Molnar <lajos@google.com> Merge "MediaCodecList: handle binder death" into lmp-mr1-dev
dc039672b8fad7746200ecc36304d0e85db4f367 15-Dec-2014 Wei Jia <wjia@google.com> am a0b3a0a4: am 6e430fbd: Merge "NuPlayer: send NOT_SEEKABLE media info to client when the source is not seekable." into lmp-mr1-dev

* commit 'a0b3a0a46dc42eafe620ffd053604515bbd9ca9a':
NuPlayer: send NOT_SEEKABLE media info to client when the source is not seekable.
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
96143d433419e789c5667a54d54ca0241f3286f0 15-Dec-2014 Rachad <rachad@google.com> am 690257fe: am aff13ad4: am 8ddb0223: Merge "Tunneled video Playback/Max resolution: Call mOmx->prepareForAdaptivePlayback() to provide max resolution information to tunneled OMX component." into lmp-mr1-dev

* commit '690257fe8288bc6f84069cc4b5d7f2a76e850401':
Tunneled video Playback/Max resolution: Call mOmx->prepareForAdaptivePlayback() to provide max resolution information to tunneled OMX component.
1fceb5697728557116a109d45e4eacc134ff738c 15-Dec-2014 Lajos Molnar <lajos@google.com> am 1896bbb7: am d4c0fef8: am 554016a3: Merge "stagefright: advertise 8kHz AAC decoder support" into lmp-mr1-dev

* commit '1896bbb7797842960f37a6bd0f5654f046e9ff45':
stagefright: advertise 8kHz AAC decoder support
eee82e44548f17253c2e06b25725f91c7b549ec2 12-Dec-2014 Lajos Molnar <lajos@google.com> MediaCodecList: handle binder death

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

* commit 'aff13ad4e639316bca12827d68a4f0a6ac54cd02':
Tunneled video Playback/Max resolution: Call mOmx->prepareForAdaptivePlayback() to provide max resolution information to tunneled OMX component.
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
1896bbb7797842960f37a6bd0f5654f046e9ff45 13-Dec-2014 Lajos Molnar <lajos@google.com> am d4c0fef8: am 554016a3: Merge "stagefright: advertise 8kHz AAC decoder support" into lmp-mr1-dev

* commit 'd4c0fef88384128acc4c986fe7d3026996d4a96b':
stagefright: advertise 8kHz AAC decoder support
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
Codec.cpp
30b865a2cfb508cd91d7403b7bf6ebcf34189c00 10-Dec-2014 Lajos Molnar <lajos@google.com> stagefright: advertise 8kHz AAC decoder support

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

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

Bug: 18599325
Change-Id: Iecd040f48750806f98d1799e2aaab2f90c6f3887
ttplive/LiveSession.cpp
2590fc421ccf5e8199d511ff3022b428ee9122e9 11-Dec-2014 Lajos Molnar <lajos@google.com> am 3e08ca67: resolved conflicts for merge of 6571ed31 to lmp-mr1-dev-plus-aosp

* commit '3e08ca6709b5a75dc3b779cf3eba8196b08a0245':
stagefright: misc fixes to software video encoders (and decoders)
3e08ca6709b5a75dc3b779cf3eba8196b08a0245 11-Dec-2014 Lajos Molnar <lajos@google.com> resolved conflicts for merge of 6571ed31 to lmp-mr1-dev-plus-aosp

Change-Id: Ibaea3a0766f75a61964615482a9ef28651a42b37
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
Codec.cpp
odecs/avc/enc/SoftAVCEncoder.cpp
odecs/avc/enc/SoftAVCEncoder.h
odecs/hevcdec/SoftHEVC.cpp
odecs/m4v_h263/dec/SoftMPEG4.cpp
odecs/m4v_h263/dec/SoftMPEG4.h
odecs/m4v_h263/enc/SoftMPEG4Encoder.cpp
odecs/m4v_h263/enc/SoftMPEG4Encoder.h
odecs/on2/dec/SoftVPX.cpp
odecs/on2/enc/SoftVPXEncoder.cpp
odecs/on2/enc/SoftVPXEncoder.h
odecs/on2/h264dec/SoftAVC.cpp
ata/media_codecs_google_video.xml
nclude/SoftVideoDecoderOMXComponent.h
nclude/SoftVideoEncoderOMXComponent.h
mx/SoftVideoDecoderOMXComponent.cpp
mx/SoftVideoEncoderOMXComponent.cpp
ests/Utils_test.cpp
41dd3a5580c9a28ccebd39fa0f0aedb9cd1ef0aa 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
ACWriter.cpp
16111eac5b63fe37b5f831244f6305bd89385248 10-Dec-2014 Chih-Hung Hsieh <chh@google.com> am c948a971: am c15a72f6: am 1914e7ed: Merge "Fix print format mismatches."

* commit 'c948a971ba70b7d9c60c56cf5977770ac61fc3f9':
Fix print format mismatches.
c948a971ba70b7d9c60c56cf5977770ac61fc3f9 10-Dec-2014 Chih-Hung Hsieh <chh@google.com> am c15a72f6: am 1914e7ed: Merge "Fix print format mismatches."

* commit 'c15a72f66add3c1f1b5b6a53488628c3843472bf':
Fix print format mismatches.
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>
odecs/m4v_h263/dec/SoftMPEG4.cpp
odecs/m4v_h263/dec/SoftMPEG4.h
c6ac859f5a82ea8642bc6351a45508a15f224f32 08-Dec-2014 Marco Nelissen <marcone@google.com> Remove filename based writer constructors

MediaPlayerService can't open files (it needs an already opened
file descriptor), so these were just wasting space.

Change-Id: I323044a6c1814a7bff952ed71b5c7792df2abf03
ACWriter.cpp
MRWriter.cpp
PEG2TSWriter.cpp
PEG4Writer.cpp
ediaMuxer.cpp
ebm/WebmWriter.cpp
ebm/WebmWriter.h
a1ded198ab2cceb07353a6dd42783e8c8dfdb03f 10-Dec-2014 Marco Nelissen <marcone@google.com> am be6a91d9: am 6eb3b520: am f6a364ed: Merge "Fix AAC recording issue" into lmp-mr1-dev

* commit 'be6a91d9e09ca33c9f3d7821c5809ce87dd57ae4':
Fix AAC recording issue
8593c3b74b059861fdaa6ca6a913597849fe9ae1 10-Dec-2014 Lajos Molnar <lajos@google.com> am 33cc5c91: am f143b608: am d1aeff55: Merge "Fix build with clang in C++11 mode"

* commit '33cc5c91e4bb9152ed122afacf7423e085420ac8':
Fix build with clang in C++11 mode
8ce2ac3c23438177d600ff90e0d6e29b0bd5e24c 10-Dec-2014 Lajos Molnar <lajos@google.com> am 853bc5a2: am f3c25346: am 66172f5c: Merge "Cast int64_t values to long long before print."

* commit '853bc5a2379a59859795027a9dd4bc11a54b2a5f':
Cast int64_t values to long long before print.
33c1ffbfa03e72112fff63053b98b907950b5030 10-Dec-2014 Andreas Gampe <agampe@google.com> am 80ddb730: am ce48b3a8: am f3df58c7: Merge "Stagefright: Fix unused variables"

* commit '80ddb73058d33fa45408a3538649867eda3f881b':
Stagefright: Fix unused variables
ccc3113681e2878e9c3ef98215f51db79ac034cc 10-Dec-2014 Lajos Molnar <lajos@google.com> am e09bf824: am 6874ed79: am a9d2f9fb: Merge "stagefright: preserve output format flags on format change" into lmp-mr1-dev

* commit 'e09bf82465ff83f4da966b77d551367f7c050154':
stagefright: preserve output format flags on format change
cd8d9c6cfe5ca53f17be1ea8edac6b324e203f52 09-Dec-2014 Chih-Hung Hsieh <chh@google.com> Fix print format mismatches.

Clang complains about mismatch of argument type and print format.

Change-Id: Ib07da09d8b1b62b3018033f9eaf7aa01bf7f7f9c
tsp/AMPEG4AudioAssembler.cpp
tsp/AMPEG4ElementaryAssembler.cpp
be6a91d9e09ca33c9f3d7821c5809ce87dd57ae4 09-Dec-2014 Marco Nelissen <marcone@google.com> am 6eb3b520: am f6a364ed: Merge "Fix AAC recording issue" into lmp-mr1-dev

* commit '6eb3b5205354ee41ae79abb692abb1490a8c3019':
Fix AAC recording issue
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
ACWriter.cpp
33cc5c91e4bb9152ed122afacf7423e085420ac8 09-Dec-2014 Lajos Molnar <lajos@google.com> am f143b608: am d1aeff55: Merge "Fix build with clang in C++11 mode"

* commit 'f143b60856d275a9dcda1f3084c768655b242022':
Fix build with clang in C++11 mode
853bc5a2379a59859795027a9dd4bc11a54b2a5f 09-Dec-2014 Lajos Molnar <lajos@google.com> am f3c25346: am 66172f5c: Merge "Cast int64_t values to long long before print."

* commit 'f3c253464e0047a28960b27bbee7366d5bd63327':
Cast int64_t values to long long before print.
80ddb73058d33fa45408a3538649867eda3f881b 09-Dec-2014 Andreas Gampe <agampe@google.com> am ce48b3a8: am f3df58c7: Merge "Stagefright: Fix unused variables"

* commit 'ce48b3a821f0c17aa68b114d964a26fce22cdd49':
Stagefright: Fix unused variables
d1aeff5597785336af3bba34cfddb0ebbc6b2397 09-Dec-2014 Lajos Molnar <lajos@google.com> Merge "Fix build with clang in C++11 mode"
66172f5cd25d1ce05870be70ad4f5fc0af6289f0 09-Dec-2014 Lajos Molnar <lajos@google.com> Merge "Cast int64_t values to long long before print."
882687382f3bf2eea0578242e0734e9eb2c0fa73 09-Dec-2014 Wei Jia <wjia@google.com> am 5185c956: am 25bad49c: am 852dc963: 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

* commit '5185c95673f7c6facd6d57fdc9fc53f52e44eed8':
avc_util: try to find the first start code prefix 0x000001 even though there is non-zero byte at the beginning of the buffer.
5a246de63468f2da0e6e6250a001da0dcefded4e 09-Dec-2014 Lajos Molnar <lajos@google.com> am 4eb26aa2: am 7f099ffd: am 8790740d: media_codecs.xml: extend vorbis sample rate to 8-96kHz

* commit '4eb26aa2b549aef5a2e0863a95a5cd2c1138cd7b':
media_codecs.xml: extend vorbis sample rate to 8-96kHz
e09bf82465ff83f4da966b77d551367f7c050154 08-Dec-2014 Lajos Molnar <lajos@google.com> am 6874ed79: am a9d2f9fb: Merge "stagefright: preserve output format flags on format change" into lmp-mr1-dev

* commit '6874ed79fd525cf5d6ec8a953475c14f5a185cb4':
stagefright: preserve output format flags on format change
5185c95673f7c6facd6d57fdc9fc53f52e44eed8 08-Dec-2014 Wei Jia <wjia@google.com> am 25bad49c: am 852dc963: 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

* commit '25bad49ce75758b2f68b278f54d7272b1cf4d08c':
avc_util: try to find the first start code prefix 0x000001 even though there is non-zero byte at the beginning of the buffer.
4eb26aa2b549aef5a2e0863a95a5cd2c1138cd7b 08-Dec-2014 Lajos Molnar <lajos@google.com> am 7f099ffd: am 8790740d: media_codecs.xml: extend vorbis sample rate to 8-96kHz

* commit '7f099ffd8feeca1d9ac6616e64f422a35cdb9890':
media_codecs.xml: extend vorbis sample rate to 8-96kHz
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
Codec.cpp
d42b90c5183fbd9d6a28d9baee613fddbf8131d6 21-Oct-2014 hkuang <hkuang@google.com> stagefright: support VP9 frame parallel decode in Soft VPX

VPX component now works with both serial decode mode and frame parallel
mode. But VP9 frame parallel decode is not enabled yet until libvpx
library enable it.

In frame parallel decode, libvpx decoder decodes several frames on all
cpus in parallel fashion. If not being flushed, it will only return frame
when all the cpus are busy. If getting flushed, it will return all the
frames in the decoder. Compare with current serial decode mode in which
libvpx decoder is idle between decode calls, libvpx decoder is busy
between decode calls. VP9 frame parallel decode is >30% faster than serial
decode which will makes devices play 1080P VP9 videos more easily.

Bug:17325438

Change-Id: I3c53329c6d0a9ff44f5a34d91ea06697478f08e2
odecs/on2/dec/SoftVPX.cpp
odecs/on2/dec/SoftVPX.h
9d02ca1a4e02ecc65edbe1deaaf06e65d33e9a28 05-Dec-2014 Wei Jia <wjia@google.com> am 4d82c2f0: am 848b4c67: am 814cbb4e: Merge "ESQueue: add frame length checking in validation of ADTS header." into lmp-mr1-dev

* commit '4d82c2f0d0361cd0062c3454d557bb1064e92020':
ESQueue: add frame length checking in validation of ADTS header.
4d82c2f0d0361cd0062c3454d557bb1064e92020 05-Dec-2014 Wei Jia <wjia@google.com> am 848b4c67: am 814cbb4e: Merge "ESQueue: add frame length checking in validation of ADTS header." into lmp-mr1-dev

* commit '848b4c676c3295508b74f85947fc5243ce9466f4':
ESQueue: add frame length checking in validation of ADTS header.
54e96f62859d933a5c8d4716cc5ab7bb00bd8711 05-Dec-2014 Andreas Gampe <agampe@google.com> Stagefright: Fix unused variables

For build-system CFLAGS clean-up, fix unused variables.

These variables are unused in aarch64.

Bug: 18632512
Change-Id: I6ae41f64e721a0f3188f0ee045a734b366ee72a6
odecs/aacenc/basic_op/basic_op.h
odecs/aacenc/src/block_switch.c
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
12a61347d0f0ba2ee99c1ef7626aeebc39307227 30-Nov-2014 Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org> Cast int64_t values to long long before print.

So the "%lld" format will not have Clang warnings in 32-bit and
64-bit builds. Alternative is to use PRId64.

Change-Id: I5fafc506fae012748a04ec261af62d9d13475cde
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
odecs/aacdec/SoftAAC2.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
vc_utils.cpp
peg2ts/ESQueue.cpp
3e715975a59f83084355ef600106d615a4f7f13f 04-Dec-2014 Lajos Molnar <lajos@google.com> am 105860ce: am 93f5b333: am 050ff19e: Merge "libstagefright: defer kWhatSetParameters in OutputPortSettingsChangedState"

* commit '105860cea2956f31f1c64d7a83a4a3bb21789cb8':
libstagefright: defer kWhatSetParameters in OutputPortSettingsChangedState
105860cea2956f31f1c64d7a83a4a3bb21789cb8 04-Dec-2014 Lajos Molnar <lajos@google.com> am 93f5b333: am 050ff19e: Merge "libstagefright: defer kWhatSetParameters in OutputPortSettingsChangedState"

* commit '93f5b333d31fd5fe425faa01b25d1b4d3115a8e6':
libstagefright: defer kWhatSetParameters in OutputPortSettingsChangedState
8790740d6bb1546dee6c87270976415503283820 04-Dec-2014 Lajos Molnar <lajos@google.com> media_codecs.xml: extend vorbis sample rate to 8-96kHz

Bug: 18615604
Change-Id: I0245556b8164959dd52fe677901cbfc517627cb4
ata/media_codecs_google_audio.xml
050ff19e650a53fd2b6f1f2490758b4bf3104ca4 04-Dec-2014 Lajos Molnar <lajos@google.com> Merge "libstagefright: defer kWhatSetParameters in OutputPortSettingsChangedState"
e6eea3a6b6e0cf92287ec1ceb8350f201d17e1ac 06-Nov-2014 Per Persson <per.persson@intel.com> libstagefright: defer kWhatSetParameters in OutputPortSettingsChangedState

Change-Id: I9719f1698bf411914eb753d3c349a15b9fbf9df6
Signed-off-by: Per Persson <per.persson@intel.com>
Signed-off-by: Persson, Mikael <mikael.persson@intel.com>
Signed-off-by: Fagerstedt, Axel <axel.fagerstedt@intel.com>
Signed-off-by: Yong Yao <yong.yao@intel.com>
Codec.cpp
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
peg2ts/ESQueue.cpp
b43ec13b603769d64d300716ffc8914fb39e30c5 01-Dec-2014 Glenn Kasten <gkasten@android.com> am d03179ac: am 42495ddc: am 592f3bc8: Merge "Added support for YEAR metadata key from VorbisComments"

* commit 'd03179ac50bc59129215e9272129665da24a27cc':
Added support for YEAR metadata key from VorbisComments
d03179ac50bc59129215e9272129665da24a27cc 01-Dec-2014 Glenn Kasten <gkasten@android.com> am 42495ddc: am 592f3bc8: Merge "Added support for YEAR metadata key from VorbisComments"

* commit '42495ddc3501c947441f892a56f2ac9ee96d7082':
Added support for YEAR metadata key from VorbisComments
592f3bc86d6f0aceb408961eae3cced1c2203af9 01-Dec-2014 Glenn Kasten <gkasten@android.com> Merge "Added support for YEAR metadata key from VorbisComments"
9014f5909920f2bb88687364876c1f7eaa014583 27-Nov-2014 Andreas Gampe <agampe@google.com> am 5a88501c: resolved conflicts for merge of e5ba80c5 to lmp-mr1-dev-plus-aosp

* commit '5a88501c8f677e34afb2043d7e81d8e09d6fa5f4':
Stagefright: Fix unused variables, functions, values
5a88501c8f677e34afb2043d7e81d8e09d6fa5f4 27-Nov-2014 Andreas Gampe <agampe@google.com> resolved conflicts for merge of e5ba80c5 to lmp-mr1-dev-plus-aosp

Change-Id: Iea12c8a6cabf84584e4a89ad80e298c1f4ea3dd7
2d0ac425564ff9882ebaac5267d1a04d4af67d00 27-Nov-2014 Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org> Fix build with clang in C++11 mode

This removes the deprecated register keyword in many places, fixes one
instance of passing '\0' where a char* is expected, and 2 switch type
narrowing issues.

Change-Id: Ie265ac26ff6a61267ad6406dfe237226d97ca9ac
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
PEG4Extractor.cpp
odecs/amrnb/common/include/basic_op_c_equivalent.h
odecs/amrnb/common/src/az_lsp.cpp
odecs/amrnb/common/src/div_s.cpp
odecs/amrnb/common/src/gc_pred.cpp
odecs/amrnb/common/src/gmed_n.cpp
odecs/amrnb/common/src/lsp_az.cpp
odecs/amrnb/common/src/mult_r.cpp
odecs/amrnb/common/src/norm_l.cpp
odecs/amrnb/common/src/norm_s.cpp
odecs/amrnb/common/src/pred_lt.cpp
odecs/amrnb/common/src/q_plsf_3.cpp
odecs/amrnb/common/src/residu.cpp
odecs/amrnb/common/src/shr.cpp
odecs/amrnb/common/src/weight_a.cpp
odecs/amrnb/dec/src/d1035pf.cpp
odecs/amrnb/dec/src/d_plsf_5.cpp
odecs/amrnb/dec/src/int_lsf.cpp
odecs/amrnb/dec/src/ph_disp.cpp
odecs/amrnb/dec/src/pstfilt.cpp
odecs/amrnb/enc/src/autocorr.cpp
odecs/amrnb/enc/src/c2_9pf.cpp
odecs/amrnb/enc/src/cl_ltp.cpp
odecs/amrnb/enc/src/convolve.cpp
odecs/amrnb/enc/src/cor_h.cpp
odecs/amrnb/enc/src/cor_h_x.cpp
odecs/amrnb/enc/src/cor_h_x2.cpp
odecs/amrnb/enc/src/dtx_enc.cpp
odecs/amrnb/enc/src/levinson.cpp
odecs/amrnb/enc/src/pitch_ol.cpp
odecs/amrnb/enc/src/pre_proc.cpp
odecs/amrnb/enc/src/set_sign.cpp
odecs/amrwb/src/pvamrwb_math_op.cpp
odecs/avc/enc/src/findhalfpel.cpp
odecs/m4v_h263/dec/src/find_min_max.cpp
odecs/m4v_h263/enc/src/dct.cpp
1a9c3954a20800dda3d6d18048c7f0edc8c53e6a 26-Nov-2014 Andreas Gampe <agampe@google.com> Merge "Stagefright: Fix unused variables, functions, values"
67d93552f0fca5a2ac6a451569cc1b1e15cd138a 26-Nov-2014 Chong Zhang <chz@google.com> am b438123f: am 9574c274: am 5d2c5fcb: Merge "MediaCodec: resume codec if state is FLUSHED in async mode" into lmp-mr1-dev

* commit 'b438123fb1ee0a8c232fd66de658d5382d2083cf':
MediaCodec: resume codec if state is FLUSHED in async mode
b438123fb1ee0a8c232fd66de658d5382d2083cf 26-Nov-2014 Chong Zhang <chz@google.com> am 9574c274: am 5d2c5fcb: Merge "MediaCodec: resume codec if state is FLUSHED in async mode" into lmp-mr1-dev

* commit '9574c274bf03900b56628b0c923d40f03cb30562':
MediaCodec: resume codec if state is FLUSHED in async mode
adf7d1c2f073f797f07d2a3025fca027bfeba1e6 26-Nov-2014 Lajos Molnar <lajos@google.com> am d1ad284d: am 20918be9: am b2cf160f: Merge "stagefright: add graceful handling when setting port definition" into lmp-mr1-dev

* commit 'd1ad284db3a84fe9f3dc027149b5f2433e3a8589':
stagefright: add graceful handling when setting port definition
d1ad284db3a84fe9f3dc027149b5f2433e3a8589 26-Nov-2014 Lajos Molnar <lajos@google.com> am 20918be9: am b2cf160f: Merge "stagefright: add graceful handling when setting port definition" into lmp-mr1-dev

* commit '20918be9309eda037074388f046c84e187a259c8':
stagefright: add graceful handling when setting port definition
5d2c5fcb5cbd262b6a238886a7ce43add03eee20 26-Nov-2014 Chong Zhang <chz@google.com> Merge "MediaCodec: resume codec if state is FLUSHED in async mode" into lmp-mr1-dev
d9e0603a1be07dbb347c55050c7d4629ea7492e8 26-Nov-2014 Chong Zhang <chz@google.com> MediaCodec: resume codec if state is FLUSHED in async mode

bug: 18513091

Change-Id: I192625c61834584f711de76db788c2c0332ae774
ediaCodec.cpp
5ecbdf58b0674ac4a8b9d56b49ebeb1033e5bd27 26-Nov-2014 Dan Albert <danalbert@google.com> Link the platform libRScpp, not the NDK's.

The NDK's is linked against stlport, the platform's against libc++.

Change-Id: I9114d56f165533de2d7c908fd9ccb1c38984b49b
ndroid.mk
90deef9fd14cd00a26c06f208a871deb68881326 26-Nov-2014 Dan Albert <danalbert@google.com> Merge "Fix build from broken makefile."
5c0409ea0798868d450cc3c32b411b5adbbf9c67 26-Nov-2014 Dan Albert <danalbert@google.com> Fix build from broken makefile.

LOCAL_NDK_STL_VARIANT is a no-op if LOCAL_SDK_VERSION is not set, and
this project cannot actually be built with the NDK (it uses platform
only libraries like cutils).

There's no reason (I hope) to be using stlport in the library anyway,
so just let them use all of libc++.

Change-Id: Ia917dbaf347cc438990386d21d95b8b73cd34614
ilters/Android.mk
67f236bc8b28021193952157efd95d73450bd21e 26-Nov-2014 Chih-hung Hsieh <chh@google.com> am fd2711ca: am e464018a: am f59eae94: Merge "Fix overload of SoftVideoDecoderOMXComponent::updatePortDefinitions"

* commit 'fd2711ca8c9108d25f18b48b924afd925f41344a':
Fix overload of SoftVideoDecoderOMXComponent::updatePortDefinitions
fd2711ca8c9108d25f18b48b924afd925f41344a 25-Nov-2014 Chih-hung Hsieh <chh@google.com> am e464018a: am f59eae94: Merge "Fix overload of SoftVideoDecoderOMXComponent::updatePortDefinitions"

* commit 'e464018a7fdacdc3bef3058620eb09ec60d3cccf':
Fix overload of SoftVideoDecoderOMXComponent::updatePortDefinitions
b3f9759c8c9437c45b9a34519ce2ea38a8314d4e 24-Nov-2014 Andreas Gampe <agampe@google.com> Stagefright: Fix unused variables, functions, values

For build-system CFLAGS clean-up, remove unused functions and
variables.

Change-Id: Ic3dee56b589ea9a693efa1d72ba394036efff168
ACWriter.cpp
Codec.cpp
PEG4Extractor.cpp
ediaCodecSource.cpp
MXCodec.cpp
tils.cpp
vc_utils.cpp
odecs/aacdec/SoftAAC2.cpp
odecs/aacenc/AACEncoder.cpp
odecs/aacenc/basic_op/oper_32b.c
odecs/aacenc/src/aacenc.c
odecs/aacenc/src/aacenc_core.c
odecs/aacenc/src/adj_thr.c
odecs/aacenc/src/bitbuffer.c
odecs/aacenc/src/block_switch.c
odecs/aacenc/src/ms_stereo.c
odecs/aacenc/src/sf_estim.c
odecs/aacenc/src/tns.c
odecs/aacenc/src/transform.c
odecs/amrnb/common/Android.mk
odecs/amrnb/dec/Android.mk
odecs/amrnb/enc/Android.mk
odecs/amrwb/Android.mk
odecs/amrwbenc/src/q_pulse.c
odecs/avc/enc/Android.mk
odecs/avc/enc/src/findhalfpel.cpp
odecs/avc/enc/src/rate_control.cpp
odecs/flac/enc/SoftFlacEncoder.cpp
odecs/m4v_h263/enc/Android.mk
odecs/mp3dec/Android.mk
ttp/MediaHTTP.cpp
ttplive/LiveSession.cpp
ttplive/PlaylistFetcher.cpp
d3/ID3.cpp
atroska/MatroskaExtractor.cpp
peg2ts/ESQueue.cpp
peg2ts/MPEG2TSExtractor.cpp
mx/tests/OMXHarness.cpp
tsp/AAMRAssembler.cpp
tsp/AMPEG4AudioAssembler.cpp
tsp/APacketSource.cpp
tsp/ARTPConnection.cpp
ebm/WebmWriter.cpp
f59eae9442374940b6b05f436f0598b3c482e6d0 25-Nov-2014 Chih-hung Hsieh <chh@google.com> Merge "Fix overload of SoftVideoDecoderOMXComponent::updatePortDefinitions"
40213e8baebf9a92d77f3eb1d1a94eec05055bb8 25-Nov-2014 Chih-hung Hsieh <chh@google.com> am a9b15da8: am 7fca411f: am b44760cf: Merge "Remove deprecated register keyword"

* commit 'a9b15da8df9f596658102fe2b7dfbe114a499867':
Remove deprecated register keyword
a9b15da8df9f596658102fe2b7dfbe114a499867 25-Nov-2014 Chih-hung Hsieh <chh@google.com> am 7fca411f: am b44760cf: Merge "Remove deprecated register keyword"

* commit '7fca411f36f76493491fd45f91fac2e9bd70fd6d':
Remove deprecated register keyword
4cb1a255bc134c4ee001ca7e38a0720cbd49c0b2 25-Nov-2014 Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org> Remove deprecated register keyword

In C++11 mode, clang errors out on the register keyword.

Change-Id: I034ba5815e37e3ff5e017551977e97b8516123e8
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
odecs/avc/common/src/deblock.cpp
668218f09abf38f477a8028130c661ed954873b8 25-Nov-2014 Chih-hung Hsieh <chh@google.com> am 9459b3e1: am 112ba592: am 6c7d332f: Merge "Remove bogus forward declarations"

* commit '9459b3e1eafa6fbb2eb01702133f41f23bb8264a':
Remove bogus forward declarations
c71151cc117154ba0b276f2fb21a8526e0373bbc 25-Nov-2014 Andreas Gampe <agampe@google.com> am df0b3e0c: am 865449b4: am e4f6ecb9: Merge "Stagefright: Fix default typo"

* commit 'df0b3e0c0406f277796322d0a61c6abcb12650ea':
Stagefright: Fix default typo
5a933150de1022c6ce4dc568853da1a7caebf489 25-Nov-2014 Chih-hung Hsieh <chh@google.com> am 70d4f7f4: am 128b7850: am db1ce33e: Merge "Remove check for an impossible condition"

* commit '70d4f7f44da0f95514d0cfb404874e780ea62be5':
Remove check for an impossible condition
9459b3e1eafa6fbb2eb01702133f41f23bb8264a 25-Nov-2014 Chih-hung Hsieh <chh@google.com> am 112ba592: am 6c7d332f: Merge "Remove bogus forward declarations"

* commit '112ba59269c4d7192cb4f590b05c6058f5daafb9':
Remove bogus forward declarations
df0b3e0c0406f277796322d0a61c6abcb12650ea 25-Nov-2014 Andreas Gampe <agampe@google.com> am 865449b4: am e4f6ecb9: Merge "Stagefright: Fix default typo"

* commit '865449b4619c7cd9b75bcf7f75a42f0de68f1f00':
Stagefright: Fix default typo
70d4f7f44da0f95514d0cfb404874e780ea62be5 25-Nov-2014 Chih-hung Hsieh <chh@google.com> am 128b7850: am db1ce33e: Merge "Remove check for an impossible condition"

* commit '128b785027033c8c74a858a3dac27cfcb2a9ae7f':
Remove check for an impossible condition
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
mx/SimpleSoftOMXComponent.cpp
6c7d332f252d5ae7b3cad810e7adb85e5aedb98a 25-Nov-2014 Chih-hung Hsieh <chh@google.com> Merge "Remove bogus forward declarations"
e5558d56cea4616ef4a2778f9a78fe27df9401ac 24-Nov-2014 Andreas Gampe <agampe@google.com> Stagefright: Fix default typo

Change-Id: Ie2fef95a45dd124572bf062011a272898a371924
imedtext/TimedTextDriver.cpp
db1ce33e0159bbbc3946c163c9ba1077182823f1 24-Nov-2014 Chih-hung Hsieh <chh@google.com> Merge "Remove check for an impossible condition"
8eeda89ae361ccd048d7bba0fd11291e05577e2a 21-Nov-2014 Dan Albert <danalbert@google.com> am d0e12a16: am 902dc42d: am 07715ac3: Merge "C++11 compatibility."

* commit 'd0e12a161471823d1ab269cb608be3f3b0a71ed1':
C++11 compatibility.
d0e12a161471823d1ab269cb608be3f3b0a71ed1 21-Nov-2014 Dan Albert <danalbert@google.com> am 902dc42d: am 07715ac3: Merge "C++11 compatibility."

* commit '902dc42d79b075395d484ce1c71f215b199aaa2a':
C++11 compatibility.
07715ac3b9309b397fb911ef81a393c4493cf20d 21-Nov-2014 Dan Albert <danalbert@google.com> Merge "C++11 compatibility."
18c9f12bc1be435ad1ef833bd1473347432912da 20-Nov-2014 Lajos Molnar <lajos@google.com> am 3efe6516: am 6597c00f: stagefright: add (temporary) support for automatic video frc automerge: 73c5c94

* commit '3efe6516acd0561cc1afef1c3192600b3ab81166':
stagefright: add (temporary) support for automatic video frc
3efe6516acd0561cc1afef1c3192600b3ab81166 20-Nov-2014 Lajos Molnar <lajos@google.com> am 6597c00f: stagefright: add (temporary) support for automatic video frc
automerge: 73c5c94

* commit '73c5c94ab53bf0c14fffe5edc62706865cff271d':
stagefright: add (temporary) support for automatic video frc
4cbd52c61875e1193b05043ecfeb0d636d5fba8a 20-Nov-2014 Chih-hung Hsieh <chh@google.com> am dcdc7699: am d6048672: am 9d2e0dae: Merge "Remove extraneous parentheses"

* commit 'dcdc76994c150c09aadc5be8f86040ebc6865706':
Remove extraneous parentheses
dcdc76994c150c09aadc5be8f86040ebc6865706 20-Nov-2014 Chih-hung Hsieh <chh@google.com> am d6048672: am 9d2e0dae: Merge "Remove extraneous parentheses"

* commit 'd60486723cdc0b4b83b77d57ce35023a7516c471':
Remove extraneous parentheses
36802bd18b7b4e8c87fa019c7e3068bee330d174 20-Nov-2014 Dan Albert <danalbert@google.com> C++11 compatibility.

* Fix string literal concatenation to not be interpreted as UD
literals.
* Add constexpr compatibility for non-integral static members.
* Use __typeof__ instead of typeof (should become decltype once this
actually becomes C++11).
* Add an appropriate cast for atomic_uintptr_t, since moving to C++11
means moving from <stdatomic.h> to <atomic>, which has better
typechecking (hooray for not macros!).

Bug: 18466763
Change-Id: I9561dcb2526578687819ff85421ba80d8e1a9694
MXCodec.cpp
0b8969c93c3b75206da23946d529ffd853c24a95 20-Nov-2014 Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org> Remove extraneous parentheses

Remove extraneous parentheses that cause compiler warnings in clang

Change-Id: I88a3d84738433db85e4a04b673f82da7b0b1be10
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
odecs/m4v_h263/enc/src/vlc_encode.cpp
3503cef001eded7330ac600b8e826e6d3d55737a 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.

Change-Id: I8327fe1b363917515cf76c8f76bdbc05b2c0fbf0
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
odecs/m4v_h263/dec/SoftMPEG4.cpp
odecs/m4v_h263/dec/SoftMPEG4.h
df79944ab36e13ceec74fc7c560145860769f6a7 20-Nov-2014 Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org> Remove bogus forward declarations

Remove forward declarations of MediaBuffer -- they're not needed because
MediaBuffer.h is included earlier in the file anyway, and they
incorrectly declared MediaBuffer as a struct instead of a class.

Change-Id: Ia35ea8f938553e39244032b6fd6c061aa388859f
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
odecs/avc/enc/SoftAVCEncoder.h
odecs/m4v_h263/enc/SoftMPEG4Encoder.h
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
Codec.cpp
8b54e0afd03c3eb39138a46ca36e2acba4ad7639 19-Nov-2014 Robert Shih <robertshih@google.com> am a97f20bb: am 2bbc61fe: am 408dba5f: Merge "HLS: fix live lock after missing the boat during configuration change" into lmp-mr1-dev

* commit 'a97f20bb4f5b770cf4d9655b7d3aaf58284aeeea':
HLS: fix live lock after missing the boat during configuration change
0951ed3cd4fd322453d5c9619e5089c9b620a7ae 19-Nov-2014 Marco Nelissen <marcone@google.com> am dae9df0a: am db95b7db: am ba0790bf: Merge "Don\'t autoloop notifications" into lmp-mr1-dev

* commit 'dae9df0a67acae245a81a8a1404b14044eb5f5b4':
Don't autoloop notifications
a97f20bb4f5b770cf4d9655b7d3aaf58284aeeea 19-Nov-2014 Robert Shih <robertshih@google.com> am 2bbc61fe: am 408dba5f: Merge "HLS: fix live lock after missing the boat during configuration change" into lmp-mr1-dev

* commit '2bbc61fe75a98e39c844c034cdcaf4d01b311834':
HLS: fix live lock after missing the boat during configuration change
dae9df0a67acae245a81a8a1404b14044eb5f5b4 19-Nov-2014 Marco Nelissen <marcone@google.com> am db95b7db: am ba0790bf: Merge "Don\'t autoloop notifications" into lmp-mr1-dev

* commit 'db95b7dbba21fc0b1112f9c362d4d942dddefba0':
Don't autoloop notifications
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
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
ttplive/PlaylistFetcher.cpp
293ef52dff24cb36e4e1f9bf628a4ca05e906aff 18-Nov-2014 Chih-hung Hsieh <chh@google.com> am 3126b503: am 5f3eef9a: am 7a200235: Merge "Remove extraneous parentheses"

* commit '3126b50345a9fc0e5d6d9e58226795735e04932f':
Remove extraneous parentheses
f69e638815dab77f367959f4c9d02c7a13bf9201 18-Nov-2014 Chih-hung Hsieh <chh@google.com> am b08869a4: am dd9d3e50: am 48b447fe: Merge "Fix uninitialized variable"

* commit 'b08869a45c78d3a9cfdbc9d220b5d491076c5c7f':
Fix uninitialized variable
c1d3818b2f63731e38083b3d2dea62a3b295f200 18-Nov-2014 Robert Shih <robertshih@google.com> am ef2af979: am 811a92f6: am 39b109a1: Merge "NuPlayer HTTPLiveSource: impl getSelectedTrack" into lmp-mr1-dev

* commit 'ef2af979309dd4f85c449614dfeb829e72ff718d':
NuPlayer HTTPLiveSource: impl getSelectedTrack
3126b50345a9fc0e5d6d9e58226795735e04932f 18-Nov-2014 Chih-hung Hsieh <chh@google.com> am 5f3eef9a: am 7a200235: Merge "Remove extraneous parentheses"

* commit '5f3eef9a6a946347bc7d8c5dc76290c9e780f818':
Remove extraneous parentheses
7a20023576f48f06407a6ad1f016eec1943817ce 18-Nov-2014 Chih-hung Hsieh <chh@google.com> Merge "Remove extraneous parentheses"
b08869a45c78d3a9cfdbc9d220b5d491076c5c7f 18-Nov-2014 Chih-hung Hsieh <chh@google.com> am dd9d3e50: am 48b447fe: Merge "Fix uninitialized variable"

* commit 'dd9d3e5046da2b36c291957ccdf3291147b847f1':
Fix uninitialized variable
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
wesomePlayer.cpp
266299cfb628ce2cadccb76443b0566e1a53dbcc 18-Nov-2014 Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org> Fix uninitialized variable

In the case of !(err == OK && !mCancelled), sdpSize is used
uninitialized.

Change-Id: I33c6365ca6df13b0051491771d3eee3e35346b6d
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
tsp/SDPLoader.cpp
54cdefc7c79c60514d3c37458df285547f4008fd 18-Nov-2014 Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org> Remove extraneous parentheses

Remove extraneous parentheses - they cause compiler warnings in clang

Change-Id: Ie2efd9714f9e2251cf3b204b5c5dd1a8b8aaca13
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
odecs/aacenc/src/bitenc.c
odecs/amrwbenc/src/wb_vad.c
ef2af979309dd4f85c449614dfeb829e72ff718d 18-Nov-2014 Robert Shih <robertshih@google.com> am 811a92f6: am 39b109a1: Merge "NuPlayer HTTPLiveSource: impl getSelectedTrack" into lmp-mr1-dev

* commit '811a92f68dbcab0f88b4be72099d783d3a44c9f6':
NuPlayer HTTPLiveSource: impl getSelectedTrack
39b109a1df23e7610b031b466e9ecf510b3c077f 18-Nov-2014 Robert Shih <robertshih@google.com> Merge "NuPlayer HTTPLiveSource: impl getSelectedTrack" into lmp-mr1-dev
1c39c28ed6537cab06d681f8f3c0a4d17bb0543d 17-Nov-2014 Chih-hung Hsieh <chh@google.com> am 8c5ee61a: am d86450b9: am c80b9b83: Merge "Fix struct vs. class mismatches"

* commit '8c5ee61a057e3b87e8f0800b284642bf3b107fd0':
Fix struct vs. class mismatches
8c5ee61a057e3b87e8f0800b284642bf3b107fd0 17-Nov-2014 Chih-hung Hsieh <chh@google.com> am d86450b9: am c80b9b83: Merge "Fix struct vs. class mismatches"

* commit 'd86450b93ab3960ccd68aed14563aaa76b43ce9b':
Fix struct vs. class mismatches
86a58cabe322b746ab0eb17f0cade34ed68ba60e 17-Nov-2014 Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org> Fix struct vs. class mismatches

Fix something being declared a struct and forward-declared a class and
vice versa.

gcc doesn't care, clang complains about the mismatch.

Change-Id: I7a7a8e9040e3c86fa1d73eb112631ea140861657
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
ttplive/PlaylistFetcher.h
nclude/AACEncoder.h
nclude/ID3.h
nclude/MPEG2TSExtractor.h
nclude/avc_utils.h
peg2ts/ATSParser.h
peg2ts/ESQueue.h
tsp/AMPEG2TSAssembler.h
tsp/ARawAudioAssembler.h
77e79a509d19ab50b1867fe3903b5a8fae450591 17-Nov-2014 Marco Nelissen <marcone@google.com> resolved conflicts for merge of e78a27ca to lmp-mr1-dev-plus-aosp

Change-Id: If10a9cc17245f95d5e10b1507445abbb4020670e
f888020c6e2735624f2b2a30e72aca24e17b8b4d 14-Nov-2014 Marco Nelissen <marcone@google.com> Update calls to IInterface::asBinder()

to use the new static version.

Change-Id: Ia7b10eb38ca55b72278bfd33d3bf647f338b4e6a

Conflicts:
media/libmedia/IAudioFlinger.cpp
media/libmedia/IMediaPlayer.cpp
media/libstagefright/CameraSource.cpp
Codec.cpp
ameraSource.cpp
MXClient.cpp
imedEventQueue.cpp
mx/OMX.cpp
060ef2a4f42820c77ded1de99c6e1f5edb0033a0 15-Nov-2014 Wei Jia <wjia@google.com> am 1ea52d5f: am addfc718: Merge "NuPlayer: tunnel decoder with renderer for data buffer passing." into lmp-mr1-dev automerge: b915eeb

* commit '1ea52d5ff0465f9353fcf14ed64246c1b9bf4439':
NuPlayer: tunnel decoder with renderer for data buffer passing.
0344dcb26841dd8d0f1e0169afa24cc7516ca69c 15-Nov-2014 Robert Shih <robertshih@google.com> am be14b79f: am f97dfbc9: Merge "PlaylistFetcher: handle sporadic fetch erros" into lmp-mr1-dev automerge: 3db2e5a

* commit 'be14b79f14cf70e7aaee5383e6a88e9984ffacdc':
PlaylistFetcher: handle sporadic fetch erros
1ea52d5ff0465f9353fcf14ed64246c1b9bf4439 15-Nov-2014 Wei Jia <wjia@google.com> am addfc718: Merge "NuPlayer: tunnel decoder with renderer for data buffer passing." into lmp-mr1-dev
automerge: b915eeb

* commit 'b915eebd82cc347b182265d4f4123b11ba3db812':
NuPlayer: tunnel decoder with renderer for data buffer passing.
be14b79f14cf70e7aaee5383e6a88e9984ffacdc 15-Nov-2014 Robert Shih <robertshih@google.com> am f97dfbc9: Merge "PlaylistFetcher: handle sporadic fetch erros" into lmp-mr1-dev
automerge: 3db2e5a

* commit '3db2e5a6bd218ba185a1387d91a974d561d304d5':
PlaylistFetcher: handle sporadic fetch erros
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
peg2ts/ATSParser.cpp
06b46062d2f8bc82ca3061a23d197734ae51918b 14-Nov-2014 Marco Nelissen <marcone@google.com> Update calls to IInterface::asBinder()

to use the new static version.

Change-Id: I89a5988a0ac694ffc04d88cf939e8455bf925d4c
Codec.cpp
ameraSource.cpp
MXClient.cpp
imedEventQueue.cpp
mx/OMX.cpp
2acb139210fff39d9c357b90584c295e93f1902f 14-Nov-2014 Lajos Molnar <lajos@google.com> am 102b17b8: am 41907c44: am cede28e2: Merge "stagefright: add runtime debug support" into lmp-mr1-dev

* commit '102b17b8276f1f364f214f5d943d887f61f71765':
stagefright: add runtime debug support
888913c576024ab5a1da3800ec0e0d5dfba07907 14-Nov-2014 Chong Zhang <chz@google.com> am b6c785ee: am 08961d0b: am 97e6ca1a: Merge "Stagefright: use MediaCodec in async mode for recording" into lmp-mr1-dev

* commit 'b6c785eeeb8e265a64bc0210bcfbc6332d0291dd':
Stagefright: use MediaCodec in async mode for recording
audio policy: move intializations to onFirstRef()
a16bb9e84c5e824175fdfb5c5778d1b7bf3201fe 14-Nov-2014 Wei Jia <wjia@google.com> am 3c17893c: am 285dc585: am 12acd3f0: Merge "AnotherPacketSource: need reset some members before returning from queueDiscontinuity()." into lmp-mr1-dev

* commit '3c17893c75bfa050c4e422cff417c428d74429e7':
AnotherPacketSource: need reset some members before returning from queueDiscontinuity().
102b17b8276f1f364f214f5d943d887f61f71765 14-Nov-2014 Lajos Molnar <lajos@google.com> am 41907c44: am cede28e2: Merge "stagefright: add runtime debug support" into lmp-mr1-dev

* commit '41907c44a597ceb258495715d3dd391fef2907e3':
stagefright: add runtime debug support
cede28e22bce0c92a6d139b51d2c007d2e3f6fca 14-Nov-2014 Lajos Molnar <lajos@google.com> Merge "stagefright: add runtime debug support" into lmp-mr1-dev
daad5b2f4a6bb46a7911661e398278d6a80d7093 30-Aug-2014 Robert Shih <robertshih@google.com> PlaylistFetcher: handle sporadic fetch erros

Bug: 17490472
Change-Id: I2c04e2352f13db762b845f4d35db0a8b851a148c
ttplive/PlaylistFetcher.cpp
5edc507d875fcb8d80d441ae2b32d2863e5a19c9 14-Nov-2014 Robert Shih <robertshih@google.com> am 811c3ad2: am 2458928e: am e0b7ddcd: Merge "PlaylistFetcher: check ts program streams before disabling a/v" into lmp-mr1-dev

* commit '811c3ad2eb02a169c22bd269d5d82e26174be349':
PlaylistFetcher: check ts program streams before disabling a/v
b6c785eeeb8e265a64bc0210bcfbc6332d0291dd 14-Nov-2014 Chong Zhang <chz@google.com> am 08961d0b: am 97e6ca1a: Merge "Stagefright: use MediaCodec in async mode for recording" into lmp-mr1-dev

* commit '08961d0b57f33e0486db2ff135f0f7fa4b1a8c58':
Stagefright: use MediaCodec in async mode for recording
audio policy: move intializations to onFirstRef()
3c17893c75bfa050c4e422cff417c428d74429e7 14-Nov-2014 Wei Jia <wjia@google.com> am 285dc585: am 12acd3f0: Merge "AnotherPacketSource: need reset some members before returning from queueDiscontinuity()." into lmp-mr1-dev

* commit '285dc585019e3c710985edc5e3f55cb934c6512c':
AnotherPacketSource: need reset some members before returning from queueDiscontinuity().
97e6ca1a0be83e420ab238d9a1c31d3112126646 14-Nov-2014 Chong Zhang <chz@google.com> Merge "Stagefright: use MediaCodec in async mode for recording" into lmp-mr1-dev
12acd3f0374e7707ff50c04f8075883be71b128c 14-Nov-2014 Wei Jia <wjia@google.com> Merge "AnotherPacketSource: need reset some members before returning from queueDiscontinuity()." into lmp-mr1-dev
87e8123d4d6058fbd50065a4fb18a0bdb6989b3f 13-Nov-2014 Wei Jia <wjia@google.com> AnotherPacketSource: need reset some members before returning from queueDiscontinuity().

Bug: 18355014
Bug: 17511837

Change-Id: I4b623d3bc4fbeaf0e8bf4ddd96661469d17afe7a
peg2ts/AnotherPacketSource.cpp
811c3ad2eb02a169c22bd269d5d82e26174be349 13-Nov-2014 Robert Shih <robertshih@google.com> am 2458928e: am e0b7ddcd: Merge "PlaylistFetcher: check ts program streams before disabling a/v" into lmp-mr1-dev

* commit '2458928ecaf99d237454188aa463e04817ae3028':
PlaylistFetcher: check ts program streams before disabling a/v
e0b7ddcda9b4fb493cc365c92293ed7d12c3208a 13-Nov-2014 Robert Shih <robertshih@google.com> Merge "PlaylistFetcher: check ts program streams before disabling a/v" into lmp-mr1-dev
bf20727f0aaf609bc3b495b07b45822b137d21ba 31-Oct-2014 Robert Shih <robertshih@google.com> PlaylistFetcher: check ts program streams before disabling a/v

Bug: 14648838
Change-Id: Ibf2b2cbb235f3d80bc33013e2afc053f13b9035f
ttplive/PlaylistFetcher.cpp
peg2ts/ATSParser.cpp
peg2ts/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
ediaCodecSource.cpp
f296e2b262d2a8f7c570eaed454a28cca99eb976 19-Jun-2014 Lajos Molnar <lajos@google.com> stagefright: add runtime debug support

Bug: 18285408
Change-Id: I56346f4652b2c5f7ef5fa3003fd8676051339384
MXCodec.cpp
oundation/ADebug.cpp
oundation/AStringUtils.cpp
oundation/Android.mk
nclude/OMXNodeInstance.h
mx/OMX.cpp
mx/OMXNodeInstance.cpp
mx/SoftOMXComponent.cpp
ests/Utils_test.cpp
2a4acf23d6eae30321351355e4626e036c8e828a 13-Nov-2014 Marco Nelissen <marcone@google.com> am dd1b265e: am cf957fb7: am 94691b01: Merge "Fix Ogg Vorbis packet timestamps" into lmp-mr1-dev

* commit 'dd1b265eb3041532ad76d41bb73dbe9722decf7f':
Fix Ogg Vorbis packet timestamps
dd1b265eb3041532ad76d41bb73dbe9722decf7f 13-Nov-2014 Marco Nelissen <marcone@google.com> am cf957fb7: am 94691b01: Merge "Fix Ogg Vorbis packet timestamps" into lmp-mr1-dev

* commit 'cf957fb7c4a5ca845bfb4639f8b551aeec0075ca':
Fix Ogg Vorbis packet timestamps
94691b01a94d3ae115a7181c99db58fbeb785c64 12-Nov-2014 Marco Nelissen <marcone@google.com> Merge "Fix Ogg Vorbis packet timestamps" into lmp-mr1-dev
fc70a810d18f13bdb04be3307aa2b282b0cdc5b0 12-Nov-2014 Andy Hung <hunga@google.com> am 745602d8: Merge "MediaCodec: Prevent stop() in the UNINITIALIZED state" into lmp-mr1-dev automerge: 8bc9b3a
automerge: 3584a1a

* commit '3584a1afb3f263a13d12cc2d8003101c74453ce3':
MediaCodec: Prevent stop() in the UNINITIALIZED state
3584a1afb3f263a13d12cc2d8003101c74453ce3 12-Nov-2014 Andy Hung <hunga@google.com> am 745602d8: Merge "MediaCodec: Prevent stop() in the UNINITIALIZED state" into lmp-mr1-dev
automerge: 8bc9b3a

* commit '8bc9b3afceb793406a3dee0099ca636b26c58aa5':
MediaCodec: Prevent stop() in the UNINITIALIZED state
79d661f469c8c6a73634bc3d4770212bc8708619 12-Nov-2014 Mark Salyzyn <salyzyn@google.com> libstagefright: use __predict_false from bionic rather than CONDITION from log/log.h

Change-Id: Ieb07a4f58c96326553e87dacca11e3980e283dc8
PEG4Writer.cpp
745602d87607521f4fe84c4f3a6388fbdb6a867c 11-Nov-2014 Andy Hung <hunga@google.com> Merge "MediaCodec: Prevent stop() in the UNINITIALIZED state" into lmp-mr1-dev
7a493d8578bb00cf10190053a4caf1d07f4e24f7 11-Nov-2014 Marco Nelissen <marcone@google.com> Fix Ogg Vorbis packet timestamps

Bug: 17586090
Change-Id: Iea88f7cc1f623cbea5df24169ea76181925fbb13
ggExtractor.cpp
75c6d4267db3cca1d06292cae09a40e2d1fcedbd 09-Nov-2010 Andreas Lillvik <andreas.lillvik@sonyericsson.com> Added support for YEAR metadata key from VorbisComments

The OggExtractor wasn't extracting the YEAR key when the metadata in
the file was parsed. The YEAR key is now extracted when the file
metadata is parsed.

Change-Id: Idf0d1a37fb141491dce5de527703ca1b27f621e7
ggExtractor.cpp
ab02262795d8b28493bcb64e84fcda57bd14f8bf 11-Nov-2014 Robert Shih <robertshih@google.com> am 7382b352: am e71da1f7: Merge "MatroskaExtractor: use GetTrackByNumber instead of GetTrackByIndex" into lmp-mr1-dev automerge: a7e65b1

* commit '7382b352e63733abbb45a9b94131b08f669cb33c':
PlaylistFetcher: clear mStartup for .aac playlists after seek
MatroskaExtractor: use GetTrackByNumber instead of GetTrackByIndex
7382b352e63733abbb45a9b94131b08f669cb33c 11-Nov-2014 Robert Shih <robertshih@google.com> am e71da1f7: Merge "MatroskaExtractor: use GetTrackByNumber instead of GetTrackByIndex" into lmp-mr1-dev automerge: a7e65b1

* commit 'e71da1f76a624adf97ca255149a85940a8515941':
PlaylistFetcher: clear mStartup for .aac playlists after seek
MatroskaExtractor: use GetTrackByNumber instead of GetTrackByIndex
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
a10667bed1671696d44d3e71b0f003fcaf72533c 10-Nov-2014 Glenn Kasten <gkasten@android.com> am d6549e9f: am eb0827f3: am c5160b34: Merge "Remove the executable bit from source files"

* commit 'd6549e9fa4c8ba9f207589cf9a12d6eab789ced9':
Remove the executable bit from source files
d6549e9fa4c8ba9f207589cf9a12d6eab789ced9 10-Nov-2014 Glenn Kasten <gkasten@android.com> am eb0827f3: am c5160b34: Merge "Remove the executable bit from source files"

* commit 'eb0827f34ef34c9ff84ab4d857af4b6215839fa3':
Remove the executable bit from source files
f5b7c3b3c9a6da29f3bbd02e4031ad19bc7ad0f7 08-Nov-2014 Robert Shih <robertshih@google.com> PlaylistFetcher: clear mStartup for .aac playlists after seek

Bug: 18296856
Change-Id: I26beabee338312eb2125b69284052c61aef611f0
ttplive/PlaylistFetcher.cpp
0644f95a8976470e84c6c0a6d96585ae6437ecd2 05-Nov-2014 Robert Shih <robertshih@google.com> MatroskaExtractor: use GetTrackByNumber instead of GetTrackByIndex

Bug: 18297854
Change-Id: I5e14a358576d9c7d25b7e421cd22428fb17a6e06
atroska/MatroskaExtractor.cpp
c98021fd30ad6ae6ae7a51c89fdb0008e093843a 07-Nov-2014 Dan Stoza <stoza@google.com> Add BufferItem argument to onFrameAvailable

Adds a BufferItem argument to onFrameAvailable so consumers can track
the queued frames in a BufferQueue.

Change-Id: I2e76144af93b5b6ada47cdb0f5f846a863b34dd7
ilters/GraphicBufferListener.cpp
ilters/GraphicBufferListener.h
048e913d58a59055af81dfa362db2c4ccf00f75a 07-Nov-2014 Dan Stoza <stoza@google.com> am f8d051fe: am 034d6747: am 1609e451: Merge "Add a BufferItem parameter to onFrameAvailable" into lmp-mr1-dev

* commit 'f8d051fee37b1a0734e4142072d3053fed8df161':
Add a BufferItem parameter to onFrameAvailable
f8d051fee37b1a0734e4142072d3053fed8df161 07-Nov-2014 Dan Stoza <stoza@google.com> am 034d6747: am 1609e451: Merge "Add a BufferItem parameter to onFrameAvailable" into lmp-mr1-dev

* commit '034d674721029e3b7e34fe30ee31814c521b62bf':
Add a BufferItem parameter to onFrameAvailable
1609e451cf6101efe6aeaaa2da61db2cb095c9e8 07-Nov-2014 Dan Stoza <stoza@google.com> Merge "Add a BufferItem parameter to onFrameAvailable" into lmp-mr1-dev
21e525fdcc234c22d843a8bf1a4ec35c4b376314 07-Nov-2014 Martin Storsjo <martin@martin.st> Remove the executable bit from source files

Change-Id: I3c105b7e2736ade22de0bb12f396859816b3adf7
odecs/amrnb/dec/test/amrnbdec_test.cpp
odecs/on2/h264dec/inc/H264SwDecApi.h
odecs/on2/h264dec/inc/basetype.h
odecs/on2/h264dec/omxdl/arm_neon/api/armCOMM.h
odecs/on2/h264dec/omxdl/arm_neon/api/armCOMM_BitDec_s.h
odecs/on2/h264dec/omxdl/arm_neon/api/armCOMM_Bitstream.h
odecs/on2/h264dec/omxdl/arm_neon/api/armCOMM_IDCTTable.h
odecs/on2/h264dec/omxdl/arm_neon/api/armCOMM_IDCT_s.h
odecs/on2/h264dec/omxdl/arm_neon/api/armCOMM_MaskTable.h
odecs/on2/h264dec/omxdl/arm_neon/api/armCOMM_Version.h
odecs/on2/h264dec/omxdl/arm_neon/api/armCOMM_s.h
odecs/on2/h264dec/omxdl/arm_neon/api/armOMX.h
odecs/on2/h264dec/omxdl/arm_neon/api/omxtypes.h
odecs/on2/h264dec/omxdl/arm_neon/api/omxtypes_s.h
odecs/on2/h264dec/omxdl/arm_neon/src/armCOMM.c
odecs/on2/h264dec/omxdl/arm_neon/src/armCOMM_Bitstream.c
odecs/on2/h264dec/omxdl/arm_neon/src/armCOMM_IDCTTable.c
odecs/on2/h264dec/omxdl/arm_neon/src/armCOMM_MaskTable.c
odecs/on2/h264dec/omxdl/arm_neon/vc/api/armVC.h
odecs/on2/h264dec/omxdl/arm_neon/vc/api/armVCCOMM_s.h
odecs/on2/h264dec/omxdl/arm_neon/vc/api/omxVC.h
odecs/on2/h264dec/omxdl/arm_neon/vc/api/omxVC_s.h
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/api/armVCM4P10_CAVLCTables.h
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/armVCM4P10_CAVLCTables.c
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/omxVCM4P10_DeblockChroma_I.c
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/omxVCM4P10_DeblockLuma_I.c
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/omxVCM4P10_DecodeChromaDcCoeffsToPairCAVLC.c
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/omxVCM4P10_DecodeCoeffsToPairCAVLC.c
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/omxVCM4P10_InterpolateChroma.c
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p2/api/armVCM4P2_Huff_Tables_VLC.h
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p2/api/armVCM4P2_ZigZag_Tables.h
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p2/src/armVCM4P2_Huff_Tables_VLC.c
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p2/src/armVCM4P2_Lookup_Tables.c
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p2/src/armVCM4P2_Zigzag_Tables.c
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p2/src/omxVCM4P2_DecodeBlockCoef_Inter.c
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p2/src/omxVCM4P2_DecodeBlockCoef_Intra.c
odecs/on2/h264dec/omxdl/arm_neon/vc/src/armVC_Version.c
odecs/on2/h264dec/source/DecTestBench.c
odecs/on2/h264dec/source/EvaluationTestBench.c
odecs/on2/h264dec/source/TestBenchMultipleInstance.c
odecs/on2/h264dec/source/h264bsd_byte_stream.c
odecs/on2/h264dec/source/h264bsd_byte_stream.h
odecs/on2/h264dec/source/h264bsd_cavlc.c
odecs/on2/h264dec/source/h264bsd_cavlc.h
odecs/on2/h264dec/source/h264bsd_cfg.h
odecs/on2/h264dec/source/h264bsd_conceal.c
odecs/on2/h264dec/source/h264bsd_conceal.h
odecs/on2/h264dec/source/h264bsd_container.h
odecs/on2/h264dec/source/h264bsd_deblocking.c
odecs/on2/h264dec/source/h264bsd_deblocking.h
odecs/on2/h264dec/source/h264bsd_dpb.c
odecs/on2/h264dec/source/h264bsd_dpb.h
odecs/on2/h264dec/source/h264bsd_image.c
odecs/on2/h264dec/source/h264bsd_image.h
odecs/on2/h264dec/source/h264bsd_inter_prediction.c
odecs/on2/h264dec/source/h264bsd_inter_prediction.h
odecs/on2/h264dec/source/h264bsd_intra_prediction.c
odecs/on2/h264dec/source/h264bsd_intra_prediction.h
odecs/on2/h264dec/source/h264bsd_macroblock_layer.c
odecs/on2/h264dec/source/h264bsd_macroblock_layer.h
odecs/on2/h264dec/source/h264bsd_nal_unit.c
odecs/on2/h264dec/source/h264bsd_nal_unit.h
odecs/on2/h264dec/source/h264bsd_neighbour.c
odecs/on2/h264dec/source/h264bsd_neighbour.h
odecs/on2/h264dec/source/h264bsd_pic_order_cnt.c
odecs/on2/h264dec/source/h264bsd_pic_order_cnt.h
odecs/on2/h264dec/source/h264bsd_pic_param_set.c
odecs/on2/h264dec/source/h264bsd_pic_param_set.h
odecs/on2/h264dec/source/h264bsd_reconstruct.c
odecs/on2/h264dec/source/h264bsd_reconstruct.h
odecs/on2/h264dec/source/h264bsd_sei.c
odecs/on2/h264dec/source/h264bsd_sei.h
odecs/on2/h264dec/source/h264bsd_seq_param_set.h
odecs/on2/h264dec/source/h264bsd_slice_data.c
odecs/on2/h264dec/source/h264bsd_slice_data.h
odecs/on2/h264dec/source/h264bsd_slice_group_map.c
odecs/on2/h264dec/source/h264bsd_slice_group_map.h
odecs/on2/h264dec/source/h264bsd_slice_header.c
odecs/on2/h264dec/source/h264bsd_slice_header.h
odecs/on2/h264dec/source/h264bsd_storage.c
odecs/on2/h264dec/source/h264bsd_storage.h
odecs/on2/h264dec/source/h264bsd_stream.c
odecs/on2/h264dec/source/h264bsd_stream.h
odecs/on2/h264dec/source/h264bsd_transform.c
odecs/on2/h264dec/source/h264bsd_transform.h
odecs/on2/h264dec/source/h264bsd_util.c
odecs/on2/h264dec/source/h264bsd_util.h
odecs/on2/h264dec/source/h264bsd_vlc.c
odecs/on2/h264dec/source/h264bsd_vlc.h
odecs/on2/h264dec/source/h264bsd_vui.c
odecs/on2/h264dec/source/h264bsd_vui.h
33f45b51654999a8b9d29c8f9471794730b85393 07-Nov-2014 Wei Jia <wjia@google.com> am 6200e7f4: am 5cccfce1: Merge "AnotherPacketSource.cpp: Do not queue discontinity signal buffer resulted from seek." into lmp-mr1-dev automerge: e86c6d5

* commit '6200e7f43d977ad6698f018ee55e2f423ff8a87c':
AnotherPacketSource.cpp: Do not queue discontinity signal buffer resulted from seek.
6200e7f43d977ad6698f018ee55e2f423ff8a87c 07-Nov-2014 Wei Jia <wjia@google.com> am 5cccfce1: Merge "AnotherPacketSource.cpp: Do not queue discontinity signal buffer resulted from seek." into lmp-mr1-dev automerge: e86c6d5

* commit '5cccfce1d9f1d088a9c363a45e0affc4474c4716':
AnotherPacketSource.cpp: Do not queue discontinity signal buffer resulted from seek.
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
ttplive/LiveSession.cpp
ttplive/LiveSession.h
ttplive/M3UParser.cpp
ttplive/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
ttplive/LiveSession.cpp
ttplive/PlaylistFetcher.cpp
peg2ts/ATSParser.h
peg2ts/AnotherPacketSource.cpp
944f3112a6d3fca7c70602e9696508101385e57c 06-Nov-2014 Jeff Tinker <jtinker@google.com> am 6e0da022: am e0e8223c: am 1cf9ad1a: Merge "Pass resolution to Crypto plugin on format change" into lmp-mr1-dev

* commit '6e0da0226503ddea118d43962a76fa2fa56bad1e':
Pass resolution to Crypto plugin on format change
6e0da0226503ddea118d43962a76fa2fa56bad1e 06-Nov-2014 Jeff Tinker <jtinker@google.com> am e0e8223c: am 1cf9ad1a: Merge "Pass resolution to Crypto plugin on format change" into lmp-mr1-dev

* commit 'e0e8223c10e051b73fdcbed4fc67a69df2655c56':
Pass resolution to Crypto plugin on format change
1cf9ad1abb599ce4057189e0db154cf00b4913f8 06-Nov-2014 Jeff Tinker <jtinker@google.com> Merge "Pass resolution to Crypto plugin on format change" into lmp-mr1-dev
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
urfaceMediaSource.cpp
mx/GraphicBufferSource.cpp
mx/GraphicBufferSource.h
33223c4f97abb78fa8c92e1b8c817546f15d97e1 04-Nov-2014 Andy Hung <hunga@google.com> MediaCodec: Prevent stop() in the UNINITIALIZED state

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

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

Change-Id: I56cd557ce3525fe625db8c312d2557d3c8b51101
related-to-bug: 16034599
ediaCodec.cpp
53f3053c3bd106d6ddf9b6d800ad1ee843f82f32 31-Oct-2014 Eric Laurent <elaurent@google.com> am f6a22ab1: am b2147445: am 7011ee31: Merge "NuPlayer: reduce offload pause teardown timeout." into lmp-mr1-dev

* commit 'f6a22ab15c6d4f3bbb49a30a896dd73553fccc83':
NuPlayer: reduce offload pause teardown timeout.
f6a22ab15c6d4f3bbb49a30a896dd73553fccc83 31-Oct-2014 Eric Laurent <elaurent@google.com> am b2147445: am 7011ee31: Merge "NuPlayer: reduce offload pause teardown timeout." into lmp-mr1-dev

* commit 'b2147445920d99609ac8fda9f85220e43354af7e':
NuPlayer: reduce offload pause teardown timeout.
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
wesomePlayer.cpp
0a79a84eda75887b15a20e4e4bad19c480693770 28-Oct-2014 Lajos Molnar <lajos@google.com> am bc836432: Merge "libstagefright: set actual stride info for SW encoder input port" into lmp-mr1-dev automerge: 701b964 automerge: 294c7f3

* commit 'bc83643295f034ed518a1da4320b48157e1dece5':
libstagefright: set actual stride info for SW encoder input port
bc83643295f034ed518a1da4320b48157e1dece5 28-Oct-2014 Lajos Molnar <lajos@google.com> Merge "libstagefright: set actual stride info for SW encoder input port" into lmp-mr1-dev automerge: 701b964
automerge: 294c7f3

* commit '294c7f36e6a92419017e7fe2a204fba1284cdc08':
libstagefright: set actual stride info for SW encoder input port
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
Codec.cpp
odecs/avc/enc/SoftAVCEncoder.cpp
odecs/m4v_h263/enc/SoftMPEG4Encoder.cpp
odecs/on2/enc/SoftVPXEncoder.cpp
7d7dd19a556f9263263cc272f72137b8219ff99a 23-Oct-2014 Chong Zhang <chz@google.com> am 705a3077: am aa92298d: am 6f907217: Merge "stagefright: return failure on malformed TS streams" into lmp-mr1-dev

* commit '705a3077c3a9e6fc029895813e591358c0157207':
stagefright: return failure on malformed TS streams
705a3077c3a9e6fc029895813e591358c0157207 23-Oct-2014 Chong Zhang <chz@google.com> am aa92298d: am 6f907217: Merge "stagefright: return failure on malformed TS streams" into lmp-mr1-dev

* commit 'aa92298de3d7b619d7b0ce19a869681c7cec0a5c':
stagefright: return failure on malformed TS streams
6f907217c7a624c9e304f799d51771aff93c0f92 23-Oct-2014 Chong Zhang <chz@google.com> Merge "stagefright: return failure on malformed TS streams" into lmp-mr1-dev
bec38fb25753a82902e5f88c706bdcc48dced1dd 23-Oct-2014 Chong Zhang <chz@google.com> am ef72cc30: am 3e2655ec: am c99e2e46: am c3ddddbd: Merge "release camera without holding CameraSource mutex" into lmp-dev automerge: 168799c

* commit 'ef72cc30702138a38767cd80c93a996c8db7bfcd':
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
d48a3abfede5a95124ba11aec53f6d3e19adfc5d 23-Oct-2014 Lajos Molnar <lajos@google.com> am 11f437a6: am edcff417: am 42aae0c4: am f04e8b5e: am 25842048: Merge "stagefright: try to free codec instance if MediaCodec.release hangs" into lmp-dev

* commit '11f437a6665167d8aee6db59df6e4753aa190bf7':
stagefright: try to free codec instance if MediaCodec.release hangs
9b3d384753658a2b7985b1f4d124b09a8fb8f3b6 23-Oct-2014 Lajos Molnar <lajos@google.com> am ccaf667e: am ffe39811: am 8274b049: am cd3fc4e3: am 6ce19d24: Merge "Stagefright: MediaCodec: shutdown allocated codec on error" into lmp-dev

* commit 'ccaf667eb6e96a28caedb0d4f776b1ff9c4aed10':
Stagefright: MediaCodec: shutdown allocated codec on error
ef72cc30702138a38767cd80c93a996c8db7bfcd 22-Oct-2014 Chong Zhang <chz@google.com> am 3e2655ec: am c99e2e46: am c3ddddbd: Merge "release camera without holding CameraSource mutex" into lmp-dev automerge: 168799c

* commit '3e2655ec790900bf79d589313b5abd9284029a53':
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
11f437a6665167d8aee6db59df6e4753aa190bf7 22-Oct-2014 Lajos Molnar <lajos@google.com> am edcff417: am 42aae0c4: am f04e8b5e: am 25842048: Merge "stagefright: try to free codec instance if MediaCodec.release hangs" into lmp-dev

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

* commit 'ffe398116e5049e80ac818dbc621f06fe0196038':
Stagefright: MediaCodec: shutdown allocated codec on error
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
6456ae745e919085c5024f784aaa2703f9695f98 03-Sep-2014 David Yeh <david.yeh@mediatek.com> stagefright: return failure on malformed TS streams

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

Bug: 17997578
Change-Id: Iba93848ad10ba84d2d836573da7ce242c761582f
ameraSource.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
Codec.cpp
mx/OMXNodeInstance.cpp
4c32aee4b505aefadb04e6c88a039a7c6d0c4260 22-Oct-2014 Marco Nelissen <marcone@google.com> am fd460a1f: am 097fc64d: Merge "Don\'t signal an error at the end of a short file" into lmp-mr1-dev
automerge: 6cadfa9

* commit '6cadfa991df57daf139cc8fdbb6bc451dba9dd07':
Don't signal an error at the end of a short file
6cadfa991df57daf139cc8fdbb6bc451dba9dd07 21-Oct-2014 Marco Nelissen <marcone@google.com> am fd460a1f: am 097fc64d: Merge "Don\'t signal an error at the end of a short file" into lmp-mr1-dev

* commit 'fd460a1ff29132d31e51409f99ff4fedb59f0818':
Don't signal an error at the end of a short file
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
ediaCodec.cpp
04463608fc0d654b88c93d9b3e3f1fec931a61c3 16-Oct-2014 Chih-Hung Hsieh <chh@google.com> am 364caa16: am 8a8f2fdc: am 589a89f5: Merge "Add -no-integrated-as at local level."

* commit '364caa16fff1eea79d6191910921360d633f7ace':
Add -no-integrated-as at local level.
5eebc4b14af753168c25565cf550dccf1e4fe7c4 16-Oct-2014 Chih-Hung Hsieh <chh@google.com> am 8a8f2fdc: am 589a89f5: Merge "Add -no-integrated-as at local level."

* commit '8a8f2fdccf149cbddcbf4ae6ce12cf68ae0febf2':
Add -no-integrated-as at local level.
364caa16fff1eea79d6191910921360d633f7ace 16-Oct-2014 Chih-Hung Hsieh <chh@google.com> am 8a8f2fdc: am 589a89f5: Merge "Add -no-integrated-as at local level."

* commit '8a8f2fdccf149cbddcbf4ae6ce12cf68ae0febf2':
Add -no-integrated-as at local level.
8a8f2fdccf149cbddcbf4ae6ce12cf68ae0febf2 16-Oct-2014 Chih-Hung Hsieh <chh@google.com> am 589a89f5: Merge "Add -no-integrated-as at local level."

* commit '589a89f5a2a9aa08bdd9b78727f608f2f178f107':
Add -no-integrated-as at local level.
328aed8f37e1d1f388006c43752a4f7af7cb6c51 16-Oct-2014 Lajos Molnar <lajos@google.com> am 468ad9e1: am 3a7fe00b: am 44a1fd38: am ea405328: am c40da54b: Merge "Fix freed memory references" into lmp-dev

* commit '468ad9e1b720515a8c2d4a7fc0776921b5907861':
Fix freed memory references
468ad9e1b720515a8c2d4a7fc0776921b5907861 16-Oct-2014 Lajos Molnar <lajos@google.com> am 3a7fe00b: am 44a1fd38: am ea405328: am c40da54b: Merge "Fix freed memory references" into lmp-dev

* commit '3a7fe00be72b9477ab82931c5a8af145f5903e10':
Fix freed memory references
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
81a61194428d64215d80219a7a64ecf7fee8830d 16-Oct-2014 Lajos Molnar <lajos@google.com> am c40da54b: Merge "Fix freed memory references" into lmp-dev

* commit 'c40da54b34138856446e79245ac45600191962b5':
Fix freed memory references
c40da54b34138856446e79245ac45600191962b5 16-Oct-2014 Lajos Molnar <lajos@google.com> Merge "Fix freed memory references" into lmp-dev
6b8feeedf65351fd78509bbb89b806c04f8939ca 16-Oct-2014 Chih-Hung Hsieh <chh@google.com> Add -no-integrated-as at local level.

Later we will enable integrated-as as default at the global level.

BUG: 17820427
Change-Id: I5d95ef260c097961cb2bf2f15155572c2b24cb0e
odecs/on2/h264dec/Android.mk
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
PEG4Extractor.cpp
b1f5ab447c6b44c810f5e97aeef381c93347a47a 16-Oct-2014 Marco Nelissen <marcone@google.com> Don't signal an error at the end of a short file

Just signaling EOS is sufficient

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

* commit 'b1c8f2200e3f1bc5d5448ade52dfc8a6d66cca27':
ACodec: only check crop rect on output port
cf39a9cfae576781b929b3280c4e28145001539d 15-Oct-2014 Lajos Molnar <lajos@google.com> am d7050b75: resolved conflicts for merge of f4147ee9 to lmp-mr1-dev-plus-aosp

* commit 'd7050b75c2ef33d1aabf71cf902f734c44c24639':
stagefright: fix surface input handling of software encoders
b1c8f2200e3f1bc5d5448ade52dfc8a6d66cca27 15-Oct-2014 Lajos Molnar <lajos@google.com> am 6bbf27e5: am e86f4be5: am 447898bc: Merge "ACodec: only check crop rect on output port" into lmp-dev

* commit '6bbf27e5a3beeca3046caef70e4e5acc487dd062':
ACodec: only check crop rect on output port
d7050b75c2ef33d1aabf71cf902f734c44c24639 15-Oct-2014 Lajos Molnar <lajos@google.com> resolved conflicts for merge of f4147ee9 to lmp-mr1-dev-plus-aosp

Change-Id: I3b66673012989ab3707852b257844f2c3851f753
70b126573cdb71965adac962fa7a670e9c876e75 15-Oct-2014 Lajos Molnar <lajos@google.com> am fa2ecc97: am 55e816d0: am 9195b11b: am 512e9792: stagefright: support passing GraphicBuffer in metadata buffer

* commit 'fa2ecc97c00ecac8f62340b59247dc9f9f004193':
stagefright: support passing GraphicBuffer in metadata buffer
fa2ecc97c00ecac8f62340b59247dc9f9f004193 15-Oct-2014 Lajos Molnar <lajos@google.com> am 55e816d0: am 9195b11b: am 512e9792: stagefright: support passing GraphicBuffer in metadata buffer

* commit '55e816d0b50a9887e07006fccc026ee33206df50':
stagefright: support passing GraphicBuffer in metadata buffer
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
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
b0b36e6dfc6e9b7adce4225e161e1d37bbb5af86 14-Oct-2014 Chong Zhang <chz@google.com> am dc9ac1cb: am 3384cfaa: am 1195142c: am 801a3ff8: Merge "handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat" into lmp-dev

* commit 'dc9ac1cb57625f72b92c414d8d90d9079afd9667':
handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat
dc9ac1cb57625f72b92c414d8d90d9079afd9667 14-Oct-2014 Chong Zhang <chz@google.com> am 3384cfaa: am 1195142c: am 801a3ff8: Merge "handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat" into lmp-dev

* commit '3384cfaa4b933e4406a41bc4362a74511e0a0e79':
handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat
260bca4fc6c9350209736614f72133d5ec21ee01 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
447898bca790fae2fdae304073162e980d816b79 14-Oct-2014 Lajos Molnar <lajos@google.com> Merge "ACodec: only check crop rect on output port" into lmp-dev
4fed5e4e7f2eb744b9f2e3c52ec23539256cdbca 14-Oct-2014 Lajos Molnar <lajos@google.com> resolved conflicts for merge of 2edda09a to lmp-dev-plus-aosp

Change-Id: I760286b72fe1ebda3e8b058ca2138cb97fbdb7e1
5a2d81752e714e206114ff3d4a9892880d28f64e 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
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
odecs/avc/enc/SoftAVCEncoder.cpp
odecs/avc/enc/SoftAVCEncoder.h
odecs/m4v_h263/enc/SoftMPEG4Encoder.cpp
odecs/m4v_h263/enc/SoftMPEG4Encoder.h
odecs/on2/enc/Android.mk
odecs/on2/enc/SoftVPXEncoder.cpp
odecs/on2/enc/SoftVPXEncoder.h
nclude/SoftVideoEncoderOMXComponent.h
mx/Android.mk
mx/SoftVideoEncoderOMXComponent.cpp
512e979284de984427e5b2f73b9054ae1b5e2b0a 11-Oct-2014 Lajos Molnar <lajos@google.com> stagefright: support passing GraphicBuffer in metadata buffer

Bug: 17935149
Change-Id: I6bb5dd654e498a7153410afc052c2c8f7f35e44d
nclude/OMXNodeInstance.h
mx/GraphicBufferSource.cpp
mx/GraphicBufferSource.h
mx/OMXNodeInstance.cpp
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
ff111660b19f6d0f0b7cd97896806490033e6add 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
801a3ff80c36aa9b55dc9b360d0e59f863011a39 13-Oct-2014 Chong Zhang <chz@google.com> Merge "handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat" into lmp-dev
1171a65e3998926ef298162d27b3eae7ddee1d71 13-Oct-2014 Wei Jia <wjia@google.com> am a15b3424: am 7d2b381f: am e39c1929: am 7225187b: Merge "ACodec: process deferred messages when entering Loaded state." into lmp-dev

* commit 'a15b34244cb9d4e65ed4fede11c9fb83b7fb46c5':
ACodec: process deferred messages when entering Loaded state.
a15b34244cb9d4e65ed4fede11c9fb83b7fb46c5 13-Oct-2014 Wei Jia <wjia@google.com> am 7d2b381f: am e39c1929: am 7225187b: Merge "ACodec: process deferred messages when entering Loaded state." into lmp-dev

* commit '7d2b381f6a611e60f715e8356269c71ecc7f5884':
ACodec: process deferred messages when entering Loaded state.
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.
319898b799cb0c2c58174c8d5702a22f822421eb 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
Codec.cpp
odecs/g711/dec/SoftG711.cpp
f3b6913fc41ebca57c41ce6fdca4cdbdcc1885ce 13-Oct-2014 Guang Zhu <guangzhu@google.com> am 0ed9ef31: am 0f69763d: am ee3f39f6: am 380757ba: Merge "Revert "handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat"" into lmp-dev

* commit '0ed9ef31c302ebe081589f8e8603832f79c664a8':
Revert "handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat"
0ed9ef31c302ebe081589f8e8603832f79c664a8 13-Oct-2014 Guang Zhu <guangzhu@google.com> am 0f69763d: am ee3f39f6: am 380757ba: Merge "Revert "handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat"" into lmp-dev

* commit '0f69763d41c101a2afcac7f10be86b41974f1279':
Revert "handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat"
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"
935c97aa76b2b6f2e44695a478d700b37268ce4f 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
Codec.cpp
957f6a79226f7efd3c41ccee131f86a85214576f 11-Oct-2014 Chong Zhang <chz@google.com> am 8f114eb1: am 1d6fe042: am 92ab9962: am aec1dbfd: Merge "handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat" into lmp-dev

* commit '8f114eb1428605ca5ba1e472d6401d1d9f211f14':
handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat
8f114eb1428605ca5ba1e472d6401d1d9f211f14 11-Oct-2014 Chong Zhang <chz@google.com> am 1d6fe042: am 92ab9962: am aec1dbfd: Merge "handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat" into lmp-dev

* commit '1d6fe0424915ce575747c2c2fe7c79a911df7e37':
handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat
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
Codec.cpp
a0041d67a7d45e55ed88a7b0ff548708fa82872e 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
115ba24deb7baacdc50fab5b7c673ea589ccb938 11-Oct-2014 Lajos Molnar <lajos@google.com> am 8250b497: am 392730f7: am 6f559515: am a4c3d8f0: Merge "MediaCodec: fix onError and onInputBufferAvailable" into lmp-dev

* commit '8250b4978e1c9f3ceba7e748929d9e126c65eb90':
MediaCodec: fix onError and onInputBufferAvailable
d7eb9ed5a81e593d309a070518a1a344c5d5794c 11-Oct-2014 Mark Salyzyn <salyzyn@google.com> am c0db452b: am dba83c1c: libstagefright: compile errors

* commit 'c0db452b030b4e169a3c539847ccba424ba39c81':
libstagefright: compile errors
8250b4978e1c9f3ceba7e748929d9e126c65eb90 10-Oct-2014 Lajos Molnar <lajos@google.com> am 392730f7: am 6f559515: am a4c3d8f0: Merge "MediaCodec: fix onError and onInputBufferAvailable" into lmp-dev

* commit '392730f7c04e090e9cee61926dfebed96a805085':
MediaCodec: fix onError and onInputBufferAvailable
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
367272ce53b31a1b0c97df3a6107b75eba4fd9b1 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
Codec.cpp
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
ediaCodec.cpp
c0db452b030b4e169a3c539847ccba424ba39c81 08-Oct-2014 Mark Salyzyn <salyzyn@google.com> am dba83c1c: libstagefright: compile errors

* commit 'dba83c1cb1bef03bc5d1760c2639d06ff71c0fa7':
libstagefright: compile errors
dba83c1cb1bef03bc5d1760c2639d06ff71c0fa7 08-Oct-2014 Mark Salyzyn <salyzyn@google.com> libstagefright: compile errors

Change-Id: I752d7d73f9c4939160a1ccaefc44ce1f8ffd9982
ameraSource.cpp
PEG4Writer.cpp
MXCodec.cpp
odecs/m4v_h263/dec/SoftMPEG4.cpp
odecs/on2/dec/SoftVPX.cpp
91a3cc00db31a713a25848f345bd624ac2ad8dc5 08-Oct-2014 Lajos Molnar <lajos@google.com> ACodec: only check crop rect on output port

Bug: 17789956
Change-Id: I0e17660d95ac0b3b051e7f555820188d9286571a
Codec.cpp
cfa976c4defcdb8eb5ac2d6c4d7210ed131627c5 07-Oct-2014 Marco Nelissen <marcone@google.com> am 2d097456: am a130edc3: am 5002d02e: Merge "Recover from errors" into lmp-dev

* commit '2d09745626af3f3c052da58df5507f92d9244e3a':
Recover from errors
2d09745626af3f3c052da58df5507f92d9244e3a 07-Oct-2014 Marco Nelissen <marcone@google.com> am a130edc3: am 5002d02e: Merge "Recover from errors" into lmp-dev

* commit 'a130edc34859cc27b258de865551b1b62b920e5c':
Recover from errors
baf1ce14dbcf594779e6a465b4f07b51e483fe20 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
703424dad7b1ffb7e55fb4780f609e3d3e514f5a 07-Oct-2014 Rachad <rachad@google.com> am 9d06b802: am 42fc04ff: am 584c14c3: Merge "stagefright: do not allocate output buffers for tunneled playback" into lmp-dev

* commit '9d06b8026d551c24527d6f72f134046d94068c46':
stagefright: do not allocate output buffers for tunneled playback
9d06b8026d551c24527d6f72f134046d94068c46 07-Oct-2014 Rachad <rachad@google.com> am 42fc04ff: am 584c14c3: Merge "stagefright: do not allocate output buffers for tunneled playback" into lmp-dev

* commit '42fc04ff4db20f2de12834818a73778ec9ede052':
stagefright: do not allocate output buffers for tunneled playback
292cf155f105915f896877a7be83e46bdf4275d2 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
584c14c370f141685b7e8963a13ed91584383ca1 07-Oct-2014 Rachad <rachad@google.com> Merge "stagefright: do not allocate output buffers for tunneled playback" into lmp-dev
5a46e4e1fd70e713c6cf48f3a2e5dcdaf54f2d86 07-Oct-2014 Chih-Hung Hsieh <chh@google.com> am 2d15fb26: am 566a6fba: am ae38d425: Merge "Add -no-integrated-as at local level."

* commit '2d15fb26bb0f03623127ed4cde9d546b5d42884e':
Add -no-integrated-as at local level.
2d15fb26bb0f03623127ed4cde9d546b5d42884e 07-Oct-2014 Chih-Hung Hsieh <chh@google.com> am 566a6fba: am ae38d425: Merge "Add -no-integrated-as at local level."

* commit '566a6fba127771c752fd40db84f1e7aafa520ea6':
Add -no-integrated-as at local level.
6160044825b0686e59c11ddbcaf56c8086da4022 07-Oct-2014 Chih-Hung Hsieh <chh@google.com> am 566a6fba: am ae38d425: Merge "Add -no-integrated-as at local level."

* commit '566a6fba127771c752fd40db84f1e7aafa520ea6':
Add -no-integrated-as at local level.
566a6fba127771c752fd40db84f1e7aafa520ea6 07-Oct-2014 Chih-Hung Hsieh <chh@google.com> am ae38d425: Merge "Add -no-integrated-as at local level."

* commit 'ae38d425fdb3e3fea015c161d635d631172350c3':
Add -no-integrated-as at local level.
7cff5732dd9876ee9aabf08147e7efe3503637ff 07-Oct-2014 Chih-Hung Hsieh <chh@google.com> Add -no-integrated-as at local level.

Later we will enable integrated-as as default at the global level.

BUG: 17820427
Change-Id: I8e67a152f82afdd1d6b81793ee7dd721ab2b59df
odecs/amrwbenc/Android.mk
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
odecs/aacdec/SoftAAC2.cpp
09f9478131d7903404e173d4ddd9224294bb1a84 04-Oct-2014 Chong Zhang <chz@google.com> am bb2c8147: am dfc2a8f8: am f0011d49: Merge "MediaRecorder: only dequeue available buffers from MediaCodec" into lmp-dev

* commit 'bb2c8147452144a19f45bc2e58f1885cec40b8dc':
MediaRecorder: only dequeue available buffers from MediaCodec
bb2c8147452144a19f45bc2e58f1885cec40b8dc 04-Oct-2014 Chong Zhang <chz@google.com> am dfc2a8f8: am f0011d49: Merge "MediaRecorder: only dequeue available buffers from MediaCodec" into lmp-dev

* commit 'dfc2a8f8a7d5062ecb2af4b940e54c3ce52795e3':
MediaRecorder: only dequeue available buffers from MediaCodec
176dda365968a32eec62c440c14ac0d4133241f5 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
f2a64852a4a48c5a3d8a08ffcda20d6884586672 04-Oct-2014 Chong Zhang <chz@google.com> MediaRecorder: only dequeue available buffers from MediaCodec

Bug: 17514968
Change-Id: If232f92d163deb2440b927315c69e0c4d51ca290
ediaCodecSource.cpp
6466e82390ccd7b3dbb4c03a716fd25f0cb9777a 04-Oct-2014 Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org> Remove check for an impossible condition

offset_for_ref_frame is an array rather than a pointer - it can't be
NULL (and the check causes a warning in clang).

Change-Id: I9b96e1e723e3b8caebd41821137ed6fb669d8cd4
Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
odecs/avc/enc/src/init.cpp
47560a0f696f3060eea09dcae2f9bdfe91eb395a 03-Oct-2014 Ronghua Wu <ronghuawu@google.com> am 8c8b2e4d: am c4fd8b3b: am b220fe0e: Merge "stagefright: fix fake-stride handling for H263 SW decoder" into lmp-dev

* commit '8c8b2e4ddbae88751f47f1bc9d4e9e159d61ef24':
stagefright: fix fake-stride handling for H263 SW decoder
8c8b2e4ddbae88751f47f1bc9d4e9e159d61ef24 03-Oct-2014 Ronghua Wu <ronghuawu@google.com> am c4fd8b3b: am b220fe0e: Merge "stagefright: fix fake-stride handling for H263 SW decoder" into lmp-dev

* commit 'c4fd8b3b7fc24932626143ea45ab75192cc247c2':
stagefright: fix fake-stride handling for H263 SW decoder
34ae9da1a22e5bd73e26cf03b1ddfdb95b1a7454 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
b220fe0e40bc3752b62a9576fc824634a16fc3ab 03-Oct-2014 Ronghua Wu <ronghuawu@google.com> Merge "stagefright: fix fake-stride handling for H263 SW decoder" into lmp-dev
504f701d475bdefbd6a27f00933975bc501e072d 03-Oct-2014 Chih-Hung Hsieh <chh@google.com> am 2cf3340d: resolved conflicts for merge of c51e512a to lmp-mr1-dev-plus-aosp

* commit '2cf3340ddeb5d406909710ac8b74ff59d3451586':
Fix struct vs. class mismatches
2cf3340ddeb5d406909710ac8b74ff59d3451586 03-Oct-2014 Chih-Hung Hsieh <chh@google.com> resolved conflicts for merge of c51e512a to lmp-mr1-dev-plus-aosp

Change-Id: I281f72a222fccd7eb663b878a8c717b3f95baddd
36a7f5b2971f9125e908388113d5e52ddcb8822c 03-Oct-2014 Chong Zhang <chz@google.com> am 9b68037c: am f0d98899: am aaa527fb: Merge "send available codec buffer count with codec notification" into lmp-dev

* commit '9b68037c1f3fcf2a390dd796fb31b1d873fe4bea':
send available codec buffer count with codec notification
9b68037c1f3fcf2a390dd796fb31b1d873fe4bea 03-Oct-2014 Chong Zhang <chz@google.com> am f0d98899: am aaa527fb: Merge "send available codec buffer count with codec notification" into lmp-dev

* commit 'f0d98899b13c2f5735f1a2b8d0b7254b975b7860':
send available codec buffer count with codec notification
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
odecs/m4v_h263/dec/SoftMPEG4.cpp
mx/SoftVideoDecoderOMXComponent.cpp
42ba9ebd280fdab8d8796bf94b444eaaf188ac67 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
07ea94c589ea6d6ee3aeb1e9ef9d4100217738c8 03-Oct-2014 Lajos Molnar <lajos@google.com> am 9236887a: am 2e74aefd: am fc93499e: Merge "mediarecorder: set level if setting default profile" into lmp-dev

* commit '9236887ac5dfa526d1a90dd5e0a3c3095f443e70':
mediarecorder: set level if setting default profile
9236887ac5dfa526d1a90dd5e0a3c3095f443e70 03-Oct-2014 Lajos Molnar <lajos@google.com> am 2e74aefd: am fc93499e: Merge "mediarecorder: set level if setting default profile" into lmp-dev

* commit '2e74aefdc1e77e6623bd869fb94eba1e1a7eeb0c':
mediarecorder: set level if setting default profile
2193622ebd2d7d079061dc816c9d6e0260e1c89f 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
e1f2739b0a53e98a0d8dc124250f99c17515b90e 03-Oct-2014 Lajos Molnar <lajos@google.com> am f973c881: resolved conflicts for merge of 55fc6a77 to lmp-mr1-dev-plus-aosp

* commit 'f973c881e3f3c1cbb91e4eb0e65f57bb23ed5758':
stagefright: move math templates into AUtils.h
ee4a92f4c89a099e7ef4531460b8cb3ff8b941a2 03-Oct-2014 Lajos Molnar <lajos@google.com> resolved conflicts for merge of 8b76b592 to lmp-dev-plus-aosp

Change-Id: I8f40237670ee7345abef562e7461391475787b3e
f973c881e3f3c1cbb91e4eb0e65f57bb23ed5758 03-Oct-2014 Lajos Molnar <lajos@google.com> resolved conflicts for merge of 55fc6a77 to lmp-mr1-dev-plus-aosp

Change-Id: I6bff1d0d214132cbafda081a39016b5b11730865
e47d44486f0a9f9b828b01d0fbaf84f5573f0aa2 30-Sep-2014 Chong Zhang <chz@google.com> send available codec buffer count with codec notification

Bug: 14679336
Change-Id: Id927c96a9a14dd6ecd72540f0037d5841aa32154
ediaCodec.cpp
6d4d3c2c99f0beccf2dd5db31ba8e016efc98e69 02-Oct-2014 Chih-Hung Hsieh <chh@google.com> resolved conflicts for merge of c51e512a to lmp-dev-plus-aosp

Change-Id: I84fae98361d1e2606e5ac2014ae9eef70c884d0e
c51e512ae6341326a584d65e93b3bd1a8190ad05 02-Oct-2014 Chih-hung Hsieh <chh@google.com> am c8871d2c: Merge "Fix struct vs. class mismatches"

* commit 'c8871d2cce58f7fa0985d4ace5fec73d468b1afd':
Fix struct vs. class mismatches
a147b4f91143d9f2fb608e22f9fca14bbd029573 02-Oct-2014 Lajos Molnar <lajos@google.com> mediarecorder: set level if setting default profile

Bug: 17676461
Change-Id: If01ccd09935945d330de0842be95c3544951b6b9
Codec.cpp
f9c01190b1305d5602ca799003d9dcaed4feb10d 02-Oct-2014 Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org> Fix struct vs. class mismatches

Fix class vs. struct mismatches clang whines about.

Change-Id: Ia551c796b6a5df8317943715447d0c28cdbf465a
Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
atroska/MatroskaExtractor.h
imedtext/TimedTextPlayer.h
imedtext/TimedTextSRTSource.h
e7c6790095545fa4e2bd6d534ae8d8a6fb486f37 02-Oct-2014 Chong Zhang <chz@google.com> am bc6b959b: am 52cb10c4: am d0b9efe7: Merge "add AAC audio decoder params for PCM limiter enable" into lmp-dev

* commit 'bc6b959b0ff5f4fc83a049cba989edc0a06ae043':
add AAC audio decoder params for PCM limiter enable
f75baebba3a35780df156d1378e18c38097f7c6c 02-Oct-2014 Robert Shih <robertshih@google.com> am b76c2702: am 8359c43a: am 3af67d03: Merge "GenericSource: support disconnect before NuCachedSource2 is created" into lmp-dev

* commit 'b76c2702fcae662b7ac0523d4735ef90c0f6dbba': (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
...
bc6b959b0ff5f4fc83a049cba989edc0a06ae043 02-Oct-2014 Chong Zhang <chz@google.com> am 52cb10c4: am d0b9efe7: Merge "add AAC audio decoder params for PCM limiter enable" into lmp-dev

* commit '52cb10c4d794e5041e04f20d716aac82c325b06b':
add AAC audio decoder params for PCM limiter enable
b76c2702fcae662b7ac0523d4735ef90c0f6dbba 02-Oct-2014 Robert Shih <robertshih@google.com> am 8359c43a: am 3af67d03: Merge "GenericSource: support disconnect before NuCachedSource2 is created" into lmp-dev

* commit '8359c43a8261ee2cc1f8580f5722975d952421c9': (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
...
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
ests/Android.mk
ests/Utils_test.cpp
17bef6401492d996232b5bc0859529a79834e810 02-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
b7492f5616e7f71dfd1297bdd99c68079ddc6825 02-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
...
4257bb32d205be46575004ffb2152e4fdd6a7d0e 02-Oct-2014 Robert Shih <robertshih@google.com> am 9d95919b: am 1f4b162e: Merge "NuCachedSource2: fix disconnect process" into lmp-dev

* commit '9d95919badc9efa688eafe0102eef5703fe0181e':
NuCachedSource2: fix disconnect process
154fb611580fabb1620b60b78982cdd19c6b3eea 02-Oct-2014 Marco Nelissen <marcone@google.com> am b9e2210b: am c06cf18e: Merge "Check if info for uri is available" into lmp-dev

* commit 'b9e2210ba2b5718371eecac880ab10ec528c2f36':
Check if info for uri is available
9d95919badc9efa688eafe0102eef5703fe0181e 02-Oct-2014 Robert Shih <robertshih@google.com> am 1f4b162e: Merge "NuCachedSource2: fix disconnect process" into lmp-dev

* commit '1f4b162e0bee6bcb0c9de464087db286270f5525':
NuCachedSource2: fix disconnect process
b9e2210ba2b5718371eecac880ab10ec528c2f36 02-Oct-2014 Marco Nelissen <marcone@google.com> am c06cf18e: Merge "Check if info for uri is available" into lmp-dev

* commit 'c06cf18e5933cfddddfe86df85b72e1d5f7fcdde':
Check if info for uri is available
35350276dd11b6ffbfda3a3837b0096dce37f18f 01-Oct-2014 Robert Shih <robertshih@google.com> am 1f4b162e: Merge "NuCachedSource2: fix disconnect process" into lmp-dev

* commit '1f4b162e0bee6bcb0c9de464087db286270f5525':
NuCachedSource2: fix disconnect process
d0b9efe7d8300e48f7a99c1dd746d60060206b3c 01-Oct-2014 Chong Zhang <chz@google.com> Merge "add AAC audio decoder params for PCM limiter enable" into lmp-dev
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
ataSource.cpp
2965f4eb7dceaf1173f0e2d93c11c28293aeead7 01-Oct-2014 Chong Zhang <chz@google.com> add AAC audio decoder params for PCM limiter enable

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

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

Bug: 17696761
Change-Id: I98bfc3f5f06594915bd58faf71fbcded482664d2
uCachedSource2.cpp
fb77d9c7cf5830bbdc2d96c4664e6804f83fc7a5 01-Oct-2014 Marco Nelissen <marcone@google.com> am c06cf18e: Merge "Check if info for uri is available" into lmp-dev

* commit 'c06cf18e5933cfddddfe86df85b72e1d5f7fcdde':
Check if info for uri is available
6300cbe99899da0103c910ba6a35c785261ce433 30-Sep-2014 Marco Nelissen <marcone@google.com> Check if info for uri is available

before retrieving it.

Bug: 17683986
Change-Id: I7a44cd06faf11c22be2ed5ace8ab6e2a5513b66c
ttplive/LiveSession.cpp
70227284397f33a32c40657bc3b4e4e263e4aa60 30-Sep-2014 Chih-hung Hsieh <chh@google.com> am 8a82259d: am 91228597: am 95fd067c: Merge "Fix linkage when building with clang, Intel CC or gcc -O0"

* commit '8a82259dd3e2eee11a3740289f0143028d791379':
Fix linkage when building with clang, Intel CC or gcc -O0
90e0d9c5864032ddb9806476fc58f9ef0014995b 30-Sep-2014 Chih-hung Hsieh <chh@google.com> am 91228597: am 95fd067c: Merge "Fix linkage when building with clang, Intel CC or gcc -O0"

* commit '912285971c9bdb358b1fc06a7ea320fc8f001d5c':
Fix linkage when building with clang, Intel CC or gcc -O0
8a82259dd3e2eee11a3740289f0143028d791379 30-Sep-2014 Chih-hung Hsieh <chh@google.com> am 91228597: am 95fd067c: Merge "Fix linkage when building with clang, Intel CC or gcc -O0"

* commit '912285971c9bdb358b1fc06a7ea320fc8f001d5c':
Fix linkage when building with clang, Intel CC or gcc -O0
912285971c9bdb358b1fc06a7ea320fc8f001d5c 30-Sep-2014 Chih-hung Hsieh <chh@google.com> am 95fd067c: Merge "Fix linkage when building with clang, Intel CC or gcc -O0"

* commit '95fd067cc8dc8cd10bd14dba5bc2000600c75449':
Fix linkage when building with clang, Intel CC or gcc -O0
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
Codec.cpp
7c0a284cbc227e35213d3c606edd29c05225f3a7 28-Sep-2014 Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org> Fix linkage when building with clang, Intel CC or gcc -O0

This code fails to link when using clang, Intel CC, or gcc -O0 because of the
CHECK_GT statement in WifiDisplaySource::scheduleKeepAlive (explanation
at https://gcc.gnu.org/wiki/VerboseDiagnostics#missing_static_const_definition,
doesn't show up with gcc when optimizations are enabled because the
entire CHECK_GT statement is optimized away).

This fixes https://code.google.com/p/android/issues/detail?id=58221

Change-Id: I43d3629819a01971846c31e9f755d6e0567fb838
Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
ifi-display/source/WifiDisplaySource.cpp
e0a2c77a44c2b8d245ae5284bf5fcd0a97efcd6e 26-Sep-2014 Marco Nelissen <marcone@google.com> am 6ff94763: am ea55da94: Merge "Fix SoftAAC2 flush" into lmp-dev

* commit '6ff947631cda2e3d4e47f97616dc70fd320d2c4a':
Fix SoftAAC2 flush
6ff947631cda2e3d4e47f97616dc70fd320d2c4a 26-Sep-2014 Marco Nelissen <marcone@google.com> am ea55da94: Merge "Fix SoftAAC2 flush" into lmp-dev

* commit 'ea55da9434f674efaacaa443c97a411bdef4ff1a':
Fix SoftAAC2 flush
a807217d06b4de4ba26124260bae544d8d71ff57 26-Sep-2014 Marco Nelissen <marcone@google.com> am ea55da94: Merge "Fix SoftAAC2 flush" into lmp-dev

* commit 'ea55da9434f674efaacaa443c97a411bdef4ff1a':
Fix SoftAAC2 flush
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
odecs/aacdec/SoftAAC2.cpp
8a836ce76a7328df6dc274f65935b176060989f3 25-Sep-2014 Andy Hung <hunga@google.com> am 3529b78d: am c0d17e34: Merge "NuPlayer: Fix decoder error handling" into lmp-dev

* commit '3529b78d2b430aac5b8f1e48bd37c0201fb1d0f7':
NuPlayer: Fix decoder error handling
9eb15bc4fabf48a2aa9ceac7ad71d4b48f5bff18 25-Sep-2014 Lajos Molnar <lajos@google.com> am 8eb58498: am a935c76f: stagefright: Advertise 16x16 alignment requirement for PV codecs

* commit '8eb584988fde8e2018399a2444a6c04cf5b5c872':
stagefright: Advertise 16x16 alignment requirement for PV codecs
9025e58140d00056016d8624d669b944ccf4f1b4 25-Sep-2014 Lajos Molnar <lajos@google.com> am 96d35b5a: am 4a34b9a4: Merge "stagefright: use frame height if slice height is 0" into lmp-dev

* commit '96d35b5a993436bdb59e12b3fb1406c206b7e682':
stagefright: use frame height if slice height is 0
84524492d9f63341583ceb33a7b8bbe861d92dc4 25-Sep-2014 Ronghua Wu <ronghuawu@google.com> am 8ef929fe: am 70a250ab: Merge "SoftVideoDecoderOMXComponent: re-config the buffer size when port definition changed." into lmp-dev

* commit '8ef929fe7128a3813b18174711903e62e2a96488':
SoftVideoDecoderOMXComponent: re-config the buffer size when port definition changed.
6073f4e748d1dc3d576611e77ed09b39f6bc5197 25-Sep-2014 Ronghua Wu <ronghuawu@google.com> am 7e12b5ac: am cae1c0fa: Merge "stagefright: fix cropping handling for SoftAVC and SoftMEPEG4." into lmp-dev

* commit '7e12b5ac00a4544e27d39942684a68f2ca0a6cb2':
stagefright: fix cropping handling for SoftAVC and SoftMEPEG4.
ea2e2976689d09210500be6a8cda19f03f9fe9af 25-Sep-2014 Robert Shih <robertshih@google.com> am 39c6d5ea: am ec5206c9: Merge "LiveSession: do not drop seek request" into lmp-dev

* commit '39c6d5ea8bc5ddfad2ffd55f1fcb6b40981ce378':
LiveSession: do not drop seek request
37acc9a2ea028c5dad1c6ea744d6727f6b802501 25-Sep-2014 Lajos Molnar <lajos@google.com> am 3e072400: am f74023f0: Merge "stagefright: return encrypted input buffer for secure codecs" into lmp-dev

* commit '3e07240000ed8df9f77733962850ee4ddbea0c7f':
stagefright: return encrypted input buffer for secure codecs
3529b78d2b430aac5b8f1e48bd37c0201fb1d0f7 25-Sep-2014 Andy Hung <hunga@google.com> am c0d17e34: Merge "NuPlayer: Fix decoder error handling" into lmp-dev

* commit 'c0d17e349901c3ccf6d15b7dcdf7fa30139c9750':
NuPlayer: Fix decoder error handling
8eb584988fde8e2018399a2444a6c04cf5b5c872 25-Sep-2014 Lajos Molnar <lajos@google.com> am a935c76f: stagefright: Advertise 16x16 alignment requirement for PV codecs

* commit 'a935c76f96b066941b34f81c42b3fe9d00db98c5':
stagefright: Advertise 16x16 alignment requirement for PV codecs
96d35b5a993436bdb59e12b3fb1406c206b7e682 25-Sep-2014 Lajos Molnar <lajos@google.com> am 4a34b9a4: Merge "stagefright: use frame height if slice height is 0" into lmp-dev

* commit '4a34b9a4759d7dcc2d2ad5bd96ea8477915dd67a':
stagefright: use frame height if slice height is 0
8ef929fe7128a3813b18174711903e62e2a96488 25-Sep-2014 Ronghua Wu <ronghuawu@google.com> am 70a250ab: Merge "SoftVideoDecoderOMXComponent: re-config the buffer size when port definition changed." into lmp-dev

* commit '70a250ab52079a4d02ff0687c07a73b2bd39feaf':
SoftVideoDecoderOMXComponent: re-config the buffer size when port definition changed.
7e12b5ac00a4544e27d39942684a68f2ca0a6cb2 25-Sep-2014 Ronghua Wu <ronghuawu@google.com> am cae1c0fa: Merge "stagefright: fix cropping handling for SoftAVC and SoftMEPEG4." into lmp-dev

* commit 'cae1c0fa3f4d5e2387f05a6055bf356914851c4b':
stagefright: fix cropping handling for SoftAVC and SoftMEPEG4.
39c6d5ea8bc5ddfad2ffd55f1fcb6b40981ce378 25-Sep-2014 Robert Shih <robertshih@google.com> am ec5206c9: Merge "LiveSession: do not drop seek request" into lmp-dev

* commit 'ec5206c99694d263ac099bf2c37f8119f43f74f1':
LiveSession: do not drop seek request
3e07240000ed8df9f77733962850ee4ddbea0c7f 25-Sep-2014 Lajos Molnar <lajos@google.com> am f74023f0: Merge "stagefright: return encrypted input buffer for secure codecs" into lmp-dev

* commit 'f74023f0fbd35b4e9382703dd34c14b440f3da43':
stagefright: return encrypted input buffer for secure codecs
737a25fb89af3caff9de1ea03d35ea7bf78a1dd5 25-Sep-2014 Andy Hung <hunga@google.com> am c0d17e34: Merge "NuPlayer: Fix decoder error handling" into lmp-dev

* commit 'c0d17e349901c3ccf6d15b7dcdf7fa30139c9750':
NuPlayer: Fix decoder error handling
c0d17e349901c3ccf6d15b7dcdf7fa30139c9750 25-Sep-2014 Andy Hung <hunga@google.com> Merge "NuPlayer: Fix decoder error handling" into lmp-dev
46b36cccd15c3d04fbde07ae348342a02488a09c 25-Sep-2014 Lajos Molnar <lajos@google.com> am a935c76f: stagefright: Advertise 16x16 alignment requirement for PV codecs

* commit 'a935c76f96b066941b34f81c42b3fe9d00db98c5':
stagefright: Advertise 16x16 alignment requirement for PV codecs
a935c76f96b066941b34f81c42b3fe9d00db98c5 25-Sep-2014 Lajos Molnar <lajos@google.com> stagefright: Advertise 16x16 alignment requirement for PV codecs

Bug: 17648616
Change-Id: Iaf276467ae9361d918feee1f72e13c7a60075819
ata/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
oundation/AMessage.cpp
78bb2faefa3d8295952532e6fc9b152966a0ce7d 25-Sep-2014 Lajos Molnar <lajos@google.com> am 4a34b9a4: Merge "stagefright: use frame height if slice height is 0" into lmp-dev

* commit '4a34b9a4759d7dcc2d2ad5bd96ea8477915dd67a':
stagefright: use frame height if slice height is 0
e6cc79067bef6bdfc52c17cb30b5512055151fa1 25-Sep-2014 Ronghua Wu <ronghuawu@google.com> am 70a250ab: Merge "SoftVideoDecoderOMXComponent: re-config the buffer size when port definition changed." into lmp-dev

* commit '70a250ab52079a4d02ff0687c07a73b2bd39feaf':
SoftVideoDecoderOMXComponent: re-config the buffer size when port definition changed.
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
83ab1b39f0bfffa44767a98f2048ed948ddc3973 25-Sep-2014 Ronghua Wu <ronghuawu@google.com> am cae1c0fa: Merge "stagefright: fix cropping handling for SoftAVC and SoftMEPEG4." into lmp-dev

* commit 'cae1c0fa3f4d5e2387f05a6055bf356914851c4b':
stagefright: fix cropping handling for SoftAVC and SoftMEPEG4.
20101cb51cef6b3d3d65bd358d068301fdbc5004 25-Sep-2014 Robert Shih <robertshih@google.com> am ec5206c9: Merge "LiveSession: do not drop seek request" into lmp-dev

* commit 'ec5206c99694d263ac099bf2c37f8119f43f74f1':
LiveSession: do not drop seek request
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
a3a4d9a0393b0b072d23855e5c2426421dd19729 25-Sep-2014 Lajos Molnar <lajos@google.com> am f74023f0: Merge "stagefright: return encrypted input buffer for secure codecs" into lmp-dev

* commit 'f74023f0fbd35b4e9382703dd34c14b440f3da43':
stagefright: return encrypted input buffer for secure codecs
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
odecs/m4v_h263/dec/SoftMPEG4.cpp
odecs/on2/h264dec/SoftAVC.cpp
odecs/on2/h264dec/SoftAVC.h
nclude/SoftVideoDecoderOMXComponent.h
mx/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
mx/SoftVideoDecoderOMXComponent.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
Codec.cpp
9f57f923fb46cb51aba3d29bfa74cb08aa542e17 24-Sep-2014 Chong Zhang <chz@google.com> am c81633f4: am 846202f5: Merge "NuCachedSource2: more fixes for source read hang" into lmp-dev

* commit 'c81633f483b2e75962800a4dde2a0eec779b0ad0':
NuCachedSource2: more fixes for source read hang
c81633f483b2e75962800a4dde2a0eec779b0ad0 24-Sep-2014 Chong Zhang <chz@google.com> am 846202f5: Merge "NuCachedSource2: more fixes for source read hang" into lmp-dev

* commit '846202f5483c30ff380fc997c7d4461cce090098':
NuCachedSource2: more fixes for source read hang
38b15533cf3a4a9ae79f18ae118196de6f781673 24-Sep-2014 Chong Zhang <chz@google.com> am 846202f5: Merge "NuCachedSource2: more fixes for source read hang" into lmp-dev

* commit '846202f5483c30ff380fc997c7d4461cce090098':
NuCachedSource2: more fixes for source read hang
846202f5483c30ff380fc997c7d4461cce090098 24-Sep-2014 Chong Zhang <chz@google.com> Merge "NuCachedSource2: more fixes for source read hang" into lmp-dev
3c8a4633c92205b4eea17c01e6a5e58bbe42790f 24-Sep-2014 Ronghua Wu <ronghuawu@google.com> am 6f785172: am 80ec934a: Merge "stagefright: add adaptive playback support to SoftHEVC decoder." into lmp-dev

* commit '6f7851724bf938e98d3c253941f73118463d974b':
stagefright: add adaptive playback support to SoftHEVC decoder.
6f7851724bf938e98d3c253941f73118463d974b 24-Sep-2014 Ronghua Wu <ronghuawu@google.com> am 80ec934a: Merge "stagefright: add adaptive playback support to SoftHEVC decoder." into lmp-dev

* commit '80ec934ae7d4e3a78af87554fdb77a58f6386ba0':
stagefright: add adaptive playback support to SoftHEVC decoder.
990fabe6625e9c51b322e75cc093c5b160785c1c 24-Sep-2014 Ronghua Wu <ronghuawu@google.com> am 80ec934a: Merge "stagefright: add adaptive playback support to SoftHEVC decoder." into lmp-dev

* commit '80ec934ae7d4e3a78af87554fdb77a58f6386ba0':
stagefright: add adaptive playback support to SoftHEVC decoder.
80ec934ae7d4e3a78af87554fdb77a58f6386ba0 24-Sep-2014 Ronghua Wu <ronghuawu@google.com> Merge "stagefright: add adaptive playback support to SoftHEVC decoder." into lmp-dev
9f3d1cffe3bbec35c1fb7fc7e206428728ac234e 24-Sep-2014 Chong Zhang <chz@google.com> NuCachedSource2: more fixes for source read hang

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

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

Bug: 17613805

Change-Id: Ibca4d3a4288ae9a9e2f5658a4240ace54efeb220
uCachedSource2.cpp
0837d0ac1b572923a27f1b0b742960fc64a6b162 24-Sep-2014 Lajos Molnar <lajos@google.com> stagefright: return encrypted input buffer for secure codecs

Bug: 17630446
Change-Id: I8a9352bcd00a3f4eb6fd2797d6809a8c1edc8482
ediaCodec.cpp
1aa26f787afc525e0deae31d856dce74a4b28a0f 12-Sep-2014 Ronghua Wu <ronghuawu@google.com> stagefright: add adaptive playback support to SoftHEVC decoder.

Bug: 17326758
Change-Id: I245e2bd1490e810094ca550fdddfa87075bc2056
odecs/hevcdec/SoftHEVC.cpp
odecs/hevcdec/SoftHEVC.h
nclude/SoftVideoDecoderOMXComponent.h
mx/SoftVideoDecoderOMXComponent.cpp
bcc1a8299224b35aa2d16cf522d4aa5bcfa1ab60 23-Sep-2014 Andy Hung <hunga@google.com> stagefright: Fix MediaCodec::init() AString name usage.

Change-Id: I7f9fcabafd60cba99af6049dc99b1a457db396c4
ediaCodec.cpp
0e7c2156cb646595d6e2f99193cd8b224233ce86 23-Sep-2014 Wei Jia <wjia@google.com> am 9c4a566e: am 5110d6a0: Merge "MyHandler: set ip address to an invalid one when getsockname() returns error." into lmp-dev

* commit '9c4a566ef19070c9aa431c6475800fbf32cbb97d':
MyHandler: set ip address to an invalid one when getsockname() returns error.
21479bed1acda3115371a4228d1e5cefeacca611 23-Sep-2014 Chong Zhang <chz@google.com> am b4c27684: am a44d8f71: Merge "fix crash when makeHTTPConnection fails with null pointer" into lmp-dev

* commit 'b4c27684ac4b33adb52a8977d5bf386d8d1cf933':
fix crash when makeHTTPConnection fails with null pointer
1a65cb0463b4456cc1110135bab39e86b86a99ce 23-Sep-2014 Andy Hung <hunga@google.com> am d20940ee: am d7f77cd7: Merge "MediaCodec: Fix deallocated pointer reference when calling reset()" into lmp-dev

* commit 'd20940ee9e9da7495a75569ccc513b4aa3ddc179':
MediaCodec: Fix deallocated pointer reference when calling reset()
d93ebc8aa9433678b36285f8d43dcbc00a8dd534 23-Sep-2014 Wei Jia <wjia@google.com> am 0973af24: am 0079b331: Merge "MediaBuffer: ABuffer will release MediaBuffer when it\'s destructed." into lmp-dev

* commit '0973af247786ff1be980390cc274364fca6b2d6e':
MediaBuffer: ABuffer will release MediaBuffer when it's destructed.
129e03672a58af34f24fea84e085aaed8e7847a5 23-Sep-2014 Robert Shih <robertshih@google.com> am 22d803cb: am 39e07162: Merge "NuPlayer HLS: better subtitle toggling" into lmp-dev

* commit '22d803cb7ee1f70f52455ec2fa0d0977df64aef3':
NuPlayer HLS: better subtitle toggling
9c4a566ef19070c9aa431c6475800fbf32cbb97d 23-Sep-2014 Wei Jia <wjia@google.com> am 5110d6a0: Merge "MyHandler: set ip address to an invalid one when getsockname() returns error." into lmp-dev

* commit '5110d6a00db5973881d06c39c60e477fb90a2d55':
MyHandler: set ip address to an invalid one when getsockname() returns error.
b4c27684ac4b33adb52a8977d5bf386d8d1cf933 23-Sep-2014 Chong Zhang <chz@google.com> am a44d8f71: Merge "fix crash when makeHTTPConnection fails with null pointer" into lmp-dev

* commit 'a44d8f71a4b9ebae87c386bc3fe19abc52590bb5':
fix crash when makeHTTPConnection fails with null pointer
43f691752e9c9a09a1fe08a441619cd9b0f96873 23-Sep-2014 Wei Jia <wjia@google.com> am 5110d6a0: Merge "MyHandler: set ip address to an invalid one when getsockname() returns error." into lmp-dev

* commit '5110d6a00db5973881d06c39c60e477fb90a2d55':
MyHandler: set ip address to an invalid one when getsockname() returns error.
881d26d30533f3f6f6d97399b237e5af2c7f44d5 23-Sep-2014 Chong Zhang <chz@google.com> am a44d8f71: Merge "fix crash when makeHTTPConnection fails with null pointer" into lmp-dev

* commit 'a44d8f71a4b9ebae87c386bc3fe19abc52590bb5':
fix crash when makeHTTPConnection fails with null pointer
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
tsp/MyHandler.h
2f87e069e90948526cb557c5e696cc67c40ed968 23-Sep-2014 Dan Albert <danalbert@google.com> am 8f230382: Merge "Fix a namespace collision."

* commit '8f230382b86e7b431211ceb0263d06c4bba1bf6b':
Fix a namespace collision.
a44d8f71a4b9ebae87c386bc3fe19abc52590bb5 23-Sep-2014 Chong Zhang <chz@google.com> Merge "fix crash when makeHTTPConnection fails with null pointer" into lmp-dev
06638ffa734d81136979d26897ce5e021eb17f7c 22-Sep-2014 Dan Albert <danalbert@google.com> Fix a namespace collision.

There's already an android::FileSource defined in
media/libstagefright/FileSource.h, and the two can conflict at link
time.

Change-Id: Id8d80e96c68af1c9bb2a153630c84b923a4f4d06
p4/FragmentedMP4Parser.cpp
d20940ee9e9da7495a75569ccc513b4aa3ddc179 22-Sep-2014 Andy Hung <hunga@google.com> am d7f77cd7: Merge "MediaCodec: Fix deallocated pointer reference when calling reset()" into lmp-dev

* commit 'd7f77cd78f5180ba7a04b270d632cc4f9f11718a':
MediaCodec: Fix deallocated pointer reference when calling reset()
0973af247786ff1be980390cc274364fca6b2d6e 22-Sep-2014 Wei Jia <wjia@google.com> am 0079b331: Merge "MediaBuffer: ABuffer will release MediaBuffer when it\'s destructed." into lmp-dev

* commit '0079b331227fc1555d7c5305f33917a570d44890':
MediaBuffer: ABuffer will release MediaBuffer when it's destructed.
22d803cb7ee1f70f52455ec2fa0d0977df64aef3 22-Sep-2014 Robert Shih <robertshih@google.com> am 39e07162: Merge "NuPlayer HLS: better subtitle toggling" into lmp-dev

* commit '39e07162be0680fd30bec7be50628883aa912ffd':
NuPlayer HLS: better subtitle toggling
217bde880be6f4d937caf9555ea98942883ebda0 22-Sep-2014 Chong Zhang <chz@google.com> fix crash when makeHTTPConnection fails with null pointer

Bug: 17608108
Change-Id: I4bdf6d09ae565418be3d6677b5ccac9072fb9b2c
ataSource.cpp
0f14717a5b89d2b020682dba1804a13b225beae0 22-Sep-2014 Andy Hung <hunga@google.com> am d7f77cd7: Merge "MediaCodec: Fix deallocated pointer reference when calling reset()" into lmp-dev

* commit 'd7f77cd78f5180ba7a04b270d632cc4f9f11718a':
MediaCodec: Fix deallocated pointer reference when calling reset()
d7f77cd78f5180ba7a04b270d632cc4f9f11718a 22-Sep-2014 Andy Hung <hunga@google.com> Merge "MediaCodec: Fix deallocated pointer reference when calling reset()" into lmp-dev
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
ediaCodec.cpp
6f7a0014777a68999c76b48feab4a85d4580c357 22-Sep-2014 Wei Jia <wjia@google.com> am 0079b331: Merge "MediaBuffer: ABuffer will release MediaBuffer when it\'s destructed." into lmp-dev

* commit '0079b331227fc1555d7c5305f33917a570d44890':
MediaBuffer: ABuffer will release MediaBuffer when it's destructed.
43035258db3a7335a3992b50b3e45573b263cd2a 22-Sep-2014 Robert Shih <robertshih@google.com> am 39e07162: Merge "NuPlayer HLS: better subtitle toggling" into lmp-dev

* commit '39e07162be0680fd30bec7be50628883aa912ffd':
NuPlayer HLS: better subtitle toggling
0079b331227fc1555d7c5305f33917a570d44890 22-Sep-2014 Wei Jia <wjia@google.com> Merge "MediaBuffer: ABuffer will release MediaBuffer when it's destructed." into lmp-dev
39e07162be0680fd30bec7be50628883aa912ffd 22-Sep-2014 Robert Shih <robertshih@google.com> Merge "NuPlayer HLS: better subtitle toggling" into lmp-dev
96e92b58b7e9647b4c7c2f54b62a1b357ab06b66 19-Sep-2014 Wei Jia <wjia@google.com> MediaBuffer: ABuffer will release MediaBuffer when it's destructed.

Bug: 17454455
Change-Id: Ia423bcc2e1fa39137f114eac44912ed15357bb99
Codec.cpp
ediaCodecSource.cpp
oundation/ABuffer.cpp
peg2ts/AnotherPacketSource.cpp
ifi-display/source/Converter.cpp
ifi-display/source/MediaPuller.cpp
162a431594e94c0da8e0dea2759e1d2931b419c5 20-Sep-2014 Marco Nelissen <marcone@google.com> am 8332b486: am 4409ba46: Merge "Fix ringbuffer handling" into lmp-dev

* commit '8332b48656c85e37a4d9f919069d7cc5e3286f34':
Fix ringbuffer handling
b44ce2f84691559672cfaf6bb8fd3a9ac43904f2 19-Sep-2014 Robert Shih <robertshih@google.com> NuPlayer HLS: better subtitle toggling

Bug: 17310061
Change-Id: Iacee1816285425aaad08c32b28591bb0162d5a85
ttplive/LiveSession.cpp
ttplive/LiveSession.h
ttplive/PlaylistFetcher.cpp
ttplive/PlaylistFetcher.h
8332b48656c85e37a4d9f919069d7cc5e3286f34 19-Sep-2014 Marco Nelissen <marcone@google.com> am 4409ba46: Merge "Fix ringbuffer handling" into lmp-dev

* commit '4409ba46fab830d81860edba056c3dc6e1c7c003':
Fix ringbuffer handling
120c25184754ff61e25072f4b668adabcfff9101 19-Sep-2014 Marco Nelissen <marcone@google.com> am 4409ba46: Merge "Fix ringbuffer handling" into lmp-dev

* commit '4409ba46fab830d81860edba056c3dc6e1c7c003':
Fix ringbuffer handling
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
odecs/aacdec/SoftAAC2.cpp
odecs/aacdec/SoftAAC2.h
60e21f8af87400ce1fe1dc3640b71524f40d75af 19-Sep-2014 Marco Nelissen <marcone@google.com> am 7f3ff4af: am b0ed4e3e: Merge "Always consider first buffer to be config" into lmp-dev

* commit '7f3ff4afc1cead44bbebce054b6fe32e28bee807':
Always consider first buffer to be config
7f3ff4afc1cead44bbebce054b6fe32e28bee807 19-Sep-2014 Marco Nelissen <marcone@google.com> am b0ed4e3e: Merge "Always consider first buffer to be config" into lmp-dev

* commit 'b0ed4e3e482cbdc2fa6c7853526597f4ae3f0972':
Always consider first buffer to be config
800599cdd50737de1cde483a34b39923750b0658 30-Aug-2014 Robert Shih <robertshih@google.com> LiveSession: do not drop seek request

Bug: 17538727
Change-Id: I28658b2779ac16512ff54adbe536d01790e6449e
ttplive/LiveSession.cpp
6106a846a8928d41c85c566e7b2f7af2cc4e7937 19-Sep-2014 Marco Nelissen <marcone@google.com> am b0ed4e3e: Merge "Always consider first buffer to be config" into lmp-dev

* commit 'b0ed4e3e482cbdc2fa6c7853526597f4ae3f0972':
Always consider first buffer to be config
b0ed4e3e482cbdc2fa6c7853526597f4ae3f0972 19-Sep-2014 Marco Nelissen <marcone@google.com> Merge "Always consider first buffer to be config" into lmp-dev
229b7a8d7c986645ef7ef75a36f27feb0c1a4117 19-Sep-2014 Marco Nelissen <marcone@google.com> Always consider first buffer to be config

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

Bug: 17567501
Change-Id: I8019da76466576e1b2984e9eccf09bdec593038a
odecs/aacdec/SoftAAC2.cpp
6f6b3a8601fca2aa09acb83aaa1b52fdbde702e9 18-Sep-2014 Robert Shih <robertshih@google.com> am 2973994a: Merge "PlaylistFetcher:don\'t signal a/v eos on subttitle eos" into lmp-dev

* commit '2973994af39d55b58728df3dca067594e826ea2a':
PlaylistFetcher:don't signal a/v eos on subttitle eos
01d73e300284cdb084bda82709bb78f62c08424b 18-Sep-2014 Robert Shih <robertshih@google.com> am dffc953b: am 2973994a: Merge "PlaylistFetcher:don\'t signal a/v eos on subttitle eos" into lmp-dev

* commit 'dffc953ba6c5561b5c9aaa7c9d3d20a14fd22483':
PlaylistFetcher:don't signal a/v eos on subttitle eos
dffc953ba6c5561b5c9aaa7c9d3d20a14fd22483 18-Sep-2014 Robert Shih <robertshih@google.com> am 2973994a: Merge "PlaylistFetcher:don\'t signal a/v eos on subttitle eos" into lmp-dev

* commit '2973994af39d55b58728df3dca067594e826ea2a':
PlaylistFetcher:don't signal a/v eos on subttitle eos
2973994af39d55b58728df3dca067594e826ea2a 18-Sep-2014 Robert Shih <robertshih@google.com> Merge "PlaylistFetcher:don't signal a/v eos on subttitle eos" into lmp-dev
9b5bb8853822b486be8f735e9c38a48daea35f55 18-Sep-2014 Marco Nelissen <marcone@google.com> am 999b888f: Merge "Fix null pointer dereference" into lmp-dev

* commit '999b888f07f4549b1f8490d7153e3b1704684ca2':
Fix null pointer dereference
4d17ac44875a09e50dfb0db38e82b5de172df694 18-Sep-2014 Marco Nelissen <marcone@google.com> am 0305de0d: am 999b888f: Merge "Fix null pointer dereference" into lmp-dev

* commit '0305de0d7856a78e78657c80f8fd783ea90bc20c':
Fix null pointer dereference
0305de0d7856a78e78657c80f8fd783ea90bc20c 18-Sep-2014 Marco Nelissen <marcone@google.com> am 999b888f: Merge "Fix null pointer dereference" into lmp-dev

* commit '999b888f07f4549b1f8490d7153e3b1704684ca2':
Fix null pointer dereference
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
odecs/aacdec/SoftAAC2.cpp
15f8ecfa23b650b3efa8fe841d2be6bd0c9523fb 15-Sep-2014 Robert Shih <robertshih@google.com> PlaylistFetcher:don't signal a/v eos on subttitle eos

Bug: 17310061
Change-Id: Ifbca3c12f21171a6e429dca51a250a41051fdd34
ttplive/LiveSession.cpp
59aa5d17a3335173f2a7256ddc4f61111fff36ff 17-Sep-2014 Robert Shih <robertshih@google.com> am 90869c2b: Merge "HLS: fix freezes when toggling between a/v streams" into lmp-dev

* commit '90869c2bef1bc47394a9f603ccebb62b2592fd2b':
HLS: fix freezes when toggling between a/v streams
2b792ff2d9a859cf36f7bec6986fc22ba954d74c 17-Sep-2014 Chong Zhang <chz@google.com> am fbbeeeb8: Merge "Disconnect HTTP-based data source upon reset" into lmp-dev

* commit 'fbbeeeb87c55c3eca94a709f9f8986190f6472a1':
Disconnect HTTP-based data source upon reset
d439e72e8b94304088f7662324793d352f615052 17-Sep-2014 Wei Jia <wjia@google.com> am 086c1e3f: Merge "ASessionDescription: allow open-ended NTP range." into lmp-dev

* commit '086c1e3f41a92aa0025a1da1db5dabbfdffaf129':
ASessionDescription: allow open-ended NTP range.
fe6e91fe69b171aae8bbd3e444b412824fabfa3c 17-Sep-2014 Robert Shih <robertshih@google.com> am 9299a687: Merge "ESQueue: do not merge aac packets" into lmp-dev

* commit '9299a6873a4b909357e031361055a888843619da':
ESQueue: do not merge aac packets
af06a5129b2243276883859d4e1b1fc8abdd59f2 17-Sep-2014 hkuang <hkuang@google.com> am db8556ba: Merge "Optimize the YUV buffer copy a little bit to skip unnecessary operation." into lmp-dev

* commit 'db8556baf10baefd286f7654c822fd0b648e71ef':
Optimize the YUV buffer copy a little bit to skip unnecessary operation.
ba3af094e9c6e5bad4e98dbc91998cf8040276e9 17-Sep-2014 Robert Shih <robertshih@google.com> am 60a89850: Merge "PlaylistFetcher: find the correct sequence number to start fetching" into lmp-dev

* commit '60a89850fdbb71fd48bdef3712b340cc2fa5a722':
PlaylistFetcher: find the correct sequence number to start fetching
8ba852e0c463e490642cb8684a4465cdb57d9828 17-Sep-2014 Robert Shih <robertshih@google.com> am 6c5febdb: am 90869c2b: Merge "HLS: fix freezes when toggling between a/v streams" into lmp-dev

* commit '6c5febdb65ce11ec50ba1d5197db2226a39d135f':
HLS: fix freezes when toggling between a/v streams
6c5febdb65ce11ec50ba1d5197db2226a39d135f 17-Sep-2014 Robert Shih <robertshih@google.com> am 90869c2b: Merge "HLS: fix freezes when toggling between a/v streams" into lmp-dev

* commit '90869c2bef1bc47394a9f603ccebb62b2592fd2b':
HLS: fix freezes when toggling between a/v streams
90869c2bef1bc47394a9f603ccebb62b2592fd2b 17-Sep-2014 Robert Shih <robertshih@google.com> Merge "HLS: fix freezes when toggling between a/v streams" into lmp-dev
3ac198d4444bc83e8410224b09a25607019f0f1a 17-Sep-2014 Chong Zhang <chz@google.com> am c67ae7b1: am fbbeeeb8: Merge "Disconnect HTTP-based data source upon reset" into lmp-dev

* commit 'c67ae7b1e2864fe6ed35c72e4561d46c284ccd60':
Disconnect HTTP-based data source upon reset
c67ae7b1e2864fe6ed35c72e4561d46c284ccd60 17-Sep-2014 Chong Zhang <chz@google.com> am fbbeeeb8: Merge "Disconnect HTTP-based data source upon reset" into lmp-dev

* commit 'fbbeeeb87c55c3eca94a709f9f8986190f6472a1':
Disconnect HTTP-based data source upon reset
fbbeeeb87c55c3eca94a709f9f8986190f6472a1 17-Sep-2014 Chong Zhang <chz@google.com> Merge "Disconnect HTTP-based data source upon reset" into lmp-dev
48296b792a8d68358de74141fa80bd5bd84d0307 14-Sep-2014 Chong Zhang <chz@google.com> Disconnect HTTP-based data source upon reset

Bug: 17425250

Change-Id: Ieb4c93fd9848489f9dbf35a36474376924fd8eb9
uCachedSource2.cpp
nclude/NuCachedSource2.h
83a28e80a631a3250da9cea814c75e2942668da0 16-Sep-2014 Wei Jia <wjia@google.com> am 14c702a6: am 086c1e3f: Merge "ASessionDescription: allow open-ended NTP range." into lmp-dev

* commit '14c702a634aeddb773ebdcbdd9e0fee7db0ff6d3':
ASessionDescription: allow open-ended NTP range.
e35ab2d1a43e39f0425ba353635c954048af619f 16-Sep-2014 hkuang <hkuang@google.com> am 13b44f1b: am db8556ba: Merge "Optimize the YUV buffer copy a little bit to skip unnecessary operation." into lmp-dev

* commit '13b44f1b089ecdfdcbb33a03767836084430d87f':
Optimize the YUV buffer copy a little bit to skip unnecessary operation.
f178b9fb647b0f9bdb315ea08fd190a7e98fc921 16-Sep-2014 Robert Shih <robertshih@google.com> am a45ee87a: am 60a89850: Merge "PlaylistFetcher: find the correct sequence number to start fetching" into lmp-dev

* commit 'a45ee87ac3b9e07567b7a5f09e66ad853cb4e8c1':
PlaylistFetcher: find the correct sequence number to start fetching
14c702a634aeddb773ebdcbdd9e0fee7db0ff6d3 16-Sep-2014 Wei Jia <wjia@google.com> am 086c1e3f: Merge "ASessionDescription: allow open-ended NTP range." into lmp-dev

* commit '086c1e3f41a92aa0025a1da1db5dabbfdffaf129':
ASessionDescription: allow open-ended NTP range.
e830c073786eac74f75ced405a0f22980d6d60bd 16-Sep-2014 Robert Shih <robertshih@google.com> am 9299a687: Merge "ESQueue: do not merge aac packets" into lmp-dev

* commit '9299a6873a4b909357e031361055a888843619da':
ESQueue: do not merge aac packets
13b44f1b089ecdfdcbb33a03767836084430d87f 16-Sep-2014 hkuang <hkuang@google.com> am db8556ba: Merge "Optimize the YUV buffer copy a little bit to skip unnecessary operation." into lmp-dev

* commit 'db8556baf10baefd286f7654c822fd0b648e71ef':
Optimize the YUV buffer copy a little bit to skip unnecessary operation.
a45ee87ac3b9e07567b7a5f09e66ad853cb4e8c1 16-Sep-2014 Robert Shih <robertshih@google.com> am 60a89850: Merge "PlaylistFetcher: find the correct sequence number to start fetching" into lmp-dev

* commit '60a89850fdbb71fd48bdef3712b340cc2fa5a722':
PlaylistFetcher: find the correct sequence number to start fetching
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
ttplive/LiveSession.cpp
ttplive/PlaylistFetcher.cpp
ttplive/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
tsp/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
peg2ts/ESQueue.cpp
peg2ts/ESQueue.h
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
mx/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
ttplive/PlaylistFetcher.cpp
ttplive/PlaylistFetcher.h
f2a0416b90d90a65c7572746d69e11a19dff18c1 13-Sep-2014 Robert Shih <robertshih@google.com> am b6237ba7: am 4d22f208: Merge "LiveSession: reliable switch" into lmp-dev

* commit 'b6237ba7b6fa796bb113e8bcd174d86780e816d4':
LiveSession: reliable switch
b6237ba7b6fa796bb113e8bcd174d86780e816d4 13-Sep-2014 Robert Shih <robertshih@google.com> am 4d22f208: Merge "LiveSession: reliable switch" into lmp-dev

* commit '4d22f2085141374fd88dba4142a8135f1bd9165c':
LiveSession: reliable switch
484ef36e4b3ad57393d20e89b1be191303288eb9 13-Sep-2014 Marco Nelissen <marcone@google.com> am 98584201: am de7e2ae6: Merge "Fix AAC timestamps for multiple aac frames per input buffer" into lmp-dev

* commit '985842013bd335df42737c4ffb83f280bf94f6a8':
Fix AAC timestamps for multiple aac frames per input buffer
6ca344831ccbe06147ec01d7fe557028b9d6f80a 13-Sep-2014 Robert Shih <robertshih@google.com> am a9176944: am f6454e6d: Merge "LiveSession: re-buffer on under run to avoid stutter" into lmp-dev

* commit 'a9176944a7fa0e683a6b1636d940dc9ce747cf66':
LiveSession: re-buffer on under run to avoid stutter
985842013bd335df42737c4ffb83f280bf94f6a8 13-Sep-2014 Marco Nelissen <marcone@google.com> am de7e2ae6: Merge "Fix AAC timestamps for multiple aac frames per input buffer" into lmp-dev

* commit 'de7e2ae67f198b3dcc861b0908ca099db10dab6f':
Fix AAC timestamps for multiple aac frames per input buffer
a9176944a7fa0e683a6b1636d940dc9ce747cf66 13-Sep-2014 Robert Shih <robertshih@google.com> am f6454e6d: Merge "LiveSession: re-buffer on under run to avoid stutter" into lmp-dev

* commit 'f6454e6d69f2ebb7b25c8e5275a0f301af8bca04':
LiveSession: re-buffer on under run to avoid stutter
7ea50388bd51cf2a45355139499314bed63e70ed 13-Sep-2014 Ronghua Wu <ronghuawu@google.com> am f2b68be8: am 98d59462: Merge "stagefright: add adaptive playback support to SoftMPEG decoder." into lmp-dev

* commit 'f2b68be88f6b892539e232170091722935ae369a':
stagefright: add adaptive playback support to SoftMPEG decoder.
4d22f2085141374fd88dba4142a8135f1bd9165c 13-Sep-2014 Robert Shih <robertshih@google.com> Merge "LiveSession: reliable switch" into lmp-dev
f4a48dfa8570d6a4708a868b8b15d1236f7ca54b 30-Aug-2014 Robert Shih <robertshih@google.com> LiveSession: reliable switch

Bug: 17142706
Change-Id: I9cd6c068178d62c294496e8ab0b0a3763354964f
ttplive/LiveSession.cpp
ttplive/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
f2b68be88f6b892539e232170091722935ae369a 12-Sep-2014 Ronghua Wu <ronghuawu@google.com> am 98d59462: Merge "stagefright: add adaptive playback support to SoftMPEG decoder." into lmp-dev

* commit '98d594620365088e05c4e5925bb00bf065b8caa1':
stagefright: add adaptive playback support to SoftMPEG decoder.
b85b737e451f1190618abe019cf9cdefd05ee3c3 12-Sep-2014 Robert Shih <robertshih@google.com> am c7cba6bd: am 84de1dc2: Merge "LiveSession: added onSwitchDown" into lmp-dev

* commit 'c7cba6bd440b5a1ec21f92e8698fa43e6bbd61f9':
LiveSession: added onSwitchDown
96a8ded521b6a92027e53599b58eb7fde012b73f 12-Sep-2014 Robert Shih <robertshih@google.com> am 3f667643: am 3b54aba0: Merge "LiveSession: raise upwards adaptation constraint" into lmp-dev

* commit '3f66764312658b3e67261eb2f4f52c36055f743f':
LiveSession: raise upwards adaptation constraint
d90215b49b286ff42be7748f5258da9b6c91fd19 12-Sep-2014 Robert Shih <robertshih@google.com> am deb2ee9f: am 5ea3378d: Merge "PlaylistFetcher: avoid repeated fetch when we run off the edge of live playlists" into lmp-dev

* commit 'deb2ee9fa977ea4f64bd73c7b046c0063945ff40':
PlaylistFetcher: avoid repeated fetch when we run off the edge of live playlists
2734bb9e5dbbacaf636644cbf12068b7e5aa09b8 12-Sep-2014 Dan Albert <danalbert@google.com> am bd014b81: am fe80b7ee: am 6bf7c5cf: Merge "Clean up test makefiles."

* commit 'bd014b81ef227752150bdbd1bb6a235db09f3616':
Clean up test makefiles.
f69c996864844e8f669308af8412cede043062a2 30-Aug-2014 Robert Shih <robertshih@google.com> LiveSession: re-buffer on under run to avoid stutter

Bug: 13742725
Change-Id: I7dad8876e18084c3c060d08190fa8a72fc2f5bad
ttplive/LiveSession.cpp
ttplive/LiveSession.h
615602a95590803e3dfe8e2ed204808a5f4e36e7 12-Sep-2014 Ronghua Wu <ronghuawu@google.com> am 236688e8: am 97187317: Merge "stagefright: add adaptive playback support to SoftAVC decoder." into lmp-dev

* commit '236688e800455c3a9d2a31a437f635dd7ff91fc7':
stagefright: add adaptive playback support to SoftAVC decoder.
08b58239685d3367733d12ff60210e3c8b9dc2ca 12-Sep-2014 Glenn Kasten <gkasten@android.com> am 75a39a7e: am 951c2197: am 2b16391d: Merge "Add test for AMR-NB decoder"

* commit '75a39a7eda320e958ea9919f4867f8581117639e':
Add test for AMR-NB decoder
98d594620365088e05c4e5925bb00bf065b8caa1 12-Sep-2014 Ronghua Wu <ronghuawu@google.com> Merge "stagefright: add adaptive playback support to SoftMPEG decoder." into lmp-dev
c7cba6bd440b5a1ec21f92e8698fa43e6bbd61f9 12-Sep-2014 Robert Shih <robertshih@google.com> am 84de1dc2: Merge "LiveSession: added onSwitchDown" into lmp-dev

* commit '84de1dc2512aa886638c103ee3e9f5c19f4a4a04':
LiveSession: added onSwitchDown
84de1dc2512aa886638c103ee3e9f5c19f4a4a04 12-Sep-2014 Robert Shih <robertshih@google.com> Merge "LiveSession: added onSwitchDown" into lmp-dev
3f66764312658b3e67261eb2f4f52c36055f743f 12-Sep-2014 Robert Shih <robertshih@google.com> am 3b54aba0: Merge "LiveSession: raise upwards adaptation constraint" into lmp-dev

* commit '3b54aba0883bdc5924290f44db8beb70da70ea26':
LiveSession: raise upwards adaptation constraint
deb2ee9fa977ea4f64bd73c7b046c0063945ff40 12-Sep-2014 Robert Shih <robertshih@google.com> am 5ea3378d: Merge "PlaylistFetcher: avoid repeated fetch when we run off the edge of live playlists" into lmp-dev

* commit '5ea3378d49285aaf39a544bcda7a98e331ad370a':
PlaylistFetcher: avoid repeated fetch when we run off the edge of live playlists
bd014b81ef227752150bdbd1bb6a235db09f3616 12-Sep-2014 Dan Albert <danalbert@google.com> am fe80b7ee: am 6bf7c5cf: Merge "Clean up test makefiles."

* commit 'fe80b7ee58b394b0cd958470aeea3c5a09f6b2bf':
Clean up test makefiles.
5f3cae8132e1682413613d6681f889cb3b6a19ba 12-Sep-2014 Dan Albert <danalbert@google.com> am 14fc930d: Merge "Clean up redundant links to stlport."

* commit '14fc930d5d2ef272b39342fa083f4097464fc9ea':
Clean up redundant links to stlport.
fe80b7ee58b394b0cd958470aeea3c5a09f6b2bf 12-Sep-2014 Dan Albert <danalbert@google.com> am 6bf7c5cf: Merge "Clean up test makefiles."

* commit '6bf7c5cfc981ce4ecbd671d73a9eab8398dc8dd4':
Clean up test makefiles.
3b54aba0883bdc5924290f44db8beb70da70ea26 12-Sep-2014 Robert Shih <robertshih@google.com> Merge "LiveSession: raise upwards adaptation constraint" 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
ttplive/LiveSession.cpp
ttplive/LiveSession.h
peg2ts/AnotherPacketSource.cpp
peg2ts/AnotherPacketSource.h
368c2bb94c1f47c1e31b89a11ad7acfc35e86693 12-Sep-2014 Dan Albert <danalbert@google.com> Clean up redundant links to stlport.

Change-Id: I4169b2476b7fd708102b971cf26cd92464b5c501
ndroid.mk
hromium_http/Android.mk
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
6bf7c5cfc981ce4ecbd671d73a9eab8398dc8dd4 12-Sep-2014 Dan Albert <danalbert@google.com> Merge "Clean up test makefiles."
0cb2c99f70dec2e4b93b72de9b433f2919c1540e 09-Sep-2014 Dan Albert <danalbert@google.com> Clean up test makefiles.

The build system takes care of linking the correct STL and gtest
libraries for you, and specifying them manually confuses the build
system when using libc++.

Change-Id: I6ac66c2f4e97cd3c55efb7a85e10922420554e7f
ests/Android.mk
dc9289b4f48fe1c868251db3ac7edce9edd50d54 11-Sep-2014 David Smith <davidas@google.com> Merge "stagefright: finish implementing MediaFilter flush"
236688e800455c3a9d2a31a437f635dd7ff91fc7 11-Sep-2014 Ronghua Wu <ronghuawu@google.com> am 97187317: Merge "stagefright: add adaptive playback support to SoftAVC decoder." into lmp-dev

* commit '971873179cf202ad8aa1ddc4ec737795f1e03ce3':
stagefright: add adaptive playback support to SoftAVC decoder.
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
odecs/m4v_h263/dec/SoftMPEG4.cpp
odecs/m4v_h263/dec/SoftMPEG4.h
odecs/m4v_h263/dec/src/vop.cpp
olorconversion/SoftwareRenderer.cpp
nclude/SoftVideoDecoderOMXComponent.h
mx/SoftVideoDecoderOMXComponent.cpp
c2f78c91f7cb5238b932ca8107f311630edebc88 11-Sep-2014 Lajos Molnar <lajos@google.com> am 87088150: am fd732779: Merge "stagefright: don\'t use AAtomizer in AMessage" into lmp-dev

* commit '87088150423676a8a0d6a0094e6b6e77e11fb3b5':
stagefright: don't use AAtomizer in AMessage
971873179cf202ad8aa1ddc4ec737795f1e03ce3 11-Sep-2014 Ronghua Wu <ronghuawu@google.com> Merge "stagefright: add adaptive playback support to SoftAVC decoder." into lmp-dev
75a39a7eda320e958ea9919f4867f8581117639e 11-Sep-2014 Glenn Kasten <gkasten@android.com> am 951c2197: am 2b16391d: Merge "Add test for AMR-NB decoder"

* commit '951c2197cc0cf1d7a91388299b74eb12ee04a3e6':
Add test for AMR-NB decoder
951c2197cc0cf1d7a91388299b74eb12ee04a3e6 11-Sep-2014 Glenn Kasten <gkasten@android.com> am 2b16391d: Merge "Add test for AMR-NB decoder"

* commit '2b16391d066d20f38f3556d65bce827a8d134e4d':
Add test for AMR-NB decoder
2b16391d066d20f38f3556d65bce827a8d134e4d 11-Sep-2014 Glenn Kasten <gkasten@android.com> Merge "Add test for AMR-NB decoder"
a0695097f3a52d5e88eb167d10a7e8de7315d823 11-Sep-2014 Marco Nelissen <marcone@google.com> am 3eef436c: am 43f2e3cf: Merge "Revert "Fix AAC timestamps for multiple aac frames per input buffer"" into lmp-dev

* commit '3eef436cea1928f96b789449ea144d1a529d2651':
Revert "Fix AAC timestamps for multiple aac frames per input buffer"
10713e41173918f2a69a602889c28223a35a6d96 11-Sep-2014 Chong Zhang <chz@google.com> am f2745669: am 74848665: Merge "fix failure in MediaCodecTest#testException" into lmp-dev

* commit 'f2745669be588f8bc8fdb3dea60a12d91f6eb9c9':
fix failure in MediaCodecTest#testException
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
87088150423676a8a0d6a0094e6b6e77e11fb3b5 11-Sep-2014 Lajos Molnar <lajos@google.com> am fd732779: Merge "stagefright: don\'t use AAtomizer in AMessage" into lmp-dev

* commit 'fd7327797fe1d21cb225cae34616b8f7b67ad29d':
stagefright: don't use AAtomizer in AMessage
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
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
odecs/aacdec/SoftAAC2.cpp
odecs/aacdec/SoftAAC2.h
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
3eef436cea1928f96b789449ea144d1a529d2651 10-Sep-2014 Marco Nelissen <marcone@google.com> am 43f2e3cf: Merge "Revert "Fix AAC timestamps for multiple aac frames per input buffer"" into lmp-dev

* commit '43f2e3cf20c2a99cd3e9b99c8b507143e2954756':
Revert "Fix AAC timestamps for multiple aac frames per input buffer"
f2745669be588f8bc8fdb3dea60a12d91f6eb9c9 10-Sep-2014 Chong Zhang <chz@google.com> am 74848665: Merge "fix failure in MediaCodecTest#testException" into lmp-dev

* commit '748486657623fc0753d11bc2d91c113bca584a1e':
fix failure in MediaCodecTest#testException
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
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
odecs/aacdec/SoftAAC2.cpp
odecs/aacdec/SoftAAC2.h
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
ttplive/LiveSession.cpp
ttplive/LiveSession.h
f64b36deccd473b545dbed22c2feb11fc49157e5 10-Sep-2014 Chong Zhang <chz@google.com> fix failure in MediaCodecTest#testException

reset codec after failed configure()
Bug: 17418876

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

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

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

Bug: 15094301
Change-Id: Ib82fb6d8fb6b48402d81f411123b3d924368eb93
oundation/AMessage.cpp
ee150907dfa662a3b923f2a4861d9e478059c6f8 10-Sep-2014 Marco Nelissen <marcone@google.com> am 95821a0f: am 8270e1d1: Merge "Fix AAC timestamps for multiple aac frames per input buffer" into lmp-dev

* commit '95821a0f83afc7ca1680de2eb3e9aa903d2ed9ba':
Fix AAC timestamps for multiple aac frames per input buffer
95821a0f83afc7ca1680de2eb3e9aa903d2ed9ba 09-Sep-2014 Marco Nelissen <marcone@google.com> am 8270e1d1: Merge "Fix AAC timestamps for multiple aac frames per input buffer" into lmp-dev

* commit '8270e1d13a101fa946848871b9903b31ff11981f':
Fix AAC timestamps for multiple aac frames per input buffer
2897286dae2934562c48febd4427b8839aeb4007 09-Sep-2014 David Smith <davidas@google.com> stagefright: finish implementing MediaFilter flush

Bug: 17203044
Change-Id: I6a967ead4dd9588caafe0041f2f4a39637368a62
ilters/MediaFilter.cpp
8270e1d13a101fa946848871b9903b31ff11981f 09-Sep-2014 Marco Nelissen <marcone@google.com> Merge "Fix AAC timestamps for multiple aac frames per input buffer" into lmp-dev
c6c182f354142b47b7a5abfa9f95c82b236f5832 05-Sep-2014 David Smith <davidas@google.com> stagefright: generic RenderScripts in MediaFilter

Adds support for generic RenderScript filters to MediaFilter via RSFilter,
which calls an RSFilterCallback object to process buffers.

Bug: 17203044
Change-Id: Iadb7700c424d225fb5e98a5359cbca070c6e4283
ilters/Android.mk
ilters/MediaFilter.cpp
ilters/RSFilter.cpp
ilters/RSFilter.h
fc10a1b11ccff408bfff9534f1b9fbfd3da93a3c 09-Sep-2014 David Smith <davidas@google.com> Merge "stagefright: SimpleFilter config params via msg"
f4207cd4024e421bf51e5cd1457dd454f52be68a 08-Sep-2014 Glenn Kasten <gkasten@google.com> am b12d6a17: am 62ce2072: Merge "Make IPowerManager native conform to .aidl for oneway" into lmp-dev

* commit 'b12d6a17d33141789c974e3bd3eacfcb0be1c1e3':
Make IPowerManager native conform to .aidl for oneway
b12d6a17d33141789c974e3bd3eacfcb0be1c1e3 08-Sep-2014 Glenn Kasten <gkasten@google.com> am 62ce2072: Merge "Make IPowerManager native conform to .aidl for oneway" into lmp-dev

* commit '62ce207291353a13dd722855102e99684259a517':
Make IPowerManager native conform to .aidl for oneway
62ce207291353a13dd722855102e99684259a517 08-Sep-2014 Glenn Kasten <gkasten@google.com> Merge "Make IPowerManager native conform to .aidl for oneway" 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
ttplive/PlaylistFetcher.cpp
fa20a1db4be377a004efd756887f8b212e31d670 05-Sep-2014 Marco Nelissen <marcone@google.com> Fix AAC timestamps for multiple aac frames per input buffer

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

Bug: 16715379
Change-Id: I84f33d9bb65b6821b2a697f6750356cea98777c4
odecs/aacdec/SoftAAC2.cpp
odecs/aacdec/SoftAAC2.h
9c3ad320ece4e4149630215056f8a38728308752 06-Sep-2014 Robert Shih <robertshih@google.com> am ea477eff: Merge "DO NOT MERGE - MPEG4Extractor: parse csd correctly; workaround malformed csd" into lmp-dev

* commit 'ea477effb909089401f6d1ec40fd495757d75021':
DO NOT MERGE - MPEG4Extractor: parse csd correctly; workaround malformed csd
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)
PEG4Extractor.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
imedEventQueue.cpp
674683a94fe915f95ca20bfcb7990540530862d0 06-Sep-2014 Lajos Molnar <lajos@google.com> am 26fc3c10: am 52c6a355: Merge "stagefright: allow P-frames spacing of 0 and 1" into lmp-dev

* commit '26fc3c1038fad86179387f9ec81f151eb0a4dcb9':
stagefright: allow P-frames spacing of 0 and 1
26fc3c1038fad86179387f9ec81f151eb0a4dcb9 06-Sep-2014 Lajos Molnar <lajos@google.com> am 52c6a355: Merge "stagefright: allow P-frames spacing of 0 and 1" into lmp-dev

* commit '52c6a355503dbbe9bb134af07faee982534031dd':
stagefright: allow P-frames spacing of 0 and 1
52c6a355503dbbe9bb134af07faee982534031dd 06-Sep-2014 Lajos Molnar <lajos@google.com> Merge "stagefright: allow P-frames spacing of 0 and 1" into lmp-dev
6dad9ad21ff547fab7f192956e4a3732fd78488b 02-Sep-2014 David Smith <davidas@google.com> stagefright: SimpleFilter config params via msg

Bug: 17203044
Change-Id: I659da31bddb51dd0e5246827c57234364a4c479b
ilters/Android.mk
ilters/IntrinsicBlurFilter.cpp
ilters/IntrinsicBlurFilter.h
ilters/MediaFilter.cpp
ilters/SaturationFilter.cpp
ilters/SaturationFilter.h
ilters/SimpleFilter.cpp
ilters/SimpleFilter.h
eab1bd40f9c9722239dc37a62ba81617abfc90f6 06-Sep-2014 David Smith <davidas@google.com> Merge "stagefright: filter surface input, config cacheDir"
688629303554086d6e198aaffa9c6ea77c34e3ba 06-Sep-2014 David Smith <davidas@google.com> Merge "stagefright: SoftwareRenderer support for RGBA8888"
e7f4e676bb88b17241d71731f9ea50c18cfcb039 29-Aug-2014 David Smith <davidas@google.com> stagefright: filter surface input, config cacheDir

Bug: 17203044
Change-Id: Ifb927429568fe68807143e8511065fea1a25b3a5
ilters/Android.mk
ilters/ColorConvert.cpp
ilters/ColorConvert.h
ilters/GraphicBufferListener.cpp
ilters/GraphicBufferListener.h
ilters/IntrinsicBlurFilter.cpp
ilters/MediaFilter.cpp
ilters/SaturationFilter.cpp
ilters/SimpleFilter.h
ilters/saturationARGB.rs
c75e9138e042af66ad7555f901b7cb6b1c348e37 05-Sep-2014 Robert Shih <robertshih@google.com> am 3cdf0158: am 6a548e91: Merge "PlaylistFetcher: do not reset mStartTimeUs if we are resuming" into lmp-dev

* commit '3cdf015809b41b9541dbe5bcdcadf558d944d438':
PlaylistFetcher: do not reset mStartTimeUs if we are resuming
46b451fab7a26c501d4d6c87a354f70531c19d13 05-Sep-2014 David Smith <davidas@google.com> stagefright: SoftwareRenderer support for RGBA8888

Bug: 17203044
Change-Id: Iba8709b4977720cd2ec18cfc2aecdc2e6939999d
olorconversion/SoftwareRenderer.cpp
3cdf015809b41b9541dbe5bcdcadf558d944d438 05-Sep-2014 Robert Shih <robertshih@google.com> am 6a548e91: Merge "PlaylistFetcher: do not reset mStartTimeUs if we are resuming" into lmp-dev

* commit '6a548e9114c4a283a6e08a2d35540f8549f44b82':
PlaylistFetcher: do not reset mStartTimeUs if we are resuming
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
Codec.cpp
MXCodec.cpp
cc0c9a2cc13f724b82b0f696be2c8d5232f0e01c 04-Sep-2014 Narayan Kamath <narayan@google.com> am 8e2ad94c: am 13006b9d: am 032ecb7f: Merge "Fix in SoftAVCEncoder plugin"

* commit '8e2ad94c2f859988759629d813e0394d452e9fc6':
Fix in SoftAVCEncoder plugin
8e2ad94c2f859988759629d813e0394d452e9fc6 04-Sep-2014 Narayan Kamath <narayan@google.com> am 13006b9d: am 032ecb7f: Merge "Fix in SoftAVCEncoder plugin"

* commit '13006b9d0586d17a0ea52e98124b54ebf6246feb':
Fix in SoftAVCEncoder plugin
13006b9d0586d17a0ea52e98124b54ebf6246feb 04-Sep-2014 Narayan Kamath <narayan@google.com> am 032ecb7f: Merge "Fix in SoftAVCEncoder plugin"

* commit '032ecb7f233f392e6e68f030bf72a9bc7c861d11':
Fix in SoftAVCEncoder plugin
032ecb7f233f392e6e68f030bf72a9bc7c861d11 04-Sep-2014 Narayan Kamath <narayan@google.com> Merge "Fix in SoftAVCEncoder plugin"
0f9a3cf9962b6859cfee9d4bf4676b5aafca79cb 30-Aug-2014 Robert Shih <robertshih@google.com> PlaylistFetcher: do not reset mStartTimeUs if we are resuming

Bug: 17376049
Change-Id: Ie519bdf7128841172df41e6512d624e99d9853d6
ttplive/PlaylistFetcher.cpp
b5aa61863a532110070f97199c5485bc9ea454d5 04-Sep-2014 hkuang <hkuang@google.com> am 1830c701: am 90073050: Merge "Fix the bug that same video frame has been decoded twice during port reconfig." into lmp-dev

* commit '1830c7015989a10a803ebff8d710c2655ec9d81d':
Fix the bug that same video frame has been decoded twice during port reconfig.
5ede45b5b776581969924ed9a13c36f41d33a032 04-Sep-2014 Marco Nelissen <marcone@google.com> am e866880a: am d71233a8: Merge "Use CharacterEncodingDetector in metadataretriever" into lmp-dev

* commit 'e866880ae1709062e0a8b36e62a78d91c3f06cc9':
Use CharacterEncodingDetector in metadataretriever
1830c7015989a10a803ebff8d710c2655ec9d81d 04-Sep-2014 hkuang <hkuang@google.com> am 90073050: Merge "Fix the bug that same video frame has been decoded twice during port reconfig." into lmp-dev

* commit '9007305003e689362749a264af2eafea80eb12a0':
Fix the bug that same video frame has been decoded twice during port reconfig.
e866880ae1709062e0a8b36e62a78d91c3f06cc9 04-Sep-2014 Marco Nelissen <marcone@google.com> am d71233a8: Merge "Use CharacterEncodingDetector in metadataretriever" into lmp-dev

* commit 'd71233a846aca7035a851941c1530d04c6a65086':
Use CharacterEncodingDetector in metadataretriever
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
d71233a846aca7035a851941c1530d04c6a65086 03-Sep-2014 Marco Nelissen <marcone@google.com> Merge "Use CharacterEncodingDetector in metadataretriever" into lmp-dev
78394fe065d01c6aed51f4448811d0966ae82c59 03-Sep-2014 Marco Nelissen <marcone@google.com> am e8d39b9d: am acdae5d7: Merge "Move stale handler cleanup to constructor" into lmp-dev

* commit 'e8d39b9d70c69656e897fece70df0c0bfa5bfb88':
Move stale handler cleanup to constructor
7dce05439c44553f46f2744d309111563c9e788d 03-Sep-2014 Marco Nelissen <marcone@google.com> am ba19ee84: am ea8462cc: Merge "Fix more potential deadlocks in ALooperRoster" into lmp-dev

* commit 'ba19ee846cef06e2c70adfd6be7e17ae26cb14e1':
Fix more potential deadlocks in ALooperRoster
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
odecs/on2/dec/SoftVPX.cpp
odecs/on2/dec/SoftVPX.h
e8d39b9d70c69656e897fece70df0c0bfa5bfb88 03-Sep-2014 Marco Nelissen <marcone@google.com> am acdae5d7: Merge "Move stale handler cleanup to constructor" into lmp-dev

* commit 'acdae5d7865b604acaadd3be1c45c84ca4bf3952':
Move stale handler cleanup to constructor
ba19ee846cef06e2c70adfd6be7e17ae26cb14e1 03-Sep-2014 Marco Nelissen <marcone@google.com> am ea8462cc: Merge "Fix more potential deadlocks in ALooperRoster" into lmp-dev

* commit 'ea8462ccd1a882f2c7c785250bcfaa2606b53cb5':
Fix more potential deadlocks in ALooperRoster
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
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
ndroid.mk
tagefrightMetadataRetriever.cpp
8bcafed490290a54cb7306a976d41af5b9c76a9a 02-Sep-2014 Ronghua Wu <ronghuawu@google.com> am 0b9a8c06: am e4478feb: Merge "Add adaptive playback support to VPX decoder." into lmp-dev

* commit '0b9a8c060f8bd229ef7c7680e80452bf982d8a3d':
Add adaptive playback support to VPX decoder.
0b9a8c060f8bd229ef7c7680e80452bf982d8a3d 02-Sep-2014 Ronghua Wu <ronghuawu@google.com> am e4478feb: Merge "Add adaptive playback support to VPX decoder." into lmp-dev

* commit 'e4478febd87f6a663bbdf2c22dd829af2a8166a6':
Add adaptive playback support to VPX decoder.
e4478febd87f6a663bbdf2c22dd829af2a8166a6 02-Sep-2014 Ronghua Wu <ronghuawu@google.com> Merge "Add adaptive playback support to VPX decoder." into lmp-dev
d299f92796f30d249f08f8bf3bcfe289bc9d3627 02-Sep-2014 Wei Jia <wjia@google.com> am f910a3df: am c9d62de7: Merge "MediaCodec: set state to UNINITIALIZED when receiving fatal error." into lmp-dev

* commit 'f910a3dfeb3fb58c297a37757e28150462fe1e9e':
MediaCodec: set state to UNINITIALIZED when receiving fatal error.
d2503caa1e7d7c362f05424838dbac479a5c84e5 02-Sep-2014 Rachad <rachad@google.com> am 760cfc90: am b6b927fc: Merge "Tunneled Video Playback: Changed AudioHwSync token to int32_t to match Audio stack api." into lmp-dev

* commit '760cfc9000c815913305b8714bdde39855df3753':
Tunneled Video Playback: Changed AudioHwSync token to int32_t to match Audio stack api.
c6f102fd2396e6c66dbc2f2d52005a68aa1b427a 02-Sep-2014 Lajos Molnar <lajos@google.com> am 42174336: am 3049c672: Merge "stagefright: add codec capability info for google video codecs" into lmp-dev

* commit '4217433611bf804d8fcdee0f3a2369c4c4610823':
stagefright: add codec capability info for google video codecs
f910a3dfeb3fb58c297a37757e28150462fe1e9e 31-Aug-2014 Wei Jia <wjia@google.com> am c9d62de7: Merge "MediaCodec: set state to UNINITIALIZED when receiving fatal error." into lmp-dev

* commit 'c9d62de72b67f069a517f24c13ff9c4e4593f76a':
MediaCodec: set state to UNINITIALIZED when receiving fatal error.
760cfc9000c815913305b8714bdde39855df3753 30-Aug-2014 Rachad <rachad@google.com> am b6b927fc: Merge "Tunneled Video Playback: Changed AudioHwSync token to int32_t to match Audio stack api." into lmp-dev

* commit 'b6b927fc437389a9fa499eaad69da88969ec9ffc':
Tunneled Video Playback: Changed AudioHwSync token to int32_t to match Audio stack api.
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
ediaCodec.cpp
4217433611bf804d8fcdee0f3a2369c4c4610823 30-Aug-2014 Lajos Molnar <lajos@google.com> am 3049c672: Merge "stagefright: add codec capability info for google video codecs" into lmp-dev

* commit '3049c672b7fbcfb832791d23da25b6f9ef1e3805':
stagefright: add codec capability info for google video codecs
3049c672b7fbcfb832791d23da25b6f9ef1e3805 29-Aug-2014 Lajos Molnar <lajos@google.com> Merge "stagefright: add codec capability info for google video codecs" into lmp-dev
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
Codec.cpp
bcbb10fbb17d7299f78f04e24dea5ac9b6113352 29-Aug-2014 Robert Shih <robertshih@google.com> am 7f7510ff: am 6868628c: Merge "PlaylistFetcher: add lower bound check when starting live streams" into lmp-dev

* commit '7f7510fff99385ed1a937c1ab907c6d01df953ea':
PlaylistFetcher: add lower bound check when starting live streams
7f7510fff99385ed1a937c1ab907c6d01df953ea 29-Aug-2014 Robert Shih <robertshih@google.com> am 6868628c: Merge "PlaylistFetcher: add lower bound check when starting live streams" into lmp-dev

* commit '6868628c0df9b8dfa0a1c16be109d907384e3186':
PlaylistFetcher: add lower bound check when starting live streams
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
ttplive/PlaylistFetcher.cpp
0b0f6075377260e006e860e3ba296f5504a6c891 28-Aug-2014 Marco Nelissen <marcone@google.com> Move stale handler cleanup to constructor

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

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

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

Bug: 13842676
Change-Id: I9c054ea489fd3a71b3b2394f15a85b84d42edb5a
odecs/avc/enc/SoftAVCEncoder.h
odecs/m4v_h263/enc/SoftMPEG4Encoder.h
odecs/on2/dec/SoftVPX.cpp
odecs/on2/enc/SoftVPXEncoder.h
nclude/SimpleSoftOMXComponent.h
nclude/SoftVideoDecoderOMXComponent.h
mx/SoftVideoDecoderOMXComponent.cpp
053bf045c50a897d4ca8a651eae1ae0b00868188 28-Aug-2014 Marco Nelissen <marcone@google.com> am 02d67d52: am 277090f1: Merge "Fix potential deadlock in unregisterStaleHandlers()" into lmp-dev

* commit '02d67d529ac52e38a3667844f6f496a1921f7a51':
Fix potential deadlock in unregisterStaleHandlers()
02d67d529ac52e38a3667844f6f496a1921f7a51 28-Aug-2014 Marco Nelissen <marcone@google.com> am 277090f1: Merge "Fix potential deadlock in unregisterStaleHandlers()" into lmp-dev

* commit '277090f1983a6378958c24028d4f58c33c0659b2':
Fix potential deadlock in unregisterStaleHandlers()
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
oundation/ALooperRoster.cpp
8dd662333faea961f188af71ea409936bd0dd574 25-Aug-2014 Robert Shih <robertshih@google.com> am 7ccd53f9: am 9c42bf25: Merge "HTTPLiveSource: check for NULL before getTrackCount/Info" into lmp-dev

* commit '7ccd53f9d19823489f18be978320a4537d88a7f8':
HTTPLiveSource: check for NULL before getTrackCount/Info
7ccd53f9d19823489f18be978320a4537d88a7f8 25-Aug-2014 Robert Shih <robertshih@google.com> am 9c42bf25: Merge "HTTPLiveSource: check for NULL before getTrackCount/Info" into lmp-dev

* commit '9c42bf257a7501491beca196a868aa260d515422':
HTTPLiveSource: check for NULL before getTrackCount/Info
9c42bf257a7501491beca196a868aa260d515422 25-Aug-2014 Robert Shih <robertshih@google.com> Merge "HTTPLiveSource: check for NULL before getTrackCount/Info" into lmp-dev
b5f9ccfa2f8ddcd2e0c391d15fededc66533c9dd 25-Aug-2014 Lajos Molnar <lajos@google.com> am 23718a84: am 34febc96: stagefright: process CSD regardless of what port was last queued

* commit '23718a84fb2f9932b484dabb748c761c37af3742':
stagefright: process CSD regardless of what port was last queued
f5dea40eefb085b74ee37a548a51ade2ff10d150 25-Aug-2014 Wei Jia <wjia@google.com> am 211aae92: am 848726d8: Merge "MediaCodec: handle errors during flushing." into lmp-dev

* commit '211aae92d3f48a56f266a2b933d6f53b625098b0':
MediaCodec: handle errors during flushing.
23718a84fb2f9932b484dabb748c761c37af3742 23-Aug-2014 Lajos Molnar <lajos@google.com> am 34febc96: stagefright: process CSD regardless of what port was last queued

* commit '34febc9654ba3b447239b7761ce4c93ca9a20b5f':
stagefright: process CSD regardless of what port was last queued
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
odecs/aacdec/SoftAAC2.cpp
211aae92d3f48a56f266a2b933d6f53b625098b0 23-Aug-2014 Wei Jia <wjia@google.com> am 848726d8: Merge "MediaCodec: handle errors during flushing." into lmp-dev

* commit '848726d845b51da04364bdaf4ec915c85d593c0e':
MediaCodec: handle errors during flushing.
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
ediaCodec.cpp
13230af83d97d96110a9e1fd04f5c7964314764e 23-Aug-2014 David Smith <davidas@google.com> Merge "stagefright: SoftwareRenderer support ARGB, RGB888"
744f5739019d1fd917f981e740b353c3d73fd1a8 16-Aug-2014 David Smith <davidas@google.com> stagefright: MediaFilter and SimpleFilter(s)

MediaFilter implements CodecBase and provides video filtering support
via filter modules which extend SimpleFilter.

Bug: 17203044
Change-Id: Ifb30c501e2901c44999d95d7d150e863b2bd06c6
ndroid.mk
ediaCodec.cpp
ilters/Android.mk
ilters/ColorConvert.cpp
ilters/ColorConvert.h
ilters/IntrinsicBlurFilter.cpp
ilters/IntrinsicBlurFilter.h
ilters/MediaFilter.cpp
ilters/SaturationFilter.cpp
ilters/SaturationFilter.h
ilters/SimpleFilter.h
ilters/ZeroFilter.cpp
ilters/ZeroFilter.h
ilters/saturation.rs
ilters/saturationARGB.rs
448517af18bd2f91c2194c2f24b22561de3ea2e4 14-Aug-2014 David Smith <davidas@google.com> stagefright: SoftwareRenderer support ARGB, RGB888

Bug: 17203044
Change-Id: Id56688bb4f63dd701e4c621ef6c2bec725e6304d
olorconversion/SoftwareRenderer.cpp
7737d01ec40690184cd8f658db34e1aa35e0b9e6 23-Aug-2014 Wei Jia <wjia@google.com> am c3c107ca: am d1de9bb3: Merge "ACodec: handle errors related to native window." into lmp-dev

* commit 'c3c107cae90e635e4d0928133d513c12f4dbe79d':
ACodec: handle errors related to native window.
c3c107cae90e635e4d0928133d513c12f4dbe79d 23-Aug-2014 Wei Jia <wjia@google.com> am d1de9bb3: Merge "ACodec: handle errors related to native window." into lmp-dev

* commit 'd1de9bb33a2f645fb9dc54e7fc69ca45304850a5':
ACodec: handle errors related to native window.
d1de9bb33a2f645fb9dc54e7fc69ca45304850a5 22-Aug-2014 Wei Jia <wjia@google.com> Merge "ACodec: handle errors related to native window." into lmp-dev
ed61c214ce7c930f2d593801c5702fddbb499e49 22-Aug-2014 Chong Zhang <chz@google.com> am e6198959: am b534f461: Merge "move cache prefill to GenericSource\'s message handler" into lmp-dev

* commit 'e61989593b2afec539f7d699e5b4c0bfdbca27d8':
move cache prefill to GenericSource's message handler
96db098bdb8cf98dfd7255cf42d78d584a7780ff 22-Aug-2014 Chong Zhang <chz@google.com> am 687ee2d4: am 89c4ab2f: Merge "print warning if offset != buffer size" into lmp-dev

* commit '687ee2d4e0fcddc4af0b6ad1096ea330c23a85c4':
print warning if offset != buffer size
3fb9f68dea5d991288f0ea8037742b50c7df5767 20-Aug-2014 Wei Jia <wjia@google.com> ACodec: handle errors related to native window.

Bug: 17068327
Bug: 13133027
Change-Id: I9875e524222a10d1be26be5a84b9633b4aaeb210
Codec.cpp
e61989593b2afec539f7d699e5b4c0bfdbca27d8 22-Aug-2014 Chong Zhang <chz@google.com> am b534f461: Merge "move cache prefill to GenericSource\'s message handler" into lmp-dev

* commit 'b534f461f6056c84c3ae87e27430f4b934fd3eb1':
move cache prefill to GenericSource's message handler
687ee2d4e0fcddc4af0b6ad1096ea330c23a85c4 22-Aug-2014 Chong Zhang <chz@google.com> am 89c4ab2f: Merge "print warning if offset != buffer size" into lmp-dev

* commit '89c4ab2f4e4fbccf5c67e2671cf252053dbe5d38':
print warning if offset != buffer size
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
a16c13e7329f2a0ba0f0cc6b38d5af09216d2ff2 22-Aug-2014 Lajos Molnar <lajos@google.com> am af385b13: am 5f42113f: stagefright: allow to resubmit CSDs for SoftAAC2

* commit 'af385b13bd2db112cb4502b401e60559939de23c':
stagefright: allow to resubmit CSDs for SoftAAC2
d2f9a299082ae7ef9b9a03d4df11d37de63d62ae 22-Aug-2014 Robert Shih <robertshih@google.com> am e2f34c14: am 143a951f: SoftAAC2: allow reconfiguring output after multiple output buffers

* commit 'e2f34c14d15fc59a8ad60ea16782862592ff28cb':
SoftAAC2: allow reconfiguring output after multiple output buffers
af385b13bd2db112cb4502b401e60559939de23c 22-Aug-2014 Lajos Molnar <lajos@google.com> am 5f42113f: stagefright: allow to resubmit CSDs for SoftAAC2

* commit '5f42113f21c31802e044f0a73351eef35e32feaf':
stagefright: allow to resubmit CSDs for SoftAAC2
e2f34c14d15fc59a8ad60ea16782862592ff28cb 22-Aug-2014 Robert Shih <robertshih@google.com> am 143a951f: SoftAAC2: allow reconfiguring output after multiple output buffers

* commit '143a951f1f19161fa12ca97f3dee85094078365a':
SoftAAC2: allow reconfiguring output after multiple output buffers
5f42113f21c31802e044f0a73351eef35e32feaf 22-Aug-2014 Lajos Molnar <lajos@google.com> stagefright: allow to resubmit CSDs for SoftAAC2

Bug: 17118001
Change-Id: I45469b9aa6146edf3265b0f05f5ce3592b5daca6
odecs/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
odecs/aacdec/SoftAAC2.cpp
d354d8d1b09503c0166c1f3e626cda72a3eeb83c 20-Aug-2014 Chong Zhang <chz@google.com> move cache prefill to GenericSource's message handler

This allows prepareAsync to be terminated by reset promptly.

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

Bug: 16892748
Bug: 17182378

Change-Id: Ia55c04a810fd805041cb2025f6739afa5120b5ed
ataSource.cpp
6e819a6e82f25656263b39976a74b5fd3e9ced98 21-Aug-2014 Marco Nelissen <marcone@google.com> am 56b350ea: am 111333ea: Merge "handle error during flush in MediaPlayer.reset()" into lmp-dev

* commit '56b350eaac38fdccb08dd3d7d8b12c6a2a83ac25':
handle error during flush in MediaPlayer.reset()
56b350eaac38fdccb08dd3d7d8b12c6a2a83ac25 21-Aug-2014 Marco Nelissen <marcone@google.com> am 111333ea: Merge "handle error during flush in MediaPlayer.reset()" into lmp-dev

* commit '111333eaab12448f45927464c8aeacbbf9a578a1':
handle error during flush in MediaPlayer.reset()
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)
ampleTable.cpp
e5ddd0b93ebf074b03b01775b21a985eced3e511 20-Aug-2014 Chong Zhang <chz@google.com> am ee8b5f26: am a8143b2b: Merge "Don\'t crash for bitstream errors in AMPEG4ElementaryAssembler" into lmp-dev

* commit 'ee8b5f26ae58a884b1695ca764477c7d36a0d8ed':
Don't crash for bitstream errors in AMPEG4ElementaryAssembler
80804f4e953d6c5f6ed0c3c8e004c4cce280f5c1 20-Aug-2014 Chong Zhang <chz@google.com> print warning if offset != buffer size

Bug: 17110981
Change-Id: Iacceca203372f4c06ff5ef7ce98edd5554727b64
tsp/AMPEG4ElementaryAssembler.cpp
ee8b5f26ae58a884b1695ca764477c7d36a0d8ed 20-Aug-2014 Chong Zhang <chz@google.com> am a8143b2b: Merge "Don\'t crash for bitstream errors in AMPEG4ElementaryAssembler" into lmp-dev

* commit 'a8143b2bbaabc3f704b05078ccc930dbc28591b9':
Don't crash for bitstream errors in AMPEG4ElementaryAssembler
755262a690d1ea878f76918581db0ceb8a004b50 19-Aug-2014 Ronghua Wu <ronghuawu@google.com> am 5b1e1d84: am 1e2d7cd6: Merge "stagefright: Fix thumbnail generation for some clips." into lmp-dev

* commit '5b1e1d840b9f7163b85a610f3883c397d5dc460a':
stagefright: Fix thumbnail generation for some clips.
5b1e1d840b9f7163b85a610f3883c397d5dc460a 19-Aug-2014 Ronghua Wu <ronghuawu@google.com> am 1e2d7cd6: Merge "stagefright: Fix thumbnail generation for some clips." into lmp-dev

* commit '1e2d7cd671ece1b9eaec7b4c56633884c9a899bd':
stagefright: Fix thumbnail generation for some clips.
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
ediaCodec.cpp
9d7fc5c5fab0c7c967a625d22fffda046f9d5c29 19-Aug-2014 Robert Shih <robertshih@google.com> HTTPLiveSource: check for NULL before getTrackCount/Info

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

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

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

Bug: 16210021
Change-Id: I8b2c48365d74ce7551f000a1f4b0711647a9796f
MXCodec.cpp
74e16a728594d790fe924aa2db9bec08d9d36628 18-Aug-2014 Lajos Molnar <lajos@google.com> am 0cdac42e: am c975c23b: Merge "stagefright: add codec capability info for google audio codecs" into lmp-dev

* commit '0cdac42ef845ca0eb2620d70ecfb808fe362b010':
stagefright: add codec capability info for google audio codecs
ce2c62ad986f84285373a639a3d725079652b261 18-Aug-2014 Elliott Hughes <enh@google.com> am 9060b70b: am 896b546b: am d29b4f65: Merge "Use gettid directly."

* commit '9060b70b143b92ba41f2be91034ad4653282ce5c':
Use gettid directly.
0cdac42ef845ca0eb2620d70ecfb808fe362b010 18-Aug-2014 Lajos Molnar <lajos@google.com> am c975c23b: Merge "stagefright: add codec capability info for google audio codecs" into lmp-dev

* commit 'c975c23bb9da36262b37a1d64367d726f8dd42e5':
stagefright: add codec capability info for google audio codecs
9060b70b143b92ba41f2be91034ad4653282ce5c 18-Aug-2014 Elliott Hughes <enh@google.com> am 896b546b: am d29b4f65: Merge "Use gettid directly."

* commit '896b546b4fa2f5860bbc2ebe55772d64e2ac14b3':
Use gettid directly.
aa4d9edcdebf95e075ddb5749531791661e29042 18-Aug-2014 Elliott Hughes <enh@google.com> am 45d2c7e1: Merge "Move chromium_http/support.cpp off androidGetTid."

* commit '45d2c7e1809e41e3d022f037aeec7e38646f6072':
Move chromium_http/support.cpp off androidGetTid.
896b546b4fa2f5860bbc2ebe55772d64e2ac14b3 18-Aug-2014 Elliott Hughes <enh@google.com> am d29b4f65: Merge "Use gettid directly."

* commit 'd29b4f656574d748f8e66a23028a690796b5fe2e':
Use gettid directly.
53c0bcef7eb8434a7b062e0cdc4d60618023672d 18-Aug-2014 Ronghua Wu <ronghuawu@google.com> am 44fa1fb8: am 475da7ef: stagefright: Fix race condition between MediaCodec and SoftwareRenderer

* commit '44fa1fb85e33ec697a129748bf3ee391ebe92500':
stagefright: Fix race condition between MediaCodec and SoftwareRenderer
44fa1fb85e33ec697a129748bf3ee391ebe92500 18-Aug-2014 Ronghua Wu <ronghuawu@google.com> am 475da7ef: stagefright: Fix race condition between MediaCodec and SoftwareRenderer

* commit '475da7ef08c05a482ced8d318832cf5aa1141aff':
stagefright: Fix race condition between MediaCodec and SoftwareRenderer
dc9aa7e2cb903bb4ebfce558671a97088477bb6e 20-Aug-2014 Chong Zhang <chz@google.com> Don't crash for bitstream errors in AMPEG4ElementaryAssembler

Bug: 17110981
Change-Id: I0d0960fa12f2ad179231494be29af307de217b2a
tsp/AMPEG4ElementaryAssembler.cpp
da153975581fb3161a30452348a5b26ee72d9255 18-Aug-2014 Elliott Hughes <enh@google.com> Use gettid directly.

Bug: 17048545
Change-Id: I5ae40c2de1afc2a59f0b28e81c25f0c404368408
Codec.cpp
b2f43abeeaf1aab91a784a393c62e01d0619b99d 18-Aug-2014 Elliott Hughes <enh@google.com> Move chromium_http/support.cpp off androidGetTid.

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

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

Bug: 13842676
Change-Id: Ibab46f109200bcbdeab13a4cc1bcd0870f2a99fb
wesomePlayer.cpp
ediaCodec.cpp
tils.cpp
olorconversion/SoftwareRenderer.cpp
nclude/SoftwareRenderer.h
6561734b191e85890da3e76038d769f1a0bf8faf 15-Aug-2014 Lajos Molnar <lajos@google.com> am ef101277: am 1864e9f6: Merge "stagefright: allow specifying flac copmression level by \'complexity\'" into lmp-dev

* commit 'ef1012772ab6292981f163bd6515f193d579046d':
stagefright: allow specifying flac copmression level by 'complexity'
e0d019d56258c94e052eaf58699145af3018ef58 15-Aug-2014 Lajos Molnar <lajos@google.com> am b986d6bb: am 74868d6d: Merge "stagefright/media: add support for codec features with text value" into lmp-dev

* commit 'b986d6bbf92601ed72151c1b5da01dc529accf0e':
stagefright/media: add support for codec features with text value
ef1012772ab6292981f163bd6515f193d579046d 15-Aug-2014 Lajos Molnar <lajos@google.com> am 1864e9f6: Merge "stagefright: allow specifying flac copmression level by \'complexity\'" into lmp-dev

* commit '1864e9f621cabc77cae58a6214d13dae09b05681':
stagefright: allow specifying flac copmression level by 'complexity'
b986d6bbf92601ed72151c1b5da01dc529accf0e 15-Aug-2014 Lajos Molnar <lajos@google.com> am 74868d6d: Merge "stagefright/media: add support for codec features with text value" into lmp-dev

* commit '74868d6d167ff231e9d2c65cb90eb249bc99c0ea':
stagefright/media: add support for codec features with text value
ff9701517d06b0caa4e9a6e61f72be2c030653ee 15-Aug-2014 Chong Zhang <chz@google.com> am f6bfa550: am 26156231: Merge "make NuPlayer\'s http connection mechanism behave more like that of AwesomePlayer\'s" into lmp-dev

* commit 'f6bfa550a371f0802f5e136f16b570d704705c98':
make NuPlayer's http connection mechanism behave more like that of AwesomePlayer's
f6bfa550a371f0802f5e136f16b570d704705c98 15-Aug-2014 Chong Zhang <chz@google.com> am 26156231: Merge "make NuPlayer\'s http connection mechanism behave more like that of AwesomePlayer\'s" into lmp-dev

* commit '261562316c1b652ea697c99c0f24a54112bd0385':
make NuPlayer's http connection mechanism behave more like that of AwesomePlayer's
1864e9f621cabc77cae58a6214d13dae09b05681 15-Aug-2014 Lajos Molnar <lajos@google.com> Merge "stagefright: allow specifying flac copmression level by 'complexity'" 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
ata/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
ata/media_codecs_google_audio.xml
ata/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
Codec.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
ediaCodecList.cpp
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
ataSource.cpp
2d4829b12aa137a4622f35fd47a3a765e348bd53 13-Aug-2014 Lajos Molnar <lajos@google.com> am 434c9084: am e6e18e8d: Merge "stagefright: allow scenarios when dequeueBufferFromNativeWindow fails" into lmp-dev

* commit '434c908400d70392a2b05bf556314158273ecc37':
stagefright: allow scenarios when dequeueBufferFromNativeWindow fails
434c908400d70392a2b05bf556314158273ecc37 13-Aug-2014 Lajos Molnar <lajos@google.com> am e6e18e8d: Merge "stagefright: allow scenarios when dequeueBufferFromNativeWindow fails" into lmp-dev

* commit 'e6e18e8de729316b3fac7733f9ebc7f1b3feba95':
stagefright: allow scenarios when dequeueBufferFromNativeWindow fails
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
Codec.cpp
4fc10b66514a62bb04bf38861115aa1460c8babc 12-Aug-2014 Lajos Molnar <lajos@google.com> am 4a3eb9d0: am d018b8ff: Merge "MediaCodecList: handle errors gracefully" into lmp-dev

* commit '4a3eb9d08a2c929f9eac971de3e321ef30922cab':
MediaCodecList: handle errors gracefully
4a3eb9d08a2c929f9eac971de3e321ef30922cab 12-Aug-2014 Lajos Molnar <lajos@google.com> am d018b8ff: Merge "MediaCodecList: handle errors gracefully" into lmp-dev

* commit 'd018b8ffd84452a7a4b992b5325713b3256e48ff':
MediaCodecList: handle errors gracefully
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
ediaCodecList.cpp
2635987008277c20fe6a3f691bade719ea4c33fd 09-Aug-2014 Dan Albert <danalbert@google.com> am 2dfe8ea7: Merge changes Idc9808f7,If7bc8e5b into lmp-dev

* commit '2dfe8ea7c131a045067c123efc934ef6ccdb8821':
Fix the build after -Bsymbolic fix.
Fix PIC relocations for non-Bsymbolic builds
8495ed2a5ed1bd377dd65f4ffbdc8f1812586581 09-Aug-2014 Rachad <rachad@google.com> am 93736390: am e079c76c: Merge "Added Tunneled video playback support to ACodec" into lmp-dev

* commit '937363908fa2738c982af78c8b96626a5a2ba94e':
Added Tunneled video playback support to ACodec
937363908fa2738c982af78c8b96626a5a2ba94e 09-Aug-2014 Rachad <rachad@google.com> am e079c76c: Merge "Added Tunneled video playback support to ACodec" into lmp-dev

* commit 'e079c76c5c29d6cca85d9debc470358588721618':
Added Tunneled video playback support to ACodec
9749b912a306fdcf68cc4aa30d7b70818f7b5ba1 09-Aug-2014 Lajos Molnar <lajos@google.com> am 90729c19: am 53a1e46e: Merge "stagefright: set crop rect in SoftwareRenderer" into lmp-dev

* commit '90729c199783743fa6ec5f4686944889677b75f9':
stagefright: set crop rect in SoftwareRenderer
71b9e53de117ad4ada3638b3f4346f035197b93b 09-Aug-2014 Lajos Molnar <lajos@google.com> am 2a31f21e: am 5f244042: Merge "Fix WAVExtractor to output full audio frames only" into lmp-dev

* commit '2a31f21e08c3ced8c3a9f1a38f98cf0cbe52d7b7':
Fix WAVExtractor to output full audio frames only
90729c199783743fa6ec5f4686944889677b75f9 09-Aug-2014 Lajos Molnar <lajos@google.com> am 53a1e46e: Merge "stagefright: set crop rect in SoftwareRenderer" into lmp-dev

* commit '53a1e46e559b00653eadf6f4bb5572679b0ee734':
stagefright: set crop rect in SoftwareRenderer
2a31f21e08c3ced8c3a9f1a38f98cf0cbe52d7b7 09-Aug-2014 Lajos Molnar <lajos@google.com> am 5f244042: Merge "Fix WAVExtractor to output full audio frames only" into lmp-dev

* commit '5f24404277a4ce2bdfd2a38c45abb48b7aeccad4':
Fix WAVExtractor to output full audio frames only
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
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
Codec.cpp
MXClient.cpp
nclude/OMX.h
nclude/OMXNodeInstance.h
mx/OMX.cpp
mx/OMXNodeInstance.cpp
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
olorconversion/SoftwareRenderer.cpp
5f24404277a4ce2bdfd2a38c45abb48b7aeccad4 09-Aug-2014 Lajos Molnar <lajos@google.com> Merge "Fix WAVExtractor to output full audio frames only" into lmp-dev
e3fdb6012905d593c9350958f4429d0d670adae4 09-Aug-2014 Andy Hung <hunga@google.com> Fix WAVExtractor to output full audio frames only

Fixes NuPlayer crash from MediaBuffers ending in partial audio frames.

Bug: 16881623
Change-Id: Ia80a9910f99245e645860c00ae85118cc85bef57
AVExtractor.cpp
ab13ef6082d0824e418e6857b10f509c54079b3f 08-Aug-2014 Jean-Michel Trivi <jmtrivi@google.com> am 045e7be2: am ddabe554: Merge "AAC decoder: add support for controlling presentation parameters" into lmp-dev

* commit '045e7be2d68b766759a6f8af6d24d80325f5d22f':
AAC decoder: add support for controlling presentation parameters
045e7be2d68b766759a6f8af6d24d80325f5d22f 08-Aug-2014 Jean-Michel Trivi <jmtrivi@google.com> am ddabe554: Merge "AAC decoder: add support for controlling presentation parameters" into lmp-dev

* commit 'ddabe554e95940891c5df9a7f092798351b5f75e':
AAC decoder: add support for controlling presentation parameters
c72c0c91c0d2f7865f125a04ee2c779f6c1d9a42 08-Aug-2014 Sasha Levitskiy <sanek@google.com> am 15ff76c9: Merge "libstagefright: foundation: Add syntactic sugar to the cast." into lmp-dev

* commit '15ff76c99482eab01934cf0f55c815a85cf06f35':
libstagefright: foundation: Add syntactic sugar to the cast.
55971df8768a2e613717a14251d56993b9322b5e 08-Aug-2014 Sasha Levitskiy <sanek@google.com> libstagefright: foundation: Add syntactic sugar to the cast.

Change-Id: I0b6b3ae440addd4891c26b0639bd6e647a7b031e
oundation/AString.cpp
62cb76f1a38475f0223660d5a9776d5e413b4160 08-Aug-2014 Dan Albert <danalbert@google.com> Resolved conflicts for merge of aed1d581 to lmp-dev-plus-aosp

Change-Id: Ib3877bfb60774d056fa2d934d2f4cb74e3b235ea
aed1d5813fbf5c5a820dc462b7352474f1153068 08-Aug-2014 Dan Albert <danalbert@google.com> am 5a192121: Merge "Revert "Fix build after side-stepping global -Bsymbolic.""

* commit '5a192121e99a740dab6df2b6550e02ef18f5dbc7':
Revert "Fix build after side-stepping global -Bsymbolic."
38c5faaaf0ead823eeb1ccfc58888cfc2ceec7ac 08-Aug-2014 Andy Hung <hunga@google.com> am 317bb916: Merge "Clarify and implement MediaCodec status codes" into lmp-dev

* commit '317bb9163befccd87348c11bdfc0044e629b362b':
Clarify and implement MediaCodec status codes
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
Codec.cpp
odecs/aacdec/SoftAAC2.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)
odecs/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)
odecs/amrwbenc/src/asm/ARMV5E/Filt_6k_7k_opt.s
odecs/amrwbenc/src/asm/ARMV5E/pred_lt4_1_opt.s
odecs/amrwbenc/src/asm/ARMV7/Filt_6k_7k_neon.s
odecs/amrwbenc/src/asm/ARMV7/pred_lt4_1_neon.s
odecs/mp3dec/src/asm/pvmp3_polyphase_filter_window_gcc.s
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_DecodeCoeffsToPair_s.S
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_DequantTables_s.S
789a7c6dd196432b83a8142aac5a2a8b75e8860c 08-Aug-2014 Dan Albert <danalbert@google.com> am 4b599537: am 9ee1572f: Merge "Fix PIC relocations for non-Bsymbolic builds"

* commit '4b59953778bb49d0b316ad8f83991d5f6fb02fba':
Fix PIC relocations for non-Bsymbolic builds
4b59953778bb49d0b316ad8f83991d5f6fb02fba 08-Aug-2014 Dan Albert <danalbert@google.com> am 9ee1572f: Merge "Fix PIC relocations for non-Bsymbolic builds"

* commit '9ee1572f7f01797b7526de95cb322f90c9b626bd':
Fix PIC relocations for non-Bsymbolic builds
95b9c3589a5d8faa42752781daac1830f3ed89db 08-Aug-2014 Colin Cross <ccross@android.com> am 1198a339: libstagefright_foundation: fix build

* commit '1198a3394a21d3c31b19395b124c77f09a8f0924':
libstagefright_foundation: fix build
1198a3394a21d3c31b19395b124c77f09a8f0924 08-Aug-2014 Colin Cross <ccross@android.com> libstagefright_foundation: fix build

Change-Id: If61766efa8834df175bd5758c760344364458d4a
oundation/AString.cpp
4e80efd580d347575b7272f822f04f5a68e3d62d 08-Aug-2014 Lajos Molnar <lajos@google.com> am 229d2426: stagefright: support flexible YUV format

* commit '229d242665c612fd97431d1e7ac004823b47f181':
stagefright: support flexible YUV format
21f75434a456c3b747c4b6a3f9801ee890f3eb46 08-Aug-2014 Lajos Molnar <lajos@google.com> am 1381d4b5: media/playerservice: add getCodecList() to MediaPlayerService

* commit '1381d4b5c0385aec3741073e5998773b064c1fb0':
media/playerservice: add getCodecList() to MediaPlayerService
ea48fd49f0217758ccde320a45b3031da40a6e6a 08-Aug-2014 Lajos Molnar <lajos@google.com> am 60b1c0e7: stagefright: rework media codec list and infos

* commit '60b1c0e79d12a1c70758bc8d060156924635f8ba':
stagefright: rework media codec list and infos
fb02a9cf5b510b96f60af46e7bf712d9a8a5846f 08-Aug-2014 Lajos Molnar <lajos@google.com> am 8accee4f: stagefright: add AString parceling, and equal/compareIgnoreCase

* commit '8accee4f0e94f19866d260be6eecd6c219eb4982':
stagefright: add AString parceling, and equal/compareIgnoreCase
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
Codec.cpp
MXCodec.cpp
1381d4b5c0385aec3741073e5998773b064c1fb0 08-Aug-2014 Lajos Molnar <lajos@google.com> media/playerservice: add getCodecList() to MediaPlayerService

Bug: 11990470
Change-Id: I8fa45946fd9b76f9b975fc59062819c57e6881ef
ediaCodecList.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
ediaCodec.cpp
ediaCodecList.cpp
MXCodec.cpp
ec8b67eb9fc678d1e33c424cb4a468082fd0b1b2 08-Aug-2014 Dan Albert <danalbert@google.com> Resolved conflicts for merge of 2af8711d to lmp-dev-plus-aosp

Change-Id: I016dbca0318998f17fc741f873589c414774e7ff
2af8711d3e3df7c7a4531bd25adc882c306cc97a 08-Aug-2014 Dan Albert <danalbert@google.com> am 07574544: Merge "Fix build after side-stepping global -Bsymbolic."

* commit '07574544bda57f4227c7eadf5682f7bf86e42b26':
Fix build after side-stepping global -Bsymbolic.
8accee4f0e94f19866d260be6eecd6c219eb4982 06-Aug-2014 Lajos Molnar <lajos@google.com> stagefright: add AString parceling, and equal/compareIgnoreCase

Bug: 11990470
Change-Id: If43ada5d2e768931f4409e499eaa268edade0500
oundation/AString.cpp
5a192121e99a740dab6df2b6550e02ef18f5dbc7 08-Aug-2014 Dan Albert <danalbert@google.com> Merge "Revert "Fix build after side-stepping global -Bsymbolic.""
b1a164e1445bcc48498e2091f42c5275a01f5a84 08-Aug-2014 Dan Albert <danalbert@google.com> Revert "Fix build after side-stepping global -Bsymbolic."

This reverts commit 3b909164de79904137bb6661514d5ca6236a49c9.

Bug: 16853291
odecs/amrwbenc/Android.mk
odecs/mp3dec/Android.mk
odecs/on2/h264dec/Android.mk
3b909164de79904137bb6661514d5ca6236a49c9 07-Aug-2014 Dan Albert <danalbert@google.com> Fix build after side-stepping global -Bsymbolic.

Some of the assembly in the codecs is generating invalid relocations
without -Bsymbolic. Leave it on for these projects for the time being.

Bug: 16853291
Change-Id: Id70488b077256a70137c4417f21be2c2d1d4341c
odecs/amrwbenc/Android.mk
odecs/mp3dec/Android.mk
odecs/on2/h264dec/Android.mk
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
Codec.cpp
ediaCodec.cpp
991c0484bb9f7e4f557b4626fe3397616f890c11 07-Aug-2014 Lajos Molnar <lajos@google.com> am a9522673: stagefright: move ARRAY_SIZE to foundation

* commit 'a9522673f3076ea937eb2912945d7ed646ca05df':
stagefright: move ARRAY_SIZE to foundation
bd796208b9b82739cdc67b1441928bd8609722c5 08-Aug-2014 Sasha Levitskiy <sanek@google.com> am c72c0c91: am 15ff76c9: Merge "libstagefright: foundation: Add syntactic sugar to the cast." into lmp-dev

* commit 'c72c0c91c0d2f7865f125a04ee2c779f6c1d9a42':
libstagefright: foundation: Add syntactic sugar to the cast.
a2c87011bbb3b90cdf1e5b719a9023aa0ba0479a 08-Aug-2014 Dan Albert <danalbert@google.com> am 62cb76f1: Resolved conflicts for merge of aed1d581 to lmp-dev-plus-aosp

* commit '62cb76f1a38475f0223660d5a9776d5e413b4160':
Revert "Fix build after side-stepping global -Bsymbolic."
21f6409920086ef678ee3288e59beb376801b8f6 08-Aug-2014 Andy Hung <hunga@google.com> am 38c5faaa: am 317bb916: Merge "Clarify and implement MediaCodec status codes" into lmp-dev

* commit '38c5faaaf0ead823eeb1ccfc58888cfc2ceec7ac':
Clarify and implement MediaCodec status codes
559d2194c5a3466b10cd0e3ce245be7aff58e895 08-Aug-2014 Dan Albert <danalbert@google.com> am 789a7c6d: am 4b599537: am 9ee1572f: Merge "Fix PIC relocations for non-Bsymbolic builds"

* commit '789a7c6dd196432b83a8142aac5a2a8b75e8860c':
Fix PIC relocations for non-Bsymbolic builds
4dd059a82213b35d97314e4e06da770b57d4156a 08-Aug-2014 Dan Albert <danalbert@google.com> Merge "Fix the build after -Bsymbolic fix."
8173554d5b5e25215e9c591a0dbb92b8c0ff082e 08-Aug-2014 Dan Albert <danalbert@google.com> Fix the build after -Bsymbolic fix.

Bug: 16853291
Change-Id: Idc9808f76e8be7afb70513c4036b57c91690728e
odecs/hevcdec/Android.mk
befa168f369fd401213650b25d5c22161267a3e2 08-Aug-2014 Colin Cross <ccross@android.com> am 95b9c358: am 1198a339: libstagefright_foundation: fix build

* commit '95b9c3589a5d8faa42752781daac1830f3ed89db':
libstagefright_foundation: fix build
c3931ffcb52ee61b7ec2cdbd036e0498ae413fb6 08-Aug-2014 Lajos Molnar <lajos@google.com> am 4e80efd5: am 229d2426: stagefright: support flexible YUV format

* commit '4e80efd580d347575b7272f822f04f5a68e3d62d':
stagefright: support flexible YUV format
26ddfc950b696f7a62e7442c9db9b2bcc5728ba0 08-Aug-2014 Lajos Molnar <lajos@google.com> am 21f75434: am 1381d4b5: media/playerservice: add getCodecList() to MediaPlayerService

* commit '21f75434a456c3b747c4b6a3f9801ee890f3eb46':
media/playerservice: add getCodecList() to MediaPlayerService
46120b61b3978be2da950683233add920f689a67 08-Aug-2014 Lajos Molnar <lajos@google.com> am ea48fd49: am 60b1c0e7: stagefright: rework media codec list and infos

* commit 'ea48fd49f0217758ccde320a45b3031da40a6e6a':
stagefright: rework media codec list and infos
b51346d22809f556ae3919e365aa5573c7ef9e2d 08-Aug-2014 Lajos Molnar <lajos@google.com> am fb02a9cf: am 8accee4f: stagefright: add AString parceling, and equal/compareIgnoreCase

* commit 'fb02a9cf5b510b96f60af46e7bf712d9a8a5846f':
stagefright: add AString parceling, and equal/compareIgnoreCase
dde93cc995b27607923a0961768a307ad5e0c69f 08-Aug-2014 Dan Albert <danalbert@google.com> am ec8b67eb: Resolved conflicts for merge of 2af8711d to lmp-dev-plus-aosp

* commit 'ec8b67eb9fc678d1e33c424cb4a468082fd0b1b2':
Fix build after side-stepping global -Bsymbolic.
3ca11b0d5d10f062a72f0c6cf90e47073b367907 07-Aug-2014 Lajos Molnar <lajos@google.com> am 991c0484: am a9522673: stagefright: move ARRAY_SIZE to foundation

* commit '991c0484bb9f7e4f557b4626fe3397616f890c11':
stagefright: move ARRAY_SIZE to foundation
9ee1572f7f01797b7526de95cb322f90c9b626bd 08-Aug-2014 Dan Albert <danalbert@google.com> Merge "Fix PIC relocations for non-Bsymbolic builds"
97e3e847179c17eb9059fb322413b6facd3e5a03 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
odecs/amrwbenc/src/asm/ARMV5E/Filt_6k_7k_opt.s
odecs/amrwbenc/src/asm/ARMV5E/pred_lt4_1_opt.s
odecs/amrwbenc/src/asm/ARMV7/Filt_6k_7k_neon.s
odecs/amrwbenc/src/asm/ARMV7/pred_lt4_1_neon.s
odecs/mp3dec/src/asm/pvmp3_polyphase_filter_window_gcc.s
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_DecodeCoeffsToPair_s.S
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_DequantTables_s.S
a9522673f3076ea937eb2912945d7ed646ca05df 06-Aug-2014 Lajos Molnar <lajos@google.com> stagefright: move ARRAY_SIZE to foundation

Bug: 11990470
Change-Id: Ifae790b774a0fb210acbe33a1310d3d6ba46e7fa
nclude/SoftVideoDecoderOMXComponent.h
5d166509fa0cdf0e4b3037d7e05005a5390aedd3 07-Aug-2014 Robert Shih <robertshih@google.com> am 71fb0565: am 0893eaf7: Merge "httplive: timestamp reporting, track selection" into lmp-dev

* commit '71fb05656ad2c786c9f98df91d70ed010ba088d1':
httplive: timestamp reporting, track selection
71fb05656ad2c786c9f98df91d70ed010ba088d1 07-Aug-2014 Robert Shih <robertshih@google.com> am 0893eaf7: Merge "httplive: timestamp reporting, track selection" into lmp-dev

* commit '0893eaf7d21e3a50b81324673eaa91a6b77a39c2':
httplive: timestamp reporting, track selection
a72b7ec42c02fd1e5a8f367e8faa1d0d633ded93 07-Aug-2014 Chong Zhang <chz@google.com> am 25d9b3df: am 29e09664: Merge "some fixes for crash when extractor creation fails" into lmp-dev

* commit '25d9b3df27fb96c616447723d7c4dca8770cebfb':
some fixes for crash when extractor creation fails
25d9b3df27fb96c616447723d7c4dca8770cebfb 07-Aug-2014 Chong Zhang <chz@google.com> am 29e09664: Merge "some fixes for crash when extractor creation fails" into lmp-dev

* commit '29e09664c2c5b49d78f2666d38a812502a36e26b':
some fixes for crash when extractor creation fails
749235234484960d0f6d70c6d0193b9b2f16d3e2 06-Aug-2014 Jean-Michel Trivi <jmtrivi@google.com> am 6b2400bc: am 3c9879b9: Merge "AAC encoder: add support for SBR mode selection" into lmp-dev

* commit '6b2400bcffa4d915c3028b994c053c140910add7':
AAC encoder: add support for SBR mode selection
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
ataSource.cpp
nclude/WVMExtractor.h
0893eaf7d21e3a50b81324673eaa91a6b77a39c2 07-Aug-2014 Robert Shih <robertshih@google.com> Merge "httplive: timestamp reporting, track selection" into lmp-dev
309aa8bf5e4cd66fe988adf2654cac3fadc2a1c3 30-Jul-2014 Robert Shih <robertshih@google.com> httplive: timestamp reporting, track selection

Bug: 15153976
Bug: 15763638
Bug: 16351654
Change-Id: I4462276d4b7342647286a0ca4be11692ce52ff6d
ttplive/LiveSession.cpp
ttplive/LiveSession.h
ttplive/M3UParser.cpp
ttplive/M3UParser.h
ttplive/PlaylistFetcher.cpp
ttplive/PlaylistFetcher.h
peg2ts/ATSParser.cpp
peg2ts/AnotherPacketSource.cpp
peg2ts/AnotherPacketSource.h
6b2400bcffa4d915c3028b994c053c140910add7 06-Aug-2014 Jean-Michel Trivi <jmtrivi@google.com> am 3c9879b9: Merge "AAC encoder: add support for SBR mode selection" into lmp-dev

* commit '3c9879b980ad195797543ce237ecbe479267e16f':
AAC encoder: add support for SBR mode selection
b97cc6a9a3c81215e365c61b071a932073b56ff2 02-Aug-2014 Jean-Michel Trivi <jmtrivi@google.com> AAC encoder: add support for SBR mode selection

Change-Id: Ibc07bff7710398929c135f38324dd29857fa0ea6
Codec.cpp
odecs/aacenc/SoftAACEncoder2.cpp
odecs/aacenc/SoftAACEncoder2.h
c88fe1b40caab1b335669e1e373127f84148f622 05-Aug-2014 aarti jadhav-gaikwad <agaikwad@nvidia.com> am dd49ca9c: am ccad786f: stagefright: Pass audio aac subformats in offloadinfo

* commit 'dd49ca9c117b75afe70f78b6d458eaece2952bf7':
stagefright: Pass audio aac subformats in offloadinfo
dd49ca9c117b75afe70f78b6d458eaece2952bf7 05-Aug-2014 aarti jadhav-gaikwad <agaikwad@nvidia.com> am ccad786f: stagefright: Pass audio aac subformats in offloadinfo

* commit 'ccad786f3497f223cbc5af981b08b460433ee622':
stagefright: Pass audio aac subformats in offloadinfo
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
tils.cpp
3c9879b980ad195797543ce237ecbe479267e16f 06-Aug-2014 Jean-Michel Trivi <jmtrivi@google.com> Merge "AAC encoder: add support for SBR mode selection" into lmp-dev
cabf03e6c9799b1a97b2cac0cacfeed255894935 04-Aug-2014 Chong Zhang <chz@google.com> am 11a4d099: am ca61a8f0: Merge "MediaCodecSource: stop puller from caller\'s thread instead of looper" into lmp-dev

* commit '11a4d099fd2cd3acf3de7210c0ef3e470254ebe8':
MediaCodecSource: stop puller from caller's thread instead of looper
11a4d099fd2cd3acf3de7210c0ef3e470254ebe8 04-Aug-2014 Chong Zhang <chz@google.com> am ca61a8f0: Merge "MediaCodecSource: stop puller from caller\'s thread instead of looper" into lmp-dev

* commit 'ca61a8f0bc22606cb11b99bdb10a146f941d556e':
MediaCodecSource: stop puller from caller's thread instead of looper
88e8131ccc0bdde2bd35d507eba8f283d5d8c7ee 01-Aug-2014 Lajos Molnar <lajos@google.com> am a2ad5bdc: am 3c6fac2c: Merge "stagefright: propagate error in MPEG4Extractor::readMetaData" into lmp-dev

* commit 'a2ad5bdc2264c73f196e5c79b5a1dff7fb2b4bac':
stagefright: propagate error in MPEG4Extractor::readMetaData
1c650b8df21a6a5ae8a0177036a8b422e0c45403 01-Aug-2014 Robert Shih <robertshih@google.com> am 37ae54ee: am 3423bbdb: GenericSource: support track (de)selection

* commit '37ae54ee81f460e11c3e8fe81e74ec91d85b04d1':
GenericSource: support track (de)selection
a2ad5bdc2264c73f196e5c79b5a1dff7fb2b4bac 01-Aug-2014 Lajos Molnar <lajos@google.com> am 3c6fac2c: Merge "stagefright: propagate error in MPEG4Extractor::readMetaData" into lmp-dev

* commit '3c6fac2c807e4234953dcdc793029a82d1f3a089':
stagefright: propagate error in MPEG4Extractor::readMetaData
37ae54ee81f460e11c3e8fe81e74ec91d85b04d1 01-Aug-2014 Robert Shih <robertshih@google.com> am 3423bbdb: GenericSource: support track (de)selection

* commit '3423bbdb05f843a64356fa24e8657f03ecbb7d65':
GenericSource: support track (de)selection
16e79115e497386eaf010af388627f94314a55a3 01-Aug-2014 Chong Zhang <chz@google.com> MediaCodecSource: stop puller from caller's thread instead of looper

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

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

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

Bug: 16522726
Change-Id: Ie91f563c5d8a98ab091bf1945af4e51f662b9403
udioSource.cpp
ediaCodecSource.cpp
3423bbdb05f843a64356fa24e8657f03ecbb7d65 17-Jul-2014 Robert Shih <robertshih@google.com> GenericSource: support track (de)selection

Bug: 15153976

Change-Id: Idfce856b4ca5fa7853da857757490798bc3ffe1e
peg2ts/AnotherPacketSource.cpp
peg2ts/AnotherPacketSource.h
eb65a2e484e55274f24ad61f32098717fbec7c10 31-Jul-2014 Lajos Molnar <lajos@google.com> am 1d5b45f7: Merge "stagefright: MediaCodec async operations." into lmp-dev

* commit '1d5b45f70f684996acc24fbf3e30fa5af0a0c642':
stagefright: MediaCodec async operations.
1fc9180adf5c89a13c0dbf059fba713acd995fe8 31-Jul-2014 Lajos Molnar <lajos@google.com> am 89869f69: stagefright: enable decoder color format selection

* commit '89869f692c35d0ca914c7de4a1f5ff63c9920634':
stagefright: enable decoder color format selection
89869f692c35d0ca914c7de4a1f5ff63c9920634 28-Jul-2014 Lajos Molnar <lajos@google.com> stagefright: enable decoder color format selection

Bug: 10706245
Change-Id: I9a77631bfae0358be229b079228c1fcae0e77faf
Codec.cpp
da7e4c3ac27aa613855152a1c860ae54eed7e0be 31-Jul-2014 Chong Zhang <chz@google.com> am b382340f: Merge "handle rotation in NuPlayer" into lmp-dev

* commit 'b382340f33ac2dc26fe825ceb3ef98bac8af974c':
handle rotation in NuPlayer
10bb0f389fc1f03dac356504f3f3603dd56c72bf 31-Jul-2014 Chong Zhang <chz@google.com> am d089a740: Merge "ATSParser: treat stream type 0x83 as TrueHD AC3" into lmp-dev

* commit 'd089a740e1e61d9503d2c84259bacb3e06c58a0e':
ATSParser: treat stream type 0x83 as TrueHD AC3
4ff2a0dbb178c4ea652f30aa4f1d3deb9fdbc832 31-Jul-2014 Lajos Molnar <lajos@google.com> stagefright: propagate error in MPEG4Extractor::readMetaData

Bug: 16641557
Change-Id: I252825bd767a4581b9fca560f2cabfb37c18e137
PEG4Extractor.cpp
1d5b45f70f684996acc24fbf3e30fa5af0a0c642 31-Jul-2014 Lajos Molnar <lajos@google.com> Merge "stagefright: MediaCodec async operations." into lmp-dev
0e8cfc36044ba97545e7c9e129b0b3e98eec5089 31-Jul-2014 Lajos Molnar <lajos@google.com> stagefright: MediaCodec async operations.

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

Bug: 11990118
Change-Id: If2d6a76ab499ee9ed4a11486fb537acbc52e66f6
ediaCodec.cpp
9a45cc3f38bb6e3de1c76a27509af154adec1a3c 30-Jul-2014 Wei Jia <wjia@google.com> am cb48eacb: Revert GenericSource track selection changes

* commit 'cb48eacb6f8857c7857bb28d6a13d4a0d417f2bd':
Revert GenericSource track selection changes
cb48eacb6f8857c7857bb28d6a13d4a0d417f2bd 30-Jul-2014 Wei Jia <wjia@google.com> Revert GenericSource track selection changes

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

Bug: 16660839
peg2ts/AnotherPacketSource.cpp
peg2ts/AnotherPacketSource.h
8639e5d0956e876c4fa83ff4383898864da24d35 31-Jul-2014 Robert Shih <robertshih@google.com> Merge "MPEG4Extractor: parse csd correctly; workaround malformed csd"
f6c33fb3830f93b680128ad575dd8a8a4d011d74 29-Jul-2014 Robert Shih <robertshih@google.com> am f0a3c169: Merge "SampleTable: check integer overflow during table alloc" into lmp-dev

* commit 'f0a3c16901a7d9455f5d3153f6240e73e57a7beb':
SampleTable: check integer overflow during table alloc
4720017b878230e09f1d9be8833f56d0f063d296 26-Jul-2014 Lajos Molnar <lajos@google.com> am 03c556ae: stagefright: add flexible YUV support

* commit '03c556ae1eb409ad088c49037e185946c54e1d25':
stagefright: add flexible YUV support
70f2c43fbd51f4d84895f5f6d7e16395550c968e 26-Jul-2014 Lajos Molnar <lajos@google.com> am 90b16fbd: stagefright: add ABuffer.CreateAsCopy

* commit '90b16fbdef406d95a6fb2f9395719dd7b7ca6adb':
stagefright: add ABuffer.CreateAsCopy
03c556ae1eb409ad088c49037e185946c54e1d25 25-Jul-2014 Lajos Molnar <lajos@google.com> stagefright: add flexible YUV support

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

Bug: 10706245
Change-Id: I8c4e96a2581a039e9e8237c3e09e2c22226da055
oundation/ABuffer.cpp
b382340f33ac2dc26fe825ceb3ef98bac8af974c 31-Jul-2014 Chong Zhang <chz@google.com> Merge "handle rotation in NuPlayer" into lmp-dev
e9e63bcf6c36351f1129b0bdc5e93f17f0f9f0b4 31-Jul-2014 Chong Zhang <chz@google.com> handle rotation in NuPlayer

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

Bug: 16668055
Change-Id: I11fd3f795bbb50113e1a1e28e682edd76f11e146
ediaCodecList.cpp
peg2ts/ATSParser.cpp
peg2ts/ATSParser.h
f0a3c16901a7d9455f5d3153f6240e73e57a7beb 29-Jul-2014 Robert Shih <robertshih@google.com> Merge "SampleTable: check integer overflow during table alloc" into lmp-dev
edd4a76eb4747bd19ed122df46fa46b452c12a0d 28-Jul-2014 Robert Shih <robertshih@google.com> SampleTable: check integer overflow during table alloc

Bug: 15328708
Bug: 15342615
Bug: 15342751
Change-Id: I6bb110a1eba46506799c73be8ff9a4f71c7e7053
ampleTable.cpp
a7c3a999993b4fb8ef28e02b8ff837c562504de6 25-Jul-2014 Chong Zhang <chz@google.com> am 858c7517: Merge "signal mFrameAvailableCondition when AudioSource is stopped" into lmp-dev

* commit '858c7517abd04c58d2f140df0f27cbad1253e18a':
signal mFrameAvailableCondition when AudioSource is stopped
Fix initial audio glitch on startup
858c7517abd04c58d2f140df0f27cbad1253e18a 25-Jul-2014 Chong Zhang <chz@google.com> Merge "signal mFrameAvailableCondition when AudioSource is stopped" into lmp-dev
d459e303f2f1d34c2b8c1af4f943747b20a8b1b2 24-Jul-2014 Chong Zhang <chz@google.com> signal mFrameAvailableCondition when AudioSource is stopped

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

Bug: 15849309
Change-Id: I79bba53630e59783a5fc041cfc5d3fdb2545cc2c
udioSource.cpp
bb9d60529cabf4c3374113b40e4adab24e747803 23-Jul-2014 Wei Jia <wjia@google.com> am 4730fa07: Hook up querying of VP8 temporal layering support.

* commit '4730fa07a3290cc3a904dcb16dbb92fcf46c36ac':
Hook up querying of VP8 temporal layering support.
4730fa07a3290cc3a904dcb16dbb92fcf46c36ac 23-Jul-2014 Wei Jia <wjia@google.com> Hook up querying of VP8 temporal layering support.

Bug: 14562236
Change-Id: I0ec5866173f7fb84dd3f79b588d1b35b523ca08a
Codec.cpp
799326870c4ee4f31e943e2d0cc1472148bada51 23-Jul-2014 Robert Shih <robertshih@google.com> am 4c9a0e3e: Merge "GenericSource: support track (de)selection" into lmp-dev

* commit '4c9a0e3e30e97a31fcd7e41cb77d15427cb9c50b':
GenericSource: support track (de)selection
433ae66759c36069a0d5e3715510f992dd8a8cba 23-Jul-2014 Robert Shih <robertshih@google.com> am b104d5a4: Merge "MediaWriter: make get/setStartTimeOffsetMs virtual" into lmp-dev

* commit 'b104d5a4dfbd8415f6bc227106b9f0130350d79a':
MediaWriter: make get/setStartTimeOffsetMs virtual
5622ae2ccbe4ceb14dd74ff1327e7549db46f898 23-Jul-2014 Chong Zhang <chz@google.com> am ecc01ef0: Merge "update battery stats for video/audio" into lmp-dev

* commit 'ecc01ef05aea6b04aafc1b7d2d8f8519d0a8d928':
update battery stats for video/audio
2606b10d51c2dceb851a2ea63e803aba4134bf00 22-Jul-2014 Chong Zhang <chz@google.com> update battery stats for video/audio

Bug: 12979595

Change-Id: Iafd93046a4fd9f22bcd66084deace746a7ca5d3c
ediaCodec.cpp
c75fa318ee6a775c6201424e952561e6b9d695e2 17-Jul-2014 Lajos Molnar <lajos@google.com> stagefright: Fix seeking in MPEG4 container - do not merge

- seek based on user-visible timestamp
- seek to previous, next and closest exactly
- also update OggExtractor seek to same logic

Bug: 12786906
Change-Id: I2d5e1fbff6469b6f081a284be2222a4cb50aa754
PEG4Extractor.cpp
ggExtractor.cpp
ampleTable.cpp
nclude/SampleTable.h
4c9a0e3e30e97a31fcd7e41cb77d15427cb9c50b 23-Jul-2014 Robert Shih <robertshih@google.com> Merge "GenericSource: support track (de)selection" into lmp-dev
05312bc7478feec11d9ae88e951c0857a7a3f28d 17-Jul-2014 Robert Shih <robertshih@google.com> GenericSource: support track (de)selection

Bug: 15153976
Change-Id: I522b1f9f0ffedf4edbea03a6654a6dbc0262860a
peg2ts/AnotherPacketSource.cpp
peg2ts/AnotherPacketSource.h
b104d5a4dfbd8415f6bc227106b9f0130350d79a 23-Jul-2014 Robert Shih <robertshih@google.com> Merge "MediaWriter: make get/setStartTimeOffsetMs virtual" into lmp-dev
6e22e0b969ceed6754f0e0fa7855ac8a2203f04a 21-Jul-2014 Lajos Molnar <lajos@google.com> am 225d5b20: stagefright: handle seeking to before first cue-point.

* commit '225d5b20409fd400bfa4ed5e9bc1d5babb498471':
stagefright: handle seeking to before first cue-point.
225d5b20409fd400bfa4ed5e9bc1d5babb498471 21-Jul-2014 Lajos Molnar <lajos@google.com> stagefright: handle seeking to before first cue-point.

Bug: 16446994
Change-Id: Id3f9d6780a7c4f62171cbfa8675a67334e8dfa10
ggExtractor.cpp
ampleTable.cpp
5791be18eba039c09370fc30a79ab78ee48357cf 20-Jul-2014 Lajos Molnar <lajos@google.com> am cf1f53ba: Fix: Add MediaCodecList capabilities

* commit 'cf1f53baa636f1782ff924d6003c70c6b8542c0b':
Fix: Add MediaCodecList capabilities
0aca37538035269379f955f2839a9f356bf4ab6a 20-Jul-2014 Lajos Molnar <lajos@google.com> am 2096abe9: Merge "Add MediaCodecList capabilities" into lmp-dev

* commit '2096abe982891b641f6117811dae419230c5d3ba':
Add MediaCodecList capabilities
85ed0ab81ad821df8a8a4a7774ec32d387c6c5c0 20-Jul-2014 Wei Jia <wjia@google.com> am c63680d8: Merge "Free MediaBuffer when ABuffer is discarded." into lmp-dev

* commit 'c63680d80ac262a6be4a22a66f92960e9f44d460':
Free MediaBuffer when ABuffer is discarded.
cf1f53baa636f1782ff924d6003c70c6b8542c0b 19-Jul-2014 Lajos Molnar <lajos@google.com> Fix: Add MediaCodecList capabilities

fix getting capability index from type

Bug: 12065651

Change-Id: Id2bc60410a92e17c841a5dd072257bc40ad6236f
ediaCodecList.cpp
bd01ada0cd5cdff2c42230e346341a0fa2a68a20 18-Jul-2014 Lajos Molnar <lajos@google.com> am ada68887: Merge "stagefright: Fix seeking in MPEG4 container" into lmp-dev

* commit 'ada688878122d6504cccebb9121f9d4f8f701e38':
stagefright: Fix seeking in MPEG4 container
c63680d80ac262a6be4a22a66f92960e9f44d460 19-Jul-2014 Wei Jia <wjia@google.com> Merge "Free MediaBuffer when ABuffer is discarded." into lmp-dev
65eeb3c92ffc8b90eb1330fdf9a74c55f3c6b463 18-Jul-2014 Wei Jia <wjia@google.com> Free MediaBuffer when ABuffer is discarded.

BUG: 15699665
Change-Id: Ie7da017cf32ccc08094fe4b01a2b07d2739770d2
peg2ts/AnotherPacketSource.cpp
599950efbb03b1672561d4cf2272504b879525e8 17-Jul-2014 Lajos Molnar <lajos@google.com> stagefright: Fix seeking in MPEG4 container

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

Bug: 12786906
Change-Id: I2d5e1fbff6469b6f081a284be2222a4cb50aa754
PEG4Extractor.cpp
ggExtractor.cpp
ampleTable.cpp
nclude/SampleTable.h
eba0bde609694203a26f5855bfd32458036b9c87 18-Jul-2014 Lajos Molnar <lajos@google.com> am 3cb57616: stagefright: use all input buffers in ACodec

* commit '3cb576166020bfdc1522b33919fe5ff8d211d0a3':
stagefright: use all input buffers in ACodec
3830fe4fe946a4ab535b54bf7cccb37bcdd2ec0a 18-Jul-2014 Lajos Molnar <lajos@google.com> am c9a11abb: stagefright: add nonblocking MediaBufferGroup.acquire_buffer method

* commit 'c9a11abbb6b48604ea063daedd6118024cfbfa92':
stagefright: add nonblocking MediaBufferGroup.acquire_buffer method
7f7f48152bdd191014f1ac9e0ab4ecba069c3c77 18-Jul-2014 Lajos Molnar <lajos@google.com> am 20965b56: Merge "stagefright: add nonblocking read option to MediaBuffer" into lmp-dev

* commit '20965b564a606f9432177668c032ce97d1913e26':
stagefright: add nonblocking read option to MediaBuffer
9c8870e5f1e3fff568b7a45ac9d52c0284e6c935 18-Jul-2014 Zhijun He <zhijunhe@google.com> am 09b9a3b0: Merge "stagefright: add error log when create omx component failed" into lmp-dev

* commit '09b9a3b0aadb347ae823ff0396232930c82a7ff1':
stagefright: add error log when create omx component failed
3cb576166020bfdc1522b33919fe5ff8d211d0a3 17-Jul-2014 Lajos Molnar <lajos@google.com> stagefright: use all input buffers in ACodec

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

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

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

Bug: 12065651
Change-Id: Icfb73c0009621cd747e113d8a0cd84c966bf055d
ediaCodecList.cpp
oundation/AMessage.cpp
d8cf55d878edddfc36bb821a95b88dfb2453c2c3 17-Jul-2014 Robert Shih <robertshih@google.com> MediaWriter: make get/setStartTimeOffsetMs virtual

Bug: 16329805
Change-Id: Ib971dd95b54829438c8af97528f9e00b87ab3f1e
ebm/WebmWriter.h
7a727021b86c2fb2c9f60af2c999154dce1766eb 18-Jul-2014 Zhijun He <zhijunhe@google.com> stagefright: add error log when create omx component failed

Bug: 16343447
Change-Id: I6854b9b837a141a77ab318953dc002ec5ad5d31d
Codec.cpp
mx/OMX.cpp
2399ae9d9c215cdd1744aaa21ce9b821f103296a 17-Jul-2014 Lajos Molnar <lajos@google.com> am 380d1e1a: am 2e25819f: Merge "M3UParser: check for NULL before setting meta data"

* commit '380d1e1abff2bbcba45d452e37f9699792422c08':
M3UParser: check for NULL before setting meta data
380d1e1abff2bbcba45d452e37f9699792422c08 17-Jul-2014 Lajos Molnar <lajos@google.com> am 2e25819f: Merge "M3UParser: check for NULL before setting meta data"

* commit '2e25819fffbb23d42541ead1bf735f3a02fa0330':
M3UParser: check for NULL before setting meta data
cfb125bf2ad434279ae58fef6d8d11c70b303964 17-Jul-2014 Robert Shih <robertshih@google.com> M3UParser: check for NULL before setting meta data

Bug:16351654
Change-Id: I64e9510f719b220471522b4d78a9b00a98bda772
ttplive/M3UParser.cpp
9b2ccd681c4624bb3a16fb6d80f16024528c8d22 17-Jul-2014 Lajos Molnar <lajos@google.com> am f839b8b4: Merge "Fix M3UParser relative path handling."

* commit 'f839b8b435fbddca48ac2b65de397ea91c7260a3':
Fix M3UParser relative path handling.
5154f98277922aba7103ac19529ecc00b1889c1e 17-Jul-2014 Robert Shih <robertshih@google.com> M3UParser: check for NULL before setting meta data

Bug:16351654
Change-Id: I64e9510f719b220471522b4d78a9b00a98bda772
ttplive/M3UParser.cpp
d323223d210aa3dcb8691c9eea4622b66c18ea83 16-Jul-2014 Lajos Molnar <lajos@google.com> am a8454c29: Fix M3UParser relative path handling.

* commit 'a8454c29b15748964b5eb556d1e23fbb1ee19ceb':
Fix M3UParser relative path handling.
a8454c29b15748964b5eb556d1e23fbb1ee19ceb 14-Jul-2014 Lajos Molnar <lajos@google.com> Fix M3UParser relative path handling.

Bug: 16017037
Change-Id: Ibfff99387fb5b3e721144a2b3f9174092d785137
ttplive/M3UParser.cpp
8c30425f9d7d5099b9e6cb0a0abd4e0b2fdd5639 14-Jul-2014 Lajos Molnar <lajos@google.com> Fix M3UParser relative path handling.

Bug: 16017037
Change-Id: Ibfff99387fb5b3e721144a2b3f9174092d785137
ttplive/M3UParser.cpp
db14d35936bf88c0a0d55600f6ac25eb3624d08a 16-Jul-2014 Lajos Molnar <lajos@google.com> am 671160ff: stagefright: add MediaCodec.reset()

* commit '671160ffe81592efa376dc1ff0fc3f4ddcdebc35':
stagefright: add MediaCodec.reset()
671160ffe81592efa376dc1ff0fc3f4ddcdebc35 15-Jul-2014 Lajos Molnar <lajos@google.com> stagefright: add MediaCodec.reset()

Bug: 12034929
Change-Id: I326f1356df89474aa088c1c87f8505b33654139d
ediaCodec.cpp
cf85bbba8abe66cac89369f6b61dab2719eefe19 14-Jul-2014 Jesse Hall <jessehall@google.com> am e580006c: Encoder input buffers don\'t need HW_TEXTURE usage

* commit 'e580006cd0067109189975c56395d29309d49883':
Encoder input buffers don't need HW_TEXTURE usage
e580006cd0067109189975c56395d29309d49883 08-Jul-2014 Jesse Hall <jessehall@google.com> Encoder input buffers don't need HW_TEXTURE usage

Change-Id: Ibb1be86ae99439ccbce3fc2b38d92115083ef7ff
mx/GraphicBufferSource.cpp
255e7d7183d8ad4171408c476d19e95dad502eb2 14-Jul-2014 Narayan Kamath <narayan@google.com> am 24a5a7c3: am b7a88e31: Merge "h264_enc: Use free() to release memory allocated with malloc()"

* commit '24a5a7c30ad041971ca511f4c7f784936090dfc6':
h264_enc: Use free() to release memory allocated with malloc()
24a5a7c30ad041971ca511f4c7f784936090dfc6 14-Jul-2014 Narayan Kamath <narayan@google.com> am b7a88e31: Merge "h264_enc: Use free() to release memory allocated with malloc()"

* commit 'b7a88e3101d2d871f1d90c08806577a859f1ea12':
h264_enc: Use free() to release memory allocated with malloc()
f6ef963fecde3b63696028fadce4bcfb5b998db0 02-Jul-2014 Naveen Kumar Ponnusamy <naveenkumar.p@ittiam.com> Resolution reinitialization changes

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

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

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

Change-Id: If525ee259b74314191d1913f7c2a3e828e05c38f
ndroid.mk
TTPBase.cpp
c5619c7a6dcc1137fde7520351ad5284e3e958ab 09-Jul-2014 Chong Zhang <chz@google.com> MediaCodec async callbacks

Bug: 11990118

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

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

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

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

Bug: 15770459

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

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

Change-Id: If269a3654b5d2b09c183212b0646ef03e06f2d8f
udioPlayer.cpp
tils.cpp
cd249c40c51584e89e065bf7d51999b04db2eb57 11-Jul-2014 Wei Jia <wjia@google.com> Check meta before dereferencing it.

Change-Id: Ic8153b33413a34d75a3053dbfb9530a639e0ec12
tils.cpp
b7a88e3101d2d871f1d90c08806577a859f1ea12 14-Jul-2014 Narayan Kamath <narayan@google.com> Merge "h264_enc: Use free() to release memory allocated with malloc()"
bc2fb720bbd0acd122bacc67e844e982d068f6f9 09-Jul-2014 Wei Jia <wjia@google.com> Add support of audio offloading for NuPlayer.

Change-Id: Ic83973339fb46a83b48382e6097925f45d200867
tils.cpp
9af4f0026d1bfff9ff5688b67a8730103f5ece2f 02-Jul-2014 Ashok Bhat <ashok.bhat@arm.com> Fix in SoftAVCEncoder plugin

size of buffer_handle_t, a pointer type, was assumed to be
4 bytes. This patch uses sizeof(buffer_handle_t) instead.

In addition, replaced magic number 4 with sizeof(OMX_U32)

Change-Id: Id5a7ed805a7b8e9867d8e51655cd334a66ac2c2b
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
odecs/avc/enc/SoftAVCEncoder.cpp
1c1b5e51cb1acd43984ce2e82a27e61b4943186a 09-Jul-2014 Narayan Kamath <narayan@google.com> am c37eaa32: Merge "m4v_h263_enc: Use uint32_t for ULong"

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

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

* commit '1c1b5e51cb1acd43984ce2e82a27e61b4943186a':
m4v_h263_enc: Use uint32_t for ULong
82d04827c290c0d7b81840897b6466170a500fa3 09-Jul-2014 Sungsoo Lim <sungsoo@google.com> Merge "Restore the LOOPING flag in onAudioTearDownEvent"
ba5e39b994b44cc458708eedd26c2d50404c9a46 09-Jul-2014 Chong Zhang <chz@google.com> Merge "HLS: do not discard packets when queuing explicit discontinuity"
718cee5f3ba7c0a055fbeced90f26296f8acb117 08-Jul-2014 Chong Zhang <chz@google.com> Merge "handle emulation_prevention_three_bytes for AVC"
e8eb7a885e574858ddfe3dfd836fbe9ce62f92b8 08-Jul-2014 Lajos Molnar <lajos@google.com> Merge "AString: add startsWithIgnoreCase and endsWithIgnoreCase"
862f8455eaacc1ffb5d8911f0bc7ecc3cf7ec46c 27-Jun-2014 Chong Zhang <chz@google.com> handle emulation_prevention_three_bytes for AVC

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

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

MediaCodec still creates an ACodec instance in init()

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

This abstracts out the ACodec dependency in MediaCodec.

Bug: 11784825
Change-Id: I0aa8b56c6414865fd4b0646e2c5bd1b62d030682
ndroid.mk
odecBase.cpp
oundation/AHierarchicalStateMachine.cpp
2426d11f795a99de85999b3ff0a26cc070a99a59 16-Jun-2014 Ashok Bhat <ashok.bhat@arm.com> m4v_h263_enc: Use uint32_t for ULong

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

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

Change-Id: I2b0086824a5985b9fc4628ce6fbe81db156e37d2
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
odecs/m4v_h263/enc/SoftMPEG4Encoder.cpp
odecs/m4v_h263/enc/include/mp4enc_api.h
odecs/m4v_h263/enc/src/motion_comp.cpp
odecs/m4v_h263/enc/src/mp4def.h
7f44751f95e722f7c628652bdacfa2bb5f510591 02-Jul-2014 Robert Shih <robertshih@google.com> Merge "MatroskaExtractor: track specific seeking"
3a8d3eae3899f8923e3386aaa015b24ef6739489 23-Jun-2014 Sungsoo Lim <sungsoo@google.com> Restore the LOOPING flag in onAudioTearDownEvent

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

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

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

Bug: 15020526
Change-Id: I5d3fc489df35e3bc44acb1ee7851571cb99cb56b
ttplive/PlaylistFetcher.cpp
peg2ts/ATSParser.cpp
peg2ts/AnotherPacketSource.cpp
peg2ts/AnotherPacketSource.h
a5a103c579d5ecde233e04c00c90f4d15b216f29 26-Jun-2014 Marco Nelissen <marcone@google.com> Fix AAC timestamps

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

b/15755476

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

Change-Id: I3d1146714fa23be3d4e696599b6f70cac1f9d28b
ACWriter.cpp
MRWriter.cpp
udioPlayer.cpp
udioSource.cpp
wesomePlayer.cpp
ameraSource.cpp
ameraSourceTimeLapse.cpp
ataURISource.cpp
SDS.cpp
PEG2TSWriter.cpp
PEG4Extractor.cpp
PEG4Writer.cpp
ediaBuffer.cpp
ediaCodec.cpp
ediaCodecSource.cpp
ediaMuxer.cpp
uCachedSource2.cpp
uMediaExtractor.cpp
ggExtractor.cpp
tagefrightMetadataRetriever.cpp
urfaceMediaSource.cpp
imedEventQueue.cpp
tils.cpp
BRISeeker.cpp
AVExtractor.cpp
odecs/on2/enc/SoftVPXEncoder.cpp
mx/GraphicBufferSource.cpp
mx/OMXMaster.cpp
1130c49ee00e2faf0e21152da88cda07299232da 26-Jun-2014 Chong Zhang <chz@google.com> HLS: only queue discontinuity for first block

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

Bug: 14571712
Change-Id: Idaec2394d569541f3963befe722f46f6b0007937
Codec.cpp
a0c5812dfbb34c168129baa300942db18bed9f5e 18-Jun-2014 Ashok Bhat <ashok.bhat@arm.com> h264_enc: Use free() to release memory allocated with malloc()

mInputFrameData and mSliceGroup are allocated memory with
malloc() but released using delete. Changed this to use free()
instead.

Change-Id: Iecf6684d97fabb2229d9abd94279a24faf9ac2d7
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
odecs/avc/enc/SoftAVCEncoder.cpp
fd1e188dc142a8a7adf36e854aa60464faedf0a0 17-Dec-2013 Xiaosong Wei <xiaosong.wei@intel.com> DO NOT MERGE: Fix for SW video decoder OMX profile/level query

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

Change-Id: I582961c0afb53c1781af7fb94226a23e5fdb96cf
Signed-off-by: Xiaosong Wei <xiaosong.wei@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
mx/SoftVideoDecoderOMXComponent.cpp
c1f4b2b73fe9432cb75ce1dd368475a2867e70ed 17-Jun-2014 Marco Nelissen <marcone@google.com> Parse trex and mehd boxes

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

b/15669839

Change-Id: Ibf3e35b5c7299bac11d0e78a391545fc325dd2d0
wesomePlayer.cpp
PEG4Extractor.cpp
nclude/MPEG4Extractor.h
2f46e8152fb881d3a1d7afd223f1ed51f6e358b8 12-Jun-2014 Robert Shih <robertshih@google.com> MatroskaExtractor: track specific seeking

Divide cues based on tracks to support track specific seeking.

Bug: 15595215
Change-Id: Ibb853b0955c62af72243ed29253f939d07628ae4
ndroid.mk
atroska/MatroskaExtractor.cpp
atroska/MatroskaExtractor.h
3c1da7224155516a08d94598eb64b64204bf10f8 18-Jun-2014 Lajos Molnar <lajos@google.com> AString: add startsWithIgnoreCase and endsWithIgnoreCase

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

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

b/14388161

Change-Id: Ia08cc0a6107f275a70e793ef3b50c0ce16ceeee0
PEG4Extractor.cpp
f9fa4bfda4122b3823a5a5cc875334bf60949a18 20-May-2014 Ashok Bhat <ashok.bhat@arm.com> Add test for AMR-NB decoder

The test accepts a .amr file as input and dumps output PCM
in a wav file.

To run the test, use following command
libstagefright_amrnbdec_test <input amr> <output wav>

Change-Id: I2492c2ed4e670c9fd8cb4213201ccbd0cb9bf8fe
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
odecs/amrnb/dec/Android.mk
odecs/amrnb/dec/test/amrnbdec_test.cpp
3a227969f604d7c6a24a795661a13f70a5f37e1f 17-Jun-2014 Marco Nelissen <marcone@google.com> Merge "Fix logging"
3ea91c9593c2c792f96682f436b587c278fe228c 16-Jun-2014 Chong Zhang <chz@google.com> Merge "support for CEA-608 closed caption"
7791cf11186a22b3f84d98cfde67393bee748cb0 10-Jun-2014 Marco Nelissen <marcone@google.com> Fix logging

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

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

Bug: 15470448

Change-Id: Ic6a527f5c35a8ee0a08a5b043336e4d193216083
ediaDefs.cpp
peg2ts/ESQueue.cpp
404fced9bfa8fa423ee210a271ca051ffd1bec13 11-Jun-2014 Chong Zhang <chz@google.com> refactor getTrackInfo()

(this is in preparation for supporting other cc source)

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

- move track info parcelling to NuPlayer

- parcel in the mime type of the subtitle format

Bug: 15470448
Change-Id: If00724d8c3a2b2319cb9c5f29d3fe76347bfe947
ediaDefs.cpp
ttplive/LiveSession.cpp
ttplive/LiveSession.h
ttplive/M3UParser.cpp
ttplive/M3UParser.h
8b8e5d45928aed8592d321fe55f560e35a4fece8 13-Jun-2014 Narayan Kamath <narayan@google.com> resolved conflicts for merge of cbd74fcb to klp-modular-dev-plus-aosp

Change-Id: I00270ef6fe813c0d3649483cbc3aba6af789e033
bdb8ef09f119c3fa8cc751babd483e942ad17749 16-Jun-2014 Chong Zhang <chz@google.com> Merge "refactor getTrackInfo()"
7903bb2b3065d58cc75637900922b434f50024d9 12-Jun-2014 Elliott Hughes <enh@google.com> am 2a8270e6: am c323737d: Merge "Offer a type-safe album art interface."

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

* commit 'c323737dd46d724b4c1ec230b283f26ae2a22b4f':
Offer a type-safe album art interface.
8b1be2ca7cee71a4920d5d31fdcbad2b1d4ca49d 02-May-2014 Andy Hung <hunga@google.com> Update OMX messages for 64 bit

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

Change-Id: Icdbef00aca575e5dc502ebb52e3ce7d0d7883203
Signed-off-by: Andy Hung <hunga@google.com>
Codec.cpp
ediaCodec.cpp
MXClient.cpp
MXCodec.cpp
nclude/OMX.h
nclude/OMXNodeInstance.h
mx/OMX.cpp
mx/OMXNodeInstance.cpp
c323737dd46d724b4c1ec230b283f26ae2a22b4f 12-Jun-2014 Elliott Hughes <enh@google.com> Merge "Offer a type-safe album art interface."
f3e80dddd7376aa9deeb27de25e1d50030a2ad98 11-Jun-2014 Elliott Hughes <enh@google.com> Offer a type-safe album art interface.

Bug: 15514223
Change-Id: Iddfc33a00e6cd3779ca09c01a55f62b151f6ec95
tagefrightMediaScanner.cpp
tagefrightMetadataRetriever.cpp
ca44dc79b5a163030ab0963f80aa771871de092d 11-Jun-2014 Christopher Ferris <cferris@google.com> am 8d6d8f54: Merge "Add libcrypto for users of libstagefright."

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

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

Change-Id: Iaf2e1aeea32fd8af038f6e77bf58ea7df50d807a
tsp/Android.mk
b9e55c4f17a91f070f78fb9fd72c08e461526e9e 11-Jun-2014 Christopher Ferris <cferris@google.com> am ca44dc79: am 8d6d8f54: Merge "Add libcrypto for users of libstagefright."

* commit 'ca44dc79b5a163030ab0963f80aa771871de092d':
Add libcrypto for users of libstagefright.
11cbb06b35cbcb488c7f39b71886ce379e57f867 11-Jun-2014 Christopher Ferris <cferris@google.com> resolved conflicts for merge of 281b884c to master

Change-Id: If8924939bdf54d3a9e6a4876a05d0672c27cf8ef
47a2377ec07ad4ec06ecd25bfd45a37df91e68e6 10-Jun-2014 Marco Nelissen <marcone@google.com> Merge "Remove unneeded code"
ed83915060af3eaaf62feef2eb2eec1e7d431891 06-Jun-2014 Marco Nelissen <marcone@google.com> Remove unneeded code

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

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

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

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

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

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

also fixed QuerySupportedProfileLevels in
SoftVideoDecoderOMXComponent.cpp

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

Bug: 15470543

Change-Id: Ia96a295fbc7e9f1b1d5c0d9091ac62184d44dcfa
peg2ts/ATSParser.cpp
a91b538853e94191fbceab5f5050940dd6b96577 05-Jun-2014 Marco Nelissen <marcone@google.com> Guard against malformed files

b/15433074

Change-Id: I35363def42d38eba49dd5aece566fd345743937e
PEG4Extractor.cpp
a78df9591c698834f3d57f6e882e4b0af5f8f473 06-Jun-2014 Marco Nelissen <marcone@google.com> Merge "Make AAC decoder behavior after flush consistent with non-flush"
8246d1dfac3ff70a6ff786a312f8354386fcfc2c 03-Jun-2014 Ashok Bhat <ashok.bhat@arm.com> h264dec: Use intptr_t when a pointer is treated as an integer

Change-Id: I83057565a842da31ee137fac674af496c1fc18af
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
odecs/on2/h264dec/omxdl/arm_neon/api/armCOMM.h
odecs/on2/h264dec/omxdl/reference/api/armCOMM.h
475300b8ac5438b5037ac088ff599394e9658022 06-Jun-2014 Marco Nelissen <marcone@google.com> Make AAC decoder behavior after flush consistent with non-flush

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

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

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

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

Change-Id: I67921a45dd4a3a175fce412e055728859e2309ba
ata/media_codecs_google_audio.xml
03873edded28f88b5bdbe44fbf2e5ca071c6f10e 05-Jun-2014 Lajos Molnar <lajos@google.com> am 9042b116: Merge "MediaCodecList: remove force-added codecs for videoeditor" into lmp-preview-dev

* commit '9042b116b62a287bb86a18af6b428c7a2b7720aa':
MediaCodecList: remove force-added codecs for videoeditor
cb3d3a365c91ed996c47dea6ff1490f2f13c1b52 05-Jun-2014 Lajos Molnar <lajos@google.com> am 17a6dd60: DO NOT MERGE: MediaCodecList: remove force-added codecs for videoeditor

* commit '17a6dd60f5f8a28af1db451bcbf44805648c844a':
DO NOT MERGE: MediaCodecList: remove force-added codecs for videoeditor
f3e7f11f419eef7cba752936e637b4f1b70267f4 03-Jun-2014 Narayan Kamath <narayan@google.com> am b6af7c63: am 05eaf105: Merge "Mp3decoder: Remove unused arm assembly files"

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

* commit '05eaf105a2a1445c2c13801ee4533ded47f1df1b':
Mp3decoder: Remove unused arm assembly files
05eaf105a2a1445c2c13801ee4533ded47f1df1b 03-Jun-2014 Narayan Kamath <narayan@google.com> Merge "Mp3decoder: Remove unused arm assembly files"
cc19c8b58a48a0d090ea9d9897664f9817e7bac1 02-Jun-2014 Robert Shih <robertshih@google.com> Merge "MPEG4Extractor: guard against missing stbl."
65734fba3029d2c75ed4e3f030d75b7c03eea4b0 29-May-2014 Jean-Michel Trivi <jmtrivi@google.com> Merge "AAC decoder: compensate limiter delay"
d4838ed14a169f5981c0adc2edcb24559a913fe6 21-May-2014 Jean-Michel Trivi <jmtrivi@google.com> AAC decoder: compensate limiter delay

Add decoder limiter delay compensation to decoder wrapper
Includes a wrapper function for SoftAAC2.cpp which selects
DRC-related decoder parameters according to information in the bitstream
and desired DRC characteristics for different playback modes.

Bug 9428126

Change-Id: I5041b68760e95cf54073c3addf2b6026b9cfe8c5
odecs/aacdec/Android.mk
odecs/aacdec/DrcPresModeWrap.cpp
odecs/aacdec/DrcPresModeWrap.h
odecs/aacdec/SoftAAC2.cpp
odecs/aacdec/SoftAAC2.h
dcec687af73ee38d8e0053a378b6bc7d5efe0bb8 29-May-2014 Lajos Molnar <lajos@google.com> MediaCodecList: remove force-added codecs for videoeditor

Bug: 15320804
Change-Id: I1c2f0f75aeaabc20cb94e79e47b70f7faefe0a9e
ediaCodecList.cpp
17a6dd60f5f8a28af1db451bcbf44805648c844a 29-May-2014 Lajos Molnar <lajos@google.com> DO NOT MERGE: MediaCodecList: remove force-added codecs for videoeditor

Bug: 15320804
Change-Id: I1c2f0f75aeaabc20cb94e79e47b70f7faefe0a9e
ediaCodecList.cpp
32f93b7bedc44b425ba99d69dec998334e759532 28-May-2014 Vignesh Venkatasubramanian <vigneshv@google.com> DO NOT MERGE: libstagefright: Add Opus support to ACodec::getPortFormat

Bug: 15114855
Change-Id: Idb184ae15986450423fc8cf116cf077600b3ea67
(cherry picked from commit 8c6693b73cb4aed9d1dcb8d5d0828a77b7471a55)
Codec.cpp
8c6693b73cb4aed9d1dcb8d5d0828a77b7471a55 28-May-2014 Vignesh Venkatasubramanian <vigneshv@google.com> libstagefright: Add Opus support to ACodec::getPortFormat

Bug: 15114855
Change-Id: Idb184ae15986450423fc8cf116cf077600b3ea67
Codec.cpp
bd278f7c631fb4ce698e6cbcbdd34d879302b4c1 23-May-2014 Ashok Bhat <ashok.bhat@arm.com> Mp3decoder: Remove unused arm assembly files

The unused ARM assembly files were written for
legacy proprietary ARM compilers. They are not
needed when gcc or clang compiler is used.

Change-Id: I8dfe9ad458efbb34922094e943ad334cc34f59a3
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
odecs/mp3dec/src/asm/pvmp3_dct_9_arm.s
odecs/mp3dec/src/asm/pvmp3_mdct_18_arm.s
odecs/mp3dec/src/asm/pvmp3_mdct_18_wm.asm
odecs/mp3dec/src/asm/pvmp3_polyphase_filter_window_arm.s
odecs/mp3dec/src/asm/pvmp3_polyphase_filter_window_wm.asm
24ffe7a9161943c8ba2353e956653a71af564b5d 23-May-2014 Elliott Hughes <enh@google.com> am 79262cfc: am 5b756bfd: am 8b187f4a: Merge "Move frameworks/av off <sys/atomics.h>."

* commit '79262cfc14a9d8b5aa29d43e84ea91eedb9492ba':
Move frameworks/av off <sys/atomics.h>.
79262cfc14a9d8b5aa29d43e84ea91eedb9492ba 23-May-2014 Elliott Hughes <enh@google.com> am 5b756bfd: am 8b187f4a: Merge "Move frameworks/av off <sys/atomics.h>."

* commit '5b756bfdaa27c8b606720544bf507213cf47376d':
Move frameworks/av off <sys/atomics.h>.
5b756bfdaa27c8b606720544bf507213cf47376d 23-May-2014 Elliott Hughes <enh@google.com> am 8b187f4a: Merge "Move frameworks/av off <sys/atomics.h>."

* commit '8b187f4acea8d7e517ff9ced32fc7368bdbaa6e0':
Move frameworks/av off <sys/atomics.h>.
63492411cf4abff452b47f59ec7ff6f3e9925c84 22-May-2014 Elliott Hughes <enh@google.com> Move frameworks/av off <sys/atomics.h>.

Bug: 14903517
Change-Id: I92cdfc618d83fd914cfb558a07b1deae0255fccb
ediaBuffer.cpp
ddde219f2f93c1d81ff1cfaf4d3d31d95156f7a3 20-May-2014 Rachad <rachad@google.com> Merge "Add HEVC decoder support to ACodec bug: 14571712"
bc413f6ad0023f7ad451a0129a07fc31dbc65665 16-May-2014 Robert Shih <robertshih@google.com> MPEG4Extractor: parse csd correctly; workaround malformed csd

Bug: 14895152
Change-Id: Ibfee9e176459099507589c26a5eca6c61caabd1c
PEG4Extractor.cpp
ce171998009e1abcb0c718c0aee495fcd33645e2 19-May-2014 Robert Shih <robertshih@google.com> MPEG4Extractor: guard against missing stbl.

Bug: 14320131
Change-Id: I33f65117c9c5365bddd96bb41cc4379a0c7ebcbd
PEG4Extractor.cpp
c1a4e7cfd07ae8e9c227a97fb4315f035b0ccef9 16-May-2014 Andreas Huber <andih@google.com> am 6b787cb8: am 1b8b8793: am 3059e27d: Merge "libstagefright foundation: fix uninitialized varibale warning"

* commit '6b787cb8ddde9d411cab0964062d5d942a710ff8':
libstagefright foundation: fix uninitialized varibale warning
6b787cb8ddde9d411cab0964062d5d942a710ff8 16-May-2014 Andreas Huber <andih@google.com> am 1b8b8793: am 3059e27d: Merge "libstagefright foundation: fix uninitialized varibale warning"

* commit '1b8b8793c0e86865df456c3d26f969b1498041db':
libstagefright foundation: fix uninitialized varibale warning
1b8b8793c0e86865df456c3d26f969b1498041db 16-May-2014 Andreas Huber <andih@google.com> am 3059e27d: Merge "libstagefright foundation: fix uninitialized varibale warning"

* commit '3059e27d0e18a427f3c19889aac86ea31ec0d5d1':
libstagefright foundation: fix uninitialized varibale warning
47aea1f7c58f5302b16822f9e7e1763f2af04ef5 15-May-2014 Lajos Molnar <lajos@google.com> ACodec: remove PTS log spam

Bug: 14976517
Bug: 11784827
Change-Id: Ibc1bbd80e7aac30b0f8f1e9ca2be1bb3e5e2ebbb
Codec.cpp
ediaCodec.cpp
5d5f8a5d3cf24b5dcf1267ef512b24caa695787a 14-May-2014 Amit Pundir <amit.pundir@linaro.org> libstagefright foundation: fix uninitialized varibale warning

gcc-4.9 reports warning for this uninitialized variable
and -Werror make this warning fatal.

Change-Id: I6901362246d53deeded78fa38ad656b167705346
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
oundation/ANetworkSession.cpp
f87e30fe71752dc431d8e8d5682c38271c03265a 14-May-2014 Andy Hung <hunga@google.com> Send 64 bit OMX codec handling to 32 bit MediaServer

This is a temporary fix for 64 bit OMX handling until 64 bit
codecs are more robust.

Bug: 13938273
Change-Id: Ifc79e360f9606f6c909b859d322b7dd5d416b26b
Signed-off-by: Andy Hung <hunga@google.com>
Codec.cpp
MXClient.cpp
MXCodec.cpp
609b815a3131d22da38b2f452faa9f89daad4039 02-May-2014 Andy Hung <hunga@google.com> Update OMX messages for 64 bit

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

Change-Id: Icdbef00aca575e5dc502ebb52e3ce7d0d7883203
Signed-off-by: Andy Hung <hunga@google.com>
Codec.cpp
ediaCodec.cpp
MXClient.cpp
MXCodec.cpp
nclude/OMX.h
nclude/OMXNodeInstance.h
mx/OMX.cpp
mx/OMXNodeInstance.cpp
2472b1c0d63454e5d90a982bd6c555de6c3127bd 06-May-2014 Rachad <rachad@google.com> Add HEVC decoder support to ACodec
bug: 14571712

Change-Id: I221625a42e143cb1c581059694f6730211e251ae
Codec.cpp
ediaDefs.cpp
01427884471391999393a15abbb95b5f0dce7d3b 09-May-2014 Robert Shih <robertshih@google.com> Merge "Expose sample duration in MPEG4Extractor."
70c2fd3dc648b512ea088ee9de5e505c626fd39c 09-May-2014 Robert Shih <robertshih@google.com> Merge "PlaylistFetcher: start queueing AUs after the 1st IDR nalu"
0c5b910e6eb2b9b2a622ccc0dd66e8fcae3eb28b 09-May-2014 Lajos Molnar <lajos@google.com> Merge "stagefright: set PTS for SoftwareRenderer"
fc7fca77caa12993dd938d5ff43797d781291027 08-May-2014 Lajos Molnar <lajos@google.com> MediaCodec: add renderAndReleaseOutputBuffer() method with timestamp

Bug: 11784827
Change-Id: Ia1dcbd6c1d1a4380db04b750c0eb3fa0bd58d7b4
Codec.cpp
ediaCodec.cpp
7d8e3ccfbf326b5e190b416590e956c2fc3021f7 09-May-2014 Lajos Molnar <lajos@google.com> Allow BOM and space in WebVTT files

Bug: 10900755
Change-Id: I47a7a33f749ea2470ce7d9d36d33c7484637d61c
ttplive/PlaylistFetcher.cpp
ttplive/PlaylistFetcher.h
908ea6603c64e29e40277a74c9fb0e776c097830 08-May-2014 Lajos Molnar <lajos@google.com> stagefright: set PTS for SoftwareRenderer

Change-Id: I08661a9eae09f919149aa5a58aa514d848de50a1
wesomePlayer.cpp
olorconversion/SoftwareRenderer.cpp
nclude/SoftwareRenderer.h
784e24e386b088c05d653ab482f2e95cb53e3d01 07-May-2014 Andy Hung <hunga@google.com> Remove legacy omx_message variables

Remove platform_private and data_ptr from omx_message.
These were used for legacy deferred buffer creation.
See OMXCodec quirks: kDefersOutputBufferAllocation and
kRequiresAllocateBufferOnOutputPorts.

Change-Id: I94da56bc64f3b46ee1276e93d67b36c1662e2eaf
Signed-off-by: Andy Hung <hunga@google.com>
Codec.cpp
MXCodec.cpp
mx/OMX.cpp
33a610c4a79975eb585526195a7c8eae8177777b 02-May-2014 Lajos Molnar <lajos@google.com> am 63249d6e: am bc4bf532: am b2314088: Merge "AwesomePlayer: use PTS for queueBuffer"

* commit '63249d6ea560b2f29d3ee255951f527b01ecbac5':
AwesomePlayer: use PTS for queueBuffer
344a1b9bb5cba14a0771c8b416466678aff3215f 02-May-2014 Lajos Molnar <lajos@google.com> am 113f2122: am 5fa3f7af: am b52675e9: Merge "Smooth out AwesomePlayer"

* commit '113f2122662856f2482836f1b4c585a050888afa':
Smooth out AwesomePlayer
63249d6ea560b2f29d3ee255951f527b01ecbac5 02-May-2014 Lajos Molnar <lajos@google.com> am bc4bf532: am b2314088: Merge "AwesomePlayer: use PTS for queueBuffer"

* commit 'bc4bf532b7581ecb1c8734a63742183c3ecb02c5':
AwesomePlayer: use PTS for queueBuffer
bc4bf532b7581ecb1c8734a63742183c3ecb02c5 02-May-2014 Lajos Molnar <lajos@google.com> am b2314088: Merge "AwesomePlayer: use PTS for queueBuffer"

* commit 'b231408849158baea8dddc0edf7e97fcfc2e3240':
AwesomePlayer: use PTS for queueBuffer
113f2122662856f2482836f1b4c585a050888afa 02-May-2014 Lajos Molnar <lajos@google.com> am 5fa3f7af: am b52675e9: Merge "Smooth out AwesomePlayer"

* commit '5fa3f7afc0d8d4978d0192cd2cf67ed3899d4dd5':
Smooth out AwesomePlayer
5fa3f7afc0d8d4978d0192cd2cf67ed3899d4dd5 02-May-2014 Lajos Molnar <lajos@google.com> am b52675e9: Merge "Smooth out AwesomePlayer"

* commit 'b52675e9e3b2cfd7ca3ec4eda80dde77dee9dafb':
Smooth out AwesomePlayer
b0210338bba812d27e0e6b1bb4b6b89405209a19 02-May-2014 Lajos Molnar <lajos@google.com> am 9e0922ba: am 6e76fda3: am f9782266: Merge "AwesomePlayer: improve scheduling of video event to hit PTS"

* commit '9e0922ba7dda72fc94d2af2872cfc630ad599c91':
AwesomePlayer: improve scheduling of video event to hit PTS
192d6a509cf609a2a4b7f9cb70aeb5daabb0204e 02-May-2014 Lajos Molnar <lajos@google.com> am edf6131d: am 075c8f6e: am a69d6f52: Merge "stagefright: add ClockEstimator API and WindowedLinearFitEstimator"

* commit 'edf6131d1eca1fdff3b151805d241a1cc81b52ca':
stagefright: add ClockEstimator API and WindowedLinearFitEstimator
9e0922ba7dda72fc94d2af2872cfc630ad599c91 02-May-2014 Lajos Molnar <lajos@google.com> am 6e76fda3: am f9782266: Merge "AwesomePlayer: improve scheduling of video event to hit PTS"

* commit '6e76fda36a87e154397de816fa091b721a4c11bd':
AwesomePlayer: improve scheduling of video event to hit PTS
edf6131d1eca1fdff3b151805d241a1cc81b52ca 02-May-2014 Lajos Molnar <lajos@google.com> am 075c8f6e: am a69d6f52: Merge "stagefright: add ClockEstimator API and WindowedLinearFitEstimator"

* commit '075c8f6e174e824b6bc95809cc25f1430e9d4e62':
stagefright: add ClockEstimator API and WindowedLinearFitEstimator
6e76fda36a87e154397de816fa091b721a4c11bd 02-May-2014 Lajos Molnar <lajos@google.com> am f9782266: Merge "AwesomePlayer: improve scheduling of video event to hit PTS"

* commit 'f9782266802b02fc06a9c532f40128496aefb3e0':
AwesomePlayer: improve scheduling of video event to hit PTS
075c8f6e174e824b6bc95809cc25f1430e9d4e62 02-May-2014 Lajos Molnar <lajos@google.com> am a69d6f52: Merge "stagefright: add ClockEstimator API and WindowedLinearFitEstimator"

* commit 'a69d6f529239950a8bdf5e4253ea13bb029375cb':
stagefright: add ClockEstimator API and WindowedLinearFitEstimator
a6e6c70a3c5403e178741eee20c7742e736c4818 30-Apr-2014 Lajos Molnar <lajos@google.com> AwesomePlayer: use PTS for queueBuffer

Change-Id: I1c14ad4784c799c46cf06a14b0f00c5e4d01f718
wesomePlayer.cpp
1b78c4b1484c7d4c12b9a87329dc8d4b6e8c0c37 30-Apr-2014 Lajos Molnar <lajos@google.com> Smooth out AwesomePlayer

Use clock estimator to smooth out audio time stamps.

Change-Id: Iec1ff30c011069d06ff8051fc4839d00895463d6
wesomePlayer.cpp
nclude/AwesomePlayer.h
9747b68530aa65b04751b43bf4ce3385b5d781f9 30-Apr-2014 Lajos Molnar <lajos@google.com> AwesomePlayer: improve scheduling of video event to hit PTS

Change-Id: I7b19911acbde9b592b757b952d4ad63cd8efebed
wesomePlayer.cpp
aa8b569eb652c22821b93a6e543449a52ad21158 23-Apr-2014 Lajos Molnar <lajos@google.com> stagefright: add ClockEstimator API and WindowedLinearFitEstimator

Change-Id: I74474c385848a8eab2ac0da7c069510378e2b217
ndroid.mk
lockEstimator.cpp
88014186c34dbc5c8f4cdf0936cae2a36e4b61ac 01-May-2014 Lajos Molnar <lajos@google.com> am ee46bd37: am 2b0b701f: am 0c388650: Merge "ACodec: add frame render/drop systrace"

* commit 'ee46bd378b7a68789be9c85d8a59fa02d4aed030':
ACodec: add frame render/drop systrace
ee46bd378b7a68789be9c85d8a59fa02d4aed030 01-May-2014 Lajos Molnar <lajos@google.com> am 2b0b701f: am 0c388650: Merge "ACodec: add frame render/drop systrace"

* commit '2b0b701f57c5efebe868d0eedce8cfc399007e8a':
ACodec: add frame render/drop systrace
2b0b701f57c5efebe868d0eedce8cfc399007e8a 01-May-2014 Lajos Molnar <lajos@google.com> am 0c388650: Merge "ACodec: add frame render/drop systrace"

* commit '0c388650722ac53571be21ee04ce342c1c9510c2':
ACodec: add frame render/drop systrace
0c388650722ac53571be21ee04ce342c1c9510c2 01-May-2014 Lajos Molnar <lajos@google.com> Merge "ACodec: add frame render/drop systrace"
ee7a5ef61b8d1149811ee73c80aca2ac8474d559 01-May-2014 Glenn Kasten <gkasten@android.com> am b4eacebf: am 1afedc4d: am 6eafba6b: Merge "Temporary workaround for log spam"

* commit 'b4eacebfc5c5fd86b20661eab0797ce70c66e323':
Temporary workaround for log spam
b4eacebfc5c5fd86b20661eab0797ce70c66e323 01-May-2014 Glenn Kasten <gkasten@android.com> am 1afedc4d: am 6eafba6b: Merge "Temporary workaround for log spam"

* commit '1afedc4d99acd52f99221d71b3a372a0a5497a84':
Temporary workaround for log spam
1afedc4d99acd52f99221d71b3a372a0a5497a84 01-May-2014 Glenn Kasten <gkasten@android.com> am 6eafba6b: Merge "Temporary workaround for log spam"

* commit '6eafba6bba3a4949cf3807ea39d5c1e969bebc52':
Temporary workaround for log spam
83f052a749b8e0ee5df3467d8332d6140fcafb50 01-May-2014 Glenn Kasten <gkasten@android.com> Temporary workaround for log spam

Bug: 13790505
Change-Id: Icfc403bceaefdede1af65dfd70ba3e8b26abab02
odecs/vorbis/dec/SoftVorbis.cpp
6fbc1afd36f514f8b8d36ce67f5e69776c690bd2 30-Apr-2014 Lajos Molnar <lajos@google.com> ACodec: add frame render/drop systrace

Change-Id: I7a33d4a937d039fd454b889ddb12b7ca1c0ff3c2
Codec.cpp
1a7be1ec9c769203e6c8e26378de0ab8e2ad493d 29-Apr-2014 Bill Yi <byi@google.com> Merge commit '91820d46b5f3065c2fded3cdf65d305715b33bb1' into HEAD
7aeb4b5b08aa31b8bcdebe43e9f56169b7a3b03e 29-Apr-2014 Robert Shih <robertshih@google.com> Merge "PlaylistFetcher: clear mTSParser on bad starting seq # hint"
5cda1b30b8c3900f8405f9bf2fab2df6e38ea95f 24-Apr-2014 Robert Shih <robertshih@google.com> PlaylistFetcher: clear mTSParser on bad starting seq # hint

Bug: 14159556
Change-Id: If25187477066282d5980da3c4d8a76dcfcf54d27
ttplive/PlaylistFetcher.cpp
1da7ee098ac97d2fdd2cff16a2bfa51fd1889ad8 24-Apr-2014 Robert Shih <robertshih@google.com> PlaylistFetcher: start queueing AUs after the 1st IDR nalu

Bug: 14159556
Change-Id: I4fc16dda9357e1251d2909571a79215d13d0104b
ttplive/PlaylistFetcher.cpp
ttplive/PlaylistFetcher.h
15387a6e8e7930ea80f46c98fab54f22981e7f11 17-Apr-2014 Robert Shih <robertshih@google.com> AwesomePlayer: fixed division by zero in onBufferingUpdate

Bug: 13911283
Change-Id: I968a274634a86f5c46f75dc533024dad44afc36b
wesomePlayer.cpp
170056540e9ce65261b45efd15f67e72e2df1bed 11-Apr-2014 Robert Shih <robertshih@google.com> Expose sample duration in MPEG4Extractor.

Bug: 12782113
Change-Id: I75ee361243c5382d9288349c554deb7bed952782
PEG4Extractor.cpp
ampleIterator.cpp
ampleTable.cpp
nclude/SampleIterator.h
nclude/SampleTable.h
67ee990d324229ab0565ce632bd5a04297e16a01 24-Apr-2014 Alex Glaznev <glaznev@google.com> Merge "Support VP8 encoder key frame interval and number of temporal layers configuration."
4154795d5526750b7aec5f774831a9e1ba0a3f15 21-Mar-2014 Alex Glaznev <glaznev@google.com> Support VP8 encoder key frame interval and number of
temporal layers configuration.

- Change ACodec.cpp to populate VP8 extra parameters
structure with key frame interval, number of temporal
layers and quantization parameters.

- Change software VP8 encoder to select frame temporal
patterns and temporal layers bitrate distribution based
on the number of layers similar to patterns used in WebRTC.

- Calculate video frame duration in VP8 encoder from the
timestamps.

Bug: 11969958
Change-Id: Ia96054d886cd09d8c108dfe250fc5f4478eaa042
Codec.cpp
odecs/on2/enc/SoftVPXEncoder.cpp
odecs/on2/enc/SoftVPXEncoder.h
18e846c1ca29d7c4e4607243bc5ba694385128a1 21-Apr-2014 Nick Kralevich <nnk@google.com> am 474038ae: am 27158eb5: Merge "AArch64: AString::append for longs and pointers"

* commit '474038aef32f47d080567e8519d916b069a4f707':
AArch64: AString::append for longs and pointers
474038aef32f47d080567e8519d916b069a4f707 21-Apr-2014 Nick Kralevich <nnk@google.com> am 27158eb5: Merge "AArch64: AString::append for longs and pointers"

* commit '27158eb55de8150258faba6574fc51c7aa641516':
AArch64: AString::append for longs and pointers
27158eb55de8150258faba6574fc51c7aa641516 21-Apr-2014 Nick Kralevich <nnk@google.com> Merge "AArch64: AString::append for longs and pointers"
9e8eeafe1ea0e88d548270280bcc209dde51781b 21-Apr-2014 Dan Stoza <stoza@google.com> Merge "BufferQueue: Increase max slots from 32 to 64"
ce65a05eddc8a39d9805d1e1eee0292725df1f1c 16-Apr-2014 Mark Salyzyn <salyzyn@google.com> am f5f24006: am cd4eb72e: Merge "media: -Werror re-enabled"

* commit 'f5f24006f7bd997c6bca00804ec0f35bddd7ccc2':
media: -Werror re-enabled
1b24cf32e02a1372e57b3a2a432bc0adfe496e6d 16-Apr-2014 Mark Salyzyn <salyzyn@google.com> am e80631aa: am 839d11d1: Merge changes I0a744dc7,Id993a70d

* commit 'e80631aa1992ca50af679cd6a018c0ffda7f9b17':
media: use size_t for integer iterator to Vector::size()
media: 64 bit compile issues
f5f24006f7bd997c6bca00804ec0f35bddd7ccc2 16-Apr-2014 Mark Salyzyn <salyzyn@google.com> am cd4eb72e: Merge "media: -Werror re-enabled"

* commit 'cd4eb72edb0575ce1e84fbd3f27bb85bab6110ed':
media: -Werror re-enabled
e80631aa1992ca50af679cd6a018c0ffda7f9b17 16-Apr-2014 Mark Salyzyn <salyzyn@google.com> am 839d11d1: Merge changes I0a744dc7,Id993a70d

* commit '839d11d1f7be9dff2f06c7d30a9eb39cb6782078':
media: use size_t for integer iterator to Vector::size()
media: 64 bit compile issues
cd4eb72edb0575ce1e84fbd3f27bb85bab6110ed 16-Apr-2014 Mark Salyzyn <salyzyn@google.com> Merge "media: -Werror re-enabled"
3ab368e0810d894dcbc0971350c095049478a055 15-Apr-2014 Mark Salyzyn <salyzyn@google.com> media: use size_t for integer iterator to Vector::size()

Change-Id: I0a744dc7815a86a993df9b0623440be620ec8903
ameraSourceTimeLapse.cpp
db43b34c3428e480f8c4c66e7e88f4001f37f91e 04-Apr-2014 Mark Salyzyn <salyzyn@google.com> media: 64 bit compile issues

- change internal sized types to use stdint.h
- printf & scanf formats
- size_t or unsigned int for iterators

Change-Id: Id993a70d8bf54c667c5d652b34179a2c727ed446
MRExtractor.cpp
uCachedSource2.cpp
MXCodec.cpp
odecs/on2/h264dec/omxdl/arm11/api/omxtypes.h
odecs/on2/h264dec/omxdl/arm_neon/api/omxtypes.h
odecs/on2/h264dec/omxdl/reference/api/omxtypes.h
mx/GraphicBufferSource.cpp
mx/OMX.cpp
mx/SoftVideoDecoderOMXComponent.cpp
tsp/SDPLoader.cpp
3b5ec66c3623647fc4dfd1a446c4f25a2c7f1ba0 14-Apr-2014 Mark Salyzyn <salyzyn@google.com> media: -Werror re-enabled

Change-Id: I62fdb78e8acefafd468ce2e5aa9e78eba0dd0f48
atroska/Android.mk
imedtext/Android.mk
6bb7a89102a8966ee032d6ddc0b3ff4f1a47ef66 15-Apr-2014 Mark Salyzyn <salyzyn@google.com> am 432ed3d6: Merge "libstagefright: fix 64-bit warnings"

* commit '432ed3d66d09464778df31c73374ee897f7b8840':
libstagefright: fix 64-bit warnings
ef80764db37aa00bbb88755cb6cf11c6f2720bd3 25-Mar-2014 Marcus Oakland <marcus.oakland@arm.com> AArch64: AString::append for longs and pointers

The AString::append methods for long, unsigned long and void *
pointers were using char arrays of 16 elements, which were not long
enough for 64-bit longs and pointers in __LP64__ systems. This
resulted in "FORTIFY_SOURCE: vsprintf: prevented write past end of
buffer. Calling abort()." when the
android.media.cts.DecoderTest#testFlush CTS test was run.

The AString::append methods that were using sprintf have been modifed
to use snprintf instead, taking the sizeof the "s" array (which has
been made 32 char without conditional compilation for __LP64__ where
appropriate), and checking the return value to ensure that the string
has not been truncated.

After this change and changes to the types of OMX_U32 and OMX_S32 in the
frameworks/native/include/media/openmax/OMX_Types.h header file, the
android.media.cts.DecoderTest#testFlush CTS test passes.

Change-Id: I76d897373473c82f52986f43a15b050b844a370a
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
oundation/AString.cpp
f6d0c1fd6d9e697bb3a891fae14c7e9d4b685de6 15-Apr-2014 Colin Cross <ccross@google.com> libstagefright: fix 64-bit warnings

%lld -> %" PRId64 " for int64_t
%d -> %zu for size_t
Also fixes some casts from void* to integer types, and some comparisons
between signed and unsigned.

(cherry picked from commit b4a7a2df4c28c3f32b5d877b54831d2cc5d78f81)

Change-Id: I76ba94d0b67776fd7abdc83b43d47c61d6c32f4c
odecs/flac/enc/SoftFlacEncoder.cpp
odecs/m4v_h263/enc/SoftMPEG4Encoder.cpp
ttplive/LiveSession.cpp
ttplive/PlaylistFetcher.cpp
d3/ID3.cpp
atroska/MatroskaExtractor.cpp
peg2ts/ATSParser.cpp
peg2ts/ESQueue.cpp
peg2ts/MPEG2PSExtractor.cpp
tsp/AAVCAssembler.cpp
tsp/AMPEG4ElementaryAssembler.cpp
tsp/ARTPConnection.cpp
tsp/ARTPWriter.cpp
imedtext/TimedTextPlayer.cpp
29fe1ea4b5a1d1fc1fb87b53866901357c04c5c1 14-Apr-2014 Mark Salyzyn <salyzyn@google.com> am 9829344d: Merge "media: memset sizeof argument issues"

* commit '9829344d526f87ca745208f04216ec795b239581':
media: memset sizeof argument issues
9829344d526f87ca745208f04216ec795b239581 14-Apr-2014 Mark Salyzyn <salyzyn@google.com> Merge "media: memset sizeof argument issues"
2475264264b51a7592c5b2e4cd6cfdaddba16644 10-Apr-2014 Dan Stoza <stoza@google.com> BufferQueue: Increase max slots from 32 to 64

Increases NUM_BUFFER_SLOTS from 32 to 64 and changes the mask
returned by IGBC::getReleasedBuffers from 32 to 64 bits.

Bug: 13174352
Change-Id: I1c41256ffbc30abcf9f7b0b5fcf53da40462da28
mx/GraphicBufferSource.cpp
8e1554f35ffcc0f7ac833a796adf3926371fcb76 12-Apr-2014 Mark Salyzyn <salyzyn@google.com> am b1b1e303: am e5238893: Merge "Fix aosp_arm64 mirror-aosp-master build 1119326"

* commit 'b1b1e303d93a5c67eedeca6ef3039be6cb4dc9f9':
Fix aosp_arm64 mirror-aosp-master build 1119326
b1b1e303d93a5c67eedeca6ef3039be6cb4dc9f9 12-Apr-2014 Mark Salyzyn <salyzyn@google.com> am e5238893: Merge "Fix aosp_arm64 mirror-aosp-master build 1119326"

* commit 'e523889332b88348e673137d272854278acbef8f':
Fix aosp_arm64 mirror-aosp-master build 1119326
4850983c3a9131af32d0fe61dd9ce3d1e5d735b5 11-Apr-2014 Mark Salyzyn <salyzyn@google.com> Fix aosp_arm64 mirror-aosp-master build 1119326

Remove -Werror that was set in 'warnings be gone'

Change-Id: I2379dc56f04a6d0ac50f90e6d1cdf05fce3a5c30
atroska/Android.mk
atroska/MatroskaExtractor.cpp
imedtext/Android.mk
0f37620e0f79bfab1354e2e3049c260342a2637e 11-Apr-2014 Colin Cross <ccross@android.com> Revert "build fix for aosp-idea133 @ 1119318"

Build fix is needed in AOSP, but in master it re-introduces a warning
and breaks the build on -Werror. Revert it in master.

This reverts commit effbb3a9b72050dbe150af7302d9148fe7e927d3.
imedtext/TimedTextDriver.cpp
027eadebbf7534d3eb596451c9197571f4e94073 11-Apr-2014 Mark Salyzyn <salyzyn@google.com> am a7281ee1: am a133bc87: Merge "build fix for aosp-idea133 @ 1119318"

* commit 'a7281ee11a27d5fa3d9fa62eb8d2c6465007eb50':
build fix for aosp-idea133 @ 1119318
a7281ee11a27d5fa3d9fa62eb8d2c6465007eb50 11-Apr-2014 Mark Salyzyn <salyzyn@google.com> am a133bc87: Merge "build fix for aosp-idea133 @ 1119318"

* commit 'a133bc87eb8269a6fa61772cb708f10c9c3b7a87':
build fix for aosp-idea133 @ 1119318
4cd0d582379ca9decba7ee0b99010d9a39f298de 11-Apr-2014 Mark Salyzyn <salyzyn@google.com> am 0938c6f7: Merge "warnings be gone (4/4)"

* commit '0938c6f7a1e713030b04e32548012f0c29c94f4d':
warnings be gone (4/4)
8819b515f541daea4288a87cfbae37561cb80b13 11-Apr-2014 Mark Salyzyn <salyzyn@google.com> am 2a27a640: Merge "warnings be gone (3/4)"

* commit '2a27a640d0d9747659cc609b4384ffead090866e':
warnings be gone (3/4)
355c04dfe84b06311bdb15a1617e22bea4eb2571 11-Apr-2014 Mark Salyzyn <salyzyn@google.com> am 79724856: Merge "warnings be gone (2/4)"

* commit '797248568b5ba32606ac0d8de024190e3cc95973':
warnings be gone (2/4)
d6579cc9f06052f94bf5a2c34261c84de0efce23 10-Apr-2014 Mark Salyzyn <salyzyn@google.com> media: memset sizeof argument issues

Change-Id: I37ef154eea0f77fb7f22faf6891f3025f6ff346e
odecs/avc/enc/SoftAVCEncoder.cpp
a133bc87eb8269a6fa61772cb708f10c9c3b7a87 11-Apr-2014 Mark Salyzyn <salyzyn@google.com> Merge "build fix for aosp-idea133 @ 1119318"
bc64e09a65bd5ba97706d2420449b9710c9e9c01 11-Apr-2014 Mark Salyzyn <salyzyn@google.com> warnings be gone (4/4)

(cherry picked from commit 84333e0475bc911adc16417f4ca327c975cf6c36)
(squashed with commit b4a7a2df4c28c3f32b5d877b54831d2cc5d78f81)

Change-Id: I55df09714a0e1cb98a44c8fcddac2c646ae5e139
atroska/MatroskaExtractor.cpp
51b9eb1c330d23b98ddb629200cd177bc9c39def 11-Apr-2014 Mark Salyzyn <salyzyn@google.com> warnings be gone (3/4)

(cherry picked from commit 84333e0475bc911adc16417f4ca327c975cf6c36)
(squashed with commit b4a7a2df4c28c3f32b5d877b54831d2cc5d78f81)

Change-Id: I0c5a0c3ea32bb5091d90c7391c67edd02e50397f
peg2ts/ATSParser.cpp
3f37c83d9817cacc0965ca66873b0353fac07228 11-Apr-2014 Mark Salyzyn <salyzyn@google.com> warnings be gone (2/4)

(cherry picked from commit 84333e0475bc911adc16417f4ca327c975cf6c36)
(squashed with commit b4a7a2df4c28c3f32b5d877b54831d2cc5d78f81)

Change-Id: I048a2c6868515716c7cd7319a3d0abe6311dac4e
ttplive/M3UParser.cpp
effbb3a9b72050dbe150af7302d9148fe7e927d3 11-Apr-2014 Mark Salyzyn <salyzyn@google.com> build fix for aosp-idea133 @ 1119318

Change-Id: I34084ebb48318628d46c2ff7ca567bd7638619e4
imedtext/TimedTextDriver.cpp
dd01ce9c28e37d4556606f481faeec032a1fe04e 11-Apr-2014 Mark Salyzyn <salyzyn@google.com> am 52a861d2: Merge "warnings be gone."

* commit '52a861d2825544fe2eb90f8e5f6351d02ff95536':
warnings be gone.
d411b4ca2945cd8974a3a78199fce94646950128 11-Apr-2014 Andreas Huber <andih@google.com> warnings be gone.

(cherry picked from commit 84333e0475bc911adc16417f4ca327c975cf6c36)

Modified by Mark Salyzyn <salyzyn@google.com> to keep merge conflicts
or errors downstream to a minimum.

Change-Id: Ic3b272f9cbf3155001aabd2f79728f1bc31de613
ACExtractor.cpp
ACWriter.cpp
Codec.cpp
MRExtractor.cpp
MRWriter.cpp
udioPlayer.cpp
udioSource.cpp
wesomePlayer.cpp
ameraSource.cpp
ameraSourceTimeLapse.cpp
LACExtractor.cpp
P3Extractor.cpp
PEG2TSWriter.cpp
PEG4Extractor.cpp
PEG4Writer.cpp
ediaAdapter.cpp
ediaCodec.cpp
uCachedSource2.cpp
ggExtractor.cpp
tagefrightMediaScanner.cpp
urfaceMediaSource.cpp
imedEventQueue.cpp
BRISeeker.cpp
AVExtractor.cpp
vc_utils.cpp
odecs/aacenc/SoftAACEncoder2.cpp
odecs/aacenc/src/adj_thr.c
odecs/aacenc/src/dyn_bits.c
odecs/amrnb/dec/SoftAMR.cpp
odecs/amrnb/enc/SoftAMRNBEncoder.cpp
odecs/amrwbenc/SoftAMRWBEncoder.cpp
odecs/common/cmnMemory.c
odecs/g711/dec/SoftG711.cpp
odecs/gsm/dec/SoftGSM.cpp
odecs/m4v_h263/dec/SoftMPEG4.cpp
odecs/m4v_h263/enc/SoftMPEG4Encoder.cpp
odecs/mp3dec/SoftMP3.cpp
odecs/mp3dec/src/pvmp3_mpeg2_get_scale_data.cpp
odecs/on2/dec/SoftVPX.cpp
odecs/on2/h264dec/SoftAVC.cpp
odecs/on2/h264dec/source/h264bsd_conceal.c
odecs/on2/h264dec/source/h264bsd_util.c
odecs/raw/SoftRaw.cpp
oundation/ANetworkSession.cpp
oundation/Android.mk
ttplive/M3UParser.cpp
nclude/TimedEventQueue.h
atroska/Android.mk
atroska/MatroskaExtractor.cpp
peg2ts/ATSParser.cpp
peg2ts/AnotherPacketSource.cpp
peg2ts/MPEG2PSExtractor.cpp
peg2ts/MPEG2TSExtractor.cpp
mx/OMX.cpp
mx/OMXNodeInstance.cpp
mx/SoftOMXComponent.cpp
mx/SoftOMXPlugin.cpp
tsp/AMPEG2TSAssembler.cpp
tsp/ARTPWriter.cpp
tsp/ARawAudioAssembler.cpp
imedtext/Android.mk
imedtext/TimedTextDriver.cpp
imedtext/TimedTextSource.h
ifi-display/rtp/RTPSender.cpp
ifi-display/source/WifiDisplaySource.cpp
c51db0a6bfb71ea9c934fb7971cb5ae1f1cf03a0 02-Apr-2014 Lajos Molnar <lajos@google.com> stagefright: handle corrupt matroska files gracefully

Bug: 13693438
Bug: 13744158
Change-Id: I557595b5b5d4a20934f79e00a622b06d13378223
atroska/MatroskaExtractor.cpp
a1df816c0677185534babba6ffc29970b048e52e 04-Apr-2014 Lajos Molnar <lajos@google.com> stagefright: log uri protocols, and opt-in to log full uri

Added property media.stagefright.log-uri. Set it to true or 1 to
log uris by AwesomePlayer.

Added utility function to get uri debug string based on incognito
and log opt-in status.

Change-Id: I5ccc23079ddfb120dd9703a3ed651a162ed5acec
Related-Bug: 6994761
wesomePlayer.cpp
tils.cpp
ttplive/LiveSession.cpp
ttplive/M3UParser.cpp
tsp/ARTSPConnection.cpp
tsp/SDPLoader.cpp
bcf08569453dcb42730cda3230d5d375a697005b 05-Apr-2014 Lajos Molnar <lajos@google.com> stagefright: add AString constructor from String8

Change-Id: I85b37b6dee4ea9d5f7f1c1a40ff405a01a0c67f1
oundation/AString.cpp
cffcba5681be302b1c1b40747a1305f2c2a667c3 04-Apr-2014 Dan Stoza <stoza@google.com> Merge "Remove deprecated BufferQueue constructor"
619fd4d6d4d815065becbdf360422ee40dfa7690 03-Apr-2014 Glenn Kasten <gkasten@google.com> Merge commit '52a23bd3' into manualmerge

Change-Id: I7a6105f467a2fa3631c62be3d306845e9cf9b365
52a23bd3f8ace9f3a6295fc2d2b97e64665d77d8 03-Apr-2014 Glenn Kasten <gkasten@google.com> am 51b3ea2b: Merge "64-bit: Correction to OMX_U32 and OMX_S32"

* commit '51b3ea2b8f7298bffbd246c65a606cd053357b66':
64-bit: Correction to OMX_U32 and OMX_S32
8260bf63e2fa974b524029f170d9ad17b69b884f 03-Apr-2014 Glenn Kasten <gkasten@android.com> am 93bbc834: Merge "Fix aac decoder flush"

* commit '93bbc8343133b910aeae536617efce978040bbae':
Fix aac decoder flush
54654025d656b437eeb5c5c9267104625bcc496d 02-Apr-2014 Glenn Kasten <gkasten@android.com> am 2b2fbe29: Merge "Fix decoder EOS handling"

* commit '2b2fbe299163b544668b41f594943a19b78dafd3':
Fix decoder EOS handling
66fe2e9ee30bcb4161bc487ec63d2ae4a05f4051 02-Apr-2014 Glenn Kasten <gkasten@google.com> 64-bit: Correction to OMX_U32 and OMX_S32

Change-Id: I9c41bb34c35595ac19a7ab8faaacde8cb4fa9a15
odecs/aacdec/SoftAAC2.cpp
odecs/aacenc/SoftAACEncoder2.cpp
odecs/avc/enc/SoftAVCEncoder.cpp
odecs/flac/enc/SoftFlacEncoder.cpp
odecs/g711/dec/SoftG711.cpp
odecs/gsm/dec/SoftGSM.cpp
odecs/m4v_h263/enc/SoftMPEG4Encoder.cpp
08fce45fdb537e135868604522aba15461f516be 20-Sep-2013 Marco Nelissen <marcone@google.com> Fix aac decoder flush

b/8543366

Change-Id: I746ffed6289486b802a2292bfc492ea6c780ed0b
odecs/aacdec/SoftAAC2.cpp
c71a99131ca97bd3bdc5b78473d06e613e96e073 29-Aug-2013 Marco Nelissen <marcone@google.com> Fix decoder EOS handling

Conceptually it should be the same whether EOS is signalled on the last
buffer holding data, or an empty buffer that follows. Make it so that
this actually behaves the same for mp3, AAC and Vorbis.

b/8747869

Change-Id: Idece8ef45689a3ffaf70fb45d19862d7b93b2f92
odecs/aacdec/SoftAAC2.cpp
odecs/aacdec/SoftAAC2.h
odecs/mp3dec/SoftMP3.cpp
odecs/mp3dec/SoftMP3.h
odecs/vorbis/dec/SoftVorbis.cpp
odecs/vorbis/dec/SoftVorbis.h
54b0bc74e051bd7df10cd657b481d88db6cdaa27 31-Mar-2014 Lajos Molnar <lajos@google.com> ACodec: do not signal kWhatShutdownCompleted on codec error

Do not signal kWhatShutdownCompleted when moving to Uninitialized
state due to receiving a codec error.

Do not abort if error happens just before handling a stop request.

Bug: 13675112
Change-Id: I4b14b2e64cff0f71215d2bbc24cd850617dfb67b
Codec.cpp
ec5f7cc4756d389505e761b9d803a1a3a46b64d7 31-Mar-2014 Lajos Molnar <lajos@google.com> MediaCodec: move to UNINITIALIZED state on codec error

ACodec moves to Uninitialized state after receiving codec error.
Make MediaCodec also move to the same state, so stop() and
release() will work correctly.

Bug: 13675112
Change-Id: I1c7e8b274f68345fc0e6a55c70dff6c7a4fb2e72
ediaCodec.cpp
5e184b0d12f1ec436246a391da8d9355cc21ee08 28-Mar-2014 Lajos Molnar <lajos@google.com> ACodec: ignore OMX messages to already freed component

Bug: 12916984
Change-Id: I92848797b8d556cff468b9b0f0a618946083208f
Codec.cpp
4f1ef2cd65d734edae17f8586cf717598b40f2c3 28-Mar-2014 Lajos Molnar <lajos@google.com> am 1000d426: am f780d28d: Merge "DO NOT MERGE: Revert "mediaplayer: keep more buffers with the BufferQueue"" into klp-dev

* commit '1000d426bedb1ec38bdfff98fc8f004b64af13cb':
DO NOT MERGE: Revert "mediaplayer: keep more buffers with the BufferQueue"
ff382d0c40493303ceb81a6c22d1a48c0fecfe9c 28-Mar-2014 Lajos Molnar <lajos@google.com> am 8bf96c01: am 3d4e4fcb: Merge "DO NOT MERGE: Revert "stagefright: allow for minUndequeuedBufs to be one less"" into klp-dev

* commit '8bf96c011ff4128f9bf06b892a38d869192d6a25':
DO NOT MERGE: Revert "stagefright: allow for minUndequeuedBufs to be one less"
1000d426bedb1ec38bdfff98fc8f004b64af13cb 28-Mar-2014 Lajos Molnar <lajos@google.com> am f780d28d: Merge "DO NOT MERGE: Revert "mediaplayer: keep more buffers with the BufferQueue"" into klp-dev

* commit 'f780d28de2e3cf7f6b26b9626321dba75719736e':
DO NOT MERGE: Revert "mediaplayer: keep more buffers with the BufferQueue"
8bf96c011ff4128f9bf06b892a38d869192d6a25 28-Mar-2014 Lajos Molnar <lajos@google.com> am 3d4e4fcb: Merge "DO NOT MERGE: Revert "stagefright: allow for minUndequeuedBufs to be one less"" into klp-dev

* commit '3d4e4fcbcfc5c16dd794591727f5c713831ab6dc':
DO NOT MERGE: Revert "stagefright: allow for minUndequeuedBufs to be one less"
f780d28de2e3cf7f6b26b9626321dba75719736e 28-Mar-2014 Lajos Molnar <lajos@google.com> Merge "DO NOT MERGE: Revert "mediaplayer: keep more buffers with the BufferQueue"" into klp-dev
3d4e4fcbcfc5c16dd794591727f5c713831ab6dc 28-Mar-2014 Lajos Molnar <lajos@google.com> Merge "DO NOT MERGE: Revert "stagefright: allow for minUndequeuedBufs to be one less"" into klp-dev
114c1b6553e3d2dc5f2780a76d92bb382234220c 28-Mar-2014 Lajos Molnar <lajos@google.com> DO NOT MERGE: Revert "mediaplayer: keep more buffers with the BufferQueue"

This reverts commit b635b0e66b257ab442e230bca96afd5105cf6829.

Bug: 13655631
Codec.cpp
MXCodec.cpp
f5ee327780ea2b538b8affafa8063f0ce0390fe0 28-Mar-2014 Lajos Molnar <lajos@google.com> DO NOT MERGE: Revert "stagefright: allow for minUndequeuedBufs to be one less"

This reverts commit a0470879e25394cb85437366fa53ce8055cd556f.

Bug: 13655631
Codec.cpp
MXCodec.cpp
2301acc6a9c7a3af4ad01f3d1d0f76f13eca7350 17-Jan-2014 Glenn Kasten <gkasten@google.com> Update comments

Change-Id: I5776313b9b49072cd666d28880f0d07cc73f827b
udioPlayer.cpp
55d15957bc44d11052e1cb3eea3340ec00f70bae 21-Mar-2014 Lajos Molnar <lajos@google.com> Merge "stagefright: initial media_codecs_google*.xml files"
ba1390335794a38472bf0349568bc4f199dc5c90 21-Mar-2014 Lajos Molnar <lajos@google.com> am 30890210: am 333ceb4f: Merge "DO NOT MERGE: PlaylistFetcher: fix infinite loop when parsing ADTS." into klp-dev

* commit '3089021031d6ad0f2b330567f108aec03fa13994':
DO NOT MERGE: PlaylistFetcher: fix infinite loop when parsing ADTS.
3089021031d6ad0f2b330567f108aec03fa13994 21-Mar-2014 Lajos Molnar <lajos@google.com> am 333ceb4f: Merge "DO NOT MERGE: PlaylistFetcher: fix infinite loop when parsing ADTS." into klp-dev

* commit '333ceb4f66ccf790081026f645474e07d832fbdb':
DO NOT MERGE: PlaylistFetcher: fix infinite loop when parsing ADTS.
0fcba89e5460ed3edca75322175b8a56a6e6f48d 21-Mar-2014 Lajos Molnar <lajos@google.com> am 333ceb4f: Merge "DO NOT MERGE: PlaylistFetcher: fix infinite loop when parsing ADTS." into klp-dev

* commit '333ceb4f66ccf790081026f645474e07d832fbdb':
DO NOT MERGE: PlaylistFetcher: fix infinite loop when parsing ADTS.
333ceb4f66ccf790081026f645474e07d832fbdb 21-Mar-2014 Lajos Molnar <lajos@google.com> Merge "DO NOT MERGE: PlaylistFetcher: fix infinite loop when parsing ADTS." into klp-dev
65e20ffc984c541a8119420f917493dd7b703f77 07-Feb-2014 Robert Shih <robertshih@google.com> DO NOT MERGE: PlaylistFetcher: fix infinite loop when parsing ADTS.

First check for embedded ID3 tag, then bail out if invalid.

Bug: 12934795
Change-Id: I74acebed4bfb2c6ca44dfe936166fdba8510233f
ttplive/PlaylistFetcher.cpp
d1afbf1372488bd927afdbb2ca49a3000511125f 21-Mar-2014 Rachad <rachad@google.com> am 1bfb8f76: am f622e2c7: Increased recorded MP4 max file size to 4GB (more precisely 2^32-1 bytes -- FAT32 max file size)

* commit '1bfb8f762dd21b39756fd8fd9990172cae1cef79':
Increased recorded MP4 max file size to 4GB (more precisely 2^32-1 bytes -- FAT32 max file size)
5ce204a6362840fe28aa762693edaab3d0da8718 21-Mar-2014 Rachad <rachad@google.com> am f622e2c7: Increased recorded MP4 max file size to 4GB (more precisely 2^32-1 bytes -- FAT32 max file size)

* commit 'f622e2c78407b50806a53a06a89b2b6546420f55':
Increased recorded MP4 max file size to 4GB (more precisely 2^32-1 bytes -- FAT32 max file size)
1bfb8f762dd21b39756fd8fd9990172cae1cef79 21-Mar-2014 Rachad <rachad@google.com> am f622e2c7: Increased recorded MP4 max file size to 4GB (more precisely 2^32-1 bytes -- FAT32 max file size)

* commit 'f622e2c78407b50806a53a06a89b2b6546420f55':
Increased recorded MP4 max file size to 4GB (more precisely 2^32-1 bytes -- FAT32 max file size)
f622e2c78407b50806a53a06a89b2b6546420f55 11-Feb-2014 Rachad <rachad@google.com> Increased recorded MP4 max file size to 4GB
(more precisely 2^32-1 bytes -- FAT32 max file size)

bug: 11039801
Change-Id: I6169f798c59d123d02d5fd7afa3b9e645ebdb598
(cherry picked from commit 1f1f2b1678fd0d038dfc501252dd2b65ecf10cae)
PEG4Writer.cpp
84f7a5b28a686f9a165e1df5c90a72b218a87568 20-Mar-2014 Marco Nelissen <marcone@google.com> am 9ec86fa0: am a577eefb: am 5be9c1da: am 01eed3c0: am 7a107b85: am 854aa061: am 42ba5806: am 72499628: am 25bab830: Fix build

* commit '9ec86fa05479cc468859c69009afda752ea46539':
Fix build
9ec86fa05479cc468859c69009afda752ea46539 20-Mar-2014 Marco Nelissen <marcone@google.com> am a577eefb: am 5be9c1da: am 01eed3c0: am 7a107b85: am 854aa061: am 42ba5806: am 72499628: am 25bab830: Fix build

* commit 'a577eefbaca24d1b9ac947daca54be1992888748':
Fix build
762f533c825040ae0d953783584f778ec187fec5 20-Mar-2014 Marco Nelissen <marcone@google.com> am a577eefb: am 5be9c1da: am 01eed3c0: am 7a107b85: am 854aa061: am 42ba5806: am 72499628: am 25bab830: Fix build

* commit 'a577eefbaca24d1b9ac947daca54be1992888748':
Fix build
a577eefbaca24d1b9ac947daca54be1992888748 20-Mar-2014 Marco Nelissen <marcone@google.com> am 5be9c1da: am 01eed3c0: am 7a107b85: am 854aa061: am 42ba5806: am 72499628: am 25bab830: Fix build

* commit '5be9c1daf956c35d37585d21fff5d6b99f506560':
Fix build
5be9c1daf956c35d37585d21fff5d6b99f506560 20-Mar-2014 Marco Nelissen <marcone@google.com> am 01eed3c0: am 7a107b85: am 854aa061: am 42ba5806: am 72499628: am 25bab830: Fix build

* commit '01eed3c0fb951e349d68f4bce818bef22e7925b1':
Fix build
01eed3c0fb951e349d68f4bce818bef22e7925b1 20-Mar-2014 Marco Nelissen <marcone@google.com> am 7a107b85: am 854aa061: am 42ba5806: am 72499628: am 25bab830: Fix build

* commit '7a107b857e658ba11c0c1fd2325ac91a2c0569a2':
Fix build
7a107b857e658ba11c0c1fd2325ac91a2c0569a2 20-Mar-2014 Marco Nelissen <marcone@google.com> am 854aa061: am 42ba5806: am 72499628: am 25bab830: Fix build

* commit '854aa061b1e2d7eaaf8ffa2ead323c1478393c57':
Fix build
72499628a24ccea0befe726de6e2b32176ddf208 20-Mar-2014 Marco Nelissen <marcone@google.com> am 25bab830: Fix build

* commit '25bab830af062dcaef6f75220066b221fd30957e':
Fix build
25bab830af062dcaef6f75220066b221fd30957e 20-Mar-2014 Marco Nelissen <marcone@google.com> Fix build

As of jb-mr1, need to explicitly include library dependencies. The original
change in jb, which the automerger dutyfully merged, did not need this.

Change-Id: I429637e2d01b8084376bb97a02bb091a0ea9eaf7
hromium_http/Android.mk
fb08bd765844160649f23c0e5ee76772678528ba 20-Mar-2014 Marco Nelissen <marcone@google.com> am 994cbef7: am 2853e48c: am 6f65db14: am 0e0891f8: am 6cdc90b5: am ebc9b473: am fb49b8ba: am dfd90c80: am d434944b: am 3bc4f7ea: am 0c271b75: Verify certificates

* commit '994cbef7361b0f304883ea463488342347ed67b8':
Verify certificates
762108211026d46cf277d1585cf770170932e3f2 20-Mar-2014 Marco Nelissen <marcone@google.com> am 2853e48c: am 6f65db14: am 0e0891f8: am 6cdc90b5: am ebc9b473: am fb49b8ba: am dfd90c80: am d434944b: am 3bc4f7ea: am 0c271b75: Verify certificates

* commit '2853e48c855fc95f2bd7bf9438a878f2a79d75a7':
Verify certificates
994cbef7361b0f304883ea463488342347ed67b8 20-Mar-2014 Marco Nelissen <marcone@google.com> am 2853e48c: am 6f65db14: am 0e0891f8: am 6cdc90b5: am ebc9b473: am fb49b8ba: am dfd90c80: am d434944b: am 3bc4f7ea: am 0c271b75: Verify certificates

* commit '2853e48c855fc95f2bd7bf9438a878f2a79d75a7':
Verify certificates
2853e48c855fc95f2bd7bf9438a878f2a79d75a7 20-Mar-2014 Marco Nelissen <marcone@google.com> am 6f65db14: am 0e0891f8: am 6cdc90b5: am ebc9b473: am fb49b8ba: am dfd90c80: am d434944b: am 3bc4f7ea: am 0c271b75: Verify certificates

* commit '6f65db14e310b513c8943b236a6e61cf27cef4c7':
Verify certificates
6f65db14e310b513c8943b236a6e61cf27cef4c7 20-Mar-2014 Marco Nelissen <marcone@google.com> am 0e0891f8: am 6cdc90b5: am ebc9b473: am fb49b8ba: am dfd90c80: am d434944b: am 3bc4f7ea: am 0c271b75: Verify certificates

* commit '0e0891f8b49f31e6a28b563f86aae537e66bb6e0':
Verify certificates
0e0891f8b49f31e6a28b563f86aae537e66bb6e0 20-Mar-2014 Marco Nelissen <marcone@google.com> am 6cdc90b5: am ebc9b473: am fb49b8ba: am dfd90c80: am d434944b: am 3bc4f7ea: am 0c271b75: Verify certificates

* commit '6cdc90b5e41374dd665df3ae7283ef0c1f532678':
Verify certificates
6cdc90b5e41374dd665df3ae7283ef0c1f532678 20-Mar-2014 Marco Nelissen <marcone@google.com> am ebc9b473: am fb49b8ba: am dfd90c80: am d434944b: am 3bc4f7ea: am 0c271b75: Verify certificates

* commit 'ebc9b47330ab8565f7bdd9b3973a8f75e3206e77':
Verify certificates
dfd90c8052a913ed2bbbea1873ee51838d40bfe1 20-Mar-2014 Marco Nelissen <marcone@google.com> am d434944b: am 3bc4f7ea: am 0c271b75: Verify certificates

* commit 'd434944b00cf83a38019047e0d7db155a15d77f4':
Verify certificates
d434944b00cf83a38019047e0d7db155a15d77f4 20-Mar-2014 Marco Nelissen <marcone@google.com> am 3bc4f7ea: am 0c271b75: Verify certificates

* commit '3bc4f7eaf063201dc85ecc2f7c2bf2b70ab564ed':
Verify certificates
3bc4f7eaf063201dc85ecc2f7c2bf2b70ab564ed 20-Mar-2014 Marco Nelissen <marcone@google.com> am 0c271b75: Verify certificates

* commit '0c271b750f7314e187f8479f478ad9382d9a9045':
Verify certificates
3b800bf9a1db3c9f2f37c9512deb282588e8b50c 19-Mar-2014 Lajos Molnar <lajos@google.com> stagefright: initial media_codecs_google*.xml files

Separated description of Google-provided codecs into their own
files based on domain. Google-provided audio/telephony codecs
should be included prior to specifying vendor codecs. Google-
provided video codecs should be included after vendor codecs.

Bug: 13549114
Change-Id: I216f01feaf0379c6cd7d8714e02792fdf2214a90
ata/media_codecs_google_audio.xml
ata/media_codecs_google_telephony.xml
ata/media_codecs_google_video.xml
10cb92cfba6b47f98e93b1bed18acb715c5f6ecb 20-Mar-2014 Alex Glaznev <glaznev@google.com> Merge "A few fixes in SW VP8 encoder:"
b4a7a2df4c28c3f32b5d877b54831d2cc5d78f81 20-Mar-2014 Colin Cross <ccross@android.com> libstagefright: fix 64-bit warnings

%lld -> %" PRId64 " for int64_t
%d -> %zu for size_t
Also fixes some casts from void* to integer types, and some comparisons
between signed and unsigned.

Change-Id: I9c52f76240e39399da252c66459042a6fc626a90
odecs/flac/enc/SoftFlacEncoder.cpp
odecs/m4v_h263/enc/SoftMPEG4Encoder.cpp
ttplive/LiveSession.cpp
ttplive/M3UParser.cpp
ttplive/PlaylistFetcher.cpp
d3/ID3.cpp
atroska/MatroskaExtractor.cpp
peg2ts/ATSParser.cpp
peg2ts/AnotherPacketSource.cpp
peg2ts/ESQueue.cpp
peg2ts/MPEG2PSExtractor.cpp
tsp/AAVCAssembler.cpp
tsp/AMPEG4ElementaryAssembler.cpp
tsp/ARTPConnection.cpp
tsp/ARTPWriter.cpp
tsp/SDPLoader.cpp
imedtext/TimedTextPlayer.cpp
ebm/WebmElement.cpp
ebm/WebmFrameThread.cpp
0d6abe8cdadde6f9ad7ac989042f725668233bdb 25-Feb-2014 Alex Glaznev <glaznev@google.com> A few fixes in SW VP8 encoder:

- Increase encoder output buffer size to 1 Mb to avoid buffer
overrun when encoding high complexity HD frames.

- Store output port format parameters.

- Use same VP8 encoder settings as in WebRTC when encoder is
configured to run in CBR mode.

Bug: b/12924516
Bug: b/12908952
Change-Id: Ida884efd0cd1a7272998f5835abd290bfb19b2ac
odecs/on2/enc/SoftVPXEncoder.cpp
odecs/on2/enc/SoftVPXEncoder.h
259ace8f6057dbb0fdec4c8223aefc0282274be3 19-Mar-2014 Glenn Kasten <gkasten@google.com> Merge commit 'c250980f' into manualmerge

Change-Id: I254d456e8cb6c580dd77d602b391bed09110454e
181cd2ba90ab574da7b57a0b79e3e2118b6ea3ad 19-Mar-2014 Glenn Kasten <gkasten@android.com> am 24e1bd71: Merge "libstagefright is no longer 32 bit only."

* commit '24e1bd71ac6850d9062b3bd803b37c0e92f69c7a':
libstagefright is no longer 32 bit only.
c250980f65ffec76537d9c6d9b1ad12afc38346a 19-Mar-2014 Glenn Kasten <gkasten@android.com> am 24e1bd71: Merge "libstagefright is no longer 32 bit only."

* commit '24e1bd71ac6850d9062b3bd803b37c0e92f69c7a':
libstagefright is no longer 32 bit only.
2ceebb30a1ee5282d36bc47840f4c5a6187a7a92 19-Mar-2014 Lajos Molnar <lajos@google.com> am bd1f8f0a: am fb28c384: am 1faa4170: stagefright: allow for minUndequeuedBufs to be one less

* commit 'bd1f8f0a5cc55761edfbd2a472e229dd4b0d2cdf':
stagefright: allow for minUndequeuedBufs to be one less
bd1f8f0a5cc55761edfbd2a472e229dd4b0d2cdf 19-Mar-2014 Lajos Molnar <lajos@google.com> am fb28c384: am 1faa4170: stagefright: allow for minUndequeuedBufs to be one less

* commit 'fb28c384316518f699e7dd3e9149c9e84b05a525':
stagefright: allow for minUndequeuedBufs to be one less
fb28c384316518f699e7dd3e9149c9e84b05a525 19-Mar-2014 Lajos Molnar <lajos@google.com> am 1faa4170: stagefright: allow for minUndequeuedBufs to be one less

* commit '1faa41704e0b976e546321effcb09a85767d51ba':
stagefright: allow for minUndequeuedBufs to be one less
f4d9d45ebad478091d65b2a4c18544d308d3fff0 19-Mar-2014 Lajos Molnar <lajos@google.com> am 1faa4170: stagefright: allow for minUndequeuedBufs to be one less

* commit '1faa41704e0b976e546321effcb09a85767d51ba':
stagefright: allow for minUndequeuedBufs to be one less
1faa41704e0b976e546321effcb09a85767d51ba 19-Mar-2014 Lajos Molnar <lajos@google.com> stagefright: allow for minUndequeuedBufs to be one less

Bug: 13533477
Change-Id: I909324e3e24f65d8051e0d5474267620efcfc729
Codec.cpp
MXCodec.cpp
f3aa039a2278f789e3c9d5e18b83f9d937a05a5f 19-Mar-2014 Narayan Kamath <narayan@google.com> libstagefright is no longer 32 bit only.

Change-Id: I88d5fcfc005a2c2acd0246cdd9c08b6c00b6c39b
Signed-off-by: Glenn Kasten <gkasten@android.com>
ndroid.mk
hromium_http/Android.mk
odecs/aacenc/Android.mk
odecs/avc/enc/Android.mk
ttplive/Android.mk
d3/Android.mk
ifi-display/Android.mk
d74110cdef2becd4f7fd2334c34c3ca73f56b355 19-Mar-2014 Lajos Molnar <lajos@google.com> stagefright: add include support for MediaCodecList xml parser

One can include full-formed XML files using <Include href=".." />.
For security/simplicity, file names must be in the form of
"media_codecs_.*\.xml"

Change-Id: Id039a4fd0ade390224485fcf5ecc1d107b2bdb9a
ediaCodecList.cpp
0c271b750f7314e187f8479f478ad9382d9a9045 13-Mar-2014 Marco Nelissen <marcone@google.com> Verify certificates

b/13418320

Cherrypicked from 8a57d24c733b08da846b54d1adf029e606b5a5f3
https://googleplex-android-review.git.corp.google.com/#/c/433309/

Change-Id: I3052dd5f9ec057e700784cd713f6a7dab9ecfe7b
hromium_http/support.cpp
129c76538570cd42fce2154bfb0aec934cf84ff3 19-Mar-2014 Lajos Molnar <lajos@google.com> am 9cde5172: am b635b0e6: mediaplayer: keep more buffers with the BufferQueue

* commit '9cde517297827156de1c3b2ff54e272a5d4ae7c3':
mediaplayer: keep more buffers with the BufferQueue
9cde517297827156de1c3b2ff54e272a5d4ae7c3 19-Mar-2014 Lajos Molnar <lajos@google.com> am b635b0e6: mediaplayer: keep more buffers with the BufferQueue

* commit 'b635b0e66b257ab442e230bca96afd5105cf6829':
mediaplayer: keep more buffers with the BufferQueue
4647dba9afd0b365e47b9493a680d71b59a361e6 19-Mar-2014 Lajos Molnar <lajos@google.com> am b635b0e6: mediaplayer: keep more buffers with the BufferQueue

* commit 'b635b0e66b257ab442e230bca96afd5105cf6829':
mediaplayer: keep more buffers with the BufferQueue
7a39abac839092298cd184c5996dc82010d60a20 19-Mar-2014 Robert Shih <robertshih@google.com> am 49b2e310: am a1f0c62c: am 43ca783e: httplive: block-by-block fetch, decrypt, and parse ts files.

* commit '49b2e310f62c590a1af9f921cd8a134cdf589263':
httplive: block-by-block fetch, decrypt, and parse ts files.
49b2e310f62c590a1af9f921cd8a134cdf589263 19-Mar-2014 Robert Shih <robertshih@google.com> am a1f0c62c: am 43ca783e: httplive: block-by-block fetch, decrypt, and parse ts files.

* commit 'a1f0c62c189f2d162cca4af736c3d440f1eff53c':
httplive: block-by-block fetch, decrypt, and parse ts files.
a1f0c62c189f2d162cca4af736c3d440f1eff53c 19-Mar-2014 Robert Shih <robertshih@google.com> am 43ca783e: httplive: block-by-block fetch, decrypt, and parse ts files.

* commit '43ca783effd99bba0e6e2dd6fe177a8888578ef8':
httplive: block-by-block fetch, decrypt, and parse ts files.
28c3e94a9b02bd5d5ed4b5fe96dff74700f88677 19-Mar-2014 Robert Shih <robertshih@google.com> am 43ca783e: httplive: block-by-block fetch, decrypt, and parse ts files.

* commit '43ca783effd99bba0e6e2dd6fe177a8888578ef8':
httplive: block-by-block fetch, decrypt, and parse ts files.
b635b0e66b257ab442e230bca96afd5105cf6829 14-Feb-2014 Lajos Molnar <lajos@google.com> mediaplayer: keep more buffers with the BufferQueue

Change OMX buffer allocation policy to allocate
nBufferCountMin + what is required for the BQ.

For the BQ, try to allocate 2 additional buffers than
the minimum undequeued count.

Also account for the fact that BQ may return one less
than the actual minimum undequeued count.

In most cases the resulting number of buffers ends up
being the same as with the previous policy, but we
keep more buffers with the BQ.

Change-Id: I826db8bf7dd333b620299dba60bf1b81b228275d
Bug: 13170236
Codec.cpp
MXCodec.cpp
43ca783effd99bba0e6e2dd6fe177a8888578ef8 27-Feb-2014 Robert Shih <robertshih@google.com> httplive: block-by-block fetch, decrypt, and parse ts files.

Bug: 12060952
Change-Id: I695345081fe23961b9d0ef6db264885f914703ec
ttplive/LiveSession.cpp
ttplive/LiveSession.h
ttplive/PlaylistFetcher.cpp
ttplive/PlaylistFetcher.h
peg2ts/ATSParser.h
286c7d915fe6d7092426c72319affe260572aa0d 19-Mar-2014 Colin Cross <ccross@android.com> am c7c839dc: am b2ecad7f: Merge "libstagefright_foundation: fix printf format for 64-bit"

* commit 'c7c839dccf58ab6322c1898cbf1b2332792d2e86':
libstagefright_foundation: fix printf format for 64-bit
c7c839dccf58ab6322c1898cbf1b2332792d2e86 19-Mar-2014 Colin Cross <ccross@android.com> am b2ecad7f: Merge "libstagefright_foundation: fix printf format for 64-bit"

* commit 'b2ecad7f079f4f852d334e67fd7a72ff1696a78e':
libstagefright_foundation: fix printf format for 64-bit
a933aa34f95ca54a765a2a3f2ef245b7054aef16 19-Mar-2014 Colin Cross <ccross@android.com> am b2ecad7f: Merge "libstagefright_foundation: fix printf format for 64-bit"

* commit 'b2ecad7f079f4f852d334e67fd7a72ff1696a78e':
libstagefright_foundation: fix printf format for 64-bit
67c036a3faada8b77d73cf81bd1b0be4cb60c562 19-Mar-2014 Colin Cross <ccross@android.com> libstagefright_foundation: fix printf format for 64-bit

Fixes build error:
frameworks/av/media/libstagefright/foundation/ANetworkSession.cpp:582:131: error: format '%d' expects argument of type 'int', but argument 4 has type 'size_t {aka long unsigned int}' [-Werror=format=]
ALOGI("%d datagrams remain queued.", mOutFragments.size());
^
cc1plus: all warnings being treated as errors

Change-Id: I69d1f086b8f1e450f107671c8f8f3ed696d170b4
oundation/ANetworkSession.cpp
1143ca58e659ded1e851eb12813793ad8ac0563e 18-Mar-2014 Glenn Kasten <gkasten@android.com> am 098b28fc: am 64727dd7: Merge "More precise 32-bit only for libstagefright/ subdirectories"

* commit '098b28fc88b3d96eada2f9db318d9c38c70cf674':
More precise 32-bit only for libstagefright/ subdirectories
3327597fe780a076a0755c7a4f1aff895c531dad 18-Mar-2014 Glenn Kasten <gkasten@android.com> am 64727dd7: Merge "More precise 32-bit only for libstagefright/ subdirectories"

* commit '64727dd7c8513b6c9ddcce2f4b305618bb76121c':
More precise 32-bit only for libstagefright/ subdirectories
098b28fc88b3d96eada2f9db318d9c38c70cf674 18-Mar-2014 Glenn Kasten <gkasten@android.com> am 64727dd7: Merge "More precise 32-bit only for libstagefright/ subdirectories"

* commit '64727dd7c8513b6c9ddcce2f4b305618bb76121c':
More precise 32-bit only for libstagefright/ subdirectories
dc2b47aee47ad8690fd8dc663c6602b7efa3bbac 17-Mar-2014 Glenn Kasten <gkasten@android.com> More precise 32-bit only for libstagefright/ subdirectories

Change-Id: Ie4e8f9ccd834b902287d3452cc9fa739809ddb68
ttplive/Android.mk
d3/Android.mk
mx/tests/Android.mk
ests/Android.mk
ifi-display/Android.mk
0dc3583043bb578b149e50a9928894eff2819508 15-Mar-2014 Marco Nelissen <marcone@google.com> am 8788c40c: am 75dcf510: Merge "Verify certificates" into klp-dev

* commit '8788c40c7b5bdcaef1dcaa7f36598ae767880047':
Verify certificates
8788c40c7b5bdcaef1dcaa7f36598ae767880047 14-Mar-2014 Marco Nelissen <marcone@google.com> am 75dcf510: Merge "Verify certificates" into klp-dev

* commit '75dcf5101c90e31bbac95694d835b0e8f57ba720':
Verify certificates
a58ed6d8378108e4309ee0077dc4529b76634791 14-Mar-2014 Marco Nelissen <marcone@google.com> am 75dcf510: Merge "Verify certificates" into klp-dev

* commit '75dcf5101c90e31bbac95694d835b0e8f57ba720':
Verify certificates
75dcf5101c90e31bbac95694d835b0e8f57ba720 14-Mar-2014 Marco Nelissen <marcone@google.com> Merge "Verify certificates" into klp-dev
758799cef41fc5495f59eeb6249d02ce9154cde8 14-Mar-2014 Glenn Kasten <gkasten@google.com> resolved conflicts for merge of 3c780188 to master

Change-Id: Ic579d346c27ff05ea6444faaa60fa6caaec86fbf
236104afb2300b7d969b1dc786f14b5f912df1cf 14-Mar-2014 Glenn Kasten <gkasten@android.com> am 089affb6: Merge "mediaserver and associated services are 32-bit only"

* commit '089affb6c2d9ed1e2d49df4be02d30dc490506f9':
mediaserver and associated services are 32-bit only
3c7801882bbb6d5f3cc641525a54cb8a6c4aca34 14-Mar-2014 Glenn Kasten <gkasten@android.com> am 089affb6: Merge "mediaserver and associated services are 32-bit only"

* commit '089affb6c2d9ed1e2d49df4be02d30dc490506f9':
mediaserver and associated services are 32-bit only
089affb6c2d9ed1e2d49df4be02d30dc490506f9 14-Mar-2014 Glenn Kasten <gkasten@android.com> Merge "mediaserver and associated services are 32-bit only"
beb57a5a08207af80180b93dd80d611a85997c43 14-Mar-2014 Andreas Huber <andih@google.com> am f1ac623f: am 4a67fc49: Merge "Implemented support for RTSP 301 Redirect"

* commit 'f1ac623fcc6bbda2faff9752cd611182a897afe1':
Implemented support for RTSP 301 Redirect
f1ac623fcc6bbda2faff9752cd611182a897afe1 14-Mar-2014 Andreas Huber <andih@google.com> am 4a67fc49: Merge "Implemented support for RTSP 301 Redirect"

* commit '4a67fc49d926c75fa6a96160ba5627fb0e209db6':
Implemented support for RTSP 301 Redirect
f10b9885462bea2f0c683038d6833ee230ad9eb2 14-Mar-2014 Andreas Huber <andih@google.com> am 4a67fc49: Merge "Implemented support for RTSP 301 Redirect"

* commit '4a67fc49d926c75fa6a96160ba5627fb0e209db6':
Implemented support for RTSP 301 Redirect
4a67fc49d926c75fa6a96160ba5627fb0e209db6 14-Mar-2014 Andreas Huber <andih@google.com> Merge "Implemented support for RTSP 301 Redirect"
fa243e07f062058e7df01c052eb79086c21fbdbc 14-Mar-2014 Lajos Molnar <lajos@google.com> am 466786b2: am 70cc5bdc: Merge changes Ic46e3069,Idc92716b into klp-dev

* commit '466786b25b262f4f6e5737b3a88e8d7f6916e45c':
LiveSession: fix incorrect stream key (subtitle"s")
M3UParser: trim spaces when parsing comma separated codecs.
a0b94395dc82c90ca437bb6fed7aa01fcbbffffe 14-Mar-2014 Lajos Molnar <lajos@google.com> am 5b297ba7: am 67a10c52: Merge "httplive: clear access units before returning from seekTo." into klp-dev

* commit '5b297ba76271e8554758cbd569e73720bc914af6':
httplive: clear access units before returning from seekTo.
466786b25b262f4f6e5737b3a88e8d7f6916e45c 14-Mar-2014 Lajos Molnar <lajos@google.com> am 70cc5bdc: Merge changes Ic46e3069,Idc92716b into klp-dev

* commit '70cc5bdc0fca3f67f3602f04152c29323cad99df':
LiveSession: fix incorrect stream key (subtitle"s")
M3UParser: trim spaces when parsing comma separated codecs.
5b297ba76271e8554758cbd569e73720bc914af6 14-Mar-2014 Lajos Molnar <lajos@google.com> am 67a10c52: Merge "httplive: clear access units before returning from seekTo." into klp-dev

* commit '67a10c522898d8223f5a2d389a846b7e2327148a':
httplive: clear access units before returning from seekTo.
f6bd712c8c252733f9d033ef60219ff1de9342ad 14-Mar-2014 Lajos Molnar <lajos@google.com> am 70cc5bdc: Merge changes Ic46e3069,Idc92716b into klp-dev

* commit '70cc5bdc0fca3f67f3602f04152c29323cad99df':
LiveSession: fix incorrect stream key (subtitle"s")
M3UParser: trim spaces when parsing comma separated codecs.
6e57e4ddc73da69e1f7e8907e6c498e7407e3c39 14-Mar-2014 Lajos Molnar <lajos@google.com> am 67a10c52: Merge "httplive: clear access units before returning from seekTo." into klp-dev

* commit '67a10c522898d8223f5a2d389a846b7e2327148a':
httplive: clear access units before returning from seekTo.
fca2d347ff3d583c15c56072b6024732d47b3d2f 14-Mar-2014 Chong Zhang <chz@google.com> am cf49a51f: fix codec buffer leak in error handling when timestamp goes backward

* commit 'cf49a51ff59c3cd228d178d23252ac0d39d5a893':
fix codec buffer leak in error handling when timestamp goes backward
b1120b65c328cf6e35c0494d7d61addcbdc16821 14-Mar-2014 Lajos Molnar <lajos@google.com> Merge changes I1455bfc6,I90c7e34b,I06e001df

* changes:
NuPlayer: use MediaCodec instead of ACodec
MediaCodec: add getInputFormat() method
Revert "NuPlayer: Use a software renderer when using software codecs"
43d3f40b389904a2bdf4fd4ef8e8b914cf5a4b67 14-Mar-2014 Chong Zhang <chz@google.com> am bd77a1b5: am cf49a51f: fix codec buffer leak in error handling when timestamp goes backward

* commit 'bd77a1b5115d355eb1e2bc270fe9aa4ceb3d8e65':
fix codec buffer leak in error handling when timestamp goes backward
bd77a1b5115d355eb1e2bc270fe9aa4ceb3d8e65 14-Mar-2014 Chong Zhang <chz@google.com> am cf49a51f: fix codec buffer leak in error handling when timestamp goes backward

* commit 'cf49a51ff59c3cd228d178d23252ac0d39d5a893':
fix codec buffer leak in error handling when timestamp goes backward
29c291f2337561b1f8c2f79bc34339b0b9c28b9c 14-Mar-2014 Chong Zhang <chz@google.com> am a671f943: am c69bc40a: Merge "Cap pts gap between adjacent frames to specified value" into klp-dev

* commit 'a671f943b72155460f0c94cdd92d829cb059b571':
Cap pts gap between adjacent frames to specified value
28836548337865536788799430e9fae77e996422 14-Mar-2014 Chong Zhang <chz@google.com> am 1e001f92: am 1c608ab3: save mGraphicBuffer pointer even when we\'re suspended

* commit '1e001f92e748de00a3e20effa464d59d75a746b3':
save mGraphicBuffer pointer even when we're suspended
7c47cafa5be623f1db483483ac27f714c54dc1cc 14-Mar-2014 Chong Zhang <chz@google.com> am c69bc40a: Merge "Cap pts gap between adjacent frames to specified value" into klp-dev

* commit 'c69bc40a347c411751cb082b3eb4a82d976a68ec':
Cap pts gap between adjacent frames to specified value
5b835698486077c5b1fd81b9fd741dfd7ff37cb3 14-Mar-2014 Chong Zhang <chz@google.com> am 1c608ab3: save mGraphicBuffer pointer even when we\'re suspended

* commit '1c608ab33acab82d4a87f1abedcc99a623d1b53a':
save mGraphicBuffer pointer even when we're suspended
8a57d24c733b08da846b54d1adf029e606b5a5f3 13-Mar-2014 Marco Nelissen <marcone@google.com> Verify certificates

b/13418320

Change-Id: I3052dd5f9ec057e700784cd713f6a7dab9ecfe7b
hromium_http/Android.mk
hromium_http/support.cpp
a671f943b72155460f0c94cdd92d829cb059b571 13-Mar-2014 Chong Zhang <chz@google.com> am c69bc40a: Merge "Cap pts gap between adjacent frames to specified value" into klp-dev

* commit 'c69bc40a347c411751cb082b3eb4a82d976a68ec':
Cap pts gap between adjacent frames to specified value
1e001f92e748de00a3e20effa464d59d75a746b3 13-Mar-2014 Chong Zhang <chz@google.com> am 1c608ab3: save mGraphicBuffer pointer even when we\'re suspended

* commit '1c608ab33acab82d4a87f1abedcc99a623d1b53a':
save mGraphicBuffer pointer even when we're suspended
97ae4073c5c589f7df36cc840ec77d02eececbc8 13-Mar-2014 Lajos Molnar <lajos@google.com> Merge "mediaplayer: keep more buffers with the BufferQueue"
0b89a66c96b409f51e882b7d065d4b8562884faf 13-Mar-2014 Marco Nelissen <marcone@google.com> am 19afb386: Merge "Remove streaming URI from default logs"

* commit '19afb3869eb6a3e3733dc1f7420e1d4c3c03d376':
Remove streaming URI from default logs
5205977929c8a63d3bba026c6bd7b4cc1e236627 12-Mar-2014 Dan Stoza <stoza@google.com> Remove deprecated BufferQueue constructor

Bug: 13415624
Change-Id: I1a824d09ce582ee54753683d30cdc23813c13b6b
urfaceMediaSource.cpp
mx/GraphicBufferSource.cpp
mx/GraphicBufferSource.h
ests/SurfaceMediaSource_test.cpp
ifi-display/source/PlaybackSession.cpp
ifi-display/source/PlaybackSession.h
70cc5bdc0fca3f67f3602f04152c29323cad99df 12-Mar-2014 Lajos Molnar <lajos@google.com> Merge changes Ic46e3069,Idc92716b into klp-dev

* changes:
LiveSession: fix incorrect stream key (subtitle"s")
M3UParser: trim spaces when parsing comma separated codecs.
67a10c522898d8223f5a2d389a846b7e2327148a 12-Mar-2014 Lajos Molnar <lajos@google.com> Merge "httplive: clear access units before returning from seekTo." into klp-dev
fca092d953e04c7169242200f0ddb914a9f54ea4 12-Mar-2014 Marco Nelissen <marcone@google.com> am f4431278: am 19afb386: Merge "Remove streaming URI from default logs"

* commit 'f4431278a9613f55ecd944ab2e3eb615b372f269':
Remove streaming URI from default logs
af783aa91f7a279153fb8bab8d0d6b9f737996e9 03-Mar-2014 Glenn Kasten <gkasten@android.com> mediaserver and associated services are 32-bit only

also 32-bit only command-line apps

Change-Id: I9ac557a8d02bbf6986a9b5c3cdce23d400b306a3
ndroid.mk
hromium_http/Android.mk
odecs/aacenc/Android.mk
odecs/avc/enc/Android.mk
f4431278a9613f55ecd944ab2e3eb615b372f269 12-Mar-2014 Marco Nelissen <marcone@google.com> am 19afb386: Merge "Remove streaming URI from default logs"

* commit '19afb3869eb6a3e3733dc1f7420e1d4c3c03d376':
Remove streaming URI from default logs
cf49a51ff59c3cd228d178d23252ac0d39d5a893 15-Feb-2014 Chong Zhang <chz@google.com> fix codec buffer leak in error handling when timestamp goes backward

don't touch codec buffer if we decided to drop a frame with bad pts

Bug: 11971963
Change-Id: I9b4c56210f64258f1be257b14184381a1133e0d6
(cherry picked from commit b63d2433350d56bda9f3477549086c90bb6d535e)
mx/GraphicBufferSource.cpp
c69bc40a347c411751cb082b3eb4a82d976a68ec 11-Mar-2014 Chong Zhang <chz@google.com> Merge "Cap pts gap between adjacent frames to specified value" into klp-dev
e257e5ebefdd50f808ee3b4d1596db261c9b62dd 14-Feb-2014 Lajos Molnar <lajos@google.com> mediaplayer: keep more buffers with the BufferQueue

Change OMX buffer allocation policy to allocate
nBufferCountMin + what is required for the BQ.

For the BQ, try to allocate 2 additional buffers than
the minimum undequeued count.

Also account for the fact that BQ may return one less
than the actual minimum undequeued count.

In most cases the resulting number of buffers ends up
being the same as with the previous policy, but we
keep more buffers with the BQ.

Change-Id: I826db8bf7dd333b620299dba60bf1b81b228275d
Bug: 12080418
Codec.cpp
MXCodec.cpp
7d3044d64294cca6fadd184648a57185e92cf5c6 11-Mar-2014 Robert Shih <robertshih@google.com> LiveSession: fix incorrect stream key (subtitle"s")

Bug: 13402087
Change-Id: Ic46e3069c6e41f90ead47cae84cbe0123d11002a
ttplive/LiveSession.cpp
9f434cfd021f60e26baf589dc34bf3839b832d4d 11-Mar-2014 Robert Shih <robertshih@google.com> M3UParser: trim spaces when parsing comma separated codecs.

Bug: 13402087
Change-Id: Idc92716bfefd6d1b0cb371d0d97d990d53288090
ttplive/M3UParser.cpp
ceeabe15f4e7bc73efdfcafed917202de9d515cb 04-Mar-2014 Robert Shih <robertshih@google.com> httplive: clear access units before returning from seekTo.

Bug: 12060952
Change-Id: I6a69a718c082501003ee9b78a948a2f8bbfbb14e
ttplive/LiveSession.cpp
ttplive/LiveSession.h
ttplive/PlaylistFetcher.cpp
ttplive/PlaylistFetcher.h
8bd4d16aa5636e98522c07ae31236420788aa749 11-Jan-2014 Chong Zhang <chz@google.com> Cap pts gap between adjacent frames to specified value

- In the scenario of cast mirroring, encoding could be suspended
for prolonged periods. Limiting the pts gap to workaround the
problem where encoder's rate control logic produces huge frames
after a long period of suspension.

- Repeat last frame a couple more times to get better quality
on static scenes.

- Fix the timestamp on repeat frames (it was not set)

Bug: 11971963
Change-Id: I1d68ab3d269874bf3921aa429a985c5f63e428c7
(cherry picked from commit 94ee4b708acfa941581160b267afb79192b1d816)
Codec.cpp
mx/GraphicBufferSource.cpp
mx/GraphicBufferSource.h
mx/OMXNodeInstance.cpp
1c608ab33acab82d4a87f1abedcc99a623d1b53a 18-Jan-2014 Chong Zhang <chz@google.com> save mGraphicBuffer pointer even when we're suspended

Bug: 12609966
Change-Id: Ifd41fd973876da69039113fcaeacdccf39472b37
(cherry picked from commit 49270665e7a20cd120724fc388da8b166ff0b4f1)
mx/GraphicBufferSource.cpp
3a0fb34ed9fcb665e71cc055abde520af393c493 11-Mar-2014 Jesse Hall <jessehall@google.com> Merge "Add empty onSidebandChanged callbacks to BufferQueue::ConsumerListeners"
eff483b9d1b1091a307b3e7d1d786e1314ce88bf 11-Mar-2014 Narayan Kamath <narayan@google.com> am 2ad7af29: Merge "Check for ARCH_ARM_HAVE_NEON flag only for ARM arch"

* commit '2ad7af29bb667d939f27417011567847c4b62f94':
Check for ARCH_ARM_HAVE_NEON flag only for ARM arch
bc9e1aa4fe8815c0b213ede636f0d0ea4ad14afc 11-Mar-2014 Narayan Kamath <narayan@google.com> am 096d72a3: Merge "AArch64: Correction for LP64"

* commit '096d72a32824a0a8c86a716ba44d589183b2b0b3':
AArch64: Correction for LP64
e4f25c280a8f1655c31a745978e0fcbc61f91dee 11-Mar-2014 Robert Shih <robertshih@google.com> LiveSession: fix incorrect stream key (subtitle"s")

Bug: 13402087
Change-Id: Ic46e3069c6e41f90ead47cae84cbe0123d11002a
ttplive/LiveSession.cpp
1ac1638077277de52d1dd4c54db71e67753f1960 11-Mar-2014 Robert Shih <robertshih@google.com> M3UParser: trim spaces when parsing comma separated codecs.

Bug: 13402087
Change-Id: Idc92716bfefd6d1b0cb371d0d97d990d53288090
ttplive/M3UParser.cpp
4860cb0e3ff6d400c788d29fa452218b91a62677 10-Mar-2014 Robert Shih <robertshih@google.com> Merge "MPEG4Writer: replace timestamp asserts in threadEntry w err return."
a5ae9aa74b1217eb838c2ba092ba2429dcaf10e8 10-Mar-2014 Robert Shih <robertshih@google.com> Merge "Stagefright: added WebM muxer."
e0381245dff04aa823a59aa8b85869eddab0f39f 25-Feb-2014 Lajos Molnar <lajos@google.com> MediaCodec: add getInputFormat() method

Additional input-port format item:

int32: "adaptive-playback"
video decoders only
whether codec is configured for adaptive playback. In this case, if
codec has max-width/height limits, those limits are also exposed
(int32: "max-width", "max-height")

Also, getInput/OutputFormat() is now callable in CONFIGURED and
STARTING states, although output format may be missing CSD fields
until INFO_OUTPUT_FORMAT_CHANGED message.

Includes missing OMX support for MP3 software decoder.

Bug: 11785204
Change-Id: I90c7e34ba81c7b81c43641599f3f496e838958c6
Codec.cpp
ediaCodec.cpp
odecs/mp3dec/SoftMP3.cpp
a8b8488f703bb6bda039d7d98f87e4f9d845664d 06-Sep-2012 David Williams <david.williams@sonymobile.com> Remove streaming URI from default logs

Streaming URI should not be visible in default logcat logs

Change-Id: I104cc56b5335f8c5621013e4c5be8028f0379833
ttplive/LiveSession.cpp
ttplive/M3UParser.cpp
tsp/ARTSPConnection.cpp
tsp/MyHandler.h
tsp/SDPLoader.cpp
1aeb490d95a32be37a8691827ddc44c99575c411 08-Mar-2014 Marco Nelissen <marcone@google.com> am 5874615f: Allow for larger codec private data

* commit '5874615f26a6ba9cda8ba359e5035b21f6e3818b':
Allow for larger codec private data
07c34a59fee02ab0732e84a2e2ff3b928de50ebc 08-Mar-2014 Robert Shih <robertshih@google.com> Merge "httplive: clear access units before returning from seekTo."
5ce50c1931e1e3d8f113394bbe2c9f99354f4c5f 04-Mar-2014 Robert Shih <robertshih@google.com> httplive: clear access units before returning from seekTo.

Change-Id: I6a69a718c082501003ee9b78a948a2f8bbfbb14e
ttplive/LiveSession.cpp
ttplive/LiveSession.h
ttplive/PlaylistFetcher.cpp
ttplive/PlaylistFetcher.h
8dcc81a2fdb35905347cf7ef46d198afa7ae79cd 04-Mar-2014 Jesse Hall <jessehall@google.com> Add empty onSidebandChanged callbacks to BufferQueue::ConsumerListeners

Change-Id: I94384aefd47b3a581cbdc3905ba9fdbc88d3d06c
urfaceMediaSource.cpp
mx/GraphicBufferSource.cpp
mx/GraphicBufferSource.h
ed043625654454462be451a63f5fd69adce67f98 07-Mar-2014 Marco Nelissen <marcone@google.com> am 4293011d: am 5874615f: Allow for larger codec private data

* commit '4293011df9caa1c5dce0f02d7a6d35e702bdfef4':
Allow for larger codec private data
4293011df9caa1c5dce0f02d7a6d35e702bdfef4 07-Mar-2014 Marco Nelissen <marcone@google.com> am 5874615f: Allow for larger codec private data

* commit '5874615f26a6ba9cda8ba359e5035b21f6e3818b':
Allow for larger codec private data
f1f5475ffb1898f415a54e362fee620907b93d34 07-Mar-2014 Narayan Kamath <narayan@google.com> am 9219bfc4: am 2ad7af29: Merge "Check for ARCH_ARM_HAVE_NEON flag only for ARM arch"

* commit '9219bfc48ccfab892913e37eaa85921f7e9b2d51':
Check for ARCH_ARM_HAVE_NEON flag only for ARM arch
5874615f26a6ba9cda8ba359e5035b21f6e3818b 03-Feb-2014 Marco Nelissen <marcone@google.com> Allow for larger codec private data

This change adds support for multibyte sizes in the ESDS. Previously the
Matroska extractor only supported single byte sizes, so codec private data
had to be less than 108 bytes, and would crash if it was bigger.
b/12584090

Change-Id: I9edfc2f687187d1e98bcfd2fe56576312435df3e
atroska/MatroskaExtractor.cpp
3eee65fa79e382b065ff5299bdc81f3a5b85be9a 07-Mar-2014 Lajos Molnar <lajos@google.com> am 49ea1337: Merge changes I787e1c05,I72d3a5e1,I0a5cc65f,I75fc2a25,I2c2be08d, ... into klp-dev

* commit '49ea13379fb15ddb73183ebafa3a377342ef932f':
LiveSession: Use the actual, possibly redirected url as base in the M3U
M3UParser: Skip query strings when looking for the last slash in a URL
ChromiumHTTPDataSource: Keep track of the redirected URL
Initial HLS seamless switch implementation.
NuPlayer side support for seamless format switch.
LiveSession refactor
PlaylistFetcher: Add support for block-by-block decryption.
LiveSession: Add support for block-by-block fetchFile.
c202aed28f3a24a7fbc74f7a65d806ef8deefb0b 07-Mar-2014 Lajos Molnar <lajos@google.com> am e0c3058a: Merge "AnotherPacketSource support to get latest buffered MetaData." into klp-dev

* commit 'e0c3058a1d0953f4c85bfc964926cf5babb7dbac':
AnotherPacketSource support to get latest buffered MetaData.
8e4b38470a367aec409e905aed392397e6b85bf4 07-Mar-2014 Lajos Molnar <lajos@google.com> am 2613347d: Merge "Added support to query ACodec whether adaptive playback is enabled." into klp-dev

* commit '2613347d74c3f35bc6fda5df1c29c1119c22d432':
Added support to query ACodec whether adaptive playback is enabled.
78e630e12b0da74d5e081cd81bc6ff30334b328a 07-Mar-2014 Lajos Molnar <lajos@google.com> am 909498b7: Merge "stagefright: use CODECS field in EXT-X_STREAM-INF as fallback" into klp-dev

* commit '909498b72d740e3151561fd4435ad0a329ec9c6e':
stagefright: use CODECS field in EXT-X_STREAM-INF as fallback
385691a374e0f202ee66c26ed0af94afccd745de 07-Mar-2014 Lajos Molnar <lajos@google.com> am 2338782d: Merge "Fixed misplaced bracket for switch-case block." into klp-dev

* commit '2338782d18d9bcc8197c63dbf205332a2a737440':
Fixed misplaced bracket for switch-case block.
b6ade3368127aa63a8f343a936f47aa6965b8361 07-Mar-2014 Lajos Molnar <lajos@google.com> am ad21a81a: Merge "stagefright: Fix issue with tracking media format in packet source" into klp-dev

* commit 'ad21a81af3e7d6b58002c9dce9c3278b6323e4a9':
stagefright: Fix issue with tracking media format in packet source
6e785b82aefa8926b8b8dbca8588a0bf5f53a317 07-Mar-2014 Lajos Molnar <lajos@google.com> am b74b2098: Merge "stagefright: Fix bugs in playlist fetcher logic" into klp-dev

* commit 'b74b209862cbcbab6053cf4a43bbc16940aaafd2':
stagefright: Fix bugs in playlist fetcher logic
5bc83fc352e5682ecafe61d77062c26ac8db4229 07-Mar-2014 Marco Nelissen <marcone@google.com> Merge "Fix SIGABRT when playing mp4 file" into klp-dev
9219bfc48ccfab892913e37eaa85921f7e9b2d51 07-Mar-2014 Narayan Kamath <narayan@google.com> am 2ad7af29: Merge "Check for ARCH_ARM_HAVE_NEON flag only for ARM arch"

* commit '2ad7af29bb667d939f27417011567847c4b62f94':
Check for ARCH_ARM_HAVE_NEON flag only for ARM arch
31a98ad0da98227f3c76469e7a8a267c9539b6e8 07-Mar-2014 Narayan Kamath <narayan@google.com> resolved conflicts for merge of 8d1caa02 to klp-modular-dev-plus-aosp

Change-Id: Ibcb60d0d3bbc8beb54440951ffe8a14b946ccc85
621d382baa8e300036f58e7acd43bda9ce87f854 07-Mar-2014 Lajos Molnar <lajos@google.com> am 04352de2: am e0c3058a: Merge "AnotherPacketSource support to get latest buffered MetaData." into klp-dev

* commit '04352de2e32d6dc0901436951f69357f5cd8655c':
AnotherPacketSource support to get latest buffered MetaData.
8d1caa026caef3673799481c5fba454306f831e9 07-Mar-2014 Lajos Molnar <lajos@google.com> am 49ea1337: Merge changes I787e1c05,I72d3a5e1,I0a5cc65f,I75fc2a25,I2c2be08d, ... into klp-dev

* commit '49ea13379fb15ddb73183ebafa3a377342ef932f':
LiveSession: Use the actual, possibly redirected url as base in the M3U
M3UParser: Skip query strings when looking for the last slash in a URL
ChromiumHTTPDataSource: Keep track of the redirected URL
Initial HLS seamless switch implementation.
NuPlayer side support for seamless format switch.
LiveSession refactor
PlaylistFetcher: Add support for block-by-block decryption.
LiveSession: Add support for block-by-block fetchFile.
04352de2e32d6dc0901436951f69357f5cd8655c 07-Mar-2014 Lajos Molnar <lajos@google.com> am e0c3058a: Merge "AnotherPacketSource support to get latest buffered MetaData." into klp-dev

* commit 'e0c3058a1d0953f4c85bfc964926cf5babb7dbac':
AnotherPacketSource support to get latest buffered MetaData.
7e65e101bd48461e274fd2e927b80fbbd8b71744 07-Mar-2014 Lajos Molnar <lajos@google.com> am 72d09f62: am 2613347d: Merge "Added support to query ACodec whether adaptive playback is enabled." into klp-dev

* commit '72d09f6280cd701e48922a86df0d2e5f4e61cd8e':
Added support to query ACodec whether adaptive playback is enabled.
d1d45fe7779e10e381420c63de79001c8593423b 07-Mar-2014 Lajos Molnar <lajos@google.com> am d7c4da3c: am 909498b7: Merge "stagefright: use CODECS field in EXT-X_STREAM-INF as fallback" into klp-dev

* commit 'd7c4da3c1c33b5219d7d87ba698cd7d9c8750c41':
stagefright: use CODECS field in EXT-X_STREAM-INF as fallback
414c2371ab38a9826dca2506c9cefd703af05c2b 07-Mar-2014 Lajos Molnar <lajos@google.com> am 4dbd814d: am 2338782d: Merge "Fixed misplaced bracket for switch-case block." into klp-dev

* commit '4dbd814de3a3bc95ca3fe39be2400418e7a05602':
Fixed misplaced bracket for switch-case block.
6fefae269ca96af5ebeef0aa6e67932ff5f7a1a0 07-Mar-2014 Lajos Molnar <lajos@google.com> am e389b1bd: am ad21a81a: Merge "stagefright: Fix issue with tracking media format in packet source" into klp-dev

* commit 'e389b1bdd13e768baa2532f537236b2c5e6243fa':
stagefright: Fix issue with tracking media format in packet source
675b80dac069ada91ceb650f202b5f51d2cae34a 07-Mar-2014 Lajos Molnar <lajos@google.com> am 3bd0270c: am b74b2098: Merge "stagefright: Fix bugs in playlist fetcher logic" into klp-dev

* commit '3bd0270c2106241674b1d8cb4951e5c5a7bc98d2':
stagefright: Fix bugs in playlist fetcher logic
72d09f6280cd701e48922a86df0d2e5f4e61cd8e 07-Mar-2014 Lajos Molnar <lajos@google.com> am 2613347d: Merge "Added support to query ACodec whether adaptive playback is enabled." into klp-dev

* commit '2613347d74c3f35bc6fda5df1c29c1119c22d432':
Added support to query ACodec whether adaptive playback is enabled.
d7c4da3c1c33b5219d7d87ba698cd7d9c8750c41 07-Mar-2014 Lajos Molnar <lajos@google.com> am 909498b7: Merge "stagefright: use CODECS field in EXT-X_STREAM-INF as fallback" into klp-dev

* commit '909498b72d740e3151561fd4435ad0a329ec9c6e':
stagefright: use CODECS field in EXT-X_STREAM-INF as fallback
4dbd814de3a3bc95ca3fe39be2400418e7a05602 07-Mar-2014 Lajos Molnar <lajos@google.com> am 2338782d: Merge "Fixed misplaced bracket for switch-case block." into klp-dev

* commit '2338782d18d9bcc8197c63dbf205332a2a737440':
Fixed misplaced bracket for switch-case block.
e389b1bdd13e768baa2532f537236b2c5e6243fa 07-Mar-2014 Lajos Molnar <lajos@google.com> am ad21a81a: Merge "stagefright: Fix issue with tracking media format in packet source" into klp-dev

* commit 'ad21a81af3e7d6b58002c9dce9c3278b6323e4a9':
stagefright: Fix issue with tracking media format in packet source
3bd0270c2106241674b1d8cb4951e5c5a7bc98d2 07-Mar-2014 Lajos Molnar <lajos@google.com> am b74b2098: Merge "stagefright: Fix bugs in playlist fetcher logic" into klp-dev

* commit 'b74b209862cbcbab6053cf4a43bbc16940aaafd2':
stagefright: Fix bugs in playlist fetcher logic
49ea13379fb15ddb73183ebafa3a377342ef932f 07-Mar-2014 Lajos Molnar <lajos@google.com> Merge changes I787e1c05,I72d3a5e1,I0a5cc65f,I75fc2a25,I2c2be08d, ... into klp-dev

* changes:
LiveSession: Use the actual, possibly redirected url as base in the M3U
M3UParser: Skip query strings when looking for the last slash in a URL
ChromiumHTTPDataSource: Keep track of the redirected URL
Initial HLS seamless switch implementation.
NuPlayer side support for seamless format switch.
LiveSession refactor
PlaylistFetcher: Add support for block-by-block decryption.
LiveSession: Add support for block-by-block fetchFile.
e0c3058a1d0953f4c85bfc964926cf5babb7dbac 07-Mar-2014 Lajos Molnar <lajos@google.com> Merge "AnotherPacketSource support to get latest buffered MetaData." into klp-dev
2613347d74c3f35bc6fda5df1c29c1119c22d432 07-Mar-2014 Lajos Molnar <lajos@google.com> Merge "Added support to query ACodec whether adaptive playback is enabled." into klp-dev
909498b72d740e3151561fd4435ad0a329ec9c6e 07-Mar-2014 Lajos Molnar <lajos@google.com> Merge "stagefright: use CODECS field in EXT-X_STREAM-INF as fallback" into klp-dev
2338782d18d9bcc8197c63dbf205332a2a737440 07-Mar-2014 Lajos Molnar <lajos@google.com> Merge "Fixed misplaced bracket for switch-case block." into klp-dev
ad21a81af3e7d6b58002c9dce9c3278b6323e4a9 07-Mar-2014 Lajos Molnar <lajos@google.com> Merge "stagefright: Fix issue with tracking media format in packet source" into klp-dev
b74b209862cbcbab6053cf4a43bbc16940aaafd2 07-Mar-2014 Lajos Molnar <lajos@google.com> Merge "stagefright: Fix bugs in playlist fetcher logic" into klp-dev
328ab3c21c185a7541e7ee087a61e18f6888af1c 07-Mar-2014 Lajos Molnar <lajos@google.com> am 7eacea11: Merge "avcenc: Only do startcode escaping if the next byte requires it"

* commit '7eacea1156a3896ee7813cd9a06c535e63c95f6a':
avcenc: Only do startcode escaping if the next byte requires it
e857b65c1d3aa055281cb48f59c9b5eb4a062dd0 07-Mar-2014 Narayan Kamath <narayan@google.com> am 3c9130a8: Merge "Make frameworks/av 64-bit compatible"

* commit '3c9130a8a12ce962dc8d22e04243b135b9e98b01':
Make frameworks/av 64-bit compatible
d224ee56ec8c2bc7963f43ca9d80cf31a3ba4c57 07-Mar-2014 Lajos Molnar <lajos@google.com> am 7142d10a: Merge "avcenc: Update video port parameters in the base class"

* commit '7142d10a7a3941b2deb18869a7f7b79462e0aa52':
avcenc: Update video port parameters in the base class
dd955ce438749bd138cdd3feae78545bc94881ee 07-Mar-2014 Lajos Molnar <lajos@google.com> am 61bdaaa1: Merge "ChromiumHTTPDataSource: Keep track of the redirected URL"

* commit '61bdaaa18a1d52666827e31bb7980a5784443835':
ChromiumHTTPDataSource: Keep track of the redirected URL
a753e4ead38e1cc14484ad5e3bf523bbaf2298b0 07-Mar-2014 Lajos Molnar <lajos@google.com> am 88e99f9a: Merge "SoftVPXEncoder: Set the frame size on the output port as well"

* commit '88e99f9a5e098ee50019ce85f2b1273b48883f37':
SoftVPXEncoder: Set the frame size on the output port as well
f7e6f7c096167f99f643371eb6a7cb7455c4f0fc 07-Mar-2014 Marco Nelissen <marcone@google.com> am 44f2b8c2: Merge "M3UParser: Fix typo in 8883a38a308"

* commit '44f2b8c2ff4baf64baa0510cd37ac178ef91b7bc':
M3UParser: Fix typo in 8883a38a308
908d31d763e46d56b1f437e90213ed14cd2b64e5 07-Mar-2014 Marco Nelissen <marcone@google.com> am 8519b8a1: Merge "M3UParser: Skip query strings when looking for the last slash in a URL"

* commit '8519b8a1298d80949edadce9c8f0963ef62cc3ff':
M3UParser: Skip query strings when looking for the last slash in a URL
28a51d04c0a25b424389b205c8de2bec66b76024 07-Mar-2014 Colin Cross <ccross@android.com> am e2307ccb: Merge "frameworks/av: fix errors inside ALOGV"

* commit 'e2307ccbab9c32a7806f15c2572cfe6ec428f2f5':
frameworks/av: fix errors inside ALOGV
a1076eb135b74a32e9bdc1aed17aee4374eb41af 22-Nov-2013 Martin Storsjo <martin@martin.st> LiveSession: Use the actual, possibly redirected url as base in the M3U

This fixes playback of HLS streams where the M3U playlists use
relative paths and the main playlist is opened via a redirect.

Bug: 13174301
Change-Id: I787e1c050daddc566be4c8e3f84803d3f91eec46
ttplive/LiveSession.cpp
ttplive/LiveSession.h
75d03185ac7be95c700f3f375080989e5de03ef6 22-Nov-2013 Martin Storsjo <martin@martin.st> M3UParser: Skip query strings when looking for the last slash in a URL

Bug: 13174301
Change-Id: I72d3a5e11fef9bbd75b291bc490c9cab1dce58da
ttplive/M3UParser.cpp
be1195a6d5e6dd4299da344cf9905dd6a12dc4ef 25-Nov-2013 Marco Nelissen <marcone@google.com> Fix SIGABRT when playing mp4 file

If the track duration was shorter than the segment duration, the calculated
encoder padding would be negative, resulting in a crash.
b/11823061
https://code.google.com/p/android/issues/detail?id=62610

Change-Id: I3989ad88caea38d212b61355c15aec13382c6116
PEG4Extractor.cpp
05a4b64ea4d01e29c427d8b5f5107b8edc2dbb21 07-Mar-2014 Lajos Molnar <lajos@google.com> am 5db1e3a6: Merge "correct one logic error in decide whether should render or not"

* commit '5db1e3a6f30c252ed61461dd8c58786e905e5f5a':
correct one logic error in decide whether should render or not
ed4d8b28b8ee5a3e4ebc8f73bf4dc86c75a74258 07-Mar-2014 Eric Laurent <elaurent@google.com> Merge "stagefright: do not offload LD-AAC decoding" into klp-dev
e2492dc46f5476e3abc617ee21d74f44198591dd 22-Nov-2013 Martin Storsjo <martin@martin.st> ChromiumHTTPDataSource: Keep track of the redirected URL

This makes the code actually match an existing comment in
DrmInitialization, which claimed that mURI was the redirected
URL and not the original one.

Bug: 13174301
Change-Id: I0a5cc65f520f1482ff91320ae78af84a8a681ee3
hromium_http/ChromiumHTTPDataSource.cpp
hromium_http/support.cpp
nclude/ChromiumHTTPDataSource.h
777ee5ed736c8f6c3f7d196ea022f7432bfd23e1 20-Feb-2014 Robert Shih <robertshih@google.com> Initial HLS seamless switch implementation.

Bug: 11854054
Change-Id: I75fc2a258111295039ac13cc37e407df25891dd2
ttplive/LiveSession.cpp
ttplive/LiveSession.h
ttplive/PlaylistFetcher.cpp
ttplive/PlaylistFetcher.h
6c8495c8f1ccc35db972ee7ac0dbb8baf5843548 14-Feb-2014 Robert Shih <robertshih@google.com> LiveSession refactor

Bug: 11854054
Change-Id: Ia91dce109835e042f72934376d4838b4cc72cb10
ttplive/LiveSession.cpp
ttplive/LiveSession.h
ttplive/M3UParser.cpp
ttplive/M3UParser.h
2cd94583868b775a548233a4f7cd1d988fc6344f 06-Feb-2014 Robert Shih <robertshih@google.com> PlaylistFetcher: Add support for block-by-block decryption.

Bug: 11854054
Change-Id: Ifd3f3369275889e716b360087b5b60d01635b578
ttplive/PlaylistFetcher.cpp
ttplive/PlaylistFetcher.h
822a489e595336be447f47f5c2a051e8fdd1cdff 06-Feb-2014 Robert Shih <robertshih@google.com> LiveSession: Add support for block-by-block fetchFile.

Bug: 11854054
Change-Id: I4025ba7fab8fab2e0c720f73894e908fd98a43d8
ttplive/LiveSession.cpp
ttplive/LiveSession.h
7e50e1c0c10cba1e27cafe581273adcadf93877d 23-Jan-2014 Robert Shih <robertshih@google.com> AnotherPacketSource support to get latest buffered MetaData.

Bug: 11854054
Change-Id: Ib3b6e0984036082bf3c4eb7901a2b29be52fdd29
peg2ts/AnotherPacketSource.cpp
peg2ts/AnotherPacketSource.h
933a4d3339ebbcd34a7f97b9e7350ec74b5ec29c 24-Jan-2014 Robert Shih <robertshih@google.com> Added support to query ACodec whether adaptive playback is enabled.

Bug: 11854054
Change-Id: I6b0308aa8550c643706959277e46dad586c37297
Codec.cpp
f7e34cfcb9d649989c8e391f23dde782d4931849 24-Jan-2014 Robert Shih <robertshih@google.com> stagefright: use CODECS field in EXT-X_STREAM-INF as fallback

Use the CODECS field in EXT-X-STREAM-INF as a viable fallback for identifying
available streams in a variant playlist.

Bug: 11854054
Change-Id: I5011809dc7c56220b023eb1a16f2d6a392ddd6f1
ttplive/M3UParser.cpp
ttplive/M3UParser.h
b2be2f2e41d5502d79636b21cbad23f4f983bbd7 23-Jan-2014 Robert Shih <robertshih@google.com> Fixed misplaced bracket for switch-case block.

Bug: 11854054
Change-Id: I66b410e1e19601ad65d8357bda4c0c58e2dc15dc
Codec.cpp
e62d20268de87f63083896b5eef083d541078322 17-Dec-2013 Lajos Molnar <lajos@google.com> stagefright: Fix issue with tracking media format in packet source

Media format in AnotherPacketSource is now tracked across discontinuities.
This fixes a bug where format was set on queueAccessUnit and cleared on
dequeueAccessUnit, thereby allowing it to remain cleared.

Change-Id: I20975a630443f4a223a2b4344e8244f34b9560b9
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug: 12060952
ttplive/PlaylistFetcher.cpp
peg2ts/AnotherPacketSource.cpp
6708a45ba1b5eacf583d5e80b2075b68940fe0ab 16-Dec-2013 Lajos Molnar <lajos@google.com> stagefright: Fix bugs in playlist fetcher logic

1. Improve start time: start playback as soon as the target duration
or 10s was buffered.
2. Select playlist monitor time based on target duration to avoid
continuously missing the boat.
3. If "we miss the boat" we still must request a safe sequence
number (last - 3)

Change-Id: Ie99c360ac67b152ad9af19e9c6e520016f67e4e3
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug: 12060952
ttplive/PlaylistFetcher.cpp
ttplive/PlaylistFetcher.h
343947abc8b7c126f966fd32a0b18bff6c2cecd1 08-Feb-2014 Robert Shih <robertshih@google.com> Stagefright: added WebM muxer.

Change-Id: I50bbf9c6f089b205d5ecef1371bfdd2028b3b358
ndroid.mk
ediaMuxer.cpp
ebm/Android.mk
ebm/EbmlUtil.cpp
ebm/EbmlUtil.h
ebm/LinkedBlockingQueue.h
ebm/WebmConstants.h
ebm/WebmElement.cpp
ebm/WebmElement.h
ebm/WebmFrame.cpp
ebm/WebmFrame.h
ebm/WebmFrameThread.cpp
ebm/WebmFrameThread.h
ebm/WebmWriter.cpp
ebm/WebmWriter.h
eff98ddea36264d028c0811c96b112a52977b51c 06-Mar-2014 Chong Zhang <chz@google.com> am 2b6191fd: am 3b7ddf83: set AAC MPEG version to MPEG-2

* commit '2b6191fddb1f4a750ad03792d09d4b8efdeeb35a':
set AAC MPEG version to MPEG-2
880413f7923ec77467243e15dc34d4af4f8064f9 06-Mar-2014 Eric Laurent <elaurent@google.com> Merge "stagefright: fix offloading HE-AAC sampling rate." into klp-dev
f590f948e6c0fe3c54008dd7802fd513f127792d 06-Dec-2013 Eric Laurent <elaurent@google.com> stagefright: do not offload LD-AAC decoding

For now, do not offload LD and ELD AAC decoding because there
is no way to know if it is supported by the audio DSP implementation.
The longer term fix will be to have mapMimeToAudioFormat() use the
audio object type in track metadata to refine the AAC format and the
audio HAL list supported AAC profiles.

Bug: 11697128.

Change-Id: Iaa88ecf3f4ae42ad48c1b42a9b007dd80eb88147
PEG4Extractor.cpp
tils.cpp
2b6191fddb1f4a750ad03792d09d4b8efdeeb35a 06-Mar-2014 Chong Zhang <chz@google.com> am 3b7ddf83: set AAC MPEG version to MPEG-2

* commit '3b7ddf83db2d11c08116a6476c0f11e71bd72ba4':
set AAC MPEG version to MPEG-2
9a67a7f73c73dd78c9045023afa6c6997fd117d0 06-Mar-2014 Chong Zhang <chz@google.com> am 3b7ddf83: set AAC MPEG version to MPEG-2

* commit '3b7ddf83db2d11c08116a6476c0f11e71bd72ba4':
set AAC MPEG version to MPEG-2
3b7ddf83db2d11c08116a6476c0f11e71bd72ba4 07-Feb-2014 Chong Zhang <chz@google.com> set AAC MPEG version to MPEG-2

wifi display play spec only allows MPEG-2 AAC.

Bug: 12747927
Change-Id: Ic96d27ce57f5c8e7da55e43b38f629b5c7333817
ifi-display/source/TSPacketizer.cpp
3c836e7882e88de42e0e600627de433b61e78621 06-Dec-2013 Eric Laurent <elaurent@google.com> stagefright: fix offloading HE-AAC sampling rate.

Fix HE AAC SBR sampling rate reading for explicit
signaling.

Bug: 11697128.
Change-Id: Ifec0ab9d48d9293f6774ec1efd9da9445994cb7c
PEG4Extractor.cpp
f2e55f1f42180f61f2bac90cc60f23f3509ce95d 06-Mar-2014 Andy McFadden <fadden@android.com> FramebufferNativeWindow.h is obsolete

Change-Id: I7d2b06bc711694deb481ae50596080b6bef23f11
ests/SurfaceMediaSource_test.cpp
145b727b4cce8b1b8d161612f30d12bbdfc8d134 06-Dec-2013 Haynes Mathew George <hgeorge@codeaurora.org> libstagefright: Delay release of wakelock in TimedEventQueue

Delay release of wakelock in the TimedEventQueue to
after an event has been processed.
This ensures AP shutdown does not happen while an event
is ready but hasn't been processed yet.

Bug: 11976087.
Change-Id: I9bce83b9ff0f2b4d174a53c95e5b0f135b5ccc70
imedEventQueue.cpp
nclude/TimedEventQueue.h
d0115d8c4db2f337030dea706bc0a434c4a03ed6 27-Jul-2013 Eric Laurent <elaurent@google.com> update offloaded audio track sampling rate

AudioPlayer must read the sampling rate from offloaded audio sinks
whenever a new time position is computed as the decoder can update
the sampling rate on the fly.

Bug: 12823955.

Change-Id: I997e5248cfd4017aeceb4e11689324ded2a5bc88
udioPlayer.cpp
7a0662afeba50b78f43ce24539230cace30c3cfd 05-Mar-2014 Robert Shih <robertshih@google.com> Merge "PlaylistFetcher: fix infinite loop when parsing ADTS."
bdc0609f8133517b8e051938ad66bac750be90b4 07-Feb-2014 Robert Shih <robertshih@google.com> PlaylistFetcher: fix infinite loop when parsing ADTS.

First check for embedded ID3 tag, then bail out if invalid.

Bug: 12934795
Change-Id: I74acebed4bfb2c6ca44dfe936166fdba8510233f
ttplive/PlaylistFetcher.cpp
17d653523898c01816457743ab376a7b0427611f 04-Mar-2014 Lajos Molnar <lajos@google.com> stagefright: SoftOpus: add explicit include files

Also resolved new warnings

Change-Id: I41423b20f80400567bf192c4b4e95c6a29d84782
odecs/opus/dec/SoftOpus.cpp
b4350af65dd66ed57f1ff79b1b426507f0e73b7b 04-Mar-2014 Lajos Molnar <lajos@google.com> Merge "Opus Matroska support in OpenMax"
bf927f8ec7979f2b64331c2b2f12a6a5dba05bca 29-Jan-2014 Vignesh Venkatasubramanian <vigneshv@google.com> Opus Matroska support in OpenMax

Adding Openmax component for libopus software decoder. This can
decode opus audio files embedded in matroska containers.

Change-Id: I7e0691cfc6d719c4e927b9efbd05a3143be49abc
Note: This CL is part of adding Opus support to Android.
Codec.cpp
ndroid.mk
ediaDefs.cpp
MXCodec.cpp
tils.cpp
odecs/opus/Android.mk
odecs/opus/dec/Android.mk
odecs/opus/dec/SoftOpus.cpp
odecs/opus/dec/SoftOpus.h
atroska/MatroskaExtractor.cpp
atroska/MatroskaExtractor.h
mx/SoftOMXPlugin.cpp
mx/tests/OMXHarness.cpp
db46c2f8ff4b305a217adbbd406a61d10ae71db7 28-Feb-2014 Ashok Bhat <ashok.bhat@arm.com> Check for ARCH_ARM_HAVE_NEON flag only for ARM arch

This patch prevents ARM neon code from being included
for Arm64, where ARM is the 2nd architecture.

Change-Id: I5a283991034f2650a0e7d4227aef967be276fc9c
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
odecs/common/Config.mk
odecs/on2/h264dec/Android.mk
52d623d44989a8f6b463d7d03c180df7011bc662 01-Mar-2014 Robert Shih <robertshih@google.com> Merge "Initial HLS seamless switch implementation."
1543d3c735a5ba4ddfcf8ab644575df13c7e30a9 20-Feb-2014 Robert Shih <robertshih@google.com> Initial HLS seamless switch implementation.

Bug: 11854054
Change-Id: I75fc2a258111295039ac13cc37e407df25891dd2
ttplive/LiveSession.cpp
ttplive/LiveSession.h
ttplive/PlaylistFetcher.cpp
ttplive/PlaylistFetcher.h
1b312a6f32d3144f21c8dd6449729c8c2bec05c5 28-Feb-2014 Marco Nelissen <marcone@google.com> Merge "Fix race condition in AwesomePlayer"
4d462fbd20c7e4b214f1d9b9396a623f4e4b6f38 28-Feb-2014 Marco Nelissen <marcone@google.com> Fix race condition in AwesomePlayer

This fixes a race condition that could cause two threads to attempt to
connect to a server at the same time, resulting in multiple requests
and/or aborted connections. In some cases, it could cause other operations
on MediaPlayer to block until network access was complete.

b/13187722

Change-Id: Ibf78acff15dbfbf6c443a4c60623e8eac967d955
wesomePlayer.cpp
bce50bfc3846ab008bafa75c5d3f29fd7b5395f7 28-Feb-2014 Glenn Kasten <gkasten@google.com> Fix type of AudioTrack/AudioRecord parameter frameCount

It's size_t consistently

Change-Id: I29638ef59ac773218025f2403a3508a307b487e0
udioSource.cpp
838b3d8bafa4a781e277870dee4e0390165cff52 28-Feb-2014 Glenn Kasten <gkasten@google.com> Fix type of AudioTrack/AudioRecord parameter notificationFrames

It's uint32_t consistently

Change-Id: If8298c7e9aeea2b951fe47b675adbdf48d104846
udioSource.cpp
3d2e09f0221693de08129edd02adf340a44e7a38 27-Feb-2014 Narayan Kamath <narayan@google.com> am d4c6052d: am 096d72a3: Merge "AArch64: Correction for LP64"

* commit 'd4c6052dd41dd5b942295cea5568783da7670eb4':
AArch64: Correction for LP64
d4c6052dd41dd5b942295cea5568783da7670eb4 27-Feb-2014 Narayan Kamath <narayan@google.com> am 096d72a3: Merge "AArch64: Correction for LP64"

* commit '096d72a32824a0a8c86a716ba44d589183b2b0b3':
AArch64: Correction for LP64
1f797f960412b5a50bf8e92a0c8b460f30e947d7 17-Feb-2014 Marcus Oakland <marcus.oakland@arm.com> AArch64: Correction for LP64

In the Intra16x16PlanePrediction function, a u32 (unsigned 32-bit
integer) was being used for the "i" variable, and being used with a
value of 7 in the loop "for (i = 0, b = 0; i < 8; i++)" to access the
"above[6-i]" location where "above" is defined as "u8 *". Because "i"
was unsigned there was no sign extension on use with the __LP64__
64-bit pointer, so rather than 0xFFFFFFFF being treated as -1, it was
treated as 4,292,967,295 and that resulted in a SIGSEGV at an invalid
address. By changing the type of "i" to an i32 (signed 32-bit integer)
the expected sign extension occurs and the value is treated as -1.

This change fixes android.media.cts.DecoderTest#testCodeBasicH264 on
64-bit platforms

Change-Id: I85df58b0dc1d39f89ab421d04ab5481356520f0c
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
odecs/on2/h264dec/source/h264bsd_intra_prediction.c
68d074fe4538e0f1bd647c3f3aa932ea7dca332a 25-Feb-2014 Marco Nelissen <marcone@google.com> Merge "Advance read pointer before failing"
0517e0b6e4a86f34388631416dd6b3b4fcb91ff8 24-Feb-2014 Marco Nelissen <marcone@google.com> Advance read pointer before failing

to prevent infinite loops when processing a truncated chunk
b/13130358

Change-Id: I24c46788ebc76c242da52a8f059b7577bbaebff4
PEG4Extractor.cpp
dc793ce8c0ead27ab43e40ce09f27fe338323502 24-Feb-2014 Robert Shih <robertshih@google.com> LiveSession refactor: reverted loop indice change.

Change-Id: I465746b206e2253ad44aae0c59317473bc93f73e
ttplive/LiveSession.cpp
11f15ddbca475b5f6a3d7970b22234e04c595b37 14-Dec-2013 Robert Shih <robertshih@google.com> MPEG4Writer: replace timestamp asserts in threadEntry w err return.

Bug: 12117267
Change-Id: I13630221c1a8f2e70711f2488659b977db3be281
PEG4Writer.cpp
20550a3ae42e2797776802149e3be420ecb064b8 24-Feb-2014 Robert Shih <robertshih@google.com> Merge "stagefright: use CODECS field in EXT-X_STREAM-INF as fallback"
587e84cd328d8f236b2d9f26c5426b3ba8ed0d02 24-Feb-2014 Marco Nelissen <marcone@google.com> Merge "Add method to get redirected Uri"
dc6ac201032d0f6ad0c8149ae2f009ec38693025 22-Feb-2014 Chong Zhang <chz@google.com> Merge "support for time lapse/slow motion when using SURFACE source"
c9c7e25a4b1c34439fb365f6cfbef063884566cc 21-Feb-2014 Marco Nelissen <marcone@google.com> Add method to get redirected Uri

Change-Id: Id8aac1077c3de1bb1f58bfcfcca93d685abe9b79
ttp/MediaHTTP.cpp
3a005b3b19b750afe24577ae322aff4602ca2740 21-Feb-2014 Robert Shih <robertshih@google.com> Merge "LiveSession refactor"
97194cdf8d67f362ef8c6dfdf607298c7e102b3b 20-Feb-2014 Marco Nelissen <marcone@google.com> resolved conflicts for merge of aa0390b7 to master

Change-Id: Ide9dfb5df75cac7c363a3c7fdbd8fabdc326a495
8ca002eedc747dd854b61cbe364b52c06869273f 14-Feb-2014 Robert Shih <robertshih@google.com> LiveSession refactor

Change-Id: Ia91dce109835e042f72934376d4838b4cc72cb10
ttplive/LiveSession.cpp
ttplive/LiveSession.h
ttplive/M3UParser.cpp
ttplive/M3UParser.h
aa0390b77cf068eda8e7bdf94348625db0c12144 20-Feb-2014 Marco Nelissen <marcone@google.com> am 4ee5d2b9: Merge "LiveSession: Use the actual, possibly redirected url as base in the M3U"

* commit '4ee5d2b9d0cdaf936bd5fecd670e5f38da63e4ae':
LiveSession: Use the actual, possibly redirected url as base in the M3U
4ee5d2b9d0cdaf936bd5fecd670e5f38da63e4ae 20-Feb-2014 Marco Nelissen <marcone@google.com> Merge "LiveSession: Use the actual, possibly redirected url as base in the M3U"
4cc224aca3f61a3d4cb4573a620dd6b48354b010 19-Feb-2014 Chong Zhang <chz@google.com> Merge "fix codec buffer leak in error handling when timestamp goes backward"
bf65553e56e7c5e1c198f48a0a17964fcfccf5da 19-Feb-2014 Ruben Brunk <rubenbrunk@google.com> Merge "Handle recording failure more gracefully."
3f80319d5bddfaf11a1513777561096fc1447172 19-Feb-2014 Marco Nelissen <marcone@google.com> Expand support for fragmented mp4

Don't require that there are no other boxes between mdat and moof boxes, or
that moof immediately follows moov.
Fix SAP parsing and seeking to exact start of segment.

Change-Id: I668644c5c7866dd2512f3b7f745fba438ae6e627
PEG4Extractor.cpp
ebfd32300605d67e4c45a97f4972d4b6ea268a37 18-Feb-2014 Marco Nelissen <marcone@google.com> Fix crash when seeking fragmented mp4 files

Rewinding a fragmented mp4 file without a segment index (sidx)
after playing it to the end would crash.
b/13028840

Change-Id: I280e74364589f0acefd432a59f85a6594c009a21
PEG4Extractor.cpp
26cee964ab4e0a2bd6ae9ad199ba78ea9634421c 15-Feb-2014 Ruben Brunk <rubenbrunk@google.com> Handle recording failure more gracefully.

Bug: 13027666
Change-Id: Iec8239bfcd293c8f466b3780e69883b97f387949
ameraSource.cpp
1ebd04b5f4ffe774c37054aac305cd9e6c73d2b2 18-Feb-2014 Andreas Huber <andih@google.com> Merge "Skip scaling_list definitions in AVC seq header."
9a73cd3face153cbd04ceff0cfc0efdd4837b94e 15-Feb-2014 Robert Shih <robertshih@google.com> Merge "LiveSession: Add support for block-by-block fetchFile."
9bed7d7e4dde67e2320f453535fc6c31b16c1cbe 15-Feb-2014 Robert Shih <robertshih@google.com> Merge "PlaylistFetcher: Add support for block-by-block decryption."
8d0f9819d19ef34d7b66f86e612b2424d924c6ab 15-Feb-2014 Robert Shih <robertshih@google.com> Merge "AnotherPacketSource support to get latest buffered MetaData."
2c9c8cba8562cc3a27532e4cd348912cc78d8d98 11-Feb-2014 Chong Zhang <chz@google.com> support for time lapse/slow motion when using SURFACE source

Bug: 13032650
Change-Id: Iecbadf9f29c8c49353416fc467fb3acdde279595
Codec.cpp
tils.cpp
mx/GraphicBufferSource.cpp
mx/GraphicBufferSource.h
mx/OMXNodeInstance.cpp
b63d2433350d56bda9f3477549086c90bb6d535e 15-Feb-2014 Chong Zhang <chz@google.com> fix codec buffer leak in error handling when timestamp goes backward

don't touch codec buffer if we decided to drop a frame with bad pts

Bug: 11971963
Change-Id: I9b4c56210f64258f1be257b14184381a1133e0d6
mx/GraphicBufferSource.cpp
6dc91c957cfad4393b205a3c2f8421e549fa7e85 14-Feb-2014 Andreas Huber <andih@google.com> Skip scaling_list definitions in AVC seq header.

Change-Id: Iad013550d9c5aecf3504624eddfc13e680162bf3
related-to-bug: 13030256
vc_utils.cpp
a0c0a9ab441fc3cbb302c7a2e783f6d4c3b63bed 14-Feb-2014 Marco Nelissen <marcone@google.com> Merge "Try not to have sample durations vary too much"
ebe130923fb1a5b8dda4b3ee215593edcd804f0d 06-Feb-2014 Robert Shih <robertshih@google.com> PlaylistFetcher: Add support for block-by-block decryption.

Change-Id: Ifd3f3369275889e716b360087b5b60d01635b578
ttplive/PlaylistFetcher.cpp
ttplive/PlaylistFetcher.h
8dd1c202aea703ed8beacaaa0dad5ae9c76a0863 06-Feb-2014 Robert Shih <robertshih@google.com> LiveSession: Add support for block-by-block fetchFile.

Change-Id: I4025ba7fab8fab2e0c720f73894e908fd98a43d8
ttplive/LiveSession.cpp
ttplive/LiveSession.h
240abcc4bf661a10ffca24859945796acc76ac6e 13-Feb-2014 Andreas Huber <andih@google.com> Remove unused FragmentedMP4Parser and friends. The functionality has been

subsumed into MP4Extractor.

Change-Id: Ic1b6445660adfb985c604f1ca6f0c86585f8de04
ndroid.mk
nclude/FragmentedMP4Parser.h
p4/FragmentedMP4Parser.cpp
p4/TrackFragment.cpp
p4/TrackFragment.h
85fcbd6aec4eab3368e9266be0a1151a081f204d 13-Feb-2014 Marco Nelissen <marcone@google.com> Try not to have sample durations vary too much

Change-Id: Ibbd0f0a253cc74e241236b7a30d1c931e18af753
PEG4Writer.cpp
cf9b0b6bed2bb559060aa77241f7c6b1b22c7e63 13-Feb-2014 Dongwon Kang <dwkang@google.com> am 49960807: am 0105027f: Fix wrong channel table in ESQueue according to the A/52 table 5.8

* commit '499608075bce8a8bc649519687b28c99a0523839':
Fix wrong channel table in ESQueue according to the A/52 table 5.8
499608075bce8a8bc649519687b28c99a0523839 13-Feb-2014 Dongwon Kang <dwkang@google.com> am 0105027f: Fix wrong channel table in ESQueue according to the A/52 table 5.8

* commit '0105027f2a385ecb29a64b055f3046fb01ca2803':
Fix wrong channel table in ESQueue according to the A/52 table 5.8
39a7ae62fd17182f9338f2d08647df3c248be682 12-Feb-2014 Andreas Huber <andih@google.com> Merge "Even more warnings (now errors) fixed to unbreak the sdk-x86 build(s)."
442cc6dc48f8188e097617f7f804c314a9dacd0e 12-Feb-2014 Andreas Huber <andih@google.com> Even more warnings (now errors) fixed to unbreak the sdk-x86 build(s).

Change-Id: Ib4a5ab1a9e50fe9e7747a907f8b4a8c207099fdb
PEG4Extractor.cpp
odecs/amrwbenc/src/pitch_f4.c
odecs/avc/enc/SoftAVCEncoder.cpp
odecs/m4v_h263/enc/SoftMPEG4Encoder.cpp
2f6c2e06a13e81b36365f60181189b6ce5f87c9b 12-Feb-2014 Andreas Huber <andih@google.com> Merge "Fix warnings (now errors) in YUVImage.cpp"
e59b77ab4c6b4ee8b7338d7eccd4a6c5fac834e7 12-Feb-2014 Andreas Huber <andih@google.com> Fix warnings (now errors) in YUVImage.cpp

related-to-build

Change-Id: Ib29d78c4ca176fe66bfe5881f24127843b95c3f8
uv/YUVImage.cpp
dc3b8b5ae07a6d7f42822b6215f4090b0ed185d2 12-Feb-2014 Rachad <rachad@google.com> Merge "Increased recorded MP4 max file size to 4GB (more precisely 2^32-1 bytes -- FAT32 max file size)"
90bdb98b8f8730074fcead63c33e8c3ce458b632 12-Feb-2014 Andreas Huber <andih@google.com> Merge "fix the OS X builds until we can fix compiler warnings that apparently"
def582e93022fa5eb7a64d4a11c15598afc0db86 12-Feb-2014 Andreas Huber <andih@google.com> fix the OS X builds until we can fix compiler warnings that apparently

trigger only on that platform...

Change-Id: I9555d7e2efbe3e349e8af60528b7b9d131a257e3
ndroid.mk
odecs/on2/enc/Android.mk
olorconversion/Android.mk
mx/Android.mk
ifi-display/Android.mk
ccb067b1d8424ba610cbd3de83368bd55b532b5b 11-Feb-2014 Andreas Huber <andih@google.com> fix the build by fixing more warnings.

Change-Id: Ied0ec39eb83b101582702d1e30c21643ccf6353e
Codec.cpp
ests/SurfaceMediaSource_test.cpp
880c6b2dd8b2fe2ab0054e74bbc108d322e82aa0 11-Feb-2014 Lajos Molnar <lajos@google.com> am 1c178d3e: am 7eacea11: Merge "avcenc: Only do startcode escaping if the next byte requires it"

* commit '1c178d3e7b8d037ac8d348922ba841b28eee662f':
avcenc: Only do startcode escaping if the next byte requires it
1c178d3e7b8d037ac8d348922ba841b28eee662f 11-Feb-2014 Lajos Molnar <lajos@google.com> am 7eacea11: Merge "avcenc: Only do startcode escaping if the next byte requires it"

* commit '7eacea1156a3896ee7813cd9a06c535e63c95f6a':
avcenc: Only do startcode escaping if the next byte requires it
7eacea1156a3896ee7813cd9a06c535e63c95f6a 11-Feb-2014 Lajos Molnar <lajos@google.com> Merge "avcenc: Only do startcode escaping if the next byte requires it"
4ef5d8f038588080b73790a46a45d710a6a1d977 11-Feb-2014 Andreas Huber <andih@google.com> Merge "warnings be gone."
faf5c0eaa5464abbe848d487781bc0f6305f3fe8 11-Feb-2014 Andreas Huber <andih@google.com> Merge "Support "data:" URIs again in mediaplayer..."
04ed61b1004282a632cdc1277d93183e15a8df93 07-Aug-2013 Martin Storsjo <martin@martin.st> avcenc: Only do startcode escaping if the next byte requires it

Section 7.4.1 in the H.264 standard says that the only valid bytes
to follow a sequence that starts with 0x000003 are 0x00, 0x01,
0x02 or 0x03.

This makes EncodeDecodeTest pass properly when decoding using
OMX.google.h264.decoder, which is strict about the forbidden
escape sequences.

Change-Id: Ice113d9b934015003ea9cb10d0b21cee4d18d774
odecs/avc/enc/src/bitstream_io.cpp
4bbfff2dbf3968c267c3b2ea9f8912a38372a9da 10-Feb-2014 Andreas Huber <andih@google.com> Support "data:" URIs again in mediaplayer...

Change-Id: I6dac35c7e606f738a60f985f6dca977dc92c82a4
related-to-bug: 12957757
ndroid.mk
ataSource.cpp
ataURISource.cpp
oundation/base64.cpp
84333e0475bc911adc16417f4ca327c975cf6c36 08-Feb-2014 Andreas Huber <andih@google.com> warnings be gone.

Change-Id: Ie3bae3f037730e316d7fca12e7a3527973f752ef
ACExtractor.cpp
ACWriter.cpp
Codec.cpp
MRExtractor.cpp
MRWriter.cpp
ndroid.mk
udioPlayer.cpp
udioSource.cpp
wesomePlayer.cpp
ameraSource.cpp
ameraSourceTimeLapse.cpp
LACExtractor.cpp
P3Extractor.cpp
PEG2TSWriter.cpp
PEG4Extractor.cpp
PEG4Writer.cpp
ediaAdapter.cpp
ediaCodec.cpp
ediaCodecSource.cpp
uCachedSource2.cpp
ggExtractor.cpp
tagefrightMediaScanner.cpp
urfaceMediaSource.cpp
imedEventQueue.cpp
BRISeeker.cpp
AVExtractor.cpp
vc_utils.cpp
odecs/aacdec/Android.mk
odecs/aacenc/Android.mk
odecs/aacenc/SoftAACEncoder2.cpp
odecs/aacenc/basic_op/oper_32b.c
odecs/aacenc/src/aacenc.c
odecs/aacenc/src/adj_thr.c
odecs/aacenc/src/bitenc.c
odecs/aacenc/src/dyn_bits.c
odecs/aacenc/src/psy_main.c
odecs/aacenc/src/qc_main.c
odecs/aacenc/src/tns.c
odecs/amrnb/common/Android.mk
odecs/amrnb/dec/Android.mk
odecs/amrnb/dec/SoftAMR.cpp
odecs/amrnb/enc/Android.mk
odecs/amrnb/enc/SoftAMRNBEncoder.cpp
odecs/amrwb/Android.mk
odecs/amrwbenc/Android.mk
odecs/amrwbenc/SoftAMRWBEncoder.cpp
odecs/amrwbenc/src/autocorr.c
odecs/amrwbenc/src/convolve.c
odecs/amrwbenc/src/syn_filt.c
odecs/amrwbenc/src/voAMRWBEnc.c
odecs/avc/common/Android.mk
odecs/avc/enc/Android.mk
odecs/avc/enc/SoftAVCEncoder.cpp
odecs/common/Android.mk
odecs/common/cmnMemory.c
odecs/flac/enc/Android.mk
odecs/flac/enc/SoftFlacEncoder.cpp
odecs/g711/dec/Android.mk
odecs/g711/dec/SoftG711.cpp
odecs/gsm/dec/Android.mk
odecs/gsm/dec/SoftGSM.cpp
odecs/m4v_h263/dec/Android.mk
odecs/m4v_h263/dec/SoftMPEG4.cpp
odecs/m4v_h263/enc/Android.mk
odecs/m4v_h263/enc/SoftMPEG4Encoder.cpp
odecs/mp3dec/Android.mk
odecs/mp3dec/SoftMP3.cpp
odecs/mp3dec/src/pvmp3_mpeg2_get_scale_data.cpp
odecs/on2/dec/Android.mk
odecs/on2/dec/SoftVPX.cpp
odecs/on2/enc/Android.mk
odecs/on2/h264dec/SoftAVC.cpp
odecs/on2/h264dec/source/H264SwDecApi.c
odecs/on2/h264dec/source/h264bsd_conceal.c
odecs/on2/h264dec/source/h264bsd_reconstruct.c
odecs/on2/h264dec/source/h264bsd_slice_header.c
odecs/on2/h264dec/source/h264bsd_util.c
odecs/raw/Android.mk
odecs/raw/SoftRaw.cpp
odecs/vorbis/dec/Android.mk
olorconversion/Android.mk
oundation/ANetworkSession.cpp
oundation/Android.mk
ttp/Android.mk
ttplive/Android.mk
ttplive/M3UParser.cpp
ttplive/PlaylistFetcher.cpp
d3/Android.mk
nclude/TimedEventQueue.h
atroska/Android.mk
atroska/MatroskaExtractor.cpp
p4/FragmentedMP4Parser.cpp
p4/TrackFragment.cpp
peg2ts/ATSParser.cpp
peg2ts/Android.mk
peg2ts/AnotherPacketSource.cpp
peg2ts/MPEG2PSExtractor.cpp
peg2ts/MPEG2TSExtractor.cpp
mx/Android.mk
mx/GraphicBufferSource.cpp
mx/OMX.cpp
mx/OMXNodeInstance.cpp
mx/SoftOMXComponent.cpp
mx/SoftOMXPlugin.cpp
mx/tests/Android.mk
tsp/AMPEG2TSAssembler.cpp
tsp/ARTPWriter.cpp
tsp/ARawAudioAssembler.cpp
tsp/Android.mk
tsp/MyHandler.h
imedtext/Android.mk
imedtext/TimedTextDriver.cpp
imedtext/TimedTextSource.h
ifi-display/Android.mk
ifi-display/rtp/RTPSender.cpp
ifi-display/source/WifiDisplaySource.cpp
uv/Android.mk
2cf312c2294f128423491a6cc6ba1b1afda5967b 11-Feb-2014 Chong Zhang <chz@google.com> Merge "fix delay when shutting down wifi display"
1d6fa7af1288b550faabe4ec2cf98684236723db 11-Feb-2014 Narayan Kamath <narayan@google.com> resolved conflicts for merge of 566be7c3 to master

Change-Id: I7b1cc71057b2bd4f771e7bcf508a8c3abd6017ce
566be7c33fc56ae4c34168ecbee5316374f7e3c5 11-Feb-2014 Narayan Kamath <narayan@google.com> am 3c9130a8: Merge "Make frameworks/av 64-bit compatible"

* commit '3c9130a8a12ce962dc8d22e04243b135b9e98b01':
Make frameworks/av 64-bit compatible
377b2ec9a2885f9b6405b07ba900a9e3f4349c38 03-Feb-2014 Kévin PETIT <kevin.petit@arm.com> Make frameworks/av 64-bit compatible

Contains the necessary changes to make frameworks/av build and work
on a 64-bit machine.

Signed-off-by: Craig Barber <craig.barber@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>

Change-Id: I725feaae50ed8eee25ca2c947cf15aee1f395c43
ACWriter.cpp
MRWriter.cpp
udioSource.cpp
wesomePlayer.cpp
PEG4Extractor.cpp
PEG4Writer.cpp
etaData.cpp
tagefrightMetadataRetriever.cpp
odecs/m4v_h263/dec/src/get_pred_adv_b_add.cpp
odecs/m4v_h263/enc/src/dct.cpp
odecs/m4v_h263/enc/src/fastcodemb.cpp
odecs/m4v_h263/enc/src/motion_comp.cpp
odecs/m4v_h263/enc/src/sad_inline.h
odecs/on2/h264dec/source/h264bsd_util.h
d3/testid3.cpp
mx/OMX.cpp
mx/tests/OMXHarness.cpp
ests/DummyRecorder.cpp
0105027f2a385ecb29a64b055f3046fb01ca2803 11-Feb-2014 Dongwon Kang <dwkang@google.com> Fix wrong channel table in ESQueue according to the A/52 table 5.8

Reference: http://www.atsc.org/cms/standards/A52-2012(12-17).pdf
Bug: 12950777
Change-Id: Ic60033170b21e67408a3b3444507f6528946bdd0
peg2ts/ESQueue.cpp
1f1f2b1678fd0d038dfc501252dd2b65ecf10cae 11-Feb-2014 Rachad <rachad@google.com> Increased recorded MP4 max file size to 4GB
(more precisely 2^32-1 bytes -- FAT32 max file size)

bug: 11039801
Change-Id: I6169f798c59d123d02d5fd7afa3b9e645ebdb598
PEG4Writer.cpp
2ca060c742a47034cea0ad2fb4aa10f0d6b59a09 10-Feb-2014 Marco Nelissen <marcone@google.com> Merge "Fix regression"
a6d4f9374b9921ab4a186608598535f5af81643a 10-Feb-2014 Lajos Molnar <lajos@google.com> am af8a3e29: am 7142d10a: Merge "avcenc: Update video port parameters in the base class"

* commit 'af8a3e29422ec5de5e7f8befbc5253e68729a654':
avcenc: Update video port parameters in the base class
af8a3e29422ec5de5e7f8befbc5253e68729a654 10-Feb-2014 Lajos Molnar <lajos@google.com> am 7142d10a: Merge "avcenc: Update video port parameters in the base class"

* commit '7142d10a7a3941b2deb18869a7f7b79462e0aa52':
avcenc: Update video port parameters in the base class
70243771c60f34afe1067c69821b5a79020281bb 10-Feb-2014 Lajos Molnar <lajos@google.com> am 25da2f09: am 88e99f9a: Merge "SoftVPXEncoder: Set the frame size on the output port as well"

* commit '25da2f099f657d8b778ce3c03f5d4519e04150cf':
SoftVPXEncoder: Set the frame size on the output port as well
d2b566f34483882648a07bb6f46c3c1b0a2f5306 10-Feb-2014 Lajos Molnar <lajos@google.com> am 61bdaaa1: Merge "ChromiumHTTPDataSource: Keep track of the redirected URL"

* commit '61bdaaa18a1d52666827e31bb7980a5784443835':
ChromiumHTTPDataSource: Keep track of the redirected URL
7142d10a7a3941b2deb18869a7f7b79462e0aa52 10-Feb-2014 Lajos Molnar <lajos@google.com> Merge "avcenc: Update video port parameters in the base class"
61bdaaa18a1d52666827e31bb7980a5784443835 10-Feb-2014 Lajos Molnar <lajos@google.com> Merge "ChromiumHTTPDataSource: Keep track of the redirected URL"
25da2f099f657d8b778ce3c03f5d4519e04150cf 10-Feb-2014 Lajos Molnar <lajos@google.com> am 88e99f9a: Merge "SoftVPXEncoder: Set the frame size on the output port as well"

* commit '88e99f9a5e098ee50019ce85f2b1273b48883f37':
SoftVPXEncoder: Set the frame size on the output port as well
88e99f9a5e098ee50019ce85f2b1273b48883f37 10-Feb-2014 Lajos Molnar <lajos@google.com> Merge "SoftVPXEncoder: Set the frame size on the output port as well"
15f08b1e75ab01d55e4cbab1f8d3570f354651f6 10-Feb-2014 Marco Nelissen <marcone@google.com> am 44f2b8c2: Merge "M3UParser: Fix typo in 8883a38a308"

* commit '44f2b8c2ff4baf64baa0510cd37ac178ef91b7bc':
M3UParser: Fix typo in 8883a38a308
c5fab66b37d8ad614d83ce4b5d36430523d6af1e 10-Feb-2014 Martin Storsjo <martin@martin.st> M3UParser: Fix typo in 8883a38a308

Change-Id: I09f8deb40b8b34efd4bfcfab6866b7780f8bae96
ttplive/M3UParser.cpp
e175d77bb610675ba2f70f24449189995ddeaf5b 10-Feb-2014 Marco Nelissen <marcone@google.com> Fix build

Change-Id: I9196e316dcf7a58096658313bdc925b11b23a7de
ttplive/M3UParser.cpp
03357add725340c290b10f50db090267bbf511b1 10-Feb-2014 Marco Nelissen <marcone@google.com> am 7cbaf3be: am 8519b8a1: Merge "M3UParser: Skip query strings when looking for the last slash in a URL"

* commit '7cbaf3be54b956727a0c7166c57ef46b4c844b94':
M3UParser: Skip query strings when looking for the last slash in a URL
7cbaf3be54b956727a0c7166c57ef46b4c844b94 10-Feb-2014 Marco Nelissen <marcone@google.com> am 8519b8a1: Merge "M3UParser: Skip query strings when looking for the last slash in a URL"

* commit '8519b8a1298d80949edadce9c8f0963ef62cc3ff':
M3UParser: Skip query strings when looking for the last slash in a URL
8519b8a1298d80949edadce9c8f0963ef62cc3ff 10-Feb-2014 Marco Nelissen <marcone@google.com> Merge "M3UParser: Skip query strings when looking for the last slash in a URL"
6a9ebb41a8084b73e654a25d97a6ae26ff4166d4 07-Feb-2014 Marco Nelissen <marcone@google.com> Fix regression

CTS DecoderTest.testBug11696552 started failing again, and this fixes that

Change-Id: I422c3b249a1d5eb25422573d2106d1f142ccfab6
odecs/aacdec/SoftAAC2.cpp
8497416c40bae877bc67b0ef30bb41a73af54711 10-Feb-2014 Colin Cross <ccross@android.com> am 429f2bf7: am e2307ccb: Merge "frameworks/av: fix errors inside ALOGV"

* commit '429f2bf7527daf872a1bbdafca8ad28635b84644':
frameworks/av: fix errors inside ALOGV
bbbb1e80f461616cd9814de125f95f5b89cf5870 07-Feb-2014 Chong Zhang <chz@google.com> Merge "set AAC MPEG version to MPEG-2"
429f2bf7527daf872a1bbdafca8ad28635b84644 07-Feb-2014 Colin Cross <ccross@android.com> am e2307ccb: Merge "frameworks/av: fix errors inside ALOGV"

* commit 'e2307ccbab9c32a7806f15c2572cfe6ec428f2f5':
frameworks/av: fix errors inside ALOGV
456fa912e46edf0b01ea3b7760ea922c01ca1866 07-Feb-2014 Chong Zhang <chz@google.com> fix delay when shutting down wifi display

RepeaterSource needs to stop SurfaceMediaSource before stopping
its looper, otherwise the stop could get queued behind the last
read(), which will not return until a new frame comes.

Change SurfaceMediaSource stop to signal frame avalable first, so
that its read() returns EOS to reader upon stop.

Bug: 11677087
Change-Id: Ie331cc8c7f4824fd3930f3e909b53db4463902fb
urfaceMediaSource.cpp
ifi-display/source/RepeaterSource.cpp
37abc0eee8795231cc5b2e409b24604c43fbb5d0 07-Feb-2014 Chong Zhang <chz@google.com> set AAC MPEG version to MPEG-2

wifi display play spec only allows MPEG-2 AAC.

Bug: 12747927
Change-Id: Ic96d27ce57f5c8e7da55e43b38f629b5c7333817
ifi-display/source/TSPacketizer.cpp
94dcc94b16cc6c2a7aa02df2d0d6b8743d738d78 07-Feb-2014 Colin Cross <ccross@android.com> frameworks/av: fix errors inside ALOGV

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

Change-Id: I9602a4a485dffa3caad732c2a19ec0e41a0ac65b
ttplive/LiveSession.cpp
peg2ts/ESQueue.cpp
ifi-display/source/TSPacketizer.cpp
85f06f640d364490dbf133f55e9d62d7c7c0db11 06-Feb-2014 Andreas Huber <andih@google.com> Merge "Remove libstagefright_http_support from the PDK build."
8d0c751c1d02aef9d96bb98f5c7be57676420120 06-Feb-2014 Andreas Huber <andih@google.com> Remove libstagefright_http_support from the PDK build.

Change-Id: Ie9f81b1cd2694e65fe2d7590cf2ad9e7dad162ce
ttp/Android.mk
7ca6e73bed1d2e1a928104feb6e9ae92953bfff5 06-Feb-2014 Chong Zhang <chz@google.com> Merge "Change StagefrightRecorder to use MediaCodec"
96f8436385163764cda10f1d45e13b9bd691a8b4 06-Feb-2014 Marco Nelissen <marcone@google.com> Merge "Fix restart after EOS for mp3"
72cecca17d735db6532c45f0a7e10c47ee6f065a 26-Dec-2013 Chong Zhang <chz@google.com> Change StagefrightRecorder to use MediaCodec

Bug: 12305192
Change-Id: I72d7cb571be5bd348b58ad650f3269d24c15d350
Codec.cpp
ndroid.mk
PEG4Writer.cpp
ediaCodecSource.cpp
mx/GraphicBufferSource.cpp
mx/GraphicBufferSource.h
mx/OMXNodeInstance.cpp
ests/SurfaceMediaSource_test.cpp
6e56e8024c98c3e6e62772e1dd345dd2c1c36717 05-Feb-2014 Marco Nelissen <marcone@google.com> Fix restart after EOS for mp3

b/12890850

Change-Id: I985a1ae94d7d62701296d95da34974eb29fcc535
odecs/mp3dec/SoftMP3.cpp
81e68448f3361eaf8618930471fdc3c21bdf5cbc 05-Feb-2014 Andreas Huber <andih@google.com> Remove no longer needed http proxy handling code, it's obsolete now

since we started to use java's HTTPConnection instead of the native
implementation. Also remove other remnants of the previous http implementation,
such as accounting for the http user's uid.

Change-Id: I60bfd31381ea40d2220db587ec5c433093b60034
ndroid.mk
ataSource.cpp
TTPBase.cpp
hromium_http/Android.mk
hromium_http/ChromiumHTTPDataSource.cpp
hromium_http/DataUriSource.cpp
hromium_http/chromium_http_stub.cpp
hromium_http/support.cpp
hromium_http/support.h
hromium_http_stub.cpp
ttplive/LiveSession.cpp
ttplive/LiveSession.h
nclude/ChromiumHTTPDataSource.h
nclude/HTTPBase.h
nclude/SDPLoader.h
nclude/chromium_http_stub.h
tsp/SDPLoader.cpp
8883a38a308fb02a653c990118ec7931a47b749b 22-Nov-2013 Martin Storsjo <martin@martin.st> M3UParser: Skip query strings when looking for the last slash in a URL

Change-Id: I72d3a5e11fef9bbd75b291bc490c9cab1dce58da
ttplive/M3UParser.cpp
412d4744efae64083e4f99a664e3efaba031af48 05-Feb-2014 Andreas Huber <andih@google.com> Merge "FINAL ATTEMPT: HTTP services are now provided from JAVA and made available to media code"
1b86fe063badb5f28c467ade39be0f4008688947 29-Jan-2014 Andreas Huber <andih@google.com> FINAL ATTEMPT: HTTP services are now provided from JAVA and made available to media code

Change-Id: I9f74a86e70422187c9cf0ca1318a29019700192d
ndroid.mk
wesomePlayer.cpp
ataSource.cpp
TTPBase.cpp
uCachedSource2.cpp
uMediaExtractor.cpp
tagefrightMediaScanner.cpp
tagefrightMetadataRetriever.cpp
ttp/Android.mk
ttp/HTTPHelper.cpp
ttp/HTTPHelper.h
ttp/MediaHTTP.cpp
ttplive/LiveSession.cpp
ttplive/LiveSession.h
nclude/AwesomePlayer.h
nclude/HTTPBase.h
nclude/SDPLoader.h
nclude/StagefrightMetadataRetriever.h
mx/tests/OMXHarness.cpp
tsp/APacketSource.cpp
tsp/ARTSPConnection.cpp
tsp/Android.mk
tsp/SDPLoader.cpp
imedtext/TimedTextDriver.cpp
ifi-display/source/PlaybackSession.cpp
10d68aabb60787f9f9b35dd4fd8eb9271e7b1abe 04-Feb-2014 Changwan Ryu <changwan@google.com> am dd432ce0: [DO NOT MERGE] Support TS + AC3 for ATSC standard

* commit 'dd432ce03eccf280d83672f95076b6fbd561047f':
[DO NOT MERGE] Support TS + AC3 for ATSC standard
aae8d29f74d05460a57d0843f6bed95d36a2145b 04-Feb-2014 Changwan Ryu <changwan@google.com> am 90903383: [DO NOT MERGE] Support AC3 in stagefright

* commit '9090338367bd9f3fc5678032332a44d457a4a2fe':
[DO NOT MERGE] Support AC3 in stagefright
824f0e5de56fdd4f2f6d56ab02983787927cf8c6 04-Feb-2014 Marco Nelissen <marcone@google.com> Merge "Allow for larger codec private data"
403484d6d76ede31fc71c88495b69108a4df8319 03-Feb-2014 Marco Nelissen <marcone@google.com> Allow for larger codec private data

This change adds support for multibyte sizes in the ESDS. Previously the
Matroska extractor only supported single byte sizes, so codec private data
had to be less than 108 bytes, and would crash if it was bigger.
b/12584090

Change-Id: I9edfc2f687187d1e98bcfd2fe56576312435df3e
atroska/MatroskaExtractor.cpp
69634506fbfe79605c37f337a8d6748cda4445b1 23-Jan-2014 Robert Shih <robertshih@google.com> AnotherPacketSource support to get latest buffered MetaData.

Change-Id: Ib3b6e0984036082bf3c4eb7901a2b29be52fdd29
peg2ts/AnotherPacketSource.cpp
peg2ts/AnotherPacketSource.h
79ccdb52ee5de2a7f65b34e21970c40d1de2682a 03-Feb-2014 Robert Shih <robertshih@google.com> Merge "MPEG4Writer: use "mp42" as major/minor brand in ftyp box."
3627c74343617fa70ebfd40b46712c234888f456 03-Feb-2014 Robert Shih <robertshih@google.com> Merge "Added support to query ACodec whether adaptive playback is enabled."
3fe8a8f797ca62096f4c929b0d81573ebe4a5458 03-Feb-2014 Robert Shih <robertshih@google.com> Merge "Fixed misplaced bracket for switch-case block."
df900f87eb09e2392d19216f09e0c168883d1004 03-Feb-2014 Lajos Molnar <lajos@google.com> am 324d9157: am 5db1e3a6: Merge "correct one logic error in decide whether should render or not"

* commit '324d9157a30f85fb12afa56b2230663ccdd61ced':
correct one logic error in decide whether should render or not
324d9157a30f85fb12afa56b2230663ccdd61ced 03-Feb-2014 Lajos Molnar <lajos@google.com> am 5db1e3a6: Merge "correct one logic error in decide whether should render or not"

* commit '5db1e3a6f30c252ed61461dd8c58786e905e5f5a':
correct one logic error in decide whether should render or not
79ee2399b67c7a11042c5904dc1309712a76f8cb 14-Jan-2014 Jianzheng Zhou <jianzheng.zhou@freescale.com> correct one logic error in decide whether should render or not

Change-Id: Ie41663f6fd5a7d983279f14a2228cb57231771bf
Signed-off-by: Jianzheng Zhou <jianzheng.zhou@freescale.com>
Codec.cpp
ediaCodec.cpp
dd432ce03eccf280d83672f95076b6fbd561047f 28-Oct-2013 Changwan Ryu <changwan@google.com> [DO NOT MERGE] Support TS + AC3 for ATSC standard

Change-Id: I141667f3f54b242bafdf0ab9db86852c56f49ffa
MXCodec.cpp
peg2ts/ATSParser.cpp
peg2ts/ATSParser.h
peg2ts/ESQueue.cpp
peg2ts/ESQueue.h
9090338367bd9f3fc5678032332a44d457a4a2fe 28-Oct-2013 Changwan Ryu <changwan@google.com> [DO NOT MERGE] Support AC3 in stagefright

Change-Id: I12016b424bd069413bd6e380ff11484e175e05f3
Codec.cpp
ediaDefs.cpp
94ee4b708acfa941581160b267afb79192b1d816 11-Jan-2014 Chong Zhang <chz@google.com> Cap pts gap between adjacent frames to specified value

- In the scenario of cast mirroring, encoding could be suspended
for prolonged periods. Limiting the pts gap to workaround the
problem where encoder's rate control logic produces huge frames
after a long period of suspension.

- Repeat last frame a couple more times to get better quality
on static scenes.

- Fix the timestamp on repeat frames (it was not set)

Bug: 11971963
Change-Id: I1d68ab3d269874bf3921aa429a985c5f63e428c7
Codec.cpp
mx/GraphicBufferSource.cpp
mx/GraphicBufferSource.h
mx/OMXNodeInstance.cpp
8284de3be2ac07d8774b15e6565df5aba084db04 30-Jan-2014 Robert Shih <robertshih@google.com> MPEG4Writer: use "mp42" as major/minor brand in ftyp box.

Bug: 12783430
Change-Id: I7c8029de1db21fcac0ce3e4505661189535c45f1
PEG4Writer.cpp
75832930a28fd70f6fc683ed966477ceea810668 24-Jan-2014 Robert Shih <robertshih@google.com> Added support to query ACodec whether adaptive playback is enabled.

Change-Id: I6b0308aa8550c643706959277e46dad586c37297
Codec.cpp
ef8adf8ce4ece039a839f42a22b436d8ae077f37 24-Jan-2014 Robert Shih <robertshih@google.com> stagefright: use CODECS field in EXT-X_STREAM-INF as fallback

Use the CODECS field in EXT-X-STREAM-INF as a viable fallback for identifying
available streams in a variant playlist.

Change-Id: I5011809dc7c56220b023eb1a16f2d6a392ddd6f1
ttplive/M3UParser.cpp
ttplive/M3UParser.h
2abfe880ced297e2b3ddd5f06d9abfd3742cb855 29-Jan-2014 Dongwon Kang <dwkang@google.com> Merge "Support for MPEG2 video" into klp-modular-dev
49270665e7a20cd120724fc388da8b166ff0b4f1 18-Jan-2014 Chong Zhang <chz@google.com> save mGraphicBuffer pointer even when we're suspended

Bug: 12609966
Change-Id: Ifd41fd973876da69039113fcaeacdccf39472b37
mx/GraphicBufferSource.cpp
b2b9b2dbdbc0445080d3c2d15212a43ba1f9cff1 27-Jan-2014 Eric Laurent <elaurent@google.com> am 1ae4b6ce: am fe6db33a: am 4ef1dc2d: Merge "Only increase the counter when we do take a wakelock"

* commit '1ae4b6ce27dca66ef9158abdd4744cb9b8d57c02':
Only increase the counter when we do take a wakelock
fe6db33a4b6454f441c6f0f5ff622d7527c5680c 27-Jan-2014 Eric Laurent <elaurent@google.com> am 4ef1dc2d: Merge "Only increase the counter when we do take a wakelock"

* commit '4ef1dc2d5b5f5df93b173b0b4c4719d4484e031d':
Only increase the counter when we do take a wakelock
625b93f1971039a547b239f87a2dc8a8d5716589 23-Jan-2014 Robert Shih <robertshih@google.com> Fixed misplaced bracket for switch-case block.

Change-Id: I66b410e1e19601ad65d8357bda4c0c58e2dc15dc
Codec.cpp
5163c2ef5fe11c9b10d230691ef429035da4c788 14-Jan-2014 Jimmy Dalqvist <jimmy.dalqvist@sonymobile.com> Only increase the counter when we do take a wakelock

We keep track on how many wakelocks we have taken. We always
just take one real wakelock but increase / decrease the
counter every time we try to acquire / release a wakelock.
The counter is always increased even if the power manager is
not ready, leading to an incorrect counter that could cause a
crash when we try to release it.
Make sure we only increase the counter when a wakelock, real
or counted, is taken.

Change-Id: Iad940e052694932f1dad8a1a71fa63601d289d6a
imedEventQueue.cpp
4d69457c1d7f3e528455fa971c1719099d3699fc 29-Oct-2013 Changwan Ryu <changwan@google.com> Support for MPEG2 video

Change-Id: If1f4e20939c96c87c65c84d56e529501facb8597
(cherry picked from commit 774eb18c40c3a7da0bc1636a9779f02315ddbad8)
Codec.cpp
MXCodec.cpp
9c1aaa7fee4b17d3675af6108c5ff28f3a84c8ec 17-Jan-2014 Marco Nelissen <marcone@google.com> am 6146f60c: am 319c5640: am 07a017d3: Merge "Added support for ID3v2 meta data in 3gp files"

* commit '6146f60c87a8a9c66036325c66dea826d2e98f6f':
Added support for ID3v2 meta data in 3gp files
319c5640ca2e5838e35faaddc47df00174dac1b5 17-Jan-2014 Marco Nelissen <marcone@google.com> am 07a017d3: Merge "Added support for ID3v2 meta data in 3gp files"

* commit '07a017d3ff9cb36e47649a9de28e469415eb8103':
Added support for ID3v2 meta data in 3gp files
6a507298357c9ff869b97db57a890e58bd6bdec0 17-Jan-2014 Glenn Kasten <gkasten@google.com> Merge "AudioRecord::getInputFramesLost() cleanup"
328abde67f57c026ac44e927f9244c40832499c8 27-Jan-2011 Oscar Rydhé <oscar.rydhe@sonyericsson.com> Added support for ID3v2 meta data in 3gp files

Added support for parsing ID3v2 meta data from
the ID32 chunk in 3gp files. The priority will be
3gpp -> ID3v2 -> iTunes per field.

Change-Id: I0282ecab58e3e5fa6bd738078d562c8bb8ce00ed
PEG4Extractor.cpp
etaData.cpp
d3/ID3.cpp
nclude/ID3.h
nclude/MPEG4Extractor.h
a238b9b43a2b8dac60e0fd8700daa6cd4f644547 15-Jan-2014 Marco Nelissen <marcone@google.com> am 07634f1f: am cbf9e91a: am 1e8a57c2: Merge "Avoid jumps to faulty position after seeks"

* commit '07634f1f8f8a899eefba978945b482dd15dabdb8':
Avoid jumps to faulty position after seeks
cbf9e91a5ab186904d3dad21eae416c23ee13668 15-Jan-2014 Marco Nelissen <marcone@google.com> am 1e8a57c2: Merge "Avoid jumps to faulty position after seeks"

* commit '1e8a57c212d26c41325e950ed629244071acc326':
Avoid jumps to faulty position after seeks
1e8a57c212d26c41325e950ed629244071acc326 15-Jan-2014 Marco Nelissen <marcone@google.com> Merge "Avoid jumps to faulty position after seeks"
5f972c031d4061f4f037c9fda1ea4bd9b6a756cd 13-Jan-2014 Glenn Kasten <gkasten@google.com> AudioRecord::getInputFramesLost() cleanup

Fixed bug that if the binder call failed (for example if the
IAudioFlinger binder is dead), then getInputFramesLost was returning
garbage. Now it correctly returns zero, which is the error value for
this method.

The type declarations for getInputFramesLost were inconsistent:
a mixture of unsigned int, size_t, and uint32_t. Now it returns uint32_t
everywhere, which is what the underlying HAL API returns.

Added a FIXME about the side effect behavior. This will need review
for multi-client.

Change-Id: Ifa2e117a87dbd0c1f2c892a31d1c3dd919bf1a0a
udioSource.cpp
784faaf1d76902be6b36d3af01fb5325f0d45a04 22-Nov-2013 Martin Storsjo <martin@martin.st> LiveSession: Use the actual, possibly redirected url as base in the M3U

This fixes playback of HLS streams where the M3U playlists use
relative paths and the main playlist is opened via a redirect.

Change-Id: I787e1c050daddc566be4c8e3f84803d3f91eec46
ttplive/LiveSession.cpp
ttplive/LiveSession.h
0e94bd33901715bee1200a3c69d1a36d4d008b79 09-Jan-2014 Marco Nelissen <marcone@google.com> am 9dfe2ae1: am 586dda1d: am 5ca94d2f: Merge "HLS: Fixed rounding error with decimal segment duration"

* commit '9dfe2ae13ef557a3b6c245bc02be8b5c71ef3fa9':
HLS: Fixed rounding error with decimal segment duration
586dda1d0845612af88e3f4ffc46ed38e304ef85 09-Jan-2014 Marco Nelissen <marcone@google.com> am 5ca94d2f: Merge "HLS: Fixed rounding error with decimal segment duration"

* commit '5ca94d2f3c4662aed7b66a97b77eb2d1948464ad':
HLS: Fixed rounding error with decimal segment duration
5ca94d2f3c4662aed7b66a97b77eb2d1948464ad 09-Jan-2014 Marco Nelissen <marcone@google.com> Merge "HLS: Fixed rounding error with decimal segment duration"
f4512c9672110c11b7bdeea0073a54bfae9c8f87 19-Dec-2013 Jean-Michel Trivi <jmtrivi@google.com> Support more channel configurations in MPEG4Extractor

Add support for streams having an audio specific configuration with the
channel_configuration equal to zero.
Add support for 6.1 and 7.1 channel configurations.

Bug 9428126

Change-Id: Iaac2516139093579c52095d4f74ae4428f8e368a
PEG4Extractor.cpp
c21623371d947b2c0bf9c4029bcc8d33c590a8ef 18-Dec-2013 Jean-Michel Trivi <jmtrivi@google.com> Update AAC decoder wrapper to latest FDK API for output channel count

Rename decoder parameter for the maximum number of PCM output channels,
according to FDK AAC decoder interface, as defined in aacdecoder_lib.h

Bug 9428126

Change-Id: I2f0f6ca848bdbc8657d8dea589b03238245c0eaf
odecs/aacdec/SoftAAC2.cpp
e6144d7a558c74e508a5c103cdc462c3cd7cf508 21-Dec-2013 Eric Laurent <elaurent@google.com> am 42d89e5d: am b904d53f: am 8115f4b2: Merge "stagefright: do not offload LD-AAC decoding"

* commit '42d89e5de5f401c7e81e1961061d07ae490c9d29':
stagefright: do not offload LD-AAC decoding
864866a6530c37f2f138d78343dc03bf0d2ef9b4 21-Dec-2013 Eric Laurent <elaurent@google.com> am 5f7483eb: am 5a086733: am 1777ed30: Merge "stagefright: fix offloading HE-AAC sampling rate."

* commit '5f7483eb6a03b3a14283c1ef09ed65bd3e015b96':
stagefright: fix offloading HE-AAC sampling rate.
b904d53ffaaafddb2f9b6f469b73d2a3bec3dd0d 21-Dec-2013 Eric Laurent <elaurent@google.com> am 8115f4b2: Merge "stagefright: do not offload LD-AAC decoding"

* commit '8115f4b206dbd04c620f062feb3c7785e2732ab3':
stagefright: do not offload LD-AAC decoding
5a086733f8a7472bee85b371e9d02874c9317f3b 21-Dec-2013 Eric Laurent <elaurent@google.com> am 1777ed30: Merge "stagefright: fix offloading HE-AAC sampling rate."

* commit '1777ed30bfb3b9c1edc037a1b5482d5ab8f28b9b':
stagefright: fix offloading HE-AAC sampling rate.
db170bb1cae145d07efc803a3c208963de0c6087 06-Dec-2013 Eric Laurent <elaurent@google.com> stagefright: do not offload LD-AAC decoding

For now, do not offload LD and ELD AAC decoding because there
is no way to know if it is supported by the audio DSP implementation.
The longer term fix will be to have mapMimeToAudioFormat() use the
audio object type in track metadata to refine the AAC format and the
audio HAL list supported AAC profiles.

Change-Id: Iaa88ecf3f4ae42ad48c1b42a9b007dd80eb88147
PEG4Extractor.cpp
tils.cpp
00307ade843ac9219ffb9a351a3145ec2927ea51 06-Dec-2013 Eric Laurent <elaurent@google.com> stagefright: fix offloading HE-AAC sampling rate.

Fix HE AAC SBR sampling rate reading for explicit
signaling.

Bug: 11697128.
Change-Id: Ifec0ab9d48d9293f6774ec1efd9da9445994cb7c
PEG4Extractor.cpp
abd5feeea499ee7337125223df4ea22cae19cd20 17-Dec-2013 Oscar Rydhé <oscar.rydhe@sonymobile.com> HLS: Fixed rounding error with decimal segment duration

If segment duration is specified with decimal value only the
integer value will be used, causing the stream duration to
be wrong.

Reported to Android public issue tracker:
https://code.google.com/p/android/issues/detail?id=56223

Change-Id: I34fb7a81af6ad3d9a214228cfe3724636ebf5ab5
ttplive/M3UParser.cpp
5432aea4b1b107b722ddb507c610bdfc4c61c8aa 11-Oct-2012 Roger1 Jonsson <roger1.jonsson@sonymobile.com> Avoid jumps to faulty position after seeks

When seeking multiple times it is possible that some seeks
are discarded in AwesomePlayer, which causes unwanted jumps
to faulty positions.
The reason is that a seek flag is reset twice in AwesomePlayer.
At first when the video seek is completed and then again when the
audio seek is completed. If a new seek is made after the previous
video seek completed but before the previous audio seek completed,
the new seek position is discarded by the previous audio seek
completion.

This fix makes sure that the seek flag is reset only when video
has completed the seek.

Change-Id: I8f8741d4cb8682345f1d1855bbad57c05f4e3c8d
wesomePlayer.cpp
fd9b01b92a95f94d2d3a8b0ee5973756784fe05f 17-Dec-2013 Lajos Molnar <lajos@google.com> stagefright: Fix issue with tracking media format in packet source

Media format in AnotherPacketSource is now tracked across discontinuities.
This fixes a bug where format was set on queueAccessUnit and cleared on
dequeueAccessUnit, thereby allowing it to remain cleared.

Change-Id: I20975a630443f4a223a2b4344e8244f34b9560b9
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug: 12060952
ttplive/PlaylistFetcher.cpp
peg2ts/AnotherPacketSource.cpp
35da47e5d55392e6adbc97efaf181cb1dd259c04 17-Dec-2013 Eric Laurent <elaurent@google.com> am 274cc85d: Merge "libstagefright: Delay release of wakelock in TimedEventQueue"

* commit '274cc85dcb255185838705a91dba00efa52bf436':
libstagefright: Delay release of wakelock in TimedEventQueue
51d166ec7985949fa69262f213a4162708ebe81e 17-Dec-2013 Eric Laurent <elaurent@google.com> am 9060d498: Merge "update offloaded audio track sampling rate"

* commit '9060d498be0c54d3caf84e2dbf1ba62516b3e76e':
update offloaded audio track sampling rate
25cb85cd3c96c28f64aae52f9c66c76773aa124c 06-Dec-2013 Haynes Mathew George <hgeorge@codeaurora.org> libstagefright: Delay release of wakelock in TimedEventQueue

Delay release of wakelock in the TimedEventQueue to
after an event has been processed.
This ensures AP shutdown does not happen while an event
is ready but hasn't been processed yet.

Bug: 11976087.

Change-Id: I71a5f3ac4a57e1d05dd5d9ab5c6f91ed7bb64c87
imedEventQueue.cpp
nclude/TimedEventQueue.h
5e49afd05566820517747b9a8071c99ec0918328 27-Jul-2013 Eric Laurent <elaurent@google.com> update offloaded audio track sampling rate

AudioPlayer must read the sampling rate from offloaded audio sinks
whenever a new time position is computed as the decoder can update
the sampling rate on the fly.

Change-Id: I997e5248cfd4017aeceb4e11689324ded2a5bc88
udioPlayer.cpp
e175e5ec1636fc638465187f3d5c6166d92388ed 16-Dec-2013 Lajos Molnar <lajos@google.com> stagefright: Fix bugs in playlist fetcher logic

1. Improve start time: start playback as soon as the target duration
or 10s was buffered.
2. Select playlist monitor time based on target duration to avoid
continuously missing the boat.
3. If "we miss the boat" we still must request a safe sequence
number (last - 3)

Change-Id: Ie99c360ac67b152ad9af19e9c6e520016f67e4e3
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug: 12060952
ttplive/PlaylistFetcher.cpp
ttplive/PlaylistFetcher.h
bd432deca2f4c38a61bc6666ed6d940aa51ad9d7 12-Dec-2013 Marco Nelissen <marcone@google.com> Merge "Better character set encoding detection"
544ad2be674423238c47650d2c8588ba7dfc9ed2 13-Nov-2013 Marco Nelissen <marcone@google.com> Better character set encoding detection

Id3 tags are supposed to be ISO-8859-1 or unicode, but often aren't.
To better detect the real encoding we now use ICU to detect possible
encodings for a given byte sequence, then apply additional heuristics
to determine the most likely one.
b/5564857

Change-Id: I53bc83b006433da5c2f2ccfcd770ddb3a26b64d0
d3/ID3.cpp
1c2a66fea852cb8a5228fabef17f85cac1bef5ec 06-Dec-2013 Haynes Mathew George <hgeorge@codeaurora.org> libstagefright: Delay release of wakelock in TimedEventQueue

Delay release of wakelock in the TimedEventQueue to
after an event has been processed.
This ensures AP shutdown does not happen while an event
is ready but hasn't been processed yet.

Bug: 11976087.

Change-Id: I71a5f3ac4a57e1d05dd5d9ab5c6f91ed7bb64c87
imedEventQueue.cpp
nclude/TimedEventQueue.h
2acc8b3833c7bdeca13f1f1a68d212d0cd5d750f 11-Dec-2013 Eric Laurent <elaurent@google.com> Revert "stagefright: fix TimedEventQueue wakelock"

This reverts commit aef04853de0ce27222cf6250b2ba4fa9fc6a72a8.
imedEventQueue.cpp
nclude/TimedEventQueue.h
aef04853de0ce27222cf6250b2ba4fa9fc6a72a8 06-Dec-2013 Eric Laurent <elaurent@google.com> stagefright: fix TimedEventQueue wakelock

If an event is taking a wakelock, the wakelock must be
released after the event is fired.
If the wakelock is released before and the event execution
implies some sleeps or I/O the system can go idle as
no wakelock is held anymore.

Bug: 11976087.

Change-Id: Ie7df8ed4834952ff818ff27d6be415c0b1794a9f
imedEventQueue.cpp
nclude/TimedEventQueue.h
e2d617f5ba7fb90f27b03e2593666b2c927e4dc9 05-Dec-2013 The Android Open Source Project <initial-contribution@android.com> Merge commit '2381f06f374ee0cb8bca0edf5388394432b00e6d' into HEAD
a10431fb0602f21b1130bd8d327673b64621246a 26-Nov-2013 Marco Nelissen <marcone@google.com> am 616c2cf1: am 90892d1b: Merge "Fix SIGABRT when playing mp4 file"

* commit '616c2cf1507898a0de4228b95d435fd36ec1e029':
Fix SIGABRT when playing mp4 file
616c2cf1507898a0de4228b95d435fd36ec1e029 26-Nov-2013 Marco Nelissen <marcone@google.com> am 90892d1b: Merge "Fix SIGABRT when playing mp4 file"

* commit '90892d1be84776f59a619ea4ef9ce51be5828ff8':
Fix SIGABRT when playing mp4 file
7e3c19fbead7af39b3c0ca3d170406a98f97dbd0 26-Nov-2013 Robert Shih <robertshih@google.com> Merge "Avoid the call to CameraSourceTimeLapse::trySettingVideoSize if initialization failed in the parent class ctor CameraSource::CameraSource."
87b009dec36f8dea6e804ae7dee9d6fc0c661af6 25-Nov-2013 Marco Nelissen <marcone@google.com> am 97f6618f: am 11e71558: Merge "Fixed data offset at parsing IPMP Descriptors"

* commit '97f6618fb3eae850945decda725151baa9388aca':
Fixed data offset at parsing IPMP Descriptors
97f6618fb3eae850945decda725151baa9388aca 25-Nov-2013 Marco Nelissen <marcone@google.com> am 11e71558: Merge "Fixed data offset at parsing IPMP Descriptors"

* commit '11e715589e0f3f96389d0eedab677369da680fd4':
Fixed data offset at parsing IPMP Descriptors
465127fa3dfba81d8ad2a164ba6036478f71c8a6 25-Nov-2013 Marco Nelissen <marcone@google.com> Fix SIGABRT when playing mp4 file

If the track duration was shorter than the segment duration, the calculated
encoder padding would be negative, resulting in a crash.
b/11823061
https://code.google.com/p/android/issues/detail?id=62610

Change-Id: I3989ad88caea38d212b61355c15aec13382c6116
PEG4Extractor.cpp
0c9045e42eebdfcfeb1d372e932f043bb99f7ad9 22-Nov-2013 Martin Storsjo <martin@martin.st> ChromiumHTTPDataSource: Keep track of the redirected URL

This makes the code actually match an existing comment in
DrmInitialization, which claimed that mURI was the redirected
URL and not the original one.

Change-Id: I0a5cc65f520f1482ff91320ae78af84a8a681ee3
hromium_http/ChromiumHTTPDataSource.cpp
hromium_http/support.cpp
nclude/ChromiumHTTPDataSource.h
0d572ff9d743afcc8422c6a161af095a9541b510 10-Aug-2013 Martin Storsjo <martin@martin.st> SoftVPXEncoder: Set the frame size on the output port as well

This makes sure the MediaCodec output MediaFormat contains
the right width and height.

Change-Id: Ic97af3b5850ebaf563533c3d1cae992be3e4d074
odecs/on2/enc/SoftVPXEncoder.cpp
f7df9ab3187a3c02bffe1fba10d3fb95197e4a07 05-Jun-2013 Ichitaro Kohara <ichitaro.kohara@sonymobile.com> Fixed data offset at parsing IPMP Descriptors

MPEG4Extractor::parseDrmSINF() miscalculated data offset in parsing
IPMP Descriptors. This commit makes it to take in 2 bytes which is
the size of IPMPS_Type field.

Change-Id: I42cbb6793af9d9b2f14dbfdd7a616096002793f9
PEG4Extractor.cpp
9bb976e1c78048081cf9df4d8a1db67311413e5b 22-Nov-2013 Robert Shih <robertshih@google.com> Avoid the call to CameraSourceTimeLapse::trySettingVideoSize if initialization
failed in the parent class ctor CameraSource::CameraSource.

Bug: 11636771
Change-Id: I5e6bffc1ebeeb1c2b84d6ed2049b2b3676ac046a
ameraSourceTimeLapse.cpp
5bf2560ce9b70bee077e0c264ac06648f0f63acc 22-Nov-2013 The Android Open Source Project <initial-contribution@android.com> Merge commit 'b2059ff384eee8ffb70a7ec8fc5570405201c734' into HEAD
6f59db12a64f4496866952a251122ccb77a36c6b 27-Jul-2013 Eric Laurent <elaurent@google.com> update offloaded audio track sampling rate

AudioPlayer must read the sampling rate from offloaded audio sinks
whenever a new time position is computed as the decoder can update
the sampling rate on the fly.

Change-Id: I997e5248cfd4017aeceb4e11689324ded2a5bc88
udioPlayer.cpp
c490e80239f090c67b00a88468155e1c406da938 14-Nov-2013 Martin Storsjo <martin@martin.st> avcenc: Update video port parameters in the base class

This makes sure that the right parameters are returned on both
input and output ports if queried after setting.

This also makes sure that the output MediaFormat from the
MediaCodec class contains the right video size.

Change-Id: I0667b3b4c6bb90331ad0ae7d51388e1bca3d1bbd
odecs/avc/enc/SoftAVCEncoder.cpp
4bdda35319d5f46efea2089b865c8a64816389cd 19-Nov-2013 Marco Nelissen <marcone@google.com> Only send a format change if the buffer has data

b/11696552

Change-Id: I31aba6e01a7b4d288f4d85d9e2ddec0aac1c2d1f
Codec.cpp
00345c5541bd59c7018534313e9a82623133b3ec 19-Nov-2013 Andreas Huber <andih@google.com> Merge "The member mRefreshState was removed in commit and the printout causes"
704287d1b9427cc39e7be2fc44b0ae21840831e4 19-Nov-2013 Lajos Molnar <lajos@google.com> am 72afcd5d: am 5ea5b020: Merge "WA: Queue extra buffers on output port during reconfig if input EOS-ed" into klp-dev

* commit '72afcd5da296b1f5fb38ef037054855aaea88054':
WA: Queue extra buffers on output port during reconfig if input EOS-ed
72afcd5da296b1f5fb38ef037054855aaea88054 19-Nov-2013 Lajos Molnar <lajos@google.com> am 5ea5b020: Merge "WA: Queue extra buffers on output port during reconfig if input EOS-ed" into klp-dev

* commit '5ea5b020b311a68f513d4a40aca5551abc6a07d8':
WA: Queue extra buffers on output port during reconfig if input EOS-ed
5ea5b020b311a68f513d4a40aca5551abc6a07d8 19-Nov-2013 Lajos Molnar <lajos@google.com> Merge "WA: Queue extra buffers on output port during reconfig if input EOS-ed" into klp-dev
16117ab436e1de4ca494cad58662cdc2ecf6797a 19-Nov-2013 Andreas Huber <andih@google.com> The member mRefreshState was removed in commit and the printout causes

build failure when verbose logging is enabled.

patch contributed by "Bertil Akesson" <bertil.akesson@sonymobile.com>

Change-Id: I1520e24be67d35cd42571ec6211c909a6be76604
related-to-bug: 11056200
ttplive/LiveSession.cpp
ca22dd5d69fdfa17e556839cff6c14e1287c0284 15-Nov-2013 Marco Nelissen <marcone@google.com> am 2381f06f: am 24605338: Merge "Fix metadata access" into klp-dev

* commit '2381f06f374ee0cb8bca0edf5388394432b00e6d':
Fix metadata access
2381f06f374ee0cb8bca0edf5388394432b00e6d 15-Nov-2013 Marco Nelissen <marcone@google.com> am 24605338: Merge "Fix metadata access" into klp-dev

* commit '246053380a9f628405a29a055a3f1f4fba13ed5b':
Fix metadata access
246053380a9f628405a29a055a3f1f4fba13ed5b 15-Nov-2013 Marco Nelissen <marcone@google.com> Merge "Fix metadata access" into klp-dev
4256c970ad90bc555eccfd585048669bb69bca1c 15-Nov-2013 Marco Nelissen <marcone@google.com> Fix metadata access

Metadata string pointers become invalid after setting more metadata,
so don't cache them.
b/11692062

Change-Id: Iaf1afb24cf53f7fa36f49ce759355693494076e5
PEG4Extractor.cpp
etaData.cpp
b4213a1252c23115f3fac77101adb33a9c6b9423 15-Nov-2013 Eric Laurent <elaurent@google.com> am 576e89b5: am 7dae71d6: Merge "AwesomePlayer: correct stream type for offload" into klp-dev

* commit '576e89b523d7705545032edc67d98d9ab1dedbd2':
AwesomePlayer: correct stream type for offload
576e89b523d7705545032edc67d98d9ab1dedbd2 15-Nov-2013 Eric Laurent <elaurent@google.com> am 7dae71d6: Merge "AwesomePlayer: correct stream type for offload" into klp-dev

* commit '7dae71d606ded1dbc2aa9733c3d98ffac57988f2':
AwesomePlayer: correct stream type for offload
22612345ae97648d5b6db43cc1aa30aad77f7bba 15-Nov-2013 Eric Laurent <elaurent@google.com> AwesomePlayer: correct stream type for offload

canOffloadStream() function in stagefright utils forces the
stream type to AUDIO_STREAM_MUSIC when querying the audio policy
manager if a particular track is offloadable or not.
This causes MP3 ringtones to be offloaded which is not a validated use case.

The fix consists in using the actual stream type read from the AudioSink.

Bug: 11410937.
Change-Id: I44b8e033a8e785a79cdc291b142f80b5580bdc4d
wesomePlayer.cpp
tils.cpp
4dd0a8a3d66c2853faf2834565b3c5df4f68734d 07-Nov-2013 Lajos Molnar <lajos@google.com> WA: Queue extra buffers on output port during reconfig if input EOS-ed

Some codecs may return input buffers before having them processed.
This causes a halt if we already signaled an EOS on the input
port. For now keep submitting output meta buffers one at a time if
the input EOS-ed, but the output not yet.

Normally, we submit an output buffer for each input buffer that is
with the component (waiting to be processed).

Change-Id: I8a1251bfb504f40f1e4085a1e220bf9a4d0b05d9
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug: 11433909
Codec.cpp
4f3f5e01208a547e8ea6ff6442a5a33e10748162 14-Nov-2013 Lajos Molnar <lajos@google.com> am ec89a75e: am 92092b39: Merge "stagefright: limit default max-input-size for AVC" into klp-dev

* commit 'ec89a75e386c61cf4ace3bc5ab80d064562ebf11':
stagefright: limit default max-input-size for AVC
4b2ce668f73e714cb1b1f115e3cf3e26bd9122f0 14-Nov-2013 Lajos Molnar <lajos@google.com> am 47afcc5f: am 069bcc50: Merge "AwesomePlayer: Improve performance on high-fps clips" into klp-dev

* commit '47afcc5f5fb94263977717bd12433d594fbbc43f':
AwesomePlayer: Improve performance on high-fps clips
ec89a75e386c61cf4ace3bc5ab80d064562ebf11 14-Nov-2013 Lajos Molnar <lajos@google.com> am 92092b39: Merge "stagefright: limit default max-input-size for AVC" into klp-dev

* commit '92092b395d59e8943a461d344f617f1dc85375a3':
stagefright: limit default max-input-size for AVC
47afcc5f5fb94263977717bd12433d594fbbc43f 14-Nov-2013 Lajos Molnar <lajos@google.com> am 069bcc50: Merge "AwesomePlayer: Improve performance on high-fps clips" into klp-dev

* commit '069bcc5084c3d8c6f9373a2890d40a0d1a36a94e':
AwesomePlayer: Improve performance on high-fps clips
92092b395d59e8943a461d344f617f1dc85375a3 14-Nov-2013 Lajos Molnar <lajos@google.com> Merge "stagefright: limit default max-input-size for AVC" into klp-dev
069bcc5084c3d8c6f9373a2890d40a0d1a36a94e 14-Nov-2013 Lajos Molnar <lajos@google.com> Merge "AwesomePlayer: Improve performance on high-fps clips" into klp-dev
f40cde132d14a260f4f7e08ae2bf29d8c55848ae 13-Nov-2013 Lajos Molnar <lajos@google.com> stagefright: limit default max-input-size for AVC

AVC has a compression ratio of at least 2. Account for this, as
some codecs refuse exorbitant max-input-size requests.

Change-Id: Ib68b485879ba33a12a486f2ce18fe100be977699
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug: 11599364
PEG4Extractor.cpp
0e0278e333aab7c87ae4d264d8ad1ab38c8b9b56 13-Nov-2013 Marco Nelissen <marcone@google.com> am 5595f6de: Merge "Only initialize sniffers once, don\'t hold mutex while sniffing" into klp-dev

* commit '5595f6de606f51ec61fbf40a269b52312507aded':
Only initialize sniffers once, don't hold mutex while sniffing
28786252886f6cd1d89bf4e6c2deeca1788ad5c3 13-Nov-2013 Andreas Huber <andih@google.com> am 5274e21e: am 26c8f714: Merge "Ignore transport stream packets with the "transport_error_indicator" bit set" into klp-dev

* commit '5274e21ea6d9e8009c13817d75f9423735964700':
Ignore transport stream packets with the "transport_error_indicator" bit set
5595f6de606f51ec61fbf40a269b52312507aded 13-Nov-2013 Marco Nelissen <marcone@google.com> Merge "Only initialize sniffers once, don't hold mutex while sniffing" into klp-dev
5274e21ea6d9e8009c13817d75f9423735964700 13-Nov-2013 Andreas Huber <andih@google.com> am 26c8f714: Merge "Ignore transport stream packets with the "transport_error_indicator" bit set" into klp-dev

* commit '26c8f714361bfb6403a7c457adfb8b55c89a634a':
Ignore transport stream packets with the "transport_error_indicator" bit set
26c8f714361bfb6403a7c457adfb8b55c89a634a 13-Nov-2013 Andreas Huber <andih@google.com> Merge "Ignore transport stream packets with the "transport_error_indicator" bit set" into klp-dev
7000c85348a69e37193230c8ccf493c8cb2708f8 13-Nov-2013 Adam Hampson <ahampson@google.com> am 728549e3: am 56477eb7: am 27ae268a: am 00cb884f: Merge "StageFright: Removes hacks for Nvidia MPEG2 decoder" into jb-mr2-dev

* commit '728549e39be9b8fcc701ef0f4623bc50d8726bd7':
StageFright: Removes hacks for Nvidia MPEG2 decoder
728549e39be9b8fcc701ef0f4623bc50d8726bd7 13-Nov-2013 Adam Hampson <ahampson@google.com> am 56477eb7: am 27ae268a: am 00cb884f: Merge "StageFright: Removes hacks for Nvidia MPEG2 decoder" into jb-mr2-dev

* commit '56477eb724972c2fe0441dfa7baaad00b7927add':
StageFright: Removes hacks for Nvidia MPEG2 decoder
56477eb724972c2fe0441dfa7baaad00b7927add 13-Nov-2013 Adam Hampson <ahampson@google.com> am 27ae268a: am 00cb884f: Merge "StageFright: Removes hacks for Nvidia MPEG2 decoder" into jb-mr2-dev

* commit '27ae268af29b25d85f83aa34e92ac8b7f6c87c6f':
StageFright: Removes hacks for Nvidia MPEG2 decoder
27ae268af29b25d85f83aa34e92ac8b7f6c87c6f 13-Nov-2013 Adam Hampson <ahampson@google.com> am 00cb884f: Merge "StageFright: Removes hacks for Nvidia MPEG2 decoder" into jb-mr2-dev

* commit '00cb884fc870aba4052c8d187a45e4aec50a6b43':
StageFright: Removes hacks for Nvidia MPEG2 decoder
0c3684f5996be3b1226ed229eff39a74ae28a879 24-Oct-2013 Lajos Molnar <lajos@google.com> AwesomePlayer: Improve performance on high-fps clips

- Immediately retry rendering next frame after frame skip.
- Schedule next videoEvent based on the timestamp of the
next frame.

Change-Id: Ia106382c4c225321b682c1f7c2d126d7eab7d56d
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug: 11159147
wesomePlayer.cpp
52668ca838e1869676ff95e7388f93ec1858b1e9 11-Nov-2013 Andreas Huber <andih@google.com> Ignore transport stream packets with the "transport_error_indicator" bit set

which indicates that they contain at least one bitstream error that was
unrecoverable.

Change-Id: I10665fd190194fdd2568175fe00b6063d3fc10a5
related-to-bug: 11537029
peg2ts/ATSParser.cpp
2c165bad49eb3a04f901d2e6e87a80757fc97485 12-Nov-2013 Andreas Huber <andih@google.com> am 073dec19: am 22990fe1: Merge "Back to the old way of making sure that no more buffers are submitted" into klp-dev

* commit '073dec19db486290a02d9952e392df9cda5700ad':
Back to the old way of making sure that no more buffers are submitted
073dec19db486290a02d9952e392df9cda5700ad 12-Nov-2013 Andreas Huber <andih@google.com> am 22990fe1: Merge "Back to the old way of making sure that no more buffers are submitted" into klp-dev

* commit '22990fe1ee3531e84dbadb7ff9ffd68d5bbe9060':
Back to the old way of making sure that no more buffers are submitted
22990fe1ee3531e84dbadb7ff9ffd68d5bbe9060 12-Nov-2013 Andreas Huber <andih@google.com> Merge "Back to the old way of making sure that no more buffers are submitted" into klp-dev
d725d23ae67045c22003d419d5c31ca1d551da89 12-Nov-2013 Andreas Huber <andih@google.com> am db50cb5f: am caee8747: Merge "configure bitrate and bitrate mode at encoder initialization for VP8/9" into klp-dev

* commit 'db50cb5f7ae6d2beacd8a4fa4a8991035b3c88e7':
configure bitrate and bitrate mode at encoder initialization for VP8/9
41e7ae8f7f1ec93f8473142d1f3bfe07b22c5c51 12-Nov-2013 Lajos Molnar <lajos@google.com> am cc5aeced: am e100b813: Merge "StageFrightRecorder: do not use meta-data mode for software encoders" into klp-dev

* commit 'cc5aeced30609326c7495eca1286163af3933fe1':
StageFrightRecorder: do not use meta-data mode for software encoders
db50cb5f7ae6d2beacd8a4fa4a8991035b3c88e7 12-Nov-2013 Andreas Huber <andih@google.com> am caee8747: Merge "configure bitrate and bitrate mode at encoder initialization for VP8/9" into klp-dev

* commit 'caee8747b7df3b1119426594d4ba1c0e300ff6db':
configure bitrate and bitrate mode at encoder initialization for VP8/9
caee8747b7df3b1119426594d4ba1c0e300ff6db 12-Nov-2013 Andreas Huber <andih@google.com> Merge "configure bitrate and bitrate mode at encoder initialization for VP8/9" into klp-dev
e3067743d6ef2c6c1aac4361b6ed65e6d7bbe3e3 06-Nov-2013 Marco Nelissen <marcone@google.com> Only initialize sniffers once, don't hold mutex while sniffing

b/11482896

Change-Id: Ie036554b4c9e7e8863cb07901d414ea457f1b2f1
(cherry picked from commit 377fce69297a0e5b7c3b266a7602b17146785635)
ataSource.cpp
ceb7a2e9e3bf8ab566d94f247c5c7c136484d0e7 12-Nov-2013 Eric Laurent <elaurent@google.com> am 5b5f76dc: am a7291156: Merge "TimedEventQueue: improve wakelock management" into klp-dev

* commit '5b5f76dcb29792830baca1f25e51a732b80241df':
TimedEventQueue: improve wakelock management
377fce69297a0e5b7c3b266a7602b17146785635 06-Nov-2013 Marco Nelissen <marcone@google.com> Only initialize sniffers once, don't hold mutex while sniffing

b/11482896

Change-Id: Ie036554b4c9e7e8863cb07901d414ea457f1b2f1
ataSource.cpp
cc5aeced30609326c7495eca1286163af3933fe1 11-Nov-2013 Lajos Molnar <lajos@google.com> am e100b813: Merge "StageFrightRecorder: do not use meta-data mode for software encoders" into klp-dev

* commit 'e100b813c4d833b48b48b74100ad0b9a82c46954':
StageFrightRecorder: do not use meta-data mode for software encoders
e100b813c4d833b48b48b74100ad0b9a82c46954 11-Nov-2013 Lajos Molnar <lajos@google.com> Merge "StageFrightRecorder: do not use meta-data mode for software encoders" into klp-dev
5b5f76dcb29792830baca1f25e51a732b80241df 11-Nov-2013 Eric Laurent <elaurent@google.com> am a7291156: Merge "TimedEventQueue: improve wakelock management" into klp-dev

* commit 'a72911563b0e5b21b196d40249b53975bf8d8f85':
TimedEventQueue: improve wakelock management
a72911563b0e5b21b196d40249b53975bf8d8f85 11-Nov-2013 Eric Laurent <elaurent@google.com> Merge "TimedEventQueue: improve wakelock management" into klp-dev
892e1b9ab055075ba9036fb7dd6404e9e0f2677a 08-Nov-2013 Andreas Huber <andih@google.com> Back to the old way of making sure that no more buffers are submitted

to the component while in executing->idle state.

Change-Id: Ia207f0a112025ed0e2c4d62f404afbbfa694cbab
related-to-bug: 11557463, 11573543
mx/GraphicBufferSource.cpp
2e70b42e2af66f4abb22a95c5d642175c007e256 08-Nov-2013 Andreas Huber <andih@google.com> am 86f79f23: am 51ac2d64: Merge "Properly handle executing->idle in GraphicBufferSource" into klp-dev

* commit '86f79f2332efad4862a4dd56f9552c93bbb52bcf':
Properly handle executing->idle in GraphicBufferSource
86f79f2332efad4862a4dd56f9552c93bbb52bcf 08-Nov-2013 Andreas Huber <andih@google.com> am 51ac2d64: Merge "Properly handle executing->idle in GraphicBufferSource" into klp-dev

* commit '51ac2d6451b8614aaad83e5bd29ccb7a3fc4651c':
Properly handle executing->idle in GraphicBufferSource
51ac2d6451b8614aaad83e5bd29ccb7a3fc4651c 08-Nov-2013 Andreas Huber <andih@google.com> Merge "Properly handle executing->idle in GraphicBufferSource" into klp-dev
8c8c9fb742f678ca34f78fff05274690ba6b00a5 08-Nov-2013 Andy McFadden <fadden@android.com> am 2e496677: am 5572b3af: Replace assert with error message

* commit '2e496677be678f5201d0e6c3712c664dd60502d9':
Replace assert with error message
2e496677be678f5201d0e6c3712c664dd60502d9 08-Nov-2013 Andy McFadden <fadden@android.com> am 5572b3af: Replace assert with error message

* commit '5572b3afe3e63110ef9e6d228112ca7cbfac866b':
Replace assert with error message
e8332ee38cc9778aa7898bbd75858561ed1e0ba3 05-Nov-2013 Eric Laurent <elaurent@google.com> TimedEventQueue: improve wakelock management

Do not acquire a wakelock unless the event is delayed by more
than a given time. This prevents from acquiring/releasing
wakelocks too often which has adverse effects on performance.

Bug: 11509471.
Change-Id: Id06803b393b40c4db5095a6e7ec02339fa581a38
imedEventQueue.cpp
nclude/TimedEventQueue.h
5572b3afe3e63110ef9e6d228112ca7cbfac866b 07-Nov-2013 Andy McFadden <fadden@android.com> Replace assert with error message

The failure happens when vendor code sends EMPTY_BUFFER_DONE
twice on the same buffer. The second time through, we see a slot
that has already been emptied, and get very confused.

This should be handled with an error, not an assertion, so we now
log a stern complaint and carry on.

Bug 11557463

Change-Id: I76e53ff08924bca81afb6980df8e59a6012ff8fe
mx/GraphicBufferSource.cpp
ad3b7e8d40bf1c97347f1538d30bba78ca371f67 07-Nov-2013 Andreas Huber <andih@google.com> Properly handle executing->idle in GraphicBufferSource

ACodec has initiated the transition from exectuing->idle and is waiting
for the component to return all buffers so they can be freed.
It's counter productive and with some vendors harmful to submit additional
buffers to the component from this point on.

Change-Id: I332be254a1faf94902c77b5792a373ab447e44d3
related-to-bug: 11573543
mx/GraphicBufferSource.cpp
mx/GraphicBufferSource.h
mx/OMXNodeInstance.cpp
5307612c3f1164bea523f5e90300d3a8b8afd093 06-Nov-2013 Changwan Ryu <changwan@google.com> Merge "Support TS + AC3 for ATSC standard"
a19c9d49ade935c86fcd58bb553ec17e1c9ce730 06-Nov-2013 Changwan Ryu <changwan@google.com> Merge "Support AC3 in stagefright"
d3c079ae9859011d118f94616d0069c2987013ed 28-Oct-2013 Changwan Ryu <changwan@google.com> Support TS + AC3 for ATSC standard

Change-Id: I141667f3f54b242bafdf0ab9db86852c56f49ffa
MXCodec.cpp
peg2ts/ATSParser.cpp
peg2ts/ATSParser.h
peg2ts/ESQueue.cpp
peg2ts/ESQueue.h
97358c3e1adaf4a744cad78891a16d12e3e9c88e 28-Oct-2013 Changwan Ryu <changwan@google.com> Support AC3 in stagefright

Change-Id: I12016b424bd069413bd6e380ff11484e175e05f3
Codec.cpp
ediaDefs.cpp
89b31a3f670d8bec87bed50aaad9bcd8edec66b6 05-Nov-2013 Andreas Huber <andih@google.com> configure bitrate and bitrate mode at encoder initialization for VP8/9

Change-Id: I0389264db4102cabb0c6fcb4ca223d85cc9e86fb
related-to-bug: 11536167
Codec.cpp
21264c4f0de2e2e74a62290a4aaafea4cc865528 05-Nov-2013 Lajos Molnar <lajos@google.com> am 2922d230: am 065789f2: Merge "Restore NuPlayer error and EOS handling" into klp-dev

* commit '2922d230155cb1be7acc0c11bef6f0ca0345bdb7':
Restore NuPlayer error and EOS handling
2922d230155cb1be7acc0c11bef6f0ca0345bdb7 05-Nov-2013 Lajos Molnar <lajos@google.com> am 065789f2: Merge "Restore NuPlayer error and EOS handling" into klp-dev

* commit '065789f24890b0a9f3614dc175e6f7664af1f2ce':
Restore NuPlayer error and EOS handling
774eb18c40c3a7da0bc1636a9779f02315ddbad8 29-Oct-2013 Changwan Ryu <changwan@google.com> Support for MPEG2 video

Change-Id: If1f4e20939c96c87c65c84d56e529501facb8597
Codec.cpp
MXCodec.cpp
7fa015217e618265ff5a844cf6961ecc316c81a4 28-Oct-2013 Lajos Molnar <lajos@google.com> Restore NuPlayer error and EOS handling

This was erroneously removed by commit a73c954

Change-Id: I4742339139e770f0181c99d427875897fd60b68e
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug: 11413439
Codec.cpp
ediaCodec.cpp
ed94a039088d2218cbc69e831f16f78db53d0c83 30-Oct-2013 Lajos Molnar <lajos@google.com> am 8578eb36: am c76b9f52: Merge "AwesomePlayer: ensure STARTED message works after reset" into klp-dev

* commit '8578eb364799f83c6f237d286e1447c02db6afbc':
AwesomePlayer: ensure STARTED message works after reset
8578eb364799f83c6f237d286e1447c02db6afbc 30-Oct-2013 Lajos Molnar <lajos@google.com> am c76b9f52: Merge "AwesomePlayer: ensure STARTED message works after reset" into klp-dev

* commit 'c76b9f52cf4e39f6943c53f5b3657dfee65857ac':
AwesomePlayer: ensure STARTED message works after reset
c76b9f52cf4e39f6943c53f5b3657dfee65857ac 30-Oct-2013 Lajos Molnar <lajos@google.com> Merge "AwesomePlayer: ensure STARTED message works after reset" into klp-dev
9c7f845780d62ea09469a8dac7117cc01adfea5c 30-Oct-2013 Lajos Molnar <lajos@google.com> StageFrightRecorder: do not use meta-data mode for software encoders

Camera HAL v1 uses vendor-specific camera-source meta-data mode, but
software encoders use generic gralloc-source mode, so they are not
compatible.

Change-Id: I0d1bab8eada26dcb70c97b1eec83f06d1f331239
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug: 11446505
ameraSourceTimeLapse.cpp
85da44b75c0f9426875ccc1bc3df1729e452c5ae 30-Oct-2013 Lajos Molnar <lajos@google.com> am b6b97f60: am eb76f318: am 96aed4fb: Merge "avcenc: Prepend startcodes to output buffers"

* commit 'b6b97f6071a3948494b5e9cb1a9c175157bdaf07':
avcenc: Prepend startcodes to output buffers
b6b97f6071a3948494b5e9cb1a9c175157bdaf07 30-Oct-2013 Lajos Molnar <lajos@google.com> am eb76f318: am 96aed4fb: Merge "avcenc: Prepend startcodes to output buffers"

* commit 'eb76f318e9daf91dbf195bcb74852b3bd736a32a':
avcenc: Prepend startcodes to output buffers
96aed4fb18e5303b039cc7e5dc252e0827491d09 29-Oct-2013 Lajos Molnar <lajos@google.com> Merge "avcenc: Prepend startcodes to output buffers"
f4909f67d8be28e3b0a5e9429479b102773b2ea8 28-Oct-2013 Lajos Molnar <lajos@google.com> AwesomePlayer: ensure STARTED message works after reset

Change-Id: I06217c07c0b68476cb296fd6151f6a0d8d4e02d0
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug: 11412881
wesomePlayer.cpp
f7d89bd79d170be3b299717ac11aff62909314c5 24-Oct-2013 Andy McFadden <fadden@android.com> am de5f7cd6: am be567be3: Merge "Check for NULL buffer in repeat-latest" into klp-dev

* commit 'de5f7cd61df74027834cd1ed2f1e482238f3ed4b':
Check for NULL buffer in repeat-latest
72ff30cf3f70c80f2c211d1bb3e98adf5257f3a9 24-Oct-2013 Vineeta Srivastava <vsrivastava@google.com> am 57c1f758: am f3a6234b: Merge "Fix kAutoRampDurationUs overflow issue" into klp-dev

* commit '57c1f758d8811024aa1298d2ba244577c44ef7b9':
Fix kAutoRampDurationUs overflow issue
de5f7cd61df74027834cd1ed2f1e482238f3ed4b 24-Oct-2013 Andy McFadden <fadden@android.com> am be567be3: Merge "Check for NULL buffer in repeat-latest" into klp-dev

* commit 'be567be3f92026f5964c1c9ecce00e30bb7df412':
Check for NULL buffer in repeat-latest
be567be3f92026f5964c1c9ecce00e30bb7df412 24-Oct-2013 Andy McFadden <fadden@android.com> Merge "Check for NULL buffer in repeat-latest" into klp-dev
bdfd4885aa4d7b3f3f591118927a3f4aec593096 23-Oct-2013 Andy McFadden <fadden@android.com> Check for NULL buffer in repeat-latest

Repeating the most-recent buffer appears to fail when the producer
disconnects. This adds a NULL check to avoid crashing.

Bug 10607920

Change-Id: Ied036004425f046fcf9c26303823681f3fddb99e
mx/GraphicBufferSource.cpp
57c1f758d8811024aa1298d2ba244577c44ef7b9 23-Oct-2013 Vineeta Srivastava <vsrivastava@google.com> am f3a6234b: Merge "Fix kAutoRampDurationUs overflow issue" into klp-dev

* commit 'f3a6234ba21640cf2bc893dbcb98fb9b0fa47481':
Fix kAutoRampDurationUs overflow issue
7ec9fbd94596de3aa985ef20d5e10845174d09f3 23-Oct-2013 Elliott Hughes <enh@google.com> am c20636f7: am e7329bd5: am d5255d1d: Merge "If dlopen("libwvm.so") fails, log the reason why."

* commit 'c20636f7a4053c6f93a8808617252afcd5dc8d50':
If dlopen("libwvm.so") fails, log the reason why.
c20636f7a4053c6f93a8808617252afcd5dc8d50 23-Oct-2013 Elliott Hughes <enh@google.com> am e7329bd5: am d5255d1d: Merge "If dlopen("libwvm.so") fails, log the reason why."

* commit 'e7329bd564e7c5f671b786dc7d0cc684d6d11fca':
If dlopen("libwvm.so") fails, log the reason why.
a77f7031c15dc8ead0228d6e15f41577bff511f2 23-Oct-2013 Elliott Hughes <enh@google.com> If dlopen("libwvm.so") fails, log the reason why.

Bug: 11342992
Change-Id: I99986b6181df6d7615fdc1520d2edaadaccd9bb4
VMExtractor.cpp
b65473f4f881ee7c0a24217ceac69514f6c127d5 17-Oct-2013 Vineeta Srivastava <vsrivastava@google.com> Fix kAutoRampDurationUs overflow issue

When kAutoRampDurationUs multiplies with mSampleRate, it overflows to int64.
Type cast it to int64 to make sure RampDurationUs properly.

BUg: 11162491
Change-Id: I4f93bc9acc8456e25623a9255ca7a5b206425009
udioSource.cpp
653edc77815c76769b6ac1871add6f47a95d1dc5 17-Oct-2013 Andreas Huber <andih@google.com> am 694d0295: am 6fa20187: Make sure we get to discover that the cache is sufficiently full again

* commit '694d0295b986e4ed8f91e71cc5ac8af0341be1de':
Make sure we get to discover that the cache is sufficiently full again
694d0295b986e4ed8f91e71cc5ac8af0341be1de 17-Oct-2013 Andreas Huber <andih@google.com> am 6fa20187: Make sure we get to discover that the cache is sufficiently full again

* commit '6fa20187e4cf9ace5692979a84741484f19e3f57':
Make sure we get to discover that the cache is sufficiently full again
6fa20187e4cf9ace5692979a84741484f19e3f57 17-Oct-2013 Andreas Huber <andih@google.com> Make sure we get to discover that the cache is sufficiently full again

by posting buffering events while in the CACHE_UNDERRUN state.

Change-Id: Ic60c8d57f0ae502aa2b6eec7160dc4224b989604
related-to-bug: 11262689
wesomePlayer.cpp
a529ee78d7cc5d94cbe79cea2d7e6469c88a0fba 17-Oct-2013 Eric Laurent <elaurent@google.com> am ace8947d: am d5766875: AwesomePlayer: fix concurrent pause and teardown

* commit 'ace8947dbcd18e86c6a089291ffe1ce32fb42508':
AwesomePlayer: fix concurrent pause and teardown
ace8947dbcd18e86c6a089291ffe1ce32fb42508 17-Oct-2013 Eric Laurent <elaurent@google.com> am d5766875: AwesomePlayer: fix concurrent pause and teardown

* commit 'd576687570f19f3956d91c1d3da10d965e34c407':
AwesomePlayer: fix concurrent pause and teardown
d576687570f19f3956d91c1d3da10d965e34c407 16-Oct-2013 Eric Laurent <elaurent@google.com> AwesomePlayer: fix concurrent pause and teardown

There was a race condition if a pause request was received
while we were executing a teardown event. Although we hold
a mutex while processing the teardown event, there is a step
of the prepare sequence where we release the mutex if streaming.
In this case, the pause request is executed but ignored because
the player state is still preparing. At the end of the teardown
event processing we restore previous playback state and resume.

The fix consists in clearing the saved teardown playback state
when a pause request is received while processing a teardown event.

Bug: 11225491.
Change-Id: If0e61855ce5a336322f1ba8e5559bdc190beeb76
wesomePlayer.cpp
921c55daae3b87482f02d85c4ea3737bd7da971a 08-Oct-2013 Eric Laurent <elaurent@google.com> am 9e8d612c: am aab5b08c: AwesomePlayer: do not send events when paused.

* commit '9e8d612cb3bcef95999407edc22252c9b251ee6d':
AwesomePlayer: do not send events when paused.
9e8d612cb3bcef95999407edc22252c9b251ee6d 08-Oct-2013 Eric Laurent <elaurent@google.com> am aab5b08c: AwesomePlayer: do not send events when paused.

* commit 'aab5b08cb4a3b5a47daece6168f41ec918020739':
AwesomePlayer: do not send events when paused.
aab5b08cb4a3b5a47daece6168f41ec918020739 08-Oct-2013 Eric Laurent <elaurent@google.com> AwesomePlayer: do not send events when paused.

When streaming audio and paused, AwesomePlayer should
stop sending BufferingEvents as they will keep a wake lock
for no reason.

TimedEventQueue should always acquire the wakelock with mediaserver
identity so that it is released with the same identity by the
event handler thread.

Bug: 11104408.
Change-Id: Ied0e03acd6ad2f5a4c0ec82d5c2aa4e1c6da772c
wesomePlayer.cpp
imedEventQueue.cpp
140f08fea6a4ad97fa8446498c713412ac734b79 04-Oct-2013 Eric Laurent <elaurent@google.com> am 9e53ab09: am da0926af: Merge "TimedEventQueue takes a wake lock" into klp-dev

* commit '9e53ab095a13a9adaca4be832e8901933f49d014':
TimedEventQueue takes a wake lock
2f99bc37d173c598a7fb11c02acb1f0b6f93b37f 04-Oct-2013 Lajos Molnar <lajos@google.com> am 6d62af8b: am 7bab0248: Merge "MediaCodec: avoid codec EOS if flushing during port reconfiguration" into klp-dev

* commit '6d62af8bb4215de45a944ae94a641acab416960b':
MediaCodec: avoid codec EOS if flushing during port reconfiguration
02627597fc4951e16b9002601e4cf3b1cc234c4b 04-Oct-2013 Lajos Molnar <lajos@google.com> am b68c1661: am 580ed263: Merge "stagefright: enable adaptive playback based on codec format key" into klp-dev

* commit 'b68c16616765576b411aa8a5a5cb809e09329d8f':
stagefright: enable adaptive playback based on codec format key
b7f82eaed2876bacc3a402182b75323026813c30 04-Oct-2013 Lajos Molnar <lajos@google.com> am aa50cc78: am 56ce7260: IOMX: Add prepareForAdaptivePlayback method

* commit 'aa50cc78be8a1067a0694a97b04d5a24b80af475':
IOMX: Add prepareForAdaptivePlayback method
6101f9562ac14b167a1ad6d6bc8d61a8407bc668 04-Oct-2013 Andreas Huber <andih@google.com> am 31ed2c54: am a306ee6b: Remove now unused wfd commandline tool. (also unbreaks the build)

* commit '31ed2c544736d8ced39ba0ae0489859d4d6a9491':
Remove now unused wfd commandline tool. (also unbreaks the build)
b3c617c0e1beed10f129678632affb681fdf52fa 04-Oct-2013 Andreas Huber <andih@google.com> am a368eb61: am 6ea551fa: Remove obsolete miracast sink code and friends.

* commit 'a368eb61b9ea8433c618ee82dd3774301e5d21eb':
Remove obsolete miracast sink code and friends.
9e53ab095a13a9adaca4be832e8901933f49d014 04-Oct-2013 Eric Laurent <elaurent@google.com> am da0926af: Merge "TimedEventQueue takes a wake lock" into klp-dev

* commit 'da0926afdb12794497c93d68eee296f2d92bfa7e':
TimedEventQueue takes a wake lock
da0926afdb12794497c93d68eee296f2d92bfa7e 04-Oct-2013 Eric Laurent <elaurent@google.com> Merge "TimedEventQueue takes a wake lock" into klp-dev
8db188489871c770d5d56cf67b0001222415db41 04-Oct-2013 Eric Laurent <elaurent@google.com> TimedEventQueue takes a wake lock

Take a wake lock when events present in a TimedEventQueue
to prevent from going idle before all delayed events are
processed.

Bug: 11057387.
Change-Id: I26a17df68068fde5e879a2fe7568dec439fc540f
ndroid.mk
imedEventQueue.cpp
nclude/TimedEventQueue.h
6d62af8bb4215de45a944ae94a641acab416960b 04-Oct-2013 Lajos Molnar <lajos@google.com> am 7bab0248: Merge "MediaCodec: avoid codec EOS if flushing during port reconfiguration" into klp-dev

* commit '7bab024867996bec6dc4e3e31ed4570da9afbc25':
MediaCodec: avoid codec EOS if flushing during port reconfiguration
7bab024867996bec6dc4e3e31ed4570da9afbc25 04-Oct-2013 Lajos Molnar <lajos@google.com> Merge "MediaCodec: avoid codec EOS if flushing during port reconfiguration" into klp-dev
b68c16616765576b411aa8a5a5cb809e09329d8f 04-Oct-2013 Lajos Molnar <lajos@google.com> am 580ed263: Merge "stagefright: enable adaptive playback based on codec format key" into klp-dev

* commit '580ed263a6ea6c766f9f715e101340c7fe26ab75':
stagefright: enable adaptive playback based on codec format key
aa50cc78be8a1067a0694a97b04d5a24b80af475 04-Oct-2013 Lajos Molnar <lajos@google.com> am 56ce7260: IOMX: Add prepareForAdaptivePlayback method

* commit '56ce726019f700a95ce5b45beebceadae4836e30':
IOMX: Add prepareForAdaptivePlayback method
31ed2c544736d8ced39ba0ae0489859d4d6a9491 04-Oct-2013 Andreas Huber <andih@google.com> am a306ee6b: Remove now unused wfd commandline tool. (also unbreaks the build)

* commit 'a306ee6bc1aef463f8984be26b8a4214490b6c55':
Remove now unused wfd commandline tool. (also unbreaks the build)
a368eb61b9ea8433c618ee82dd3774301e5d21eb 04-Oct-2013 Andreas Huber <andih@google.com> am 6ea551fa: Remove obsolete miracast sink code and friends.

* commit '6ea551fa13b69e5ce359a7dba7485d857a005304':
Remove obsolete miracast sink code and friends.
fce0d1883cdbcb7d501625fb43844043cd28a267 03-May-2013 Lajos Molnar <lajos@google.com> stagefright: enable adaptive playback based on codec format key

Added support for prepareForAdaptivePlayback() call in
configureCodec, if max-width and max-height keys are specified
in the format. It is OK for this call to fail, if component
does not implement adaptive playback.

Change-Id: Ie15892bc666df103b635890a0fda799b204bb06c
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug: 7093648
Bug: 10192531
Codec.cpp
MXCodec.cpp
56ce726019f700a95ce5b45beebceadae4836e30 03-May-2013 Lajos Molnar <lajos@google.com> IOMX: Add prepareForAdaptivePlayback method

prepareForAdaptivePlayback is the fallback mechanism to support
seamless resolution change for devices that do not support dynamic
output buffers. It is up to the codecs to handle this appropriately,
but codecs that do not handle dynamic output buffers would
request enough buffers up to the requested size in this method
to avoid port reconfiguration on resolution changes.

Change-Id: I58d4aa8ef1359ea3472735bbe9140c3132039b3d
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug: 10192531
Related-to-bug: 7093648
MXClient.cpp
nclude/OMX.h
nclude/OMXNodeInstance.h
mx/OMX.cpp
mx/OMXNodeInstance.cpp
a306ee6bc1aef463f8984be26b8a4214490b6c55 03-Oct-2013 Andreas Huber <andih@google.com> Remove now unused wfd commandline tool. (also unbreaks the build)

Change-Id: I03320342976e4e355cc6aeb3d2c485985613b3b5
related-to-bug: 11047222
ifi-display/Android.mk
ifi-display/wfd.cpp
a73c954d947748a3b6f630cf2c160fe55ec596e3 02-Oct-2013 Lajos Molnar <lajos@google.com> MediaCodec: avoid codec EOS if flushing during port reconfiguration

Change-Id: Ic2e93f38feeb2e906f8d6b400ed6df2b7580ca87
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug: 11045434
Codec.cpp
6ea551fa13b69e5ce359a7dba7485d857a005304 02-Oct-2013 Andreas Huber <andih@google.com> Remove obsolete miracast sink code and friends.

Change-Id: I8bbb22fb0cfe2d73881d9f05bf8112ae86d8040b
related-to-bug: 11047222
ifi-display/Android.mk
ifi-display/MediaReceiver.cpp
ifi-display/MediaReceiver.h
ifi-display/SNTPClient.cpp
ifi-display/SNTPClient.h
ifi-display/TimeSyncer.cpp
ifi-display/TimeSyncer.h
ifi-display/nettest.cpp
ifi-display/rtp/RTPAssembler.cpp
ifi-display/rtp/RTPAssembler.h
ifi-display/rtp/RTPReceiver.cpp
ifi-display/rtp/RTPReceiver.h
ifi-display/rtptest.cpp
ifi-display/sink/DirectRenderer.cpp
ifi-display/sink/DirectRenderer.h
ifi-display/sink/WifiDisplaySink.cpp
ifi-display/sink/WifiDisplaySink.h
ifi-display/source/WifiDisplaySource.cpp
ifi-display/source/WifiDisplaySource.h
ifi-display/udptest.cpp
2b9cbe9dcea41d687aa1d54bffb4e443e2101a35 02-Oct-2013 Lajos Molnar <lajos@google.com> am 6ec564ac: am 353fb9bf: Merge "MediaTimeProvider support fixes" into klp-dev

* commit '6ec564aca718b4d01543ded38d47e1e6c0ae05d5':
MediaTimeProvider support fixes
770433ca4506d51ba5b08b20e0cfad8e74bbd55c 02-Oct-2013 Lajos Molnar <lajos@google.com> am 7c16991d: am 5fd39f77: Merge "MediaCodecInfo: report supported color formats for non-native-window mode" into klp-dev

* commit '7c16991db49f41dce37bef7d3cbd9225b79a6b4d':
MediaCodecInfo: report supported color formats for non-native-window mode
6ec564aca718b4d01543ded38d47e1e6c0ae05d5 02-Oct-2013 Lajos Molnar <lajos@google.com> am 353fb9bf: Merge "MediaTimeProvider support fixes" into klp-dev

* commit '353fb9bf940ee34a3885bc85ec7891228e958a4b':
MediaTimeProvider support fixes
7c16991db49f41dce37bef7d3cbd9225b79a6b4d 02-Oct-2013 Lajos Molnar <lajos@google.com> am 5fd39f77: Merge "MediaCodecInfo: report supported color formats for non-native-window mode" into klp-dev

* commit '5fd39f777d54368a93fc9d8a6a24da0239d41fcf':
MediaCodecInfo: report supported color formats for non-native-window mode
cff0d41463dfa0bcb33805794f1341d029e86f04 02-Oct-2013 Rachad Alao <rachad@google.com> am d2807602: am f006989d: Merge "Change VP8 encoder bitrate" into klp-dev

* commit 'd28076022746e36af16260da899718ab74a2b454':
Change VP8 encoder bitrate
0e2144a21d7819ecf70a614f800aa13df4dfa348 02-Oct-2013 Rachad Alao <rachad@google.com> am c46683a9: am 0797fb70: Merge "Indicate sync frames returned by encoder" into klp-dev

* commit 'c46683a96dd668446ba949c841d6041d2bea2cbc':
Indicate sync frames returned by encoder
2f0f0b32de1f85722761dc8080238a561b842777 02-Oct-2013 Marco Nelissen <marcone@google.com> am 3d97e23f: Merge "Prevent onPrepared callback from being called twice" into klp-dev

* commit '3d97e23fcd78f752443cb6c30a1ee39f49f1f987':
Prevent onPrepared callback from being called twice
353fb9bf940ee34a3885bc85ec7891228e958a4b 01-Oct-2013 Lajos Molnar <lajos@google.com> Merge "MediaTimeProvider support fixes" into klp-dev
5fd39f777d54368a93fc9d8a6a24da0239d41fcf 01-Oct-2013 Lajos Molnar <lajos@google.com> Merge "MediaCodecInfo: report supported color formats for non-native-window mode" into klp-dev
d28076022746e36af16260da899718ab74a2b454 01-Oct-2013 Rachad Alao <rachad@google.com> am f006989d: Merge "Change VP8 encoder bitrate" into klp-dev

* commit 'f006989d8f222639ac170067d371e11daf0e76ae':
Change VP8 encoder bitrate
c46683a96dd668446ba949c841d6041d2bea2cbc 01-Oct-2013 Rachad Alao <rachad@google.com> am 0797fb70: Merge "Indicate sync frames returned by encoder" into klp-dev

* commit '0797fb709d2cdd35fe596b6089b259ad10d345d6':
Indicate sync frames returned by encoder
d990e7b27b1984fcaee6c37005056db9ca5ca3c7 01-Oct-2013 Marco Nelissen <marcone@google.com> am 3d97e23f: Merge "Prevent onPrepared callback from being called twice" into klp-dev

* commit '3d97e23fcd78f752443cb6c30a1ee39f49f1f987':
Prevent onPrepared callback from being called twice
1db33c2fdffa620fb921faf6e16629ca86b398c9 01-Oct-2013 Eric Laurent <elaurent@google.com> am f2c8b027: Merge "fix playback position after switching to offload" into klp-dev

* commit 'f2c8b02786c58b98d41d3f7c30e882cacc34e7ab':
fix playback position after switching to offload
6218fdc2bef7b9c912bc4d132c12ee43b7b2dd37 25-Sep-2013 Lajos Molnar <lajos@google.com> MediaTimeProvider support fixes

Add MEDIA_SKIPPED event when resuming at a different time than
seeked to.

Send MEDIA_STARTED/PAUSED events only when playing (vs. when doing seek
previews)

Change-Id: I243ebf054303755ea8863229c3211694f2c204a7
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug: 10954008
wesomePlayer.cpp
8bc2df27f61c9ea959ea30face63049b1cf4c620 30-Sep-2013 Eric Laurent <elaurent@google.com> am f2c8b027: Merge "fix playback position after switching to offload" into klp-dev

* commit 'f2c8b02786c58b98d41d3f7c30e882cacc34e7ab':
fix playback position after switching to offload
c16c203047ca0f0d76573ead2c42764a78baf521 30-Sep-2013 Lajos Molnar <lajos@google.com> MediaCodecInfo: report supported color formats for non-native-window mode

Revert the change in behavior when checking for adaptive playback was
introduced.

Change-Id: I59dc2450a4299b912015f2e4c9ec018a19a20b84
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug: 10921537
MXCodec.cpp
f006989d8f222639ac170067d371e11daf0e76ae 30-Sep-2013 Rachad Alao <rachad@google.com> Merge "Change VP8 encoder bitrate" into klp-dev
0797fb709d2cdd35fe596b6089b259ad10d345d6 30-Sep-2013 Rachad Alao <rachad@google.com> Merge "Indicate sync frames returned by encoder" into klp-dev
3d97e23fcd78f752443cb6c30a1ee39f49f1f987 28-Sep-2013 Marco Nelissen <marcone@google.com> Merge "Prevent onPrepared callback from being called twice" into klp-dev
30c08634416a99a0f627e4de3a5f49dcf0a72fd3 28-Sep-2013 Johann <johannkoenig@google.com> Change VP8 encoder bitrate

Allow the bitrate to be updated while the encoder is running.

Bug: 8422347
Change-Id: I8427fe20921b00f92b8f99fe21691709fab354b0
odecs/on2/enc/SoftVPXEncoder.cpp
odecs/on2/enc/SoftVPXEncoder.h
42c5ae81036d4002da3fe1e3b1016131ba737e74 27-Sep-2013 Marco Nelissen <marcone@google.com> Prevent onPrepared callback from being called twice

b/10891995

Change-Id: If6845c832d114629282f0b03f904a37c3325208e
wesomePlayer.cpp
nclude/AwesomePlayer.h
91b0ca1a5bea44dd9b5196910186dd2927821994 27-Sep-2013 Eric Laurent <elaurent@google.com> fix playback position after switching to offload

After switching from offloaded track to PCM track
while paused (e.g. when connecting A2DP), playback
restarts from the beginning of the song when resuming.

Save current position before recreating an AudioPlayer
in AwesomePlayer::play_l() and seek to the saved position before
starting playback.
Also fix a problem where the position is not reported properly
by AudioPlayer if a seek is pending and queried just after start
and before the first buffer is read from the MediaSource.

Bug: 8174034.
Change-Id: I254e65418ff903a9bf2e2111b89a00e2e54876c5
udioPlayer.cpp
wesomePlayer.cpp
465da60d885c8fa4e7cea4626478574ce17a54a9 27-Sep-2013 Johann <johannkoenig@google.com> Indicate sync frames returned by encoder

Set the appropriate OMX flag when the encoder generates a keyframe. This
is necessary for any muxer which needs to indicate which frames are
seekable.

Bug: 8422347
Change-Id: I744a0b3023db24d3de2210bce82f41e50d259505
odecs/on2/enc/SoftVPXEncoder.cpp
ebf0e057d69259128a282e7c333b038b129a15f0 25-Sep-2013 Chong Zhang <chz@google.com> am 9843e8c9: am 58dd0786: Merge "Send kWhatConnected in onTimeUpdate() before first access unit" into klp-dev

* commit '9843e8c9446aec0c25168ff4561bdbb12948f1c7':
Send kWhatConnected in onTimeUpdate() before first access unit
9843e8c9446aec0c25168ff4561bdbb12948f1c7 25-Sep-2013 Chong Zhang <chz@google.com> am 58dd0786: Merge "Send kWhatConnected in onTimeUpdate() before first access unit" into klp-dev

* commit '58dd07863571951408b67fa0a7f17cb23606fb1c':
Send kWhatConnected in onTimeUpdate() before first access unit
4ec4818d19f2764cec5d3c724005907fd93ec0f7 25-Sep-2013 Lajos Molnar <lajos@google.com> am a35b4278: am 6c63fe0f: am ab70649e: Merge "MediaCodec: Pass the crop rect to SoftwareRenderer"

* commit 'a35b4278582175ee7e4082c0e93ddb4a83726f47':
MediaCodec: Pass the crop rect to SoftwareRenderer
a35b4278582175ee7e4082c0e93ddb4a83726f47 25-Sep-2013 Lajos Molnar <lajos@google.com> am 6c63fe0f: am ab70649e: Merge "MediaCodec: Pass the crop rect to SoftwareRenderer"

* commit '6c63fe0fdb33e5e7eb8c89f2420262b072cdd83f':
MediaCodec: Pass the crop rect to SoftwareRenderer
6539f82d55d4457bc84ed23d57967346022c56dc 25-Sep-2013 Martin Storsjo <martin@martin.st> MediaCodec: Pass the crop rect to SoftwareRenderer

Change-Id: I434411516eb5fafe9d7aeac9882bbc7f1a8415d8
ediaCodec.cpp
67606c31f41959589d46fbd9e845a2974a48e505 29-Aug-2012 Martin Storsjo <martin@martin.st> avcenc: Prepend startcodes to output buffers

This makes the encoder output data that is similar to what
actual HW encoders output. This form is also what is expected
by virtually every other component - the only exception
seems to be stagefright's MPEG4Writer which happens to work
with this format.

This also makes the encoder's output work in other decoders
when passing through directly. If feeding the encoded data
straight through to a decoder (such as in the EncodeDecodeTest
CTS test), the output from OMX.google.h264.encoder cannot be
decoded by e.g. OMX.Nvidia.h264.decode on a Nexus 7 or
OMX.SEC.avc.dec on a Galaxy S3.

Change-Id: I6e16433a4a66936e3080723c8233681f53bd55e5
odecs/avc/enc/SoftAVCEncoder.cpp
ffd5687c9ece8e28779793a20f06f99c7199ce44 24-Sep-2013 Chong Zhang <chz@google.com> Send kWhatConnected in onTimeUpdate() before first access unit

Bug: 10642588
Change-Id: If2b4fbbf250d5307e304f31c7aa4ac480e279484
tsp/MyHandler.h
a7868f92ec1a8ae2f7d68d435d971761a9b93150 24-Sep-2013 Marco Nelissen <marcone@google.com> Merge "Fix aac decoder flush"
ca1b3ee97a82a91c650da664ea2f2c47dbfaf621 20-Sep-2013 Marco Nelissen <marcone@google.com> Fix aac decoder flush

b/8543366

Change-Id: I746ffed6289486b802a2292bfc492ea6c780ed0b
odecs/aacdec/SoftAAC2.cpp
b81332964f2f3fb83f056b539a4eeea245bb7999 18-Sep-2013 Marco Nelissen <marcone@google.com> Merge "Fully reset SkipCutBuffer state in clear()"
a6cdabf38b29ee98bdb3e874b4e2978dbc409624 18-Sep-2013 Marco Nelissen <marcone@google.com> Fully reset SkipCutBuffer state in clear()

b/8543366

Change-Id: I1b90d56ba3d672fd12b4ee91fa9ba24c665126ed
kipCutBuffer.cpp
133531663cacc892f19edafac8b1edf244e054aa 18-Sep-2013 Lajos Molnar <lajos@google.com> am ec467110: am ab6c93b4: Merge "Use changed MediaCodec.PARAMETER_KEY_VIDEO_BITRATE value" into klp-dev

* commit 'ec467110f23ad98630d4fd504d647ac70d78f279':
Use changed MediaCodec.PARAMETER_KEY_VIDEO_BITRATE value
ec467110f23ad98630d4fd504d647ac70d78f279 18-Sep-2013 Lajos Molnar <lajos@google.com> am ab6c93b4: Merge "Use changed MediaCodec.PARAMETER_KEY_VIDEO_BITRATE value" into klp-dev

* commit 'ab6c93b4bea96dc4f44a7acfefee1e11a3abda5b':
Use changed MediaCodec.PARAMETER_KEY_VIDEO_BITRATE value
530fdbdc1b5491f3fbf172752834d1515701e142 18-Sep-2013 Lajos Molnar <lajos@google.com> Use changed MediaCodec.PARAMETER_KEY_VIDEO_BITRATE value

Change-Id: I157bcafbf705865e66c81517b1eab10c3daa039e
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug: 10461617
Codec.cpp
ifi-display/source/Converter.cpp
fc94bcfa39edcae9528a8e47a36a01626137841a 13-Sep-2013 Lajos Molnar <lajos@google.com> am 49d62d66: am 877c673c: Merge "ACodec: fix flush/resume for decoder-output-meta-data mode" into klp-dev

* commit '49d62d66a1578da3a2115ab9f5f128f8916659e4':
ACodec: fix flush/resume for decoder-output-meta-data mode
49d62d66a1578da3a2115ab9f5f128f8916659e4 12-Sep-2013 Lajos Molnar <lajos@google.com> am 877c673c: Merge "ACodec: fix flush/resume for decoder-output-meta-data mode" into klp-dev

* commit '877c673c3d3794e89e4677d448f38f77bdee7fdb':
ACodec: fix flush/resume for decoder-output-meta-data mode
c38fcfba95f711e5738e4c72bd5499317a2f30d9 12-Sep-2013 Lajos Molnar <lajos@google.com> ACodec: fix flush/resume for decoder-output-meta-data mode

When in decoder-output-meta-data mode, ACodec does not hold onto
buffers, but they are either with the native window, or with the
component/client. However, for flushing we did not release the
discarded buffers back to native window (this makes sense because
they will be resubmitted shortly.) This logic can be handled by
the normal resubmission.

Change-Id: Ic472b386422251515ef12f426e187f208f14decc
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug: 10621959
Bug: 10192533
Codec.cpp
0fc610ade6ecd2cec75df4b9d91ed3298601400a 12-Sep-2013 Chong Zhang <chz@google.com> am 33010b80: am a911f51c: Pass subtitle track properties to getTrackInfo

* commit '33010b80bc01d0000456c49a1c31b647c8a4aa61':
Pass subtitle track properties to getTrackInfo
33010b80bc01d0000456c49a1c31b647c8a4aa61 12-Sep-2013 Chong Zhang <chz@google.com> am a911f51c: Pass subtitle track properties to getTrackInfo

* commit 'a911f51c21430ac92f1d796b2338878fd98382e9':
Pass subtitle track properties to getTrackInfo
a911f51c21430ac92f1d796b2338878fd98382e9 07-Sep-2013 Chong Zhang <chz@google.com> Pass subtitle track properties to getTrackInfo

Bug: 10326117

Change-Id: I15fcc49ad02e26d7cc92e82ee670bafca62a09a7
ttplive/M3UParser.cpp
b4e04abed8d82d3bb31861740542e161df91321a 10-Sep-2013 Zhijun He <zhijunhe@google.com> am 1024ffd7: am 7f9551f7: MediaMuxer: Hook up setLocation method

* commit '1024ffd706ca10591e4cc8ebcd92605a00b516d0':
MediaMuxer: Hook up setLocation method
1024ffd706ca10591e4cc8ebcd92605a00b516d0 10-Sep-2013 Zhijun He <zhijunhe@google.com> am 7f9551f7: MediaMuxer: Hook up setLocation method

* commit '7f9551f75eedb3e4e1fe8feaaba48d8080635fc4':
MediaMuxer: Hook up setLocation method
7f9551f75eedb3e4e1fe8feaaba48d8080635fc4 10-Sep-2013 Zhijun He <zhijunhe@google.com> MediaMuxer: Hook up setLocation method

This method is needed when mediamuxer is used for camera video recording.

Bug: 10594784
Change-Id: I9bd006a07e5e2ac7019849e3f4f7cf7b8356d669
ediaMuxer.cpp
f040fec6317c04ab4f91315e4c46f51e47788238 06-Sep-2013 Marco Nelissen <marcone@google.com> am e0fdfdd5: am c23981d9: Merge "Better workaround for slow decoders." into klp-dev

* commit 'e0fdfdd5ded5893fcc5997261cc08b058dbbce9a':
Better workaround for slow decoders.
e0fdfdd5ded5893fcc5997261cc08b058dbbce9a 06-Sep-2013 Marco Nelissen <marcone@google.com> am c23981d9: Merge "Better workaround for slow decoders." into klp-dev

* commit 'c23981d9375d4a55f5701a4090b36deecda92f92':
Better workaround for slow decoders.
c23981d9375d4a55f5701a4090b36deecda92f92 06-Sep-2013 Marco Nelissen <marcone@google.com> Merge "Better workaround for slow decoders." into klp-dev
0d0cb392b89efb8b63748ad5f6772d2a59119b57 05-Sep-2013 Marco Nelissen <marcone@google.com> Merge "Fix decoder EOS handling"
6f9439efd2a6004b588605f6a9d4af20c98e8e80 05-Sep-2013 Marco Nelissen <marcone@google.com> Better workaround for slow decoders.

This is more in the spirit of the original code. Now it checks
whether a codec instantiated by name is a video codec, and enables
the extra looper if so.

b/10528409

Change-Id: Ia253c04c1283d4ecf66f213ef4bf523279ad7cca
ediaCodec.cpp
83da1fcb120a2d09642be74cf9091ab321a60c8f 05-Sep-2013 Chong Zhang <chz@google.com> am c74630bc: am a1991255: Merge "wifi-display: do not use HDCP\'s encryptNative method if its unsupported" into klp-dev

* commit 'c74630bcbdc6f9a88a019b7ced6fbe7a58675ea2':
wifi-display: do not use HDCP's encryptNative method if its unsupported
c74630bcbdc6f9a88a019b7ced6fbe7a58675ea2 05-Sep-2013 Chong Zhang <chz@google.com> am a1991255: Merge "wifi-display: do not use HDCP\'s encryptNative method if its unsupported" into klp-dev

* commit 'a19912554f3779fac0c341ac702227bf4b5fe399':
wifi-display: do not use HDCP's encryptNative method if its unsupported
a19912554f3779fac0c341ac702227bf4b5fe399 05-Sep-2013 Chong Zhang <chz@google.com> Merge "wifi-display: do not use HDCP's encryptNative method if its unsupported" into klp-dev
d089c2540e4f0897c166693f4f13e2023241720e 29-Aug-2013 Marco Nelissen <marcone@google.com> Fix decoder EOS handling

Conceptually it should be the same whether EOS is signalled on the last
buffer holding data, or an empty buffer that follows. Make it so that
this actually behaves the same for mp3, AAC and Vorbis.

b/8747869

Change-Id: Idece8ef45689a3ffaf70fb45d19862d7b93b2f92
odecs/aacdec/SoftAAC2.cpp
odecs/aacdec/SoftAAC2.h
odecs/mp3dec/SoftMP3.cpp
odecs/mp3dec/SoftMP3.h
odecs/vorbis/dec/SoftVorbis.cpp
odecs/vorbis/dec/SoftVorbis.h
207c699f14256df67ad0d289193783de5f07e62f 04-Sep-2013 Rachad <rachad@google.com> am 86df9e10: am c85d6196: Merge " Fixed timestamp handling in ESQueue Access Unit parser. This fixes bug b/10294801" into klp-dev

* commit '86df9e105cfb066e8bcf5ebd70226cceb9002d13':
Fixed timestamp handling in ESQueue Access Unit parser. This fixes bug b/10294801
86df9e105cfb066e8bcf5ebd70226cceb9002d13 04-Sep-2013 Rachad <rachad@google.com> am c85d6196: Merge " Fixed timestamp handling in ESQueue Access Unit parser. This fixes bug b/10294801" into klp-dev

* commit 'c85d61964cb6f9b23cd2e82e43d7052b3e7d4fbc':
Fixed timestamp handling in ESQueue Access Unit parser. This fixes bug b/10294801
c85d61964cb6f9b23cd2e82e43d7052b3e7d4fbc 04-Sep-2013 Rachad <rachad@google.com> Merge " Fixed timestamp handling in ESQueue Access Unit parser. This fixes bug b/10294801" into klp-dev
12406e0102996d920cafafada16049e69bd27eda 04-Sep-2013 Marco Nelissen <marcone@google.com> am b9ab60c0: am df60eff8: Merge "Work around decoder slowness" into klp-dev

* commit 'b9ab60c0d764933347849cdf13b7c9540be605a4':
Work around decoder slowness
b9ab60c0d764933347849cdf13b7c9540be605a4 04-Sep-2013 Marco Nelissen <marcone@google.com> am df60eff8: Merge "Work around decoder slowness" into klp-dev

* commit 'df60eff872f276c1a94ab0355b252b73fe61faa9':
Work around decoder slowness
df60eff872f276c1a94ab0355b252b73fe61faa9 04-Sep-2013 Marco Nelissen <marcone@google.com> Merge "Work around decoder slowness" into klp-dev
ec3acca4a75fc4adc076b56751124f507b419622 03-Sep-2013 Chong Zhang <chz@google.com> wifi-display: do not use HDCP's encryptNative method if its unsupported

Bug: 10609422
Change-Id: I005f1d04a4191b1503b5f3e895a98b8d6560c402
ifi-display/source/PlaybackSession.cpp
491211b87dd38357d37ece687cf8795bff8996a5 04-Sep-2013 Marco Nelissen <marcone@google.com> Work around decoder slowness

b/10528409

Change-Id: Ifcaf0488d63e87676b1e9382437943138deb76a6
ediaCodec.cpp
859a0f197e0c565d62d233c97ef8088c8eb4d0ac 03-Sep-2013 Jean-Michel Trivi <jmtrivi@google.com> am dfa989d2: am 572864b9: Merge "AAC encoder: handle missing object types" into klp-dev

* commit 'dfa989d2cd11c54a71b8b40c343a003032cf3cb9':
AAC encoder: handle missing object types
dfa989d2cd11c54a71b8b40c343a003032cf3cb9 03-Sep-2013 Jean-Michel Trivi <jmtrivi@google.com> am 572864b9: Merge "AAC encoder: handle missing object types" into klp-dev

* commit '572864b94e7882c2d23537525c708abcacde43b0':
AAC encoder: handle missing object types
572864b94e7882c2d23537525c708abcacde43b0 03-Sep-2013 Jean-Michel Trivi <jmtrivi@google.com> Merge "AAC encoder: handle missing object types" into klp-dev
bfb56d6b79e019dd6005f1de6b6ee245229dd279 31-Aug-2013 Eric Laurent <elaurent@google.com> am 1f8d1397: am e45a767e: Merge "Revert "Fix decoder EOS handling"" into klp-dev

* commit '1f8d1397837bdf3df8821f553384318a7b7086cf':
Revert "Fix decoder EOS handling"
1f8d1397837bdf3df8821f553384318a7b7086cf 31-Aug-2013 Eric Laurent <elaurent@google.com> am e45a767e: Merge "Revert "Fix decoder EOS handling"" into klp-dev

* commit 'e45a767e13fe3396185c9d378a70f7f11eb881d0':
Revert "Fix decoder EOS handling"
b6209a3d4c29bbb88de5a77546f4d545883cc484 31-Aug-2013 Eric Laurent <elaurent@google.com> Revert "Fix decoder EOS handling"

This reverts commit 9da36a6c8df70a5c8179ac78fab33cfbb5078cb2.

Bug: 10571297.
Change-Id: I76f20fe34872ea54fce626077462fb86c8c3f02e
odecs/aacdec/SoftAAC2.cpp
odecs/aacdec/SoftAAC2.h
odecs/mp3dec/SoftMP3.cpp
odecs/mp3dec/SoftMP3.h
odecs/vorbis/dec/SoftVorbis.cpp
odecs/vorbis/dec/SoftVorbis.h
fa51e09b30e884fed20b141783a7447599a6563e 31-Aug-2013 Rachad <rachad@google.com> Fixed timestamp handling in ESQueue Access Unit parser.
This fixes bug b/10294801

Change-Id: Ie96d36e2ff6fdee0c949a85da3602ab04b34bf6e
peg2ts/ESQueue.cpp
de8c85a9b0d91dc104b9da73353559b7a161c1a0 30-Aug-2013 Marco Nelissen <marcone@google.com> am b87a8152: am 9404fa6a: Merge "Fix decoder EOS handling" into klp-dev

* commit 'b87a815248e36c9a0a720c166ae152fe779bd64b':
Fix decoder EOS handling
b87a815248e36c9a0a720c166ae152fe779bd64b 30-Aug-2013 Marco Nelissen <marcone@google.com> am 9404fa6a: Merge "Fix decoder EOS handling" into klp-dev

* commit '9404fa6ac9f76f8f8d898e35f4fa03906a553e0a':
Fix decoder EOS handling
9404fa6ac9f76f8f8d898e35f4fa03906a553e0a 30-Aug-2013 Marco Nelissen <marcone@google.com> Merge "Fix decoder EOS handling" into klp-dev
9da36a6c8df70a5c8179ac78fab33cfbb5078cb2 29-Aug-2013 Marco Nelissen <marcone@google.com> Fix decoder EOS handling

Conceptually it should be the same whether EOS is signalled on the last
buffer holding data, or an empty buffer that follows. Make it so that
this actually behaves the same for mp3, AAC and Vorbis.

b/8747869

Change-Id: Idece8ef45689a3ffaf70fb45d19862d7b93b2f92
odecs/aacdec/SoftAAC2.cpp
odecs/aacdec/SoftAAC2.h
odecs/mp3dec/SoftMP3.cpp
odecs/mp3dec/SoftMP3.h
odecs/vorbis/dec/SoftVorbis.cpp
odecs/vorbis/dec/SoftVorbis.h
0553eeeed8f703e18654cbed91b04ccf8ccb9647 30-Aug-2013 Lajos Molnar <lajos@google.com> Merge "Fix test build for libstagefright_timedtext moudle"
4c22b2f1505ed4a017c865ff8af6fabfd328662b 30-Aug-2013 Eric Laurent <elaurent@google.com> am e3b8b6e3: Merge "AudioPlayer: timestamp fixes for compress offload" into klp-dev

* commit 'e3b8b6e3e3a78ec6f9978f56c4573e193866ef53':
AudioPlayer: timestamp fixes for compress offload
1b02586f0f41d82c80619cfc0d16cd3feb5eaec7 30-Aug-2013 Jean-Michel Trivi <jmtrivi@google.com> AAC encoder: handle missing object types

The audio object type for parametric stereo and lowdelay was not passed
to the FDK AAC encoder.

Bug 9428126

Change-Id: Ic32822afff8b1da6a2d80c1b65d514f24059fb29
odecs/aacenc/SoftAACEncoder2.cpp
50d9a8f7de5f79fa8a36489a53846d6653997e38 05-Aug-2013 Haynes Mathew George <hgeorge@codeaurora.org> AudioPlayer: timestamp fixes for compress offload

Use realtime queried from AudioTrack as the only time for compress
offload playback.

Change-Id: I314447637715c4864690c94173260165369146cb
udioPlayer.cpp
0ed75c699318584604727ba68e6b4411176dc8e1 29-Aug-2013 Chong Zhang <chz@google.com> am bdd467ed: Merge "Set PREPARING flag after setDataSource_l()" into klp-dev

* commit 'bdd467edb8550ab006c89a59b556759386e99898':
Set PREPARING flag after setDataSource_l()
fffe959060c5c5a2aeb45709e10fb1cc426ec732 29-Aug-2013 Sungsoo Lim <sungsoo@google.com> Fix test build for libstagefright_timedtext moudle

Change-Id: Id113743c1531509fbca7a1fa7125056d6d7f1213
imedtext/test/Android.mk
22f03209ceed3bcdf8c6558fcf02dc7699dde259 29-Aug-2013 Chong Zhang <chz@google.com> Set PREPARING flag after setDataSource_l()

Otherwise the reset_l() inside setDataSource_l() will get stuck
waiting for the PREPARING to be cleared.

Bug: 10426788
Change-Id: I7ccdf7abcea71cf150544c7cd3f4781e3a946b97
wesomePlayer.cpp
cb18b6987bb3c928b2ec69e344923b427ed39627 28-Aug-2013 Andreas Huber <andih@google.com> am af66fae1: am fb949d5d: Merge "Fix crash in MyHandler when sockets are not set."

* commit 'af66fae15f8c386ad884e5fa83db4eaef4c4f2ee':
Fix crash in MyHandler when sockets are not set.
fb949d5dc8a764e31fbd65bee87f59fcfeb6d848 28-Aug-2013 Andreas Huber <andih@google.com> Merge "Fix crash in MyHandler when sockets are not set."
f79d6e44ffd427cf9d331a95777cfbbcc99f72f1 27-Aug-2013 Chong Zhang <chz@google.com> am 33142e1e: Merge "wifi-display: pass session info to wifi display settings" into klp-dev

* commit '33142e1e318c0c766a385d88d2434f62f9e2dfe7':
wifi-display: pass session info to wifi display settings
24850793d3ca7e29d2ef553639d2e133c3983f7e 27-Aug-2013 Chong Zhang <chz@google.com> am 2484040e: Merge "MediaPlayer: add listener for raw track data" into klp-dev

* commit '2484040e0f413989e4edbe26ba3bf71122382af6':
MediaPlayer: add listener for raw track data
33142e1e318c0c766a385d88d2434f62f9e2dfe7 24-Aug-2013 Chong Zhang <chz@google.com> Merge "wifi-display: pass session info to wifi display settings" into klp-dev
2484040e0f413989e4edbe26ba3bf71122382af6 23-Aug-2013 Chong Zhang <chz@google.com> Merge "MediaPlayer: add listener for raw track data" into klp-dev
452e5cef4745f5a624376f68a0bb22adf8cb3b0e 22-Aug-2013 Eino-Ville Talvala <etalvala@google.com> am 4b820b0e: Camera1: Rename setPreviewTexture to ...Target for clarity

* commit '4b820b0e1fa069714b123fc35784541d0f94d267':
Camera1: Rename setPreviewTexture to ...Target for clarity
4b820b0e1fa069714b123fc35784541d0f94d267 21-Aug-2013 Eino-Ville Talvala <etalvala@google.com> Camera1: Rename setPreviewTexture to ...Target for clarity

Bug: 10312644
Change-Id: I19976188f0359bfd177209fb40145defdae9c740
ameraSource.cpp
87ecf19404586672008e98babc225e094292ceb5 06-Jun-2013 Chong Zhang <chz@google.com> wifi-display: pass session info to wifi display settings

Bug: 9371882

Change-Id: I9e4b8c2154b03ce8ff3e14c465a5224bb6e8db9a
ifi-display/source/WifiDisplaySource.cpp
ifi-display/wfd.cpp
8f34c1cc5efaa479ffffd821a750db9e7d87a9b1 19-Aug-2013 Jeff Brown <jeffbrown@google.com> am 7fb86565: Remove call to enable/disable remote submix from test program.

* commit '7fb865653293e665f48b31e791ca124e98c7d257':
Remove call to enable/disable remote submix from test program.
5eab65aa7bd40e907d11dca8aad69714ffef19f1 19-Aug-2013 Marco Nelissen <marcone@google.com> am ff58698e: am f36ae7ca: Merge "Added support for 3GPP meta data atoms"

* commit 'ff58698ec7e0f32bf9f3e1758173fe170e17270c':
Added support for 3GPP meta data atoms
f36ae7ca47dff5a5266f633bb36bf92308eec3f8 19-Aug-2013 Marco Nelissen <marcone@google.com> Merge "Added support for 3GPP meta data atoms"
dcb89b3b505522efde173c105a851c412f947178 06-Aug-2013 Chong Zhang <chz@google.com> MediaPlayer: add listener for raw track data

Bug: 10326117

Change-Id: I2c0bdf8adc67b11f8dc633423bee66897548f181
ttplive/Android.mk
ttplive/LiveSession.cpp
ttplive/LiveSession.h
ttplive/M3UParser.cpp
ttplive/M3UParser.h
ttplive/PlaylistFetcher.cpp
ttplive/PlaylistFetcher.h
7fb865653293e665f48b31e791ca124e98c7d257 16-Aug-2013 Jeff Brown <jeffbrown@google.com> Remove call to enable/disable remote submix from test program.

The submix will be controlled automatically from now on based on
whether there is an active audio recorder.

Bug: 10265163
Change-Id: Iea8164182daa037066f60974b54597d20db4903b
ifi-display/wfd.cpp
1cb4e1661e4144cb188c2c79b89804fcb902fd19 16-Aug-2013 Lajos Molnar <lajos@google.com> Merge "Add MEDIA_STARTED/PAUSED/STOPPED events to media players" into klp-dev
cbaffcffee6418d678806e63097c19fe26d48fe0 15-Aug-2013 Lajos Molnar <lajos@google.com> Add MEDIA_STARTED/PAUSED/STOPPED events to media players

This is needed for the MediaTimeProvider java interface, so it does not
continually poll for current media time.

Note: NuPlayer and AwesomePlayer do not correctly handle stop (pause
instead), so for those we will signal PAUSED.

Signed-off-by: Lajos Molnar <lajos@google.com>
Change-Id: I3c61e1bda475f131323f475c18a42e3ec66c9ae1
Bug: 10326117
wesomePlayer.cpp
nclude/AwesomePlayer.h
75c16dde986e16ac5fd4d34b06b0cc6a90679866 15-Aug-2013 Andreas Huber <andih@google.com> Merge "You can now opt-in to having the video decoder push blank buffers to the" into klp-dev
c13a958fba83dae63a8cf23b76b36a8fc8580aef 15-Aug-2013 Mathias Agopian <mathias@google.com> Merge "fix build. optional tests broke" into klp-dev
88c3c4acb13a93209b3572fecd585099defec184 15-Aug-2013 Mathias Agopian <mathias@google.com> fix build. optional tests broke

Change-Id: Ifb38fb2a7bd9c3d6305726f8e6d661be05cdcf7e
ests/SurfaceMediaSource_test.cpp
0167414e261f88a96b5e4bf6cb592e6ca11e5a95 14-Aug-2013 Andreas Huber <andih@google.com> You can now opt-in to having the video decoder push blank buffers to the

surface on the transition from executing->idle by specifying the key
"push-blank-buffers-on-shutdown" with a value of 1 in the call to configure.

Change-Id: I1155fccf89f18e717728c985e590651597595515
Codec.cpp
7f76a81b18ade3158ae27015637074ce08e837b2 14-Aug-2013 Lajos Molnar <lajos@google.com> Merge "Check adaptive playback support via CodecCapabilities" into klp-dev
2ee14000a38683220fb250d9e7300e1d71ccdaa0 07-Aug-2013 Lajos Molnar <lajos@google.com> Check adaptive playback support via CodecCapabilities

Added flags field to CodecCapabilities, so that applications
can query whether codecs support various features. For now
added one video-decoder feature:

kFlagSupportsAdaptivePlayback

Media playback applications can query it to see if a codec
supports seamless resolution changes, such as by supporting
dynamic output buffers.

Signed-off-by: Lajos Molnar <lajos@google.com>
Change-Id: I09da46e8ab6b8645fa2749e33128e49eda2e865b
Related-to-bug: 7093648
ediaCodecList.cpp
MXCodec.cpp
cd06d357ed4fcde991aa55dc97317d97cb287332 13-Aug-2013 Andreas Huber <andih@google.com> Merge "Optionally repeat the previously submitted frame to the encoder" into klp-dev
a61285dcf1da8a2cf40c499ee3a7b9fc4d74ac58 31-Jul-2013 Andreas Huber <andih@google.com> Optionally repeat the previously submitted frame to the encoder

if no new frame has been delivered by surface flinger within the timeout
interval.

Change-Id: I282f1b726dfe5646b178d7858d6f5d4f5a264fde
Codec.cpp
mx/GraphicBufferSource.cpp
mx/GraphicBufferSource.h
mx/OMXNodeInstance.cpp
fbc9d2b9cda433d98c36acb842c4a91fdeeb75e0 14-Dec-2012 Oscar Rydhé <oscar.rydhe@sonymobile.com> Added support for 3GPP meta data atoms

3GPP metadata is not supported, only iTunes Metadata
Format is supported.

Change-Id: I78b41c88788d5a43800c936e0ac0f98424515c62
PEG4Extractor.cpp
nclude/MPEG4Extractor.h
b8689b31813f55cbc1bf8e9ca0d46a9ee113e38a 12-Aug-2013 Andreas Huber <andih@google.com> Support for "request-sync" parameter in ACodec

Also returns errors to caller instead of asserting...

Change-Id: Id3018655a2b3da4289167fba16af907350a511ae
Codec.cpp
34242ac93467fc364bec435bf961283cd3d6ba0b 30-Jul-2013 Suresh Choudhary <sureshc@nvidia.com> StageFright: Removes hacks for Nvidia MPEG2 decoder

Removes the NVIDIA MPEG2 decoder specific hacks in legacy code as
Nvidia HW MPEG2 decoder is enabled and tested now.

Change-Id: Ifc67e1119d9741551336753f85f9cfdfd3fc8600
wesomePlayer.cpp
MXCodec.cpp
9bdc9c4ee0b44ca407cdca4499df9b3134bc5884 09-Aug-2013 Andreas Huber <andih@google.com> am bcd86896: am d0f5664a: Merge "Handle undefined NAL type for h264 streaming"

* commit 'bcd86896e486e303d285e13477e0623b2a920e78':
Handle undefined NAL type for h264 streaming
d0f5664abb5a8d94ae13f63a5f3491b47383ee2f 08-Aug-2013 Andreas Huber <andih@google.com> Merge "Handle undefined NAL type for h264 streaming"
89a70f71cef61d10437b3901e8efc1f082a857c5 07-Aug-2013 Lajos Molnar <lajos@google.com> Merge "IOMX: add updateGraphicBufferInMeta method for metadata mode"
d0715867861c216e88a4a7523b6da8a3cb128724 22-Jul-2013 Lajos Molnar <lajos@google.com> IOMX: add updateGraphicBufferInMeta method for metadata mode

This is used to set the handle in the metadata buffer that is
valid in the mediaserver process, as well as to keep a reference
for the graphic buffers in BufferMeta.

Change-Id: I46bb68d8bed894f357eeeb25368360d11b276634
Signed-off-by: Lajos Molnar <lajos@google.com>
Codec.cpp
MXClient.cpp
nclude/OMX.h
nclude/OMXNodeInstance.h
mx/OMX.cpp
mx/OMXNodeInstance.cpp
deeef54487a34034dc0cfaab20b20d557224c07c 02-Aug-2013 Mathias Agopian <mathias@google.com> separte producer and consumer interfaces

Bug: 9265647
Change-Id: Iefabc11e4bd2e2e8ffd31160476c450affe6629c
urfaceMediaSource.cpp
910813bd66eaf0f6a72769c9b3fa9830dd100a19 01-Aug-2013 Mathias Agopian <mathias@google.com> fix fallout from binderizing BufferQueues consumer side

Change-Id: I626bac6df4fc3d8478046193f06ecc7ea60dd3a8
urfaceMediaSource.cpp
mx/GraphicBufferSource.cpp
30873bfd08255e2c4e98ff5732ffff2838772617 31-Jul-2013 Andreas Huber <andih@google.com> Unregister any handlers still registered on now "dead" ALoopers

upon the death of an ALooper.

Change-Id: I64c0835b8db04486204f3d0fa7173ee53708a116
related-to-bug: 10106648
oundation/ALooper.cpp
oundation/ALooperRoster.cpp
9610adc395d18e474e6e35c0bc8b9c3220e6e525 31-Jul-2013 Andreas Huber <andih@google.com> am b57fb786: am d0ef1ccd: Merge "rtsp handle response line ended with \'\n\'"

* commit 'b57fb786a32d4ea78cd8bbf24a65593353d87a88':
rtsp handle response line ended with '\n'
3e3af91f70b20623fa5f3845f26260235c0b212d 14-May-2013 Yajun Zeng <beanz@marvell.com> rtsp handle response line ended with '\n'

Change-Id: I5bfafd3fa2c95083e833da2846556282eada2b02
Signed-off-by: Yajun Zeng <beanz@marvell.com>
tsp/ARTSPConnection.cpp
2314e90eb8de63a7058297817125b94c1eac8019 30-Jul-2013 Andreas Huber <andih@google.com> Merge "Fix typo in AwesomePlayer"
04022b34d2b97938b0926ab62e6c283418da3bba 29-Jul-2013 Marco Nelissen <marcone@google.com> Fail more gracefully on version mismatch

b/9900647

Change-Id: I9ea508a2685ff8adc780edd5ecec30dd1a9b0997
PEG4Extractor.cpp
a355bb4f5ce39a77d05f62263d4be888e903c4cd 16-Nov-2012 Patrik2 Carlsson <patrik2.carlsson@sonyericsson.com> Handle undefined NAL type for h264 streaming

Packages of undefined NAL type (0) was observed but lead to deleting
the subsequent package due to the current assembler implementation.
Identifying and ignoring this package without returning an error
handles undefined packages without side-effects.

Change-Id: I02e15b8682bee3154b3c4acf82639a28417f0c85
tsp/AAVCAssembler.cpp
94ea60f975c3eb7ce6d2a4430538a42a5fc3babd 14-May-2013 Richard Fitzgerald <rf@opensource.wolfsonmicro.com> stagefright: offload playback support

Offloading of compressed audio decoding to audio DSP
is implemented for audio only, non streamed content.
when the datasource is

AudioPlayer:
- Create an offloaded sink when playing a compressed
source
- Send metadata to audio HAL
- Return sink start error to AwesomePlayer so that a
new player for PCM audio can be created in case of problem.
- Forward stream end and tear down callback events to AwesomePlayer
- Stop the sink and wait for stream end callback when EOS is reached.
- Pause and restart the sink if needed before flushing when seeking
(otherwise flush is a no op).
- For current media time, directly query the render position from the
sink and offset by the start position (seek to time)

AwesomePlayer:

- When initializing the audio decoder, check with audio policy manager
if offloading is supported. If yes, create the software decoder in
case a reconfiguration is needed but connect the audio track directly
to the AudioPlayer.
- In case of error when starting the AudioPlayer, reconnect the software
decoder (OMXSource) and recreate a PCM AudioPlayer.
- Handle AudioPlayer tear down event by detroying and recreating the
AudioPlayer to allow transitions between situations were offloading
is supported or not.
- Force tear down of offloaded AudioPlayer when paused for a certain time:
This will close the sink and allow the DSP to power down.

Utils:
- Added helper methods:
- send meta data to audio ia sink setParameters
- query audio policy manager if offloading is supported for a
given audio content

Change-Id: I115842ce424f947b966d45e253a74d3fd5df9aae
Signed-off-by: Eric Laurent <elaurent@google.com>
ndroid.mk
udioPlayer.cpp
wesomePlayer.cpp
tils.cpp
nclude/AwesomePlayer.h
92cb8f928dc9e237c356c942d10b5c0c1e04b2ae 25-Jul-2013 Andy McFadden <fadden@android.com> Update error message

The color format used for surfaces has two different names. The
one in the error message is the "native" name, which doesn't mean
anything to external developers.

Change-Id: Ic0561f4ad12970b0e0a60bd17b4e3997af1a9f0e
mx/OMXNodeInstance.cpp
de7c96afc382ac73108116d3431342633fa4e489 24-Jul-2013 Andy McFadden <fadden@android.com> Merge "Don't abort on unusual state transition"
ba812e3b3ca0a0c9459fe29bbc211c9a73313b8b 23-Jul-2013 Andy McFadden <fadden@android.com> Don't abort on unusual state transition

The state transition check was too strict, and we were crashing
mediaserver inappropriately.

Bug 9819944

Change-Id: I1482ed1cfee37088d4893ee81cf1b2b950d2e930
mx/GraphicBufferSource.cpp
4e0a584cc349899782f44fc0720319f0e36ae219 23-Jul-2013 Geremy Condra <gcondra@google.com> Merge "Fix typo in socket name"
59d3f809024ae5b5a7ea35dcfdd056f1c7ca42b2 23-Jul-2013 Chad Brubaker <cbrubaker@google.com> Fix typo in socket name

Change-Id: I29171368f1b69333ef7eae53ada2fab94e3e28b9
tsp/MyHandler.h
0429aa9322a1419eae0b932491b22f300cd58206 23-Jul-2013 Geremy Condra <gcondra@google.com> Merge "Add routing sockets for the requesting user"
cd63212dedc29d72d4746a4070d018fdbca316a9 20-Jul-2013 Mathias Agopian <mathias@google.com> Merge "update to new Consumer APIs"
5908f88a7e45380a9b0d71a3b1ea535d76c420b3 16-Jul-2013 Chad Brubaker <cbrubaker@google.com> Add routing sockets for the requesting user

Mediaserver sockets are now routed as if the connection was in the
requesting app in per user routing.

Change-Id: I60f4649c3c4145a65264b54c1aa2c6c7741efaba
ndroid.mk
TTPBase.cpp
nclude/HTTPBase.h
tsp/ARTSPConnection.cpp
tsp/MyHandler.h
336da16a12423c496efba6ca9813d5d42a1f70f6 19-Jul-2013 Andreas Huber <andih@google.com> Enable support for explicitly requesting an encoded keyframe from the vp8

encoder.

Change-Id: I370d5831f7d6037faf361a92521390f19f179cbe
odecs/on2/enc/SoftVPXEncoder.cpp
odecs/on2/enc/SoftVPXEncoder.h
a05822a368dfc8c220b413c3d23dcc1af58b4b5f 19-Jul-2013 Andreas Huber <andih@google.com> Minor tweaks to DirectRenderer and Converter

Converter now supports automatic prepending of SPS/PPS to IDR frames (h264)
as well as using the encoder in "surface-input" mode.
The new features are all opt-in and should not affect existing clients.

Change-Id: I543cf1d31ba068c1a01ab4e6814ac8d817b63faa
ifi-display/sink/DirectRenderer.cpp
ifi-display/sink/DirectRenderer.h
ifi-display/source/Converter.cpp
ifi-display/source/Converter.h
ifi-display/source/PlaybackSession.cpp
20f4754b7e687d3718a0a0a585f2c9ac22e2567d 19-Jul-2013 Andreas Huber <andih@google.com> Merge "ANetworkSession and ParsedMessage are now part of stagefright foundation."
8060060217ff16cd67c8f6a15c649f44c343acf0 18-Jul-2013 Andreas Huber <andih@google.com> ANetworkSession and ParsedMessage are now part of stagefright foundation.

Also fixes some bugs in ParseMessage and adds "WebSocket" mode to
ANetworkSession, something that's opt-in and should not affect existing clients
of the API.

Change-Id: I86d5748e0d818231d85d3590d86c2b41d4f8b1f1
oundation/ANetworkSession.cpp
oundation/Android.mk
oundation/ParsedMessage.cpp
ifi-display/ANetworkSession.cpp
ifi-display/ANetworkSession.h
ifi-display/Android.mk
ifi-display/MediaReceiver.cpp
ifi-display/MediaSender.cpp
ifi-display/ParsedMessage.cpp
ifi-display/ParsedMessage.h
ifi-display/TimeSyncer.cpp
ifi-display/nettest.cpp
ifi-display/rtp/RTPReceiver.cpp
ifi-display/rtp/RTPSender.cpp
ifi-display/rtptest.cpp
ifi-display/sink/WifiDisplaySink.cpp
ifi-display/sink/WifiDisplaySink.h
ifi-display/source/MediaPuller.cpp
ifi-display/source/WifiDisplaySource.cpp
ifi-display/source/WifiDisplaySource.h
ifi-display/udptest.cpp
ifi-display/wfd.cpp
760874ca0ff100ed04d80495347f7e98424c838a 18-Jul-2013 Dima Zavin <dima@android.com> Merge "stagefright: set scaling mode for blank frames in ACodec"
87eb285dca94b20dc5f0ff8e60a0d395a4ca3be9 18-Jul-2013 Dima Zavin <dima@android.com> stagefright: set scaling mode for blank frames in ACodec

Analogous to 1d5ac80d0c6d3deabcc9e9b4abc9e3ef536aeb27
(by jgennis), this sets the scaling mode for the ANativeWindow
to SCALE_TO_WINDOW prior to pushing the blank frames during
decoder tear down.

Without this, the window defaults to FREEZE and SF ignores the
new frames.

Bug: 9516405
Change-Id: I39ef30922d733034bf01100d7ff24ac9c0c33b7d
Signed-off-by: Dima Zavin <dima@android.com>
Codec.cpp
0b83a15d97f61d575a7cffbf42f9ed6edfa25ccc 18-Jul-2013 Andreas Huber <andih@google.com> Merge "Support "suspension" of a video encoder in "surface-input" mode."
e40cda70eec141fa05cbcca1de420fdb22b98be6 17-Jul-2013 Andreas Huber <andih@google.com> Support "suspension" of a video encoder in "surface-input" mode.

i.e. feed no more input frames to the encoder while suspended.

Change-Id: I51391e18c1517548e869f8ddece19f4af37e78f9
Codec.cpp
MXClient.cpp
nclude/OMX.h
nclude/OMXNodeInstance.h
mx/GraphicBufferSource.cpp
mx/GraphicBufferSource.h
mx/OMX.cpp
mx/OMXNodeInstance.cpp
a0a63e13788a77bc502da0c72269d82c4779ac91 17-Jul-2013 Andreas Huber <andih@google.com> Experimental support for enabling the use of "surface input" mode

even with the software VP8 encoder.
This relies heavily on the fact that the "Nexus" devices use ARGB32 as
the colorspace for the data underlying a surface provided by SurfaceFlinger
(mirroring). Generally there are no such guarantees.

Change-Id: I1de32f591a3bb935ca76151816b3a02665bec40b
odecs/on2/enc/Android.mk
odecs/on2/enc/SoftVPXEncoder.cpp
odecs/on2/enc/SoftVPXEncoder.h
5e1f08b3917ac7900f8a11118afb7e8bf3e61c64 17-Jul-2013 Mathias Agopian <mathias@google.com> update to new Consumer APIs

Change-Id: I3c5d4be2a2e8783fbf98b3e268fd02658f71dc7d
urfaceMediaSource.cpp
mx/GraphicBufferSource.cpp
ceb1f0af56b5ff1f546438ec27321929956c705f 11-Jul-2013 Andy McFadden <fadden@android.com> Merge "Pass additional arg to acquireBuffer calls."
f90b123a3a67316284ba4b48a4fb0c5a36158545 10-Jul-2013 Sungsoo Lim <sungsoo@google.com> Fix typo in AwesomePlayer

Change-Id: I32113e382a3033c9a1b038dc06e4ccddc2a97d7f
wesomePlayer.cpp
656e86250cd68f7f362c50a4bc92a865e9deacbe 28-Jun-2013 Andy McFadden <fadden@android.com> Pass additional arg to acquireBuffer calls.

Bug 7900302

Change-Id: I30b9cca783e0a48f77035b745b7d5e20edf10f27
urfaceMediaSource.cpp
mx/GraphicBufferSource.cpp
9046684244e6adaf4db46f1a5e5b1fea221cd781 08-Jul-2013 Jean-Baptiste Queru <jbq@google.com> am 1468dd9c: am c582fde9: resolved conflicts for merge of c158971f to stage-aosp-master

* commit '1468dd9cefe11d5938a5497688f99701b6b14706':
Store rtsp accessunit until PLAY response parsed
1468dd9cefe11d5938a5497688f99701b6b14706 08-Jul-2013 Jean-Baptiste Queru <jbq@google.com> am c582fde9: resolved conflicts for merge of c158971f to stage-aosp-master

* commit 'c582fde93ded7219107157333a9e46d780adcf9c':
Store rtsp accessunit until PLAY response parsed
c582fde93ded7219107157333a9e46d780adcf9c 08-Jul-2013 Jean-Baptiste Queru <jbq@google.com> resolved conflicts for merge of c158971f to stage-aosp-master

Change-Id: I3d77b86f7e616af62a826fc37126706ad8ff6158
c158971f13ea4f496dc7836c698f1220fa4e4bba 08-Jul-2013 Jean-Baptiste Queru <jbq@google.com> Merge "Store rtsp accessunit until PLAY response parsed"
680e9b590abab6a6cc10062a5c09037d9445fbdd 08-Jul-2013 Jean-Baptiste Queru <jbq@google.com> am c26ab375: am 5d2ab2a6: am 8eef093c: Merge "libstagefright: Use LOG_BASIC when use chromium http stack"

* commit 'c26ab375ebb1bce6c3a99a46a72d8369170255ca':
libstagefright: Use LOG_BASIC when use chromium http stack
c26ab375ebb1bce6c3a99a46a72d8369170255ca 08-Jul-2013 Jean-Baptiste Queru <jbq@google.com> am 5d2ab2a6: am 8eef093c: Merge "libstagefright: Use LOG_BASIC when use chromium http stack"

* commit '5d2ab2a6d5e90c045d0989ef1be6c66a2295ee2d':
libstagefright: Use LOG_BASIC when use chromium http stack
90eb959ac9bd53049af73ed0ebf24b817a0a153a 08-Jul-2013 Jean-Baptiste Queru <jbq@google.com> am 046d9c8d: am 06197925: am 267363ee: Merge "Prevent Media Server crash while the AwesomePlayer getBitrate return true with mBitrate equals to zero."

* commit '046d9c8dad97118535778cf93efc662ceb5fec8d':
Prevent Media Server crash while the AwesomePlayer getBitrate return true with mBitrate equals to zero.
046d9c8dad97118535778cf93efc662ceb5fec8d 08-Jul-2013 Jean-Baptiste Queru <jbq@google.com> am 06197925: am 267363ee: Merge "Prevent Media Server crash while the AwesomePlayer getBitrate return true with mBitrate equals to zero."

* commit '061979253985e59c4fcb82ede232717736e633b1':
Prevent Media Server crash while the AwesomePlayer getBitrate return true with mBitrate equals to zero.
5d2ab2a6d5e90c045d0989ef1be6c66a2295ee2d 08-Jul-2013 Jean-Baptiste Queru <jbq@google.com> am 8eef093c: Merge "libstagefright: Use LOG_BASIC when use chromium http stack"

* commit '8eef093c213094c7efb655ef4d9e31439646bd7f':
libstagefright: Use LOG_BASIC when use chromium http stack
8eef093c213094c7efb655ef4d9e31439646bd7f 08-Jul-2013 Jean-Baptiste Queru <jbq@google.com> Merge "libstagefright: Use LOG_BASIC when use chromium http stack"
061979253985e59c4fcb82ede232717736e633b1 08-Jul-2013 Jean-Baptiste Queru <jbq@google.com> am 267363ee: Merge "Prevent Media Server crash while the AwesomePlayer getBitrate return true with mBitrate equals to zero."

* commit '267363ee2836ff9bc18d7fdd93aaedf19de546ad':
Prevent Media Server crash while the AwesomePlayer getBitrate return true with mBitrate equals to zero.
b9b8d14d89019ba7b9d183f0fbad2af924a0cd95 02-Jul-2013 hovanchen <hovanchen@fihspec.com> Prevent Media Server crash while the AwesomePlayer getBitrate return true with mBitrate equals to zero.

[Cause]
- getBitrate(int64_t *bitrate) will return true if mBitrate = 0.
- Then, in getCachedDuration_l(int64_t *durationUs, bool *eos),
we might execute the following function when
getBitrate(&bitrate) = true and bitrate = 0.
*durationUs = cachedDataRemaining * 8000000ll / bitrate;
- Mediaserver will be crashed when divided by zero.
- The mediaserver crash often occur when DLNA IOP tests on Golden DMS
with AAC_ADTS_320 audio.
[Solution]
- Prevent the divide function executing when bitrate is zero.

Change-Id: I4439d92cee5faec95df2109e9186c33b3fff6c66
wesomePlayer.cpp
1ab85ec401801ef9a9184650d0f5a1639b45eeb9 31-May-2013 Glenn Kasten <gkasten@google.com> Include what is needed

Remove old includes.
Header files only include other header files that they directly need themselves.

Change-Id: Ic471386808d9f42ea19ccbd59cb50a5f83a89dd0
ifi-display/sink/DirectRenderer.h
3b942668596cb7c4d927ffe0d250c69bbaf67386 29-Jun-2013 Andreas Huber <andih@google.com> am 0eefffd8: am 47a1fe04: am a9aa6baa: Merge "Set u.ext_data to null after it has been freed"

* commit '0eefffd8fc8abfbe694814fcec397aeac3f545b8':
Set u.ext_data to null after it has been freed
0eefffd8fc8abfbe694814fcec397aeac3f545b8 29-Jun-2013 Andreas Huber <andih@google.com> am 47a1fe04: am a9aa6baa: Merge "Set u.ext_data to null after it has been freed"

* commit '47a1fe04637793f48d808261b1fac47acc3de1e1':
Set u.ext_data to null after it has been freed
47a1fe04637793f48d808261b1fac47acc3de1e1 29-Jun-2013 Andreas Huber <andih@google.com> am a9aa6baa: Merge "Set u.ext_data to null after it has been freed"

* commit 'a9aa6baa5d86fc1a5bd37fc636d766d9e3ad2507':
Set u.ext_data to null after it has been freed
fca812565cebd229fba8be32bad14983c5252a7b 18-Jun-2013 Christer Fletcher <christer.fletcher@sonymobile.com> Set u.ext_data to null after it has been freed

SEGV_MAPPER crash could happen in MetaData::typed_data::freeStorage.
The faulty address could be both random pointers and deadbaad. It
seems like free could be called more than once on u.ext_data. Set
u.ext_data to null after it has been freed as there already is a
null check before trying to free it.

Change-Id: I710c49f9c231bd8852159914c0b2add58a685f0e
etaData.cpp
ad3af3305f024bcbbd55c894a4995e449498e1ba 25-Mar-2013 Richard Fitzgerald <rf@opensource.wolfsonmicro.com> Public API changes for audio offload support.

NOTE: this does _not_ include all private member variables added
to classes as part of offload support. Only public/protected functions
and stubs functions/variables needed to make the changes buildable.

- isOffloadSupported() added to audio policy service
A stub implementation is required to build, this always returns false
- setParameters() added to IAudioTrack
A stub implementation is required to build, this always returns
INVALID_OPERATION

- CBlk flag for stream end

- Change AudioSystem::getRenderPosition() to take an audio_output_t
so caller can specify which output to query

- Add AudioSystem::isOffloadSupported()
This is fully implemented down to the AudioFlinger function
AudioPolicyServer::isOffloadSupported() which is just a stub
that always returns false.

- Add EVENT_STREAM_END to AudioTrack interface.
STREAM_END is used to signal when the hardware has actually finished
playing all the data it was sent.

- Add event type enumeration to media player interface AudioSink callbacks
so that the same callback can be used to handle multiple types of
event. For offloaded tracks we also have to handle STREAM_END and
TEAR_DOWN events

- Pass audio_offload_info_t to various functions used for opening outputs,
tracks and audio players. This passes additional information about the
compressed stream down to the HAL when using offload.
For publicly-available APIs this is an optional parameter (for some of
the internal and low-level APIs around the HAL interface it is mandatory)

- Add getParameters() and setParameters() API to AudioTrack
Currently dummy implementations.

- Change AudioPlayer contructor so that it takes a set of bitflags defining what
options are required. This replaces the original bool which only specified
whether to use deep buffering.

- Changes to StageFright class definition related to handling tearing-down of
an offloaded track when we need to switch back to software decode

- Define new StageFright utility functions used for offloaded tracks
Currently dummy implementations.

- AudioFlinger changes to use extended audio_config_t.
Fills in audio_offload_info_t member if this info is passed in when
opening an output.

- libvideoeditor changes required to add the new event type parameter
to AudioSink callback functions

- libmediaplayerservice changes required to add the new event type parameter
to AudioSink callback functions

Change-Id: I3ab41138aa1083d81fe83b886a9b1021ec7320f1
Signed-off-by: Richard Fitzgerald <rf@opensource.wolfsonmicro.com>
Signed-off-by: Eric Laurent <elaurent@google.com>
udioPlayer.cpp
tils.cpp
nclude/AwesomePlayer.h
nclude/ESDS.h
3b6d6b1b95b9aefc4b2c78808ad7c873f1e8f0f5 26-Jun-2013 Lajos Molnar <lajos@google.com> Merge "Adds VP9 decoding support for stagefright."
d74a9ee83fd6e033fd2260ca3777390d7e5f817a 25-Jun-2013 Jean-Baptiste Queru <jbq@google.com> Merge "libstagefright: fix the duration "00:00" for some httplive link"
94705aff3c9eef58cbb72ec6fe5d2dcfd9481646 24-Jun-2013 hkuang <hkuang@google.com> Adds VP9 decoding support for stagefright.

Also change the VP8 encoder role name from
video_encoder.vpx to video_encoder.vp8 for
future VP9 encoder support.


Requires the change in frameworks/native and media_codecs.xml
corresponding to the device.


VP9 decoding test will be added to cts repo later.
Codec.cpp
ediaDefs.cpp
MXCodec.cpp
odecs/on2/dec/SoftVPX.cpp
odecs/on2/dec/SoftVPX.h
odecs/on2/enc/SoftVPXEncoder.cpp
odecs/on2/enc/SoftVPXEncoder.h
atroska/MatroskaExtractor.cpp
mx/SoftOMXPlugin.cpp
mx/tests/OMXHarness.cpp
054e7347cc60ad4b9dd2e8f456406f122f9f5879 03-May-2013 Lajos Molnar <lajos@google.com> stagefright: support for video decoder metadata mode

Change-Id: Id360f29236798163f9f3a82135f601083a8a5058
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug: 7093648
Codec.cpp
0063bbff7db6096a877deaaf48787ca78a3a37c8 18-Jun-2013 Marco Nelissen <marcone@google.com> Merge "Speed up id3v2 unsynchronization"
72a43b68da48890273508cb1c9d646b7d75fc101 18-Jun-2013 Marco Nelissen <marcone@google.com> Speed up id3v2 unsynchronization

Instead of doing many overlapping memmoves, do a single copy pass
that skips over the inserted unsynchronization bytes. For some
files this reduces parsing time from minutes to milliseconds.

b/9463262

Change-Id: I735b7051e77a093d86fb7a3e46209875946225ed
d3/ID3.cpp
d983cb0ca409eb6df6bc9dc0f19cb110a9cf098e 17-Jun-2013 Andreas Huber <andih@google.com> Merge "The software avc decoder would silently drop output frames if not"
2309d1a1ff016a31d9aa68272bcb471e64a26cfa 14-Jun-2013 Andreas Huber <andih@google.com> The software avc decoder would silently drop output frames if not

enough room was available in the output queue at the time they were
available. No more.

Change-Id: I5957290d40ba31bda7944271ec7f2aa0f1f7043c
odecs/on2/h264dec/SoftAVC.cpp
odecs/on2/h264dec/SoftAVC.h
e2ffd5b583da9d30d96710b0e8879e90b2b51d30 13-Jun-2013 Glenn Kasten <gkasten@google.com> AudioRecord must be used as sp<> only

Bug: 9423855
Change-Id: I78ba8228c60dff11fb466156bb632c5dda45cdaf
udioSource.cpp
9fef8d453b15a91a2b748faac2bfaff713bcf1e1 12-Jun-2013 Andreas Huber <andih@google.com> Converter now takes the desired _output_ format instead of the

input format, allowing control over the type of encoding.

Change-Id: Iaaa1a825f447ea130e373bbd8e5dc96f2762db18
ifi-display/source/Converter.cpp
ifi-display/source/Converter.h
ifi-display/source/PlaybackSession.cpp
63e9f73c2db01fec30246adbcfea2880671e2108 12-Jun-2013 Lajos Molnar <lajos@google.com> am f8af99b7: am 0662f7b6: Merge "stagefright: synchronously change nativewindow crop" into jb-mr2-dev

* commit 'f8af99b7c10f1441d9a52676724b168f20752270':
stagefright: synchronously change nativewindow crop
f8af99b7c10f1441d9a52676724b168f20752270 12-Jun-2013 Lajos Molnar <lajos@google.com> am 0662f7b6: Merge "stagefright: synchronously change nativewindow crop" into jb-mr2-dev

* commit '0662f7b6735df0a140f6512285d05f8f9a38bb98':
stagefright: synchronously change nativewindow crop
577db6d42b8d83b3578c7e56b1391bdaca9cb705 12-Jun-2013 Lajos Molnar <lajos@google.com> stagefright: synchronously change nativewindow crop

Only change the nativewindow crop before queuing frames
with the new crop.

Change-Id: Icd8a84c82e66a8be3d6bc1675c777b1de8dc39b9
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug: 9395753
Codec.cpp
d1fffa24d9b5d0d6f5ff9eda372befe114ceefb6 07-Jun-2013 Mike Lockwood <lockwood@google.com> Remove "LOCAL_MODULE_TAGS := debug" for stagefright tests

Change-Id: I53815d2f6d7dfe7eebb26c3802eb3d195244aab1
ifi-display/Android.mk
7f616d3cc5366a4b8af20d3d0c768e3de1df0666 05-Jun-2013 Lajos Molnar <lajos@google.com> stagefright: created SoftVideoDecoderOMXComponent

Created common base class for all software video decoders to make
adding new features easier.

Change-Id: Id89964e572d5cc5add02662273e6ae96c6b7eb12
Signed-off-by: Lajos Molnar <lajos@google.com>
odecs/m4v_h263/dec/SoftMPEG4.cpp
odecs/m4v_h263/dec/SoftMPEG4.h
odecs/on2/dec/SoftVPX.cpp
odecs/on2/dec/SoftVPX.h
odecs/on2/h264dec/SoftAVC.cpp
odecs/on2/h264dec/SoftAVC.h
nclude/SoftVideoDecoderOMXComponent.h
mx/Android.mk
mx/SoftVideoDecoderOMXComponent.cpp
269a355679fce6a71523faeefc2ff575abbd1a8e 05-Jun-2013 Lajos Molnar <lajos@google.com> Track exact timestamps in SoftMPEG4/H263 decoders

Change-Id: I7772e3afec020f889dea80fd6372afbc36cd68d6
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug: 9285553
(cherry picked from commit e113aa1f078cb3d5f8182058e144fd14ce945fca)
odecs/m4v_h263/dec/SoftMPEG4.cpp
odecs/m4v_h263/dec/SoftMPEG4.h
53b0a2b1f9cb6b99b3f0d1a639921d1b24bc30b7 05-Jun-2013 Lajos Molnar <lajos@google.com> Reset PV decoder on SoftMPEG4 decoder reset

Otherwise, state may be undefined for subsequent frames.

Change-Id: Icdc0126247e1422eba21f2008a04cf7867d93f5d
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug: 9284771
(cherry picked from commit 0f15875b8e80fb49a3b18d88964b063326f307b9)
odecs/m4v_h263/dec/SoftMPEG4.cpp
c92ed3339b533afbfb94893de6bb10bc2c0951e9 04-Jun-2013 Andreas Huber <andih@google.com> Merge "Fix uninitialized variable error in HLS bandwidth determination."
8a8bc6839910009e3568831415555d5e173d9bee 04-Jun-2013 Andreas Huber <andih@google.com> Merge "Fix our software decoders to reset (more of) their internal state"
673158582c9589cee1d5e4d7c79622609938b8f8 04-Jun-2013 Andreas Huber <andih@google.com> Fix uninitialized variable error in HLS bandwidth determination.

Change-Id: I647e79443f2a06e5b1b4f9068c02b424b0e57989
ttplive/LiveSession.cpp
d94e716af0e49d775f0c0c4f36dd2c136ba5f2b2 04-Jun-2013 Andreas Huber <andih@google.com> Fix our software decoders to reset (more of) their internal state

properly on a transition from idle->loaded.

Change-Id: I56ccfeef24c391e50e42b522194206e35c7ab700
related-to-bug: 9105408
odecs/aacdec/SoftAAC2.cpp
odecs/amrnb/dec/SoftAMR.cpp
odecs/amrnb/dec/SoftAMR.h
odecs/m4v_h263/dec/SoftMPEG4.cpp
odecs/m4v_h263/dec/SoftMPEG4.h
odecs/mp3dec/SoftMP3.cpp
odecs/on2/dec/SoftVPX.cpp
odecs/on2/dec/SoftVPX.h
odecs/on2/h264dec/SoftAVC.cpp
odecs/on2/h264dec/SoftAVC.h
odecs/vorbis/dec/SoftVorbis.cpp
e64d41332776e3c91f51c3239589695bf2cd0aeb 03-Jun-2013 Lajos Molnar <lajos@google.com> am 25b5617c: Merge "stagefright: Fix port-reconfiguration & output-buffer-filled race condition" into jb-mr2-dev

* commit '25b5617c56488fe5413473ffae6b43f6c5bddc96':
stagefright: Fix port-reconfiguration & output-buffer-filled race condition
25b5617c56488fe5413473ffae6b43f6c5bddc96 03-Jun-2013 Lajos Molnar <lajos@google.com> Merge "stagefright: Fix port-reconfiguration & output-buffer-filled race condition" into jb-mr2-dev
587f8425a9522b2d0fe1ae0d211a259ec83786d1 03-Jun-2013 Glenn Kasten <gkasten@google.com> Merge "Use sp<AudioTrack> instead of raw AudioTrack *"
b756239ac620d57bc602f529acd1e5e35d61d743 03-Jun-2013 Chong Zhang <chz@google.com> Merge "wifi-display: fix resolution list and keepalive interval"
2799d743ee2ae5a25fe869a7f9c052acc029559f 30-May-2013 Glenn Kasten <gkasten@google.com> Use sp<AudioTrack> instead of raw AudioTrack *

This change prepares for the new implementation of AudioTrack client, which
will require clients to use only sp<AudioTrack>, not raw AudioTrack *.
A raw delete will cause a race condition during AudioTrack destruction.

AudioTrack was made a RefBase by commit b68a91a70bc8d0d18e7404e14443d4e4020b3635
on 2011/11/15, when it was needed by OpenSL ES (for the callback protector).
At that time, the only other client that was also converted from
AudioTrack * to sp<AudioTrack> was android.media.AudioTrack JNI in
project frameworks/base (file android_media_AudioTrack.cpp).

Details:
* Use .clear() instead of delete followed by = NULL.
* ALOG %p need .get().
* sp<> don't need to be listed in constructor initializer, if initially 0.
* Use == 0 for sp<> vs == NULL for raw pointers.
* Use if (sp != 0) instead of if (raw).

Change-Id: Ic7cad25795d6e862e112abdc227b6d33afdfce17
udioPlayer.cpp
7c684c622110af460025eff85082030947278430 03-Jun-2013 Andreas Huber <andih@google.com> am f9bb8358: am b7319a7e: Update HTTP proxy configuration for all media playback inside stagefright.

* commit 'f9bb8358e454be6dc88403171db7e0e182407f17':
Update HTTP proxy configuration for all media playback inside stagefright.
f9bb8358e454be6dc88403171db7e0e182407f17 03-Jun-2013 Andreas Huber <andih@google.com> am b7319a7e: Update HTTP proxy configuration for all media playback inside stagefright.

* commit 'b7319a7eb0a06ef4fd3a0c9157ee63e637ad7aa1':
Update HTTP proxy configuration for all media playback inside stagefright.
b7319a7eb0a06ef4fd3a0c9157ee63e637ad7aa1 29-May-2013 Andreas Huber <andih@google.com> Update HTTP proxy configuration for all media playback inside stagefright.

Change-Id: Ie0dd00045aba668d8b49da73224e7a7c9c04f69b
related-to-bug: 8873723
(cherry picked from commit 2704965b8a1ff3b7450ff58ccecf86d8ec688c40)
TTPBase.cpp
hromium_http/ChromiumHTTPDataSource.cpp
hromium_http/chromium_http_stub.cpp
hromium_http/support.cpp
hromium_http/support.h
hromium_http_stub.cpp
nclude/ChromiumHTTPDataSource.h
nclude/HTTPBase.h
nclude/chromium_http_stub.h
e532d37cf9342abbca398e4ce671b880369d90c6 27-Apr-2013 Lajos Molnar <lajos@google.com> stagefright: Fix port-reconfiguration & output-buffer-filled race condition

Remove the invalid assumption that when a port-reconfiguration event
is received, buffers cannot be downstream (waiting to be rendered).

Luckily, these buffers are properly handled (freed) after they are
sent to be rendered.

Change-Id: I1df39c1ffc2bfb96f8b7b4ee5be07cae654f956f
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug: 8736466
Codec.cpp
14f7672b5d450ed26a06fd3bb3ce045ea78b11b2 15-Jan-2013 Andreas Huber <andih@google.com> New HLS implementation supporting independent stream sources, audio-only streams

and more.

Change-Id: Icfc45a0100243b2f7a14a9e65696be45b67d6495
Codec.cpp
ndroid.mk
oundation/AHierarchicalStateMachine.cpp
ttplive/Android.mk
ttplive/LiveSession.cpp
ttplive/LiveSession.h
ttplive/M3UParser.cpp
ttplive/M3UParser.h
ttplive/PlaylistFetcher.cpp
ttplive/PlaylistFetcher.h
d3/ID3.cpp
nclude/ID3.h
nclude/LiveSession.h
nclude/M3UParser.h
nclude/MPEG2TSExtractor.h
peg2ts/AnotherPacketSource.cpp
peg2ts/AnotherPacketSource.h
peg2ts/MPEG2TSExtractor.cpp
1ad3eb9441eb509c792c61aa0181b0e74dbe9984 31-May-2013 Chong Zhang <chz@google.com> wifi-display: fix resolution list and keepalive interval

- add all resolutions lower than 1280x720p30

- schedule next keepalive when sending M16

bug 9116665

Change-Id: I7b3fea2101d3d882c0af5c153af5c502b8ce98f6
ifi-display/VideoFormats.cpp
ifi-display/VideoFormats.h
ifi-display/source/WifiDisplaySource.cpp
fbb70ce416b193655fbe5ff7f6c8676050bdf524 31-May-2013 Chong Zhang <chz@google.com> Merge "wifi-display: fixes for PAUSE/PLAY state"
aa603c40dadca5d6886ea0e7a39a91aeadd9615f 30-May-2013 Marco Nelissen <marcone@google.com> Merge "Edit list uses timescale from movie header"
a40cc472d26e36a23d00078cb925c3889d1fc0a0 30-May-2013 Vineeta Srivastava <vsrivastava@google.com> Merge "libstagefright: Check for duration > 0 to avoid divide-by-zero exception"
fc80e9ec5582770cb5a7fef172af3b52625ecce7 30-May-2013 Marco Nelissen <marcone@google.com> Edit list uses timescale from movie header

not from track media header

Change-Id: I24063183f44027b999782cc9006e9a1b56e87355
PEG4Extractor.cpp
nclude/MPEG4Extractor.h
bd25dacce1187c827dde3fb72036c044c8106719 30-May-2013 Chong Zhang <chz@google.com> wifi-display: fixes for PAUSE/PLAY state

PAUSE could be initiated by either source (via trigger method)
or sink, in latter case we have to allow PAUSE from PLAYING state.
Similarly PLAY should be allowed from PAUSED state.

Bug: 8922515

Change-Id: I475534aa4ffa6dc6844f59c5868d8f88291019ae
ifi-display/source/WifiDisplaySource.cpp
c3a73bb6446df8c1387a2b3ff9357190f515eccb 30-May-2013 Lajos Molnar <lajos@google.com> am 1cd68527: am 41688da2: Merge "MediaMuxer: Remove SAMPLE_FLAG_SYNC flag" into jb-mr2-dev

* commit '1cd68527a6c4cc92608dfe8a8c6ba51e5e2c4fc2':
MediaMuxer: Remove SAMPLE_FLAG_SYNC flag
1cd68527a6c4cc92608dfe8a8c6ba51e5e2c4fc2 30-May-2013 Lajos Molnar <lajos@google.com> am 41688da2: Merge "MediaMuxer: Remove SAMPLE_FLAG_SYNC flag" into jb-mr2-dev

* commit '41688da226e91c97ea3b2fe096044e1e5b0520bc':
MediaMuxer: Remove SAMPLE_FLAG_SYNC flag
210efd48ed21ca0084d9440f9a1db7d9878f8094 29-May-2013 Marco Nelissen <marcone@google.com> Don't crash if no timescale was given

b/9175577

Change-Id: Ie159a9c9b42e6c8d9366d0ef6a607234af569e36
PEG4Extractor.cpp
776a0023f5146423e88474c35691eb0e20fc8102 23-May-2013 Ajay Dudani <adudani@codeaurora.org> libstagefright: Check for duration > 0 to avoid divide-by-zero exception

Change-Id: I58ccacbf7ede892dff9626715162ea7b1f2ddbc6
wesomePlayer.cpp
6f505a4c0b91d88d2759fbd7e17d91f3ed715165 28-May-2013 Lajos Molnar <lajos@google.com> MediaMuxer: Remove SAMPLE_FLAG_SYNC flag

MediaMuxer.writeSampleData() uses MediaCodec.BufferInfo
objects to specify the flags, so use directly the MediaCodec
flags. This is more intuitive and avoids users of the
MediaMuxer API having to create translations between
MediaMuxer's and MediaCodec's flag constants.

Change-Id: I18e12a6839ffb2c63da62516a4dc4c94e8bb3d17
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug: 9169479
ediaMuxer.cpp
1f02e27d0d8be96dd9d2c515b3e2c1fbf28b1922 24-May-2013 Marco Nelissen <marcone@google.com> Merge "Add support for MPEG editlist gapless info"
0a69bd281c76bf777ddb51d0c6c08519634b192d 24-May-2013 Marco Nelissen <marcone@google.com> Add support for MPEG editlist gapless info

Change-Id: I862d89c805d738db9bdf81a8f1c5b317ff968dff
PEG4Extractor.cpp
d030447b617105b31bf3013e5e4b39d422b53b77 15-May-2013 Lajos Molnar <lajos@google.com> stagefright: BufferProducer updates

Update BufferQueue and ConsumerBase users to new BufferQueue
API, to allow BufferQueue slots to be reused. Buffer consumers
generally now need to track the unique frameNumber belonging to
each frame acquired if they are using BufferQueue directly.
Otherwise, they can simply track the graphicBuffer.

Change-Id: I30ee3158cf40fb10bbd085241646d5f1128ee480
Signed-off-by: Lajos Molnar <lajos@google.com>
Related-to-bug: 7093648
urfaceMediaSource.cpp
mx/GraphicBufferSource.cpp
mx/GraphicBufferSource.h
a02eae5e911f3bdc3f84f39c0ef223261b646128 22-May-2013 Lajos Molnar <lajos@google.com> stagefright: SoftVP8: Handle EOS flag on frames with content.

SoftVP8 decoder ignored frame content if EOS flag was set on
input frame. Now, decode the frame first, unless it is empty.

Change-Id: Id105a9eb86103a61390af3de60cae2507028e2d1
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug: 9091495
odecs/on2/dec/SoftVPX.cpp
6077b51013d935f626d430281c826d4ad5b8ba64 21-May-2013 Jamie Gennis <jgennis@google.com> am 9545b670: am f21daf47: Merge "Avoid a deadlock during EmptyBufferDone" into jb-mr2-dev

* commit '9545b6707e8c2213806c71fa9b0cae608b8bc032':
Avoid a deadlock during EmptyBufferDone
9545b6707e8c2213806c71fa9b0cae608b8bc032 21-May-2013 Jamie Gennis <jgennis@google.com> am f21daf47: Merge "Avoid a deadlock during EmptyBufferDone" into jb-mr2-dev

* commit 'f21daf4718bbd5662eae843f5a56e039bd34a2f4':
Avoid a deadlock during EmptyBufferDone
1b4ca5cebd7f42a8f8842e45bfabe19001e9a435 20-May-2013 Andreas Huber <andih@google.com> Avoid a deadlock during EmptyBufferDone

The deadlock happens withen in the case where we use an OMX encoder with a
GraphicBufferSource.

Bug: 8329090
Change-Id: Icec58bb85ff3839ad1a2e3eca02fa9d6d133ca45
mx/OMXNodeInstance.cpp
308bcaa44e578279e61be32b572fdb0b11b1e4c7 04-May-2013 Chong Zhang <chz@google.com> wifi-display: add support for metadata mode on encoder output

pass buffer_handle_t from encoder output to HDCP encryptor input

Bug: 8968123

Change-Id: Iea8007ce568641e213fd2e3cf6947a6f7a95746c
Codec.cpp
ifi-display/MediaSender.cpp
ifi-display/VideoFormats.cpp
ifi-display/VideoFormats.h
ifi-display/source/Converter.cpp
ifi-display/source/Converter.h
ifi-display/source/PlaybackSession.cpp
ifi-display/source/PlaybackSession.h
ifi-display/source/TSPacketizer.cpp
ifi-display/source/WifiDisplaySource.cpp
ifi-display/source/WifiDisplaySource.h
bd398c64c368615a810c9658798dbe8ec44978e8 17-May-2013 Mathias Agopian <mathias@google.com> am 074eb387: am e2dfa5a4: Merge "update to Fence::waitForever() API change" into jb-mr2-dev

* commit '074eb387091ca464257601a2d23020e3e10a6915':
update to Fence::waitForever() API change
074eb387091ca464257601a2d23020e3e10a6915 17-May-2013 Mathias Agopian <mathias@google.com> am e2dfa5a4: Merge "update to Fence::waitForever() API change" into jb-mr2-dev

* commit 'e2dfa5a4ea3459b155b4b403b7dafe2116d960d4':
update to Fence::waitForever() API change
e2dfa5a4ea3459b155b4b403b7dafe2116d960d4 17-May-2013 Mathias Agopian <mathias@google.com> Merge "update to Fence::waitForever() API change" into jb-mr2-dev
586e14cc0bbc2b259e4db2f3d77afa3759b205c0 17-May-2013 Andy McFadden <fadden@android.com> am b07d3c48: am 4224dedf: Merge "Adjust timestamp scale" into jb-mr2-dev

* commit 'b07d3c48ea7dcb5bb41c8f5d93b23ac6c42b15dc':
Adjust timestamp scale
b07d3c48ea7dcb5bb41c8f5d93b23ac6c42b15dc 17-May-2013 Andy McFadden <fadden@android.com> am 4224dedf: Merge "Adjust timestamp scale" into jb-mr2-dev

* commit '4224dedff0451e0aea3b8f5c3aaf5f2ad0eac1dd':
Adjust timestamp scale
4224dedff0451e0aea3b8f5c3aaf5f2ad0eac1dd 17-May-2013 Andy McFadden <fadden@android.com> Merge "Adjust timestamp scale" into jb-mr2-dev
d76442421eadfa73f2f3a9e50f6caf65b0dd1ce9 17-May-2013 Mathias Agopian <mathias@google.com> update to Fence::waitForever() API change

Bug: 8988871
Change-Id: I24a2620d356f3bb6207ed834c79fd3e48b429695
urfaceMediaSource.cpp
mx/GraphicBufferSource.cpp
d392f215e15b4737e9e1232b4eeba757303ced26 16-May-2013 Chong Zhang <chz@google.com> am b5b2d03f: am 99f27cdf: wifi-display: retry UDP read/write to improve connection robustness

* commit 'b5b2d03fc2c154a613ba68b599cd474b3e6ccec3':
wifi-display: retry UDP read/write to improve connection robustness
b5b2d03fc2c154a613ba68b599cd474b3e6ccec3 16-May-2013 Chong Zhang <chz@google.com> am 99f27cdf: wifi-display: retry UDP read/write to improve connection robustness

* commit '99f27cdf2c2711aa0c8b4d9ae4d12cae37ff94f6':
wifi-display: retry UDP read/write to improve connection robustness
324143b1531328bc4e53c6cbd962c9a457d73707 16-May-2013 Andy McFadden <fadden@android.com> Adjust timestamp scale

BufferQueue item timestamps are in nanoseconds, MediaCodec buffer
timestamps are in microseconds. Adjust.

Bug 8988357

Change-Id: Ib12824d7eea0316a14543c756e3a127c0866db6b
mx/GraphicBufferSource.cpp
mx/GraphicBufferSource.h
99f27cdf2c2711aa0c8b4d9ae4d12cae37ff94f6 16-May-2013 Chong Zhang <chz@google.com> wifi-display: retry UDP read/write to improve connection robustness

Bug: 8922753
Change-Id: Ie6d18f03afcb23d11e6f0e63403e8f0d59b70be8
ifi-display/ANetworkSession.cpp
d64993741048110ead714a2c1c49907cfe38c065 15-May-2013 Chong Zhang <chz@google.com> am be06e9fc: am 6ed6a2e6: Merge "wifi-display: misc fixes for M3 response parsing" into jb-mr2-dev

* commit 'be06e9fcdee1b02d29681c73c42a23a530f25d13':
wifi-display: misc fixes for M3 response parsing
03b7bddfe1326d1e3148c240ff4a14fa84270a99 15-May-2013 Chong Zhang <chz@google.com> am 6ed6a2e6: Merge "wifi-display: misc fixes for M3 response parsing" into jb-mr2-dev

* commit '6ed6a2e615e19d8c7c37e2a8ac017c01a74ba876':
wifi-display: misc fixes for M3 response parsing
be06e9fcdee1b02d29681c73c42a23a530f25d13 15-May-2013 Chong Zhang <chz@google.com> am 6ed6a2e6: Merge "wifi-display: misc fixes for M3 response parsing" into jb-mr2-dev

* commit '6ed6a2e615e19d8c7c37e2a8ac017c01a74ba876':
wifi-display: misc fixes for M3 response parsing
614e95449a04ca495cddfa435fddca2945d03572 13-May-2013 Andreas Huber <andih@google.com> Fix receiver report handling.

Not adjusting the size of the buffer would in effect only add a single
report block (the last one added would survive) and a whole lot of
uninitialized data to the report.

Change-Id: I5b4353d6d8c3becb1bc102afd42385b7851b1c3a
ifi-display/rtp/RTPReceiver.cpp
bbbf9c4552402ab18b255f4058e9e6e506f3f106 24-Apr-2013 Yajun Zeng <beanz@marvell.com> Store rtsp accessunit until PLAY response parsed

If RTP accessunit comes earlier than play response,
the normal play time mapping posted in func onAccessUnitComplete is wrong.
This leads wrong timestamp of the first few frames.
This issue is found in the 3 CtsVerifier RTSP streaming cases.

Change-Id: I640eea375b1f3f4730238f9d561c3b40ec682395
Signed-off-by: Yajun Zeng <beanz@marvell.com>
tsp/MyHandler.h
3573574071b44f9c02fb4784610c23c8cedd8b3e 09-May-2013 Chong Zhang <chz@google.com> wifi-display: misc fixes for M3 response parsing

- fix wfd_video_format parsing w/ multiple H264-Codec
- fix handling of CRLF at end of M3 response
- fix missing wfd_client_rtp_ports

Bug: 8871667
Bug: 8875749

Change-Id: Idb0b5605313bba6ff067bcd765512bbed42e5202
ifi-display/Parameters.cpp
ifi-display/VideoFormats.cpp
ifi-display/VideoFormats.h
ifi-display/source/WifiDisplaySource.cpp
aef5c98cd3f67e0209e1fa28489078e9f40d6f46 09-May-2013 Chong Zhang <chz@google.com> wifi-display: misc fixes for M3 response parsing

- fix wfd_video_format parsing w/ multiple H264-Codec
- fix handling of CRLF at end of M3 response
- fix missing wfd_client_rtp_ports

Bug: 8871667
Bug: 8875749

Change-Id: Idb0b5605313bba6ff067bcd765512bbed42e5202
ifi-display/Parameters.cpp
ifi-display/VideoFormats.cpp
ifi-display/VideoFormats.h
ifi-display/source/WifiDisplaySource.cpp
d7107bf350e6e7720ab412396891348b092f330b 11-May-2013 Marco Nelissen <marcone@google.com> am b12caf7b: am 519f7624: Merge "Don\'t render buffers that have size 0" into jb-mr2-dev

* commit 'b12caf7be3759c6b322fe82792f7c6fbc3600c0c':
Don't render buffers that have size 0
b12caf7be3759c6b322fe82792f7c6fbc3600c0c 11-May-2013 Marco Nelissen <marcone@google.com> am 519f7624: Merge "Don\'t render buffers that have size 0" into jb-mr2-dev

* commit '519f7624696cf43a7fafe21fd2108deaad0bfe4a':
Don't render buffers that have size 0
d702ba16a9ca43a36be0f6f198268e5d1466879c 11-May-2013 Marco Nelissen <marcone@google.com> am 519f7624: Merge "Don\'t render buffers that have size 0" into jb-mr2-dev

* commit '519f7624696cf43a7fafe21fd2108deaad0bfe4a':
Don't render buffers that have size 0
6aade6058521b0dbd35a9a4620f4d04f02f90444 09-May-2013 Marco Nelissen <marcone@google.com> Don't render buffers that have size 0

b/8857451

Change-Id: I12a31a2f85af76602db9e6f0ec80632954b3f7ed
Codec.cpp
ediaCodec.cpp
b6ac8e2ce3574160714fd3c0c6d6b5fbf6c8eeab 09-May-2013 Marco Nelissen <marcone@google.com> Don't render buffers that have size 0

b/8857451

Change-Id: I12a31a2f85af76602db9e6f0ec80632954b3f7ed
Codec.cpp
ediaCodec.cpp
db1a066a3bac0289817843289d8b85ccd21e858a 02-May-2013 Andreas Huber <andih@google.com> am f2ae7606: A reference to the psi section data could become invalid if more

* commit 'f2ae760602a948598a168ad43673bfbd9d50fc6b':
A reference to the psi section data could become invalid if more
bb85e3730002bbbcbe030d888076f43c5185e0a0 02-May-2013 Andreas Huber <andih@google.com> am f2ae7606: A reference to the psi section data could become invalid if more

* commit 'f2ae760602a948598a168ad43673bfbd9d50fc6b':
A reference to the psi section data could become invalid if more
f2ae760602a948598a168ad43673bfbd9d50fc6b 29-Apr-2013 Andreas Huber <andih@google.com> A reference to the psi section data could become invalid if more

sections were added to the KeyedVector.

Change-Id: I095b5452ccfad89d69fc502fb21ce39495e201c3
related-to-bug: 8754565
peg2ts/ATSParser.cpp
04a840d9a0eea7d0816b6b665aa150649c46974f 29-Apr-2013 Andreas Huber <andih@google.com> A reference to the psi section data could become invalid if more

sections were added to the KeyedVector.

Change-Id: I095b5452ccfad89d69fc502fb21ce39495e201c3
related-to-bug: 8754565
peg2ts/ATSParser.cpp
f4c0f5790ae3f11cdaf38900d9178b294b89cdf3 02-May-2013 Andreas Huber <andih@google.com> am bfc5b96c: am 09f842b0: Merge "The software FLAC encoder now properly signals an error if client" into jb-mr2-dev

* commit 'bfc5b96c326a6321f167a59de4a201e2b61f5ca4':
The software FLAC encoder now properly signals an error if client
d88c34b6765c843eb9d36dbc5659c89bf59e5931 02-May-2013 Andreas Huber <andih@google.com> am 77cf463c: am 00bbca96: Merge "Don\'t even try to verify the native resolution validity a" into jb-mr2-dev

* commit '77cf463c09662a999d6d9a667a1d1313bd08b225':
Don't even try to verify the native resolution validity a
dcd82dfaf7d4dc60e97f137355193dd816ddb006 02-May-2013 Andreas Huber <andih@google.com> am 6756998e: am de6bf9cc: Merge "Fix miracast source code to ignore the encoder output format change" into jb-mr2-dev

* commit '6756998ef4ac1573e0f879e49a7936285ec61464':
Fix miracast source code to ignore the encoder output format change
bfc5b96c326a6321f167a59de4a201e2b61f5ca4 02-May-2013 Andreas Huber <andih@google.com> am 09f842b0: Merge "The software FLAC encoder now properly signals an error if client" into jb-mr2-dev

* commit '09f842b03d8f9c0ab5e4541937f8061a7d1bf53d':
The software FLAC encoder now properly signals an error if client
77cf463c09662a999d6d9a667a1d1313bd08b225 02-May-2013 Andreas Huber <andih@google.com> am 00bbca96: Merge "Don\'t even try to verify the native resolution validity a" into jb-mr2-dev

* commit '00bbca96684cb995458fedd2e1f9dec5f047100b':
Don't even try to verify the native resolution validity a
5ac3693c5d4e6399529a28e1ade76f4b22bad5ff 02-May-2013 Andreas Huber <andih@google.com> am 09f842b0: Merge "The software FLAC encoder now properly signals an error if client" into jb-mr2-dev

* commit '09f842b03d8f9c0ab5e4541937f8061a7d1bf53d':
The software FLAC encoder now properly signals an error if client
e1f1f400433446c9809d3bf2b9dd038efb120c9b 02-May-2013 Andreas Huber <andih@google.com> am 00bbca96: Merge "Don\'t even try to verify the native resolution validity a" into jb-mr2-dev

* commit '00bbca96684cb995458fedd2e1f9dec5f047100b':
Don't even try to verify the native resolution validity a
6756998ef4ac1573e0f879e49a7936285ec61464 02-May-2013 Andreas Huber <andih@google.com> am de6bf9cc: Merge "Fix miracast source code to ignore the encoder output format change" into jb-mr2-dev

* commit 'de6bf9cc0fd94452ffcd6685e1469092db74a454':
Fix miracast source code to ignore the encoder output format change
93f343af103aaad6e2c213047c4545e94b043197 02-May-2013 Andreas Huber <andih@google.com> am de6bf9cc: Merge "Fix miracast source code to ignore the encoder output format change" into jb-mr2-dev

* commit 'de6bf9cc0fd94452ffcd6685e1469092db74a454':
Fix miracast source code to ignore the encoder output format change
09f842b03d8f9c0ab5e4541937f8061a7d1bf53d 02-May-2013 Andreas Huber <andih@google.com> Merge "The software FLAC encoder now properly signals an error if client" into jb-mr2-dev
88346647a41a7bdcc1d3640893adc48d76f5b6c0 02-May-2013 Andreas Huber <andih@google.com> Merge "The software FLAC encoder now properly signals an error if client" into jb-mr2-dev
00bbca96684cb995458fedd2e1f9dec5f047100b 02-May-2013 Andreas Huber <andih@google.com> Merge "Don't even try to verify the native resolution validity a" into jb-mr2-dev
25b089697febaac4f699bb7ae68ad3839c4df5ab 02-May-2013 Andreas Huber <andih@google.com> Merge "Don't even try to verify the native resolution validity a" into jb-mr2-dev
b489b1639c0c12fdd498def46d3f5be3e1fdf6b9 02-May-2013 Andreas Huber <andih@google.com> Fix miracast source code to ignore the encoder output format change

it doesn't care about.

Change-Id: Iec1594775a98b0c1aba662cc9f08652d2f8d4805
related-to-bug: 8616651
ifi-display/source/Converter.cpp
2edb6a6aee4f0c8c518397393015a48d1fcce5d2 02-May-2013 Andreas Huber <andih@google.com> Fix miracast source code to ignore the encoder output format change

it doesn't care about.

Change-Id: Iec1594775a98b0c1aba662cc9f08652d2f8d4805
related-to-bug: 8616651
ifi-display/source/Converter.cpp
1f9374bad4f59d619ef30f227705a926dabf41d5 01-May-2013 Andreas Huber <andih@google.com> am 9db1b382: am deff6910: Merge "Support MediaCodec::getOutputFormat for encoders" into jb-mr2-dev

* commit '9db1b382c279f992dcd33a56226b1f5d2a24afca':
Support MediaCodec::getOutputFormat for encoders
9db1b382c279f992dcd33a56226b1f5d2a24afca 01-May-2013 Andreas Huber <andih@google.com> am deff6910: Merge "Support MediaCodec::getOutputFormat for encoders" into jb-mr2-dev

* commit 'deff69107566cfe76dc33eff1b4250893956a244':
Support MediaCodec::getOutputFormat for encoders
a3e5c624659bc2ef6bca860e53fc9f626eb309e1 01-May-2013 Andreas Huber <andih@google.com> am deff6910: Merge "Support MediaCodec::getOutputFormat for encoders" into jb-mr2-dev

* commit 'deff69107566cfe76dc33eff1b4250893956a244':
Support MediaCodec::getOutputFormat for encoders
0182f9acca6f873ee127898e408cf75cc316c3ea 01-May-2013 Andreas Huber <andih@google.com> Don't even try to verify the native resolution validity a

miracast sink advertises, even if it were valid we couldn't use it
since it's not consistently implemented by sinks.

Change-Id: Ibee6b3e23b5a55270fc3c419a581e2626530e3af
related-to-bug: 8772006
ifi-display/VideoFormats.cpp
9f447e90991315c5a09ba6dfa2ef249922dbf781 01-May-2013 Andreas Huber <andih@google.com> Don't even try to verify the native resolution validity a

miracast sink advertises, even if it were valid we couldn't use it
since it's not consistently implemented by sinks.

Change-Id: Ibee6b3e23b5a55270fc3c419a581e2626530e3af
related-to-bug: 8772006
ifi-display/VideoFormats.cpp
eb8709e3c65b59e85b882b5ca8710068708671be 01-May-2013 Andreas Huber <andih@google.com> The software FLAC encoder now properly signals an error if client

attempts to configure it with too large an input buffer size.
Previously this would lead to memory corruption during encoding due to a
typo.

Change-Id: I229b07b7dbe87fb8424419706671b66a8d58ec6b
related-to-bug: 8778893
odecs/flac/enc/SoftFlacEncoder.cpp
odecs/flac/enc/SoftFlacEncoder.h
537d31a995011d28e9d9e88cf67d42f0be3d2f6c 01-May-2013 Andreas Huber <andih@google.com> The software FLAC encoder now properly signals an error if client

attempts to configure it with too large an input buffer size.
Previously this would lead to memory corruption during encoding due to a
typo.

Change-Id: I229b07b7dbe87fb8424419706671b66a8d58ec6b
related-to-bug: 8778893
odecs/flac/enc/SoftFlacEncoder.cpp
odecs/flac/enc/SoftFlacEncoder.h
bae8df127ed4b76cce410922e33ce65e525bb405 01-May-2013 Lajos Molnar <lajos@google.com> Merge "stagefright: Fix port-reconfiguration & output-buffer-filled race condition"
e96ee699aca0f711d41e6c0833e5de2341c4a36d 01-May-2013 Andreas Huber <andih@google.com> Support MediaCodec::getOutputFormat for encoders

codec specific data is provided as part of the MediaFormat if available.

Change-Id: I5a79c936e2411fe66ebc694791071faefc33941e
related-to-bug: 8616651
Codec.cpp
ediaCodec.cpp
cd4ac42ed448f1cb286ca4c3c7ea64621adf9d42 01-May-2013 Andreas Huber <andih@google.com> Support MediaCodec::getOutputFormat for encoders

codec specific data is provided as part of the MediaFormat if available.

Change-Id: I5a79c936e2411fe66ebc694791071faefc33941e
related-to-bug: 8616651
Codec.cpp
ediaCodec.cpp
4b4bb11b8747adeb2efe56c7df4ab6803dd7db41 29-Apr-2013 Andreas Huber <andih@google.com> A reference to the psi section data could become invalid if more

sections were added to the KeyedVector.

Change-Id: I095b5452ccfad89d69fc502fb21ce39495e201c3
related-to-bug: 8754565
peg2ts/ATSParser.cpp
2ded8b53014602d25b20bade8ce46db95a8da4b5 27-Apr-2013 Lajos Molnar <lajos@google.com> stagefright: Fix port-reconfiguration & output-buffer-filled race condition

Remove the invalid assumption that when a port-reconfiguration event
is received, buffers cannot be downstream (waiting to be rendered).

Luckily, these buffers are properly handled (freed) after they are
sent to be rendered.

Also, the case where buffers have been sent onto the native window
is already handled.

Change-Id: I1df39c1ffc2bfb96f8b7b4ee5be07cae654f956f
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug: 8736466
Codec.cpp
c86ef45279185b474bd6af0a7ae407f8ab577f13 26-Apr-2013 Andreas Huber <andih@google.com> Revert "Remove all traces of wifi display sink implementation and supporting code."

This reverts commit 3a9682a86ead84d6f60d3f3aa01b2b4d34af983d.
ifi-display/Android.mk
ifi-display/MediaReceiver.cpp
ifi-display/MediaReceiver.h
ifi-display/MediaSender.cpp
ifi-display/MediaSender.h
ifi-display/SNTPClient.cpp
ifi-display/SNTPClient.h
ifi-display/TimeSyncer.cpp
ifi-display/TimeSyncer.h
ifi-display/nettest.cpp
ifi-display/rtp/RTPAssembler.cpp
ifi-display/rtp/RTPAssembler.h
ifi-display/rtp/RTPReceiver.cpp
ifi-display/rtp/RTPReceiver.h
ifi-display/rtp/RTPSender.cpp
ifi-display/rtp/RTPSender.h
ifi-display/rtptest.cpp
ifi-display/sink/DirectRenderer.cpp
ifi-display/sink/DirectRenderer.h
ifi-display/sink/WifiDisplaySink.cpp
ifi-display/sink/WifiDisplaySink.h
ifi-display/source/PlaybackSession.cpp
ifi-display/source/WifiDisplaySource.cpp
ifi-display/source/WifiDisplaySource.h
ifi-display/udptest.cpp
ifi-display/wfd.cpp
89407b01795ebc56033b09e3a48defaa290bb3c5 24-Apr-2013 Andreas Huber <andih@google.com> am 0fb06b85: am 0dbff625: Merge "Fix overflow of rand in ARTPConnection"

* commit '0fb06b85e9f40cc695542a101113255693c91321':
Fix overflow of rand in ARTPConnection
0fb06b85e9f40cc695542a101113255693c91321 24-Apr-2013 Andreas Huber <andih@google.com> am 0dbff625: Merge "Fix overflow of rand in ARTPConnection"

* commit '0dbff625c3128962b48f3476ceacb3ac80a3f421':
Fix overflow of rand in ARTPConnection
a3840fdfe6fdb8dd07d78d3f3202003649e952e9 24-Apr-2013 Andreas Huber <andih@google.com> am 0dbff625: Merge "Fix overflow of rand in ARTPConnection"

* commit '0dbff625c3128962b48f3476ceacb3ac80a3f421':
Fix overflow of rand in ARTPConnection
cdabfe48c300f15466c9472375d7ad2ccf9ba328 24-Apr-2013 Andreas Huber <andih@google.com> resolved conflicts for merge of e55951df to master

Conflicts:
media/libstagefright/wifi-display/Android.mk

Change-Id: Icdf5e745a859506cbed7be93b6bc5def8046473c
e55951df62a777485f437bf070a5149caf62955f 24-Apr-2013 Andreas Huber <andih@google.com> am 7f86d983: Merge "Remove all traces of wifi display sink implementation and supporting code." into jb-mr2-dev

* commit '7f86d98317843838c4a5248c733bf95f9574fcab':
Remove all traces of wifi display sink implementation and supporting code.
3ba2aea1588438d0768ed48fc2749a2034eb3a2b 24-Apr-2013 Andreas Huber <andih@google.com> am 7f86d983: Merge "Remove all traces of wifi display sink implementation and supporting code." into jb-mr2-dev

* commit '7f86d98317843838c4a5248c733bf95f9574fcab':
Remove all traces of wifi display sink implementation and supporting code.
be21e039d7d993872ac85a0279ea657e40f674fd 24-Apr-2013 Yajun Zeng <beanz@marvell.com> Fix overflow of rand in ARTPConnection

without this fix, (rand()*1000)/RAND_MAX is mainly 0.

Change-Id: I48ae940a7b6974b197d81732774c9dcea107bcf1
Signed-off-by: Yajun Zeng <beanz@marvell.com>
tsp/ARTPConnection.cpp
6cb3f224d7e2280f8834d361bba1a72682aaaad1 24-Apr-2013 Yajun Zeng <beanz@marvell.com> Fix overflow of rand in ARTPConnection

without this fix, (rand()*1000)/RAND_MAX is mainly 0.

Change-Id: I48ae940a7b6974b197d81732774c9dcea107bcf1
Signed-off-by: Yajun Zeng <beanz@marvell.com>
tsp/ARTPConnection.cpp
3a9682a86ead84d6f60d3f3aa01b2b4d34af983d 23-Apr-2013 Andreas Huber <andih@google.com> Remove all traces of wifi display sink implementation and supporting code.

Change-Id: I64b681b7e3df1ef0dd80c0d261cacae293d5e684
related-to-bug: 8698812
ifi-display/Android.mk
ifi-display/MediaReceiver.cpp
ifi-display/MediaReceiver.h
ifi-display/MediaSender.cpp
ifi-display/MediaSender.h
ifi-display/SNTPClient.cpp
ifi-display/SNTPClient.h
ifi-display/TimeSyncer.cpp
ifi-display/TimeSyncer.h
ifi-display/nettest.cpp
ifi-display/rtp/RTPAssembler.cpp
ifi-display/rtp/RTPAssembler.h
ifi-display/rtp/RTPReceiver.cpp
ifi-display/rtp/RTPReceiver.h
ifi-display/rtp/RTPSender.cpp
ifi-display/rtp/RTPSender.h
ifi-display/rtptest.cpp
ifi-display/sink/DirectRenderer.cpp
ifi-display/sink/DirectRenderer.h
ifi-display/sink/WifiDisplaySink.cpp
ifi-display/sink/WifiDisplaySink.h
ifi-display/source/PlaybackSession.cpp
ifi-display/source/WifiDisplaySource.cpp
ifi-display/source/WifiDisplaySource.h
ifi-display/udptest.cpp
ifi-display/wfd.cpp
c4bd06130e4c3068ab58a0be88a4f765c2267563 23-Apr-2013 Andreas Huber <andih@google.com> Remove all traces of wifi display sink implementation and supporting code.

Change-Id: I64b681b7e3df1ef0dd80c0d261cacae293d5e684
related-to-bug: 8698812
ifi-display/Android.mk
ifi-display/MediaSender.cpp
ifi-display/MediaSender.h
ifi-display/rtp/RTPSender.cpp
ifi-display/rtp/RTPSender.h
ifi-display/source/PlaybackSession.cpp
ifi-display/source/WifiDisplaySource.cpp
ifi-display/source/WifiDisplaySource.h
ifi-display/wfd.cpp
4085c9aa8964304bc37175ab00f0b43ff7f6074c 23-Apr-2013 Marco Nelissen <marcone@google.com> am b0ec4e15: am 3030f344: Merge "Fixed the wrong timestamps issue about camera recording"

* commit 'b0ec4e15704b77847c1d24e611029b6311d67dfe':
Fixed the wrong timestamps issue about camera recording
b0ec4e15704b77847c1d24e611029b6311d67dfe 23-Apr-2013 Marco Nelissen <marcone@google.com> am 3030f344: Merge "Fixed the wrong timestamps issue about camera recording"

* commit '3030f344e77d14cf688c34f79c83a045c888825d':
Fixed the wrong timestamps issue about camera recording
6a169ccd48dc5c04d908b483de636e0da44e94a8 23-Apr-2013 Marco Nelissen <marcone@google.com> am 3030f344: Merge "Fixed the wrong timestamps issue about camera recording"

* commit '3030f344e77d14cf688c34f79c83a045c888825d':
Fixed the wrong timestamps issue about camera recording
2431f75b3e1c820215ad6d86e2383a40eb09012f 22-Apr-2013 Andreas Huber <andih@google.com> am a93686a4: am 4613b7e3: Merge "3rd time\'s the charm, right? Fix another instance where MediaCodec would" into jb-mr2-dev

* commit 'a93686a4ace1e38eb6fa5da8fc97e97a19f4ac5c':
3rd time's the charm, right? Fix another instance where MediaCodec would
fa189d0d74d8da0ab19c8d9c6cd16fa80d406e9c 22-Apr-2013 Andreas Huber <andih@google.com> am 45f1f86e: am f0fba380: Merge "A flush of a video decoder connected to a native window must reclaim" into jb-mr2-dev

* commit '45f1f86eb97356b73811fc4d70af437c55a86dd7':
A flush of a video decoder connected to a native window must reclaim
4613b7e38b1830535cbf00e962afdfa5fe1308ba 22-Apr-2013 Andreas Huber <andih@google.com> Merge "3rd time's the charm, right? Fix another instance where MediaCodec would" into jb-mr2-dev
6e96f5927bd2234606ad3fcef1c1dc3029e66347 22-Apr-2013 Andreas Huber <andih@google.com> Merge "3rd time's the charm, right? Fix another instance where MediaCodec would" into jb-mr2-dev
6e5b6ef15bb39cc0aa3d8fb7d4f75d44e5aadd92 22-Apr-2013 Jun Tian <jun.j.tian@intel.com> Fixed the wrong timestamps issue about camera recording

On emulator, the camera video recording crashes randomly.
It's caused by wrong timestamp when encoding the video frame.
The element of the vector is erased before accessing it.
Therefore, when reading the timestamp from the element,
the memory of the element has been changed.

Change-Id: I9750417fbb9dc4697ccae1e78e286b23925d3764

Signed-off-by: Panfeng Chang <panfengx.chang@intel.com>
Signed-off-by: Jun Tian <jun.j.tian@intel.com>
odecs/m4v_h263/enc/SoftMPEG4Encoder.cpp
b483a82f02e86710fade1f581e9255f8f4afb246 22-Apr-2013 Jun Tian <jun.j.tian@intel.com> Fixed the wrong timestamps issue about camera recording

On emulator, the camera video recording crashes randomly.
It's caused by wrong timestamp when encoding the video frame.
The element of the vector is erased before accessing it.
Therefore, when reading the timestamp from the element,
the memory of the element has been changed.

Change-Id: I9750417fbb9dc4697ccae1e78e286b23925d3764

Signed-off-by: Panfeng Chang <panfengx.chang@intel.com>
Signed-off-by: Jun Tian <jun.j.tian@intel.com>
odecs/m4v_h263/enc/SoftMPEG4Encoder.cpp
f0fba38005f16b94b89a512fde0e01511d97e304 19-Apr-2013 Andreas Huber <andih@google.com> Merge "A flush of a video decoder connected to a native window must reclaim" into jb-mr2-dev
d0229c9ae703504cf145e8ef92c97702dbc6963b 19-Apr-2013 Andreas Huber <andih@google.com> Merge "A flush of a video decoder connected to a native window must reclaim" into jb-mr2-dev
aa7f97bb9c70176245ffb7ed0ce52bee6c1a57d7 19-Apr-2013 Andreas Huber <andih@google.com> 3rd time's the charm, right? Fix another instance where MediaCodec would

not return from a stop() or release() call if mediaserver dies at just the right
moment.

Change-Id: I7728f8df82d62602d4d272f8023aa88678dd7d95
related-to-bug: 8397711
ediaCodec.cpp
6b5d15099579c179d8e7531bb5abfb272614513a 19-Apr-2013 Andreas Huber <andih@google.com> 3rd time's the charm, right? Fix another instance where MediaCodec would

not return from a stop() or release() call if mediaserver dies at just the right
moment.

Change-Id: I7728f8df82d62602d4d272f8023aa88678dd7d95
related-to-bug: 8397711
ediaCodec.cpp
7e7013392e302a28364df1dcee79b82ad90978b4 19-Apr-2013 Andreas Huber <andih@google.com> A flush of a video decoder connected to a native window must reclaim

output buffers already queued for rendering before considering a flush
completed. Otherwise the decoder may not have enough output buffers to
continue decoding after the discontinuity and we'll never dequeue more
from the native window.

Change-Id: I42e275dc336568e180081c6d7c0dc05fc9637c79
related-to-bug: 8578467
Codec.cpp
0ae2001f40587556e2f5ed56f791292fb5e9a329 19-Apr-2013 Andreas Huber <andih@google.com> A flush of a video decoder connected to a native window must reclaim

output buffers already queued for rendering before considering a flush
completed. Otherwise the decoder may not have enough output buffers to
continue decoding after the discontinuity and we'll never dequeue more
from the native window.

Change-Id: I42e275dc336568e180081c6d7c0dc05fc9637c79
related-to-bug: 8578467
Codec.cpp
ac08180346cc9c83c04ba16684b98af44a7566b3 19-Apr-2013 Andreas Huber <andih@google.com> am 5bb603c1: am 2c157e0f: Merge "Make sure MediaCodec::stop() and MediaCodec::release() still return" into jb-mr2-dev

* commit '5bb603c1e1984dcac0bc7b0e4f82c623710d54a8':
Make sure MediaCodec::stop() and MediaCodec::release() still return
2c157e0f127f36b4c709508f899c2a9f32ba3bd4 19-Apr-2013 Andreas Huber <andih@google.com> Merge "Make sure MediaCodec::stop() and MediaCodec::release() still return" into jb-mr2-dev
723791e2a829a3254d95fdea1ead9ce542ecbf25 19-Apr-2013 Andreas Huber <andih@google.com> Merge "Make sure MediaCodec::stop() and MediaCodec::release() still return" into jb-mr2-dev
4a6e78a59279e474338e2fb5af95123ecf23797c 19-Apr-2013 Marco Nelissen <marcone@google.com> am c2e8f144: am da77cee9: Merge "Fix sample info parsing" into jb-mr2-dev

* commit 'c2e8f144db456b1612ea95893b17ddc3cdb2e844':
Fix sample info parsing
da77cee96d33aa015f90e537ce2d06e6853aac93 19-Apr-2013 Marco Nelissen <marcone@google.com> Merge "Fix sample info parsing" into jb-mr2-dev
37abc6e23e96cae3eb622b1c8983a12153ce16eb 19-Apr-2013 Marco Nelissen <marcone@google.com> Merge "Fix sample info parsing" into jb-mr2-dev
5299272da0d17308fa3d17e78c590c1827137f79 19-Apr-2013 Jamie Gennis <jgennis@google.com> am 2ffc2b8e: am 5ffabf06: OMXNodeInstance: actually fix OMX_GetExtIndex logging

* commit '2ffc2b8e5e4b6ed54bc2924a1f146b0a04f79670':
OMXNodeInstance: actually fix OMX_GetExtIndex logging
5ffabf0664b80b3dd94d40a3a63db25ecd993fd0 19-Apr-2013 Jamie Gennis <jgennis@google.com> OMXNodeInstance: actually fix OMX_GetExtIndex logging

Bug: 8538872
Change-Id: I228746e8eb502af4bba4054caa4d8569fab35025
mx/OMXNodeInstance.cpp
d8754298b576aca4e85a059ea7b7e8f7a9502226 19-Apr-2013 Jamie Gennis <jgennis@google.com> OMXNodeInstance: actually fix OMX_GetExtIndex logging

Bug: 8538872
Change-Id: I228746e8eb502af4bba4054caa4d8569fab35025
mx/OMXNodeInstance.cpp
03ddaec84b65157af1dbf022a72de778dc59a63e 18-Apr-2013 Andreas Huber <andih@google.com> Make sure MediaCodec::stop() and MediaCodec::release() still return

instead of blocking indefinitely if the mediaserver died while the call
is pending.

Change-Id: If2789b7fe99634d947ce4a3bb69c04baff5f8b10
related-to-bug: 8397711
ediaCodec.cpp
815dd298dc903606181afee3aec23e9cee629e8f 18-Apr-2013 Andreas Huber <andih@google.com> Make sure MediaCodec::stop() and MediaCodec::release() still return

instead of blocking indefinitely if the mediaserver died while the call
is pending.

Change-Id: If2789b7fe99634d947ce4a3bb69c04baff5f8b10
related-to-bug: 8397711
ediaCodec.cpp
48186b6ec99aa71ec48338a55f2a2d8291681fe4 17-Apr-2013 Marco Nelissen <marcone@google.com> Fix sample info parsing

b/8626561

Change-Id: Ibd5168282eb33d1abdc423e15a0d9aeb5a1ad687
PEG4Extractor.cpp
9b45248b5709440d85c4a3a9a66e2e8780945e0b 17-Apr-2013 Marco Nelissen <marcone@google.com> Fix sample info parsing

b/8626561

Change-Id: Ibd5168282eb33d1abdc423e15a0d9aeb5a1ad687
PEG4Extractor.cpp
503261ce9e616b16056e54c37e1e3dfdc1077763 18-Apr-2013 Marco Nelissen <marcone@google.com> am 4707c9b0: am f7baffd1: Merge "Make sure the drain buffer is big enough" into jb-mr2-dev

* commit '4707c9b04891e5cf7772de74e9c229bce028c87d':
Make sure the drain buffer is big enough
8160921de80aeff12436ee1c2bfdae77fc4914b9 18-Apr-2013 Andreas Huber <andih@google.com> am c9e18491: am 767fea95: Merge "Apparently the mp3 decoder glitches if it was configured with the wrong" into jb-mr2-dev

* commit 'c9e18491b4dd6d82d52ec7baa2101732ab617db6':
Apparently the mp3 decoder glitches if it was configured with the wrong
f7baffd1fce85e3cac464b0d2ad6bc600836abf8 18-Apr-2013 Marco Nelissen <marcone@google.com> Merge "Make sure the drain buffer is big enough" into jb-mr2-dev
790703a1422b46fada45a1210815a6517d35b792 18-Apr-2013 Marco Nelissen <marcone@google.com> Merge "Make sure the drain buffer is big enough" into jb-mr2-dev
767fea952b45f29f2091f1fb59a1bb3c24eed7e1 18-Apr-2013 Andreas Huber <andih@google.com> Merge "Apparently the mp3 decoder glitches if it was configured with the wrong" into jb-mr2-dev
06a614eed67cad894026852059a06790c05ef4d6 18-Apr-2013 Andreas Huber <andih@google.com> Merge "Apparently the mp3 decoder glitches if it was configured with the wrong" into jb-mr2-dev
bbf898c04667d27598c4f29e3955556c5e54ac4a 17-Apr-2013 Andreas Huber <andih@google.com> am 7aebfe0e: am ed863845: Merge "Parse the last none-empty line of .m3u8 file" into jb-mr2-dev

* commit '7aebfe0eac988a5efa16d9268e4f3fe03d673e33':
Parse the last none-empty line of .m3u8 file
ed86384591c0bf7ee2d227a6c56e85aa54bfaeac 17-Apr-2013 Andreas Huber <andih@google.com> Merge "Parse the last none-empty line of .m3u8 file" into jb-mr2-dev
03fb6f01a39f11c1c90f60d16999fa274402f465 17-Apr-2013 Andreas Huber <andih@google.com> Merge "Parse the last none-empty line of .m3u8 file" into jb-mr2-dev
42392e49e167c6a0c573e55e1c1b4c7fa0ceb213 17-Apr-2013 Andreas Huber <andih@google.com> Apparently the mp3 decoder glitches if it was configured with the wrong

sample rate. Make sure we tell it about the one the extractor provides.

Change-Id: Ice5b9cf55485ca1a8f099a14be0202be9540e781
related-to-bug: 8621639
Codec.cpp
MXCodec.cpp
odecs/mp3dec/SoftMP3.cpp
2242fbd1d9327dff9c25ac2aba0fa7d5d471bb88 17-Apr-2013 Andreas Huber <andih@google.com> Apparently the mp3 decoder glitches if it was configured with the wrong

sample rate. Make sure we tell it about the one the extractor provides.

Change-Id: Ice5b9cf55485ca1a8f099a14be0202be9540e781
related-to-bug: 8621639
Codec.cpp
MXCodec.cpp
odecs/mp3dec/SoftMP3.cpp
e42f027d19b20cf581be11a89e26b2c96c50c335 17-Apr-2013 Marco Nelissen <marcone@google.com> Make sure the drain buffer is big enough

b/8614909

Change-Id: I9d973dcd74100b793791359c262b821207ff9ddd
odecs/aacdec/SoftAAC2.cpp
f2334661f4047beddf0431e7fe5204ca1cf4380b 17-Apr-2013 Marco Nelissen <marcone@google.com> Make sure the drain buffer is big enough

b/8614909

Change-Id: I9d973dcd74100b793791359c262b821207ff9ddd
odecs/aacdec/SoftAAC2.cpp
1e0757e0a63d876acc65991ac73284227c522bdc 31-Dec-2012 Sungsoo Lim <sungsoo@google.com> Parse the last none-empty line of .m3u8 file

If the last sentence of .m3u8 file is not processed, because
it is not empty and has no line feed, M3UParser.isComplete()
returns false even though it is completed.

Change-Id: I01b9f900d44247a3ef40369a2f9198bb7eaf01b7
related-to-bug: 8405824
ttplive/M3UParser.cpp
be2bda4abed36eb6adf474c317d1492b4aec8f1a 31-Dec-2012 Sungsoo Lim <sungsoo@google.com> Parse the last none-empty line of .m3u8 file

If the last sentence of .m3u8 file is not processed, because
it is not empty and has no line feed, M3UParser.isComplete()
returns false even though it is completed.

Change-Id: I01b9f900d44247a3ef40369a2f9198bb7eaf01b7
related-to-bug: 8405824
ttplive/M3UParser.cpp
956d23db7ab5fc8aaf91447c46a1ca3bcde82c93 16-Apr-2013 Jean-Michel Trivi <jmtrivi@google.com> am 844c8b03: am ff4b1e2b: Merge "Better default AAC DRC setting" into jb-mr2-dev

* commit '844c8b039feb7d2dd9b951a244966edd5e6fab67':
Better default AAC DRC setting
ff4b1e2b9a7109669ce794692553a2ce14981923 16-Apr-2013 Jean-Michel Trivi <jmtrivi@google.com> Merge "Better default AAC DRC setting" into jb-mr2-dev
c3e65a8942f482583dd603c02d78a5b1fc85b0e8 16-Apr-2013 Jean-Michel Trivi <jmtrivi@google.com> Merge "Better default AAC DRC setting" into jb-mr2-dev
4cb26d5cb123131266b38d1bad3966cee55dce79 16-Apr-2013 Marco Nelissen <marcone@google.com> am 589bee39: am 94b66227: Fix Vorbis decoder reset

* commit '589bee39de9b6b7450f43c9e61f7b0393772f4ac':
Fix Vorbis decoder reset
0e03e72e7bb2633f5a16c2fe7c164bc3ec8ca855 16-Apr-2013 Jean-Michel Trivi <jmtrivi@google.com> Better default AAC DRC setting

By default, use boost and attenuation together.

bug 7140036

Change-Id: Ie0565f9e5cd24f7a59b5a218b4e6186661832601
odecs/aacdec/SoftAAC2.cpp
806df3dbdd19cd1cd3721f39397175b93f257590 16-Apr-2013 Jean-Michel Trivi <jmtrivi@google.com> Better default AAC DRC setting

By default, use boost and attenuation together.

bug 7140036

Change-Id: Ie0565f9e5cd24f7a59b5a218b4e6186661832601
odecs/aacdec/SoftAAC2.cpp
94b66227ff5a57dd810aafa7b3aa810b9a185b8d 16-Apr-2013 Marco Nelissen <marcone@google.com> Fix Vorbis decoder reset

b/8543366

Change-Id: I9f32e96fdfc355cf444259a7c40554e2de184728
odecs/vorbis/dec/SoftVorbis.cpp
98391d3e9c0188d477fab6044d5259eeb0014113 16-Apr-2013 Marco Nelissen <marcone@google.com> Fix Vorbis decoder reset

b/8543366

Change-Id: I9f32e96fdfc355cf444259a7c40554e2de184728
odecs/vorbis/dec/SoftVorbis.cpp
3b72d24df4d78b63622937a4d20776b5f46304a6 15-Apr-2013 Marco Nelissen <marcone@google.com> am f749a670: am f4c873a6: Merge "Fix AAC decoder reconfiguration" into jb-mr2-dev

* commit 'f749a67054e63b9184e67461ab40fe7b4b270241':
Fix AAC decoder reconfiguration
f4c873a64db2d5d2d74ca596e7482627dd6b4238 15-Apr-2013 Marco Nelissen <marcone@google.com> Merge "Fix AAC decoder reconfiguration" into jb-mr2-dev
d961ae47cbc741b0e3d6f038ae0018b7f2a7424e 15-Apr-2013 Marco Nelissen <marcone@google.com> Merge "Fix AAC decoder reconfiguration" into jb-mr2-dev
7c5abbb0e1b20df4b265a08a8560899f637f9b44 15-Apr-2013 Marco Nelissen <marcone@google.com> Fix AAC decoder reconfiguration

The recent flush() changed made the codec behave differently after
a reconfigure. Now we reset its state properly again.
b/8543366

Change-Id: I8807b5ab02249b43fc1cf315d4e8d4ceb3f9b298
odecs/aacdec/SoftAAC2.cpp
931243e2a36bb68eb05cca18bb26549fa7944195 15-Apr-2013 Marco Nelissen <marcone@google.com> Fix AAC decoder reconfiguration

The recent flush() changed made the codec behave differently after
a reconfigure. Now we reset its state properly again.
b/8543366

Change-Id: I8807b5ab02249b43fc1cf315d4e8d4ceb3f9b298
odecs/aacdec/SoftAAC2.cpp
ea29f0da58add214f79ed148ad0321cef0777e54 15-Apr-2013 ztenghui <ztenghui@google.com> am a768b4f8: am 8f1efee1: Merge "MediaMuxer prefer not to use the MPEG4Writer in real time recording mode." into jb-mr2-dev

* commit 'a768b4f838f93823f661422d8193ebbff64b1b5a':
MediaMuxer prefer not to use the MPEG4Writer in real time recording mode.
8f1efee1c17e997af5ea3c46c62b3ae106b18264 15-Apr-2013 ztenghui <ztenghui@google.com> Merge "MediaMuxer prefer not to use the MPEG4Writer in real time recording mode." into jb-mr2-dev
cb7032acc963e447adbffcf95ee297643d64e0d7 15-Apr-2013 ztenghui <ztenghui@google.com> Merge "MediaMuxer prefer not to use the MPEG4Writer in real time recording mode." into jb-mr2-dev
de05c8eab188e98798f2b9c3dfac53dbc18ef584 12-Apr-2013 ztenghui <ztenghui@google.com> MediaMuxer prefer not to use the MPEG4Writer in real time recording mode.

By default, MPEG4Write will keep running in real time recording mode.

bug:8598944

Change-Id: Idf7fbd4e0feb7763660a74279ba8817b79098aaf
PEG4Writer.cpp
ediaMuxer.cpp
e756d9753c7cffe2e9731a31fa98a3e8f37151c9 12-Apr-2013 ztenghui <ztenghui@google.com> MediaMuxer prefer not to use the MPEG4Writer in real time recording mode.

By default, MPEG4Write will keep running in real time recording mode.

bug:8598944

Change-Id: Idf7fbd4e0feb7763660a74279ba8817b79098aaf
PEG4Writer.cpp
ediaMuxer.cpp
e982ae247dda3de86e1640d37735363f0a6645c5 12-Apr-2013 Jamie Gennis <jgennis@google.com> am 1d9c4125: am 4a4256eb: Merge "OMXNodeInstance: fix OMX_GetExtensionIndex logging" into jb-mr2-dev

* commit '1d9c4125c460025725fb26e435d1e88761991ffe':
OMXNodeInstance: fix OMX_GetExtensionIndex logging
4a4256eb3963124e20ce63034c092c9bec396e32 12-Apr-2013 Jamie Gennis <jgennis@google.com> Merge "OMXNodeInstance: fix OMX_GetExtensionIndex logging" into jb-mr2-dev
6efa0c06acb4bdcf9c1fb1dbb4beee254e040848 12-Apr-2013 Jamie Gennis <jgennis@google.com> Merge "OMXNodeInstance: fix OMX_GetExtensionIndex logging" into jb-mr2-dev
e6e7ea49e0478d467d43242e4f42142413ba7f51 12-Apr-2013 Marco Nelissen <marcone@google.com> am fe028e58: am 089edf2e: Merge "Fix MediaCodec.flush()" into jb-mr2-dev

* commit 'fe028e58782566bd1a8bf9209848c2b00f2b339c':
Fix MediaCodec.flush()
3f0651d12b5c4b01ab0347412ae0e2e5fe2aadaa 12-Apr-2013 Andreas Huber <andih@google.com> am 4b40f7ef: am 5157b1e8: Merge "ACodec now signals an error if the mediaserver died while it is in" into jb-mr2-dev

* commit '4b40f7ef5a9d29006dcb3351086fc13f1a8e0fa2':
ACodec now signals an error if the mediaserver died while it is in
089edf2e227c72b7ff4fd9b9ed96320e21811d50 12-Apr-2013 Marco Nelissen <marcone@google.com> Merge "Fix MediaCodec.flush()" into jb-mr2-dev
91b4e0d2b2dc0d3eeee375d51f48ff8cc243f6ca 12-Apr-2013 Marco Nelissen <marcone@google.com> Merge "Fix MediaCodec.flush()" into jb-mr2-dev
4713d3dc48cec162f4aeb3513719a8dd153e8c85 12-Apr-2013 Andreas Huber <andih@google.com> resolved conflicts for merge of 1e04c248 to master

Change-Id: I9a1292eaec2f12cb7636c27a53068672694c2236
f3bd1972e039c6ded5154db715e5a32f1813a239 09-Apr-2013 Marco Nelissen <marcone@google.com> Fix MediaCodec.flush()

There were two problems here. One was that the skip/cut buffer
wasn't cleared when it should be, and the second was that we
were always sending the first buffer of encoded data to the AAC
decoder twice.
b/8543366

Change-Id: Ic040edabf16cccd1f6ef8c9e5c9cfbacbdd8a089
Codec.cpp
odecs/aacdec/SoftAAC2.cpp
odecs/aacdec/SoftAAC2.h
b3ac921cae96686ec0902796bb8f8ef99ae08abd 09-Apr-2013 Marco Nelissen <marcone@google.com> Fix MediaCodec.flush()

There were two problems here. One was that the skip/cut buffer
wasn't cleared when it should be, and the second was that we
were always sending the first buffer of encoded data to the AAC
decoder twice.
b/8543366

Change-Id: Ic040edabf16cccd1f6ef8c9e5c9cfbacbdd8a089
Codec.cpp
odecs/aacdec/SoftAAC2.cpp
odecs/aacdec/SoftAAC2.h
5157b1e8355ef3176536e4de793ec1b7679b7ad9 12-Apr-2013 Andreas Huber <andih@google.com> Merge "ACodec now signals an error if the mediaserver died while it is in" into jb-mr2-dev
99076b990cfc6514b7de3a4809b3b3ff3d76e43d 12-Apr-2013 Andreas Huber <andih@google.com> Merge "ACodec now signals an error if the mediaserver died while it is in" into jb-mr2-dev
ac0230da14a3d223c2144b165a3a163e8519d239 12-Apr-2013 Andreas Huber <andih@google.com> ACodec now signals an error if the mediaserver died while it is in

anything other than "uninitialized" state.

Change-Id: Id133d897ac65b455b34e5de17ff9c39b47285630
related-to-bug: 8397711
Codec.cpp
MXClient.cpp
6610a7d621c634fe059b855ca7eb3f58fb8d0757 12-Apr-2013 Andreas Huber <andih@google.com> ACodec now signals an error if the mediaserver died while it is in

anything other than "uninitialized" state.

Change-Id: Id133d897ac65b455b34e5de17ff9c39b47285630
related-to-bug: 8397711
Codec.cpp
MXClient.cpp
76ab6df08a2069eac6317715dadccbb6041e7fab 11-Apr-2013 Andreas Huber <andih@google.com> The framework really doesn't need to know the specifics of the codec

color format, so stop trying to enforce a whitelist.

Change-Id: I0ceb3bdd5bcc6c1bbd56740b0cd662a2b5820dfe
related-to-bug: 8596546
Codec.cpp
MXCodec.cpp
3c09d025b60dedc605e893d630177bd54552f061 11-Apr-2013 Andreas Huber <andih@google.com> The framework really doesn't need to know the specifics of the codec

color format, so stop trying to enforce a whitelist.

Change-Id: I0ceb3bdd5bcc6c1bbd56740b0cd662a2b5820dfe
related-to-bug: 8596546
Codec.cpp
MXCodec.cpp
2c65be2298f055d015c31dea9956855236a0b465 11-Apr-2013 Rom Lemarchand <romlem@google.com> Add support for OMX_QCOM_COLOR_FormatYUV420PackedSemiPlanar32m color format

Change-Id: Ib862ee341ccf668445f0dff29c5a39e91e769244
Codec.cpp
MXCodec.cpp
844ebdef8c73b98ec29c75f1fd7940624e70d14d 10-Apr-2013 Ying Wang <wangying@google.com> am e63f850b: am da0dc0af: Add liblog

* commit 'e63f850b179a43a344d438f202ad34ec7566f955':
Add liblog
da0dc0af0effe9fbfb3ce3187c8472fca2baf3c6 10-Apr-2013 Ying Wang <wangying@google.com> Add liblog

Bug: 8580410
Change-Id: If493d87d60d71be664ad75b140c62acadb75b0d0
hromium_http/Android.mk
odecs/aacdec/Android.mk
odecs/aacenc/Android.mk
odecs/amrnb/dec/Android.mk
odecs/amrnb/enc/Android.mk
odecs/amrwbenc/Android.mk
odecs/avc/enc/Android.mk
odecs/flac/enc/Android.mk
odecs/g711/dec/Android.mk
odecs/gsm/dec/Android.mk
odecs/m4v_h263/dec/Android.mk
odecs/m4v_h263/enc/Android.mk
odecs/mp3dec/Android.mk
odecs/on2/dec/Android.mk
odecs/on2/enc/Android.mk
odecs/on2/h264dec/Android.mk
odecs/raw/Android.mk
odecs/vorbis/dec/Android.mk
oundation/Android.mk
d3/Android.mk
mx/Android.mk
mx/tests/Android.mk
ests/Android.mk
ifi-display/Android.mk
uv/Android.mk
ecba7488c5cceaacef95836b1b476433451e7761 10-Apr-2013 Ying Wang <wangying@google.com> Add liblog

Bug: 8580410
Change-Id: If493d87d60d71be664ad75b140c62acadb75b0d0
hromium_http/Android.mk
odecs/aacdec/Android.mk
odecs/aacenc/Android.mk
odecs/amrnb/dec/Android.mk
odecs/amrnb/enc/Android.mk
odecs/amrwbenc/Android.mk
odecs/avc/enc/Android.mk
odecs/flac/enc/Android.mk
odecs/g711/dec/Android.mk
odecs/gsm/dec/Android.mk
odecs/m4v_h263/dec/Android.mk
odecs/m4v_h263/enc/Android.mk
odecs/mp3dec/Android.mk
odecs/on2/dec/Android.mk
odecs/on2/enc/Android.mk
odecs/on2/h264dec/Android.mk
odecs/raw/Android.mk
odecs/vorbis/dec/Android.mk
oundation/Android.mk
d3/Android.mk
mx/Android.mk
mx/tests/Android.mk
ests/Android.mk
ifi-display/Android.mk
uv/Android.mk
63594e8f83d982e45bd454224f2d20739b662c40 10-Apr-2013 Jamie Gennis <jgennis@google.com> OMXNodeInstance: fix OMX_GetExtensionIndex logging

This change fixes the logging of OMX_GetExtensionIndex errors. Under certain
circumstances these errors are not harmful and should not be logged.

Bug: 8538872
Change-Id: I19a13d29ca6263454a9a7a8be205e10363725f31
mx/OMXNodeInstance.cpp
ce18d7d85a78ac6642624fef1b5831eff4c72d56 10-Apr-2013 Jamie Gennis <jgennis@google.com> OMXNodeInstance: fix OMX_GetExtensionIndex logging

This change fixes the logging of OMX_GetExtensionIndex errors. Under certain
circumstances these errors are not harmful and should not be logged.

Bug: 8538872
Change-Id: I19a13d29ca6263454a9a7a8be205e10363725f31
mx/OMXNodeInstance.cpp
a4d0cd1b817a3c55858af5f754f7daa302de087e 09-Apr-2013 Marco Nelissen <marcone@google.com> am b021358d: am ec771223: Add support for common encryption

* commit 'b021358ddba63e81d6b59f2370e891c71f14f630':
Add support for common encryption
ec77122351b4e78c1fe5b60a208f76baf8c67591 08-Apr-2013 Marco Nelissen <marcone@google.com> Add support for common encryption

b/7465749

Change-Id: I5403b74a5ae428ad28b382863a09daafc400b137
ataSource.cpp
PEG4Extractor.cpp
uMediaExtractor.cpp
nclude/MPEG4Extractor.h
5544c66ba0aa789a997b376df503a5ffae425dc7 08-Apr-2013 Marco Nelissen <marcone@google.com> Add support for common encryption

b/7465749

Change-Id: I5403b74a5ae428ad28b382863a09daafc400b137
ataSource.cpp
PEG4Extractor.cpp
uMediaExtractor.cpp
nclude/MPEG4Extractor.h
d918f978a4a141f02076108dba071766d21aab25 05-Apr-2013 Andreas Huber <andih@google.com> am 57a1f3e9: am 526b2285: Merge "In certain cases where AAC audio frames extended into the next PES payload" into jb-mr2-dev

* commit '57a1f3e9ee9cca3c72f5d1cfd9c988784122d777':
In certain cases where AAC audio frames extended into the next PES payload
526b2285e975b3c02d174d8798b55e9fc300f0d3 05-Apr-2013 Andreas Huber <andih@google.com> Merge "In certain cases where AAC audio frames extended into the next PES payload" into jb-mr2-dev
878f9692e4fe9cc2311a8eb74edfa8f6cc0ea54f 05-Apr-2013 Andreas Huber <andih@google.com> Merge "In certain cases where AAC audio frames extended into the next PES payload" into jb-mr2-dev
a1cc7d579888554a59f35c6cdfae3e7f85645ae2 05-Apr-2013 Andreas Huber <andih@google.com> In certain cases where AAC audio frames extended into the next PES payload

(inside transport streams) timestamps would be miscalculated. This fixes it.

Change-Id: I9d74eeea474d2b89e8a9cdc478ed6085282fb3be
peg2ts/ESQueue.cpp
8807524fcb3bcfbf87004dbf1df9722b0a977300 05-Apr-2013 Andreas Huber <andih@google.com> In certain cases where AAC audio frames extended into the next PES payload

(inside transport streams) timestamps would be miscalculated. This fixes it.

Change-Id: I9d74eeea474d2b89e8a9cdc478ed6085282fb3be
peg2ts/ESQueue.cpp
6dfb09089a9d4bb99aa5ebb619b4eb9097e0e809 05-Apr-2013 Marco Nelissen <marcone@google.com> am 1da297f9: am f8fae863: Merge "Make sure resume() and flush() are handled appropriately even if the codec" into jb-mr2-dev

* commit '1da297f9f1fca52d02d09733198e4f3849782c34':
Make sure resume() and flush() are handled appropriately even if the codec
f8fae863e8a5d442684634a1d3b2adcbe74b957a 05-Apr-2013 Marco Nelissen <marcone@google.com> Merge "Make sure resume() and flush() are handled appropriately even if the codec" into jb-mr2-dev
1dc6fcccfe33c65a2253bc3385e45d4e77e4b79e 05-Apr-2013 Marco Nelissen <marcone@google.com> Merge "Make sure resume() and flush() are handled appropriately even if the codec" into jb-mr2-dev
6463e76d41430f9b03a79b221de84255f2475658 05-Apr-2013 Marco Nelissen <marcone@google.com> Make sure resume() and flush() are handled appropriately even if the codec

is in Loaded->Idle state.
b/8347958

Change-Id: Ic14d29502a7effc636251379bb1bbc25739db98e
Codec.cpp
488bf2281134c549fcc9ffcec7bda9690c2d5617 05-Apr-2013 Marco Nelissen <marcone@google.com> Make sure resume() and flush() are handled appropriately even if the codec

is in Loaded->Idle state.
b/8347958

Change-Id: Ic14d29502a7effc636251379bb1bbc25739db98e
Codec.cpp
74b4d6369dd516a47f69b74221b49f812cc396fc 04-Apr-2013 Lajos Molnar <lajos@google.com> am 13837944: am 2e9c6f37: Merge "Fix previous changes." into jb-mr2-dev

* commit '1383794416a9362df29c045a18554ea2001d84ef':
Fix previous changes.
2e9c6f37f8a839a6e31f118a5748ea8faac152a8 04-Apr-2013 Lajos Molnar <lajos@google.com> Merge "Fix previous changes." into jb-mr2-dev
2877100b2768360754f7920f04f95bb5018fbaaa 04-Apr-2013 Lajos Molnar <lajos@google.com> Merge "Fix previous changes." into jb-mr2-dev
4eac4e624f6930966d208d8e1ee99eefee077b50 04-Apr-2013 Andreas Huber <andih@google.com> Fix previous changes.

Change-Id: I1cd3803b6507156174591c3252f1d89ef2e6140a
ifi-display/nettest.cpp
ifi-display/rtp/RTPSender.cpp
ifi-display/rtptest.cpp
8a9ea338b172a47c1ff117c51f6cd167d4ef953f 04-Apr-2013 Andreas Huber <andih@google.com> Fix previous changes.

Change-Id: I1cd3803b6507156174591c3252f1d89ef2e6140a
ifi-display/rtp/RTPSender.cpp
c2a9d4ef6a1ef35c4774cb68062535995738d453 04-Apr-2013 Andreas Huber <andih@google.com> am 3141de27: am 74a6b0f1: Merge "RTPReceiver can now track packet loss, account for late arrivals" into jb-mr2-dev

* commit '3141de27f8b425e12e6f640388a9feb8594c93b9':
RTPReceiver can now track packet loss, account for late arrivals
f620cc277cc654d4ca5404ad6c40e96aad103cd3 04-Apr-2013 Andreas Huber <andih@google.com> am 2814a493: am 071c6334: Merge "Support "raw" packetization in RTPSender." into jb-mr2-dev

* commit '2814a4939faff8bf1f85ee46165888f2521a4a1f':
Support "raw" packetization in RTPSender.
7f8c2d7738213624044c029ee1fac318847c1b55 04-Apr-2013 Andreas Huber <andih@google.com> am 2db8a06a: am 8f2f7b33: Merge "New nettest, a simple TCP connection test to measure" into jb-mr2-dev

* commit '2db8a06adbc36cd162e1aa212f2796c08dfbe207':
New nettest, a simple TCP connection test to measure
f211ed5e4284c9443ecb8696935df635302e2dd2 04-Apr-2013 Andreas Huber <andih@google.com> am 0dfa63f8: am 13e1c06b: Merge "RTPTest updated to allow for UDP/TCP transport and abstracted" into jb-mr2-dev

* commit '0dfa63f869c545fc0ec720cee91947151591e220':
RTPTest updated to allow for UDP/TCP transport and abstracted
74a6b0f1a0de62b34b41dca22ea82615c3fdc77a 04-Apr-2013 Andreas Huber <andih@google.com> Merge "RTPReceiver can now track packet loss, account for late arrivals" into jb-mr2-dev
071c6334bf1e59fa8c5229b8c9f0b43616884982 04-Apr-2013 Andreas Huber <andih@google.com> Merge "Support "raw" packetization in RTPSender." into jb-mr2-dev
25a5c604e5b731430e2134838789b99ab937b7ee 04-Apr-2013 Andreas Huber <andih@google.com> Merge "Support "raw" packetization in RTPSender." into jb-mr2-dev
8f2f7b336fc3ae0482bb2bd30e2f61423bf46958 04-Apr-2013 Andreas Huber <andih@google.com> Merge "New nettest, a simple TCP connection test to measure" into jb-mr2-dev
7f537b72908d0f51698d70840ac666d69a0c53dd 04-Apr-2013 Andreas Huber <andih@google.com> Merge "New nettest, a simple TCP connection test to measure" into jb-mr2-dev
13e1c06bdeb7c6d48fd9b64254648c0af991acc5 04-Apr-2013 Andreas Huber <andih@google.com> Merge "RTPTest updated to allow for UDP/TCP transport and abstracted" into jb-mr2-dev
e3c85394869622a4f478c570480cb2fbcda664e5 04-Apr-2013 Andreas Huber <andih@google.com> am da88aa77: am ac67e976: Merge "Track max latency in WifiDisplaySink" into jb-mr2-dev

* commit 'da88aa770ddded67c5bc888abfa4e236b16062d8':
Track max latency in WifiDisplaySink
cac0e7e266bfe20f52d3a9b2ce8873bfc4831885 04-Apr-2013 Andreas Huber <andih@google.com> am e3661424: am 8058888d: Merge "Reduce TimeSyncer frequency to once every 60 secs, added some logs" into jb-mr2-dev

* commit 'e3661424efdd21a523d37f99f1cc002ce2c09e9b':
Reduce TimeSyncer frequency to once every 60 secs, added some logs
c22329712d06206edbb8014a19179380677e5793 04-Apr-2013 Andreas Huber <andih@google.com> am 287aec7f: am 7a09d501: Merge "Removed rtp timestamp patching hack in ANetworkSession, advertise" into jb-mr2-dev

* commit '287aec7f199188bd5501ebb264c6c4991556ec0f':
Removed rtp timestamp patching hack in ANetworkSession, advertise
e6ee42eb4145201a109c01fc23b6009191ea342b 04-Apr-2013 Andreas Huber <andih@google.com> am 63563da8: am fa3df4ad: Merge "Fix adaptive frame rate handling to be non-adaptive unless specified through" into jb-mr2-dev

* commit '63563da85437667213fbc4aec765e56ab84354d9':
Fix adaptive frame rate handling to be non-adaptive unless specified through
2be6121a47d3df2a0efcb73afd214f2958eb9927 04-Apr-2013 Andreas Huber <andih@google.com> RTPReceiver can now track packet loss, account for late arrivals

it also uses timers to trigger retransmission and packet loss declaration

Change-Id: If1f9324783b3bef950076c2edf321f7c33ff9fea
ifi-display/rtp/RTPReceiver.cpp
ifi-display/rtp/RTPReceiver.h
eae218f0174ac6470b123ec91e6a309af6f8a8c5 04-Apr-2013 Andreas Huber <andih@google.com> Support "raw" packetization in RTPSender.

Change-Id: I14d59573ee0f57eccc104fea0fb46377476d213d
ifi-display/rtp/RTPBase.h
ifi-display/rtp/RTPSender.cpp
ifi-display/rtp/RTPSender.h
8f1f6a4814403dd78539250c845f8326f6137a61 04-Apr-2013 Andreas Huber <andih@google.com> Support "raw" packetization in RTPSender.

Change-Id: I14d59573ee0f57eccc104fea0fb46377476d213d
ifi-display/rtp/RTPAssembler.cpp
ifi-display/rtp/RTPBase.h
ifi-display/rtp/RTPSender.cpp
ifi-display/rtp/RTPSender.h
bd8319b282f39822d5f89bfb098c3317d2be6f03 04-Apr-2013 Andreas Huber <andih@google.com> New nettest, a simple TCP connection test to measure

latency between two devices exchanging low-bitrate data.

Change-Id: Iac138fa70d2a69bbc86c517c953011c80bed071f
ifi-display/Android.mk
ifi-display/nettest.cpp
f165e25696be6babf8db99c780fee804aaf364e6 04-Apr-2013 Andreas Huber <andih@google.com> New nettest, a simple TCP connection test to measure

latency between two devices exchanging low-bitrate data.

Change-Id: Iac138fa70d2a69bbc86c517c953011c80bed071f
ifi-display/Android.mk
ac67e976b35cf43b4e8aea0eb64c4f206065096a 04-Apr-2013 Andreas Huber <andih@google.com> Merge "Track max latency in WifiDisplaySink" into jb-mr2-dev
8058888d7b98e14d82a68d0cf4f122a5c118894d 04-Apr-2013 Andreas Huber <andih@google.com> Merge "Reduce TimeSyncer frequency to once every 60 secs, added some logs" into jb-mr2-dev
7a09d501fe339203a1a38b35dbc13dc0dc31dcf9 04-Apr-2013 Andreas Huber <andih@google.com> Merge "Removed rtp timestamp patching hack in ANetworkSession, advertise" into jb-mr2-dev
04e46929fc316d77426796435bdf13799798c7a8 04-Apr-2013 Andreas Huber <andih@google.com> Merge "Removed rtp timestamp patching hack in ANetworkSession, advertise" into jb-mr2-dev
fa3df4ad35da6528ab5620d4f596c60d8cd99110 04-Apr-2013 Andreas Huber <andih@google.com> Merge "Fix adaptive frame rate handling to be non-adaptive unless specified through" into jb-mr2-dev
c44834b77a24c050692bff6181bb603c7388b7f2 04-Apr-2013 Andreas Huber <andih@google.com> Merge "Fix adaptive frame rate handling to be non-adaptive unless specified through" into jb-mr2-dev
48c0addff1e943393272a5ed698d24afbf6b2471 04-Apr-2013 Andreas Huber <andih@google.com> RTPTest updated to allow for UDP/TCP transport and abstracted

where the data is coming from, also added time synchronization.

Change-Id: Iecc2201a2bd17be06f16690a28261bef5b4e439c
ifi-display/rtptest.cpp
30bf97b3665aa5a9024517697b8459d7662eb8b9 04-Apr-2013 Andreas Huber <andih@google.com> Track max latency in WifiDisplaySink

also unbreak non-special-mode by choosing a proper time offset based
on arrival time of the first access unit even when no time synchronization
is present.

Change-Id: I133050afc6f70d4639ca45de68a31d5bc3594e96
ifi-display/sink/WifiDisplaySink.cpp
ifi-display/sink/WifiDisplaySink.h
e7547e7221f1e2b2626f91984688642ea1649bff 04-Apr-2013 Andreas Huber <andih@google.com> am b41c9a03: am a5761dcb: Fix a number of warnings in stagefright code.

* commit 'b41c9a03b7a7ca4244f68fd26b2f9d41b66f038a':
Fix a number of warnings in stagefright code.
8f24c039fb3418c15f476988f12383b26c1201bc 04-Apr-2013 Andreas Huber <andih@google.com> Reduce TimeSyncer frequency to once every 60 secs, added some logs

to indicate when syncing intervals start and end.

Change-Id: I3b2b997d6723ff592af7c31082c6020cc1eca433
ifi-display/TimeSyncer.cpp
ifi-display/TimeSyncer.h
6e8aec8d185444e52ff0247b266f614c690ded13 04-Apr-2013 Andreas Huber <andih@google.com> Removed rtp timestamp patching hack in ANetworkSession, advertise

differentiated service tags to help prioritize our traffic.

Change-Id: Ibe42df64da272f4bb6b978e46a4ea2efdadfcbc7
ifi-display/ANetworkSession.cpp
013673916b6badf0b6dfb65e7165cef84241ede3 04-Apr-2013 Andreas Huber <andih@google.com> Removed rtp timestamp patching hack in ANetworkSession, advertise

differentiated service tags to help prioritize our traffic.

Change-Id: Ibe42df64da272f4bb6b978e46a4ea2efdadfcbc7
ifi-display/ANetworkSession.cpp
5340cef8c137e7002ff196f2b88b508675bd5b24 04-Apr-2013 Andreas Huber <andih@google.com> Fix adaptive frame rate handling to be non-adaptive unless specified through

adb shell setprop media.wfd.video-framerate adaptive

Change-Id: I452576b62ad465680232b40464977e126616df18
ifi-display/source/PlaybackSession.cpp
80bf5cc27e8f3347897aa29a9c16d7ee83577df2 04-Apr-2013 Andreas Huber <andih@google.com> Fix adaptive frame rate handling to be non-adaptive unless specified through

adb shell setprop media.wfd.video-framerate adaptive

Change-Id: I452576b62ad465680232b40464977e126616df18
ifi-display/source/PlaybackSession.cpp
a5761dcb5f9f017ca9b83ec868565d7ce54a92ac 04-Apr-2013 Andreas Huber <andih@google.com> Fix a number of warnings in stagefright code.

Change-Id: If3edd00d991851797aeccdfe795a4a405e3a2ea3
odecs/aacenc/SoftAACEncoder2.cpp
odecs/amrnb/enc/SoftAMRNBEncoder.cpp
odecs/on2/enc/SoftVPXEncoder.cpp
3d34fa7fe4df6fb66215303f721cc87ce4619cdc 04-Apr-2013 Andreas Huber <andih@google.com> Fix a number of warnings in stagefright code.

Change-Id: If3edd00d991851797aeccdfe795a4a405e3a2ea3
odecs/aacenc/SoftAACEncoder2.cpp
odecs/amrnb/enc/SoftAMRNBEncoder.cpp
odecs/on2/enc/SoftVPXEncoder.cpp
a4a1c1657799cb30d72af989de333c3e0130cbad 02-Apr-2013 Andreas Huber <andih@google.com> am 30e5fecf: am 848621d5: Merge "Fix seek in response to OnPrepared() for HLS content" into jb-mr2-dev

* commit '30e5fecf560f50ca692923f355b10f1294ea00e9':
Fix seek in response to OnPrepared() for HLS content
848621d519636e2abdb8575ba0f964efc53da0d5 01-Apr-2013 Andreas Huber <andih@google.com> Merge "Fix seek in response to OnPrepared() for HLS content" into jb-mr2-dev
e574eecea416c813d539a0977d5393c3ed291a1c 01-Apr-2013 Andreas Huber <andih@google.com> Merge "Fix seek in response to OnPrepared() for HLS content" into jb-mr2-dev
997594088164cfb33c1cb8c376884346fbf1e7ae 01-Apr-2013 Andreas Huber <andih@google.com> Fix seek in response to OnPrepared() for HLS content

Change-Id: I0e52352845398a4db074e939487f6f6de94bd523
related-to-bug: 8225122
ttplive/LiveSession.cpp
7069bdf24a9e3393479368e83f9009817869c33c 01-Apr-2013 Andreas Huber <andih@google.com> Fix seek in response to OnPrepared() for HLS content

Change-Id: I0e52352845398a4db074e939487f6f6de94bd523
related-to-bug: 8225122
ttplive/LiveSession.cpp
dd9a0e5589dc117f9c304b0f0cd5e6d5f828809b 01-Apr-2013 Lajos Molnar <lajos@google.com> am fc67784b: am f9230087: Merge "stagefright: matroska: don\'t crash on parsing error" into jb-mr2-dev

* commit 'fc67784b262d46137af5b750b1e59f8a5cc71ba5':
stagefright: matroska: don't crash on parsing error
f92300875743fca7e264c731a4e2fe9860cd1b10 01-Apr-2013 Lajos Molnar <lajos@google.com> Merge "stagefright: matroska: don't crash on parsing error" into jb-mr2-dev
d49e54289654ab7d7bda03f019ca4421fe303b05 01-Apr-2013 Lajos Molnar <lajos@google.com> Merge "stagefright: matroska: don't crash on parsing error" into jb-mr2-dev
0eb53b64aa4ab9c14194e5bcde8b18c28afc0860 28-Mar-2013 Andreas Huber <andih@google.com> am 6da2afa9: am 31215f2f: Merge "Fix SHUTDOWN after SETUP and before PLAY in wifi display." into jb-mr2-dev

* commit '6da2afa976c17fdbf8a3ecc4909a9bd7870deb6e':
Fix SHUTDOWN after SETUP and before PLAY in wifi display.
31215f2f341bae9d1f6db6368b2b1539e077d571 28-Mar-2013 Andreas Huber <andih@google.com> Merge "Fix SHUTDOWN after SETUP and before PLAY in wifi display." into jb-mr2-dev
2f711486c2b35610fb8e114968263e6660cdb683 28-Mar-2013 Andreas Huber <andih@google.com> Merge "Fix SHUTDOWN after SETUP and before PLAY in wifi display." into jb-mr2-dev
ff9297ac908aa01e44fda4ab9ca7a4bb514c00fd 28-Mar-2013 Andreas Huber <andih@google.com> Fix SHUTDOWN after SETUP and before PLAY in wifi display.

Change-Id: Ieb8ce1ac3130254839975a3677162b64156735bc
related-to-bug: 8499893
ifi-display/source/WifiDisplaySource.cpp
57190e05c9f58e22087a2b8411e4b9ff81a92a63 28-Mar-2013 Andreas Huber <andih@google.com> Fix SHUTDOWN after SETUP and before PLAY in wifi display.

Change-Id: Ieb8ce1ac3130254839975a3677162b64156735bc
related-to-bug: 8499893
ifi-display/source/WifiDisplaySource.cpp
8bca3d4f4d3238a73be76a794f4affed7e7c2b7f 28-Mar-2013 Andreas Huber <andih@google.com> am 945957de: am d0b1fac1: Merge "Make sure resume() and flush() are handled appropriately even if the codec" into jb-mr2-dev

* commit '945957def67b160dfa2dcfa5c7f438d40ec1d9a2':
Make sure resume() and flush() are handled appropriately even if the codec
d0b1fac13ead06231dcc0782d137d117e02d634e 28-Mar-2013 Andreas Huber <andih@google.com> Merge "Make sure resume() and flush() are handled appropriately even if the codec" into jb-mr2-dev
63519f7f74e15f88450263e6f752cc76d094add7 28-Mar-2013 Andreas Huber <andih@google.com> Merge "Make sure resume() and flush() are handled appropriately even if the codec" into jb-mr2-dev
d477b8d071826c0768620f7ac302f31d8b12b1ca 28-Mar-2013 Andreas Huber <andih@google.com> Make sure resume() and flush() are handled appropriately even if the codec

is in Idle->Executing state.

Change-Id: I16a10791fae0e062a19299732c472cc93e4ed971
related-to-bug: 8347958
Codec.cpp
5e691cd3aed18b79cc7362b6689f67886ce90e56 28-Mar-2013 Andreas Huber <andih@google.com> Make sure resume() and flush() are handled appropriately even if the codec

is in Idle->Executing state.

Change-Id: I16a10791fae0e062a19299732c472cc93e4ed971
related-to-bug: 8347958
Codec.cpp
a8dd8ef3b0efb5f61931870bf5e8167e27dbf4be 28-Mar-2013 Marco Nelissen <marcone@google.com> am 49a8b409: am 5952255a: Merge "Fix valgrind error in software h264 decoder" into jb-mr2-dev

* commit '49a8b409541eb090bf31761014d3bc9bd64b77bd':
Fix valgrind error in software h264 decoder
e467ef084b75b074d0081616080b54212a7024c8 28-Mar-2013 Lajos Molnar <lajos@google.com> stagefright: matroska: don't crash on parsing error

MatroskaExtractor crashed with an assertion if mkvparser::ParseNext()
returned a negative number. Now handle all error values the same
way as the EOF.

Change-Id: I173c4f878d692a0cbdb915ad1118d0686249d625
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug: 8433794
atroska/MatroskaExtractor.cpp
7268396ee607804570d3ae5927d672894aa708b1 28-Mar-2013 Lajos Molnar <lajos@google.com> stagefright: matroska: don't crash on parsing error

MatroskaExtractor crashed with an assertion if mkvparser::ParseNext()
returned a negative number. Now handle all error values the same
way as the EOF.

Change-Id: I173c4f878d692a0cbdb915ad1118d0686249d625
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug: 8433794
atroska/MatroskaExtractor.cpp
4a7fe9cd333c4cf533f78a074c8c2c820b94c6d2 28-Mar-2013 Marco Nelissen <marcone@google.com> Fix valgrind error in software h264 decoder

h264bsdNextMbAddress could read past the end of an allocation, which
could conceivably result in a segfault if the allocation was at the
very end of a page.

Change-Id: Id7a0c5733d66e609f36feb0e15b2d67b9bbc0b4d
odecs/on2/h264dec/source/h264bsd_util.c
cbfce76bc7cd986cb391101c384d8e89a14328bf 28-Mar-2013 Marco Nelissen <marcone@google.com> Fix valgrind error in software h264 decoder

h264bsdNextMbAddress could read past the end of an allocation, which
could conceivably result in a segfault if the allocation was at the
very end of a page.

Change-Id: Id7a0c5733d66e609f36feb0e15b2d67b9bbc0b4d
odecs/on2/h264dec/source/h264bsd_util.c
e89c0c142bbbde37e72d3b845e80c28da8e65211 26-Mar-2013 Andreas Huber <andih@google.com> am a66ca01a: am 4fc3e841: Merge "Adapt frame rate instead of keeping that constant and tweaking bitrate" into jb-mr2-dev

* commit 'a66ca01a17a1ec16625bf00a7827fd83f2df36c8':
Adapt frame rate instead of keeping that constant and tweaking bitrate
eaf5381f38bf6c3ecb5fe32a8351c26a447549f5 26-Mar-2013 Andreas Huber <andih@google.com> Adapt frame rate instead of keeping that constant and tweaking bitrate

Change-Id: I889abbbe1237e1a8fdd7135cdc91a2e9728ff39b
ifi-display/source/Converter.cpp
ifi-display/source/Converter.h
ifi-display/source/PlaybackSession.cpp
ifi-display/source/RepeaterSource.cpp
ifi-display/source/RepeaterSource.h
4646d5756c06e896f9f8489fa07cd14f958b2f84 26-Mar-2013 Andreas Huber <andih@google.com> Adapt frame rate instead of keeping that constant and tweaking bitrate

Change-Id: I889abbbe1237e1a8fdd7135cdc91a2e9728ff39b
ifi-display/source/Converter.cpp
ifi-display/source/Converter.h
ifi-display/source/PlaybackSession.cpp
ifi-display/source/RepeaterSource.cpp
ifi-display/source/RepeaterSource.h
c2140bb6c7e91e77bb6cdae4b1e4db83e1d786fa 26-Mar-2013 Andreas Huber <andih@google.com> am 1e7d497c: am cd77d4a1: Identify network servers and clients with a OS version related string

* commit '1e7d497c91e429b70fff592e6ae78aa81a4cea16':
Identify network servers and clients with a OS version related string
cd77d4a1d38b7609a03f6826a1ff5fa7c98aa34f 26-Mar-2013 Andreas Huber <andih@google.com> Identify network servers and clients with a OS version related string

and put the logic to create that string in one location instead of many...

Change-Id: I1f729f2e7376cd3b45eea0e48f7bd10084b41b39
tils.cpp
hromium_http/support.cpp
tsp/ARTSPConnection.cpp
tsp/ARTSPConnection.h
tsp/MyHandler.h
ifi-display/sink/WifiDisplaySink.cpp
ifi-display/sink/WifiDisplaySink.h
ifi-display/source/WifiDisplaySource.cpp
ifi-display/source/WifiDisplaySource.h
190cdbab6ba24519d6b5e8bec6c2c74e6650e284 26-Mar-2013 Andreas Huber <andih@google.com> Identify network servers and clients with a OS version related string

and put the logic to create that string in one location instead of many...

Change-Id: I1f729f2e7376cd3b45eea0e48f7bd10084b41b39
tils.cpp
hromium_http/support.cpp
tsp/ARTSPConnection.cpp
tsp/ARTSPConnection.h
tsp/MyHandler.h
ifi-display/source/WifiDisplaySource.cpp
ifi-display/source/WifiDisplaySource.h
5742afb7e897cbaf57c4e068404504c4d72e1d95 26-Mar-2013 Andreas Huber <andih@google.com> am cb7e64f4: am 5d014f0f: Merge "In "special" mode we now establish a UDP RTCP channel in addition to the" into jb-mr2-dev

* commit 'cb7e64f474660fc1d6ec2fa1d60e85bffa64f754':
In "special" mode we now establish a UDP RTCP channel in addition to the
2aea9552aeba92bbaf9e56c666049ea2d14057b5 25-Mar-2013 Andreas Huber <andih@google.com> In "special" mode we now establish a UDP RTCP channel in addition to the

TCP RTP channel and provide feedback on the latency of arriving packets from
the sink back to the source. This information is then used to throttle
video bitrate.

Change-Id: Ic589a3cb65e4893a3ff67de947da6063d32a1c6e
ifi-display/ANetworkSession.cpp
ifi-display/MediaReceiver.cpp
ifi-display/MediaReceiver.h
ifi-display/MediaSender.cpp
ifi-display/MediaSender.h
ifi-display/rtp/RTPReceiver.cpp
ifi-display/rtp/RTPReceiver.h
ifi-display/rtp/RTPSender.cpp
ifi-display/rtp/RTPSender.h
ifi-display/sink/WifiDisplaySink.cpp
ifi-display/source/Converter.cpp
ifi-display/source/Converter.h
ifi-display/source/PlaybackSession.cpp
ifi-display/source/PlaybackSession.h
ifi-display/source/WifiDisplaySource.cpp
dca73b8fe8fa4d991e1a78c02f1939aaeb673cc1 25-Mar-2013 Andreas Huber <andih@google.com> In "special" mode we now establish a UDP RTCP channel in addition to the

TCP RTP channel and provide feedback on the latency of arriving packets from
the sink back to the source. This information is then used to throttle
video bitrate.

Change-Id: Ic589a3cb65e4893a3ff67de947da6063d32a1c6e
ifi-display/ANetworkSession.cpp
ifi-display/MediaSender.cpp
ifi-display/MediaSender.h
ifi-display/rtp/RTPSender.cpp
ifi-display/rtp/RTPSender.h
ifi-display/source/Converter.cpp
ifi-display/source/Converter.h
ifi-display/source/PlaybackSession.cpp
ifi-display/source/PlaybackSession.h
ifi-display/source/WifiDisplaySource.cpp
4d818078d3a24d11eb1e91ff6fed8874c02773b5 25-Mar-2013 Andreas Huber <andih@google.com> am 6436281a: am 112c72a9: Merge "Get rid of TunnelRenderer" into jb-mr2-dev

* commit '6436281aec238501e28cf2b87c5031d242491191':
Get rid of TunnelRenderer
f90debb467a0daf5288e7d8684642ef1119c4bad 25-Mar-2013 Andreas Huber <andih@google.com> Get rid of TunnelRenderer

Change-Id: I40dc00e2e689d7a6b8717ce524016c2948229807
ifi-display/Android.mk
ifi-display/sink/TunnelRenderer.cpp
ifi-display/sink/TunnelRenderer.h
ifi-display/sink/WifiDisplaySink.cpp
ifi-display/sink/WifiDisplaySink.h
d3d9263ce5e10220552026253d0e205986e82490 25-Mar-2013 Andreas Huber <andih@google.com> Get rid of TunnelRenderer

Change-Id: I40dc00e2e689d7a6b8717ce524016c2948229807
ifi-display/Android.mk
ifi-display/sink/TunnelRenderer.cpp
ifi-display/sink/TunnelRenderer.h
1922d9b3e475ae048873ef7e0f3a36fdd45c8662 25-Mar-2013 Andreas Huber <andih@google.com> am 0b56fc9c: am bd91c0ab: Merge "Misc debugging support and handling of latency changes." into jb-mr2-dev

* commit '0b56fc9cc02d262bf3b6d43fca3893e09eb89aaa':
Misc debugging support and handling of latency changes.
cc8623a7af8c1f7f40dd7810e2b5cf24a008faf3 25-Mar-2013 Andreas Huber <andih@google.com> Misc debugging support and handling of latency changes.

Change-Id: I682944f793690842219cf1adbae5e61e061b6b62
ifi-display/MediaSender.cpp
ifi-display/sink/DirectRenderer.cpp
ifi-display/sink/DirectRenderer.h
ifi-display/sink/WifiDisplaySink.cpp
ifi-display/sink/WifiDisplaySink.h
ifi-display/wfd.cpp
6bb4d7f084c7e2a6d8e804519ad786c519b74d0d 25-Mar-2013 Andreas Huber <andih@google.com> Misc debugging support and handling of latency changes.

Change-Id: I682944f793690842219cf1adbae5e61e061b6b62
ifi-display/MediaSender.cpp
ifi-display/wfd.cpp
a547b646b179e31b3fe27e43dae318ac3ff4f8ab 25-Mar-2013 Andreas Huber <andih@google.com> am 74ba6576: am 09bfd026: Merge "Separate the mode of the RTP and RTCP channels." into jb-mr2-dev

* commit '74ba65765981a25970a2cfd3a57b926a1061e3b7':
Separate the mode of the RTP and RTCP channels.
09bfd026b9f4fe004cba05e2eaf2dee38913bc7e 25-Mar-2013 Andreas Huber <andih@google.com> Merge "Separate the mode of the RTP and RTCP channels." into jb-mr2-dev
cbb2aad7a8aced67d2d97e03d8cd78b1a843290c 25-Mar-2013 Andreas Huber <andih@google.com> Merge "Separate the mode of the RTP and RTCP channels." into jb-mr2-dev
6e98aba4d23d00cab236d993d895f57ea76ea0e5 22-Mar-2013 Andreas Huber <andih@google.com> Separate the mode of the RTP and RTCP channels.

I now can use a TCP reliable data channel with a UDP back channel.

Change-Id: Ieb0f0970e3a6da4cff250e9547e181c0c961b9fb
ifi-display/MediaReceiver.cpp
ifi-display/MediaSender.cpp
ifi-display/rtp/RTPBase.h
ifi-display/rtp/RTPReceiver.cpp
ifi-display/rtp/RTPReceiver.h
ifi-display/rtp/RTPSender.cpp
ifi-display/rtp/RTPSender.h
ifi-display/rtptest.cpp
a64ea768de9c02bce0e545be032dabe8b6c39727 22-Mar-2013 Andreas Huber <andih@google.com> Separate the mode of the RTP and RTCP channels.

I now can use a TCP reliable data channel with a UDP back channel.

Change-Id: Ieb0f0970e3a6da4cff250e9547e181c0c961b9fb
ifi-display/MediaSender.cpp
ifi-display/rtp/RTPBase.h
ifi-display/rtp/RTPSender.cpp
ifi-display/rtp/RTPSender.h
be5125ba7b70c4b6507f443634892c1f1c4a862e 25-Mar-2013 Andreas Huber <andih@google.com> am ebc1ab2c: am 2850e418: Merge "Ensure that the payload in each TS packet is an even multiple of 16 bytes long" into jb-mr2-dev

* commit 'ebc1ab2c6669f376ebc4b067f7cfe5ae9d7f196b':
Ensure that the payload in each TS packet is an even multiple of 16 bytes long
2850e41813c2bfaf199fefc990d7ec91551a9460 25-Mar-2013 Andreas Huber <andih@google.com> Merge "Ensure that the payload in each TS packet is an even multiple of 16 bytes long" into jb-mr2-dev
10222ef1c1728e0d623954eec4b9732d39e9e9ec 25-Mar-2013 Andreas Huber <andih@google.com> Merge "Ensure that the payload in each TS packet is an even multiple of 16 bytes long" into jb-mr2-dev
820ebf8d452165d9a7619e2667ffa3c0b638da39 21-Mar-2013 Andreas Huber <andih@google.com> Ensure that the payload in each TS packet is an even multiple of 16 bytes long

(except for the final TS packet) as specified by HDCP.

Change-Id: I45d49d347c06f5daae310f196d9a8484be0f3ca0
related-to-bug: 7549145
ifi-display/source/TSPacketizer.cpp
e8ad89f993bb36f9c869f3a71bbcd60949979e1a 21-Mar-2013 Andreas Huber <andih@google.com> Ensure that the payload in each TS packet is an even multiple of 16 bytes long

(except for the final TS packet) as specified by HDCP.

Change-Id: I45d49d347c06f5daae310f196d9a8484be0f3ca0
related-to-bug: 7549145
ifi-display/source/TSPacketizer.cpp
a459c33e0b5ef65014be5716b6a5e5d89e8c8624 20-Mar-2013 ztenghui <ztenghui@google.com> am 6bc010e3: am 9e36b5a5: Merge "Add the presentation rotation support" into jb-mr2-dev

* commit '6bc010e3062b50d5cf9605dd5ffaa0904772312e':
Add the presentation rotation support
9e36b5a5c630c303b5007fdeb5c0df83b953adf4 20-Mar-2013 ztenghui <ztenghui@google.com> Merge "Add the presentation rotation support" into jb-mr2-dev
3a29ea87c8fdcd45987bcc9cd2b68961ac971d27 20-Mar-2013 ztenghui <ztenghui@google.com> Merge "Add the presentation rotation support" into jb-mr2-dev
0e6858d6aea12fc585a8c7d217c1271878655081 07-Mar-2013 Dan Morrill <morrildl@google.com> Turn off debug tags in stagefright modules.
LOCAL_MODULE_TAGS := debug causes the module to be included in every userdebug
build, regardless of whether it's specified as a dep by the device config.
This CL switches them all to optional (i.e. default behavior) so that we can
do (userdebug) device builds without pulling these in.

Change-Id: I4b7b65afea61865dd38b3af55550fb8f10edf66d
odecs/aacenc/SampleCode/Android.mk
odecs/amrwbenc/SampleCode/Android.mk
odecs/on2/h264dec/Android.mk
d3/Android.mk
tsp/Android.mk
ifi-display/Android.mk
96954c00cc8887f216ba84e126ab4a1100f348b4 19-Mar-2013 Andreas Huber <andih@google.com> Merge "Change ANetworkSession implementation to optionally attach timestamps" into jb-mr2-dev
42404e895c182df761cbd2473d172e58e763ac89 19-Mar-2013 Andreas Huber <andih@google.com> Merge "Change ANetworkSession implementation to optionally attach timestamps" into jb-mr2-dev
106f1628b849f733046f1da25e4c8222676288b0 19-Mar-2013 Andreas Huber <andih@google.com> Merge "Allow for streaming of media files (without recompression)" into jb-mr2-dev
ffe25bc8dc76fe437afeaafe679943b33a468986 19-Mar-2013 Andreas Huber <andih@google.com> Merge "Allow for streaming of media files (without recompression)" into jb-mr2-dev
a239dd722e760fe4fd7379b454d7722e1f312928 18-Mar-2013 Andreas Huber <andih@google.com> Change ANetworkSession implementation to optionally attach timestamps

to fragments of data to be transferred and to log statistics when data
is finally submitted to the POSIX layer.

Change-Id: Icbfcac203cdc5c9eac1634e84d34bb380b316a01
ifi-display/ANetworkSession.cpp
ifi-display/ANetworkSession.h
ifi-display/MediaSender.cpp
ifi-display/rtp/RTPSender.cpp
ifi-display/rtp/RTPSender.h
ifi-display/wfd.cpp
632177b7446185a0407b7df96f684a9b8b980765 18-Mar-2013 Andreas Huber <andih@google.com> Change ANetworkSession implementation to optionally attach timestamps

to fragments of data to be transferred and to log statistics when data
is finally submitted to the POSIX layer.

Change-Id: Icbfcac203cdc5c9eac1634e84d34bb380b316a01
ifi-display/ANetworkSession.cpp
ifi-display/ANetworkSession.h
ifi-display/MediaSender.cpp
ifi-display/rtp/RTPSender.cpp
ifi-display/rtp/RTPSender.h
ifi-display/wfd.cpp
0b530f1050150bb751ae642d5a9dce34141d9475 18-Mar-2013 Andreas Huber <andih@google.com> Allow for streaming of media files (without recompression)

Change-Id: I1de356cc37506ba986822d12a1a59e7b64069e02
ifi-display/MediaSender.cpp
ifi-display/source/PlaybackSession.cpp
ifi-display/source/PlaybackSession.h
ifi-display/source/TSPacketizer.cpp
ifi-display/source/WifiDisplaySource.cpp
ifi-display/source/WifiDisplaySource.h
ifi-display/wfd.cpp
16fb8f3954a6a4058953c505a4e7958a1b14c62b 18-Mar-2013 Andreas Huber <andih@google.com> Allow for streaming of media files (without recompression)

Change-Id: I1de356cc37506ba986822d12a1a59e7b64069e02
ifi-display/MediaSender.cpp
ifi-display/source/PlaybackSession.cpp
ifi-display/source/PlaybackSession.h
ifi-display/source/TSPacketizer.cpp
ifi-display/source/WifiDisplaySource.cpp
ifi-display/source/WifiDisplaySource.h
ifi-display/wfd.cpp
e0fb528f8e3bbab04620c8534177168b358e837b 12-Mar-2013 ztenghui <ztenghui@google.com> Add the presentation rotation support

bug:7991013

Change-Id: I10cb034b432876c724baa4974efcb3d67b8a99b6
ediaMuxer.cpp
11287471298193ff51ffb429686f5d63a84a621b 12-Mar-2013 ztenghui <ztenghui@google.com> Add the presentation rotation support

bug:7991013

Change-Id: I10cb034b432876c724baa4974efcb3d67b8a99b6
ediaMuxer.cpp
ee6ad3bd4bfc8e71b3b8c96eb4ea56a592e13e65 15-Mar-2013 Andreas Huber <andih@google.com> am 59ac7b30: am 66abe3ae: Merge "Fix for crash if no content in DESCRIBE response"

* commit '59ac7b3056db57e5a8e851b7946a181c5fc34852':
Fix for crash if no content in DESCRIBE response
4f4c2655dc3f6fcef766db6e793b1642ad0fd605 15-Mar-2013 Andreas Huber <andih@google.com> am 59ac7b30: am 66abe3ae: Merge "Fix for crash if no content in DESCRIBE response"

* commit '59ac7b3056db57e5a8e851b7946a181c5fc34852':
Fix for crash if no content in DESCRIBE response
7d02488e0af9f21f5f15abcbd8dd8746606a124c 14-Mar-2013 Tenghui Zhu <ztenghui@google.com> Merge "Make limitations of MPEG4Writer explicit" into jb-mr2-dev
b7be24f055426f00fd1ae1af07d5dd40dbcedfe7 14-Mar-2013 Tenghui Zhu <ztenghui@google.com> Merge "Make limitations of MPEG4Writer explicit" into jb-mr2-dev
1cea316d40b306f5d710175cd77c2ae4161c12e1 14-Mar-2013 Marco Nelissen <marcone@google.com> Merge "Parse SBR extension sample rate" into jb-mr2-dev
db57fae81950e32af019b32421b93d204d67e951 14-Mar-2013 Marco Nelissen <marcone@google.com> Merge "Parse SBR extension sample rate" into jb-mr2-dev
595ee7ba5f988ff34527226d0142a109ca3b049e 14-Mar-2013 Marco Nelissen <marcone@google.com> Parse SBR extension sample rate

Change-Id: Ib6f6994228a279ee10b389515fba04516c7c42ba
PEG4Extractor.cpp
0364a91b4230e5b0631f96579e91a0eb2efa48c3 14-Mar-2013 Marco Nelissen <marcone@google.com> Parse SBR extension sample rate

Change-Id: Ib6f6994228a279ee10b389515fba04516c7c42ba
PEG4Extractor.cpp
acc47642e0f5d962f6289e6ba687fabf68f8312b 12-Mar-2013 James Dong <jdong@google.com> Make limitations of MPEG4Writer explicit

o No more than 2 tracks will be supported
o No more than one video and/or one audio tracks will be supported
o Only take video and/or audio track (for instance, no text tracks)
o If there is no track before start() is called, bail out.

At the same time, make sure the errors from addSource() report to
addTrack(), not to start().

Bug: 7991013

Change-Id: I1ca35aaeb75b5448d75ed2c6c10dd12ecea720ab
PEG4Writer.cpp
ediaMuxer.cpp
5883d53cf8300d8b13a1a6ef3310d72a55e191c0 12-Mar-2013 James Dong <jdong@google.com> Make limitations of MPEG4Writer explicit

o No more than 2 tracks will be supported
o No more than one video and/or one audio tracks will be supported
o Only take video and/or audio track (for instance, no text tracks)
o If there is no track before start() is called, bail out.

At the same time, make sure the errors from addSource() report to
addTrack(), not to start().

Bug: 7991013

Change-Id: I1ca35aaeb75b5448d75ed2c6c10dd12ecea720ab
PEG4Writer.cpp
ediaMuxer.cpp
f15c0d6d0d80899da9c2d0c479aebc7f42464f27 13-Mar-2013 Andreas Huber <andih@google.com> Merge "Adds audio support to DirectRenderer." into jb-mr2-dev
a32fd0e2c7489fa28055595d7c67d857d32566a5 13-Mar-2013 Mathias Agopian <mathias@google.com> Merge "remove uses of Surface in favor or IGraphicBufferProducer" into jb-mr2-dev
8fb6f96e1cc246bc5630e1f5a0eb90f5459331b7 13-Mar-2013 Mathias Agopian <mathias@google.com> Merge "remove uses of Surface in favor or IGraphicBufferProducer" into jb-mr2-dev
c66f8788871b2ae2d240e0e16dd3bdc5c277ce31 13-Mar-2013 Andreas Huber <andih@google.com> Adds audio support to DirectRenderer.

Change-Id: Ibf4df90aca29d638215e2da9b39e78bf3a2c4d08
ifi-display/sink/DirectRenderer.cpp
ifi-display/sink/DirectRenderer.h
ifi-display/sink/WifiDisplaySink.cpp
126568c7aeeb5570789e70a310477f44dbdbd885 12-Mar-2013 Andreas Huber <andih@google.com> Attempt to recover from network stalls by dropping frames on the source side.

Change-Id: I5f9eb4f5acb624a9e5bc0087801fb5a4a9ade35c
ifi-display/ANetworkSession.cpp
ifi-display/ANetworkSession.h
ifi-display/MediaSender.cpp
ifi-display/MediaSender.h
ifi-display/rtp/RTPSender.cpp
ifi-display/rtp/RTPSender.h
ifi-display/sink/WifiDisplaySink.cpp
ifi-display/source/Converter.cpp
ifi-display/source/Converter.h
ifi-display/source/PlaybackSession.cpp
ifi-display/source/WifiDisplaySource.cpp
e2aef54fee88fdeb585a41e1e9834e3d975b263c 12-Mar-2013 Andreas Huber <andih@google.com> Attempt to recover from network stalls by dropping frames on the source side.

Change-Id: I5f9eb4f5acb624a9e5bc0087801fb5a4a9ade35c
ifi-display/ANetworkSession.cpp
ifi-display/ANetworkSession.h
ifi-display/MediaSender.cpp
ifi-display/MediaSender.h
ifi-display/rtp/RTPSender.cpp
ifi-display/rtp/RTPSender.h
ifi-display/source/Converter.cpp
ifi-display/source/Converter.h
ifi-display/source/PlaybackSession.cpp
ifi-display/source/WifiDisplaySource.cpp
99617adda9bc46c43f511f0940bc735c73de61de 13-Mar-2013 Mathias Agopian <mathias@google.com> remove uses of Surface in favor or IGraphicBufferProducer

Change-Id: I13d7a9553aa335bca790a3a59d389d7533c83d57
ameraSource.cpp
ameraSourceTimeLapse.cpp
33da402287605e40e189289b11a08b8f5d515818 13-Mar-2013 Mathias Agopian <mathias@google.com> remove uses of Surface in favor or IGraphicBufferProducer

Change-Id: I13d7a9553aa335bca790a3a59d389d7533c83d57
ameraSource.cpp
ameraSourceTimeLapse.cpp
c148e7a671c289f82f6ca40e29defcc43e1c6d0b 12-Mar-2013 Andreas Huber <andih@google.com> Merge "Squashed commit of the following:" into jb-mr2-dev
c93484ab9fdf044fd32f2388a3ce29040d2ba319 12-Mar-2013 Andreas Huber <andih@google.com> Merge "Squashed commit of the following:" into jb-mr2-dev
d5e56231a598b180a1d898bb7dc61b75580e59a4 12-Mar-2013 Andreas Huber <andih@google.com> Squashed commit of the following:

commit f4edf442741886cdbe071e2d15f6e6247269f7c5
Author: Andreas Huber <andih@google.com>
Date: Tue Mar 12 09:09:18 2013 -0700

Pass additional flags to the sink, use TCP by default in wolfiecast mode.

Change-Id: I41e11a2375d4199656e45c4f149d8441d0016092

commit 6302602ed280a38287f507159abfb40a1da38c5a
Author: Andreas Huber <andih@google.com>
Date: Tue Mar 12 08:51:58 2013 -0700

tweaks

Change-Id: Ie29e422d7258be522f4bb1f6c5afcf74c937e547

commit a38a860e4979ba563cadbaafa21b084439449d26
Author: Andreas Huber <andih@google.com>
Date: Mon Mar 11 16:57:43 2013 -0700

Report average lateness all the way from NuPlayerRenderer...

Change-Id: I2e7700703ae656515e44b9c25610d26c75778111

commit a7d49b11675ea88be4029dd8451d1649db94571d
Author: Andreas Huber <andih@google.com>
Date: Mon Mar 11 14:54:19 2013 -0700

Make TimeSyncer smarter, enable TunnelRenderer

Change-Id: I27377a60cd8feb01589da456967fddd34532c20e

commit 0f214c8ef68179f7b61512c37040939554013151
Author: Andreas Huber <andih@google.com>
Date: Thu Mar 7 15:57:56 2013 -0800

convert source timestamps to sink timestamps, report lateness.

Change-Id: I051a60fbbceca2f7b508ae3dac6e01e402bae39e

commit 04a4f8e16bad09157b5615a5fa45310438955832
Author: Andreas Huber <andih@google.com>
Date: Thu Mar 7 09:00:28 2013 -0800

Sync time between sink and source.

Change-Id: Ie8b4d75c957aa48310e7c81d1279761b9f821efe

commit aebe20e6184e3636a99082f8ece08e708015cb8d
Author: Andreas Huber <andih@google.com>
Date: Wed Mar 6 09:03:12 2013 -0800

play with back pressure

Change-Id: I51eb69257e6a79e76f5f9c75ff99d8adbd083947

Change-Id: Ifdf57228667fed7fc71c5090a2c3f7cea1037c5c
peg2ts/ATSParser.cpp
peg2ts/ATSParser.h
ifi-display/ANetworkSession.cpp
ifi-display/Android.mk
ifi-display/MediaReceiver.cpp
ifi-display/MediaReceiver.h
ifi-display/TimeSyncer.cpp
ifi-display/TimeSyncer.h
ifi-display/rtp/RTPAssembler.cpp
ifi-display/rtp/RTPReceiver.cpp
ifi-display/rtp/RTPReceiver.h
ifi-display/rtp/RTPSender.cpp
ifi-display/sink/DirectRenderer.cpp
ifi-display/sink/DirectRenderer.h
ifi-display/sink/TunnelRenderer.cpp
ifi-display/sink/TunnelRenderer.h
ifi-display/sink/WifiDisplaySink.cpp
ifi-display/sink/WifiDisplaySink.h
ifi-display/source/WifiDisplaySource.cpp
ifi-display/source/WifiDisplaySource.h
ifi-display/udptest.cpp
ifi-display/wfd.cpp
9dffd24e00a1b2abd5e2dcc2366c0327ec3701b8 12-Mar-2013 Andreas Huber <andih@google.com> Squashed commit of the following:

commit f4edf442741886cdbe071e2d15f6e6247269f7c5
Author: Andreas Huber <andih@google.com>
Date: Tue Mar 12 09:09:18 2013 -0700

Pass additional flags to the sink, use TCP by default in wolfiecast mode.

Change-Id: I41e11a2375d4199656e45c4f149d8441d0016092

commit 6302602ed280a38287f507159abfb40a1da38c5a
Author: Andreas Huber <andih@google.com>
Date: Tue Mar 12 08:51:58 2013 -0700

tweaks

Change-Id: Ie29e422d7258be522f4bb1f6c5afcf74c937e547

commit a38a860e4979ba563cadbaafa21b084439449d26
Author: Andreas Huber <andih@google.com>
Date: Mon Mar 11 16:57:43 2013 -0700

Report average lateness all the way from NuPlayerRenderer...

Change-Id: I2e7700703ae656515e44b9c25610d26c75778111

commit a7d49b11675ea88be4029dd8451d1649db94571d
Author: Andreas Huber <andih@google.com>
Date: Mon Mar 11 14:54:19 2013 -0700

Make TimeSyncer smarter, enable TunnelRenderer

Change-Id: I27377a60cd8feb01589da456967fddd34532c20e

commit 0f214c8ef68179f7b61512c37040939554013151
Author: Andreas Huber <andih@google.com>
Date: Thu Mar 7 15:57:56 2013 -0800

convert source timestamps to sink timestamps, report lateness.

Change-Id: I051a60fbbceca2f7b508ae3dac6e01e402bae39e

commit 04a4f8e16bad09157b5615a5fa45310438955832
Author: Andreas Huber <andih@google.com>
Date: Thu Mar 7 09:00:28 2013 -0800

Sync time between sink and source.

Change-Id: Ie8b4d75c957aa48310e7c81d1279761b9f821efe

commit aebe20e6184e3636a99082f8ece08e708015cb8d
Author: Andreas Huber <andih@google.com>
Date: Wed Mar 6 09:03:12 2013 -0800

play with back pressure

Change-Id: I51eb69257e6a79e76f5f9c75ff99d8adbd083947

Change-Id: Ifdf57228667fed7fc71c5090a2c3f7cea1037c5c
peg2ts/ATSParser.cpp
peg2ts/ATSParser.h
ifi-display/ANetworkSession.cpp
ifi-display/Android.mk
ifi-display/rtp/RTPSender.cpp
ifi-display/sink/TunnelRenderer.cpp
ifi-display/sink/TunnelRenderer.h
ifi-display/source/WifiDisplaySource.cpp
ifi-display/source/WifiDisplaySource.h
ifi-display/wfd.cpp
b9f4140b374b56277f8aec47d1a31ec713ad8668 11-Mar-2013 Andy McFadden <fadden@android.com> GraphicBufferSource fixes

Various fixes:
- Set the maximum number of BQ buffers we're allowed to
acquire equal to the actual number of codec buffers. That
way we keep the codec as full as possible, and never try to
acquire more than we're allowed from the BufferQueue.
- Actually use "end of stream sent" flag.
- Name the BufferQueue (for debug messages).

Bug 8359403

Change-Id: I3b8c1f679bbebf6a89e623e13ca029eda7f657ba
mx/GraphicBufferSource.cpp
mx/GraphicBufferSource.h
mx/OMXNodeInstance.cpp
0c37f9d1320bb87fd242f9425c67dacd6ce20112 11-Mar-2013 Andy McFadden <fadden@android.com> GraphicBufferSource fixes

Various fixes:
- Set the maximum number of BQ buffers we're allowed to
acquire equal to the actual number of codec buffers. That
way we keep the codec as full as possible, and never try to
acquire more than we're allowed from the BufferQueue.
- Actually use "end of stream sent" flag.
- Name the BufferQueue (for debug messages).

Bug 8359403

Change-Id: I3b8c1f679bbebf6a89e623e13ca029eda7f657ba
mx/GraphicBufferSource.cpp
mx/GraphicBufferSource.h
mx/OMXNodeInstance.cpp
5f1897538bab324f53efc6bec65487516041f2e9 07-Jan-2013 Xuefei Chen <xuefei.chen@sonymobile.com> Fix for crash if no content in DESCRIBE response

If DESCRIBE response is received with status 200 but no content,
MyHandler will still set content data for session description
parsing. This will cause NULL Pointer crash.
This fix checks whether DESCRIBE response has content before
parsing session description.

Change-Id: I114ae6fd54ce804e61718f62618ca9008425a433
tsp/MyHandler.h
d32b7b479fad359d7fe779a9c5b4c090cdc14b56 07-Jan-2013 Xuefei Chen <xuefei.chen@sonymobile.com> Fix for crash if no content in DESCRIBE response

If DESCRIBE response is received with status 200 but no content,
MyHandler will still set content data for session description
parsing. This will cause NULL Pointer crash.
This fix checks whether DESCRIBE response has content before
parsing session description.

Change-Id: I114ae6fd54ce804e61718f62618ca9008425a433
tsp/MyHandler.h
70369845f8250df4f6f22c336414b4df0a3ce53e 09-Mar-2013 ztenghui <ztenghui@google.com> Merge "Clean up the native code to match Java update" into jb-mr2-dev
dbda1c852d68fde2e729ff2f8e85a406da73994b 09-Mar-2013 ztenghui <ztenghui@google.com> Merge "Clean up the native code to match Java update" into jb-mr2-dev
3db62dfc5102247d415df4667bd9609e669fc022 22-Feb-2013 ztenghui <ztenghui@google.com> Clean up the native code to match Java update

1. Add flags to match the java side change.
2. Update the interface.

bug:7991013

Change-Id: I8ffe84c466b2a68e2e1e48b35b78db9e44640265
ediaMuxer.cpp
afde4e56566af19b36f1fe5e7aa7f226bf1703dd 22-Feb-2013 ztenghui <ztenghui@google.com> Clean up the native code to match Java update

1. Add flags to match the java side change.
2. Update the interface.

bug:7991013

Change-Id: I8ffe84c466b2a68e2e1e48b35b78db9e44640265
ediaMuxer.cpp
2797b47f8a74b902d445cd89755e2349136a8b6b 08-Mar-2013 Andreas Huber <andih@google.com> Merge "Disable our fancy logic to respect both sink and source's native formats" into jb-mr2-dev
96aeef2b4f51b06cb7f9ccbb04df48b305550b67 08-Mar-2013 Andreas Huber <andih@google.com> Merge "Disable our fancy logic to respect both sink and source's native formats" into jb-mr2-dev
5abf87f9af48149972eeb851ecaea679911da040 07-Mar-2013 Andreas Huber <andih@google.com> Disable our fancy logic to respect both sink and source's native formats

since it isn't actually supported by anything in the field.

Change-Id: I9cd038d7631105de26303312ca87c472d67034d4
ifi-display/VideoFormats.cpp
ifi-display/VideoFormats.h
ifi-display/sink/WifiDisplaySink.cpp
ifi-display/source/WifiDisplaySource.cpp
13700b08cb1f6405f0b27434d42d03864e00e41f 07-Mar-2013 Andreas Huber <andih@google.com> Disable our fancy logic to respect both sink and source's native formats

since it isn't actually supported by anything in the field.

Change-Id: I9cd038d7631105de26303312ca87c472d67034d4
ifi-display/VideoFormats.cpp
ifi-display/VideoFormats.h
ifi-display/source/WifiDisplaySource.cpp
bfd79f2a8e795f304062e22756c72d995af7a0e6 07-Mar-2013 Andreas Huber <andih@google.com> The transport stream HDCP descriptor belongs in the program_info section

instead of being included in the per-stream descriptors

Change-Id: If5251c0c02456646e2fdbb5e62acf66c356cf13e
ifi-display/MediaSender.cpp
ifi-display/MediaSender.h
ifi-display/source/TSPacketizer.cpp
ifi-display/source/TSPacketizer.h
1c345ebe4f1c7a876826de5112cd325df2faf1d5 07-Mar-2013 Andreas Huber <andih@google.com> The transport stream HDCP descriptor belongs in the program_info section

instead of being included in the per-stream descriptors

Change-Id: If5251c0c02456646e2fdbb5e62acf66c356cf13e
ifi-display/MediaSender.cpp
ifi-display/MediaSender.h
ifi-display/source/TSPacketizer.cpp
ifi-display/source/TSPacketizer.h
0ab4d86643dfb668a583c13b8bd61b589dbe8602 06-Mar-2013 Andy McFadden <fadden@android.com> Merge "Correct MediaCodec + Surface behavior" into jb-mr2-dev
8d4c382db4f89c30a309ffa16bef33930c691681 06-Mar-2013 Andy McFadden <fadden@android.com> Merge "Correct MediaCodec + Surface behavior" into jb-mr2-dev
6507d14c6d10f93d390de62b9eed267f9b544985 05-Mar-2013 Andy McFadden <fadden@android.com> Correct MediaCodec + Surface behavior

Assorted tweaks:
- Allow signalEndOfInputStream() before ACodec is in Executing
state (added message to two more states).
- Return an error if signalEndOfInputStream() is called a second
time on the same stream.
- Require AndroidOpaque color format in createInputSurface().
- Disallow dequeueInputBuffer() after an input surface has been
created (boolean flag in MediaCodec tracks it).
- Discard input surface when encoder is re-configure()ed (drop
OMXNodeInstance's ref when we go back to Loaded).

Bug 7991062

Change-Id: Iff30f3036e14eb5a2f6536910dcf11aba33031ee
Codec.cpp
ediaCodec.cpp
mx/GraphicBufferSource.cpp
mx/GraphicBufferSource.h
mx/OMXNodeInstance.cpp
ba6218eae3dbcf3f962b3561b26374a214dbf5e2 05-Mar-2013 Andy McFadden <fadden@android.com> Correct MediaCodec + Surface behavior

Assorted tweaks:
- Allow signalEndOfInputStream() before ACodec is in Executing
state (added message to two more states).
- Return an error if signalEndOfInputStream() is called a second
time on the same stream.
- Require AndroidOpaque color format in createInputSurface().
- Disallow dequeueInputBuffer() after an input surface has been
created (boolean flag in MediaCodec tracks it).
- Discard input surface when encoder is re-configure()ed (drop
OMXNodeInstance's ref when we go back to Loaded).

Bug 7991062

Change-Id: Iff30f3036e14eb5a2f6536910dcf11aba33031ee
Codec.cpp
ediaCodec.cpp
mx/GraphicBufferSource.cpp
mx/GraphicBufferSource.h
mx/OMXNodeInstance.cpp
0695ea9ff78bd1ef6e0bc2b05d1f6332c7214621 05-Mar-2013 Andreas Huber <andih@google.com> Merge "Squashed commit of the following:" into jb-mr2-dev
7b288449777a071cb800c69468e28b4e5857a690 05-Mar-2013 Andreas Huber <andih@google.com> Merge "Squashed commit of the following:" into jb-mr2-dev
a556c4822fc205db0d27834ba5b637c351d73ffa 05-Mar-2013 Andreas Huber <andih@google.com> Squashed commit of the following:

commit e5919b1f57ea61fa1d380dfdb4e3e832ce73d79d
Author: Andreas Huber <andih@google.com>
Date: Wed Feb 27 16:38:48 2013 -0800

Configure TCP datagram sockets to be TCP_NODELAY.

Change-Id: Ia724a81e6e27dccd00ac84603e712d69ca77a0cd

commit 1b52b393183db8a6dc000a7c31baac544ccfc50c
Author: Andreas Huber <andih@google.com>
Date: Wed Feb 27 14:26:01 2013 -0800

Send IDR frame requests on packet loss.

Change-Id: I53b7fb85cbd6923491113b93ec3e2175726d654a

commit 68d76b4b3a0181b30abc57cd2915273210530a6d
Author: Andreas Huber <andih@google.com>
Date: Tue Feb 26 15:12:34 2013 -0800

Revive TunnelRenderer

Change-Id: I8c5a9d982793b1c5b841c828227b354f1dab618c

commit 3df28a8e9d8bcdc1430016bb088d097eca653b56
Author: Andreas Huber <andih@google.com>
Date: Tue Feb 26 13:53:14 2013 -0800

Disable suspension of video updates.

Change-Id: I7e3a16b8d7dd7a55d9f962a2236388931f664106

commit 2ec7a79de019a26ec415016c1478afd762f069cd
Author: Andreas Huber <andih@google.com>
Date: Tue Feb 26 08:54:40 2013 -0800

Adds an SNTP client to wfd.

Change-Id: Icd7d6104e951e1443e4c1b81ccf6b3731d79d3ec

commit c81c3bb5725bb4079a4d7fb02151ad0bb540632f
Author: Andreas Huber <andih@google.com>
Date: Mon Feb 25 10:00:58 2013 -0800

Squashed commit of the following:

commit b83a4ec96659ef6f6b7c2090fdd866abe3ab78ba
Author: Andreas Huber <andih@google.com>
Date: Mon Feb 25 09:28:11 2013 -0800

Some reorganization of the rtp code, renamed StreamHub -> MediaSender

Change-Id: I8cf67444960e60426bf74880af1acce41e8b2fef

commit 7769cbd739f2a67c58e0c6a7b1a21a12210c7c4d
Author: Andreas Huber <andih@google.com>
Date: Fri Feb 22 16:12:18 2013 -0800

Choose a smaller MTU to avoid fragmented IPv4 packets, fix AVC assembler.

Change-Id: I274b3cc1483c4e9f4d146dbf9f3d9f7557ef7ef9

commit 1f687ee80a88b56d614c2cf408ff729114ff86a0
Author: Andreas Huber <andih@google.com>
Date: Fri Feb 22 11:38:31 2013 -0800

better reporting.

Change-Id: I67f0bb51f106ea77f5cc75938b053c8e8e8f688e

commit 7950c1cd59213eb5f281fcde44a772ecffae473d
Author: Andreas Huber <andih@google.com>
Date: Fri Feb 22 09:07:41 2013 -0800

stuff

Change-Id: Ib99416366d3eec6e6ad69b4d791a8a9408410f3b

commit 33c09045b0f86fcaa4619cbd679b47a074f71231
Author: Andreas Huber <andih@google.com>
Date: Thu Feb 21 15:54:01 2013 -0800

Render frames according to their timestamps.

Change-Id: I8143a95cffe775799d6a4bb093558bd7abb1f063

commit d8b6daae2160bf1c016d7c6251256b46bb89db42
Author: Andreas Huber <andih@google.com>
Date: Thu Feb 21 15:01:27 2013 -0800

Better packet-lost logic.

Change-Id: I611eee5a42bd089638cf45b0e16f628ff2a955ab

commit 782c6b15717e2d062d96665a089d06c0577733d0
Author: Andreas Huber <andih@google.com>
Date: Wed Feb 20 15:06:47 2013 -0800

Add a dedicated looper for the MediaReceiver

Change-Id: I3b79cad367fb69c9a160a8d009af8c5f5142b98e

commit 4c7b8b10861674b773270103bcabd1a99486a691
Author: Andreas Huber <andih@google.com>
Date: Wed Feb 20 14:30:28 2013 -0800

Tweaks to RTPSender and RTPReceiver

Change-Id: Ib535552f289a26cfead6df8c63e4c63d3987d4e9

commit 39226b28177a816cda5c67b321745d396b18277d
Author: Andreas Huber <andih@google.com>
Date: Tue Feb 19 08:48:25 2013 -0800

Playing around with non muxed delivery

Change-Id: I845375f6938d04bc30502840c2ceb7688dc9b237

commit c16d21de75d8ecdbcd9abce14934afe484970061
Author: Andreas Huber <andih@google.com>
Date: Wed Feb 13 14:43:35 2013 -0800

A more solid base for RTP communication.

Change-Id: I52033eeb0feba0ff029d61553a821c82f2fa1c3f

Change-Id: I57e3bcfc1c59a012b15aaaa42ed81f09c34c26bb

Change-Id: I4b09db4a44d0eeded7a1658f6dc6c97d4b8be720
ifi-display/ANetworkSession.cpp
ifi-display/Android.mk
ifi-display/MediaReceiver.cpp
ifi-display/MediaReceiver.h
ifi-display/MediaSender.cpp
ifi-display/MediaSender.h
ifi-display/SNTPClient.cpp
ifi-display/SNTPClient.h
ifi-display/TimeSeries.cpp
ifi-display/TimeSeries.h
ifi-display/rtp/RTPAssembler.cpp
ifi-display/rtp/RTPAssembler.h
ifi-display/rtp/RTPBase.h
ifi-display/rtp/RTPReceiver.cpp
ifi-display/rtp/RTPReceiver.h
ifi-display/rtp/RTPSender.cpp
ifi-display/rtp/RTPSender.h
ifi-display/rtptest.cpp
ifi-display/sink/DirectRenderer.cpp
ifi-display/sink/DirectRenderer.h
ifi-display/sink/LinearRegression.cpp
ifi-display/sink/LinearRegression.h
ifi-display/sink/RTPSink.cpp
ifi-display/sink/RTPSink.h
ifi-display/sink/TunnelRenderer.cpp
ifi-display/sink/TunnelRenderer.h
ifi-display/sink/WifiDisplaySink.cpp
ifi-display/sink/WifiDisplaySink.h
ifi-display/source/PlaybackSession.cpp
ifi-display/source/PlaybackSession.h
ifi-display/source/RepeaterSource.h
ifi-display/source/Sender.cpp
ifi-display/source/Sender.h
ifi-display/source/TSPacketizer.cpp
ifi-display/source/TSPacketizer.h
ifi-display/source/WifiDisplaySource.cpp
43433111d4adff6a138447dfadf531046497a008 05-Mar-2013 Andreas Huber <andih@google.com> Squashed commit of the following:

commit e5919b1f57ea61fa1d380dfdb4e3e832ce73d79d
Author: Andreas Huber <andih@google.com>
Date: Wed Feb 27 16:38:48 2013 -0800

Configure TCP datagram sockets to be TCP_NODELAY.

Change-Id: Ia724a81e6e27dccd00ac84603e712d69ca77a0cd

commit 1b52b393183db8a6dc000a7c31baac544ccfc50c
Author: Andreas Huber <andih@google.com>
Date: Wed Feb 27 14:26:01 2013 -0800

Send IDR frame requests on packet loss.

Change-Id: I53b7fb85cbd6923491113b93ec3e2175726d654a

commit 68d76b4b3a0181b30abc57cd2915273210530a6d
Author: Andreas Huber <andih@google.com>
Date: Tue Feb 26 15:12:34 2013 -0800

Revive TunnelRenderer

Change-Id: I8c5a9d982793b1c5b841c828227b354f1dab618c

commit 3df28a8e9d8bcdc1430016bb088d097eca653b56
Author: Andreas Huber <andih@google.com>
Date: Tue Feb 26 13:53:14 2013 -0800

Disable suspension of video updates.

Change-Id: I7e3a16b8d7dd7a55d9f962a2236388931f664106

commit 2ec7a79de019a26ec415016c1478afd762f069cd
Author: Andreas Huber <andih@google.com>
Date: Tue Feb 26 08:54:40 2013 -0800

Adds an SNTP client to wfd.

Change-Id: Icd7d6104e951e1443e4c1b81ccf6b3731d79d3ec

commit c81c3bb5725bb4079a4d7fb02151ad0bb540632f
Author: Andreas Huber <andih@google.com>
Date: Mon Feb 25 10:00:58 2013 -0800

Squashed commit of the following:

commit b83a4ec96659ef6f6b7c2090fdd866abe3ab78ba
Author: Andreas Huber <andih@google.com>
Date: Mon Feb 25 09:28:11 2013 -0800

Some reorganization of the rtp code, renamed StreamHub -> MediaSender

Change-Id: I8cf67444960e60426bf74880af1acce41e8b2fef

commit 7769cbd739f2a67c58e0c6a7b1a21a12210c7c4d
Author: Andreas Huber <andih@google.com>
Date: Fri Feb 22 16:12:18 2013 -0800

Choose a smaller MTU to avoid fragmented IPv4 packets, fix AVC assembler.

Change-Id: I274b3cc1483c4e9f4d146dbf9f3d9f7557ef7ef9

commit 1f687ee80a88b56d614c2cf408ff729114ff86a0
Author: Andreas Huber <andih@google.com>
Date: Fri Feb 22 11:38:31 2013 -0800

better reporting.

Change-Id: I67f0bb51f106ea77f5cc75938b053c8e8e8f688e

commit 7950c1cd59213eb5f281fcde44a772ecffae473d
Author: Andreas Huber <andih@google.com>
Date: Fri Feb 22 09:07:41 2013 -0800

stuff

Change-Id: Ib99416366d3eec6e6ad69b4d791a8a9408410f3b

commit 33c09045b0f86fcaa4619cbd679b47a074f71231
Author: Andreas Huber <andih@google.com>
Date: Thu Feb 21 15:54:01 2013 -0800

Render frames according to their timestamps.

Change-Id: I8143a95cffe775799d6a4bb093558bd7abb1f063

commit d8b6daae2160bf1c016d7c6251256b46bb89db42
Author: Andreas Huber <andih@google.com>
Date: Thu Feb 21 15:01:27 2013 -0800

Better packet-lost logic.

Change-Id: I611eee5a42bd089638cf45b0e16f628ff2a955ab

commit 782c6b15717e2d062d96665a089d06c0577733d0
Author: Andreas Huber <andih@google.com>
Date: Wed Feb 20 15:06:47 2013 -0800

Add a dedicated looper for the MediaReceiver

Change-Id: I3b79cad367fb69c9a160a8d009af8c5f5142b98e

commit 4c7b8b10861674b773270103bcabd1a99486a691
Author: Andreas Huber <andih@google.com>
Date: Wed Feb 20 14:30:28 2013 -0800

Tweaks to RTPSender and RTPReceiver

Change-Id: Ib535552f289a26cfead6df8c63e4c63d3987d4e9

commit 39226b28177a816cda5c67b321745d396b18277d
Author: Andreas Huber <andih@google.com>
Date: Tue Feb 19 08:48:25 2013 -0800

Playing around with non muxed delivery

Change-Id: I845375f6938d04bc30502840c2ceb7688dc9b237

commit c16d21de75d8ecdbcd9abce14934afe484970061
Author: Andreas Huber <andih@google.com>
Date: Wed Feb 13 14:43:35 2013 -0800

A more solid base for RTP communication.

Change-Id: I52033eeb0feba0ff029d61553a821c82f2fa1c3f

Change-Id: I57e3bcfc1c59a012b15aaaa42ed81f09c34c26bb

Change-Id: I4b09db4a44d0eeded7a1658f6dc6c97d4b8be720
ifi-display/ANetworkSession.cpp
ifi-display/Android.mk
ifi-display/MediaSender.cpp
ifi-display/MediaSender.h
ifi-display/TimeSeries.cpp
ifi-display/TimeSeries.h
ifi-display/rtp/RTPBase.h
ifi-display/rtp/RTPSender.cpp
ifi-display/rtp/RTPSender.h
ifi-display/sink/LinearRegression.cpp
ifi-display/sink/LinearRegression.h
ifi-display/sink/RTPSink.cpp
ifi-display/sink/RTPSink.h
ifi-display/sink/TunnelRenderer.cpp
ifi-display/sink/TunnelRenderer.h
ifi-display/source/PlaybackSession.cpp
ifi-display/source/PlaybackSession.h
ifi-display/source/RepeaterSource.h
ifi-display/source/Sender.cpp
ifi-display/source/Sender.h
ifi-display/source/TSPacketizer.cpp
ifi-display/source/TSPacketizer.h
ifi-display/source/WifiDisplaySource.cpp
e51d8b3ba4533b7f94345a97e3cc633dc7b31f12 05-Mar-2013 Andy McFadden <fadden@android.com> Merge "Implement Surface input to MediaCodec." into jb-mr2-dev
7cd58537932ef6f481f68be0b9c597a89cebdfec 19-Feb-2013 Andy McFadden <fadden@android.com> Implement Surface input to MediaCodec.

Also, renamed a CHECK_INTERFACE macro that was clashing with the
Binder version.

Bug 7991062

Change-Id: If5e6ed0a06d9f67975497676e4b05abe3aa3d6c0
Codec.cpp
ediaCodec.cpp
MXClient.cpp
nclude/OMX.h
nclude/OMXNodeInstance.h
mx/Android.mk
mx/GraphicBufferSource.cpp
mx/GraphicBufferSource.h
mx/OMX.cpp
mx/OMXNodeInstance.cpp
f779bb50d9746d9526541c3e6dcdf619cac941b7 19-Feb-2013 Andy McFadden <fadden@android.com> Implement Surface input to MediaCodec.

Also, renamed a CHECK_INTERFACE macro that was clashing with the
Binder version.

Bug 7991062

Change-Id: If5e6ed0a06d9f67975497676e4b05abe3aa3d6c0
Codec.cpp
ediaCodec.cpp
MXClient.cpp
nclude/OMX.h
nclude/OMXNodeInstance.h
mx/Android.mk
mx/GraphicBufferSource.cpp
mx/GraphicBufferSource.h
mx/OMX.cpp
mx/OMXNodeInstance.cpp
8602e5501a653a00e2f82d6fd3f7558382fea1dd 04-Mar-2013 Andreas Huber <andih@google.com> Modified udptest to sync time across devices.

Change-Id: Ib055cd8ab5931395907d017331e27f5d781d7019
ifi-display/udptest.cpp
fa74de2d0f633df0a88c69b8733c8deec85ac0ae 27-Feb-2013 Andreas Huber <andih@google.com> am ceb83b8d: Merge "SoftAMR: Signal the right frame format"

* commit 'ceb83b8d8919dc778402bf610c073987d4f9f89b':
SoftAMR: Signal the right frame format
7072e03ae4eb9b8f48a567dbb2a5cc8d2049f331 27-Feb-2013 Andreas Huber <andih@google.com> am ceb83b8d: Merge "SoftAMR: Signal the right frame format"

* commit 'ceb83b8d8919dc778402bf610c073987d4f9f89b':
SoftAMR: Signal the right frame format
eed157dcfea88cc7b71524258a112ebf49ad7a05 27-Feb-2013 Andreas Huber <andih@google.com> am ccf51ec4: Merge "SoftVorbis: Set the right encoding in the port definition"

* commit 'ccf51ec41652a7e2db8cbee37bca91a95908d5ff':
SoftVorbis: Set the right encoding in the port definition
f9a2b8192403a969919fa7751c3d95bfb44ecec5 27-Feb-2013 Andreas Huber <andih@google.com> am ccf51ec4: Merge "SoftVorbis: Set the right encoding in the port definition"

* commit 'ccf51ec41652a7e2db8cbee37bca91a95908d5ff':
SoftVorbis: Set the right encoding in the port definition
8b5c4ec7bbf253eb704094ab6b04f58923f67994 27-Feb-2013 Igor Murashkin <iam@google.com> Merge "camera_client: refactor Camera/ProCamera commonalities into BasicCamera" into jb-mr2-dev
f5daac4225905184b8d7cdd2fd87247d73e27ea7 27-Feb-2013 Igor Murashkin <iam@google.com> Merge "camera_client: refactor Camera/ProCamera commonalities into BasicCamera" into jb-mr2-dev
ceb83b8d8919dc778402bf610c073987d4f9f89b 27-Feb-2013 Andreas Huber <andih@google.com> Merge "SoftAMR: Signal the right frame format"
d166e4c1b2463a1aa78ca9225a36aa956427446b 27-Feb-2013 Andreas Huber <andih@google.com> Merge "SoftAMR: Signal the right frame format"
ccf51ec41652a7e2db8cbee37bca91a95908d5ff 27-Feb-2013 Andreas Huber <andih@google.com> Merge "SoftVorbis: Set the right encoding in the port definition"
25e964bc9cfbb8ed315f75ac1e05cbc3c6cd9fc2 27-Feb-2013 Andreas Huber <andih@google.com> Merge "SoftVorbis: Set the right encoding in the port definition"
68189471332964a65f0d1f47cda7724c562c566d 27-Feb-2013 Andreas Huber <andih@google.com> am 801726ef: Merge "MPEG4Writer: Write a zero-length compressor string"

* commit '801726efb2dcc6ea19e9f55c7c43fe41f0c6643e':
MPEG4Writer: Write a zero-length compressor string
aebd9bbed761d99b20bb1871ed170021fb3c68ad 27-Feb-2013 Andreas Huber <andih@google.com> am 801726ef: Merge "MPEG4Writer: Write a zero-length compressor string"

* commit '801726efb2dcc6ea19e9f55c7c43fe41f0c6643e':
MPEG4Writer: Write a zero-length compressor string
801726efb2dcc6ea19e9f55c7c43fe41f0c6643e 27-Feb-2013 Andreas Huber <andih@google.com> Merge "MPEG4Writer: Write a zero-length compressor string"
6ee1b867bb316fa3eda3b0c9f907d473031659d9 27-Feb-2013 Andreas Huber <andih@google.com> Merge "MPEG4Writer: Write a zero-length compressor string"
b39f30b0a4902ea0f28454885785da4b2629fe25 26-Feb-2013 Eino-Ville Talvala <etalvala@google.com> am ceb388d6: CameraService and Stagefright: Support AppOps

* commit 'ceb388d6c03c38b96dc41c0ea4804b749aa077c4':
CameraService and Stagefright: Support AppOps
253e3c03b0cf4d5852a497ddda0f43b630664644 26-Feb-2013 Eino-Ville Talvala <etalvala@google.com> am ceb388d6: CameraService and Stagefright: Support AppOps

* commit 'ceb388d6c03c38b96dc41c0ea4804b749aa077c4':
CameraService and Stagefright: Support AppOps
ceb388d6c03c38b96dc41c0ea4804b749aa077c4 19-Feb-2013 Eino-Ville Talvala <etalvala@google.com> CameraService and Stagefright: Support AppOps

Camera:
- Signal to AppOpsService when camera usage starts and stops
- Listen to permissions revocations and act on them
- Currently just kill camera connection when permissions lost

Stagefright:
- Pass on client name, UID to camera as needed

Bug: 8181262
Change-Id: I9e33c9d05e9daa77dbb2d795045d08eb887ec8f0
ameraSource.cpp
ameraSourceTimeLapse.cpp
48af7e8dd40883d6154e7029d9500072b551b5fa 19-Feb-2013 Eino-Ville Talvala <etalvala@google.com> CameraService and Stagefright: Support AppOps

Camera:
- Signal to AppOpsService when camera usage starts and stops
- Listen to permissions revocations and act on them
- Currently just kill camera connection when permissions lost

Stagefright:
- Pass on client name, UID to camera as needed

Bug: 8181262
Change-Id: I9e33c9d05e9daa77dbb2d795045d08eb887ec8f0
ameraSource.cpp
ameraSourceTimeLapse.cpp
2b56065a51c49a6235ac974c033c5751e8055869 23-Nov-2012 Insun Kang <insun@google.com> Handles duplicated NAL start code to fix crash on HLS streams.

Some youtube live streams are encoded having duplicated NAL start code,
for instance, 00 00 01 00 00 00 01 ....

In previous code, zero NAL size causes crash by CHECK_GT(nalsize, 0)
macro. With this patch, duplicated NAL start code will be just ignored.

TESTED=Played problematic Youtube Live streams.

Change-Id: I1d76f111a34bd29cb09b037eb1b0626fe5f5b140
peg2ts/ESQueue.cpp
c9c47e48256fc1b79a77be8226ab9030920c0355 23-Nov-2012 Insun Kang <insun@google.com> Handles duplicated NAL start code to fix crash on HLS streams.

Some youtube live streams are encoded having duplicated NAL start code,
for instance, 00 00 01 00 00 00 01 ....

In previous code, zero NAL size causes crash by CHECK_GT(nalsize, 0)
macro. With this patch, duplicated NAL start code will be just ignored.

TESTED=Played problematic Youtube Live streams.

Change-Id: I1d76f111a34bd29cb09b037eb1b0626fe5f5b140
peg2ts/ESQueue.cpp
8298cd4d7e99648f277215bf981fdef78bc19e45 17-Feb-2013 Martin Storsjo <martin@martin.st> SoftAMR: Signal the right frame format

The correct enum for the format used is OMX_AUDIO_AMRFrameFormatFSF,
which is the same as is used in amrnb/enc/SoftAMRNBEncoder.cpp,
amrwbenc/SoftAMRWBEncoder.cpp and in OMXCodec and ACodec.

The OMX_AUDIO_AMRFrameFormatConformance enum refers to an odd file
format only used for conformance tests, not used in the wild.

Change-Id: Idc395fc1d4969e33453522d6ec6526876438c526
odecs/amrnb/dec/SoftAMR.cpp
d13e6d06ecbbad0fcd7681f9d3c3b076016339aa 17-Feb-2013 Martin Storsjo <martin@martin.st> SoftAMR: Signal the right frame format

The correct enum for the format used is OMX_AUDIO_AMRFrameFormatFSF,
which is the same as is used in amrnb/enc/SoftAMRNBEncoder.cpp,
amrwbenc/SoftAMRWBEncoder.cpp and in OMXCodec and ACodec.

The OMX_AUDIO_AMRFrameFormatConformance enum refers to an odd file
format only used for conformance tests, not used in the wild.

Change-Id: Idc395fc1d4969e33453522d6ec6526876438c526
odecs/amrnb/dec/SoftAMR.cpp
7aa1237287c43aca1c6bab776573062a66ebd154 15-Feb-2013 Mathias Agopian <mathias@google.com> Merge "Refactoring: Rename SurfaceTextureClient to Surface"
4490bf05a9addf5a4e12e0da92f22d854e5ce9a0 15-Feb-2013 Mathias Agopian <mathias@google.com> Merge "Refactoring: Rename SurfaceTextureClient to Surface"
1a2952aee048ca7b1765e2bc09ebe9aeddaeafa3 15-Feb-2013 Mathias Agopian <mathias@google.com> Refactoring: Rename SurfaceTextureClient to Surface

Change-Id: I4e8a8b20914cb64edc37abe68233fbc9f2b5d830
wesomePlayer.cpp
ediaCodec.cpp
ests/SurfaceMediaSource_test.cpp
ifi-display/sink/DirectRenderer.cpp
ifi-display/sink/TunnelRenderer.cpp
ifi-display/source/Converter.cpp
ifi-display/wfd.cpp
b1e7cd156ca3e1747374e0d20cdd1ce467210453 15-Feb-2013 Mathias Agopian <mathias@google.com> Refactoring: Rename SurfaceTextureClient to Surface

Change-Id: I4e8a8b20914cb64edc37abe68233fbc9f2b5d830
wesomePlayer.cpp
ediaCodec.cpp
ests/SurfaceMediaSource_test.cpp
ifi-display/sink/TunnelRenderer.cpp
ifi-display/source/Converter.cpp
ifi-display/wfd.cpp
ab89ac209fd1c3b0a2227168a48d7f3ae9bc43f3 15-Feb-2013 Marco Nelissen <marcone@google.com> Remove FragmentedMP4Extractor

MPEG4Extractor now supports fragmented mp4 files.

Change-Id: I5659a51f4e5e4407a12535e69238fe3abffda7dc
ndroid.mk
ataSource.cpp
ragmentedMP4Extractor.cpp
ediaExtractor.cpp
nclude/FragmentedMP4Extractor.h
6bde4671ae7cb383e731606d9ee548859047c961 15-Feb-2013 Marco Nelissen <marcone@google.com> Remove FragmentedMP4Extractor

MPEG4Extractor now supports fragmented mp4 files.

Change-Id: I5659a51f4e5e4407a12535e69238fe3abffda7dc
ndroid.mk
ataSource.cpp
ragmentedMP4Extractor.cpp
ediaExtractor.cpp
nclude/FragmentedMP4Extractor.h
05f625c46b992ab66b8d1527a366fe2746b4e3c7 13-Feb-2013 Marco Nelissen <marcone@google.com> Add support for fragmented mp4 to MPEG4Extractor

This makes FragmentedMP4Extractor obsolete. It will be removed in a
separate change.

Change-Id: Ida74c07ccf84983e20a1320ee24ffc7a5c083859
ataSource.cpp
PEG4Extractor.cpp
nclude/MPEG4Extractor.h
62ad9071cd61fc56355d3c2d25895382003ea362 13-Feb-2013 Marco Nelissen <marcone@google.com> Add support for fragmented mp4 to MPEG4Extractor

This makes FragmentedMP4Extractor obsolete. It will be removed in a
separate change.

Change-Id: Ida74c07ccf84983e20a1320ee24ffc7a5c083859
ataSource.cpp
PEG4Extractor.cpp
nclude/MPEG4Extractor.h
a7db81e243d33485eb0f6f5703b184d6a853fb87 13-Feb-2013 James Dong <jdong@google.com> Merge "Add OMX.google.vpx.encoder"
c7c78e3d17cd3e599b052b35dfa7ba204803ac53 13-Feb-2013 James Dong <jdong@google.com> Merge "Add OMX.google.vpx.encoder"
f98ab74cdc06c1978762cb99d7b28061bc7d1044 12-Feb-2013 James Dong <jdong@google.com> Add OMX.google.vpx.encoder

Change-Id: I843e6e542533884a94e105e1cb56f16f0440af61
mx/SoftOMXPlugin.cpp
b6cd3797b010e0de3366e062f590fcb98c5f81bf 12-Feb-2013 James Dong <jdong@google.com> Add OMX.google.vpx.encoder

Change-Id: I843e6e542533884a94e105e1cb56f16f0440af61
mx/SoftOMXPlugin.cpp
b4698f79230bbee15936641d951d49655f9e6da5 01-Feb-2013 Kunter Gultekin <kuntergultekin@google.com> Adds VPX encoding support for stagefright.

Only following encoder settings are available
- target bitrate
- rate control (constant / variable)
- frame rate
- token partitioning
- error resilience
- reconstruction & loop filters

Only following color formats are recognized
- YUV420Planar
- YUV420SemiPlanar
- AndroidOpaque

Following settings are not configurable by the client
- encoding deadline is realtime
- the algorithm interface for encoder is vp8
- fractional bits of frame rate is discarded
- timebase is fixed to 1/1000000

Requires libvpx to be built with encoder support enabled.
Requires openmax 1.1.2 extension headers.

Relevant tests exist in cts repo.

Change-Id: I650f1aca83e7dc93f79d7e6cba7ac24f26e66d40
Signed-off-by: Kunter Gultekin <kuntergultekin@google.com>
odecs/on2/enc/Android.mk
odecs/on2/enc/MODULE_LICENSE_APACHE2
odecs/on2/enc/NOTICE
odecs/on2/enc/SoftVPXEncoder.cpp
odecs/on2/enc/SoftVPXEncoder.h
79e499be700ff3365b778f9f6b2c179ad69ae43a 01-Feb-2013 Kunter Gultekin <kuntergultekin@google.com> Adds VPX encoding support for stagefright.

Only following encoder settings are available
- target bitrate
- rate control (constant / variable)
- frame rate
- token partitioning
- error resilience
- reconstruction & loop filters

Only following color formats are recognized
- YUV420Planar
- YUV420SemiPlanar
- AndroidOpaque

Following settings are not configurable by the client
- encoding deadline is realtime
- the algorithm interface for encoder is vp8
- fractional bits of frame rate is discarded
- timebase is fixed to 1/1000000

Requires libvpx to be built with encoder support enabled.
Requires openmax 1.1.2 extension headers.

Relevant tests exist in cts repo.

Change-Id: I650f1aca83e7dc93f79d7e6cba7ac24f26e66d40
Signed-off-by: Kunter Gultekin <kuntergultekin@google.com>
odecs/on2/enc/Android.mk
odecs/on2/enc/MODULE_LICENSE_APACHE2
odecs/on2/enc/NOTICE
odecs/on2/enc/SoftVPXEncoder.cpp
odecs/on2/enc/SoftVPXEncoder.h
4f1732b8068970b368a89271158ca29daf25650e 05-Feb-2013 ztenghui <ztenghui@google.com> Add the native MediaMuxer support.

MediaAdapter: a helper class to convert the push model to pull model.
MediaMuxer: the real muxer.

bug:7991013

Change-Id: If3b79551bc6332bc81f5c2740885e579a5c4abf9
ndroid.mk
ediaAdapter.cpp
ediaMuxer.cpp
6269d53cce5c1c9350565d3d72d92116594260cb 05-Feb-2013 ztenghui <ztenghui@google.com> Add the native MediaMuxer support.

MediaAdapter: a helper class to convert the push model to pull model.
MediaMuxer: the real muxer.

bug:7991013

Change-Id: If3b79551bc6332bc81f5c2740885e579a5c4abf9
ndroid.mk
ediaAdapter.cpp
ediaMuxer.cpp
513b8b238caa52f8ddf5c85109dbf362c515185f 09-Feb-2013 James Dong <jdong@google.com> Revert "Adds VPX encoding support for stagefright."
This lib was not part of the build, but it is built anyway for userdebug image (not for eng though).
let me revert it for now...

This reverts commit 6c6bb9873f55853fe74d8f45ad3ae116636d8be7.
odecs/on2/enc/Android.mk
odecs/on2/enc/MODULE_LICENSE_APACHE2
odecs/on2/enc/NOTICE
odecs/on2/enc/SoftVPXEncoder.cpp
odecs/on2/enc/SoftVPXEncoder.h
51a920302a6f376cdb24691051d96f34f24a55bf 09-Feb-2013 James Dong <jdong@google.com> Revert "Adds VPX encoding support for stagefright."
This lib was not part of the build, but it is built anyway for userdebug image (not for eng though).
let me revert it for now...

This reverts commit 6c6bb9873f55853fe74d8f45ad3ae116636d8be7.
odecs/on2/enc/Android.mk
odecs/on2/enc/MODULE_LICENSE_APACHE2
odecs/on2/enc/NOTICE
odecs/on2/enc/SoftVPXEncoder.cpp
odecs/on2/enc/SoftVPXEncoder.h
41c71f20e71967f3205818103fa35c1aeefb3e83 09-Feb-2013 James Dong <jdong@google.com> Merge "Adds VPX encoding support for stagefright."
fa171eaa239ee2e83ce57091279e170369de4edb 09-Feb-2013 James Dong <jdong@google.com> Merge "Adds VPX encoding support for stagefright."
7e0b88bca060deb0cd499d528ff88ac9d4a7b954 08-Feb-2013 Andreas Huber <andih@google.com> Merge "Allow for dynamic reconfiguration of the video bitrate used"
90cede87c5a0176574961a4a57589eb217ac1873 08-Feb-2013 Andreas Huber <andih@google.com> Merge "Allow for dynamic reconfiguration of the video bitrate used"
26b0a9d007e77e088af9ff3810734728f0558e85 07-Feb-2013 Andreas Huber <andih@google.com> A few more patches to fix wfd tcp unicast transport.

Change-Id: Ie2f1b1e56c487ac4c3ef19d9e79022a35084e042
ifi-display/sink/DirectRenderer.cpp
ifi-display/sink/RTPSink.cpp
ifi-display/sink/RTPSink.h
1dfc70879323990ba4b4d3e7cadc93ea3900063c 07-Feb-2013 Andreas Huber <andih@google.com> A few more patches to fix wfd tcp unicast transport.

Change-Id: Ie2f1b1e56c487ac4c3ef19d9e79022a35084e042
ifi-display/sink/RTPSink.cpp
ifi-display/sink/RTPSink.h
a2eb22c1de262aa3fa7c356537ac2fe165afdf3d 07-Feb-2013 Andreas Huber <andih@google.com> Allow for dynamic reconfiguration of the video bitrate used

to encode video while running as a wfd source.

Change-Id: I44f7b2350c88fc5807047c61bfe594ef8fa79275
Codec.cpp
ediaCodec.cpp
ifi-display/source/Converter.cpp
ifi-display/source/Converter.h
c71601c3b1dd63afc9be462194809813e4dbacf1 07-Feb-2013 Andreas Huber <andih@google.com> Allow for dynamic reconfiguration of the video bitrate used

to encode video while running as a wfd source.

Change-Id: I44f7b2350c88fc5807047c61bfe594ef8fa79275
Codec.cpp
ediaCodec.cpp
ifi-display/source/Converter.cpp
ifi-display/source/Converter.h
6c6bb9873f55853fe74d8f45ad3ae116636d8be7 01-Feb-2013 Kunter Gultekin <kuntergultekin@google.com> Adds VPX encoding support for stagefright.

Only following encoder settings are available
- target bitrate
- rate control (constant / variable)
- frame rate
- token partitioning
- error resilience
- reconstruction & loop filters

Only following color formats are recognized
- YUV420Planar
- YUV420SemiPlanar
- AndroidOpaque

Following settings are not configurable by the client
- encoding deadline is realtime
- the algorithm interface for encoder is vp8
- fractional bits of frame rate is discarded
- timebase is fixed to 1/1000000

Requires libvpx to be built with encoder support enabled.
Requires openmax 1.1.2 extension headers.

Relevant tests exist in cts repo.

Change-Id: If759edb8db36acbd24dcb53d159a54e942766020
Signed-off-by: Kunter Gultekin <kuntergultekin@google.com>
odecs/on2/enc/Android.mk
odecs/on2/enc/MODULE_LICENSE_APACHE2
odecs/on2/enc/NOTICE
odecs/on2/enc/SoftVPXEncoder.cpp
odecs/on2/enc/SoftVPXEncoder.h
8b7a86119ca2da79d23713ee6b4581c222f2c0fe 01-Feb-2013 Kunter Gultekin <kuntergultekin@google.com> Adds VPX encoding support for stagefright.

Only following encoder settings are available
- target bitrate
- rate control (constant / variable)
- frame rate
- token partitioning
- error resilience
- reconstruction & loop filters

Only following color formats are recognized
- YUV420Planar
- YUV420SemiPlanar
- AndroidOpaque

Following settings are not configurable by the client
- encoding deadline is realtime
- the algorithm interface for encoder is vp8
- fractional bits of frame rate is discarded
- timebase is fixed to 1/1000000

Requires libvpx to be built with encoder support enabled.
Requires openmax 1.1.2 extension headers.

Relevant tests exist in cts repo.

Change-Id: If759edb8db36acbd24dcb53d159a54e942766020
Signed-off-by: Kunter Gultekin <kuntergultekin@google.com>
odecs/on2/enc/Android.mk
odecs/on2/enc/MODULE_LICENSE_APACHE2
odecs/on2/enc/NOTICE
odecs/on2/enc/SoftVPXEncoder.cpp
odecs/on2/enc/SoftVPXEncoder.h
a0dd006834f4a424b67773ab6724e961a61de923 23-Jan-2013 Roger Jönsson <roger1.jonsson@sonymobile.com> Avoid rebuffering after RTSP pause

If pausing an RTSP stream, an RTSP Pause request is sent and then
if the stream is immediately resumed again, an RTSP Play request
will be sent to the server.
But the new data after the pause will not be buffered until
Sender Reports have arrived again on both channels.
Meanwhile the player will resume playback and continue consuming
the already existing buffer.
This means that there is a risk that the buffer is emptied while
waiting for sender reports.

This commit simply adds a delay before the RTSP pause request is
sent, allowing some additional RTSP buffering that might be needed
when the stream is resumed again.
Also, if the stream is resumed again before the RTSP pause request
is sent, there is no need for any RTSP pause request, hence it is
omitted.

Change-Id: I928c8bfb5e99a6a146dcda4e51e528973ecbe065
tsp/MyHandler.h
0955986e6c1c27ba752e293246086ea79c49d39c 23-Jan-2013 Roger Jönsson <roger1.jonsson@sonymobile.com> Avoid rebuffering after RTSP pause

If pausing an RTSP stream, an RTSP Pause request is sent and then
if the stream is immediately resumed again, an RTSP Play request
will be sent to the server.
But the new data after the pause will not be buffered until
Sender Reports have arrived again on both channels.
Meanwhile the player will resume playback and continue consuming
the already existing buffer.
This means that there is a risk that the buffer is emptied while
waiting for sender reports.

This commit simply adds a delay before the RTSP pause request is
sent, allowing some additional RTSP buffering that might be needed
when the stream is resumed again.
Also, if the stream is resumed again before the RTSP pause request
is sent, there is no need for any RTSP pause request, hence it is
omitted.

Change-Id: I928c8bfb5e99a6a146dcda4e51e528973ecbe065
tsp/MyHandler.h
ba021d15cf7bc964bc813688e33d34845bfd89ea 23-Jan-2013 joakim johansson <joakim.c.johansson@sonyericsson.com> EOS fixes for RTSP streams

The fix takes care of several near end of stream use cases:
seek, pause and fake timestamps.

Change-Id: I5f5fa881b1f619dfd5e1afd2af957082345c59eb
tsp/MyHandler.h
1a37ee3c877165c812734b405f922f6e0d747052 23-Jan-2013 joakim johansson <joakim.c.johansson@sonyericsson.com> EOS fixes for RTSP streams

The fix takes care of several near end of stream use cases:
seek, pause and fake timestamps.

Change-Id: I5f5fa881b1f619dfd5e1afd2af957082345c59eb
tsp/MyHandler.h
599b9655ddf95cdf6cb99970ce03c632bb2a576b 23-Jan-2013 MÃ¥ns Zigher <mans.zigher@sonyericsson.com> RTSP: Parse session level control attribute from SDP

If a=control: is present at session-level in the SDP response,
RFC2326:C.1.1 defines the URL to be used for aggregate commands.
This includes PLAY and PAUSE but not TEARDOWN.

Change-Id: Iaa1dc2271d00df39dc83477a99fda6fbeb73c5b4
tsp/MyHandler.h
b6ec588faa7728ff3b518bf809ff75e8dd14f08c 23-Jan-2013 MÃ¥ns Zigher <mans.zigher@sonyericsson.com> RTSP: Parse session level control attribute from SDP

If a=control: is present at session-level in the SDP response,
RFC2326:C.1.1 defines the URL to be used for aggregate commands.
This includes PLAY and PAUSE but not TEARDOWN.

Change-Id: Iaa1dc2271d00df39dc83477a99fda6fbeb73c5b4
tsp/MyHandler.h
fba60daf77cc74a13ae3bf4b0e9925dd2ee4470c 21-Jan-2013 Roger Jönsson <roger1.jonsson@sonymobile.com> Enable pause/resume for RTSP streaming

When a stream is paused, RTSP Pause is also sent to the server.
Otherwise the buffering might continue until the memory runs out.
When the stream is resumed, RTSP Play will be sent in order to
resume the buffering.

Change-Id: I5dc1761140827c532451638c3fd3f34271e5b9ab
tsp/MyHandler.h
46d13e3606b87d71379287672b54b50d0d9aa5cc 21-Jan-2013 Roger Jönsson <roger1.jonsson@sonymobile.com> Enable pause/resume for RTSP streaming

When a stream is paused, RTSP Pause is also sent to the server.
Otherwise the buffering might continue until the memory runs out.
When the stream is resumed, RTSP Play will be sent in order to
resume the buffering.

Change-Id: I5dc1761140827c532451638c3fd3f34271e5b9ab
tsp/MyHandler.h
b50e83eca302a12f0fced6e7bab1b8617d63deaa 21-Jan-2013 Roger Jönsson <roger1.jonsson@sonymobile.com> RTSP buffering improvements

Added buffering start and end notifications for RTSP.
MEDIA_INFO_BUFFERING_START is sent when buffering is started
and MEDIA_INFO_BUFFERING_END is sent when the buffer has
filled up.

This patch also adds RTSP end of stream handling.
EOS is signalled when BYE is received OR when
detecting end of stream even if no actual EOS is received.

Change-Id: I5cccb6845060ae6afd66d9f735b89da81476cd13
peg2ts/AnotherPacketSource.cpp
peg2ts/AnotherPacketSource.h
tsp/MyHandler.h
cfc3083927df14bf82403b20a45ae303a01c39f5 21-Jan-2013 Roger Jönsson <roger1.jonsson@sonymobile.com> RTSP buffering improvements

Added buffering start and end notifications for RTSP.
MEDIA_INFO_BUFFERING_START is sent when buffering is started
and MEDIA_INFO_BUFFERING_END is sent when the buffer has
filled up.

This patch also adds RTSP end of stream handling.
EOS is signalled when BYE is received OR when
detecting end of stream even if no actual EOS is received.

Change-Id: I5cccb6845060ae6afd66d9f735b89da81476cd13
peg2ts/AnotherPacketSource.cpp
peg2ts/AnotherPacketSource.h
tsp/MyHandler.h
0df36ec3303c2c6bf9b42c07945ac8bd234153f3 06-Feb-2013 Andreas Huber <andih@google.com> HLS now properly publishes its "seekable" flags after connection

has successfully completed and a sufficient amount of data fetched,
and only then signals that preparation is completed.

Change-Id: I7684a14238b826909f518f2af506966e522dfcfc
oundation/ALooperRoster.cpp
ttplive/LiveSession.cpp
nclude/LiveSession.h
0c3f0fa983107a8b5a4d6274179d15333fde8d3c 06-Feb-2013 Andreas Huber <andih@google.com> HLS now properly publishes its "seekable" flags after connection

has successfully completed and a sufficient amount of data fetched,
and only then signals that preparation is completed.

Change-Id: I7684a14238b826909f518f2af506966e522dfcfc
oundation/ALooperRoster.cpp
ttplive/LiveSession.cpp
nclude/LiveSession.h
ec0c597cabf169ca646bcea5faac1bd81ed4484d 05-Feb-2013 Andreas Huber <andih@google.com> RTSP now properly publishes its "seekable" flags after connection

has successfully completed and only then signals that preparation is
complete.

Change-Id: I1a60f718e673fe1462c69369c40eafbed6a14326
tsp/MyHandler.h
7f475c34ffc8e35345f2cceee2ef56a50bb5fea6 05-Feb-2013 Andreas Huber <andih@google.com> RTSP now properly publishes its "seekable" flags after connection

has successfully completed and only then signals that preparation is
complete.

Change-Id: I1a60f718e673fe1462c69369c40eafbed6a14326
tsp/MyHandler.h
84ca0414fedea2dfe51607b422f6227e1c4f0d7f 17-Jan-2013 Roger Jönsson <roger1.jonsson@sonymobile.com> Detect live streams

The information is used to decide on visibility of pause button and
to handle the duration clock correctly.

Change-Id: I286ac992fd171c7fc313e429326d38b6fc80e3fb
tsp/MyHandler.h
ec29a2bfb5364a5968b77559fd13821b827d173a 17-Jan-2013 Roger Jönsson <roger1.jonsson@sonymobile.com> Detect live streams

The information is used to decide on visibility of pause button and
to handle the duration clock correctly.

Change-Id: I286ac992fd171c7fc313e429326d38b6fc80e3fb
tsp/MyHandler.h
d62bb275f095d1a2e939a22e7eeaea42ac154bd4 05-Feb-2013 Andreas Huber <andih@google.com> Merge "Added HTTP support for SDP files."
80c1ae8f63cbbd243756caf1533ddbb97244b8b5 05-Feb-2013 Andreas Huber <andih@google.com> Merge "Added HTTP support for SDP files."
7a33b7740412accf6a1cc912686c8d0acfb2a883 20-Feb-2012 Oscar Rydhé <oscar.rydhe@sonyericsson.com> Added HTTP support for SDP files.

Added support for playing SDP files from http links. Previously,
SDP files only worked when started from rtsp links
(rtsp://a.b.c/abc.sdp), but they are just as common in http links.

patch provided by "Oscar Rydhé <oscar.rydhe@sonyericsson.com>"

Change-Id: Ic73af3a9a002009dbe8b04c267a4621bf7fe2f46
nclude/SDPLoader.h
tsp/Android.mk
tsp/MyHandler.h
tsp/SDPLoader.cpp
81dd60e0340ddcf7f1d5fb80b6c30906fabf201a 20-Feb-2012 Oscar Rydhé <oscar.rydhe@sonyericsson.com> Added HTTP support for SDP files.

Added support for playing SDP files from http links. Previously,
SDP files only worked when started from rtsp links
(rtsp://a.b.c/abc.sdp), but they are just as common in http links.

patch provided by "Oscar Rydhé <oscar.rydhe@sonyericsson.com>"

Change-Id: Ic73af3a9a002009dbe8b04c267a4621bf7fe2f46
nclude/SDPLoader.h
tsp/Android.mk
tsp/MyHandler.h
tsp/SDPLoader.cpp
a0216af1a45b4c657a5801b766ec34a82fac1b3e 05-Feb-2013 Andreas Huber <andih@google.com> Merge "Revive the code to support TCP interleaved transport"
7846311d9a7d1f52432f5b66d084d587666ab27a 05-Feb-2013 Andreas Huber <andih@google.com> Merge "Revive the code to support TCP interleaved transport"
6bb6f2f9cba46aa2b853357a139ae5166c5b6713 05-Feb-2013 Marco Nelissen <marcone@google.com> Merge "Return error code if setting scaling mode fails"
b15a3e8292d3c98d06d136a07b6e8e66f33dd5c7 05-Feb-2013 Marco Nelissen <marcone@google.com> Merge "Return error code if setting scaling mode fails"
a77c496d4520f25b7b337d32ebd9681d8ea0f7bb 05-Feb-2013 Marco Nelissen <marcone@google.com> Return error code if setting scaling mode fails

The return code from native_window_set_scaling_mode() was ignored.
Looking at the code review comments that introduced this code, it
seems like the intention was to return the error code in that case.

Change-Id: I9592cc378f0a0b960d37178aa0525fc17e8734ba
wesomePlayer.cpp
200d71c850e308d4153ea2ea2ebc0004bcae7808 05-Feb-2013 Marco Nelissen <marcone@google.com> Return error code if setting scaling mode fails

The return code from native_window_set_scaling_mode() was ignored.
Looking at the code review comments that introduced this code, it
seems like the intention was to return the error code in that case.

Change-Id: I9592cc378f0a0b960d37178aa0525fc17e8734ba
wesomePlayer.cpp
20ea4b429237f6845a833994bcee8f86791e8973 04-Feb-2013 James Dong <jdong@google.com> Merge "Remove a few unused header includes from PlaybackSession.cpp"
c41c932328f35f5eed7e517e9b64db9144f2fcb0 04-Feb-2013 James Dong <jdong@google.com> Merge "Remove a few unused header includes from PlaybackSession.cpp"
2fa05230219f72118388f3a350b1239db1299647 30-Jan-2013 James Dong <jdong@google.com> Remove a few unused header includes from PlaybackSession.cpp

Change-Id: Id3147e2f2d5d75ccc172e67802639cd43ed68870
ifi-display/source/PlaybackSession.cpp
ea85a11a0833a887340d7e977db0c59fb508b92f 30-Jan-2013 James Dong <jdong@google.com> Remove a few unused header includes from PlaybackSession.cpp

Change-Id: Id3147e2f2d5d75ccc172e67802639cd43ed68870
ifi-display/source/PlaybackSession.cpp
7cc0c29d6a7b76520ec588437ab51d5b8eac9ebc 01-Feb-2013 Andreas Huber <andih@google.com> Revive the code to support TCP interleaved transport

Also support non-interleaved transport now, but the sink gets to decide
what mode it wants to run in, _not_ the source.

Change-Id: I3b6057f86871084e4decf930bb4a7a2d7517b0f2
ifi-display/ANetworkSession.cpp
ifi-display/sink/DirectRenderer.cpp
ifi-display/sink/RTPSink.cpp
ifi-display/sink/RTPSink.h
ifi-display/sink/WifiDisplaySink.cpp
ifi-display/sink/WifiDisplaySink.h
ifi-display/source/PlaybackSession.cpp
ifi-display/source/WifiDisplaySource.cpp
ifi-display/source/WifiDisplaySource.h
7bc2ffca12828d72aaeeace0891183dc547877c0 01-Feb-2013 Andreas Huber <andih@google.com> Revive the code to support TCP interleaved transport

Also support non-interleaved transport now, but the sink gets to decide
what mode it wants to run in, _not_ the source.

Change-Id: I3b6057f86871084e4decf930bb4a7a2d7517b0f2
ifi-display/ANetworkSession.cpp
ifi-display/sink/RTPSink.cpp
ifi-display/sink/RTPSink.h
ifi-display/source/PlaybackSession.cpp
ifi-display/source/WifiDisplaySource.cpp
ifi-display/source/WifiDisplaySource.h
aa65ddb06862fa542c9ec8d556bd3e01bf4c32b2 01-Feb-2013 Andreas Huber <andih@google.com> Fix typo and reduce allocation overhead of RTP retransmission requests.

Change-Id: I402a195da5dfeceadb4d073888ee7702c5532dc8
ifi-display/sink/RTPSink.cpp
2520d32ca16632e1810bc195707146a9d030d39e 01-Feb-2013 Andreas Huber <andih@google.com> Fix typo and reduce allocation overhead of RTP retransmission requests.

Change-Id: I402a195da5dfeceadb4d073888ee7702c5532dc8
ifi-display/sink/RTPSink.cpp
5c824472f7cec8a3634838f7d88ffa9ccc7fc8e6 30-Jan-2013 Martin Storsjo <martin@martin.st> SoftVorbis: Set the right encoding in the port definition

Previously, it set the encoding type to AAC, which is just a typo.

Change-Id: I2dcae1f579e9feb0b35b6f5d334028c534275042
odecs/vorbis/dec/SoftVorbis.cpp
323093339da7774935bd4f3a8af5057e4411f30a 30-Jan-2013 Martin Storsjo <martin@martin.st> SoftVorbis: Set the right encoding in the port definition

Previously, it set the encoding type to AAC, which is just a typo.

Change-Id: I2dcae1f579e9feb0b35b6f5d334028c534275042
odecs/vorbis/dec/SoftVorbis.cpp
c30a88a273b47bef6728ae1dddea11641090939a 30-Jan-2013 Martin Storsjo <martin@martin.st> MPEG4Writer: Write a zero-length compressor string

The first byte is the number of bytes in the string to display,
the rest is the actual string (see ISO/IEC 14496-12:2008 page 29,
compressorname in VisualSampleEntry) to display. Currently, all 31
space characters are displayed in certain players (such as Apple
QuickTime Player) instead of the plain codec name (e.g. "H.264").
By writing the string length properly, the actual content of the
remaining 31 bytes is ignored instead of displayed.

Change-Id: I7f93a8966d74a4e86abc46c3dcb70f71780d9cd6
PEG4Writer.cpp
89b28bfea641983a908b45a15e69a6c62add847a 30-Jan-2013 Martin Storsjo <martin@martin.st> MPEG4Writer: Write a zero-length compressor string

The first byte is the number of bytes in the string to display,
the rest is the actual string (see ISO/IEC 14496-12:2008 page 29,
compressorname in VisualSampleEntry) to display. Currently, all 31
space characters are displayed in certain players (such as Apple
QuickTime Player) instead of the plain codec name (e.g. "H.264").
By writing the string length properly, the actual content of the
remaining 31 bytes is ignored instead of displayed.

Change-Id: I7f93a8966d74a4e86abc46c3dcb70f71780d9cd6
PEG4Writer.cpp
3d6aa43575ae3342a93f88dd035f299e99554797 30-Jan-2013 Andreas Huber <andih@google.com> Merge "Actually display something on screen when instantiating a wfd sink via"
4f5454ecf49b1021cdd492f7764f013b39676bc6 30-Jan-2013 Andreas Huber <andih@google.com> Merge "Actually display something on screen when instantiating a wfd sink via"
0fcdb7271e1a25bc501ead6093ab1ae2667fdd47 30-Jan-2013 Andreas Huber <andih@google.com> Actually display something on screen when instantiating a wfd sink via

the wfd commandline tool.

Change-Id: I26466efb95a5837a14d77d6581e0777038d31d95
ifi-display/sink/DirectRenderer.cpp
ifi-display/wfd.cpp
4563d95b810682195529100e0bc4ae70fa4abe29 30-Jan-2013 Andreas Huber <andih@google.com> Actually display something on screen when instantiating a wfd sink via

the wfd commandline tool.

Change-Id: I26466efb95a5837a14d77d6581e0777038d31d95
ifi-display/wfd.cpp
a6a88d9c445e261972c2433254e0a996336e78a4 30-Jan-2013 Andreas Huber <andih@google.com> Plumbing to reflect minor changes in the HDCP module API that allow for

support of _decryption_ modules in addition to what we already supported.

Change-Id: Ic37b87dc170ba8def3817991d25df798f21e950b
ifi-display/source/WifiDisplaySource.cpp
279dcd89ab1d2de91dfe95e461412a0f577a6891 30-Jan-2013 Andreas Huber <andih@google.com> Plumbing to reflect minor changes in the HDCP module API that allow for

support of _decryption_ modules in addition to what we already supported.

Change-Id: Ic37b87dc170ba8def3817991d25df798f21e950b
ifi-display/source/WifiDisplaySource.cpp
1bd947a7c99853ad4ee67d59db89524be1e5acfc 29-Jan-2013 Andreas Huber <andih@google.com> Merge "Squashed commit of the following:"
150a516ce434bd1df81e3c3070915e3f549bca59 29-Jan-2013 Andreas Huber <andih@google.com> Merge "Squashed commit of the following:"
94a483bf2bd699275673d9cd57cb125d48572f30 29-Jan-2013 Andreas Huber <andih@google.com> Squashed commit of the following:

commit f2c38e5cf8cee3b597c744c9d6a9c0969ac8599a
Author: Andreas Huber <andih@google.com>
Date: Mon Jan 28 16:33:07 2013 -0800

Proper support for video format selection/negotiation.

Change-Id: I7db86cef939d63b8064be1c74de9ad78e85d45d9

commit 488023b7bad086692ffe942114fa3cc0e59a16c0
Author: Andreas Huber <andih@google.com>
Date: Mon Jan 28 11:21:23 2013 -0800

Sink now notifies clients once it is disconnected.

Change-Id: I2f0a458ef1ec30dda1272ad5a013fee4ee70edc9

commit 783932e40dd904aa531c263ad51280d9ca814dcb
Author: Andreas Huber <andih@google.com>
Date: Tue Dec 18 15:03:40 2012 -0800

Alternative DirectRenderer implementation.

Change-Id: I307beb913d7a61cb938bcb02696cc2e82d2b8b07

commit 1935cc9a87824aea71fc8ebe2162f62ec634ce5a
Author: Andreas Huber <andih@google.com>
Date: Tue Dec 18 10:24:27 2012 -0800

Experimenting with wifi sink timing.

Change-Id: I059bae9762cf11777666988a8b4ab2012b5807be

commit a859ee1eadd6a1d6a080667917e8b102c3770d61
Author: Andreas Huber <andih@google.com>
Date: Thu Nov 15 11:16:30 2012 -0800

wfd sink update.

Change-Id: I026dfc580be92aa40dbbe7c1bc061fadf3b08be8

Change-Id: I191d3d7015869ca99254d813d074328fb5b2f479
peg2ts/ATSParser.cpp
ifi-display/Android.mk
ifi-display/VideoFormats.cpp
ifi-display/VideoFormats.h
ifi-display/sink/DirectRenderer.cpp
ifi-display/sink/DirectRenderer.h
ifi-display/sink/RTPSink.cpp
ifi-display/sink/RTPSink.h
ifi-display/sink/TunnelRenderer.cpp
ifi-display/sink/WifiDisplaySink.cpp
ifi-display/sink/WifiDisplaySink.h
ifi-display/source/PlaybackSession.cpp
ifi-display/source/PlaybackSession.h
ifi-display/source/Sender.cpp
ifi-display/source/WifiDisplaySource.cpp
ifi-display/source/WifiDisplaySource.h
ifi-display/wfd.cpp
bf049b94f53f0213d53ba00e1cbe6996164d8eca 29-Jan-2013 Andreas Huber <andih@google.com> Squashed commit of the following:

commit f2c38e5cf8cee3b597c744c9d6a9c0969ac8599a
Author: Andreas Huber <andih@google.com>
Date: Mon Jan 28 16:33:07 2013 -0800

Proper support for video format selection/negotiation.

Change-Id: I7db86cef939d63b8064be1c74de9ad78e85d45d9

commit 488023b7bad086692ffe942114fa3cc0e59a16c0
Author: Andreas Huber <andih@google.com>
Date: Mon Jan 28 11:21:23 2013 -0800

Sink now notifies clients once it is disconnected.

Change-Id: I2f0a458ef1ec30dda1272ad5a013fee4ee70edc9

commit 783932e40dd904aa531c263ad51280d9ca814dcb
Author: Andreas Huber <andih@google.com>
Date: Tue Dec 18 15:03:40 2012 -0800

Alternative DirectRenderer implementation.

Change-Id: I307beb913d7a61cb938bcb02696cc2e82d2b8b07

commit 1935cc9a87824aea71fc8ebe2162f62ec634ce5a
Author: Andreas Huber <andih@google.com>
Date: Tue Dec 18 10:24:27 2012 -0800

Experimenting with wifi sink timing.

Change-Id: I059bae9762cf11777666988a8b4ab2012b5807be

commit a859ee1eadd6a1d6a080667917e8b102c3770d61
Author: Andreas Huber <andih@google.com>
Date: Thu Nov 15 11:16:30 2012 -0800

wfd sink update.

Change-Id: I026dfc580be92aa40dbbe7c1bc061fadf3b08be8

Change-Id: I191d3d7015869ca99254d813d074328fb5b2f479
peg2ts/ATSParser.cpp
ifi-display/Android.mk
ifi-display/VideoFormats.cpp
ifi-display/VideoFormats.h
ifi-display/sink/RTPSink.cpp
ifi-display/sink/RTPSink.h
ifi-display/sink/TunnelRenderer.cpp
ifi-display/source/PlaybackSession.cpp
ifi-display/source/PlaybackSession.h
ifi-display/source/Sender.cpp
ifi-display/source/WifiDisplaySource.cpp
ifi-display/source/WifiDisplaySource.h
ifi-display/wfd.cpp
0f6675d5fdf15d4b8765545fb6a351138acccdf6 16-Jan-2013 SeungBeom Kim <sbcrux.kim@samsung.com> ACodec Fix.

Bug: 7961269

Change-Id: Ie12530f89dd96dbce82e873de0c2310490390c34
Signed-off-by: SeungBeom Kim <sbcrux.kim@samsung.com>
Codec.cpp
14e4016259e18f6d88446145f8973d22d9884505 16-Jan-2013 SeungBeom Kim <sbcrux.kim@samsung.com> ACodec Fix.

Bug: 7961269

Change-Id: Ie12530f89dd96dbce82e873de0c2310490390c34
Signed-off-by: SeungBeom Kim <sbcrux.kim@samsung.com>
Codec.cpp
2ba042ff8a8bb5aa0320580119771e11e64ba2cd 25-Sep-2012 Insun Kang <insun@google.com> Bug fix: set 'und' as default metadata language info for srt.

o Previously, it leaves language code empty and it is inconsistent with
other code which gives 'und'. As a result, selected SRT track returned
empty language info. With this fix, it returns 'und'.

Bug: 7227230

TESTED=runtest -d cts-media -c android.media.cts.MediaPlayerTest -m
testGetTrackInfo

Change-Id: I225848f029637dd782c376e0d770dddd5c849550
imedtext/TimedTextSRTSource.cpp
034566c1bb1a71d38399c930cd1b206880605458 25-Sep-2012 Insun Kang <insun@google.com> Bug fix: set 'und' as default metadata language info for srt.

o Previously, it leaves language code empty and it is inconsistent with
other code which gives 'und'. As a result, selected SRT track returned
empty language info. With this fix, it returns 'und'.

Bug: 7227230

TESTED=runtest -d cts-media -c android.media.cts.MediaPlayerTest -m
testGetTrackInfo

Change-Id: I225848f029637dd782c376e0d770dddd5c849550
imedtext/TimedTextSRTSource.cpp
6f90c2b99cc6ec90c0e9a175d795edaf22f9d5bd 28-Dec-2012 James Dong <jdong@google.com> am cd2d2631: am b54cedab: Merge "Use default values when MPEG4 audio config parsing fails."

* commit 'cd2d263116576dc9770d31bb792e7cf2d6840b53':
Use default values when MPEG4 audio config parsing fails.
41aa725aa6c03b4ed814d0e2fcd30c7b6d2ad429 28-Dec-2012 James Dong <jdong@google.com> am cd2d2631: am b54cedab: Merge "Use default values when MPEG4 audio config parsing fails."

* commit 'cd2d263116576dc9770d31bb792e7cf2d6840b53':
Use default values when MPEG4 audio config parsing fails.
cd2d263116576dc9770d31bb792e7cf2d6840b53 21-Dec-2012 James Dong <jdong@google.com> am b54cedab: Merge "Use default values when MPEG4 audio config parsing fails."

* commit 'b54cedabdf0261211241e2f3af09c75cffd911ed':
Use default values when MPEG4 audio config parsing fails.
035f6c9c06791b75e6162433c6b2106d8f1851fb 21-Dec-2012 James Dong <jdong@google.com> am b54cedab: Merge "Use default values when MPEG4 audio config parsing fails."

* commit 'b54cedabdf0261211241e2f3af09c75cffd911ed':
Use default values when MPEG4 audio config parsing fails.
49d24d3fcd01aef0ec1fa4abd9c1b85473f64c0f 21-Dec-2012 Glenn Kasten <gkasten@google.com> Merge "Remove unnecessary parameter"
5570227ac334479982a9dd8c1647c00f58f47c18 21-Dec-2012 Glenn Kasten <gkasten@google.com> Merge "Remove unnecessary parameter"
b54cedabdf0261211241e2f3af09c75cffd911ed 21-Dec-2012 James Dong <jdong@google.com> Merge "Use default values when MPEG4 audio config parsing fails."
cc4e6091bd24f84e69d4baf4fce6ceae67676ee5 21-Dec-2012 James Dong <jdong@google.com> Merge "Use default values when MPEG4 audio config parsing fails."
e21c339f8aea46f6d406ccff61828e26b1689435 20-Dec-2012 Andreas Huber <andih@google.com> Merge "Properly release any MediaBuffer references associated with the"
5533367bee43819e72f66506df752d465154cb57 20-Dec-2012 Andreas Huber <andih@google.com> Merge "Properly release any MediaBuffer references associated with the"
c8e07e483c116ecaca1c9c6991588607f1187b75 20-Dec-2012 Andreas Huber <andih@google.com> Properly release any MediaBuffer references associated with the

encoder input buffers on shutdown. This worked fine before for an orderly
shutdown but didn't release all references in case of error.

Change-Id: I0ea3eb26da76fbeb33cadf58d237b0c68a86ac4a
related-to-bug: 7893090
ifi-display/source/Converter.cpp
ifi-display/source/Converter.h
d1ac40885d1f2969347a71749eba6d275821365a 20-Dec-2012 Andreas Huber <andih@google.com> Properly release any MediaBuffer references associated with the

encoder input buffers on shutdown. This worked fine before for an orderly
shutdown but didn't release all references in case of error.

Change-Id: I0ea3eb26da76fbeb33cadf58d237b0c68a86ac4a
related-to-bug: 7893090
ifi-display/source/Converter.cpp
ifi-display/source/Converter.h
ceabf0acaefeaf2696ca071dec92da607cd52758 20-Dec-2012 Marco Nelissen <marcone@google.com> Merge "Ensure proper EOS behavior"
4792d25c324e782ebe95adf43c49c5008f1c34e1 20-Dec-2012 Marco Nelissen <marcone@google.com> Merge "Ensure proper EOS behavior"
4c44e9fed87ff6363393f2559b150291242da247 20-Dec-2012 Marco Nelissen <marcone@google.com> Ensure proper EOS behavior

If a buffer is tagged with EOS but has data in it, decode that data
instead of ignoring it.

Change-Id: Ie41c8485c3ad7fe7d9c64f0752c2e7601d91d602
odecs/m4v_h263/dec/SoftMPEG4.cpp
odecs/on2/h264dec/SoftAVC.cpp
79399a427dad4a65e20dafc6c8f7cb07c8d719c7 20-Dec-2012 Marco Nelissen <marcone@google.com> Ensure proper EOS behavior

If a buffer is tagged with EOS but has data in it, decode that data
instead of ignoring it.

Change-Id: Ie41c8485c3ad7fe7d9c64f0752c2e7601d91d602
odecs/m4v_h263/dec/SoftMPEG4.cpp
odecs/on2/h264dec/SoftAVC.cpp
e6b94a3328a3a72ccdbc4957a9dcae43c79064ed 20-Dec-2012 Glenn Kasten <gkasten@android.com> am 68c3de89: am df9cce64: Merge "Allow multichannel FLAC files"

* commit '68c3de899f822acf3c735c681d206e852ad3821f':
Allow multichannel FLAC files
223fa9af371710d288dce79ef29af81a017c9e50 20-Dec-2012 Glenn Kasten <gkasten@android.com> am 68c3de89: am df9cce64: Merge "Allow multichannel FLAC files"

* commit '68c3de899f822acf3c735c681d206e852ad3821f':
Allow multichannel FLAC files
68c3de899f822acf3c735c681d206e852ad3821f 20-Dec-2012 Glenn Kasten <gkasten@android.com> am df9cce64: Merge "Allow multichannel FLAC files"

* commit 'df9cce649d9ac1f4446f613c54191e7c4d646f07':
Allow multichannel FLAC files
bc9f3fc7999a3222c559bc077fde1d5f5fdbc535 20-Dec-2012 Glenn Kasten <gkasten@android.com> am df9cce64: Merge "Allow multichannel FLAC files"

* commit 'df9cce649d9ac1f4446f613c54191e7c4d646f07':
Allow multichannel FLAC files
df9cce649d9ac1f4446f613c54191e7c4d646f07 20-Dec-2012 Glenn Kasten <gkasten@android.com> Merge "Allow multichannel FLAC files"
9e69d42d88c908b63b45f3a18da337f89f0dd734 20-Dec-2012 Glenn Kasten <gkasten@android.com> Merge "Allow multichannel FLAC files"
8d6cc842e8d525405c68e57fdf3bc5da0b4d7e87 03-Feb-2012 Glenn Kasten <gkasten@google.com> Remove unnecessary parameter

Just get the parameter on server side

Change-Id: I433a63104dbb257e0d862be2ab61847cb36d1c15
ifi-display/sink/TunnelRenderer.cpp
f37971f624164c3ed185d3f976404a6f60f49b9a 03-Feb-2012 Glenn Kasten <gkasten@google.com> Remove unnecessary parameter

Just get the parameter on server side

Change-Id: I433a63104dbb257e0d862be2ab61847cb36d1c15
ifi-display/sink/TunnelRenderer.cpp
534f712969d647b2e7a040581ac148e03ffa7585 19-Dec-2012 James Dong <jdong@google.com> Merge "Fix memory leakage from MPEG4Writer."
f5961efd27adde3726b78386328b0e649b248171 19-Dec-2012 James Dong <jdong@google.com> Merge "Fix memory leakage from MPEG4Writer."
6a695f176fcf758a68bc23f201e4615c37206369 19-Dec-2012 Andy McFadden <fadden@android.com> Merge "Rename ISurfaceTexture and SurfaceTexture"
e4bbe007c721d29671c95cefd6162c018726bffe 19-Dec-2012 Andy McFadden <fadden@android.com> Merge "Rename ISurfaceTexture and SurfaceTexture"
0ebf429406d796df74f781dfe085ee73851fe2a1 19-Dec-2012 Marco Nelissen <marcone@google.com> Merge "Report buffer size even when using hardware buffers"
14c4a2668ef130e25f5566082e03a694237bf5c0 19-Dec-2012 Marco Nelissen <marcone@google.com> Merge "Report buffer size even when using hardware buffers"
6fc72b01a3b67903b52f1d33b1ad5c960b5365f1 18-Dec-2012 Marco Nelissen <marcone@google.com> Make codecs reconfigurable

Change-Id: I3dd46cb4401493becbf6152f4dcd5a8f1e9a0b44
odecs/aacdec/SoftAAC2.cpp
odecs/aacdec/SoftAAC2.h
odecs/mp3dec/SoftMP3.cpp
odecs/mp3dec/SoftMP3.h
odecs/vorbis/dec/SoftVorbis.cpp
odecs/vorbis/dec/SoftVorbis.h
nclude/SimpleSoftOMXComponent.h
mx/SimpleSoftOMXComponent.cpp
1c80821b0720175478981ac43e7ca9567b58b7c5 18-Dec-2012 Marco Nelissen <marcone@google.com> Make codecs reconfigurable

Change-Id: I3dd46cb4401493becbf6152f4dcd5a8f1e9a0b44
odecs/aacdec/SoftAAC2.cpp
odecs/aacdec/SoftAAC2.h
odecs/mp3dec/SoftMP3.cpp
odecs/mp3dec/SoftMP3.h
odecs/vorbis/dec/SoftVorbis.cpp
odecs/vorbis/dec/SoftVorbis.h
nclude/SimpleSoftOMXComponent.h
mx/SimpleSoftOMXComponent.cpp
21ad778dcfcddb8f8fd9dc3fe4992fbef246c511 18-Dec-2012 Marco Nelissen <marcone@google.com> Report buffer size even when using hardware buffers

This makes it so that the buffers dequeued from a MediaCodec show
a non-zero size when there's actually data in them, which allows
the caller to distinguish between a valid frame and an empty buffer.

Change-Id: I891b2301501e26f0b4e8cf2e24c169e501a6d026
Codec.cpp
616d9ea56744a9aeb3ae93e850450732acfe96a8 18-Dec-2012 Marco Nelissen <marcone@google.com> Report buffer size even when using hardware buffers

This makes it so that the buffers dequeued from a MediaCodec show
a non-zero size when there's actually data in them, which allows
the caller to distinguish between a valid frame and an empty buffer.

Change-Id: I891b2301501e26f0b4e8cf2e24c169e501a6d026
Codec.cpp
8ba01021b573889802e67e029225a96f0dfa471a 18-Dec-2012 Andy McFadden <fadden@android.com> Rename ISurfaceTexture and SurfaceTexture

The C++ class names don't match what the classes do, so rename
ISurfaceTexture to IGraphicBufferProducer, and SurfaceTexture to
GLConsumer.

Bug 7736700

Change-Id: I64520a55f8c09fe6215382ea361c539a9940cba5
wesomePlayer.cpp
olorconversion/SoftwareRenderer.cpp
nclude/AwesomePlayer.h
ests/SurfaceMediaSource_test.cpp
ifi-display/sink/RTPSink.cpp
ifi-display/sink/RTPSink.h
ifi-display/sink/TunnelRenderer.cpp
ifi-display/sink/TunnelRenderer.h
ifi-display/sink/WifiDisplaySink.cpp
ifi-display/sink/WifiDisplaySink.h
ifi-display/source/PlaybackSession.cpp
ifi-display/source/PlaybackSession.h
ifi-display/source/WifiDisplaySource.cpp
ifi-display/wfd.cpp
484566c410afdfbc4b6bc5aa1732aef37428a5b8 18-Dec-2012 Andy McFadden <fadden@android.com> Rename ISurfaceTexture and SurfaceTexture

The C++ class names don't match what the classes do, so rename
ISurfaceTexture to IGraphicBufferProducer, and SurfaceTexture to
GLConsumer.

Bug 7736700

Change-Id: I64520a55f8c09fe6215382ea361c539a9940cba5
wesomePlayer.cpp
olorconversion/SoftwareRenderer.cpp
nclude/AwesomePlayer.h
ests/SurfaceMediaSource_test.cpp
ifi-display/sink/RTPSink.cpp
ifi-display/sink/RTPSink.h
ifi-display/sink/TunnelRenderer.cpp
ifi-display/sink/TunnelRenderer.h
ifi-display/source/PlaybackSession.cpp
ifi-display/source/PlaybackSession.h
ifi-display/source/WifiDisplaySource.cpp
ifi-display/wfd.cpp
7b670d4a0a4fa560f536f132e0a3fc7247f6724c 14-Dec-2012 James Dong <jdong@google.com> Fix memory leakage from MPEG4Writer.

o The in-memory cache, mMoovBoxBuffer, holding the content for Moov box may not be freed.
o Added comment describing how the in-memory cache works
o Moved the memory release to a single place to make the code more robust
o Avoided allocating the in-memory cache if the file is not intended to be streamable

o related-to-bug: 7664029

Change-Id: If04fc6b12daeaaa86710dfb4b4b9c175da6421df
PEG4Writer.cpp
b69d77ca8ef84bcdf75734326bb0ab64f7bb10d1 14-Dec-2012 James Dong <jdong@google.com> Fix memory leakage from MPEG4Writer.

o The in-memory cache, mMoovBoxBuffer, holding the content for Moov box may not be freed.
o Added comment describing how the in-memory cache works
o Moved the memory release to a single place to make the code more robust
o Avoided allocating the in-memory cache if the file is not intended to be streamable

o related-to-bug: 7664029

Change-Id: If04fc6b12daeaaa86710dfb4b4b9c175da6421df
PEG4Writer.cpp
53bc0a2fc54330534330118edd5c393f39eff8ab 17-Dec-2012 Glenn Kasten <gkasten@android.com> am 9435b498: am f38259cf: Merge "Fix bug in WAVExtractor for 24-bit per sample wav"

* commit '9435b498123f3e22532391c30eb42c336bf743ec':
Fix bug in WAVExtractor for 24-bit per sample wav
34d7db5dd43000cac7e8e156d79e9f97ccbb8990 17-Dec-2012 Glenn Kasten <gkasten@android.com> am 9435b498: am f38259cf: Merge "Fix bug in WAVExtractor for 24-bit per sample wav"

* commit '9435b498123f3e22532391c30eb42c336bf743ec':
Fix bug in WAVExtractor for 24-bit per sample wav
9435b498123f3e22532391c30eb42c336bf743ec 17-Dec-2012 Glenn Kasten <gkasten@android.com> am f38259cf: Merge "Fix bug in WAVExtractor for 24-bit per sample wav"

* commit 'f38259cfe5566914a49f5b0f8b11aa6a951d667a':
Fix bug in WAVExtractor for 24-bit per sample wav
e9a7857dc045a4465c9e59ea8df67cdd707345b7 17-Dec-2012 Glenn Kasten <gkasten@android.com> am f38259cf: Merge "Fix bug in WAVExtractor for 24-bit per sample wav"

* commit 'f38259cfe5566914a49f5b0f8b11aa6a951d667a':
Fix bug in WAVExtractor for 24-bit per sample wav
f38259cfe5566914a49f5b0f8b11aa6a951d667a 17-Dec-2012 Glenn Kasten <gkasten@android.com> Merge "Fix bug in WAVExtractor for 24-bit per sample wav"
43c32aaaf222c13357cf8fccfa6ffc34c5872947 17-Dec-2012 Glenn Kasten <gkasten@android.com> Merge "Fix bug in WAVExtractor for 24-bit per sample wav"
dc42966de62acc48f88183a50686717d8d8be9a4 15-Dec-2012 Marco Nelissen <marcone@google.com> am 34d2f109: am 409542cd: Merge "FileSource: FILE is not closed"

* commit '34d2f10908526cf3011d6c167a5817522b5a24d7':
FileSource: FILE is not closed
432e1d8013157a66383d9256541f2f8712e4cf5a 15-Dec-2012 Marco Nelissen <marcone@google.com> am 34d2f109: am 409542cd: Merge "FileSource: FILE is not closed"

* commit '34d2f10908526cf3011d6c167a5817522b5a24d7':
FileSource: FILE is not closed
442e29ef408f2cd32610988b52be6e06e11e4de2 15-Dec-2012 Jean-Baptiste Queru <jbq@google.com> am 0cd75629: Merge "Match new paths and organization in external/libvpx"

* commit '0cd75629a8f7a6bd47b2abc6dd8d9f66e70d76a4':
Match new paths and organization in external/libvpx
db09629a6dcedf6c9e301a93a8da9524b40c77a0 15-Dec-2012 Jean-Baptiste Queru <jbq@google.com> am 0cd75629: Merge "Match new paths and organization in external/libvpx"

* commit '0cd75629a8f7a6bd47b2abc6dd8d9f66e70d76a4':
Match new paths and organization in external/libvpx
34d2f10908526cf3011d6c167a5817522b5a24d7 15-Dec-2012 Marco Nelissen <marcone@google.com> am 409542cd: Merge "FileSource: FILE is not closed"

* commit '409542cdaf72d8983043f2746d9d916ee1566a80':
FileSource: FILE is not closed
da99f77816e04f7ea3dafcb371e84d070f5b312a 15-Dec-2012 Marco Nelissen <marcone@google.com> am 409542cd: Merge "FileSource: FILE is not closed"

* commit '409542cdaf72d8983043f2746d9d916ee1566a80':
FileSource: FILE is not closed
ef3d158d102b64513ebb0707b49eb99566b067a6 14-Dec-2012 Greg Hackmann <ghackmann@google.com> SurfaceMediaSource: wait on fence from acquired buffers

Change-Id: I4ab93a4adeec536648258c70a7d943503d9b10f4
Signed-off-by: Greg Hackmann <ghackmann@google.com>
urfaceMediaSource.cpp
10174bfdac537730be6729b9d47ad7d5bafed072 14-Dec-2012 Greg Hackmann <ghackmann@google.com> SurfaceMediaSource: wait on fence from acquired buffers

Change-Id: I4ab93a4adeec536648258c70a7d943503d9b10f4
Signed-off-by: Greg Hackmann <ghackmann@google.com>
urfaceMediaSource.cpp
0cd75629a8f7a6bd47b2abc6dd8d9f66e70d76a4 14-Dec-2012 Jean-Baptiste Queru <jbq@google.com> Merge "Match new paths and organization in external/libvpx"
65e8ca7abe6b5a69a61112fc694c6babdc52220f 14-Dec-2012 Jean-Baptiste Queru <jbq@google.com> Merge "Match new paths and organization in external/libvpx"
442d83cfb731bc0a8d1bb2d41ecd242ec498893f 14-Dec-2012 You Kim <you.kim72@gmail.com> FileSource: FILE is not closed

Add destructor to call fclose.

Change-Id: I765c56236f8df58af998439492b0b955ab57606f
p4/FragmentedMP4Parser.cpp
e0d44a50c3ddc5b1bc1b8efb551176c084929342 14-Dec-2012 You Kim <you.kim72@gmail.com> FileSource: FILE is not closed

Add destructor to call fclose.

Change-Id: I765c56236f8df58af998439492b0b955ab57606f
p4/FragmentedMP4Parser.cpp
6b3efc8b88ca53fee5d3cfb373f715acb7d29123 13-Dec-2012 Marco Nelissen <marcone@google.com> Merge "Signal that IDR frames are sync frames"
da690cef33c2a1db108ebddeb1e31b43afa2347d 13-Dec-2012 Marco Nelissen <marcone@google.com> Merge "Signal that IDR frames are sync frames"
8c95fa91fff6e8726df03598d52243f22e5ff8e7 13-Dec-2012 Marco Nelissen <marcone@google.com> Signal that IDR frames are sync frames

Change-Id: Iaf77edc0572cae38935fd9d94367adbfcb370985
ragmentedMP4Extractor.cpp
tils.cpp
p4/FragmentedMP4Parser.cpp
75ce7656a2c0d2391b224e9c473e57b17ca23efb 13-Dec-2012 Marco Nelissen <marcone@google.com> Signal that IDR frames are sync frames

Change-Id: Iaf77edc0572cae38935fd9d94367adbfcb370985
ragmentedMP4Extractor.cpp
tils.cpp
p4/FragmentedMP4Parser.cpp
a20fc62f23263c4220c1a14eb6a37165f7cdf327 30-Oct-2012 Johann <johannkoenig@google.com> Match new paths and organization in external/libvpx

See I2c0a87b0fc049e855e21f455b806287b578091de

Change-Id: Iec8566bce0a4763a9a17b4a46f15aa39b5bcd141
ndroid.mk
odecs/on2/dec/Android.mk
atroska/Android.mk
e81a9610343425e5bb76cdb297065426c6e75ef0 30-Oct-2012 Johann <johannkoenig@google.com> Match new paths and organization in external/libvpx

See I2c0a87b0fc049e855e21f455b806287b578091de

Change-Id: Iec8566bce0a4763a9a17b4a46f15aa39b5bcd141
ndroid.mk
odecs/on2/dec/Android.mk
atroska/Android.mk
8cade496e47fc7d8f01e286579a5db15b85c59cc 12-Dec-2012 Ying Wang <wangying@google.com> Merge "Match new paths and organization in external/libvpx"
c8849107ad2fd0ab6b6464af2551fe3706ce643d 12-Dec-2012 Ying Wang <wangying@google.com> Merge "Match new paths and organization in external/libvpx"
308ca621005ab86847b1b1dabaf65a2521844a2a 12-Dec-2012 Marco Nelissen <marcone@google.com> Increase buffer size for video

Change-Id: I055e1336954387f7b48aa58d893a3a5fae036ece
ragmentedMP4Extractor.cpp
0e73fead7e765c63cd95858ec40f093b41ac881b 12-Dec-2012 Marco Nelissen <marcone@google.com> Increase buffer size for video

Change-Id: I055e1336954387f7b48aa58d893a3a5fae036ece
ragmentedMP4Extractor.cpp
86355f5b1ef6c6434d8717c71428e3165b0fe7b5 12-Dec-2012 Marco Nelissen <marcone@google.com> Fix timestamps after seek

Ensure buffers are correctly timestamped after a seek.

Change-Id: I7d76689138e4f95c0ceb9fb7a4c4d42c48568212
p4/FragmentedMP4Parser.cpp
1457bf40071bbae83086bc67138caa59c1057248 12-Dec-2012 Marco Nelissen <marcone@google.com> Fix timestamps after seek

Ensure buffers are correctly timestamped after a seek.

Change-Id: I7d76689138e4f95c0ceb9fb7a4c4d42c48568212
p4/FragmentedMP4Parser.cpp
9ff1087c2c53a5b3c3c3abbc6d6c1d142f65b33a 06-Dec-2012 Andreas Huber <andih@google.com> am 49c5737f: am 03425d9c: Merge "Fix bad checks that causes crash when streaming H.263 content."

* commit '49c5737fe4d9d82ea1cc71d7ca73edfc7477a401':
Fix bad checks that causes crash when streaming H.263 content.
c984e76f3091c8210cd6bb0cae0f23549a7af0ee 06-Dec-2012 Andreas Huber <andih@google.com> am 49c5737f: am 03425d9c: Merge "Fix bad checks that causes crash when streaming H.263 content."

* commit '49c5737fe4d9d82ea1cc71d7ca73edfc7477a401':
Fix bad checks that causes crash when streaming H.263 content.
49c5737fe4d9d82ea1cc71d7ca73edfc7477a401 06-Dec-2012 Andreas Huber <andih@google.com> am 03425d9c: Merge "Fix bad checks that causes crash when streaming H.263 content."

* commit '03425d9cf7f22cf400c13cda60d3e91f0fd48d6e':
Fix bad checks that causes crash when streaming H.263 content.
917279c99c7677a02a120909dc4f9092339f2827 06-Dec-2012 Andreas Huber <andih@google.com> am 03425d9c: Merge "Fix bad checks that causes crash when streaming H.263 content."

* commit '03425d9cf7f22cf400c13cda60d3e91f0fd48d6e':
Fix bad checks that causes crash when streaming H.263 content.
516dacfb02d0b0eafe21114330c98ce0e7d90da9 04-Dec-2012 Andreas Huber <andih@google.com> Respect sample aspect ratio in NuPlayer.

related-to-bug: 7569402
Change-Id: I302de95d83b180bd2dc72ddd0c69a665dbce2527
Codec.cpp
tils.cpp
vc_utils.cpp
nclude/avc_utils.h
e9810fae2ca6620337b75a787786cc0ea52adecd 04-Dec-2012 Andreas Huber <andih@google.com> Respect sample aspect ratio in NuPlayer.

related-to-bug: 7569402
Change-Id: I302de95d83b180bd2dc72ddd0c69a665dbce2527
Codec.cpp
tils.cpp
vc_utils.cpp
nclude/avc_utils.h
03425d9cf7f22cf400c13cda60d3e91f0fd48d6e 05-Dec-2012 Andreas Huber <andih@google.com> Merge "Fix bad checks that causes crash when streaming H.263 content."
f4283b689abeac92399a26813ca12234050dcb2f 05-Dec-2012 Andreas Huber <andih@google.com> Merge "Fix bad checks that causes crash when streaming H.263 content."
b6f7642496f955da04d1eb9e33df0dab653c9c4e 20-Sep-2011 Henrik Backlund <henrik.backlund@sonyericsson.com> Fix crash in MyHandler when sockets are not set.

-When going quickly in and out of the video view during an rtsp
streaming session, a race condition occurs and MyHandler tries to
connect to a socket that has been reset. To avoid this,
checks are added.
- If there are errors during setupTrack 1, it is no use
setting up track 2. It will cause new errors.
- No assert for socket connect since there is a normal
status check already.

Change-Id: Ie06221d6c0d78ce0449f76c782ed5120fa646bfd
tsp/ARTSPConnection.cpp
tsp/MyHandler.h
fd5bc3be56ba5e2109daa216bd086825d6cd4ea3 03-Dec-2012 Andreas Huber <andih@google.com> am cd8d39e0: am f00d40c7: Merge "Memory leak solved in MPEG4Extractor::parseChunk for cover art"

* commit 'cd8d39e00fb7896e56318cc192978446e21d46b8':
Memory leak solved in MPEG4Extractor::parseChunk for cover art
a7c6ac4fae30d6248b2cfd6f5421cde4233613f1 03-Dec-2012 Andreas Huber <andih@google.com> am cd8d39e0: am f00d40c7: Merge "Memory leak solved in MPEG4Extractor::parseChunk for cover art"

* commit 'cd8d39e00fb7896e56318cc192978446e21d46b8':
Memory leak solved in MPEG4Extractor::parseChunk for cover art
cd8d39e00fb7896e56318cc192978446e21d46b8 03-Dec-2012 Andreas Huber <andih@google.com> am f00d40c7: Merge "Memory leak solved in MPEG4Extractor::parseChunk for cover art"

* commit 'f00d40c716fd4741fa56dd2b59813227658e50f2':
Memory leak solved in MPEG4Extractor::parseChunk for cover art
43309327a15490726618e24da5778457f6f19464 03-Dec-2012 Andreas Huber <andih@google.com> am f00d40c7: Merge "Memory leak solved in MPEG4Extractor::parseChunk for cover art"

* commit 'f00d40c716fd4741fa56dd2b59813227658e50f2':
Memory leak solved in MPEG4Extractor::parseChunk for cover art
f00d40c716fd4741fa56dd2b59813227658e50f2 03-Dec-2012 Andreas Huber <andih@google.com> Merge "Memory leak solved in MPEG4Extractor::parseChunk for cover art"
6020ef18b39c65516a381263837899232b87d774 03-Dec-2012 Andreas Huber <andih@google.com> Merge "Memory leak solved in MPEG4Extractor::parseChunk for cover art"
4bb026ba585d5b37795bd9765459f0607b7aa60a 24-Feb-2011 David Williams <david.williams@sonyericsson.com> Implemented support for RTSP 301 Redirect

RTSP 301 (Permament Redirect) support has been implemented.

Change-Id: If82ffc87f4e7dcbdf98e0a662a35cc086750fc1b
tsp/MyHandler.h
a1ca351f98e2e9c3d03654fb9794a7bf7d8f9617 21-Dec-2010 Roger1 Jonsson <roger1.jonsson@sonyericsson.com> Fix bad checks that causes crash when streaming H.263 content.

Remove checks that causes crash for rtsp streamed h.263 content
with certain values in the RTP payload header:
Remove zero check for the five reserved bits in the payload header.
According to RFC 4629 these bits MUST be ignored by receivers.
Remove zero-check for the VRC (Video Redundancy Coding) bit,
skip packet instead.
Remove zero-check for the PLEN bits (extra picture header),
skip packet instead.
Remove zero-check for the PEBIT bits (extra picture header),
skip packet instead.
Remove corresponding zero check for the four resreved bits in the
AMR payload header. According to RFC 4867 these bits MUST be
ignored by receivers.

Change-Id: I7fc21d69a19d23da24f9267623c338d415ef1387
tsp/AAMRAssembler.cpp
tsp/AH263Assembler.cpp
b90b748d7484f1d464cd9e15289d77b83beed10e 21-Dec-2010 Roger1 Jonsson <roger1.jonsson@sonyericsson.com> Fix bad checks that causes crash when streaming H.263 content.

Remove checks that causes crash for rtsp streamed h.263 content
with certain values in the RTP payload header:
Remove zero check for the five reserved bits in the payload header.
According to RFC 4629 these bits MUST be ignored by receivers.
Remove zero-check for the VRC (Video Redundancy Coding) bit,
skip packet instead.
Remove zero-check for the PLEN bits (extra picture header),
skip packet instead.
Remove zero-check for the PEBIT bits (extra picture header),
skip packet instead.
Remove corresponding zero check for the four resreved bits in the
AMR payload header. According to RFC 4867 these bits MUST be
ignored by receivers.

Change-Id: I7fc21d69a19d23da24f9267623c338d415ef1387
tsp/AAMRAssembler.cpp
tsp/AH263Assembler.cpp
9b1797fed7065be05f8fb7a36d1a27e0df3cb7ab 29-Nov-2012 cong.zhou <cong.zhou@lge.com> Fix bug in WAVExtractor for 24-bit per sample wav

support stereo/multichannel 24-bit format
kMaxFrameSize is fixed to 32768. When converting 24-bit to 16-bit,
number of samlpes is maxBytesToRead /3.
In this case, if the maxBytesToRead is not multiple of 3,
pcm data is messed when converting.

Bug:7630939
Change-Id: I0ea1b53eb1272a8d83b63815fc0a05b73cef75f1
AVExtractor.cpp
51634104ae2e91353905e53cdcb483a86d408ca7 29-Nov-2012 cong.zhou <cong.zhou@lge.com> Fix bug in WAVExtractor for 24-bit per sample wav

support stereo/multichannel 24-bit format
kMaxFrameSize is fixed to 32768. When converting 24-bit to 16-bit,
number of samlpes is maxBytesToRead /3.
In this case, if the maxBytesToRead is not multiple of 3,
pcm data is messed when converting.

Bug:7630939
Change-Id: I0ea1b53eb1272a8d83b63815fc0a05b73cef75f1
AVExtractor.cpp
47c1a5f7c13d82aa8834fd4543bd1d713b97808e 28-Nov-2012 Dylan Powers <dylan.kyle.powers@gmail.com> Bug fix for the MediaPlayer::prepare() api.

For an MP3 source, within the prepare command, ID3 tags are checked in search of
gapless playback info. This causes problems for streamed sources. If ID3v2 tags
aren't present, then a check is done for ID3v1 tags. This results in a read
command that asks the cache to jump to the end of the file, and subsequently
make an extra http call to request those bytes. For a streamed source, this
causes the file to not be downloaded automatically when MediaPlayer::prepare()
is called, and causes stuttering and extra buffering time to be needed when
start() is finally called.
The solution is to ignore the ID3v1 tags as the gapless info would never exist
there, and only check for ID3v2 tags.

Cherrypicked from external contribution ffd6ffc5429c45577fd8e9f8fa90e79bb91b8a84
b/7638165

Change-Id: I7d1b94cffbfe7c38ca094834dedbc92a58855e20
P3Extractor.cpp
d3/ID3.cpp
nclude/ID3.h
37a9e8e13bcc9ac614c1b733ec2c66764c29679a 29-Nov-2012 Andreas Huber <andih@google.com> am 2f6107ec: am b64def9a: Merge "[wfd] Support a low(er) power state by triggering PAUSE/RESUME." into jb-mr1.1-dev

* commit '2f6107ec8e67eea1f73b9558a5ad34caec52867f':
[wfd] Support a low(er) power state by triggering PAUSE/RESUME.
f59ab0eb162cc32df4fc0af8d1a4500c5bce3ecc 29-Nov-2012 Andreas Huber <andih@google.com> am 2f6107ec: am b64def9a: Merge "[wfd] Support a low(er) power state by triggering PAUSE/RESUME." into jb-mr1.1-dev

* commit '2f6107ec8e67eea1f73b9558a5ad34caec52867f':
[wfd] Support a low(er) power state by triggering PAUSE/RESUME.
b58fdddc227e7245701508904056805625b9ec5f 29-Nov-2012 Andreas Huber <andih@google.com> am 5ea87edb: am e5aed03d: Enable retransmission of UDP packets in case we want to use it

* commit '5ea87edbc97cd693fb7a9a8e00e712978315693c':
Enable retransmission of UDP packets in case we want to use it
4aefd5fc4dde13a8f3c9c27ec4055b771c0ee341 29-Nov-2012 Andreas Huber <andih@google.com> am 5ea87edb: am e5aed03d: Enable retransmission of UDP packets in case we want to use it

* commit '5ea87edbc97cd693fb7a9a8e00e712978315693c':
Enable retransmission of UDP packets in case we want to use it
156c4664d1ce797c51d9c81b75ca3606ad2e84b6 29-Nov-2012 James Dong <jdong@google.com> am bd4f7b89: am 79c56d3f: Merge "Reduce the frequency of IDR frames and add intra-fresh mode support for WiFi display" into jb-mr1.1-dev

* commit 'bd4f7b8931a316ca43fae033d86167c83a8bac07':
Reduce the frequency of IDR frames and add intra-fresh mode support for WiFi display
e1b3d69e2a5b391aa45047c6f90ee3d1ecfb74d3 29-Nov-2012 James Dong <jdong@google.com> am bd4f7b89: am 79c56d3f: Merge "Reduce the frequency of IDR frames and add intra-fresh mode support for WiFi display" into jb-mr1.1-dev

* commit 'bd4f7b8931a316ca43fae033d86167c83a8bac07':
Reduce the frequency of IDR frames and add intra-fresh mode support for WiFi display
239a901bb320383eb1aa2820c02c80937053acb4 29-Nov-2012 James Dong <jdong@google.com> am 296cb9dd: am 0dbe5a93: Added optional intra macroblock refresh support for encoding

* commit '296cb9ddd916c43983bfb4ddab9c69ed555d4cc4':
Added optional intra macroblock refresh support for encoding
2e57f4c428be32a574e31b0f4aeeae8de24e5895 29-Nov-2012 James Dong <jdong@google.com> am 296cb9dd: am 0dbe5a93: Added optional intra macroblock refresh support for encoding

* commit '296cb9ddd916c43983bfb4ddab9c69ed555d4cc4':
Added optional intra macroblock refresh support for encoding
2f6107ec8e67eea1f73b9558a5ad34caec52867f 29-Nov-2012 Andreas Huber <andih@google.com> am b64def9a: Merge "[wfd] Support a low(er) power state by triggering PAUSE/RESUME." into jb-mr1.1-dev

* commit 'b64def9a555bfbf533a2da41ba0189b9842a76fb':
[wfd] Support a low(er) power state by triggering PAUSE/RESUME.
53faa7ee457eb9b27be1fd814e42ffe43c8520a0 29-Nov-2012 Andreas Huber <andih@google.com> am b64def9a: Merge "[wfd] Support a low(er) power state by triggering PAUSE/RESUME." into jb-mr1.1-dev

* commit 'b64def9a555bfbf533a2da41ba0189b9842a76fb':
[wfd] Support a low(er) power state by triggering PAUSE/RESUME.
5ea87edbc97cd693fb7a9a8e00e712978315693c 29-Nov-2012 Andreas Huber <andih@google.com> am e5aed03d: Enable retransmission of UDP packets in case we want to use it

* commit 'e5aed03d30ea0ce49728873c5b74f89ba05a9541':
Enable retransmission of UDP packets in case we want to use it
6b4f9facb1d0caf06d511bd1d5a020c6af793c2b 29-Nov-2012 Andreas Huber <andih@google.com> am e5aed03d: Enable retransmission of UDP packets in case we want to use it

* commit 'e5aed03d30ea0ce49728873c5b74f89ba05a9541':
Enable retransmission of UDP packets in case we want to use it
bd4f7b8931a316ca43fae033d86167c83a8bac07 29-Nov-2012 James Dong <jdong@google.com> am 79c56d3f: Merge "Reduce the frequency of IDR frames and add intra-fresh mode support for WiFi display" into jb-mr1.1-dev

* commit '79c56d3f17d3193a0a86eb3c9bfdea90b89ae3f9':
Reduce the frequency of IDR frames and add intra-fresh mode support for WiFi display
06d739cfc61e45d9aaa296284d2628773bcfa9ca 29-Nov-2012 James Dong <jdong@google.com> am 79c56d3f: Merge "Reduce the frequency of IDR frames and add intra-fresh mode support for WiFi display" into jb-mr1.1-dev

* commit '79c56d3f17d3193a0a86eb3c9bfdea90b89ae3f9':
Reduce the frequency of IDR frames and add intra-fresh mode support for WiFi display
296cb9ddd916c43983bfb4ddab9c69ed555d4cc4 29-Nov-2012 James Dong <jdong@google.com> am 0dbe5a93: Added optional intra macroblock refresh support for encoding

* commit '0dbe5a9321b24b6883fbb2fe97cd9d525128b0b5':
Added optional intra macroblock refresh support for encoding
cb9d270eecb7108e19323f522c5e82dcc80a5f32 29-Nov-2012 James Dong <jdong@google.com> am 0dbe5a93: Added optional intra macroblock refresh support for encoding

* commit '0dbe5a9321b24b6883fbb2fe97cd9d525128b0b5':
Added optional intra macroblock refresh support for encoding
db2919e9b87226a883f01e7b399419c9bf43800c 29-Nov-2012 Andreas Huber <andih@google.com> Merge "Clear the sticky EOS flags when transitioning to LOADED state"
d5ab37a1a0e74a75537b9514289434651635a820 29-Nov-2012 Andreas Huber <andih@google.com> Merge "Clear the sticky EOS flags when transitioning to LOADED state"
f6f38287b97ec69b169387add6458f859b770e65 29-Nov-2012 Andreas Huber <andih@google.com> Clear the sticky EOS flags when transitioning to LOADED state

instead of transitioning _from_ UNINITIALIZED state. This makes codec instances
reusable.

Change-Id: I8f0c11923978ffee58b553a5ac59c740b0223c54
Codec.cpp
16572becd56c43a43ceffd8edd33263895d0c045 29-Nov-2012 Andreas Huber <andih@google.com> Clear the sticky EOS flags when transitioning to LOADED state

instead of transitioning _from_ UNINITIALIZED state. This makes codec instances
reusable.

Change-Id: I8f0c11923978ffee58b553a5ac59c740b0223c54
Codec.cpp
c67d057596d81aea8fcd4868453cfcb501157297 29-Nov-2012 Marco Nelissen <marcone@google.com> am ce8dcdf5: am 031c93df: Merge "Bug fix for the MediaPlayer::prepare() api."

* commit 'ce8dcdf5361dd5de8c86cf5b0308c71d519f98ca':
Bug fix for the MediaPlayer::prepare() api.
6eb50f7ad52687331e55400a161164a62b8ebd52 29-Nov-2012 Marco Nelissen <marcone@google.com> am ce8dcdf5: am 031c93df: Merge "Bug fix for the MediaPlayer::prepare() api."

* commit 'ce8dcdf5361dd5de8c86cf5b0308c71d519f98ca':
Bug fix for the MediaPlayer::prepare() api.
ce8dcdf5361dd5de8c86cf5b0308c71d519f98ca 29-Nov-2012 Marco Nelissen <marcone@google.com> am 031c93df: Merge "Bug fix for the MediaPlayer::prepare() api."

* commit '031c93df74621dc2149876dc377aedee8930547f':
Bug fix for the MediaPlayer::prepare() api.
45be8448daafeab8f37cb82cd2219f95bc218a6a 29-Nov-2012 Marco Nelissen <marcone@google.com> am 031c93df: Merge "Bug fix for the MediaPlayer::prepare() api."

* commit '031c93df74621dc2149876dc377aedee8930547f':
Bug fix for the MediaPlayer::prepare() api.
031c93df74621dc2149876dc377aedee8930547f 29-Nov-2012 Marco Nelissen <marcone@google.com> Merge "Bug fix for the MediaPlayer::prepare() api."
5676e25a9d99703a247cc03f3918f8ac2ddbb338 29-Nov-2012 Marco Nelissen <marcone@google.com> Merge "Bug fix for the MediaPlayer::prepare() api."
b64def9a555bfbf533a2da41ba0189b9842a76fb 29-Nov-2012 Andreas Huber <andih@google.com> Merge "[wfd] Support a low(er) power state by triggering PAUSE/RESUME." into jb-mr1.1-dev
471dd1323f832a2b7daf42f7e75d2b4471dfe112 29-Nov-2012 Andreas Huber <andih@google.com> Merge "[wfd] Support a low(er) power state by triggering PAUSE/RESUME." into jb-mr1.1-dev
e5aed03d30ea0ce49728873c5b74f89ba05a9541 29-Nov-2012 Andreas Huber <andih@google.com> Enable retransmission of UDP packets in case we want to use it

in our upcoming wfd _sink_ implementation.

Change-Id: I4509c30d5a7b992bc841b73d63db902bbcf8f76a
related-to-bug: 7638155
ifi-display/source/Sender.h
2e6255f1c1fa4f8bc68da9f050755b86e6fa8d7e 29-Nov-2012 Andreas Huber <andih@google.com> Enable retransmission of UDP packets in case we want to use it

in our upcoming wfd _sink_ implementation.

Change-Id: I4509c30d5a7b992bc841b73d63db902bbcf8f76a
related-to-bug: 7638155
ifi-display/source/Sender.h
5131d127a042ee88f903370be88845dc8c9f8578 16-Nov-2012 Andreas Huber <andih@google.com> [wfd] Support a low(er) power state by triggering PAUSE/RESUME.

Change-Id: Ibe42bfa73816bbfeb7e652d435254d0171b89727
related-to-bug: 7638150
ifi-display/source/MediaPuller.cpp
ifi-display/source/MediaPuller.h
ifi-display/source/PlaybackSession.cpp
ifi-display/source/PlaybackSession.h
ifi-display/source/WifiDisplaySource.cpp
ifi-display/source/WifiDisplaySource.h
bf4950aa265ec7b54777d122b27037461638af0f 16-Nov-2012 Andreas Huber <andih@google.com> [wfd] Support a low(er) power state by triggering PAUSE/RESUME.

Change-Id: Ibe42bfa73816bbfeb7e652d435254d0171b89727
related-to-bug: 7638150
ifi-display/source/MediaPuller.cpp
ifi-display/source/MediaPuller.h
ifi-display/source/PlaybackSession.cpp
ifi-display/source/PlaybackSession.h
ifi-display/source/WifiDisplaySource.cpp
ifi-display/source/WifiDisplaySource.h
504dd3fdad2e1f59eb553ea2d4f94235eb7a8472 29-Nov-2012 Andreas Huber <andih@google.com> am 37ddc8fc: am 251c04b1: Merge "Unsolicited server responses cause RTSP streaming to crash"

* commit '37ddc8fc0f78234b5b3b58886113560cdf98aadf':
Unsolicited server responses cause RTSP streaming to crash
a6c87d18d0edf49ee5fa7c979f9d41b2febe4062 29-Nov-2012 Andreas Huber <andih@google.com> am 37ddc8fc: am 251c04b1: Merge "Unsolicited server responses cause RTSP streaming to crash"

* commit '37ddc8fc0f78234b5b3b58886113560cdf98aadf':
Unsolicited server responses cause RTSP streaming to crash
37ddc8fc0f78234b5b3b58886113560cdf98aadf 29-Nov-2012 Andreas Huber <andih@google.com> am 251c04b1: Merge "Unsolicited server responses cause RTSP streaming to crash"

* commit '251c04b1f3d048f541832c93347c6604b314e0ea':
Unsolicited server responses cause RTSP streaming to crash
391daa215831b21f5e5c96598cb08b114263b4d5 29-Nov-2012 Andreas Huber <andih@google.com> am 251c04b1: Merge "Unsolicited server responses cause RTSP streaming to crash"

* commit '251c04b1f3d048f541832c93347c6604b314e0ea':
Unsolicited server responses cause RTSP streaming to crash
8b96e5df9f085e285d23beb96fd41c3d4b8005a3 20-Jan-2012 Lena Magnusson <lena.magnusson@sonyericsson.com> Unsolicited server responses cause RTSP streaming to crash

If the set up of the RTSP stream contains an incorrect or otherwise
problematic URL, some servers will send an unsolicited server response
that contains a negative number in the sequence number (CSeq) field.

This negative value is not returned from the function findPendingRequest(),
so the check in notifyResponseListener() will not work. Instead there will
be a crash when 0 is used as the index to find a matching request/response
pair that doesn’t exist.

The fix is to return the received sequence number also when it is an
unsolicited server-client message.

Change-Id: Iedaba8a63dece7b43bce007069baefbfd10970b8
tsp/ARTSPConnection.cpp
78cc49b4c4b25ea51dc5f6a6878ea158056bcf32 20-Jan-2012 Lena Magnusson <lena.magnusson@sonyericsson.com> Unsolicited server responses cause RTSP streaming to crash

If the set up of the RTSP stream contains an incorrect or otherwise
problematic URL, some servers will send an unsolicited server response
that contains a negative number in the sequence number (CSeq) field.

This negative value is not returned from the function findPendingRequest(),
so the check in notifyResponseListener() will not work. Instead there will
be a crash when 0 is used as the index to find a matching request/response
pair that doesn’t exist.

The fix is to return the received sequence number also when it is an
unsolicited server-client message.

Change-Id: Iedaba8a63dece7b43bce007069baefbfd10970b8
tsp/ARTSPConnection.cpp
79c56d3f17d3193a0a86eb3c9bfdea90b89ae3f9 29-Nov-2012 James Dong <jdong@google.com> Merge "Reduce the frequency of IDR frames and add intra-fresh mode support for WiFi display" into jb-mr1.1-dev
7a7ea64c1daf025eafaba49617ee47add296254a 29-Nov-2012 James Dong <jdong@google.com> Merge "Reduce the frequency of IDR frames and add intra-fresh mode support for WiFi display" into jb-mr1.1-dev
13e8a0e8a14faaf3fe0bcebf4da1f2694d59565d 16-Nov-2012 James Dong <jdong@google.com> Reduce the frequency of IDR frames and add intra-fresh mode support for WiFi display

The time interval between periodic neighboring IDR frames is increased from 1 second to 15 seconds.

o related-to-bug: 7524791

Change-Id: Ic32f37448f952f329549eda5e73637ee3b02f046
ifi-display/source/Converter.cpp
7497e313a163d157647e2eb4a70b3e094cf637f7 16-Nov-2012 James Dong <jdong@google.com> Reduce the frequency of IDR frames and add intra-fresh mode support for WiFi display

The time interval between periodic neighboring IDR frames is increased from 1 second to 15 seconds.

o related-to-bug: 7524791

Change-Id: Ic32f37448f952f329549eda5e73637ee3b02f046
ifi-display/source/Converter.cpp
0dbe5a9321b24b6883fbb2fe97cd9d525128b0b5 15-Nov-2012 James Dong <jdong@google.com> Added optional intra macroblock refresh support for encoding

o related-to-bug: 7524791

Change-Id: I95ac4ee925e2dbeb00b3cfb2e29c611698c5cc9f
Codec.cpp
e97adde42fabc3928a2ac0b8cdc88e35b24b85dc 15-Nov-2012 James Dong <jdong@google.com> Added optional intra macroblock refresh support for encoding

o related-to-bug: 7524791

Change-Id: I95ac4ee925e2dbeb00b3cfb2e29c611698c5cc9f
Codec.cpp
2546219a54970e0ad53bd218586cdc48d6039b20 28-Nov-2012 Andreas Huber <andih@google.com> am 7b7f17dc: am b7c8e918: Add support for HLS playlists of type \'event\'.

* commit '7b7f17dc9b30ff4ecdf0aea9bcfa1c518d4ac1e7':
Add support for HLS playlists of type 'event'.
1bfcf04b27bdd5320ab70b74285b855380e83f26 28-Nov-2012 Andreas Huber <andih@google.com> am 7b7f17dc: am b7c8e918: Add support for HLS playlists of type \'event\'.

* commit '7b7f17dc9b30ff4ecdf0aea9bcfa1c518d4ac1e7':
Add support for HLS playlists of type 'event'.
7b7f17dc9b30ff4ecdf0aea9bcfa1c518d4ac1e7 28-Nov-2012 Andreas Huber <andih@google.com> am b7c8e918: Add support for HLS playlists of type \'event\'.

* commit 'b7c8e91880463ff4981e3e53e98e45d68e2fe374':
Add support for HLS playlists of type 'event'.
61c195615176903bb077a10d6b88ba112fefa250 28-Nov-2012 Andreas Huber <andih@google.com> am b7c8e918: Add support for HLS playlists of type \'event\'.

* commit 'b7c8e91880463ff4981e3e53e98e45d68e2fe374':
Add support for HLS playlists of type 'event'.
ffd6ffc5429c45577fd8e9f8fa90e79bb91b8a84 28-Nov-2012 Dylan Powers <dylan.kyle.powers@gmail.com> Bug fix for the MediaPlayer::prepare() api.

For an MP3 source, within the prepare command, ID3 tags are checked in search of
gapless playback info. This causes problems for streamed sources. If ID3v2 tags
aren't present, then a check is done for ID3v1 tags. This results in a read
command that asks the cache to jump to the end of the file, and subsequently
make an extra http call to request those bytes. For a streamed source, this
causes the file to not be downloaded automatically when MediaPlayer::prepare()
is called, and causes stuttering and extra buffering time to be needed when
start() is finally called.
The solution is to ignore the ID3v1 tags as the gapless info would never exist
there, and only check for ID3v2 tags.

Change-Id: I7d1b94cffbfe7c38ca094834dedbc92a58855e20
P3Extractor.cpp
d3/ID3.cpp
nclude/ID3.h
6e8f0bc59ad2409b294ad4eb803131500306bc8b 28-Nov-2012 Dylan Powers <dylan.kyle.powers@gmail.com> Bug fix for the MediaPlayer::prepare() api.

For an MP3 source, within the prepare command, ID3 tags are checked in search of
gapless playback info. This causes problems for streamed sources. If ID3v2 tags
aren't present, then a check is done for ID3v1 tags. This results in a read
command that asks the cache to jump to the end of the file, and subsequently
make an extra http call to request those bytes. For a streamed source, this
causes the file to not be downloaded automatically when MediaPlayer::prepare()
is called, and causes stuttering and extra buffering time to be needed when
start() is finally called.
The solution is to ignore the ID3v1 tags as the gapless info would never exist
there, and only check for ID3v2 tags.

Change-Id: I7d1b94cffbfe7c38ca094834dedbc92a58855e20
P3Extractor.cpp
d3/ID3.cpp
nclude/ID3.h
b7c8e91880463ff4981e3e53e98e45d68e2fe374 28-Nov-2012 Andreas Huber <andih@google.com> Add support for HLS playlists of type 'event'.

related-to-bug: 6870049

Squashed commit of the following:

commit eee2f3ba6bb7335f4e285632726db85645669929
Author: Andreas Huber <andih@google.com>
Date: Tue Nov 27 15:02:01 2012 -0800

Make everything a lot less verbose by default.

Change-Id: I884d7a7901aa1e7d4ff590f065ca57a79d2af8b3

commit 6bbdb837ed5bd88008e45efb8faf595e4051ba26
Author: Andreas Huber <andih@google.com>
Date: Tue Nov 27 14:34:46 2012 -0800

HLS now properly signals media time changes at discontinuities including

the start of playback (which may not necessarily be at time 0 if the playlist
is of type 'event' and hasn't completed yet).

Change-Id: I5ab747d024f9b8d0df72a4e06a12ebb29f62802e

commit 1555589832b1878a144a976a643e1af4d61f877c
Author: Andreas Huber <andih@google.com>
Date: Tue Nov 27 14:32:28 2012 -0800

As part of a time discontinuity, clients of IStreamListener can now

signal the corresponding media time after the discontinuity, i.e. the first PTS
timestamp following the discontinuity will be considered equivalent to the
specified media time and media buffers timestamped accordingly.

Change-Id: Id7db7679b7faa6efd6270620ff52e34e884f3e92

commit 5c24c605c073a11c426d025b1e7478fc1ad8365a
Author: Andreas Huber <andih@google.com>
Date: Tue Nov 27 13:00:56 2012 -0800

NuPlayer sources now expose flags() and can announce

that duration may change (increase) dynamically, in which case duration
will be polled at 1 second intervals and communicated to the upper layers.

Change-Id: I45102909b7a19eed0dda576747e3814d742a0eea

commit ecb71de8e281e61971a2cd73e7161a97540bc357
Author: Andreas Huber <andih@google.com>
Date: Tue Nov 27 12:57:47 2012 -0800

Stop caching duration in MediaPlayer, duration could increase dynamically.

Change-Id: I7bb2f16c0abe49debdf45c776d2266aa069d7791

commit 544aec5823e6d7a3e97e15b6b23546616bcd343e
Author: Andreas Huber <andih@google.com>
Date: Tue Nov 27 08:46:28 2012 -0800

An attempt to add support for "event" style HLS playlists.

Change-Id: I3dfb2e801ecaff8f5d8bdb3a4fca1b18aeeb2c60

Change-Id: I48cf7f65a654d33f2f49ded74f8be22aed9e3b98
hromium_http/ChromiumHTTPDataSource.cpp
ttplive/LiveSession.cpp
ttplive/M3UParser.cpp
nclude/LiveSession.h
nclude/M3UParser.h
peg2ts/ATSParser.cpp
a4c5bc0f18fe272146426ab2eccad6215279c9f3 28-Nov-2012 Andreas Huber <andih@google.com> Add support for HLS playlists of type 'event'.

related-to-bug: 6870049

Squashed commit of the following:

commit eee2f3ba6bb7335f4e285632726db85645669929
Author: Andreas Huber <andih@google.com>
Date: Tue Nov 27 15:02:01 2012 -0800

Make everything a lot less verbose by default.

Change-Id: I884d7a7901aa1e7d4ff590f065ca57a79d2af8b3

commit 6bbdb837ed5bd88008e45efb8faf595e4051ba26
Author: Andreas Huber <andih@google.com>
Date: Tue Nov 27 14:34:46 2012 -0800

HLS now properly signals media time changes at discontinuities including

the start of playback (which may not necessarily be at time 0 if the playlist
is of type 'event' and hasn't completed yet).

Change-Id: I5ab747d024f9b8d0df72a4e06a12ebb29f62802e

commit 1555589832b1878a144a976a643e1af4d61f877c
Author: Andreas Huber <andih@google.com>
Date: Tue Nov 27 14:32:28 2012 -0800

As part of a time discontinuity, clients of IStreamListener can now

signal the corresponding media time after the discontinuity, i.e. the first PTS
timestamp following the discontinuity will be considered equivalent to the
specified media time and media buffers timestamped accordingly.

Change-Id: Id7db7679b7faa6efd6270620ff52e34e884f3e92

commit 5c24c605c073a11c426d025b1e7478fc1ad8365a
Author: Andreas Huber <andih@google.com>
Date: Tue Nov 27 13:00:56 2012 -0800

NuPlayer sources now expose flags() and can announce

that duration may change (increase) dynamically, in which case duration
will be polled at 1 second intervals and communicated to the upper layers.

Change-Id: I45102909b7a19eed0dda576747e3814d742a0eea

commit ecb71de8e281e61971a2cd73e7161a97540bc357
Author: Andreas Huber <andih@google.com>
Date: Tue Nov 27 12:57:47 2012 -0800

Stop caching duration in MediaPlayer, duration could increase dynamically.

Change-Id: I7bb2f16c0abe49debdf45c776d2266aa069d7791

commit 544aec5823e6d7a3e97e15b6b23546616bcd343e
Author: Andreas Huber <andih@google.com>
Date: Tue Nov 27 08:46:28 2012 -0800

An attempt to add support for "event" style HLS playlists.

Change-Id: I3dfb2e801ecaff8f5d8bdb3a4fca1b18aeeb2c60

Change-Id: I48cf7f65a654d33f2f49ded74f8be22aed9e3b98
hromium_http/ChromiumHTTPDataSource.cpp
ttplive/LiveSession.cpp
ttplive/M3UParser.cpp
nclude/LiveSession.h
nclude/M3UParser.h
peg2ts/ATSParser.cpp
d3d2eefa88f353438bef47ddb6ee1110edfa886b 27-Nov-2012 Andreas Huber <andih@google.com> am 8b5985d9: am 5768fa03: Merge "Crash in android::MyHandler::parsePlayResponse"

* commit '8b5985d99becc2d5126b8a26afb6f5798b560007':
Crash in android::MyHandler::parsePlayResponse
85cecc25d877cb44b0b0f670c4e52dc4839a4064 27-Nov-2012 Andreas Huber <andih@google.com> am 8b5985d9: am 5768fa03: Merge "Crash in android::MyHandler::parsePlayResponse"

* commit '8b5985d99becc2d5126b8a26afb6f5798b560007':
Crash in android::MyHandler::parsePlayResponse
8b5985d99becc2d5126b8a26afb6f5798b560007 27-Nov-2012 Andreas Huber <andih@google.com> am 5768fa03: Merge "Crash in android::MyHandler::parsePlayResponse"

* commit '5768fa034ede834656697d3612c525595ff85ef9':
Crash in android::MyHandler::parsePlayResponse
47ea283ceaeab616c092f504efcf16eab88267e5 27-Nov-2012 Andreas Huber <andih@google.com> am 5768fa03: Merge "Crash in android::MyHandler::parsePlayResponse"

* commit '5768fa034ede834656697d3612c525595ff85ef9':
Crash in android::MyHandler::parsePlayResponse
5768fa034ede834656697d3612c525595ff85ef9 27-Nov-2012 Andreas Huber <andih@google.com> Merge "Crash in android::MyHandler::parsePlayResponse"
0d55a6f35a2d37187139e50972f7b6c413b2371f 27-Nov-2012 Andreas Huber <andih@google.com> Merge "Crash in android::MyHandler::parsePlayResponse"
738198a16cfd7b125d15b0bab0708ba7fbf7e64a 26-Sep-2011 Patric Frederiksen <patric.frederiksen@sonyericsson.com> Crash in android::MyHandler::parsePlayResponse

This fix handles problems with several asynchronous calls
within streaming. This case is when the phone has sent a
request to the server and while the response is being sent
back by the server the request is aborted by the user.
The fix is an if case that checks if we have aborted while
waiting for a response from the server. If we have aborted
we should ignore the late response instead of continuing.

Change-Id: I1264bb992f6abcaee1f10a89479e08b54a95e3c2
tsp/MyHandler.h
e1a31d16dda3460a34e5dfd65c4e96e422dbdbfc 26-Sep-2011 Patric Frederiksen <patric.frederiksen@sonyericsson.com> Crash in android::MyHandler::parsePlayResponse

This fix handles problems with several asynchronous calls
within streaming. This case is when the phone has sent a
request to the server and while the response is being sent
back by the server the request is aborted by the user.
The fix is an if case that checks if we have aborted while
waiting for a response from the server. If we have aborted
we should ignore the late response instead of continuing.

Change-Id: I1264bb992f6abcaee1f10a89479e08b54a95e3c2
tsp/MyHandler.h
53f6244746342f06a028702a6b850af2d93f20ac 26-Nov-2012 Andreas Huber <andih@google.com> am 5bc5bf39: am 79fd6853: Merge "MediaCodec: Add a method for getting the component name"

* commit '5bc5bf39120ae27ef46a8b13f85bf44ea19c7d5e':
MediaCodec: Add a method for getting the component name
a98a8877396fdcdf04e64cf8674ede9d4212c97b 26-Nov-2012 Andreas Huber <andih@google.com> am 5bc5bf39: am 79fd6853: Merge "MediaCodec: Add a method for getting the component name"

* commit '5bc5bf39120ae27ef46a8b13f85bf44ea19c7d5e':
MediaCodec: Add a method for getting the component name
5bc5bf39120ae27ef46a8b13f85bf44ea19c7d5e 26-Nov-2012 Andreas Huber <andih@google.com> am 79fd6853: Merge "MediaCodec: Add a method for getting the component name"

* commit '79fd685323e34e0fde22d17fd6848d33f171f4ae':
MediaCodec: Add a method for getting the component name
115d8138fa0a288163bbeefaf763135f1fc5b677 26-Nov-2012 Andreas Huber <andih@google.com> am 79fd6853: Merge "MediaCodec: Add a method for getting the component name"

* commit '79fd685323e34e0fde22d17fd6848d33f171f4ae':
MediaCodec: Add a method for getting the component name
79fd685323e34e0fde22d17fd6848d33f171f4ae 26-Nov-2012 Andreas Huber <andih@google.com> Merge "MediaCodec: Add a method for getting the component name"
98c47abf4d04ca5df2c8fc403332d08d65e8ce1e 26-Nov-2012 Andreas Huber <andih@google.com> Merge "MediaCodec: Add a method for getting the component name"
7032c59b5c2551c584c1f2fad87ae8926fc0b959 20-Nov-2012 Marco Nelissen <marcone@google.com> am b96c4b4c: am 2da6e4ae: Merge "Avoid memory leaks when handling metadata strings"

* commit 'b96c4b4ce8eb90a6bdb162681affe1e50fe6aafc':
Avoid memory leaks when handling metadata strings
b614933a9cf99a6ebd55ae7abced9663d5d624a8 20-Nov-2012 Marco Nelissen <marcone@google.com> am b96c4b4c: am 2da6e4ae: Merge "Avoid memory leaks when handling metadata strings"

* commit 'b96c4b4ce8eb90a6bdb162681affe1e50fe6aafc':
Avoid memory leaks when handling metadata strings
b96c4b4ce8eb90a6bdb162681affe1e50fe6aafc 20-Nov-2012 Marco Nelissen <marcone@google.com> am 2da6e4ae: Merge "Avoid memory leaks when handling metadata strings"

* commit '2da6e4ae488896df10b22166b0aa0b2cc15492f1':
Avoid memory leaks when handling metadata strings
2cfd3b7d85917666f80826bdb5b85f209b22c528 20-Nov-2012 Marco Nelissen <marcone@google.com> am 2da6e4ae: Merge "Avoid memory leaks when handling metadata strings"

* commit '2da6e4ae488896df10b22166b0aa0b2cc15492f1':
Avoid memory leaks when handling metadata strings
d863eff90f2820e78da763ca5be9f942dc49675e 19-Nov-2012 David Williams <david.williams@sonymobile.com> Avoid memory leaks when handling metadata strings

Don't duplicate strings when retrieveing metadata from media
files. As any requests for metadata strings would pass through
the binder, this would cause the reference to the duplicate string
to be lost, causing a memory leak as the duplicate would not be
freed.

Change-Id: I2593733472b1bb589bc502b2c11080f581015bb5
tagefrightMetadataRetriever.cpp
8a1016a6f4d274444379c2ed88cc32bfbdfeb346 19-Nov-2012 David Williams <david.williams@sonymobile.com> Avoid memory leaks when handling metadata strings

Don't duplicate strings when retrieveing metadata from media
files. As any requests for metadata strings would pass through
the binder, this would cause the reference to the duplicate string
to be lost, causing a memory leak as the duplicate would not be
freed.

Change-Id: I2593733472b1bb589bc502b2c11080f581015bb5
tagefrightMetadataRetriever.cpp
0ebc0bfbdfeedd9dac023e60524a71af67d0796d 20-Nov-2012 Andreas Huber <andih@google.com> am 14dda623: am 7013209c: Merge "Handle large AVCC chunks"

* commit '14dda623c8db5f991b8a22dce4f19f8d8b47fea2':
Handle large AVCC chunks
c1d6b630da52f37db415e92741f7c011ce2959d5 20-Nov-2012 Andreas Huber <andih@google.com> am 14dda623: am 7013209c: Merge "Handle large AVCC chunks"

* commit '14dda623c8db5f991b8a22dce4f19f8d8b47fea2':
Handle large AVCC chunks
41bc927ed70c7316ece894f0848ab5e4db822766 20-Nov-2012 Marco Nelissen <marcone@google.com> am 343f9c81: am dca2b5d7: Merge "Changed parsing of trkn and disk from 8 bits to 16 bits"

* commit '343f9c81f293f56e09b1cc1921844ecd3372e435':
Changed parsing of trkn and disk from 8 bits to 16 bits
34a895226e062c15197e2be1dd710098224702c3 20-Nov-2012 Marco Nelissen <marcone@google.com> am 343f9c81: am dca2b5d7: Merge "Changed parsing of trkn and disk from 8 bits to 16 bits"

* commit '343f9c81f293f56e09b1cc1921844ecd3372e435':
Changed parsing of trkn and disk from 8 bits to 16 bits
14dda623c8db5f991b8a22dce4f19f8d8b47fea2 20-Nov-2012 Andreas Huber <andih@google.com> am 7013209c: Merge "Handle large AVCC chunks"

* commit '7013209cdf393b3d958ddd46ed50394349378826':
Handle large AVCC chunks
12407d6a5161226bf9c29057d187892498fc566c 20-Nov-2012 Andreas Huber <andih@google.com> am 7013209c: Merge "Handle large AVCC chunks"

* commit '7013209cdf393b3d958ddd46ed50394349378826':
Handle large AVCC chunks
343f9c81f293f56e09b1cc1921844ecd3372e435 20-Nov-2012 Marco Nelissen <marcone@google.com> am dca2b5d7: Merge "Changed parsing of trkn and disk from 8 bits to 16 bits"

* commit 'dca2b5d7c29ee06f3c82527dd7264fcc21cac9a6':
Changed parsing of trkn and disk from 8 bits to 16 bits
fcc6d852b6efb93c1f189399446e4219578cc311 20-Nov-2012 Marco Nelissen <marcone@google.com> am dca2b5d7: Merge "Changed parsing of trkn and disk from 8 bits to 16 bits"

* commit 'dca2b5d7c29ee06f3c82527dd7264fcc21cac9a6':
Changed parsing of trkn and disk from 8 bits to 16 bits
7013209cdf393b3d958ddd46ed50394349378826 20-Nov-2012 Andreas Huber <andih@google.com> Merge "Handle large AVCC chunks"
35c96b589ed8095a0d3a7dfd166b40180c0cf84c 20-Nov-2012 Andreas Huber <andih@google.com> Merge "Handle large AVCC chunks"
dca2b5d7c29ee06f3c82527dd7264fcc21cac9a6 20-Nov-2012 Marco Nelissen <marcone@google.com> Merge "Changed parsing of trkn and disk from 8 bits to 16 bits"
515bb03933b7ec4e7133c0cc6de72d9abd57687f 20-Nov-2012 Marco Nelissen <marcone@google.com> Merge "Changed parsing of trkn and disk from 8 bits to 16 bits"
717fd3d4328abf524978ce9c125ab8ae8d6bffad 25-Sep-2012 Martin Storsjo <martin@martin.st> MediaCodec: Add a method for getting the component name

If the codec was chosen based on mime type, the caller does
not know what component actually was chosen. This allows
getting essential information (such as supported color formats,
for a video encoder) for this component.

Change-Id: Ie471f40f8104b37d27ced3dba5a54facc6504b1b
ediaCodec.cpp
8601efe463bf3331fa2a389ee13db25f21d28eb9 25-Sep-2012 Martin Storsjo <martin@martin.st> MediaCodec: Add a method for getting the component name

If the codec was chosen based on mime type, the caller does
not know what component actually was chosen. This allows
getting essential information (such as supported color formats,
for a video encoder) for this component.

Change-Id: Ie471f40f8104b37d27ced3dba5a54facc6504b1b
ediaCodec.cpp
afa28a823724a2f76e1a53b15358533388003666 13-Oct-2010 Andreas Lillvik <andreas.lillvik@sonyericsson.com> Changed parsing of trkn and disk from 8 bits to 16 bits

The MPEG4Extractor was parsing 8 bits instead of 16 bits when parsing
'trkn' and 'disk'. Also added support for 16 bytes size 'disk'.

Change-Id: I22b4de2ac800881884d5759776cb380917522a87
PEG4Extractor.cpp
791841a80dc6bc46cb8d7f613b94338ec5b69b5c 13-Oct-2010 Andreas Lillvik <andreas.lillvik@sonyericsson.com> Changed parsing of trkn and disk from 8 bits to 16 bits

The MPEG4Extractor was parsing 8 bits instead of 16 bits when parsing
'trkn' and 'disk'. Also added support for 16 bytes size 'disk'.

Change-Id: I22b4de2ac800881884d5759776cb380917522a87
PEG4Extractor.cpp
d2f6b04578432fa4e27bacf860b78bf29a099b73 26-Sep-2012 Jan Olof Svensson <janolof.svensson@sonyericsson.com> Handle large AVCC chunks

If enabling seq_scaling_matrix_present_flag = 1 the AVCC chunk can
be larger than the original buffer size. Changed to using ABuffer
instead.

Change-Id: Idacc14b45ea2634c5e608919f3ce567f23363135
PEG4Extractor.cpp
0fd2883dbe2841b7b35f1e7581e5d9d59e58ad97 26-Sep-2012 Jan Olof Svensson <janolof.svensson@sonyericsson.com> Handle large AVCC chunks

If enabling seq_scaling_matrix_present_flag = 1 the AVCC chunk can
be larger than the original buffer size. Changed to using ABuffer
instead.

Change-Id: Idacc14b45ea2634c5e608919f3ce567f23363135
PEG4Extractor.cpp
1552217cca4d949bba4b2cf6194a0936bbb10fa4 10-Sep-2012 Jens Gulin <jens.gulin@sonymobile.com> Memory leak solved in MPEG4Extractor::parseChunk for cover art

Repeated leaks detected in mediaserver context. Most chunks small but
some bigger. Adding up it was not uncommon to see 200Mb footprint.
libc memdebug allocation call stack showed the root cause in "covr"
parsing - that explains why content often was empty but sometimes big.

Change-Id: I0de6c1eeef174d2529973ff9c6a020ec3dd44c75
PEG4Extractor.cpp
2cac3fcde42af0f198144dc5f413dc9e6faae4cc 10-Sep-2012 Jens Gulin <jens.gulin@sonymobile.com> Memory leak solved in MPEG4Extractor::parseChunk for cover art

Repeated leaks detected in mediaserver context. Most chunks small but
some bigger. Adding up it was not uncommon to see 200Mb footprint.
libc memdebug allocation call stack showed the root cause in "covr"
parsing - that explains why content often was empty but sometimes big.

Change-Id: I0de6c1eeef174d2529973ff9c6a020ec3dd44c75
PEG4Extractor.cpp
8af5fe5a2431522a7d30bc546dcd31c0c64db70c 19-Sep-2011 Erik Rydgren <erik.rydgren@sonyericsson.com> Use default values when MPEG4 audio config parsing fails.

MPEG4 audio packets may be multiplexed using the so called
LATM (Low Overhead Audio Transport Multiplex) scheme.
LATM parsing was recently introduced in Stagefright and it
has caused issues in cases when the LATM config element
cannot be parsed correctly. The main problem occurrs when
the AudioSpecificConfig part of the config element contains
more information than what is expected, causing the
frameLengthType parameter to get the wrong value. This fix
introduces default values of some config parameters that are
used in case config parsing fails.

Change-Id: I3cb35df76826f95ca0831dc08c2a1e7c6c2c586d
tsp/AMPEG4AudioAssembler.cpp
a45a600d69a5d8ab99eeb7e0dfa58c3cb99a2e61 19-Sep-2011 Erik Rydgren <erik.rydgren@sonyericsson.com> Use default values when MPEG4 audio config parsing fails.

MPEG4 audio packets may be multiplexed using the so called
LATM (Low Overhead Audio Transport Multiplex) scheme.
LATM parsing was recently introduced in Stagefright and it
has caused issues in cases when the LATM config element
cannot be parsed correctly. The main problem occurrs when
the AudioSpecificConfig part of the config element contains
more information than what is expected, causing the
frameLengthType parameter to get the wrong value. This fix
introduces default values of some config parameters that are
used in case config parsing fails.

Change-Id: I3cb35df76826f95ca0831dc08c2a1e7c6c2c586d
tsp/AMPEG4AudioAssembler.cpp
b7047796795083484c0bc9003f346b4022c3be9a 16-Nov-2012 Marco Nelissen <marcone@google.com> resolved conflicts for merge of 205d7249 to master

Change-Id: I3df408b6e30e0c0b2a19a3336134ce49fb73a8bb
db182fc307c3fd50ea287f0cdc1b2032d6c056c1 16-Nov-2012 Marco Nelissen <marcone@google.com> resolved conflicts for merge of 205d7249 to master

Change-Id: I3df408b6e30e0c0b2a19a3336134ce49fb73a8bb
205d72493af8150cc8f398ab4971b382965cd467 16-Nov-2012 Marco Nelissen <marcone@google.com> am da33d66e: Merge "Add .mpga to acceptable file name extensions list."

* commit 'da33d66e68791d0bfeccebc8253a59467b5ef670':
Add .mpga to acceptable file name extensions list.
50fee506df0f18a2f0c2686b47dbce2170d4ee01 16-Nov-2012 Marco Nelissen <marcone@google.com> am da33d66e: Merge "Add .mpga to acceptable file name extensions list."

* commit 'da33d66e68791d0bfeccebc8253a59467b5ef670':
Add .mpga to acceptable file name extensions list.
a1c1a7e4c9cb37726e4afc10d6678666087f8e1d 16-Nov-2012 Marco Nelissen <marcone@google.com> Merge "Add GSM 6.10 decoder"
3c81bfb86cfa2b0bae4fea41cc26e3ce50af8517 16-Nov-2012 Marco Nelissen <marcone@google.com> Merge "Add GSM 6.10 decoder"
03163f4ed4e130c5df454e3ab2a5bb3690c26be1 16-Nov-2012 Jan Bjernler <jan2.bjernler@sonymobile.com> Add .mpga to acceptable file name extensions list.

The *.mpga files are playable, but are not correctly scanned.
This is because they are prevented from being scanned in
StagefrightMediaScanner.cpp.
What this fix does is to add the extension to the list of valid
file extensions so that the scanner handles the filetype properly.
We have previously added the .mpga extension to the framework to
make it playable, but not added it so that the scanner scans it.

Change-Id: I02a44d770adb80d38e8bed77d0d76efa1b28a861
tagefrightMediaScanner.cpp
19af4c7966bda963f5d9143bd60f58a9e171cf0a 16-Nov-2012 Jan Bjernler <jan2.bjernler@sonymobile.com> Add .mpga to acceptable file name extensions list.

The *.mpga files are playable, but are not correctly scanned.
This is because they are prevented from being scanned in
StagefrightMediaScanner.cpp.
What this fix does is to add the extension to the list of valid
file extensions so that the scanner handles the filetype properly.
We have previously added the .mpga extension to the framework to
make it playable, but not added it so that the scanner scans it.

Change-Id: I02a44d770adb80d38e8bed77d0d76efa1b28a861
tagefrightMediaScanner.cpp
ba933df89521d63f75ca66af12ce9d7ae9496b9e 15-Nov-2012 Marco Nelissen <marcone@google.com> Add GSM 6.10 decoder

Supports Microsoft frame packing only, since that's what the sample
file used.
b/6620569

Change-Id: Ia89d95bcbf0f8dcbaad42148a7401728f60e079d
Codec.cpp
ediaDefs.cpp
MXCodec.cpp
AVExtractor.cpp
odecs/gsm/Android.mk
odecs/gsm/dec/Android.mk
odecs/gsm/dec/MODULE_LICENSE_APACHE2
odecs/gsm/dec/NOTICE
odecs/gsm/dec/SoftGSM.cpp
odecs/gsm/dec/SoftGSM.h
mx/SoftOMXPlugin.cpp
2ed5cf016c1b45426ae25ab105e02ff4bb992f28 15-Nov-2012 Marco Nelissen <marcone@google.com> Add GSM 6.10 decoder

Supports Microsoft frame packing only, since that's what the sample
file used.
b/6620569

Change-Id: Ia89d95bcbf0f8dcbaad42148a7401728f60e079d
Codec.cpp
ediaDefs.cpp
MXCodec.cpp
AVExtractor.cpp
odecs/gsm/Android.mk
odecs/gsm/dec/Android.mk
odecs/gsm/dec/MODULE_LICENSE_APACHE2
odecs/gsm/dec/NOTICE
odecs/gsm/dec/SoftGSM.cpp
odecs/gsm/dec/SoftGSM.h
mx/SoftOMXPlugin.cpp
1db91aff064ca986dc4eb14e1722de1b7f18add9 16-Nov-2012 Patrik2 Carlsson <patrik2.carlsson@sonyericsson.com> Allow multichannel FLAC files

FLACExtractor had artificial limits which did not allow multichannel
audio, 88.2 or 96 kHz samplerate, these were removed since it is up
to the audio subsystem to handle.

Change-Id: Iadc20cdf4724814b5c980827a528a1e1b4bd6a82
LACExtractor.cpp
91de11b05f1bbde310dcc2ab22770970721e79a5 16-Nov-2012 Patrik2 Carlsson <patrik2.carlsson@sonyericsson.com> Allow multichannel FLAC files

FLACExtractor had artificial limits which did not allow multichannel
audio, 88.2 or 96 kHz samplerate, these were removed since it is up
to the audio subsystem to handle.

Change-Id: Iadc20cdf4724814b5c980827a528a1e1b4bd6a82
LACExtractor.cpp
e33054eb968cbf8ccaee1b0ff0301403902deed6 14-Nov-2012 Glenn Kasten <gkasten@google.com> Use size_t for frame counts

Also fix typo: bufferCount should be frameCount.

Change-Id: Ibed539504db75ef99dc21c8ff1bf2987122063a5
udioSource.cpp
7da35f231725aa6e0b2ac8714a7d66471368df77 14-Nov-2012 Glenn Kasten <gkasten@google.com> Use size_t for frame counts

Also fix typo: bufferCount should be frameCount.

Change-Id: Ibed539504db75ef99dc21c8ff1bf2987122063a5
udioSource.cpp
7d9c126be8dfe3016683eeb2b7a2d88ba5b24c0b 15-Nov-2012 Andreas Huber <andih@google.com> Merge "wfd sink update."
de5191e8b02f727756eb9d6e812af415d6cd0768 15-Nov-2012 Andreas Huber <andih@google.com> Merge "wfd sink update."
22d00b70516f108c3351a29c95d8ba639a8ed520 15-Nov-2012 Andreas Huber <andih@google.com> wfd sink update.

Change-Id: Ib4e41ec1524d045699543536acdddc9a243db741
ifi-display/sink/TunnelRenderer.cpp
ifi-display/sink/WifiDisplaySink.cpp
11860f04a8bb09c8569819d1d67e67d7e049a635 15-Nov-2012 Andreas Huber <andih@google.com> wfd sink update.

Change-Id: Ib4e41ec1524d045699543536acdddc9a243db741
ifi-display/sink/TunnelRenderer.cpp
5ce181568da90c78ba7fad3e084c8479041545df 15-Nov-2012 Andreas Huber <andih@google.com> The length information of the chunks making up vorbis codec specific info

are "Xiph-style-lacing encoded" instead of individual bytes.

Change-Id: Ic1274a5bd8f082197bae6831da04002762a920c5
related-to-bug: 7401329
odecs/on2/dec/SoftVPX.cpp
atroska/MatroskaExtractor.cpp
5f3ddc56d0dfde768839923d8c36759445818fc0 15-Nov-2012 Andreas Huber <andih@google.com> The length information of the chunks making up vorbis codec specific info

are "Xiph-style-lacing encoded" instead of individual bytes.

Change-Id: Ic1274a5bd8f082197bae6831da04002762a920c5
related-to-bug: 7401329
odecs/on2/dec/SoftVPX.cpp
atroska/MatroskaExtractor.cpp
33cf42ff2264ba4e806ab82ca7a4139b1682192b 14-Nov-2012 Andreas Huber <andih@google.com> am dbb74f4e: am f0937247: Merge "Properly signal an error if codec configuration goes wrong." into jb-mr1.1-dev

* commit 'dbb74f4ee1a971da71f26739d870fc9334100499':
Properly signal an error if codec configuration goes wrong.
f550f56d4bc0fa165c675bbf2e41217c41089fcd 14-Nov-2012 Andreas Huber <andih@google.com> am dbb74f4e: am f0937247: Merge "Properly signal an error if codec configuration goes wrong." into jb-mr1.1-dev

* commit 'dbb74f4ee1a971da71f26739d870fc9334100499':
Properly signal an error if codec configuration goes wrong.
89e275dc833aadb90dd12bdb5dc7e93775a625be 14-Nov-2012 Andreas Huber <andih@google.com> am 911d5f93: am 0224bf17: Various improvements of wifi display code

* commit '911d5f937adbd177c69bd6959603b8a3b776097e':
Various improvements of wifi display code
05eae7dcb16399c2ab1811ad951d53e6728823f6 14-Nov-2012 Andreas Huber <andih@google.com> am 911d5f93: am 0224bf17: Various improvements of wifi display code

* commit '911d5f937adbd177c69bd6959603b8a3b776097e':
Various improvements of wifi display code
dbb74f4ee1a971da71f26739d870fc9334100499 14-Nov-2012 Andreas Huber <andih@google.com> am f0937247: Merge "Properly signal an error if codec configuration goes wrong." into jb-mr1.1-dev

* commit 'f0937247b6d92b7d9457c64e36fe4c10927685ac':
Properly signal an error if codec configuration goes wrong.
830fbc06b6b5f2d3d14888fc39f7ac2d71ec5408 14-Nov-2012 Andreas Huber <andih@google.com> am f0937247: Merge "Properly signal an error if codec configuration goes wrong." into jb-mr1.1-dev

* commit 'f0937247b6d92b7d9457c64e36fe4c10927685ac':
Properly signal an error if codec configuration goes wrong.
911d5f937adbd177c69bd6959603b8a3b776097e 14-Nov-2012 Andreas Huber <andih@google.com> am 0224bf17: Various improvements of wifi display code

* commit '0224bf170a3904576bba81593eaab113c5d3a4e7':
Various improvements of wifi display code
990b9755bcafe5aa1e5db24b97b4c66073e75e02 14-Nov-2012 Andreas Huber <andih@google.com> am 0224bf17: Various improvements of wifi display code

* commit '0224bf170a3904576bba81593eaab113c5d3a4e7':
Various improvements of wifi display code
f0937247b6d92b7d9457c64e36fe4c10927685ac 14-Nov-2012 Andreas Huber <andih@google.com> Merge "Properly signal an error if codec configuration goes wrong." into jb-mr1.1-dev
3326dffb07bc7cb724cae31923a122321ff5bb1a 14-Nov-2012 Andreas Huber <andih@google.com> Merge "Properly signal an error if codec configuration goes wrong." into jb-mr1.1-dev
4471e47ece77be5b4159cc9cbbcef4d43900d36f 14-Nov-2012 Andreas Huber <andih@google.com> Properly signal an error if codec configuration goes wrong.

previously any error signaled by setupXXX inside ACodec::configureCodec
would be overwritten with the result of setMinBufferSize at the end
of the function.

Change-Id: Id4beb571ca52ea4646239d0af006e09ce1130268
related-to-bug: 7542181
Codec.cpp
b81ed713b09d6db0f01d052fcd3f6bdfb5dd05c1 14-Nov-2012 Andreas Huber <andih@google.com> Properly signal an error if codec configuration goes wrong.

previously any error signaled by setupXXX inside ACodec::configureCodec
would be overwritten with the result of setMinBufferSize at the end
of the function.

Change-Id: Id4beb571ca52ea4646239d0af006e09ce1130268
related-to-bug: 7542181
Codec.cpp
0224bf170a3904576bba81593eaab113c5d3a4e7 12-Nov-2012 Andreas Huber <andih@google.com> Various improvements of wifi display code

- manually prepend SPS/PPS if encoder doesn't support it
- latency improvements
- support for "our" method of optional RTP retransmission
- improvements to the wfd commandline tool for testing
- make it easier to turn on/off suspension of the video pipeline on idle
- fixes an issue where an error during encryption would cause a SEGV
- add HDCP descriptor if necessary

Squashed commit of the following:

commit 1115be0ebb3b885b4f1b7dba56761ca013d0ec4a
Author: Andreas Huber <andih@google.com>
Date: Fri Nov 9 11:32:23 2012 -0800

Better shutdown of wfd -l sessions.

Change-Id: Id898a14ae21efd3b065b00a729830063d39195a7

commit 0e7d106dfe4eb6e2640b0b66c65deaba265f7ff0
Author: Andreas Huber <andih@google.com>
Date: Thu Nov 8 16:38:55 2012 -0800

No more sending delay, create rtp packets upfront.

Change-Id: I809a225f664fdb485c7d9a49a27886601a6a26b2

commit d399e8571b77353d59afb57508dfd2a82c1ef93a
Author: Andreas Huber <andih@google.com>
Date: Thu Nov 8 14:19:43 2012 -0800

Restore AudioSource buffer size, factor out TimeSeries, make

suspending video optional.

Change-Id: Ifdfe4d447b901e714abf52856b4641d1d55a5d41

commit f8b649f0b8f917d59f4b8a2e8e6d7db61a684a78
Author: Andreas Huber <andih@google.com>
Date: Thu Nov 8 09:34:06 2012 -0800

Pull 480 frames at a time from AudioSource/AudioRecord

Change-Id: I1e215abd329faec3da026631122c0f4c800c0ac4

commit 1bc13452eb35eebbba00f5da93fa86535be5db59
Author: Andreas Huber <andih@google.com>
Date: Thu Nov 8 08:50:30 2012 -0800

fixed bitrate traffic simulation

Change-Id: Ic5efb7cbb0b5d3b4917bc77b8ba73d447249e695

commit 016cdff18e74bdc631a5679e97192645ed095aa2
Author: Andreas Huber <andih@google.com>
Date: Wed Nov 7 14:00:03 2012 -0800

resurrected "our" style of retransmission.

Change-Id: I34d757aba67428437cb39b8293a9651750ad20d9

commit 384cf1a3c8fb4ec410bdf8fa5722c298e6028f3e
Author: Andreas Huber <andih@google.com>
Date: Tue Nov 6 09:38:55 2012 -0800

Changes to make wfd work on manta.

Change-Id: I7a4e00cf16581fe2146edd1b359af195774090e4

commit 9628f24b22b35f28630d99dda3614babf51bc07e
Author: Andreas Huber <andih@google.com>
Date: Wed Nov 7 09:15:44 2012 -0800

Patch up rtp timestamps to more accurately measure network jitter.

Change-Id: I9502a4615575f97f98a215a13131a89a6ae93c6d

commit 7c891a1a24f08bbd50f55be13f7d05f43e807eb8
Author: Andreas Huber <andih@google.com>
Date: Tue Nov 6 09:37:24 2012 -0800

Additions to the "wfd" tool to create a local wfd source.

Change-Id: I99558653a70fdc703f9d13990b3ce1c4d3ae227a

Change-Id: Ia94c63fc390f597014531073485f0cfc53b3418a
ifi-display/ANetworkSession.cpp
ifi-display/Android.mk
ifi-display/TimeSeries.cpp
ifi-display/TimeSeries.h
ifi-display/source/Converter.cpp
ifi-display/source/Converter.h
ifi-display/source/PlaybackSession.cpp
ifi-display/source/PlaybackSession.h
ifi-display/source/RepeaterSource.cpp
ifi-display/source/RepeaterSource.h
ifi-display/source/Sender.cpp
ifi-display/source/Sender.h
ifi-display/source/TSPacketizer.cpp
ifi-display/source/WifiDisplaySource.cpp
ifi-display/source/WifiDisplaySource.h
ifi-display/wfd.cpp
83c9bd167600b3ff77008a6c06c05bb1f189d4ca 12-Nov-2012 Andreas Huber <andih@google.com> Various improvements of wifi display code

- manually prepend SPS/PPS if encoder doesn't support it
- latency improvements
- support for "our" method of optional RTP retransmission
- improvements to the wfd commandline tool for testing
- make it easier to turn on/off suspension of the video pipeline on idle
- fixes an issue where an error during encryption would cause a SEGV
- add HDCP descriptor if necessary

Squashed commit of the following:

commit 1115be0ebb3b885b4f1b7dba56761ca013d0ec4a
Author: Andreas Huber <andih@google.com>
Date: Fri Nov 9 11:32:23 2012 -0800

Better shutdown of wfd -l sessions.

Change-Id: Id898a14ae21efd3b065b00a729830063d39195a7

commit 0e7d106dfe4eb6e2640b0b66c65deaba265f7ff0
Author: Andreas Huber <andih@google.com>
Date: Thu Nov 8 16:38:55 2012 -0800

No more sending delay, create rtp packets upfront.

Change-Id: I809a225f664fdb485c7d9a49a27886601a6a26b2

commit d399e8571b77353d59afb57508dfd2a82c1ef93a
Author: Andreas Huber <andih@google.com>
Date: Thu Nov 8 14:19:43 2012 -0800

Restore AudioSource buffer size, factor out TimeSeries, make

suspending video optional.

Change-Id: Ifdfe4d447b901e714abf52856b4641d1d55a5d41

commit f8b649f0b8f917d59f4b8a2e8e6d7db61a684a78
Author: Andreas Huber <andih@google.com>
Date: Thu Nov 8 09:34:06 2012 -0800

Pull 480 frames at a time from AudioSource/AudioRecord

Change-Id: I1e215abd329faec3da026631122c0f4c800c0ac4

commit 1bc13452eb35eebbba00f5da93fa86535be5db59
Author: Andreas Huber <andih@google.com>
Date: Thu Nov 8 08:50:30 2012 -0800

fixed bitrate traffic simulation

Change-Id: Ic5efb7cbb0b5d3b4917bc77b8ba73d447249e695

commit 016cdff18e74bdc631a5679e97192645ed095aa2
Author: Andreas Huber <andih@google.com>
Date: Wed Nov 7 14:00:03 2012 -0800

resurrected "our" style of retransmission.

Change-Id: I34d757aba67428437cb39b8293a9651750ad20d9

commit 384cf1a3c8fb4ec410bdf8fa5722c298e6028f3e
Author: Andreas Huber <andih@google.com>
Date: Tue Nov 6 09:38:55 2012 -0800

Changes to make wfd work on manta.

Change-Id: I7a4e00cf16581fe2146edd1b359af195774090e4

commit 9628f24b22b35f28630d99dda3614babf51bc07e
Author: Andreas Huber <andih@google.com>
Date: Wed Nov 7 09:15:44 2012 -0800

Patch up rtp timestamps to more accurately measure network jitter.

Change-Id: I9502a4615575f97f98a215a13131a89a6ae93c6d

commit 7c891a1a24f08bbd50f55be13f7d05f43e807eb8
Author: Andreas Huber <andih@google.com>
Date: Tue Nov 6 09:37:24 2012 -0800

Additions to the "wfd" tool to create a local wfd source.

Change-Id: I99558653a70fdc703f9d13990b3ce1c4d3ae227a

Change-Id: Ia94c63fc390f597014531073485f0cfc53b3418a
ifi-display/ANetworkSession.cpp
ifi-display/Android.mk
ifi-display/TimeSeries.cpp
ifi-display/TimeSeries.h
ifi-display/source/Converter.cpp
ifi-display/source/Converter.h
ifi-display/source/PlaybackSession.cpp
ifi-display/source/PlaybackSession.h
ifi-display/source/RepeaterSource.cpp
ifi-display/source/RepeaterSource.h
ifi-display/source/Sender.cpp
ifi-display/source/Sender.h
ifi-display/source/TSPacketizer.cpp
ifi-display/source/WifiDisplaySource.cpp
ifi-display/source/WifiDisplaySource.h
ifi-display/wfd.cpp
f4fca226d2cb08862d0faa4918e181b3e73f6a0c 08-Nov-2012 Marco Nelissen <marcone@google.com> Scan .awb files too

b/6122599

Change-Id: Ied3e0392939231447f1fc5685ca1fade1e55ce08
tagefrightMediaScanner.cpp
0332a0cfecd3f7a26dafd3c973a8bf4185fb85c8 08-Nov-2012 Marco Nelissen <marcone@google.com> Scan .awb files too

b/6122599

Change-Id: Ied3e0392939231447f1fc5685ca1fade1e55ce08
tagefrightMediaScanner.cpp
ad4e408b8ea397caadbfee85e1e39515e7e08104 26-Oct-2012 Glenn Kasten <gkasten@google.com> Turn off executable bit on ordinary files

Change-Id: I0abea25b58fb1d03975bed9cca40f826fcd4c5e4
ameraSource.cpp
PEG4Writer.cpp
MXCodec.cpp
kipCutBuffer.cpp
480421bb48af5df4f15498845447f3fde20a4069 26-Oct-2012 Glenn Kasten <gkasten@google.com> Turn off executable bit on ordinary files

Change-Id: I0abea25b58fb1d03975bed9cca40f826fcd4c5e4
ameraSource.cpp
PEG4Writer.cpp
MXCodec.cpp
kipCutBuffer.cpp
2e136686cd60556b681480079142142ab4a7e07c 02-Nov-2012 James Dong <jdong@google.com> Remove unused default parameter for copyBuffer()

Change-Id: I8002986ccb926165af393ca80cece60dee011204
nclude/FragmentedMP4Parser.h
p4/FragmentedMP4Parser.cpp
11ed78642e2caad1c8c6a524ce4589dfbdfbf824 02-Nov-2012 James Dong <jdong@google.com> Remove unused default parameter for copyBuffer()

Change-Id: I8002986ccb926165af393ca80cece60dee011204
nclude/FragmentedMP4Parser.h
p4/FragmentedMP4Parser.cpp
ea4d950e9d2cfbb06fde1ccb6ddada5adb0a726e 02-Nov-2012 Andreas Huber <andih@google.com> am d37ee8fb: am 96076964: Make video encoders\' bitrate mode (constant, variable, ...) configurable

* commit 'd37ee8fb36c972bf8d07868700a2c47358e25eb4':
Make video encoders' bitrate mode (constant, variable, ...) configurable
269019581b7bdd73f4c4e618a3a5bbc541058e72 02-Nov-2012 Andreas Huber <andih@google.com> am d37ee8fb: am 96076964: Make video encoders\' bitrate mode (constant, variable, ...) configurable

* commit 'd37ee8fb36c972bf8d07868700a2c47358e25eb4':
Make video encoders' bitrate mode (constant, variable, ...) configurable
d37ee8fb36c972bf8d07868700a2c47358e25eb4 02-Nov-2012 Andreas Huber <andih@google.com> am 96076964: Make video encoders\' bitrate mode (constant, variable, ...) configurable

* commit '96076964863ee6887f0bed9d0f11f424b48ab9b9':
Make video encoders' bitrate mode (constant, variable, ...) configurable
5520b9c29c3eba005fb5a5044cbf44687254965e 02-Nov-2012 Andreas Huber <andih@google.com> am 96076964: Make video encoders\' bitrate mode (constant, variable, ...) configurable

* commit '96076964863ee6887f0bed9d0f11f424b48ab9b9':
Make video encoders' bitrate mode (constant, variable, ...) configurable
96076964863ee6887f0bed9d0f11f424b48ab9b9 01-Nov-2012 Andreas Huber <andih@google.com> Make video encoders' bitrate mode (constant, variable, ...) configurable

through the desired output format. Configure the video encoder to use
constant bitrate mode for WFD.

Change-Id: Id7bd619598153c13448a9c5acd69d80f8a01f333
related-to-bug: 7459597
Codec.cpp
ifi-display/source/Converter.cpp
7b4262221c06951e9df75d5414c0a7daab365177 01-Nov-2012 Andreas Huber <andih@google.com> Make video encoders' bitrate mode (constant, variable, ...) configurable

through the desired output format. Configure the video encoder to use
constant bitrate mode for WFD.

Change-Id: Id7bd619598153c13448a9c5acd69d80f8a01f333
related-to-bug: 7459597
Codec.cpp
ifi-display/source/Converter.cpp
719ae96a5308273100a68d112f131c61f9b3db81 31-Oct-2012 Andreas Huber <andih@google.com> am 6776e7fe: am 90a92053: Various tweaks to wfd

* commit '6776e7fea5aa4ab045ac3f7303e3ba5d9bbce007':
Various tweaks to wfd
d8a71417484ed7d937ef612d6499704d0c325874 31-Oct-2012 Andreas Huber <andih@google.com> am 6776e7fe: am 90a92053: Various tweaks to wfd

* commit '6776e7fea5aa4ab045ac3f7303e3ba5d9bbce007':
Various tweaks to wfd
6776e7fea5aa4ab045ac3f7303e3ba5d9bbce007 31-Oct-2012 Andreas Huber <andih@google.com> am 90a92053: Various tweaks to wfd

* commit '90a92053219ae50ddf4bb54e3d54db2d309e2b8d':
Various tweaks to wfd
6a52c12da5dfe279fa6fb4a0a02db49a0dfbc1de 31-Oct-2012 Andreas Huber <andih@google.com> am 90a92053: Various tweaks to wfd

* commit '90a92053219ae50ddf4bb54e3d54db2d309e2b8d':
Various tweaks to wfd
90a92053219ae50ddf4bb54e3d54db2d309e2b8d 30-Oct-2012 Andreas Huber <andih@google.com> Various tweaks to wfd

related-to-bug: 7426218

Squashed commit of the following:

commit 1553f1a1c66af998674168f7f7a3be23fcb0c794
Author: Andreas Huber <andih@google.com>
Date: Tue Oct 30 15:51:27 2012 -0700

Add LPCM, AVC and AVC HRD descriptors as necessary.

Change-Id: Ibc836fced0fe37e8a25574c2295e886765b9ea6f

commit 4e74db61d2d31ebe239acbdec8f110f88016a4ea
Author: Andreas Huber <andih@google.com>
Date: Tue Oct 30 15:50:52 2012 -0700

added copyright headers to Sender.{cpp,h}

Change-Id: If615ccb8767e32bd83ed1f0f669acc39a72489f6

commit 7144bf8ae68c5cdb8faa6e219547aabbd750f04e
Author: Andreas Huber <andih@google.com>
Date: Tue Oct 30 15:50:25 2012 -0700

Reenable suspension of the RepeaterSource

Change-Id: I765338fcde89c65e4b69be45a5949eba6bcdcf6f

commit 812164bcfa0699821d7d8eefcc0dff96b2e2cd08
Author: Andreas Huber <andih@google.com>
Date: Tue Oct 30 14:03:50 2012 -0700

Add 2 stuffing bytes to the PES headers for audio tracks.

Change-Id: I8b9c634f6a565ab7fa7ecdb610f7d8557e0b139b

commit a084a741a63015d47c92d99fcd8b980fe615dc7d
Author: Andreas Huber <andih@google.com>
Date: Tue Oct 30 13:19:38 2012 -0700

Fix PCM audio packetization in WFD.

Change-Id: I99a435f9fe6b4397f24d6c22afae5ae2505ffc14

commit c5cb9369585f701f34bce41534940d5f9b59248f
Author: Andreas Huber <andih@google.com>
Date: Tue Oct 30 13:19:12 2012 -0700

Support extraction of PCM audio from transport streams.

Change-Id: I28a0516756ebcb5587325b6588df013ac871ffb9

commit b0a0512300ae037d6b39c2d04952d34b5fc12b2d
Author: Andreas Huber <andih@google.com>
Date: Tue Oct 30 08:54:13 2012 -0700

disable suspend of the RepeaterSource

Change-Id: Ibf42a98185b0567f817ae582a82e6580f95d3d40

commit 4330e8b7668dc92a6d882b5622c0697cf292d04c
Author: Andreas Huber <andih@google.com>
Date: Mon Oct 29 14:11:25 2012 -0700

Better handling of datagrams in ANetworkSession

reduce unnecessary copy overhead.

Change-Id: I2ed8c767274ba07764f03e8d4913041168e5755f

commit a44e73c322ba3f2c336f7cc4e1d63d3a74faa75d
Author: Andreas Huber <andih@google.com>
Date: Mon Oct 29 11:14:47 2012 -0700

Network traffic is now handled on a separate thread.

Audio and video are queued to ensure proper A/V interleaving.
Scheduled packet sends according to capture timestamps to reduce
send-jitter.

Change-Id: Ibd6357c1e663086cf87bec0a98f8e54dfdfaa0e5
related-to-bug: 7426218

Change-Id: Ia440129d656c35814abf18df06da50b73d5bb554
peg2ts/ATSParser.cpp
peg2ts/ATSParser.h
peg2ts/ESQueue.cpp
peg2ts/ESQueue.h
ifi-display/ANetworkSession.cpp
ifi-display/Android.mk
ifi-display/source/Converter.cpp
ifi-display/source/PlaybackSession.cpp
ifi-display/source/PlaybackSession.h
ifi-display/source/Sender.cpp
ifi-display/source/Sender.h
ifi-display/source/TSPacketizer.cpp
ifi-display/source/TSPacketizer.h
ifi-display/source/WifiDisplaySource.cpp
bd4e99c1636c75f6db0be70434b9f276bfecd96d 30-Oct-2012 Andreas Huber <andih@google.com> Various tweaks to wfd

related-to-bug: 7426218

Squashed commit of the following:

commit 1553f1a1c66af998674168f7f7a3be23fcb0c794
Author: Andreas Huber <andih@google.com>
Date: Tue Oct 30 15:51:27 2012 -0700

Add LPCM, AVC and AVC HRD descriptors as necessary.

Change-Id: Ibc836fced0fe37e8a25574c2295e886765b9ea6f

commit 4e74db61d2d31ebe239acbdec8f110f88016a4ea
Author: Andreas Huber <andih@google.com>
Date: Tue Oct 30 15:50:52 2012 -0700

added copyright headers to Sender.{cpp,h}

Change-Id: If615ccb8767e32bd83ed1f0f669acc39a72489f6

commit 7144bf8ae68c5cdb8faa6e219547aabbd750f04e
Author: Andreas Huber <andih@google.com>
Date: Tue Oct 30 15:50:25 2012 -0700

Reenable suspension of the RepeaterSource

Change-Id: I765338fcde89c65e4b69be45a5949eba6bcdcf6f

commit 812164bcfa0699821d7d8eefcc0dff96b2e2cd08
Author: Andreas Huber <andih@google.com>
Date: Tue Oct 30 14:03:50 2012 -0700

Add 2 stuffing bytes to the PES headers for audio tracks.

Change-Id: I8b9c634f6a565ab7fa7ecdb610f7d8557e0b139b

commit a084a741a63015d47c92d99fcd8b980fe615dc7d
Author: Andreas Huber <andih@google.com>
Date: Tue Oct 30 13:19:38 2012 -0700

Fix PCM audio packetization in WFD.

Change-Id: I99a435f9fe6b4397f24d6c22afae5ae2505ffc14

commit c5cb9369585f701f34bce41534940d5f9b59248f
Author: Andreas Huber <andih@google.com>
Date: Tue Oct 30 13:19:12 2012 -0700

Support extraction of PCM audio from transport streams.

Change-Id: I28a0516756ebcb5587325b6588df013ac871ffb9

commit b0a0512300ae037d6b39c2d04952d34b5fc12b2d
Author: Andreas Huber <andih@google.com>
Date: Tue Oct 30 08:54:13 2012 -0700

disable suspend of the RepeaterSource

Change-Id: Ibf42a98185b0567f817ae582a82e6580f95d3d40

commit 4330e8b7668dc92a6d882b5622c0697cf292d04c
Author: Andreas Huber <andih@google.com>
Date: Mon Oct 29 14:11:25 2012 -0700

Better handling of datagrams in ANetworkSession

reduce unnecessary copy overhead.

Change-Id: I2ed8c767274ba07764f03e8d4913041168e5755f

commit a44e73c322ba3f2c336f7cc4e1d63d3a74faa75d
Author: Andreas Huber <andih@google.com>
Date: Mon Oct 29 11:14:47 2012 -0700

Network traffic is now handled on a separate thread.

Audio and video are queued to ensure proper A/V interleaving.
Scheduled packet sends according to capture timestamps to reduce
send-jitter.

Change-Id: Ibd6357c1e663086cf87bec0a98f8e54dfdfaa0e5
related-to-bug: 7426218

Change-Id: Ia440129d656c35814abf18df06da50b73d5bb554
peg2ts/ATSParser.cpp
peg2ts/ATSParser.h
peg2ts/ESQueue.cpp
peg2ts/ESQueue.h
ifi-display/ANetworkSession.cpp
ifi-display/Android.mk
ifi-display/source/Converter.cpp
ifi-display/source/PlaybackSession.cpp
ifi-display/source/PlaybackSession.h
ifi-display/source/Sender.cpp
ifi-display/source/Sender.h
ifi-display/source/TSPacketizer.cpp
ifi-display/source/TSPacketizer.h
ifi-display/source/WifiDisplaySource.cpp
c41590251aa84c078c942d258e838aad814b73a5 30-Oct-2012 Glenn Kasten <gkasten@google.com> Remove obsolete references to libmedia_native

Bug: 6654403
Change-Id: I3993d62987cf0dd85db10bf002a5cce53d4f01bd
ndroid.mk
faa4420344216ccbad15a49aa7c1cd6141532fcb 30-Oct-2012 Glenn Kasten <gkasten@google.com> Remove obsolete references to libmedia_native

Bug: 6654403
Change-Id: I3993d62987cf0dd85db10bf002a5cce53d4f01bd
ndroid.mk
24cde8216d5aba49104967e97807ce2ff114bf70 30-Oct-2012 Dave Burke <daveburke@google.com> am dd4e72b4: am 2295ce2c: Increase bitrate now that other issues have been resolved.

* commit 'dd4e72b44ddb7a1591bd2f81c46d20bb0939e9eb':
Increase bitrate now that other issues have been resolved.
77cde32568950c2f88e4838c71ab71947454623d 30-Oct-2012 Dave Burke <daveburke@google.com> am dd4e72b4: am 2295ce2c: Increase bitrate now that other issues have been resolved.

* commit 'dd4e72b44ddb7a1591bd2f81c46d20bb0939e9eb':
Increase bitrate now that other issues have been resolved.
83ca157a13d683eb151b543147fc5b9fd186d5df 30-Oct-2012 Dave Burke <daveburke@google.com> am dd974cc4: am e815552c: Disable silence suppression (causes issues with dongles).

* commit 'dd974cc4f335b30731c452885bff3c396ed54724':
Disable silence suppression (causes issues with dongles).
6677b65cb63f3126a34acd6c767261e1a2c1e4ac 30-Oct-2012 Dave Burke <daveburke@google.com> am dd974cc4: am e815552c: Disable silence suppression (causes issues with dongles).

* commit 'dd974cc4f335b30731c452885bff3c396ed54724':
Disable silence suppression (causes issues with dongles).
fd88f86ec6788170fb4d903c1b0932a18ce1197c 30-Oct-2012 Johann <johannkoenig@google.com> Match new paths and organization in external/libvpx

See I739f99d48b8d7e6354c416ef2ca79c954826307f

Change-Id: I42b51e2845a696a6e211dde00951afc8f571336f
ndroid.mk
odecs/on2/dec/Android.mk
atroska/Android.mk
0b95d8a547316997b5e280f7acb1df362f3e820b 30-Oct-2012 Johann <johannkoenig@google.com> Match new paths and organization in external/libvpx

See I739f99d48b8d7e6354c416ef2ca79c954826307f

Change-Id: I42b51e2845a696a6e211dde00951afc8f571336f
ndroid.mk
odecs/on2/dec/Android.mk
atroska/Android.mk
dd4e72b44ddb7a1591bd2f81c46d20bb0939e9eb 29-Oct-2012 Dave Burke <daveburke@google.com> am 2295ce2c: Increase bitrate now that other issues have been resolved.

* commit '2295ce2c6fcf07ffaa134440691a8cea5fe35b43':
Increase bitrate now that other issues have been resolved.
ec12d75df6464637ee0d8a004745080f21a57d74 29-Oct-2012 Dave Burke <daveburke@google.com> am 2295ce2c: Increase bitrate now that other issues have been resolved.

* commit '2295ce2c6fcf07ffaa134440691a8cea5fe35b43':
Increase bitrate now that other issues have been resolved.
dd974cc4f335b30731c452885bff3c396ed54724 29-Oct-2012 Dave Burke <daveburke@google.com> am e815552c: Disable silence suppression (causes issues with dongles).

* commit 'e815552c9cb17be79cb3b7eb6fbdfa9ad81c861b':
Disable silence suppression (causes issues with dongles).
ab76ae4a3842ecf5767517c2ffc99ea1c800708c 29-Oct-2012 Dave Burke <daveburke@google.com> am e815552c: Disable silence suppression (causes issues with dongles).

* commit 'e815552c9cb17be79cb3b7eb6fbdfa9ad81c861b':
Disable silence suppression (causes issues with dongles).
2295ce2c6fcf07ffaa134440691a8cea5fe35b43 27-Oct-2012 Dave Burke <daveburke@google.com> Increase bitrate now that other issues have been resolved.

Bug: 7426218
Change-Id: I67dfa1e4b85f326f355ad0ec5b6c699e87b45564
ifi-display/source/Converter.cpp
cc37e71d7843815899a75876c5ff2a9ce776bdd6 27-Oct-2012 Dave Burke <daveburke@google.com> Increase bitrate now that other issues have been resolved.

Bug: 7426218
Change-Id: I67dfa1e4b85f326f355ad0ec5b6c699e87b45564
ifi-display/source/Converter.cpp
e815552c9cb17be79cb3b7eb6fbdfa9ad81c861b 27-Oct-2012 Dave Burke <daveburke@google.com> Disable silence suppression (causes issues with dongles).

Bug: 7426218
Change-Id: Ie1517a8017bae1f9a9b6c224cd3170dfcc5fb941
ifi-display/source/Converter.h
40017a30d11bc3c9d154e88d0c07ead1f2b51599 27-Oct-2012 Dave Burke <daveburke@google.com> Disable silence suppression (causes issues with dongles).

Bug: 7426218
Change-Id: Ie1517a8017bae1f9a9b6c224cd3170dfcc5fb941
ifi-display/source/Converter.h
a15ed9529e70caaf42aae78f9fe530abe38bcc1b 24-Oct-2012 Marco Nelissen <marcone@google.com> Make ThrottledSource more usable

Add reconnectAtOffset(), DrmInitialization() and getDrmInfo().
Also rearrange the code a bit so all the methods that just call through
to the wrapped DataSource are in the header.

Change-Id: If25b674df317b0f6da5d36241c694e32abb0a01c
hrottledSource.cpp
nclude/ThrottledSource.h
f76ca8f6aaa56146b388239c034bd53f19b9abf2 24-Oct-2012 Marco Nelissen <marcone@google.com> Make ThrottledSource more usable

Add reconnectAtOffset(), DrmInitialization() and getDrmInfo().
Also rearrange the code a bit so all the methods that just call through
to the wrapped DataSource are in the header.

Change-Id: If25b674df317b0f6da5d36241c694e32abb0a01c
hrottledSource.cpp
nclude/ThrottledSource.h
e3e639b1714d35628f9b75276839ad55d8afc74c 24-Oct-2012 Andreas Huber <andih@google.com> am ac1a450a: Merge "Don\'t attempt to seek audio and video separately." into jb-mr1-dev

* commit 'ac1a450a76c2f42f66c876200cb724d1e93ef4c7':
Don't attempt to seek audio and video separately.
add3dfc488c8f21cd7a9c95cefeb1d2937d07e51 24-Oct-2012 Andreas Huber <andih@google.com> am ac1a450a: Merge "Don\'t attempt to seek audio and video separately." into jb-mr1-dev

* commit 'ac1a450a76c2f42f66c876200cb724d1e93ef4c7':
Don't attempt to seek audio and video separately.
14744c076e2e361f049e8c3c43cef502ba3fcbd5 23-Oct-2012 Andreas Huber <andih@google.com> Don't attempt to seek audio and video separately.

The widevine extractor doesn't deal too well with that...

Change-Id: Iadfeede4fe0c086af788c5639782854e4fbb98ff
related-to-bug: 7262386
wesomePlayer.cpp
0fc13f2d10035f0bf8505d4fb4edb1bcc5ac34ea 23-Oct-2012 Andreas Huber <andih@google.com> Don't attempt to seek audio and video separately.

The widevine extractor doesn't deal too well with that...

Change-Id: Iadfeede4fe0c086af788c5639782854e4fbb98ff
related-to-bug: 7262386
wesomePlayer.cpp
dc5f12a217279d60444fc7243fe89ba4311eea88 22-Oct-2012 Andreas Huber <andih@google.com> am 0328ec08: WFD use of HDCP is now optional.

* commit '0328ec08dc1e90caa2a9e0c4e107d8ddaa74af20':
WFD use of HDCP is now optional.
81bb3a5d3aeda1e79163c0cd1cb391b083a114a5 22-Oct-2012 Andreas Huber <andih@google.com> am 0328ec08: WFD use of HDCP is now optional.

* commit '0328ec08dc1e90caa2a9e0c4e107d8ddaa74af20':
WFD use of HDCP is now optional.
0328ec08dc1e90caa2a9e0c4e107d8ddaa74af20 22-Oct-2012 Andreas Huber <andih@google.com> WFD use of HDCP is now optional.

if the sink supports it we'll use HDCP (and fail if necessary), if it doesn't
we won't. If an HDCP session is established we'll tell our observer that
the connection is secure, otherwise we don't.

Change-Id: I7cbef384f2cf0a6ac65801c581eea227b9ef4c46
related-to-bug: 7368436
ifi-display/source/WifiDisplaySource.cpp
ifi-display/source/WifiDisplaySource.h
fe0847ac6ee16409ec1d27520fa28dd9232dddd0 22-Oct-2012 Andreas Huber <andih@google.com> WFD use of HDCP is now optional.

if the sink supports it we'll use HDCP (and fail if necessary), if it doesn't
we won't. If an HDCP session is established we'll tell our observer that
the connection is secure, otherwise we don't.

Change-Id: I7cbef384f2cf0a6ac65801c581eea227b9ef4c46
related-to-bug: 7368436
ifi-display/source/WifiDisplaySource.cpp
ifi-display/source/WifiDisplaySource.h
ad99e748ae97be7b0f769e1895ca7f69da6c9df8 20-Oct-2012 Jean-Michel Trivi <jmtrivi@google.com> am c3ed4a1c: Merge "AAC DRC reference level for mobile is -16dB" into jb-mr1-dev

* commit 'c3ed4a1c3ea71681c71de48c206a899e702864bd':
AAC DRC reference level for mobile is -16dB
d483b1c83b7630eb28299c37e92aeade104f6bd8 20-Oct-2012 Jean-Michel Trivi <jmtrivi@google.com> am c3ed4a1c: Merge "AAC DRC reference level for mobile is -16dB" into jb-mr1-dev

* commit 'c3ed4a1c3ea71681c71de48c206a899e702864bd':
AAC DRC reference level for mobile is -16dB
347f35436be724a64272c41e6325f03fe6b9d43a 19-Oct-2012 Jean-Michel Trivi <jmtrivi@google.com> AAC DRC reference level for mobile is -16dB

Use -16dB as the default DRC reference level when decoding streams
with DRC metadata.

Bug 7370764

Change-Id: I900cee22f32384a5657fb041b69d42657bcddf09
odecs/aacdec/SoftAAC2.cpp
cc694bc0d0ff77aa7b28cd814668ac6983da368c 19-Oct-2012 Jean-Michel Trivi <jmtrivi@google.com> AAC DRC reference level for mobile is -16dB

Use -16dB as the default DRC reference level when decoding streams
with DRC metadata.

Bug 7370764

Change-Id: I900cee22f32384a5657fb041b69d42657bcddf09
odecs/aacdec/SoftAAC2.cpp
4ad27b11f8c883a3131d1f81d883de01b8076be1 19-Oct-2012 Nick Kralevich <nnk@google.com> am 1baa01a5: Merge "hardening: eliminate more .text relocations"

* commit '1baa01a52f24566c134313fade8b19a582654638':
hardening: eliminate more .text relocations
fec5b1333ab756f73677acf42ddd7b71cdbfafae 19-Oct-2012 Nick Kralevich <nnk@google.com> am 1baa01a5: Merge "hardening: eliminate more .text relocations"

* commit '1baa01a52f24566c134313fade8b19a582654638':
hardening: eliminate more .text relocations
c40e9b86092e67f245ba8f05244f578b26e49fe2 19-Oct-2012 Nick Kralevich <nnk@google.com> hardening: eliminate more .text relocations

In 74bc3e133bd59a65dbed70b5fc89549f04a545e2, a bunch of text relocations
were cleaned up from amrwbenc. Looks like we forgot one. Fixed.

Change-Id: I80d4c68be435c3461731374d2b6d3bdbd61354a5
odecs/amrwbenc/src/asm/ARMV5E/pred_lt4_1_opt.s
5ee3350785f2821a1b5aad92824ea6b380f61ece 18-Oct-2012 James Dong <jdong@google.com> am ccd08439: Added some extra failure logging messages

* commit 'ccd08439c7914d86264c7ad81bfd03cf39aaa9f7':
Added some extra failure logging messages
fdffbc69ce830b57e88cb1277cf77c0eb4a6152f 18-Oct-2012 James Dong <jdong@google.com> am ccd08439: Added some extra failure logging messages

* commit 'ccd08439c7914d86264c7ad81bfd03cf39aaa9f7':
Added some extra failure logging messages
ccd08439c7914d86264c7ad81bfd03cf39aaa9f7 17-Oct-2012 James Dong <jdong@google.com> Added some extra failure logging messages

o related-to-bug: 7282066

Change-Id: I0896551a45aab61fb571fef19061397ff84321d9
wesomePlayer.cpp
MXCodec.cpp
569661450b446f957f58b6690bff30f94542b737 17-Oct-2012 James Dong <jdong@google.com> Added some extra failure logging messages

o related-to-bug: 7282066

Change-Id: I0896551a45aab61fb571fef19061397ff84321d9
wesomePlayer.cpp
MXCodec.cpp
cd91d915dcaa11a4a6136c2554c3af73ea881573 13-Oct-2012 Glenn Kasten <gkasten@google.com> Fix log spam: Failed to open libwvm.so

Bug: 7342813
Change-Id: I98852f036e4679a653723fc2bf1435d6e9d7d34c
VMExtractor.cpp
75e351348e11f75b3db6b6ab388cc31d5702ea2e 13-Oct-2012 Glenn Kasten <gkasten@google.com> Fix log spam: Failed to open libwvm.so

Bug: 7342813
Change-Id: I98852f036e4679a653723fc2bf1435d6e9d7d34c
VMExtractor.cpp
d243c04534d1b74bd66625c5c96a9b918d8838bf 10-Oct-2012 Andreas Huber <andih@google.com> Switch audio mode based on dongle's capabilities

properly parse rtp port and use it to setup session.

Change-Id: Ic7521cb867143278196c3ce4b19a74ecc2703d8e
related-to-bug: 7318719
ifi-display/source/WifiDisplaySource.cpp
ifi-display/source/WifiDisplaySource.h
1fdfd0186f1cf959fb8bec03b4d426b8879ed4fd 10-Oct-2012 Andreas Huber <andih@google.com> Switch audio mode based on dongle's capabilities

properly parse rtp port and use it to setup session.

Change-Id: Ic7521cb867143278196c3ce4b19a74ecc2703d8e
related-to-bug: 7318719
ifi-display/source/WifiDisplaySource.cpp
ifi-display/source/WifiDisplaySource.h
e7bd24af08ef0722fb124a550662bcec48c56f86 04-Oct-2012 Andreas Huber <andih@google.com> Optionally emit LPCM audio instead of using AAC in wifi display code

related-to-bug: 7248248

May decrease power usage at the cost of significantly increasing audio bitrate.

Use "adb shell setprop media.wfd.use-pcm-audio true"

to turn it on (must be done before connecting).

Change-Id: I7ebeadf3209e01522a2644948287b23d7c383c7e
ifi-display/source/Converter.cpp
ifi-display/source/Converter.h
ifi-display/source/PlaybackSession.cpp
ifi-display/source/PlaybackSession.h
ifi-display/source/TSPacketizer.cpp
ifi-display/source/WifiDisplaySource.cpp
ifi-display/source/WifiDisplaySource.h
20a5a98667df7ed83e5d9f37e88b1bbdb876d718 04-Oct-2012 Andreas Huber <andih@google.com> Optionally emit LPCM audio instead of using AAC in wifi display code

related-to-bug: 7248248

May decrease power usage at the cost of significantly increasing audio bitrate.

Use "adb shell setprop media.wfd.use-pcm-audio true"

to turn it on (must be done before connecting).

Change-Id: I7ebeadf3209e01522a2644948287b23d7c383c7e
ifi-display/source/Converter.cpp
ifi-display/source/Converter.h
ifi-display/source/PlaybackSession.cpp
ifi-display/source/PlaybackSession.h
ifi-display/source/TSPacketizer.cpp
ifi-display/source/WifiDisplaySource.cpp
ifi-display/source/WifiDisplaySource.h
d69fd4d2567f9fce02252ce10d7ae3a28fc79e04 04-Oct-2012 James Dong <jdong@google.com> Merge "Enable hdcp for WiFi display" into jb-mr1-dev
95f24dacbde69295fd21bbf683281b277e097bb1 04-Oct-2012 James Dong <jdong@google.com> Merge "Enable hdcp for WiFi display" into jb-mr1-dev
16c090555adf9f37bad0f061fd2651b91a34ae41 03-Oct-2012 James Dong <jdong@google.com> Enable hdcp for WiFi display

o related-to-bug: 7055369

Change-Id: Ie1ddd1e961f9ff60fe32b57cf7f8de4f4ecf5aa0
ifi-display/source/WifiDisplaySource.h
b30d9daef40ac803cfaa4d0a94fa8dc84928c738 03-Oct-2012 James Dong <jdong@google.com> Enable hdcp for WiFi display

o related-to-bug: 7055369

Change-Id: Ie1ddd1e961f9ff60fe32b57cf7f8de4f4ecf5aa0
ifi-display/source/WifiDisplaySource.h
9f71aed36f7bb58fd8b077a5c6e414fc4af1805c 03-Oct-2012 Dave Burke <daveburke@google.com> Drop video bitrate to 2.5mbps.

We have too much corruption/loss at higher bitrates. Reviewed quality
trade-off with jdong@. We can increase in the future if we have a
better packet loss concealment solution.

Bug: 7241844
Change-Id: I3b500a9c3a4429e834fb4c5ca04164d4e106fa9e
ifi-display/source/Converter.cpp
f7565f207a9d1d8fa157c0178b93bad84925440d 03-Oct-2012 Dave Burke <daveburke@google.com> Drop video bitrate to 2.5mbps.

We have too much corruption/loss at higher bitrates. Reviewed quality
trade-off with jdong@. We can increase in the future if we have a
better packet loss concealment solution.

Bug: 7241844
Change-Id: I3b500a9c3a4429e834fb4c5ca04164d4e106fa9e
ifi-display/source/Converter.cpp
4401091bc89fc69b7fc7df58cf6b403776f2698a 03-Oct-2012 Andreas Huber <andih@google.com> Merge "Better power savings with wifi display code." into jb-mr1-dev
f9736ae9642e2b86e7d0d118ad6080e75144a1f0 03-Oct-2012 Andreas Huber <andih@google.com> Merge "Better power savings with wifi display code." into jb-mr1-dev
575a5361fc970476cd7979638ee3ac00cc6e5024 03-Oct-2012 Andreas Huber <andih@google.com> Better power savings with wifi display code.

No more polling the encoder for work to do, the encoder instead notifies
if there's activity.

Change-Id: Ia707211b4f5c5a6e6b70d750233d204a2d6bb778
related-to-bug: 7248248
ediaCodec.cpp
ifi-display/source/Converter.cpp
ifi-display/source/Converter.h
72c6686ad04feb976ea3d2f816c784e485b55506 03-Oct-2012 Andreas Huber <andih@google.com> Better power savings with wifi display code.

No more polling the encoder for work to do, the encoder instead notifies
if there's activity.

Change-Id: Ia707211b4f5c5a6e6b70d750233d204a2d6bb778
related-to-bug: 7248248
ediaCodec.cpp
ifi-display/source/Converter.cpp
ifi-display/source/Converter.h
3a555c19dbd6ae7bf0d63cb9879befb22773770d 03-Oct-2012 Andreas Huber <andih@google.com> Merge "Increase polling frequency again temporarily to fix A/V issues" into jb-mr1-dev
aa3fbc5c3892b8aeee33c45b70e4d5a93d171fa5 03-Oct-2012 Andreas Huber <andih@google.com> Merge "Increase polling frequency again temporarily to fix A/V issues" into jb-mr1-dev
8d16bbc5a354d302abfd912b8d88d9c7feb3948f 03-Oct-2012 Andreas Huber <andih@google.com> Increase polling frequency again temporarily to fix A/V issues

Fixes a bug in the silence detection and increases the timeout after which
we enter "silent mode" to 10 secs.

Change-Id: I802b058f054becd5c377186664437f7b3970193f
related-to-bug: 7248248
ifi-display/source/Converter.cpp
ifi-display/source/PlaybackSession.cpp
4a114f03a79e157cab9396f986ef947df2255f1d 03-Oct-2012 Andreas Huber <andih@google.com> Increase polling frequency again temporarily to fix A/V issues

Fixes a bug in the silence detection and increases the timeout after which
we enter "silent mode" to 10 secs.

Change-Id: I802b058f054becd5c377186664437f7b3970193f
related-to-bug: 7248248
ifi-display/source/Converter.cpp
ifi-display/source/PlaybackSession.cpp
2808b5902a4dd70be231fcb2e3131eb1944807da 03-Oct-2012 Jean-Michel Trivi <jmtrivi@google.com> Merge "Bug 7170947 Configure AAC decoder for mobile DRC settings" into jb-mr1-dev
3b941378f4bf8b6e5206ef6859df429397f4338c 03-Oct-2012 Jean-Michel Trivi <jmtrivi@google.com> Merge "Bug 7170947 Configure AAC decoder for mobile DRC settings" into jb-mr1-dev
4213e9db1cc57ab593bb63432b4e0cf477c3f835 02-Oct-2012 Jean-Michel Trivi <jmtrivi@google.com> Bug 7170947 Configure AAC decoder for mobile DRC settings

Configure the AAC decoder to use the modile DRC settings when
decoding streams with DRC metadata.
Settings are:
- target reference level of -12dB
- DRC compression factor (attenuation) at max
These settings can be overridden by platform properties if the
default values are to be modified.

Change-Id: If329fe566497685b735abe4e4b9a5e01697c063b
odecs/aacdec/SoftAAC2.cpp
5a755c3856ca1f5b4c6b36810d51ca574947b8ae 02-Oct-2012 Jean-Michel Trivi <jmtrivi@google.com> Bug 7170947 Configure AAC decoder for mobile DRC settings

Configure the AAC decoder to use the modile DRC settings when
decoding streams with DRC metadata.
Settings are:
- target reference level of -12dB
- DRC compression factor (attenuation) at max
These settings can be overridden by platform properties if the
default values are to be modified.

Change-Id: If329fe566497685b735abe4e4b9a5e01697c063b
odecs/aacdec/SoftAAC2.cpp
47aa9c47a0796bb695d09aa307b2d1c2c913f0eb 02-Oct-2012 Andreas Huber <andih@google.com> Merge "Enable silence detection and don't driver the audio encoder" into jb-mr1-dev
e3451c7ee7cf643495357f212f2fb55a617412a1 02-Oct-2012 Andreas Huber <andih@google.com> Merge "Enable silence detection and don't driver the audio encoder" into jb-mr1-dev
805b3ae300ea414ce5973e60a9b544169da0ac44 02-Oct-2012 Andreas Huber <andih@google.com> Merge "Now back to 30fps, suspend updates if surface flinger didn't send us" into jb-mr1-dev
c38d6d4ec4ae280192b854719fa247760c457b2e 02-Oct-2012 Andreas Huber <andih@google.com> Merge "Now back to 30fps, suspend updates if surface flinger didn't send us" into jb-mr1-dev
f5aa7aa94465e774ccdb07039690a5f42de1518a 02-Oct-2012 Andreas Huber <andih@google.com> Merge "More power savings: No need to keep a history of outgoing packets" into jb-mr1-dev
32cad8553a67a6248c393139480de2654c82f127 02-Oct-2012 Andreas Huber <andih@google.com> Merge "More power savings: No need to keep a history of outgoing packets" into jb-mr1-dev
16461dca0ba8ac1850463db6245d20dc1699279d 02-Oct-2012 Andreas Huber <andih@google.com> Merge "Increase converter polling interval." into jb-mr1-dev
37bc4b68395471acbf8461e8638792b469d8d2c7 02-Oct-2012 Andreas Huber <andih@google.com> Merge "Increase converter polling interval." into jb-mr1-dev
f1b9504587b04d8a7067aca90b1f0575ccf74bb9 02-Oct-2012 Andreas Huber <andih@google.com> Merge "Take advantage of the hardware encoder's ability to prepend SPS/PPS" into jb-mr1-dev
a9de397e8e57f5ce734c88dea5465b1ab205ad27 02-Oct-2012 Andreas Huber <andih@google.com> Merge "Take advantage of the hardware encoder's ability to prepend SPS/PPS" into jb-mr1-dev
cf2604f8940093e249ed7e5382c12ba544a48545 02-Oct-2012 Andreas Huber <andih@google.com> Enable silence detection and don't driver the audio encoder

or send any audio out over the network if we've seen at least one second
of silence.

Change-Id: Ic2bca4ce7d55bd246283dc669f5f5cb6106d88ea
related-to-bug: 7248248
ifi-display/source/Converter.cpp
ifi-display/source/Converter.h
07fbf9458a9a6a5b644e7d02f7e59c7b75218d0c 02-Oct-2012 Andreas Huber <andih@google.com> Enable silence detection and don't driver the audio encoder

or send any audio out over the network if we've seen at least one second
of silence.

Change-Id: Ic2bca4ce7d55bd246283dc669f5f5cb6106d88ea
related-to-bug: 7248248
ifi-display/source/Converter.cpp
ifi-display/source/Converter.h
4a8b9a2363b7b7b4f98022e6d9aae8b8aa8e35e5 02-Oct-2012 Andreas Huber <andih@google.com> Now back to 30fps, suspend updates if surface flinger didn't send us

any new frames for one second or longer.

Change-Id: I1c2ec349b0a4b7c4eb9dcdde483362ec87dd69fa
related-to-bug: 7248248
ifi-display/source/Converter.cpp
ifi-display/source/PlaybackSession.cpp
ifi-display/source/PlaybackSession.h
ifi-display/source/RepeaterSource.cpp
ifi-display/source/RepeaterSource.h
ifi-display/source/WifiDisplaySource.cpp
77c887a262840d5dc013b7abb838696eb5cb5ee7 02-Oct-2012 Andreas Huber <andih@google.com> Now back to 30fps, suspend updates if surface flinger didn't send us

any new frames for one second or longer.

Change-Id: I1c2ec349b0a4b7c4eb9dcdde483362ec87dd69fa
related-to-bug: 7248248
ifi-display/source/Converter.cpp
ifi-display/source/PlaybackSession.cpp
ifi-display/source/PlaybackSession.h
ifi-display/source/RepeaterSource.cpp
ifi-display/source/RepeaterSource.h
ifi-display/source/WifiDisplaySource.cpp
887070dbe6b6258ba04f988fd90c3ac856d2e5bf 02-Oct-2012 Andreas Huber <andih@google.com> More power savings: No need to keep a history of outgoing packets

if we're not enabling retransmission anyway.

Change-Id: I361120607974a2fab758c28b5033716213aef88e
related-to-bug: 7248248
ifi-display/source/PlaybackSession.cpp
ifi-display/source/PlaybackSession.h
aa8ff19e822a93c319951ab1be5a14aed62764bd 02-Oct-2012 Andreas Huber <andih@google.com> More power savings: No need to keep a history of outgoing packets

if we're not enabling retransmission anyway.

Change-Id: I361120607974a2fab758c28b5033716213aef88e
related-to-bug: 7248248
ifi-display/source/PlaybackSession.cpp
ifi-display/source/PlaybackSession.h
0389cc09f7b90f155a8942a0d2e1925cad1dbe2d 02-Oct-2012 Marco Nelissen <marcone@google.com> Fix video continuity

Fixes "pixelation" seen after seeking in Netflix.
b/7211673

Change-Id: Id675acaef1e5fd7151fdfa7bd79e2f25990e1ecd
peg2ts/ATSParser.cpp
5c21fc11f1fbc1b08f1a0638f9a23e54129bc75b 02-Oct-2012 Marco Nelissen <marcone@google.com> Fix video continuity

Fixes "pixelation" seen after seeking in Netflix.
b/7211673

Change-Id: Id675acaef1e5fd7151fdfa7bd79e2f25990e1ecd
peg2ts/ATSParser.cpp
21daec5798f7e13c5ab6b513d27b3f79d4779bca 02-Oct-2012 Andreas Huber <andih@google.com> Increase converter polling interval.

Change-Id: I455005086a63c70883a71e189753a117b195f22f
related-to-bug: 7248248
ifi-display/source/Converter.cpp
75561ed3ff3811f6a9ed33366b8f2596519e9368 02-Oct-2012 Andreas Huber <andih@google.com> Increase converter polling interval.

Change-Id: I455005086a63c70883a71e189753a117b195f22f
related-to-bug: 7248248
ifi-display/source/Converter.cpp
c6920dfdca378a168a2168f4a64d21af4d37d539 02-Oct-2012 Andreas Huber <andih@google.com> Take advantage of the hardware encoder's ability to prepend SPS/PPS

to IDR frames instead of doing it manually.

Change-Id: I994cfbd6539013406dd610393ba1f0b9a0dbf4d5
related-to-bug: 7245308
ifi-display/source/Converter.cpp
ifi-display/source/PlaybackSession.cpp
ifi-display/source/PlaybackSession.h
ifi-display/source/TSPacketizer.cpp
ifi-display/source/TSPacketizer.h
e2858e83692e9a208d134798b4f8735795c7145c 02-Oct-2012 Andreas Huber <andih@google.com> Take advantage of the hardware encoder's ability to prepend SPS/PPS

to IDR frames instead of doing it manually.

Change-Id: I994cfbd6539013406dd610393ba1f0b9a0dbf4d5
related-to-bug: 7245308
ifi-display/source/Converter.cpp
ifi-display/source/PlaybackSession.cpp
ifi-display/source/PlaybackSession.h
ifi-display/source/TSPacketizer.cpp
ifi-display/source/TSPacketizer.h
bd710197a47e3772763c48bfb5d6be21df173a7f 02-Oct-2012 Jeff Tinker <jtinker@google.com> Merge "[WVDRM] Fix for stuttering on low bandwidth" into jb-mr1-dev
b6e88c841f3e76d3fbc206c6fff0edac8cafb363 02-Oct-2012 Jeff Tinker <jtinker@google.com> Merge "[WVDRM] Fix for stuttering on low bandwidth" into jb-mr1-dev
ee178668818eb4f43ff40735405f8fc42372620f 02-Oct-2012 Andreas Huber <andih@google.com> Use incremental updates sent by surface flinger

instead of running at a fixed framerate.

Change-Id: Ia3f36aa449e2e952bf3263ffbb709a9b79b09c26
related-to-bug: 7266398
ifi-display/source/Converter.cpp
ifi-display/source/PlaybackSession.cpp
ifi-display/source/WifiDisplaySource.cpp
f79023998f731419b48eae64c3b10dfaa166dd2d 02-Oct-2012 Andreas Huber <andih@google.com> Use incremental updates sent by surface flinger

instead of running at a fixed framerate.

Change-Id: Ia3f36aa449e2e952bf3263ffbb709a9b79b09c26
related-to-bug: 7266398
ifi-display/source/Converter.cpp
ifi-display/source/PlaybackSession.cpp
ifi-display/source/WifiDisplaySource.cpp
1c730d33da2fa861000b3990b5e6c9ff69291387 02-Oct-2012 Andreas Huber <andih@google.com> Merge "ALooper::GetNowUs() now relies on systemTime instead of gettimeofday." into jb-mr1-dev
b72d42c715b4446b8fb87d97cbcc5a6441d7a539 02-Oct-2012 Andreas Huber <andih@google.com> Merge "ALooper::GetNowUs() now relies on systemTime instead of gettimeofday." into jb-mr1-dev
1a0d1670b4304f294530f4ca9ce68defad6445dc 02-Oct-2012 Andreas Huber <andih@google.com> Merge "Optionally have SurfaceMediaSource return absolute timestamps" into jb-mr1-dev
1ba73d32fab532facafa867a3466fbaa763972dd 02-Oct-2012 Andreas Huber <andih@google.com> Merge "Optionally have SurfaceMediaSource return absolute timestamps" into jb-mr1-dev
af5dd7753e62353411cf0daf3b513c38818e9662 02-Oct-2012 Andreas Huber <andih@google.com> ALooper::GetNowUs() now relies on systemTime instead of gettimeofday.

Change-Id: Ia31eb0940b02581327a8bf51af6df135f9ab6de3
related-to-bug: 7266324
udioSource.cpp
hrottledSource.cpp
imeSource.cpp
imedEventQueue.cpp
oundation/ALooper.cpp
mx/tests/OMXHarness.cpp
tsp/ARTPAssembler.cpp
ifi-display/source/MediaPuller.cpp
ifi-display/source/PlaybackSession.cpp
fa0e033ab5a0ab5d96e90c9f6d4d53bedc74514b 02-Oct-2012 Andreas Huber <andih@google.com> ALooper::GetNowUs() now relies on systemTime instead of gettimeofday.

Change-Id: Ia31eb0940b02581327a8bf51af6df135f9ab6de3
related-to-bug: 7266324
udioSource.cpp
hrottledSource.cpp
imeSource.cpp
imedEventQueue.cpp
oundation/ALooper.cpp
mx/tests/OMXHarness.cpp
tsp/ARTPAssembler.cpp
ifi-display/source/MediaPuller.cpp
ifi-display/source/PlaybackSession.cpp
0868deae404604b577892413c128d55a2bafc56e 02-Oct-2012 Andreas Huber <andih@google.com> Optionally have SurfaceMediaSource return absolute timestamps

based on systemTime().

Change-Id: I2eff15dd149a4b737d6e7473d1907cf0c80b6b38
related-to-bug: 7266706
urfaceMediaSource.cpp
90689fda75c343ab9328ced63e58f45eabaa33cc 02-Oct-2012 Andreas Huber <andih@google.com> Optionally have SurfaceMediaSource return absolute timestamps

based on systemTime().

Change-Id: I2eff15dd149a4b737d6e7473d1907cf0c80b6b38
related-to-bug: 7266706
urfaceMediaSource.cpp
0cb47712a4fc0e01ad8680ee6ac3a5d72eafe0ba 01-Oct-2012 Andreas Huber <andih@google.com> Inform DisplayManager that we're running over a secure channel (HDCP)

if that's the case.

Change-Id: I5f16cad04a6937a3fb65600a971866a77e0ae9fc
related-to-bug: 7265406
ifi-display/source/WifiDisplaySource.cpp
e9880de9032194500afe8383ef118d33468b5fbe 01-Oct-2012 Andreas Huber <andih@google.com> Inform DisplayManager that we're running over a secure channel (HDCP)

if that's the case.

Change-Id: I5f16cad04a6937a3fb65600a971866a77e0ae9fc
related-to-bug: 7265406
ifi-display/source/WifiDisplaySource.cpp
a3fafcb4ee6d6344f2b5b602d095a4ffebc8dbb7 01-Oct-2012 Jeff Tinker <jtinker@google.com> [WVDRM] Fix for stuttering on low bandwidth

Reintroduces the play/pause rebuffering logic we eliminated
in JB zero day to fix double spins and slow startup - but
activates that logic only based on a comparison of the
current bandwidth measurement and the lowest bitrate track
in the movie.

Needs to be submitted with related changes in /vendor/widevine

bug: 7230071
Change-Id: If4f5ecda36c4858ce8bf5c4abb722f90a329ecdb
wesomePlayer.cpp
25d542dcd6d6a633860925591145b1f51e22993c 01-Oct-2012 Jeff Tinker <jtinker@google.com> [WVDRM] Fix for stuttering on low bandwidth

Reintroduces the play/pause rebuffering logic we eliminated
in JB zero day to fix double spins and slow startup - but
activates that logic only based on a comparison of the
current bandwidth measurement and the lowest bitrate track
in the movie.

Needs to be submitted with related changes in /vendor/widevine

bug: 7230071
Change-Id: If4f5ecda36c4858ce8bf5c4abb722f90a329ecdb
wesomePlayer.cpp
ad0d97c7cf620e96a0b088dd9461645a3f8900b7 01-Oct-2012 Andreas Huber <andih@google.com> Perform an orderly shutdown if possible, force disconnect if necessary

wait for up to 2 secs for the dongle to send us a "TEARDOWN", after that
forcibly shutdown the connection.

Change-Id: Ie049857cd468b7af6986d6305f725c54571b2276
related-to-bug: 7258622
ifi-display/source/PlaybackSession.cpp
ifi-display/source/WifiDisplaySource.cpp
ifi-display/source/WifiDisplaySource.h
799688d0520149edc7f18ebe69c1ddd453a73cce 01-Oct-2012 Andreas Huber <andih@google.com> Perform an orderly shutdown if possible, force disconnect if necessary

wait for up to 2 secs for the dongle to send us a "TEARDOWN", after that
forcibly shutdown the connection.

Change-Id: Ie049857cd468b7af6986d6305f725c54571b2276
related-to-bug: 7258622
ifi-display/source/PlaybackSession.cpp
ifi-display/source/WifiDisplaySource.cpp
ifi-display/source/WifiDisplaySource.h
0e1d71641624c641a0a1abe4098943f5a42c6f94 01-Oct-2012 Andreas Huber <andih@google.com> Remove double negatives from SurfaceMediaSource

ensure mStarted actually reflects the state of SurfaceMediaSource

Change-Id: I92557896993ad8da23fe6940e997402ad63b8cbc
related-to-bug: 7258622
urfaceMediaSource.cpp
a54dee4002624e0885b39451cb29028406f5bf8e 01-Oct-2012 Andreas Huber <andih@google.com> Remove double negatives from SurfaceMediaSource

ensure mStarted actually reflects the state of SurfaceMediaSource

Change-Id: I92557896993ad8da23fe6940e997402ad63b8cbc
related-to-bug: 7258622
urfaceMediaSource.cpp
6360758ce2d171169d2a21e30266547ee4ac0fec 01-Oct-2012 Andreas Huber <andih@google.com> Make sure we still handle shutdown-related message even if we're

in error-state.

Change-Id: Ie12dd1a63306b4020b9de9eae007f6d768f02df6
related-to-bug: 7262673
ifi-display/source/PlaybackSession.cpp
8292f6d078a12062bbb090eed49d1ea025ff58f3 01-Oct-2012 Andreas Huber <andih@google.com> Make sure we still handle shutdown-related message even if we're

in error-state.

Change-Id: Ie12dd1a63306b4020b9de9eae007f6d768f02df6
related-to-bug: 7262673
ifi-display/source/PlaybackSession.cpp
4769f0b873030bbaa6977fe18696961d1d1b26ba 30-Sep-2012 Dave Burke <daveburke@google.com> Merge "Even cleaner shutdown." into jb-mr1-dev
6756203ec80f7640f743d8cc9d8799302d9513b6 30-Sep-2012 Dave Burke <daveburke@google.com> Merge "Even cleaner shutdown." into jb-mr1-dev
77245813007cf903b4b73f5d0cd20313fbf0e510 29-Sep-2012 Andreas Huber <andih@google.com> Even cleaner shutdown.

Change-Id: I5a76f83db3a5e43f55eb4e04269d890c2015bae7
related-to-bug: 7247918
ifi-display/source/Converter.cpp
ifi-display/source/PlaybackSession.cpp
ifi-display/source/PlaybackSession.h
ifi-display/source/RepeaterSource.cpp
ifi-display/source/RepeaterSource.h
9fcc8ce3e8829b38be3fd86551e1ec9ee3eb244e 29-Sep-2012 Andreas Huber <andih@google.com> Even cleaner shutdown.

Change-Id: I5a76f83db3a5e43f55eb4e04269d890c2015bae7
related-to-bug: 7247918
ifi-display/source/Converter.cpp
ifi-display/source/PlaybackSession.cpp
ifi-display/source/PlaybackSession.h
ifi-display/source/RepeaterSource.cpp
ifi-display/source/RepeaterSource.h
bbe96f0f05a1f1a1b3cfec0d124cb0d63c1ebf2a 29-Sep-2012 Andreas Huber <andih@google.com> Fix shutdown if HDCP was never instantiated.

Change-Id: Icdf6785880180f417c5432dff54c7e0fb12ef84d
related-to-bug: 7247918
ifi-display/source/WifiDisplaySource.cpp
d1805ebb0ff7694441fd95b5801fbce222849b6f 29-Sep-2012 Andreas Huber <andih@google.com> Fix shutdown if HDCP was never instantiated.

Change-Id: Icdf6785880180f417c5432dff54c7e0fb12ef84d
related-to-bug: 7247918
ifi-display/source/WifiDisplaySource.cpp
3a0ef0dc71f3776d115f30d87f1d8867daefea88 28-Sep-2012 Andreas Huber <andih@google.com> Tell the encoder to emit SPS/PPS before IDR frames in wifi display code.

Change-Id: Ic40e09b66784dd2e370d30b688d50561a47ab85a
related-to-bug: 7245308
Codec.cpp
ifi-display/source/Converter.cpp
ifi-display/source/PlaybackSession.cpp
13315ce05fbee1e1f5b920cfe4217c3a30167023 28-Sep-2012 Andreas Huber <andih@google.com> Tell the encoder to emit SPS/PPS before IDR frames in wifi display code.

Change-Id: Ic40e09b66784dd2e370d30b688d50561a47ab85a
related-to-bug: 7245308
Codec.cpp
ifi-display/source/Converter.cpp
ifi-display/source/PlaybackSession.cpp
96fc6cc65ca93009a759a3a874b82a35771b9714 28-Sep-2012 Andreas Huber <andih@google.com> Various improvements to a cleaner shutdown of the wifi display connection.

Change-Id: Id029a89939e53c2bd1d20e572d3975ec2795c239
related-to-bug: 7247918
Codec.cpp
urfaceMediaSource.cpp
ifi-display/ANetworkSession.cpp
ifi-display/source/Converter.cpp
ifi-display/source/Converter.h
ifi-display/source/MediaPuller.cpp
ifi-display/source/MediaPuller.h
ifi-display/source/PlaybackSession.cpp
ifi-display/source/PlaybackSession.h
ifi-display/source/RepeaterSource.cpp
ifi-display/source/WifiDisplaySource.cpp
ifi-display/source/WifiDisplaySource.h
a7f7e0ac9436a8417bb9f31aecedfec1909d4630 28-Sep-2012 Andreas Huber <andih@google.com> Various improvements to a cleaner shutdown of the wifi display connection.

Change-Id: Id029a89939e53c2bd1d20e572d3975ec2795c239
related-to-bug: 7247918
Codec.cpp
urfaceMediaSource.cpp
ifi-display/ANetworkSession.cpp
ifi-display/source/Converter.cpp
ifi-display/source/Converter.h
ifi-display/source/MediaPuller.cpp
ifi-display/source/MediaPuller.h
ifi-display/source/PlaybackSession.cpp
ifi-display/source/PlaybackSession.h
ifi-display/source/RepeaterSource.cpp
ifi-display/source/WifiDisplaySource.cpp
ifi-display/source/WifiDisplaySource.h
de799a74064a363d26f4c1bbc5a59d1b7127f49f 27-Sep-2012 Andreas Huber <andih@google.com> wfd_presentation_url should not include the port number according to wfd specs

Change-Id: I9c0e0174f6ab4cb24c6eafcaae853e432b3dffb9
related-to-bug: 7247490
ifi-display/source/WifiDisplaySource.cpp
8397243efdd4e70ba75a9cf50d882c24dad250a2 27-Sep-2012 Andreas Huber <andih@google.com> wfd_presentation_url should not include the port number according to wfd specs

Change-Id: I9c0e0174f6ab4cb24c6eafcaae853e432b3dffb9
related-to-bug: 7247490
ifi-display/source/WifiDisplaySource.cpp
ecc8db5ee83d648532be1392f53277aa3a25284e 27-Sep-2012 Andreas Huber <andih@google.com> Merge "Cleaner Wifi Display shutdown process, avoid crashing HDCP on exit." into jb-mr1-dev
a87ec1f1383767b30622567340e913a0da343a7d 27-Sep-2012 Andreas Huber <andih@google.com> Merge "Cleaner Wifi Display shutdown process, avoid crashing HDCP on exit." into jb-mr1-dev
5cfd237fd70572796b86f977ff4fdfe29cab888d 27-Sep-2012 Andreas Huber <andih@google.com> Merge "Prepend SPS/PPS manually before encryption in HDCP mode. This is" into jb-mr1-dev
5e614a104c911ea5424cccf83beb00e990e1b879 27-Sep-2012 Andreas Huber <andih@google.com> Merge "Prepend SPS/PPS manually before encryption in HDCP mode. This is" into jb-mr1-dev
ef7d3793fa9bbfb25253626ede9a020ee9280a17 27-Sep-2012 Andreas Huber <andih@google.com> Cleaner Wifi Display shutdown process, avoid crashing HDCP on exit.

Change-Id: Ie54ee3edd672ec629360b4ecc5df2f85ecbaa45f
related-to-bug: 7247584
urfaceMediaSource.cpp
ifi-display/source/PlaybackSession.cpp
ifi-display/source/PlaybackSession.h
ifi-display/source/WifiDisplaySource.cpp
ifi-display/source/WifiDisplaySource.h
be996645b3118b84edf26fc05cc5e4ff56c163b5 27-Sep-2012 Andreas Huber <andih@google.com> Cleaner Wifi Display shutdown process, avoid crashing HDCP on exit.

Change-Id: Ie54ee3edd672ec629360b4ecc5df2f85ecbaa45f
related-to-bug: 7247584
urfaceMediaSource.cpp
ifi-display/source/PlaybackSession.cpp
ifi-display/source/PlaybackSession.h
ifi-display/source/WifiDisplaySource.cpp
ifi-display/source/WifiDisplaySource.h
f58cac48e5732dbc4a5f33eed9cd39f109146ca4 27-Sep-2012 Dave Burke <daveburke@google.com> Tune WFD audio bitrate (did some listening tests).
Bug: 7241844

Change-Id: I5243f7a771871e650c6c2f380e0e81e7671c7bac
ifi-display/source/Converter.cpp
ce51cb862709f8a3cd3be562080a1ba9ca45e86b 27-Sep-2012 Dave Burke <daveburke@google.com> Tune WFD audio bitrate (did some listening tests).
Bug: 7241844

Change-Id: I5243f7a771871e650c6c2f380e0e81e7671c7bac
ifi-display/source/Converter.cpp
e399acc9d9f3b7af72106c4209e4bb40de37aa6a 27-Sep-2012 Andreas Huber <andih@google.com> Prepend SPS/PPS manually before encryption in HDCP mode. This is

a temporary change that will go away once the encoder can take care
of this.

Change-Id: Id65218f8a250d8c8fe3e8987b522065b5f5d7dca
related-to-bug: 7245308
ifi-display/source/PlaybackSession.cpp
ifi-display/source/PlaybackSession.h
ifi-display/source/TSPacketizer.cpp
ifi-display/source/TSPacketizer.h
af5f02cdd48b8c93a1976c8e078586216d96bdc0 27-Sep-2012 Andreas Huber <andih@google.com> Prepend SPS/PPS manually before encryption in HDCP mode. This is

a temporary change that will go away once the encoder can take care
of this.

Change-Id: Id65218f8a250d8c8fe3e8987b522065b5f5d7dca
related-to-bug: 7245308
ifi-display/source/PlaybackSession.cpp
ifi-display/source/PlaybackSession.h
ifi-display/source/TSPacketizer.cpp
ifi-display/source/TSPacketizer.h
ee93c8c0f65cc1965ca09c9e33ae672f8bc9b88c 27-Sep-2012 Dave Burke <daveburke@google.com> Tune iframe interval to 1sec.
Bug: 7241844

Change-Id: Iae0d73ecc680f6fa69d82ee2e8fac18ebece7782
ifi-display/source/Converter.cpp
bee01b8e6e37a1a7145c440f075583235e17153a 27-Sep-2012 Dave Burke <daveburke@google.com> Tune iframe interval to 1sec.
Bug: 7241844

Change-Id: Iae0d73ecc680f6fa69d82ee2e8fac18ebece7782
ifi-display/source/Converter.cpp
72ff5903df5f409ea83f74c363a52f0745ced8b8 26-Sep-2012 Andreas Huber <andih@google.com> 720p24 i-frames every 2 secs.

related-to-bug: 7239971

Change-Id: I4cbf7e9b878b180b0683656e9e8c0a6bb18e06dc
ifi-display/source/Converter.cpp
ifi-display/source/PlaybackSession.cpp
ifi-display/source/WifiDisplaySource.cpp
8000e368cbdcb8a2a712c9c92f6c97526b36f0ed 26-Sep-2012 Andreas Huber <andih@google.com> 720p24 i-frames every 2 secs.

related-to-bug: 7239971

Change-Id: I4cbf7e9b878b180b0683656e9e8c0a6bb18e06dc
ifi-display/source/Converter.cpp
ifi-display/source/PlaybackSession.cpp
ifi-display/source/WifiDisplaySource.cpp
eb11600a248cfe5b95ddd3e5aaae02bd2ab65276 26-Sep-2012 Andreas Huber <andih@google.com> Make sure we only release the HDCP module once shutdown has completed.

Change-Id: I4b614afe2b55ac53b4aa63311e5bea8fd6c4462e
related-to-bug: 7223555
ifi-display/source/PlaybackSession.cpp
ifi-display/source/PlaybackSession.h
ifi-display/source/WifiDisplaySource.cpp
ifi-display/source/WifiDisplaySource.h
8cc2fd3a7e5d2bca7b363c6eefb5b6bcac259290 26-Sep-2012 Andreas Huber <andih@google.com> Make sure we only release the HDCP module once shutdown has completed.

Change-Id: I4b614afe2b55ac53b4aa63311e5bea8fd6c4462e
related-to-bug: 7223555
ifi-display/source/PlaybackSession.cpp
ifi-display/source/PlaybackSession.h
ifi-display/source/WifiDisplaySource.cpp
ifi-display/source/WifiDisplaySource.h
44b175c31a96804d8f981c43145967473491540f 26-Sep-2012 Andreas Huber <andih@google.com> Merge "Fix shutdown and eliminate those annoying "failed to post..." logs." into jb-mr1-dev
d8717323119c085d30d575df5a638ed4b25528c7 26-Sep-2012 Andreas Huber <andih@google.com> Merge "Fix shutdown and eliminate those annoying "failed to post..." logs." into jb-mr1-dev
019aabab44e396d9a68c8126c9e0745162a4603a 26-Sep-2012 Andreas Huber <andih@google.com> Logic to include HDCP specific PES extra header data was backwards.

Change-Id: I85ab02f0c3ab945093b27210da1e36a31c022da5
related-to-bug: 7237850
ifi-display/source/PlaybackSession.cpp
f07c0eab0aa5f44e04cdd5e95ec8dd3cc93e100f 26-Sep-2012 Andreas Huber <andih@google.com> Logic to include HDCP specific PES extra header data was backwards.

Change-Id: I85ab02f0c3ab945093b27210da1e36a31c022da5
related-to-bug: 7237850
ifi-display/source/PlaybackSession.cpp
df4ddebe61ac84c7773da1f774d13e4d4bbe9f72 26-Sep-2012 Andreas Huber <andih@google.com> Fix shutdown and eliminate those annoying "failed to post..." logs.

Change-Id: I963e0712f59070f83a26946c494fdeb3558aa0e3
related-to-bug: 7230886
ifi-display/source/WifiDisplaySource.cpp
3146c0855ae51d64e1b4370efff8d22148cd808e 26-Sep-2012 Andreas Huber <andih@google.com> Fix shutdown and eliminate those annoying "failed to post..." logs.

Change-Id: I963e0712f59070f83a26946c494fdeb3558aa0e3
related-to-bug: 7230886
ifi-display/source/WifiDisplaySource.cpp
28e17ed7e2fbb254fb99481b74db85e427c905ee 25-Sep-2012 Andreas Huber <andih@google.com> Better transport stream timestamp handling.

Properly emit PCR and PMT/PAT updates every 0.1 secs.
Don't stream RTCP unless requested by the dongle.

related-to-bug: 7232540
Change-Id: Ie9a6949a074d86ab022adfab5d2811294ba746aa
ifi-display/source/PlaybackSession.cpp
ifi-display/source/PlaybackSession.h
ifi-display/source/TSPacketizer.cpp
ifi-display/source/WifiDisplaySource.cpp
0d76795773c2cb33fbf95f94a678a004653ca6ee 25-Sep-2012 Andreas Huber <andih@google.com> Better transport stream timestamp handling.

Properly emit PCR and PMT/PAT updates every 0.1 secs.
Don't stream RTCP unless requested by the dongle.

related-to-bug: 7232540
Change-Id: Ie9a6949a074d86ab022adfab5d2811294ba746aa
ifi-display/source/PlaybackSession.cpp
ifi-display/source/PlaybackSession.h
ifi-display/source/TSPacketizer.cpp
ifi-display/source/WifiDisplaySource.cpp
92f655fe351a5f2eb7d36123d2b687d6e7e3e913 24-Sep-2012 Andreas Huber <andih@google.com> Add some more logging, reduce startup delay to 1 sec.

Change-Id: Ic24a3d9e3e645288411efb46f7004d89e7a0a4b7
ifi-display/source/Converter.cpp
ifi-display/source/PlaybackSession.cpp
bedcdb270f66872355b733fcd072e17c98452185 24-Sep-2012 Andreas Huber <andih@google.com> Add some more logging, reduce startup delay to 1 sec.

Change-Id: Ic24a3d9e3e645288411efb46f7004d89e7a0a4b7
ifi-display/source/Converter.cpp
ifi-display/source/PlaybackSession.cpp
2a865ad8d45940bc824c02a8a8558cbcb97acc88 25-Sep-2012 Dave Burke <daveburke@google.com> Tune video bitrate to 5 mbps.

Change-Id: Ieb7ab1675db6fb21087a1258465f866ecdc5475b
ifi-display/source/Converter.cpp
2eddc1d2f99fb280786e30ec91f3c5df78556166 25-Sep-2012 Dave Burke <daveburke@google.com> Tune video bitrate to 5 mbps.

Change-Id: Ieb7ab1675db6fb21087a1258465f866ecdc5475b
ifi-display/source/Converter.cpp
ea4bbfdcad9478ea19257fb19a32de68a2dfd958 22-Sep-2012 Andreas Huber <andih@google.com> Attempt an orderly shutdown of the wifi display connection if possible.

Shutdown the session if the encoder signals an error.

related-to-bug:7207481

Change-Id: Id78000a336f8bb8904e7d2102f8f81a4139cdd61
ifi-display/source/PlaybackSession.cpp
ifi-display/source/WifiDisplaySource.cpp
ifi-display/source/WifiDisplaySource.h
a71c3ea5db4c035390a4a85012ee40f605ba4938 22-Sep-2012 Andreas Huber <andih@google.com> Attempt an orderly shutdown of the wifi display connection if possible.

Shutdown the session if the encoder signals an error.

related-to-bug:7207481

Change-Id: Id78000a336f8bb8904e7d2102f8f81a4139cdd61
ifi-display/source/PlaybackSession.cpp
ifi-display/source/WifiDisplaySource.cpp
ifi-display/source/WifiDisplaySource.h
94a68ecf2b56bd56994d0352cbaad56e58dcf0dc 23-Sep-2012 James Dong <jdong@google.com> Merge "Bug fix: MediaPlayer's deselectTrack() for subtitle." into jb-mr1-dev
4bf45909bcccb46acac61c155edd031e85b9dc12 23-Sep-2012 James Dong <jdong@google.com> Merge "Bug fix: MediaPlayer's deselectTrack() for subtitle." into jb-mr1-dev
207e18540fefbaf530a4fdf506d266f34ddec84f 21-Sep-2012 Andreas Huber <andih@google.com> Remove legacy code and APIs in wifi display related code.

Change-Id: Ia010e7a00534f9356b3247369d0ffd65591d91aa
ifi-display/Android.mk
ifi-display/source/PlaybackSession.cpp
ifi-display/source/PlaybackSession.h
ifi-display/source/Serializer.cpp
ifi-display/source/Serializer.h
ifi-display/source/WifiDisplaySource.cpp
ifi-display/wfd.cpp
45d76bb6c8f15335f89c287dbae04cc38f79d0a8 21-Sep-2012 Andreas Huber <andih@google.com> Remove legacy code and APIs in wifi display related code.

Change-Id: Ia010e7a00534f9356b3247369d0ffd65591d91aa
ifi-display/Android.mk
ifi-display/source/PlaybackSession.cpp
ifi-display/source/PlaybackSession.h
ifi-display/source/Serializer.cpp
ifi-display/source/Serializer.h
ifi-display/source/WifiDisplaySource.cpp
ifi-display/wfd.cpp
086f958a7e539acffb637b42f5a6998184544179 21-Sep-2012 Dave Burke <daveburke@google.com> Tune video bitrate to 2.5 MBPS.

Temporary workaround for buggy firmware (desired is 5 MBPS).

Change-Id: I9fb0af31ca07c9bfdc6f790b7c98ca546eaf2985
ifi-display/source/Converter.cpp
8fdd88b073275812ccd2279e3f657a4b5960bfa3 21-Sep-2012 Dave Burke <daveburke@google.com> Tune video bitrate to 2.5 MBPS.

Temporary workaround for buggy firmware (desired is 5 MBPS).

Change-Id: I9fb0af31ca07c9bfdc6f790b7c98ca546eaf2985
ifi-display/source/Converter.cpp
efd9c63dc846dd3dea2c979fe2a9d6770e73f9ac 20-Sep-2012 Andreas Huber <andih@google.com> Code to support RTP retransmission according to rfc4585, rfc4588

Change-Id: Idfb3c0935f28e4cbc2141f0903f0d3c4e95818a6
ifi-display/source/PlaybackSession.cpp
ifi-display/source/PlaybackSession.h
ifi-display/source/WifiDisplaySource.cpp
f45a4e1892496cc907cf1110482d186ae84258d2 20-Sep-2012 Andreas Huber <andih@google.com> Code to support RTP retransmission according to rfc4585, rfc4588

Change-Id: Idfb3c0935f28e4cbc2141f0903f0d3c4e95818a6
ifi-display/source/PlaybackSession.cpp
ifi-display/source/PlaybackSession.h
ifi-display/source/WifiDisplaySource.cpp
23580bb8d6cafbc2b65dd0a4ce1acb52562d1b05 20-Sep-2012 Insun Kang <insun@google.com> Bug fix: MediaPlayer's deselectTrack() for subtitle.

o Previously, deselectTrack() actually doesn't work properly in
TimedTextDriver / TimedTextPlayer.
o Ignores select track operation when the same track is selected in a
row.

Bug: 7200096
TESTED=runtest -d cts-media -c android.media.cts.MediaPlayerTest

Change-Id: If7feac294cf9b358f616be45574bc2e26001c887
imedtext/TimedTextDriver.cpp
imedtext/TimedTextPlayer.cpp
ef58870d2c798f046c87b06be0ec0cad109a754b 20-Sep-2012 Insun Kang <insun@google.com> Bug fix: MediaPlayer's deselectTrack() for subtitle.

o Previously, deselectTrack() actually doesn't work properly in
TimedTextDriver / TimedTextPlayer.
o Ignores select track operation when the same track is selected in a
row.

Bug: 7200096
TESTED=runtest -d cts-media -c android.media.cts.MediaPlayerTest

Change-Id: If7feac294cf9b358f616be45574bc2e26001c887
imedtext/TimedTextDriver.cpp
imedtext/TimedTextPlayer.cpp
b8c7bd418f0ee5b88923b0e0817e3a4acc53cf8d 18-Sep-2012 Andreas Huber <andih@google.com> Instantiate HDCP module, add PES_private_data for encrypted streams.

Change-Id: I970f561a56a1d489a392c3480dec13f4ed7b43bd
ifi-display/Android.mk
ifi-display/Parameters.cpp
ifi-display/Parameters.h
ifi-display/source/PlaybackSession.cpp
ifi-display/source/PlaybackSession.h
ifi-display/source/TSPacketizer.cpp
ifi-display/source/TSPacketizer.h
ifi-display/source/WifiDisplaySource.cpp
ifi-display/source/WifiDisplaySource.h
75a8df99f695784cd458c72c8e1a99510e8761b2 18-Sep-2012 Andreas Huber <andih@google.com> Instantiate HDCP module, add PES_private_data for encrypted streams.

Change-Id: I970f561a56a1d489a392c3480dec13f4ed7b43bd
ifi-display/Android.mk
ifi-display/Parameters.cpp
ifi-display/Parameters.h
ifi-display/source/PlaybackSession.cpp
ifi-display/source/PlaybackSession.h
ifi-display/source/TSPacketizer.cpp
ifi-display/source/TSPacketizer.h
ifi-display/source/WifiDisplaySource.cpp
ifi-display/source/WifiDisplaySource.h
c92bed3a73c06e90217f8f199ca0b517aa7595d2 18-Sep-2012 Andreas Huber <andih@google.com> Now we only support a single client connection

and it cannot be initiated from the local interface address for security
reasons.
Also, there's at most one playback session active at any time, and when
it dies we shutdown the client connection altogether and signal an error
to the listener.

related-to-bug: 7139784
Change-Id: Ia8d02bc994ce9986936947ddda1f2a3dddbf5714
ifi-display/source/WifiDisplaySource.cpp
ifi-display/source/WifiDisplaySource.h
c438b88ac929e4a14ebaa54aad8c827dbdab8c73 18-Sep-2012 Andreas Huber <andih@google.com> Now we only support a single client connection

and it cannot be initiated from the local interface address for security
reasons.
Also, there's at most one playback session active at any time, and when
it dies we shutdown the client connection altogether and signal an error
to the listener.

related-to-bug: 7139784
Change-Id: Ia8d02bc994ce9986936947ddda1f2a3dddbf5714
ifi-display/source/WifiDisplaySource.cpp
ifi-display/source/WifiDisplaySource.h
bd08e2f93bafd02abf2c25d740e9fb8bce455a99 13-Sep-2012 Andreas Huber <andih@google.com> Support for RTP/RTCP traffic over TCP sockets in wifi display code.

This is opt-in through

adb shell setprop media.wfd.enable-tcp true

Change-Id: I49ab22a8c8d62690065631e781a7f0057e5ce557
ifi-display/ANetworkSession.cpp
ifi-display/ANetworkSession.h
ifi-display/source/PlaybackSession.cpp
ifi-display/source/PlaybackSession.h
ifi-display/source/Serializer.cpp
ifi-display/source/WifiDisplaySource.cpp
ifi-display/source/WifiDisplaySource.h
7d34f83f64919295baff4b0e260267af3efb4f9f 13-Sep-2012 Andreas Huber <andih@google.com> Support for RTP/RTCP traffic over TCP sockets in wifi display code.

This is opt-in through

adb shell setprop media.wfd.enable-tcp true

Change-Id: I49ab22a8c8d62690065631e781a7f0057e5ce557
ifi-display/ANetworkSession.cpp
ifi-display/ANetworkSession.h
ifi-display/source/PlaybackSession.cpp
ifi-display/source/PlaybackSession.h
ifi-display/source/Serializer.cpp
ifi-display/source/WifiDisplaySource.cpp
ifi-display/source/WifiDisplaySource.h
08654f9d7157f6d6ca0928cb438bbbed53fb0fd1 14-Sep-2012 James Dong <jdong@google.com> Make a small correction in terms of GOP structure in the recorded video

When we have a 30 fps frame rate, and one second key-frame or I-frame interval,
we really would like to have for each second, 29 P-frames + 1 I-frame. Thus,
we should calculate the number of P frames so that it is equal to
frame_rate * I_frame_interval - 1

Change-Id: I5b9be6e4c101e7a6b718015aa4041496961c0f19
MXCodec.cpp
bcb54a4662bf8659762db59cd66ae3c06382fd4b 14-Sep-2012 James Dong <jdong@google.com> Make a small correction in terms of GOP structure in the recorded video

When we have a 30 fps frame rate, and one second key-frame or I-frame interval,
we really would like to have for each second, 29 P-frames + 1 I-frame. Thus,
we should calculate the number of P frames so that it is equal to
frame_rate * I_frame_interval - 1

Change-Id: I5b9be6e4c101e7a6b718015aa4041496961c0f19
MXCodec.cpp
2637cb172105939052d8a02f4eea693a90549518 14-Sep-2012 James Dong <jdong@google.com> Merge "Allow OMXCodec to specify an output color format for OMX decoder component" into jb-mr1-dev
afcb6aec27a52b87f3990691698ebe6b62e7a7bf 14-Sep-2012 James Dong <jdong@google.com> Merge "Allow OMXCodec to specify an output color format for OMX decoder component" into jb-mr1-dev
496238cc7551d414067dcbbb4fe3bd801f205f95 14-Sep-2012 Andreas Huber <andih@google.com> Support IDR requests in wifi display, MediaCodec and ACodec.

Change-Id: I596cf8dd61b63465437f78413186fad2be287244
Codec.cpp
ediaCodec.cpp
ifi-display/source/Converter.cpp
ifi-display/source/Converter.h
ifi-display/source/PlaybackSession.cpp
ifi-display/source/PlaybackSession.h
ifi-display/source/WifiDisplaySource.cpp
03e2ffa64470eec4e886614a4fa4facbae58a862 14-Sep-2012 Andreas Huber <andih@google.com> Support IDR requests in wifi display, MediaCodec and ACodec.

Change-Id: I596cf8dd61b63465437f78413186fad2be287244
Codec.cpp
ediaCodec.cpp
ifi-display/source/Converter.cpp
ifi-display/source/Converter.h
ifi-display/source/PlaybackSession.cpp
ifi-display/source/PlaybackSession.h
ifi-display/source/WifiDisplaySource.cpp
dca352880e210e0ca0ff39de074540d3640ecfab 13-Sep-2012 Andreas Huber <andih@google.com> Better video bandwidth utilization by not lying about the frame rate.

log network bandwidth used (for data traffic).

Change-Id: I043018624b3f02d94fa9c0cb9d15a6b2f2bd2eab
ifi-display/source/Converter.cpp
ifi-display/source/PlaybackSession.cpp
ifi-display/source/PlaybackSession.h
b5d99d162f4e82d7d1786506ec557c406f470b76 13-Sep-2012 Andreas Huber <andih@google.com> Better video bandwidth utilization by not lying about the frame rate.

log network bandwidth used (for data traffic).

Change-Id: I043018624b3f02d94fa9c0cb9d15a6b2f2bd2eab
ifi-display/source/Converter.cpp
ifi-display/source/PlaybackSession.cpp
ifi-display/source/PlaybackSession.h
a438123bd96c7faf145683876702387efe5628d9 13-Sep-2012 Andreas Huber <andih@google.com> Various improvements to cleanly shutdown a wfd session.

Change-Id: I86f0a27d7e8eb96200153bab847a862f21a19d13
ifi-display/source/Converter.cpp
ifi-display/source/MediaPuller.cpp
ifi-display/source/MediaPuller.h
ifi-display/source/PlaybackSession.cpp
ifi-display/source/PlaybackSession.h
ifi-display/source/WifiDisplaySource.cpp
596b4cde38b9fe18d21b4ed20dbdba909514a457 13-Sep-2012 Andreas Huber <andih@google.com> Various improvements to cleanly shutdown a wfd session.

Change-Id: I86f0a27d7e8eb96200153bab847a862f21a19d13
ifi-display/source/Converter.cpp
ifi-display/source/MediaPuller.cpp
ifi-display/source/MediaPuller.h
ifi-display/source/PlaybackSession.cpp
ifi-display/source/PlaybackSession.h
ifi-display/source/WifiDisplaySource.cpp
6701a4492350169aa41f66c9c79ece0ba0b280b7 13-Sep-2012 Andreas Huber <andih@google.com> Merge "Audio and video bitrate are now configurable through system properties" into jb-mr1-dev
c049afa039bee54629c30871eefffa17b403cdb5 13-Sep-2012 Andreas Huber <andih@google.com> Merge "Audio and video bitrate are now configurable through system properties" into jb-mr1-dev
d168b19bc716bf04a35c380af250e1974d0aecd2 13-Sep-2012 Andreas Huber <andih@google.com> Merge "Use proper number of video buffers to be acquired simultaneously from" into jb-mr1-dev
ab43b2cecf0b45b6e4db99b0f9f49f6f97dae66a 13-Sep-2012 Andreas Huber <andih@google.com> Merge "Use proper number of video buffers to be acquired simultaneously from" into jb-mr1-dev
44b59fd9326026d3f82dec25cde48c589b0438e7 12-Sep-2012 Andreas Huber <andih@google.com> Audio and video bitrate are now configurable through system properties

adb shell setprop media.wfd.audio-bitrate 64000
adb shell setprop media.wfd.video-bitrate 10000000

are the defaults.

Change-Id: Ib4d700748bdac2adffc6e7e31aff9c9f998e20f0
ifi-display/source/Converter.cpp
13da4ed2926946d1249e645b6d29f61bf362387c 12-Sep-2012 Andreas Huber <andih@google.com> Audio and video bitrate are now configurable through system properties

adb shell setprop media.wfd.audio-bitrate 64000
adb shell setprop media.wfd.video-bitrate 10000000

are the defaults.

Change-Id: Ib4d700748bdac2adffc6e7e31aff9c9f998e20f0
ifi-display/source/Converter.cpp
5a832f87b680ead3606c4448a0a82c0e556d1b93 12-Sep-2012 Andreas Huber <andih@google.com> Use proper number of video buffers to be acquired simultaneously from

SurfaceMediaSource, this should match the number of encoder input buffers.

Change-Id: Ibeb102337fd23698c5321c63dd3cb00b93e632b0
ifi-display/source/PlaybackSession.cpp
8bcc1a1ce7dab4479b36fb274ed66eaf687d1eac 12-Sep-2012 Andreas Huber <andih@google.com> Use proper number of video buffers to be acquired simultaneously from

SurfaceMediaSource, this should match the number of encoder input buffers.

Change-Id: Ibeb102337fd23698c5321c63dd3cb00b93e632b0
ifi-display/source/PlaybackSession.cpp
00f41327264fa2e59cc05abaa5c554b2a32938e1 12-Sep-2012 Andreas Huber <andih@google.com> Throttle SurfaceMediaSource.

Change-Id: I214ce60f8d94df9c07041577e34ed1ad5e199fdb
urfaceMediaSource.cpp
b62f95145293bf1a39959166a4964088bb413224 12-Sep-2012 Andreas Huber <andih@google.com> Throttle SurfaceMediaSource.

Change-Id: I214ce60f8d94df9c07041577e34ed1ad5e199fdb
urfaceMediaSource.cpp
359cf1cac2a7851a59dfe4960a1a5992ac6fdb84 13-Sep-2012 Jean-Baptiste Queru <jbq@google.com> am a923dd4e: am 1b0ae9e4: Merge "avcenc: Set OMX_BUFFERFLAG_EOS on the last output frame"

* commit 'a923dd4e6c14f5cba2fc5f6f152619ec6bc70c5d':
avcenc: Set OMX_BUFFERFLAG_EOS on the last output frame
71ea9f024c3943160110d9aa15b082b66516f72e 13-Sep-2012 Jean-Baptiste Queru <jbq@google.com> am a923dd4e: am 1b0ae9e4: Merge "avcenc: Set OMX_BUFFERFLAG_EOS on the last output frame"

* commit 'a923dd4e6c14f5cba2fc5f6f152619ec6bc70c5d':
avcenc: Set OMX_BUFFERFLAG_EOS on the last output frame
a923dd4e6c14f5cba2fc5f6f152619ec6bc70c5d 13-Sep-2012 Jean-Baptiste Queru <jbq@google.com> am 1b0ae9e4: Merge "avcenc: Set OMX_BUFFERFLAG_EOS on the last output frame"

* commit '1b0ae9e47273357e19a9beb22466319753e8242d':
avcenc: Set OMX_BUFFERFLAG_EOS on the last output frame
1b0ae9e47273357e19a9beb22466319753e8242d 12-Sep-2012 Jean-Baptiste Queru <jbq@google.com> Merge "avcenc: Set OMX_BUFFERFLAG_EOS on the last output frame"
e891a7888141fcd3e7956bf80425c885992fa2bf 12-Sep-2012 Andreas Huber <andih@google.com> Merge "Various improvements to the wifi display implementation." into jb-mr1-dev
036012b9209d3614cbc3c0a96cece5776c45e77d 12-Sep-2012 Andreas Huber <andih@google.com> Merge "Various improvements to the wifi display implementation." into jb-mr1-dev
e1957358f11031a554c57d4fb46988dd6044acc1 12-Sep-2012 Andreas Huber <andih@google.com> Various improvements to the wifi display implementation.

Using a MediaPuller now, audio and video on their separate threads.
No more flushing the RTP stream on audio tracks, since it wastes too much
of a full size UDP packet.

Change-Id: I53346b4aea739c3142da13bd179428503a3c98b0
ifi-display/Android.mk
ifi-display/source/Converter.cpp
ifi-display/source/MediaPuller.cpp
ifi-display/source/MediaPuller.h
ifi-display/source/PlaybackSession.cpp
ifi-display/source/PlaybackSession.h
ifi-display/source/RepeaterSource.cpp
ifi-display/source/Serializer.cpp
eb29bae4b8ae270e656b6fcd5216fa86e9f1d8d0 12-Sep-2012 Andreas Huber <andih@google.com> Various improvements to the wifi display implementation.

Using a MediaPuller now, audio and video on their separate threads.
No more flushing the RTP stream on audio tracks, since it wastes too much
of a full size UDP packet.

Change-Id: I53346b4aea739c3142da13bd179428503a3c98b0
ifi-display/Android.mk
ifi-display/source/Converter.cpp
ifi-display/source/MediaPuller.cpp
ifi-display/source/MediaPuller.h
ifi-display/source/PlaybackSession.cpp
ifi-display/source/PlaybackSession.h
ifi-display/source/RepeaterSource.cpp
ifi-display/source/Serializer.cpp
8a74c9b8e2627560ae5a92d4261f0de4464490ad 06-Sep-2012 Edwin Wong <edwinwong@google.com> Add getError and setError to propagate error code from WVMMediaExtractor up to player.

The two virtual functions provides a path for the player(AwesomePlayer) to retrieve
the last error from WVMMediaExtractor container.

Change-Id: Iee8d4a3eccf82af95eb3d4d465f069daced4aa1a
related-to-bug: 7073630
wesomePlayer.cpp
VMExtractor.cpp
nclude/WVMExtractor.h
ac1b71664dbdba1379f00fad2dcc3baa5f734d6b 06-Sep-2012 Edwin Wong <edwinwong@google.com> Add getError and setError to propagate error code from WVMMediaExtractor up to player.

The two virtual functions provides a path for the player(AwesomePlayer) to retrieve
the last error from WVMMediaExtractor container.

Change-Id: Iee8d4a3eccf82af95eb3d4d465f069daced4aa1a
related-to-bug: 7073630
wesomePlayer.cpp
VMExtractor.cpp
nclude/WVMExtractor.h
8fa80e3be63ffde5ef029afa713877440856b663 08-Sep-2012 James Dong <jdong@google.com> Allow OMXCodec to specify an output color format for OMX decoder component

The output color format is specified via the meta argument in OMXCodec::Create()

o related-to-bug: 7122195

Change-Id: Id3247686b893af25cc190685201e53ad34b0399c
MXCodec.cpp
tagefrightMetadataRetriever.cpp
2020801209f7f0f82ddd7635daf2c371b46ea6d6 08-Sep-2012 James Dong <jdong@google.com> Allow OMXCodec to specify an output color format for OMX decoder component

The output color format is specified via the meta argument in OMXCodec::Create()

o related-to-bug: 7122195

Change-Id: Id3247686b893af25cc190685201e53ad34b0399c
MXCodec.cpp
tagefrightMetadataRetriever.cpp
66765846726c02db16a0f024f2217990a90802c0 10-Sep-2012 Andreas Huber <andih@google.com> Merge "Enable audio streaming to a wifi display. Remove startup delay hack." into jb-mr1-dev
d6de933cfcc088d7c80e26bcca4d3b20b1573225 10-Sep-2012 Andreas Huber <andih@google.com> Merge "Enable audio streaming to a wifi display. Remove startup delay hack." into jb-mr1-dev
e0f8517eac5dbd4e25aa61fff66c76a42d8fbefc 10-Sep-2012 Jean-Baptiste Queru <jbq@google.com> am f755a506: am d81be6d6: Merge "aacenc: Mark some global arrays const"

* commit 'f755a506335df3bfb32c062096deceaf045044ed':
aacenc: Mark some global arrays const
e3fd5865f166f611cb3a32a76faac124dbae90dc 10-Sep-2012 Jean-Baptiste Queru <jbq@google.com> am f755a506: am d81be6d6: Merge "aacenc: Mark some global arrays const"

* commit 'f755a506335df3bfb32c062096deceaf045044ed':
aacenc: Mark some global arrays const
1646a0fed94c30a44128b3c379736def4b332033 10-Sep-2012 Andreas Huber <andih@google.com> Enable audio streaming to a wifi display. Remove startup delay hack.

Change-Id: I2e163db1595bb504de3a2e99cace191aa90708ca
ifi-display/source/PlaybackSession.cpp
ifi-display/source/Serializer.cpp
c17183c6b516f89d5a353b07fbd1312838adc74e 10-Sep-2012 Andreas Huber <andih@google.com> Enable audio streaming to a wifi display. Remove startup delay hack.

Change-Id: I2e163db1595bb504de3a2e99cace191aa90708ca
ifi-display/source/PlaybackSession.cpp
ifi-display/source/Serializer.cpp
f755a506335df3bfb32c062096deceaf045044ed 10-Sep-2012 Jean-Baptiste Queru <jbq@google.com> am d81be6d6: Merge "aacenc: Mark some global arrays const"

* commit 'd81be6d670f0d89aa6048a82fbbff82c584e9922':
aacenc: Mark some global arrays const
d81be6d670f0d89aa6048a82fbbff82c584e9922 10-Sep-2012 Jean-Baptiste Queru <jbq@google.com> Merge "aacenc: Mark some global arrays const"
fd48021dfc3278b048ba99ecffe7f996751fb440 10-Sep-2012 Elliott Hughes <enh@google.com> am e7c992c6: am 5abc91d6: Merge "Fix libmedia and libstagefright to get expat header files from the approved location."

* commit 'e7c992c675e0075cd60b0b11c06d5956e3ddd7a3':
Fix libmedia and libstagefright to get expat header files from the approved location.
947be6bf6700d07e148f6fbf6308e86b08d3c926 10-Sep-2012 Elliott Hughes <enh@google.com> am e7c992c6: am 5abc91d6: Merge "Fix libmedia and libstagefright to get expat header files from the approved location."

* commit 'e7c992c675e0075cd60b0b11c06d5956e3ddd7a3':
Fix libmedia and libstagefright to get expat header files from the approved location.
e7c992c675e0075cd60b0b11c06d5956e3ddd7a3 10-Sep-2012 Elliott Hughes <enh@google.com> am 5abc91d6: Merge "Fix libmedia and libstagefright to get expat header files from the approved location."

* commit '5abc91d61718e334e05c6d4858bd868bd5a5769c':
Fix libmedia and libstagefright to get expat header files from the approved location.
e8057dd8208f0a185109992339a995c518b12780 09-Sep-2012 Elliott Hughes <enh@google.com> Fix libmedia and libstagefright to get expat header files from the approved location.

Found during a libexpat upgrade.

Change-Id: I9e5abd502a884975d898486edde374fb2519164e
ndroid.mk
ediaCodecList.cpp
888f63bcde37347061de1aabb1b7febb2eca0875 09-Sep-2012 Jean-Michel Trivi <jmtrivi@google.com> Fix buffer size issue for multichannel HE-AAC

Decoding of HE-AAC fails due to output buffer size being too small.
Size output buffer size according to maximum number of channels.

Change-Id: I6b10842cf7ba3da1f4b4075b1f7f5404bf76be41
odecs/aacdec/SoftAAC2.cpp
82016dab001142124f1ab1eba1850b5687a4f936 09-Sep-2012 Jean-Michel Trivi <jmtrivi@google.com> Fix buffer size issue for multichannel HE-AAC

Decoding of HE-AAC fails due to output buffer size being too small.
Size output buffer size according to maximum number of channels.

Change-Id: I6b10842cf7ba3da1f4b4075b1f7f5404bf76be41
odecs/aacdec/SoftAAC2.cpp
9538ab83ed3917e643fc88f63ed83736d5a22d19 09-Sep-2012 Martin Storsjo <martin@martin.st> aacenc: Mark some global arrays const

This gets rid of initialized writeable data in the library.

Change-Id: I7c1cbeb3df10c302b645b7311591ead87a289ca1
odecs/aacenc/inc/aac_rom.h
odecs/aacenc/src/aac_rom.c
odecs/aacenc/src/block_switch.c
ef49e2fdb1f776229a4be05aa9952a1107e94f51 09-Sep-2012 Jeff Brown <jeffbrown@google.com> Revert max buffers change.

Attempting to use 31 buffers crashes on Prime.

Bug: 7131413
Change-Id: Ib85aef9b1da01f7243bd781a0efa47de2970412d
ifi-display/source/PlaybackSession.cpp
e976612a6e534c1751f855270b31b842414d8ba1 09-Sep-2012 Jeff Brown <jeffbrown@google.com> Revert max buffers change.

Attempting to use 31 buffers crashes on Prime.

Bug: 7131413
Change-Id: Ib85aef9b1da01f7243bd781a0efa47de2970412d
ifi-display/source/PlaybackSession.cpp
7ac783252ef682abddd083104ab06619d82ac52f 08-Sep-2012 Andreas Huber <andih@google.com> Merge "Less verbose logging, lots of references." into jb-mr1-dev
d0c3da34ad99506ccdc05d4b626c81d9cf43834a 08-Sep-2012 Andreas Huber <andih@google.com> Merge "Less verbose logging, lots of references." into jb-mr1-dev
72f6aea5afba3ff8ab7e8eab49552d65ee3bb97b 08-Sep-2012 Andreas Huber <andih@google.com> Less verbose logging, lots of references.

Change-Id: Idcb76848883b113e956d7e6266da882771a053b8
ifi-display/ANetworkSession.cpp
ifi-display/source/PlaybackSession.cpp
ifi-display/source/WifiDisplaySource.cpp
52299d853b340690dfc63890a26710fb53283b3c 08-Sep-2012 Andreas Huber <andih@google.com> Less verbose logging, lots of references.

Change-Id: Idcb76848883b113e956d7e6266da882771a053b8
ifi-display/ANetworkSession.cpp
ifi-display/source/PlaybackSession.cpp
ifi-display/source/WifiDisplaySource.cpp
525098dd5442c66e9aa43ef15563fdae6d47ec9e 08-Sep-2012 Andreas Huber <andih@google.com> Merge "Make wfd code work with both old and new dongles." into jb-mr1-dev
cdf8ad7cf7b08666c023da28d64e5b44000ade11 08-Sep-2012 Andreas Huber <andih@google.com> Merge "Make wfd code work with both old and new dongles." into jb-mr1-dev
7977e85f7287f2b0e7a5de94e853e6073736e03b 08-Sep-2012 Andreas Huber <andih@google.com> Make wfd code work with both old and new dongles.

Change-Id: Idc750dc334c47a171791587dd7e7281d565ff566
ifi-display/ANetworkSession.cpp
ifi-display/source/PlaybackSession.cpp
be009a3d9897e5f3a66f3eeeb6762552a1f858a8 08-Sep-2012 Andreas Huber <andih@google.com> Make wfd code work with both old and new dongles.

Change-Id: Idc750dc334c47a171791587dd7e7281d565ff566
ifi-display/ANetworkSession.cpp
ifi-display/source/PlaybackSession.cpp
8c7d147cca17961a71209c105a2676a552d3d69f 07-Sep-2012 John Grossman <johngro@google.com> Fix iTunSMPB parsing for AAC tracks encoded with Nero

Make sure to clear out the mean/name/data state when parsing
apple-style metadata from tracks every time we have a full set, not
just when we find an iTunSMPB set.

AAC tracks encoded from WAV by Nero tend to put in an additional apple
style metadata tag (cdec) before the iTunSMPB tag. The sequence in
the file goes something like

mean : "com.apple.iTunes"
name : "cdec"
data : "ndaudio 1.5.4.0 / -2pass -br 320000"
mean : "com.apple.iTunes"
name : "iTunSMPB"
data : " 00000000 00000A40 000000B8 <etc...>"

If the internal state was not cleared after the first set, then when
the second instance of "name" is encountered, an attempt is made to
parse the previous data entry as an iTunSMPB tag when it is actually a
cdec tag. Afterwards, mean, name and data are all cleared, and when
the second data is encountered there is no current mean or name
present, so the gapless metadata gets skipped. By clearing the
metadata state every time we have a full set of mean/name/data, we
make sure that we are always interpreting the data field as the proper
type.

Change-Id: I196e2e3f83e434f15d5ee55ae40a74a92d5a1845
PEG4Extractor.cpp
7abab13f230e4c38a4c8a88c859af64d491d5e9b 07-Sep-2012 John Grossman <johngro@google.com> Fix iTunSMPB parsing for AAC tracks encoded with Nero

Make sure to clear out the mean/name/data state when parsing
apple-style metadata from tracks every time we have a full set, not
just when we find an iTunSMPB set.

AAC tracks encoded from WAV by Nero tend to put in an additional apple
style metadata tag (cdec) before the iTunSMPB tag. The sequence in
the file goes something like

mean : "com.apple.iTunes"
name : "cdec"
data : "ndaudio 1.5.4.0 / -2pass -br 320000"
mean : "com.apple.iTunes"
name : "iTunSMPB"
data : " 00000000 00000A40 000000B8 <etc...>"

If the internal state was not cleared after the first set, then when
the second instance of "name" is encountered, an attempt is made to
parse the previous data entry as an iTunSMPB tag when it is actually a
cdec tag. Afterwards, mean, name and data are all cleared, and when
the second data is encountered there is no current mean or name
present, so the gapless metadata gets skipped. By clearing the
metadata state every time we have a full set of mean/name/data, we
make sure that we are always interpreting the data field as the proper
type.

Change-Id: I196e2e3f83e434f15d5ee55ae40a74a92d5a1845
PEG4Extractor.cpp
c56857b4cd12cd4bc3361e375f5b7554277ce9d7 06-Sep-2012 John Grossman <johngro@google.com> Merge "Fix calculations for an obscure combo of MPEG audio options." into jb-mr1-dev
ed68d9acdd5eae0ca6a3a6eebb99c104784707e4 06-Sep-2012 John Grossman <johngro@google.com> Merge "Fix calculations for an obscure combo of MPEG audio options." into jb-mr1-dev
a39ad61a1c9c69c2cc60f5d14243dd56040f8571 29-Aug-2012 John Grossman <johngro@google.com> Fix calculations for an obscure combo of MPEG audio options.

MPEGv2 and MPEGv2.5 Layer 2 audio payloads should 1152 samples per
access unit, not 576. Adjust the frame size and samples out
calculations accordingly.

Also, adjust the max frame size in the MP3Extractor's MediaSource to
be closer to the theoretical worst case max frame size. The
theoretical worst case for MPEG audio is 2881 bytes per frame, but the
max frame size being used was 32kB. It has been changed to be 4kB in
order to remain a power of 2 allocation, but to be the power of 2
closest to the worst case.

Change-Id: If11f5a843b06e70151bbe8298cc54f954938d9d7
P3Extractor.cpp
vc_utils.cpp
ab736e117354a3022177213ffcc7dce49c681249 29-Aug-2012 John Grossman <johngro@google.com> Fix calculations for an obscure combo of MPEG audio options.

MPEGv2 and MPEGv2.5 Layer 2 audio payloads should 1152 samples per
access unit, not 576. Adjust the frame size and samples out
calculations accordingly.

Also, adjust the max frame size in the MP3Extractor's MediaSource to
be closer to the theoretical worst case max frame size. The
theoretical worst case for MPEG audio is 2881 bytes per frame, but the
max frame size being used was 32kB. It has been changed to be 4kB in
order to remain a power of 2 allocation, but to be the power of 2
closest to the worst case.

Change-Id: If11f5a843b06e70151bbe8298cc54f954938d9d7
P3Extractor.cpp
vc_utils.cpp
3a6b97eba61b280bf81407ad6d6fb210ef93f9c4 06-Sep-2012 Marco Nelissen <marcone@google.com> Merge "To make mimetype for WAV file consistent over SF." into jb-mr1-dev
b9342ac53966c722758602b64d6339863ac26e41 06-Sep-2012 Marco Nelissen <marcone@google.com> Merge "To make mimetype for WAV file consistent over SF." into jb-mr1-dev
9c6cb7a896f41cb8ad2f2ad63f8f6edfbb56ed4f 06-Sep-2012 Marco Nelissen <marcone@google.com> Merge "Fragmented mp4 extractor" into jb-mr1-dev
ccd07716d105125b2eb2f1280b8c3fe9f57e78f3 06-Sep-2012 Marco Nelissen <marcone@google.com> Merge "Fragmented mp4 extractor" into jb-mr1-dev
56997121c5031598fbbba7b7c53980b7fd529c2d 29-Aug-2012 Marco Nelissen <marcone@google.com> Fragmented mp4 extractor

Still experimental. Set property "media.stagefright.use-fragmp4" to true to
enable.

Change-Id: I210b9c5b5164b5c5eefc31309845ee881ac7db8e
ndroid.mk
RMExtractor.cpp
ataSource.cpp
ragmentedMP4Extractor.cpp
PEG4Extractor.cpp
ediaExtractor.cpp
etaData.cpp
tils.cpp
nclude/FragmentedMP4Extractor.h
nclude/FragmentedMP4Parser.h
p4/FragmentedMP4Parser.cpp
1e9ee018c6fa906c99270616456c32f0bb30c9c0 29-Aug-2012 Marco Nelissen <marcone@google.com> Fragmented mp4 extractor

Still experimental. Set property "media.stagefright.use-fragmp4" to true to
enable.

Change-Id: I210b9c5b5164b5c5eefc31309845ee881ac7db8e
ndroid.mk
RMExtractor.cpp
ataSource.cpp
ragmentedMP4Extractor.cpp
PEG4Extractor.cpp
ediaExtractor.cpp
etaData.cpp
tils.cpp
nclude/FragmentedMP4Extractor.h
nclude/FragmentedMP4Parser.h
p4/FragmentedMP4Parser.cpp
0b73d4730202fcad53aefc4314a06e7b95f442f0 05-Sep-2012 Andreas Huber <andih@google.com> Expose an IRemoteDisplay to trigger wifi display connections setup and feedback.

Change-Id: I7602cda0e38073c9f0e63fa4de238ca0d4b4ce8e
ifi-display/source/PlaybackSession.cpp
ifi-display/source/PlaybackSession.h
ifi-display/source/WifiDisplaySource.cpp
ifi-display/source/WifiDisplaySource.h
28169b107327b5db58877babf6993f0eb109c58a 05-Sep-2012 Andreas Huber <andih@google.com> Expose an IRemoteDisplay to trigger wifi display connections setup and feedback.

Change-Id: I7602cda0e38073c9f0e63fa4de238ca0d4b4ce8e
ifi-display/source/PlaybackSession.cpp
ifi-display/source/PlaybackSession.h
ifi-display/source/WifiDisplaySource.cpp
ifi-display/source/WifiDisplaySource.h
06096f955d486e229e19956052925f43f2f3f7c4 05-Sep-2012 Dongwon Kang <dwkang@google.com> To make mimetype for WAV file consistent over SF.

(audio/x-wav is chosen because it was also used in MediaFile.java.)
Tested: checked wav files plays well on Music app.

Change-Id: Ifc07bcbed681e509176b1c144626f6f1009e69be
ediaDefs.cpp
AVExtractor.cpp
4a315abd2fa975ab31ec8fcef8f4a790dfda9416 05-Sep-2012 Dongwon Kang <dwkang@google.com> To make mimetype for WAV file consistent over SF.

(audio/x-wav is chosen because it was also used in MediaFile.java.)
Tested: checked wav files plays well on Music app.

Change-Id: Ifc07bcbed681e509176b1c144626f6f1009e69be
ediaDefs.cpp
AVExtractor.cpp
66e72bc85fb762876baff60ef29de729da93cf26 05-Sep-2012 Andreas Huber <andih@google.com> Configure the SurfaceMediaSource to emit the same number of buffers

as the video encoder allocates for its input. Do this before connecting
the bufferqueue through surface flinger.

Change-Id: Ibc81db1359afe2d88fdb75b23fadae65c8a6f7cc
urfaceMediaSource.cpp
ifi-display/source/Converter.cpp
ifi-display/source/Converter.h
ifi-display/source/PlaybackSession.cpp
7f06639d375c44f260e00aa5e18cd883624b38bf 05-Sep-2012 Andreas Huber <andih@google.com> Configure the SurfaceMediaSource to emit the same number of buffers

as the video encoder allocates for its input. Do this before connecting
the bufferqueue through surface flinger.

Change-Id: Ibc81db1359afe2d88fdb75b23fadae65c8a6f7cc
urfaceMediaSource.cpp
ifi-display/source/Converter.cpp
ifi-display/source/Converter.h
ifi-display/source/PlaybackSession.cpp
fbe9d81ff5fbdc5aecdcdd13e4a5d7f019824f96 31-Aug-2012 Andreas Huber <andih@google.com> Support for acting as a wifi display sink.

Change-Id: I0beac87025b93c60164daa865c89f16b72197a47
ifi-display/Android.mk
ifi-display/sink/LinearRegression.cpp
ifi-display/sink/LinearRegression.h
ifi-display/sink/RTPSink.cpp
ifi-display/sink/RTPSink.h
ifi-display/sink/TunnelRenderer.cpp
ifi-display/sink/TunnelRenderer.h
ifi-display/sink/WifiDisplaySink.cpp
ifi-display/sink/WifiDisplaySink.h
ifi-display/wfd.cpp
8a61c22ecc2a38fffe978be210fe3f0a70efb71c 31-Aug-2012 Andreas Huber <andih@google.com> Support for acting as a wifi display sink.

Change-Id: I0beac87025b93c60164daa865c89f16b72197a47
ifi-display/Android.mk
ifi-display/sink/LinearRegression.cpp
ifi-display/sink/LinearRegression.h
ifi-display/sink/RTPSink.cpp
ifi-display/sink/RTPSink.h
ifi-display/sink/TunnelRenderer.cpp
ifi-display/sink/TunnelRenderer.h
ifi-display/wfd.cpp
7323115c6e55f2da73317d7ff6a69b808d74264e 04-Sep-2012 Andreas Huber <andih@google.com> Merge "Improvements to our MPEG2 Transport Stream parser" into jb-mr1-dev
ebb5047fca788f89188158cc764fbb5ad2321f7a 04-Sep-2012 Andreas Huber <andih@google.com> Merge "Improvements to our MPEG2 Transport Stream parser" into jb-mr1-dev
312380331e28b7e5693a4b1646caf2d19aba1b2a 31-Aug-2012 Marco Nelissen <marcone@google.com> Merge "Move fragmented mp4 parser to libstagefright" into jb-mr1-dev
d99d678228fee4baa74d1bae463a59cc0aa13cd5 31-Aug-2012 Marco Nelissen <marcone@google.com> Merge "Move fragmented mp4 parser to libstagefright" into jb-mr1-dev
cb1f88c684140ce0eb407049a78f889bc7d51be1 31-Aug-2012 Marco Nelissen <marcone@google.com> Move fragmented mp4 parser to libstagefright

and rename it from Parser to FragmentedMP4Parser
Change-Id: I986f50d0c5c93648aac675d6160e18623b031541
ndroid.mk
nclude/FragmentedMP4Parser.h
p4/FragmentedMP4Parser.cpp
p4/TrackFragment.cpp
p4/TrackFragment.h
4ecce5026fe3235e783766dcb9fc2b59405da08f 31-Aug-2012 Marco Nelissen <marcone@google.com> Move fragmented mp4 parser to libstagefright

and rename it from Parser to FragmentedMP4Parser
Change-Id: I986f50d0c5c93648aac675d6160e18623b031541
ndroid.mk
nclude/FragmentedMP4Parser.h
p4/FragmentedMP4Parser.cpp
p4/TrackFragment.cpp
p4/TrackFragment.h
892020e46b97adfa012be7a9dd688a2d6d528de4 31-Aug-2012 Andreas Huber <andih@google.com> Merge "Special mode for ESQueue that allows for earlier dequeuing of access units" into jb-mr1-dev
7468828497435ed88534508537714149aa66ead3 31-Aug-2012 Andreas Huber <andih@google.com> Merge "Special mode for ESQueue that allows for earlier dequeuing of access units" into jb-mr1-dev
87f2a558dd12043631e12c361abef301bf603140 31-Aug-2012 Andreas Huber <andih@google.com> Improvements to our MPEG2 Transport Stream parser

Verifies the continuity counter
Parses and associates PCR time with streams
Allows for a absolute time anchor to be signalled via discontinuity.

Change-Id: I4bc88c78382c9cc6380f28df584cc6c254e0a8f9
peg2ts/ATSParser.cpp
peg2ts/ATSParser.h
5205152968957c51b597ddeabe6a5e17b2a84e38 31-Aug-2012 Andreas Huber <andih@google.com> Improvements to our MPEG2 Transport Stream parser

Verifies the continuity counter
Parses and associates PCR time with streams
Allows for a absolute time anchor to be signalled via discontinuity.

Change-Id: I4bc88c78382c9cc6380f28df584cc6c254e0a8f9
peg2ts/ATSParser.cpp
peg2ts/ATSParser.h
f56afa4878694803a44d1b0e9a54762d1d5ab652 31-Aug-2012 Andreas Huber <andih@google.com> Special mode for ESQueue that allows for earlier dequeuing of access units

if it's know beforehand that each PES packet contains exactly one access unit.
Currently this optimization is only supported for H.264 video.

Change-Id: I0888027cc7e9850307484b11dba1191cf6bfac83
peg2ts/ESQueue.cpp
peg2ts/ESQueue.h
57bc23915ecc1d15c293d30463948b68885b3437 31-Aug-2012 Andreas Huber <andih@google.com> Special mode for ESQueue that allows for earlier dequeuing of access units

if it's know beforehand that each PES packet contains exactly one access unit.
Currently this optimization is only supported for H.264 video.

Change-Id: I0888027cc7e9850307484b11dba1191cf6bfac83
peg2ts/ESQueue.cpp
peg2ts/ESQueue.h
371e121745c2e43e3c26fd1a854eaf6d3324f057 31-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 8b152566: Merge "OMXCodec: enhance error handling of OMX IL client"

* commit '8b1525663322685ff34d9c09176feebd102e1c3d':
OMXCodec: enhance error handling of OMX IL client
cfaeeec0900014d97e15829e0fa52f865ee4c786 31-Aug-2012 Andreas Huber <andih@google.com> Add support for mpeg2 transport streams to the RTSP implementation.

Change-Id: I409d7133a53a71e62523b1acc2b03302fcf824a5
tsp/AMPEG2TSAssembler.cpp
tsp/AMPEG2TSAssembler.h
tsp/APacketSource.cpp
tsp/ARTPSource.cpp
tsp/Android.mk
49694688c82214f5fd9e969e177c9e126a240a26 31-Aug-2012 Andreas Huber <andih@google.com> Add support for mpeg2 transport streams to the RTSP implementation.

Change-Id: I409d7133a53a71e62523b1acc2b03302fcf824a5
tsp/AMPEG2TSAssembler.cpp
tsp/AMPEG2TSAssembler.h
tsp/APacketSource.cpp
tsp/ARTPSource.cpp
tsp/Android.mk
dc91c885f267005e06f439a3bd592b3d8706bb50 31-Aug-2012 Andreas Huber <andih@google.com> Merge "Implement the source->sink(!) keep alive the wfd specs mandate..." into jb-mr1-dev
b2562f6faf7b1061f617586801597e0b6b4400b5 31-Aug-2012 Andreas Huber <andih@google.com> Merge "Implement the source->sink(!) keep alive the wfd specs mandate..." into jb-mr1-dev
520c3c74d701532759e12c3b54d43b415afcb6d2 27-Jul-2012 Weian Chen <weian.chen@intel.com> OMXCodec: enhance error handling of OMX IL client

Original design doesn't handle event EMPTY_BUFFER_DONE and
FILL_BUFFER_DONE which leads to buffer status mess issue,
and in turn leads to mediaserver crash.
Here we will handle those 2 events anyway to fix this.

Change-Id: Ia90b46ea7ec6026d6fda5d33fef6773435788b04
Author: Tianmi Chen<tianmi.chen@intel.com>
Signed-off-by: Tianmi Chen<tianmi.chen@intel.com>
Signed-off-by: Weian Chen <weian.chen@intel.com>
Signed-off-by: Shuo Gao <shuo.gao@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Author-tracking-BZ: 49066, 27054
MXCodec.cpp
64d7b68fc25bbb2fc5558c645138eb625ca64674 31-Aug-2012 Jamie Gennis <jgennis@google.com> Merge "Don't hard code the number of buffers for SurfaceMediaSource" into jb-mr1-dev
3a24b93d3a48f739188cd30c1906a9a446dbd23d 31-Aug-2012 Jamie Gennis <jgennis@google.com> Merge "Don't hard code the number of buffers for SurfaceMediaSource" into jb-mr1-dev
b6777017a68ed473d61cc9d6e77c34fd5cd301cc 31-Aug-2012 Andreas Huber <andih@google.com> Implement the source->sink(!) keep alive the wfd specs mandate...

Change-Id: I388d9911ebd243aa9c13a13ec3683e76898470a6
ifi-display/source/WifiDisplaySource.cpp
ifi-display/source/WifiDisplaySource.h
54408d8aa2cda8b78123fc071847b1b74f983b6f 31-Aug-2012 Andreas Huber <andih@google.com> Implement the source->sink(!) keep alive the wfd specs mandate...

Change-Id: I388d9911ebd243aa9c13a13ec3683e76898470a6
ifi-display/source/WifiDisplaySource.cpp
ifi-display/source/WifiDisplaySource.h
bcf09f8c995221e75c7cd328f25c7cc6d2b5f7c9 30-Aug-2012 Andreas Huber <andih@google.com> Only run the wifi display RTSP server on demand, and only on the wifi direct

interface.

Change-Id: I7d3c44cb79cd40e73499f2d7ccf35c69b628e6d7
ifi-display/ANetworkSession.cpp
ifi-display/ANetworkSession.h
ifi-display/source/PlaybackSession.cpp
ifi-display/source/WifiDisplaySource.cpp
ifi-display/source/WifiDisplaySource.h
ifi-display/wfd.cpp
ab1bd84889273bc21efdabe5ff6f4633eb918a85 30-Aug-2012 Andreas Huber <andih@google.com> Only run the wifi display RTSP server on demand, and only on the wifi direct

interface.

Change-Id: I7d3c44cb79cd40e73499f2d7ccf35c69b628e6d7
ifi-display/ANetworkSession.cpp
ifi-display/ANetworkSession.h
ifi-display/source/PlaybackSession.cpp
ifi-display/source/WifiDisplaySource.cpp
ifi-display/source/WifiDisplaySource.h
ifi-display/wfd.cpp
3d26e897fc91cf6ad3576d25b4b240e9a2189970 23-Aug-2012 James Dong <jdong@google.com> Don't hard code the number of buffers for SurfaceMediaSource

Change-Id: I9ce17b3dc82a5d3e4a66569c76ad9745ceedacd6
urfaceMediaSource.cpp
56fc8fb5437e08131a84063041183d5ce8a678cc 23-Aug-2012 James Dong <jdong@google.com> Don't hard code the number of buffers for SurfaceMediaSource

Change-Id: I9ce17b3dc82a5d3e4a66569c76ad9745ceedacd6
urfaceMediaSource.cpp
082830f92373a1b9e512dbbfb940187ffa1c2c6f 30-Aug-2012 Andreas Huber <andih@google.com> Prepare for transmitting audio through AudioSource.

AudioSource can now be configured to output buffers timestamped based
on looper time (absolute) instead of based on systemTime() relative to
start time.

Change-Id: I8eca42648eb50033ac4aafbe5daac64a98a40690
udioSource.cpp
ifi-display/source/PlaybackSession.cpp
bd381af4d618a4da78de99d05d44a10c0c37207b 30-Aug-2012 Andreas Huber <andih@google.com> Prepare for transmitting audio through AudioSource.

AudioSource can now be configured to output buffers timestamped based
on looper time (absolute) instead of based on systemTime() relative to
start time.

Change-Id: I8eca42648eb50033ac4aafbe5daac64a98a40690
udioSource.cpp
ifi-display/source/PlaybackSession.cpp
e05a679401c7baeb0f82ce105eb20ae1ec863cdf 30-Aug-2012 Andreas Huber <andih@google.com> Transmit frames at a higher frame rate for smoother updates, increase

video bandwidth to 5 Mbit/sec.

Change-Id: Ieb9051b0f29d5a20004d1b3befdb745bc67769c7
ifi-display/source/Converter.cpp
ifi-display/source/PlaybackSession.cpp
8dd92a89e09496a83bcd9221bf77dd607313f2e4 30-Aug-2012 Andreas Huber <andih@google.com> Transmit frames at a higher frame rate for smoother updates, increase

video bandwidth to 5 Mbit/sec.

Change-Id: Ieb9051b0f29d5a20004d1b3befdb745bc67769c7
ifi-display/source/Converter.cpp
ifi-display/source/PlaybackSession.cpp
774df0dce0116c69b6d17f2e4a4912e06138e575 30-Aug-2012 Andreas Huber <andih@google.com> Optionally log the transport stream transmitted to the sink.

Change-Id: I5d392e7997d6beb09ba6eca70d6899747098d2b3
ifi-display/source/PlaybackSession.cpp
ifi-display/source/PlaybackSession.h
08631506af1a6369ca291db50284d0f71cf801ec 30-Aug-2012 Andreas Huber <andih@google.com> Optionally log the transport stream transmitted to the sink.

Change-Id: I5d392e7997d6beb09ba6eca70d6899747098d2b3
ifi-display/source/PlaybackSession.cpp
ifi-display/source/PlaybackSession.h
2f9a44101f4fd372834c67150aea76a07b94b5ec 30-Aug-2012 Andreas Huber <andih@google.com> Merge "Fix wifi display shutdown deadlock." into jb-mr1-dev
ec558bf3d3b9bf4be797eedd1a510755debf4323 30-Aug-2012 Andreas Huber <andih@google.com> Merge "Fix wifi display shutdown deadlock." into jb-mr1-dev
2dff0f6a7bf06a878ad0890d93dc9c1ef0b5a107 30-Aug-2012 Andreas Huber <andih@google.com> Fix wifi display shutdown deadlock.

Change-Id: I77eed39f39c0de6b427c425248ff7d21c051c074
ifi-display/source/PlaybackSession.cpp
25934a0854671973a513556bb18986fb6f0a3f67 30-Aug-2012 Andreas Huber <andih@google.com> Fix wifi display shutdown deadlock.

Change-Id: I77eed39f39c0de6b427c425248ff7d21c051c074
ifi-display/source/PlaybackSession.cpp
d8ee4e56f92eeb44ddc0997efe280b9f28ad814d 30-Aug-2012 Andreas Huber <andih@google.com> Merge "Initial checkin of support for acting as a wifi display source" into jb-mr1-dev
a2c31a786cfea83f4028c4c5ae00386ae96542e9 30-Aug-2012 Andreas Huber <andih@google.com> Merge "Initial checkin of support for acting as a wifi display source" into jb-mr1-dev
d7bee3a9d2ad76d073d91f0ee36d5ac5f9df480c 29-Aug-2012 Andreas Huber <andih@google.com> Initial checkin of support for acting as a wifi display source

Change-Id: I08f17efa0c7d007e17408feb7d4fbef0a19f531a
Codec.cpp
ifi-display/ANetworkSession.h
ifi-display/Android.mk
ifi-display/ParsedMessage.h
ifi-display/source/Converter.cpp
ifi-display/source/Converter.h
ifi-display/source/PlaybackSession.cpp
ifi-display/source/PlaybackSession.h
ifi-display/source/RepeaterSource.cpp
ifi-display/source/RepeaterSource.h
ifi-display/source/Serializer.cpp
ifi-display/source/Serializer.h
ifi-display/source/TSPacketizer.cpp
ifi-display/source/TSPacketizer.h
ifi-display/source/WifiDisplaySource.cpp
ifi-display/source/WifiDisplaySource.h
ifi-display/wfd.cpp
35213f1420c669f43314cb75eadea450d21a75cb 29-Aug-2012 Andreas Huber <andih@google.com> Initial checkin of support for acting as a wifi display source

Change-Id: I08f17efa0c7d007e17408feb7d4fbef0a19f531a
Codec.cpp
ifi-display/ANetworkSession.h
ifi-display/Android.mk
ifi-display/ParsedMessage.h
ifi-display/source/Converter.cpp
ifi-display/source/Converter.h
ifi-display/source/PlaybackSession.cpp
ifi-display/source/PlaybackSession.h
ifi-display/source/RepeaterSource.cpp
ifi-display/source/RepeaterSource.h
ifi-display/source/Serializer.cpp
ifi-display/source/Serializer.h
ifi-display/source/TSPacketizer.cpp
ifi-display/source/TSPacketizer.h
ifi-display/source/WifiDisplaySource.cpp
ifi-display/source/WifiDisplaySource.h
ifi-display/wfd.cpp
0a24726a64ba1c50aa6ee1610de2d80602d49fe6 29-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 8836f8e0: am 5b15adfe: Merge "MPEG2TSWriter: Read more immediately if an empty buffer is received"

* commit '8836f8e0bfc64dce81963db89dfc5d0f11c29483':
MPEG2TSWriter: Read more immediately if an empty buffer is received
6db33a9272da8f011be1c51675220b81655fd470 29-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 8836f8e0: am 5b15adfe: Merge "MPEG2TSWriter: Read more immediately if an empty buffer is received"

* commit '8836f8e0bfc64dce81963db89dfc5d0f11c29483':
MPEG2TSWriter: Read more immediately if an empty buffer is received
55fb8470278b2eb747db3f4d7c245e37abdb7f2f 29-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am bf30787f: am 735d1b92: Merge "avcenc: Don\'t erase the InputBufferInfo before reading info from it"

* commit 'bf30787f2694057e775f3b527b649a9f8074237b':
avcenc: Don't erase the InputBufferInfo before reading info from it
4c6c1f1d582a0aae24aa3ecef3fc1166513efba0 29-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am bf30787f: am 735d1b92: Merge "avcenc: Don\'t erase the InputBufferInfo before reading info from it"

* commit 'bf30787f2694057e775f3b527b649a9f8074237b':
avcenc: Don't erase the InputBufferInfo before reading info from it
8836f8e0bfc64dce81963db89dfc5d0f11c29483 29-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 5b15adfe: Merge "MPEG2TSWriter: Read more immediately if an empty buffer is received"

* commit '5b15adfe9e5ee9a92b5f0a2853246fce170d4eef':
MPEG2TSWriter: Read more immediately if an empty buffer is received
bf30787f2694057e775f3b527b649a9f8074237b 29-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 735d1b92: Merge "avcenc: Don\'t erase the InputBufferInfo before reading info from it"

* commit '735d1b926fa3e057c92d74cebacca2f243ead274':
avcenc: Don't erase the InputBufferInfo before reading info from it
5b15adfe9e5ee9a92b5f0a2853246fce170d4eef 29-Aug-2012 Jean-Baptiste Queru <jbq@google.com> Merge "MPEG2TSWriter: Read more immediately if an empty buffer is received"
f547a36c8f0fe11c4c425168037e3ce1d1a697df 29-Aug-2012 Martin Storsjo <martin@martin.st> avcenc: Set OMX_BUFFERFLAG_EOS on the last output frame

Without this, the caller might hang waiting for more output buffers.

Change-Id: Ief6be00b7600be8498a953e8e88f0582ea8fce85
odecs/avc/enc/SoftAVCEncoder.cpp
e61f13d2c710918f5267b3c835fcc20447b4e4d6 29-Aug-2012 Martin Storsjo <martin@martin.st> avcenc: Don't erase the InputBufferInfo before reading info from it

Previously, the timestamp and flags were read from the InputBufferInfo
struct after it had been erased.

This fixes cases where the output timestamp from the avc encoder
could spuriously be garbage every now and then.

Change-Id: I21acf23cfac93bcc201a603feace6499ec6d8e76
odecs/avc/enc/SoftAVCEncoder.cpp
02d18453d54a05c275c03b72a8290f3c9a964446 29-Aug-2012 Martin Storsjo <martin@martin.st> MPEG2TSWriter: Read more immediately if an empty buffer is received

If writing encoded data from an OMXCodec, the last buffer can be
an empty buffer (with the EOS flag set, which isn't propagated to
MediaBuffer). If we don't retry reading, we won't ever get the
EOS error and thus won't properly signal that the source is done.

Change-Id: Ibe01dbcd0637fbf0c2529a277e9f208c48e0e8ab
PEG2TSWriter.cpp
3a1d5240f3dcf0f3538549cc94c63fde8b216762 28-Aug-2012 Andreas Huber <andih@google.com> Merge "Fix retries when server doesn't support range requests." into jb-mr1-dev
d1e7f23bed86769a9b31f7120ac4fe69fbc5276a 28-Aug-2012 Andreas Huber <andih@google.com> Merge "Fix retries when server doesn't support range requests." into jb-mr1-dev
a7607a7f97b3136d5e61c0bca63760bf9fc05b19 28-Aug-2012 Andreas Huber <andih@google.com> Fix retries when server doesn't support range requests.

Change-Id: I2d137f3e799b87af36a279473c0077d860c14477
related-to-bug: 7021436
uCachedSource2.cpp
eccfd92954c1c79bd8e71b9d3df9314d0e93d287 28-Aug-2012 Andreas Huber <andih@google.com> Merge "Test to measure UDP roundtrip time between two devices on the same network." into jb-mr1-dev
17d52f1e9f7540c6b07b28f5f249b6b4da56e8f5 28-Aug-2012 Andreas Huber <andih@google.com> Merge "Test to measure UDP roundtrip time between two devices on the same network." into jb-mr1-dev
bb197f84c4119651e5face418285688ddaf08ea3 28-Aug-2012 Andreas Huber <andih@google.com> Test to measure UDP roundtrip time between two devices on the same network.

Change-Id: I4c9a5190efe18da8b6be7d68bda91df878c4118c
ifi-display/ANetworkSession.cpp
ifi-display/ANetworkSession.h
ifi-display/Android.mk
ifi-display/ParsedMessage.cpp
ifi-display/ParsedMessage.h
ifi-display/udptest.cpp
6f9aebc2da485775c7e8df2d5ac0a4e07c9978bf 28-Aug-2012 Andreas Huber <andih@google.com> Test to measure UDP roundtrip time between two devices on the same network.

Change-Id: I4c9a5190efe18da8b6be7d68bda91df878c4118c
ifi-display/ANetworkSession.cpp
ifi-display/ANetworkSession.h
ifi-display/Android.mk
ifi-display/ParsedMessage.cpp
ifi-display/ParsedMessage.h
2352a815fe99a00702dd00c5d1c6cfdfadba10fd 28-Aug-2012 Jeff Brown <jeffbrown@google.com> Merge "Use new surface flinger API." into jb-mr1-dev
1c356d38527efbbee0894188c0a8f82074b0f441 27-Aug-2012 James Dong <jdong@google.com> Merge "Fixed a native crash due to unexpected state at destroy time when encoder component's source fails to start" into jb-mr1-dev
690921927f289da73556ea71c28981194af8ffcd 27-Aug-2012 Jamie Gennis <jgennis@google.com> Merge "SurfaceMediaSource: a few fixes / cleanups" into jb-mr1-dev
a0ead0a2d2ce1d114ad3a17d755dddce831abb40 24-Aug-2012 Jamie Gennis <jgennis@google.com> SurfaceMediaSource: a few fixes / cleanups

- Remove the setting of mStopped to true in onBuffersReleased
- Cleaned up a few function call logs
- Removed the 'reset' method.

Change-Id: I56bab1d5cb2f3e6d59d54698c2e045d796d1849f
urfaceMediaSource.cpp
a6195decfe4f9021bbbd7deb050495c33371366b 25-Aug-2012 Jeff Brown <jeffbrown@google.com> Use new surface flinger API.

Change-Id: I594c6e15db5f617d2feaac1a65b5316daa3812d0
ests/SurfaceMediaSource_test.cpp
fd7ec80f3d0e30c8df61b86951d926ab9c8c6d25 25-Aug-2012 Marco Nelissen <marcone@google.com> Fix deadlock

I wanted to save some space, and ended up with a deadlock.
This change basically restores setDataSource(fd, offset, size) to the
way it was before I added the new setDataSource(DataSource) method,
instead of calling through to it.

Change-Id: Iacf4627c8745369fa84b467530189a9f64f8726b
uMediaExtractor.cpp
aa8879d381918335c9d829fc279b76d53a15a550 24-Aug-2012 James Dong <jdong@google.com> Fixed a native crash due to unexpected state at destroy time when encoder component's source fails to start

o Encoder component initializes to be in the state of EXECUTING before its source gets started, because we wanted to be able
to configure the source to use the advertised number of input buffers. However, if the source fails to start, then the encoder
ends up in the state of EXECUTING when OMXCodec object gets destroyed. As a result, the assertion on the expected state in
OMXCodec's constructor fails. The fix is to stop the video encoder component right way when its source fails to start so to
bring the state of the encoder component back to the expected state.

o related-to-bug: 7045494

Change-Id: I6d4a221eb809d7137f53e58098a04816998f7a25
MXCodec.cpp
ff3f75c3e827c1c1f3e3a11b1de46b19444af197 24-Aug-2012 Marco Nelissen <marcone@google.com> Merge "Allow directly setting a DataSource for NuMediaExtractor" into jb-mr1-dev
dbcb4c17f16230dfc6af908f176681c49f61b13e 24-Aug-2012 Marco Nelissen <marcone@google.com> Allow directly setting a DataSource for NuMediaExtractor

This adds NuMediaExtractor::setDataSource(const sp<DataSource> &source),
which some new code under frameworks/av will use to let applications
provide a custom data source for extractors.

Change-Id: I8fb743441d04b4eadbda3c2d76858c3d60e2a3b2
uMediaExtractor.cpp
960e46f97e3ca22e99548841816ab77ac3a30d86 24-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 07315f82: am 4b60ac04: Merge "Fixed redefinition of \'i\' with a different type error"

* commit '07315f8262f843f3624c70974642e4fb733a661c':
Fixed redefinition of 'i' with a different type error
a8d21ea6dd37683a11a7ba2a63ab0af786ef52d7 24-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 78015984: am 6e55a0f7: Merge "Fixed member access into incomplete type build error"

* commit '780159840d754eae8e4e3f693ea10932634053f8':
Fixed member access into incomplete type build error
003050568829aa7b3c13c1fbcb24abcfd17cad80 26-Jul-2012 ywan171 <yi.a.wang@intel.com> libstagefright: fix the duration "00:00" for some httplive link

if the playlist does not end by '\n', player can not show
the correction duration

Change-Id: I6dd9abfce32a1ef7b7d6ed157c966fce3c190389
Author: Yi Wang <yi.a.wang@intel.com>
Signed-off-by: Yi Wang <yi.a.wang@intel.com>
Signed-off-by: Shuo Gao <shuo.gao@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Author-tracking-BZ: 48555
ttplive/M3UParser.cpp
07315f8262f843f3624c70974642e4fb733a661c 23-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 4b60ac04: Merge "Fixed redefinition of \'i\' with a different type error"

* commit '4b60ac04a878eaf8344b56189509ccd6925855c2':
Fixed redefinition of 'i' with a different type error
780159840d754eae8e4e3f693ea10932634053f8 23-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 6e55a0f7: Merge "Fixed member access into incomplete type build error"

* commit '6e55a0f71eef07c6041077e6e9e7fad8c973a752':
Fixed member access into incomplete type build error
4b60ac04a878eaf8344b56189509ccd6925855c2 23-Aug-2012 Jean-Baptiste Queru <jbq@google.com> Merge "Fixed redefinition of 'i' with a different type error"
f10f36d34812bae602ff018fb503ad07eaf550b1 23-Aug-2012 Jeffrey Tinker <jtinker@google.com> Send current bandwidth info event when buffering occurs

There is a dependent change in vendor/widevine repo.

Change-Id: If063f4b1c8857e5bfc7be54ab0f97a4ed169b303
related-to-bug: 5883234
wesomePlayer.cpp
VMExtractor.cpp
nclude/WVMExtractor.h
cba4ed0039c8b8fac01b3193d19fc2364f934506 26-Jul-2012 Tareq A. Siraj <tareq.a.siraj@intel.com> Fixed redefinition of 'i' with a different type error

Renamed the redefinition of 'i' to 'k'.

Change-Id: I8ae8ed1dee42c896fa15e55be8d58b33b29254f4
Author: Tareq A. Siraj <tareq.a.siraj@intel.com>
Reviewed-by: Kevin P Schoedel <kevin.p.schoedel@intel.com>
atroska/MatroskaExtractor.cpp
3677437296fd1547d762b1b227a3de83dbc960d6 27-Jul-2012 Tareq A. Siraj <tareq.a.siraj@intel.com> Fixed member access into incomplete type build error

Included the ARTPAssembler.h file to fix the 'member access into
incomplete type "android::ARTPAssembler"' error reported by clang.

Change-Id: I10cb1e38bf360858bb7ebdeae82ba1e64431f87d
Author: Tareq A. Siraj <tareq.a.siraj@intel.com>
Reviewed-by: Edwin Vane<edwin.vane@intel.com>
tsp/ARTPConnection.cpp
cd3ed11664d16939f1f5763a896d7fc75dd3642e 21-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 8d4d590d: am 1e75e972: Merge "avcenc: Update a comment about the inline assembly"

* commit '8d4d590dcbbd2b178976d0bd024625e9d6216365':
avcenc: Update a comment about the inline assembly
562d654876c6134b1e879f56f72635dabc5535f2 21-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 8a825ec0: am aa411adf: Merge "h264 streaming: make profile-level-id optional"

* commit '8a825ec079da6f2b89149c53568cb9721c10d923':
h264 streaming: make profile-level-id optional
8d4d590dcbbd2b178976d0bd024625e9d6216365 21-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 1e75e972: Merge "avcenc: Update a comment about the inline assembly"

* commit '1e75e9721254ae5df05c3d88b30ed7f778406261':
avcenc: Update a comment about the inline assembly
8a825ec079da6f2b89149c53568cb9721c10d923 21-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am aa411adf: Merge "h264 streaming: make profile-level-id optional"

* commit 'aa411adfc39a4ee6c4ff57952296ba40c2fbfdb3':
h264 streaming: make profile-level-id optional
1e75e9721254ae5df05c3d88b30ed7f778406261 21-Aug-2012 Jean-Baptiste Queru <jbq@google.com> Merge "avcenc: Update a comment about the inline assembly"
aa411adfc39a4ee6c4ff57952296ba40c2fbfdb3 21-Aug-2012 Jean-Baptiste Queru <jbq@google.com> Merge "h264 streaming: make profile-level-id optional"
391348890849f99663dd46c475a1fc0737d6908d 21-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 41ee747f: am 5ebce52c: Merge "avcenc: Fix the gcc inline assembly constraints"

* commit '41ee747fc019eb5856454c698adf23f55073c69e':
avcenc: Fix the gcc inline assembly constraints
136e83a2987acdb7a6956934098bfc0d347c4e7d 21-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 894a7e45: am 9e13e927: Merge "avcenc: Properly indent assembly blocks"

* commit '894a7e450704b0c7858a2187a5432b479ac69c1d':
avcenc: Properly indent assembly blocks
41ee747fc019eb5856454c698adf23f55073c69e 21-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 5ebce52c: Merge "avcenc: Fix the gcc inline assembly constraints"

* commit '5ebce52c46360b349daa8c944ca81e3c74accec0':
avcenc: Fix the gcc inline assembly constraints
894a7e450704b0c7858a2187a5432b479ac69c1d 21-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 9e13e927: Merge "avcenc: Properly indent assembly blocks"

* commit '9e13e927206b7c7c15359af2b0ccc8f525e78a7d':
avcenc: Properly indent assembly blocks
42d515121f11389df082dd02319904c99dd50cd6 21-Aug-2012 Martin Storsjo <martin@martin.st> avcenc: Update a comment about the inline assembly

Since the inline assembly was fixed in commit 3fdb405597f the
comment was no longer accurate.

Change-Id: Id4f8a111d1fa6e0c2e97f7db64262e8d1604c519
odecs/avc/enc/src/sad_halfpel_inline.h
odecs/avc/enc/src/sad_inline.h
odecs/avc/enc/src/sad_mb_offset.h
3fdb405597f0e062a9bb8af20199c5e67f0f764c 13-Apr-2012 Martin Storsjo <martin@martin.st> avcenc: Fix the gcc inline assembly constraints

Use +r for registers whose value is used as input to the block.

Also switch input registers to output registers with +r, for
registers that are modified by the assembly block (SUB_SAD in
sad_inline.h).

Without this, the inline assembly fails on modern gcc versions
(tested on gcc 4.6), where the intended input value never is
loaded into the registers, causing segfaults at runtime.

Currently this assembly isn't used, but this change makes it
work properly if enabled.

Change-Id: I37c247cd5c8aff213445e31ab3bd33d8f0f37e05
odecs/avc/enc/src/sad_halfpel_inline.h
odecs/avc/enc/src/sad_inline.h
odecs/avc/enc/src/sad_mb_offset.h
ccde1257952d2c073e51ecba6180060570ffa41f 13-Apr-2012 Martin Storsjo <martin@martin.st> avcenc: Properly indent assembly blocks

Also line break multiline assembly blocks - previously they were
virtually unreadable.

Change-Id: Icb269909b78746e26b28ab7dcb6979c4655a0b0c
odecs/avc/enc/src/sad_halfpel_inline.h
odecs/avc/enc/src/sad_inline.h
odecs/avc/enc/src/sad_mb_offset.h
3411fc2f3a44b22d69a359a3eb26f756d6116e4f 20-Aug-2012 Nick Kralevich <nnk@google.com> am add7c4d3: am 46b7eeb8: Merge "hardening: eliminate text relocations from h264"

* commit 'add7c4d329586119fb8b5501b049905004400233':
hardening: eliminate text relocations from h264
add7c4d329586119fb8b5501b049905004400233 20-Aug-2012 Nick Kralevich <nnk@google.com> am 46b7eeb8: Merge "hardening: eliminate text relocations from h264"

* commit '46b7eeb8be7449515082ecb1a61700affb44115f':
hardening: eliminate text relocations from h264
46b7eeb8be7449515082ecb1a61700affb44115f 20-Aug-2012 Nick Kralevich <nnk@google.com> Merge "hardening: eliminate text relocations from h264"
11623fa3eb2c25ace502fdbdf290e154ac66960e 20-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am af5f9f05: am cd622346: Merge "MPEG2TSWriter: Fix an off-by-one in the condition for padding"

* commit 'af5f9f05937521acb4855848d77bed1d4ed7db0a':
MPEG2TSWriter: Fix an off-by-one in the condition for padding
07c6ddb431c784a24a70a5a91d8a454e9c1dde5d 20-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 3b939a5e: am 02a4ec21: Merge "avcenc: Remove a leftover define"

* commit '3b939a5e893ccfe87f5b7b3fe229439a9b2fc87a':
avcenc: Remove a leftover define
af5f9f05937521acb4855848d77bed1d4ed7db0a 20-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am cd622346: Merge "MPEG2TSWriter: Fix an off-by-one in the condition for padding"

* commit 'cd622346235829f60246a061560adf5921ba129c':
MPEG2TSWriter: Fix an off-by-one in the condition for padding
3b939a5e893ccfe87f5b7b3fe229439a9b2fc87a 20-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 02a4ec21: Merge "avcenc: Remove a leftover define"

* commit '02a4ec216cf5ca903e1765ca3e7ff2985436b236':
avcenc: Remove a leftover define
cd622346235829f60246a061560adf5921ba129c 20-Aug-2012 Jean-Baptiste Queru <jbq@google.com> Merge "MPEG2TSWriter: Fix an off-by-one in the condition for padding"
c867a50ec5317e74602798e2e8435cde313b91e9 20-Aug-2012 Martin Storsjo <martin@martin.st> MPEG2TSWriter: Fix an off-by-one in the condition for padding

This makes a remuxed file play without any decoding warnings,
while there still were some occasional warnings with the previous
version.

Change-Id: I31d73446ded1eeb3da10783c5ef841270563ca12
PEG2TSWriter.cpp
8033393a74a6872ad8d702b10da34d98dde0bf41 20-Aug-2012 Patrik2 Carlsson <patrik2.carlsson@sonymobile.com> h264 streaming: make profile-level-id optional

profile-level-id is made optional according to rfc3984:
"If no profile-level-id is present, the Baseline Profile without
additional constraints at Level 1 MUST be implied."

Change-Id: If868468a48917ceccb963b8ac15767583da29723
tsp/APacketSource.cpp
53ae1640ffbfc690962f7f94694b02680c6f66cb 17-Aug-2012 James Dong <jdong@google.com> Don't log streaming url.

o related-to-bug: 6994761

Change-Id: I79d5549a70b3bde67ddf496cfc6283ac92b1f569
wesomePlayer.cpp
hromium_http/ChromiumHTTPDataSource.cpp
ttplive/LiveSession.cpp
300df42a7f51f2666d7ef4e73ac04101bbbb11bb 24-Jul-2012 Xuefeng Deng <xuefeng.deng@intel.com> libstagefright: Use LOG_BASIC when use chromium http stack

When using chromium http stack, the LogLevel is LOG_ALL, and
in chromium_net, LOG_ALL will HexEncode all received data. thus
playing a 10Mbps 1080P video stream will generate 20Mbps Hex Buffer
for event logging. This is a heavy operation for logging.

Change-Id: I28e8173e1aa806dd23014378d530d30187360060
Author: Xuefeng Deng <xuefeng.deng@intel.com>
Singed-off-by: Shuo Gao <shuo.gao@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Author-tracking-BZ: 35737
hromium_http/support.cpp
0a1b2aecb75b949df6b465a4e4ccc739af034443 17-Aug-2012 Martin Storsjo <martin@martin.st> avcenc: Remove a leftover define

This should have been removed as part of f5af6314db, but
the second __arm__ define was introduced after the original commit
was written, and not removing the second one was an oversight in
rebasing the patch on top of the new code.

Change-Id: Iccf08ffdef130446dd6e97dc1e15e6a1d4f9386f
odecs/avc/enc/Android.mk
02d3c328d2c127c26ab787aa95e5240e6b7ff223 17-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 523c09d5: am 64b3fe55: Merge "stagefright amrnb: Remove unused leftover source files"

* commit '523c09d56c78933eea7fb4f028e0bfa595ca82b1':
stagefright amrnb: Remove unused leftover source files
f81ed0032f86ab0943baa1ad8a25de8e06498409 17-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am f20e4ad9: am c1d2777c: Merge "stagefright amrnb: Move the bitstream_format enum into frame_type_3gpp.h"

* commit 'f20e4ad9f23fe0267f8f3434a6eb961eb69bde3a':
stagefright amrnb: Move the bitstream_format enum into frame_type_3gpp.h
523c09d56c78933eea7fb4f028e0bfa595ca82b1 17-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 64b3fe55: Merge "stagefright amrnb: Remove unused leftover source files"

* commit '64b3fe55f7edd16be32e07c28c2c90f84f3b9b80':
stagefright amrnb: Remove unused leftover source files
f20e4ad9f23fe0267f8f3434a6eb961eb69bde3a 17-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am c1d2777c: Merge "stagefright amrnb: Move the bitstream_format enum into frame_type_3gpp.h"

* commit 'c1d2777c8004a9491e1381cca33a6768faed50c3':
stagefright amrnb: Move the bitstream_format enum into frame_type_3gpp.h
64b3fe55f7edd16be32e07c28c2c90f84f3b9b80 17-Aug-2012 Jean-Baptiste Queru <jbq@google.com> Merge "stagefright amrnb: Remove unused leftover source files"
c1d2777c8004a9491e1381cca33a6768faed50c3 17-Aug-2012 Jean-Baptiste Queru <jbq@google.com> Merge "stagefright amrnb: Move the bitstream_format enum into frame_type_3gpp.h"
7df98f17a42e47d8bc49891c370786ee3d3a1379 17-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 0df213ba: am dde79acf: Merge "hardening: eliminate text relocations from mp3"

* commit '0df213babc4fb41b7daa05cb3c08071f2b60f6a5':
hardening: eliminate text relocations from mp3
1a42aee5e1e975158da4754f9bae46c945e27281 17-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am a109e9d5: am b7ca7dc9: Merge "avcenc: Clarify the ifdefs surrounding inline assembly"

* commit 'a109e9d5d5dbdbbd63a3f32fce131c718f0f8c99':
avcenc: Clarify the ifdefs surrounding inline assembly
9bd763d1d3b7dcb30320aa70597680a53ffb5bbf 17-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am fba9d50d: am 4f981882: Merge "hardening: eliminate text relocations from amrwb"

* commit 'fba9d50d1b2e487bc08b59ec93d7ed3183c76dbe':
hardening: eliminate text relocations from amrwb
f365fecf8519a0a1c7e511657f79638844be02e3 17-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 1191287b: am c3bfa026: Merge "aacenc/amrwbenc: Remove the now unused LINUX define"

* commit '1191287bc438c164a89cf86704936aeddbefb136':
aacenc/amrwbenc: Remove the now unused LINUX define
fa172b0d2dcd761622b61701b7c7dd4d0f19610b 17-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am eeb9fde0: am 3f5d2e17: Merge "aacenc/amrwbenc: Remove unused and dubious typedefs"

* commit 'eeb9fde0cb8e0ace44eb720bcac272ee70282d4d':
aacenc/amrwbenc: Remove unused and dubious typedefs
0df213babc4fb41b7daa05cb3c08071f2b60f6a5 17-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am dde79acf: Merge "hardening: eliminate text relocations from mp3"

* commit 'dde79acfb97083d690e3cceabff78931b10d1539':
hardening: eliminate text relocations from mp3
a109e9d5d5dbdbbd63a3f32fce131c718f0f8c99 17-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am b7ca7dc9: Merge "avcenc: Clarify the ifdefs surrounding inline assembly"

* commit 'b7ca7dc9652456181080bf28ec376bc5a36cf6a2':
avcenc: Clarify the ifdefs surrounding inline assembly
fba9d50d1b2e487bc08b59ec93d7ed3183c76dbe 17-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 4f981882: Merge "hardening: eliminate text relocations from amrwb"

* commit '4f981882da8080e1d41d000bfbad92df61adcfba':
hardening: eliminate text relocations from amrwb
1191287bc438c164a89cf86704936aeddbefb136 17-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am c3bfa026: Merge "aacenc/amrwbenc: Remove the now unused LINUX define"

* commit 'c3bfa0260a530af3e9c091c1c9d90d1283021dd6':
aacenc/amrwbenc: Remove the now unused LINUX define
eeb9fde0cb8e0ace44eb720bcac272ee70282d4d 17-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 3f5d2e17: Merge "aacenc/amrwbenc: Remove unused and dubious typedefs"

* commit '3f5d2e1777bcf8856e966b93b2bce0b2c9cd1a49':
aacenc/amrwbenc: Remove unused and dubious typedefs
dde79acfb97083d690e3cceabff78931b10d1539 16-Aug-2012 Jean-Baptiste Queru <jbq@google.com> Merge "hardening: eliminate text relocations from mp3"
b7ca7dc9652456181080bf28ec376bc5a36cf6a2 16-Aug-2012 Jean-Baptiste Queru <jbq@google.com> Merge "avcenc: Clarify the ifdefs surrounding inline assembly"
4f981882da8080e1d41d000bfbad92df61adcfba 16-Aug-2012 Jean-Baptiste Queru <jbq@google.com> Merge "hardening: eliminate text relocations from amrwb"
fef71ef418d8ecff6d20fbd50b7fbabf6ad58f74 07-Mar-2012 Martin Storsjo <martin@martin.st> aacenc/amrwbenc: Remove the now unused LINUX define

This is no longer used by the codec code (except for the
amrwbenc sample).

Change-Id: I78c7f62f257c490bf44477217975a93abcc7779e
odecs/aacenc/Android.mk
odecs/aacenc/SampleCode/Android.mk
odecs/amrwbenc/Android.mk
odecs/amrwbenc/SampleCode/Android.mk
odecs/common/Android.mk
odecs/common/Config.mk
adee070820d9b038ac811b3785de618349f35293 23-Jun-2011 Martin Storsjo <martin@martin.st> aacenc/amrwbenc: Remove unused and dubious typedefs

These typedefs aren't used anywhere, and their description
doesn't really match their actual definition. The VO_TCHAR
type is even defined as pointer for one configuration and
as non-pointer for another configuration.

This gets rid of the last use of the LINUX define in the
VO codecs (except for the amrwbenc sample application).
Within the codecs, the use of this define is unclear - does it
indicate code specific to android but not normal linux, linux
but not other unixes, unix but not windows, or gcc but not
other compilers, etc.

Originally, prior to cleanup, the define has meant many
different of these - these uses has now been cleaned up to
use the proper feature detection macros (e.g. looking for
defines automatically set by the compiler, instead of
relying on manually setting this define).

Change-Id: I1a675d653d6d305f558aa7f74c7255858dc62758
odecs/common/include/voType.h
ce088d274b4530fb813a030216d675b0e7262711 15-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am add9f820: am 2c3d9b7b: Merge "MPEG2TSWriter: Correctly add padding using the adaptation field"

* commit 'add9f820eaeb180b5e72a4420995a54062cfabd7':
MPEG2TSWriter: Correctly add padding using the adaptation field
add9f820eaeb180b5e72a4420995a54062cfabd7 15-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 2c3d9b7b: Merge "MPEG2TSWriter: Correctly add padding using the adaptation field"

* commit '2c3d9b7b9e34c9122c0a568d6b1fb24404021f55':
MPEG2TSWriter: Correctly add padding using the adaptation field
99b99df476b1bfb49da74fda9d6960d82b5ffd10 23-Jan-2012 Paul Fariello <fariello@archos.com> MPEG2TSWriter: Correctly add padding using the adaptation field

Change-Id: I268cce36ada910ba168c4c9dcedab0b20f6e6ebb
PEG2TSWriter.cpp
0088e930b17228f23ddfff4840ed6172da354730 14-Aug-2012 Jean-Michel Trivi <jmtrivi@google.com> Merge "Fix AAC DRC metadata being ignored" into jb-mr1-dev
5696a4efef79ee474ac6bcf2639c741e159bed1b 10-Aug-2012 Jean-Michel Trivi <jmtrivi@google.com> Fix AAC DRC metadata being ignored

The decoder will bypass all DRC processing during decode unless
any of the DRC parameters is set.
The fix consists in setting the DRC reference level to its
default value when after the decoder is initialized.

Change-Id: Ibb8355ab8c3c65020c5eef0752957040f7316c2a
odecs/aacdec/SoftAAC2.cpp
93b68548124ec9b01b9bf4ddf010afa06a503547 14-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 979df012: am 98159acd: Merge "amrnb: Restart the p_xn pointer when retraversing the array on overflow"

* commit '979df012eb0588ac7f87d5f6e8bff77e2049ee46':
amrnb: Restart the p_xn pointer when retraversing the array on overflow
979df012eb0588ac7f87d5f6e8bff77e2049ee46 14-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 98159acd: Merge "amrnb: Restart the p_xn pointer when retraversing the array on overflow"

* commit '98159acd68307bf0fcec40ae0fffc1a715517d1d':
amrnb: Restart the p_xn pointer when retraversing the array on overflow
98159acd68307bf0fcec40ae0fffc1a715517d1d 13-Aug-2012 Jean-Baptiste Queru <jbq@google.com> Merge "amrnb: Restart the p_xn pointer when retraversing the array on overflow"
22e06318d04074d1a7c90caa173857abdcfd153e 13-Aug-2012 Ard Biesheuvel <ard.biesheuvel@gmail.com> hardening: eliminate text relocations from h264

Change-Id: I8bdf9746f28f2f7bed6c1109c0f4badbab765a7c
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_DecodeCoeffsToPair_s.S
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_Interpolate_Chroma_s.S
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/omxVCM4P10_DequantTransformResidualFromPairAndAdd_s.S
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/omxVCM4P10_PredictIntraChroma_8x8_s.S
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/omxVCM4P10_PredictIntra_16x16_s.S
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/omxVCM4P10_PredictIntra_4x4_s.S
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/omxVCM4P10_TransformDequantChromaDCFromPair_s.S
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/omxVCM4P10_TransformDequantLumaDCFromPair_s.S
9a2c14b2c96625d5be73e1a7627f5d2a3091c4a2 13-Aug-2012 Ard Biesheuvel <ard.biesheuvel@gmail.com> hardening: eliminate text relocations from mp3

Change-Id: I671ed4c8c7bb15172a8b64d513e2844319495102
odecs/mp3dec/src/asm/pvmp3_dct_16_gcc.s
odecs/mp3dec/src/asm/pvmp3_mdct_18_gcc.s
odecs/mp3dec/src/asm/pvmp3_polyphase_filter_window_gcc.s
74bc3e133bd59a65dbed70b5fc89549f04a545e2 13-Aug-2012 Ard Biesheuvel <ard.biesheuvel@gmail.com> hardening: eliminate text relocations from amrwb

Change-Id: I47235fc4afe6b916da1e999401fb3c8b12c94e62
odecs/amrwbenc/src/asm/ARMV5E/Filt_6k_7k_opt.s
odecs/amrwbenc/src/asm/ARMV7/Filt_6k_7k_neon.s
odecs/amrwbenc/src/asm/ARMV7/pred_lt4_1_neon.s
8cf9c1a8640553a146f3a7aad01b393c664a46af 13-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 10004fe6: am 5efa7bf9: Merge "amrnb: Fix audio distortion in an AMR-NB clip"

* commit '10004fe612bc38bedc258fd1c380ebccacfa0c1e':
amrnb: Fix audio distortion in an AMR-NB clip
10004fe612bc38bedc258fd1c380ebccacfa0c1e 13-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 5efa7bf9: Merge "amrnb: Fix audio distortion in an AMR-NB clip"

* commit '5efa7bf945f53c419501b0a4f9718962f24f0df5':
amrnb: Fix audio distortion in an AMR-NB clip
5efa7bf945f53c419501b0a4f9718962f24f0df5 13-Aug-2012 Jean-Baptiste Queru <jbq@google.com> Merge "amrnb: Fix audio distortion in an AMR-NB clip"
b3e12a4d15a329821979bf287c49a9630486e23f 11-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 3ca352c4: am 24893fef: Merge "MPEG2TSWriter: Write a proper CRC in PAT and PMT"

* commit '3ca352c4cd01f6df3b691f835efc68a5771e724e':
MPEG2TSWriter: Write a proper CRC in PAT and PMT
3ca352c4cd01f6df3b691f835efc68a5771e724e 11-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 24893fef: Merge "MPEG2TSWriter: Write a proper CRC in PAT and PMT"

* commit '24893fef8e0f816a8a21749fa3eb9eed9173a0fd':
MPEG2TSWriter: Write a proper CRC in PAT and PMT
24893fef8e0f816a8a21749fa3eb9eed9173a0fd 11-Aug-2012 Jean-Baptiste Queru <jbq@google.com> Merge "MPEG2TSWriter: Write a proper CRC in PAT and PMT"
751fa786aa9599c694219085601f9f5ebe96a516 10-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 31a593b9: am 2001d2ac: Merge "MPEG2TSWriter: Write proper continuity counters for PAT and PMT"

* commit '31a593b901eeb924ae5214962c628397dd0197f2':
MPEG2TSWriter: Write proper continuity counters for PAT and PMT
31a593b901eeb924ae5214962c628397dd0197f2 10-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 2001d2ac: Merge "MPEG2TSWriter: Write proper continuity counters for PAT and PMT"

* commit '2001d2ac01e36c13c1abda5f73b6404cba2648e1':
MPEG2TSWriter: Write proper continuity counters for PAT and PMT
2001d2ac01e36c13c1abda5f73b6404cba2648e1 10-Aug-2012 Jean-Baptiste Queru <jbq@google.com> Merge "MPEG2TSWriter: Write proper continuity counters for PAT and PMT"
fa514f007bd144eb99cdd68f2fe5302a4508db28 10-Aug-2012 James Dong <jdong@google.com> Handle malformed raw AAC/AMR writer better

Change-Id: I196fe196c26b83be09fcd54174ceb4e135073c2b
ACWriter.cpp
MRWriter.cpp
e983aa4ff4d80af7702888e230b9aaa93a7b7e57 08-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 51af4af2: am e28df5b9: Merge "Store correct time stamps in recorded mp4 files"

* commit '51af4af2414cdaaf0185b971a41fc0b4f8c0b7e4':
Store correct time stamps in recorded mp4 files
51af4af2414cdaaf0185b971a41fc0b4f8c0b7e4 08-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am e28df5b9: Merge "Store correct time stamps in recorded mp4 files"

* commit 'e28df5b996af3480b457c7a9908dbb9d52ad8d7c':
Store correct time stamps in recorded mp4 files
e28df5b996af3480b457c7a9908dbb9d52ad8d7c 08-Aug-2012 Jean-Baptiste Queru <jbq@google.com> Merge "Store correct time stamps in recorded mp4 files"
1e357f4610e788c3e5dea5dd2f01b26bb75c5e36 08-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am ef620093: am efee0095: Merge "Correct ID3::StringSize calculation for UCS-2 data."

* commit 'ef62009372d050b431939835d4e2c5ee77da8831':
Correct ID3::StringSize calculation for UCS-2 data.
4bb0e2aa1410191a8cff1f921d1b246232ed42e9 08-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 662b15c3: am a858aa96: Merge "avcenc: Remove redundant zero-initialization of allocated memory"

* commit '662b15c377e1ebe6aed8ff5cf82c684f0c8894dc':
avcenc: Remove redundant zero-initialization of allocated memory
49e74946370e7af2378e28733ba6d8df8951b068 08-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 44237a8d: am b71298ee: Merge "avcenc: Initialize all memory allocated by the CBAVC_Malloc callback function"

* commit '44237a8d58dc218257687f2cbe8fd33d73a713e8':
avcenc: Initialize all memory allocated by the CBAVC_Malloc callback function
f5a66877655695af619909db6c831f78373d733e 08-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 68d44b06: am 0ab18f85: Merge "avcenc: Remove useless casts"

* commit '68d44b061e92fb6832240457d4f683635bf5328f':
avcenc: Remove useless casts
93f902d58cd287e8dd046621824b7de7aa985d36 08-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 96d18cca: am 0822156c: Merge "avcenc: Fix indentation"

* commit '96d18cca4546045df118660017e74ddd751dfbb4':
avcenc: Fix indentation
3269b5314f02eb3724be8d45880f15762fac09c0 08-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 80c46255: am 874a074a: Merge "avcenc: Switch malloc/free callbacks to use pointers instead of ints"

* commit '80c46255bcf3d4d5a3ffe9a1ef3aefd9310c6ed4':
avcenc: Switch malloc/free callbacks to use pointers instead of ints
ef62009372d050b431939835d4e2c5ee77da8831 08-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am efee0095: Merge "Correct ID3::StringSize calculation for UCS-2 data."

* commit 'efee009528f446542d51f1ce50e2189e8a2f71dd':
Correct ID3::StringSize calculation for UCS-2 data.
662b15c377e1ebe6aed8ff5cf82c684f0c8894dc 08-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am a858aa96: Merge "avcenc: Remove redundant zero-initialization of allocated memory"

* commit 'a858aa963d2a7e767d0d8694e29cb6fe87c9ef9f':
avcenc: Remove redundant zero-initialization of allocated memory
44237a8d58dc218257687f2cbe8fd33d73a713e8 08-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am b71298ee: Merge "avcenc: Initialize all memory allocated by the CBAVC_Malloc callback function"

* commit 'b71298eeeb16d942dd5144e550731e6e29b6436e':
avcenc: Initialize all memory allocated by the CBAVC_Malloc callback function
68d44b061e92fb6832240457d4f683635bf5328f 08-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 0ab18f85: Merge "avcenc: Remove useless casts"

* commit '0ab18f853571149de700930fbb783ecd6b2c5582':
avcenc: Remove useless casts
96d18cca4546045df118660017e74ddd751dfbb4 08-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 0822156c: Merge "avcenc: Fix indentation"

* commit '0822156cfd25c111cd33932ee9a89b3100d0350c':
avcenc: Fix indentation
80c46255bcf3d4d5a3ffe9a1ef3aefd9310c6ed4 08-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 874a074a: Merge "avcenc: Switch malloc/free callbacks to use pointers instead of ints"

* commit '874a074ad88117d9fabf178b5b4a1c885dc512f5':
avcenc: Switch malloc/free callbacks to use pointers instead of ints
17fa4ab45a87e042a0503356e641fa6ff72ef572 08-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am b7ee9c44: Merge "mediacodec: Return an error on getOutputFormat if there is no output format yet"

* commit 'b7ee9c4436c50cc5ff6e72059bf27c2c16dc1b92':
mediacodec: Return an error on getOutputFormat if there is no output format yet
efee009528f446542d51f1ce50e2189e8a2f71dd 08-Aug-2012 Jean-Baptiste Queru <jbq@google.com> Merge "Correct ID3::StringSize calculation for UCS-2 data."
a858aa963d2a7e767d0d8694e29cb6fe87c9ef9f 08-Aug-2012 Jean-Baptiste Queru <jbq@google.com> Merge "avcenc: Remove redundant zero-initialization of allocated memory"
b71298eeeb16d942dd5144e550731e6e29b6436e 08-Aug-2012 Jean-Baptiste Queru <jbq@google.com> Merge "avcenc: Initialize all memory allocated by the CBAVC_Malloc callback function"
0ab18f853571149de700930fbb783ecd6b2c5582 08-Aug-2012 Jean-Baptiste Queru <jbq@google.com> Merge "avcenc: Remove useless casts"
0822156cfd25c111cd33932ee9a89b3100d0350c 08-Aug-2012 Jean-Baptiste Queru <jbq@google.com> Merge "avcenc: Fix indentation"
874a074ad88117d9fabf178b5b4a1c885dc512f5 08-Aug-2012 Jean-Baptiste Queru <jbq@google.com> Merge "avcenc: Switch malloc/free callbacks to use pointers instead of ints"
3478eaa23c19dbbe473be70e8f3cc0c904d2465c 08-Aug-2012 John Grossman <johngro@google.com> Fix a small build warning.

Change-Id: I2b228db8f11a829399cdc6efe67d7b6e0a1917ba
imedtext/TimedTextPlayer.cpp
219f195159f93d627af2b243732e3f9020511a46 08-Aug-2012 James Dong <jdong@google.com> Make sure that the trackId starts from 1

o this patch avoids sending incorrect track events to applications because
track events contain the trackId

Change-Id: I1cf054da8ab413d31a5b7fe8ed729486d1475c46
PEG4Writer.cpp
a9e0ea58738a50de84a80d3b4db1936e7433dce4 08-Aug-2012 Andreas Huber <andih@google.com> Merge "Remove the no longer used PV software aac decoder." into jb-mr1-dev
1f8834711f23f66d528aca98cca9602fb18cab66 07-Aug-2012 Andreas Huber <andih@google.com> Remove the no longer used PV software aac decoder.

Change-Id: Ia260f706780b66dc16a108aaa8780f68970380bd
odecs/aacdec/Android.mk
odecs/aacdec/SoftAAC.cpp
odecs/aacdec/SoftAAC.h
odecs/aacdec/aac_mem_funcs.h
odecs/aacdec/analysis_sub_band.cpp
odecs/aacdec/analysis_sub_band.h
odecs/aacdec/apply_ms_synt.cpp
odecs/aacdec/apply_ms_synt.h
odecs/aacdec/apply_tns.cpp
odecs/aacdec/apply_tns.h
odecs/aacdec/bit_reversal_swap.h
odecs/aacdec/buf_getbits.cpp
odecs/aacdec/buf_getbits.h
odecs/aacdec/buffer_normalization.h
odecs/aacdec/byte_align.cpp
odecs/aacdec/calc_auto_corr.cpp
odecs/aacdec/calc_auto_corr.h
odecs/aacdec/calc_gsfb_table.cpp
odecs/aacdec/calc_sbr_anafilterbank.cpp
odecs/aacdec/calc_sbr_anafilterbank.h
odecs/aacdec/calc_sbr_envelope.cpp
odecs/aacdec/calc_sbr_envelope.h
odecs/aacdec/calc_sbr_synfilterbank.cpp
odecs/aacdec/calc_sbr_synfilterbank.h
odecs/aacdec/chans.h
odecs/aacdec/check_crc.cpp
odecs/aacdec/check_crc.h
odecs/aacdec/dct16.cpp
odecs/aacdec/dct16.h
odecs/aacdec/dct64.cpp
odecs/aacdec/dct64.h
odecs/aacdec/decode_huff_cw_binary.cpp
odecs/aacdec/decode_noise_floorlevels.cpp
odecs/aacdec/decode_noise_floorlevels.h
odecs/aacdec/deinterleave.cpp
odecs/aacdec/digit_reversal_tables.cpp
odecs/aacdec/digit_reversal_tables.h
odecs/aacdec/dst16.cpp
odecs/aacdec/dst16.h
odecs/aacdec/dst32.cpp
odecs/aacdec/dst32.h
odecs/aacdec/dst8.cpp
odecs/aacdec/dst8.h
odecs/aacdec/e_adif_const.h
odecs/aacdec/e_blockswitching.h
odecs/aacdec/e_coupling_mode.h
odecs/aacdec/e_elementid.h
odecs/aacdec/e_huffmanconst.h
odecs/aacdec/e_infoinitconst.h
odecs/aacdec/e_invf_mode.h
odecs/aacdec/e_maskstatus.h
odecs/aacdec/e_mp4ff_const.h
odecs/aacdec/e_progconfigconst.h
odecs/aacdec/e_rawbitstreamconst.h
odecs/aacdec/e_sbr_element_id.h
odecs/aacdec/e_sbr_error.h
odecs/aacdec/e_sbr_header_status.h
odecs/aacdec/e_sbr_master_status.h
odecs/aacdec/e_sbr_sync_state.h
odecs/aacdec/e_sr_mode.h
odecs/aacdec/e_tmp4audioobjecttype.h
odecs/aacdec/e_tns_const.h
odecs/aacdec/e_window_sequence.h
odecs/aacdec/e_window_shape.h
odecs/aacdec/esc_iquant_scaling.cpp
odecs/aacdec/esc_iquant_scaling.h
odecs/aacdec/extractframeinfo.cpp
odecs/aacdec/extractframeinfo.h
odecs/aacdec/fft_rx4.h
odecs/aacdec/fft_rx4_long.cpp
odecs/aacdec/fft_rx4_short.cpp
odecs/aacdec/fft_rx4_tables_fxp.cpp
odecs/aacdec/find_adts_syncword.cpp
odecs/aacdec/find_adts_syncword.h
odecs/aacdec/fwd_long_complex_rot.cpp
odecs/aacdec/fwd_long_complex_rot.h
odecs/aacdec/fwd_short_complex_rot.cpp
odecs/aacdec/fwd_short_complex_rot.h
odecs/aacdec/fxp_mul32.h
odecs/aacdec/fxp_mul32_arm_gcc.h
odecs/aacdec/fxp_mul32_arm_v4.h
odecs/aacdec/fxp_mul32_arm_v4_gcc.h
odecs/aacdec/fxp_mul32_arm_v5.h
odecs/aacdec/fxp_mul32_c_equivalent.h
odecs/aacdec/fxp_mul32_c_msc_evc.h
odecs/aacdec/fxp_mul32_c_msc_evc_armv5.h
odecs/aacdec/fxp_mul32_pentium.h
odecs/aacdec/gen_rand_vector.cpp
odecs/aacdec/gen_rand_vector.h
odecs/aacdec/get_adif_header.cpp
odecs/aacdec/get_adif_header.h
odecs/aacdec/get_adts_header.cpp
odecs/aacdec/get_adts_header.h
odecs/aacdec/get_audio_specific_config.cpp
odecs/aacdec/get_audio_specific_config.h
odecs/aacdec/get_dse.cpp
odecs/aacdec/get_dse.h
odecs/aacdec/get_ele_list.cpp
odecs/aacdec/get_ele_list.h
odecs/aacdec/get_ga_specific_config.cpp
odecs/aacdec/get_ga_specific_config.h
odecs/aacdec/get_ics_info.cpp
odecs/aacdec/get_ics_info.h
odecs/aacdec/get_prog_config.cpp
odecs/aacdec/get_prog_config.h
odecs/aacdec/get_pulse_data.cpp
odecs/aacdec/get_pulse_data.h
odecs/aacdec/get_sbr_bitstream.cpp
odecs/aacdec/get_sbr_bitstream.h
odecs/aacdec/get_sbr_startfreq.cpp
odecs/aacdec/get_sbr_startfreq.h
odecs/aacdec/get_sbr_stopfreq.cpp
odecs/aacdec/get_sbr_stopfreq.h
odecs/aacdec/get_sign_bits.h
odecs/aacdec/get_tns.cpp
odecs/aacdec/get_tns.h
odecs/aacdec/getbits.h
odecs/aacdec/getfill.cpp
odecs/aacdec/getfill.h
odecs/aacdec/getgroup.cpp
odecs/aacdec/getics.cpp
odecs/aacdec/getmask.cpp
odecs/aacdec/hcbtables.h
odecs/aacdec/hcbtables_binary.cpp
odecs/aacdec/huffcb.cpp
odecs/aacdec/huffdecode.cpp
odecs/aacdec/hufffac.cpp
odecs/aacdec/huffman.h
odecs/aacdec/huffspec_fxp.cpp
odecs/aacdec/ibstream.h
odecs/aacdec/idct16.cpp
odecs/aacdec/idct16.h
odecs/aacdec/idct32.cpp
odecs/aacdec/idct32.h
odecs/aacdec/idct8.cpp
odecs/aacdec/idct8.h
odecs/aacdec/imdct_fxp.cpp
odecs/aacdec/imdct_fxp.h
odecs/aacdec/infoinit.cpp
odecs/aacdec/init_sbr_dec.cpp
odecs/aacdec/init_sbr_dec.h
odecs/aacdec/intensity_right.cpp
odecs/aacdec/intensity_right.h
odecs/aacdec/inv_long_complex_rot.cpp
odecs/aacdec/inv_long_complex_rot.h
odecs/aacdec/inv_short_complex_rot.cpp
odecs/aacdec/inv_short_complex_rot.h
odecs/aacdec/iquant_table.cpp
odecs/aacdec/iquant_table.h
odecs/aacdec/long_term_prediction.cpp
odecs/aacdec/long_term_prediction.h
odecs/aacdec/long_term_synthesis.cpp
odecs/aacdec/long_term_synthesis.h
odecs/aacdec/lt_decode.cpp
odecs/aacdec/lt_decode.h
odecs/aacdec/lt_prediction.h
odecs/aacdec/ltp_common_internal.h
odecs/aacdec/mdct_fxp.cpp
odecs/aacdec/mdct_fxp.h
odecs/aacdec/mdct_tables_fxp.cpp
odecs/aacdec/mdst.cpp
odecs/aacdec/mdst.h
odecs/aacdec/mix_radix_fft.cpp
odecs/aacdec/mix_radix_fft.h
odecs/aacdec/ms_map_mask.h
odecs/aacdec/ms_synt.cpp
odecs/aacdec/ms_synt.h
odecs/aacdec/pns_corr.cpp
odecs/aacdec/pns_corr.h
odecs/aacdec/pns_intensity_right.cpp
odecs/aacdec/pns_intensity_right.h
odecs/aacdec/pns_left.cpp
odecs/aacdec/pns_left.h
odecs/aacdec/ps_all_pass_filter_coeff.cpp
odecs/aacdec/ps_all_pass_filter_coeff.h
odecs/aacdec/ps_all_pass_fract_delay_filter.cpp
odecs/aacdec/ps_all_pass_fract_delay_filter.h
odecs/aacdec/ps_allocate_decoder.cpp
odecs/aacdec/ps_allocate_decoder.h
odecs/aacdec/ps_applied.cpp
odecs/aacdec/ps_applied.h
odecs/aacdec/ps_bstr_decoding.cpp
odecs/aacdec/ps_bstr_decoding.h
odecs/aacdec/ps_channel_filtering.cpp
odecs/aacdec/ps_channel_filtering.h
odecs/aacdec/ps_constants.h
odecs/aacdec/ps_decode_bs_utils.cpp
odecs/aacdec/ps_decode_bs_utils.h
odecs/aacdec/ps_decorrelate.cpp
odecs/aacdec/ps_decorrelate.h
odecs/aacdec/ps_fft_rx8.cpp
odecs/aacdec/ps_fft_rx8.h
odecs/aacdec/ps_hybrid_analysis.cpp
odecs/aacdec/ps_hybrid_analysis.h
odecs/aacdec/ps_hybrid_filter_bank_allocation.cpp
odecs/aacdec/ps_hybrid_filter_bank_allocation.h
odecs/aacdec/ps_hybrid_synthesis.cpp
odecs/aacdec/ps_hybrid_synthesis.h
odecs/aacdec/ps_init_stereo_mixing.cpp
odecs/aacdec/ps_init_stereo_mixing.h
odecs/aacdec/ps_pwr_transient_detection.cpp
odecs/aacdec/ps_pwr_transient_detection.h
odecs/aacdec/ps_read_data.cpp
odecs/aacdec/ps_read_data.h
odecs/aacdec/ps_stereo_processing.cpp
odecs/aacdec/ps_stereo_processing.h
odecs/aacdec/pulse_nc.cpp
odecs/aacdec/pulse_nc.h
odecs/aacdec/pv_audio_type_defs.h
odecs/aacdec/pv_div.cpp
odecs/aacdec/pv_div.h
odecs/aacdec/pv_log2.cpp
odecs/aacdec/pv_log2.h
odecs/aacdec/pv_normalize.cpp
odecs/aacdec/pv_normalize.h
odecs/aacdec/pv_pow2.cpp
odecs/aacdec/pv_pow2.h
odecs/aacdec/pv_sine.cpp
odecs/aacdec/pv_sine.h
odecs/aacdec/pv_sqrt.cpp
odecs/aacdec/pv_sqrt.h
odecs/aacdec/pvmp4audiodecoder_api.h
odecs/aacdec/pvmp4audiodecoderconfig.cpp
odecs/aacdec/pvmp4audiodecoderframe.cpp
odecs/aacdec/pvmp4audiodecodergetmemrequirements.cpp
odecs/aacdec/pvmp4audiodecoderinitlibrary.cpp
odecs/aacdec/pvmp4audiodecoderresetbuffer.cpp
odecs/aacdec/pvmp4setaudioconfig.cpp
odecs/aacdec/q_normalize.cpp
odecs/aacdec/q_normalize.h
odecs/aacdec/qmf_filterbank_coeff.cpp
odecs/aacdec/qmf_filterbank_coeff.h
odecs/aacdec/s_adif_header.h
odecs/aacdec/s_bit_buffer.h
odecs/aacdec/s_bits.h
odecs/aacdec/s_ch_info.h
odecs/aacdec/s_crc_buffer.h
odecs/aacdec/s_elelist.h
odecs/aacdec/s_frameinfo.h
odecs/aacdec/s_hcb.h
odecs/aacdec/s_huffman.h
odecs/aacdec/s_hybrid.h
odecs/aacdec/s_lt_pred_status.h
odecs/aacdec/s_mc_info.h
odecs/aacdec/s_mixdown.h
odecs/aacdec/s_patch.h
odecs/aacdec/s_progconfig.h
odecs/aacdec/s_ps_dec.h
odecs/aacdec/s_pulseinfo.h
odecs/aacdec/s_sbr_channel.h
odecs/aacdec/s_sbr_dec.h
odecs/aacdec/s_sbr_element_stream.h
odecs/aacdec/s_sbr_frame_data.h
odecs/aacdec/s_sbr_header_data.h
odecs/aacdec/s_sbrbitstream.h
odecs/aacdec/s_sectinfo.h
odecs/aacdec/s_sr_info.h
odecs/aacdec/s_tdec_int_chan.h
odecs/aacdec/s_tdec_int_file.h
odecs/aacdec/s_tns_frame_info.h
odecs/aacdec/s_tnsfilt.h
odecs/aacdec/s_wnd_shape.h
odecs/aacdec/sbr_aliasing_reduction.cpp
odecs/aacdec/sbr_aliasing_reduction.h
odecs/aacdec/sbr_applied.cpp
odecs/aacdec/sbr_applied.h
odecs/aacdec/sbr_code_book_envlevel.cpp
odecs/aacdec/sbr_code_book_envlevel.h
odecs/aacdec/sbr_constants.h
odecs/aacdec/sbr_crc_check.cpp
odecs/aacdec/sbr_crc_check.h
odecs/aacdec/sbr_create_limiter_bands.cpp
odecs/aacdec/sbr_create_limiter_bands.h
odecs/aacdec/sbr_dec.cpp
odecs/aacdec/sbr_dec.h
odecs/aacdec/sbr_decode_envelope.cpp
odecs/aacdec/sbr_decode_envelope.h
odecs/aacdec/sbr_decode_huff_cw.cpp
odecs/aacdec/sbr_decode_huff_cw.h
odecs/aacdec/sbr_downsample_lo_res.cpp
odecs/aacdec/sbr_downsample_lo_res.h
odecs/aacdec/sbr_envelope_calc_tbl.cpp
odecs/aacdec/sbr_envelope_calc_tbl.h
odecs/aacdec/sbr_envelope_unmapping.cpp
odecs/aacdec/sbr_envelope_unmapping.h
odecs/aacdec/sbr_extract_extended_data.cpp
odecs/aacdec/sbr_extract_extended_data.h
odecs/aacdec/sbr_find_start_andstop_band.cpp
odecs/aacdec/sbr_find_start_andstop_band.h
odecs/aacdec/sbr_generate_high_freq.cpp
odecs/aacdec/sbr_generate_high_freq.h
odecs/aacdec/sbr_get_additional_data.cpp
odecs/aacdec/sbr_get_additional_data.h
odecs/aacdec/sbr_get_cpe.cpp
odecs/aacdec/sbr_get_cpe.h
odecs/aacdec/sbr_get_dir_control_data.cpp
odecs/aacdec/sbr_get_dir_control_data.h
odecs/aacdec/sbr_get_envelope.cpp
odecs/aacdec/sbr_get_envelope.h
odecs/aacdec/sbr_get_header_data.cpp
odecs/aacdec/sbr_get_header_data.h
odecs/aacdec/sbr_get_noise_floor_data.cpp
odecs/aacdec/sbr_get_noise_floor_data.h
odecs/aacdec/sbr_get_sce.cpp
odecs/aacdec/sbr_get_sce.h
odecs/aacdec/sbr_inv_filt_levelemphasis.cpp
odecs/aacdec/sbr_inv_filt_levelemphasis.h
odecs/aacdec/sbr_open.cpp
odecs/aacdec/sbr_open.h
odecs/aacdec/sbr_read_data.cpp
odecs/aacdec/sbr_read_data.h
odecs/aacdec/sbr_requantize_envelope_data.cpp
odecs/aacdec/sbr_requantize_envelope_data.h
odecs/aacdec/sbr_reset_dec.cpp
odecs/aacdec/sbr_reset_dec.h
odecs/aacdec/sbr_update_freq_scale.cpp
odecs/aacdec/sbr_update_freq_scale.h
odecs/aacdec/set_mc_info.cpp
odecs/aacdec/set_mc_info.h
odecs/aacdec/sfb.cpp
odecs/aacdec/sfb.h
odecs/aacdec/shellsort.cpp
odecs/aacdec/shellsort.h
odecs/aacdec/stereo_2_mono.h
odecs/aacdec/synthesis_sub_band.cpp
odecs/aacdec/synthesis_sub_band.h
odecs/aacdec/tns_ar_filter.cpp
odecs/aacdec/tns_ar_filter.h
odecs/aacdec/tns_decode_coef.cpp
odecs/aacdec/tns_decode_coef.h
odecs/aacdec/tns_inv_filter.cpp
odecs/aacdec/tns_inv_filter.h
odecs/aacdec/trans4m_freq_2_time_fxp.cpp
odecs/aacdec/trans4m_time_2_freq_fxp.cpp
odecs/aacdec/unpack_idx.cpp
odecs/aacdec/unpack_idx.h
odecs/aacdec/window_block_fxp.h
odecs/aacdec/window_tables_fxp.cpp
odecs/aacdec/write_output.h
51d7547944967d1157b7fe18e1fb8f7ee6810412 07-Aug-2012 Andreas Huber <andih@google.com> Only emit padding at the end of the stream in the aac and mp3 decoders

if we actually discarded content at the beginning of the stream.

Change-Id: I1e79835bb3a02350060a137b94f85f2c90f4a12b
odecs/aacdec/SoftAAC2.cpp
odecs/mp3dec/SoftMP3.cpp
mx/tests/OMXHarness.cpp
e671207115fac3914134c61b336d5fa0242c68ca 26-Jun-2012 Andreas Huber <andih@google.com> Make sure codec names and corresponding quirks are returned together.

Previously they were returned in separate vectors and only one of them was sorted if
software codecs were preferred, leaving the quirks no longer matching the codec name
at the same index.

Change-Id: Id3f1e6f9f7f8c9cc4b6ebfb86a203b4d59de8604
related-to-bug: 6737884
Codec.cpp
MXCodec.cpp
28620ee3e9926ef07f0b4cb3e22b156b812e2d7e 07-Aug-2012 Andreas Huber <andih@google.com> Merge "mediacodec: Return an error on getOutputFormat if there is no output format yet" into jb-mr1-dev
972f2321583ef4094477271e0fc6a1d05a1a0eea 12-Jul-2012 Martin Storsjo <martin@martin.st> mediacodec: Return an error on getOutputFormat if there is no output format yet

This avoids crashing if calling the public java method
MediaCodec.getOutputFormat immediately after MediaCodec.start
(as the documentation example shows that one should do!).

Change-Id: Icd3dd7ab9ae9e8f2a67cef171ff176735de95f58
ediaCodec.cpp
a6ee7bc5f9524c220377e37f6525e2d46c69b75b 07-Aug-2012 James Dong <jdong@google.com> Remove obsolete hack for TI specific code

o related-to-bug: 6566886

Change-Id: I39aad214cbf7b748a95a9d22db50cd8f421931e6
MXCodec.cpp
e643ccba8b8476595ab353c9bcecc8863c53242e 04-Aug-2012 Ying Wang <wangying@google.com> Merge "Remove circular dependency." into jb-mr1-dev
8d5ec2a336c114688e5d2950b124440e07e79ad9 04-Aug-2012 Ying Wang <wangying@google.com> Remove circular dependency.

libstagefright_chromium_http is added to build/target/product/core.mk
instead.

Bug: 6933259
Change-Id: I2e87037eea0f1f2a56936dd02419cde564c8670d
ndroid.mk
a3b71fa5235b758d5f9ea00b9c58fbfd707fb9dd 03-Aug-2012 Marco Nelissen <marcone@google.com> Merge "experimental support for fragmented mp4 playback in nuplayer" into jb-mr1-dev
840667883fd09d44015716d79bc3ac4d60edc0f0 16-Aug-2011 Andreas Huber <andih@google.com> experimental support for fragmented mp4 playback in nuplayer

cherry picked from change 170999

Change-Id: I407775f0290154ad4961134839a15c9f296424c0
oundation/AMessage.cpp
oundation/hexdump.cpp
983cf231ab2d176a14595cdae46ff1b0c239af47 02-Aug-2012 James Dong <jdong@google.com> Dynamically configure the number of video buffers used by camera source, if supported

o related-to-bug: 6920805

Change-Id: I413bb50954cc84e32ed40bcb713842dc7b58e2b6
ameraSource.cpp
0dff606f42292b8a31b9eee842877f9875279dab 02-Aug-2012 James Dong <jdong@google.com> Allocate buffers before calling start on its source in OMXCodec::start() for encoder case

o This makes it possible to configure the source to use the same number of input buffers
as requested by the video encoder, before the source starts. As a result, hardcoded
number of video buffers for camera source, for instance, can be avoided.

o related-to-bug: 6920805

Change-Id: I13d2c308dce34967768cd407f02988e92ef10a89
MXCodec.cpp
c9729ca1cb1760da836e293e3ed7a82f769f3e07 24-Jul-2012 Insun Kang <insun@google.com> Unifying TimedTextDriver's resume() and start().

(cherry picked from gtv bb23a2b7e06c59f56e353fd4a2a66a9b8179d425)

Change-Id: If5f14549fa315c34e32d6fed7c1ea09deabceb63
imedtext/TimedTextDriver.cpp
6472badc497a9e748411f8c8c9ed5d83ef335a85 18-Jun-2012 Insun Kang <insun@google.com> Fix: status checking in TimedTextDriver.

o fixes seeking error when there's no enabled text track.
o clean up status checking code for deselectTrack.
o fixes a potential bug : pause->backward seek can trigger unwanted
resume.

Bug: 6682160
Change-Id: I03d8788b27fb9c0a6092be83ad3578ccf3266905
(cherry picked from commit 2dafb6071d4f14e0e208912500694912211aa26b)
imedtext/TimedTextDriver.cpp
imedtext/TimedTextPlayer.cpp
imedtext/TimedTextPlayer.h
bb6bc8491fe819f96e1902e56694715cb110ce94 10-Jul-2012 Insun Kang <insun@google.com> Adds resume() function

o Revived resume() function to fix pause/resume bug. (Bug: 6663740)
o Mannually cherry-picked from GTV change.
(commit: ad1197226d1c6745959f0e469f510ca06f99489f)

Change-Id: I77ac90085fb1f1d2e7eb706642978a4fa4d28b49
imedtext/TimedTextDriver.cpp
imedtext/TimedTextPlayer.cpp
imedtext/TimedTextPlayer.h
2f0632f12cd02b0350918720443c888b48f4417b 01-Jun-2012 Insun Kang <insun@google.com> Adjust fire time of a timed text message before firing it.

related-to-bug: 6501328

o When Video/Audio is stuttering, subtitle's firing time should be
adjusted.

Change-Id: I0e7e8a1796cb2b3c8a09c8fbd41690bce2689e85
(cherry picked from gtv: commit b2c3aedcb6c145e33ded39ef81e3202b2419469f)
imedtext/TimedTextPlayer.cpp
imedtext/TimedTextPlayer.h
5a81ad893eada20c32596be53dabe203b99bec3c 31-Jul-2012 James Dong <jdong@google.com> Allows MediaMetadataRetriever to retrieve video rotation angle

o related-to-bug: 6872687

Change-Id: I34e74b0756f8269edefdf3a25d8806c76fd1e2f8
tagefrightMetadataRetriever.cpp
25f0d7ba1987de61c75f8c68b19de48e0ad9736c 31-Jul-2012 James Dong <jdong@google.com> Should really compare the pos to the total number of values in get() and set() methods in ListTableEntries class

o related-to-bug: 6435176

Change-Id: Ib6f6e598304e7c9becfa6cb3fc925c55b2df2682
PEG4Writer.cpp
c620cbd7f8dc75f6819e2b862d3c09970560bc63 28-Jul-2012 James Dong <jdong@google.com> Refactoring how the box table entries are stored in MPEG4Writer

o Helps drastically reduce the time writing all the box table entries for long duration video recording sessions.
Experiments showed that the time is reduced from multiple seconds to less than one second for around 2.5 hours of video recording.

Change-Id: I6a696823e2938b76fcf2c73605f51bf5e5c2d749

related-to-bug: 6435176
PEG4Writer.cpp
efcdf187baab9ec29e12adcf85e63fe3e6d5aa4d 08-Mar-2012 Johannes Carlsson <johannes.carlsson.x@sonymobile.com> Store correct time stamps in recorded mp4 files

According to the specification (ISO_IEC_14496-12_2008 page 17, 19 and
21) the time is "in seconds since midnight, Jan. 1, 1904, in UTC time"
which is not the same as Unix epoch time. This is already correctly
handled in MPEG4Extractor.cpp when reading files.

The specification also supports 64 bit timestamps which would make
it a bit more future proof, but unfortunately it seems like support
for this in players are poor (tested both Windows media player and
Quicktime player).

Change-Id: I102d728f098b8b0a21013956f017b0c4f2d69112
PEG4Writer.cpp
9fbe94294ce2053d102ff5de89846a0c5015fb58 30-Jul-2012 Ed Heyl <ed@google.com> Merge remote-tracking branch 'goog/jb-dev-mako' into jb-mr1-dev

Conflicts:
services/audioflinger/AudioFlinger.cpp

Change-Id: If27e4ff35de1e182394cc149e1557a49f0f7c95b
bf5bea96f236adb5eef78c2f414ef82b3602a0f7 19-Jul-2012 Eino-Ville Talvala <etalvala@google.com> Codecs: Add MetaDataMode support to software video encoders.

This support is needed to enable efficient video recording with
emulator and camera HAL 2.

- Update SoftAVCEncoder and SoftMPEG4Encoder to support MetaDataMode
extension.
- Allow CameraSource to handle opaque pixel formats, so that
MetaDataMode can be used.
- Remove hardware codec restriction for MetaDataMode

Bug: 6243944
Change-Id: I970eb3d55542a413b6d75a78f76d3a8583155601
ameraSource.cpp
MXCodec.cpp
odecs/avc/enc/Android.mk
odecs/avc/enc/SoftAVCEncoder.cpp
odecs/avc/enc/SoftAVCEncoder.h
odecs/m4v_h263/enc/Android.mk
odecs/m4v_h263/enc/SoftMPEG4Encoder.cpp
odecs/m4v_h263/enc/SoftMPEG4Encoder.h
3499e2d178960ca3392855716c963eec7403a089 23-Jul-2012 James Dong <jdong@google.com> Don't make the decrypted content available to Java applications via MediaExtractor.java API

Change-Id: I38df6a6be30a34ce3f2640f79784dc94c8ca1158
uMediaExtractor.cpp
f1b3ee26cafc80900bae681bddf47446a6a3733f 21-Jul-2012 James Dong <jdong@google.com> Merge "Added number of encoded frames and duration to the MPEG4Writer::Track::dump"
f5545b962794b78a97cafa73d0b592f55ffe06d8 21-Jul-2012 James Dong <jdong@google.com> Merge "Bugfix: Seek on SRT external track"
c374dae535b83d9b499dd9fe8f9dabdb8b0ac9fd 20-Jul-2012 James Dong <jdong@google.com> Added a callback to signal when the rendering of the video frame just occurred

Change-Id: Ifbd78606ffc33483aecebf02cb18e0e52af9624d
related-to-bug: 6851811
wesomePlayer.cpp
nclude/AwesomePlayer.h
a08412711b3266d336134b16a45e98baa8d11b9d 20-Jul-2012 Marco Nelissen <marcone@google.com> Merge "Ensure MEDIA_INFO_BUFFERING_END is always sent"
6f434482331b55876cb09c638149c21ca40c7690 20-Jul-2012 Marco Nelissen <marcone@google.com> Ensure MEDIA_INFO_BUFFERING_END is always sent

b/6620761

Change-Id: Iafd2eeac7b3cbbeb42af3638628a32dc6c2bb414
wesomePlayer.cpp
45dfb6ae94b33eea04d74afa378c1664e884f09a 06-Jul-2012 Haynes Mathew George <hgeorge@codeaurora.org> Synchronize access to OMX class member variables

- Protect access to mLiveNodes KeyedVector member variable in freeNode function

Change-Id: Ic86844aabc2bc897ffb7fc91cd1f54254f5e29fe
mx/OMX.cpp
a3c9d82d0f898d30982840b48d1f00fd0d831e19 10-Jul-2012 Insun Kang <insun@google.com> Bugfix: Seek on SRT external track

o Need to return closest upcoming subtitle when seeking time is within
gap ranges.
o Manually cherry-picked from GTV change.
(commit e026a83dc88888b42da77eca739b8f09a0cd6dae)

related-to-bug: 6796228
Change-Id: I02b7718a432d6b2f5575fa1a1a42bda6f04aa25b
imedtext/TimedTextSRTSource.cpp
imedtext/TimedTextSRTSource.h
imedtext/test/Android.mk
imedtext/test/TimedTextSRTSource_test.cpp
13210f3346462a86ce9fe3af72a0c200dba84e27 20-Jul-2012 James Dong <jdong@google.com> Added number of encoded frames and duration to the MPEG4Writer::Track::dump

o also removed unused varialble mMaxTimeStampUs

Change-Id: I61a47e1ec8ee96a25df668637c4d4661188a1a8c
PEG4Writer.cpp
77e8ae9967a078770416619e99ddb5b010def312 18-Jul-2012 James Dong <jdong@google.com> When a request max file size is relatively small, don't store moov header at the
beginning of a recorded mp4 file.

Trying to put the 'moov' box at the beginning of an mp4 file requires to reserve
some estimated space for 'moov'. The estimate can be larger or smaller than the
actual 'moov' size. When the estimate is larger, we could meet the file
size limit, although some space is wasted; but when the estimate is smaller than
the actual 'moov' size, we not only waste the reserved space but also have to
use extra space to write 'moov' space at the end of the file. In this case, often
the requested file size limit could be exceeded by a large margin.

This patch avoids putting the 'moov' box at the beginning when a file size limit
is explicitly requested.

Change-Id: I838443d08b5589f33f3c486c662195600e3edb9b
related-to-bug: 6697505
PEG4Writer.cpp
b46ccde3610d3f1713f7ebf0e9ffe943e44b54d2 18-Jul-2012 Edwin Wong <edwinwong@google.com> Merge from jb-dev for "sample video corruption in MediaCodec mode." DO NOT MERGE

jb-dev commit: fa2b8f243eb048fb2b8e5a14356190f69eb31a36

Change-Id: I4f08b9c8e9682a998db01c509a390e51bae60c2d
related-to-bug: 6732061
ediaCodec.cpp
2bdb2f25861f3a3ac9cf3b7af561975fc9b9eead 14-Jul-2012 Edwin Wong <edwinwong@google.com> am 190313ec: am 65e8d62a: Merge "Fixed sample video corrupted in MediaCodec mode." into jb-dev

* commit '190313ec68e81c10d200ff3c20ac152cf90760d6':
Fixed sample video corrupted in MediaCodec mode.
190313ec68e81c10d200ff3c20ac152cf90760d6 14-Jul-2012 Edwin Wong <edwinwong@google.com> am 65e8d62a: Merge "Fixed sample video corrupted in MediaCodec mode." into jb-dev

* commit '65e8d62a5b243518795cdafa498df4a49baf6940':
Fixed sample video corrupted in MediaCodec mode.
fa2b8f243eb048fb2b8e5a14356190f69eb31a36 11-Jul-2012 Edwin Wong <edwinwong@google.com> Fixed sample video corrupted in MediaCodec mode.

Change-Id: I50c5660072d40f6e297e58fd026ea04c89d6a70a
related-to-bug: 6732061
ediaCodec.cpp
5c63a648f943b0ec91c3262ced77d1598ff32093 12-Jul-2012 Martin Storsjo <martin@martin.st> mediacodec: Return an error on getOutputFormat if there is no output format yet

This avoids crashing if calling the public java method
MediaCodec.getOutputFormat immediately after MediaCodec.start
(as the documentation example shows that one should do!).

Change-Id: Icd3dd7ab9ae9e8f2a67cef171ff176735de95f58
ediaCodec.cpp
21dc4b6a99f0427cc1c0b10d3dcdb34c7571d10f 16-Apr-2012 Martin Storsjo <martin@martin.st> avcenc: Remove redundant zero-initialization of allocated memory

The allocation callback is now supposed to always return initialized
memory.

Change-Id: I7a4d036e498c9f87c730dda3aab5057eb764a1e7
odecs/avc/enc/src/avcenc_api.cpp
odecs/avc/enc/src/rate_control.cpp
359d8fcd30ff0a8390e4c5560d53ec55a4cc5bcd 16-Apr-2012 Martin Storsjo <martin@martin.st> avcenc: Initialize all memory allocated by the CBAVC_Malloc callback function

Valgrind reported use of uninitialized memory in AVCEncodeSlice,
which this fixes.

Change-Id: Ia09ad3e50d05b2b0487a4d588d9b00fc0828c816
odecs/avc/common/include/avcapi_common.h
odecs/avc/enc/SoftAVCEncoder.cpp
be5016bac5c1b422d850e299d3cb11fecf0ac19d 11-Jul-2012 Jesper Tragardh <jesper.tragardh@sonyericsson.com> Correct ID3::StringSize calculation for UCS-2 data.

Album art was not displayed when albums were transferred via MediaGo
because the length of the description in the APIC tag was not
correctly calculated.

The method StringSize used to calculate the length of the tag
does not add the size of the null termination in UCS-2 case.

Change-Id: I5409d42f5e87d315e6e03c4d7e6cbd8a378a160d
d3/ID3.cpp
955585cca11173b07e2e7db3d636ee97b69b053b 13-Apr-2012 Martin Storsjo <martin@martin.st> avcenc: Fix indentation

Change-Id: I4fcdf619e3b75387a7909272f3164b8d608b6cc2
odecs/avc/enc/src/sad_mb_offset.h
f5af6314db25ff3bef9bd2eeba201bc6cc60805d 13-Apr-2012 Martin Storsjo <martin@martin.st> avcenc: Clarify the ifdefs surrounding inline assembly

Previously, the code was structured like this:

#if defined(__GNUC__) && defined(__arm__)
/* Generic C implementation */
#elif defined(__CC_ARM)
/* RVCT version */
#elif defined(__GNUC__) && defined(__arm__)
/* GCC arm assembly version */
#endif

This had two implications - the gcc arm version never was used
in practice, and the code required -D__arm__ to build at all for
other architectures.

The inline assembly constraints are buggy (requires changes so as
to not crash), and if fixed, the optimizations still aren't faster
than the generic C code on modern gcc versions. Therefore, just
ignore them and use the generic C code.

Due to the peculiar code block ordering and preprocessor conditions,
the generic C code is what has been used before anyway, but it
did require -D__arm__ to build, which can cause problems if building
for other architectures, if the system headers have ifdefs for this
define. This change makes it build without that define.

Change-Id: Ib3fcf5651ee720310b7dff10fd04279b5f90759c
odecs/avc/enc/Android.mk
odecs/avc/enc/src/sad_halfpel_inline.h
odecs/avc/enc/src/sad_inline.h
odecs/avc/enc/src/sad_mb_offset.h
2f3152dee8e763fd7eae9d7b71078d5c6aec5881 13-Apr-2012 Martin Storsjo <martin@martin.st> avcenc: Remove useless casts

Change-Id: I73a6f74268bcf6ca22d489d13936be8fd1b3fc92
odecs/avc/enc/src/bitstream_io.cpp
23da4cf305b9bfff07954711a8a2d9ec040865af 13-Apr-2012 Martin Storsjo <martin@martin.st> avcenc: Switch malloc/free callbacks to use pointers instead of ints

There is no reason for casting the pointers to ints. This fixes
building the code on platforms where pointers are larger than ints,
e.g. 64 bit platforms.

Change-Id: I910cd207d0908287931c9a96eb270139967e029b
odecs/avc/common/include/avcapi_common.h
odecs/avc/common/src/dpb.cpp
odecs/avc/enc/SoftAVCEncoder.cpp
odecs/avc/enc/src/avcenc_api.cpp
odecs/avc/enc/src/bitstream_io.cpp
odecs/avc/enc/src/motion_est.cpp
odecs/avc/enc/src/rate_control.cpp
223933e8e7419d0d4431d01e8980592fcafd2404 23-Jun-2011 Martin Storsjo <martin@martin.st> stagefright amrnb: Remove unused leftover source files

This allows getting rid of adding the plain common directory
(not common/include) to the include paths in projects that use
this code, too.

Change-Id: Ifb1fe4fc1f5c6f1264cb2b64f7b78e42b1e7833a
odecs/amrnb/common/include/pvgsmamr.h
odecs/amrnb/common/pvgsmamrdecoderinterface.h
odecs/amrnb/dec/Android.mk
odecs/amrnb/dec/include/pvamrnbdecoder_api.h
odecs/amrnb/dec/src/pvgsmamrdecoder.cpp
odecs/amrnb/enc/Android.mk
448239b929de32621e26504b86482ab4d436a5e3 01-Mar-2012 Martin Storsjo <martin@martin.st> stagefright amrnb: Move the bitstream_format enum into frame_type_3gpp.h

Change-Id: I6d6f9dc5799750394a853325466ffa2ebec44625
odecs/amrnb/common/include/frame_type_3gpp.h
odecs/amrnb/common/pvgsmamrdecoderinterface.h
odecs/amrnb/dec/src/amrdecode.h
odecs/amrnb/dec/src/gsmamr_dec.h
8d5a687f4f4c50f4fc8c1a29ab7a0cd618bcf9d1 17-May-2011 PacketVideo CM <engbuild@pv.com> amrnb: Fix audio distortion in an AMR-NB clip

This fix had the PacketVideo internal tracking number
RIO-9190.

This was committed on the master branch of the opencore
repository in commit 7d6ccc907d3a15ca2ff74b9c76f122ab87d0ffbe.

Change-Id: Icbd7d6fe94e02cae360946cfb6f3b8dc90c8b518
odecs/amrnb/dec/src/post_pro.cpp
6d72a807dc3910ddd0b7c4f85130951dd189e8f5 17-May-2011 Martin Storsjo <martin@martin.st> amrnb: Restart the p_xn pointer when retraversing the array on overflow

This is a safeguard to avoid issues in a rare codepath.

This was committed on the master branch of the opencore
repository in commit f532d145194e474cb30d8644b8eee83873ad24cc,
based on AOSP contribution 10905.

Change-Id: I9688b009bcbe63d88ee5040e883a021aefa30664
odecs/amrnb/enc/src/g_pitch.cpp
983995747ed3adaf25035c433df1ccbaa056a898 23-Jan-2012 Paul Fariello <fariello@archos.com> MPEG2TSWriter: Write a proper CRC in PAT and PMT

Change-Id: I6ec8039b176878da6f02691194d96b0a1e894055
PEG2TSWriter.cpp
d4e5af6bc0a012e8d43975ca8b5627631333920d 23-Jan-2012 Paul Fariello <fariello@archos.com> MPEG2TSWriter: Write proper continuity counters for PAT and PMT

Change-Id: If94e31e51c563867db6d2376ad771f9751416084
PEG2TSWriter.cpp
dd8104cc5367262f0e5f13df4e79f131e8d560bb 02-Jul-2012 Glenn Kasten <gkasten@google.com> Use audio_channel_mask_t more consistently

In IAudioFlinger::createTrack() and IAudioFlinger::openRecord(),
declare input parameter to use correct type audio_channel_mask_t.

In IAudioFlinger::getInputBufferSize(), input parameter is now channel mask
instead of channel count.

Remove unused IAudioFlinger::channelCount(audio_io_handle_t).

In AudioRecord::getMinFrameCount() and AudioSystem::getInputBufferSize(),
input parameter is channel mask instead of channel count.

Change-Id: Ib2f1c29bea70f016b3cfce83942ba292190ac965
udioSource.cpp
faa5bdd1efff301962537a7b271bd31c78ec13dc 15-Jun-2012 Colin Cross <ccross@android.com> libstagefright: dynamically load libstagefright_chromium_http

dlopen libstagefright_chromium_http to allow it to be on the platform
side of the pdk without getting overwritten during a pdk fusion build.

Bug: 6772533

Change-Id: I391e81d98beab165c3313bc8a71bb370ebb8584d
ndroid.mk
ataSource.cpp
TTPBase.cpp
hromium_http/Android.mk
hromium_http/chromium_http_stub.cpp
hromium_http_stub.cpp
nclude/chromium_http_stub.h
a0108697f86d8625eb7ad3f13e422427fe7573ca 30-Jun-2012 James Dong <jdong@google.com> Fixed a media server crash due to unintialized mRecord member variable

mRecord is not properly initialized if the call to AudioRecord::getMinFrameCount() fails.
media server crashes when the unintialized mRecord object is deleted in AudioSource's destructor.

Change-Id: Ia89222789d044c11c9957a99725bc89f9c709e17

related-to-bug: 6744014
udioSource.cpp
f89a87ab3708e75c406b2abcb7e69dc1b076868a 26-Jun-2012 Haynes Mathew George <hgeorge@codeaurora.org> Process EBD and FBD messages in ERROR state

- OMXCodec::on_message() function drops all OMX messages if
OMXCodec is in ERROR state
- This can cause EBD/FBD messages containing valid buffers to be
dropped
- Avoid dropping EBD/FBD messages so that buffer book-keeping is still
possible

Change-Id: Idc1174b3fa946b26458d49394b87fba1738b228e
Signed-off-by: Iliyan Malchev <malchev@google.com>
MXCodec.cpp
af8e8aa1ada2948972555592570ec9ad90cbf372 26-Jun-2012 Nick Kralevich <nnk@google.com> Add mode when open(O_CREAT) is used.

When creating a new file using open(..., O_CREAT), it is an error
to fail to specify a creation mode. If a mode is not specified, a
random stack provided value is used as the "mode".

This will become a compile error in a future Android change.

Change-Id: I36a3d67d294a915c1f79632a1b0ba45edd1214b1
ACWriter.cpp
MRWriter.cpp
PEG4Writer.cpp
f18da5524ecc50b12ea8233f82892f99106fc009 26-Jun-2012 Jamie Gennis <jgennis@google.com> am 33e28dd3: Merge "SurfaceMediaSource: keep refs to current buffers" into jb-dev

* commit '33e28dd3c033641f4db9d1b99c7c88d6d08c61f7':
SurfaceMediaSource: keep refs to current buffers
46ec58976b3c04a99ce6e7eda2531543bfb151c7 25-Jun-2012 Glenn Kasten <gkasten@google.com> Merge "Remove AudioRecord record_flags"
f15f6e2e7fc51d48ba95890e1f562908e6e957c0 13-Jun-2012 Jesse Hall <jessehall@google.com> Provide new argument to BufferQueue::releaseBuffer

Change-Id: Ib86f1af80a0d2833535a0ad170dce5ac061eec75
urfaceMediaSource.cpp
0f59d4815400649943716f10305a77c7d56b47c4 23-Jun-2012 Jamie Gennis <jgennis@google.com> am e6cb412b: am 33e28dd3: Merge "SurfaceMediaSource: keep refs to current buffers" into jb-dev

* commit 'e6cb412b677966c25b424766dc6ceb2787d49caa':
SurfaceMediaSource: keep refs to current buffers
e6cb412b677966c25b424766dc6ceb2787d49caa 23-Jun-2012 Jamie Gennis <jgennis@google.com> am 33e28dd3: Merge "SurfaceMediaSource: keep refs to current buffers" into jb-dev

* commit '33e28dd3c033641f4db9d1b99c7c88d6d08c61f7':
SurfaceMediaSource: keep refs to current buffers
33e28dd3c033641f4db9d1b99c7c88d6d08c61f7 23-Jun-2012 Jamie Gennis <jgennis@google.com> Merge "SurfaceMediaSource: keep refs to current buffers" into jb-dev
2cd25a9056cc150b9fd3ac9b0bca37a1334ffd47 22-Jun-2012 Jamie Gennis <jgennis@google.com> SurfaceMediaSource: keep refs to current buffers

This change fixes a bug in SurfaceMediaSource where it would not keep a
reference to all of the Gralloc buffers that the video encoder is currently
using.

Bug: 6655597
Change-Id: Ifd99976cc7ae57ed724bbf2bbcff357a39497391
urfaceMediaSource.cpp
f92eec53f886f43e4374a36195be55f2a7bbcf36 07-Mar-2012 Glenn Kasten <gkasten@google.com> Remove AudioRecord record_flags

Change-Id: I021ddcc1bcb63132a4597d13e3d09db2a5f2c628
udioSource.cpp
1e5b2b3361ddd07259bf4b29820ca4aa5f3a861b 14-Jun-2012 Jamie Gennis <jgennis@google.com> Update ANativeWindow client code for sync

This change updates all the uses of ANativeWindow to use the new ANW functions
that accept and return Sync HAL fence file descriptors.

Change-Id: Id7db42d8d6380f8b440d88476ce9211c6225fb16
Codec.cpp
ndroid.mk
wesomePlayer.cpp
MXCodec.cpp
olorconversion/SoftwareRenderer.cpp
ests/Android.mk
ests/SurfaceMediaSource_test.cpp
18faac2af4e3b27deec0a707757883e5e569c591 21-Jun-2012 Haynes Mathew George <hgeorge@codeaurora.org> Add vendor specific output color format

- Add Qualcomm specific color format support to OMXCodec and ACodec
- This is the default color format supported on QCom chipsets

Change-Id: Id947b158c3b403c2d347f708bc1e780b4d65e220
Codec.cpp
MXCodec.cpp
95e6e6efcac831874b3d08947d1751d8f65503f9 21-Jun-2012 Glenn Kasten <gkasten@google.com> Merge "Workaround for corrupt Vorbis comment"
a43787a8cc513715543fb5c80c7c464e2cd51b6e 20-Jun-2012 Andreas Huber <andih@google.com> am e77c76dc: am 39a31135: Revert input buffer count for the SoftAAC* decoders back to 4.

* commit 'e77c76dc57f88ec9e6b370dcba8a8c3e0684461d':
Revert input buffer count for the SoftAAC* decoders back to 4.
e77c76dc57f88ec9e6b370dcba8a8c3e0684461d 20-Jun-2012 Andreas Huber <andih@google.com> am 39a31135: Revert input buffer count for the SoftAAC* decoders back to 4.

* commit '39a3113539f9bcc86a8efe562780c23ac8731098':
Revert input buffer count for the SoftAAC* decoders back to 4.
39a3113539f9bcc86a8efe562780c23ac8731098 20-Jun-2012 Andreas Huber <andih@google.com> Revert input buffer count for the SoftAAC* decoders back to 4.

This improves the netflix bandwidth change responsiveness.
With the old count of 32 the audio decoder running at a higher
priority would starve the video decoder for about 1 sec while
draining the input data.

I haven't been able to break any stream playback using MediaCodec
using the lower count, even though I'm sure I had a good reason
to increase it in the first place (see bug 6478823)

Change-Id: I7fd3e71794b0cc1570ea9d27d1d869ab1e1750c4
related-to-bug: 6685031
odecs/aacdec/SoftAAC.h
odecs/aacdec/SoftAAC2.h
af2e65ca9a0415e68acfae9497ce445e96fb738a 19-Jun-2012 Glenn Kasten <gkasten@google.com> Workaround for corrupt Vorbis comment

Bug: 6682991
Change-Id: I8b0d91ab76b700ab981f2524124109234023a9da
LACExtractor.cpp
c67d875fde2158e60e45b7f0a79edaa959ca9464 18-Jun-2012 Colin Cross <ccross@android.com> Merge "libstagefright: dynamically load libstagefright_chromium_http"
bea455c8e4a230cc5aedc9df33e1ba97c64cec5f 15-Jun-2012 Colin Cross <ccross@android.com> libstagefright: dynamically load libstagefright_chromium_http

dlopen libstagefright_chromium_http to allow it to be on the platform
side of the pdk without getting overwritten during a pdk fusion build.

Change-Id: I391e81d98beab165c3313bc8a71bb370ebb8584d
ndroid.mk
ataSource.cpp
TTPBase.cpp
hromium_http/Android.mk
hromium_http/chromium_http_stub.cpp
hromium_http_stub.cpp
nclude/chromium_http_stub.h
fbb26f5101d9ef14251d561dba37f87d001fbbf6 15-Jun-2012 James Dong <jdong@google.com> am fc42e16d: Merge "Fix track selection code in AwesomePlayer" into jb-dev

* commit 'fc42e16d96b7e1b18b573f40df1319c56f8ab933':
Fix track selection code in AwesomePlayer
8a15dfba686b50f2b8163af247e236d52150321f 15-Jun-2012 Insun Kang <insun@google.com> Fix track selection code in AwesomePlayer

Change-Id: I1c5a2f13f562a0ba253a93b4346cbe2c60099ddd
related-to-bug: 6671977
wesomePlayer.cpp
be8cf4a280b0aa786ba1aa3dad85d51125e0a86f 14-Jun-2012 Jamie Gennis <jgennis@google.com> am 7b4de101: Merge "stagefright: set scaling mode for blank frames" into jb-dev

* commit '7b4de10199f3a1803350e9a65baa671874d9c2f1':
stagefright: set scaling mode for blank frames
1d5ac80d0c6d3deabcc9e9b4abc9e3ef536aeb27 14-Jun-2012 Jamie Gennis <jgennis@google.com> stagefright: set scaling mode for blank frames

This change sets the ANativeWindow scaling mode before pushing the blank frames
during decoder tear down.

Bug: 6603254
Change-Id: Ic64011645e2d3671b4a8d302ac7f39e6fd3affcd
MXCodec.cpp
c3c044ab1b2b5f9bebcff610795b6a1a9b60d01b 14-Jun-2012 Marco Nelissen <marcone@google.com> am 82233b4b: Merge "Better handle invalid duration in Xing/VBRI tags" into jb-dev

* commit '82233b4b5bee06f11618a558ae465abbfdedfd6e':
Better handle invalid duration in Xing/VBRI tags
82233b4b5bee06f11618a558ae465abbfdedfd6e 14-Jun-2012 Marco Nelissen <marcone@google.com> Merge "Better handle invalid duration in Xing/VBRI tags" into jb-dev
cc0df657cdc8316c2b816c562f269be1706f00ea 14-Jun-2012 James Dong <jdong@google.com> am e20435de: Merge "Add NOTICE and MODULE_LICENSE_APACH2 to libs build under /frameworks/av/" into jb-dev

* commit 'e20435de10f63af812da9d4f801b61a8817733a0':
Add NOTICE and MODULE_LICENSE_APACH2 to libs build under /frameworks/av/
e20435de10f63af812da9d4f801b61a8817733a0 14-Jun-2012 James Dong <jdong@google.com> Merge "Add NOTICE and MODULE_LICENSE_APACH2 to libs build under /frameworks/av/" into jb-dev
8fe9840be2ce6aac8a008fc15cb641f858b5a32e 14-Jun-2012 James Dong <jdong@google.com> am cac467b3: Merge "Fix one of the potential ANR issues from AwesomePlayer" into jb-dev

* commit 'cac467b3af9235229522a134d2c57e4fa605ba2f':
Fix one of the potential ANR issues from AwesomePlayer
cac467b3af9235229522a134d2c57e4fa605ba2f 14-Jun-2012 James Dong <jdong@google.com> Merge "Fix one of the potential ANR issues from AwesomePlayer" into jb-dev
5fd7d3a23316ec0d2320fece85201859b52c2aef 13-Jun-2012 Marco Nelissen <marcone@google.com> Better handle invalid duration in Xing/VBRI tags

b/6654637

Change-Id: Ie92eddd84ef5914b77dbadaacd80b4de6cd66e1c
BRISeeker.cpp
INGSeeker.cpp
3d51d5cb53cc630709a0ba78d0e60501a675f2d5 13-Jun-2012 James Dong <jdong@google.com> Add NOTICE and MODULE_LICENSE_APACH2 to libs build under /frameworks/av/

Change-Id: I0a3af3e2abdedebd5934f3d941d01c32cfc75e26
related-to-bug: 6647465
ODULE_LICENSE_APACHE2
OTICE
odecs/aacdec/MODULE_LICENSE_APACHE2
odecs/aacdec/NOTICE
odecs/aacenc/MODULE_LICENSE_APACHE2
odecs/aacenc/NOTICE
odecs/aacenc/SampleCode/MODULE_LICENSE_APACHE2
odecs/aacenc/SampleCode/NOTICE
odecs/amrnb/common/MODULE_LICENSE_APACHE2
odecs/amrnb/common/NOTICE
odecs/amrnb/dec/MODULE_LICENSE_APACHE2
odecs/amrnb/dec/NOTICE
odecs/amrnb/enc/MODULE_LICENSE_APACHE2
odecs/amrnb/enc/NOTICE
odecs/amrwb/MODULE_LICENSE_APACHE2
odecs/amrwb/NOTICE
odecs/amrwbenc/MODULE_LICENSE_APACHE2
odecs/amrwbenc/NOTICE
odecs/amrwbenc/SampleCode/MODULE_LICENSE_APACHE2
odecs/amrwbenc/SampleCode/NOTICE
odecs/avc/common/MODULE_LICENSE_APACHE2
odecs/avc/common/NOTICE
odecs/avc/enc/MODULE_LICENSE_APACHE2
odecs/avc/enc/NOTICE
odecs/common/MODULE_LICENSE_APACHE2
odecs/common/NOTICE
odecs/flac/enc/MODULE_LICENSE_APACHE2
odecs/flac/enc/NOTICE
odecs/g711/dec/MODULE_LICENSE_APACHE2
odecs/g711/dec/NOTICE
odecs/m4v_h263/dec/MODULE_LICENSE_APACHE2
odecs/m4v_h263/dec/NOTICE
odecs/m4v_h263/enc/MODULE_LICENSE_APACHE2
odecs/m4v_h263/enc/NOTICE
odecs/mp3dec/MODULE_LICENSE_APACHE2
odecs/mp3dec/NOTICE
odecs/raw/MODULE_LICENSE_APACHE2
odecs/raw/NOTICE
odecs/vorbis/dec/MODULE_LICENSE_APACHE2
odecs/vorbis/dec/NOTICE
olorconversion/MODULE_LICENSE_APACHE2
olorconversion/NOTICE
oundation/MODULE_LICENSE_APACHE2
oundation/NOTICE
ttplive/MODULE_LICENSE_APACHE2
ttplive/NOTICE
d3/MODULE_LICENSE_APACHE2
d3/NOTICE
atroska/MODULE_LICENSE_APACHE2
atroska/NOTICE
peg2ts/MODULE_LICENSE_APACHE2
peg2ts/NOTICE
mx/MODULE_LICENSE_APACHE2
mx/NOTICE
mx/tests/MODULE_LICENSE_APACHE2
mx/tests/NOTICE
tsp/MODULE_LICENSE_APACHE2
tsp/NOTICE
ests/MODULE_LICENSE_APACHE2
ests/NOTICE
imedtext/MODULE_LICENSE_APACHE2
imedtext/NOTICE
uv/MODULE_LICENSE_APACHE2
uv/NOTICE
ce3d3ef78d6512cc272d469e236fba4fca1189b0 13-Jun-2012 James Dong <jdong@google.com> Fix one of the potential ANR issues from AwesomePlayer

Change-Id: I8ac7bbb5fe219f65bdbdd223538fbac0575e2957
related-to-bug: 6565826
wesomePlayer.cpp
02bd296991e7e8a17939419cf197a6747ea441de 13-Jun-2012 Eric Laurent <elaurent@google.com> am b4ea1ab8: Merge "stagefright: fix AudioRecord callback buffer size" into jb-dev

* commit 'b4ea1ab821d652cb080910d4081f5f1318597a90':
stagefright: fix AudioRecord callback buffer size
b4ea1ab821d652cb080910d4081f5f1318597a90 13-Jun-2012 Eric Laurent <elaurent@google.com> Merge "stagefright: fix AudioRecord callback buffer size" into jb-dev
92a6141ea0bae283c898a8542604f6b47e226fad 13-Jun-2012 James Dong <jdong@google.com> am 958f463c: Add NOTICE and MODULE_LICENSE_APACHE2 for libstagefright_soft_h264dec and libstagefright_soft_vpxdec

* commit '958f463c4cddba6437c86d5bfef68167f767ee66':
Add NOTICE and MODULE_LICENSE_APACHE2 for libstagefright_soft_h264dec and libstagefright_soft_vpxdec
958f463c4cddba6437c86d5bfef68167f767ee66 13-Jun-2012 James Dong <jdong@google.com> Add NOTICE and MODULE_LICENSE_APACHE2 for libstagefright_soft_h264dec and libstagefright_soft_vpxdec

Change-Id: Id4f1ef8dfc21731846a9862b8d12940a92fe99bb
related-to-bug: 6647465
odecs/on2/dec/MODULE_LICENSE_APACHE2
odecs/on2/dec/NOTICE
odecs/on2/h264dec/MODULE_LICENSE_APACHE2
odecs/on2/h264dec/NOTICE
e49f2b424318aa8e830e7a1338e5e32ab82992f9 13-Jun-2012 Eric Laurent <elaurent@google.com> stagefright: fix AudioRecord callback buffer size

Make sure that the maximum number of frames passed to
AudioSource by the AudioRecord callback always fits within
the maximum buffer size defined by kMaxBufferSize.

Also make sure that the total AudioRecord buffer size is more
than the minimum required.

Change-Id: I26a1f998e0cf75ac88b02e67ec9d8db3c0cca193
udioSource.cpp
8f1dd6fdc2f788492e5ca77344eac13755c304ff 12-Jun-2012 Dave Burke <daveburke@google.com> am 10cf121f: Merge "Update make file" into jb-dev

* commit '10cf121f7285e23c37264dab3bad7cffefd754b1':
Update make file
ddc757cacf0336f028aec11380387cfdf3b3089c 12-Jun-2012 James Dong <jdong@google.com> am 8a61dc02: Merge "Revert "Added some informational log messages to track down ANR related issues"" into jb-dev

* commit '8a61dc02dbbc325dee51f2e9c9f0bbc238759ec5':
Revert "Added some informational log messages to track down ANR related issues"
c68f4a226fc5af54a882b0603d3051793a781037 12-Jun-2012 Dave Burke <daveburke@google.com> Update make file

Change-Id: I7dbd128245f584df2689457df0dd12ce888cf8ef
odecs/aacdec/Android.mk
odecs/aacenc/Android.mk
b5325c8a8fff4d735c24d9a8138e4213ee0833d5 23-May-2012 Martin Storsjo <martin@martin.st> stagefright aacenc: Move system headers before local headers

This avoids issues with the encoder's own definition of __inline,
which conflicts with headers brought in by string.h in glibc.

Change-Id: I9e3fbf8d892529940ea67a46e67a9abe71d9c5fa
odecs/aacenc/src/adj_thr.c
01e5b5699fb049bedbb7e156fbf7f5952c39130d 11-Jun-2012 James Dong <jdong@google.com> Revert "Added some informational log messages to track down ANR related issues"

This reverts commit c558fa89016ba9583049b84dc57e66a913cabde8.

related-to-bug: 6565826
MXCodec.cpp
93eb01fd39e31b7532932f60828abf11a494fb8f 12-Jan-2012 Martin Storsjo <martin@martin.st> stagefright aacenc: Add parentheses in expression with mixed && and ||

This doesn't maintain the exact behaviour, but seems closer to
what the original author probably intended.

This avoids a warning.

Change-Id: I191292faa0a25f715f2b7d46ec770827e2ac0b7b
odecs/aacenc/src/aacenc.c
c9bdf9b442bd6bb8f59e8e25c145ac625ac07c54 01-Jun-2012 Jeff Tinker <jtinker@google.com> am dadc0ddb: Part of fix for double spins & faster startup

* commit 'dadc0ddbfe309086801b479ddc91c55eeb2a9cbb':
Part of fix for double spins & faster startup
dadc0ddbfe309086801b479ddc91c55eeb2a9cbb 01-Jun-2012 Jeff Tinker <jtinker@google.com> Part of fix for double spins & faster startup

This change alters the way that the media player
interacts with the Widevine adaptive streaming buffer
logic. It eliminates the reliance on cached buffer
duration to determine pause/play states and instead
only generates buffering events when the widevine
library is not producing data (i.e. when it is
buffering). This eliminates unnecessary pause and
rebuffer cycles, reducing startup time and the
frequency and duration of spinners.

Multi-repo commit, depends on related changes in vendor/widevine

Change-Id: I387db2decd83841775a8351bddf5a6381fe4104f
related-to-bug:6503294
related-to-bug:6463780
wesomePlayer.cpp
3878fbedd8cd1f09aa2c1c2b6a44efd57c75e834 30-May-2012 James Dong <jdong@google.com> am cc9833b5: Only send port settings changed if the number of channels and sample rate are both known to be valid.

* commit 'cc9833b5db0e96f12daddb90a747fd146627377d':
Only send port settings changed if the number of channels and sample rate are both known to be valid.
cc9833b5db0e96f12daddb90a747fd146627377d 30-May-2012 James Dong <jdong@google.com> Only send port settings changed if the number of channels and sample rate are both known to be valid.

Change-Id: I9f8813eedc95db202488d8860cf485bdb8e69e11
related-to-bug: 6553089
odecs/aacdec/SoftAAC2.cpp
16c4cc1ecd9f907a34846117a3b3c7f59d9838ad 30-May-2012 Dave Burke <daveburke@google.com> am 4364d2d1: Merge "Precautionary logging to identify a potential infinite loop." into jb-dev

* commit '4364d2d1fd712faed7e839b58fedba3f48f626d0':
Precautionary logging to identify a potential infinite loop.
4364d2d1fd712faed7e839b58fedba3f48f626d0 30-May-2012 Dave Burke <daveburke@google.com> Merge "Precautionary logging to identify a potential infinite loop." into jb-dev
503775e4e2c3ead1cbd3c10561e3bdd90f2e70d5 30-May-2012 Dave Burke <daveburke@google.com> Precautionary logging to identify a potential infinite loop.

Bug: 6571063
Change-Id: I433659c6da333d5acd25ad03cb7f4a6ab0b6a4a5
odecs/aacdec/SoftAAC2.cpp
c5a5ebde7d14292e54532692fc9082051119fb80 30-May-2012 James Dong <jdong@google.com> am c558fa89: Added some informational log messages to track down ANR related issues

* commit 'c558fa89016ba9583049b84dc57e66a913cabde8':
Added some informational log messages to track down ANR related issues
c558fa89016ba9583049b84dc57e66a913cabde8 29-May-2012 James Dong <jdong@google.com> Added some informational log messages to track down ANR related issues

Change-Id: Ie991c86e75d58f7eb4c9f524815c4de054d5f262
related-to-bug: 6565826
MXCodec.cpp
aeb1ce5fe2e23d89d2f3f00a7623741945d75b12 29-May-2012 Andreas Huber <andih@google.com> am 91b0d43a: Merge "Unwedge ACodec if allocating output buffers fails while reconfiguring." into jb-dev

* commit '91b0d43a27b3a1cebd75270f953f3fb9fa4f2047':
Unwedge ACodec if allocating output buffers fails while reconfiguring.
91b0d43a27b3a1cebd75270f953f3fb9fa4f2047 29-May-2012 Andreas Huber <andih@google.com> Merge "Unwedge ACodec if allocating output buffers fails while reconfiguring." into jb-dev
755b9861197f1566f916785ba7d35cf86fd5b2d5 29-May-2012 Andreas Huber <andih@google.com> Unwedge ACodec if allocating output buffers fails while reconfiguring.

Change-Id: I871cf639167c01860e65c0408d3ce935f8f8f1ea
related-to-bug: 6571060
Codec.cpp
35a144765f0403bf93765a01691c898e38b4ef55 29-May-2012 Andreas Huber <andih@google.com> am 40fe18f2: Force shutdown of the omx decoder even if it\'s in a wedged state...

* commit '40fe18f20e07f3626ff23d89ebdd5113733e155d':
Force shutdown of the omx decoder even if it's in a wedged state...
40fe18f20e07f3626ff23d89ebdd5113733e155d 29-May-2012 Andreas Huber <andih@google.com> Force shutdown of the omx decoder even if it's in a wedged state...

Change-Id: I5899928a3df4bcf7715769992955a0b834db1e2f
related-to-bug: 6571060
MXCodec.cpp
f8321d624f4bbbfcf01d59f346d3eb390f75f24c 25-May-2012 Martin Storsjo <martin@martin.st> stagefright aacenc: Fix reading out of bounds in pow2_xy

This fixes cases where x was a large number, causing fPart to
exceed the 32 bit signed integer range (while fitting in an
unsigned 32 bit integer), making the table index a negative
number.

Change-Id: I674047db65f89148a93d218c138b42cd8305f80e
odecs/aacenc/basic_op/oper_32b.c
f655483263128529bc01aa1c2e80c229a2d169b8 25-May-2012 Dave Burke <daveburke@google.com> am 6350e21e: Merge "Property to enable AAC 5.1 pass-through." into jb-dev

* commit '6350e21e8947398a94402bc2969d13d407fbc3fb':
Property to enable AAC 5.1 pass-through.
6350e21e8947398a94402bc2969d13d407fbc3fb 25-May-2012 Dave Burke <daveburke@google.com> Merge "Property to enable AAC 5.1 pass-through." into jb-dev
1adacd921319ec52fac1a4596ab6eaf8689e6a7d 23-May-2012 Dave Burke <daveburke@google.com> Property to enable AAC 5.1 pass-through.

Bug: 6275957
Change-Id: I8debdce872fc8287a4f6340f1790e02c075886e3
odecs/aacdec/Android.mk
odecs/aacdec/SoftAAC2.cpp
odecs/aacdec/SoftAAC2.h
41ced0ade8a90f071e85fe1cf49f073c0738e95a 25-May-2012 James Dong <jdong@google.com> am 49fcd3cc: Fix an error caused by sample size value by order

* commit '49fcd3cc0c0bf352c5c0516e53805278e94951ca':
Fix an error caused by sample size value by order
49fcd3cc0c0bf352c5c0516e53805278e94951ca 25-May-2012 James Dong <jdong@google.com> Fix an error caused by sample size value by order

The sample size was saved in the array in network order, but it was treated as host order when
writeInt32() is called. Calling write(void *, int, int) resolves the issue.

related-to-bug: 6555366

Change-Id: If7ef99911ad65108c61b533673ac4d4cd580a370
PEG4Writer.cpp
4719fa8ae1259d6a94ba5b5ecdaa01e69f553996 29-Mar-2012 Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org> libstagefright/matroska: Fix build with gcc 4.7

gcc 4.7 doesn't like the redefinition of i in the
same scope

Change-Id: Idf1b33af7041f0302f2f2562442a3e11ce9607d9
Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
atroska/MatroskaExtractor.cpp
73e9a35c41efe4dac6b05387a9dafecdc662f140 22-May-2012 Andreas Huber <andih@google.com> am 8d9846c0: Merge "Tell surface flinger that we want to protect output buffers from being" into jb-dev

* commit '8d9846c0693b7651b243f0161caa86be506f764a':
Tell surface flinger that we want to protect output buffers from being
bc098410be55f9d96f394b3981a0c482b83859b6 22-May-2012 Andreas Huber <andih@google.com> Tell surface flinger that we want to protect output buffers from being

sent to HDMI (without HDCP) and push a few black frames on IDLE->LOADED
similar to OMXCodec's behaviour.

Change-Id: Iea6055a115151ca881220a70a31af6ade2c58cb3
related-to-bug: 6537187
Codec.cpp
uMediaExtractor.cpp
bbc0940562f8cb6cbf19750246eb259b43a5a698 22-May-2012 Andreas Huber <andih@google.com> am a6490c65: Only mark the audio player as started if it did so successfully.

* commit 'a6490c65f93e1cbe969fba499978e8d64214108a':
Only mark the audio player as started if it did so successfully.
d684da86233357b51f0dc096bbe840892165bb3e 22-May-2012 Andreas Huber <andih@google.com> am 4575beb3: Revert "Stop audio source if AudioPlayer could not be started"

* commit '4575beb3dea80e271eaa6619234fdc02e914e6e6':
Revert "Stop audio source if AudioPlayer could not be started"
a6490c65f93e1cbe969fba499978e8d64214108a 22-May-2012 Andreas Huber <andih@google.com> Only mark the audio player as started if it did so successfully.

Change-Id: I4683f5ca243f9f1b80990028d225d0f6c5973899
related-to-bug: 6500580
wesomePlayer.cpp
4575beb3dea80e271eaa6619234fdc02e914e6e6 22-May-2012 Andreas Huber <andih@google.com> Revert "Stop audio source if AudioPlayer could not be started"

This reverts commit 022048e95f3f1d65cb776cf21de2001423fcf7d9.
udioPlayer.cpp
93a417da48394ff929c9bb0b36cc3bef77a893a8 22-May-2012 Dave Burke <daveburke@google.com> am c9ef89cd: Revert "Revert to PV for AAC codec for FactoryROM."

* commit 'c9ef89cd40bea216046ed28e5366f8ac361d3dd4':
Revert "Revert to PV for AAC codec for FactoryROM."
96286ab6ec6dfa178f9356dc5f9595648eb37e60 22-May-2012 Dave Burke <daveburke@google.com> am d7d79a2b: Revert to PV for AAC codec for FactoryROM.

* commit 'd7d79a2bbf38d1d19ec7cc8d6a514fc999b5c444':
Revert to PV for AAC codec for FactoryROM.
c9ef89cd40bea216046ed28e5366f8ac361d3dd4 22-May-2012 Dave Burke <daveburke@google.com> Revert "Revert to PV for AAC codec for FactoryROM."

This reverts commit d7d79a2bbf38d1d19ec7cc8d6a514fc999b5c444.

Change-Id: I7076feab31ab64fccd364699280d821011edc099
odecs/aacdec/Android.mk
odecs/aacenc/Android.mk
d7d79a2bbf38d1d19ec7cc8d6a514fc999b5c444 19-May-2012 Dave Burke <daveburke@google.com> Revert to PV for AAC codec for FactoryROM.

Change-Id: I72cf856685c0c4bae745646f870a0415d416afb5
odecs/aacdec/Android.mk
odecs/aacenc/Android.mk
4b43b41eaf8c4c80f66185e13620cf94b8b2ef5b 13-Apr-2012 Martin Storsjo <martin@martin.st> stagefright avcenc: Use intptr_t for casting pointers to integers

This is used for doing integer arithmetic on the pointers, for
checking pointer alignment.

Change-Id: I7a7ff834dc631ac9cce90e46216f64645e1ae6e5
odecs/avc/enc/src/avcenc_api.cpp
odecs/avc/enc/src/motion_comp.cpp
odecs/avc/enc/src/sad_inline.h
4e1d7b8d16abbe8a60fa3957646297b552e82fb0 13-Apr-2012 Martin Storsjo <martin@martin.st> stagefright avcenc: Switch tmp variables to use the right type, to avoid casting

This fixes building on platforms where int is smaller than
pointers, e.g. 64 bit platforms.

Change-Id: I3da0459bac10cbffd1db699bf4782fe926cd391f
odecs/avc/common/src/deblock.cpp
odecs/avc/enc/src/motion_comp.cpp
0c072553f20085b18e6204afc8818b7922bffa9d 21-May-2012 James Dong <jdong@google.com> am a92896f6: Merge "Fix a mediaserver crash caused by dereferencing a NULL pointer." into jb-dev

* commit 'a92896f62d8f4a4a6ff61f26439ad61c210ce728':
Fix a mediaserver crash caused by dereferencing a NULL pointer.
a92896f62d8f4a4a6ff61f26439ad61c210ce728 21-May-2012 James Dong <jdong@google.com> Merge "Fix a mediaserver crash caused by dereferencing a NULL pointer." into jb-dev
21a0dca457bc0f3b8bafca0c49dfe2d442acbde0 21-May-2012 James Dong <jdong@google.com> Fix a mediaserver crash caused by dereferencing a NULL pointer.

The pointer (info in method drainInputBuffer) in can be null at the point of the dereference,
but it will get updated subsequently. Thus, we should move the logging after the pointer gets updated.

related-to-bug: 6530159

Change-Id: Ifa5f19a694953af6942454e5c28cd3fa024f11d2
MXCodec.cpp
602b899432e1540a8e874c9dfd73aaa9743d1b3b 21-May-2012 Andreas Huber <andih@google.com> am cd8a36fd: Merge "Add more verbose ADTS error logging to SoftAAC." into jb-dev

* commit 'cd8a36fdc49a823f78d45e8e1a464dc261553b26':
Add more verbose ADTS error logging to SoftAAC.
cd8a36fdc49a823f78d45e8e1a464dc261553b26 21-May-2012 Andreas Huber <andih@google.com> Merge "Add more verbose ADTS error logging to SoftAAC." into jb-dev
e35ac2860e99d809a2ccca59bd4eb2f8c02d15ad 21-May-2012 Andreas Huber <andih@google.com> Add more verbose ADTS error logging to SoftAAC.

and fix the corresponding code in SoftAAC2.

Change-Id: I6c745fb6e8e093708fdfe2861963b0a35fa7b912
related-to-bug: 6519161
odecs/aacdec/SoftAAC.cpp
odecs/aacdec/SoftAAC2.cpp
c86ae70bf5a7ae7f62d3b5ea3f459aed4e362095 21-May-2012 Andreas Huber <andih@google.com> am 91bfadb4: If we encounter an error during buffer allocation change state back

* commit '91bfadb4aa75444c60e9949232de3c184cfe060a':
If we encounter an error during buffer allocation change state back
91bfadb4aa75444c60e9949232de3c184cfe060a 21-May-2012 Andreas Huber <andih@google.com> If we encounter an error during buffer allocation change state back

to LOADED instead of remaining in the transitional state LOADED->IDLE
that won't properly handle flush or shutdown requests.

Change-Id: Ica1bf22eb884b220f18ed2a4f7a9c56eec228796
related-to-bug: 6516512
Codec.cpp
60359f49d38c16d95b6e4f5c024e256b37d03f0c 18-May-2012 Andreas Huber <andih@google.com> am 8370c7ad: Instead of asserting on malformed ADTS headers or insufficient data,

* commit '8370c7ad4136ad7e0787d5a91ccfa3d63cfbe5cc':
Instead of asserting on malformed ADTS headers or insufficient data,
e40d461e4826a8515aaa74779a1705ff1b1997ef 18-May-2012 Dave Burke <daveburke@google.com> am bf2461ec: Don\'t reconfigure stream after outputing data.

* commit 'bf2461ecc71c0aacf8c03fcdaf0dc46bc8285c7f':
Don't reconfigure stream after outputing data.
8370c7ad4136ad7e0787d5a91ccfa3d63cfbe5cc 18-May-2012 Andreas Huber <andih@google.com> Instead of asserting on malformed ADTS headers or insufficient data,

stop decoding and signal a runtime error.

Change-Id: Ib66a17a2908273f65a92999951439cc6f0752164
related-to-bug: 6519161
odecs/aacdec/SoftAAC2.cpp
bf2461ecc71c0aacf8c03fcdaf0dc46bc8285c7f 18-May-2012 Dave Burke <daveburke@google.com> Don't reconfigure stream after outputing data.

Handle invalid configuration.
Bug: 6519161

Change-Id: Ib2d38bee769e63e627c93d7f3839c3a55de694e9
odecs/aacdec/SoftAAC2.cpp
896da3c8f8a1e252bf088f2602caf9f79296b875 18-May-2012 Dave Burke <daveburke@google.com> am 441fbdea: Robustness - use defaults if we see bogus sample rate / channels from decoder.

* commit '441fbdea6e46ddc6b99fa864ab1edaa9759ec033':
Robustness - use defaults if we see bogus sample rate / channels from decoder.
441fbdea6e46ddc6b99fa864ab1edaa9759ec033 18-May-2012 Dave Burke <daveburke@google.com> Robustness - use defaults if we see bogus sample rate / channels from decoder.

Bug: 6498711
Change-Id: I6950d316a292cfd0cb516ee6d95b6af071b08fdc
odecs/aacdec/SoftAAC2.cpp
00e7ebd0fc7674ab885dcddd09c1f53bf0423e69 18-May-2012 Dave Burke <daveburke@google.com> am 3748b71a: Handle stream changes at any point in the stream.

* commit '3748b71a7fe73b0365a93f1fd28ced14219f85e5':
Handle stream changes at any point in the stream.
3748b71a7fe73b0365a93f1fd28ced14219f85e5 18-May-2012 Dave Burke <daveburke@google.com> Handle stream changes at any point in the stream.

Also, handle discontinuity properly (was using wrong flag before).
Bug: 6498711

Change-Id: I18a6684f7dc96aa04b1e8113b54ec1053895ca98
odecs/aacdec/SoftAAC2.cpp
odecs/aacdec/SoftAAC2.h
540b65bcd4cad71593abb49d305b01a807cf2a92 18-May-2012 Dave Burke <daveburke@google.com> am 3eda271f: Merge "Clear the decoder input buffer after it signalled an error to be able to continue." into jb-dev

* commit '3eda271f8b1879467759f98e5538577b1b6804f4':
Clear the decoder input buffer after it signalled an error to be able to continue.
3eda271f8b1879467759f98e5538577b1b6804f4 18-May-2012 Dave Burke <daveburke@google.com> Merge "Clear the decoder input buffer after it signalled an error to be able to continue." into jb-dev
b5733a9474cb8bf3f29965a0c5faa467238e015e 18-May-2012 Andreas Huber <andih@google.com> am 8dfa2282: Fixes parsing of PSI sections in MPEG2 transport streams

* commit '8dfa228201131da0bf3ba1d74c819c27c0500f6b':
Fixes parsing of PSI sections in MPEG2 transport streams
8dfa228201131da0bf3ba1d74c819c27c0500f6b 15-May-2012 Andreas Huber <andih@google.com> Fixes parsing of PSI sections in MPEG2 transport streams

They can span multiple transport stream packets, something the parser
previously did not support.

Change-Id: I78da6ffd2d422cceedb87aad61cba2062419e635
related-to-bug: 6166596
peg2ts/ATSParser.cpp
peg2ts/ATSParser.h
e672a0eea2cdc2ed43e002f0583902f20705de57 18-May-2012 Andreas Huber <andih@google.com> Clear the decoder input buffer after it signalled an error to be able to continue.

Change-Id: I06d43723dea7688d63cfb05e7fc7754672788562
related-to-bug: 6419102
odecs/aacdec/SoftAAC2.cpp
d361f18957a3470ef9c2e23d92039371f7105060 17-May-2012 Andreas Huber <andih@google.com> am e00e0485: Merge "Buffer at least 2 secs worth of data at startup of after a seek before" into jb-dev

* commit 'e00e0485b0aa1e432be8c639da0eb5285942777b':
Buffer at least 2 secs worth of data at startup of after a seek before
e00e0485b0aa1e432be8c639da0eb5285942777b 17-May-2012 Andreas Huber <andih@google.com> Merge "Buffer at least 2 secs worth of data at startup of after a seek before" into jb-dev
bfd4d0d9fe0033abf3f55b94f30f6a58846a875e 17-May-2012 Andreas Huber <andih@google.com> Buffer at least 2 secs worth of data at startup of after a seek before

resuming starting RTSP playback.

Change-Id: I060c6c7fd627ab7ebd5c095ddcfdb4cc0f637aad
related-to-bug: 6364126
peg2ts/AnotherPacketSource.cpp
peg2ts/AnotherPacketSource.h
569a6fe322da8cd3ae0bc37307254af1f91102d4 17-May-2012 Andreas Huber <andih@google.com> am b33eaec7: Merge "Prefix MPEG4-generic audio data with ADTS headers" into jb-dev

* commit 'b33eaec751d712c237e1c1b53a18a259456fa682':
Prefix MPEG4-generic audio data with ADTS headers
b33eaec751d712c237e1c1b53a18a259456fa682 17-May-2012 Andreas Huber <andih@google.com> Merge "Prefix MPEG4-generic audio data with ADTS headers" into jb-dev
ece3dcfe23ccd804293dbb408f0f680c94f7dd72 17-May-2012 Dave Burke <daveburke@google.com> am 35c53ccd: Merge "Add informational logging to track 0 channel issue." into jb-dev

* commit '35c53ccdc1be56879ba25956bf2284d2cff7c3c4':
Add informational logging to track 0 channel issue.
35c53ccdc1be56879ba25956bf2284d2cff7c3c4 17-May-2012 Dave Burke <daveburke@google.com> Merge "Add informational logging to track 0 channel issue." into jb-dev
e893150187191299002626c75232f8985189cb0d 17-May-2012 Dave Burke <daveburke@google.com> Add informational logging to track 0 channel issue.

Bug #: 6498711

Change-Id: I952777923569511a171fe8b79eab579625eda073
odecs/aacdec/SoftAAC2.cpp
8647bbe4420ca487467318404127f52c567e346b 17-May-2012 Andreas Huber <andih@google.com> Prefix MPEG4-generic audio data with ADTS headers

to work around limitations of the new AAC decoder.

Change-Id: I4988c7c39fedb7d04eb1ae2ba2d618aa6cb14e77
related-to-bug: 6488547
tsp/AMPEG4AudioAssembler.cpp
tsp/AMPEG4ElementaryAssembler.cpp
tsp/AMPEG4ElementaryAssembler.h
tsp/APacketSource.cpp
tsp/ARTPAssembler.cpp
tsp/ARTPAssembler.h
cd160b175dbccc4581131653e3fcd08b632150ca 17-May-2012 James Dong <jdong@google.com> am 022048e9: Stop audio source if AudioPlayer could not be started

* commit '022048e95f3f1d65cb776cf21de2001423fcf7d9':
Stop audio source if AudioPlayer could not be started
022048e95f3f1d65cb776cf21de2001423fcf7d9 17-May-2012 James Dong <jdong@google.com> Stop audio source if AudioPlayer could not be started

related-to-bug: 6500580

Change-Id: If47e442db2f1ea400e9b598502bb48513f28cd6d
udioPlayer.cpp
87cbe8aed7e6c9306df8c9c68a2fa82c24da66c3 17-May-2012 Andreas Huber <andih@google.com> am 88ba895b: Merge "Stop extrapolating audio time from the anchor if we\'re paused or reached eos." into jb-dev

* commit '88ba895b5ddd8b3da364c3ceacdb698224ee746f':
Stop extrapolating audio time from the anchor if we're paused or reached eos.
88ba895b5ddd8b3da364c3ceacdb698224ee746f 17-May-2012 Andreas Huber <andih@google.com> Merge "Stop extrapolating audio time from the anchor if we're paused or reached eos." into jb-dev
7d2256a535434d4f05a57eebc592790a1d1edd90 16-May-2012 Dave Burke <daveburke@google.com> am 62999949: Merge "Add logging for invalid channel count or sample rate." into jb-dev

* commit '62999949c58ae18784a6061d83e4f2b78dbc3465':
Add logging for invalid channel count or sample rate.
62999949c58ae18784a6061d83e4f2b78dbc3465 16-May-2012 Dave Burke <daveburke@google.com> Merge "Add logging for invalid channel count or sample rate." into jb-dev
26976984d4f882f5da385360e76bc1c29fb4a696 16-May-2012 Dave Burke <daveburke@google.com> Add logging for invalid channel count or sample rate.

Change-Id: I2e2145e4b258923cf6c2907106345b7172c12280
odecs/aacdec/SoftAAC2.cpp
e9f4e016145f9bd1f2d133425dde6440d2f4c27e 16-May-2012 James Dong <jdong@google.com> am 50a9908f: Merge "Speed up stsz box write in MPEG4Writer" into jb-dev

* commit '50a9908f987fd5a73d8a95d6fe46b530386cdc86':
Speed up stsz box write in MPEG4Writer
50a9908f987fd5a73d8a95d6fe46b530386cdc86 16-May-2012 James Dong <jdong@google.com> Merge "Speed up stsz box write in MPEG4Writer" into jb-dev
6051af9e024700a1ce5f3243e543f9aac09f934f 16-May-2012 Andreas Huber <andih@google.com> am 6d0780ae: Merge "Log which OMX component is not returning all buffers to us on executing->idle." into jb-dev

* commit '6d0780ae34ed2fa3e9631667f200e15ddd472464':
Log which OMX component is not returning all buffers to us on executing->idle.
8c460498c028888c533ab442be12b6d4b669b965 15-May-2012 James Dong <jdong@google.com> Speed up stsz box write in MPEG4Writer

With this patch, the write time for 30+ minutes recording session is reduced from 10+ seconds down to around 2-3 seconds.

related-to-bug: 6435176

Change-Id: I83b705cea42d8de798e7032c770c5c7b033e267e
PEG4Writer.cpp
5179ff34cf3ca69b3d3eaa71cdbf0c2aec6b45b3 16-May-2012 Andreas Huber <andih@google.com> Log which OMX component is not returning all buffers to us on executing->idle.

Change-Id: I8cd102cc5b1f3c9c36e3c5832ae4bee75c471efd
related-to-bug: 6498711
MXCodec.cpp
a99a5bca365277271915cbaeea811ad87131270d 16-May-2012 Andreas Huber <andih@google.com> Stop extrapolating audio time from the anchor if we're paused or reached eos.

Change-Id: I55903ba625d9c075a9a6e7bcd5ff95d450b915b2
related-to-bug: 6479613
udioPlayer.cpp
e5575ae2280dc02f1e623c92a31b0ea83081d49f 15-May-2012 Andreas Huber <andih@google.com> am 859c897b: Merge "Ignore sideband parsing errors and spit out a frame of silence." into jb-dev

* commit '859c897b87593386d7c37ab844d4890aaa19bceb':
Ignore sideband parsing errors and spit out a frame of silence.
859c897b87593386d7c37ab844d4890aaa19bceb 15-May-2012 Andreas Huber <andih@google.com> Merge "Ignore sideband parsing errors and spit out a frame of silence." into jb-dev
259b39cbfc03cb94c48e66d752836e153e9a2f8b 15-May-2012 Andreas Huber <andih@google.com> Ignore sideband parsing errors and spit out a frame of silence.

Change-Id: I274d8e9018e02eb42121a2440b42caefeca94fb0
related-to-bug: 6498193
odecs/mp3dec/SoftMP3.cpp
8311aa4a6a33563232f9b94b43a5eb6482f369b9 15-May-2012 Andreas Huber <andih@google.com> am 2879bb21: Merge "Explicitly set the video scaling mode to "stretch"." into jb-dev

* commit '2879bb2181c4c315ae653724f6b605b3e3831bdd':
Explicitly set the video scaling mode to "stretch".
3f9d05d2d8f92498172b0260a4284b649dc0af85 15-May-2012 Andreas Huber <andih@google.com> am de321c32: Instead of asserting, turn an unsupported colorspace conversion into a

* commit 'de321c324cc4af88a8ea54d08c63546f73677037':
Instead of asserting, turn an unsupported colorspace conversion into a
2879bb2181c4c315ae653724f6b605b3e3831bdd 15-May-2012 Andreas Huber <andih@google.com> Merge "Explicitly set the video scaling mode to "stretch"." into jb-dev
1ec498e67f78fb0c3ab2a1cd9a071e6356618dad 15-May-2012 Andreas Huber <andih@google.com> Explicitly set the video scaling mode to "stretch".

Change-Id: I23b8848cfef51bc8ea72deb22783e21d093dbd98
related-to-bug: 6498150
Codec.cpp
de321c324cc4af88a8ea54d08c63546f73677037 15-May-2012 Andreas Huber <andih@google.com> Instead of asserting, turn an unsupported colorspace conversion into a

runtime error.

Change-Id: I0a1754ecaa2a6aac8b0b1bcc829aa873cf238b9b
related-to-bug: 6499326
tagefrightMetadataRetriever.cpp
cb013629eaac7fa42a5b1e2f9b6b10af87851909 15-May-2012 Andreas Huber <andih@google.com> am dfa29ab1: Merge "Smoothen audio "real" time by compensating with system_time()" into jb-dev

* commit 'dfa29ab13647f22b30b2de34d4830c9e815bf120':
Smoothen audio "real" time by compensating with system_time()
0cfd2ada44749a934bf943da9c90ab91d2208d95 15-May-2012 James Dong <jdong@google.com> am 804c27e9: Merge "Switch audio tracks at runtime" into jb-dev

* commit '804c27e91ea324c5d8dc89b60637695adc776141':
Switch audio tracks at runtime
3a01ce738476b2543e1d0a31aa54875b1c69a31b 15-May-2012 Andreas Huber <andih@google.com> am 44f84ded: ACodec mustn\'t override the video scaling mod.

* commit '44f84ded62bffd5f04e0f5961e8304427a7b9f34':
ACodec mustn't override the video scaling mod.
dfa29ab13647f22b30b2de34d4830c9e815bf120 15-May-2012 Andreas Huber <andih@google.com> Merge "Smoothen audio "real" time by compensating with system_time()" into jb-dev
e4451a91a61a341014f5eff61db356156c3ecb37 15-May-2012 Andreas Huber <andih@google.com> Smoothen audio "real" time by compensating with system_time()

for the delay since the last buffer submission to the audio sink.

Change-Id: Ib1a8672f96ba8bbef07d23372f1076fbb1f0bdcc
related-to-bug: 6479613
udioPlayer.cpp
804c27e91ea324c5d8dc89b60637695adc776141 14-May-2012 James Dong <jdong@google.com> Merge "Switch audio tracks at runtime" into jb-dev
ab7a2e544643edcb2e09ed5f204580afd763edc1 27-Apr-2012 James Dong <jdong@google.com> Switch audio tracks at runtime

o The switching is not allowed if there is an audio seek operation ongoing.

o related-to-bug: 6110705

Change-Id: Ib92a165f3984aa033d97800184d3d17319522db5
wesomePlayer.cpp
nclude/AwesomePlayer.h
44f84ded62bffd5f04e0f5961e8304427a7b9f34 14-May-2012 Andreas Huber <andih@google.com> ACodec mustn't override the video scaling mod.

Change-Id: Id9b569446d73dcfe44ab4a3488812203758c9c42
related-to-bug: 6490687
Codec.cpp
89463ee03d8393cf42cc3d6b1ebf95a8a0d35e99 13-May-2012 Dave Burke <daveburke@google.com> am 94f60e29: Remove ASC workaround (now fixed in Franhofer library).

* commit '94f60e297b9e45fac387cf10b6ce1acc067cb4a1':
Remove ASC workaround (now fixed in Franhofer library).
94f60e297b9e45fac387cf10b6ce1acc067cb4a1 12-May-2012 Dave Burke <daveburke@google.com> Remove ASC workaround (now fixed in Franhofer library).

Change-Id: Ia0ce8155def9f6dea85da7f88942ac1b11c16823
odecs/aacdec/SoftAAC2.cpp
6906d17e061b6fb9ee9f9294a280134d48a8ff41 12-May-2012 Jamie Gennis <jgennis@google.com> am bb9d731b: Merge "stagefright: add tracing to AwesomePlayer." into jb-dev

* commit 'bb9d731bc2b5759f72f6d382834e431a0389cf07':
stagefright: add tracing to AwesomePlayer.
bb9d731bc2b5759f72f6d382834e431a0389cf07 12-May-2012 Jamie Gennis <jgennis@google.com> Merge "stagefright: add tracing to AwesomePlayer." into jb-dev
e9c21233c3fd08e0ae5be60f11a898c1866ed470 12-May-2012 James Dong <jdong@google.com> am 7cf0de49: Merge "Remove unused VideoSourceDownSampler class" into jb-dev

* commit '7cf0de49dbdcb2da7d9bf9421f58adf442dfeaea':
Remove unused VideoSourceDownSampler class
7cf0de49dbdcb2da7d9bf9421f58adf442dfeaea 12-May-2012 James Dong <jdong@google.com> Merge "Remove unused VideoSourceDownSampler class" into jb-dev
3a2633008be4a92fbca6e76c057f86e220558197 11-May-2012 James Dong <jdong@google.com> Remove unused VideoSourceDownSampler class

Change-Id: I2faf5962ff4cc366c688ef5bb27f53596f08fe0a
related-to-bug: 6484217
ndroid.mk
ideoSourceDownSampler.cpp
68be0108a701cbae2d9e3335a7b1056d8eedb140 11-May-2012 Andreas Huber <andih@google.com> am 7d580566: Merge "Increase AAC software decoder\'s buffer count. Refactor how clients" into jb-dev

* commit '7d5805669dea851e70115c494154a2d26b8dc39e':
Increase AAC software decoder's buffer count. Refactor how clients
7d5805669dea851e70115c494154a2d26b8dc39e 11-May-2012 Andreas Huber <andih@google.com> Merge "Increase AAC software decoder's buffer count. Refactor how clients" into jb-dev
eb61431af13741aa8b7e57a39f69bba5a6c190dc 11-May-2012 Andreas Huber <andih@google.com> Increase AAC software decoder's buffer count. Refactor how clients

of ACodec get notified about codec buffers and buffer ids.

Change-Id: I962f873262dae7aa7b43f5f68a6d60268282f91e
related-to-bug: 6478823
Codec.cpp
ediaCodec.cpp
odecs/aacdec/SoftAAC.cpp
odecs/aacdec/SoftAAC.h
odecs/aacdec/SoftAAC2.cpp
odecs/aacdec/SoftAAC2.h
cb0e6ac3d9f9f006652ead57f5b4d5e54ecc5d37 11-May-2012 James Dong <jdong@google.com> am c20f467d: Merge "Fix a bug on sending a message to retry in TimedText." into jb-dev

* commit 'c20f467d54f921730aa0b2fd087ad83496aeaf4b':
Fix a bug on sending a message to retry in TimedText.
c20f467d54f921730aa0b2fd087ad83496aeaf4b 11-May-2012 James Dong <jdong@google.com> Merge "Fix a bug on sending a message to retry in TimedText." into jb-dev
2163320110d2f971becbad82e15b2ab360a1ddb6 11-May-2012 Jamie Gennis <jgennis@google.com> stagefright: add tracing to AwesomePlayer.

Change-Id: Id84419a1c54e41e158b24477f0676071e90f6922
wesomePlayer.cpp
3b963c60693c10276f5ebf5e0abb95f6be78070f 10-May-2012 Insun Kang <insun@google.com> Fix a bug on sending a message to retry in TimedText.

related-to-bug: 6480861

Change-Id: I86f24f1304dea42a7501c578cff0c590b048ccc2
imedtext/TimedTextPlayer.cpp
0c0e003f8e4557eb3ddb477c6adbdb3cd2ba28f4 11-May-2012 Andreas Huber <andih@google.com> am 96409203: Merge "Add "support" for AMR WB comfort noise, no data and speech lost frame types" into jb-dev

* commit '96409203b4a857768e38137e88001378ad383584':
Add "support" for AMR WB comfort noise, no data and speech lost frame types
8ab086d0356f90bc1901d1c4e7e0687f6ac273c3 11-May-2012 Dave Burke <daveburke@google.com> am da66e667: Merge "Make decoder more robust to inaccurate ASCs." into jb-dev

* commit 'da66e667840de77d3b9a9a094bbf12f43975d7e0':
Make decoder more robust to inaccurate ASCs.
96409203b4a857768e38137e88001378ad383584 11-May-2012 Andreas Huber <andih@google.com> Merge "Add "support" for AMR WB comfort noise, no data and speech lost frame types" into jb-dev
da66e667840de77d3b9a9a094bbf12f43975d7e0 11-May-2012 Dave Burke <daveburke@google.com> Merge "Make decoder more robust to inaccurate ASCs." into jb-dev
dc5db5d281d57ff59d92105cf0cd383df3b3c368 11-May-2012 Dave Burke <daveburke@google.com> Make decoder more robust to inaccurate ASCs.

Bug: 6408518
Bug: 6463794
Change-Id: Ice4ae327bc53e9d826adce572a2706e045eacd62
odecs/aacdec/SoftAAC2.cpp
a9605efa3edfae96fa618a4b78f6c2276f941fab 10-May-2012 Andreas Huber <andih@google.com> Add "support" for AMR WB comfort noise, no data and speech lost frame types

by emitting silence.

Change-Id: I27b7f31051f0c9a14adde866305bbc91a827a00c
related-to-bug: 6478154
odecs/amrnb/dec/SoftAMR.cpp
0bf474261dc5656990ecc25af63f3b2d125b2b20 10-May-2012 Andreas Huber <andih@google.com> am af9e6a17: Merge "Properly connect/disconnect to/from the native window in MediaCodec." into jb-dev

* commit 'af9e6a17d7038b411b61a3cb0669694058511a05':
Properly connect/disconnect to/from the native window in MediaCodec.
af9e6a17d7038b411b61a3cb0669694058511a05 10-May-2012 Andreas Huber <andih@google.com> Merge "Properly connect/disconnect to/from the native window in MediaCodec." into jb-dev
0857d4e2bdca4d4b0fd085b6fe7058d61b080165 10-May-2012 Andreas Huber <andih@google.com> am 5c36fc87: Don\'t attempt to support content the software MPEG4 decoder clearly wasn\'t

* commit '5c36fc8701eb7468c268c47dae5dba58dbd8e83e':
Don't attempt to support content the software MPEG4 decoder clearly wasn't
5c36fc8701eb7468c268c47dae5dba58dbd8e83e 10-May-2012 Andreas Huber <andih@google.com> Don't attempt to support content the software MPEG4 decoder clearly wasn't

prepared for.

Change-Id: I4614ba25a1c67e47bde27ddebd99cb50892c1a94
related-to-bug: 6327803
odecs/m4v_h263/dec/include/mp4dec_api.h
7541ff5d83a3e77cb533841a0326a241550b95d9 10-May-2012 Andreas Huber <andih@google.com> Properly connect/disconnect to/from the native window in MediaCodec.

Change-Id: Ib5bf90a3b81fca8ff2346235bc28a2bd0bc7bfb1
related-to-bug: 6472161
ediaCodec.cpp
ce7380818e9b19668730fdc527ee7876d3427078 10-May-2012 Jean-Michel Trivi <jmtrivi@google.com> am 2f74ef3c: OMX IL wrapper for FLAC encoder

* commit '2f74ef3cdc192f817ee1121f41765f0852c1d81e':
OMX IL wrapper for FLAC encoder
2f74ef3cdc192f817ee1121f41765f0852c1d81e 30-Apr-2012 Jean-Michel Trivi <jmtrivi@google.com> OMX IL wrapper for FLAC encoder

Add wrapper around libFLAC for FLAC encoding in OpenMAX IL.

Declare FLAC encoder in OMX component roles.

Bug 5525503

Change-Id: I19bbce41c216870669d09365693f4ea89f8bc0f7
Codec.cpp
MXCodec.cpp
odecs/flac/Android.mk
odecs/flac/enc/Android.mk
odecs/flac/enc/SoftFlacEncoder.cpp
odecs/flac/enc/SoftFlacEncoder.h
mx/SoftOMXPlugin.cpp
89f24546f131e78ada87d60c3843470fd737fa24 09-May-2012 Andreas Huber <andih@google.com> am c150ca7d: Merge "Submit codec specific data automatically" into jb-dev

* commit 'c150ca7dda844891fa684f6898da7f7e0c40329d':
Submit codec specific data automatically
f4407649ea26382dd33109c71cc0c3b150f56f87 09-May-2012 Andreas Huber <andih@google.com> am a9623e01: Merge "Fix both H.263 and MPEG4 decoders." into jb-dev

* commit 'a9623e018737889d32f6b231f913a70d020c7ac5':
Fix both H.263 and MPEG4 decoders.
70dbe3e9c240e6ae1a23edc4dc7ee8b6261667c5 09-May-2012 Fred Gylys-Colwell <fredgc@google.com> am 1d02a827: Fix DRM timer start for Widevine.

* commit '1d02a827bc0bb5023a551bc9ce3fb37457240daa':
Fix DRM timer start for Widevine.
c150ca7dda844891fa684f6898da7f7e0c40329d 08-May-2012 Andreas Huber <andih@google.com> Merge "Submit codec specific data automatically" into jb-dev
8ee516a515c70a492c395b67ce12e19e7d159804 08-May-2012 Andreas Huber <andih@google.com> Submit codec specific data automatically

if it is contained in the format passed to MediaCodec::configure.

Change-Id: I8ef6755e8389ec47b44a9c70904ea6c03a00f4f2
related-to-bug: 6364139
ediaCodec.cpp
a9623e018737889d32f6b231f913a70d020c7ac5 08-May-2012 Andreas Huber <andih@google.com> Merge "Fix both H.263 and MPEG4 decoders." into jb-dev
02accddf8d69da7b2b5e05631ad222cd842ff547 08-May-2012 Andreas Huber <andih@google.com> Fix both H.263 and MPEG4 decoders.

Change-Id: I6c76fa33f6ea4b439abc14c396a86c3553c85189
related-to-bug: 6460112
odecs/m4v_h263/dec/SoftMPEG4.cpp
1d02a827bc0bb5023a551bc9ce3fb37457240daa 05-May-2012 Fred Gylys-Colwell <fredgc@google.com> Fix DRM timer start for Widevine.

The DRM flag should always be true for WVMExtractor. The WVMExtractor always
turns on the DRM flag. Before this change, it was reset to false in
MediaExtractor::Create. After this change, MediaExtractor::Create will return
as soon as the WVMExtractor has been created.

Change-Id: I04949d2cd11b912bde61a106ee6b805932041c25
related-to-bug:6261699
ediaExtractor.cpp
706bb450ee7eb56691c61b40284136d9e2228444 08-May-2012 James Dong <jdong@google.com> am 3e0f56df: Merge "Get rid of vendor specific video encoder component names from ACodec and OMXCodec" into jb-dev

* commit '3e0f56df1a22b76f59d85699d0cc78c37ddd37c5':
Get rid of vendor specific video encoder component names from ACodec and OMXCodec
3e0f56df1a22b76f59d85699d0cc78c37ddd37c5 08-May-2012 James Dong <jdong@google.com> Merge "Get rid of vendor specific video encoder component names from ACodec and OMXCodec" into jb-dev
907a33bce9457a8b27de35c554856dc6d45b0d9b 07-May-2012 Andreas Huber <andih@google.com> am e5177094: Remove/Disable the AVI extractor.

* commit 'e51770946feca174d2d65811f773dcfc3d66ad3b':
Remove/Disable the AVI extractor.
7c25df82dfc8bbedb58608242f0d923a4594bb14 07-May-2012 James Dong <jdong@google.com> Get rid of vendor specific video encoder component names from ACodec and OMXCodec

o related-to-bug: 6446245

Change-Id: I1fa07ad8a39337e3b19ac51c10533a2de8c11bb5
Codec.cpp
MXCodec.cpp
e51770946feca174d2d65811f773dcfc3d66ad3b 07-May-2012 Andreas Huber <andih@google.com> Remove/Disable the AVI extractor.

Change-Id: I47dcae710df9c66688a937fb1e648f9b00ca0f65
related-to-bug: 5717242
ndroid.mk
ataSource.cpp
ediaExtractor.cpp
f2861d6b867827ec752930e12825f278ab7cebab 05-May-2012 Eric Laurent <elaurent@google.com> am fc52dd88: Merge "Revert "Merge "Improve AudioPlayer position reporting""" into jb-dev

* commit 'fc52dd88e4d2f433feba5d5aaff1880659d46319':
Revert "Merge "Improve AudioPlayer position reporting""
fc52dd88e4d2f433feba5d5aaff1880659d46319 05-May-2012 Eric Laurent <elaurent@google.com> Merge "Revert "Merge "Improve AudioPlayer position reporting""" into jb-dev
b48aea123775fb6ec7e6944826fc99da8d8996a5 04-May-2012 Eric Laurent <elaurent@google.com> Revert "Merge "Improve AudioPlayer position reporting""

This reverts commit 887c5d2ac34d81bde66dadbd7b2ff07501744778, reversing
changes made to 5aaeb0d64fc98f9b019a4378eb39f0ee49ee6ec4.
udioPlayer.cpp
4ded4983983aa8597e927d3a7f0dc241fa993951 04-May-2012 Andreas Huber <andih@google.com> am 9dc4c66f: Until we have emulator support for YUV12 rendering do software color conversion.

* commit '9dc4c66f36ca0158b470c78b0929cd9dd929a375':
Until we have emulator support for YUV12 rendering do software color conversion.
9dc4c66f36ca0158b470c78b0929cd9dd929a375 04-May-2012 Andreas Huber <andih@google.com> Until we have emulator support for YUV12 rendering do software color conversion.

Change-Id: Id2e118cae224facad7077f2f62c62cd21e95e749
related-to-bug: 6444358
olorconversion/SoftwareRenderer.cpp
b26105c04508f32528f59dd66b78d1e0858fe90e 04-May-2012 Andreas Huber <andih@google.com> am f53c36c6: Merge "Respect channel mask in ACodec and NuPlayer." into jb-dev

* commit 'f53c36c6463d899895719b8b17ba45bd2d552cee':
Respect channel mask in ACodec and NuPlayer.
f53c36c6463d899895719b8b17ba45bd2d552cee 04-May-2012 Andreas Huber <andih@google.com> Merge "Respect channel mask in ACodec and NuPlayer." into jb-dev
9806555d3930be43e11106281dee354820ac1c88 03-May-2012 Andreas Huber <andih@google.com> Respect channel mask in ACodec and NuPlayer.

Refactor conversion from MetaData into AMessage while we're at it.

Change-Id: I5479129836ea4316e8de28cf1b472bf19e3ac4ab
related-to-bug: 6439076
Codec.cpp
uMediaExtractor.cpp
tils.cpp
878044b88a088ca021fdfa113150e7a2233a8f16 03-May-2012 Andreas Huber <andih@google.com> am ef7f3794: Merge "Revert our seek behaviour to SEEK_CLOSEST_SYNC instead of SEEK_CLOSEST." into jb-dev

* commit 'ef7f379497199148b5694615e75b3fb2bf666a18':
Revert our seek behaviour to SEEK_CLOSEST_SYNC instead of SEEK_CLOSEST.
49e7daaf6c2fd7f3e3d06d350de73de1ffeff5dd 03-May-2012 Andreas Huber <andih@google.com> Revert our seek behaviour to SEEK_CLOSEST_SYNC instead of SEEK_CLOSEST.

Change-Id: I375ca724b228cb0bb4776b87eeaab788e365be84
related-to-bug: 6437985
wesomePlayer.cpp
588f93d3130774056a8c568e31adeac29eb84579 03-May-2012 Edwin Wong <edwinwong@google.com> am 6a3969cc: Removed mutex lock in addTextSource, and rename to addTextSource_l to indicate this method needs to be called with a lock hold.

* commit '6a3969cc3bcbfc84dbcc27aa726eb96bc03a830b':
Removed mutex lock in addTextSource, and rename to addTextSource_l to indicate this method needs to be called with a lock hold.
6a3969cc3bcbfc84dbcc27aa726eb96bc03a830b 03-May-2012 Edwin Wong <edwinwong@google.com> Removed mutex lock in addTextSource, and rename to addTextSource_l
to indicate this method needs to be called with a lock hold.

Change-Id: I7e99f0a622e7de49c288be09dd4fc955bbca390b
related-to-bug: 5629511
related-to-bug: 5542712
wesomePlayer.cpp
nclude/AwesomePlayer.h
a8f613283901dfbe4c06c9149930f4c923c15374 02-May-2012 James Dong <jdong@google.com> am 359f90ce: Merge "The presence of the kKeyAACProfile is optional, we should not mandate its presence in AACWriter." into jb-dev

* commit '359f90cea8a59c4a8d25b422fd0b0569e31db2fa':
The presence of the kKeyAACProfile is optional, we should not mandate its presence in AACWriter.
359f90cea8a59c4a8d25b422fd0b0569e31db2fa 02-May-2012 James Dong <jdong@google.com> Merge "The presence of the kKeyAACProfile is optional, we should not mandate its presence in AACWriter." into jb-dev
ce0a54de16aa2197fe4e6ac9a8c91562ae0ff114 02-May-2012 Jean-Michel Trivi <jmtrivi@google.com> am 06f6ae34: Fix build, WAVExtractor typo

* commit '06f6ae34c735640dccdaca6ab1567d8afc9d3938':
Fix build, WAVExtractor typo
38f45a53ff1a19d3a6440e03a579b23186267062 02-May-2012 Jean-Michel Trivi <jmtrivi@google.com> am 95c157cc: Merge "Tolerate 0 valid bits value in WAV_EXT" into jb-dev

* commit '95c157cc6b109a5058f29edd73811e90d91e92ab':
Tolerate 0 valid bits value in WAV_EXT
2d94235a343151bed9aa74e86697fa01241ea5cf 02-May-2012 James Dong <jdong@google.com> The presence of the kKeyAACProfile is optional, we should not mandate its presence in AACWriter.

o related-to-bug: 6421833

Change-Id: Ia1d75e73270430177d3010e8024b48c88eb7b430
ACWriter.cpp
06f6ae34c735640dccdaca6ab1567d8afc9d3938 02-May-2012 Jean-Michel Trivi <jmtrivi@google.com> Fix build, WAVExtractor typo

Change-Id: I6885f3f259619526165c6e76364bfe9a4ce49f97
AVExtractor.cpp
95c157cc6b109a5058f29edd73811e90d91e92ab 02-May-2012 Jean-Michel Trivi <jmtrivi@google.com> Merge "Tolerate 0 valid bits value in WAV_EXT" into jb-dev
72b2b9ba68ee85a3054a0de3a8414b8dfb217aeb 02-May-2012 Jean-Michel Trivi <jmtrivi@google.com> Tolerate 0 valid bits value in WAV_EXT

Some WAV_EXT writers don't properly set the "valid bits per sample"
value and set it to 0. Don't return an error when such a header
is parsed.

Change-Id: I21763087af4f3fc8c62a24b883aae53b23ae71d4
AVExtractor.cpp
375172c4ccb1b810e1065cf9dad98b8a9c4c5fc8 02-May-2012 Jean-Michel Trivi <jmtrivi@google.com> am 2c3297ab: No warning on using channel order in AudioPlayer

* commit '2c3297ab6c4daaaa7b27eed8418c64cf168fe2a1':
No warning on using channel order in AudioPlayer
e0b6fc58cb1b5a560da8e7903b1f7d291e7448de 16-Apr-2012 Martin Storsjo <martin@martin.st> stagefright: Remove useless declarations

The encoder common library doesn't contain any source
code with assembly optimizations (there is nothing
using the defines in the single source file in the library),
and the source directories added to the include path do
not exist.

Change-Id: If8854ea3bac4ad3504615ae4ad022267103a8b65
odecs/common/Android.mk
2c3297ab6c4daaaa7b27eed8418c64cf168fe2a1 01-May-2012 Jean-Michel Trivi <jmtrivi@google.com> No warning on using channel order in AudioPlayer

Don't log a warning when an AudioPlayer derives a channel mask
from the channel count, only info-log when channel count is
higher than 2.

Change-Id: Ia1cbced660903483654eede300ef72f7f17dcf78
udioPlayer.cpp
daaf7b119649674cfc414a8761585fed6b0296df 01-May-2012 James Dong <jdong@google.com> Merge "Impl for supporting two video scaling modes" into jb-dev
6635c44c27a8fc2f1eeaaefd5dfc2e65464bcb5d 01-May-2012 Andreas Huber <andih@google.com> Merge "Fix assertion triggered when mediaserver dies at roughly the same" into jb-dev
4f6eed0d1c7972a983c075bdcf03089569e13fe1 30-Apr-2012 James Dong <jdong@google.com> Impl for supporting two video scaling modes

o allows the video scaling mode to change at any time
o also remove the scaling mode logic in OMXCodec.cpp

o related-to-bug: 5454345

Change-Id: I6f1714eb0c2774591ce650d56c1e779b8afd085f
wesomePlayer.cpp
MXCodec.cpp
nclude/AwesomePlayer.h
b78ff5fb6f56c679bce936078180ce61a1e97288 01-May-2012 Andreas Huber <andih@google.com> Fix assertion triggered when mediaserver dies at roughly the same

time that a client attempts to explicitly free an OMX node.

Change-Id: I767e6af402801357da20b328611cc7cddeed0260
related-to-bug: 6012750
mx/OMX.cpp
8b6bacd02a0478ed51b3b15a9e997624c95a7564 01-May-2012 Andreas Huber <andih@google.com> Properly handle the case where a pending connection process is disconnected

just at the time when the connection is established.

Change-Id: Icbae5a61edfd6a1336e4b8d3ee513337363c09ea
related-to-bug: 6154825
hromium_http/ChromiumHTTPDataSource.cpp
hromium_http/support.cpp
27431de020e535c31365884316f656bc60b4fe4f 01-May-2012 James Dong <jdong@google.com> Merge "Fix a bug on subtitle (SRT)." into jb-dev
0a2f0e047a2e593c62f54b07b903baf4728b9d0a 21-Apr-2012 Insun Kang <insun@google.com> Fix a bug on subtitle (SRT).

Bug: 6375542

Change-Id: Ic5dd5a1826b9f78ccbbddc4dec33b0e915b9329f
imedtext/TimedTextSRTSource.cpp
imedtext/TimedTextSRTSource.h
a3cbc03f7c646ad9b05d24e72a6d306cb457807c 28-Apr-2012 James Dong <jdong@google.com> Removed software video encoders that are not OMX-based.

o related-to-bug: 5933287

Change-Id: I63635375e2bef00733b61adc3fa12c29df7e2155
ndroid.mk
ediaCodecList.cpp
MXCodec.cpp
odecs/avc/enc/AVCEncoder.cpp
odecs/avc/enc/Android.mk
odecs/m4v_h263/enc/Android.mk
odecs/m4v_h263/enc/M4vH263Encoder.cpp
nclude/AVCEncoder.h
nclude/M4vH263Encoder.h
99bbaff7853eab325bd87b315d532909206592b1 30-Apr-2012 Andreas Huber <andih@google.com> Merge "Make the transport stream extraction code output ADTS AAC frames." into jb-dev
4c9cd95b27a638701be2ffa1713273ba2f624770 30-Apr-2012 Dave Burke <daveburke@google.com> Merge "Added support for HE-AAC recording" into jb-dev
56ad61a253a94586d946cc09ed814e7a95a40ca7 30-Apr-2012 Andreas Huber <andih@google.com> Make the transport stream extraction code output ADTS AAC frames.

Change-Id: I145f4b1265045750f1b0425269f3ffe5fb055f61
related-to-bug: 6419102
peg2ts/ESQueue.cpp
8b71241ce7353731ab75322c46e090ee35014a33 27-Apr-2012 Marco Nelissen <marcone@google.com> Fix mono gapless playback for decoders that output stereo

The old AAC decoder always outputs stereo, even for mono source material, so we
need to use the number of channels of the output when calculating the number of
bytes to skip, not the number of channels in the source.
This makes OMXCodec skip the right amount of data, and prevents NuPlayer from
writing half a frame and then asserting when the AudioSink doesn't accept it.
Also move use of the SkipCutBuffer from NuPlayer to ACodec, so that it also
works when using the new Java APIs, and make SkipCutBuffer derive from RefBase.
b/774846

Change-Id: I34df9fea3e6730617eae559afaa556f4085ef0a0
Codec.cpp
uMediaExtractor.cpp
MXCodec.cpp
f60c660f048d5f5e2458cff243c20400d73757a7 29-Apr-2012 Dave Burke <daveburke@google.com> Added support for HE-AAC recording

Fixed bug in decoder related to sample rates / channel counts
Made decoder follow Fraunhofer pattern
Log if bitrate not available
Bug: 6275957

Change-Id: I47a8e29358fa4a88ebc73fe02d46a2bfb96c64fe
odecs/aacdec/SoftAAC2.cpp
odecs/aacenc/SoftAACEncoder2.cpp
d8b0003739768953b6e28080f434fdadec55c0e3 27-Apr-2012 Andreas Huber <andih@google.com> Merge "Opt in to the WVM extractor's secondary (cryptoPlugin) mode." into jb-dev
e6d7f46c566d16792068f25ef479e3fbae7365b8 27-Apr-2012 Jeff Tinker <jtinker@google.com> Merge "Expose an API to run the WV extractor in crypto plugin mode." into jb-dev
543f0fd46b2355c0ffc22445c8594f6dcde6a388 27-Apr-2012 James Dong <jdong@google.com> Merge "Bug fix : enqueue one next subtitle for each subtitle." into jb-dev
e0c026e32277de27627b2bc24e51f333a2f1c4ee 27-Apr-2012 James Dong <jdong@google.com> Merge "Handle the case when there is no timed text track" into jb-dev
ed709d00ead015b8a0de50ebc410073f6a078fd5 26-Apr-2012 Jeff Tinker <jtinker@google.com> Expose an API to run the WV extractor in crypto plugin mode.

Provides compatibility with the MediaCodec model.

Change-Id: I76f2c7d1e9d2cfc3e76b531ac9b2cf66aa6a4327
related-to-bug: 5986621
VMExtractor.cpp
nclude/WVMExtractor.h
94c1c8c99b70f2fdab87e131812eb253271e5500 27-Apr-2012 Andreas Huber <andih@google.com> Opt in to the WVM extractor's secondary (cryptoPlugin) mode.

Change-Id: If0abec6e34b20b59ee2fc5bd97573a73d68465f0
related-to-bug: 6276111
uMediaExtractor.cpp
41914becfd019c619783d875c61ef71db0e67400 26-Apr-2012 Marco Nelissen <marcone@google.com> Account for new AAC decoder's delay

This drops the first block of decoded samples, and flushes the decoder
at the end of the stream to get the last bit of valid data.
b/774846

Change-Id: I1ae61b3e0619444441d160f33903eb61f57c6d31
odecs/aacdec/SoftAAC2.cpp
odecs/aacdec/SoftAAC2.h
514bcaf1e842e8e90fbeabf35e7e654622b75b02 17-Apr-2012 James Dong <jdong@google.com> Handle the case when there is no timed text track

o also replaced mTimedTextLock with mLock, since there is no particular reason to use a separate lock for timed text

o related-to-bug: 6110705

Change-Id: Ia687e96956692c42d492e57992e5721ca1e8e18b
wesomePlayer.cpp
nclude/AwesomePlayer.h
0756aa99dffd5740d963fdda60699fdefe58ce85 26-Apr-2012 Andreas Huber <andih@google.com> Merge "NuMediaExtractor API to unselect tracks and finer control over seeking." into jb-dev
9d07855aaff8a6b502a3ab058002cdd4a278b965 26-Apr-2012 Andreas Huber <andih@google.com> NuMediaExtractor API to unselect tracks and finer control over seeking.

Change-Id: I44d5a2b01d34b771bb0ff48b12829e33314c2374
related-to-bug: 6276111
uMediaExtractor.cpp
2b095b74526cf5c9472131452600a02d8a66c32e 26-Apr-2012 James Dong <jdong@google.com> Merge "Software MPEG4/H263 video encoder is now OMX-based" into jb-dev
940335776b6d4eb91b13c4e56bc20bed3ac0011b 26-Apr-2012 Dave Burke <daveburke@google.com> Handle reconfiguration properly.

Bug 6388957.

Change-Id: I61a86ed6fdad99497535249acda5e4a325911918
odecs/aacdec/SoftAAC2.cpp
aeb8fd460ed87d032b3fb8bb61e21eb542ce0f5b 19-Apr-2012 Dave Burke <daveburke@google.com> Add Fraunhofer AAC encoder with AAC-ELD support.

Change-Id: I6cd499d257d72f50a5b508bed97796a591a51506
ACWriter.cpp
Codec.cpp
PEG4Extractor.cpp
MXCodec.cpp
odecs/aacenc/Android.mk
odecs/aacenc/SoftAACEncoder2.cpp
odecs/aacenc/SoftAACEncoder2.h
c4ddeeb06a9defc359e99d1ce20882e1d688d1b3 21-Apr-2012 Insun Kang <insun@google.com> Bug fix : enqueue one next subtitle for each subtitle.

o Do not enqueue another subtitle when notifying a null message.
related-to-bug: 6401574

Change-Id: I366e643ffa1601c11a12e46fcf7c00a469c77448
imedtext/TimedTextPlayer.cpp
1700744ae0ce2fcf722816453ae0af2cd5646458 24-Apr-2012 James Dong <jdong@google.com> Software MPEG4/H263 video encoder is now OMX-based

o related-to-bug: 6401068

Change-Id: If8eccea060f38e42ad31eb6e91aaa832e67c5559
odecs/m4v_h263/enc/Android.mk
odecs/m4v_h263/enc/SoftMPEG4Encoder.cpp
odecs/m4v_h263/enc/SoftMPEG4Encoder.h
mx/SoftOMXPlugin.cpp
e370bb62b89d2f2980f519392010ea08a24c558e 25-Apr-2012 Andreas Huber <andih@google.com> Bump up the max number of items in an AMessage, remove overly stringent

CHECK() limiting us to just audio/* or video/* tracks.

related-to-bug: 6399405
Change-Id: I9bdaf7e709665ecc22da8839c8b16c081dbf4535
uMediaExtractor.cpp
e4f70a7ea72c2a9fca60e6b64a258604e9333580 25-Apr-2012 James Dong <jdong@google.com> Merge "Software AVC encoder is now OMX-based"
c1d8115e8a0bdaeb2b723d395b9a85a02c90c933 24-Apr-2012 Andreas Huber <andih@google.com> Make sure OMXCodec and ACodec both accept more than 2 channels of audio

and fill in the OMX channel mask properly.

Change-Id: I915950a0b252142b9eb3277cf7c6e0d9f5875305
Codec.cpp
MXCodec.cpp
5c61b361d1c55a93a215cfb2c325b4987f57f1c5 29-Mar-2012 James Dong <jdong@google.com> Software AVC encoder is now OMX-based

o related-to-bug: 6383440

Change-Id: I0b1ae50a704b0979857ea447585eabe86602149a
odecs/avc/enc/Android.mk
odecs/avc/enc/SoftAVCEncoder.cpp
odecs/avc/enc/SoftAVCEncoder.h
mx/SoftOMXPlugin.cpp
dc7431e70b4b030b5f42d0dfc3ef244d4f583dd2 23-Apr-2012 Andreas Huber <andih@google.com> Make sure NuMediaExtractor is thread safe.

Change-Id: If261c4d87d5569a0d7cfd75afe311803a6ce0109
uMediaExtractor.cpp
0818e739bdbcf16f6dfb21d507002ceaaf664ee4 23-Apr-2012 Andreas Huber <andih@google.com> Merge "Make sure we restore our input buffer to its original state if we want to revisit it."
f853499c6a088ef8506cacbb3ccdffa87e0cec3e 21-Apr-2012 Eric Laurent <elaurent@google.com> Merge "Add support for deep audio buffers"
6b7b8227cc8753fde4094ca8af2d381c2740826f 21-Apr-2012 Andreas Huber <andih@google.com> Make sure we restore our input buffer to its original state if we want to revisit it.

Change-Id: Iab62562c4dea13520751c37c9448c0b19c82d739
odecs/aacdec/SoftAAC.cpp
odecs/aacdec/SoftAAC2.cpp
1948eb3ea6eee336e8cdab9b0c693f93f5f19993 14-Apr-2012 Eric Laurent <elaurent@google.com> Add support for deep audio buffers

Allow AudioSink to use deep audio buffering when the
source is audio only and its duration is more than
a certain threshold.
This helps improve battery life but implies higher
audio latency.

Change-Id: Ie79915b61c370292f05aabda9779356570e03cbb
udioPlayer.cpp
wesomePlayer.cpp
a53d87c7b1428fe02f535c31dafd64cb1362fde9 20-Apr-2012 Andreas Huber <andih@google.com> Add the ability to query the amount of cached data to NuMediaExtractor.

Change-Id: I0966270a2bd36698330beaa03f47d02fc6a40c44
related-to-bug: 6364341
uCachedSource2.cpp
uMediaExtractor.cpp
nclude/NuCachedSource2.h
8d6086781c79620ce6133df7bd27f0efdee6b4e6 19-Apr-2012 Andreas Huber <andih@google.com> Merge "Allow propagation of error information and description from the CryptoPlugin to"
5b8987e7de9d04b09153f329c680d2316cdb44ec 19-Apr-2012 Andreas Huber <andih@google.com> Allow propagation of error information and description from the CryptoPlugin to

the higher layers.

Change-Id: I9f434ad55cdf575803c208bedf47b607baff2330
related-to-bug: 6365261
ediaCodec.cpp
1345ef0f49f83f37953e6d30616611a92294144a 19-Apr-2012 Dave Burke <daveburke@google.com> Merge "Revert "Temporary revert of new AAC codec to fix build""
eee7f9dd0d3410877dd58a14c4b80aacbeb32d72 19-Apr-2012 James Dong <jdong@google.com> Merge "Make timed text source type explicit in TimedTextDriver"
05cd06e19f968c7320e8e85fc7122125f284741c 19-Apr-2012 Dave Burke <daveburke@google.com> Revert "Temporary revert of new AAC codec to fix build"

This reverts commit f356cc9c9995ba292bf116f1cb28a6caa1b65fd2.
odecs/aacdec/Android.mk
324c81a9f45614cb1d924ba0bcecddc120b2d69f 19-Apr-2012 Dave Burke <daveburke@google.com> Merge "Temporary revert of new AAC codec to fix build"
a43af9853f4dfdea03c01037f1c73cf29441f89b 19-Apr-2012 Wu-cheng Li <wuchengli@google.com> Merge "Remove new camera connect API."
f356cc9c9995ba292bf116f1cb28a6caa1b65fd2 19-Apr-2012 Dave Burke <daveburke@google.com> Temporary revert of new AAC codec to fix build

Change-Id: I5c7f0360883fc68e313d10b1aa5dac1463fae7fb
odecs/aacdec/Android.mk
c2dabeb11d625fadfd923e6461405f5fbf383320 19-Apr-2012 Dave Burke <daveburke@google.com> Merge "Make AAC 5.1 work Fix bug with pausing audio"
08ad5efcef90e24db2863c0f85972ed05fe848a2 18-Apr-2012 Wu-cheng Li <wuchengli@google.com> Remove new camera connect API.

Applications are not resumed under the lock screen now.
This API is not needed anymore.

bug:5584464
Change-Id: I115daf6b647348617ec0fc05b626878c945b9b29
ameraSource.cpp
692ac36c4b6a09fed5113a4f45f00a041665a769 19-Apr-2012 James Dong <jdong@google.com> Make timed text source type explicit in TimedTextDriver

o related-to-bug: 5542712

Change-Id: Ifdc730e616336e8b16783e8a5766f27df62a0592
imedtext/TimedTextDriver.cpp
0ca3cf94c0dfc173ad7886ae162c4b67067539f6 18-Apr-2012 Eric Laurent <elaurent@google.com> rename audio policy output flags

Change-Id: I27c46bd1d1b2b5f96b87af7d05b951fef18a1312
udioPlayer.cpp
ee685f6d19a6cc3b0bf02e69eb5dea11a2aeb601 18-Apr-2012 Eino-Ville Talvala <etalvala@google.com> Merge "Set gralloc consumer usage bits in SurfaceMediaSource."
c34ee0429c4663a97f6a5c342633eeac46de081e 18-Apr-2012 Andreas Huber <andih@google.com> Merge "Some refactoring and cleanup of now obsolete crypto fields."
f69e53033f23f9f70fcdb28a3c2e650de0147459 18-Apr-2012 Andreas Huber <andih@google.com> Some refactoring and cleanup of now obsolete crypto fields.

codec commandline tool no longer supports decryption.

Change-Id: I7b10be6524631b20ac5d361d47949b00addf4a93
uMediaExtractor.cpp
peg2ts/AnotherPacketSource.cpp
13692a5d885405701a8a9b16af98a2e693085216 18-Apr-2012 Eddy Talvala <etalvala@google.com> Merge "Fixed leaks in SurfaceMediaSource_test"
52bef17f5953cd07b1655a3371d833f4de01caae 18-Apr-2012 James Dong <jdong@google.com> Merge "Fix for multiple audio/timed track feature implementation - part one"
095c2da8d6c2058b02142c940f6e6346d6581780 13-Apr-2012 Dave Burke <daveburke@google.com> Make AAC 5.1 work
Fix bug with pausing audio

Change-Id: Icd6b095dac8d1a68b027de853d11ae02cc070b10
odecs/aacdec/Android.mk
odecs/aacdec/SoftAAC2.cpp
odecs/aacdec/SoftAAC2.h
4835705370584f6904c80afebcc6e8b9fdb110a5 18-Apr-2012 Andreas Huber <andih@google.com> NuMediaExtractor accidentally returned what looked like errors to the caller...

Change-Id: Iec0c62ba98c8a8afc5cb423a76b8f53778aeb867
related-to-bug: 6276111
uMediaExtractor.cpp
1608735ef488ecd8c3c012a3b0d4b1d4ef3d93c7 13-Apr-2012 Andreas Huber <andih@google.com> Support widevine:// URLs in NuMediaExtractor / java MediaExtractor.

Allow anyone to talk to drm services.

Change-Id: I5c2f3c419d01de30c3d6e2bc85b1fe5c9c37b392
related-to-bug: 6276111
ataSource.cpp
uMediaExtractor.cpp
VMExtractor.cpp
9d06df4ecfe39e7e46873f7cd75a71e32a01d4f7 17-Apr-2012 Daniel Lam <dalam@google.com> Fixed leaks in SurfaceMediaSource_test

mEglSurface was being reused which resulted in
EGLSurfaces being lost.

Change-Id: Ica07cd24b0e4f3d4b2156f55b7de8e83d5466136
ests/SurfaceMediaSource_test.cpp
8add6cf4976de9b7bca7b73b1473a1e5f7201087 14-Apr-2012 Eino-Ville Talvala <etalvala@google.com> Set gralloc consumer usage bits in SurfaceMediaSource.

BufferQueue is no longer setting these for its endpoints; set the bits
to GRALLOC_USAGE_HW_VIDEO_ENCODER | GRALLOC_USAGE_HW_TEXTURE. In the
longer term, the set flags should be just
GRALLOC_USAGE_HW_VIDEO_ENCODER, but that requires other changes.

Change-Id: I4170658de49bf88d829d34605a15684e72a90706
urfaceMediaSource.cpp
eec46abb88dcc50621fd2d3f17a6b8d24fd07a19 12-Apr-2012 James Dong <jdong@google.com> Fix for multiple audio/timed track feature implementation - part one

o getTrackInfo now returns all tracks, rather than just the timed text tracks.
o the index of the track info is kept to the same as the track index if the
track is not from an external source
o correctly maps the selectTrack() and unselectTrack() calls to the right
track index

o TODO:
1) note that the selectTrack() and unselectTrack() only works for timed text
track at present; 2) the lock is timed text specific

o related-to-bug: 6110705

Change-Id: Ib1feeef2184bc992930ace0d1197b6c00a2636d7
wesomePlayer.cpp
nclude/AwesomePlayer.h
imedtext/TimedTextDriver.cpp
a98db787397633155fd71b06ecaa765a7ad20cf2 16-Apr-2012 Andreas Huber <andih@google.com> Merge "Change NuMediaExtractor's API to support different kinds of data sources."
fbe308d428e42fe249ec317f76e3d11feb3264d5 14-Apr-2012 Marco Nelissen <marcone@google.com> Merge "Make mediascanner use filedescriptors instead of paths"
25736fd247ba757feefe15d3071f7e747c64fea4 27-Mar-2012 Insun Kang <insun@google.com> To return default track info even if there's no metadata for a
subtitle track.

It would rather return empty data than return NULL data for an existing track.

Change-Id: Ie0c18e6851bfbe2c471041589670a3012605b584
imedtext/TimedTextDriver.cpp
db9b87e30a2ffe71554150e33066738ab134bc3c 13-Apr-2012 James Dong <jdong@google.com> Merge "Add external timed text source using a passed file descriptor"
a28976b04c70cef3c8e79137478b6a7bc05608ac 13-Apr-2012 Marco Nelissen <marcone@google.com> Make mediascanner use filedescriptors instead of paths

Media scanner needs to open the files now, because media server doesn't
have the required permission.

b/6330061

Change-Id: I2364d93dcc0530c15676664fc4a8c306351dde08
tagefrightMediaScanner.cpp
613c8ae1b7a2b4f43b33a72dc2fff0bc8b7d4c6f 13-Apr-2012 James Dong <jdong@google.com> Add external timed text source using a passed file descriptor

o Also fixed a minor issue where the file length should be of type off64_t rather than size_t

o related-to-bug: 5542712

Change-Id: I35fd8ceea0bc75e553b7f4a99932cf58ea560c4e
wesomePlayer.cpp
imedtext/TimedTextDriver.cpp
918c7652b9a38c02e26c0c46541cea82070c0e43 13-Apr-2012 Andreas Huber <andih@google.com> Change NuMediaExtractor's API to support different kinds of data sources.

Change-Id: I080aa2ce28300a72a85751509334dbdc491936c6
related-to-bug: 6276111
ataSource.cpp
uMediaExtractor.cpp
1fe40b374fc13c477d42b3fc59f3d21f1e552aea 12-Apr-2012 Dave Burke <daveburke@google.com> Merge "Add support for a new AAC decoder library."
e5becb51c64cb8a3f6bbd8a417f54510567f37dd 11-Apr-2012 Andreas Huber <andih@google.com> Merge "Changes to add support for H263-1999/2000 formats for streaming"
f4b7d94062c896dca565d849c6188cd3489be257 11-Apr-2012 Andreas Huber <andih@google.com> Better error logging during meta data retrieval. Fixed the stagefright

commandline tool to open the file to extract thumbnails from itself since
mediaserver may not have permission to open files.

Change-Id: Iabe16b3248e9bb0f266b0866a8d2ccba2ab7d2a8
related-to-bug: 6321237
ileSource.cpp
tagefrightMetadataRetriever.cpp
f95439afa8eb2484969d4a928b0fdd6a4d3a38d7 11-Apr-2012 Andreas Huber <andih@google.com> Changes to add support for H263-1999/2000 formats for streaming

contributed by sureshc@nvidia.com (and subsequently simplified)

Change-Id: Ia1c2ac9233f5414ce3e4a70e42e68c1c5c35eb9d
tsp/AH263Assembler.cpp
b3eb2b7e0ad11bc03344e10cc5204bdb71f0686e 11-Apr-2012 Andreas Huber <andih@google.com> Merge "Cache the file size in favour of extraneous seek requests."
4ee31e2603b4019e4ae76e027115f80b818527aa 11-Apr-2012 Andreas Huber <andih@google.com> Cache the file size in favour of extraneous seek requests.

Change-Id: Ia922b13179c69749d09cd3fccbd5c30109c28bd7
related-to-bug: 6321952
ileSource.cpp
2d531e1b5865d61d5ca25d77d53017b1ad180efa 11-Apr-2012 Mathias Agopian <mathias@google.com> Merge "Refactored SurfaceMediaSource"
bdddc659a941afdb7f4958f582c6901c07246097 31-Mar-2012 Daniel Lam <dalam@google.com> Refactored SurfaceMediaSource

SurfaceMediaSource takes advantage of BufferQueue to avoid
duplicated code.

Change-Id: I5e60b8eca21e6c3cf728d363cd8f3786125182d1
urfaceMediaSource.cpp
ests/SurfaceMediaSource_test.cpp
4b75a9c8b93a90749bc5d22912ad0d96c12f4ecf 06-Apr-2012 Andreas Huber <andih@google.com> New API to support submitting encrypted buffers to the decoder.

Change-Id: I69dd60e43078c4211c6123cf6e0ce90e676bf873
related-to-bug: 6275919
ediaCodec.cpp
8d0648eff7a9a7bc7cd6318ba5fc96c759bef978 05-Apr-2012 Andreas Huber <andih@google.com> Merge "Trust the Cues element"
5faee0829f673f6147636820eafae2c0fa238c77 05-Apr-2012 Andreas Huber <andih@google.com> Merge "Fix a bug: WOULD_BLOCK handling in TimedTextPlayer."
f02a7f5c42db707d20e59ff28f32d1eaebcc5429 05-Apr-2012 Johann <johannkoenig@google.com> Trust the Cues element

With the Cue based seeking we will get the closest previous key frame.
For audio, use the Cue file to find the Cluster with the video key frame
then incrementally look for the audio Block.

Change-Id: Idc934cca1286b1bb48ee7577b27903ca488a0610
atroska/MatroskaExtractor.cpp
4762a5164a986bd6a7ca0e7aba43881b64f146dd 04-Apr-2012 Marco Nelissen <marcone@google.com> Send video width and height to mediascanner

b/5820120

Change-Id: Ia5c48eb1ab15fe3bbe773131148470a06eb2b96d
tagefrightMediaScanner.cpp
4e1c91dd07fad96ee2387eda510c6da45e5dff0a 27-Mar-2012 Insun Kang <insun@google.com> Fix a bug: WOULD_BLOCK handling in TimedTextPlayer.

Bug: 6234756

Change-Id: I0fae6e5ad8607d472faad7dd680e020f20ac1669
imedtext/TimedTextPlayer.cpp
imedtext/TimedTextPlayer.h
290ca3a767a974ce9d041e5bcb0c69153f7851d5 03-Apr-2012 Andreas Huber <andih@google.com> Merge "fix crash with cues at the beginning of the file"
1bd139a2a68690e80398b70b27ca59550fea0e65 03-Apr-2012 Andreas Huber <andih@google.com> New Crypto services talking to the new crypto "HAL".

Change-Id: I69ed31e7a8b4d69d1209d2d516f94d258f072566
related-to-bug: 6275919
ediaCodec.cpp
be7ac3d682729048af27871311808a76c618abdb 03-Apr-2012 Johann <johannkoenig@google.com> fix crash with cues at the beginning of the file

previous implementation tried to be clever about economizing Cue loads.
however, files with the cues at the beginning missed the initial load in
the seek function and would crash with a null pointer.

Change-Id: I49c15d6688909cd13afabf33a54d9f5896aab7cd
atroska/MatroskaExtractor.cpp
d22da88fd555f1262357c7dcdeface8445e3a012 03-Apr-2012 Andreas Huber <andih@google.com> Merge "Use Cues to seek Matroska files"
b7ddcc9460f488f0b032aeb27b52a423318a97ea 02-Apr-2012 Dave Burke <daveburke@google.com> Add support for a new AAC decoder library.

Change-Id: I867bf95f7c20503e55b38d0087ac027647834f37
odecs/aacdec/Android.mk
odecs/aacdec/SoftAAC2.cpp
odecs/aacdec/SoftAAC2.h
69829f3bd09ee4e6be49fee8795c5df24c4da70e 30-Mar-2012 Andreas Huber <andih@google.com> Add a few more APIs to MediaCodecList.

Change-Id: I5ac193cd40c82bbcd87c1e55003b78102e8d4674
ediaCodecList.cpp
MXCodec.cpp
10f0fe7bcd60bdb0eceb905e84ac11555e8c1b9d 30-Mar-2012 Johann <johannkoenig@google.com> Use Cues to seek Matroska files

On the first seek, load the Cues element. Parse it incrementally until
the desired seek point can be located.

This allows files to begin playing immediately. However, the Browser
still seeks to 0 before playing embedded YouTube files. Because YouTube
stores the cues at the end of the file, this causes it to seek, load the
cues, then begin playing. It is still better than the previous behavior
which blocked until the entire file was loaded.

BUG=5921311

Change-Id: Iad2abc64ded3b4e2c2d2c478a969f68450754282
atroska/MatroskaExtractor.cpp
df7e6ea0c755fb95a77d21010105e3a2eac69ff8 30-Mar-2012 Mathias Agopian <mathias@google.com> reduce IPCs in BufferQueue

Change-Id: I1f8c32a771a411476d225adc62d1f07c24f39a3e
urfaceMediaSource.cpp
ecdd39c5af016e2fa57cbfd837aa670b706dabd3 29-Mar-2012 Andreas Huber <andih@google.com> Implementation of a raw audio "decoder".

Change-Id: Ie89f01e59dd8106883937188afbb407550f0ac92
Codec.cpp
ediaCodecList.cpp
MXCodec.cpp
odecs/raw/Android.mk
odecs/raw/SoftRaw.cpp
odecs/raw/SoftRaw.h
mx/SoftOMXPlugin.cpp
cb5b766bb0a3ed992998a5bd66de0ee1d2223b81 29-Mar-2012 Marco Nelissen <marcone@google.com> Add ABuffer support to SkipCutBuffer

Add support for ABuffer to SkipCutBuffer, and make it (re)allocate an
appropriately sized buffer when needed, rather then relying on the
caller to tell it ahead of time how big the buffers are going to be.

Change-Id: I8b5c9ba5dd2fc13ef8870b7d4fe93a1bfdc7a626
MXCodec.cpp
kipCutBuffer.cpp
559bf2836f5da25b75bfb229fec0d20d540ee426 28-Mar-2012 James Dong <jdong@google.com> AV Android make files changes

o plus a few file relocation: ActivityManager.cpp/h, SoundPool.h, etc
o remove some runtime dependencies to libandroid, libandroid_runtime, etc

Change-Id: I047a47c5fb361dd5cf85cd98798c39f629a75d10
ndroid.mk
hromium_http/Android.mk
odecs/aacdec/Android.mk
odecs/aacenc/Android.mk
odecs/amrnb/dec/Android.mk
odecs/amrnb/enc/Android.mk
odecs/amrwb/Android.mk
odecs/amrwbenc/Android.mk
odecs/avc/enc/Android.mk
odecs/g711/dec/Android.mk
odecs/m4v_h263/dec/Android.mk
odecs/m4v_h263/enc/Android.mk
odecs/mp3dec/Android.mk
odecs/on2/dec/Android.mk
odecs/on2/h264dec/Android.mk
odecs/vorbis/dec/Android.mk
oundation/Android.mk
ttplive/Android.mk
peg2ts/Android.mk
mx/Android.mk
mx/tests/Android.mk
tsp/Android.mk
ests/Android.mk
imedtext/Android.mk
4116807a35a27abf635bf6199ed9ad8703c9e94d 24-Mar-2012 Colin Cross <ccross@android.com> stagefright: compile without chromium for pdk builds

Change-Id: I7d85e04fb9f0caa8460a111ca6181bba6f6497ac
ndroid.mk
hromium_http/Android.mk
15147270aa1c56503902b424f946389294875665 26-Mar-2012 Andreas Huber <andih@google.com> Merge "Provisional support for secure decryption of media streams."
ed3e3e046840d5bf1ca84a8c0cc097425e89d6d6 26-Mar-2012 Andreas Huber <andih@google.com> Provisional support for secure decryption of media streams.

Change-Id: Ib3982a9c960bfdb0cb7e1b174440b141b194cfbe
Codec.cpp
ediaCodec.cpp
uMediaExtractor.cpp
MXCodec.cpp
odecs/aacdec/SoftAAC.cpp
odecs/aacdec/SoftAAC.h
oundation/AString.cpp
peg2ts/AnotherPacketSource.cpp
6eb463b1d07492bf5a89e1cd8a2a131c7bba5bfb 26-Mar-2012 James Dong <jdong@google.com> Removed code related to simulator build in TimedEventQueue to get rid of the dependency on jni.h

o related-to-bug: 6214141

Change-Id: I548d84a9888be884d3903dc9dea9235258792165
imedEventQueue.cpp
3ee26944b082def647fe5bb2b75116ffb0267059 24-Mar-2012 James Dong <jdong@google.com> Remove JNI in LOCAL_C_INCLUDE from non-JNI related Android.mk files.

o related-to-bug: 6214141

Change-Id: Ic88d1732b3e014af47532a0809e01f6086e8464d
ndroid.mk
hromium_http/Android.mk
ttplive/Android.mk
atroska/Android.mk
peg2ts/Android.mk
mx/Android.mk
mx/tests/Android.mk
tsp/Android.mk
imedtext/Android.mk
bc8b5faec8a0a9ad7c8d94945e7b000d63f0afe6 23-Mar-2012 Andreas Huber <andih@google.com> Fix the file mimetype reported by the mpeg4 extractor.

Change-Id: I72474c17757dba5867f55b0e99e76e9e4e32ce7b
related-to-bug: 6217289
PEG4Extractor.cpp
ediaDefs.cpp
a98478bfbcc0f7fb4b164d3dce40ca96df75667d 21-Mar-2012 Marco Nelissen <marcone@google.com> Support gapless playback for mp3 and m4a

Gapless playback for appropriately tagged mp3 and m4a files.
Currently this is implemented in OMXCodec, which most players
use, but should be easy to support in other players as well by
using the SkipCutBuffer utility class.

Change-Id: I748c669adc1cfbe5ee9a7dea2fad945d48882551
ndroid.mk
MXCodec.cpp
kipCutBuffer.cpp
odecs/mp3dec/SoftMP3.cpp
odecs/mp3dec/SoftMP3.h
2f694b3ef6af235e7ba850d57538eece9f136499 21-Mar-2012 Marco Nelissen <marcone@google.com> Merge "Add MetaData::dumpToLog"
feba11fd788c99b0b63e0bce724730817688d82f 21-Mar-2012 Marco Nelissen <marcone@google.com> Add MetaData::dumpToLog

Utility method for dumping the content of a MetaData object to the log.

Change-Id: I2d91b991e1d9fed2215e8995a73c2b1854205074
etaData.cpp
4949c36978b844f65abf84027e1cf2dcf82c1184 21-Mar-2012 Marco Nelissen <marcone@google.com> Merge "Parse gapless info from mp4 files"
5d2f8ba30c24ea597d54468cda01c7ec5f6a0e66 20-Mar-2012 Marco Nelissen <marcone@google.com> Parse gapless info from mp4 files

Change-Id: I4c83d4e12e996dc29708268e68a4bb74b368c6f3
PEG4Extractor.cpp
nclude/MPEG4Extractor.h
e9ddbf9466a64e211e518efa2f2058f8bbb4d513 21-Mar-2012 James Dong <jdong@google.com> Merge "Handling end times of subtitles."
bae00e73c6d1d87cc5fd42b50f95d1d9572162ea 14-Mar-2012 Insun Kang <insun@google.com> Handling end times of subtitles.

Change-Id: Ic19ec8980d0a2bf9f265d375cd56e638a2460af8
imedtext/TimedText3GPPSource.cpp
imedtext/TimedText3GPPSource.h
imedtext/TimedTextPlayer.cpp
imedtext/TimedTextPlayer.h
imedtext/TimedTextSRTSource.cpp
imedtext/TimedTextSRTSource.h
imedtext/TimedTextSource.h
f6e7ad1543ce19f05600d9414360c74c83e467bb 20-Mar-2012 Marco Nelissen <marcone@google.com> Merge "Move COM tag parsing to constructor"
092406a2568316bbe5ed1ec6335e6f1d128ebf8e 20-Mar-2012 Marco Nelissen <marcone@google.com> Move COM tag parsing to constructor

Change-Id: Icfcf05655ca98ccccad4f94834770c2f4098a764
P3Extractor.cpp
6da08fc33642b832d1cde2e46815a5fd67dd0016 20-Mar-2012 Marco Nelissen <marcone@google.com> Merge "Parse mp3 encoder padding/delay"
b636abde14f2612ea236257846b9ab15d87d4623 19-Mar-2012 Marco Nelissen <marcone@google.com> Parse mp3 encoder padding/delay

Get the mp3 encoder padding and delay from a XING frame or iTunSMPB tag.

Change-Id: Icde598c8857d7e7c187a718f478ee9799d6a1b8a
P3Extractor.cpp
INGSeeker.cpp
d3/ID3.cpp
nclude/ID3.h
nclude/XINGSeeker.h
fa6494d086e697543efa3d16440647e14ea09f30 20-Mar-2012 Wu-cheng Li <wuchengli@google.com> Merge "Do not set camera preview display if the surface is null."
1bb8e81b066a2311fd238fc6dae8f026e33ed99e 20-Mar-2012 Glenn Kasten <gkasten@google.com> Merge "Add libmedia_native"
1746929ddc7592ab397c402724a61352e45df093 19-Mar-2012 Glenn Kasten <gkasten@google.com> Merge "audio_channel_in/out_mask_from_count"
8e0792bb55a604ffcd4aa90fdb4419d8b3c6ad24 14-Mar-2012 Wu-cheng Li <wuchengli@google.com> Do not set camera preview display if the surface is null.

MediaRecorder.setPreviewDisplay() is not required if applications
use MediaRecorder.setCamera(). Besides, this causes a problem when
apps use Camera.setPreviewTexture. Camera service thinks the
surface texture from Camera.setPreviewTexture and the surface from
MediaRecorder.setPreviewDisplay are different.

bug:5988937

Change-Id: Ia345705b6679ef349db6e354feaa3cc0fe8bcd8c
ameraSource.cpp
a673ba75ab58aaf380ca2420b1d63d3639cf1960 16-Mar-2012 Andreas Huber <andih@google.com> Merge "ACodec is a little more aggressive in its error checking now."
c5255ac5b1bd313dcb50159566163b24dce7483f 16-Mar-2012 Andreas Huber <andih@google.com> ACodec is a little more aggressive in its error checking now.

Update components to do the right thing.

Change-Id: Ibfbad3f53effc16368cca4a0e978d01d54d08a1d
Codec.cpp
MXCodec.cpp
odecs/amrnb/dec/SoftAMR.cpp
odecs/g711/dec/SoftG711.cpp
b12153e36ae5e514d96c77d660b327d1a8f5000f 16-Mar-2012 Glenn Kasten <gkasten@google.com> Add libmedia_native

Change-Id: Ib8cff8abd73723b793f08da99ad59549f219e0e7
ndroid.mk
6469edeeac6079b118e8f81252116c40574c9841 16-Mar-2012 Andreas Huber <andih@google.com> Merge "Remove obsolete software codec header files and amr encoders."
ded61aa958278147b5a150c189f86d025165f095 16-Mar-2012 Andreas Huber <andih@google.com> Remove obsolete software codec header files and amr encoders.

Change-Id: Ifbdf252ee312c9cb5ab29498f1e06dae8f23faf7
odecs/amrnb/enc/AMRNBEncoder.cpp
odecs/amrnb/enc/Android.mk
odecs/amrwbenc/AMRWBEncoder.cpp
odecs/amrwbenc/Android.mk
nclude/AACDecoder.h
nclude/AMRNBDecoder.h
nclude/AMRNBEncoder.h
nclude/AMRWBDecoder.h
nclude/AMRWBEncoder.h
nclude/AVCDecoder.h
nclude/G711Decoder.h
nclude/M4vH263Decoder.h
nclude/MP3Decoder.h
nclude/VPXDecoder.h
nclude/VorbisDecoder.h
0893d312070143e45c630d4a212df187b99a0e3e 16-Mar-2012 Marco Nelissen <marcone@google.com> Merge "Skip XING/VBRI frame when decoding"
ce40e081de3ecb5aa1c49d98775c99975710aed2 16-Mar-2012 Andreas Huber <andih@google.com> Merge "Remove obsolete OMXComponentBase class"
cc3190bcd4bd9321a68fb726b055c45b35229ec1 16-Mar-2012 Andreas Huber <andih@google.com> Remove obsolete OMXComponentBase class

Change-Id: I701ff5a57b0ab49cc772c4f82d03b5005e54ec6f
mx/Android.mk
mx/OMXComponentBase.cpp
mx/OMXComponentBase.h
9e50385f34676d8fcb3b473ec4c9f5c388a4c887 16-Mar-2012 Marco Nelissen <marcone@google.com> Skip XING/VBRI frame when decoding

Don't send the XING/VBRI frame to the decoder, as it will result in
extra data being output. Also clean up the XING seeker code a bit.

Change-Id: I714a94180edae9bedc1bc0c96bf382fe6f928ac6
P3Extractor.cpp
BRISeeker.cpp
INGSeeker.cpp
7c5afe93c9ca2f9f3958663bc3fa9649ec2f5331 15-Mar-2012 Insun Kang <insun@google.com> Fix a bug in MediaPlayer's addExternalSource().

Change-Id: I035cbfb7acccc7ff88d659861ece7d0f61314fda
wesomePlayer.cpp
imedtext/TimedTextDriver.cpp
ab334fd351ae5a0e18903da123d63e565b536874 14-Mar-2012 Glenn Kasten <gkasten@google.com> audio_channel_in/out_mask_from_count

and avoid ambiguous term "channels" where it might be confusing
as to whether it is a channel mask or channel count

Change-Id: I744fa08ccb6001a98c97bd638d2c9d56836c4234
udioPlayer.cpp
udioSource.cpp
2fd2440d0175ca3e196b01b7541a9e0d4ed9a694 24-Feb-2012 Wu-cheng Li <wuchengli@google.com> Add a new camera open API that allows taking the ownership.

The purpose is to let face unlock always get the camera
successfully. What happened was the camera applications may
have opened the camera in onResume under the lock screen.
This API lets face unlock take the camera from the camera
application. A new permission will be added, so other
applicatoins won't be able to take the camera from the face
unlock.

bug:5584464

Change-Id: Ib3d9dcbc2161815b68db42327dc01148453704c6
ameraSource.cpp
cbcd6e869dd41158076e742a31c1ee410fc0c713 15-Mar-2012 James Dong <jdong@google.com> Merge "Defines MediaPlayer APIs to support multiple audio/video/timedtext tracks."
5102400104ce1f0a6de7bf913381a91e4f18a22a 15-Mar-2012 Marco Nelissen <marcone@google.com> Fix Xing seeking when TOC[0] == 0

A file purchased from the Amazon mp3 store had two 0 entries at the
start of the TOC (presumably because there was a lot of silence at
the beginning, which compresses well), which made TOC based seeking
think the TOC was not valid.
b/6170518

Change-Id: Ie7135b4af06ebb925f63a374be780cf3a9404347
INGSeeker.cpp
nclude/XINGSeeker.h
f9d660a5e0196240add5daf0199f128d471e592c 16-Feb-2012 Insun Kang <insun@google.com> Defines MediaPlayer APIs to support multiple audio/video/timedtext
tracks.

o Newly introduced APIs are (MediaPlayer):
getTrackInfo() / addExternalSource() / enableTrack() / disableTrack().

o Timed text tracks are supported only, for now.

o TODOs:
- Define the audio/video behavior for enableTrack and disableTrack.
- Refactoring AwesomePlayer / TimedTextDriver so that all types of
track index can be managed in the correct order and be ready for
supporting audio/video tracks.
(MediaExtractor and MediaSource for text file might be necessary.)

Change-Id: Idb85e1b3f2ed49a64f377d05472dd6663ce94e07
wesomePlayer.cpp
ediaDefs.cpp
nclude/AwesomePlayer.h
imedtext/TimedText3GPPSource.cpp
imedtext/TimedText3GPPSource.h
imedtext/TimedTextDriver.cpp
imedtext/TimedTextPlayer.cpp
imedtext/TimedTextPlayer.h
imedtext/TimedTextSRTSource.cpp
imedtext/TimedTextSRTSource.h
imedtext/TimedTextSource.cpp
imedtext/TimedTextSource.h
abf0610a8cea021548f2909e1d47d656206f641c 23-Feb-2012 Daniel Lam <dalam@google.com> SurfaceTexture: Fully refactored from BufferQueue

Cleaning up camera and media interactions as part of SurfaceTexture refactoring

Change-Id: Iea2b10ff80b5f01f83ed0902c725df1d3b4c541a
urfaceMediaSource.cpp
ests/SurfaceMediaSource_test.cpp
36a4d2cc7a44eb42d0d9ef5fe50b6747a7a34cab 13-Mar-2012 Marco Nelissen <marcone@google.com> Merge "Gapless playback, step 1."
6b74d671a1321a6ecc4a40b6c87beedfecc1ec44 29-Feb-2012 Marco Nelissen <marcone@google.com> Gapless playback, step 1.

Currently able to play Ogg Vorbis, PCM WAV and other lossless files seamlessly
by reusing the initial AudioTrack for subsequent players.

Change-Id: Ie7cf6b9076bdf4f9211574456d192c02c04fecc7
udioPlayer.cpp
5e7616cc0e5493241211333134555d74aec89982 13-Mar-2012 James Dong <jdong@google.com> Merge "Switched to use the header files in /frameworks/native and deleted the duplicate header files in /frameworks/base"
083c271152f2d930f259816d52327ed47e022780 13-Mar-2012 Insun Kang <insun@google.com> Fixing coding style : Indentation

Change-Id: Ia66f92aa74c55719bbc32211c75ea1ebdf828373
imedtext/TimedText3GPPSource.h
imedtext/TimedTextSRTSource.h
6c6b4d0d2b98a7ceee8b697daaf611f8df3254fb 12-Mar-2012 James Dong <jdong@google.com> Switched to use the header files in /frameworks/native
and deleted the duplicate header files in /frameworks/base

o related-to-bug: 6044887

Change-Id: I17e0692d9a9b5c8796ded36677c833ca8ab36795
ndroid.mk
MXCodec.cpp
urfaceMediaSource.cpp
hromium_http/Android.mk
odecs/aacdec/Android.mk
odecs/aacenc/Android.mk
odecs/amrnb/dec/Android.mk
odecs/amrnb/enc/Android.mk
odecs/amrwbenc/Android.mk
odecs/avc/enc/Android.mk
odecs/g711/dec/Android.mk
odecs/m4v_h263/dec/Android.mk
odecs/m4v_h263/enc/Android.mk
odecs/mp3dec/Android.mk
odecs/on2/dec/Android.mk
odecs/on2/h264dec/Android.mk
odecs/vorbis/dec/Android.mk
olorconversion/Android.mk
ttplive/Android.mk
atroska/Android.mk
peg2ts/Android.mk
mx/Android.mk
mx/OMXMaster.h
mx/OMXNodeInstance.cpp
mx/SoftOMXPlugin.h
mx/tests/Android.mk
tsp/Android.mk
ests/Android.mk
4a47e1a47e56fc0b9612c538001e49ebb4ab0e0f 12-Mar-2012 Jean-Michel Trivi <jmtrivi@google.com> Merge "Extend WAV extractor for multichannel"
3bed68cb3d43af40475f56211869c40470c1fb4d 09-Mar-2012 Jean-Michel Trivi <jmtrivi@google.com> Extend WAV extractor for multichannel

Support multichannel (more than 2) audio in WAV.
Support WAV_EXT format.

Change-Id: If0e6cf28cb3096f4f148ff6583f7e01db8f8a901
AVExtractor.cpp
nclude/WAVExtractor.h
18868c5db2f90309c6d11e5837822135e4a0c0fa 07-Mar-2012 Glenn Kasten <gkasten@google.com> Use audio_policy_output_flags_t consistently

This affects:
- IAudioFlinger::openOutput
- AudioTrack::AudioTrack
- AudioTrack::set
- apps that call these

Change-Id: I26fb281bac6cb87593d17697bc9cb37a835af205
udioPlayer.cpp
f2015b625cd6bea86da7401e725332c35b90e7cf 10-Mar-2012 Glenn Kasten <gkasten@google.com> Merge "Use AudioRecord::record_flags consistently"
5e9ce08417c36aa572c3f18b40ff9335d409b1e9 10-Mar-2012 Conley Owens <cco3@android.com> am ea374096: am c24f5ba4: am 9a3f3b9d: am 67cf093d: Merge "stagefright amrwbenc: Simplify the definition of static_vo"

* commit 'ea374096511f92206c264f3f1eb0551a05a34cd5':
stagefright amrwbenc: Simplify the definition of static_vo
ca17672e75faf59492527a5b168cc01db8badabb 10-Mar-2012 Conley Owens <cco3@android.com> am 3557654c: am 66da3fdc: am 972efafb: am 6db6ea02: Merge changes I00c852e4,Ib31bf028

* commit '3557654c95bae7754dcd1951ec10742b895817e2':
stagefright aacenc: Avoid overflows when calculating normFactor
stagefright aacenc: Avoid a division by zero
ec431bbd9c7ab07c61290b12d41d9995794e0f61 10-Mar-2012 Conley Owens <cco3@android.com> am 9a3f3b9d: am 67cf093d: Merge "stagefright amrwbenc: Simplify the definition of static_vo"

* commit '9a3f3b9db63e7e109a417c0959b8bc589ab70e04':
stagefright amrwbenc: Simplify the definition of static_vo
62dac15d10f940b3bdb9f78d79cdc3e793ff63dd 10-Mar-2012 Conley Owens <cco3@android.com> am 972efafb: am 6db6ea02: Merge changes I00c852e4,Ib31bf028

* commit '972efafb90b543eea51aa5b23104d469a1bcc1fb':
stagefright aacenc: Avoid overflows when calculating normFactor
stagefright aacenc: Avoid a division by zero
c98c8831388d206f3883767fda3e9c0e5b2e816b 10-Mar-2012 Conley Owens <cco3@android.com> am 67cf093d: Merge "stagefright amrwbenc: Simplify the definition of static_vo"

* commit '67cf093d86539d4f3db7e2a2b168c9a250c0a5b8':
stagefright amrwbenc: Simplify the definition of static_vo
9045f8d6bf6f052b8fa0e34de2d703e8bff75a95 10-Mar-2012 Conley Owens <cco3@android.com> am 6db6ea02: Merge changes I00c852e4,Ib31bf028

* commit '6db6ea02b999e86dfbddd08780eeab0034389f93':
stagefright aacenc: Avoid overflows when calculating normFactor
stagefright aacenc: Avoid a division by zero
824ab1a4138faa7a2dda1571282f0938e4b6cc40 09-Mar-2012 Andreas Huber <andih@google.com> Merge "Fix memory leak when carrying ABuffer* in AMessages."
bdaa29a9bc63d8d0d86879e40286a06655623322 09-Mar-2012 Andreas Huber <andih@google.com> Fix memory leak when carrying ABuffer* in AMessages.

Change-Id: Icb4770ca238d316e6dd2d89159357a8fdb504ea9
oundation/AMessage.cpp
e7d0c712f1c9fa0b0e413b8eb729049995290aee 09-Mar-2012 Marco Nelissen <marcone@google.com> Improve AudioPlayer position reporting

The latency was not taken into account when updating mPositionTimeRealUs
inside of the fillBuffer hook, contrary to what the getRealTimeUsLocked()
method does. This caused the realTimeOffset calculated in the
getMediaTimeUs to always be negative, causing the reported position to
always be equal to mPositionTimeMediaUs, which is updated infrequently.
With this change, the reported position is updated more frequently, allowing
apps to perform smoother UI updates.

Change-Id: I61e05c1a8b53d46b9091afb0d18a6289d13a7a5e
udioPlayer.cpp
dc1696c890698d55aade9dbadf3148c2fac01cd0 09-Mar-2012 Conley Owens <cco3@android.com> Merge "stagefright amrwbenc: Simplify the definition of static_vo"
1f7e2d9906d25b4e709c247d78537ee826d31051 09-Mar-2012 Conley Owens <cco3@android.com> Merge changes I00c852e4,Ib31bf028

* changes:
stagefright aacenc: Avoid overflows when calculating normFactor
stagefright aacenc: Avoid a division by zero
679ab0b0792846a89162ce41c953819d70030112 07-Mar-2012 Glenn Kasten <gkasten@google.com> Use AudioRecord::record_flags consistently

Change-Id: I6f369a2b99eb515603bc7d5629a07db2b96783fe
udioSource.cpp
5e5631bbf2403b8242e77977792318d65362ed91 09-Mar-2012 Jeff Tinker <jtinker@google.com> Merge "Fix videos app bandwidth accounting for 4G streaming"
381f475475b11a552a5233c48947cc570c28b1d8 08-Mar-2012 Dirk Dougherty <ddougherty@google.com> resolved conflicts for merge of 532679a5 to master

Change-Id: Id60d047c0e1f288acff97526c016cca632873b6b
6556e5bb99bda64f3ab92e8b540fccdd59e9ed8d 06-Mar-2012 Eric Laurent <elaurent@google.com> Merge "MediaPlayerService: fix AudioSink latency"
56617834920554fc68a818da17b56e0c2ad8f254 06-Mar-2012 James Dong <jdong@google.com> Merge "Remove unused code - MediaSourceSplitter"
70a1577d42c6e222c98f0245e7b81b0e8bc238f7 06-Mar-2012 Glenn Kasten <gkasten@google.com> Merge "Remove references to sched_policy.h"
6a26abbafe8d9a9c2250afcc037c3db5e9d1b42a 06-Mar-2012 Dirk Dougherty <ddougherty@google.com> am 4d7bc655: Doc change: String changes for Android Market

* commit '4d7bc65538c7cd9fbb1fbbcf22d1da47fcee1219':
Doc change: String changes for Android Market
083644fee99d23491554484301943e6a7daf262b 28-Jan-2012 Dirk Dougherty <ddougherty@google.com> Doc change: String changes for Android Market

Change-Id: I823812a4fd24021bec906ad856479c92a8d2a759
odecs/m4v_h263/dec/src/vop.cpp
054a5a69374efae97924c83c2ee7ec7210bf3283 06-Mar-2012 James Dong <jdong@google.com> Remove unused code - MediaSourceSplitter

Change-Id: Icf37832a1c234501ee3ff91ff13eece2242425ae
ndroid.mk
ediaSourceSplitter.cpp
c236eb8ae848997d47b47371f86c37389eef013e 06-Mar-2012 Glenn Kasten <gkasten@google.com> Remove references to sched_policy.h

As part of scheduling policy cleanup, remove obsolete
references to sched_policy.h and its APIs.

Change-Id: Id957d11dd645cdf9d53dd6c02e568369aef23243
imedEventQueue.cpp
db354e58e65592777aa17caa47933e14838b8b35 06-Mar-2012 Eric Laurent <elaurent@google.com> MediaPlayerService: fix AudioSink latency

The AudioSink latency is currently cached when the associated AudioTrack
is created. However, the AudioTrack latency can change if the AudioTrack is moved
from one output stream to another.
The AudioPlayer must also periodically update its view of the latency
as it is needed to compensate the real audio time used for A/V sync.

This fixes an A/V sync problem seen when switching A2DP on and off while
playing a video.

Change-Id: I28b24049ca114e1af3e24791dcc900f463536ba4
udioPlayer.cpp
786618ffe881aceb64d65a6a2e2d76ede6e01ec0 02-Mar-2012 Jean-Michel Trivi <jmtrivi@google.com> Add channel mask in AudioSink

Add support for specifying a channel mask when opening an AudioSink.
This parameter does not replace the channel count parameter in order
to not have to duplicate the logic to derive a mask from the
channel count everywhere an AudioSink is used without a known mask.

A mask of 0 (CHANNEL_MASK_USE_CHANNEL_ORDER) means a mask will
be automatically derived from the number of channels.

Update existing AudioSink implementations to use the channel mask,
and users of AudioSink to specify the mask if available, and
CHANNEL_MASK_USE_CHANNEL_ORDER otherwise.

Change-Id: Ifa9bd259874816dbc25ead2b03ea52e873cff474
udioPlayer.cpp
4bce61f407d43b216c288a8d7b26fb5519853dba 02-Mar-2012 Andreas Huber <andih@google.com> Merge "Remove hacks that worked around issues in OMX components several releases back."
79967af7ba8fb2ddd3a106afc0361f3ad836c174 02-Mar-2012 Jean-Baptiste Queru <jbq@google.com> am 9de7793b: am 4f906362: am 97348431: am 704131cb: Merge changes I46c81dba,If1f40e9c,I652eaaa5

* commit '9de7793b425be89889412f3a86466d7b19055c3c':
stagefright aacenc: Use QDADD/QDSUB instructions
stagefright aacenc: Remove useless inline asm for simple right shift
stagefright aacenc: Use ARMv6 SSAT instruction
6c1f1cb5bd2b22f8b21b78ea020a0b6370f5b9ff 02-Mar-2012 Jean-Baptiste Queru <jbq@google.com> am 715c78b9: am 225eec8d: am f9d4ba77: am 69aae36e: Merge "stagefright aacenc: Safeguard against overwriting bits"

* commit '715c78b933f8dec04882ebb73acd61fdd42c6c64':
stagefright aacenc: Safeguard against overwriting bits
25a9ce1b1fea65341299c262b944825d233006f6 02-Mar-2012 Andreas Huber <andih@google.com> Remove hacks that worked around issues in OMX components several releases back.

Change-Id: I89bb3d0be4d2c1824de382aedfdd4f9bd2547dbc
MXCodec.cpp
afc16d667afa23f5aa00154ccad62f8c45cf5419 01-Mar-2012 Andreas Huber <andih@google.com> Instead of hardcoding OMX component names in our code, support

a config file instead.

Change-Id: I5835903ab9f1c4a22ccc605ca99ed966767adf57
Codec.cpp
ndroid.mk
ediaCodecList.cpp
MXCodec.cpp
d1aeb29912c93863a05b8023bc30cd139c97c5f5 01-Mar-2012 Jean-Baptiste Queru <jbq@google.com> am 704131cb: Merge changes I46c81dba,If1f40e9c,I652eaaa5

* commit '704131cb7e4f9cc682ea57ed569375f9f289368e':
stagefright aacenc: Use QDADD/QDSUB instructions
stagefright aacenc: Remove useless inline asm for simple right shift
stagefright aacenc: Use ARMv6 SSAT instruction
769501aad4e1c69af713b27dada849f99db22914 01-Mar-2012 Jean-Baptiste Queru <jbq@google.com> am 69aae36e: Merge "stagefright aacenc: Safeguard against overwriting bits"

* commit '69aae36e900cf7114c5895618747906951a11730':
stagefright aacenc: Safeguard against overwriting bits
9f422f59fcb74283fa52c3bfd0a2665ec9ce9e10 29-Feb-2012 Jean-Baptiste Queru <jbq@google.com> Merge changes I46c81dba,If1f40e9c,I652eaaa5

* changes:
stagefright aacenc: Use QDADD/QDSUB instructions
stagefright aacenc: Remove useless inline asm for simple right shift
stagefright aacenc: Use ARMv6 SSAT instruction
de99ee3d507bf1284fdb5d6b84a32f4227f16a6f 29-Feb-2012 Jean-Baptiste Queru <jbq@google.com> Merge "stagefright aacenc: Safeguard against overwriting bits"
5687da3359c7939dbd982de9fa2e5f19e41ae411 29-Feb-2012 Andreas Huber <andih@google.com> Merge "Separate the notion of "stop" from that of "release", i.e."
41acadea86b763f4cc6f7aeb292f943d4570ac90 29-Feb-2012 James Dong <jdong@google.com> Merge "Moves TimedTextDriver.h into include/media/stagefright/timedtext."
c95c2ddcdfc974f42408a377fbe2de51b94a8c94 29-Feb-2012 Andreas Huber <andih@google.com> Separate the notion of "stop" from that of "release", i.e.

stop - means transition back to LOADED state and keeping the component
instance allocated.

release - means we get rid of the component completely.

Change-Id: I40ad01ce70821faaad43f57999249904f9144924
Codec.cpp
ediaCodec.cpp
3f791be1032e6c4cc499598dd2be116db6fb33c3 28-Feb-2012 Jean-Baptiste Queru <jbq@google.com> am 254cf597: am 7b6b81f8: am f016dc1b: am f881fa51: Merge "stagefright amr: Avoid C++/C99 for loops with variable declaration"

* commit '254cf5973ebe5ebdce9ef261d826e88ed2f67f58':
stagefright amr: Avoid C++/C99 for loops with variable declaration
77f70f7de1977d7b0a9f9c37a25e34db16feb7b4 28-Feb-2012 Mathias Agopian <mathias@google.com> remove dependency on unneeded headers

Change-Id: I890f40c430beca055bedd95c878eb68b42f232c2
olorconversion/SoftwareRenderer.cpp
279612dd95acc127e41b8a7aa3277f3ffacaa849 28-Feb-2012 Jean-Baptiste Queru <jbq@google.com> am f881fa51: Merge "stagefright amr: Avoid C++/C99 for loops with variable declaration"

* commit 'f881fa517978adc7ea610a1982e0d071f1fd3425':
stagefright amr: Avoid C++/C99 for loops with variable declaration
bc303ed5fd25228b8523adbfcc9c007e73bc04ea 28-Feb-2012 Jean-Baptiste Queru <jbq@google.com> Merge "stagefright amr: Avoid C++/C99 for loops with variable declaration"
acb364073e62acddced517f2edfe0326245b2af9 27-Feb-2012 Jean-Baptiste Queru <jbq@google.com> am 19bb6261: am bf826923: am faf38b24: am 9e3d9575: Merge "stagefright aacenc: Add prototypes for arm specific implementations of functions"

* commit '19bb62613f512b62d492fb4caf36de88fd1914dd':
stagefright aacenc: Add prototypes for arm specific implementations of functions
7b419b45b4c810c0c7ebcca5d613cd9356fa4939 27-Feb-2012 Jean-Baptiste Queru <jbq@google.com> am 360db46e: am b7913f70: am 163777b8: am 354ac772: Merge "stagefright amrwb: Make local const arrays static"

* commit '360db46e78a1492b695d5be6e779386dc66a502e':
stagefright amrwb: Make local const arrays static
d6b15d3d101b2fb253895e611e081c82afe6d9e2 27-Feb-2012 Jean-Baptiste Queru <jbq@google.com> am 5ba910d8: am 040c5b2c: am ded8e681: am 695cfe1e: Merge "stagefright amrwb: Change a C++ style cast into a C style cast"

* commit '5ba910d867d029e69c4f52667c02a4c114f849df':
stagefright amrwb: Change a C++ style cast into a C style cast
7b65e71b662ce3bd7983fbfb62e8dafade5ccc55 27-Feb-2012 Jean-Baptiste Queru <jbq@google.com> am b205a5d8: am 50ee92e9: am d91b744d: am f7f1280e: Merge changes Ib4e27ea3,I4ad55266,Ie32b32c7

* commit 'b205a5d861c5ba31599084a42c7d92549f464dac':
stagefright amrnb: Remove extern from table definitions
stagefright amrnb: Add includes for prototype declarations of tables
stagefright amrnb: Add missing const qualifier to table declarations in headers
d7fe790fe59089394ee01f5d56106c0f488aad0a 27-Feb-2012 Jean-Baptiste Queru <jbq@google.com> am 18a64b74: am a887ff9a: am 4f74be57: am 1a864db7: Merge "stagefright aacenc: Simplify the definition of __inline"

* commit '18a64b74aa3cb0babb5f50e5f80660f601d80123':
stagefright aacenc: Simplify the definition of __inline
bf9fc69dd171c99794725171c38f65a3c6f6e544 27-Feb-2012 Jean-Baptiste Queru <jbq@google.com> am 6b4d7bad: am f7210cf5: am 7346d73c: am 77576ff4: Merge "stagefright amrwbenc: Remove a useless check"

* commit '6b4d7bada0b1d34f93149211cb179b71c864d5d3':
stagefright amrwbenc: Remove a useless check
14f94704418852fe83eabd3e0e13288951fee574 27-Feb-2012 Jean-Baptiste Queru <jbq@google.com> am 2bf76b98: am 3e61e413: am 32901b39: am be9a7055: Merge "stagefright aacenc: Remove a stray semicolon"

* commit '2bf76b983da1d1730d685f9907d5d4fa6ea46fcd':
stagefright aacenc: Remove a stray semicolon
54fd89aec2b34f6ea14d7b93b34a4a7a69ab0278 27-Feb-2012 Jean-Baptiste Queru <jbq@google.com> am 484fc74b: am 4bcdeb86: am 716a0517: am fe5f5d77: Merge "stagefright amrwb: Make a global const array static"

* commit '484fc74beb79d0b8d49223cb3fce9e1ccbfd3501':
stagefright amrwb: Make a global const array static
f2f4a649d71aea5066d609c10cd9449df9abd453 27-Feb-2012 Jean-Baptiste Queru <jbq@google.com> am eb483de5: am bf5c5e5b: am c1da1e1b: am 94ee1bf2: Merge "stagefright amrwbenc: Change keyword ordering"

* commit 'eb483de58e4b41cb549149459e492e9ad1d65bd0':
stagefright amrwbenc: Change keyword ordering
c0502b930651092683a5f47c55159b559fae7727 27-Feb-2012 Jean-Baptiste Queru <jbq@google.com> am 5b299d2f: am 18643e70: am 6bc542e0: am 5aff259c: Merge "stagefright aacenc: Don\'t address a Word32 with a Word16 pointer"

* commit '5b299d2f9038452aa09a97d4f2ce57ec20bbc06a':
stagefright aacenc: Don't address a Word32 with a Word16 pointer
021c841c460993c0db515826a17460fc36eaf744 27-Feb-2012 Jean-Baptiste Queru <jbq@google.com> am 9e3d9575: Merge "stagefright aacenc: Add prototypes for arm specific implementations of functions"

* commit '9e3d957599c76ba19e23fd25b75ccc02d54efe3e':
stagefright aacenc: Add prototypes for arm specific implementations of functions
1b1123d45da74ae4916e12b119a6ad5458dea5a2 27-Feb-2012 Jean-Baptiste Queru <jbq@google.com> am 354ac772: Merge "stagefright amrwb: Make local const arrays static"

* commit '354ac772eca0afea25dd12d233e5cdee9677888b':
stagefright amrwb: Make local const arrays static
67caa6dfef0b98235616102eb5c503f84782bbed 27-Feb-2012 Jean-Baptiste Queru <jbq@google.com> am 695cfe1e: Merge "stagefright amrwb: Change a C++ style cast into a C style cast"

* commit '695cfe1e1e189f176fdf994f72d05a0129a66394':
stagefright amrwb: Change a C++ style cast into a C style cast
c6531cfdf04db7f75de3fe82697149f6e28b94e1 27-Feb-2012 Jean-Baptiste Queru <jbq@google.com> am f7f1280e: Merge changes Ib4e27ea3,I4ad55266,Ie32b32c7

* commit 'f7f1280e0c71d64098efb42b58a922d056164b5e':
stagefright amrnb: Remove extern from table definitions
stagefright amrnb: Add includes for prototype declarations of tables
stagefright amrnb: Add missing const qualifier to table declarations in headers
43a1734eba6f409f9982d2e35dde6a869dbbdc90 27-Feb-2012 Jean-Baptiste Queru <jbq@google.com> am 1a864db7: Merge "stagefright aacenc: Simplify the definition of __inline"

* commit '1a864db7723a7947b72d24e6008ba48341d0feff':
stagefright aacenc: Simplify the definition of __inline
30a186e062e6301d54cf3140275fff866237c5fd 27-Feb-2012 Jean-Baptiste Queru <jbq@google.com> am 77576ff4: Merge "stagefright amrwbenc: Remove a useless check"

* commit '77576ff487e227092cdaf09db163e21f1e07604a':
stagefright amrwbenc: Remove a useless check
ea6293131b72a65afabef16e18874c535f061d0a 27-Feb-2012 Jean-Baptiste Queru <jbq@google.com> am be9a7055: Merge "stagefright aacenc: Remove a stray semicolon"

* commit 'be9a705586edafcedc9fabb94d3259f882b7cbd7':
stagefright aacenc: Remove a stray semicolon
30e927947126e87f4865b626ffe17bec74ff5ffe 27-Feb-2012 Jean-Baptiste Queru <jbq@google.com> am fe5f5d77: Merge "stagefright amrwb: Make a global const array static"

* commit 'fe5f5d7728b7f8be24716fda6eb1480eb9dfb72f':
stagefright amrwb: Make a global const array static
59e82a04949ffca325508f5ebf43fdb8657e350c 27-Feb-2012 Jean-Baptiste Queru <jbq@google.com> am 94ee1bf2: Merge "stagefright amrwbenc: Change keyword ordering"

* commit '94ee1bf232d1f1cc97902dab1e4148eb478cd304':
stagefright amrwbenc: Change keyword ordering
7917b452eae7340fcab09b7b406d9d8ca28a4a87 27-Feb-2012 Jean-Baptiste Queru <jbq@google.com> am 5aff259c: Merge "stagefright aacenc: Don\'t address a Word32 with a Word16 pointer"

* commit '5aff259c61e54e441ed04bf77e3cc69a0374432d':
stagefright aacenc: Don't address a Word32 with a Word16 pointer
df712ea86e6350f7005a02ab0e1c60c28a343ed0 26-Feb-2012 Mathias Agopian <mathias@google.com> fix libgui header location

Change-Id: Iec71706cdd4f29c6904993648ce873e83ef9cafe
Codec.cpp
wesomePlayer.cpp
ameraSource.cpp
urfaceMediaSource.cpp
olorconversion/SoftwareRenderer.cpp
ests/SurfaceMediaSource_test.cpp
61d07fbe79533517dbd4390d90206badd8df4641 27-Feb-2012 Jean-Baptiste Queru <jbq@google.com> Merge "stagefright aacenc: Add prototypes for arm specific implementations of functions"
94530642d4a742888363d90875a9b44498100658 27-Feb-2012 Jean-Baptiste Queru <jbq@google.com> Merge "stagefright amrwb: Make local const arrays static"
9d0e88ca1ceee29e4bc4f38fb0897c53cb79b1e9 27-Feb-2012 Jean-Baptiste Queru <jbq@google.com> Merge "stagefright amrwb: Change a C++ style cast into a C style cast"
f27422a71112e77af77de0da2e60d4deb94a9375 23-Jun-2011 Martin Storsjo <martin@martin.st> stagefright amr: Avoid C++/C99 for loops with variable declaration

This makes the code compileable in C89 mode, too.

Change-Id: I9b76f8bfca148d1aec6081b8db139f351d64cfed
odecs/amrnb/enc/src/ton_stab.cpp
odecs/amrwb/src/get_amr_wb_bits.cpp
odecs/amrwb/src/oversamp_12k8_to_16k.cpp
fbaf72b701316c8050d73690ff387e62f724f216 27-Feb-2012 Jean-Baptiste Queru <jbq@google.com> Merge changes Ib4e27ea3,I4ad55266,Ie32b32c7

* changes:
stagefright amrnb: Remove extern from table definitions
stagefright amrnb: Add includes for prototype declarations of tables
stagefright amrnb: Add missing const qualifier to table declarations in headers
7c7674ea2d7ba099b5afd3badf4d69da55b377dd 27-Feb-2012 Jean-Baptiste Queru <jbq@google.com> Merge "stagefright aacenc: Simplify the definition of __inline"
e98a953903240da9e5118594b6e4f454dcd2c123 27-Feb-2012 Jean-Baptiste Queru <jbq@google.com> Merge "stagefright amrwbenc: Remove a useless check"
7d8e0f1ae48058ac1613272fd66e4d8335adbb93 27-Feb-2012 Jean-Baptiste Queru <jbq@google.com> Merge "stagefright aacenc: Remove a stray semicolon"
a4999a9f0fb1a5690d967c08c7c6216221bc028a 27-Feb-2012 Jean-Baptiste Queru <jbq@google.com> Merge "stagefright amrwb: Make a global const array static"
d78b7149dd619c73b1160ba68a7e05ffdd50cb0c 27-Feb-2012 Jean-Baptiste Queru <jbq@google.com> Merge "stagefright amrwbenc: Change keyword ordering"
5b9c33c7239c996135c0021ec9a0d9afedd81a78 27-Feb-2012 Jean-Baptiste Queru <jbq@google.com> Merge "stagefright aacenc: Don't address a Word32 with a Word16 pointer"
3254b25e8b0f674ccc2226609e01dd86a600802e 27-Feb-2012 Insun Kang <insun@google.com> Moves TimedTextDriver.h into include/media/stagefright/timedtext.

So that other players can include TimedTextDriver.h properly.

Change-Id: I15e72bf655de8555eef6244a6c853c27a0828a1d
ndroid.mk
wesomePlayer.cpp
imedtext/Android.mk
imedtext/TimedTextDriver.cpp
imedtext/TimedTextDriver.h
imedtext/TimedTextPlayer.cpp
9eeafeb52fecf90882e9b44eeefcb7c3e16aa915 25-Feb-2012 Mathias Agopian <mathias@google.com> remove dependency on android_native{s_priv|buffer}.h

Change-Id: Ie4b95f7061c240f37c504414259f92d72c4ffc89
olorconversion/SoftwareRenderer.cpp
nclude/SoftwareRenderer.h
7fb5e8832f582ec515550696e9dabc3a8d9de14d 24-Feb-2012 Andreas Huber <andih@google.com> Merge "Make sure we return input/output buffers to the codec not just while"
8b2a453ab6698eae4560389c6e8f6ecab2643218 24-Feb-2012 Andreas Huber <andih@google.com> Make sure we return input/output buffers to the codec not just while

flushing but also while stopping.

Change-Id: I23534008b93654c9b9c022c0b1d204c2b546d566
ediaCodec.cpp
1ead790eadd0e09a118308caccc7ac37d36f43f3 17-May-2011 Martin Storsjo <martin@martin.st> stagefright amrnb: Remove extern from table definitions

Local prototype declarations are added where no suitable ones are
available in headers.

This fixes warnings when compiling as C - while the source
files are named .cpp, they actually are compileable as pure C.

This was committed on the master branch of the opencore
repository in commit a0acb494ea6682ca966b5ebbd3676c89c56d63a6,
based on AOSP contribution 10303.

Change-Id: Ib4e27ea30302c66e0233e63e5a4652f6339bc940
odecs/amrnb/common/src/bitno_tab.cpp
odecs/amrnb/common/src/bitreorder_tab.cpp
odecs/amrnb/common/src/bytesused.cpp
odecs/amrnb/common/src/c2_9pf_tab.cpp
odecs/amrnb/common/src/gains_tbl.cpp
odecs/amrnb/common/src/gray_tbl.cpp
odecs/amrnb/common/src/grid_tbl.cpp
odecs/amrnb/common/src/inv_sqrt_tbl.cpp
odecs/amrnb/common/src/log2_tbl.cpp
odecs/amrnb/common/src/lsp_lsf_tbl.cpp
odecs/amrnb/common/src/lsp_tab.cpp
odecs/amrnb/common/src/overflow_tbl.cpp
odecs/amrnb/common/src/ph_disp_tab.cpp
odecs/amrnb/common/src/pow2_tbl.cpp
odecs/amrnb/common/src/q_plsf_5_tbl.cpp
odecs/amrnb/common/src/qua_gain_tbl.cpp
odecs/amrnb/common/src/sqrt_l_tbl.cpp
odecs/amrnb/common/src/window_tab.cpp
odecs/amrnb/dec/src/dec_input_format_tab.cpp
odecs/amrnb/dec/src/qgain475_tab.cpp
odecs/amrnb/enc/src/corrwght_tab.cpp
odecs/amrnb/enc/src/enc_output_format_tab.cpp
odecs/amrnb/enc/src/inter_36_tab.cpp
odecs/amrnb/enc/src/lag_wind_tab.cpp
d95a8462c367a7bea1b4aee24917d3e9ed7e2a48 17-May-2011 Martin Storsjo <martin@martin.st> stagefright amrnb: Add includes for prototype declarations of tables

This was committed on the master branch of the opencore
repository in commit da3d0463c999871ee584a0d750be65be65d19b00,
based on AOSP contribution 10302.

Change-Id: I4ad5526634efecc2d2bb3d2169184b8d4d4d7671
odecs/amrnb/common/src/bitreorder_tab.cpp
odecs/amrnb/common/src/grid_tbl.cpp
odecs/amrnb/common/src/inv_sqrt_tbl.cpp
odecs/amrnb/common/src/log2_tbl.cpp
odecs/amrnb/common/src/lsp_tab.cpp
odecs/amrnb/common/src/pow2_tbl.cpp
odecs/amrnb/common/src/q_plsf_5_tbl.cpp
odecs/amrnb/common/src/qua_gain_tbl.cpp
odecs/amrnb/common/src/sqrt_l_tbl.cpp
odecs/amrnb/common/src/window_tab.cpp
odecs/amrnb/dec/src/dec_input_format_tab.cpp
odecs/amrnb/enc/src/corrwght_tab.cpp
odecs/amrnb/enc/src/enc_output_format_tab.cpp
odecs/amrnb/enc/src/inter_36_tab.cpp
odecs/amrnb/enc/src/lag_wind_tab.cpp
93eec2bc24e3782420d76df52586c84a03669087 17-May-2011 Martin Storsjo <martin@martin.st> stagefright amrnb: Add missing const qualifier to table declarations in headers

This was committed on the master branch of the opencore
repository in commit 5ce7a6fdf125116ffce2e692e14eafef1c807628,
based on AOSP contribution 10301.

Change-Id: Ie32b32c7407f449e382c0b4fd2d60a664e0daa33
odecs/amrnb/common/include/az_lsp.h
odecs/amrnb/common/include/inv_sqrt.h
odecs/amrnb/common/include/log2_norm.h
odecs/amrnb/common/include/pow2.h
odecs/amrnb/common/include/sqrt_l.h
034816f92436de28071652d88975a5fcef317acd 17-May-2011 Martin Storsjo <martin@martin.st> stagefright amrwb: Make a global const array static

This fixes compilation as C - while the source files are named
.cpp, they actually are compileable as pure C. Prior to this,
this table produced multiple definitions of the same symbol.

This was committed on the master branch of the opencore
repository in commit a803bd49a631317e0d52ff060cf1799f7741a47e,
based on AOSP contribution 10017.

Change-Id: Id76274964242b119ab61b8181e557477df1e1521
odecs/amrwb/include/pvamrwbdecoder_api.h
46f715e1150b02b00b16620f92a84c74aba43b47 17-May-2011 Martin Storsjo <martin@martin.st> stagefright amrwb: Make local const arrays static

Some of these tables exist in both the amrnb and amrwb libraries,
but with different content.

This avoids some cases of multiple definitions of symbols, if
linking in both libraries statically into the same executable,
if the libraries are built as C. (As C++, the local symbols
get mangled so they don't conflict with the external C symbols
in amrnb, that are unmangled.)

Most of this was committed on the master branch of the opencore
repository in commit 0cd4b3ac412dd0a8370ce339e89cf346c6cfe395,
based on AOSP contribution 10016.

Change-Id: I5387e699ce54a56dc43fcfa0396dee5c99280fd9
odecs/amrwb/src/homing_amr_wb_dec.cpp
odecs/amrwb/src/isp_isf.cpp
odecs/amrwb/src/phase_dispersion.cpp
ffa34edd0fd50d558f9bc7a650d959b4d3d29123 17-May-2011 Martin Storsjo <martin@martin.st> stagefright amrwb: Change a C++ style cast into a C style cast

This fixes compilation as C - while the source files are named
.cpp, they actually are compileable as pure C (except for this
cast).

This was committed on the master branch of the opencore
repository in commit ae27d9b2ef68c4e6fc383a8cab93d6baa235ff6b,
based on AOSP contribution 10014.

Change-Id: I4f533313be041ad3e0a03ffc5f4207480894ddd1
odecs/amrwb/src/oversamp_12k8_to_16k.cpp
1e07b508b4f9d5031e17cde7701ad656824816f1 24-Feb-2012 Jean-Baptiste Queru <jbq@google.com> am ed7e1e83: am 47023027: am 26d9944e: am 6a300a54: Merge "stagefright aacenc: Make the bits to write in WriteBits unsigned"

* commit 'ed7e1e830165678421ee7d1b3dac044214a6e635':
stagefright aacenc: Make the bits to write in WriteBits unsigned
9a2af4508c27affc0e4a7440f8e5694ec3f0bec6 24-Feb-2012 Jean-Baptiste Queru <jbq@google.com> am 6a300a54: Merge "stagefright aacenc: Make the bits to write in WriteBits unsigned"

* commit '6a300a5413898ff8b728e77c5a23290cae60e9b5':
stagefright aacenc: Make the bits to write in WriteBits unsigned
338b9c9020ca6be98f30670cf307ad8553f1b4c9 12-Jan-2012 Martin Storsjo <martin@martin.st> stagefright aacenc: Remove a stray semicolon

This avoids warnings about an empty body in an if statement.

mem_free does the same null check, so the accidental extra
semicolon was harmless, and the whole if statement actually
is needless. But if removing the if statements, all the
other ones should be removed too, for consistency.
(This could be done as a separate change).

Change-Id: I1b6064dedd15ffa949043bb5396148aaed9b43f6
odecs/aacenc/src/qc_main.c
8a3b3707a6e320ba75f4ecd47fdc001f16c15cb8 12-Jan-2012 Martin Storsjo <martin@martin.st> stagefright aacenc: Add prototypes for arm specific implementations of functions

The arm specific functions are implemented in .s files,
without any function declarations in headers.

This fixes compiler warnings about implicit declarations
of these functions.

Change-Id: I1512560b6740c1879f378886e05aaad2e3a6c869
odecs/aacenc/src/transform.c
b0238c30a22778bdb4ac7c86a1eb65e50e32f2ec 12-Jan-2012 Martin Storsjo <martin@martin.st> stagefright amrwbenc: Change keyword ordering

This avoids warnings about 'static' not being at the beginning
of the declarations.

Change-Id: I80f91b8a0f7f61edcdca96c206fedbd74ec0d88e
odecs/amrwbenc/inc/isp_isf.tab
c4ef4bb50d1407aec63358d4c14d1007ae0c4c1d 12-Jan-2012 Martin Storsjo <martin@martin.st> stagefright amrwbenc: Remove a useless check

Since the Length field is unsigned, the comparison will always
be false. The corresponding code in the aac encoder doesn't have
any check for Length.

This avoids a warning about comparison always being false.

Change-Id: I57c28ff9d09cb9ac4effeaeb40db608ab976acc6
odecs/amrwbenc/src/voAMRWBEnc.c
fc237e5453333c3e0a31da3562f26ca8639d7951 24-Feb-2012 Jean-Baptiste Queru <jbq@google.com> am 70450553: am 14c6e272: am 2accfc11: am d6a25154: Merge "stagefright aacenc: Fix an inline asm constraint"

* commit '70450553f8f1e6ec4967f86a4b811db2940e8772':
stagefright aacenc: Fix an inline asm constraint
837b1e098a3b321bf1b19f22189d8c8bcdd509a6 24-Feb-2012 Jean-Baptiste Queru <jbq@google.com> am 78fc0c0b: am 428ece23: am c4aa19a5: am ea227787: Merge changes I903353c5,I822dcc74

* commit '78fc0c0bfae913a4a44011225396ae525b335fb1':
stagefright amrnb: Properly negate all values
stagefright amrnb: Fix a bug on architectures where long is 64 bit
b86b3c8f976b70635770d93217132d4023ecf33f 24-Feb-2012 Jean-Baptiste Queru <jbq@google.com> Merge "stagefright aacenc: Make the bits to write in WriteBits unsigned"
5b823b4cca17de5249fbbd774541c69b970e8da8 24-Feb-2012 Jean-Baptiste Queru <jbq@google.com> am d6a25154: Merge "stagefright aacenc: Fix an inline asm constraint"

* commit 'd6a25154d94c48ab2ef12641c789458ab14ca94f':
stagefright aacenc: Fix an inline asm constraint
391906630443d7bd1d3a34e34535d93113723316 24-Feb-2012 Jean-Baptiste Queru <jbq@google.com> am ea227787: Merge changes I903353c5,I822dcc74

* commit 'ea227787253e29da2d688399b097e05708d3bf73':
stagefright amrnb: Properly negate all values
stagefright amrnb: Fix a bug on architectures where long is 64 bit
c6a8eec53535fcb074989b5966baec48628a6f94 24-Feb-2012 Jean-Baptiste Queru <jbq@google.com> Merge "stagefright aacenc: Fix an inline asm constraint"
dab48426d9b2becf45bef409f607045f066d6f72 24-Feb-2012 Andreas Huber <andih@google.com> Merge "Small fix to MediaCodec"
de8b924a7f7d104af4243b1dfaef6f4480f93eea 24-Feb-2012 Jean-Baptiste Queru <jbq@google.com> Merge changes I903353c5,I822dcc74

* changes:
stagefright amrnb: Properly negate all values
stagefright amrnb: Fix a bug on architectures where long is 64 bit
a118abebce9aa2bdd8fa4a7251875c5049082434 24-Feb-2012 Jean-Baptiste Queru <jbq@google.com> am 15278119: am 61022b06: am 5f83b957: am bf45bbf3: Merge "stagefright aacenc: Zero-initialize a struct"

* commit '1527811984557ee0b5d6e476e84ed147e073cb45':
stagefright aacenc: Zero-initialize a struct
90b8ca7c29d75a265faaa9386d556d41ca5be538 24-Feb-2012 Jean-Baptiste Queru <jbq@google.com> am bf45bbf3: Merge "stagefright aacenc: Zero-initialize a struct"

* commit 'bf45bbf3b4a54976b81234ffc8ac41520bc052fc':
stagefright aacenc: Zero-initialize a struct
d38faa28eb767a108a7a9467c1a481957531d2af 24-Feb-2012 Jean-Baptiste Queru <jbq@google.com> am 4de803c7: am 459df4ef: am e7650c32: am e5bdd24b: Merge "stagefright aacenc: Avoid warnings about incompatible pointer types"

* commit '4de803c76d4afd0f542c086b555b71729b3c5796':
stagefright aacenc: Avoid warnings about incompatible pointer types
80d4b8903ed09d2cf9ac35391f04eb8619f47a1e 24-Feb-2012 Jean-Baptiste Queru <jbq@google.com> Merge "stagefright aacenc: Zero-initialize a struct"
142ce9a65b7505819e1205ad5bfa5d63843c7f43 24-Feb-2012 Jean-Baptiste Queru <jbq@google.com> am e5bdd24b: Merge "stagefright aacenc: Avoid warnings about incompatible pointer types"

* commit 'e5bdd24b69c4033163d478d721247691e11cea36':
stagefright aacenc: Avoid warnings about incompatible pointer types
b20a352b7e4eb6690e86e0dcf9d58d73640dc874 24-Feb-2012 Jean-Baptiste Queru <jbq@google.com> am 307f47aa: am 7e8b65df: am 7ffa4546: am 47b56c5a: Merge "stagefright aacenc: Add const declarations to some pointers"

* commit '307f47aa5def85d0c0bb4af725ff557707c5be86':
stagefright aacenc: Add const declarations to some pointers
9884ee5920da4976a4de809567ad8fcbe8608433 24-Feb-2012 Jean-Baptiste Queru <jbq@google.com> am 47b56c5a: Merge "stagefright aacenc: Add const declarations to some pointers"

* commit '47b56c5a46287ea226c05e3c0238a91f4702491a':
stagefright aacenc: Add const declarations to some pointers
ccdf9e6e3dc929a9ffee7ed2aab57115ef810527 24-Feb-2012 Jean-Baptiste Queru <jbq@google.com> Merge "stagefright aacenc: Avoid warnings about incompatible pointer types"
042d1b44537eeb3ead09778f4284a35be9e9f5d3 24-Feb-2012 Jean-Baptiste Queru <jbq@google.com> am 5c2f1220: am 901b8bb0: am aa86aa60: am 1b704610: Merge "stagefright aacenc: Fix inline asm"

* commit '5c2f1220f90ae68a064195ba3c94f1319813f32c':
stagefright aacenc: Fix inline asm
0db280176bd3277e3256252d063f3712b1905ba9 24-Feb-2012 Andreas Huber <andih@google.com> Small fix to MediaCodec

Change-Id: I6bcbfd35fdf5a2b0260b8f07a630a5b380e139a0
ediaCodec.cpp
aa1639aeb42e7c403315319bf55632de93d3c8d9 24-Feb-2012 Jean-Baptiste Queru <jbq@google.com> Merge "stagefright aacenc: Add const declarations to some pointers"
db7670ab7a884efb64f0e7a20425b6445d749822 24-Feb-2012 Jean-Baptiste Queru <jbq@google.com> am 1b704610: Merge "stagefright aacenc: Fix inline asm"

* commit '1b7046108c0f381fa8b7efaebae02c1a2b3099b3':
stagefright aacenc: Fix inline asm
3e4d4efcaf00c8263c7bcd651e453e93b60535da 24-Feb-2012 Jean-Baptiste Queru <jbq@google.com> Merge "stagefright aacenc: Fix inline asm"
54263bcfa6e9ad2fcb3e89617240f4ec0b3a2f99 24-Feb-2012 Jean-Baptiste Queru <jbq@google.com> am 0c96e869: am 41087f79: am d7ab4e0c: am bf1e85bf: Merge "stagefright aacenc: Fix inline asm constraints"

* commit '0c96e8690408e3cfc12eee521a442c52f1c10b27':
stagefright aacenc: Fix inline asm constraints
7ce8b8c79c866fd787f3b4628abf5028207312e6 24-Feb-2012 Jean-Baptiste Queru <jbq@google.com> am bf1e85bf: Merge "stagefright aacenc: Fix inline asm constraints"

* commit 'bf1e85bfc8293646d57f0017afbfb0e09a1a41d7':
stagefright aacenc: Fix inline asm constraints
6dfeab4ddf3fcb82483f29d146329aa959fc0c82 24-Feb-2012 Jean-Baptiste Queru <jbq@google.com> Merge "stagefright aacenc: Fix inline asm constraints"
afc08acfae7946ab3305feede3a96bc6441be75f 24-Feb-2012 James Dong <jdong@google.com> Merge "Changed TimedTextInBandSource to TimedText3GPPSource."
04394b1c83d56e2956ba84aa9cb4b5d3b01d8ae8 23-Feb-2012 James Dong <jdong@google.com> Fix memory leakage due to unreleased MuxOMX objects after disconnection

o related-to-bug: 5984232

Change-Id: I20cbeff6ae865e995d02342549f1e09320543740
MXClient.cpp
16d3dfb5710290b334a07aadeb7d3620c7624e7c 23-Feb-2012 Andreas Huber <andih@google.com> Merge "Add new APIs AMessage::(set|find)Buffer to make it safer to pass"
7fd1703162a6ff694b03f6fd0a8c9f3525f6d9a4 23-Feb-2012 Steve Block <steveblock@google.com> Merge "Drop support for Android HTTP stack"
25eefbedf4b0ba6aea38605f4ba19c75a40810d1 23-Feb-2012 Insun Kang <insun@google.com> Changed TimedTextInBandSource to TimedText3GPPSource.

Change-Id: I820adffbf9b4012f25ab45e9624ae2c35fc5af94
imedtext/Android.mk
imedtext/TimedText3GPPSource.cpp
imedtext/TimedText3GPPSource.h
imedtext/TimedTextInBandSource.cpp
imedtext/TimedTextInBandSource.h
imedtext/TimedTextSource.cpp
2d8bedd05437b6fccdbc6bf70f673ffd86744d59 21-Feb-2012 Andreas Huber <andih@google.com> Add new APIs AMessage::(set|find)Buffer to make it safer to pass

ABuffer objects through messages.

Change-Id: I9f8b4e4c4767d0d70a0105e0c0813b754379b49d
Codec.cpp
PEG2TSWriter.cpp
ediaCodec.cpp
uMediaExtractor.cpp
oundation/AMessage.cpp
tsp/AAMRAssembler.cpp
tsp/AAVCAssembler.cpp
tsp/AH263Assembler.cpp
tsp/AMPEG4AudioAssembler.cpp
tsp/AMPEG4ElementaryAssembler.cpp
tsp/ARTPConnection.cpp
tsp/ARTPSession.cpp
tsp/ARTSPConnection.cpp
tsp/ARawAudioAssembler.cpp
tsp/MyHandler.h
5778822d86b0337407514b9372562b86edfa91cd 21-Feb-2012 Andreas Huber <andih@google.com> Implementation of a java media codec interface and associated tools.

Change-Id: I13e54062d4de584355c5d82bb027a68aeaf2923b
Codec.cpp
ndroid.mk
ediaCodec.cpp
uMediaExtractor.cpp
MXCodec.cpp
oundation/AMessage.cpp
43b1d8ad30bcd61c8cc62fce52fdc6d8381e5732 16-Feb-2012 Steve Block <steveblock@google.com> Drop support for Android HTTP stack

All future releases will use the Chromium HTTP stack and maintaining two HTTP
stacks adds maintenance overhead. The Chromium HTTP stack requires V8, but we
now use V8 in all build targets (b/5495373), so we can safely drop the Android
HTTP stack.

LoadListener, HttpAuthHandlerImpl, Network, SslErrorHandlerImpl, WebViewWorker
- Android-stack specific, removed
StreamLoader, FrameLoader
- Require LoadListener, removed
CacheLoader, ContentLoader, DataLoader, FileLoader
- Extend StreamLoader, removed

BrowserFrame
- Removed methods that create LoadListener
- BrowserFrame.startLoadingResource() is called from native
CallbackProxy, WebView
- Removed calls to Network methods
CacheManager, CookieManager, CookieSyncManager, WebViewCore, WebResourceResponse
- Removed other Android-stack specific code
JniUtlil
- Removed useChromiumHttpStack()
WebViewDatabase
- Removed all code to create cookies and cache databases for Android HTTP stack

See corresponding WebKit change https://android-git.corp.google.com/g/166327.

Bug: 5495616
Change-Id: If491675516f6eb187077af4220214bb6e6a8d045
ndroid.mk
c33305c5dd4cc06e71eb0c66a7150aa6ab647c99 21-Feb-2012 James Dong <jdong@google.com> Merge "Limit the amount of audio record data in each buffer"
b9c769aa8ec26e25a7a61e14a9d521c2adf5b68d 17-Feb-2012 Steve Block <steveblock@google.com> Update stagefright makefile after dropping support for JSC

Bug: 5495373
Change-Id: Ibb81196edd3a6eaa4999cf0e30a78368afb66360
ndroid.mk
dcdfc1ad27cb64bcb51a864b020b846ba22ce2a7 19-Feb-2012 Martin Storsjo <martin@martin.st> stagefright aacenc: Avoid overflows when calculating normFactor

normFactor is calculated using the saturating L_add function,
but if the value added (*psfbPeFactors) is negative, the sum
can end up negative.

*psfbPeFactors can end up negative if redThrExp is less than
*psfbNActiveLines.

In cases where *psfbPeFactors ended up negative, normFactor
became INT_MIN, causing division by zero later.

Change-Id: I00c852e457b22f7eef4d6ed1887629828057206b
odecs/aacenc/src/adj_thr.c
01e29ede19cd7d85bfef38896de8e71e569cd211 19-Feb-2012 Martin Storsjo <martin@martin.st> stagefright aacenc: Avoid a division by zero

In rare cases, the result of normFactor * (*psfbNActiveLines)
could be zero, leading to a division by zero in pow2_xy.

In these cases, normFactor was INT_MIN, and if *psfbNActiveLines
was 2, the product was zero.

normFactor being INT_MIN is a bug in itself though.

Change-Id: Ib31bf02889615a7be3bd1bc028da8a7651a8dbee
odecs/aacenc/src/adj_thr.c
b575ddce78d266fa218006f90306158dda5c8f56 14-Feb-2012 James Dong <jdong@google.com> Limit the amount of audio record data in each buffer

o The size of each input buffer should be less than or equal to kMaxBufferSize
o related-to-bug: 5977032

Change-Id: I04343169aac3df56694aad4ba7967ec45337ad7e
udioSource.cpp
dce4161f7d4d39498f69591e876f5fecdde95833 14-Feb-2012 Jeff Tinker <jtinker@google.com> Fix videos app bandwidth accounting for 4G streaming

Register the app uid with the WV extractor so it can
attribute bandwidth usage to the proper process.

Multi-repository commit, also changes in vendor/widevine

Change-Id: I42395fd08bf0bfc7e224745f820a714400066456
related-to-bug: 5434244
wesomePlayer.cpp
VMExtractor.cpp
nclude/WVMExtractor.h
7a8b0ed6419e57dd8b41d3806893d63d3df91aab 02-Feb-2012 Jean-Michel Trivi <jmtrivi@google.com> Playback rate on MediaPlayer

Add support for modifying the playback rate of a MediaPlayer
by altering the sample rate of its AudioTrack.
The playback rate is expressed in permille, where 1000 is the
playback at normal speed.

Change-Id: I981d060ab32f7bae7a767e82c60c88ae635dceed
udioPlayer.cpp
wesomePlayer.cpp
860936d780d98a5968f40e66ca6ae800c67adbc3 11-Feb-2012 James Dong <jdong@google.com> Merge "Change the signature of method addTextSource() in AwesomePlayer"
f1d5aa162c02a16b7195a43a9bcea4d592600ac4 07-Feb-2012 James Dong <jdong@google.com> Move away from MediaDebug and use ADebug instead

Change-Id: I963a3b6f79a7292891973cbeeaf3378b38629f08
ACExtractor.cpp
MRExtractor.cpp
MRWriter.cpp
ameraSource.cpp
ameraSourceTimeLapse.cpp
RMExtractor.cpp
ileSource.cpp
PEGSource.cpp
ediaBuffer.cpp
ediaBufferGroup.cpp
ediaSourceSplitter.cpp
etaData.cpp
ggExtractor.cpp
ampleIterator.cpp
tagefrightMetadataRetriever.cpp
urfaceMediaSource.cpp
hrottledSource.cpp
imedEventQueue.cpp
ideoSourceDownSampler.cpp
AVExtractor.cpp
VMExtractor.cpp
odecs/aacenc/AACEncoder.cpp
odecs/amrnb/enc/AMRNBEncoder.cpp
odecs/amrwbenc/AMRWBEncoder.cpp
odecs/avc/enc/AVCEncoder.cpp
odecs/m4v_h263/enc/M4vH263Encoder.cpp
olorconversion/ColorConverter.cpp
d3/Android.mk
d3/ID3.cpp
d3/testid3.cpp
peg2ts/MPEG2TSExtractor.cpp
mx/OMX.cpp
mx/OMXComponentBase.cpp
mx/OMXMaster.cpp
mx/OMXNodeInstance.cpp
mx/tests/Android.mk
mx/tests/OMXHarness.cpp
ests/SurfaceMediaSource_test.cpp
imedtext/TimedTextInBandSource.cpp
imedtext/TimedTextPlayer.cpp
uv/YUVCanvas.cpp
uv/YUVImage.cpp
7c5b72c1ea1a7a8ec40c1364e5e32043799c811f 10-Feb-2012 James Dong <jdong@google.com> Change the signature of method addTextSource() in AwesomePlayer

o avoid a unnecessary copy constructor call

Change-Id: Ib598bbe42d42a835549e2d29502c6f196f859874
wesomePlayer.cpp
nclude/AwesomePlayer.h
43089daaf82bd2b8e5f9a29b80af5abaae4657b3 09-Feb-2012 James Dong <jdong@google.com> Finish up B frame support in MPEG4Writer

o optimize to reduce the size of the size of the ctts box
o change the type for the time offset field in ctts table entry from int32_t to uint32_t according to the mp4 file spec
o also moved away from MediaDebug and used ADebug instead.

o related-to-bug: 4232183

Change-Id: I19364303728da64359c63169eec7487508c1d0f8
PEG4Writer.cpp
5ec58d925520e6913fba3fc54413881af751c610 09-Feb-2012 Andreas Huber <andih@google.com> Experiment with seeking to closest frame instead of closest syncframe

Also supports SEEK_CLOSEST mode in the Matroska/Webm extractor.

Change-Id: I257771648dfe41392a4cf8932f625489dcb9f234
wesomePlayer.cpp
atroska/MatroskaExtractor.cpp
7ae4a2c130ec2cb5dec69d095b810698acc543b3 08-Feb-2012 James Dong <jdong@google.com> Merge "Enable B frame support in MPEG4Writer"
000e18370baae60ffd9f25b509501dd8c26deabf 07-Feb-2012 James Dong <jdong@google.com> Enable B frame support in MPEG4Writer

This patch allows us to automatically detect whether ctts box is needed in MPEG4Writer.
MPEG4Writer uses ctts version 0 (non-negative offset value) store the composition time
offset on a needed basis.

Currently, the size of the ctts box is not optimized. Optimization will be addressed
in a subsequent patch.

o also changed the private method retrieveDecodingTime(bool) in OMXCodec
to getDecodingTime()

o related-to-bug: 4232183

Change-Id: Ic6dc7b25ecd258c2506ca4b9c25156e922456e51
PEG4Writer.cpp
MXCodec.cpp
f83463148fbe344989ee1da07d15b94c38a61582 07-Feb-2012 Andreas Huber <andih@google.com> Merge "MatroskaExtractor: to support MPEG4 and MP3 codec."
60c2b4ece6528d6d3f4e9e2c7e45772b65c4b87d 04-Feb-2012 James Dong <jdong@google.com> Don't call virtual function in destructor of SurfaceMediaSource

Change-Id: I3cbc2b1222335b61c814b5cdcfaefa495148b0ec
urfaceMediaSource.cpp
f9289a4ca88d8f72cb0d6b3ca16fbc44ef4a2aeb 04-Feb-2012 James Dong <jdong@google.com> Merge "Don't call virtual functions in the destructor for audio and camera source classes"
f3623993b78669a624d9b3a703b361ed6c035ad9 04-Feb-2012 James Dong <jdong@google.com> Merge "Don't call virtual functions in destructors for the writer classes"
c71f6e2392bf55cc85ee7c1a376441e9b9aae4c8 03-Feb-2012 James Dong <jdong@google.com> Keep AACEncoder around for a bit longer to have more time fix issues related to video editor engine

o this should be reverted after the problem is fixed.
o related-to-bug: 5947347

Change-Id: Iaec4b59d2c99c975e83f0588a813e9a4bfcb7ee2
ndroid.mk
MXCodec.cpp
b44c9d2bdc0d5b9cb03254022a58e017b516e9e6 03-Feb-2012 James Dong <jdong@google.com> Don't call virtual functions in the destructor for audio and camera source classes

Change-Id: Ia74ffc1c0cbd7971697f5e3c476e340ec5c7727a
udioSource.cpp
ameraSource.cpp
ameraSourceTimeLapse.cpp
8bcc65c753085fe3328592cceda0cf0e8f8b0a45 03-Feb-2012 James Dong <jdong@google.com> Don't call virtual functions in destructors for the writer classes

Have not found any concrete bugs related to these calls yet, but we should avoid
calling virtual functions in destructors, regardless.

Change-Id: I2d47b79d3fb2d29f418619bee83aa147d232a5d4
ACWriter.cpp
MRWriter.cpp
PEG2TSWriter.cpp
PEG4Writer.cpp
914b33354be650a5213dd545ace49c6e81828043 02-Feb-2012 James Dong <jdong@google.com> Merge "Removed a loop for buffer lookup"
928170837b9dec2b90f7a01b85182a8b00b45972 02-Feb-2012 James Dong <jdong@google.com> Removed a loop for buffer lookup

o used the nInputPortIndex and nOutputPortIndex from header instead
of assuming that the # of ports == 2

Change-Id: I4b615912b088b4e2bac9c00e89986e811a5c58bb
mx/SimpleSoftOMXComponent.cpp
bf6954598193147cac980b8b5d7ad5215f1dec16 02-Feb-2012 James Dong <jdong@google.com> Merge "Remove the restriction that the width must be a multiple of 4 or 2 for thumbnail generation"
4e260ab948787c2a814543077832847deae890fd 01-Feb-2012 James Dong <jdong@google.com> Remove the restriction that the width must be a multiple of 4 or 2 for thumbnail generation

o simply applying the change in commit a161af9d1e2baa3f23e32634ef7dd9b4bbce9a6c to other formats
o related-to-bug: 5947196

Change-Id: I95de10263b8ad9ec941f1d6b907fca6aeff0a90f
olorconversion/ColorConverter.cpp
83f70f4472e9b0cacc5d372eddfcef4b02662d10 01-Feb-2012 Andreas Huber <andih@google.com> The AMR WB software encoder is now an OMX component.

Change-Id: Iebfb2696783a0163369ba4e8ef72e19ee76ad893
ndroid.mk
MXCodec.cpp
odecs/amrwbenc/Android.mk
odecs/amrwbenc/SoftAMRWBEncoder.cpp
odecs/amrwbenc/SoftAMRWBEncoder.h
mx/SoftOMXPlugin.cpp
252353088a5ebf8508fbc01439ff417805ef1417 31-Jan-2012 Andreas Huber <andih@google.com> The software AMR NB encoder is now an OMX component.

Change-Id: I890eab052a7c36409b8b694c964884e28dd8d8fc
MXCodec.cpp
odecs/amrnb/enc/Android.mk
odecs/amrnb/enc/SoftAMRNBEncoder.cpp
odecs/amrnb/enc/SoftAMRNBEncoder.h
mx/SoftOMXPlugin.cpp
2af955b7437ac5345d75a5e528ebbb749667af7e 01-Feb-2012 James Dong <jdong@google.com> Merge "add tests module tag to omx_tests"
8a0f85fec2e28a97ba8fdda89c2a9b957098c114 31-Jan-2012 James Dong <jdong@google.com> add tests module tag to omx_tests

Change-Id: I5dcb5187f09a7ae980ac5857b7ade81001d459f8
mx/tests/Android.mk
10a5a34b0a8ba44343d0c7e0d3f261af49b5cf4c 31-Jan-2012 James Dong <jdong@google.com> Merge "First step of refactoring 'timedtext' code."
d459b485c61bd3e7fd81c5cd3af8ada27fc3e8d3 31-Jan-2012 Andreas Huber <andih@google.com> Slighly improve the API to discover if the OMX stack is running in the local

process.

Change-Id: Idd3c2f0d4a9542af01a3fdfd3b0bfab90e083505
MXClient.cpp
MXCodec.cpp
nclude/OMX.h
mx/OMX.cpp
3989d5c21ce6d1f3492c9e5484d610d5d66abd9e 20-Apr-2011 Martin Storsjo <martin@martin.st> stagefright aacenc: Safeguard against overwriting bits

Previously, if bits above the lowest noBitsToWrite were
set, they would be ORed into the previous cache word,
setting unrelated bits erroneously.

This doesn't noticeably affect the performance of the
codec as a whole.

Change-Id: Ie9935533c4299b8f07cb14485f039a9be9c84016
odecs/aacenc/src/bitbuffer.c
6655174826330afe66ef766258181ae8c11f3f6c 11-Jan-2012 Insun Kang <insun@google.com> First step of refactoring 'timedtext' code.

Goal
1. Removed dependency of TimedTextPlayer on AwsomePlayer.
2. Generalized TimedTextParser to TimedTextSource and its subclasses.

Summary
1. Introduced TimedTextDriver, TimedTextPlayer (new implementation),
TimedTextSource (and its subclasses).
2. Removed TimedTextParser.

Remaining TODOs
1. Revise VideoVidew, Gallery3D app, AwesomePlayer to check if
'pause' and 'resume' works well.
2. Consider revising MediaPlayer APIs such as setParameter() ->
addTextSource(). Need more thoughts.

Change-Id: Ie0c4f15b9690102de755cef6940f8c31ccf78e27
wesomePlayer.cpp
PEG4Extractor.cpp
nclude/AwesomePlayer.h
imedtext/Android.mk
imedtext/TimedTextDriver.cpp
imedtext/TimedTextDriver.h
imedtext/TimedTextInBandSource.cpp
imedtext/TimedTextInBandSource.h
imedtext/TimedTextParser.cpp
imedtext/TimedTextParser.h
imedtext/TimedTextPlayer.cpp
imedtext/TimedTextPlayer.h
imedtext/TimedTextSRTSource.cpp
imedtext/TimedTextSRTSource.h
imedtext/TimedTextSource.cpp
imedtext/TimedTextSource.h
530f752a8191ccc6bde82fb2012aa3cd032257c0 31-Jan-2012 Andreas Huber <andih@google.com> Make sure our aac decoder handles this parameter.

Change-Id: I212ef0c21776b99d0c6662b118ca0ec16b1d3d5e
odecs/aacdec/SoftAAC.cpp
e9c52da6fdb755ed832325c2fe4fe5b3bc4c9eed 30-Jan-2012 Andreas Huber <andih@google.com> Instantiate software codecs locally whenever possible.

Change-Id: I58d5c30b9de9873a239e91955a8900e2c72518a7
ndroid.mk
MXClient.cpp
dc27bc4b2cd4b95a0d7ba5dd34e3be63e1cc0c9d 22-Jun-2011 Martin Storsjo <martin@martin.st> stagefright amrwbenc: Simplify the definition of static_vo

For GCC, all of inline, __inline and __inline__ work fine.
For MSVC, only __inline works. (__inline should also be accepted
by RVCT.)

Change-Id: Ifbb1c848b200a8c4080624a3d3bd8b6ee498edb2
odecs/amrwbenc/inc/basic_op.h
cf8b805a0c0695097211ca18237c27f45b0df85c 22-Dec-2010 Martin Storsjo <martin@martin.st> stagefright aacenc: Avoid warnings about incompatible pointer types

Change-Id: Ida53cd1030ebb9feb0d6916e42e8ba67a90e86c7
odecs/aacenc/inc/aacenc_core.h
odecs/aacenc/src/aacenc_core.c
fd267d7cf640225bb57f0ed1af44efc153275f6d 27-Jan-2012 Glenn Kasten <gkasten@google.com> Merge "Use audio_source_t consistently"
eba51fb3a361f67a6a64d5a16eba6084fe27d60e 23-Jan-2012 Glenn Kasten <gkasten@google.com> Use audio_source_t consistently

Was a mix of audio_source_t, uint8_t, and int.

Related fixes:
- fix comments in MediaRecorder.java
- AudioPolicyService server side was not checking source parameter at
all, so if the client wrapper was bypassed, invalid values could be
passed into audio HAL
- JNI android_media_AudioRecord_setup was checking source for positive
values, but not negative values. This test is redundant, since already
checked at Java and now checked by AudioPolicyService also, but might
as well make it correct.

Change-Id: Ie5e25d646dcd59a86d7985aa46cfcb4a1ba64a4a
udioSource.cpp
710272b2da6b32c050770378db74f8197e8b8dc6 27-Jan-2012 Andreas Huber <andih@google.com> Merge "The software AAC encoder is now an OMX component."
2b1892db4a2ab47bfc09e59a4c11751aea99e4ea 26-Jan-2012 Andreas Huber <andih@google.com> The software AAC encoder is now an OMX component.

Yay.

Change-Id: I74938a20b4e0a622836ea5184d3761180eb0f5de
ndroid.mk
MXCodec.cpp
odecs/aacenc/Android.mk
odecs/aacenc/SoftAACEncoder.cpp
odecs/aacenc/SoftAACEncoder.h
mx/SoftOMXPlugin.cpp
2857b47a2731579772c76d46285660972c0ba23d 25-Jan-2012 Ben Cheng <bccheng@google.com> Preserve NEON callee-save registers d8-d15.

BUG:5918479
Change-Id: I574bd5845d9e7e007c637aabbf170d03217d10ad
odecs/aacenc/src/asm/ARMV7/PrePostMDCT_v7.s
odecs/aacenc/src/asm/ARMV7/R4R8First_v7.s
odecs/aacenc/src/asm/ARMV7/Radix4FFT_v7.s
244ffc8b98c8b59cf64ef3d368c3373014a2f230 25-Jan-2012 Jean-Baptiste Queru <jbq@google.com> am 95306d85: am 64085d03: am 12045502: Merge "stagefright aacenc: Fix type definitions for 64 bit platforms"

* commit '95306d85005f165e10a25ad45cadadec6e1f6a31':
stagefright aacenc: Fix type definitions for 64 bit platforms
395584e473cc096c84d6657d07380d65dd711e14 25-Jan-2012 Jean-Baptiste Queru <jbq@google.com> am 12045502: Merge "stagefright aacenc: Fix type definitions for 64 bit platforms"

* commit '12045502c49bfee40d7d3cb806d9b70d3b5d3ed3':
stagefright aacenc: Fix type definitions for 64 bit platforms
013b73bfc4d5fb21082ccccf45fa08c18f86aa08 25-Jan-2012 Jean-Baptiste Queru <jbq@google.com> Merge "stagefright aacenc: Fix type definitions for 64 bit platforms"
2d96e2965b3118c4e3cb21a76c9f07e0c8ccfc6e 25-Jan-2012 Jean-Baptiste Queru <jbq@google.com> am e2594b85: am 4cd2b343: am 98539a4e: Merge "stagefright amrwbenc: Make the mem_malloc function 64-bit safe"

* commit 'e2594b85093441e03150c7cfc540abc626884eaf':
stagefright amrwbenc: Make the mem_malloc function 64-bit safe
4787cfeb9cfe6027c7634b09ede309f37a8b0a75 25-Jan-2012 Jean-Baptiste Queru <jbq@google.com> am a3946104: am fc2ea24b: am d80cbb8c: Merge "stagefright aacenc: Add missing newlines at the end of files"

* commit 'a39461047eae6022e2c0ef873ffa2c7241b393a9':
stagefright aacenc: Add missing newlines at the end of files
fa521a76c4fc14b01b46930cd0d04856d57fdcc1 25-Jan-2012 Jean-Baptiste Queru <jbq@google.com> am 98539a4e: Merge "stagefright amrwbenc: Make the mem_malloc function 64-bit safe"

* commit '98539a4eba7677c0b1ddc12f800c7075851ef302':
stagefright amrwbenc: Make the mem_malloc function 64-bit safe
a70de78001281b44e8a05da60d81b551850c57bf 25-Jan-2012 Jean-Baptiste Queru <jbq@google.com> am d80cbb8c: Merge "stagefright aacenc: Add missing newlines at the end of files"

* commit 'd80cbb8c7b13203704c00e2f5941588811c15665':
stagefright aacenc: Add missing newlines at the end of files
ceec4ae3ba8c3c3d5e243647ad7ee2fc39c71c9c 24-Jan-2012 Jean-Baptiste Queru <jbq@google.com> Merge "stagefright amrwbenc: Make the mem_malloc function 64-bit safe"
a078e9b727156c76ef864ac2d8b3f6a99df9e604 24-Jan-2012 Jean-Baptiste Queru <jbq@google.com> Merge "stagefright aacenc: Add missing newlines at the end of files"
f06a99bbc159a691ad618865c4faecbf185371cd 24-Jan-2012 Jean-Baptiste Queru <jbq@google.com> am 10c4641c: am 2ae5805c: am 164a9842: Merge "stagefright aacenc: Properly terminate a comment"

* commit '10c4641c2e2f747f8fef7d217d550b7f9a6de588':
stagefright aacenc: Properly terminate a comment
5e37bc8d9ba68d6bc42e70a263f7c2969cc3c787 24-Jan-2012 Jean-Baptiste Queru <jbq@google.com> am 164a9842: Merge "stagefright aacenc: Properly terminate a comment"

* commit '164a984224f5d430757628028f2522329987350f':
stagefright aacenc: Properly terminate a comment
9c7ebfd56cef49f9a26572b44790868689599e34 24-Jan-2012 Jean-Baptiste Queru <jbq@google.com> Merge "stagefright aacenc: Properly terminate a comment"
7e73e44c2d2208a7079e562f7b0b9b73ef6a29f1 20-Jan-2012 Andreas Huber <andih@google.com> Starhub RTSP apparently does not establish time on all tracks

i.e. the "SR" RTCP packet is sent for only one of the two tracks.

fake timestamps if that's the case, previously we'd only fake timestamps
if we didn't receive _any_ "SR" packets.

Change-Id: Id63d4940d453ba6c04c62e02ab9a0ad843936bc1
related-to-bug: 5669027
tsp/MyHandler.h
d746737921074e2a6c39c52b06022c5166689df5 20-Jan-2012 Jean-Baptiste Queru <jbq@google.com> am 6df477be: Merge "Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)"

* commit '6df477be186233e36fc370c4d2db6c1ed928a740':
Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)
daef36f5d4934bd055c694a8d54b86e2b50a6159 20-Jan-2012 Jean-Baptiste Queru <jbq@google.com> am a826f9e2: Merge "Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)"

* commit 'a826f9e2c4f6329d8d48c927f6e942e78ffaf92f':
Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)
3734cbca25c6d902677cfb5e59dff7a1cb17a45d 20-Jan-2012 Jean-Baptiste Queru <jbq@google.com> am 4f367f33: Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)"

* commit '4f367f3387887c538c81c34cc8becaea6fa5e430':
Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)
e744a90eb52bf9547848c08380cfb7ba7e63ffbc 20-Jan-2012 Jean-Baptiste Queru <jbq@google.com> am ba7f0d2a: Merge "Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)"

* commit 'ba7f0d2a03643ce429421b81febf18fd50473070':
Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)
ca05a87f4c69670a06bdee4b4f98bcdcd838beda 20-Jan-2012 Jean-Baptiste Queru <jbq@google.com> Merge ee4618bc

Change-Id: Ie1dc6ad38e7c30636d80f6caef11cf6673144940
9a8ded7348c5b2302dd27b285b395416bc842c49 06-Jan-2012 Steve Block <steveblock@google.com> Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)

Change-Id: I1de629b4632a4b3187ca1a28d6416daccd35f924
ACWriter.cpp
Codec.cpp
MRExtractor.cpp
VIExtractor.cpp
wesomePlayer.cpp
ameraSource.cpp
ameraSourceTimeLapse.cpp
LACExtractor.cpp
ileSource.cpp
TTPBase.cpp
P3Extractor.cpp
PEG4Extractor.cpp
PEG4Writer.cpp
ediaBuffer.cpp
uCachedSource2.cpp
MXCodec.cpp
ggExtractor.cpp
ampleIterator.cpp
ampleTable.cpp
tagefrightMediaScanner.cpp
tagefrightMetadataRetriever.cpp
urfaceMediaSource.cpp
VMExtractor.cpp
odecs/aacdec/SoftAAC.cpp
odecs/aacenc/AACEncoder.cpp
odecs/amrnb/dec/SoftAMR.cpp
odecs/amrnb/enc/AMRNBEncoder.cpp
odecs/amrwbenc/AMRWBEncoder.cpp
odecs/avc/enc/AVCEncoder.cpp
odecs/g711/dec/SoftG711.cpp
odecs/m4v_h263/dec/SoftMPEG4.cpp
odecs/m4v_h263/enc/M4vH263Encoder.cpp
odecs/mp3dec/SoftMP3.cpp
odecs/on2/dec/SoftVPX.cpp
odecs/on2/h264dec/SoftAVC.cpp
odecs/vorbis/dec/SoftVorbis.cpp
oundation/AMessage.cpp
ttplive/LiveDataSource.cpp
ttplive/LiveSession.cpp
ttplive/M3UParser.cpp
d3/ID3.cpp
atroska/MatroskaExtractor.cpp
peg2ts/ATSParser.cpp
peg2ts/MPEG2PSExtractor.cpp
mx/OMXMaster.cpp
mx/OMXNodeInstance.cpp
mx/SoftOMXPlugin.cpp
mx/tests/OMXHarness.cpp
tsp/ARTPSession.cpp
tsp/ARTSPConnection.cpp
tsp/MyHandler.h
tsp/UDPPusher.cpp
tsp/rtp_test.cpp
ests/DummyRecorder.cpp
ests/SurfaceMediaSource_test.cpp
imedtext/TimedTextPlayer.cpp
uv/YUVImage.cpp
aa70226152d2084f85a96b52359dbc8476a86a45 06-Jan-2012 Steve Block <steveblock@google.com> Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)

Change-Id: I8fbdfa7a7581f481968dbb65aa40f7042936d7cb
Codec.cpp
VIExtractor.cpp
udioSource.cpp
ameraSource.cpp
RMExtractor.cpp
SDS.cpp
LACExtractor.cpp
PEG4Extractor.cpp
PEG4Writer.cpp
MXCodec.cpp
tagefrightMetadataRetriever.cpp
imedEventQueue.cpp
odecs/aacdec/SoftAAC.cpp
odecs/aacenc/AACEncoder.cpp
odecs/amrnb/enc/AMRNBEncoder.cpp
odecs/amrwbenc/AMRWBEncoder.cpp
odecs/avc/enc/AVCEncoder.cpp
odecs/m4v_h263/dec/SoftMPEG4.cpp
odecs/m4v_h263/enc/M4vH263Encoder.cpp
odecs/vorbis/dec/SoftVorbis.cpp
olorconversion/SoftwareRenderer.cpp
oundation/AHierarchicalStateMachine.cpp
oundation/ALooperRoster.cpp
peg2ts/ESQueue.cpp
mx/OMXNodeInstance.cpp
tsp/ARTPConnection.cpp
tsp/ARTPSource.cpp
tsp/ARTSPConnection.cpp
tsp/MyHandler.h
53feeb42c721e8fc9285e35e679906a951f3277c 04-Jan-2012 Steve Block <steveblock@google.com> Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)

Change-Id: I26f76452ac49e2890b14d133c065493d8df0fb4a
wesomePlayer.cpp
ameraSource.cpp
ameraSourceTimeLapse.cpp
TTPBase.cpp
P3Extractor.cpp
PEG4Extractor.cpp
PEG4Writer.cpp
uCachedSource2.cpp
MXCodec.cpp
ggExtractor.cpp
ampleTable.cpp
BRISeeker.cpp
vc_utils.cpp
odecs/avc/enc/AVCEncoder.cpp
odecs/m4v_h263/enc/M4vH263Encoder.cpp
oundation/hexdump.cpp
ttplive/LiveSession.cpp
ttplive/M3UParser.cpp
atroska/MatroskaExtractor.cpp
peg2ts/ATSParser.cpp
peg2ts/ESQueue.cpp
peg2ts/MPEG2PSExtractor.cpp
peg2ts/MPEG2TSExtractor.cpp
mx/tests/OMXHarness.cpp
tsp/AMPEG4AudioAssembler.cpp
tsp/APacketSource.cpp
tsp/ARTPConnection.cpp
tsp/ARTPSession.cpp
tsp/ARTPWriter.cpp
tsp/ARTSPConnection.cpp
tsp/ASessionDescription.cpp
tsp/MyHandler.h
tsp/UDPPusher.cpp
52546c0ef96aa3e7e21482e0f9b6e982557c8da9 20-Dec-2011 Steve Block <steveblock@google.com> Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)

Change-Id: I44f267700356967dc51e8f85ebf457dc85cfb229
wesomePlayer.cpp
ameraSource.cpp
ameraSourceTimeLapse.cpp
PEG4Writer.cpp
3812256de32e73e38ba16e50ac0451c10223d4eb 20-Oct-2011 Steve Block <steveblock@google.com> Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF)

Change-Id: I5321ebd12e9c6248a108529e82c4e1af2a4405e3
ACWriter.cpp
Codec.cpp
MRWriter.cpp
VIExtractor.cpp
udioPlayer.cpp
udioSource.cpp
wesomePlayer.cpp
ameraSource.cpp
ameraSourceTimeLapse.cpp
SDS.cpp
LACExtractor.cpp
P3Extractor.cpp
PEG2TSWriter.cpp
PEG4Extractor.cpp
PEG4Writer.cpp
ediaExtractor.cpp
ediaSourceSplitter.cpp
uCachedSource2.cpp
MXCodec.cpp
ggExtractor.cpp
ampleIterator.cpp
ampleTable.cpp
tagefrightMediaScanner.cpp
tagefrightMetadataRetriever.cpp
urfaceMediaSource.cpp
imedEventQueue.cpp
BRISeeker.cpp
ideoSourceDownSampler.cpp
AVExtractor.cpp
vc_utils.cpp
odecs/aacdec/SoftAAC.cpp
odecs/aacenc/AACEncoder.cpp
odecs/avc/enc/AVCEncoder.cpp
odecs/m4v_h263/dec/SoftMPEG4.cpp
odecs/m4v_h263/enc/M4vH263Encoder.cpp
odecs/mp3dec/SoftMP3.cpp
odecs/on2/dec/SoftVPX.cpp
odecs/vorbis/dec/SoftVorbis.cpp
ttplive/LiveSession.cpp
ttplive/M3UParser.cpp
d3/ID3.cpp
atroska/MatroskaExtractor.cpp
peg2ts/ATSParser.cpp
peg2ts/AnotherPacketSource.cpp
peg2ts/ESQueue.cpp
peg2ts/MPEG2PSExtractor.cpp
mx/OMX.cpp
mx/OMXNodeInstance.cpp
mx/SimpleSoftOMXComponent.cpp
mx/SoftOMXPlugin.cpp
tsp/AAMRAssembler.cpp
tsp/AAVCAssembler.cpp
tsp/AMPEG4ElementaryAssembler.cpp
tsp/ARTPConnection.cpp
tsp/ARTPSource.cpp
tsp/ARTPWriter.cpp
tsp/ARTSPConnection.cpp
tsp/ARawAudioAssembler.cpp
tsp/ASessionDescription.cpp
tsp/MyHandler.h
ests/DummyRecorder.cpp
ests/SurfaceMediaSource_test.cpp
bd9c9a80fd487b3e83861c32b388eac146f8a299 19-Jan-2012 Andreas Huber <andih@google.com> Make sure the ThrottledSource reports the proper mime type

of the underlying source.

Change-Id: I7cfd5c9f10d4b07781ed82fbdc9bf3db2e86cf84
nclude/ThrottledSource.h
77418fc9b4131cabfe9a85963604bdd535a04df8 18-Jan-2012 Andreas Huber <andih@google.com> Merge "AVIExtractor: adding a H264 fourCC which is also specified in the reference. (H264 code can be found avi file which is encoded with FFmpeg.)"
40a4e1440869b2e3981f261b0d301cd16c0cf0aa 18-Jan-2012 Bryan Mawhinney <bryanmawhinney@google.com> Make sure seek triggers a reconnect if needed.

Previously, if we had disconnected at the high watermark,
the read immediately following a seek would fail, and would
not be retried, resulting in an error.

Change-Id: I45a53563fe17d6b54893815abc7750a7dfb0a124
uCachedSource2.cpp
9fc4dfb69df0b5a13b7a1904272eb1dcf8113d0c 22-Dec-2010 Martin Storsjo <martin@martin.st> stagefright aacenc: Add const declarations to some pointers

This avoids some compilation warnings.

Change-Id: Ia89ab94020a9f1ee4c1df48823fb89325cca7d36
odecs/aacenc/inc/psy_configuration.h
odecs/aacenc/src/dyn_bits.c
odecs/aacenc/src/interface.c
odecs/aacenc/src/psy_configuration.c
odecs/aacenc/src/psy_main.c
odecs/aacenc/src/quantize.c
132e88ee86e4f11d1b649c336cd2d6eb5980c3fc 15-Jan-2012 Dongwon Kang <dwkang@google.com> MatroskaExtractor: to support MPEG4 and MP3 codec.

Change-Id: Ic7ffb3ed394b233336fbf2a7b2627ee27033a59e
atroska/MatroskaExtractor.cpp
ec2e74b538b899aac54f55ed1aa60286624f8895 14-Jan-2012 Dongwon Kang <dwkang@google.com> AVIExtractor: adding a H264 fourCC which is also specified in the reference.
(H264 code can be found avi file which is encoded with FFmpeg.)

Change-Id: Id9eccd4580443f42b2afa491c94ac2c2faa37f87
VIExtractor.cpp
f4e76c538f81068bc2e125f3f9ef8b8dd40f2d2a 13-Jan-2012 Jean-Baptiste Queru <jbq@google.com> am c0ef548c: am d75961ee: am b4cee0f8: Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace"

* commit 'c0ef548c748f0c3bc917eff7b50941f9cbe1df86':
stagefright aacenc/amrwbenc: Remove trailing whitespace
b45e50a5bce5fba740318d056c8dd1fd9caed354 13-Jan-2012 Jean-Baptiste Queru <jbq@google.com> am d75961ee: am b4cee0f8: Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace"

* commit 'd75961eecbfeb3f7e027a2a1f6011a26dd7d2d2d':
stagefright aacenc/amrwbenc: Remove trailing whitespace
60866592ed6953f2b0e12cefcd58f1ced26546d0 12-Jan-2012 Martin Storsjo <martin@martin.st> stagefright aacenc: Properly terminate a comment

This avoids a warning about /* within a comment.

Change-Id: I9079909734d35db5ab0fd54b46173d7a1848d0c9
odecs/aacenc/src/adj_thr.c
721f2bb7b28891c0811a5bea31fa62644131befc 12-Jan-2012 Martin Storsjo <martin@martin.st> stagefright aacenc: Fix an inline asm constraint

Output-only parameters should use =r or =&r constrains, never +r.

This avoids a warning about the variable 'result' being used
uninitialized.

This avoids loading the uninitialized value into the register,
before it is overwritten by the multiplication.

Change-Id: I0ef6179e133c35d290feb8e12bea180ecae11a05
odecs/aacenc/basic_op/oper_32b.h
b8576d5ae50294bb1917b84f366054ebff02a3a6 05-Apr-2011 Mans Rullgard <mans@mansr.com> stagefright aacenc: Use QDADD/QDSUB instructions

Change-Id: I46c81dba0486d515f1f2b89a13fae27f6ab1e122
odecs/aacenc/basic_op/basic_op.h
fa9597bc0007f6a1d6704f047e7d94bb195c8a68 05-Apr-2011 Mans Rullgard <mans@mansr.com> stagefright aacenc: Remove useless inline asm for simple right shift

Change-Id: If1f40e9c16952182e974af1c86a14995259c2ade
odecs/aacenc/basic_op/basic_op.h
813eebeb773b1e4c42c2063a7fe37a94514e596a 05-Apr-2011 Mans Rullgard <mans@mansr.com> stagefright aacenc: Use ARMv6 SSAT instruction

Change-Id: I652eaaa54e7766d9dca80fd8cc156ca481359471
odecs/aacenc/Android.mk
odecs/aacenc/basic_op/basic_op.h
odecs/aacenc/basic_op/typedefs.h
9da751147af3222258093d9f41cabf0ea1391c04 05-Apr-2011 Mans Rullgard <mans@mansr.com> stagefright aacenc: Fix inline asm

- don't write input-only registers
- use temp variables instead of hardcoded regs
- don't build constants manually, specify as asm inputs
- remove unnecessary volatile qualifiers

Change-Id: I3b9bb2d30768bcf409dc478bde4489135eeb50d7
odecs/aacenc/basic_op/basic_op.h
d2fdc7129d96391d22065866c612d532dfe411b3 05-Apr-2011 Mans Rullgard <mans@mansr.com> stagefright aacenc: Fix inline asm constraints

Output-only parameters should use =r or =&r constrains, never +r.

This fixes a lot of warnings about the variable 'result' being
used uninitialized.

Change-Id: Ie689fce8c6ecd874d4fc66e87687c67551d9ab6a
odecs/aacenc/basic_op/basic_op.h
132e42c04a58e623efa6cd6ca43641cd80db0f05 05-Apr-2011 Martin Storsjo <martin@martin.st> stagefright aacenc: Zero-initialize a struct

This avoids using uninitialized data in some cases, according
to valgrind.

Change-Id: I2eb5242b93c4d83a1cf6a15f022ec9579e0742a4
odecs/aacenc/src/adj_thr.c
2db3b238966f5f326010321b698fa938d65b8e8a 05-Apr-2011 Martin Storsjo <martin@martin.st> stagefright aacenc: Fix type definitions for 64 bit platforms

Also don't require LINUX to be defined, enable the MSVC typedefs
only within _MSC_VER.

This fixes a lot of warnings about dereferencing pointer 'winPtr'
breaking strict aliasing rules.

Change-Id: I4afbe0ed81295ebe6e5ee2c7f0fb0cc2dc83c89b
odecs/aacenc/basic_op/typedefs.h
2f0fb8c1ec139d385feb6990111ed6dc93422eac 22-Dec-2010 Martin Storsjo <martin@martin.st> stagefright aacenc: Don't address a Word32 with a Word16 pointer

Currently, a pointer to a Word32 is used as a pointer to Word16, which
doesn't work as intended on big endian architectures.

This change needs to be analyzed and tested properly so that it doesn't
cause issues with overflows in these variables. Another solution would be
to change all the scf arrays to 32 bit instead.

Change-Id: I53d9eb83bdaf8d3b1530eb5064dd10b08bce737a
odecs/aacenc/src/sf_estim.c
417f62c84261ea17e17a011b1e9706eb997a6ba1 22-Dec-2010 Martin Storsjo <martin@martin.st> stagefright amrwbenc: Make the mem_malloc function 64-bit safe

Change-Id: Iab0dbfdc6be09c62d353bee46596635686b784a6
odecs/amrwbenc/src/mem_align.c
5e9afe434d8207fb0af6e191cca671ab74cfe878 20-Apr-2011 Martin Storsjo <martin@martin.st> stagefright aacenc: Make the bits to write in WriteBits unsigned

They shouldn't, as far as I know, ever be a signed value.

Change-Id: I64429c7c0b2b52bec768a04d3c3eb0eb252955fa
odecs/aacenc/inc/bitbuffer.h
odecs/aacenc/src/bitbuffer.c
891abc0ee089f2ba5b92dcc014e5efc2ef07f01e 31-Aug-2011 Martin Storsjo <martin@martin.st> stagefright aacenc: Add missing newlines at the end of files

This avoids compiler warnings about missing newlines.

Change-Id: Ieb2bb7152d794dca47c629588879032d3ba65677
odecs/aacenc/basic_op/oper_32b.c
odecs/aacenc/inc/config.h
odecs/aacenc/inc/sf_estim.h
odecs/aacenc/inc/transform.h
odecs/aacenc/src/aac_rom.c
odecs/aacenc/src/aacenc.c
odecs/aacenc/src/asm/ARMV5E/PrePostMDCT_v5.s
odecs/aacenc/src/asm/ARMV5E/R4R8First_v5.s
odecs/aacenc/src/asm/ARMV5E/Radix4FFT_v5.s
odecs/aacenc/src/asm/ARMV7/PrePostMDCT_v7.s
odecs/aacenc/src/asm/ARMV7/R4R8First_v7.s
odecs/aacenc/src/asm/ARMV7/Radix4FFT_v7.s
odecs/aacenc/src/band_nrg.c
32bc0329ac94b181f1457c182c5bb2903f29832d 05-Apr-2011 Martin Storsjo <martin@martin.st> stagefright aacenc: Simplify the definition of __inline

This reduces the amount of ifdefs needed, into something that
works on both gcc and MSVC. This removes one occurrance of the
LINUX ifdef, simplifying compiling on various platforms.

Change-Id: I1e2af6c2517410dc280197ba922df877cf7afbd5
odecs/aacenc/basic_op/typedefs.h
9d2f386dd2885eaffa11fd494ae258bb09fe6397 10-Jan-2012 James Dong <jdong@google.com> Separate sniffing from session initialization

This avoid lengthy/duplicate sniffing for drm plugins when a decrypt session is opened

o The change is backward compatibile in that no update is required
for existing drm plug-ins if they do not plan to provide separate
sniffer/extractor

related-to-bug: 5725548

Change-Id: I7fc4caf82d77472da4e2bc7b5d31060fb54fd84c
wesomePlayer.cpp
RMExtractor.cpp
ataSource.cpp
ileSource.cpp
uCachedSource2.cpp
VMExtractor.cpp
hromium_http/ChromiumHTTPDataSource.cpp
nclude/AwesomePlayer.h
nclude/ChromiumHTTPDataSource.h
nclude/NuCachedSource2.h
nclude/WVMExtractor.h
b676a05348e4c516fa8b57e33b10548e6142c3f8 05-Apr-2011 Mans Rullgard <mans@mansr.com> stagefright aacenc/amrwbenc: Remove trailing whitespace

This was applied in AOSP master earlier, in commit
b21611e5b0f1797e39e781d91ade023bac87637f, but when merged
into the Google internal tree in
88c2d4d26d79384f32a25bd775cf873cb678b12a, none of these
changes have been brought in. (The diff of this merge commit
and its first parent, d94b71d, is empty.)

Therefore, reapply the rest of these changes on the files
that still are present in the current version.

Change-Id: I645a9b9134769958a11808a06163123d28d83e46
odecs/aacenc/Android.mk
odecs/aacenc/SampleCode/AAC_E_SAMPLES.c
odecs/aacenc/basic_op/basic_op.h
odecs/aacenc/basic_op/basicop2.c
odecs/aacenc/basic_op/oper_32b.c
odecs/aacenc/basic_op/oper_32b.h
odecs/aacenc/basic_op/typedef.h
odecs/aacenc/basic_op/typedefs.h
odecs/aacenc/inc/aac_rom.h
odecs/aacenc/inc/aacenc_core.h
odecs/aacenc/inc/adj_thr.h
odecs/aacenc/inc/adj_thr_data.h
odecs/aacenc/inc/bitenc.h
odecs/aacenc/inc/interface.h
odecs/aacenc/inc/line_pe.h
odecs/aacenc/inc/psy_const.h
odecs/aacenc/inc/psy_main.h
odecs/aacenc/inc/qc_main.h
odecs/aacenc/inc/quantize.h
odecs/aacenc/inc/sf_estim.h
odecs/aacenc/inc/stat_bits.h
odecs/aacenc/inc/tns_param.h
odecs/aacenc/inc/transform.h
odecs/aacenc/src/aac_rom.c
odecs/aacenc/src/aacenc.c
odecs/aacenc/src/aacenc_core.c
odecs/aacenc/src/adj_thr.c
odecs/aacenc/src/asm/ARMV5E/AutoCorrelation_v5.s
odecs/aacenc/src/asm/ARMV5E/CalcWindowEnergy_v5.s
odecs/aacenc/src/asm/ARMV5E/PrePostMDCT_v5.s
odecs/aacenc/src/asm/ARMV5E/R4R8First_v5.s
odecs/aacenc/src/asm/ARMV5E/Radix4FFT_v5.s
odecs/aacenc/src/asm/ARMV5E/band_nrg_v5.s
odecs/aacenc/src/asm/ARMV7/PrePostMDCT_v7.s
odecs/aacenc/src/asm/ARMV7/R4R8First_v7.s
odecs/aacenc/src/asm/ARMV7/Radix4FFT_v7.s
odecs/aacenc/src/band_nrg.c
odecs/aacenc/src/bit_cnt.c
odecs/aacenc/src/bitbuffer.c
odecs/aacenc/src/bitenc.c
odecs/aacenc/src/block_switch.c
odecs/aacenc/src/channel_map.c
odecs/aacenc/src/dyn_bits.c
odecs/aacenc/src/grp_data.c
odecs/aacenc/src/interface.c
odecs/aacenc/src/line_pe.c
odecs/aacenc/src/memalign.c
odecs/aacenc/src/ms_stereo.c
odecs/aacenc/src/pre_echo_control.c
odecs/aacenc/src/psy_configuration.c
odecs/aacenc/src/psy_main.c
odecs/aacenc/src/qc_main.c
odecs/aacenc/src/quantize.c
odecs/aacenc/src/sf_estim.c
odecs/aacenc/src/stat_bits.c
odecs/aacenc/src/tns.c
odecs/aacenc/src/transform.c
odecs/amrwbenc/Android.mk
odecs/amrwbenc/inc/basic_op.h
odecs/amrwbenc/inc/homing.tab
odecs/amrwbenc/inc/isp_isf.tab
odecs/amrwbenc/inc/log2.h
odecs/amrwbenc/inc/mime_io.tab
odecs/amrwbenc/inc/stream.h
odecs/amrwbenc/inc/typedef.h
odecs/amrwbenc/inc/typedefs.h
odecs/amrwbenc/src/asm/ARMV5E/Deemph_32_opt.s
odecs/amrwbenc/src/asm/ARMV5E/Dot_p_opt.s
odecs/amrwbenc/src/asm/ARMV5E/Filt_6k_7k_opt.s
odecs/amrwbenc/src/asm/ARMV5E/Norm_Corr_opt.s
odecs/amrwbenc/src/asm/ARMV5E/Syn_filt_32_opt.s
odecs/amrwbenc/src/asm/ARMV5E/convolve_opt.s
odecs/amrwbenc/src/asm/ARMV5E/cor_h_vec_opt.s
odecs/amrwbenc/src/asm/ARMV5E/pred_lt4_1_opt.s
odecs/amrwbenc/src/asm/ARMV5E/residu_asm_opt.s
odecs/amrwbenc/src/asm/ARMV5E/scale_sig_opt.s
odecs/amrwbenc/src/asm/ARMV5E/syn_filt_opt.s
odecs/amrwbenc/src/asm/ARMV7/Deemph_32_neon.s
odecs/amrwbenc/src/asm/ARMV7/Dot_p_neon.s
odecs/amrwbenc/src/asm/ARMV7/Filt_6k_7k_neon.s
odecs/amrwbenc/src/asm/ARMV7/Norm_Corr_neon.s
odecs/amrwbenc/src/asm/ARMV7/Syn_filt_32_neon.s
odecs/amrwbenc/src/asm/ARMV7/convolve_neon.s
odecs/amrwbenc/src/asm/ARMV7/cor_h_vec_neon.s
odecs/amrwbenc/src/asm/ARMV7/pred_lt4_1_neon.s
odecs/amrwbenc/src/asm/ARMV7/residu_asm_neon.s
odecs/amrwbenc/src/asm/ARMV7/scale_sig_neon.s
odecs/amrwbenc/src/asm/ARMV7/syn_filt_neon.s
odecs/amrwbenc/src/autocorr.c
odecs/amrwbenc/src/az_isp.c
odecs/amrwbenc/src/bits.c
odecs/amrwbenc/src/c2t64fx.c
odecs/amrwbenc/src/c4t64fx.c
odecs/amrwbenc/src/convolve.c
odecs/amrwbenc/src/cor_h_x.c
odecs/amrwbenc/src/decim54.c
odecs/amrwbenc/src/deemph.c
odecs/amrwbenc/src/dtx.c
odecs/amrwbenc/src/g_pitch.c
odecs/amrwbenc/src/gpclip.c
odecs/amrwbenc/src/hp400.c
odecs/amrwbenc/src/hp50.c
odecs/amrwbenc/src/hp6k.c
odecs/amrwbenc/src/hp_wsp.c
odecs/amrwbenc/src/int_lpc.c
odecs/amrwbenc/src/isp_az.c
odecs/amrwbenc/src/isp_isf.c
odecs/amrwbenc/src/levinson.c
odecs/amrwbenc/src/log2.c
odecs/amrwbenc/src/lp_dec2.c
odecs/amrwbenc/src/math_op.c
odecs/amrwbenc/src/mem_align.c
odecs/amrwbenc/src/p_med_ol.c
odecs/amrwbenc/src/pitch_f4.c
odecs/amrwbenc/src/pred_lt4.c
odecs/amrwbenc/src/preemph.c
odecs/amrwbenc/src/q_gain2.c
odecs/amrwbenc/src/q_pulse.c
odecs/amrwbenc/src/qisf_ns.c
odecs/amrwbenc/src/qpisf_2s.c
odecs/amrwbenc/src/residu.c
odecs/amrwbenc/src/scale.c
odecs/amrwbenc/src/stream.c
odecs/amrwbenc/src/syn_filt.c
odecs/amrwbenc/src/updt_tar.c
odecs/amrwbenc/src/voAMRWBEnc.c
odecs/amrwbenc/src/voicefac.c
odecs/amrwbenc/src/wb_vad.c
odecs/amrwbenc/src/weight_a.c
odecs/common/Config.mk
odecs/common/include/voAMRWB.h
odecs/common/include/voAudio.h
odecs/common/include/voIndex.h
e51dd6dd7b7034c171246ebf5e08b187ef17150c 11-Jan-2012 Eric Laurent <elaurent@google.com> am 05985a2e: am c15cf3d2: Merge "stagefright: limit audio gap for looped playback" into ics-mr1

* commit '05985a2e2ae5c21fbf69d2884c59ea475fce7f6d':
stagefright: limit audio gap for looped playback
86d24aa35adf82512d341d9aaebd62b36b0a0847 09-Jan-2012 Eric Laurent <elaurent@google.com> stagefright: limit audio gap for looped playback

The audio gap when looping audio is mostly due to
a delay requested by the audio player when executing
the end of stream message. This is to allow the audio
to be drained out of the pipe before actually stopping the
AudioTrack.
This delay is not needed when looping as the AudioTrack
is not stopped.

The fix consists in ignoring the requested delay when the
looping flag is set in awesome player.

Issue 5800981.

Change-Id: Ib32d2930c53ecebc21ca8440e6e054c7e20db4a5
wesomePlayer.cpp
29357bc2c0dd7c43ad3bd0c8e3efa4e6fd9bfd47 06-Jan-2012 Steve Block <steveblock@google.com> Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE

See https://android-git.corp.google.com/g/#/c/157220

Bug: 5449033
Change-Id: Ic9c19d30693bd56755f55906127cd6bd7126096c
ACWriter.cpp
Codec.cpp
MRExtractor.cpp
VIExtractor.cpp
wesomePlayer.cpp
ameraSource.cpp
ameraSourceTimeLapse.cpp
LACExtractor.cpp
ileSource.cpp
TTPBase.cpp
P3Extractor.cpp
PEG4Extractor.cpp
PEG4Writer.cpp
ediaBuffer.cpp
uCachedSource2.cpp
MXCodec.cpp
ggExtractor.cpp
ampleIterator.cpp
ampleTable.cpp
tagefrightMediaScanner.cpp
tagefrightMetadataRetriever.cpp
urfaceMediaSource.cpp
VMExtractor.cpp
odecs/aacdec/SoftAAC.cpp
odecs/aacenc/AACEncoder.cpp
odecs/amrnb/dec/SoftAMR.cpp
odecs/amrnb/enc/AMRNBEncoder.cpp
odecs/amrwbenc/AMRWBEncoder.cpp
odecs/avc/enc/AVCEncoder.cpp
odecs/g711/dec/SoftG711.cpp
odecs/m4v_h263/dec/SoftMPEG4.cpp
odecs/m4v_h263/enc/M4vH263Encoder.cpp
odecs/mp3dec/SoftMP3.cpp
odecs/on2/dec/SoftVPX.cpp
odecs/on2/h264dec/SoftAVC.cpp
odecs/vorbis/dec/SoftVorbis.cpp
oundation/AMessage.cpp
ttplive/LiveDataSource.cpp
ttplive/LiveSession.cpp
ttplive/M3UParser.cpp
d3/ID3.cpp
atroska/MatroskaExtractor.cpp
peg2ts/ATSParser.cpp
peg2ts/MPEG2PSExtractor.cpp
mx/OMXMaster.cpp
mx/OMXNodeInstance.cpp
mx/SoftOMXPlugin.cpp
mx/tests/OMXHarness.cpp
tsp/ARTPSession.cpp
tsp/ARTSPConnection.cpp
tsp/MyHandler.h
tsp/UDPPusher.cpp
tsp/rtp_test.cpp
ests/DummyRecorder.cpp
ests/SurfaceMediaSource_test.cpp
imedtext/TimedTextPlayer.cpp
uv/YUVImage.cpp
5ff1dd576bb93c45b44088a51544a18fc43ebf58 06-Jan-2012 Steve Block <steveblock@google.com> Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGE

See https://android-git.corp.google.com/g/157065

Bug: 5449033
Change-Id: I00a4b904f9449e6f93b7fd35eac28640d7929e69
Codec.cpp
VIExtractor.cpp
udioSource.cpp
ameraSource.cpp
RMExtractor.cpp
SDS.cpp
LACExtractor.cpp
PEG4Extractor.cpp
PEG4Writer.cpp
MXCodec.cpp
tagefrightMetadataRetriever.cpp
imedEventQueue.cpp
odecs/aacdec/SoftAAC.cpp
odecs/aacenc/AACEncoder.cpp
odecs/amrnb/enc/AMRNBEncoder.cpp
odecs/amrwbenc/AMRWBEncoder.cpp
odecs/avc/enc/AVCEncoder.cpp
odecs/m4v_h263/dec/SoftMPEG4.cpp
odecs/m4v_h263/enc/M4vH263Encoder.cpp
odecs/vorbis/dec/SoftVorbis.cpp
olorconversion/SoftwareRenderer.cpp
oundation/AHierarchicalStateMachine.cpp
oundation/ALooperRoster.cpp
peg2ts/ESQueue.cpp
mx/OMXNodeInstance.cpp
tsp/ARTPConnection.cpp
tsp/ARTPSource.cpp
tsp/ARTSPConnection.cpp
tsp/MyHandler.h
df64d15042bbd5e0e4933ac49bf3c177dd94752c 04-Jan-2012 Steve Block <steveblock@google.com> Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE

See https://android-git.corp.google.com/g/156801

Bug: 5449033
Change-Id: Ib08fe86d23db91ee153e9f91a99a35c42b9208ea
wesomePlayer.cpp
ameraSource.cpp
ameraSourceTimeLapse.cpp
TTPBase.cpp
P3Extractor.cpp
PEG4Extractor.cpp
PEG4Writer.cpp
uCachedSource2.cpp
MXCodec.cpp
ggExtractor.cpp
ampleTable.cpp
BRISeeker.cpp
vc_utils.cpp
odecs/avc/enc/AVCEncoder.cpp
odecs/m4v_h263/enc/M4vH263Encoder.cpp
oundation/hexdump.cpp
ttplive/LiveSession.cpp
ttplive/M3UParser.cpp
atroska/MatroskaExtractor.cpp
peg2ts/ATSParser.cpp
peg2ts/ESQueue.cpp
peg2ts/MPEG2PSExtractor.cpp
peg2ts/MPEG2TSExtractor.cpp
mx/tests/OMXHarness.cpp
tsp/AMPEG4AudioAssembler.cpp
tsp/APacketSource.cpp
tsp/ARTPConnection.cpp
tsp/ARTPSession.cpp
tsp/ARTPWriter.cpp
tsp/ARTSPConnection.cpp
tsp/ASessionDescription.cpp
tsp/MyHandler.h
tsp/UDPPusher.cpp
b8a805261bf0282e992d3608035e47d05a898710 20-Dec-2011 Steve Block <steveblock@google.com> Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGE

See https://android-git.corp.google.com/g/156016

Bug: 5449033
Change-Id: I4c4e33bb9df3e39e11cd985e193e6fbab4635298
wesomePlayer.cpp
ameraSource.cpp
ameraSourceTimeLapse.cpp
PEG4Writer.cpp
e78950e714e57767b54a836e22924212cfbf5f5f 17-Dec-2011 Hong Teng <hongteng@google.com> Merge "Fix for 5754998 testPerformanceTransitionWithEffectOverlapping test failed."
8d0dd8b46163ec7b42e2051c441ae2bf96dd9aec 16-Dec-2011 Hong Teng <hongteng@google.com> Fix for 5754998 testPerformanceTransitionWithEffectOverlapping test failed.

-Fix the index is out of sync frame array boundary when seeking to end of a 3gp file.
Validation only were done for video editor cts test and Movie Studio application.
Futher validation may include media player, youtube application,.etc.

Change-Id: Ib01314f1768cfab702dbe25c307553ace0b85e77
ampleTable.cpp
255adceb85bc23de61fb138ddb474852514b3b33 16-Dec-2011 Dave Burke <daveburke@google.com> am 0cc1e42d: am ac279de9: Merge "SurfaceMediaSource: use the HW_TEXTURE usage bit" into ics-mr1

* commit '0cc1e42d74e09c259a6da0abc9009d1abf7537b1':
SurfaceMediaSource: use the HW_TEXTURE usage bit
69aac3e6cd68e8c305a41b2677123db7662efd4b 16-Dec-2011 Jamie Gennis <jgennis@google.com> SurfaceMediaSource: use the HW_TEXTURE usage bit

This change makes SurfaceMediaSource request Gralloc buffers with the
HW_TEXTURE usage bit rather than the VIDEO_ENCODER bit. It is a
temporary workaround for what is likely a Gralloc bug.

Bug: 5771063
Change-Id: I9cce615e80fc14a1644fae27ba06970c262dd179
urfaceMediaSource.cpp
2a3d6e1b6cfd2d564a48371598fdc664ea40fa8c 14-Dec-2011 James Dong <jdong@google.com> am 3f6a7d1e: am d70c64db: Revert the following patches because they may lead to power regression because SHA/MD5 module is stuck 1. Revert "Fix drm flag setting missed in false drm recognition fix." This reverts commit 9f704f6c46a171357e49c411c83458b9d4565f3b.

* commit '3f6a7d1ee961a4544563932b7499535dc1cac1ec':
Revert the following patches because they may lead to power regression because SHA/MD5 module is stuck 1. Revert "Fix drm flag setting missed in false drm recognition fix." This reverts commit 9f704f6c46a171357e49c411c83458b9d4565f3b.
785ee06d106cd7958e0c151ebc6b7174d9ba861e 14-Dec-2011 James Dong <jdong@google.com> Revert the following patches because they may lead to power regression because SHA/MD5 module is stuck
1. Revert "Fix drm flag setting missed in false drm recognition fix."
This reverts commit 9f704f6c46a171357e49c411c83458b9d4565f3b.

2. Revert "Fixed the false drm recognition."
This reverts commit aadbd80b307c817698ce5110ff8e002804d1b230.

3. Revert "Fix drm enumeration order, resolves failure to play forward lock ringtones"
This reverts commit a5cbf023e349f2394ba6fc58d73b4375cfec4369.

4. Revert "Fix ANRs due to Widevine DRM plugin sniff taking too long."
This reverts commit d0d19db1ca1c289b069db33f4665bcb9386064e9.

As a result of the reverting, many ANRs from WV sniffing are back.

related-to-bug: 5739618
wesomePlayer.cpp
RMExtractor.cpp
ataSource.cpp
ediaExtractor.cpp
VMExtractor.cpp
nclude/WVMExtractor.h
19e9d0fe6dc3ff4fb1807fee2ad058bf3277e883 10-Dec-2011 Andreas Huber <andih@google.com> DO NOT MERGE: Support for parsing of "folded" RTSP header values

and some tweaks to the AMR assembler contributed by Samsung (untested).

Change-Id: I6c3df31fa3a35433bfddfdda82747bb4c6ee86a1
related-to-bug: 5669027
tsp/AAMRAssembler.cpp
tsp/ARTSPConnection.cpp
fec2284d520fa2856358692095a715678225abcb 13-Dec-2011 Jeff Tinker <jtinker@google.com> am dc44e06e: am ef664f62: Merge "Fix drm flag setting missed in false drm recognition fix." into ics-mr1

* commit 'dc44e06ef305be8de060af69a468e003e231ba05':
Fix drm flag setting missed in false drm recognition fix.
f2d86c8afe5e80bc178c1758d41b7bf154960318 13-Dec-2011 James Dong <jdong@google.com> am 406dd5d1: am aadbd80b: Fixed the false drm recognition.

* commit '406dd5d1e48752177753666867403542e1f400ca':
Fixed the false drm recognition.
6af1e76b61d04ed524b570f92091680a851207df 12-Dec-2011 Andreas Huber <andih@google.com> Merge "Support for parsing of "folded" RTSP header values and some tweaks to the AMR assembler"
aa5ba9a27f4c483ee116b7b296a681f4f8e23e62 10-Dec-2011 Andreas Huber <andih@google.com> am aa82c39b: am 0ba9380a: Merge "Fix Bitreader "putBits" implementation, make sure we emulate timestamps" into ics-mr1

* commit 'aa82c39bdb4ad9c1fdcb09f3bea11be5197d3ce6':
Fix Bitreader "putBits" implementation, make sure we emulate timestamps
4aae77cbe1bf4369910314a55c2bc2349af10d3c 10-Dec-2011 Andreas Huber <andih@google.com> Support for parsing of "folded" RTSP header values and some tweaks to the AMR assembler

contributed by Samsung (untested).

Change-Id: I182561fe0a1a564126bdbb317e96aa52bf525726
tsp/AAMRAssembler.cpp
tsp/ARTSPConnection.cpp
901e78d96eec495bda0dbe2e2b73009951301817 09-Dec-2011 Jeff Tinker <jtinker@google.com> am a5038d16: am a693a4b5: Merge "Fix ANRs due to Widevine DRM plugin sniff taking too long." into ics-mr1

* commit 'a5038d169f47b2e2278c0056495dfd4808803f8a':
Fix ANRs due to Widevine DRM plugin sniff taking too long.
7e976e926dd8085a64a7add97ce09bfeca26e088 09-Dec-2011 Jeff Tinker <jtinker@google.com> Fix drm flag setting missed in false drm recognition fix.

Change-Id: Ie38668c8a32969ef7c7df4ca3350e2364291953c
related-to-bug: 5732033
wesomePlayer.cpp
d1fa3ca0eee42ffd450d579b357f39163a716ee3 09-Dec-2011 James Dong <jdong@google.com> Fixed the false drm recognition.

Change-Id: If0198e52ff7bbd7422f219f55a37aae97f7d74f1

related-to-bug: 5732033
wesomePlayer.cpp
ediaExtractor.cpp
1906e5c7492b9cbc88601365536a69e9a490c963 08-Dec-2011 Andreas Huber <andih@google.com> Fix Bitreader "putBits" implementation, make sure we emulate timestamps

if we don't receive npt time mapping from the rtsp server (i.e. live stream)

Change-Id: I5147d665bd90c9a303ad6ffdafbf770f930f917c
related-to-bug: 5660357
oundation/ABitReader.cpp
tsp/MyHandler.h
894f3ca9a9f94225bb64f36847508a91d0b17a6e 08-Dec-2011 Jeff Tinker <jtinker@google.com> Merge "Fix ANRs due to Widevine DRM plugin sniff taking too long." into ics-mr1
8e49b604c806eabe3eea2bd24813cdfc4b87c64c 08-Dec-2011 Jeff Tinker <jtinker@google.com> Fix ANRs due to Widevine DRM plugin sniff taking too long.

Add a Widevine-specific format sniffer to avoid having to
refetch data from the remote server.

Change-Id: I5fdb21fe7a0d6e74f2a6f06e6fbf8070b068ac60
related-to-bug: 5725548
wesomePlayer.cpp
RMExtractor.cpp
ataSource.cpp
VMExtractor.cpp
nclude/WVMExtractor.h
eebeceec684a36222b4559e3157b0db04c0a67ed 07-Dec-2011 Dave Burke <daveburke@google.com> am 6727a43f: am 54a53841: Merge "Fetch at least 192KB to avoid our mp3 sniffer from blocking on data." into ics-mr1

* commit '6727a43f6d8ff193b86ca90b2daa761c47157638':
Fetch at least 192KB to avoid our mp3 sniffer from blocking on data.
bab412099ab1bd3e9e942453cbb42c87ea9a59ec 07-Dec-2011 Andreas Huber <andih@google.com> Fetch at least 192KB to avoid our mp3 sniffer from blocking on data.

Change-Id: Icb10c129249bb9b69e91f6633a385840c94efa59
related-to-bug: 5666532
wesomePlayer.cpp
e74de52d4e22fc61d41f703672fa8f1215446ab5 06-Dec-2011 James Dong <jdong@google.com> Merge "DO NOT MERGE - Consider I-Frame at zeroeth position when searching for sync frames" into ics-mr1
f7b5cdd410cb8fdd46bac5b5098e0f01442bba12 06-Dec-2011 Andreas Huber <andih@google.com> DO NOT MERGE: Remove the AVI extractor.

Change-Id: Ifce6c0d3d87aad2f5cc7f40ad6304936cbfa795e
ndroid.mk
ataSource.cpp
ediaExtractor.cpp
6c83e3be2921009ff7dcfced2a3eda7811b8b041 16-Nov-2011 Narayan Kamath <narayan@google.com> Allow data uris to be data sources

bug:5571010
Change-Id: I0b6ae6c729ac34d46e9990fcceb08294eb4f7c58
ataSource.cpp
hromium_http/Android.mk
hromium_http/DataUriSource.cpp
nclude/DataUriSource.h
223e70d6bde101349cba04b20ef243730cf84c07 05-Dec-2011 James Dong <jdong@google.com> DO NOT MERGE - Consider I-Frame at zeroeth position when searching for sync frames

The current logic does not check the I-frame at zeroeth position and therefore
for the files with only 1 I-Frame at zeroeth postion does not play.

Originally authored by Braganza Sam Robertsh <sam.braganza@samsung.com>

Do not merge to master branch since we made some improvement to SampleTable.cpp in the master branch.

Change-Id: I068184dec71986f14a586f769c2af1f52b4bcf94
related-to-bug: 5711942
ampleTable.cpp
456caf3f5f0af673dc120c17c23635f40d8f5ac2 05-Dec-2011 Andreas Huber <andih@google.com> resolved conflicts for merge of 07bacabe to master

Change-Id: Idb56996f7c1b78d96e3d3d3f08419c4d122db0b1
a0f2bf56e30f580535229fa6a58e7d48b762727c 05-Dec-2011 Andreas Huber <andih@google.com> Properly identify how much metadata we need to cache in order to instantiate

the extractor without blocking (and therefore be able to abort).

Change-Id: Id2acdde897e02baaeabadae70b7c95b66c9041b3
related-to-bug: 5666532
wesomePlayer.cpp
PEG4Extractor.cpp
ampleTable.cpp
17078d8a83becd5bfb49a39f1415882b78d07a49 01-Dec-2011 Andreas Huber <andih@google.com> am 10526a0b: am 2c2ed7be: Merge "Fixes a typo in AVIExtractor that would advertise the wrong video dimensions" into ics-mr1

* commit '10526a0bfe070ac4d1e550a81ed68be35d261b16':
Fixes a typo in AVIExtractor that would advertise the wrong video dimensions
4fe1c6c3988f79fd67c14a1f91e4b1df8a7e806f 01-Dec-2011 Andreas Huber <andih@google.com> Fixes a typo in AVIExtractor that would advertise the wrong video dimensions

Change-Id: I587a5ce259b04c973ed2d7614e874cb74c521aab
related-to-bug: 5696324
VIExtractor.cpp
cd9e929c8490d1410e6d99c9b54585cb2fea569c 30-Nov-2011 Jamie Gennis <jgennis@google.com> am c040e1e7: am 6f1dd757: Merge "SurfaceMediaSource: use the vid enc usage bit" into ics-mr1

* commit 'c040e1e77923d81050f2d3dbdac5d07e01be72f6':
SurfaceMediaSource: use the vid enc usage bit
7a3a2b2f9bb9421dcf83fbd47276e57917078aef 30-Nov-2011 James Dong <jdong@google.com> Fix the broken build

Change-Id: Ib508514891474d24f14ac69d721b0c9c700a0c3f
Codec.cpp
21befea3720fb847aef5440d507902d8705a671a 30-Nov-2011 Jamie Gennis <jgennis@google.com> Merge "SurfaceMediaSource: use the vid enc usage bit" into ics-mr1
8afbf8e07fd1d75dfa0a517267beb6c1fa818027 30-Nov-2011 Andreas Huber <andih@google.com> am 52607c53: am d12dc284: Merge "If an error occurs that prevents us from reallocating buffers during a format change" into ics-mr1

* commit '52607c5364446df6ac5b2f55cb50e146e6023a4f':
If an error occurs that prevents us from reallocating buffers during a format change
eca36b5a1759970bc3d0373d72d6fec7c9b7e944 30-Nov-2011 Andreas Huber <andih@google.com> resolved conflicts for merge of 998a929a to master

Change-Id: Id5cfbcf20e5ec28782cc88075040cf9edebfdfe8
5274010d068b05333e3e5544d59ca284802b1a8e 29-Nov-2011 Andreas Huber <andih@google.com> Merge "If an error occurs that prevents us from reallocating buffers during a format change" into ics-mr1
6e3d311b6631b12aac2879d1b08c3534aece78b1 28-Nov-2011 Andreas Huber <andih@google.com> Finer granularity discontinuity support.

No clients can signal a format change on either audio or video track (or both)
and a time discontinuity (timestamps changed) independantly.

Change-Id: I3e6cf4e7c260e85759879d61a9b517f68431c22f
related-to-bug: 5553055
peg2ts/ATSParser.cpp
peg2ts/ATSParser.h
peg2ts/AnotherPacketSource.cpp
peg2ts/AnotherPacketSource.h
peg2ts/MPEG2PSExtractor.cpp
404a123bed7f180724ead17f10e037b3eb347701 18-Nov-2011 Mathias Agopian <mathias@google.com> split ComposerService out of SurfaceComposerClient.h

Change-Id: I1eb691f7ca263d5895d871ab675bb5826e0323c6
urfaceMediaSource.cpp
d3d822204249eaca4259bdf46f6f0357b96e8e21 28-Nov-2011 Andreas Huber <andih@google.com> If an error occurs that prevents us from reallocating buffers during a format change

we need to transition to executing state anyway to be able to properly flush/shutdown
in the future.

Change-Id: Ie48bc09ea31942009ae3a5a45aabc9ffad9fb91f
related-to-bug: 5655016
Codec.cpp
1d2ad70cb27c16709ebd74ae651c47f57abfedb0 23-Nov-2011 James Dong <jdong@google.com> Merge "Fix a subtitle bug: multiple blank lines in SubRip(srt) file."
a7e4865306b72e8eb97ee73719c897c432c53a0c 22-Nov-2011 Andreas Huber <andih@google.com> am 31626b30: am cb6fbc89: Merge "Report a runtime error instead of asserting on malformed avc configuration data." into ics-mr1

* commit '31626b3075335f4cf579342e99436bb45870cf55':
Report a runtime error instead of asserting on malformed avc configuration data.
e933cb5ae546d023ab756391a135c170874e7901 22-Nov-2011 Andreas Huber <andih@google.com> Merge "Report a runtime error instead of asserting on malformed avc configuration data." into ics-mr1
0e0c3220ee1c4d57765e2cba3b07923921c55e08 22-Nov-2011 Insun Kang <insun@google.com> Fix a subtitle bug: multiple blank lines in SubRip(srt) file.

TimedTextParser should handle multiple blank lines between subtitles
in SRT format.

Change-Id: Id81e0a14d9984141f68b9f0919942c85562301b3
imedtext/TimedTextParser.cpp
7c56bb3ac1fb758a222a0c23805704a2789657b6 22-Nov-2011 James Dong <jdong@google.com> am d0a25456: am 02740dc4: Merge "Fix log spamming during time lapse video recording" into ics-mr1

* commit 'd0a254566f5f0be5607b4d64839a575c888c94f6':
Fix log spamming during time lapse video recording
4c57986f963c81fc7c2455deb113c9b32b135468 22-Nov-2011 Jamie Gennis <jgennis@google.com> SurfaceMediaSource: use the vid enc usage bit

This change makes SurfaceMediaSource add the VIDEO_ENC usage bit when
allocating its GraphicBuffers rather than the HW_TEXTURE bit.

Change-Id: Ie20e225c894fdbc31cad6bb82b3b64c7e98074eb
urfaceMediaSource.cpp
e8e5f86e9e310b065596c8cbbca1543eb833dee1 20-Nov-2011 James Dong <jdong@google.com> Fix log spamming during time lapse video recording

Change-Id: I4fc0809203684ebb02eaf217d7abad00aefc898f

related-to-bug: 5626569
ameraSource.cpp
ameraSourceTimeLapse.cpp
6f5cc45c48c02173bfae8d54b54a92c9bae256a1 19-Nov-2011 Marco Nelissen <marcone@google.com> am d4b22ab4: status_t != bool

* commit 'd4b22ab4889f9b1885bfc0dc45667c846a171a98':
status_t != bool
91e2c7d2988c4947aca8a637f88a2179d905b970 18-Nov-2011 Marco Nelissen <marcone@google.com> status_t != bool

b/5567433

Change-Id: I255ab8c3b0b5e0ea6a5cc7c05df757c667f3855e
tagefrightMediaScanner.cpp
153cefdf4acab25355f590d7760ebf73ef6096a9 18-Nov-2011 Marco Nelissen <marcone@google.com> status_t != bool

b/5567433

Change-Id: I255ab8c3b0b5e0ea6a5cc7c05df757c667f3855e
tagefrightMediaScanner.cpp
71b61a960ae30df990976ca5dbe780d85a15b0d1 18-Nov-2011 Andreas Huber <andih@google.com> Report a runtime error instead of asserting on malformed avc configuration data.

Change-Id: Ibcd9c3fb5b6532eba843ed80ecdcdacaf50d8845
related-to-bug: 5641069
MXCodec.cpp
60047ae30cc816e98ddb4b0b48e58c34c3d1f486 17-Nov-2011 Andreas Huber <andih@google.com> am 624efe45: am c1b1709b: Merge "Make sure not to cancel pending seek/EOS notifications on a cache underrun..." into ics-mr1

* commit '624efe45671131903fb5165f6133ba39486092ab':
Make sure not to cancel pending seek/EOS notifications on a cache underrun...
c34233e673c9791e137456d0c427d58db184b690 16-Nov-2011 Andreas Huber <andih@google.com> Make sure not to cancel pending seek/EOS notifications on a cache underrun...

or they are lost for good.

Change-Id: I2f9f53efb05db4077961137c9dc8c27edac4ec62
related-to-bug: 5544907
wesomePlayer.cpp
nclude/AwesomePlayer.h
78ff828e28c22715f5b6c320d967744cb4f51fd4 11-Nov-2011 Andreas Huber <andih@google.com> am 8a065423: am 23217182: Merge "Didn\'t mean to check this in..." into ics-mr1

* commit '8a0654231ff36d938bc3451190cf67231195f1d0':
Didn't mean to check this in...
516fb1dad0c434fd89624c418543d35436a5374c 11-Nov-2011 Andreas Huber <andih@google.com> am 40461ee7: am cd556b82: Merge "Instead of asserting, signal a runtime error if the session doesn\'t contain" into ics-mr1

* commit '40461ee70161d8568663332f72be2353b04c34e7':
Instead of asserting, signal a runtime error if the session doesn't contain
a36d8caf15d56a75906e9cc75b5e04463c1317a6 11-Nov-2011 Andreas Huber <andih@google.com> am 9c981cd3: am d9f25bc9: Merge "Disconnect on socket error on the RTSP control connection." into ics-mr1

* commit '9c981cd3d53238f10842368c1cd82d625b701a47':
Disconnect on socket error on the RTSP control connection.
91f230461288a2a5091182ef9e17079aabf8ebaa 11-Nov-2011 Andreas Huber <andih@google.com> Didn't mean to check this in...

Change-Id: Ie5a1902ff2613cd349ca5724f63a3fe3306640c7
tsp/MyHandler.h
73b1fd56d99b356b0effe8cf96ecf7446beb207f 11-Nov-2011 Andreas Huber <andih@google.com> Merge "Instead of asserting, signal a runtime error if the session doesn't contain" into ics-mr1
4ab3045755d33ab24bd312cfbc888f300c5e01f9 11-Nov-2011 Andreas Huber <andih@google.com> Merge "DO NOT MERGE: Instead of asserting, remove active streams if their sockets" into ics-mr1
4c5f7e33c26a858fd61438e3c1aea5c196a770e7 11-Nov-2011 Andreas Huber <andih@google.com> Merge "Disconnect on socket error on the RTSP control connection." into ics-mr1
023132eac2f2e2e0aa8859231cce1a6d324242fd 11-Nov-2011 James Dong <jdong@google.com> am 510180f1: am 08e42967: Merge "Add support for retrieving location information in mp4/3gpp files" into ics-mr1

* commit '510180f162dee3ae5416a98caa07f58a754f4b3f':
Add support for retrieving location information in mp4/3gpp files
0bb80204f457e1f948e47abacd86fae9ee687de4 11-Nov-2011 James Dong <jdong@google.com> Merge "Adds handler type 'sbtl' to support subtitles in various containers."
0fbe0577cfeda28bd016110e670708cce0752044 10-Nov-2011 Andreas Huber <andih@google.com> Disconnect on socket error on the RTSP control connection.

Change-Id: Ib52a69f9b0830b481c6f5c9b1991d1f4cb36ec7b
tsp/ARTSPConnection.cpp
tsp/ARTSPConnection.h
19de627354d465c4e9ccd1fcdcffd132861330b2 09-Nov-2011 Andreas Huber <andih@google.com> DO NOT MERGE: Instead of asserting, remove active streams if their sockets

return failure

Change-Id: Icb47adfd2fbe0398c473ba66e068186311c9cc79
related-to-bug: 5593654
tsp/ARTPConnection.cpp
f0c86a83c687074be79397e082e3775ca56641b1 10-Nov-2011 Andreas Huber <andih@google.com> Instead of asserting, signal a runtime error if the session doesn't contain

any playable tracks at all.

Change-Id: Ibbbe2fdcd53b7e020da80c84c8229856107a87e6
tsp/MyHandler.h
4948818cb91176df74c972ac27b2f392b5d148bc 09-Nov-2011 James Dong <jdong@google.com> Add support for retrieving location information in mp4/3gpp files

Change-Id: Ib8427704ef9ee5a4fa8fe1818c8a62d77b4ea687
related-to-bug: 5560253
PEG4Extractor.cpp
tagefrightMetadataRetriever.cpp
7cad0b48243f86c516181d09185dc83223ae51d7 10-Nov-2011 Andreas Huber <andih@google.com> am 9e2949c6: am 2375d163: Merge "Send RTSP control connection keep-alive requests" into ics-mr1

* commit '9e2949c6ab4e791b5c20d5e85c3eff62f206a99b':
Send RTSP control connection keep-alive requests
a585407bd04f2f4189dc393fc7e3f7f58d4f1a7a 10-Nov-2011 Andreas Huber <andih@google.com> am 2dff5cdc: am b42aea5b: Merge "Don\'t believe the PV decoder\'s lies..." into ics-mr1

* commit '2dff5cdc362ff6026e71d4b96faea8f2d7bd7063':
Don't believe the PV decoder's lies...
e9a919b178a75f4cb70322c02c9c8e2756fb5ea1 10-Nov-2011 Andreas Huber <andih@google.com> am ec04f4ac: am 7c063cf9: Merge "There\'s no point in trying to continue to decode after an error was signalled." into ics-mr1

* commit 'ec04f4ac23e5fe8f90267d09ddda8c0aa684c147':
There's no point in trying to continue to decode after an error was signalled.
1dc0ab1d2e2c5f40193556ad1239e304563f3083 10-Nov-2011 Andreas Huber <andih@google.com> Merge "Send RTSP control connection keep-alive requests" into ics-mr1
ca957d753496aff94dbb93b547e1c605bbfa064b 10-Nov-2011 Andreas Huber <andih@google.com> Merge "Don't believe the PV decoder's lies..." into ics-mr1
e26dd87f87be5016777bf92e498a26d545d3926a 10-Nov-2011 Insun Kang <insun@google.com> Adds handler type 'sbtl' to support subtitles in various containers.

Change-Id: I16d2c5d9aeb087b958e28052f266ca0ef42ea7f1
PEG4Extractor.cpp
d9f9f24db6f55f4743ece9965d4ece5f33d1b7ed 09-Nov-2011 Andreas Huber <andih@google.com> Merge "Instead of asserting, remove active streams if their sockets return failure"
8c308ffd781132c8417cebc3bf77c2e56a464e0b 09-Nov-2011 Andreas Huber <andih@google.com> Instead of asserting, remove active streams if their sockets return failure

Change-Id: Ic5cc786f718cf921876b181927cf1b03e8373ff1
related-to-bug: 5593654
tsp/ARTPConnection.cpp
2961a85f5f00343c115ac8e5dc17de631694fb6e 09-Nov-2011 Andreas Huber <andih@google.com> There's no point in trying to continue to decode after an error was signalled.

Change-Id: I2a2410cac9444eadd85be5d104799703171f1a24
related-to-bug: 5588658
odecs/on2/h264dec/SoftAVC.cpp
odecs/on2/h264dec/SoftAVC.h
0029faf8f4efbca3844c4174b75d46c432f8f272 09-Nov-2011 Andreas Huber <andih@google.com> Don't believe the PV decoder's lies...

Change-Id: I97391235255afb8a4890a4ff52d4e8e9ca954f27
odecs/m4v_h263/dec/SoftMPEG4.cpp
908dbdee96856693decc04fa143c2ba525495d43 09-Nov-2011 Andreas Huber <andih@google.com> Send RTSP control connection keep-alive requests

default to 60 secs unless overridden by server's session-id response.

Change-Id: I7c3aff5b787dbb57cc0dccf9db3c75e5cf7e778c
related-to-bug: 5562303
tsp/MyHandler.h
471af5aaea2d2491a77dba379771f7c96b9ca3c3 08-Nov-2011 Andreas Huber <andih@google.com> resolved conflicts for merge of 26f70db9 to master

Change-Id: Ib1536b1a4c9eeff80e0726b3e61cee12057cd120
936a981ba15d528a023311aa32f46446813551d9 08-Nov-2011 Andreas Huber <andih@google.com> Merge "Remove surface legacy APIs and code." into ics-mr1
6a9ab553ebd36705d3edacc6deb6a27dd6b799a3 08-Nov-2011 James Dong <jdong@google.com> am ee7ebb32: Merge "Fix a hang issue where the first frame can be dropped for timelapse video recording." into ics-mr1

* commit 'ee7ebb3257d9337627b175835dc3d08f9b8ab339':
Fix a hang issue where the first frame can be dropped for timelapse video recording.
49e82712b2b7072bb8b8d6e2c86115eaa82e9943 08-Nov-2011 James Dong <jdong@google.com> Merge "Fix a hang issue where the first frame can be dropped for timelapse video recording." into ics-mr1
8f76ebf90d0391a4baa8a921ed6e291dfc7891da 07-Nov-2011 Andreas Huber <andih@google.com> Use binary search to discover closest sync sample index, replace

assertions with runtime errors in case the file's table of sync sample
indices is not sorted properly.

Change-Id: Ie4446a44e613a8d329ac680c37361d4407d22520
related-to-bug: 5549855
ampleTable.cpp
14da736f1707a6dbefa52405e910ecb1b3bc2dd2 01-Nov-2011 Andreas Huber <andih@google.com> Properly decode ADTS files with ID3 headers.

Change-Id: I55247e79ac9cc9547e3e0f6fe048bcbdc9b639d1
ACExtractor.cpp
ediaExtractor.cpp
nclude/AACExtractor.h
2aa4cc04154d82f6658fb86f394f13bb488b0468 08-Aug-2011 Andreas Huber <andih@google.com> Support new HLS byte-range extensions

Change-Id: Ic767ddea93ffcb87d83b8fbc20837486648da3d7
ttplive/LiveSession.cpp
ttplive/M3UParser.cpp
nclude/LiveSession.h
nclude/M3UParser.h
3901e5d87573447db33fb9930871a1f5266a9b2c 25-Oct-2011 Andreas Huber <andih@google.com> Remove surface legacy APIs and code.

All surfaces are now supported through surface textures.

Change-Id: I95dd823e7099c0c32a48a1121624149dcc29d9c6
wesomePlayer.cpp
nclude/AwesomePlayer.h
c1aa1e96d1310e8b8f9962f924247aa35a61e3c3 28-Oct-2011 James Dong <jdong@google.com> am da57c0e8: Merge "Report call status from AudioSource::start() to file writer" into ics-mr1

* commit 'da57c0e8cf7e5022dd927b51fab3c1a40a8adf54':
Report call status from AudioSource::start() to file writer
be1480bade58688d201335860247734aec6b11cb 28-Oct-2011 James Dong <jdong@google.com> Merge "Report call status from AudioSource::start() to file writer" into ics-mr1
bd1970ae5c97cf423cbc5b591e9c8eab05a76a37 27-Oct-2011 Andreas Huber <andih@google.com> am 1388aced: Merge "Fix a reference to a stale pointer in AwesomePlayer." into ics-mr1

* commit '1388aced2a5ce3aafa8b0ae922925efafb61a5e1':
Fix a reference to a stale pointer in AwesomePlayer.
0d681abd16873a265a10aee1e9ae8fa062309de3 27-Oct-2011 Andreas Huber <andih@google.com> Merge "Fix a reference to a stale pointer in AwesomePlayer." into ics-mr1
93594b5aa16dbbb0b196f6e181a8ca099d7ab62b 27-Oct-2011 James Dong <jdong@google.com> Fix a hang issue where the first frame can be dropped for timelapse video recording.

Change-Id: I04754f1005a983953a80a659ff13f8762d0e120c
related-to-bug: 5523502
ameraSourceTimeLapse.cpp
b05e3b5b3c2d77f6c71631ea538f6190ec61b3d9 27-Oct-2011 James Dong <jdong@google.com> Report call status from AudioSource::start() to file writer

Change-Id: I5109dc87a92170dede4eaa58b039efe6d8b7c330
related-to-bug: 5514288
odecs/amrnb/enc/AMRNBEncoder.cpp
odecs/amrwbenc/AMRWBEncoder.cpp
783cfe32ee6f3972849b72283b95d5173ba79766 26-Oct-2011 Jamie Gennis <jgennis@google.com> am 5ded5fc5: am b7b4eaaa: Merge "Stagefright: push blank buffers when tearing down" into ics-mr0

* commit '5ded5fc55f2da2af0a76a9ddc52d27948b227037':
Stagefright: push blank buffers when tearing down
71adab54edf9d0e2c89473d3be12edb6b9dc4549 26-Oct-2011 Jamie Gennis <jgennis@google.com> am b7b4eaaa: Merge "Stagefright: push blank buffers when tearing down" into ics-mr0

* commit 'b7b4eaaa05284634d50d581d924a250f1194f66d':
Stagefright: push blank buffers when tearing down
32bdfd5acb76a02e82e0059c8bd892bc1f73a7e3 26-Oct-2011 Andreas Huber <andih@google.com> Fix a reference to a stale pointer in AwesomePlayer.

The pointer returned by MetaData::findCString may become stale if the metadata
object is modified. Make a copy of the returned mime type in order to prevent
MediaPlayer::dump log corruption.

Change-Id: I9077aee36c4316d83b37fb909bf91e6b3f75d5d2
wesomePlayer.cpp
3856b090cd04ba5dd4a59a12430ed724d5995909 20-Oct-2011 Steve Block <steveblock@google.com> Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF) DO NOT MERGE

See https://android-git.corp.google.com/g/#/c/143865

Bug: 5449033
Change-Id: I0122812ed6ff6f5b59fe4a43ab8bff0577adde0a
ACWriter.cpp
Codec.cpp
MRWriter.cpp
VIExtractor.cpp
udioPlayer.cpp
udioSource.cpp
wesomePlayer.cpp
ameraSource.cpp
ameraSourceTimeLapse.cpp
SDS.cpp
LACExtractor.cpp
P3Extractor.cpp
PEG2TSWriter.cpp
PEG4Extractor.cpp
PEG4Writer.cpp
ediaExtractor.cpp
ediaSourceSplitter.cpp
uCachedSource2.cpp
MXCodec.cpp
ggExtractor.cpp
ampleIterator.cpp
ampleTable.cpp
tagefrightMediaScanner.cpp
tagefrightMetadataRetriever.cpp
urfaceMediaSource.cpp
imedEventQueue.cpp
BRISeeker.cpp
ideoSourceDownSampler.cpp
AVExtractor.cpp
vc_utils.cpp
odecs/aacdec/SoftAAC.cpp
odecs/aacenc/AACEncoder.cpp
odecs/avc/enc/AVCEncoder.cpp
odecs/m4v_h263/dec/SoftMPEG4.cpp
odecs/m4v_h263/enc/M4vH263Encoder.cpp
odecs/mp3dec/SoftMP3.cpp
odecs/on2/dec/SoftVPX.cpp
odecs/vorbis/dec/SoftVorbis.cpp
ttplive/LiveSession.cpp
ttplive/M3UParser.cpp
d3/ID3.cpp
atroska/MatroskaExtractor.cpp
peg2ts/ATSParser.cpp
peg2ts/AnotherPacketSource.cpp
peg2ts/ESQueue.cpp
peg2ts/MPEG2PSExtractor.cpp
mx/OMX.cpp
mx/OMXNodeInstance.cpp
mx/SimpleSoftOMXComponent.cpp
mx/SoftOMXPlugin.cpp
tsp/AAMRAssembler.cpp
tsp/AAVCAssembler.cpp
tsp/AMPEG4ElementaryAssembler.cpp
tsp/ARTPConnection.cpp
tsp/ARTPSource.cpp
tsp/ARTPWriter.cpp
tsp/ARTSPConnection.cpp
tsp/ARawAudioAssembler.cpp
tsp/ASessionDescription.cpp
tsp/MyHandler.h
ests/DummyRecorder.cpp
ests/SurfaceMediaSource_test.cpp
1765d6e0c962d2b89897c0278f969084f632d181 25-Oct-2011 Jamie Gennis <jgennis@google.com> Stagefright: push blank buffers when tearing down

This change makes OMXCodec push RGB 565 buffers filled with black to an
ANativeWindow when tearing down after decoding to protected gralloc
buffers. This allows the OMX tear down to zero out any protected
buffers that were used without the possibility that the buffer is still
being used by SurfaceFlinger or HWComposer.

Bug: 5483222
Change-Id: I8acedd81a7bb67dfdc2fd15733e3375b6ce8d560
MXCodec.cpp
1d2acaffde56ad79e6e96f228d7857863462397c 20-Oct-2011 Dave Burke <daveburke@google.com> am 23d64420: Merge "Stagefright: idle OMX after ANW errors" into ics-mr0

* commit '23d644202a44383bf008ff86f6faa3ea7e447290':
Stagefright: idle OMX after ANW errors
55f4bc5c3d1acfaa735b8b19cf34b6b68f6cfcca 20-Oct-2011 Dave Burke <daveburke@google.com> Merge "Stagefright: idle OMX after ANW errors" into ics-mr0
b1d666f5cb555d135eb69e005e88a03330bbb54c 20-Oct-2011 Jamie Gennis <jgennis@google.com> Stagefright: idle OMX after ANW errors

This change fixes an issue in Stagefright where the state of an OMXCodec
object can get out of sync with the state of the OMX component. In
particular, if one of the ANativeWindow functions failed and put the
OMXCodec into the ERROR state, this would cause Stagefright to skip
doing the Executing -> Idle transition. Without this transition the
freeBuffersOnPort call would never be made, and the MediaBuffers would
end up being leaked (which would also leak the Gralloc buffers they
reference).

Bug: 5333695
Change-Id: I85ea0cf92d18e7ef6d35c7d1e2a7b4e2c9745d34
MXCodec.cpp
nclude/OMX.h
nclude/OMXNodeInstance.h
mx/OMX.cpp
mx/OMXNodeInstance.cpp
ca9f7f2d484ba0296db49406e3ef908bc7e119c1 19-Oct-2011 James Dong <jdong@google.com> am 5264f600: Merge "Bail out after kMaxColorFormatSupported calls to OMX_GetParameter(). Avoid infinite loop in querying omx component about the supported color format." into ics-mr0

* commit '5264f6003bbcb8ca70df034379154914260cc322':
Bail out after kMaxColorFormatSupported calls to OMX_GetParameter(). Avoid infinite loop in querying omx component about the supported color format.
5e69eb97b0e5e70919f61099bcc5bdbb1db0861c 19-Oct-2011 James Dong <jdong@google.com> Bail out after kMaxColorFormatSupported calls to OMX_GetParameter().
Avoid infinite loop in querying omx component about the supported color format.

Change-Id: I4997efd36462c792a6d8b5e04c79a80966a559fe
related-to-bug: 5466057
MXCodec.cpp
89770b4c942a2cf0bc2cba2a7a182a10d17b21b5 18-Oct-2011 Dave Burke <daveburke@google.com> am 6f13adb2: Merge "Don\'t hold onto the lock while reconnecting to the server" into ics-mr0

* commit '6f13adb22afcb47a1cd45a90eaa3c154522089d4':
Don't hold onto the lock while reconnecting to the server
a038c14efdaa118e2d8c5b42584cb0bb5f3b2ec7 18-Oct-2011 Dave Burke <daveburke@google.com> Merge "Don't hold onto the lock while reconnecting to the server" into ics-mr0
95c4d6034dc356f70c6293ea53d4858415b2d020 18-Oct-2011 Andreas Huber <andih@google.com> Don't hold onto the lock while reconnecting to the server

to avoid stalling the readers.

Change-Id: I73b646587c8a654a73ff7d800c0f17bd78001855
uCachedSource2.cpp
2bfdd428c56c7524d1a11979f200a1762866032d 12-Oct-2011 Andreas Huber <andih@google.com> NuPlayer is now taking on the task of streaming over RTSP.

Change-Id: Ie204db8810807f1e7981959e34dc0149e5d9563a
ndroid.mk
wesomePlayer.cpp
nclude/ARTSPController.h
nclude/AwesomePlayer.h
tsp/APacketSource.cpp
tsp/APacketSource.h
tsp/ARTSPController.cpp
tsp/Android.mk
tsp/MyHandler.h
f337772630b0a1b48d7828647d1079ebdc22919d 13-Oct-2011 Andreas Huber <andih@google.com> Merge "Support for an MPEG2 Program Stream extractor."
98a46cf165d8de3779874eba01803bbc485f45b9 12-Oct-2011 Andreas Huber <andih@google.com> Assume a PTS of 0 if absent, don't bail on fragmented PES packets not having PTS

Change-Id: I3b31f08428fb7195b98f145ae0675006c8756de1
related-to-bug: 5450187
peg2ts/ATSParser.cpp
peg2ts/ESQueue.cpp
49c59815369616b0fd5451ccabd377e8fe1dc3fa 07-Oct-2011 Andreas Huber <andih@google.com> YouTube can now request custom cache/prefetch parameters and disconnect-at-highwater

through the use of pseudo http headers specified in the setDataSource call.

x-cache-config: -1/-1/0
x-disconnect-at-highwatermark: 1

turns off keep-alives and disconnects every time the cache is full (will attempt
to reconnect once it run below lowwater mark)

related-to-bug: 5433309

Change-Id: Id2f942fc956e0e156834cfcd6bb08dae6a29fae1
wesomePlayer.cpp
uCachedSource2.cpp
nclude/NuCachedSource2.h
0b8cd8b0cf1489f8f7c0b2c4d7ea8fea70ca93a1 07-Oct-2011 Andreas Huber <andih@google.com> Specifying -1 for both low and highwater marks would not actually do the right thing

before this change. Also make it more consistent in that specifying -1 for the
keepalive settings specifies the default.

Change-Id: I086f530fbf42abce66d1c8e61157215cb474e044
uCachedSource2.cpp
003124e20eb0744aab36ad1bde05e15ac122ad75 07-Oct-2011 Andreas Huber <andih@google.com> Merge "Allow a system property "media.stagefright.cache-params" to override cache/prefetcher"
a045cb0e77097120e86e367e1cab5494ce2a5d5e 05-Oct-2011 Andreas Huber <andih@google.com> Allow a system property "media.stagefright.cache-params" to override cache/prefetcher

default parameters. To override specify a property

adb shell setprop media.stagefright.cache-params "4096/20480/15" to
set the low water threshold to 4096 KB, the high water threshold to 20 MB
and the keepalive interval to 15 secs.

if high and/or lowwater mark are negative, the default values are used for
the respective value.

if keep-alive interval is 0, keep-alives are disabled.

Change-Id: I89a4a06836e4a2f473d7a92b567ab07818c2f87d
uCachedSource2.cpp
nclude/NuCachedSource2.h
788a07fc61bad7ea2f0e3cca3f126b52a9bab376 06-Oct-2011 Andreas Huber <andih@google.com> Return a runtime error instead of assertion if seeking beyond EOS in mpeg4 files.

Change-Id: If6531b4a1ff45460cfcdcc04764c5c63a2f5a749
related-to-bug: 5418914
PEG4Extractor.cpp
d20bf0676d6db8f12edcd2307f82409c076c7015 30-Sep-2011 Lakshman Gowda <lakshman79@ti.com> Set crop params to ANative Window during Initialization.

The native_window_set_crop() is called when port reconfig event callback comes from decoder's and
crop parameters are changed from default getconfig() OMX_IndexConfigCommonOutputCrop values.
Since the default crop params are same as port reconfig crop params, the native_window_set_crop()
is not called, hence resulting in displaying the whole frame(paddedWidth x paddedHeight).
By calling native_window_set_crop() during initilaization of output port of decoder ensures
in setting up ANative window to crop region.

Change-Id: I68926464a1f5c7e6053804615c8b9bd32ea85688
Signed-off-by: Lakshman Gowda <lakshman79@ti.com>
MXCodec.cpp
2944eca607304a095ea43ba2b8f0b9de61249f9f 08-Sep-2011 Andreas Huber <andih@google.com> Support for an MPEG2 Program Stream extractor.

Change-Id: I606d87c278f72b22a5b6d7ee57bce6b02e280d41
Codec.cpp
wesomePlayer.cpp
ataSource.cpp
P3Extractor.cpp
ediaDefs.cpp
ediaExtractor.cpp
MXCodec.cpp
tagefrightMediaScanner.cpp
nclude/MPEG2PSExtractor.h
peg2ts/ATSParser.h
peg2ts/Android.mk
peg2ts/ESQueue.cpp
peg2ts/MPEG2PSExtractor.cpp
d3523f89a867afa111bb332887bf006ec3ae93e6 16-Sep-2011 Gilles-Arnaud Bleu-Laine <gilles@ti.com> Gracefuly return on detecting wrong AAC format from corrupted files

Return BAD_VALUE error upon detection of wrongly formatted files.
The client should abort the initialization upon error detection.

The current CHECK() interrupts the configurecodec() preventing a graceful
exit.

Change-Id: Ic79313fa76a63284897df5d91635de87d06f3100
Signed-off-by: Gilles-Arnaud Bleu-Laine <gilles@ti.com>
MXCodec.cpp
fea8f6217455d8cfc957e5b30f4eb2349859518f 29-Sep-2011 Andreas Huber <andih@google.com> Merge "Support multiple NAL fragments per .mkv payload"
792e33fd19e57e0d615d401a54ab567d04f16251 29-Sep-2011 Andreas Huber <andih@google.com> Support multiple NAL fragments per .mkv payload

Apparently the payload for an h.264 track in an .mkv file can contain multiple
NAL fragments, we used to discard everything after the first one before, now
we preserve them all.

Change-Id: Ic7187365309f3880a3256982879a45df50db697d
related-to-bug: 5337218
atroska/MatroskaExtractor.cpp
5530493f9abcd8f1f0b06cccecd6900e86a99778 28-Sep-2011 James Dong <jdong@google.com> Merge "Flush resets the count of played audio frames"
729de186450f78c099637e1fce743fe531862c52 28-Sep-2011 Andreas Huber <andih@google.com> Support AMR, G.711 and vorbis audio in ACodec and friends.

Change-Id: I08c03219bf2d60fc5c6e89957bd4b4c615570983
Codec.cpp
MXCodec.cpp
6c375490a5536695770a85b57ec9f828d3c0c9d4 28-Sep-2011 James Dong <jdong@google.com> Flush resets the count of played audio frames

Change-Id: I0cda94646a71757fa113a199d29235e13efd7ac3
related-to-bug: 5331470
udioPlayer.cpp
c32589a79f8120ac0060945fffc50279143989aa 28-Sep-2011 Andreas Huber <andih@google.com> Cut down on AwesomePlayer and OMXCodec's verbosity.

Change-Id: Ifd95717e8ea0fb0327099b16d72a6ed58c7c9924
related-to-bug: 5382014
wesomePlayer.cpp
MXCodec.cpp
dc9bacd838442a524585887e6ea6696836be2eda 26-Sep-2011 Andreas Huber <andih@google.com> Propagate error signalled by the source all the way to the output EOS notification.

Change-Id: I30e959a6d669f09745c59fbdebee08f869511cf7
related-to-bug: 5372901
Codec.cpp
ece731de0c0af30917316d55313f25c56f91960d 26-Sep-2011 Andreas Huber <andih@google.com> Merge "Support even more .avi files with .mp3 content not aligned to chunk boundaries"
32e1832dfac3a6bbcc5c0973ccd0e22de4d1a1ac 23-Sep-2011 Andreas Huber <andih@google.com> Support even more .avi files with .mp3 content not aligned to chunk boundaries

Change-Id: I3ace4118e2e519648c23c51d0b699ba0d7511a5d
related-to-bug: 5349382
VIExtractor.cpp
nclude/AVIExtractor.h
3d5ec85e29edfa0639290610044517bec269c7df 23-Sep-2011 Pannag Sanketi <psanketi@google.com> am 1d71c7b4: Merge "Returning EOS in SurfaceMediaSource:read" into ics-factoryrom

* commit '1d71c7b40a7f38487e602e78f45279b6a8364fc9':
Returning EOS in SurfaceMediaSource:read
3e9bf4061475ae0d01c57e32c13e63808aa3e31f 23-Sep-2011 Pannag Sanketi <psanketi@google.com> Returning EOS in SurfaceMediaSource:read

In SurfaceMediaSource::read, if disconnect has already been called, then
ERROR_END_OF_STREAM should be returned rather that NO_INIT. Else, it
sometimes leads to a crash in mediarecorder stop() call.

Related to FactoryROM bug: 5332812

Change-Id: I22132538ab2501d084e0283876817b1ec3f64a1d
urfaceMediaSource.cpp
c639aad6d8894f57c02e620f52ccf49e51b64866 21-Sep-2011 Andreas Huber <andih@google.com> Support some .avi files containing H.264 video, log warnings if audio/video unsupported

Change-Id: Ie7280f25f2bd19f32234c08673e64ceb65833677
related-to-bug: 5349382
VIExtractor.cpp
vc_utils.cpp
nclude/AVIExtractor.h
89aa8fe4cb00d2f24260005b008602232d678684 19-Sep-2011 Andreas Huber <andih@google.com> Remove an O(n^2) algorithm in MPEG4Extractor.cpp to speed up seeks in long streams

containing B-frames.

Change-Id: Ie4dc734d2c2d5a5ce84674bb883f4b27e2278642
related-to-bug: 5336497
ampleTable.cpp
nclude/SampleTable.h
3fe62150fa3dd6d25cb84aad80bc9e27ddd16c45 17-Sep-2011 Andreas Huber <andih@google.com> In order to recover from video lagging behind audio, drop avc frames

that are not referenced by other frames before feeding them into the decoder.

Change-Id: I822190af8f8329567bff8da1ea23136d0a765481
vc_utils.cpp
nclude/avc_utils.h
078cfcf7cce9185ec7559910d08b0bc02bfc88a3 15-Sep-2011 Andreas Huber <andih@google.com> Various improvements to nuplayer playback

- Drastically cut down the number of times we supply the AudioSink with data
by estimating the time until the sink would run out of data and then scheduling
a refill in advance of that.

- Use a dedicated looper for video decoders since they are currently taking
too long to return from OMX_FillThisBuffer (bug 5325201)

- Revise thread priorities for the OMX dispatcher and software codecs, instead
of running them at ANDROID_PRIORITY_AUDIO, they now only run at
ANDROID_PRIORITY_FOREGROUND

- Since threads created by pthread_create inherit all of the parent threads
attributes including thread priority, briefly reset thread priority to
ANDROID_PRIORITY_FOREGROUND before instantiating OMX components and then
restore it.

Change-Id: If9332a3a20dad5485333d68c11de0d2d5d3fffc3
Codec.cpp
hromium_http/support.cpp
oundation/AMessage.cpp
mx/OMX.cpp
mx/SimpleSoftOMXComponent.cpp
5dc2812abddde309234edc786a541d251c4f820a 15-Sep-2011 James Dong <jdong@google.com> Merge "Change an assert failure due to unsupported level by HW AVC decoder and report the error to applications"
7de73f4eb68f3aa478e19ba05a13bc84296f9894 13-Sep-2011 Andreas Huber <andih@google.com> Support .avi tracks that have a sample size of 1, i.e. samples != chunks

Assume for now that all chunks are the same size, i.e. have the same number of
samples.

Change-Id: Ib8a7dfeb16cc3e5be199ff9d98b68dd0b9c23eb8
related-to-bug: 5279872
VIExtractor.cpp
nclude/AVIExtractor.h
9a5e04438df742c297c5dbcdb60e6fd4d8f8321d 13-Sep-2011 James Dong <jdong@google.com> Change an assert failure due to unsupported level by HW AVC decoder and report the error to applications

Change-Id: I522a994981d86329ccc86c3b536b561dc6e40eeb
related-to-bug: 5300618
MXCodec.cpp
9215ea4cd8bc5f9c9770c5c34a009dc7c6068f86 12-Sep-2011 Andreas Huber <andih@google.com> Merge "Turn an another assertion into a runtime error in ACodec's implementation"
cc54fbaa69c0b69929467449d2c19192f15b5039 12-Sep-2011 Andreas Huber <andih@google.com> Turn an another assertion into a runtime error in ACodec's implementation

Change-Id: I6779b29f200b90d088273ab3204724ef3d8d59bd
related-to-bug: 5284760
Codec.cpp
c6c4572cd35f739bfac2aa439b3664032e03dcd8 12-Sep-2011 Andreas Huber <andih@google.com> Increase the avi extractor's confidence slighly over mp3's

So that we don't accidentally identify a .avi file containing an mp3 track as
an mp3 file.

Change-Id: I73495b80cbb5bc1007bf810f2db453c9f175171b
related-to-bug: 5288189
VIExtractor.cpp
618b58c4237359328b06371d9d6e855d2e6ac42c 09-Sep-2011 James Dong <jdong@google.com> Merge "Don't check mFilledBuffers whether it is empty or not when the port reconfiguration is not meant for buffer reallocation"
8edb8e82fa886564ee8e72178a1969e2437dd525 09-Sep-2011 James Dong <jdong@google.com> Don't check mFilledBuffers whether it is empty or not when the port reconfiguration is not meant for buffer reallocation

Change-Id: Iee9b18449bce9d7565ab5cc7f9e999484051196c
related-to-bug: 5233843
MXCodec.cpp
7280088b2315b6c2eccd39f0f0363d498ec82f0d 09-Sep-2011 Pannag Sanketi <psanketi@google.com> Merge "Always set geometry in queuebuffer"
7dc9b309f1ce01308bcfde9948ebfece32dc2870 08-Sep-2011 Pannag Sanketi <psanketi@google.com> Always set geometry in queuebuffer

The queuebuffer could return early due to timestamp issues. Need to set
the geometry even in that case.

Change-Id: I04d7cd1df3996d640c269285398c0042923ba920
urfaceMediaSource.cpp
f7eade99250520f2c9c8366a20a9256c4b34abc1 08-Sep-2011 Andreas Huber <andih@google.com> Audio player must not be used as a timesource before it's started.

Otherwise it'll trigger a division-by-zero exception since the audio sample rate
is as yet unknown.

Change-Id: I0793aa7c1c348ffa2611272bb646eff6ecf6ff53
related-to-bug: 5242451
udioPlayer.cpp
wesomePlayer.cpp
3991f099c643b718e78e0d938745ef2c5c431544 07-Sep-2011 Pannag Sanketi <psanketi@google.com> Merge "Fixing bug in SurfaceMediaSource_test"
74a0a0d7f766d63330a00c3fa8f133c44c1d5be6 07-Sep-2011 Andreas Huber <andih@google.com> Apparently keyframe status in audio tracks of .webm/.mkv files is unreliable

fortunately in all our supported audio encodings we can treat every frame as
a keyframe.

Change-Id: I32f21d0077bbae7ef9efe725dd351baf531179e2
related-to-bug: 5263837
atroska/MatroskaExtractor.cpp
aa9dfd5d07534c29337b5c72022f7dfecd85deea 07-Sep-2011 Andreas Huber <andih@google.com> Merge "Stop metadata retriever from dereferencing a NULL pointer if"
d6e27296206b9f897401107f1c46f4ac2947be85 07-Sep-2011 James Dong <jdong@google.com> Revert "To make SniffMP3() more concrete so that we can remove false-positve responses from MPEG-PS streams."

This reverts commit 983ab88e117fcbda9370b8f4ba94271d37149672.

related-to-bug: 5231309
P3Extractor.cpp
e7484f36061a60aadadb01143d84964d931aa837 07-Sep-2011 Andreas Huber <andih@google.com> Stop metadata retriever from dereferencing a NULL pointer if

the media extractor failed to initialize (malformed or unsupported content)

Change-Id: Icfad4e9eeb8d6713ad12eee7979ab30b696c06e0
related-to-bug: 5263840
tagefrightMetadataRetriever.cpp
adc857e80a1045897ebad85e691dc04451d364e3 06-Sep-2011 James Dong <jdong@google.com> Merge "Don't overwrite pending port setting change if there are more than one port setting change event."
31292d99f62a812af691e67e8e732c6ae582ee08 03-Sep-2011 Pannag Sanketi <psanketi@google.com> Fixing bug in SurfaceMediaSource_test

The test was making EGL calls once disconnected. Instead of calling
"disconnect" directly on the Surface, and EGL calls should be made to that
effect.

Change-Id: I21468ac8cbc2cb3145a49269e32a884736cd452e
ests/SurfaceMediaSource_test.cpp
3a13fad63af40a8364fce796b1a54a8f0a2fbf32 02-Sep-2011 Andreas Huber <andih@google.com> Properly serialize access to FileSource::getSize by acquiring the mutex

Both ::getSize and ::read call into lseek64, if this happens simultaneously
from multiple threads the results are undefined if not properly serialized.

Change-Id: I737cafebd836f3d8eb702beac557b4731f69c6f6
related-to-bug: 5196490
ileSource.cpp
97857479de48fda4c33bb415b2fbb15193f768e8 02-Sep-2011 James Dong <jdong@google.com> Don't overwrite pending port setting change if there are more than one port setting change event.

Change-Id: I3413f5235b191031252aa3785f5aaef00caef1ce
related-to-bug: 5122512
MXCodec.cpp
d942202ee0c92608c648735c3ad0f1bab4312420 01-Sep-2011 Andreas Huber <andih@google.com> Merge "Guard the audio notifications with a separate lock to avoid deadlocks during reset."
02f6e988107bc13ebe4828b734ea0fc3d9d11ae0 01-Sep-2011 Andreas Huber <andih@google.com> Guard the audio notifications with a separate lock to avoid deadlocks during reset.

Change-Id: I9a97372e1f777d1cbd6774cac2ed34b4b8cd9392
related-to-bug: 5179827
wesomePlayer.cpp
nclude/AwesomePlayer.h
5403129e2a2f44620f2ac8109889e5a61be08732 01-Sep-2011 Andreas Huber <andih@google.com> Signal an error when encountering a malformed .ts stream.

Change-Id: I3ab0215419214b652573945403eb45eb09d41aff
related-to-bug: 5114811
peg2ts/ATSParser.cpp
aec548b979f3d64712e8aa84cffdc4b7f094a798 01-Sep-2011 Andreas Huber <andih@google.com> Merge "I have one HLS stream that switches stream PIDs from one bandwidth to the next"
ef96bbce63da03bc0f0ad86174567cfdd5990c1b 01-Sep-2011 Andreas Huber <andih@google.com> Merge "Discontinuities are only signalled on streams that have been identified, i.e."
06528d7f18ad01377357d337eaa3e875a242bd2d 01-Sep-2011 Andreas Huber <andih@google.com> I have one HLS stream that switches stream PIDs from one bandwidth to the next

this change intends to support its very limited case and signals an error in
all other cases of unexpected PID changes that we cannot recover from.

Change-Id: Icbfdf9fe7461969e2a8781ed416f54d891dd789a
peg2ts/ATSParser.cpp
peg2ts/ATSParser.h
peg2ts/MPEG2TSExtractor.cpp
18ac5407da14dad9731f40ffc9a56bee73830019 01-Sep-2011 Andreas Huber <andih@google.com> Discontinuities are only signalled on streams that have been identified, i.e.

those that have a queue. This ensures that the player doesn't observe discontinuities
that don't match up across streams.

Also, make sure output buffers arriving from the decoder to be rendered are sent
back to the decoder if we started flushing.

Finally, don't parse TS packets for streams we don't support. And don't allocate
memory for them.

Change-Id: I708e0de4cba8110a62e4c8ceb1e5702430d5d2bb
peg2ts/ATSParser.cpp
c6b551541a6abd68bc3f3add07c196be4badccf3 01-Sep-2011 Pannag Sanketi <psanketi@google.com> Merge "Update SurfaceMediaSource_test to not use pbuffer configs"
f11b37bc9c92380cafadad7c8988f170687b8dfe 31-Aug-2011 James Dong <jdong@google.com> Merge "Fix a crash where the EOS was signalled but some output buffer were still pending."
af6764da53c022768290e735bbcc3088bec333d8 31-Aug-2011 Eino-Ville Talvala <etalvala@google.com> Merge "Fix SurfaceMediaSource timestamp handling."
e31f4f78729f66b3a90f51671ad557b551ed0bea 31-Aug-2011 Gloria Wang <gwang@google.com> Merge "Stop the AudioSource in reset() of AwesomePlayer if AudioSource is not NULL and AudioPlayer was not started. Fix for 5236419."
5b75fdc8fbc026453888cbb2d3fe31345394618b 31-Aug-2011 Gloria Wang <gwang@google.com> Stop the AudioSource in reset() of AwesomePlayer if AudioSource is not NULL
and AudioPlayer was not started.
Fix for 5236419.

Change-Id: I5eadd069118c3533a19b5d6f6dca2ce16d8505fb
wesomePlayer.cpp
935456794a8d572368ebe942d13451f7d71a9f4e 31-Aug-2011 Andreas Huber <andih@google.com> Merge "ATSParser now supports a mode in which PTS is considered to be absolute time"
21fcf0830c8b4fb544a09467bc96a8d0463ad966 31-Aug-2011 Pannag Sanketi <psanketi@google.com> Update SurfaceMediaSource_test to not use pbuffer configs

SurfaceMediaSource_test now does not use pbuffer configs
to create a surface. Always uses a window config.
Also, cleaned up the test a bit.

Change-Id: Idda40dcb8474249eccaa8d2dad20ee840d2dd484
ests/SurfaceMediaSource_test.cpp
e8eb2f4f0f8eff0313a27892ab8514223553d943 31-Aug-2011 James Dong <jdong@google.com> Fix a crash where the EOS was signalled but some output buffer were still pending.

Change-Id: Ide111264501441b51bb10629ae2021accf9e1fb5
related-to-bug: 5234126
MXCodec.cpp
c4c17d47b674b425fb6c399822c0ab3258543c0a 31-Aug-2011 Andreas Huber <andih@google.com> ATSParser now supports a mode in which PTS is considered to be absolute time

i.e. PTS 0 <=> media time 0

Change-Id: If10a0f98c129b95e8430dc419664b1def92e547e
peg2ts/ATSParser.cpp
peg2ts/ATSParser.h
df4a59c61103e7e0e9332e167a0be67da5d82ff3 30-Aug-2011 Eino-Ville Talvala <etalvala@google.com> Fix SurfaceMediaSource timestamp handling.

Was not basing timestamps on startTimeUs.
Now synchronizes properly with audio.

Bug: 4510826
Change-Id: I613db0aa91e51fc75d120e65540e742d8ab2ae43
urfaceMediaSource.cpp
1619f3d3428e9d502dc477d31e0681fe1cd12b89 30-Aug-2011 Jean-Michel Trivi <jmtrivi@google.com> Merge "Bug 5156756 Fix AAC ADTS header size computation"
bf4c48bc678c8f531f39f0b48755967d844ad581 29-Aug-2011 Jean-Michel Trivi <jmtrivi@google.com> Bug 5156756 Fix AAC ADTS header size computation

This previous frame size computation code had two incorrect
assumptions:
1/ the ADTS frame length value already contains the header size
2/ the ADTS header is not of fixed size: it is 2 bytes bigger
if it contains the CRC value.
For 1/, the code worked because when the header size was added
to the frame size, the + operator is of stronger precedence
than the ? operator, so the size added was always 0 (instead
of ADTS_HEADER_LENGTH.
For 2/, the code worked as long as there was no CRC in the ADTS
data.

The fix consists in:
- documenting what the frame length computation code returns
- fixing the frame length computation
- when computing the frame length, also returning the header
size so the correct data can be sent to the decoder.

Change-Id: I92df72a9e531f594f762e63d62f9dee7b0109904
ACExtractor.cpp
63970b42f101c87db7cfd26d43b0d300260b1582 29-Aug-2011 Andreas Huber <andih@google.com> Return an error to the client instead of asserting if decoder instantiation fails

after a surface change.

Change-Id: Ic7758cbeb107032db68a1c3b8e2984710a12dd8b
related-to-bug: 5212725
wesomePlayer.cpp
nclude/AwesomePlayer.h
1b5a697dc5435c76447eb5a2de373f5acdda119e 29-Aug-2011 Andreas Huber <andih@google.com> Merge "Signal errors to the client instead of asserting in ACodec."
c7de3f6bbaa6c1b8b334574fad34d583e3a67f5d 28-Aug-2011 Pannag Sanketi <psanketi@google.com> Merge "Default W, H allowed in SurfaceMediaSource dequeue"
f4b25b1dca4f1798c6f3f989be0738258d6504de 27-Aug-2011 Pannag Sanketi <psanketi@google.com> Merge "Fixing small syntax error in MPEG4 logging"
5410afcbb0af5d29d9f710a1c2978c500f9792dc 27-Aug-2011 Pannag Sanketi <psanketi@google.com> Fixing small syntax error in MPEG4 logging

Found that the build was breaking when the logging was enabled in
MPEG4Writer. Fixed.

Change-Id: I62c5e6d16b2ecf5644c8d46b9bbcca68a797b223
PEG4Writer.cpp
cb67cd1b51ff9ab221e3124cf7e546515fef3c87 27-Aug-2011 Andreas Huber <andih@google.com> Signal errors to the client instead of asserting in ACodec.

Also make sure NuPlayer can properly shutdown in certain edge cases.

Change-Id: Iceb16d600d87ba66c802e60e95bf62f66487a453
Codec.cpp
d2824a9a392e02a09929a34f0a3dad41ac1faacf 26-Aug-2011 Andreas Huber <andih@google.com> Merge "Support for posting messages and synchronously waiting for a response."
0b293e76c8fe4e973ccd8a872bc5320ba28d49cc 26-Aug-2011 Andreas Huber <andih@google.com> Properly reset the number of frames we think we've written to the audio sink

in order to compute the final delay before posting end-of-stream correctly.

Change-Id: I4ff6d7142fdf1ea2d19d12ec78c1e84322d22e5f
related-to-bug: 5216930
udioPlayer.cpp
5df775d2f509c76e76a46615fca83dba95299f6e 26-Aug-2011 Andreas Huber <andih@google.com> Support for posting messages and synchronously waiting for a response.

Change-Id: Id6c7a08c34fd5cb6c4632f78ece9e7898b29e52c
oundation/ALooperRoster.cpp
oundation/AMessage.cpp
24245683b9285b0b53c8900f088cf146000501c4 25-Aug-2011 Andreas Huber <andih@google.com> Merge "When encountering a discontinuity, flush(clear) all content enqueued up to that"
9a442c1b9a051edc6d4ceb0daad2d0a8433e7b0b 25-Aug-2011 Andreas Huber <andih@google.com> When encountering a discontinuity, flush(clear) all content enqueued up to that

point except previously enqueued discontinuities.

Change-Id: Id04a559dc062fa4a5c80c599ad74bf81a543de01
related-to-bug: 5201378
peg2ts/AnotherPacketSource.cpp
9a82f8acd4138fe920e91bd73e0041d52b2db237 25-Aug-2011 Gloria Wang <gwang@google.com> Merge "Set mSeekNotificationSent as false for RTSP seeking. Fix for bug 5208736."
1a49a13f20a06c2b58b97ad311a90d8eb0956052 25-Aug-2011 Gloria Wang <gwang@google.com> Set mSeekNotificationSent as false for RTSP seeking.
Fix for bug 5208736.

Change-Id: Ib1d74608ec289509082d8dcad080769f48098853
wesomePlayer.cpp
934d865a807e149b97d11b54c674d421b51bbe8a 25-Aug-2011 James Dong <jdong@google.com> Merge "When Camera is launched by media recording framework, stagefright controls the stop and release."
9197441e59be323e2f6f0c6506f7248eb6a944b2 25-Aug-2011 James Dong <jdong@google.com> When Camera is launched by media recording framework, stagefright controls the stop and release.

Change-Id: Ic79a60dad0f617a845211d3fbe146c1648a71da3
related-to-bug: 5205804
ameraSource.cpp
539a735a82fefb1944aa6135df73dfe9f541566c 25-Aug-2011 Chih-Chung Chang <chihchung@google.com> Merge "Port setting change should happen before receiving any filled frame."
f76e1672c674620cb056f338a25ee4826d55dfcb 25-Aug-2011 Pannag Sanketi <psanketi@google.com> Default W, H allowed in SurfaceMediaSource dequeue

The client does not have to send (w, h) = (0,0) in dequeuebuffer. It can
set the same w, h as the default width and height.

Change-Id: I8202f90261ccaebbd35ea28c153a7472f01912f1
urfaceMediaSource.cpp
1797e5d00e0ba4048c2258f091e6fd80748aa0ad 25-Aug-2011 Pannag Sanketi <psanketi@google.com> Merge "Testing the GL/ CPU encoding w/ Gralloc buffers"
0c5c7d2b119d2350c186ae9902919bcf28c3e277 19-Aug-2011 Pannag Sanketi <psanketi@google.com> Testing the GL/ CPU encoding w/ Gralloc buffers

This is the test for Gralloc buffers based encoding.
contains a combination of two main changes:

1. GL based encoding tests added to SurfaceMediaSource_test

2. SurfaceMediaSource ::read() colorformat

The SurfaceMediaSource::getformat() sets it to OMX_COLOR_FormatAndroidOpaque.
The omx encoder needs to interpret that colorformat and reads the format
from the Gralloc buffers directly

Change-Id: Iee2fe8901384109a4952e1d6c528c59eb01eb5b1
MXCodec.cpp
urfaceMediaSource.cpp
ests/Android.mk
ests/SurfaceMediaSource_test.cpp
3281e721c785304613c44853fc506b43cfea343c 24-Aug-2011 James Dong <jdong@google.com> Merge "To make SniffMP3() more concrete so that we can remove false-positve responses from MPEG-PS streams."
eca1762d92c43f2b7836941d14e453d4c0f9ed99 23-Aug-2011 Andreas Huber <andih@google.com> We were accidentally sending out an output buffer before the final port settings change

Change-Id: I4de0d3c377bb12e59524ed370ab3ed0b9a9b70a6
related-to-bug: 5122512
odecs/aacdec/SoftAAC.cpp
84f74fbfeec81eb59e874660fd52ad42820ea8a2 22-Aug-2011 Chih-Chung Chang <chihchung@google.com> Port setting change should happen before receiving any filled frame.

Change-Id: I12a54b80e7ef958b6d451b7add110d38f05ec439
MXCodec.cpp
8c32b164d00d3e4d73764d06956331f09693ef43 22-Aug-2011 Andreas Huber <andih@google.com> The MatroskaExtractor will now publish a different mime-type "video/webm" if

the doctype of the matroska file indicates that it is a webm file.

Change-Id: I467f597690a841043ecd11d2a2cae93351820f1b
related-to-bug: 5042137
atroska/MatroskaExtractor.cpp
atroska/MatroskaExtractor.h
2edd41583bb8c2b90c332980e0d1c34ae9ede34e 22-Aug-2011 Chih-Chung Chang <chihchung@google.com> Merge "Remove useAndroidNativeBuffer(2) warning message."
f764f8c0625762d98eacadb582c7308dba1c7b79 19-Aug-2011 Jamie Gennis <jgennis@google.com> Merge "Stagefright: fix a compiler warning"
67f43688334bcd72ae7c3b5b386c1b6a34711f4f 19-Aug-2011 Andreas Huber <andih@google.com> Raise the maximum input buffer size for the vpx video decoder to 256KB

Change-Id: I0411763829bf186d1b3b679fa72c9051524506b4
related-to-bug: 5169641
odecs/on2/dec/SoftVPX.cpp
50bb96ca6d19846b20b8016cf020e6a3a80e495e 19-Aug-2011 Gloria Wang <gwang@google.com> Merge "When switching surface, do not set mSeekNotificationSent as true, because there could be a previous uncompleted seeking which needs to send back MEDIA_SEEK_COMPLETE message. If we set mSeekNotificationSent as true here, then mediaplayer.cpp will be waiting for message MEDIA_SEEK_COMPLETE. The getCurrentPosition() will always return the seek time before MEDIA_SEEK_COMPLETE being received by mediaplayer.cpp. Fix for bug 5181272."
af64a8a6ad89f52685e822dca30742a4132c9ae6 18-Aug-2011 Gloria Wang <gwang@google.com> When switching surface, do not set mSeekNotificationSent as true,
because there could be a previous uncompleted seeking which needs
to send back MEDIA_SEEK_COMPLETE message. If we set mSeekNotificationSent
as true here, then mediaplayer.cpp will be waiting for message
MEDIA_SEEK_COMPLETE. The getCurrentPosition() will always return
the seek time before MEDIA_SEEK_COMPLETE being received by mediaplayer.cpp.
Fix for bug 5181272.

Change-Id: I290aff29b6d9ec8db67c66abbe1f352a43f57073
wesomePlayer.cpp
7341123ed8fed903c593a38d57ffabad3ad62860 18-Aug-2011 Andreas Huber <andih@google.com> Merge "Some decoders require more gentle treatment"
14f95746466fb6abdbbf33ee26d92ebf3fbef98f 12-Aug-2011 James Dong <jdong@google.com> Some decoders require more gentle treatment

We sacrifice A/V sync to some extent to enable the decoder to recover from
temporary bottlenecks.

Change-Id: I16195091ad752bfad4c70869cdd7e9f28ca3a118
related-to-bug: 5180142
wesomePlayer.cpp
nclude/AwesomePlayer.h
cdef698dae0c6dd89755f6494cc3d4b163f410ef 18-Aug-2011 Andreas Huber <andih@google.com> Disable vorbis-auto-looping if the audio sink used is not realtime, i.e. recording.

Change-Id: I982e740e8488ff8717ca5f081db9def55aabc9ec
related-to-bug: 5179033
wesomePlayer.cpp
2e17686223bad35101c23083dc79f1d12f3ff429 18-Aug-2011 Chih-Chung Chang <chihchung@google.com> Remove useAndroidNativeBuffer(2) warning message.

Change-Id: I3e9765e7271d80fda302e521501720bf8c13e5c7
mx/OMXNodeInstance.cpp
97f2fb5bc753f021bfa51f58129bc1a36c047c47 18-Aug-2011 Dongwon Kang <dwkang@google.com> To make SniffMP3() more concrete so that we can remove false-positve responses from MPEG-PS streams.

Note: current resync logic keeps searching mp3 frames until it meets a
valid one. This resync logic works well with seek() operation, but in
SniffMP3(), this may cause false-positive classification for the
following MPEG-PS file format.
A possible MPEG-PS video file:
[PS header]...[mp3 frame][mp3 frame] ...
MP3 files:
[ID3 tag][mp3 frame][mp3 frame] ...

BUG: 5104562
Change-Id: Idd5020723f7bdb2fefc2a63fc8651580fd644399
P3Extractor.cpp
ee0846f97cf07f5f18d19161526743330aabb44e 17-Aug-2011 Andreas Huber <andih@google.com> Merge "Make sure we have all the sample table metadata before declaring a track valid."
169c286ed166499c5099d2b336967e0bf3d25551 17-Aug-2011 Andreas Huber <andih@google.com> Make sure we have all the sample table metadata before declaring a track valid.

Change-Id: I2dfbc3e6017b5cd264e4cccfa47d19047b2e7f31
related-to-bug: 5178976
PEG4Extractor.cpp
ampleTable.cpp
nclude/SampleTable.h
1e7d2ba8b79e548286a649ca91402a2d41f59fa0 17-Aug-2011 James Dong <jdong@google.com> Merge "Don't time out prematurely for video encoding waiting for output buffers"
8a976a863cf921f97feff8be63f11775a1d8b76f 17-Aug-2011 Kristian Monsen <kristianm@google.com> Merge "Testing for bug 5122864 libwebcore related libraries increased by 3MB in ICS vs HCMR2"
61659f61b8dec729ffc03ef88e2d87f8941dcfc0 16-Aug-2011 Andreas Huber <andih@google.com> Merge "Error handling in ACodec and Nuplayer."
c92fd24c10a6bf80b346d7e261325434d9c6964b 16-Aug-2011 Andreas Huber <andih@google.com> Error handling in ACodec and Nuplayer.

Codec errors (and codec not found errors) now trigger a controlled shutdown
of playback and signal errors to the MediaPlayer client.

Change-Id: I2ee23ff2a1422d05a1a21e50ecb87d7c7ab958cc
Codec.cpp
99590d29c9d3081cadfccd036842f5ce9a7debef 16-Aug-2011 Andreas Huber <andih@google.com> Properly initialize some instance variables.

Change-Id: I190b889be343dca14fe8109528be14cc3cdd4c34
wesomePlayer.cpp
64b944106c697933a453a1ffd8bcddb137fdbc4c 15-Aug-2011 James Dong <jdong@google.com> Don't time out prematurely for video encoding waiting for output buffers

o For timelapse video encoding, the timelapse between two neighoring
input frames could be very long

Change-Id: I2b6f9c392f2237deae71c894efc7fc3692431796
related-to-bug: 5160548
MXCodec.cpp
421b31b7a859b6aa6185a36143158ef59f751adf 16-Aug-2011 Kristian Monsen <kristianm@google.com> Testing for bug 5122864 libwebcore related libraries increased by 3MB in ICS vs HCMR2

Reenabling chromium as a shread lib

Change-Id: I5f7abe61624d812c5781c4a453f587e744bc082d
ndroid.mk
a2e0a4259191fc486e0f563b992e3eadd7f9ae4b 12-Aug-2011 Andreas Huber <andih@google.com> Fix the software AAC decoder's AAC+ detection to ignore malformed frames

at the beginning of the stream.

Change-Id: Ib990848c696896e7d43c80dec8119dec35704b74
related-to-bug: 5122512
odecs/aacdec/SoftAAC.cpp
a0dac9e24ae7520cb7d7f0505bf0936bffbcd047 12-Aug-2011 Jamie Gennis <jgennis@google.com> Stagefright: fix a compiler warning

Change-Id: Ia6b2027dfe80960450156d918bdd7fe1567cafea
mx/OMXNodeInstance.cpp
94fbe4c6e29a7ea9800ea94cacc2d095ff25ab77 11-Aug-2011 Kristian Monsen <kristianm@google.com> Merge "Testing for bug 5122864 libwebcore related libraries increased by 3MB in ICS vs HCMR2"
8adb83ba4837b3c9de1a4221a5ca4c371a62e38c 10-Aug-2011 Gloria Wang <gwang@google.com> Merge "To reduce the bytes need to be buffered before start playing the streaming video. We might revert this change if too many spinnings were introduced. For bug 4448008."
83ed9d41b5aea53a5f3f0ae2fa14e101c079a12a 10-Aug-2011 Gloria Wang <gwang@google.com> To reduce the bytes need to be buffered before start playing the streaming video.
We might revert this change if too many spinnings were introduced.
For bug 4448008.

Change-Id: I3248bba9237d71c2bd99feebc9c73f7bd45260de
wesomePlayer.cpp
7231e169c1a00c6e69b3517ca9b851659dd96fed 10-Aug-2011 Andreas Huber <andih@google.com> Merge "When using "secure input buffer mode" we instantiate a different OMX component"
35b4be1751893dfbc376b474f339b45b24bfffd4 10-Aug-2011 Andreas Huber <andih@google.com> Merge "Revert "Notify the OMX component that it's going to be used in "secure" mode.""
c4847184f0d351ca2587ca66dc5ab8eab4dbe207 10-Aug-2011 Andreas Huber <andih@google.com> When using "secure input buffer mode" we instantiate a different OMX component

We form the new component name by appending the suffix ".secure".

Change-Id: I509848b50ae92edb179a941493ca611f923213ec
MXCodec.cpp
17741baf43818ca66c2a88db6b6e252d7abfff49 10-Aug-2011 Andreas Huber <andih@google.com> Revert "Notify the OMX component that it's going to be used in "secure" mode."

This reverts commit 7616178271e95f009452a21ea45e7225997dc27a.
MXCodec.cpp
d4495be0d417efbcf51d4b257228b8c10dc3617f 10-Aug-2011 James Dong <jdong@google.com> Merge "Fix initial 0 duration video sample in the recorded videos"
ff0299b487657d866adb5062d7fc9f02eaa15792 10-Aug-2011 Gloria Wang <gwang@google.com> Merge "To support for switching from a non-null surface/ surface texture to a null one, and vice versa. Fix for bug 5137445."
56e6d29d951cf514817f0a2c8b02138403716f01 10-Aug-2011 Kristian Monsen <kristianm@google.com> Testing for bug 5122864 libwebcore related libraries increased by 3MB in ICS vs HCMR2

Trying to build with static libchromium on the build server.

Change-Id: Ib88ce1803f3d36ef97a627c1454ed83239a3afee
ndroid.mk
f12d5faa1986384f2c899b50057142a6a2e40eec 10-Aug-2011 Ashish Sharma <ashishsharma@google.com> Merge "Network traffic accounting for chromium stack support in mediaserver."
80ec929862bcfe8582984f3a28e7a4ca5f4f27bb 10-Aug-2011 Gloria Wang <gwang@google.com> To support for switching from a non-null surface/ surface texture to
a null one, and vice versa.
Fix for bug 5137445.

Change-Id: Ifca2997f8ad27a843abbdaa7e89a56329bc40fde
wesomePlayer.cpp
129a94a569c927d4c8906a12f3de74ca0585d3f2 10-Aug-2011 Mathias Agopian <mathias@google.com> Merge changes Ie06e73e5,I7ac6b5b0

* changes:
free all buffers when ANativeWindow::disconnect is called
return correct value from query after connecting a surface
5a217fba010e801c255503602bda4b86ac5a6ac9 09-Aug-2011 James Dong <jdong@google.com> Fix initial 0 duration video sample in the recorded videos

o Patch suggested by pmehendale@nvidia.com

Change-Id: Ibf516ba83b721b0d0ab55bb7637fe9b7b2958214
related-to-bug: 5117434
PEG4Writer.cpp
beccb75d0c511950fb59500b05a591942d5c4751 09-Aug-2011 James Dong <jdong@google.com> Merge "Do not release recording frames if camera is gone"
820a509687599edb8ff1a7577de8b9295f416263 09-Aug-2011 Mathias Agopian <mathias@google.com> return correct value from query after connecting a surface

the first time a surface was connected, the values returned
by query NATIVE_WINDOW_DEFAULT_{WIDTH|HEIGHT} and
NATIVE_WINDOW_TRANSFORM_HINT were wrong until a call
to queueBuffer was performed.

Bug: 5137366, 5121607
Change-Id: I7ac6b5b0daa876638f6bed7c20f286a6e6d984f6
urfaceMediaSource.cpp
a1f10e8959cd4656aedb2613e855342102e59555 09-Aug-2011 Andreas Huber <andih@google.com> Notify the OMX component that it's going to be used in "secure" mode.

Change-Id: Id87c4b295eb38f7d24045918e73df298d7b842f9
related-to-bug: 5137212
MXCodec.cpp
334d097870eefeb45137b6df026f7db861d47663 06-Aug-2011 James Dong <jdong@google.com> Do not release recording frames if camera is gone

Change-Id: Ia6038c1a3ca17207e43a955ec47c42cdff1f5a76
related-to-bug: 5129465
ameraSource.cpp
a23456b306f35b9ecf973bf5818ca39295e9e029 08-Jul-2011 Ashish Sharma <ashishsharma@google.com> Network traffic accounting for chromium stack support in mediaserver.

- Atribute network activity to uid calling the mediaplayer
- Enables logging of chromium network stack in logcat

Change-Id: I2d28c8392248a056b3cee305dd4d4475ebba4337
TTPBase.cpp
hromium_http/ChromiumHTTPDataSource.cpp
hromium_http/support.cpp
hromium_http/support.h
nclude/HTTPBase.h
tsp/ARTSPConnection.cpp
tsp/MyHandler.h
ea7c2fea6a031d37270cb5b22b432729626b266d 05-Aug-2011 Gloria Wang <gwang@google.com> Merge "Close the DRM session in the destructor of ChromiumHTTPDataSource. Fix for bug 5015079."
99930d45c40f2d79a7633d9dd9f8478d22307848 05-Aug-2011 Gloria Wang <gwang@google.com> Close the DRM session in the destructor of ChromiumHTTPDataSource.
Fix for bug 5015079.

Change-Id: I45fcf6ff8b50e62f2812930eaf68c00206cb7e52
hromium_http/ChromiumHTTPDataSource.cpp
f89d780df70b7fbb8465bce4913c46cca019721f 05-Aug-2011 Andreas Huber <andih@google.com> Eliminate superfluous memcpys by wrapping an ABuffer in a MediaBuffer

Change-Id: I1313f117cd7cdfaf7d6ec25413a0b4b8ea495037
related-to-bug: 5122973
ediaBuffer.cpp
peg2ts/AnotherPacketSource.cpp
tsp/APacketSource.cpp
6801b4dbd00b485ecdcd31b517ed885a8fa21c63 04-Aug-2011 Andreas Huber <andih@google.com> Restart HLS streaming from the bottom of the playlist if we miss the boat on the

next segment. This can happen if for whatever reason we playback video slower than
it is served.

Also removed some unnecessary verbosity from ChromiumHTTPDataSource.

Change-Id: I6e870879310c9efe4d50d7dc0883c08405442d79
related-to-bug: 5120425
hromium_http/support.cpp
ttplive/LiveSession.cpp
874f0f1223041d70dbcc9777d0d14c995810a4d8 04-Aug-2011 Gloria Wang <gwang@google.com> Merge "Check the syncword for each frame. Fix for bug 5117233."
fdb04b61f91c45eed0edd28aa33d7085a5e6eb74 04-Aug-2011 Gloria Wang <gwang@google.com> Check the syncword for each frame.
Fix for bug 5117233.

Change-Id: I714c9b671832c9606cabdfe6bb21697c08de2eff
ACExtractor.cpp
c6354e9396b4d8929058a283cfc77327b47e9944 02-Aug-2011 Sarthak Aggarwal <sarthak@ti.com> Removing hack for framerate setting in Stagefright for encoders.

Ducati binary starting to support frame-rate on i/p port rather than o/p port,
stagefright can start giving frame-rate frame rate on i/p port and 0 on o/p
port.

Change-Id: I70830747e43e6bfcac73f0fb01de0ab0235a7b28
Signed-Off-By: Sarthak Aggarwal<sarthak@ti.com>
Signed-off-by: Iliyan Malchev <malchev@google.com>
MXCodec.cpp
8292f43746a359d31af631efcffccd142c0a50c3 02-Aug-2011 James Dong <jdong@google.com> Merge "Start thread pool for binder calls"
874aef204ebca8d6778d208a1c8eef231b6ccbf3 02-Aug-2011 Gloria Wang <gwang@google.com> Merge "Re-calculate mCurrentTimeUs for MP3 CBR seek because we might have called Resync() which changes mCurrentPos. For bug 4869063."
57c86189bc07d9ccb0fd044e66df736d0bf19639 29-Jul-2011 Wu-cheng Li <wuchengli@google.com> Pass camera frame metadata from camera service to Java.

bug:4460717
Change-Id: I2fae6e1dfca6b8f3a5ee5716fc7817f5417bf657
ameraSource.cpp
b6f2fced47866a5d095b2b18d2e28d7c4321e3a6 02-Aug-2011 James Dong <jdong@google.com> Start thread pool for binder calls

Change-Id: Ie67f54ba06d7fdb42bcb041c1e0a50d8477ae423
related-to-bug: 5095635
ests/SurfaceMediaSource_test.cpp
9ea5908d386e0ac482b025bc3235d9eb71d77e06 01-Aug-2011 Andreas Huber <andih@google.com> Merge "Fix NALU extraction of unit starts with a 0x00 nalType"
7f048fdd69753e0ba95d3ef1484b30bcf39164c0 01-Aug-2011 Andreas Huber <andih@google.com> Fix NALU extraction of unit starts with a 0x00 nalType

by not backing up beyond the start of the nal unit.

Change-Id: I5fba9913202de416e634e5f39181be62b72b2469
related-to-bug: 4770290
vc_utils.cpp
20f725ebcef13ded1b4b85c61c8a4b37cd030656 22-Jul-2011 Andreas Huber <andih@google.com> Start playing live streaming HLS content from the first segment.

Also properly signal a "hard" discontinuity, i.e. a possible format change
when a discontinuity is signalled explicitly as part of the playlist.

Change-Id: Ic347d3d11d39b0411c3726a7c723bcf13092b8bc
related-to-bug: 5103155, 5103013
ttplive/LiveSession.cpp
b7c5f8fa2ee707f010b60ff7bea07c2bf1e17e2d 29-Jul-2011 Kristian Monsen <kristianm@google.com> Merge "Part of fix for bug 5065047 build libchromium as a shared lib"
a3924af33a8005a0aeb20b97fd06e0c523b0d1af 27-Jul-2011 Glenn Kasten <gkasten@google.com> Merge "Bug 4599730 Get audio channel count on MediaPlayer"
f9d566ef54954c5e7b913275438e8022fb194ad6 27-Jul-2011 Gloria Wang <gwang@google.com> Re-calculate mCurrentTimeUs for MP3 CBR seek because we might have
called Resync() which changes mCurrentPos.
For bug 4869063.

Change-Id: I5c5876ad81adf0ced1a6e6c18cda6905bf38f731
P3Extractor.cpp
cd25fed09742235fac10953b9d4b77268c695063 25-Jul-2011 Glenn Kasten <gkasten@google.com> Bug 4599730 Get audio channel count on MediaPlayer

Related changes:
- Fix bug in get/setParameter* to recycle Parcels when done with them.

Change-Id: Iaff05e91bbd99a14fccb79d816dd873359b6ae65
wesomePlayer.cpp
673aebfc7e6e8d38ad29a66d68c71ea8e9121eb1 27-Jul-2011 Iliyan Malchev <malchev@google.com> libstagefright: add destroyOMXPlugin and use C linkage for symbols

Add a destroyOMXPlugin() to complemenet createOMXPlugin(). Since the latter is
an opaque call into a library, it is not safe to assume that the object thus
returned may be destroyed by calling delete. This patch will call
destroyOMXPlugin() in libstagefrighthw.so, if the symbol is defined there.
Otherwise, it will default to a delete as before.

Also, prefer C linkage for the symbol names. Using mangled C++ symbols is not
very safe and makes it hard to grep for those symbols through the code. We
attempt to locate createOMXPlugin as a C symbol then try it as a mangled C++
one. We only use C linkage for destroyOMXPlugin since this symbol is new.

Change-Id: Ied23c910486856a0f18056df049c871234797c5c
Signed-off-by: Iliyan Malchev <malchev@google.com>
mx/OMXMaster.cpp
f0de042dc6df6d3a1f3db3a95a1c7964109c6541 27-Jul-2011 Kristian Monsen <kristianm@google.com> Merge "Fix for bug 5049763 HLS: Cookies set in main playlist request aren't being passed to subsequent HTTP requests"
b283ac1ac6758aba907bfe56713d279e8aafd38b 26-Jul-2011 Pannag Sanketi <psanketi@google.com> Merge "Adding Metadata mode to SurfaceMediaSource"
a4635b0cde4a4b7bf0f9aed6aaade60d88eb2fe6 25-Jul-2011 James Dong <jdong@google.com> Merge "Do not support still image capture mode for timelapse video recording"
e6cf962d41cb05b57e55ef80f75a24c62671dcfe 22-Jul-2011 Kristian Monsen <kristianm@google.com> Part of fix for bug 5065047 build libchromium as a shared lib

Building chromium as a shared lib, updating other libs that
use it.

Change-Id: Ia20749bb7fbec51b94adb314116503f62f41b782
ndroid.mk
be1cc822304d3a29c106ad5b6f330aed3e8c5658 24-Jul-2011 James Dong <jdong@google.com> Merge "Do not wait forever for output buffers in OMXCodec.cpp and error out in case time out happens"
726e4527b7a750e688fec4c1e7c5f7b9a33d1623 24-Jul-2011 Jean-Michel Trivi <jmtrivi@google.com> Merge "QueryCodecs() signature change"
348a3aca420da133b2283ee12216e8e0f939e88d 24-Jul-2011 Gloria Wang <gwang@google.com> Merge "Do not change the number of bytes while converting 8-bit samples to 16-bit, because this number will be used later to calculate mCurrentPos. Fix for bug 5063703."
3cecf640c4daf2df616b278bd9986018c8182908 30-Jun-2011 James Dong <jdong@google.com> Do not support still image capture mode for timelapse video recording

related-to-bug: 4973779

Change-Id: Ica665217ab10247b2242acc4e93d4fe9f83e3f45
ameraSourceTimeLapse.cpp
a361483bb5dbd3bbf132c5b99b2df7d197c3fc50 14-Jul-2011 Pannag Sanketi <psanketi@google.com> Adding Metadata mode to SurfaceMediaSource

SurfaceMediaSource operates in metadata mode only, i.e. just the
metadata is stored in videobuffers. SurfaceMediaSource passes the Gralloc
buffer handle along with a 4 byte 'type' (indicating that the metadata
is of type GrallocSource) to the encoder as opposed to the
GrallocBuffer itself.

Related to bug id: 4529323

Change-Id: I83aebc0dd10f317658cdf70be5802dfc35a1e72d
urfaceMediaSource.cpp
ests/SurfaceMediaSource_test.cpp
77882a8deb5167235ae591e49c9dcff9abb373c1 23-Jul-2011 Pannag Sanketi <psanketi@google.com> Merge "Connect MediaRecorder Native to SurfaceMediaSource"
d35924d9928f29dcee6f5666b5bbd084640c7b34 22-Jul-2011 Jean-Michel Trivi <jmtrivi@google.com> QueryCodecs() signature change

Restore QueryCodecs() signature exactly as used by third-party libs.
Add an alternative function to select HW only codecs.

Change-Id: Ibb2cb4dd36fc0c6599eb93aa5751c216397e3b6f
MXCodec.cpp
0b3f21761eae9b7d230ddd9b4be76ef02d4cec15 22-Jul-2011 Gloria Wang <gwang@google.com> Do not change the number of bytes while converting 8-bit samples to 16-bit,
because this number will be used later to calculate mCurrentPos.
Fix for bug 5063703.

Change-Id: I75a78ef694482aa426d82a6c5f3d2ce570a9c19e
AVExtractor.cpp
29a142c7237821b6dc7bd1e8b56bb1efdc56767b 19-Jul-2011 Jamie Gennis <jgennis@google.com> SurfaceTexture: add the abandon method.

This change adds the 'abandon' method to the SurfaceTexture C++ class.
This method may be used to put the SurfaceTexture in an abandoned state,
causing all ISurfaceTexture methods to fail.

Change-Id: Ibd261f7b73f44e2bec36a8508bf92113cfb7cf95
urfaceMediaSource.cpp
b33f3407bab0970a7f9241680723a1140b177c50 02-Jul-2011 Pannag Sanketi <psanketi@google.com> Connect MediaRecorder Native to SurfaceMediaSource

Making a connection from MediaRecorder Native layer to the
SurfaceMediaSource for the purpose of encoding GL Frames. This will be
called from the java side inside the Mobile Filter Framework.

The mediarecorder native layer (client), when set the videosource to
option VIDEO_SOURCE_FRAMES, asks the StageFrightRecorder on the mediaserver
side to create a SurfaceMediaSource object and pass it back as a
sp<ISurfaceTexture> object. Using that, the client side will dequeue and
queue buffers. Connecting the GL Frames to the obtained
sp<ISurfaceTexture> is not part of this CL.

Related to bug id: 4529323

Change-Id: I651bec718dd5b935779e7d7a050b841c2d0b0fcd
urfaceMediaSource.cpp
85eafc680a0bf5e0253cf611ac525769fc9bef3e 22-Jul-2011 Jamie Gennis <jgennis@google.com> SurfaceMediaSource: remove getAllocator method

This change removes the getAllocator method from SurfaceMediaSource
because that method is no longer a part of the ISurfaceTexture
interface.

Change-Id: I0e2f0bc3bc1c8cd3c1b4b14246f07b9b4e3066c3
urfaceMediaSource.cpp
fe388eedca9f46ed3fee9579258acecd93e88641 22-Jul-2011 Pannag Sanketi <psanketi@google.com> Merge "Renaming SurfaceEncoder to SurfaceMediaSource"
10b7197cf9016093bdff20b6f7768543fd1c5720 22-Jul-2011 Pannag Sanketi <psanketi@google.com> Merge "Adding SurfaceEncoder for encoding FilterFrames"
0683eba6b35c396c21f10e926709f2f8fc05f090 18-Jul-2011 Andreas Huber <andih@google.com> Retry datasource fetches a few times before giving up (NuCachedSource2).

Change-Id: I147fc18ef55bc89d2e2fee69b7869c45abbfdd6b
related-to-bug: 3405354
uCachedSource2.cpp
hromium_http/ChromiumHTTPDataSource.cpp
nclude/ChromiumHTTPDataSource.h
nclude/NuCachedSource2.h
deaba1c70b8ebdd1fffb40665a40e0593bd9cf3e 22-Jul-2011 Kristian Monsen <kristianm@google.com> Fix for bug 5049763 HLS: Cookies set in main playlist request aren't being passed to subsequent HTTP requests

Cookies should be store between requests in memory with this.

Tell me if you want to store the cookies on disk as well.

Change-Id: I9afe5796a3d395afcf54d669c86cf7da432f8d9a
hromium_http/support.cpp
1a2fafbaa36390a06cc9a066fcbe147c8c47ea77 01-Jul-2011 Pannag Sanketi <psanketi@google.com> Renaming SurfaceEncoder to SurfaceMediaSource

Related to bug id: 4529323

Change-Id: Id820d45a536bd2c65e0a59def564eb5b3ea4a71c
ndroid.mk
urfaceEncoder.cpp
urfaceMediaSource.cpp
ests/Android.mk
ests/SurfaceEncoder_test.cpp
ests/SurfaceMediaSource_test.cpp
3399b7267185646c69b04352211fca4fad9d7547 11-Jun-2011 Pannag Sanketi <psanketi@google.com> Adding SurfaceEncoder for encoding FilterFrames

Adding SurfaceEncoder which can be used to encode
custom frame data. In a sense, it is reverse
of what SurfaceTexture does.

SurfaceEncoder takes in frames from a native window and
passes them to an encoder, thus acting like a MediaSource.
It uses GRAlloc buffers underneath for passing data.
The client side sets the geometry, format in the beginning,
which cannot be changed while the recording is going on.

Currently, there is no common pixel format that both
GRAlloc and HAL understand.
Also, the encoder cannot encode using the data from the GRAlloc
buffers.

The SurfaceEncoder_test examines mainly the buffer passage
since true encoding cannot be done at this point.
SimpleDummyRecorder 'reads' the frames in the same thread
as the start(), whereas DummyRecorder 'reads' in a separate
thread much like the MPEG4Writer. The test with DummyRecorder
is much closer to the real encoding implementation.

Related to bug id: 4529323

Change-Id: I58ec19a150f8fe4d6195196dc44f55002b46c7c8
ndroid.mk
urfaceEncoder.cpp
ests/Android.mk
ests/DummyRecorder.cpp
ests/DummyRecorder.h
ests/SurfaceEncoder_test.cpp
3a1f8a404b38aaa82d57c77cb83e48665e66e553 21-Jul-2011 Jeff Brown <jeffbrown@google.com> Merge "Untangle MediaScanner error handling. Bug: 5056917"
7188e55f54a43c55fd6b96454720c447f1dc454e 21-Jul-2011 Jeff Brown <jeffbrown@google.com> Untangle MediaScanner error handling.
Bug: 5056917

Change-Id: I1a7a73579e3ba4e9709459329fc1901a28b0f4b1
tagefrightMediaScanner.cpp
afa9771b5abe7646077a8353f8bf710506803f7a 21-Jul-2011 James Dong <jdong@google.com> Merge "Let the media recording framework release the Camera object when it is the owner"
3bd3020c00ec8264ac1fe3870800f326487f9221 20-Jul-2011 James Dong <jdong@google.com> Let the media recording framework release the Camera object when it is the owner

related-to-bug: 5050535,5036813,5051707

Change-Id: I88e10f65f087931e7f95ab26a018d59f7361103e
ameraSource.cpp
7dff060f29858d6db2464845bb9097ac5960bbe6 20-Jul-2011 Andreas Huber <andih@google.com> Merge "Content found in the wild violated the MPEG4 systems specs"
f3dadf2204119eb7ef263535d53d36cd14b9bf47 20-Jul-2011 Andreas Huber <andih@google.com> Content found in the wild violated the MPEG4 systems specs

but other players apparently worked around it as well, so we do to.

Change-Id: I8269d2344b010d1d704028c8a9c05bddab53828d
related-to-bug: 5049979
SDS.cpp
50d42da58a88dcdb082cff079766af71c0871470 20-Jul-2011 Andreas Huber <andih@google.com> Merge "More HLS fixes"
d6a46a6bda23667e06ee5ccca3781e407c7d1204 20-Jul-2011 Andreas Huber <andih@google.com> More HLS fixes

properly expand URLs where the "new" URL is an absolute path.
properly include any extra headers even when fetching the key files.

Change-Id: I7cd8879015ea8e3d3e2334f4e7e16b8c1a5d48e9
ttplive/LiveSession.cpp
ttplive/M3UParser.cpp
9bc7af17974f448291a44912566ec7472a0d798b 19-Jul-2011 Mathias Agopian <mathias@google.com> use SurfaceTexture new scaling mode in SF

SF now obeys SurfaceTexture's scaling mode instead
of inferring it from the buffer's size

Change-Id: I4d50e9851abedd7e64bfcfc8af9eefb9fb668529
Codec.cpp
MXCodec.cpp
olorconversion/SoftwareRenderer.cpp
2e460c5b7f48aaabff33698ba6b11b04906eefa8 19-Jul-2011 James Dong <jdong@google.com> Remove PV AVC decoder

Change-Id: Icf056c852f95b5d6a07473728ddbf5b641990381
odecs/avc/dec/Android.mk
odecs/avc/dec/SoftAVC.cpp
odecs/avc/dec/SoftAVC.h
odecs/avc/dec/include/avcdec_api.h
odecs/avc/dec/include/pvavcdecoder.h
odecs/avc/dec/include/pvavcdecoderinterface.h
odecs/avc/dec/src/avc_bitstream.cpp
odecs/avc/dec/src/avcdec_api.cpp
odecs/avc/dec/src/avcdec_bitstream.h
odecs/avc/dec/src/avcdec_int.h
odecs/avc/dec/src/avcdec_lib.h
odecs/avc/dec/src/header.cpp
odecs/avc/dec/src/itrans.cpp
odecs/avc/dec/src/pred_inter.cpp
odecs/avc/dec/src/pred_intra.cpp
odecs/avc/dec/src/residual.cpp
odecs/avc/dec/src/slice.cpp
odecs/avc/dec/src/vlc.cpp
mx/SoftOMXPlugin.cpp
8ebe5be6b0b3caa7d9d6277a1216ed786bd1e66a 19-Jul-2011 Conley Owens <cco3@android.com> am e5143d6c: am a4aef41a: am a74774fd: am 4d8f6a38: Merge "stagefright aacenc: Mark codeWord as UWord16"

* commit 'e5143d6c09f0e9a960661a2b0a5916c33fcafc4d':
stagefright aacenc: Mark codeWord as UWord16
b2ac59b3a1748eef58c228a7e808d40bd1741dcf 19-Jul-2011 Conley Owens <cco3@android.com> am a4aef41a: am a74774fd: am 4d8f6a38: Merge "stagefright aacenc: Mark codeWord as UWord16"

* commit 'a4aef41a74a69b0296b88361ffb33d0470a26362':
stagefright aacenc: Mark codeWord as UWord16
e82c319beb2275ad0832cf77252943e16df04b1a 19-Jul-2011 Conley Owens <cco3@android.com> am 4d8f6a38: Merge "stagefright aacenc: Mark codeWord as UWord16"

* commit '4d8f6a38e7268e29e189cb4173f42c7aa5b320a3':
stagefright aacenc: Mark codeWord as UWord16
d94bb8b524e09f978b6a16699b968628ff279208 19-Jul-2011 Conley Owens <cco3@android.com> Merge "stagefright aacenc: Mark codeWord as UWord16"
d36635c4d90e8b891c7197a92370796635b7684c 19-Jul-2011 Deckard Autoverifier <deckard@android.com> am 3ab6ccda: am 2acddc54: am 89bac182: am 88409911: Merge "stagefright: Include stdlib.h for malloc/free"

* commit '3ab6ccda447c605c35c8854a2ec8c49c2a0653a6':
stagefright: Include stdlib.h for malloc/free
8ebcf0222143b2b59d24946ef260894f367e096c 19-Jul-2011 Deckard Autoverifier <deckard@android.com> am b32af642: am 31140598: am 16db83c2: am eb07c531: Merge "stagefright amrwbenc: Remove a duplicate, unused file"

* commit 'b32af642454f3113cb1539821eb3b0dbf4174974':
stagefright amrwbenc: Remove a duplicate, unused file
7b9bcbb0975049c05c3b4a4048802807433ace42 19-Jul-2011 Deckard Autoverifier <deckard@android.com> am d4dee1a5: am 29fd8cdb: am 80ef1745: am c06c3603: Merge "stagefright aacenc: Make the mem_malloc function 64-bit safe"

* commit 'd4dee1a57fdcd1bd1e7c621163e89039cf88d9f9':
stagefright aacenc: Make the mem_malloc function 64-bit safe
bb29abfe798e0a3329380481834e5839db141902 19-Jul-2011 Deckard Autoverifier <deckard@android.com> am b7f0d825: am 691257b1: am 68e37dac: am 55f115a3: Merge "stagefright: Only use __int64 on MSVC, not on all win32 compilers"

* commit 'b7f0d825c56dced10bb7df7cfc624ef9ebffe21c':
stagefright: Only use __int64 on MSVC, not on all win32 compilers
0ab6faaca562abcb1d116824198388f5a3c8c73d 19-Jul-2011 Deckard Autoverifier <deckard@android.com> am 2acddc54: am 89bac182: am 88409911: Merge "stagefright: Include stdlib.h for malloc/free"

* commit '2acddc54e1e7a9f41b4b5acc2e8984c46539425a':
stagefright: Include stdlib.h for malloc/free
9f8f2f857b5791b10f5da9b5cc04d3d8f7988c29 19-Jul-2011 Deckard Autoverifier <deckard@android.com> am 31140598: am 16db83c2: am eb07c531: Merge "stagefright amrwbenc: Remove a duplicate, unused file"

* commit '31140598866c668047fc6dede7944e146aa21a0a':
stagefright amrwbenc: Remove a duplicate, unused file
54b0ae0dc7ba9be652285250f4976d8db89c30ee 19-Jul-2011 Deckard Autoverifier <deckard@android.com> am 29fd8cdb: am 80ef1745: am c06c3603: Merge "stagefright aacenc: Make the mem_malloc function 64-bit safe"

* commit '29fd8cdbe554ca65c57dd9eea59dc57e3392acc3':
stagefright aacenc: Make the mem_malloc function 64-bit safe
c57d9ff30a5bff931f8ffa8d3fa390628268a8a8 19-Jul-2011 Deckard Autoverifier <deckard@android.com> am 691257b1: am 68e37dac: am 55f115a3: Merge "stagefright: Only use __int64 on MSVC, not on all win32 compilers"

* commit '691257b1812ffd8172b01c17b9ba23a48eb76594':
stagefright: Only use __int64 on MSVC, not on all win32 compilers
6f1dd23b28752fdf47795c6575c537943711b1c1 19-Jul-2011 Deckard Autoverifier <deckard@android.com> am 88409911: Merge "stagefright: Include stdlib.h for malloc/free"

* commit '88409911aebed6c3663e51d51fca67f527c0c2fb':
stagefright: Include stdlib.h for malloc/free
4a028164ee8ce74a7872ce4bcce196b70d9eb4e2 19-Jul-2011 Deckard Autoverifier <deckard@android.com> am eb07c531: Merge "stagefright amrwbenc: Remove a duplicate, unused file"

* commit 'eb07c531498f4dc881ad2b4d1a32cacab25950ff':
stagefright amrwbenc: Remove a duplicate, unused file
3bfc65a3ca36b2f1cec52b83e4f75147b41c27e0 19-Jul-2011 Deckard Autoverifier <deckard@android.com> am c06c3603: Merge "stagefright aacenc: Make the mem_malloc function 64-bit safe"

* commit 'c06c3603e09a85136eb97d1d8ba1a49fcebae93b':
stagefright aacenc: Make the mem_malloc function 64-bit safe
af7e9726a19d106494e96078dedfda7baaeb59cd 19-Jul-2011 Deckard Autoverifier <deckard@android.com> am 55f115a3: Merge "stagefright: Only use __int64 on MSVC, not on all win32 compilers"

* commit '55f115a3214343c826acf27fcbc4bf2927049083':
stagefright: Only use __int64 on MSVC, not on all win32 compilers
a77079f09897f27e97b073d3835fb4b62949a159 19-Jul-2011 Deckard Autoverifier <deckard@android.com> Merge "stagefright: Include stdlib.h for malloc/free"
24123b996366a20bedab4dffbc69c8e439fe04d3 19-Jul-2011 Deckard Autoverifier <deckard@android.com> Merge "stagefright amrwbenc: Remove a duplicate, unused file"
e625479f58d7d9234c8ae7cb0c0a604bf43a9115 19-Jul-2011 Deckard Autoverifier <deckard@android.com> Merge "stagefright aacenc: Make the mem_malloc function 64-bit safe"
aacb82162005eec4c06cba90389eded2c189a448 19-Jul-2011 Deckard Autoverifier <deckard@android.com> Merge "stagefright: Only use __int64 on MSVC, not on all win32 compilers"
bd8299bd5471902596cc2a27dc9404bda92edfe6 18-Jul-2011 Conley Owens <cco3@android.com> am 45ddd425: am 3edba93f: am 98fcc404: Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace"

* commit '45ddd42544167494cee7213ecddcb6f8057c86c0':
stagefright aacenc/amrwbenc: Remove trailing whitespace
3259fc9acfc740a30b3a52bf70fe6e402d2d1010 18-Jul-2011 Conley Owens <cco3@android.com> am 98fcc404: Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace"

* commit '98fcc4041d35831c7a65a6e2f0e61021e0fb37e2':
stagefright aacenc/amrwbenc: Remove trailing whitespace
ac04df0bbb3a1b9627cbc0eb298a596c665a3e7c 18-Jul-2011 Conley Owens <cco3@android.com> Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace"
db4d3717b4677b3239546a248dc0a7d82db4ba50 18-Jul-2011 Jean-Michel Trivi <jmtrivi@google.com> Merge "Add option to query hardware decoders only"
df57a0d6d3b0609e69ff79afa63fe44dfa91f6f5 18-Jul-2011 Jean-Michel Trivi <jmtrivi@google.com> Add option to query hardware decoders only

Add an option to OMXCodec::QueryCodecs() to filter out
software codecs.

Update stagefright command line tool to list the roles of codecs.

Change-Id: Icddb79118c30fe13cc3aea20f340174cc082c4e0
MXCodec.cpp
8dae4ca229d21f68f3ee76c76b49b6f0a47aad53 16-Jul-2011 Andreas Huber <andih@google.com> Always consider playlists corresponding to different bandwidths different.

Change-Id: I07bb3023af5046db93b4f8785eb90c6a4fb15b95
ttplive/LiveSession.cpp
a57a9a491272aa884494b2ec7854960827a73742 16-Jul-2011 James Dong <jdong@google.com> Do not wait forever for output buffers in OMXCodec.cpp and error out in case time out happens

o Deal with vendor codec hang bug

Change-Id: Ic8449afd43045f09a9e0bd3d1be9a320e59ccabe
MXCodec.cpp
4378ace44b9de477608a6c2fbf7134bc0345555f 15-Jul-2011 Gloria Wang <gwang@google.com> Merge "Use unsigned char to store table of contents retrieved from XING header. Our compiler treats char default to unsigned (trygon-eng on master branch). If I force "signed char" for the table of contents array, some MediaFramework tests for VBR mp3 would fail."
d75de03f90a17862b18a3d2404e7117d8c53dbbf 15-Jul-2011 Andreas Huber <andih@google.com> Merge "Refetch playlists according to the HLS specs, varying delay if playlists unchanged"
6fb40672ac0f0b2f479367fa0ba4e8944df06dad 15-Jul-2011 Gloria Wang <gwang@google.com> Use unsigned char to store table of contents retrieved from XING header.
Our compiler treats char default to unsigned (trygon-eng on master branch).
If I force "signed char" for the table of contents array, some MediaFramework
tests for VBR mp3 would fail.

Change-Id: I725e2d4dfe57ff36fdb1d65fe3184f7ab41ad695
INGSeeker.cpp
nclude/XINGSeeker.h
7e43a5a2dcfa9bc64ef477472a33c87a84695c09 15-Jul-2011 Andreas Huber <andih@google.com> Refetch playlists according to the HLS specs, varying delay if playlists unchanged

since the previous fetch.

Change-Id: I75e167a650c65a23e284381db5203beba7be7420
related-to-bug: 4983546
ttplive/LiveSession.cpp
nclude/LiveSession.h
3c76eaebad1e420937088e52ec89efcb76bb875d 15-Jul-2011 Glenn Kasten <gkasten@google.com> Merge "Bug 5031179 possible fix for assert in join"
dc3d6784c73882c888423f0cb9b4de1b14e1dc02 15-Jul-2011 James Dong <jdong@google.com> Merge "Revert "Add some logging to track down where ANR happens during MediaPlayer._release().""
a3f4d7f096e5c91dc6af085761b1459866c043d9 15-Jul-2011 James Dong <jdong@google.com> Revert "Add some logging to track down where ANR happens during MediaPlayer._release()."

This reverts commit a5293d1ca4459293f4993ea39c09ea703a022844.

Conflicts:

media/libstagefright/AwesomePlayer.cpp

Change-Id: I2a5960208a6780b9a44ab5cce0ffc0e2fb28f426
wesomePlayer.cpp
MXCodec.cpp
40d76d70587ed095692615b0a1b657da861f7ffc 15-Jul-2011 Glenn Kasten <gkasten@google.com> Bug 5031179 possible fix for assert in join

Change-Id: Id3a24c152579b8fdcfb9d66a11aa11579406a7ec
mx/OMX.cpp
6f93135e5c8945ad2589af0c01652bc104eae819 14-Jul-2011 Andreas Huber <andih@google.com> Merge "If audio startup fails while executing MediaPlayer::start() do NOT post an error"
5442cb59e8483e18b3a02400d431d167ea7074b3 14-Jul-2011 Andreas Huber <andih@google.com> If audio startup fails while executing MediaPlayer::start() do NOT post an error

notification, the error returned by MediaPlayer::start() will suffice.

Change-Id: I49bd8d42078f039e5e6d8d4fed4f7f55dc5ff82a
related-to-bug: 5020200
wesomePlayer.cpp
nclude/AwesomePlayer.h
15825c7b6f6b19092a5949b4e46aea4fa229932c 14-Jul-2011 James Dong <jdong@google.com> Merge "Support profile and level query for SW video decoders"
49c8340bd83cc5d64b1fcaed4afbda5fd4d74a3e 14-Jul-2011 Andreas Huber <andih@google.com> Merge "Remove legacy http support from stagefright, chromium is the new hotness."
0ee92ffd74ac8594b68aa3c73b341dc0c6330b3f 14-Jul-2011 Glenn Kasten <gkasten@google.com> Merge "OMX CallbackDispatcher uses C++ Thread not pthread"
dab718bba3945332dc75e268e1e7f0fe2eb91c4a 14-Jul-2011 Andreas Huber <andih@google.com> Remove legacy http support from stagefright, chromium is the new hotness.

Change-Id: I6725d42d38b91e6a1cbca43174870f445aeb3d99
ndroid.mk
TTPBase.cpp
TTPStream.cpp
uHTTPDataSource.cpp
houtcastSource.cpp
nclude/HTTPBase.h
nclude/HTTPStream.h
nclude/NuHTTPDataSource.h
tsp/ARTSPConnection.cpp
tsp/MyHandler.h
87e031caf905145cb6e362a8c60f02736b87deef 13-Jul-2011 Andreas Huber <andih@google.com> Remove old-style software decoders.

Change-Id: Ie0729d6a65470ffdc38229791f25a75a22c724d8
ndroid.mk
MXCodec.cpp
hreadedSource.cpp
odecs/aacdec/AACDecoder.cpp
odecs/aacdec/Android.mk
odecs/amrnb/dec/AMRNBDecoder.cpp
odecs/amrnb/dec/Android.mk
odecs/amrwb/AMRWBDecoder.cpp
odecs/amrwb/Android.mk
odecs/avc/dec/AVCDecoder.cpp
odecs/avc/dec/Android.mk
odecs/g711/dec/Android.mk
odecs/g711/dec/G711Decoder.cpp
odecs/m4v_h263/dec/Android.mk
odecs/m4v_h263/dec/M4vH263Decoder.cpp
odecs/mp3dec/Android.mk
odecs/mp3dec/MP3Decoder.cpp
odecs/on2/dec/Android.mk
odecs/on2/dec/VPXDecoder.cpp
odecs/vorbis/dec/Android.mk
odecs/vorbis/dec/VorbisDecoder.cpp
nclude/ThreadedSource.h
350d9162155e1f3eab1821f5eeed762faa01f0cc 13-Jul-2011 Iliyan Malchev <malchev@google.com> Merge "Add support for TI H264 encoder"
1374eddc4455b26d1dffdca10fc70534b3f08c1d 12-Jul-2011 Dandawate Saket <dsaket@ti.com> Add support for TI H264 encoder

Add support for TI H264 encoder and quirks for buffer allocation.
Temporary switching to baseline profile till ctts patch is defaulted
as per profile detection.

Change-Id: I1d56184b9c5d5f00d6c63aef7e058f3d56b84cef
Signed-off-by: Dandawate Saket <dsaket@ti.com>
Signed-off-by: Iliyan Malchev <malchev@google.com>
ameraSource.cpp
PEG4Writer.cpp
MXCodec.cpp
ca9718b81d1edb3d094a11502737293dcb7526e7 24-Jun-2011 Glenn Kasten <gkasten@google.com> OMX CallbackDispatcher uses C++ Thread not pthread

This permits leveraging future improvements to Thread.

Change-Id: I45e25a309e7edd1d4f0dacc5ec987329afa497d9
nclude/OMX.h
mx/OMX.cpp
5e0067b486c3862316aa1f293cf9690c0cf54bda 12-Jul-2011 Jeff Brown <jeffbrown@google.com> Remove the simulator target from all makefiles.
Bug: 5010576

Change-Id: I04d722f258951a3078fe07899f5bbe8aac02a8e8
ndroid.mk
hromium_http/Android.mk
mx/Android.mk
3623b481fa2734b95d4553dafabca931e5d0502a 11-Jul-2011 James Dong <jdong@google.com> Merge "Do not wait for unlaunched threads in stop()"
411ba422e3635d534928ffd81abf54f4f291c739 09-Jul-2011 James Dong <jdong@google.com> Do not wait for unlaunched threads in stop()

Change-Id: If681749753bb96ee98c1539658cfd919eeb0cb65
PEG4Writer.cpp
fcf0efd3919435cb27091a8af6db3de35b6899ba 11-Jul-2011 James Dong <jdong@google.com> Merge "Release camera if CameraSource::start() has not been called"
457116d3a01618acf9a875020ca5860551ba03a6 11-Jul-2011 James Dong <jdong@google.com> Support profile and level query for SW video decoders

Change-Id: I9c20db128be96cd36cf2083e08e8c21f5e6d1fdf
odecs/avc/dec/SoftAVC.cpp
odecs/m4v_h263/dec/SoftMPEG4.cpp
odecs/on2/h264dec/SoftAVC.cpp
ae4c1ac6401185539c03ce0819e174fd1b04b136 09-Jul-2011 James Dong <jdong@google.com> Release camera if CameraSource::start() has not been called

Change-Id: I2f7e4b8501db3d80b9aa6f99d896d778bec29e8c
ameraSource.cpp
d552b88515c6ccd18695e5db5e6032a6425d8c63 08-Jul-2011 James Dong <jdong@google.com> Use advertised h264 encoding parameters by default if the profile is not baseline

o Force to use AVC baseline profile for camcorder low quality videos

Change-Id: I3424c57dd0c55fc4991f5767b57695c8f3420ecb
MXCodec.cpp
5895e970ae119210773a5184c019178e2516b132 06-Jul-2011 Gloria Wang <gwang@google.com> Merge "- Retrieve is_drm in MediaMetadataRetriever. - Add one more column in MediaStore to indicate whether a media file is drm-protected. - Remove old DRM code from Ringtone - Use the new DRM code in RingtoneManager"
0d0edfb024f65f7e1097bf1814ae229ce9cb367d 27-Jun-2011 Gloria Wang <gwang@google.com> - Retrieve is_drm in MediaMetadataRetriever.
- Add one more column in MediaStore to indicate whether a
media file is drm-protected.
- Remove old DRM code from Ringtone
- Use the new DRM code in RingtoneManager

Change-Id: I1311fd1c04841c2cd47df6c901589966cf55a692
PEG4Extractor.cpp
ediaExtractor.cpp
tagefrightMediaScanner.cpp
tagefrightMetadataRetriever.cpp
nclude/MPEG4Extractor.h
d26edf9435bf5bdb43b5a1f71192bb1477a1cc7f 02-Jul-2011 Glenn Kasten <gkasten@google.com> Merge "Bug 4571308 Provide correct video frame timestamps"
13b263c0fb2f03f12089150c3d05b545c25257ca 01-Jul-2011 Andreas Huber <andih@google.com> Merge "Charge network traffic to the uid of the process using the MediaPlayer."
ea317826269a1faecc2c61b76e2dab9bb7e70a62 01-Jul-2011 Andreas Huber <andih@google.com> Merge "Ignore all flush-complete notifications with port == OMX_ALL"
9b80c2bdb205bc143104f54d0743b6eedd67b14e 01-Jul-2011 Andreas Huber <andih@google.com> Charge network traffic to the uid of the process using the MediaPlayer.

Change-Id: I2bcb54b8232afd3fc7ee16289f37c7a7b3f23067
related-to-bug: 4517282
wesomePlayer.cpp
TTPBase.cpp
TTPStream.cpp
uHTTPDataSource.cpp
ttplive/LiveSession.cpp
nclude/ARTSPController.h
nclude/AwesomePlayer.h
nclude/HTTPBase.h
nclude/HTTPStream.h
nclude/LiveSession.h
tsp/ARTSPConnection.cpp
tsp/ARTSPConnection.h
tsp/ARTSPController.cpp
tsp/MyHandler.h
0af941927ef8f35f2da5380dfd8d04b7f4ed3532 01-Jul-2011 Andreas Huber <andih@google.com> Ignore all flush-complete notifications with port == OMX_ALL

Use of this notification is not consistent across
implementations. We'll drop this notification and rely
on flush-complete notifications on the individual port
indices instead.

Change-Id: I76c0dfdcfc92a7c9acf57abf3027d2638d77efca
Codec.cpp
577dd43e0a80b4ccc621d52f06fea0761fc7f602 01-Jul-2011 Andreas Huber <andih@google.com> Merge "Support a "secure input buffer" mode for use by Widevine DRM in OMXCodec."
0bb6b4c5da2451ee0973372b0a3858b15c742689 30-Jun-2011 Andreas Huber <andih@google.com> Support a "secure input buffer" mode for use by Widevine DRM in OMXCodec.

Change-Id: Ie03b285265099dbac9b12f3f41d9ad758d0b50ad
MXCodec.cpp
3edf4509ad62582c682cbcf572396da4036506a3 01-Jul-2011 Edwin Wong <edwinwong@google.com> Merge "Revert "Fix for b/4165024: Serious Memory leak when playing a WV protected streaming video.""
ab23dc0443e874a82110119896cce0103d89a529 01-Jul-2011 James Dong <jdong@google.com> Merge "Return ERROR_END_OF_STREAM when the input source reaches eos"
cebcdaef5b559f4db2a9d8b305d9d7da03525b62 01-Jul-2011 Kristian Monsen <kristianm@google.com> Merge changes I7e8401a4,I412ddf36

* changes:
Merge Chromium at r11.0.696.0: New autofill strings
Merge Chromium at r11.0.696.0: Using setter instead of direct variable access
e301545a292987b6f7f3b316003eb8b76e3a5e2e 01-Jul-2011 Jeff Tinker <jtinker@google.com> Revert "Fix for b/4165024: Serious Memory leak when playing a WV protected streaming video."

This reverts commit d63d947d406977c7c307f69369908b4342c98ef3
VMExtractor.cpp
nclude/WVMExtractor.h
0f30bd90272c818aa37c0bb22d22eaa7d3689879 01-Jul-2011 Andreas Huber <andih@google.com> Seeking/duration in HLS content is based on the individual segments' duration

not target-duration.

Change-Id: I294097daa84c25e4084a6fc4ea80e39a543f3d10
related-to-bug: 4983285
ttplive/LiveSession.cpp
ttplive/M3UParser.cpp
69c2b29eb72396068b9d116c2a54f283025c7d6b 30-Jun-2011 Andreas Huber <andih@google.com> Merge "Revert "Parse RTP-Info even for live streams.""
ac5767a96df9fae46a37ffba62611472135a0f6d 30-Jun-2011 Andreas Huber <andih@google.com> Revert "Parse RTP-Info even for live streams."

This reverts commit d873413ff9f742f259c29d7d0b58265db6b24529.
tsp/ASessionDescription.cpp
tsp/MyHandler.h
e5bf6409774fe73f968b7db215f535b64de66139 30-Jun-2011 Andreas Huber <andih@google.com> Some (most) OMX decoders do not send a OMX_CmdComplete/Flush OMX_ALL notification

Change-Id: I1bdcc7be5f12dab301891a5f9ee5cc981e09ba82
Codec.cpp
ba499b591db0e26081e38545493144755eb72fff 30-Jun-2011 James Dong <jdong@google.com> Return ERROR_END_OF_STREAM when the input source reaches eos

Change-Id: I334313b054dcf388d2e05d56efb10ceea4980638
odecs/avc/enc/AVCEncoder.cpp
odecs/m4v_h263/enc/M4vH263Encoder.cpp
4ea52aea75c385e8d9de8cc04554aa5d93ca272b 29-Jun-2011 Andreas Huber <andih@google.com> Merge "Fix a format string that triggered a compile-time warning in OMXCodec.cpp"
0055e9e1c67e4614135da2cc0866caf3e7bfa3d6 28-Jun-2011 Andreas Huber <andih@google.com> Fix a format string that triggered a compile-time warning in OMXCodec.cpp

Change-Id: Ib4b6cce1b4102034605da8edfb0dd8bc9a578168
MXCodec.cpp
553f66e21be6e11120460830fc78793a4d11b465 20-Jun-2011 Andreas Huber <andih@google.com> Instantiate a NetworkChangeNotifier to have chromium transparently handle interface

changes.

Change-Id: If48d2934ce29d68b9c31a1d120fe8f134f277a33
hromium_http/support.cpp
63d794763a680c29edccce3a6fac3d6d9c13c8e3 27-Jun-2011 Kristian Monsen <kristianm@google.com> Merge Chromium at r11.0.696.0: Using setter instead of direct variable access

Members in UrlRequestContext was made private in upstream CL:
http://src.chromium.org/viewvc/chrome/trunk/src/net/url_request/url_request_context.h?view=diff&pathrev=77261&r1=75164&r2=75165

Change-Id: I412ddf36b0818e59b9b3ae428407d562facd4785
hromium_http/support.cpp
95068be1426dc0a4dc856cf9e35550c31b901711 29-Jun-2011 Wu-cheng Li <wuchengli@google.com> Unlock the camera if media recorder fails to start recording.

bug:4965716

Change-Id: Icb1f7f18e9ea6c4f0427ade2ed338e7d56be5e01
ameraSource.cpp
3e1763ecdf14769a534f75e94a56785f63174b47 28-Jun-2011 Andreas Huber <andih@google.com> Support for writing output data to a provided callback function instead of a file

in MPEG2TSWriter

Change-Id: Ie54a5677c7b789a973aa50b7f197c6db238425bc
PEG2TSWriter.cpp
0a932b40bdc8c427ff275426ee19960d8648021d 28-Jun-2011 Andreas Huber <andih@google.com> Merge "Multiple changes to ACodec/codec tools:"
1065b3f17d3048948e7d522049d1980b90df3dc1 28-Jun-2011 Andreas Huber <andih@google.com> Multiple changes to ACodec/codec tools:

Make sure sf2 does not coalesce input buffers, generalize ACodec's codec
instantiation based on OMXCodec's list of eligible component names.

Some changes/additions to the "sf2" commandline tool

Make surface options consistent with stagefright tool, i.e. use '-S' instead of '-s'
New option '-R' renders surface-allocated buffers.

Also fixes a longstanding bug introduced when generalizing from surfaces to native windows that never used surface-allocated buffers in sf2 even when the option was specified.

Change-Id: I59fd533f0f6ef0337ebe2806ddc81a46878eb3ae
Codec.cpp
306bafcd7cabeb9059e066296cd225b8b03968a2 28-Jun-2011 Jeff Tinker <jtinker@google.com> Merge "Fix for b/4165024: Serious Memory leak when playing a WV protected streaming video."
50255a92dfb2ffd35955035ae9ac9d4b85f606b8 27-Jun-2011 Jeff Tinker <jtinker@google.com> Fix for b/4165024: Serious Memory leak when playing a WV protected streaming video.

This change allows the WVM extractor to close and reopen when not in use which resolves
the issue with heap fragmentation between plays.

Change-Id: I160ee1e98aada2bfdd0818eeb6300ad50644fb75
VMExtractor.cpp
nclude/WVMExtractor.h
34bac59216838c056ffc27fa8dc9c0bf583eaf82 27-Jun-2011 Andreas Huber <andih@google.com> Merge "Fix the new color converter to respect the destination crop rect."
e5b2a43058438da3f5795dd9abf9419d640a004f 27-Jun-2011 Andreas Huber <andih@google.com> Merge "Log video dimensions and crop rectangle."
bab4b56c93a3fc26767687bffd5d10c5250b35ea 27-Jun-2011 Andreas Huber <andih@google.com> Merge "Update paths to test content used to run the omx_tests."
593e2773f616a926af45e74359e21a898c89875f 27-Jun-2011 Glenn Kasten <gkasten@google.com> Bug 4571308 Provide correct video frame timestamps

Change-Id: I0f726817fc02d3e2a4cf82ed801ef977994e6bcc
wesomePlayer.cpp
b1af69b8f91cf71bef79f56faf981f9a77e507b6 27-Jun-2011 James Dong <jdong@google.com> Merge "Reduce the number of output buffers and force output buffers in display order for SoftAVC decoder"
3571d50a2582bc9c63f09cd81b4f490ea3522bd9 24-Jun-2011 Andreas Huber <andih@google.com> Fix the new color converter to respect the destination crop rect.

Also fixes the SoftwareRenderer to request blitting the correct crop rectangles.

Change-Id: I38706cf9b42d96c6d5b35a9380f006ea4fbbf1ea
olorconversion/ColorConverter.cpp
olorconversion/SoftwareRenderer.cpp
nclude/SoftwareRenderer.h
884946a23cfe804491ef6067bd9361371d7848fd 24-Jun-2011 Andreas Huber <andih@google.com> Log video dimensions and crop rectangle.

Change-Id: Ia56b09df4f6e9a14c4dcc499a6637fc39f8e3bb5
MXCodec.cpp
078f12ed36b71a5fa7654b774369090b98cc684c 24-Jun-2011 Andreas Huber <andih@google.com> Update paths to test content used to run the omx_tests.

Change-Id: I23201ac1541df032426cb05b9dc872b28882f992
mx/tests/OMXHarness.cpp
4ca2c7c913f8bd4ada13aca56d36045d42d1e00f 01-Jun-2011 Wu-cheng Li <wuchengli@google.com> Add framework support for camcorder zoom.

The purpose of ICameraRecordingProxy and ICameraRecordingProxyListener is to
allow applications using the camera during recording.

Camera service allows only one client at a time. Since camcorder application
needs to own the camera to do things like zoom, the media recorder cannot
access the camera directly during recording. So ICameraRecordingProxy is a proxy
of ICamera, which allows the media recorder to start/stop the recording and
release recording frames. ICameraRecordingProxyListener is an interface that
allows the recorder to receive video frames during recording.

ICameraRecordingProxy
startRecording()
stopRecording()
releaseRecordingFrame()

ICameraRecordingProxyListener
dataCallbackTimestamp()

The camcorder app opens the camera and starts the preview. The app passes
ICamera and ICameraRecordingProxy to the media recorder by
MediaRecorder::setCamera(). The recorder uses ICamera to setup the camera in
MediaRecorder::start(). After setup, the recorder disconnects from camera
service. The recorder calls ICameraRecordingProxy::startRecording() and
passes a ICameraRecordingProxyListener to the app. The app connects back to
camera service and starts the recording. The app owns the camera and can do
things like zoom. The media recorder receives the video frames from the
listener and releases them by ICameraRecordingProxy::releaseRecordingFrame.
The recorder calls ICameraRecordingProxy::stopRecording() to stop the
recording.

The call sequences are as follows:
1. The app: Camera.unlock().
2. The app: MediaRecorder.setCamera().
3. Start recording
(1) The app: MediaRecorder.start().
(2) The recorder: ICamera.unlock() and ICamera.disconnect().
(3) The recorder: ICameraRecordingProxy.startRecording().
(4) The app: ICamera.reconnect().
(5) The app: ICamera.startRecording().
4. During recording
(1) The recorder: receive frames from ICameraRecordingProxyListener.dataCallbackTimestamp()
(2) The recorder: release frames by ICameraRecordingProxy.releaseRecordingFrame().
5. Stop recording
(1) The app: MediaRecorder.stop()
(2) The recorder: ICameraRecordingProxy.stopRecording().
(3) The app: ICamera.stopRecording().

bug:2644213

Change-Id: I15269397defc25cbbcae16abc071c8349c123122
ameraSource.cpp
ameraSourceTimeLapse.cpp
486247017e0bfb9db9994a53a28c0dacfebf8567 18-Jun-2011 James Dong <jdong@google.com> Reduce the number of output buffers and force output buffers in display order for SoftAVC decoder

Change-Id: I9ec6d8205e7a56e42d5b5799a6c2e31076d24b81
odecs/on2/h264dec/SoftAVC.cpp
odecs/on2/h264dec/SoftAVC.h
c5a57efb706ec79032fc09c43b16d11ed0876604 22-Jun-2011 Anu Sundararajan <sanuradha@ti.com> Stagefright: add support for gralloc OMX_UseBuffer.

XXX: This change should go along with a documentation change to
HardwareAPI.h that describes the new extension.

This change adds support for passing a buffer_handle_t to OMX_UseBuffer
during OMXCodec initialization. This new way of passing the
buffer_handle_t's replaces the old OMX_SetParameter-based approach, and
this change deprecates that interface, but still supports it for OMX IL
implementations that do not support the new interface.

Change-Id: If9c1cb3c6c349c54dab094aeb8af13eae9f85271
Signed-off-by: Jamie Gennis <jgennis@google.com>
Signed-off-by: Sarthak Aggarwal <sarthak@ti.com>
nclude/OMXNodeInstance.h
mx/OMXNodeInstance.cpp
cb62bc3fe54222cf05824e6f98fefafee552049a 22-Jun-2011 Anu Sundararajan <sanuradha@ti.com> Integrating TI OMAP4 Video Decoder

Added the video decoder component name to kDecoderInfo.
Set the quirks for the video decoder.
Add a new color format to OMX_IVCommon.h to denote TI OMAP4 NV12 color format.
Added a color conversion routine [ from NV12 to RGB ] for thumbnail generation.

Change-Id: I6b23c36441645ef65ec7406ba262d19f89cf64fd
Signed-off-by: Devaraj Rangasamy <dev@ti.com>
Signed-off-by: Sreenidhi Koti <sreenidhi@ti.com>
Signed-off-by: Anu Sundararajan <sanuradha@ti.com>
MXCodec.cpp
olorconversion/ColorConverter.cpp
06371d97f549981cd2d524c8868fde2ef10dc1e9 23-Jun-2011 Andreas Huber <andih@google.com> Merge "Parse RTP-Info even for live streams."
17e5dcbf4b22a7dc1ae1a72d14cf5f8d747f1123 23-Jun-2011 Martin Storsjo <martin@martin.st> stagefright amrwbenc: Remove a duplicate, unused file

This file is identical to common/cmnMemory.c, and that's the
file that is used by all the makefiles, not this one.

Change-Id: I6a601c24a983285e55e5356bd5569853a1e2d7fe
odecs/amrwbenc/src/cmnMemory.c
10774791af82faacb12307d3d7d79c80afc96574 22-Jun-2011 Gloria Wang <gwang@google.com> Merge "Timed text display format support: 1. Extract 3GPP global format descriptions 2. Extract 3GPP local format descriptions 3. Define data structure (TimedText) for applications to retrieve the format metadata"
2a4592119fe1d303fff2f268fffe7a84f38f8027 22-Apr-2011 Martin Storsjo <martin@martin.st> stagefright: Only use __int64 on MSVC, not on all win32 compilers

Change-Id: I9eef7e1cb762753b792ab602333dc5a2fd8a173c
odecs/common/include/voType.h
267dbd822ff060843ce409c0f1b50f6d5468ea31 22-Dec-2010 Martin Storsjo <martin@martin.st> stagefright aacenc: Make the mem_malloc function 64-bit safe

Change-Id: I720109133bf5e13388b26a3bdbd66ff1f5320b70
odecs/aacenc/src/memalign.c
ea1b2a40def72caa03a40460bf04911b0d9b4d46 22-Dec-2010 Martin Storsjo <martin@martin.st> stagefright: Include stdlib.h for malloc/free

According to ANSI C, malloc/free are provided by stdlib.h.

Also, string.h is always available according to ANSI C, and provides
the memset function, so there's no need to include it conditionally
for linux only.

This makes the code buildable on OS X, too.

Change-Id: Ie5d1da02158797e7e45dea257cbe3e4996dde4db
odecs/common/cmnMemory.c
3b573f7bf1c5736d500e39013b8d32478a1429e6 01-Jun-2011 Gloria Wang <gwang@google.com> Timed text display format support:
1. Extract 3GPP global format descriptions
2. Extract 3GPP local format descriptions
3. Define data structure (TimedText) for applications to
retrieve the format metadata

Change-Id: I6eac2a78df29ee15beee456656331fdd83b24e8e
PEG4Extractor.cpp
imedtext/Android.mk
imedtext/TextDescriptions.cpp
imedtext/TextDescriptions.h
imedtext/TimedTextPlayer.cpp
imedtext/TimedTextPlayer.h
45c254c0c535e1d62f23d14cab7385d536c1e2bf 22-Jun-2011 James Dong <jdong@google.com> Add some error log messages to indicate the failure of a recording session

Change-Id: I8c5885200bcf6a59736076efc021f07f45a0fdac
PEG4Writer.cpp
6ef9a104959c1d15232fe3a319e4a270eed3ddb5 22-Jun-2011 James Dong <jdong@google.com> Merge "Timestamp adjustment will not work well if we ask video encoder to produce B frames"
f2ab12d0dcef27fd52dcae53221e9c51a369fef6 04-Jun-2011 James Dong <jdong@google.com> Timestamp adjustment will not work well if we ask video encoder to produce B frames

Change-Id: Ic6a2235fefb6f15081091e1f2c1b12ee92fba5e0
PEG4Writer.cpp
81eacb8bbf331501bb68c7f1fdd7ca1811b03f8f 21-Jun-2011 Andreas Huber <andih@google.com> Log an error instead of asserting if the OMX plugin reports an error.

Change-Id: I2bae80706495c5c5d4257cd607c2141c070c5ff9
mx/OMXMaster.cpp
fb6c6167c81c6ade0956d05924eebdeeec65d973 21-Jun-2011 Andreas Huber <andih@google.com> Merge "Don't assert on malformed .mp4 content that contains fewer samples than"
440060f943d9dab6cc5060a6e3159e173d52d9f7 21-Jun-2011 James Dong <jdong@google.com> Merge "Boost software vp8 decoder performance using multi-threaded decoding if possible"
9067e30b3ccb3a07e41b61af22c036378053a9a3 21-Jun-2011 Andreas Huber <andih@google.com> Parse the individual segment's duration as a floating point number which is now

allowed in later HLS specs.

Change-Id: I7c8296acb4e9b0f80022f3057769de0eea9ee0c6
related-to-bug: 4779022
ttplive/LiveSession.cpp
ttplive/M3UParser.cpp
nclude/M3UParser.h
65a2670e84f44f6cdd80d625a7248fc65319ab8c 21-Jun-2011 Andreas Huber <andih@google.com> Don't assert on malformed .mp4 content that contains fewer samples than

described in the time-to-sample box.

Change-Id: Ic6f973212c15012a25f6e849759fd4f14d97e30f
related-to-bug: 4779053
ampleTable.cpp
551e95607ce83c0d491a2c12cdae4aa92197dc2c 21-Jun-2011 Andreas Huber <andih@google.com> Merge "Restore legacy soft-aac decoder behaviour. Substitute silence on decode error."
122baae2f2aedca38fab723f7ad672044b0ce413 21-Jun-2011 Andreas Huber <andih@google.com> Restore legacy soft-aac decoder behaviour. Substitute silence on decode error.

Change-Id: I680ccaabef32b1319819f723260cb3789585f09e
related-to-bug: 4579486
odecs/aacdec/SoftAAC.cpp
c0fc64242a504a6c72670b0db2d648d2a3e208d2 21-Jun-2011 Andreas Huber <andih@google.com> Merge "OGG: To prevent mediaserver from crash by SIGFPE (divide by zero) and more guarding in getMetaData()."
8c67a583db53eebe65bd0c3abb41909c60a02eb0 20-Jun-2011 James Dong <jdong@google.com> Merge "When a recording session is stopped, no outstanding input video frames exist for the output buffers returned from OMX component to SF."
03168ed2f76e12e5dd41740697ea8206759924c1 20-Jun-2011 James Dong <jdong@google.com> When a recording session is stopped, no outstanding input video frames exist for the output buffers returned from OMX component to SF.

When this happens, default value of 0 will be used for the "decoding" time for these output buffers.
These buffers do not contain valid media data anyway.

related-to-bug: 4725803

Change-Id: I0eaf248bb2ac022ff072eaffd0ed3f21171f824e
MXCodec.cpp
f3ac3e3c94c14dbf1cdf6a4577f0b3aa8edfad06 18-Jun-2011 James Dong <jdong@google.com> Boost software vp8 decoder performance using multi-threaded decoding if possible

Change-Id: I7258c7d0cf91aa7c62444d03ed8bce96fb23d8ef
related-to-bug: 4539653
odecs/on2/dec/SoftVPX.cpp
a6925e6149faf4a936a5b557a769d117454413d8 01-Jun-2011 Andreas Huber <andih@google.com> Parse RTP-Info even for live streams.

Change-Id: Ib2c39ce8d5366f5ea350e71b7a54f5f7c2b510b9
tsp/ASessionDescription.cpp
tsp/MyHandler.h
e6ebb09642944b1d0cc06a788308e9b843dee595 20-Jun-2011 Glenn Kasten <gkasten@google.com> Merge "Remove unneeded #include <sys/resource.h>"
f9fb13966a8e6ba039e88a46d096cd1cce2eb283 17-Jun-2011 Dongwon Kang <dwkang@google.com> OGG: To prevent mediaserver from crash by SIGFPE (divide by zero) and more guarding in getMetaData().

BUG:4689872
Change-Id: I483bf230b5571a8d1815b954dce2c52e9a5f1f37
ggExtractor.cpp
05e65807d48c2c7b954af82eda0532a48948e96a 18-Jun-2011 James Dong <jdong@google.com> Use system property to control whether we will enable B frame support in MPEG4Writer

o This is to work around a bug in crespo's video encoder output timestamp

related-to-bug: 4600191,4724339

Change-Id: I485c1e044bd2f604b318692efd6433345cfc6487
PEG4Writer.cpp
b8e9897b8ad5d722e424d7a7e256153307ecbd93 15-Jun-2011 Glenn Kasten <gkasten@google.com> Remove unneeded #include <sys/resource.h>

Suggested in code review for previous change.

Change-Id: Ic3225b240367dc6c9bf56fb4498fb8a0f9f806ec
ACWriter.cpp
MRWriter.cpp
PEG4Writer.cpp
imedEventQueue.cpp
mx/OMX.cpp
fce442c23e65fa1973947df683eec9a5c36057a5 15-Jun-2011 Kristian Monsen <kristianm@google.com> Merge "Merge chromium to r11.0.672.0: Compile fix"
7b92cb6aecba28927ed5d66ec1ba0a9f496477f0 15-Jun-2011 Glenn Kasten <gkasten@google.com> Merge "Bug 4608375"
a307c3371987a864a4f066b84f9ffb8ab803b41f 15-Jun-2011 James Dong <jdong@google.com> Merge "Enforce the rule that the timestamp from timelapse video source monotically increases"
86106f8b0641444c97a39e9788eeef55ab2a2ac6 14-Jun-2011 Glenn Kasten <gkasten@google.com> Bug 4608375

Update priority and policy together for audio threads

Change-Id: Ib3b07b32586c222c4aacbf23414ae8b05db502be
PEG4Writer.cpp
imedEventQueue.cpp
mx/OMX.cpp
1fc87828715ef5cda402f1960231621672f91513 14-Jun-2011 James Dong <jdong@google.com> Enforce the rule that the timestamp from timelapse video source monotically increases

Change-Id: Ie5ccb43e0192420300da58525ec52af7544e8e9e
ameraSourceTimeLapse.cpp
965e4239ca1cf6c824c1f8ce23116f9ba8cf6ebd 08-Jun-2011 James Dong <jdong@google.com> Add B frame support for MPEG4Writer

o requires the support of negative ctts duration values (ctts version 1)

Change-Id: Ib14130c9359c3bff3c76f20a7380d468a065dcaf
PEG4Writer.cpp
MXCodec.cpp
79761ab096f57c3027fad9556c2bc436672d614e 07-Jun-2011 James Dong <jdong@google.com> Avoid duplicated code calculating the stts sample duration

o This also speeds up the MediaRecorder.stop() call.
o Also fix incorrect start time compensation in stts box

Change-Id: I6392b8b980e0f786ddeeec0fe2c341de67208c6f
PEG4Writer.cpp
d5fee4df48a1a2d24219ef892230621396d9ab9d 10-Jun-2011 James Dong <jdong@google.com> Merge "Call storeMetaDataInVideoBuffers() before get/setParameters() on index OMX_IndexParamPortDefinition"
b8df88558caf8f66ce432974705afe00bf00928d 10-Jun-2011 James Dong <jdong@google.com> Merge "Correctly handle crop rect event in SoftAVC.cpp"
e94a0e6973735e34b743fb1eef609ddb2c2ff4f6 10-Jun-2011 Andreas Huber <andih@google.com> Merge "Make dumpsys(media.player) more useful by having AwesomePlayer populate it."
870e9f714acdf680cdd32d1bfe849a90637d2ec5 10-Jun-2011 Marco Nelissen <marcone@google.com> am 6a91953c: am 90dc22fa: am a02d9bf9: Make sure we don\'t read from invalid fds

* commit '6a91953cc9bb8a48d867cc53e3cf5286d9a2f5ac':
Make sure we don't read from invalid fds
e9f6d0579603372fd2547e6c5ba6e114c6f8cba7 10-Jun-2011 James Dong <jdong@google.com> Fix an issue in MPEG4Writer where the write of outstanding chunks in the last batch was missing

Change-Id: I93c9f6ae7ed098cdf828b2b11a9273c9e0c244e3
PEG4Writer.cpp
abcd31d61be0542cdd60542081c7d7d3526bf987 10-Jun-2011 James Dong <jdong@google.com> Merge "Add timestamp and data pointer checks in CameraSource"
4c2e9437c6a0bdf7e166a6e3a0987ba41bf31889 09-Jun-2011 James Dong <jdong@google.com> am 2488a943: am e3b80c83: Merge "Revert "Add avg bandwidth estimate every 2 seconds - do not merge."" into honeycomb-mr2

* commit '2488a94350e0c0b088da2646557c9a0f3a0e9847':
Revert "Add avg bandwidth estimate every 2 seconds - do not merge."
695d014c6feb0751132e999082ebcb7e089a3245 09-Jun-2011 Conley Owens <cco3@android.com> am 644f36ea: am d8b027b1: Merge "stagefright aacenc/amrwbenc: Convert line breaks to Unix style"

* commit '644f36eab4eb9911ad897c9caae68b9c5a72388f':
stagefright aacenc/amrwbenc: Convert line breaks to Unix style
dab863f7585a2b2c2e10119afd7c4bab1e920afd 09-Jun-2011 Conley Owens <cco3@android.com> am d8b027b1: Merge "stagefright aacenc/amrwbenc: Convert line breaks to Unix style"

* commit 'd8b027b18f5a922ef729c6ee363eecb053358d47':
stagefright aacenc/amrwbenc: Convert line breaks to Unix style
635dbf9f98fe65734aff8a3f4786987525882d71 09-Jun-2011 James Dong <jdong@google.com> am e3b80c83: Merge "Revert "Add avg bandwidth estimate every 2 seconds - do not merge."" into honeycomb-mr2

* commit 'e3b80c838753fe8c9049950216c6379098465810':
Revert "Add avg bandwidth estimate every 2 seconds - do not merge."
8d9a6e7b93ca96d6cf0f201ff5b139423e4d1d1f 09-Jun-2011 James Dong <jdong@google.com> Merge "Revert "Add avg bandwidth estimate every 2 seconds - do not merge."" into honeycomb-mr2
cbaae3bfbd3a96aef34bb996e9e11945e18fdfc8 09-Jun-2011 Marco Nelissen <marcone@google.com> am 90dc22fa: am a02d9bf9: Make sure we don\'t read from invalid fds

* commit '90dc22fa09c4cddb94926b8a8f08fd3d0a404f7f':
Make sure we don't read from invalid fds
639ffaca514deb9de538bc2dc6e712380db68fd3 09-Jun-2011 James Dong <jdong@google.com> Correctly handle crop rect event in SoftAVC.cpp

Width and height of the video frame was incorrectly overwritten when a cropping need was detected. Using a separate
crop width and crop height resolves the problem.

Change-Id: I8a371c7fe7f8417a7995d7a7fe231120274ea0c8
related-to-bug: 4575591
odecs/on2/h264dec/SoftAVC.cpp
odecs/on2/h264dec/SoftAVC.h
2c32a92c84445d312b0dee4c82f84c036f2ca651 09-Jun-2011 Conley Owens <cco3@android.com> Merge "stagefright aacenc/amrwbenc: Convert line breaks to Unix style"
30215039c4089648da02193981f6443776f2389a 09-Jun-2011 Marco Nelissen <marcone@google.com> am a02d9bf9: Make sure we don\'t read from invalid fds

* commit 'a02d9bf9c3ff22cd449da21ff7c23170488ebd8e':
Make sure we don't read from invalid fds
2bb7e36e78521f49d2550aab34b34c25c23f7435 09-Jun-2011 Marco Nelissen <marcone@google.com> Make sure we don't read from invalid fds

b/4580570

Change-Id: I622f001551a404a7a840d8388a9febac2db107ad
TTPStream.cpp
a0b1d4b161599c2bb2a47119e50c51e75bbe980e 08-Jun-2011 Andreas Huber <andih@google.com> Make dumpsys(media.player) more useful by having AwesomePlayer populate it.

Change-Id: I12ba7d542331a8293d67a0d47378b8be4f777759
wesomePlayer.cpp
nclude/AwesomePlayer.h
103487c0cb5c06f47225484486a98bc84745a059 08-Jun-2011 Andreas Huber <andih@google.com> This device-specific workaround is no longer necessary.

We can now enable yuv->yuv blitting instead of converting to RGB565.

Change-Id: Ia6a94b706f20a0c9e6ef78a7325cff4f5bb216b8
related-to-bug: 4394005
olorconversion/Android.mk
olorconversion/SoftwareRenderer.cpp
f6e1ff257eb3c4f98587170d0c6367bf58cfb115 08-Jun-2011 James Dong <jdong@google.com> Call storeMetaDataInVideoBuffers() before get/setParameters() on index OMX_IndexParamPortDefinition

This can potentially save lot of memory for video recording use case since the video encoder
can advertise a much smaller size of the input buffers which are allocated by SF by default.

Change-Id: I582a356cd02c7852e13f2713d90ad5f1eb43177d
MXCodec.cpp
64125da2f3b76f2d88bb757cb6bf5bd5e29a0639 07-Jun-2011 Kristian Monsen <kristianm@google.com> Merge chromium to r11.0.672.0: Compile fix

Cause by upstream CL:
http://src.chromium.org/viewvc/chrome/trunk/src/net/url_request/url_request_context.h?r1=70592&r2=71522&pathrev=74924

Change-Id: Iada1639b7a38cee963644437e8e3f4f5708d6136
hromium_http/support.cpp
hromium_http/support.h
5ffc7628f0efa122207eec86473c3e23dbd17445 07-Jun-2011 James Dong <jdong@google.com> Merge "Fix the comment for the location box @xyz"
d5623ca906f64cc257cd695abd2a6b52b085f65f 04-Jun-2011 James Dong <jdong@google.com> Merge "Move OMX_QCOM_COLOR_FormatYVU420SemiPlanar definition to OMX_IVCommon.h"
20214f3908a6f085ea531c65496347953e2d25b6 04-Jun-2011 James Dong <jdong@google.com> Merge "Initial-checkin for ON2 Software AVC/H264 decoder"
98cfde007490a5903b729a4718c0dada755ae8f8 04-Jun-2011 James Dong <jdong@google.com> Add timestamp and data pointer checks in CameraSource

Change-Id: I99e188f631df2257813aa7ec657d6ecfc8859d9e
ameraSource.cpp
432ec3768cc4a3b1b01afedc456689d75c89ee2b 04-Jun-2011 James Dong <jdong@google.com> Fix the comment for the location box @xyz

Change-Id: I5347e346eef40a8ba90e7a3fa786b4654d18606b
PEG4Writer.cpp
57ca262f8d1c0aabeea294ddb53e4db172fc6bec 03-Jun-2011 James Dong <jdong@google.com> Move OMX_QCOM_COLOR_FormatYVU420SemiPlanar definition to OMX_IVCommon.h

Change-Id: I5cbc7246a63301fa7ff735fa3d6512e940608d2b
Codec.cpp
MXCodec.cpp
olorconversion/ColorConverter.cpp
158b194da537c18a6ad1d7ef3cd63c87b2310269 02-Jun-2011 Andreas Huber <andih@google.com> Merge "Don't advertise the (old-style) software decoders unless they're actually present."
2f0a8405f00a6e2e7e9f1cc47ac803ac01d5dfd5 02-Jun-2011 Andreas Huber <andih@google.com> Don't advertise the (old-style) software decoders unless they're actually present.

Change-Id: I3753a21e1a7de86432c9c087be9d52028e3a1e1b
MXCodec.cpp
0c1bc742181ded4930842b46e9507372f0b1b963 01-Jun-2011 James Dong <jdong@google.com> Initial-checkin for ON2 Software AVC/H264 decoder

o when neon is present, the performance gain of On2 AVC software decoder
over PV software decoder is more than 30%.

o In addition, it fixes some known PV software decoder issues like missing
output frames

o allow both pv and on2 software avc to be available for easy comparision

o change output frames from 8 to 16

Change-Id: I567ad1842025ead7092f0c47e3513d6d9ca232dd
MXCodec.cpp
odecs/on2/h264dec/Android.mk
odecs/on2/h264dec/SoftAVC.cpp
odecs/on2/h264dec/SoftAVC.h
odecs/on2/h264dec/inc/H264SwDecApi.h
odecs/on2/h264dec/inc/basetype.h
odecs/on2/h264dec/omxdl/arm11/ARM_DELIVERY.TXT
odecs/on2/h264dec/omxdl/arm11/ARM_MANIFEST.TXT
odecs/on2/h264dec/omxdl/arm11/api/armCOMM.h
odecs/on2/h264dec/omxdl/arm11/api/armCOMM_BitDec_s.h
odecs/on2/h264dec/omxdl/arm11/api/armCOMM_Bitstream.h
odecs/on2/h264dec/omxdl/arm11/api/armCOMM_IDCTTable.h
odecs/on2/h264dec/omxdl/arm11/api/armCOMM_IDCT_s.h
odecs/on2/h264dec/omxdl/arm11/api/armCOMM_MaskTable.h
odecs/on2/h264dec/omxdl/arm11/api/armCOMM_Version.h
odecs/on2/h264dec/omxdl/arm11/api/armCOMM_s.h
odecs/on2/h264dec/omxdl/arm11/api/armOMX.h
odecs/on2/h264dec/omxdl/arm11/api/omxtypes.h
odecs/on2/h264dec/omxdl/arm11/api/omxtypes_s.h
odecs/on2/h264dec/omxdl/arm11/build_vc.pl
odecs/on2/h264dec/omxdl/arm11/filelist_vc.txt
odecs/on2/h264dec/omxdl/arm11/src/armCOMM.c
odecs/on2/h264dec/omxdl/arm11/src/armCOMM_Bitstream.c
odecs/on2/h264dec/omxdl/arm11/src/armCOMM_IDCTTable.c
odecs/on2/h264dec/omxdl/arm11/src/armCOMM_MaskTable.c
odecs/on2/h264dec/omxdl/arm11/vc/api/armVC.h
odecs/on2/h264dec/omxdl/arm11/vc/api/armVCCOMM_s.h
odecs/on2/h264dec/omxdl/arm11/vc/api/omxVC.h
odecs/on2/h264dec/omxdl/arm11/vc/api/omxVC_s.h
odecs/on2/h264dec/omxdl/arm11/vc/comm/src/omxVCCOMM_Copy16x16_s.s
odecs/on2/h264dec/omxdl/arm11/vc/comm/src/omxVCCOMM_Copy8x8_s.s
odecs/on2/h264dec/omxdl/arm11/vc/comm/src/omxVCCOMM_ExpandFrame_I_s.s
odecs/on2/h264dec/omxdl/arm11/vc/m4p10/api/armVCM4P10_CAVLCTables.h
odecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/armVCM4P10_Average_4x_Align_unsafe_s.s
odecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/armVCM4P10_CAVLCTables.c
odecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/armVCM4P10_DeblockingChroma_unsafe_s.s
odecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/armVCM4P10_DeblockingLuma_unsafe_s.s
odecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/armVCM4P10_DecodeCoeffsToPair_s.s
odecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/armVCM4P10_DequantTables_s.s
odecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/armVCM4P10_InterpolateLuma_Align_unsafe_s.s
odecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/armVCM4P10_InterpolateLuma_Copy_unsafe_s.s
odecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/armVCM4P10_InterpolateLuma_DiagCopy_unsafe_s.s
odecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/armVCM4P10_InterpolateLuma_HalfDiagHorVer4x4_unsafe_s.s
odecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/armVCM4P10_InterpolateLuma_HalfDiagVerHor4x4_unsafe_s.s
odecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/armVCM4P10_InterpolateLuma_HalfHor4x4_unsafe_s.s
odecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/armVCM4P10_InterpolateLuma_HalfVer4x4_unsafe_s.s
odecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/armVCM4P10_Interpolate_Chroma_s.s
odecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/armVCM4P10_QuantTables_s.s
odecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/armVCM4P10_TransformResidual4x4_s.s
odecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/armVCM4P10_UnpackBlock4x4_s.s
odecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/omxVCM4P10_DeblockChroma_I.c
odecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/omxVCM4P10_DeblockLuma_I.c
odecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/omxVCM4P10_DecodeChromaDcCoeffsToPairCAVLC.c
odecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/omxVCM4P10_DecodeCoeffsToPairCAVLC.c
odecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/omxVCM4P10_DequantTransformResidualFromPairAndAdd_s.s
odecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/omxVCM4P10_FilterDeblockingChroma_HorEdge_I_s.s
odecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/omxVCM4P10_FilterDeblockingChroma_VerEdge_I_s.s
odecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/omxVCM4P10_FilterDeblockingLuma_HorEdge_I_s.s
odecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/omxVCM4P10_FilterDeblockingLuma_VerEdge_I_s.s
odecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/omxVCM4P10_InterpolateChroma.c
odecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/omxVCM4P10_InterpolateLuma_s.s
odecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/omxVCM4P10_PredictIntraChroma_8x8_s.s
odecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/omxVCM4P10_PredictIntra_16x16_s.s
odecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/omxVCM4P10_PredictIntra_4x4_s.s
odecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/omxVCM4P10_TransformDequantChromaDCFromPair_s.s
odecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/omxVCM4P10_TransformDequantLumaDCFromPair_s.s
odecs/on2/h264dec/omxdl/arm11/vc/m4p2/api/armVCM4P2_Huff_Tables_VLC.h
odecs/on2/h264dec/omxdl/arm11/vc/m4p2/api/armVCM4P2_ZigZag_Tables.h
odecs/on2/h264dec/omxdl/arm11/vc/m4p2/src/armVCM4P2_Clip8_s.s
odecs/on2/h264dec/omxdl/arm11/vc/m4p2/src/armVCM4P2_DecodeVLCZigzag_AC_unsafe_s.s
odecs/on2/h264dec/omxdl/arm11/vc/m4p2/src/armVCM4P2_Huff_Tables_VLC.c
odecs/on2/h264dec/omxdl/arm11/vc/m4p2/src/armVCM4P2_Lookup_Tables.c
odecs/on2/h264dec/omxdl/arm11/vc/m4p2/src/armVCM4P2_SetPredDir_s.s
odecs/on2/h264dec/omxdl/arm11/vc/m4p2/src/armVCM4P2_Zigzag_Tables.c
odecs/on2/h264dec/omxdl/arm11/vc/m4p2/src/omxVCM4P2_DecodeBlockCoef_Inter.c
odecs/on2/h264dec/omxdl/arm11/vc/m4p2/src/omxVCM4P2_DecodeBlockCoef_Intra.c
odecs/on2/h264dec/omxdl/arm11/vc/m4p2/src/omxVCM4P2_DecodePadMV_PVOP_s.s
odecs/on2/h264dec/omxdl/arm11/vc/m4p2/src/omxVCM4P2_DecodeVLCZigzag_Inter_s.s
odecs/on2/h264dec/omxdl/arm11/vc/m4p2/src/omxVCM4P2_DecodeVLCZigzag_IntraACVLC_s.s
odecs/on2/h264dec/omxdl/arm11/vc/m4p2/src/omxVCM4P2_DecodeVLCZigzag_IntraDCVLC_s.s
odecs/on2/h264dec/omxdl/arm11/vc/m4p2/src/omxVCM4P2_FindMVpred_s.s
odecs/on2/h264dec/omxdl/arm11/vc/m4p2/src/omxVCM4P2_IDCT8x8blk_s.s
odecs/on2/h264dec/omxdl/arm11/vc/m4p2/src/omxVCM4P2_MCReconBlock_s.s
odecs/on2/h264dec/omxdl/arm11/vc/m4p2/src/omxVCM4P2_PredictReconCoefIntra_s.s
odecs/on2/h264dec/omxdl/arm11/vc/m4p2/src/omxVCM4P2_QuantInvInter_I_s.s
odecs/on2/h264dec/omxdl/arm11/vc/m4p2/src/omxVCM4P2_QuantInvIntra_I_s.s
odecs/on2/h264dec/omxdl/arm11/vc/src/armVC_Version.c
odecs/on2/h264dec/omxdl/arm_neon/ARM_DELIVERY.TXT
odecs/on2/h264dec/omxdl/arm_neon/ARM_MANIFEST.TXT
odecs/on2/h264dec/omxdl/arm_neon/api/armCOMM.h
odecs/on2/h264dec/omxdl/arm_neon/api/armCOMM_BitDec_s.h
odecs/on2/h264dec/omxdl/arm_neon/api/armCOMM_Bitstream.h
odecs/on2/h264dec/omxdl/arm_neon/api/armCOMM_IDCTTable.h
odecs/on2/h264dec/omxdl/arm_neon/api/armCOMM_IDCT_s.h
odecs/on2/h264dec/omxdl/arm_neon/api/armCOMM_MaskTable.h
odecs/on2/h264dec/omxdl/arm_neon/api/armCOMM_Version.h
odecs/on2/h264dec/omxdl/arm_neon/api/armCOMM_s.h
odecs/on2/h264dec/omxdl/arm_neon/api/armOMX.h
odecs/on2/h264dec/omxdl/arm_neon/api/omxtypes.h
odecs/on2/h264dec/omxdl/arm_neon/api/omxtypes_s.h
odecs/on2/h264dec/omxdl/arm_neon/build_vc.pl
odecs/on2/h264dec/omxdl/arm_neon/filelist_vc.txt
odecs/on2/h264dec/omxdl/arm_neon/src/armCOMM.c
odecs/on2/h264dec/omxdl/arm_neon/src/armCOMM_Bitstream.c
odecs/on2/h264dec/omxdl/arm_neon/src/armCOMM_IDCTTable.c
odecs/on2/h264dec/omxdl/arm_neon/src/armCOMM_MaskTable.c
odecs/on2/h264dec/omxdl/arm_neon/vc/api/armVC.h
odecs/on2/h264dec/omxdl/arm_neon/vc/api/armVCCOMM_s.h
odecs/on2/h264dec/omxdl/arm_neon/vc/api/omxVC.h
odecs/on2/h264dec/omxdl/arm_neon/vc/api/omxVC_s.h
odecs/on2/h264dec/omxdl/arm_neon/vc/comm/src/omxVCCOMM_Copy16x16_s.s
odecs/on2/h264dec/omxdl/arm_neon/vc/comm/src/omxVCCOMM_Copy8x8_s.s
odecs/on2/h264dec/omxdl/arm_neon/vc/comm/src/omxVCCOMM_ExpandFrame_I_s.s
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/api/armVCM4P10_CAVLCTables.h
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/armVCM4P10_Average_4x_Align_unsafe_s.s
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/armVCM4P10_CAVLCTables.c
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/armVCM4P10_DeblockingChroma_unsafe_s.s
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/armVCM4P10_DeblockingLuma_unsafe_s.s
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/armVCM4P10_DecodeCoeffsToPair_s.s
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/armVCM4P10_DequantTables_s.s
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/armVCM4P10_InterpolateLuma_Align_unsafe_s.s
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/armVCM4P10_InterpolateLuma_Copy_unsafe_s.s
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/armVCM4P10_InterpolateLuma_DiagCopy_unsafe_s.s
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/armVCM4P10_InterpolateLuma_HalfDiagHorVer4x4_unsafe_s.s
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/armVCM4P10_InterpolateLuma_HalfDiagVerHor4x4_unsafe_s.s
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/armVCM4P10_InterpolateLuma_HalfHor4x4_unsafe_s.s
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/armVCM4P10_InterpolateLuma_HalfVer4x4_unsafe_s.s
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/armVCM4P10_Interpolate_Chroma_s.s
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/armVCM4P10_QuantTables_s.s
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/armVCM4P10_TransformResidual4x4_s.s
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/armVCM4P10_UnpackBlock4x4_s.s
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/omxVCM4P10_DeblockChroma_I.c
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/omxVCM4P10_DeblockLuma_I.c
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/omxVCM4P10_DecodeChromaDcCoeffsToPairCAVLC.c
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/omxVCM4P10_DecodeCoeffsToPairCAVLC.c
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/omxVCM4P10_DequantTransformResidualFromPairAndAdd_s.s
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/omxVCM4P10_FilterDeblockingChroma_HorEdge_I_s.s
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/omxVCM4P10_FilterDeblockingChroma_VerEdge_I_s.s
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/omxVCM4P10_FilterDeblockingLuma_HorEdge_I_s.s
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/omxVCM4P10_FilterDeblockingLuma_VerEdge_I_s.s
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/omxVCM4P10_InterpolateChroma.c
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/omxVCM4P10_InterpolateLuma_s.s
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/omxVCM4P10_PredictIntraChroma_8x8_s.s
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/omxVCM4P10_PredictIntra_16x16_s.s
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/omxVCM4P10_PredictIntra_4x4_s.s
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/omxVCM4P10_TransformDequantChromaDCFromPair_s.s
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/omxVCM4P10_TransformDequantLumaDCFromPair_s.s
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_Average_4x_Align_unsafe_s.S
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_DeblockingChroma_unsafe_s.S
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_DeblockingLuma_unsafe_s.S
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_DecodeCoeffsToPair_s.S
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_DequantTables_s.S
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_InterpolateLuma_Align_unsafe_s.S
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_InterpolateLuma_Copy_unsafe_s.S
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_InterpolateLuma_DiagCopy_unsafe_s.S
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_InterpolateLuma_HalfDiagHorVer4x4_unsafe_s.S
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_InterpolateLuma_HalfDiagVerHor4x4_unsafe_s.S
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_InterpolateLuma_HalfHor4x4_unsafe_s.S
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_InterpolateLuma_HalfVer4x4_unsafe_s.S
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_Interpolate_Chroma_s.S
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_QuantTables_s.S
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_TransformResidual4x4_s.S
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_UnpackBlock4x4_s.S
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/omxVCM4P10_DeblockLuma_I.S
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/omxVCM4P10_DequantTransformResidualFromPairAndAdd_s.S
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/omxVCM4P10_FilterDeblockingChroma_HorEdge_I_s.S
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/omxVCM4P10_FilterDeblockingChroma_VerEdge_I_s.S
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/omxVCM4P10_FilterDeblockingLuma_HorEdge_I_s.S
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/omxVCM4P10_FilterDeblockingLuma_VerEdge_I_s.S
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/omxVCM4P10_InterpolateLuma_s.S
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/omxVCM4P10_PredictIntraChroma_8x8_s.S
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/omxVCM4P10_PredictIntra_16x16_s.S
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/omxVCM4P10_PredictIntra_4x4_s.S
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/omxVCM4P10_TransformDequantChromaDCFromPair_s.S
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/omxVCM4P10_TransformDequantLumaDCFromPair_s.S
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p2/api/armVCM4P2_Huff_Tables_VLC.h
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p2/api/armVCM4P2_ZigZag_Tables.h
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p2/src/armVCM4P2_Clip8_s.s
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p2/src/armVCM4P2_DecodeVLCZigzag_AC_unsafe_s.s
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p2/src/armVCM4P2_Huff_Tables_VLC.c
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p2/src/armVCM4P2_Lookup_Tables.c
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p2/src/armVCM4P2_SetPredDir_s.s
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p2/src/armVCM4P2_Zigzag_Tables.c
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p2/src/omxVCM4P2_DecodeBlockCoef_Inter.c
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p2/src/omxVCM4P2_DecodeBlockCoef_Intra.c
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p2/src/omxVCM4P2_DecodePadMV_PVOP_s.s
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p2/src/omxVCM4P2_DecodeVLCZigzag_Inter_s.s
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p2/src/omxVCM4P2_DecodeVLCZigzag_IntraACVLC_s.s
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p2/src/omxVCM4P2_DecodeVLCZigzag_IntraDCVLC_s.s
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p2/src/omxVCM4P2_FindMVpred_s.s
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p2/src/omxVCM4P2_IDCT8x8blk_s.s
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p2/src/omxVCM4P2_MCReconBlock_s.s
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p2/src/omxVCM4P2_PredictReconCoefIntra_s.s
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p2/src/omxVCM4P2_QuantInvInter_I_s.s
odecs/on2/h264dec/omxdl/arm_neon/vc/m4p2/src/omxVCM4P2_QuantInvIntra_I_s.s
odecs/on2/h264dec/omxdl/arm_neon/vc/src/armVC_Version.c
odecs/on2/h264dec/omxdl/reference/ARM_DELIVERY.TXT
odecs/on2/h264dec/omxdl/reference/ARM_MANIFEST.TXT
odecs/on2/h264dec/omxdl/reference/api/armCOMM.h
odecs/on2/h264dec/omxdl/reference/api/armCOMM_Bitstream.h
odecs/on2/h264dec/omxdl/reference/api/armCOMM_Version.h
odecs/on2/h264dec/omxdl/reference/api/armOMX.h
odecs/on2/h264dec/omxdl/reference/api/omxtypes.h
odecs/on2/h264dec/omxdl/reference/build_vc.pl
odecs/on2/h264dec/omxdl/reference/filelist_vc.txt
odecs/on2/h264dec/omxdl/reference/src/armCOMM.c
odecs/on2/h264dec/omxdl/reference/src/armCOMM_Bitstream.c
odecs/on2/h264dec/omxdl/reference/vc/api/armVC.h
odecs/on2/h264dec/omxdl/reference/vc/api/omxVC.h
odecs/on2/h264dec/omxdl/reference/vc/comm/src/armVCCOMM_Average.c
odecs/on2/h264dec/omxdl/reference/vc/comm/src/armVCCOMM_SAD.c
odecs/on2/h264dec/omxdl/reference/vc/comm/src/omxVCCOMM_Average_16x.c
odecs/on2/h264dec/omxdl/reference/vc/comm/src/omxVCCOMM_Average_8x.c
odecs/on2/h264dec/omxdl/reference/vc/comm/src/omxVCCOMM_ComputeTextureErrorBlock.c
odecs/on2/h264dec/omxdl/reference/vc/comm/src/omxVCCOMM_ComputeTextureErrorBlock_SAD.c
odecs/on2/h264dec/omxdl/reference/vc/comm/src/omxVCCOMM_Copy16x16.c
odecs/on2/h264dec/omxdl/reference/vc/comm/src/omxVCCOMM_Copy8x8.c
odecs/on2/h264dec/omxdl/reference/vc/comm/src/omxVCCOMM_ExpandFrame_I.c
odecs/on2/h264dec/omxdl/reference/vc/comm/src/omxVCCOMM_LimitMVToRect.c
odecs/on2/h264dec/omxdl/reference/vc/comm/src/omxVCCOMM_SAD_16x.c
odecs/on2/h264dec/omxdl/reference/vc/comm/src/omxVCCOMM_SAD_8x.c
odecs/on2/h264dec/omxdl/reference/vc/m4p10/api/armVCM4P10_CAVLCTables.h
odecs/on2/h264dec/omxdl/reference/vc/m4p10/src/armVCM4P10_CAVLCTables.c
odecs/on2/h264dec/omxdl/reference/vc/m4p10/src/armVCM4P10_CompareMotionCostToMV.c
odecs/on2/h264dec/omxdl/reference/vc/m4p10/src/armVCM4P10_DeBlockPixel.c
odecs/on2/h264dec/omxdl/reference/vc/m4p10/src/armVCM4P10_DecodeCoeffsToPair.c
odecs/on2/h264dec/omxdl/reference/vc/m4p10/src/armVCM4P10_DequantTables.c
odecs/on2/h264dec/omxdl/reference/vc/m4p10/src/armVCM4P10_FwdTransformResidual4x4.c
odecs/on2/h264dec/omxdl/reference/vc/m4p10/src/armVCM4P10_InterpolateHalfDiag_Luma.c
odecs/on2/h264dec/omxdl/reference/vc/m4p10/src/armVCM4P10_InterpolateHalfHor_Luma.c
odecs/on2/h264dec/omxdl/reference/vc/m4p10/src/armVCM4P10_InterpolateHalfVer_Luma.c
odecs/on2/h264dec/omxdl/reference/vc/m4p10/src/armVCM4P10_Interpolate_Chroma.c
odecs/on2/h264dec/omxdl/reference/vc/m4p10/src/armVCM4P10_Interpolate_Luma.c
odecs/on2/h264dec/omxdl/reference/vc/m4p10/src/armVCM4P10_PredictIntraDC4x4.c
odecs/on2/h264dec/omxdl/reference/vc/m4p10/src/armVCM4P10_QuantTables.c
odecs/on2/h264dec/omxdl/reference/vc/m4p10/src/armVCM4P10_SADQuar.c
odecs/on2/h264dec/omxdl/reference/vc/m4p10/src/armVCM4P10_TransformResidual4x4.c
odecs/on2/h264dec/omxdl/reference/vc/m4p10/src/armVCM4P10_UnpackBlock2x2.c
odecs/on2/h264dec/omxdl/reference/vc/m4p10/src/armVCM4P10_UnpackBlock4x4.c
odecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_Average_4x.c
odecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_BlockMatch_Half.c
odecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_BlockMatch_Integer.c
odecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_BlockMatch_Quarter.c
odecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_DeblockChroma_I.c
odecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_DeblockLuma_I.c
odecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_DecodeChromaDcCoeffsToPairCAVLC.c
odecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_DecodeCoeffsToPairCAVLC.c
odecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_DequantTransformResidualFromPairAndAdd.c
odecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_FilterDeblockingChroma_HorEdge_I.c
odecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_FilterDeblockingChroma_VerEdge_I.c
odecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_FilterDeblockingLuma_HorEdge_I.c
odecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_FilterDeblockingLuma_VerEdge_I.c
odecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_GetVLCInfo.c
odecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_InterpolateChroma.c
odecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_InterpolateHalfHor_Luma.c
odecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_InterpolateHalfVer_Luma.c
odecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_InterpolateLuma.c
odecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_InvTransformDequant_ChromaDC.c
odecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_InvTransformDequant_LumaDC.c
odecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_InvTransformResidualAndAdd.c
odecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_MEGetBufSize.c
odecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_MEInit.c
odecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_MotionEstimationMB.c
odecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_PredictIntraChroma_8x8.c
odecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_PredictIntra_16x16.c
odecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_PredictIntra_4x4.c
odecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_SADQuar_16x.c
odecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_SADQuar_4x.c
odecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_SADQuar_8x.c
odecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_SAD_4x.c
odecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_SATD_4x4.c
odecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_SubAndTransformQDQResidual.c
odecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_TransformDequantChromaDCFromPair.c
odecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_TransformDequantLumaDCFromPair.c
odecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_TransformQuant_ChromaDC.c
odecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_TransformQuant_LumaDC.c
odecs/on2/h264dec/omxdl/reference/vc/m4p2/api/armVCM4P2_DCT_Table.h
odecs/on2/h264dec/omxdl/reference/vc/m4p2/api/armVCM4P2_Huff_Tables_VLC.h
odecs/on2/h264dec/omxdl/reference/vc/m4p2/api/armVCM4P2_ZigZag_Tables.h
odecs/on2/h264dec/omxdl/reference/vc/m4p2/src/armVCM4P2_ACDCPredict.c
odecs/on2/h264dec/omxdl/reference/vc/m4p2/src/armVCM4P2_BlockMatch_Half.c
odecs/on2/h264dec/omxdl/reference/vc/m4p2/src/armVCM4P2_BlockMatch_Integer.c
odecs/on2/h264dec/omxdl/reference/vc/m4p2/src/armVCM4P2_CheckVLCEscapeMode.c
odecs/on2/h264dec/omxdl/reference/vc/m4p2/src/armVCM4P2_CompareMV.c
odecs/on2/h264dec/omxdl/reference/vc/m4p2/src/armVCM4P2_DCT_Table.c
odecs/on2/h264dec/omxdl/reference/vc/m4p2/src/armVCM4P2_DecodeVLCZigzag_intra.c
odecs/on2/h264dec/omxdl/reference/vc/m4p2/src/armVCM4P2_EncodeVLCZigzag_intra.c
odecs/on2/h264dec/omxdl/reference/vc/m4p2/src/armVCM4P2_FillVLCBuffer.c
odecs/on2/h264dec/omxdl/reference/vc/m4p2/src/armVCM4P2_FillVLDBuffer.c
odecs/on2/h264dec/omxdl/reference/vc/m4p2/src/armVCM4P2_GetVLCBits.c
odecs/on2/h264dec/omxdl/reference/vc/m4p2/src/armVCM4P2_Huff_Tables_VLC.c
odecs/on2/h264dec/omxdl/reference/vc/m4p2/src/armVCM4P2_PutVLCBits.c
odecs/on2/h264dec/omxdl/reference/vc/m4p2/src/armVCM4P2_SetPredDir.c
odecs/on2/h264dec/omxdl/reference/vc/m4p2/src/armVCM4P2_Zigzag_Tables.c
odecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_BlockMatch_Half_16x16.c
odecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_BlockMatch_Half_8x8.c
odecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_BlockMatch_Integer_16x16.c
odecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_BlockMatch_Integer_8x8.c
odecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_DCT8x8blk.c
odecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_DecodeBlockCoef_Inter.c
odecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_DecodeBlockCoef_Intra.c
odecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_DecodePadMV_PVOP.c
odecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_DecodeVLCZigzag_Inter.c
odecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_DecodeVLCZigzag_IntraACVLC.c
odecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_DecodeVLCZigzag_IntraDCVLC.c
odecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_EncodeMV.c
odecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_EncodeVLCZigzag_Inter.c
odecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_EncodeVLCZigzag_IntraACVLC.c
odecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_EncodeVLCZigzag_IntraDCVLC.c
odecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_FindMVpred.c
odecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_IDCT8x8blk.c
odecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_MCReconBlock.c
odecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_MEGetBufSize.c
odecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_MEInit.c
odecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_MotionEstimationMB.c
odecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_PredictReconCoefIntra.c
odecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_QuantInter_I.c
odecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_QuantIntra_I.c
odecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_QuantInvInter_I.c
odecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_QuantInvIntra_I.c
odecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_TransRecBlockCoef_inter.c
odecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_TransRecBlockCoef_intra.c
odecs/on2/h264dec/omxdl/reference/vc/src/armVC_Version.c
odecs/on2/h264dec/source/DecTestBench.c
odecs/on2/h264dec/source/EvaluationTestBench.c
odecs/on2/h264dec/source/H264SwDecApi.c
odecs/on2/h264dec/source/TestBenchMultipleInstance.c
odecs/on2/h264dec/source/arm11_asm/h264bsd_interpolate_chroma_hor.s
odecs/on2/h264dec/source/arm11_asm/h264bsd_interpolate_chroma_hor_ver.s
odecs/on2/h264dec/source/arm11_asm/h264bsd_interpolate_chroma_ver.s
odecs/on2/h264dec/source/arm11_asm/h264bsd_interpolate_hor_half.s
odecs/on2/h264dec/source/arm11_asm/h264bsd_interpolate_hor_quarter.s
odecs/on2/h264dec/source/arm11_asm/h264bsd_interpolate_hor_ver_quarter.s
odecs/on2/h264dec/source/arm11_asm/h264bsd_interpolate_mid_hor.s
odecs/on2/h264dec/source/arm11_asm/h264bsd_interpolate_ver_half.s
odecs/on2/h264dec/source/arm11_asm/h264bsd_interpolate_ver_quarter.s
odecs/on2/h264dec/source/arm11_asm/win_asm.bat
odecs/on2/h264dec/source/arm_neon_asm/h264bsdClearMbLayer.s
odecs/on2/h264dec/source/arm_neon_asm/h264bsdCountLeadingZeros.s
odecs/on2/h264dec/source/arm_neon_asm/h264bsdFillRow7.s
odecs/on2/h264dec/source/arm_neon_asm/h264bsdFlushBits.s
odecs/on2/h264dec/source/arm_neon_asm/h264bsdWriteMacroblock.s
odecs/on2/h264dec/source/arm_neon_asm_gcc/asm_common.S
odecs/on2/h264dec/source/arm_neon_asm_gcc/h264bsdClearMbLayer.S
odecs/on2/h264dec/source/arm_neon_asm_gcc/h264bsdCountLeadingZeros.S
odecs/on2/h264dec/source/arm_neon_asm_gcc/h264bsdFillRow7.S
odecs/on2/h264dec/source/arm_neon_asm_gcc/h264bsdFlushBits.S
odecs/on2/h264dec/source/arm_neon_asm_gcc/h264bsdWriteMacroblock.S
odecs/on2/h264dec/source/h264bsd_byte_stream.c
odecs/on2/h264dec/source/h264bsd_byte_stream.h
odecs/on2/h264dec/source/h264bsd_cavlc.c
odecs/on2/h264dec/source/h264bsd_cavlc.h
odecs/on2/h264dec/source/h264bsd_cfg.h
odecs/on2/h264dec/source/h264bsd_conceal.c
odecs/on2/h264dec/source/h264bsd_conceal.h
odecs/on2/h264dec/source/h264bsd_container.h
odecs/on2/h264dec/source/h264bsd_deblocking.c
odecs/on2/h264dec/source/h264bsd_deblocking.h
odecs/on2/h264dec/source/h264bsd_decoder.c
odecs/on2/h264dec/source/h264bsd_decoder.h
odecs/on2/h264dec/source/h264bsd_dpb.c
odecs/on2/h264dec/source/h264bsd_dpb.h
odecs/on2/h264dec/source/h264bsd_image.c
odecs/on2/h264dec/source/h264bsd_image.h
odecs/on2/h264dec/source/h264bsd_inter_prediction.c
odecs/on2/h264dec/source/h264bsd_inter_prediction.h
odecs/on2/h264dec/source/h264bsd_intra_prediction.c
odecs/on2/h264dec/source/h264bsd_intra_prediction.h
odecs/on2/h264dec/source/h264bsd_macroblock_layer.c
odecs/on2/h264dec/source/h264bsd_macroblock_layer.h
odecs/on2/h264dec/source/h264bsd_nal_unit.c
odecs/on2/h264dec/source/h264bsd_nal_unit.h
odecs/on2/h264dec/source/h264bsd_neighbour.c
odecs/on2/h264dec/source/h264bsd_neighbour.h
odecs/on2/h264dec/source/h264bsd_pic_order_cnt.c
odecs/on2/h264dec/source/h264bsd_pic_order_cnt.h
odecs/on2/h264dec/source/h264bsd_pic_param_set.c
odecs/on2/h264dec/source/h264bsd_pic_param_set.h
odecs/on2/h264dec/source/h264bsd_reconstruct.c
odecs/on2/h264dec/source/h264bsd_reconstruct.h
odecs/on2/h264dec/source/h264bsd_sei.c
odecs/on2/h264dec/source/h264bsd_sei.h
odecs/on2/h264dec/source/h264bsd_seq_param_set.c
odecs/on2/h264dec/source/h264bsd_seq_param_set.h
odecs/on2/h264dec/source/h264bsd_slice_data.c
odecs/on2/h264dec/source/h264bsd_slice_data.h
odecs/on2/h264dec/source/h264bsd_slice_group_map.c
odecs/on2/h264dec/source/h264bsd_slice_group_map.h
odecs/on2/h264dec/source/h264bsd_slice_header.c
odecs/on2/h264dec/source/h264bsd_slice_header.h
odecs/on2/h264dec/source/h264bsd_storage.c
odecs/on2/h264dec/source/h264bsd_storage.h
odecs/on2/h264dec/source/h264bsd_stream.c
odecs/on2/h264dec/source/h264bsd_stream.h
odecs/on2/h264dec/source/h264bsd_transform.c
odecs/on2/h264dec/source/h264bsd_transform.h
odecs/on2/h264dec/source/h264bsd_util.c
odecs/on2/h264dec/source/h264bsd_util.h
odecs/on2/h264dec/source/h264bsd_vlc.c
odecs/on2/h264dec/source/h264bsd_vlc.h
odecs/on2/h264dec/source/h264bsd_vui.c
odecs/on2/h264dec/source/h264bsd_vui.h
mx/SoftOMXPlugin.cpp
b33d2ac90cfce0fe6db8c3e979e7ae2bbfc28163 02-Jun-2011 James Dong <jdong@google.com> Do not call getEstimatedBandwidth if the streaming is not HTTP-based

Change-Id: I4ab6c57e5b2b989676b8dfbb98402d10a5752261
wesomePlayer.cpp
uCachedSource2.cpp
uHTTPDataSource.cpp
hromium_http/ChromiumHTTPDataSource.cpp
nclude/NuCachedSource2.h
84f03d564ac868924e6ddbff88418fe94f1d3e53 02-Jun-2011 Andreas Huber <andih@google.com> am 8050a02b: DO NOT MERGE: Linux sockets are odd, closing a socket descriptor does not abort pending recv/send calls.

* commit '8050a02b0130f0ba2e2ddfc240aa59029ee2ac6d':
DO NOT MERGE: Linux sockets are odd, closing a socket descriptor does not abort pending recv/send calls.
26e0ac2f3849f97fa5f37b13f97a9b24b05ed6c5 26-Jan-2011 Andreas Huber <andih@google.com> DO NOT MERGE: Linux sockets are odd, closing a socket descriptor does not abort pending recv/send calls.

Change-Id: Iaee1821257a25a5257d93c9f5ba3976748cad619
related-to-bug: 3362836, 4439092
TTPStream.cpp
d217a8c4632b3e3065f8c2a26b9ce4dc4c97171f 02-Jun-2011 Glenn Kasten <gkasten@google.com> Revert "Use AudioTrack::event_type not int in callback"

This reverts commit 2225e4b7049fa3fb9d39a068b8268b63c952d7c1
udioPlayer.cpp
013b5a67d6f8e12a1b06e74863daec1bee4d99c1 05-May-2011 Glenn Kasten <gkasten@google.com> Use AudioTrack::event_type not int in callback

Change-Id: Ifefc708d46874e04fd0d01cb6e2d43b987ee796c
udioPlayer.cpp
5b1b8a93a07326f1cbc627f09e02988375189e0a 26-May-2011 James Dong <jdong@google.com> Send estimated bandwidth value as informational event when cache fetcher pauses

o Application can make informed decision about the available network bandwidth
when cache fetcher pauses.

o Application can also adjust how frequently the bandwidth is estimated within
a range from one second to one minute.

Change-Id: I90068001343e79da1886de03c565537787e1580b
wesomePlayer.cpp
TTPBase.cpp
uCachedSource2.cpp
uHTTPDataSource.cpp
hromium_http/ChromiumHTTPDataSource.cpp
nclude/AwesomePlayer.h
nclude/ChromiumHTTPDataSource.h
nclude/HTTPBase.h
nclude/NuCachedSource2.h
nclude/NuHTTPDataSource.h
a3e73df3b402f1ebdbef7c8a8e3111d852e7bd35 26-May-2011 James Dong <jdong@google.com> Merge "Extract embedded cover art (aka poster frame) in mp4 files"
2de4113c10975648ad9d1cffa45847870a0d01b3 26-May-2011 James Dong <jdong@google.com> am c004a0c9: am 05e13b9e: am c1ded373: Merge "Revert "Use pread() to get the decrypted data for container based DRM file."" into honeycomb-mr2

* commit 'c004a0c925ea2c9c48bbf9670d2ebf96f432c90a':
Revert "Use pread() to get the decrypted data for container based DRM file."
515e855eae78aa495da58356486aaa666cb57fd1 26-May-2011 James Dong <jdong@google.com> Extract embedded cover art (aka poster frame) in mp4 files

Change-Id: Ic9421ee27b9aa3b27df00878b887de20f25d232b
PEG4Extractor.cpp
tagefrightMetadataRetriever.cpp
8d91237333c60c4a6839358109265e8847df23f3 26-May-2011 Andreas Huber <andih@google.com> Merge "Support mpeg1,2 audio and mpeg1,2,4 video content extraction from .ts streams."
ecc0840163093942f3418aa4b27e9279c187b173 26-May-2011 Gloria Wang <gwang@google.com> Merge "For out of band timed text support (timed text in a separate file)."
965d08ba16ee82bc85f69546360c18e7da907406 11-May-2011 Gloria Wang <gwang@google.com> For out of band timed text support (timed text in a separate file).

Change-Id: I9e024a63eb9bf6f839deee3c7766a66e63126c96
ndroid.mk
wesomePlayer.cpp
PEG4Extractor.cpp
imedTextPlayer.cpp
nclude/AwesomePlayer.h
nclude/TimedTextPlayer.h
imedtext/Android.mk
imedtext/TimedTextParser.cpp
imedtext/TimedTextParser.h
imedtext/TimedTextPlayer.cpp
imedtext/TimedTextPlayer.h
386d609dc513e838c7e7c4c46c604493ccd560be 19-May-2011 Andreas Huber <andih@google.com> Support mpeg1,2 audio and mpeg1,2,4 video content extraction from .ts streams.

Change-Id: I9d2ee63495f161e30daba7c3aab16cb9d8ced6a5
Codec.cpp
P3Extractor.cpp
ediaDefs.cpp
MXCodec.cpp
BRISeeker.cpp
vc_utils.cpp
odecs/mp3dec/SoftMP3.cpp
nclude/MP3Extractor.h
nclude/avc_utils.h
peg2ts/ATSParser.cpp
peg2ts/ATSParser.h
peg2ts/ESQueue.cpp
peg2ts/ESQueue.h
peg2ts/MPEG2TSExtractor.cpp
tsp/APacketSource.cpp
a2b2c9f9661a54e431430b029ce76332c6914f0b 25-May-2011 James Dong <jdong@google.com> am c1ded373: Merge "Revert "Use pread() to get the decrypted data for container based DRM file."" into honeycomb-mr2

* commit 'c1ded373951f8bd489401e93f2dd512ff9705a49':
Revert "Use pread() to get the decrypted data for container based DRM file."
ade8c2d682d4f8c9424dece53e39400c237d22bf 25-May-2011 James Dong <jdong@google.com> Merge "Convert line breaks to Unix style"
f29f13077582425c242a36565bd71130fedf3cd0 25-May-2011 James Dong <jdong@google.com> Revert "Use pread() to get the decrypted data for container based DRM file."

This reverts commit a6f1104b9d829c636b60b9387e379f9667b5df09.
uHTTPDataSource.cpp
fa855e0e46fc706a2120bc4659aaeaf2ef395a4d 25-May-2011 Kristian Monsen <kristianm@google.com> Merge "Merge chromium to 10.0.634.0: Compile fix"
a533975a8e3bb741948750a68a2c962a48777fe0 25-May-2011 Kristian Monsen <kristianm@google.com> Merge chromium to 10.0.634.0: Compile fix

base/thread.h moved to base/threading/thread.h:
http://codereview.chromium.org/6028009

Change-Id: I4a7dd04055ed931f6bc2c6b63255f3832d0c78bd
hromium_http/support.cpp
931db87f8fd6fa1fd5b918f3b1fc107e8dca2e0e 25-May-2011 Andreas Huber <andih@google.com> Merge "Make sure all references to the decoder plugin are accounted for"
90d99759c4607106adcf1dbcc8546aedb2ff089f 25-May-2011 Andreas Huber <andih@google.com> Merge "Make sure the software mpeg4 decoder supports multiple input frames per input buffer"
5a65e30064dc8dffa4f3d868f1c46038972c40c5 25-May-2011 Andreas Huber <andih@google.com> Make sure all references to the decoder plugin are accounted for

before calling dlunload().

Change-Id: I59aa1d19edf566b8a86a6f73b1c2eeb47c96b0de
related-to-bug: 4466387
nclude/SimpleSoftOMXComponent.h
nclude/SoftOMXComponent.h
mx/SimpleSoftOMXComponent.cpp
mx/SoftOMXPlugin.cpp
f2af5a2c607e71ff4cd39da28b077c0a68b206fe 24-May-2011 Andreas Huber <andih@google.com> Make sure the software mpeg4 decoder supports multiple input frames per input buffer

to enable faster throughput in ACodec.

Change-Id: I6f6a1c70d9446f9d52c3df257b2d22358b0e71f4
odecs/m4v_h263/dec/SoftMPEG4.cpp
mx/SoftOMXPlugin.cpp
68cb8cfaaf4d01125397ff3bea30603bdc5001d4 24-May-2011 Jeffrey Tinker <jtinker@google.com> am c41a17de: am 6e5cdca1: am ef89cc14: Merge "Multi-repository checkin, goes with https://android-git.corp.google.com/g/111038" into honeycomb-mr2

* commit 'c41a17de2b2e80f246adeef4962073916dcfff0b':
Multi-repository checkin, goes with https://android-git.corp.google.com/g/111038
9eff287f4f59d6a0c9ca1d5dd8a7bb6e64acf5a4 24-May-2011 James Dong <jdong@google.com> resolved conflicts for merge of d5762583 to master

Change-Id: Icba2bcdbc9f967288a65c930b198405fd8566abd
b1d713703b00dc972ceb2a655d5bac72381f303d 24-May-2011 Jeffrey Tinker <jtinker@google.com> am ef89cc14: Merge "Multi-repository checkin, goes with https://android-git.corp.google.com/g/111038" into honeycomb-mr2

* commit 'ef89cc14957ab631346564801841190346632ac9':
Multi-repository checkin, goes with https://android-git.corp.google.com/g/111038
8331a49259adf0529dc41ba66fc88fbe5af95129 24-May-2011 Jeffrey Tinker <jtinker@google.com> Merge "Multi-repository checkin, goes with https://android-git.corp.google.com/g/111038" into honeycomb-mr2
cd0b0fe858a9f109281031717d5c0001953b9054 22-May-2011 Jeffrey Tinker <jtinker@google.com> Multi-repository checkin, goes with https://android-git.corp.google.com/g/111038

Fix for b/4198446 HC - Support for Widevine Adaptive VOD

Change-Id: Ia777c80825e3416bab6ae6273fba46a194135e60
VMExtractor.cpp
nclude/WVMExtractor.h
003f6d613698484869476f01aa3fe2c28d3120bc 23-May-2011 James Dong <jdong@google.com> am a5293d1c: Add some logging to track down where ANR happens during MediaPlayer._release().

* commit 'a5293d1ca4459293f4993ea39c09ea703a022844':
Add some logging to track down where ANR happens during MediaPlayer._release().
37b2d62df28a1f8e9489ee8adad030a3d24213d7 20-May-2011 James Dong <jdong@google.com> Add some logging to track down where ANR happens during MediaPlayer._release().

o add a log message in AwesomePlayer::reset before acquiring the lock

Change-Id: I9f228f615f99c03c394e9d0dd78c855c0b9fcfbb
related-to-bug: 4409547
wesomePlayer.cpp
MXCodec.cpp
e2e838afcf03e603a41a0455846eaf9614537c16 22-Apr-2011 Mans Rullgard <mans@mansr.com> Convert line breaks to Unix style

Change-Id: I6219725a9fbd72432bad71a176c14f26fabdbd5f
odecs/aacenc/SampleCode/AAC_E_SAMPLES.c
odecs/aacenc/basic_op/basic_op.h
odecs/aacenc/basic_op/basicop2.c
odecs/aacenc/basic_op/oper_32b.c
odecs/aacenc/basic_op/oper_32b.h
odecs/aacenc/basic_op/typedef.h
odecs/aacenc/basic_op/typedefs.h
odecs/aacenc/inc/aac_rom.h
odecs/aacenc/inc/aacenc_core.h
odecs/aacenc/inc/adj_thr.h
odecs/aacenc/inc/adj_thr_data.h
odecs/aacenc/inc/band_nrg.h
odecs/aacenc/inc/bit_cnt.h
odecs/aacenc/inc/bitbuffer.h
odecs/aacenc/inc/bitenc.h
odecs/aacenc/inc/block_switch.h
odecs/aacenc/inc/channel_map.h
odecs/aacenc/inc/config.h
odecs/aacenc/inc/dyn_bits.h
odecs/aacenc/inc/grp_data.h
odecs/aacenc/inc/interface.h
odecs/aacenc/inc/line_pe.h
odecs/aacenc/inc/memalign.h
odecs/aacenc/inc/ms_stereo.h
odecs/aacenc/inc/pre_echo_control.h
odecs/aacenc/inc/psy_configuration.h
odecs/aacenc/inc/psy_const.h
odecs/aacenc/inc/psy_data.h
odecs/aacenc/inc/psy_main.h
odecs/aacenc/inc/qc_data.h
odecs/aacenc/inc/qc_main.h
odecs/aacenc/inc/quantize.h
odecs/aacenc/inc/sf_estim.h
odecs/aacenc/inc/spreading.h
odecs/aacenc/inc/stat_bits.h
odecs/aacenc/inc/tns.h
odecs/aacenc/inc/tns_func.h
odecs/aacenc/inc/tns_param.h
odecs/aacenc/inc/transform.h
odecs/aacenc/src/aac_rom.c
odecs/aacenc/src/aacenc.c
odecs/aacenc/src/aacenc_core.c
odecs/aacenc/src/adj_thr.c
odecs/aacenc/src/asm/ARMV5E/AutoCorrelation_v5.s
odecs/aacenc/src/asm/ARMV5E/CalcWindowEnergy_v5.s
odecs/aacenc/src/asm/ARMV5E/PrePostMDCT_v5.s
odecs/aacenc/src/asm/ARMV5E/R4R8First_v5.s
odecs/aacenc/src/asm/ARMV5E/Radix4FFT_v5.s
odecs/aacenc/src/asm/ARMV5E/band_nrg_v5.s
odecs/aacenc/src/asm/ARMV7/PrePostMDCT_v7.s
odecs/aacenc/src/asm/ARMV7/R4R8First_v7.s
odecs/aacenc/src/asm/ARMV7/Radix4FFT_v7.s
odecs/aacenc/src/band_nrg.c
odecs/aacenc/src/bit_cnt.c
odecs/aacenc/src/bitbuffer.c
odecs/aacenc/src/bitenc.c
odecs/aacenc/src/block_switch.c
odecs/aacenc/src/channel_map.c
odecs/aacenc/src/dyn_bits.c
odecs/aacenc/src/grp_data.c
odecs/aacenc/src/interface.c
odecs/aacenc/src/line_pe.c
odecs/aacenc/src/ms_stereo.c
odecs/aacenc/src/pre_echo_control.c
odecs/aacenc/src/psy_configuration.c
odecs/aacenc/src/psy_main.c
odecs/aacenc/src/qc_main.c
odecs/aacenc/src/quantize.c
odecs/aacenc/src/sf_estim.c
odecs/aacenc/src/spreading.c
odecs/aacenc/src/stat_bits.c
odecs/aacenc/src/tns.c
odecs/aacenc/src/transform.c
odecs/amrwbenc/SampleCode/AMRWB_E_SAMPLE.c
odecs/amrwbenc/inc/acelp.h
odecs/amrwbenc/inc/basic_op.h
odecs/amrwbenc/inc/bits.h
odecs/amrwbenc/inc/cnst.h
odecs/amrwbenc/inc/cod_main.h
odecs/amrwbenc/inc/dtx.h
odecs/amrwbenc/inc/grid100.tab
odecs/amrwbenc/inc/ham_wind.tab
odecs/amrwbenc/inc/homing.tab
odecs/amrwbenc/inc/isp_isf.tab
odecs/amrwbenc/inc/lag_wind.tab
odecs/amrwbenc/inc/log2.h
odecs/amrwbenc/inc/log2_tab.h
odecs/amrwbenc/inc/main.h
odecs/amrwbenc/inc/math_op.h
odecs/amrwbenc/inc/mem_align.h
odecs/amrwbenc/inc/mime_io.tab
odecs/amrwbenc/inc/oper_32b.h
odecs/amrwbenc/inc/p_med_o.h
odecs/amrwbenc/inc/p_med_ol.tab
odecs/amrwbenc/inc/q_gain2.tab
odecs/amrwbenc/inc/q_pulse.h
odecs/amrwbenc/inc/qisf_ns.tab
odecs/amrwbenc/inc/qpisf_2s.tab
odecs/amrwbenc/inc/stream.h
odecs/amrwbenc/inc/typedef.h
odecs/amrwbenc/inc/typedefs.h
odecs/amrwbenc/inc/wb_vad.h
odecs/amrwbenc/inc/wb_vad_c.h
odecs/amrwbenc/src/asm/ARMV5E/Deemph_32_opt.s
odecs/amrwbenc/src/asm/ARMV5E/Dot_p_opt.s
odecs/amrwbenc/src/asm/ARMV5E/Filt_6k_7k_opt.s
odecs/amrwbenc/src/asm/ARMV5E/Syn_filt_32_opt.s
odecs/amrwbenc/src/asm/ARMV5E/cor_h_vec_opt.s
odecs/amrwbenc/src/asm/ARMV5E/pred_lt4_1_opt.s
odecs/amrwbenc/src/asm/ARMV5E/residu_asm_opt.s
odecs/amrwbenc/src/asm/ARMV5E/scale_sig_opt.s
odecs/amrwbenc/src/asm/ARMV5E/syn_filt_opt.s
odecs/amrwbenc/src/asm/ARMV7/Deemph_32_neon.s
odecs/amrwbenc/src/asm/ARMV7/Dot_p_neon.s
odecs/amrwbenc/src/asm/ARMV7/Filt_6k_7k_neon.s
odecs/amrwbenc/src/asm/ARMV7/Syn_filt_32_neon.s
odecs/amrwbenc/src/asm/ARMV7/cor_h_vec_neon.s
odecs/amrwbenc/src/asm/ARMV7/pred_lt4_1_neon.s
odecs/amrwbenc/src/asm/ARMV7/scale_sig_neon.s
odecs/amrwbenc/src/asm/ARMV7/syn_filt_neon.s
odecs/amrwbenc/src/autocorr.c
odecs/amrwbenc/src/az_isp.c
odecs/amrwbenc/src/bits.c
odecs/amrwbenc/src/c2t64fx.c
odecs/amrwbenc/src/c4t64fx.c
odecs/amrwbenc/src/cmnMemory.c
odecs/amrwbenc/src/convolve.c
odecs/amrwbenc/src/cor_h_x.c
odecs/amrwbenc/src/decim54.c
odecs/amrwbenc/src/deemph.c
odecs/amrwbenc/src/dtx.c
odecs/amrwbenc/src/g_pitch.c
odecs/amrwbenc/src/gpclip.c
odecs/amrwbenc/src/homing.c
odecs/amrwbenc/src/hp400.c
odecs/amrwbenc/src/hp50.c
odecs/amrwbenc/src/hp6k.c
odecs/amrwbenc/src/hp_wsp.c
odecs/amrwbenc/src/int_lpc.c
odecs/amrwbenc/src/isp_az.c
odecs/amrwbenc/src/isp_isf.c
odecs/amrwbenc/src/lag_wind.c
odecs/amrwbenc/src/levinson.c
odecs/amrwbenc/src/log2.c
odecs/amrwbenc/src/lp_dec2.c
odecs/amrwbenc/src/math_op.c
odecs/amrwbenc/src/oper_32b.c
odecs/amrwbenc/src/p_med_ol.c
odecs/amrwbenc/src/pit_shrp.c
odecs/amrwbenc/src/pitch_f4.c
odecs/amrwbenc/src/pred_lt4.c
odecs/amrwbenc/src/preemph.c
odecs/amrwbenc/src/q_gain2.c
odecs/amrwbenc/src/q_pulse.c
odecs/amrwbenc/src/qisf_ns.c
odecs/amrwbenc/src/qpisf_2s.c
odecs/amrwbenc/src/random.c
odecs/amrwbenc/src/residu.c
odecs/amrwbenc/src/scale.c
odecs/amrwbenc/src/stream.c
odecs/amrwbenc/src/syn_filt.c
odecs/amrwbenc/src/updt_tar.c
odecs/amrwbenc/src/util.c
odecs/amrwbenc/src/voAMRWBEnc.c
odecs/amrwbenc/src/voicefac.c
odecs/amrwbenc/src/wb_vad.c
odecs/amrwbenc/src/weight_a.c
odecs/common/Config.mk
odecs/common/cmnMemory.c
odecs/common/include/cmnMemory.h
odecs/common/include/voAAC.h
odecs/common/include/voAMRWB.h
odecs/common/include/voAudio.h
odecs/common/include/voIndex.h
odecs/common/include/voType.h
8294aac281863e584027c3f2c7d2007c4140bf24 20-May-2011 Gloria Wang <gwang@google.com> am 4d8ceada: am dbfd055d: am a6f1104b: Use pread() to get the decrypted data for container based DRM file. For bug 4392094.

* commit '4d8ceada09441f43a98f5c7dadde9192e7d6abf9':
Use pread() to get the decrypted data for container based DRM file. For bug 4392094.
ff2e0968976f26612b34f7a88e6e1e4ed1cd277b 20-May-2011 Gloria Wang <gwang@google.com> am a6f1104b: Use pread() to get the decrypted data for container based DRM file. For bug 4392094.

* commit 'a6f1104b9d829c636b60b9387e379f9667b5df09':
Use pread() to get the decrypted data for container based DRM file. For bug 4392094.
fa6efe7757a41f7125fc49312230283b63618111 20-May-2011 Gloria Wang <gwang@google.com> Use pread() to get the decrypted data for container based DRM file.
For bug 4392094.

Change-Id: Icc64a26c5b413313cc35dcd02d60484dc8245dfb
uHTTPDataSource.cpp
b127de057abe04876d18db3d371854035a395c58 20-May-2011 Kristian Monsen <kristianm@google.com> Merge "Merge Chromium at 10.0.621.0: Fixes for libstagefreight"
a03838331660ca2c0aa8283a7c00ef607db0cfee 19-May-2011 James Dong <jdong@google.com> Revert "Add avg bandwidth estimate every 2 seconds - do not merge."

This reverts commit ec78f551b575b0274cbe796f8e08a9df1a706680.
uHTTPDataSource.cpp
nclude/NuHTTPDataSource.h
e39350924f4e743ec04cc9640526e06990c8cbda 19-May-2011 James Dong <jdong@google.com> resolved conflicts for merge of a8939e0d to master

Change-Id: I090479ed09618e1aa3685ca79e16202d9c82f523
5348dc86f3ac3cebebcda271cf990dbcc87f5a7f 19-May-2011 James Dong <jdong@google.com> am d148a499: Merge "Using widevine:// to stream adaptive bitrate wvm content no longer" into honeycomb-mr2

* commit 'd148a499c27145e0473f89ece0500ebed38f875f':
Using widevine:// to stream adaptive bitrate wvm content no longer
5a4e4804aa5340a4cf7ef4250d31fd901f53ddb2 19-May-2011 James Dong <jdong@google.com> Merge "Using widevine:// to stream adaptive bitrate wvm content no longer" into honeycomb-mr2
b5746d9058c3e81a195f82f5345e1ffe0a26c0b2 18-May-2011 Andreas Huber <andih@google.com> Properly forward rotation information from input format to output format.

The software renderer would otherwise never rotate videos as it only has access to
the decoder's output format.

Change-Id: If893c0c23d0e85a3d9d4eb94390a114af5514b1c
MXCodec.cpp
fdce3778fbb3dd91ebc4d5fff9fd85fe8991d049 18-May-2011 Gloria Wang <gwang@google.com> am 07e9267d: Merge "DO NOT MERGE For bug 4422428 Squashed commit of the following:" into honeycomb-mr2

* commit '07e9267d33bb199d0a2b8de221c64541bdf2465a':
DO NOT MERGE For bug 4422428 Squashed commit of the following:
3a0c5e310103946115dc28fa22d23e236ff0213f 18-May-2011 Gloria Wang <gwang@google.com> Merge "DO NOT MERGE For bug 4422428 Squashed commit of the following:" into honeycomb-mr2
e55147f462e04d41bff7ead6e9ea61a5b83bda4b 17-May-2011 Martin Storsjo <martin@martin.st> stagefright amrnb: Properly negate all values

Initially, input values -32768 weren't negated properly.

This was committed on the master branch of the opencore
repository in commit f532d145194e474cb30d8644b8eee83873ad24cc,
based on AOSP contribution 10906.

Change-Id: I903353c5539a8fe94b7fc5f26b95eaeac57df5f4
odecs/amrnb/enc/src/set_sign.cpp
773f457645786b139fa8fe180ef27e78ad7ab2f9 17-May-2011 Martin Storsjo <martin@martin.st> stagefright amrnb: Fix a bug on architectures where long is 64 bit

Initially, this code gave a warning "comparison is always
false due to limited range of data type" if long was 64 bit.
Additionally, the output from the AMR encoder was mostly noise.

This was committed on the master branch of the opencore
repository in commit f532d145194e474cb30d8644b8eee83873ad24cc,
based on AOSP contribution 10904.

Change-Id: I822dcc74beeae548d3032ffda759de9c8cd1fcfe
odecs/amrnb/common/src/az_lsp.cpp
2cf9c5073ca3342ee52673ad68763fadd2c2be79 18-May-2011 James Dong <jdong@google.com> Revert "Add const to the finders method in MetaData.cpp"

This reverts commit 78fed171d9d62b25aa846d7373a7040e3fd2241e.

Conflicts:

include/media/stagefright/MPEG4Writer.h

Change-Id: Ie6f497f67a473ad95b50bb949c1aa49e1804bac3
PEG4Writer.cpp
etaData.cpp
07ec01904613a0bac32caaa8444b4690998faed7 14-May-2011 James Dong <jdong@google.com> Make track informational event optional, depending on system property

o also add a track informational event to return the encoded data in kilo-bytes

Change-Id: I7c383360d57048c8a3606d0b8141ba53e4f4b224
PEG4Writer.cpp
44ade918fd2e82db86a2f0aeb49229950e78822b 17-May-2011 Andreas Huber <andih@google.com> am c56e81c8: Merge "DO NOT MERGE: Properly construct the ESDS metadata even if sizeof(codec-specific-data) != 2" into honeycomb-mr2

* commit 'c56e81c88706d79ce51a314b5bfd3e247ca6f86c':
DO NOT MERGE: Properly construct the ESDS metadata even if sizeof(codec-specific-data) != 2
58fb39120c633e3b8aa31b8f0a78e8efc193d59d 17-May-2011 Andreas Huber <andih@google.com> Claim support for .3gpp2 A/B files.

Change-Id: I16dd3dcb93a50b3c808ae710d0ba4757c89ab9c8
related-to-bug: 4406745
PEG4Extractor.cpp
3778838eee9470825bea7e5bad376f1dc9a94392 17-May-2011 Andreas Huber <andih@google.com> Disable yuv->yuv mode and external display support until various driver fixes are in.

Change-Id: Ib3838f779afc87caca7d78e18a5d72d2971ee306
olorconversion/Android.mk
olorconversion/SoftwareRenderer.cpp
3d0de325381b66880626357f6b68ea09da0a9dda 17-May-2011 Andreas Huber <andih@google.com> Merge "Instead of using an RGB surface and conversion yuv420->rgb565"
a4a1d9b8e4e218b75ffa2d5e155d1f9fbf008877 16-May-2011 Andreas Huber <andih@google.com> Merge "Fix module tags on stagefright software decoders."
a920660c2ae1548471c40c664ed3ac01b87c57b6 16-May-2011 Andreas Huber <andih@google.com> Fix module tags on stagefright software decoders.

Change-Id: I8b3f60760e1e8eaa0f66eb6c7ce3df8e425638fb
related-to-bug: 4427361
odecs/aacdec/Android.mk
odecs/amrnb/dec/Android.mk
odecs/avc/dec/Android.mk
odecs/g711/dec/Android.mk
odecs/m4v_h263/dec/Android.mk
odecs/mp3dec/Android.mk
odecs/on2/dec/Android.mk
odecs/vorbis/dec/Android.mk
86b7f47aa7482424cf8fd248f1315311919be3b0 10-May-2011 James Dong <jdong@google.com> Support platform and camera dependent recording start time offset

related-to-bug: 4390777

Change-Id: Icb52973ad4ac716f04fb103ef527915a966d06d5
PEG4Writer.cpp
07b1bb529a1ae76c46a71b01338c166f9490629d 12-May-2011 James Dong <jdong@google.com> Support for storing geo information in the recorded mp4/3gpp file.

o Geo data (latitude and longitude) is stored in udta box

Change-Id: I76e4aeb741c4b339f3753d3d28190151f3ea4919
related-to-bug: 4260295
PEG4Writer.cpp
2352f4854a5cbfb4ba180f1c19f3e9a3b2315327 13-May-2011 Gloria Wang <gwang@google.com> DO NOT MERGE
For bug 4422428
Squashed commit of the following:

commit ae2e13783db2284f40d3891e70e152dab941edfc
Author: Gloria Wang <gwang@google.com>
Date: Fri May 13 11:43:11 2011 -0700

Add one more DRM error code. For bug 4422428.

Change-Id: I4e333f474c96c0e0f162dde4013ad32b336bebd6

commit 0f88249d0cb5221f622cf1d1ac3cdccefb8f58a2
Author: Gloria Wang <gwang@google.com>
Date: Fri Apr 29 10:44:46 2011 -0700

Add DRM errors in the DRM frameworks to MediaErrors also.
For bug 4350156.

Change-Id: Ib5711ec642178a49203a448b7f5114e675d49394

Change-Id: Ia02de462159400eef8c015d28531bf1dd6796a18
wesomePlayer.cpp
RMExtractor.cpp
b5212db69734962f55e1493d3e696794172ced51 13-May-2011 James Dong <jdong@google.com> Track id really starts with 1, not 0

Change-Id: I55dcfdc2dc2a64285dfa93024f7b885210cc827e
PEG4Writer.cpp
cd45ccddb00662f2af8409b895fbcdd0434da8b1 13-May-2011 Kristian Monsen <kristianm@google.com> Merge Chromium at 10.0.621.0: Fixes for libstagefreight

URLRequest is now a member of the net namespace.
HttpCache constructor has a new argument, which is a CertVerifier()

Change-Id: I21d524938868b2e37993838f4fbb8447b02c3606
hromium_http/support.cpp
hromium_http/support.h
b84d042a1216694e1db6b1fc2b053d348cab5593 12-May-2011 Andreas Huber <andih@google.com> Merge "A fix to the MPEG4Extractor to support 16-bit sample sizes."
9f753df58a70f20db220af31cb202bbd21b30f36 12-May-2011 Andreas Huber <andih@google.com> A fix to the MPEG4Extractor to support 16-bit sample sizes.

Change-Id: Ic531f1ff0dd171f6f14aaad56aacbf3952a3aeae
ampleTable.cpp
00f4951088805442e86ff9c2a20ddad79fc2410a 11-May-2011 Andreas Huber <andih@google.com> The decoder wrapper is no longer needed. Also disable building old-style decoders.

Change-Id: Ie022f1a6dffe619c1b0385aa13f63e097282cfe4
ndroid.mk
bbba88cb1bdc34705d1477208990a06904c022e7 11-May-2011 Andreas Huber <andih@google.com> Squashed commit of the following:

commit c80992e419ed567abef451042f09c4958534b90d
Author: Andreas Huber <andih@google.com>
Date: Wed May 11 14:00:07 2011 -0700

Support for the mp3 audio decoder as a software OMX component.

Change-Id: I66e10c4d0be4c3aecdef1c21b15a2c7359ceb807

commit a358d0e1bf2a88897887445f42ccdda0f5f2f528
Author: Andreas Huber <andih@google.com>
Date: Wed May 11 13:11:23 2011 -0700

Support for G.711 alaw and mulaw decoders as software OMX components

Change-Id: Ia5c76c02cb83a9f94ce39a27b2251e5880218f03

commit 79088b9c9a5c8b8c97ea66cb4f90a2b0f0d34553
Author: Andreas Huber <andih@google.com>
Date: Thu May 5 15:43:32 2011 -0700

Instead of using an RGB surface and conversion yuv420->rgb565

convert from OMX_COLOR_FormatYUV420Planar to HAL_PIXEL_FORMAT_YV12 instead.

Change-Id: I8c4fc3c54c963f0d4ba6377f3c4ab4e0013152e5
related-to-bug: 4394005

commit 69469d3bd84425777b11b9fc938c5e0c61af26a7
Author: Andreas Huber <andih@google.com>
Date: Tue May 10 15:46:42 2011 -0700

voip mustn't link against libstagefright.so

Change-Id: I4d0ba9a8b9dc9380b792a1bd04bcda231964862c

commit 2a9a9eeeeeb36ae3a9e680469c3016d509ff08c3
Author: Andreas Huber <andih@google.com>
Date: Tue May 10 14:37:10 2011 -0700

Remove most non-OMX software decoders by default

Change-Id: Ic56514bc1b56b8fa952e8c4a164ea7379ecb69d0

commit a4de62c37b335c318217765403a9fb282b20a216
Author: Andreas Huber <andih@google.com>
Date: Mon May 9 16:50:02 2011 -0700

Conditionally build the old-style software decoders.

Change-Id: I5de609e1d76c92d26d6eb81d1551462258f3f15f

commit 5d8b039f9449dc3dad1e77c42c80cc0b54b0c846
Author: Andreas Huber <andih@google.com>
Date: Mon May 9 16:13:12 2011 -0700

Support for MPEG4 and H.263 video decoders as soft OMX components.

Change-Id: I5e3a4835afab89f98e3aa128d013628f5830eafe

commit b25a1bfbeb0ff6e62e1cc694ce2599c91489c7d0
Author: Andreas Huber <andih@google.com>
Date: Mon May 9 11:49:10 2011 -0700

Boost Soft OMX thread priority, fix timestamp handling in vorbis Soft OMX decoder.

Change-Id: I68d26d4999f06fcc451d69e5303663fab0cba9e8

commit c0574362f8dc3319ce84d981097867062a698527
Author: Andreas Huber <andih@google.com>
Date: Mon May 9 11:28:53 2011 -0700

Support for the AMR decoders (NB and WB) as Soft OMX components.

Change-Id: Ia565f59833fb52653e23f26536e7e41fc329a754

commit 3e5575a8f0e27a490cb7bde77bd9456087837f08
Author: Andreas Huber <andih@google.com>
Date: Wed May 4 13:41:25 2011 -0700

Signal an error if the aac decoder failed to initialize from codec specific data.

Change-Id: I01da7831bdf722edd7d6dc5974486daa2cf2b209
related-to-bug: 4272179

commit f94aeaa9886e772ff4823e671ed237096649f4af
Author: Andreas Huber <andih@google.com>
Date: Tue May 3 13:07:38 2011 -0700

Software OMX nodes don't (yet?) support native_window mode.

Change-Id: I7d9ca9164ef4abf66b573ca21dba12d672f8b12d

commit eefdfabac8dc659e00daa56da69aea705c49cb67
Author: Andreas Huber <andih@google.com>
Date: Tue May 3 12:57:16 2011 -0700

Fixing the OMX tests to refer to appropriate files from test content.

Change-Id: I5b61c3498749bfb876abbd3946a5132356e3f6ff

commit f31b7326aef14b6a1b7946520a9688f092e844d5
Author: Andreas Huber <andih@google.com>
Date: Tue May 3 11:08:38 2011 -0700

Soft OMX components are now dynamiclly loaded/unloaded, not directly linked against.

Change-Id: I1e2ecfbfab67a8869886f738eaf0c7b3c948b6d9

commit b7f0343879e4df06f0a1c9bfece24df557954e2f
Author: Andreas Huber <andih@google.com>
Date: Mon May 2 15:58:36 2011 -0700

Support for the AVC software decoder as an OMX component.

Change-Id: I13c12df435ba4afbd968a9fc659f66b91c818bc2

commit 5bb9e616d6c8e1b13d531fe996b9a9affdfb2977
Author: Andreas Huber <andih@google.com>
Date: Fri Apr 29 12:05:37 2011 -0700

Fix Vorbis OMX decoder's component role.

Change-Id: I5e871e5e11b3f951c93590210e63fd7987c467b5

commit 089c91f2333062e196c7afd5fb0ca914878aa474
Author: Andreas Huber <andih@google.com>
Date: Fri Apr 29 12:05:18 2011 -0700

Support vorbis_decoder OMX testing.

Change-Id: I1985be178a12ae3f8768bc72067d9236238be170

commit 56e241fa36fc37219bc536b823bdc2ab82dc1fad
Author: Andreas Huber <andih@google.com>
Date: Fri Apr 29 12:01:46 2011 -0700

SoftVorbis OMX component now respects the number of valid frames per page.

Change-Id: I82a117a064d9b083fc58a54ad900a987a763ef03

commit fcd618ec520c376fdb78f4cbb44b8d9f5d213e2b
Author: Andreas Huber <andih@google.com>
Date: Fri Apr 29 10:59:38 2011 -0700

Support for the vorbis audio decoder as a soft OMX component.

Change-Id: Iaeb057e58ca306d3dce205c0445b74d5aefef492

commit d1fcc3203fc8003ad79c6e96b3a1fc4261743f16
Author: Andreas Huber <andih@google.com>
Date: Fri Apr 29 10:07:50 2011 -0700

VPX decoder now properly resizes buffers after a port settings change.

Change-Id: I110749a31b6cba087891d8e5dfe420830bdbf831

commit 35c7168243cb69849d88911144a2c7fdfed5c54e
Author: Andreas Huber <andih@google.com>
Date: Thu Apr 28 13:23:34 2011 -0700

Support for the VPX video decoder as a Software OMX component.

Change-Id: Ic345add2d6d768d4af631160153f2e9b97fcea71

commit 923b2534b4211fc5405377b5190bfa6f2dd27f32
Author: Andreas Huber <andih@google.com>
Date: Thu Apr 28 11:34:40 2011 -0700

Table-based registration of soft omx components.

Change-Id: I7f45f0fa5b3a7950776e69c66349731f7674e937

commit 04a88f3edb2266a463da9c4481b80178be460902
Author: Andreas Huber <andih@google.com>
Date: Thu Apr 28 11:22:31 2011 -0700

Apparently OMX_GetParameter is valid in any state other than OMX_StateInvalid

OMX_SetParameter is still constrained to OMX_StateLoaded or a disabled port.

Change-Id: I1032d7cf4011982d306aa369d4158a82830d26fb

commit 9d70ca68445e7c40f5c9b2d12466e468f514de88
Author: Andreas Huber <andih@google.com>
Date: Wed Apr 27 15:03:18 2011 -0700

Use the new soft OMX aac decoder for HTTP live playback.

Change-Id: Ifbcfb732a9edb855cb46b49f6d0ac942170ee28f

commit 213fe4a10ea93cce08e8622dc3908053f29878a1
Author: Andreas Huber <andih@google.com>
Date: Tue Apr 12 16:39:45 2011 -0700

Foundation for supporting software decoders as OMX components

Change-Id: I7fdab256563b35d1d090617abaea9a26b198d816

Change-Id: I83e9236beed4af985d10333c203f065df9e09a42
Codec.cpp
ndroid.mk
wesomePlayer.cpp
MXCodec.cpp
AVExtractor.cpp
odecs/aacdec/Android.mk
odecs/aacdec/SoftAAC.cpp
odecs/aacdec/SoftAAC.h
odecs/amrnb/dec/Android.mk
odecs/amrnb/dec/SoftAMR.cpp
odecs/amrnb/dec/SoftAMR.h
odecs/amrwb/AMRWBDecoder.cpp
odecs/amrwb/src/mime_io.cpp
odecs/amrwb/src/pvamrwbdecoder.h
odecs/avc/dec/Android.mk
odecs/avc/dec/SoftAVC.cpp
odecs/avc/dec/SoftAVC.h
odecs/g711/dec/Android.mk
odecs/g711/dec/SoftG711.cpp
odecs/g711/dec/SoftG711.h
odecs/m4v_h263/dec/Android.mk
odecs/m4v_h263/dec/SoftMPEG4.cpp
odecs/m4v_h263/dec/SoftMPEG4.h
odecs/mp3dec/Android.mk
odecs/mp3dec/SoftMP3.cpp
odecs/mp3dec/SoftMP3.h
odecs/on2/dec/Android.mk
odecs/on2/dec/SoftVPX.cpp
odecs/on2/dec/SoftVPX.h
odecs/vorbis/dec/Android.mk
odecs/vorbis/dec/SoftVorbis.cpp
odecs/vorbis/dec/SoftVorbis.h
nclude/SimpleSoftOMXComponent.h
nclude/SoftOMXComponent.h
mx/Android.mk
mx/OMXMaster.cpp
mx/OMXMaster.h
mx/OMXNodeInstance.cpp
mx/OMXPVCodecsPlugin.cpp
mx/OMXPVCodecsPlugin.h
mx/SimpleSoftOMXComponent.cpp
mx/SoftOMXComponent.cpp
mx/SoftOMXPlugin.cpp
mx/SoftOMXPlugin.h
mx/tests/OMXHarness.cpp
6e9fd1a24da7e9d7cabf0079a4291647154f8e39 11-May-2011 Andreas Huber <andih@google.com> Merge "Leave the number of output buffers up to surface flinger and friends."
4f4bedbfcbd443c9d0041a1e353d558fe6900757 11-May-2011 Andreas Huber <andih@google.com> Leave the number of output buffers up to surface flinger and friends.

Change-Id: Iebb90f45793793aeb08d1cf9706e29a7cefae792
olorconversion/SoftwareRenderer.cpp
df659ac173b247b4ad440fb2979ff51ff45e0aa4 11-May-2011 Andreas Huber <andih@google.com> Make sure the ogg extractor returns appropriate error codes.

Change-Id: I36cbf58aa6fa9195e1cc052f91e1183f57069d03
ggExtractor.cpp
681755fc0d0797506456f46a2a10555916d6be32 21-Apr-2011 Andreas Huber <andih@google.com> Using widevine:// to stream adaptive bitrate wvm content no longer

uses stagefright's http cache but defers caching to the WVMExtractor, which
now has the responsibility of reporting buffer status/duration.

Change-Id: Ieec64a20203977fd0a61d0c6834da124de78bfa2
related-to-bug: 4390283
wesomePlayer.cpp
VMExtractor.cpp
nclude/AwesomePlayer.h
nclude/WVMExtractor.h
c0dfc5b02d4179769bbdd25c10d430576ec09568 10-May-2011 Andreas Huber <andih@google.com> Properly honour any pending seek request when reading the first buffer after

starting the audio player.

Change-Id: Ibedc1804a8c444e4d0f5be4eb87b22ed5d2c367d
udioPlayer.cpp
wesomePlayer.cpp
nclude/AwesomePlayer.h
70ccfd44c4bfe95ddecc2df6c3695efc48229d72 06-May-2011 James Dong <jdong@google.com> Add send session recording summary report to application

Change-Id: I9c63ddae432f0c93486c39776ed0a058a8649602
PEG4Writer.cpp
4650ff0e86f9e815e3152a806a06c700418d071d 09-May-2011 James Dong <jdong@google.com> Add const to the finders method in MetaData.cpp

o also fixed the MPEG4Writer writeFtypBox() to take a const pointer to MetaData

Change-Id: Iaecdbe6aeab345f6dc72aac0d19f9704b6e0d28a
PEG4Writer.cpp
etaData.cpp
43ec1dfc5dc3934680a52a026c5519ddc51bdbd3 06-May-2011 James Dong <jdong@google.com> Add end of recording summary track info

Change-Id: I2fcf589e70db225776ef7c8d0f28505ceb824c45
related-to-bug: 1854633
PEG4Writer.cpp
b21c564ce47041f9dd3ab65e36fed57c4937a42d 07-May-2011 James Dong <jdong@google.com> Refactor MPEG4Writer::writeTrackHeader() method

o most of the mp4 file boxes has its own method now
TODO: remove some of the duplicated code for esds box, for instance.

Change-Id: Iae3dbb2410b79bc79aaee081b80569d339993c47
PEG4Writer.cpp
5e97c8861ef81d07cf1e304c1c1bed09b84513d4 06-May-2011 Andreas Huber <andih@google.com> Instead of using an RGB surface and conversion yuv420->rgb565

convert from OMX_COLOR_FormatYUV420Planar to HAL_PIXEL_FORMAT_YV12 instead.

Change-Id: I8c4fc3c54c963f0d4ba6377f3c4ab4e0013152e5
related-to-bug: 4394005
olorconversion/SoftwareRenderer.cpp
d7be5c5e812ad79d4838737a5e4dd81a8d776a0d 06-May-2011 Andreas Huber <andih@google.com> Color conversion now supports YUV420p->RGB565 conversion even if the width is odd.

Change-Id: I1ef3ead94eab3811ead8830e104a9dad211ae3fd
related-to-bug: 4363071
olorconversion/ColorConverter.cpp
83e90762e0ce4470e5174ae3b38afdfca0b9e42f 04-May-2011 Andreas Huber <andih@google.com> DO NOT MERGE: Properly construct the ESDS metadata even if sizeof(codec-specific-data) != 2

Change-Id: Ie711ea8d6956fa8370c78e23bf795325627164d1
related-to-bug: 4381047
atroska/MatroskaExtractor.cpp
593aebaedc4bfaa72c92a8ce470543b67838d86f 04-May-2011 James Dong <jdong@google.com> Merge "Initial check-in for AACWriter"
760943b5e7a09b602aba04ec451e97662f48b0a4 21-Mar-2011 James Dong <jdong@google.com> Initial check-in for AACWriter

Change-Id: Ia21ca39a404484b2dda25c6101780d2ff11c4623

related-to-bug: 4211046
ACWriter.cpp
ndroid.mk
odecs/aacenc/AACEncoder.cpp
59633a1e0ae968a90367718fb21716c32d73af04 04-May-2011 Andreas Huber <andih@google.com> Signal an error if aac decoding fails early.

Change-Id: I8b886a7642aaf83fa008fefb38cb4f92267ca948
related-to-bug: 4272179
odecs/aacdec/AACDecoder.cpp
87ae62f327eb155a595ab6400e924667fd50a852 04-May-2011 Andreas Huber <andih@google.com> Merge "Fix potential memory corruption in NuCachedSource2."
67802977b6f0aa8d6f14f85dadcf32a3cadb9c07 04-May-2011 Andreas Huber <andih@google.com> Fix potential memory corruption in NuCachedSource2.

Change-Id: Ia6bd2d4966287228a3ac1b067ee1f1ccad965dbb
related-to-bug: 4354845
uCachedSource2.cpp
82ac8bf2da940c4439786c346f739f4a496864ad 04-May-2011 Andreas Huber <andih@google.com> Properly construct the ESDS metadata even if sizeof(codec-specific-data) != 2

Change-Id: I3dc50e6e447668ac8b8c2956329352635750a2cd
related-to-bug: 4381047
atroska/MatroskaExtractor.cpp
89dc0dffdcbf0999a854a9b1bbea8f56395cc209 04-May-2011 Gloria Wang <gwang@google.com> Merge "Initial CL for the timed text support: - Add support for MP4 timed text - Add API for app to turn on/off a text track - Add timed text metadata(language) in the MediaMetadataRetriever"
7a1e3e81264189e23a1db2b174e1b5a5d4c7d1c3 04-May-2011 Gloria Wang <gwang@google.com> Initial CL for the timed text support:
- Add support for MP4 timed text
- Add API for app to turn on/off a text track
- Add timed text metadata(language) in the MediaMetadataRetriever

Change-Id: I0055beba38ac761627dbcc6d581ae9582d68bb94
ndroid.mk
wesomePlayer.cpp
PEG4Extractor.cpp
ediaDefs.cpp
tagefrightMetadataRetriever.cpp
imedTextPlayer.cpp
nclude/AwesomePlayer.h
nclude/TimedTextPlayer.h
8ce2364512f7c32c824f5ec5719688830ba72427 01-May-2011 Iliyan Malchev <malchev@google.com> frameworks/base: android_native_buffer_t -> ANativeWindowBuffer

Change-Id: Idc2eabaa805bb6d308ebb315872623f28d428417
Signed-off-by: Iliyan Malchev <malchev@google.com>
Codec.cpp
MXCodec.cpp
olorconversion/SoftwareRenderer.cpp
d2b0088df550e3ddfa44dbdfd1cd9a79ff80a2de 30-Apr-2011 Gloria Wang <gwang@google.com> Merge "Add setParameter/getParameter to MediaPlayer API. for bug 1982947"
7ae9d02961c091dcd9765e094c1c4063cbdf34a4 29-Apr-2011 James Dong <jdong@google.com> am ec78f551: Add avg bandwidth estimate every 2 seconds - do not merge.

* commit 'ec78f551b575b0274cbe796f8e08a9df1a706680':
Add avg bandwidth estimate every 2 seconds - do not merge.
7340743ce30766af6334bbd9acf813eb66dd5a60 29-Apr-2011 Gloria Wang <gwang@google.com> Add DRM errors in the DRM frameworks to MediaErrors also.
For bug 4350156.

Change-Id: Ib5711ec642178a49203a448b7f5114e675d49394
wesomePlayer.cpp
RMExtractor.cpp
4f9e47f2c03ce36261c4717cd7e131d7940bb068 26-Apr-2011 Gloria Wang <gwang@google.com> Add setParameter/getParameter to MediaPlayer API.
for bug 1982947

Change-Id: If3f40e4f18cbba155af29944af38bdc627f8cd53
wesomePlayer.cpp
nclude/AwesomePlayer.h
ae23aaee377578d9601db8d0acff66a4dd40920a 28-Apr-2011 James Dong <jdong@google.com> Add avg bandwidth estimate every 2 seconds - do not merge.

This patch is meant for testing only.
We will remove this patch once we tracked down all those spinning issues.

related-to-bug: 4339075

Change-Id: I4cf1927f1067d4f7dbc589ceb3c47407eaf40ae7
uHTTPDataSource.cpp
nclude/NuHTTPDataSource.h
5d4478556299c656b5bb940e83277e01233ec015 28-Apr-2011 Dima Zavin <dima@android.com> Merge changes I22d9e018,Ib0701fcc,Ibc637918,I9eb7e002,I4adcec73

* changes:
audioflinger: don't do work in constructor, instead do it in onFirstRef
audioflinger: enumerate all the possible audio interfaces
audio/media: convert to using the audio HAL and new audio defs
libmedia: move AudioParameter out of AudioSystem
audioflinger: move legacy audio hw/policy out to libhardware_legacy
a488c7daf91357611fcdbff7a32e5a73ec630070 28-Apr-2011 Andreas Huber <andih@google.com> Fix omx_tests to no longer refer to test files that are no longer available.

Also make sure that a seek beyond EOF does not just seek the final syncframe.

Change-Id: I0a58490ef719ce095a94f1d6909c60eb20074a0b
ampleTable.cpp
mx/tests/OMXHarness.cpp
fce7a473248381cc83a01855f92581077d3c9ee2 20-Apr-2011 Dima Zavin <dima@android.com> audio/media: convert to using the audio HAL and new audio defs

Change-Id: Ibc637918637329e4f2b62f4ac7781102fbc269f5
Signed-off-by: Dima Zavin <dima@android.com>
udioPlayer.cpp
udioSource.cpp
2e40530f7cbb024b60c491f42dadb2597d4de07e 26-Apr-2011 James Dong <jdong@google.com> Merge "Give PSP and QuickTime compatible mp4 files a chance to play"
7c1bc4cb2260f666a2fba9e64bb9de95121f0b22 24-Apr-2011 Mike Lockwood <lockwood@android.com> Remove log spam

Change-Id: I3182576158c7c0410c19036a580fd46c6ab079f9
Signed-off-by: Mike Lockwood <lockwood@android.com>
INGSeeker.cpp
99bc0510f9152fa88508a1ba1d2d158961fcefe0 20-Apr-2011 Martin Storsjo <martin@martin.st> stagefright aacenc: Mark codeWord as UWord16

Without this, the codeword 0xffff will be expanded to
0xffffffff when passed as a Word32 parameter. All code words
set into this variable are UWord16 initially.

When it was expanded to 0xffffffff, it could accidentally
overwrite earlier cached bits in the bitstream writer.

Change-Id: Id91a2b8a4e934876d9cb39eaeeee323202ec8e40
odecs/aacenc/src/bit_cnt.c
f3664ae9369a861ffbc2354e8e93e48983802062 05-Apr-2011 Mans Rullgard <mans@mansr.com> stagefright aacenc/amrwbenc: Remove trailing whitespace

Change-Id: I3c85d8ba4cfb164455d137cdbf3b5ecc941dc6b8
odecs/aacenc/Android.mk
odecs/aacenc/SampleCode/AAC_E_SAMPLES.c
odecs/aacenc/SampleCode/Android.mk
odecs/aacenc/SampleCode/eclair/Makefile
odecs/aacenc/SampleCode/ms.mk
odecs/aacenc/Tools/doit.mk
odecs/aacenc/Tools/eclair.mk
odecs/aacenc/basic_op/basic_op.h
odecs/aacenc/basic_op/basicop2.c
odecs/aacenc/basic_op/oper_32b.c
odecs/aacenc/basic_op/oper_32b.h
odecs/aacenc/basic_op/typedef.h
odecs/aacenc/basic_op/typedefs.h
odecs/aacenc/build/eclair/ARMV5E/Makefile
odecs/aacenc/build/eclair/ARMV7/Makefile
odecs/aacenc/build/eclair/makefile
odecs/aacenc/build/ms.mk
odecs/aacenc/inc/aac_rom.h
odecs/aacenc/inc/aacenc_core.h
odecs/aacenc/inc/adj_thr.h
odecs/aacenc/inc/adj_thr_data.h
odecs/aacenc/inc/bitenc.h
odecs/aacenc/inc/interface.h
odecs/aacenc/inc/line_pe.h
odecs/aacenc/inc/psy_const.h
odecs/aacenc/inc/psy_main.h
odecs/aacenc/inc/qc_main.h
odecs/aacenc/inc/quantize.h
odecs/aacenc/inc/sf_estim.h
odecs/aacenc/inc/stat_bits.h
odecs/aacenc/inc/tns_param.h
odecs/aacenc/inc/transform.h
odecs/aacenc/src/aac_rom.c
odecs/aacenc/src/aacenc.c
odecs/aacenc/src/aacenc_core.c
odecs/aacenc/src/adj_thr.c
odecs/aacenc/src/asm/ARMV5E/AutoCorrelation_v5.s
odecs/aacenc/src/asm/ARMV5E/CalcWindowEnergy_v5.s
odecs/aacenc/src/asm/ARMV5E/PrePostMDCT_v5.s
odecs/aacenc/src/asm/ARMV5E/R4R8First_v5.s
odecs/aacenc/src/asm/ARMV5E/Radix4FFT_v5.s
odecs/aacenc/src/asm/ARMV5E/band_nrg_v5.s
odecs/aacenc/src/asm/ARMV7/PrePostMDCT_v7.s
odecs/aacenc/src/asm/ARMV7/R4R8First_v7.s
odecs/aacenc/src/asm/ARMV7/Radix4FFT_v7.s
odecs/aacenc/src/band_nrg.c
odecs/aacenc/src/bit_cnt.c
odecs/aacenc/src/bitbuffer.c
odecs/aacenc/src/bitenc.c
odecs/aacenc/src/block_switch.c
odecs/aacenc/src/channel_map.c
odecs/aacenc/src/dyn_bits.c
odecs/aacenc/src/grp_data.c
odecs/aacenc/src/interface.c
odecs/aacenc/src/line_pe.c
odecs/aacenc/src/memalign.c
odecs/aacenc/src/ms_stereo.c
odecs/aacenc/src/pre_echo_control.c
odecs/aacenc/src/psy_configuration.c
odecs/aacenc/src/psy_main.c
odecs/aacenc/src/qc_main.c
odecs/aacenc/src/quantize.c
odecs/aacenc/src/sf_estim.c
odecs/aacenc/src/stat_bits.c
odecs/aacenc/src/tns.c
odecs/aacenc/src/transform.c
odecs/amrwbenc/Android.mk
odecs/amrwbenc/SampleCode/AMRWB_E_SAMPLE.c
odecs/amrwbenc/SampleCode/Android.mk
odecs/amrwbenc/SampleCode/eclair/Makefile
odecs/amrwbenc/SampleCode/ms.mk
odecs/amrwbenc/build/eclair/ARMV5E/Makefile
odecs/amrwbenc/build/eclair/ARMV7/Makefile
odecs/amrwbenc/build/eclair/makefile
odecs/amrwbenc/build/eclair/ms.mk
odecs/amrwbenc/inc/basic_op.h
odecs/amrwbenc/inc/homing.tab
odecs/amrwbenc/inc/isp_isf.tab
odecs/amrwbenc/inc/log2.h
odecs/amrwbenc/inc/mime_io.tab
odecs/amrwbenc/inc/stream.h
odecs/amrwbenc/inc/typedef.h
odecs/amrwbenc/inc/typedefs.h
odecs/amrwbenc/src/asm/ARMV5E/Deemph_32_opt.s
odecs/amrwbenc/src/asm/ARMV5E/Dot_p_opt.s
odecs/amrwbenc/src/asm/ARMV5E/Filt_6k_7k_opt.s
odecs/amrwbenc/src/asm/ARMV5E/Norm_Corr_opt.s
odecs/amrwbenc/src/asm/ARMV5E/Syn_filt_32_opt.s
odecs/amrwbenc/src/asm/ARMV5E/convolve_opt.s
odecs/amrwbenc/src/asm/ARMV5E/cor_h_vec_opt.s
odecs/amrwbenc/src/asm/ARMV5E/pred_lt4_1_opt.s
odecs/amrwbenc/src/asm/ARMV5E/residu_asm_opt.s
odecs/amrwbenc/src/asm/ARMV5E/scale_sig_opt.s
odecs/amrwbenc/src/asm/ARMV5E/syn_filt_opt.s
odecs/amrwbenc/src/asm/ARMV7/Deemph_32_neon.s
odecs/amrwbenc/src/asm/ARMV7/Dot_p_neon.s
odecs/amrwbenc/src/asm/ARMV7/Filt_6k_7k_neon.s
odecs/amrwbenc/src/asm/ARMV7/Norm_Corr_neon.s
odecs/amrwbenc/src/asm/ARMV7/Syn_filt_32_neon.s
odecs/amrwbenc/src/asm/ARMV7/convolve_neon.s
odecs/amrwbenc/src/asm/ARMV7/cor_h_vec_neon.s
odecs/amrwbenc/src/asm/ARMV7/pred_lt4_1_neon.s
odecs/amrwbenc/src/asm/ARMV7/residu_asm_neon.s
odecs/amrwbenc/src/asm/ARMV7/scale_sig_neon.s
odecs/amrwbenc/src/asm/ARMV7/syn_filt_neon.s
odecs/amrwbenc/src/autocorr.c
odecs/amrwbenc/src/az_isp.c
odecs/amrwbenc/src/bits.c
odecs/amrwbenc/src/c2t64fx.c
odecs/amrwbenc/src/c4t64fx.c
odecs/amrwbenc/src/convolve.c
odecs/amrwbenc/src/cor_h_x.c
odecs/amrwbenc/src/decim54.c
odecs/amrwbenc/src/deemph.c
odecs/amrwbenc/src/dtx.c
odecs/amrwbenc/src/g_pitch.c
odecs/amrwbenc/src/gpclip.c
odecs/amrwbenc/src/hp400.c
odecs/amrwbenc/src/hp50.c
odecs/amrwbenc/src/hp6k.c
odecs/amrwbenc/src/hp_wsp.c
odecs/amrwbenc/src/int_lpc.c
odecs/amrwbenc/src/isp_az.c
odecs/amrwbenc/src/isp_isf.c
odecs/amrwbenc/src/levinson.c
odecs/amrwbenc/src/log2.c
odecs/amrwbenc/src/lp_dec2.c
odecs/amrwbenc/src/math_op.c
odecs/amrwbenc/src/mem_align.c
odecs/amrwbenc/src/p_med_ol.c
odecs/amrwbenc/src/pitch_f4.c
odecs/amrwbenc/src/pred_lt4.c
odecs/amrwbenc/src/preemph.c
odecs/amrwbenc/src/q_gain2.c
odecs/amrwbenc/src/q_pulse.c
odecs/amrwbenc/src/qisf_ns.c
odecs/amrwbenc/src/qpisf_2s.c
odecs/amrwbenc/src/residu.c
odecs/amrwbenc/src/scale.c
odecs/amrwbenc/src/stream.c
odecs/amrwbenc/src/syn_filt.c
odecs/amrwbenc/src/updt_tar.c
odecs/amrwbenc/src/voAMRWBEnc.c
odecs/amrwbenc/src/voicefac.c
odecs/amrwbenc/src/wb_vad.c
odecs/amrwbenc/src/weight_a.c
odecs/common/Config.mk
odecs/common/include/voAMRWB.h
odecs/common/include/voAudio.h
odecs/common/include/voIndex.h
41050cdb033641ddf26831d9272c0930f7b40a2d 22-Apr-2011 Mans Rullgard <mans@mansr.com> stagefright aacenc/amrwbenc: Convert line breaks to Unix style

Change-Id: I6219725a9fbd72432bad71a176c14f26fabdbd5f
odecs/aacenc/SampleCode/AAC_E_SAMPLES.c
odecs/aacenc/SampleCode/eclair/Makefile
odecs/aacenc/SampleCode/ms.mk
odecs/aacenc/basic_op/basic_op.h
odecs/aacenc/basic_op/basicop2.c
odecs/aacenc/basic_op/oper_32b.c
odecs/aacenc/basic_op/oper_32b.h
odecs/aacenc/basic_op/typedef.h
odecs/aacenc/basic_op/typedefs.h
odecs/aacenc/build/eclair/ARMV5E/Makefile
odecs/aacenc/build/eclair/ARMV7/Makefile
odecs/aacenc/build/ms.mk
odecs/aacenc/inc/aac_rom.h
odecs/aacenc/inc/aacenc_core.h
odecs/aacenc/inc/adj_thr.h
odecs/aacenc/inc/adj_thr_data.h
odecs/aacenc/inc/band_nrg.h
odecs/aacenc/inc/bit_cnt.h
odecs/aacenc/inc/bitbuffer.h
odecs/aacenc/inc/bitenc.h
odecs/aacenc/inc/block_switch.h
odecs/aacenc/inc/channel_map.h
odecs/aacenc/inc/config.h
odecs/aacenc/inc/dyn_bits.h
odecs/aacenc/inc/grp_data.h
odecs/aacenc/inc/interface.h
odecs/aacenc/inc/line_pe.h
odecs/aacenc/inc/memalign.h
odecs/aacenc/inc/ms_stereo.h
odecs/aacenc/inc/pre_echo_control.h
odecs/aacenc/inc/psy_configuration.h
odecs/aacenc/inc/psy_const.h
odecs/aacenc/inc/psy_data.h
odecs/aacenc/inc/psy_main.h
odecs/aacenc/inc/qc_data.h
odecs/aacenc/inc/qc_main.h
odecs/aacenc/inc/quantize.h
odecs/aacenc/inc/sf_estim.h
odecs/aacenc/inc/spreading.h
odecs/aacenc/inc/stat_bits.h
odecs/aacenc/inc/tns.h
odecs/aacenc/inc/tns_func.h
odecs/aacenc/inc/tns_param.h
odecs/aacenc/inc/transform.h
odecs/aacenc/src/aac_rom.c
odecs/aacenc/src/aacenc.c
odecs/aacenc/src/aacenc_core.c
odecs/aacenc/src/adj_thr.c
odecs/aacenc/src/asm/ARMV5E/AutoCorrelation_v5.s
odecs/aacenc/src/asm/ARMV5E/CalcWindowEnergy_v5.s
odecs/aacenc/src/asm/ARMV5E/PrePostMDCT_v5.s
odecs/aacenc/src/asm/ARMV5E/R4R8First_v5.s
odecs/aacenc/src/asm/ARMV5E/Radix4FFT_v5.s
odecs/aacenc/src/asm/ARMV5E/band_nrg_v5.s
odecs/aacenc/src/asm/ARMV7/PrePostMDCT_v7.s
odecs/aacenc/src/asm/ARMV7/R4R8First_v7.s
odecs/aacenc/src/asm/ARMV7/Radix4FFT_v7.s
odecs/aacenc/src/band_nrg.c
odecs/aacenc/src/bit_cnt.c
odecs/aacenc/src/bitbuffer.c
odecs/aacenc/src/bitenc.c
odecs/aacenc/src/block_switch.c
odecs/aacenc/src/channel_map.c
odecs/aacenc/src/dyn_bits.c
odecs/aacenc/src/grp_data.c
odecs/aacenc/src/interface.c
odecs/aacenc/src/line_pe.c
odecs/aacenc/src/ms_stereo.c
odecs/aacenc/src/pre_echo_control.c
odecs/aacenc/src/psy_configuration.c
odecs/aacenc/src/psy_main.c
odecs/aacenc/src/qc_main.c
odecs/aacenc/src/quantize.c
odecs/aacenc/src/sf_estim.c
odecs/aacenc/src/spreading.c
odecs/aacenc/src/stat_bits.c
odecs/aacenc/src/tns.c
odecs/aacenc/src/transform.c
odecs/amrwbenc/SampleCode/AMRWB_E_SAMPLE.c
odecs/amrwbenc/SampleCode/eclair/Makefile
odecs/amrwbenc/SampleCode/ms.mk
odecs/amrwbenc/build/eclair/ARMV5E/Makefile
odecs/amrwbenc/build/eclair/ARMV7/Makefile
odecs/amrwbenc/build/eclair/ms.mk
odecs/amrwbenc/inc/acelp.h
odecs/amrwbenc/inc/basic_op.h
odecs/amrwbenc/inc/bits.h
odecs/amrwbenc/inc/cnst.h
odecs/amrwbenc/inc/cod_main.h
odecs/amrwbenc/inc/dtx.h
odecs/amrwbenc/inc/grid100.tab
odecs/amrwbenc/inc/ham_wind.tab
odecs/amrwbenc/inc/homing.tab
odecs/amrwbenc/inc/isp_isf.tab
odecs/amrwbenc/inc/lag_wind.tab
odecs/amrwbenc/inc/log2.h
odecs/amrwbenc/inc/log2_tab.h
odecs/amrwbenc/inc/main.h
odecs/amrwbenc/inc/math_op.h
odecs/amrwbenc/inc/mem_align.h
odecs/amrwbenc/inc/mime_io.tab
odecs/amrwbenc/inc/oper_32b.h
odecs/amrwbenc/inc/p_med_o.h
odecs/amrwbenc/inc/p_med_ol.tab
odecs/amrwbenc/inc/q_gain2.tab
odecs/amrwbenc/inc/q_pulse.h
odecs/amrwbenc/inc/qisf_ns.tab
odecs/amrwbenc/inc/qpisf_2s.tab
odecs/amrwbenc/inc/stream.h
odecs/amrwbenc/inc/typedef.h
odecs/amrwbenc/inc/typedefs.h
odecs/amrwbenc/inc/wb_vad.h
odecs/amrwbenc/inc/wb_vad_c.h
odecs/amrwbenc/src/asm/ARMV5E/Deemph_32_opt.s
odecs/amrwbenc/src/asm/ARMV5E/Dot_p_opt.s
odecs/amrwbenc/src/asm/ARMV5E/Filt_6k_7k_opt.s
odecs/amrwbenc/src/asm/ARMV5E/Syn_filt_32_opt.s
odecs/amrwbenc/src/asm/ARMV5E/cor_h_vec_opt.s
odecs/amrwbenc/src/asm/ARMV5E/pred_lt4_1_opt.s
odecs/amrwbenc/src/asm/ARMV5E/residu_asm_opt.s
odecs/amrwbenc/src/asm/ARMV5E/scale_sig_opt.s
odecs/amrwbenc/src/asm/ARMV5E/syn_filt_opt.s
odecs/amrwbenc/src/asm/ARMV7/Deemph_32_neon.s
odecs/amrwbenc/src/asm/ARMV7/Dot_p_neon.s
odecs/amrwbenc/src/asm/ARMV7/Filt_6k_7k_neon.s
odecs/amrwbenc/src/asm/ARMV7/Syn_filt_32_neon.s
odecs/amrwbenc/src/asm/ARMV7/cor_h_vec_neon.s
odecs/amrwbenc/src/asm/ARMV7/pred_lt4_1_neon.s
odecs/amrwbenc/src/asm/ARMV7/scale_sig_neon.s
odecs/amrwbenc/src/asm/ARMV7/syn_filt_neon.s
odecs/amrwbenc/src/autocorr.c
odecs/amrwbenc/src/az_isp.c
odecs/amrwbenc/src/bits.c
odecs/amrwbenc/src/c2t64fx.c
odecs/amrwbenc/src/c4t64fx.c
odecs/amrwbenc/src/cmnMemory.c
odecs/amrwbenc/src/convolve.c
odecs/amrwbenc/src/cor_h_x.c
odecs/amrwbenc/src/decim54.c
odecs/amrwbenc/src/deemph.c
odecs/amrwbenc/src/dtx.c
odecs/amrwbenc/src/g_pitch.c
odecs/amrwbenc/src/gpclip.c
odecs/amrwbenc/src/homing.c
odecs/amrwbenc/src/hp400.c
odecs/amrwbenc/src/hp50.c
odecs/amrwbenc/src/hp6k.c
odecs/amrwbenc/src/hp_wsp.c
odecs/amrwbenc/src/int_lpc.c
odecs/amrwbenc/src/isp_az.c
odecs/amrwbenc/src/isp_isf.c
odecs/amrwbenc/src/lag_wind.c
odecs/amrwbenc/src/levinson.c
odecs/amrwbenc/src/log2.c
odecs/amrwbenc/src/lp_dec2.c
odecs/amrwbenc/src/math_op.c
odecs/amrwbenc/src/oper_32b.c
odecs/amrwbenc/src/p_med_ol.c
odecs/amrwbenc/src/pit_shrp.c
odecs/amrwbenc/src/pitch_f4.c
odecs/amrwbenc/src/pred_lt4.c
odecs/amrwbenc/src/preemph.c
odecs/amrwbenc/src/q_gain2.c
odecs/amrwbenc/src/q_pulse.c
odecs/amrwbenc/src/qisf_ns.c
odecs/amrwbenc/src/qpisf_2s.c
odecs/amrwbenc/src/random.c
odecs/amrwbenc/src/residu.c
odecs/amrwbenc/src/scale.c
odecs/amrwbenc/src/stream.c
odecs/amrwbenc/src/syn_filt.c
odecs/amrwbenc/src/updt_tar.c
odecs/amrwbenc/src/util.c
odecs/amrwbenc/src/voAMRWBEnc.c
odecs/amrwbenc/src/voicefac.c
odecs/amrwbenc/src/wb_vad.c
odecs/amrwbenc/src/weight_a.c
odecs/common/Config.mk
odecs/common/cmnMemory.c
odecs/common/include/cmnMemory.h
odecs/common/include/voAAC.h
odecs/common/include/voAMRWB.h
odecs/common/include/voAudio.h
odecs/common/include/voIndex.h
odecs/common/include/voType.h
34fe252c89e33572d01fea981b58d7b115e76164 22-Apr-2011 James Dong <jdong@google.com> Remove the assertion and report content malform error to application

Change-Id: I8e30c586048d38334fd4366959a124a99d8efe28
related-to-bug: 4267147
PEG4Extractor.cpp
ad0d9c9c39a24b7fbd94e935a5855c9025341929 19-Apr-2011 Andreas Huber <andih@google.com> Add extra headers specified in the media player's setDataSource call

to all http requests made by the http live implementation.

Change-Id: I9dd78bb261bc678ea98c82009ca2634b74f3cd58
related-to-bug: 4315346
ttplive/LiveSession.cpp
nclude/LiveSession.h
7bf8413f91fc072452f315a91618aeef2574d420 19-Apr-2011 Andreas Huber <andih@google.com> Make sure a read restarts the prefetcher if necessary.

Change-Id: I87cac0e61e4dce7987ddf29c32f51e1672d1bbed
related-to-bug: 4286618
uCachedSource2.cpp
nclude/NuCachedSource2.h
859e0c839fc2bf1a1411d58c41f958474f87c836 19-Apr-2011 Andreas Huber <andih@google.com> am f0f1ceeb: DO NOT MERGE: Make sure we restart the prefetcher immediately when trying to satisfy a read.

* commit 'f0f1ceeb517ff226532a407da6d55602f195e5b5':
DO NOT MERGE: Make sure we restart the prefetcher immediately when trying to satisfy a read.
4678a6dc5f09008481524949a9667af5a6190374 15-Apr-2011 Andreas Huber <andih@google.com> Remove streamability verification, it's taking too long. Also...

make sure that findSampleAtTime uses composition time instead of decoding time,
at the expense of extra memory.

Change-Id: I67d09389b3df7ed265f614bdd0b142ca7f19f86a
related-to-bug: 4294536
PEG4Extractor.cpp
ampleTable.cpp
nclude/MPEG4Extractor.h
nclude/SampleTable.h
0a89d849bbf20ff1739f0799d54f1868f8abefbc 14-Apr-2011 Andreas Huber <andih@google.com> DO NOT MERGE: Make sure we restart the prefetcher immediately when trying to satisfy a read.

Change-Id: I27c2b5d20ae577e71936d32522f70f6ba08cc247
related-to-bug: 4286618
wesomePlayer.cpp
uCachedSource2.cpp
nclude/NuCachedSource2.h
53e1c0497b720d0e4f00dd7ca61838b865d41add 13-Apr-2011 Glenn Kasten <gkasten@google.com> am 8d2e14da: am 34cd123a: am b0d6f10e: Bug 4167061 remove debugging code

* commit '8d2e14daa752d657b9747fc9734fbfd7b34c1f7a':
Bug 4167061 remove debugging code
7613baa541233c0955d32c4f76731f6c1fb6f61f 13-Apr-2011 Glenn Kasten <gkasten@google.com> am b0d6f10e: Bug 4167061 remove debugging code

* commit 'b0d6f10eedeef099164995d51dbd076a6fcc5acc':
Bug 4167061 remove debugging code
6c00983982d167bdb348c437f0480a480f38696c 13-Apr-2011 Glenn Kasten <gkasten@google.com> Bug 4167061 remove debugging code

Change-Id: I1cb46a7bbf885c72e75d32f3f7675d90ab611e85
wesomePlayer.cpp
c33b033d11b781719d7f8dd2a63a826f09bb3593 12-Apr-2011 Andreas Huber <andih@google.com> Merge "Experimental support for changing the video surface/texture on an active mediaplayer"
90fc6105cf504bf8e5eabc33a8d35b70a91795d2 12-Apr-2011 Andreas Huber <andih@google.com> Merge "If the media extractor specifies an invalid thumbnail time, default to the first frame."
fb50c0ba482dddfb030a2cff6874586949dc8ffe 11-Apr-2011 Glenn Kasten <gkasten@google.com> am a7e8385c: am 87ee132a: am c6c2285b: Enable HDCP debugging in Stagefright (1 of 2)

* commit 'a7e8385cb34a19e47fb67bf8f632a8b47503242d':
Enable HDCP debugging in Stagefright (1 of 2)
df485b44bc929c34cf2cc068efe74816540c64b7 11-Apr-2011 Glenn Kasten <gkasten@google.com> am c6c2285b: Enable HDCP debugging in Stagefright (1 of 2)

* commit 'c6c2285b36e83b96056e2404371cdf6e6f7acaee':
Enable HDCP debugging in Stagefright (1 of 2)
449d8ad81402c2758793db99850a4d390c191f4f 11-Apr-2011 Glenn Kasten <gkasten@google.com> Enable HDCP debugging in Stagefright (1 of 2)

Change-Id: Ia3ea555d5fa45547ed6bfce59f299087ced7809c
wesomePlayer.cpp
21af757836167a328ddf1c0381909d53941528c4 11-Apr-2011 Andreas Huber <andih@google.com> If the media extractor specifies an invalid thumbnail time, default to the first frame.

Change-Id: I96514fa661d26726b4562872a5ebe87be88db71e
related-to-bug: 3447147
tagefrightMetadataRetriever.cpp
79f84b521cc681dfd7ec7b1b0d5d832795085dc8 11-Apr-2011 Jason Simmons <jsimmons@google.com> Merge "In the MP3 extractor, compute timestamps based on sample count instead of byte count. This fixes timestamp accuracy on VBR streams."
fa4e195a735ab99e02388ac5c5611e73a76c7c72 09-Apr-2011 Jamie Gennis <jgennis@google.com> am 0fb4e73f: am 3a9f5143: am 66380f76: Stagefright: authenticate ANativeWindow.

* commit '0fb4e73f5fd107b0ebd1c7a1a25dc40d99cf0705':
Stagefright: authenticate ANativeWindow.
f68c65b8d9864919950aa52774e8cf7b5d7563f4 09-Apr-2011 Jamie Gennis <jgennis@google.com> am 66380f76: Stagefright: authenticate ANativeWindow.

* commit '66380f768c0de8bde1f54ac6ab3f126b66928dad':
Stagefright: authenticate ANativeWindow.
d4d43b2ad0f715211feb48ce2f3e2158883583c0 08-Apr-2011 Jamie Gennis <jgennis@google.com> Stagefright: authenticate ANativeWindow.

This change adds a check to verify that the ANativeWindow to which
decoded video buffers are queued sends those buffers to SurfaceFlinger.
The check is done when the buffer content is flagged as protected. This
change also adds an error in the case where protected buffers are
needed, but an ANativeWindow is not being used as the video destination.

Change-Id: I107c9082d65ef0de4a13594e9535a2053ad5161b
Bug: 4269240
MXCodec.cpp
4cb2c4dc7af70684e81cfbce46cbcbb9e44f4dc4 08-Apr-2011 James Dong <jdong@google.com> Give PSP and QuickTime compatible mp4 files a chance to play

Change-Id: I2618946b242b581fb8ed5de9a13ede23a4191b11
related-to-bug: 4173290
PEG4Extractor.cpp
a9e05b911f978dc3f25d4b1e35e51383dc4f9fc7 07-Apr-2011 Jason Simmons <jsimmons@google.com> In the MP3 extractor, compute timestamps based on sample count instead of byte count.
This fixes timestamp accuracy on VBR streams.

Change-Id: I73a30309536919cbeb5e5163f2f1340e2b9fa4b1
P3Extractor.cpp
nclude/MP3Extractor.h
9a03bfb071e0969b14a1ead7c85a12bd3df564a1 04-Apr-2011 James Dong <jdong@google.com> am ea5d2c58: Merge "When read() from AudioRecord returns 0 or negative value, report an error to application. DO NOT MERGE." into gingerbread

* commit 'ea5d2c584490424be6bbc27dec58b4f9868d631e':
When read() from AudioRecord returns 0 or negative value, report an error to application. DO NOT MERGE.
7fb4b427d5fca79c09d69b212ddca41539c215a2 04-Apr-2011 Andreas Huber <andih@google.com> Merge "This reverts an earlier change 4aeec2da39fce4de9b07b694d59fd308ffb3d491"
51c1e0e86a0ad95bf3d890a9a2f51e54b8ef9444 04-Apr-2011 Andreas Huber <andih@google.com> This reverts an earlier change 4aeec2da39fce4de9b07b694d59fd308ffb3d491

Instead of returning 0-filled buffers after EOS from AudioTrack we do this
work in AudioOutput instead. That way the EOS signal (0 frames returned)
is preserved in AudioCache which otherwise would lead to a heap size overflow
filling everything with zeroes.

Change-Id: I7e07429ba887957a4340dd4b21eef4bba76248cd
related-to-bug: 3514073
udioPlayer.cpp
bd7b7177f88ae6e83bd7bb8bfd9b7018be923931 04-Apr-2011 Andreas Huber <andih@google.com> Avoid a race condition while signaling audio EOS/seek complete by acquiring the lock.

Change-Id: Idfea452ff661b264e013fe515bcd2a2762bd959c
related-to-bug: 4193552
udioPlayer.cpp
wesomePlayer.cpp
94baecca5e14b083c46615a1bcf18ea6cf7cad46 01-Apr-2011 Andreas Huber <andih@google.com> Merge "Remove legacy hack to only drop frames every other late frame"
2ba7ce928b0fa8917ee202836b0963ca58613453 01-Apr-2011 Andreas Huber <andih@google.com> Fix a webm-seek issue introduced when adding support for streaming webm

Change-Id: I52ec841832077603ee035f7a648316349513e978
related-to-bug: 4199894
atroska/MatroskaExtractor.cpp
dab59b5a4956b7e9b1ffc64a0676e7990579934e 01-Apr-2011 Andreas Huber <andih@google.com> Remove legacy hack to only drop frames every other late frame

Change-Id: I197e568d292341c330efb394c41aa9af0e74b081
related-to-bug: 4203195
wesomePlayer.cpp
nclude/AwesomePlayer.h
d5109dc76e943d4d2f90d1681dfd728011b2173f 31-Mar-2011 Glenn Kasten <gkasten@google.com> am 69250839: am 4ed59de6: am ffa670b5: Bug 4167061

* commit '69250839bb0ae94305ee1ac9a452b98d67acc5cf':
Bug 4167061
650502b7f3a47fd85db72c1396d64ec9628821e1 31-Mar-2011 Glenn Kasten <gkasten@google.com> am ffa670b5: Bug 4167061

* commit 'ffa670b5b00b8b4c5a4296f9a1ac382c0e647894':
Bug 4167061
5b3635efd12466e957a59d93a9167c9a01e9c933 31-Mar-2011 Glenn Kasten <gkasten@google.com> Bug 4167061

Change-Id: I9bf7c0f9387ad23501261b8c2d10fa6fdaba8aef
wesomePlayer.cpp
db513feea83a4f76d8a6b492ff33d3d53247ac5e 31-Mar-2011 Andreas Huber <andih@google.com> am 399792b8: am 06ac0399: am b676b73e: Merge "When http streaming and Content-Length is unknown, make sure to return all" into honeycomb-mr1

* commit '399792b83174a835840a4f47adcd34aed4e0b9ba':
When http streaming and Content-Length is unknown, make sure to return all
5c43188653b82a8b40bd25ded8b3b8c48d67e132 31-Mar-2011 Andreas Huber <andih@google.com> am 66ec9068: am 8de5df43: am ebf6a72b: Merge "Surfaceflinger expects rectangles to be specified right/bottom edge exclusive." into honeycomb-mr1

* commit '66ec90687f3579fe73f6baa2a188f8a4583167a3':
Surfaceflinger expects rectangles to be specified right/bottom edge exclusive.
90fd5e0eac8bde1a37023b9014c90062ea3cf360 31-Mar-2011 James Dong <jdong@google.com> When read() from AudioRecord returns 0 or negative value, report an error to application. DO NOT MERGE.

Change-Id: I3a66fd0ed3f6b90350d706a608a39d8b4a398e32
related-to-bug: 4195127
udioSource.cpp
ba7d7874192e9670e7a51e7e334732c96f27ab5d 31-Mar-2011 Andreas Huber <andih@google.com> am b676b73e: Merge "When http streaming and Content-Length is unknown, make sure to return all" into honeycomb-mr1

* commit 'b676b73e391b10a4ec5fbd6a1a02054fb3d8aa4b':
When http streaming and Content-Length is unknown, make sure to return all
cbd2ba4e5398e2c2ae71a1fce6bd6d6b1e395fd6 31-Mar-2011 Andreas Huber <andih@google.com> Merge "When http streaming and Content-Length is unknown, make sure to return all" into honeycomb-mr1
9dc0193472834c49e6bdc864fbeb145828f1d8aa 30-Mar-2011 Andreas Huber <andih@google.com> When http streaming and Content-Length is unknown, make sure to return all

data that we successfully received before signalling the error.

Change-Id: I7e60602d41b4df85aa85e413c590687305e9bbce
related-to-bug: 4190765
uHTTPDataSource.cpp
f8374dec590223ebdd6959b26d9ba90749dd8328 24-Mar-2011 Andreas Huber <andih@google.com> Support for divx files, i.e. mpeg 4 video + mpeg audio layer III in .avi files

Change-Id: I6e1e989c43300ddb0d341e3e9183cdccd69eeae6
related-to-bug: 4192562
VIExtractor.cpp
ndroid.mk
ataSource.cpp
ediaDefs.cpp
ediaExtractor.cpp
tagefrightMediaScanner.cpp
nclude/AVIExtractor.h
72bbbff2dfb120ed1ebc9a50e8509364508bfa70 30-Mar-2011 Andreas Huber <andih@google.com> Merge "Stagefright DataSources now expose the underlying content mime type."
6511c9755c3a3360ba869772600c7aae048a7ffc 30-Mar-2011 Andreas Huber <andih@google.com> Stagefright DataSources now expose the underlying content mime type.

Use that mime type to determine if we should do upfront buffering at the start of
playback and don't for audio streams to ensure playback starts fairly instantly.

Change-Id: If21e36d1b024f0e5c723911bceadaa2e0307ab42
related-to-bug: 4090916
wesomePlayer.cpp
ataSource.cpp
uCachedSource2.cpp
uHTTPDataSource.cpp
hromium_http/ChromiumHTTPDataSource.cpp
hromium_http/support.cpp
nclude/ChromiumHTTPDataSource.h
nclude/NuCachedSource2.h
nclude/NuHTTPDataSource.h
70d3e260edcd42972864bf501337f0b1a187657d 23-Mar-2011 James Dong <jdong@google.com> Check whether WAVE extractor can be initialized successfully in the sniffer for WAVE

bug - 3373994

Change-Id: I91c420815caae3b868fe9184ba48f37046b495fb
AVExtractor.cpp
62302d34b084c43b231f936be3c08f202d5c7c1a 30-Mar-2011 Andreas Huber <andih@google.com> am ebf6a72b: Merge "Surfaceflinger expects rectangles to be specified right/bottom edge exclusive." into honeycomb-mr1

* commit 'ebf6a72b3536646ade389c7afa828e316eb93c21':
Surfaceflinger expects rectangles to be specified right/bottom edge exclusive.
ff6bf33354f28a2bce073645bd102414c81d7580 29-Mar-2011 Andreas Huber <andih@google.com> Merge "Add a user-agent header to our RTSP requests."
e681b91c27439907f216cb6c88426929bc5194bf 29-Mar-2011 Andreas Huber <andih@google.com> Add a user-agent header to our RTSP requests.

Change-Id: I02f8ff6a4a37fa59cc8c5fcfd3afb64ee11ba576
related-to-bug: 4173725
tsp/ARTSPConnection.cpp
tsp/ARTSPConnection.h
a65818133df0a04a867423c50e7778bb225bfb52 29-Mar-2011 Andreas Huber <andih@google.com> Merge "Adding support for the '.mxmf' MIDI file extension."
8d30cc86d36c5e2d7d8defab8f58faed4139ed7f 29-Mar-2011 Andreas Huber <andih@google.com> Adding support for the '.mxmf' MIDI file extension.

Change-Id: Ic73e2f843f8640dd794d090413cf63232f0182b9
related-to-bug: 4186454
tagefrightMediaScanner.cpp
f8be8c0c8055ead961d23b969bf46315eb93e887 29-Mar-2011 Andreas Huber <andih@google.com> Make sure we don't trigger a log warning if calling ALooper::stop() from the looper thread.

Change-Id: I669d589ab4521fe44a3e8f638c7ce8e79174d625
related-to-bug: 4179898
oundation/ALooper.cpp
89c120e7adbe09c6283591789594c5e591aa5032 29-Mar-2011 Andreas Huber <andih@google.com> Surfaceflinger expects rectangles to be specified right/bottom edge exclusive.

Change-Id: Ib493572c614dbb74fa23b13c3e43899e3b31cf0e
related-to-bug: 4147205
Codec.cpp
MXCodec.cpp
51538b30da3208ecf498ce327ac3104b455f163d 29-Mar-2011 Iliyan Malchev <malchev@google.com> Merge "frameworks/base: some camera-interface cleanup"
108dddf924d714c811dd565b8f4c7a0178cca2f2 29-Mar-2011 Iliyan Malchev <malchev@google.com> frameworks/base: some camera-interface cleanup

Methods getNumberOfVideoBuffers() and getVideoBuffer() as well as struct
image_rect_struct are no longer used (instead, the necessary information is
passed through ANativeWindow.)

Change-Id: If4b11446fc9ccbde1f6b45bc70c0d0b8e54376eb
Signed-off-by: Iliyan Malchev <malchev@google.com>
ameraSource.cpp
0c03d5c7c2fa4d17f7f5159e3fddd2adf6bfc923 28-Mar-2011 Andreas Huber <andih@google.com> Ignore OMX codec messages once we're in ERROR state.

Change-Id: I2bdf58ed705a641be1f3aec89fa41cada6acfc96
related-to-bug: 4175573
MXCodec.cpp
mx/OMXNodeInstance.cpp
b1d3d37c7990d22d0659e4c8c9aac56d4c09b6ea 28-Mar-2011 Andreas Huber <andih@google.com> am a4a81aef: am e7cedad2: am 2edbdcc6: Merge "After a seek there\'s a brief period where audio time isn\'t reestablished." into honeycomb-mr1

* commit 'a4a81aef39b15649bda146476d98f23ac554887f':
After a seek there's a brief period where audio time isn't reestablished.
3979f08f59ab2905510a439bae32b92ae21cfddf 28-Mar-2011 Andreas Huber <andih@google.com> am 2edbdcc6: Merge "After a seek there\'s a brief period where audio time isn\'t reestablished." into honeycomb-mr1

* commit '2edbdcc6f2572e5f84253617b1850908344b3f8c':
After a seek there's a brief period where audio time isn't reestablished.
98442ddd86ea33453c2db10cfbfc310ae49dce8f 28-Mar-2011 Andreas Huber <andih@google.com> Merge "After a seek there's a brief period where audio time isn't reestablished." into honeycomb-mr1
000cca99e085be1aa46df44109b37a84af58e7c8 26-Mar-2011 Mathias Agopian <mathias@google.com> Merge "merge libsurfaceflinger_client into libgui"
5f7fcf29a7475a20cf38bf72da67746135d504c3 26-Mar-2011 Mathias Agopian <mathias@google.com> merge libsurfaceflinger_client into libgui

this is the first step in unifying surfacetexture and surface.
for this reason the header files were not moved, as most of them
will eventually go away.

NOTE: currently we keep libsurfaceflinger_client.so as an empty
library to workaround prebuilt binaries wrongly linking against
it.

Change-Id: I130f0de2428e8579033dc41394d093f4e1431a00
ndroid.mk
fe9b71919cdddf898a516169db840751878098ca 26-Mar-2011 Andreas Huber <andih@google.com> After a seek there's a brief period where audio time isn't reestablished.

Don't use audio time to trigger a "we're very late, skipping ahead" action
until it's reestablished.

Change-Id: Ia8534e5bed60203d49a457d14b2e55eb972b5fa1
related-to-bug: 4173683
udioPlayer.cpp
06570ecee7cab4d89030ad89307882ac1f6570d1 26-Mar-2011 Andreas Huber <andih@google.com> am e2cb08bd: am 2fee96bc: am 1457ef74: Merge "Make sure we post a video event when seeking after seeing video EOS before." into honeycomb-mr1

* commit 'e2cb08bd4c3bc7e7045e107af41f7228d780be04':
Make sure we post a video event when seeking after seeing video EOS before.
3a4d645d3bf0bcd3e75968a9d88245fa9a9e0a42 25-Mar-2011 Andreas Huber <andih@google.com> am 1457ef74: Merge "Make sure we post a video event when seeking after seeing video EOS before." into honeycomb-mr1

* commit '1457ef74d49ee56097ad97cc078e898326beb7db':
Make sure we post a video event when seeking after seeing video EOS before.
5dac87b088556b8ed7f2a4f5546d31be0bb68680 25-Mar-2011 Andreas Huber <andih@google.com> Make sure we post a video event when seeking after seeing video EOS before.

Change-Id: I513bf94c0732a85324160977ea5723d8aafd6aba
related-to-bug: 3316960
wesomePlayer.cpp
f490e1765c44f63bde8e8acd905f36f92a840ddf 25-Mar-2011 James Dong <jdong@google.com> am 70a5b031: am 9fb98238: am 837430dd: Merge "Switch to use SF cached source" into honeycomb-mr1

* commit '70a5b0317d5029b34be26a423c0ebeaa74b728ed':
Switch to use SF cached source
df4a70cf8858185323e5176bd3bed51f1b5cbc35 25-Mar-2011 James Dong <jdong@google.com> am 837430dd: Merge "Switch to use SF cached source" into honeycomb-mr1

* commit '837430dd3440f6e71f68ef755399e22386dee084':
Switch to use SF cached source
3318523222e31fb4a7fcc345ddb4ec845d30ef96 25-Mar-2011 James Dong <jdong@google.com> Switch to use SF cached source

bug - 3500025

Change-Id: I96c416d39af498f091d2d52f5923f556382a9c1f
wesomePlayer.cpp
a61e0f254f586d59c575e3087992889c0cf026cb 24-Mar-2011 Glenn Kasten <gkasten@google.com> am 64233b86: am 503f4daf: am 0b1b2a32: Merge "Bug 4159373 Use HDCP debug settings" into honeycomb-mr1

* commit '64233b86f3a78d2c4a21092b242ad071a6b38bd5':
Bug 4159373 Use HDCP debug settings
ee9f5eefb02bdef3120cd4c1053c505065fe9094 24-Mar-2011 Glenn Kasten <gkasten@google.com> am 0b1b2a32: Merge "Bug 4159373 Use HDCP debug settings" into honeycomb-mr1

* commit '0b1b2a3212cc6c96959e009a9705f94f2ed8b4f4':
Bug 4159373 Use HDCP debug settings
eabd34665adc284525fe7337ad5c56a8b92964ef 23-Mar-2011 Glenn Kasten <gkasten@google.com> Bug 4159373 Use HDCP debug settings

Change-Id: Iefc0a0d4b574ee94fbc83bf74b57c1d3465c821c
wesomePlayer.cpp
d7c1648e99ca1ca9c4b941aeefccd2feb55a649f 22-Mar-2011 Andreas Huber <andih@google.com> Merge "Delay signaling the end of audio playback until all frames have actually played."
84b343f29063fbfa2ee61b2e3d37ba059ca507d4 22-Mar-2011 Andreas Huber <andih@google.com> Delay signaling the end of audio playback until all frames have actually played.

Change-Id: I1fa07358a885a818fd0a5d7da425740f86095e10
related-to-bug: 3404000
udioPlayer.cpp
wesomePlayer.cpp
nclude/AwesomePlayer.h
98d147d15f704b021e130c197258d0520d9ca7ae 22-Mar-2011 James Dong <jdong@google.com> Merge "Fix AAC encoder test util and remove files that are not needed"
27dcaafef982f4bf461ad013a3dae4c474908380 22-Mar-2011 James Dong <jdong@google.com> Merge "Fix AMRWB test util and remove useless files"
9d00f0375f8b1af9fe06637e4fa575c7c062df39 22-Mar-2011 Andreas Huber <andih@google.com> am 6834f061: am 970d7dd9: am e2c32e9f: If nothing is to be copied, return right away.

* commit '6834f0617aea626dfc0f306c9fa3610f32cee1f7':
If nothing is to be copied, return right away.
0e680d80363358f1759a376d9a968732ac41bbe8 22-Mar-2011 Andreas Huber <andih@google.com> am 453c0d5f: Merge "DO NOT MERGE: Enable http-live support for https:// urls, fix a parsing issue." into honeycomb-mr1

* commit '453c0d5f16a09473b0653566973bf8b6a867cf79':
DO NOT MERGE: Enable http-live support for https:// urls, fix a parsing issue.
90d97c996a15f9ebc90fbd260f47f95ffbe68006 22-Mar-2011 James Dong <jdong@google.com> Fix AMRWB test util and remove useless files

Change-Id: Ia11a1ec053855c9e692070d23c7a690c39cb3d5e
odecs/amrwbenc/SampleCode/AMRWB_E_SAMPLE.c
odecs/amrwbenc/SampleCode/Android.mk
odecs/amrwbenc/SampleCode/eclair/Makefile
odecs/amrwbenc/SampleCode/ms.mk
odecs/amrwbenc/build/eclair/ARMV5E/Makefile
odecs/amrwbenc/build/eclair/ARMV7/Makefile
odecs/amrwbenc/build/eclair/makefile
odecs/amrwbenc/build/eclair/ms.mk
61589965cc98a92f7755dd929511bec4b2414daa 22-Mar-2011 James Dong <jdong@google.com> Fix AAC encoder test util and remove files that are not needed

Change-Id: Ib6cbe78de9f85e4df357d53365a35d1f9f0bb1d3
odecs/aacenc/SampleCode/AAC_E_SAMPLES.c
odecs/aacenc/SampleCode/Android.mk
odecs/aacenc/SampleCode/eclair/Makefile
odecs/aacenc/SampleCode/ms.mk
odecs/aacenc/Tools/doit.mk
odecs/aacenc/Tools/eclair.mk
odecs/aacenc/build/eclair/ARMV5E/Makefile
odecs/aacenc/build/eclair/ARMV7/Makefile
odecs/aacenc/build/eclair/makefile
odecs/aacenc/build/ms.mk
bb3ae0dc89b06ddf81c34fc1ba7f972712ab8a92 22-Mar-2011 Andreas Huber <andih@google.com> DO NOT MERGE: Enable http-live support for https:// urls, fix a parsing issue.

Change-Id: Ic683201dcfcd11fb4bccfeefc63427a4c9bfabb4
related-to-bug: 4148291
ttplive/M3UParser.cpp
0a73d81f213fb2d6f2fdd59c4dda047bf453bb1c 22-Mar-2011 Andreas Huber <andih@google.com> Enable http-live support for https:// urls, fix a parsing issue.

Change-Id: I2284e1d62babde7f739fba6a3cb4e2619f0e62f9
related-to-bug: 4148291
ttplive/M3UParser.cpp
b6a7147ce79b4fd44313f23d76e25c8d1919d490 22-Mar-2011 Andreas Huber <andih@google.com> am e2c32e9f: If nothing is to be copied, return right away.

* commit 'e2c32e9f966cf9f2c9ed94bf0703344a2cca284b':
If nothing is to be copied, return right away.
03f6f4e7e2ce09357cbc05bb546cd8a6e54b5bae 21-Mar-2011 James Dong <jdong@google.com> Add read and write option in opening file for output in the writers

Change-Id: Ibfba0aacd3c8587c04a2e903b636de337cc30104
MRWriter.cpp
PEG4Writer.cpp
310962976d575c0a97ec7a768e9cca0b2361daea 21-Mar-2011 Andreas Huber <andih@google.com> If nothing is to be copied, return right away.

This avoids a potential out-of-bounds problem in the code below.

Change-Id: I942d55da0a5288b37512cb74407f900a2d824c0c
related-to-bug: 4139974
uCachedSource2.cpp
c8a8472a0205dd698c8d81bf7e09026ca1013d1e 21-Mar-2011 Andreas Huber <andih@google.com> Merge "Support passing headers to MediaMetadataRetriever's setDataSource API"
af8791e112c8072452bd14ef3c43a47511d19542 21-Mar-2011 Andreas Huber <andih@google.com> Support passing headers to MediaMetadataRetriever's setDataSource API

Change-Id: Ib1a5c08fc5034cac05034db27007a35c9b660b26
related-to-bug: 3506316
tagefrightMetadataRetriever.cpp
nclude/StagefrightMetadataRetriever.h
1d54b3e0ec3d1ef17e75fec6f97be59f29721fff 19-Mar-2011 James Dong <jdong@google.com> Scale the thumbnail if display dimension is different from the actual buffer size

bug - 3379293

Change-Id: I31c08010c97387716433da99d648bd364847b6aa
tagefrightMetadataRetriever.cpp
ebd5d2541d4e5351fd1f1a23fc9ef047cfa67575 19-Mar-2011 Andreas Huber <andih@google.com> Merge "Squashed commit of the following:"
9c79141ee9bde51f6cad04568f21b530d28c11e9 18-Mar-2011 James Dong <jdong@google.com> Merge "Better organize media recorder error and information event and types"
d42573cace9db2b5948e540c32beaef80f04153c 18-Mar-2011 Andreas Huber <andih@google.com> Squashed commit of the following:

commit ed615e2803839ef28e0eab50d17844c207083ad6
Author: Andreas Huber <andih@google.com>
Date: Fri Mar 18 12:38:30 2011 -0700

Support for live streaming of webm content over http.

Change-Id: Ie9ebd23d2c44d192d348b9fa3f3a0f3f28ac9e4c

commit 9c50b1392471a3d652b4a875c823bee854f8855b
Author: Andreas Huber <andih@google.com>
Date: Thu Mar 17 13:33:22 2011 -0700

Upgrade to the latest version of libwebm.

Change-Id: Ic7965dda84131a38f9d3c72b6acd2025ace939ce

Change-Id: I3c993a89f749f05741594ef0ea47864e17ee783b
atroska/MatroskaExtractor.cpp
atroska/MatroskaExtractor.h
bc2661e26894905b1c3f5c59963708700bbcecaa 18-Mar-2011 James Dong <jdong@google.com> Merge "Handle display dimension scaling event due to SAR embedded in AVC videos"
9cbb1a6f99003a9cd8765e11b9d7380e67839f82 18-Mar-2011 James Dong <jdong@google.com> Handle display dimension scaling event due to SAR embedded in AVC videos

bug - 3379293

Change-Id: I03cb548e61d31bc0a2fb40916d207aaf840fafce
wesomePlayer.cpp
MXCodec.cpp
bc07bcc65e91c7aea9713631ae67760dcf1b0286 18-Mar-2011 James Dong <jdong@google.com> Better organize media recorder error and information event and types

Change-Id: I45f1f953596985494725525c1fabf57eccc19175
MRWriter.cpp
PEG4Writer.cpp
d13ff411aeaac2730e012ba2dcce03c671d2eb97 18-Mar-2011 Andreas Huber <andih@google.com> Signal a runtime error if the AVCDecoder encounters an invalid frame.

Instead of asserting.

Change-Id: I4c89f5fef92e5adb11d1ea6b564a67e99fc96595
related-to-bug: 4109304
odecs/avc/dec/AVCDecoder.cpp
c901f74404435cc1cf2717016e2b0092b6dcea24 17-Mar-2011 James Dong <jdong@google.com> am 782ffe91: am 9c0c5b56: am 2f1f2248: Fix missing AOSP copyright headers for a bunch of media framework files

* commit '782ffe91da665c6b1fb9e297faa6e0dc6035f40c':
Fix missing AOSP copyright headers for a bunch of media framework files
f432a761e73bef8be43f83377ecea8abef72ce86 17-Mar-2011 James Dong <jdong@google.com> am 2f1f2248: Fix missing AOSP copyright headers for a bunch of media framework files

* commit '2f1f2248c8439adbd686810e306c55f9e6a5abc3':
Fix missing AOSP copyright headers for a bunch of media framework files
27c174483a8ae9688d5d4897c19074f62c7f1701 17-Mar-2011 James Dong <jdong@google.com> Fix missing AOSP copyright headers for a bunch of media framework files

bug - 4119349

Change-Id: If5924e16a5f596d5d73d9beb66eaf5ac9a6f0e50
Codec.cpp
odecs/avc/common/include/avc_types.h
oundation/AHierarchicalStateMachine.cpp
nclude/MPEG2TSExtractor.h
512895089f2035bc86d3f502255199809aca721b 16-Mar-2011 Andreas Huber <andih@google.com> Don't send the seek-complete notification twice.

Change-Id: Ie994de2d57e20dde12b8d59af4968d03569c7efa
related-to-bug: 3489432
wesomePlayer.cpp
8190975e03954b2efe30bd2cd146d869ad676580 16-Mar-2011 Andreas Huber <andih@google.com> am 46956b06: Merge "DO NOT MERGE: Fix a race condition when playing an audio-only stream and seeking before starting." into honeycomb-mr1

* commit '46956b0691b2a228237d17536fe4ad33a760c0af':
DO NOT MERGE: Fix a race condition when playing an audio-only stream and seeking before starting.
ae03031ab6af9505335e888b709ee661fe04ed83 16-Mar-2011 Andreas Huber <andih@google.com> DO NOT MERGE: Fix a race condition when playing an audio-only stream and seeking before starting.

Change-Id: I70dfdfb7c27e3c713079c359ef89a570eb600dc7
related-to-bug: 4039068
wesomePlayer.cpp
b874cd085bba63528c570f74c493bfea835190d9 16-Mar-2011 Andreas Huber <andih@google.com> Fix a race condition when playing an audio-only stream and seeking before starting.

Change-Id: Id3883293caf316ce492f5eb16428c15ced82da38
related-to-bug: 4039068
wesomePlayer.cpp
f1e10e8ed74cac805d601139882378a1f450fe94 15-Mar-2011 James Dong <jdong@google.com> Fix an issue where the timestamp provided by WAVExtractor does not start with 0

Change-Id: Ie8eb86e26f026c07a3c3be43e35027b19de4a2c3
AVExtractor.cpp
3e67eeb5c710bcf00d4cd4d6105a0b5f7ee3007e 15-Mar-2011 Iliyan Malchev <malchev@google.com> Merge "frameworks/base: remove LOCAL_PRELINK_MODULE"
de6ee790f0e0b758894f72daf3ec742fdabf3d22 14-Mar-2011 James Dong <jdong@google.com> Merge "libstagefright: Add error handling in AMRNB deooder"
9691a73139bb36c5bf294ed13eedcb04d7f05320 14-Mar-2011 Iliyan Malchev <malchev@google.com> frameworks/base: remove LOCAL_PRELINK_MODULE

Change-Id: I54dd62ebef47e7690afa5a858f3cad941b135481
Signed-off-by: Iliyan Malchev <malchev@google.com>
odecs/aacenc/Android.mk
odecs/amrwbenc/Android.mk
odecs/common/Android.mk
oundation/Android.mk
uv/Android.mk
1549dbbfb0d18201cc568b4fa2bd6b0e7f582e9d 08-Mar-2011 Sidipotu Ashok <sashok@codeaurora.org> libstagefright: Add error handling in AMRNB deooder

Return error when AMRNB software decoder fails

Change-Id: I1203db4a4b5ac766c8c131d3d0ba18a4ff2e3ceb
odecs/amrnb/dec/AMRNBDecoder.cpp
150694cda0842d38a9358fe8d1fcb4fb4a76599e 14-Mar-2011 Andreas Huber <andih@google.com> Experimental support for changing the video surface/texture on an active mediaplayer

Change-Id: Ia7a5126e9311dc1c721ab2aef54bd698151c88cd
wesomePlayer.cpp
nclude/AwesomePlayer.h
6df0dc04a43e5272f1c57e772b0c0842c03a01bc 13-Mar-2011 James Dong <jdong@google.com> Fix PV AAC decoder crash due to out-of-boundary array access.

Two cases were fixed:
o xover had a larger number of bands than the high frequency band, which led to some negative array index under some circumstances
o integrated a PV fix from OpenCore.git where the array index for scratch_mem may be over the array boundary

bug - 3473128

Change-Id: I844cd8797b4e5b0120fafa0c46a8c1facea78a8b
odecs/aacdec/sbr_dec.cpp
6d8ed9598d526dfe9be983543f125e3178d7c9b1 26-Feb-2011 James Dong <jdong@google.com> If MP3 decoder output frame size were 0, media server would crash.

This is to log an error message should that happen.

Change-Id: I0f947cd7a8e6639b4f11a928bf90286a34cc652e
odecs/mp3dec/MP3Decoder.cpp
04b1447ce161ab99cde5d071014367e5b21571ca 11-Mar-2011 James Dong <jdong@google.com> am 68f66b94: Merge "MP3Extractor and MP3 decoder fixes - DO NOT MERGE" into gingerbread

* commit '68f66b945e7a69549689becd2e656d9056f1e7f5':
MP3Extractor and MP3 decoder fixes - DO NOT MERGE
9dec4911624b449afcf42a8d99ac78ca73952331 11-Mar-2011 James Dong <jdong@google.com> MP3Extractor and MP3 decoder fixes - DO NOT MERGE

cherry-picked the following patches from HC branch:
o PV's mp3 decoder mistreated inputBufferCurrentLength in unit of bytes as in unit of bits
o Do not enforce the rule in MP3Extractor that all audio frames in an mp3 file must have the same mode
o When the temp buffer wraps around, the next read position should start
from what have been read to avoid reading the same remaining bytes in
the buffer again.
o Speed up MP3Extractor using cached reads

bug - 4083532

Change-Id: I7bbd2bd358fd5ee322287866cb8ee0c2bb217fea
P3Extractor.cpp
odecs/mp3dec/src/pvmp3_decode_header.cpp
34fba6695fe1b55710baef561785caa0486654fb 11-Mar-2011 Andreas Huber <andih@google.com> Only use ChromiumHTTPDataSource if webkit was built with chromium support.

Change-Id: I9ce16f4aae35c61c9fb92fefc2a7c72537631cba
ndroid.mk
TTPBase.cpp
884d064fbf7f45f8089abd7d87bdca5d325cc2ab 11-Mar-2011 Glenn Kasten <gkasten@google.com> am 055066e1: am 92f2f3ff: Merge "Bug 3012968 DRM output control" into honeycomb-mr1

* commit '055066e1e77d944383360d50057f5b8187f23c0b':
Bug 3012968 DRM output control
203616faff0be6c2306f02d82f3ce305746beb49 11-Mar-2011 Glenn Kasten <gkasten@google.com> am 92f2f3ff: Merge "Bug 3012968 DRM output control" into honeycomb-mr1

* commit '92f2f3ff2ea5c5b474722f2055cfee4916010e26':
Bug 3012968 DRM output control
2eb62955eb84b97695e8a7e56e14310cbb86412b 28-Jan-2011 Glenn Kasten <gkasten@google.com> Bug 3012968 DRM output control

Modifies Stagefright to verify that there is a hardware-protected path
to video sink for DRM content.

Change-Id: I18b8741390e803a05a88c7f180b860a24ba88a10
wesomePlayer.cpp
MXCodec.cpp
b5ce361d19e69fe156f7188c9ee0f4734b259874 25-Feb-2011 Gloria Wang <gwang@google.com> Fix for bug 3477330
This patch fixs a crash bug caused by using a NULL DecryptHandle pointer.
Fix by using sp<DecryptHandle> instead.

Change-Id: Icbd59858385e8256125a615a3c82656b25319d44
wesomePlayer.cpp
RMExtractor.cpp
ileSource.cpp
uCachedSource2.cpp
uHTTPDataSource.cpp
hromium_http/ChromiumHTTPDataSource.cpp
nclude/AwesomePlayer.h
nclude/ChromiumHTTPDataSource.h
nclude/DRMExtractor.h
nclude/NuCachedSource2.h
nclude/NuHTTPDataSource.h
c4122f56d6c3425666b67a81ed2d7224c8a4cda3 10-Mar-2011 Andreas Huber <andih@google.com> Merge "Support http authentication ala http://foo:bar@host.org in stagefright."
3b93951624b5490a2d40abc5385dc71b15526757 10-Mar-2011 Lorenzo Colitti <lorenzo@google.com> am d1e09e08: am 8df2477c: am bd0e806a: Support IPv6->IPv4 fallback in HTTP streaming.

* commit 'd1e09e08210e755034bbdd07e1f48b35ec9a4752':
Support IPv6->IPv4 fallback in HTTP streaming.
e146aa536ae4c990e70dd03e85f5bac9fbe956a0 10-Mar-2011 Lorenzo Colitti <lorenzo@google.com> am d6aaec0c: am e4a02b61: am b9da16a1: Support IPv6 in HTTP streaming.

* commit 'd6aaec0ce7639a9d8bb73983711e20545b55e860':
Support IPv6 in HTTP streaming.
4ec5179bf8cdebe37538fd22a690f20783a2b010 10-Mar-2011 Lorenzo Colitti <lorenzo@google.com> am 8df2477c: am bd0e806a: Support IPv6->IPv4 fallback in HTTP streaming.

* commit '8df2477c4e7e5bf72d6d1216ae5184c53304470e':
Support IPv6->IPv4 fallback in HTTP streaming.
83bfaf0acb485327bbc49356ea76025645f9ec0d 10-Mar-2011 Lorenzo Colitti <lorenzo@google.com> am e4a02b61: am b9da16a1: Support IPv6 in HTTP streaming.

* commit 'e4a02b61290fa61955c979cfd1afc17a92bba481':
Support IPv6 in HTTP streaming.
d563b839989fbacfe958db4e6b9876796841aa21 10-Mar-2011 Lorenzo Colitti <lorenzo@google.com> am bd0e806a: Support IPv6->IPv4 fallback in HTTP streaming.

* commit 'bd0e806a61df9b67890dc3b1390db554e7468b4a':
Support IPv6->IPv4 fallback in HTTP streaming.
f64b241764f52ebd595fc4535d4f54dc07f501fc 10-Mar-2011 Lorenzo Colitti <lorenzo@google.com> am b9da16a1: Support IPv6 in HTTP streaming.

* commit 'b9da16a1e36fcf4e38a50adcf10ea59c12dea254':
Support IPv6 in HTTP streaming.
70fcf534d3fb6faa3aaa8061fc87f720c396e7ae 09-Mar-2011 Andreas Huber <andih@google.com> Support http authentication ala http://foo:bar@host.org in stagefright.

Change-Id: I0b20077ad540ec8aa11adf0ca9f4142ea8b8ae98
hromium_http/support.cpp
72fee698602ede6f6b64b77c0f1f28d96ff673d3 09-Mar-2011 Andreas Huber <andih@google.com> Use the same http proxy mechanism that webkit uses instead of bypassing proxies.

Change-Id: Ifd64664d3052fbfa715c2920984170c2a6190f6b
related-to-bug: 3440271
hromium_http/support.cpp
1156dc913a5ba7b2bc86489468d4914430f03d14 09-Mar-2011 Andreas Huber <andih@google.com> An HTTP datasource for stagefright using the chromium code.

Use of this new datasource is now the default unless overwritten by

adb shell setprop media.stagefright.use-chromium false

Change-Id: I156a8eb9a1fff1cb537b4aec6cf3e8e6052be81e
ndroid.mk
wesomePlayer.cpp
ataSource.cpp
TTPBase.cpp
hromium_http/Android.mk
hromium_http/ChromiumHTTPDataSource.cpp
hromium_http/support.cpp
hromium_http/support.h
ttplive/LiveSession.cpp
nclude/AwesomePlayer.h
nclude/ChromiumHTTPDataSource.h
nclude/HTTPBase.h
nclude/LiveSession.h
nclude/NuHTTPDataSource.h
0ef631528fa7a2f061aea2bdd68ef734ed626b87 04-Feb-2011 Lorenzo Colitti <lorenzo@google.com> Support IPv6->IPv4 fallback in HTTP streaming.

Bug: 4068057
Change-Id: I425f65a99eb9e0986d9e9c0e264c3c8f61fcfdbd
TTPStream.cpp
7528e58daa21c43dd937d06b130a033f31c99604 04-Jan-2011 Lorenzo Colitti <lorenzo@google.com> Support IPv6 in HTTP streaming.

Bug: 4068057
Change-Id: I1e141ec99fbfa43722eeb2e4161d56548ffc0640
TTPStream.cpp
af50f1169ec7489f981158ba6d1afacdeeeda9c3 08-Mar-2011 James Dong <jdong@google.com> am d581c047: Add missing copyright headers for a couple of files. DO NOT MERGE Cherry-picked from other branch...

* commit 'd581c04722e2610ca5471b9c3d1881043b1205b1':
Add missing copyright headers for a couple of files. DO NOT MERGE Cherry-picked from other branch...
64bfdc7d8d8e0404f7193f776fd226d1cd870f93 07-Mar-2011 James Dong <jdong@google.com> Add missing copyright headers for a couple of files. DO NOT MERGE
Cherry-picked from other branch...

bug - 4025673

Change-Id: I6fd1baaf5625297fb1e358de3a3a632a7f5deb90
uHTTPDataSource.cpp
nclude/NuHTTPDataSource.h
38978f57fec45748fd1eb7f96d25bc4e8415aabb 07-Mar-2011 James Dong <jdong@google.com> am a7c9dffd: am 4ed072f9: Merge "Add missing copyright headers to a couple of files" into honeycomb-mr1

* commit 'a7c9dffdb8097105482ce976ba0a51baa76d8806':
Add missing copyright headers to a couple of files
fbb1909036ba7de3d9fb8738daba60b357881153 05-Mar-2011 James Dong <jdong@google.com> Add missing copyright headers to a couple of files

bug - 4025673

Change-Id: Ie1c4cf18c06032f9b89cc08e5be25d38c0f76aa1
uHTTPDataSource.cpp
nclude/NuHTTPDataSource.h
e6482914b71449319abd691f304b6ae9223f97a1 07-Mar-2011 Andreas Huber <andih@google.com> Merge "Added more metadata published by the MediaMetaDataRetriever"
6ab1d170a6707e4b92bc1ee353dcd2bf7b897bac 05-Mar-2011 James Dong <jdong@google.com> am 0b7912d3: am 99b86247: Fix a leak from AACEncoder.cpp

* commit '0b7912d32848e123e3356d6452895f734b5dda7e':
Fix a leak from AACEncoder.cpp
73870c96dc3d652b64b74b023f3df67edf7d08c0 05-Mar-2011 James Dong <jdong@google.com> Fix a leak from AACEncoder.cpp

bug - 3470617

Change-Id: I328e92bc1b2aca72e5856703dae00f957f40bc27
odecs/aacenc/AACEncoder.cpp
918581cd1d50f0d34a94ae820d82dc7ab50aaa99 04-Mar-2011 James Dong <jdong@google.com> am 70d7522e: am 865448a0: Merge "Do not enforce the rule in MP3Extractor that all audio frames in an mp3 file must have the same mode" into honeycomb-mr1

* commit '70d7522e9f25f80f528d9737fa67976eacb24afd':
Do not enforce the rule in MP3Extractor that all audio frames in an mp3 file must have the same mode
2eb6a47b58c5b36f887a372e89f3d70f5d40812c 04-Mar-2011 James Dong <jdong@google.com> Do not enforce the rule in MP3Extractor that all audio frames in an mp3 file must have the same mode

For some mp3 files, the mode can be changed from one audio frame to another. Without
the capability to switch modes, the decoded audio may have lots of artifacts.

bug - 3253310

Change-Id: Id57bb1f204642d15e38a800c72214f6794cfaa37
P3Extractor.cpp
2256d515e6fa1dd95b8fd0de05b56d8c83af8327 04-Mar-2011 Andreas Huber <andih@google.com> Added more metadata published by the MediaMetaDataRetriever

- presence of audio/video content
- video dimensions
- avg. bitrate

Change-Id: Ie6d478a3c2d0bb6bebaea99ac0a20a4c17808934
related-to-bug: 3506316
tagefrightMetadataRetriever.cpp
bdba1f2a3813e4c8e690d71cfc2b82d5dee85c73 03-Mar-2011 Andreas Huber <andih@google.com> Reject streaming .mp4 files over http that are not muxed reasonably.

Audio and video samples must be reasonably close by at any given timestamp,
for now we define "reasonably" as "their offsets must not be more than 1MB apart".

related-to-bug: 3509977
Change-Id: I4c3a2a239bf911306833f3b17b73c9e2f76ab901
PEG4Extractor.cpp
nclude/MPEG4Extractor.h
9a5f9b7dbe9ecdebfbd9e8f96452c42213b08a31 03-Mar-2011 Jamie Gennis <jgennis@google.com> Merge "Stagefright: Use the ANW min undequeued bufs query."
c3369fd756f015b06fe5824766e618160fe079f5 03-Mar-2011 Andreas Huber <andih@google.com> Merge "Resize internal PES buffers dynamically instead of relying on a fixed maximum size."
3e57322b332214e3cb1874e67a5704c9b2b5f6ec 03-Mar-2011 Andreas Huber <andih@google.com> Resize internal PES buffers dynamically instead of relying on a fixed maximum size.

Change-Id: Ibe720e6148799e32d039ccdb4b269659bc779952
peg2ts/ATSParser.cpp
43a7e77206090d5a301dea224347a01a59fb2dfc 03-Mar-2011 Andreas Huber <andih@google.com> Merge "Allow optional specification of a PTS timestamp when signalling a discontinuity."
32f3cefa373cd55e63deda36ca9d07c7fe22eaaf 03-Mar-2011 Andreas Huber <andih@google.com> Allow optional specification of a PTS timestamp when signalling a discontinuity.

If present, rendering will be suppressed until reaching the timestamp.

Change-Id: Ic64bdf4225063c5a4d042ea9809960b843a46d19
related-to-bug: 3489454
peg2ts/ATSParser.cpp
peg2ts/ATSParser.h
peg2ts/AnotherPacketSource.cpp
peg2ts/AnotherPacketSource.h
f96ebc66c0feb441733da6d08bca6d8de96cd9f0 02-Mar-2011 James Dong <jdong@google.com> Merge "PV's mp3 decoder mistreated inputBufferCurrentLength in unit of bytes as in unit of bits"
ebdc652a891659d83386c3f92715ad6c70c8ba2d 02-Mar-2011 James Dong <jdong@google.com> PV's mp3 decoder mistreated inputBufferCurrentLength in unit of bytes as in unit of bits

bug - 3464899

Change-Id: Idef81a1bd3846d60fc5e4a40c11ce1ba78ebaa23
odecs/mp3dec/src/pvmp3_decode_header.cpp
3fd91baee812919f53a85c5c05f32606313f8334 02-Mar-2011 Andreas Huber <andih@google.com> Provide better duration and seek accuracy if playing vorbis audio from a non-streaming source.

Change-Id: Ib823c2dd28e84f4c49e3676f4e4962a6e006b166
related-to-bug: 3107013
ggExtractor.cpp
59e7879a8482284a434268d51b4b438f0625d1be 01-Mar-2011 Jamie Gennis <jgennis@google.com> Merge "Stagefright: Query buffer usage from the component."
e13e24b6e8a7c2d0244ba575e309fb1254119a82 01-Mar-2011 Jamie Gennis <jgennis@google.com> Merge "Add an OMX IL API for querying buffer usage flags."
d2d38d5c937c552555aec8aa2eb9822a19b2476b 01-Mar-2011 Jamie Gennis <jgennis@google.com> Merge "Fix error recovery in Stagefright init."
258d4e3aef7984574b0972a66871afc8a13d8e4e 28-Feb-2011 Jamie Gennis <jgennis@google.com> Stagefright: Use the ANW min undequeued bufs query.

This change modifies Stagefright's ANativeWindow initialization to use
the new MIN_UNDEQUEUED_BUFFERS query on the ANativeWindow.

Change-Id: I62565945e90ac40de326de77adcfa5577ed89975
Related-Bug: 3356050
Codec.cpp
MXCodec.cpp
74006804065941841883c4b46ee785070164023f 23-Feb-2011 Jamie Gennis <jgennis@google.com> Fix error recovery in Stagefright init.

This change fixes the error path of
OMXCodec::allocateOutputBuffersFromNativeWindow so that it cancels the
correct number of buffers if a dequeueBuffer operation fails.

Change-Id: Ib7cdcdf24f1718bc070ad218a5980949c0e942eb
Codec.cpp
MXCodec.cpp
3c14b9745c4afc88cec247d9dd0b003e087cbb52 24-Feb-2011 Jamie Gennis <jgennis@google.com> Stagefright: Query buffer usage from the component.

This change makes Stagefright query the gralloc buffer usage flags from
the OMX IL component and passing those flags on to the ANativeWindow.

Change-Id: Ic9af8a9e6df9ff4aadc7355890324d68841bc488
Related-Bug: 3479027
Codec.cpp
MXCodec.cpp
e2ce6458659c6e1bad420357b61dc10cd8bbe2ab 24-Feb-2011 Jamie Gennis <jgennis@google.com> Add an OMX IL API for querying buffer usage flags.

This change defines an OpenMAX IL API for querying from the IL component
the gralloc buffer usage flags that should be used to allocate the
buffers. It also adds the Stagefright plumbing for using the new OMX IL
API.

Change-Id: I046b5e7be70ce61e2a921dcdc6e3aa9324d19ea6
Related-Bug: 3479027
nclude/OMX.h
nclude/OMXNodeInstance.h
mx/OMX.cpp
mx/OMXNodeInstance.cpp
6fa83fbad4bf779c6677d525d434f0738726465e 28-Feb-2011 James Dong <jdong@google.com> Merge "The color conversion from YUV420Planar to RGB only requires the image width to be a multiple of 2, not 4."
8ddeebb93cb41e7a8e9fe763afb6c6016b21fa61 21-Feb-2011 Glenn Kasten <gkasten@google.com> Bug 3447027 Limit previews for DRM video

Change-Id: I5b15cf6a15623cf73f007c59143ab5e3fa5a07e8
RMExtractor.cpp
ediaExtractor.cpp
tagefrightMetadataRetriever.cpp
633b4c8cc1f41370576aa43e6c5a70e4865a36df 25-Feb-2011 James Dong <jdong@google.com> mp4a box contains mp3 audio when the object type indication is 0x6b

In this case, the MediaExtractor returns ERROR_UNSUPPORTED since our
software MP3 audio decoder may not be able to handle packetized
MP3 audio.

bug - 3377570

Change-Id: I8bb6b3813716b5fa019e318842e8e1908b3c8bf8
PEG4Extractor.cpp
18eb42eca6949158e630eae38a70db8f837c17c8 25-Feb-2011 Andreas Huber <andih@google.com> Merge "Alternate patch for late video issue: seek only the video ahead to the next"
827b55c5f3409b68ef57816208220d8804693e44 24-Feb-2011 Andreas Huber <andih@google.com> Merge "Suppress the logging of URLs when in incognito mode."
7314fa17093d514199fedcb55ac41136a1b31cb3 24-Feb-2011 Andreas Huber <andih@google.com> Suppress the logging of URLs when in incognito mode.

Change-Id: Ib951b495eae15669e160ef54686eab0eeb9b366a
related-to-bug: 3336575
wesomePlayer.cpp
uHTTPDataSource.cpp
ttplive/LiveSession.cpp
nclude/AwesomePlayer.h
nclude/LiveSession.h
nclude/NuHTTPDataSource.h
64bb6983690bf994d904591145a3cdd6373bdbe6 24-Feb-2011 Andreas Huber <andih@google.com> Alternate patch for late video issue: seek only the video ahead to the next

syncframe after the current audio media position, leave audio untouched.

Change-Id: Ia9fa8e205467e5460c8219afd396bddd09fcfb46
related-to-bug: 3375737
wesomePlayer.cpp
nclude/AwesomePlayer.h
72feaa5df1f7b15b18e30592653dc511dc0b8c51 24-Feb-2011 Glenn Kasten <gkasten@google.com> Merge "Bug 3438258 Add SurfaceTexture as MediaPlayer sink"
e23da615c0b1721fe7d9d2e06e82e43b9bd89df3 24-Feb-2011 James Dong <jdong@google.com> Fix MP3Extractor

When the temp buffer wraps around, the next read position should start
from what have been read to avoid reading the same remaining bytes in
the buffer again.

o also fix some of the formatting string for logging

bug - 3482444

Change-Id: Ie0b56f4691ff9e80a48a57f1b7d0d28c78cfb313
P3Extractor.cpp
9287abf2657bee9464965c37bdaa866d023c9d89 24-Feb-2011 Glenn Kasten <gkasten@google.com> Merge "Don't crash when parsing DRM MIME types"
17e89b555a41aa591f1a01ecd51a7cb5a7bcfc0e 24-Feb-2011 James Dong <jdong@google.com> d263 may contain optional bitr box, and thus its size can be up to 23 bytes

bug - 3482703

Change-Id: Id6fdf9d1f4a304954c018b67d50bd79a07164687
PEG4Extractor.cpp
676ae7591c5260869f89efe2380afaacb79bacc9 24-Feb-2011 Mathias Agopian <mathias@google.com> Merge "Remove RefBase.h dependency on TextOutput.h"
1173118eace0e9e347cb007f0da817cee87579ed 09-Feb-2011 Glenn Kasten <gkasten@google.com> Bug 3438258 Add SurfaceTexture as MediaPlayer sink

This change enables the use of a SurfaceTexture in place of a Surface
as the video sink for an android.media.MediaPlayer. The new API
MediaPlayer.setTexture is currently hidden.

This includes:
- New Java and C++ interfaces
- C++ plumbing and implementation (JNI, Binder)
- Stagefright AwesomePlayer and NuPlayer use ANativeWindow
(either Surface or SurfaceTextureClient)

Change-Id: I2b568bee143d9eaf3dfc6cc4533c1bebbd5afc51
Codec.cpp
ndroid.mk
wesomePlayer.cpp
olorconversion/SoftwareRenderer.cpp
nclude/AwesomePlayer.h
nclude/SoftwareRenderer.h
f7f3e824a8cb2b38355db8e4f99e43b90ee71ce4 23-Feb-2011 James Dong <jdong@google.com> Merge "Application-managed callback buffer support for raw image"
51b9a8b53eaa1a0188be95d4d6a749424787e0d6 23-Feb-2011 Gloria Wang <gwang@google.com> Merge "- Add method in MediaPlayerService to collect and pull codec usage (duration) for the battery app - Collect MediaPlayer decoding usage data"
7cf180c9bff69e5cc4a2f4e53b432db45ebbebab 20-Feb-2011 Gloria Wang <gwang@google.com> - Add method in MediaPlayerService to collect and pull
codec usage (duration) for the battery app
- Collect MediaPlayer decoding usage data

Change-Id: I0ef4e32b6a041ba1fe73c19f9c67185c61d03965
wesomePlayer.cpp
e468ac57f6e8afc6078c76d4eb1ac327112a3de0 18-Feb-2011 James Dong <jdong@google.com> Application-managed callback buffer support for raw image

bug - 3292153

Change-Id: I9789f7c5cde3a3889d7375e881181e9152d95fc2
ameraSourceTimeLapse.cpp
95d7e994c73c17b27c7134ba3cc3acbb5889aa87 17-Feb-2011 Mathias Agopian <mathias@google.com> Remove RefBase.h dependency on TextOutput.h

Change-Id: I72cd6b98ef82b4868fe1c8ec87862cf43fb4ee73
nclude/AMRExtractor.h
nclude/MP3Extractor.h
nclude/OggExtractor.h
nclude/WAVExtractor.h
nclude/avc_utils.h
peg2ts/ESQueue.h
8e0e1979f0f41487b0f18aa5b9c8c52a39ca27f4 23-Feb-2011 James Dong <jdong@google.com> Merge "Remove mkvparser code from /frameworks/base"
c498a2747314b1e863eab6a22aaf7323642ba62a 23-Feb-2011 James Dong <jdong@google.com> Remove mkvparser code from /frameworks/base

bug - 3322129

Change-Id: I94dca6234ce57c9a32290aa7ac4885b0a2f566a9
atroska/Android.mk
atroska/mkvparser.cpp
atroska/mkvparser.hpp
fcea8f7a7d178e5426aa06586cff54726e18d1f6 23-Feb-2011 Andreas Huber <andih@google.com> Support for PCMA and PCMU raw audio data in RTP/RTSP.

Change-Id: Icb87bdfa7cf572c572e2a86c46fa072d9fad18f6
related-to-bug: 3084183
tsp/APacketSource.cpp
tsp/ARTPSource.cpp
tsp/ARawAudioAssembler.cpp
tsp/ARawAudioAssembler.h
tsp/Android.mk
55e26193c885b7d5acdae9978848e6587987790f 22-Feb-2011 Andreas Huber <andih@google.com> Support more MPEG4-LATM audio functionality.

related-to-bug: 3474610

Change-Id: I6dab40e8b465922c62be9ee7f168718822c6caac
Now skipping extra header that the spec claimed shouldn't be present in LATM...
oundation/ABitReader.cpp
tsp/AMPEG4AudioAssembler.cpp
tsp/AMPEG4AudioAssembler.h
8c8f24dce1dfc2d1eed8f7856ffceaa349afa2a6 19-Feb-2011 Glenn Kasten <gkasten@google.com> Don't crash when parsing DRM MIME types

Change-Id: I414897c911a6588061ddbb5f05c574e78162dca9
ediaExtractor.cpp
0e10ea4e9773fc9c6c391b5b391a95e29edf29e4 17-Feb-2011 Andreas Huber <andih@google.com> Merge "Experimental support for https transfers in stagefright."
a472613aec322e25891abf5c77bf3f7e3c244920 16-Feb-2011 James Dong <jdong@google.com> A/V synchronization at the beginning of a recording session

o do not use edts/elst boxes since these optional boxes are ignored
o manipulate the first video/audio frame duration to make sure that the rest
of the audio/video is in sync (ideally, we should only manipulate
the vidoe frame duration, not the audio)
o reduce the initial audio mute/suppression period, which is used to
eliminate the "recording" sound.

bug - 3405882 and 3362703

Change-Id: Ib0acfb4f3843b365157288951dc122b006299c18
udioSource.cpp
ameraSource.cpp
PEG4Writer.cpp
8cb0c4168bf4b678e4a6edfcf409247016be20d5 17-Feb-2011 Andreas Huber <andih@google.com> Experimental support for https transfers in stagefright.

Change-Id: If1bd0f265dda136c7c34b53317f64383023b53a3
ndroid.mk
wesomePlayer.cpp
ataSource.cpp
TTPStream.cpp
uHTTPDataSource.cpp
ttplive/LiveSession.cpp
nclude/HTTPStream.h
nclude/NuHTTPDataSource.h
b8dc45f224232e6ff64c1528b9e549b5a348fcd3 16-Feb-2011 Andreas Huber <andih@google.com> am dbe09da6: DO NOT MERGE: Respond to RTSP server->client requests.

* commit 'dbe09da6ac4d1e9e78e5c8f33fbc6d32822ba7ed':
DO NOT MERGE: Respond to RTSP server->client requests.
917429960b0e0d0c363e849f482f6aeb11c9b7d7 16-Feb-2011 Andreas Huber <andih@google.com> DO NOT MERGE: Respond to RTSP server->client requests.

Even if it's just to tell them that we don't support any (this is optional).

Change-Id: Iee50b4020f28a47dfbe5d56f1732fe044b3b3655
related-to-bug: 3353752
tsp/ARTSPConnection.cpp
tsp/ARTSPConnection.h
4fd9736c7719ea121f9717b331b771bef798ee64 16-Feb-2011 Andreas Huber <andih@google.com> Merge "Respond to RTSP server->client requests."
5ef152132b477a07fa31b2ddd39f4cf7a29f68b4 16-Feb-2011 Andreas Huber <andih@google.com> Respond to RTSP server->client requests.

Even if it's just to tell them that we don't support any (this is optional).

Change-Id: I557865ac00d0fb65ffa69363eb1eceaabe522a1a
related-to-bug: 3353752
tsp/ARTSPConnection.cpp
tsp/ARTSPConnection.h
6b61f4355db1974cd0f0dfaa4effdd7117b9f09b 15-Feb-2011 James Dong <jdong@google.com> Decouple AudioRecord read and audio encoding

bug - 3313754

Change-Id: I951dd0e21e34aa1412c391f003bc32103d0424b0
udioSource.cpp
ed8d14f6a934072cd012992c4ef16990a54baa9a 16-Feb-2011 Andreas Huber <andih@google.com> Remove legacy, AwesomePlayer-based http live implementation.

Change-Id: I455d0faa5612dcd4d2bb6f2b3c7b64a1caaabf69
wesomePlayer.cpp
ttplive/LiveSession.cpp
nclude/AwesomePlayer.h
peg2ts/ATSParser.cpp
peg2ts/ATSParser.h
peg2ts/MPEG2TSExtractor.cpp
6d91a2069f58ed054889371cbce3a294f3207338 16-Feb-2011 Andreas Huber <andih@google.com> am 8db7a7bf: Merge "DO NOT MERGE: Derive the Transport "source" attribute from the RTSP endpoint address if necessary" into gingerbread

* commit '8db7a7bfadc7bdfa30f60bb06063f91b19234096':
DO NOT MERGE: Derive the Transport "source" attribute from the RTSP endpoint address if necessary
d48a6044fddc910f17e67650f280e91e7aaf5e65 16-Feb-2011 Gloria Wang <gwang@google.com> Merge "Add AAC extractor"
50c44c79d2d7dd6cd1485d9d939f67f80b8da1ca 02-Feb-2011 Gloria Wang <gwang@google.com> Add AAC extractor

Change-Id: Iedb08525ac72e65ba98e5c791734da0720a0e3f6
ACExtractor.cpp
ndroid.mk
ataSource.cpp
ediaDefs.cpp
ediaExtractor.cpp
vc_utils.cpp
nclude/AACExtractor.h
nclude/avc_utils.h
peg2ts/ESQueue.cpp
peg2ts/ESQueue.h
43270a821f418f57140220b4c78c559d880850ef 16-Feb-2011 Andreas Huber <andih@google.com> Revert "Make AwesomePlayer's reset process more verbose to track down ANRs (yet again)"

This reverts commit e7c83d4a711241923854d6bbd5de0e24f9192f93.

Change-Id: I5151c7c72d79154528c55aa01bf006c8e38e7af7
wesomePlayer.cpp
MXCodec.cpp
b81c1b65e58186b5e7abf8f894c9b0f2f317ec09 15-Feb-2011 Andreas Huber <andih@google.com> DO NOT MERGE: Derive the Transport "source" attribute from the RTSP endpoint address if necessary

and continue even if we were unable to poke a hole into the firewall.

Change-Id: I5757a2521b8d81a42d03cca379179ce2c9ee46e7
related-to-bug: 3457201
tsp/MyHandler.h
de9a20c274983d4f7a688acb68d5dfc6a432eb10 15-Feb-2011 Andreas Huber <andih@google.com> Derive the Transport "source" attribute from the RTSP endpoint address if necessary

and continue even if we were unable to poke a hole into the firewall.

related-to-bug: 3457201
Change-Id: I0a523f38e6959bf00b8b140a70bb65fcc414c9c1
tsp/MyHandler.h
dc468c5f9d72ce54de0070493e9a23efb8907e06 15-Feb-2011 Andreas Huber <andih@google.com> Work around several issues with non-compliant RTSP servers.

In this particular case these RTSP servers were implemented as local services,
retransmitting live streams via a local RTSP server instance.

They picked wrong rtp/rtcp port pairs (odd rtp port), blank lines in the session
description, wrong case of the format description, relative base URLs...

Change-Id: I63fa90ca2398f19e8b52c147248bd2c5c2372426
related-to-bug: 3452103
tsp/AMPEG4ElementaryAssembler.cpp
tsp/APacketSource.cpp
tsp/ARTPConnection.cpp
tsp/ARTPSource.cpp
tsp/ASessionDescription.cpp
tsp/MyHandler.h
69686c47220cf6c85b91d741fc3a08eb46887ad1 15-Feb-2011 Andreas Huber <andih@google.com> am d1ba051a: DO NOT MERGE: Work around several issues with non-compliant RTSP servers.

* commit 'd1ba051a465518fa4325c364ed77025fc1a2a794':
DO NOT MERGE: Work around several issues with non-compliant RTSP servers.
3d7b550b1a9bae0ec692bf7b786385914f99ea3d 15-Feb-2011 Andreas Huber <andih@google.com> DO NOT MERGE: Work around several issues with non-compliant RTSP servers.

In this particular case these RTSP servers were implemented as local services,
retransmitting live streams via a local RTSP server instance.

They picked wrong rtp/rtcp port pairs (odd rtp port), blank lines in the session
description, wrong case of the format description, relative base URLs...

Change-Id: I502a04a7e1d690fd461b7ecf0b56c6a6c2ac1325
related-to-bug: 3452103
tsp/AMPEG4ElementaryAssembler.cpp
tsp/APacketSource.cpp
tsp/ARTPConnection.cpp
tsp/ARTPSource.cpp
tsp/ASessionDescription.cpp
tsp/MyHandler.h
f1958f9442bc937e1f8c8d9175901500b944b021 14-Feb-2011 Andreas Huber <andih@google.com> Enable cancelling the rtsp connection process early.

Change-Id: Ie2059c54541ad8c675944d71b39c772b0f6f04c8
related-to-bug: 3452699
wesomePlayer.cpp
nclude/AwesomePlayer.h
tsp/ARTSPController.cpp
244ba87d20aeb29c9cad727820fa1e803ec3643c 12-Feb-2011 James Dong <jdong@google.com> Make available h263 DSI information from MPEG4Extractor

bug - 3446863

Change-Id: Idbaf7a564d544784fdbc36ed0339c98a519adc88
PEG4Extractor.cpp
f03034408506051f2f836e59305fcd5f662bf19a 11-Feb-2011 Andreas Huber <andih@google.com> Start playing (and decoding) audio only after the first video frame has been decoded.

if there's both audio and video content. This gives the video decoder an opportunity
to fill its internal buffer queue at the start of playback.

Change-Id: Ib2c95753b430e4e47207953b913b607024a328d7
related-to-bug: 3431702
wesomePlayer.cpp
nclude/AwesomePlayer.h
ff98976e40459e910cfd1a7693bb08cff4dabd42 11-Feb-2011 James Dong <jdong@google.com> The color conversion from YUV420Planar to RGB only requires the image width to be a multiple of 2, not 4.

bug - 3379293

Change-Id: I8960737f0604b54ce90dfc26137f1582073b4ab2
olorconversion/ColorConverter.cpp
864d06670089f79bc177a51fd53de9db0e21fc99 10-Feb-2011 Andreas Huber <andih@google.com> Fix the build.

Change-Id: I9b777ffb260eb0f3790ae0907e4a443d33fa3f2f
tsp/Android.mk
100a4408968b90e314526185d572c72ea4cc784a 08-Feb-2011 Andreas Huber <andih@google.com> Change timestamp handling in RTSP, remove unused, experimental, gtalk support

related-to-bug: 3216447

NTP timestamp handling is now done at a higher layer than before.

Change-Id: I9fb23f1335110ec59e534f9aa0fe6f6a6406dd52
wesomePlayer.cpp
nclude/AwesomePlayer.h
tsp/ARTPAssembler.cpp
tsp/ARTPConnection.cpp
tsp/ARTPConnection.h
tsp/ARTPSession.cpp
tsp/ARTPSource.cpp
tsp/ARTPSource.h
tsp/Android.mk
tsp/MyHandler.h
fcac8fa9421f442f024018628a6042d7a14fbfb0 09-Feb-2011 James Dong <jdong@google.com> Reduce blocking time in file write

bug - 3418787

Change-Id: I4723662bf46ed07271be8468f84ae5d93cb793fa
PEG4Writer.cpp
722555f01ace262c2aba9e1ca5d9794ce30c564f 09-Feb-2011 James Dong <jdong@google.com> Catch read error from AudioRecord and do not assert

bug - 3439313

Change-Id: Ie29d6e4945978ef27fc3e5849e467d895c7736d3
udioSource.cpp
6b8ef4762a26cb828e0a597719764d3d0404e2b1 08-Feb-2011 Gloria Wang <gwang@google.com> Merge "Add more check before using the DRM manager client."
8f64134f749e4f7861a08a3063450fc714c4651d 08-Feb-2011 Gloria Wang <gwang@google.com> Add more check before using the DRM manager client.

Change-Id: I7369dcd6b6abd1945430373200fd5353bca70652
wesomePlayer.cpp
RMExtractor.cpp
ileSource.cpp
uHTTPDataSource.cpp
eeffad65d2db4879593c1d4806824ef5b4dcb3e1 08-Feb-2011 Andreas Huber <andih@google.com> Merge "Handle some edge cases when seeking while starting up OMXCodec"
9c0096378820e5a61db26e52a7e6df50ba9c872d 08-Feb-2011 Andreas Huber <andih@google.com> Handle some edge cases when seeking while starting up OMXCodec

These were exposed by the new preview-seekframe while paused code.
In particular, the codec may have been in state RECONFIGURING when attempting
to seek, or we may have initiated flushing of the output port and this may not
have completed yet by the time we want to reconfigure the output port.

Change-Id: Id7640ade11dbc7205a22f648ea0b5e3e9b49cf4b
related-to-bug: 3392259
MXCodec.cpp
cd334d7a8e9df05f6b94eefbad2bddda0850f2cf 08-Feb-2011 Andreas Huber <andih@google.com> Merge "Remove one log message from the VPXDecoder"
b93d55d9f6e154629d47270970e0a0ace5a1b0a0 08-Feb-2011 Gloria Wang <gwang@google.com> Merge "- Do not use global DrmManagerClient - Release the DrmManagerClient and DecryptHandle in DataSource Fix for bug 3429811"
576c3f65d7ad166c21ef09342a2a321e57666af4 08-Feb-2011 Andreas Huber <andih@google.com> Remove one log message from the VPXDecoder

related-to-bug: 3402216

The VPX format supports "internal-only" frames that are
referenced by future content but never actually displayed, so
this is a perfectly valid scenario that doesn't require a
log message.

Change-Id: I8330bfdfefcdf4ab66ae6d2b59b99fd9b89350df
odecs/on2/dec/VPXDecoder.cpp
889b340ec736a9d3e3e690256d305cc8740f0c4b 07-Feb-2011 Gloria Wang <gwang@google.com> - Do not use global DrmManagerClient
- Release the DrmManagerClient and DecryptHandle in DataSource
Fix for bug 3429811

Change-Id: I549f72b75225751877eb0e630ce8098f8ec6316f
wesomePlayer.cpp
RMExtractor.cpp
ileSource.cpp
uCachedSource2.cpp
uHTTPDataSource.cpp
nclude/DRMExtractor.h
nclude/NuCachedSource2.h
nclude/NuHTTPDataSource.h
2b1222f8938356669672f35e0e53e176c78c40ef 07-Feb-2011 Andreas Huber <andih@google.com> Display a single (still-)frame of video after seeking while paused.

Change-Id: Ia78bf29ba6d649043e70c49913725cecdf918c03
related-to-bug: 3392259
wesomePlayer.cpp
nclude/AwesomePlayer.h
349d3fcb4afacf754f7b5b5186d2f258f5bf35e7 04-Feb-2011 Andreas Huber <andih@google.com> Improvements/fixes to ACodec.

- Make sure ACodec reverts its state when it's shutdown
- Defer "resume" to after handling the OutputPortSettingsChange

- If the OMX_EventPortSettingsChanged event comes in while we're flushing, defer it
and make sure the output port can be disabled by deleting all buffers not already
owned by the component.

Change-Id: I1f8cdffa71237b57d4275a48b834647a7b263e8b
Codec.cpp
a205abd16ba836b27cfb8ba6b03611e8e8120978 04-Feb-2011 Andreas Huber <andih@google.com> Merge "Make AwesomePlayer's reset process more verbose to track down ANRs (yet again)"
553ab646159d94747dab5c3893ea51c8ec2463d9 04-Feb-2011 Andreas Huber <andih@google.com> Make AwesomePlayer's reset process more verbose to track down ANRs (yet again)

Change-Id: Ie1d853c31ad75ec5b12303c1131c9a74eb8cfc9f
wesomePlayer.cpp
MXCodec.cpp
4931bb5259d10c1fa01e7405fb7aaef58a8ffb22 03-Feb-2011 Andreas Huber <andih@google.com> Make sure timestamps attached to encoded media are composition timestamps.

not decoding timestamps. Obviously there is no difference between them if the
content in question does not involve frame reordering.

Change-Id: Iac4d06cfeb8a136f735c1148e98cac340d3ef893
related-to-bug: 3398314
PEG4Extractor.cpp
ampleIterator.cpp
ampleTable.cpp
nclude/SampleTable.h
856990b491d84b7ed4fefe337485c8997ba9dd02 13-Jan-2011 Glenn Kasten <gkasten@google.com> Bug 1804058 FLAC extractor

Note: dependent on external/flac for libFLAC

Implemented and tested:
* FLAC container
* mono and stereo
* standard sample rates
* standard bit depths
* sniffer
* media scanner
* Vorbis comment metadata including album art
* random access seeking with "torture test"
* web browser integration for audio/flac (not audio/x-flac), but
note that most web servers don't correctly report the MIME type

Not implemented:
* 24-bit to 16-bit dither or noise shaping in AudioFlinger
* 96 kHz to 44.1 or 48 kHz downsampling low pass filter in AudioFlinger
* replay gain is better done in AudioFlinger
* multi-channel, would need AudioFlinger support
* Ogg container, does not seem to be very popular yet

Change-Id: I300873e8c0cfc2e95403d9adb5064d16a2923f17
ndroid.mk
ataSource.cpp
LACExtractor.cpp
ediaDefs.cpp
ediaExtractor.cpp
ggExtractor.cpp
tagefrightMediaScanner.cpp
nclude/FLACExtractor.h
nclude/OggExtractor.h
c36c7addb22cecfbe467b58ce219cd1f6db21a44 01-Feb-2011 Gloria Wang <gwang@google.com> Merge "- Support comfort noise in AMRExtractor - Support duration and seeking in AMRExtractor for different bit rates"
80f68ce02c91f188bb0cb0019fd25df2b8115f18 28-Jan-2011 Gloria Wang <gwang@google.com> - Support comfort noise in AMRExtractor
- Support duration and seeking in AMRExtractor for different bit rates

Bug 2530101

Change-Id: I12beffea73cea0ec056f0e0cf51a4a8d46d897b8
MRExtractor.cpp
nclude/AMRExtractor.h
ab8a0badb8fb1e294dacf2eb6a891439f348aff9 01-Feb-2011 Andreas Huber <andih@google.com> Disconnect HTTP live sessions as soon as the request comes in.

Instead of waiting until pending events have been processed.

Change-Id: Id758f5508a514561e18aade82175d69e9156965e
related-to-bug: 3409681
ttplive/LiveSession.cpp
nclude/LiveSession.h
5c009b036e01d2a351b02c47b8f20f384aa663fd 28-Jan-2011 Andreas Huber <andih@google.com> am b6c2e2b4: DO NOT MERGE: More robust parsing of NPT time ranges in RTSP.

* commit 'b6c2e2b46c574a90450438cccfb6cb97b7edc20f':
DO NOT MERGE: More robust parsing of NPT time ranges in RTSP.
db207461a16ebcab38b52906ef88228393efca41 28-Jan-2011 Andreas Huber <andih@google.com> Revert "Make AwesomePlayer's reset process more verbose to track down ANRs (again)"

This reverts commit aac2e9e1566a3bb0ef811ebd3a56b538324c95c1.

Change-Id: Ic84dfa829981fdc1a1330ccfe6b9dccf64a80719
related-to-bug: 3392386
wesomePlayer.cpp
4635eba3507750ed57817f244e84084d06df5b2c 28-Jan-2011 Andreas Huber <andih@google.com> DO NOT MERGE: More robust parsing of NPT time ranges in RTSP.

Change-Id: If5a00f1e29dbc12956e1fb000dac859706d19791
related-to-bug: 3217210
tsp/ASessionDescription.cpp
tsp/ASessionDescription.h
tsp/MyHandler.h
783e5cd85d4bd40b1a04dfdfed256c5dcb2525cc 28-Jan-2011 Andreas Huber <andih@google.com> More robust parsing of NPT time ranges in RTSP.

Change-Id: I3674501d2fd66aaface805c0a8678c74671a6dd3
related-to-bug: 3217210
tsp/ASessionDescription.cpp
tsp/ASessionDescription.h
tsp/MyHandler.h
05b8794654688079247c5d1d5b59dd0d288fd436 27-Jan-2011 Andreas Huber <andih@google.com> am 2dce338e: DO NOT MERGE: This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes.

* commit '2dce338e01678620db0734fc3d84bcb3f2512d62':
DO NOT MERGE: This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes.
97a38b4f1be201bbbfa23d298bb779fffd624a3d 27-Jan-2011 Andreas Huber <andih@google.com> DO NOT MERGE: This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes.

And now we're just ignoring them. Yay standards.

Change-Id: Ia8c0b9161e606152fb681f0dda3ba901954dc749
related-to-bug: 3353752
tsp/AMPEG4AudioAssembler.cpp
9202cca86e9017cc5ce30970c92a91ab32a0835e 27-Jan-2011 Andreas Huber <andih@google.com> This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes.

And now we're just ignoring them. Yay standards.

Change-Id: I76529ad8d585f143d6f99621ff671d179caf7b35
related-to-bug: 3353752
tsp/AMPEG4AudioAssembler.cpp
7757f5010a771fb8824b6fdf9788f588a1577e3f 26-Jan-2011 James Dong <jdong@google.com> Make sure that key frame is generated for timelapse video recording if there are at least two input video frames from camera source.

This will fix the stop failure issue where we have to wait n * time_interval before a key frame can be received by the file writer, where
o n is the actual number of buffers advertised by the video encoder
o time_interval is the interval settings for timelapse video recording
specifying the time distance between neighboring input video frames

The fix includes two parts:
o OMXCodec will not submit all n buffers at one time, but instead submit one input
frame at one time if it become available.

o Timelapse camera source made available the first two input frames and do not skip
them so that the first compressed output frame data can be received regardless
the specified time_interval

bug - 3367659

Change-Id: Ia68cc2cb0d71aa7dc54540e9ad82fae911ad530b
ameraSource.cpp
ameraSourceTimeLapse.cpp
MXCodec.cpp
2494373e91399a97ad405f4e42dff6543cc296c7 26-Jan-2011 Andreas Huber <andih@google.com> Merge "More instrumentation to track down the hardware decoder not shutting down bug." into honeycomb
43e5eca7048a3b7b3ee0223b7f3cbd837ed10ae5 25-Jan-2011 Andreas Huber <andih@google.com> More instrumentation to track down the hardware decoder not shutting down bug.

Change-Id: I3f31b6fdf5c90b436567bbce578dcbc4666ed7c2
related-to-bug: 3362836
MXCodec.cpp
mx/OMXNodeInstance.cpp
6592195d76b12a9823f82d3352245d0a6d459647 26-Jan-2011 Andreas Huber <andih@google.com> Ignore errors returned from native_window_set_crop.

If the surface is already invalid, we'll know soon enough.

Change-Id: If360ffb8293817afb47df8c1a75722aea74bb335
related-to-bug: 3394601
MXCodec.cpp
78fc8fab70411c6863d5f71383061f51290294df 26-Jan-2011 Andreas Huber <andih@google.com> Merge "Linux sockets suck, closing a socket descriptor does not abort pending recv/send calls." into honeycomb
6e1cc6e6e5477693a279185c372b90863778a10b 26-Jan-2011 Andreas Huber <andih@google.com> Instead of not feeding the AudioTrack any data after EOS, play silence instead.

Change-Id: I9aa797cf5bb58eefed51d732f4e5d09450551158
related-to-bug: 3347428
udioPlayer.cpp
0b967b923f7f608b2faa1820167a4f262a2f0720 26-Jan-2011 Andreas Huber <andih@google.com> Linux sockets suck, closing a socket descriptor does not abort pending recv/send calls.

Change-Id: Id53e7831761619f72ddc61f63571230011c93f16
related-to-bug: 3362836
TTPStream.cpp
b656f3592332cebfad8944e8692003cf3688d586 26-Jan-2011 Mike Lockwood <lockwood@android.com> Merge "StagefrightMediaScanner: Close metadata retriever after we are done scanning" into honeycomb
eaae38445a340c4857c1c5569475879a728e63b7 25-Jan-2011 James Dong <jdong@google.com> Report errors to applications if AudioRecord->start() fails

bug - 3385198

Change-Id: I86ac8071eb28a538b333e102192193d1b9eda5eb
udioSource.cpp
PEG4Writer.cpp
odecs/aacenc/AACEncoder.cpp
0a095d09464ba18e288a3f529410af0f1257ac2a 26-Jan-2011 Mike Lockwood <lockwood@android.com> StagefrightMediaScanner: Close metadata retriever after we are done scanning

This prevents the mediaserver from leaking a file descriptor after
the media scanner runs

BUG: 3373546

Change-Id: I82a8bae82306de3da56a5c7da5b03ecf106a4efc
Signed-off-by: Mike Lockwood <lockwood@android.com>
tagefrightMediaScanner.cpp
05adea42e17b0af3b90e51945f800aa26a2d0240 25-Jan-2011 Andreas Huber <andih@google.com> am efebdf4b: DO NOT MERGE: Support non-multiple-of-16 dimensions in MPEG4/H.263 software decoder

* commit 'efebdf4bd4da35bc50c7d81450c8473697f6654a':
DO NOT MERGE: Support non-multiple-of-16 dimensions in MPEG4/H.263 software decoder
05b22175a0d186d964694a5162892b6b3476c562 24-Jan-2011 Andreas Huber <andih@google.com> DO NOT MERGE: Support non-multiple-of-16 dimensions in MPEG4/H.263 software decoder

Change-Id: I6c27c00a6e13cb3635e61089c0db0989f5810c37
related-to-bug: 3384367
odecs/m4v_h263/dec/M4vH263Decoder.cpp
odecs/m4v_h263/dec/include/mp4dec_api.h
odecs/m4v_h263/dec/src/pvdec_api.cpp
4feffd1a8d95cf3843c06a37160580d30d421d8e 24-Jan-2011 Andreas Huber <andih@google.com> Merge "Support non-multiple-of-16 dimensions in MPEG4/H.263 software decoder" into honeycomb
b9ff4b4f631239a6a37fe6588e025cb387150c0e 24-Jan-2011 Andreas Huber <andih@google.com> Support non-multiple-of-16 dimensions in MPEG4/H.263 software decoder

Change-Id: Ia22ebce66d9c35de4b04c3eedc9495847796901d
related-to-bug: 3384367
odecs/m4v_h263/dec/M4vH263Decoder.cpp
odecs/m4v_h263/dec/include/mp4dec_api.h
odecs/m4v_h263/dec/src/pvdec_api.cpp
30ae68bccd8de6f0ab2acd22a6d661ace514343e 24-Jan-2011 Andreas Huber <andih@google.com> The .mkv parser lib leaves some tracks NULL if it doesn't support them.

But it still counts them as valid tracks...

Change-Id: I77e8fd24cce91a586e8e418759db55b6eba449c0
related-to-bug: 3377186
atroska/MatroskaExtractor.cpp
e20e15bcfd0317f63ecf76e6b8e9fbd9196fde0b 24-Jan-2011 Andreas Huber <andih@google.com> Make AwesomePlayer's reset process more verbose to track down ANRs (again)

Change-Id: I0d66994cc4295fd5ceeaaf151ce913ed0dd995f9
related-to-bug: 3362836
wesomePlayer.cpp
8aded52c4d6962da5357d4bfc0bca4be3aa331ef 21-Jan-2011 Carl Shapiro <cshapiro@google.com> Revert "Make AwesomePlayer's reset process more verbose to track down ANRs."

This reverts commit 90c656574175bd54ed8d258f406f158177e5e91c.

Bug: 3378444
Change-Id: Id845bc0bc213f18c73fec12e6a2084cb2075c2d9
wesomePlayer.cpp
7fac331b39ca49ce49a67e425dcc031a3cb9e97f 21-Jan-2011 Andreas Huber <andih@google.com> Properly rotate video that's marked as such and decoded to a surface.

Change-Id: I1e9144db3447e58c99aac3f47702ad471678789c
related-to-bug: 3378148
MXCodec.cpp
bc7f5b2e56107cfeaeeab13cf8979379e3c2f139 21-Jan-2011 Andreas Huber <andih@google.com> Some tweaks to HTTP live / nuplayer behaviour

- play audio-only streams again
- workaround for malformed streams that switch PIDs across bandwidths
- attempt to pick a different bandwidth stream if the previously chosen one appears
to be malformed/unsupported.

Change-Id: I426d0a40dc725aa242f619d4c9d048b69aca55c9
related-to-bug: 2368598
ttplive/LiveSession.cpp
peg2ts/ATSParser.cpp
peg2ts/ATSParser.h
b23ef145ac2a62068a6a8848f1f5d8a74f9c2b34 21-Jan-2011 Dave Sparks <davidsparks@android.com> am 65d39eeb: Merge "DO NOT MERGE: Prefill the cache before trying to instantiate the media extractor." into gingerbread

* commit '65d39eeb9b032e5507a01daa25afff62b29bffe4':
DO NOT MERGE: Prefill the cache before trying to instantiate the media extractor.
6e3edc2dffb0d424b02ac57b55114b0d13163f56 20-Jan-2011 Andreas Huber <andih@google.com> DO NOT MERGE: Prefill the cache before trying to instantiate the media extractor.

The latter is an operation that otherwise could block on the datasource
for a significant amount of time. During that time we'd be unable to
abort the preparation phase without this prefill.

Change-Id: I3bc889b264f599bfd5c2bbdf48b88ccb55d86172
related-to-bug: 3362836
wesomePlayer.cpp
uCachedSource2.cpp
1c705e94c291897d23d236a7d118a68eace74406 20-Jan-2011 Andreas Huber <andih@google.com> Merge "Prefill the cache before trying to instantiate the media extractor." into honeycomb
ac05c317cd818701535c5d72ce90da98c4bae75b 20-Jan-2011 Andreas Huber <andih@google.com> Prefill the cache before trying to instantiate the media extractor.

The latter is an operation that otherwise could block on the datasource
for a significant amount of time. During that time we'd be unable to
abort the preparation phase without this prefill.

Change-Id: Ia42496d88a11314386ea8797d665bf4e94871e30
related-to-bug: 3362836
wesomePlayer.cpp
uCachedSource2.cpp
886c09ee81eb7b8878e487c7f801ea8ddb27c17c 19-Jan-2011 James Dong <jdong@google.com> Merge "Logging the duration range from different media tracks for recording" into honeycomb
65b3d76025c71d755b0fb3b6ead90255f25417ed 19-Jan-2011 James Dong <jdong@google.com> Logging the duration range from different media tracks for recording

Change-Id: I8c3edcf97ce35301f8645e4a1e232d9bfc2c0349
PEG4Writer.cpp
88b7ad413c4b6d08697069b18488641d6ce31fd3 19-Jan-2011 Andreas Huber <andih@google.com> Always revert to the previous bandwidth if the required sequence number cannot be found

Change-Id: I098dba37f4a70fc703c9ce65346907c3e10f27f6
ttplive/LiveSession.cpp
88b348910a607ae399bcd693dd42a231d98da2c9 19-Jan-2011 Andreas Huber <andih@google.com> Return a runtime error if decryption fails instead of asserting.

Change-Id: Ibab7f2cae3ff7a2e19bc3f31005d5059775a664a
ttplive/LiveSession.cpp
113a95462d2018c62b9e6bc86e7f643ff46f29cf 19-Jan-2011 James Dong <jdong@google.com> Expose average video frame rate via MPEG4Extractor

bug - 3362483

Change-Id: Ifcbb75c1e8b80cb06c4b8fe7f5ff99bc6f18af69
PEG4Extractor.cpp
e75ceba6e3f009118c5debbbe2de268beb350c9a 19-Jan-2011 James Dong <jdong@google.com> Merge "Fix the presentation video resolution when it is different from the actual image resolution of the video." into honeycomb
018761c5cc4aefd0495eaa4666f2372a59a7980a 19-Jan-2011 Andreas Huber <andih@google.com> Turn another assertion into a runtime error. Damn you surfaces.

Change-Id: Ib62957180949293a6fb84bb5a40af058798337ab
related-to-bug: 3335220
MXCodec.cpp
b45c01c2b8588ff431b511151666a55a39f0a6ae 16-Jan-2011 James Dong <jdong@google.com> Fix the presentation video resolution when it is different from the actual image resolution of the video.

bug - 3352413

Change-Id: I8f08f3896e9fb90f09119dccdb88b82af60f79f2
wesomePlayer.cpp
PEG4Extractor.cpp
nclude/AwesomePlayer.h
ea59c3e26a903af458cb1cadaeed869a99bf5680 19-Jan-2011 Andreas Huber <andih@google.com> am e9a00235: Merge "DO NOT MERGE: Apparently our native TCP sockets do not return an error from blocking "connect"" into gingerbread

* commit 'e9a00235c102d198a702bc665b2ea5b5e8c4bc07':
DO NOT MERGE: Apparently our native TCP sockets do not return an error from blocking "connect"
2b4883641e324c50a2ee24c5bd15170c7d31e57d 19-Jan-2011 James Dong <jdong@google.com> Use metadata in video buffers for timelapse video recording by default to eliminate memcpy

bug - 3361771

Change-Id: Ib37ffe4be8edc8708baa76b3507b6f11372536d9
ameraSourceTimeLapse.cpp
f4c056aeacad2dac60a83ccd7928bfeaa9d6ddf6 19-Jan-2011 Andreas Huber <andih@google.com> DO NOT MERGE: Apparently our native TCP sockets do not return an error from blocking "connect"

if the network interface is shutdown while connecting.

Change-Id: I168c6026de24812efa9b7e607a9eb83efded8c1f
related-to-bug: 3362836
TTPStream.cpp
368ef16787c3fe2334dadc767e7418b610c83cbd 19-Jan-2011 Andreas Huber <andih@google.com> Apparently our native TCP sockets do not return an error from blocking "connect"

if the network interface is shutdown while connecting.

Change-Id: I1bd7e43475edf20f35e15dd4eae547126289f5f0
related-to-bug: 3362836
TTPStream.cpp
bf6489f8b4c03dda70bf7a549702b98da497e348 18-Jan-2011 Andreas Huber <andih@google.com> Merge "Implement parsing of vbv buffering info in RTSP." into honeycomb
21a6f9ffee8b3c014abfe165b8f7fd2224f49e1f 18-Jan-2011 Andreas Huber <andih@google.com> Implement parsing of vbv buffering info in RTSP.

Change-Id: I7d871cafda2c4c65670a40ad9ab4f24317f8568a
related-to-bug: 3351915
tsp/APacketSource.cpp
1bd233ce7e1aa7730bc18d46ffd57791391738cd 18-Jan-2011 Bryan Mawhinney <bryanmawhinney@google.com> Don't report 100% buffered when the stream ends prematurely.

Change-Id: Ia4e80d02f28104427a3309e3d5b155faa5702757
wesomePlayer.cpp
uCachedSource2.cpp
nclude/NuCachedSource2.h
ccb3506ed1845121b94f4e27244e61a46eb19815 17-Jan-2011 Dharmaray Kundargi <dharmaray@google.com> integrate videoeditor preview player.

Change-Id: I83084f494605c8e6f4d198afa8c36f9e29579667
nclude/AwesomePlayer.h
cf3592c5bf1c66ba510934fff5eb57ee0b3fd761 15-Jan-2011 Jean-Baptiste Queru <jbq@google.com> merge 83fdc69e from gingerbread - do not merge

Change-Id: Ib1e9e12244a44f75a93d66142e71915de6386680
6ee94582e3ce7bdd9625345e7564e3176a51a2f3 15-Jan-2011 James Dong <jdong@google.com> Fixed thrashing in the cached buffer during 720p YT video streaming

bug - 3340194

Change-Id: Ic59bb18ab1731d7dd7cae7cc8aeb393900bce7f6
uCachedSource2.cpp
95304d5488ba465f19cc788f1c7394218c2ea2d1 03-Dec-2010 James Dong <jdong@google.com> Squash commits of the following patches, cherry-picked from other branch - do not merge.

o Prepare for publishing MediaMetadataRetriever as public API
step one:
o replaced captureFrame with getFrameAtTime
o removed getMode

o Replace MediaMetadataRetriever.captureFrame() with MediaMetadataRetriever.getFrameAtTime()
as part of the preparation for publishing MediaMetadataRetriever as public Java API

o Remove captureFrame from MediaMetadataRetriever.java class
It has been replaced by getFrameAtTime() method

o Replace extractAlbumArt() with getEmbeddedPicture() in MediaMetadataRetriever.java

o Publish MediaMetadataRetriever.java as public API
o Removed setMode() methods and related mode constants
o Removed some of the unused the metadata keys
o Updated the javadoc
o part of a multi-project change.

bug - 3309041

Change-Id: I2efb6e8b8d52897186b016cb4efda6862f5584c4
tagefrightMediaScanner.cpp
tagefrightMetadataRetriever.cpp
nclude/StagefrightMetadataRetriever.h
3e9eeb3b411f56d9935f9240056107816da24653 12-Jan-2011 Andreas Huber <andih@google.com> Merge "Fail to parse duration instead of asserting, if the server response cannot be parsed." into honeycomb
7f7d52ac18dfc3c6d8f6267dad29306613e9bd0e 06-Jan-2011 James Dong <jdong@google.com> Publish MediaMetadataRetriever.java as public API

o Removed setMode() methods and related mode constants
o Removed some of the unused the metadata keys
o Updated the javadoc

o part of a multi-project change.

bug - 2433195

Change-Id: I5ed167f1fd6a53cb143b7dc385b149431d434438
tagefrightMediaScanner.cpp
tagefrightMetadataRetriever.cpp
67988a9ba5a081d14dbd8a663516e1d484d829df 12-Jan-2011 James Dong <jdong@google.com> Merge "Speed up MP3Extractor using cached reads" into honeycomb
72b228f6b18763a95023fd8ba44eb7354cfd7f74 12-Jan-2011 Andreas Huber <andih@google.com> am 7c615360: Fail to parse duration instead of asserting, if the server response cannot be parsed.

* commit '7c6153606cc963191362494c8cb5669749e84326':
Fail to parse duration instead of asserting, if the server response cannot be parsed.
934ca8cb1bcffcf1781a576ca625d2f901e5f0a9 12-Jan-2011 Andreas Huber <andih@google.com> Fail to parse duration instead of asserting, if the server response cannot be parsed.

Change-Id: I42324468edca5ccce29486059091da8e64f36326
related-to-bug: 3338518
tsp/ASessionDescription.cpp
e49051406baa71cb63d5754d33908ce3df201af1 12-Jan-2011 Andreas Huber <andih@google.com> Fail to parse duration instead of asserting, if the server response cannot be parsed.

Change-Id: I95c61ed83800db82e99c0023b942fb8ae05ed3cf
related-to-bug: 3338518
tsp/ASessionDescription.cpp
7cc497733b7602b99b783decfa8c002bc27e25aa 12-Jan-2011 James Dong <jdong@google.com> Speed up MP3Extractor using cached reads

Change-Id: I53a5ed76bc2f76f0c184f3800b5448f677117ae3
P3Extractor.cpp
4dafe5b814c923538a0f275b62220ec9cc94a9b5 12-Jan-2011 Glenn Kasten <gkasten@google.com> Fix race in buffer ref counting.

Change-Id: Id47c30469c3e3ec293ed2ef574a191275b5044d6
ediaBuffer.cpp
4c0104e004f30d7e48381ef8d728b2e93931611f 12-Jan-2011 Andreas Huber <andih@google.com> am 7e2f9cc8: DO NOT MERGE: Fix Matroska issues

* commit '7e2f9cc81da788006790365ff11f06551fc1bc26':
DO NOT MERGE: Fix Matroska issues
9a0cf4fb7d18e186e06341bde915de234992d969 12-Jan-2011 Andreas Huber <andih@google.com> DO NOT MERGE: Fix Matroska issues

related-to-bug: 3331623

Squashed commit of the following:

commit 8484811f3784564ce962ec1b6311bac532d73ffc
Author: Andreas Huber <andih@google.com>
Date: Tue Jan 11 11:56:06 2011 -0800

Properly parse Matroska lacing flags and extract all frames contained in a block.

related-to-bug: 3331623

commit 38f1f39381a01659577461b3d35bd22db45ba317
Author: Andreas Huber <andih@google.com>
Date: Mon Nov 15 15:10:34 2010 -0800

Proper support for variable NALsize lengths of AVC content in .mkv files.

related-to-bug: 3197442

Change-Id: I4b404f3c3d0a2a2fa336b9edff75eb25ffc66a2f
atroska/MatroskaExtractor.cpp
atroska/mkvparser.cpp
atroska/mkvparser.hpp
960737e761895d5850beabab809d03b3621d0ec3 12-Jan-2011 repo sync <andih@google.com> resolved conflicts for merge of e7fbfb6b to gingerbread-plus-aosp

Change-Id: Icef97302fb99e3dd346ec6ee04aa9e8eea7bff26
c4c3a2d4123f7dfe8c6ed0c26fb14aeb7b8d8f61 12-Jan-2011 Andreas Huber <andih@google.com> Merge "Increase cache size and low-watermark threshold, also" into honeycomb
fd52174eaacf661e9e7b1ff0001a9587f1b90b87 12-Jan-2011 Andreas Huber <andih@google.com> Merge "Properly parse Matroska lacing flags and extract all frames contained in a block." into honeycomb
145e68fc778275963189b02a1adcbe27cce4d769 12-Jan-2011 Andreas Huber <andih@google.com> Increase cache size and low-watermark threshold, also

MediaPlayer now sends out MEDIA_INFO,MEDIA_INFO_VIDEO_TRACK_LAGGING messages
to the JAVA client informing it how much (if at all) the video lags behind
audio (arg2 is the media delay in ms).

Change-Id: I6933f573d8597a35112e4b5ee0fcb826a7f6ddd1
related-to-bug: 3335220
wesomePlayer.cpp
uCachedSource2.cpp
nclude/AwesomePlayer.h
nclude/NuCachedSource2.h
50c8bea8fba2fcafb14696399028bdbc094dc995 11-Jan-2011 Andreas Huber <andih@google.com> Properly parse Matroska lacing flags and extract all frames contained in a block.

Change-Id: I1aca46b2e28b9cad88bf4a296f675e81e66ee095
related-to-bug: 3331623
atroska/MatroskaExtractor.cpp
atroska/mkvparser.cpp
atroska/mkvparser.hpp
8eb04084b96d59802615f0e0570359c35ca3df61 11-Jan-2011 James Dong <jdong@google.com> Merge "Fix uninitialized rect structure for retrieving rect cropping information from decoder" into honeycomb
0d85990f20106513b6da5a446702aa62ab61397f 11-Jan-2011 Andreas Huber <andih@google.com> DO NOT MERGE: Fix parsing of ntp= PLAY response.

related-to-bug: 3340186

Squashed commit of the following:

commit b61c36b7228aec9f5360883b1e1c1e0530488974
Author: Andreas Huber <andih@google.com>
Date: Wed Oct 27 13:59:59 2010 -0700

Better support for MP4A-LATM RTP disassembly. This used to fail if mNumSubFrames > 1 and the sub frames did not align with RTP packet boundaries.

commit b10f322c07e5bebcaf032e8624cb4a5d733dfc15
Author: Andreas Huber <andih@google.com>
Date: Mon Oct 25 09:40:52 2010 -0700

We don't have access to the md5 implementation on the simulator, let's disable digest authentication in rtsp for simulator targets.

commit 0aa83cf9e4637adf9501708fcdf7d0d6d4dc4fe1
Author: Andreas Huber <andih@google.com>
Date: Wed Oct 20 15:00:34 2010 -0700

Support for BASIC and DIGEST authentication schemes in RTSP. Support for malformed packet descriptions that end lines in LF only, instead of CRLF.

related-to-bug: 3084183

Change-Id: I6e512cb73cc8d5624a83f7154aa5699f7fef7534
tsp/AMPEG4AudioAssembler.cpp
tsp/AMPEG4AudioAssembler.h
tsp/ARTPSource.cpp
tsp/ARTSPConnection.cpp
tsp/ARTSPConnection.h
tsp/ASessionDescription.cpp
tsp/Android.mk
tsp/MyHandler.h
b0fb6bf746f1d611033c55a4a1ab5a4b0e212a95 11-Jan-2011 James Dong <jdong@google.com> Don't release the video recording frame after recording is stopped in CameraSourceTimeLapse.cpp

bug - 3334999

Change-Id: I1c83080713696221048da9b1a9f8c2ee48849ade
ameraSourceTimeLapse.cpp
7b8a803497450bb90b9c4f5ba3426bf984fad274 10-Jan-2011 James Dong <jdong@google.com> am 13d1cb56: Merge "Avoid deadlock in OMX::freeNode by making sure OMXCodecObserver does not hold the last reference of OMXCodec object - do not merge" into gingerbread

* commit '13d1cb56dfdfc89888de6a0389b0fe6cf7e36c27':
Avoid deadlock in OMX::freeNode by making sure OMXCodecObserver does not hold the last reference of OMXCodec object - do not merge
0ecfbd1cf37dbfb44d19c27351f5769309ac028d 10-Jan-2011 Andreas Huber <andih@google.com> Return a runtime error instead of asserting if the M4vH263Decoder fails in start()

Change-Id: Ie704a72685f749613fa0ed5fa6f461abc0406371
related-to-bug: 3328200
odecs/m4v_h263/dec/M4vH263Decoder.cpp
32ad210e4e4bcbdf912a01c9d2ff105cb3c5056f 10-Jan-2011 Andreas Huber <andih@google.com> Merge "NuPlayer now properly sends MEDIA_SET_VIDEOSIZE notifications." into honeycomb
31e2508c75018145a8238925ff1a08cbde4e799a 10-Jan-2011 Andreas Huber <andih@google.com> NuPlayer now properly sends MEDIA_SET_VIDEOSIZE notifications.

Change-Id: I99b4223ad6ecfd8839a3c0e737fef3165565d76d
related-to-bug: 3336496
Codec.cpp
oundation/AMessage.cpp
32c8335c6b6eb87a88e9193db1a5aab29175d043 10-Jan-2011 James Dong <jdong@google.com> Avoid deadlock in OMX::freeNode by making sure OMXCodecObserver does not hold the last reference of OMXCodec object - do not merge

cherry-picked from: I4c79b66a900c527e3ae6a833f76d5da1b75c5a89

bug - 3336424

Change-Id: I2d8ecb79a5422342988c195c012c9e6327ac457a
MXCodec.cpp
mx/OMX.cpp
14c858e80dfe2030c9f343dc0c6e2048e030731b 10-Jan-2011 James Dong <jdong@google.com> Avoid deadlock in OMX::freeNode by making sure OMXCodecObserver does not hold the last reference of OMXCodec object

bug - 3336424

Change-Id: I4c79b66a900c527e3ae6a833f76d5da1b75c5a89
MXCodec.cpp
mx/OMX.cpp
aee6c07b3572bf2510cd9e7d29c454fcfedde31d 06-Jan-2011 pmehendale <pmehendale@nvidia.com> Awesomeplayer : Frame dropping logic change

Changed late frame drop policy, now we are dropping only 1 in 8,
late (> 40ms) frames. Dropping every late frame result in lot of noticible
pauses, usually with peaky bitrate activity these pauses become more prominant.
Dropping few frames is still required to allow overall playback chain,
to regain the performance.
Experimentally decided to drop Max one late frame in 8.

Change-Id: If20848d619a76aaf8179b1e5c3155610e3bc85fd
wesomePlayer.cpp
nclude/AwesomePlayer.h
c29dd6f4ccd7ea7e41921d48d03d26e159aeaae4 07-Jan-2011 James Dong <jdong@google.com> Fix uninitialized rect structure for retrieving rect cropping information from decoder

o This patch is from NV.

bug - 3333254

Change-Id: I02bc26af464ea0bc9ad9f2e111474e8398c67220
MXCodec.cpp
11f8109ad8646d3acd9a0987613229cde59d52c1 06-Jan-2011 Marco Nelissen <marcone@google.com> Add support for the "compilation" tag in mp3, mp4 and ogg, and also add
support for two common ways of specifying album artist in ogg files.
b/3311831

(cherry-picked from GB because of weird automerger failure)

Change-Id: Ibf12a3d6bc8bbc2ac5ea815de6b33414b8f53f0f
P3Extractor.cpp
PEG4Extractor.cpp
ggExtractor.cpp
tagefrightMediaScanner.cpp
tagefrightMetadataRetriever.cpp
e28b1e565705ffb85b05c8e226e1ab5010cb3821 07-Jan-2011 Marco Nelissen <marcone@google.com> am ba77a3f9: Add support for the "compilation" tag in mp3, mp4 and ogg, and also add support for two common ways of specifying album artist in ogg files. b/3311831

* commit 'ba77a3f9cb1d68b2ed4813aaae856444578e3a75':
Add support for the "compilation" tag in mp3, mp4 and ogg, and also add support for two common ways of specifying album artist in ogg files. b/3311831
20ad3a341a96e7746015ccb7369fa567897e11f6 07-Jan-2011 Andreas Huber <andih@google.com> Fix typo.

Change-Id: I2d7796425ea746432964ce48959b6c227d31df11
ttplive/LiveSession.cpp
aea5aff45a1af14e249ac311f0a128a621a7d13e 07-Jan-2011 Andreas Huber <andih@google.com> If the stream for the new bandwidth doesn't have the segment we're looking for...

go back to the previous bandwidth' stream.

Change-Id: I3477cb6932102883509a7cbe9fb2b3bb02dac8c6
ttplive/LiveSession.cpp
288fb7e5bd7060cbe9b737500975754c9312e2db 06-Jan-2011 Marco Nelissen <marcone@google.com> Add support for the "compilation" tag in mp3, mp4 and ogg, and also add
support for two common ways of specifying album artist in ogg files.
b/3311831

Change-Id: Iba1152013b7577168af71f947d7249560419fa05
P3Extractor.cpp
PEG4Extractor.cpp
ggExtractor.cpp
tagefrightMediaScanner.cpp
tagefrightMetadataRetriever.cpp
4b197e1ffe46eb73ebdb80efc984bfde336b8e92 06-Jan-2011 Andreas Huber <andih@google.com> Use NuPlayer for HTTP live streaming playback by default.

Reversed the property logic, set media.httplive.disable-nuplayer to true to revert

Change-Id: I1057940667aaab56bb75c9ea15c2cdcab736f3c6
ttplive/LiveSession.cpp
b1787e3b95e96cc002377d41518cc183f64b58c4 06-Jan-2011 Andreas Huber <andih@google.com> Colorconverter may not support some src/dst bitmap configurations.

Let it return an appropriate error code instead of asserting.

Change-Id: I7fe0dfa169e1cbdecb04c5fcbe8501e73362d05e
related-to-bug: 3328212
tagefrightMetadataRetriever.cpp
olorconversion/ColorConverter.cpp
4d785ae6b940c62610612baf9d24f1ee607a2714 06-Jan-2011 Andreas Huber <andih@google.com> If we failed to initialize the codec after transitioning to IDLE state, don't assert

during shutdown.

Change-Id: I40ac44260fb136c15d6dcb9f5ad62211640c66ec
related-to-bug: 3328222
MXCodec.cpp
bade4951bd8b2c9148df9018c44903b9d48d1f7b 06-Jan-2011 Andreas Huber <andih@google.com> Merge "Some more fixes regarding HTTP live in NuPlayer."
22fc52f6f72f39e33c3970d0291de3569118aa5c 06-Jan-2011 Andreas Huber <andih@google.com> Some more fixes regarding HTTP live in NuPlayer.

Change-Id: I9e29615fa8ee6c7bd4189373a75c20caef3fd2b1
ttplive/LiveSession.cpp
peg2ts/ATSParser.cpp
peg2ts/AnotherPacketSource.cpp
peg2ts/AnotherPacketSource.h
149d3b0565c9b7e56af344d0e5c2f121236fa119 05-Jan-2011 Andreas Huber <andih@google.com> Merge "Seek/Duration support for completed http live streams in NuPlayer."
43c3e6ce02215ca99d506458f596cb1211639f29 05-Jan-2011 Andreas Huber <andih@google.com> Seek/Duration support for completed http live streams in NuPlayer.

Change-Id: I55bbe75d87140c07b1927d14ad24130fce803463
related-to-bug: 3321475
ttplive/LiveSession.cpp
nclude/LiveSession.h
peg2ts/ATSParser.cpp
peg2ts/ATSParser.h
28934a90e168291f6c77c56e8a05f272e5151bbd 05-Jan-2011 James Dong <jdong@google.com> Use video output if necessary for timelapse video recording

Change-Id: I88d0cc824f0fbf8b2f392fbc23c69b5bfefda1b8
ameraSourceTimeLapse.cpp
c2f95fba3ab2a4e512fd1152a12e64691f2ea73d 04-Jan-2011 James Dong <jdong@google.com> Merge "Remove captureFrame from MediaMetadataRetriever.java class It has been replaced by getFrameAtTime() method"
6e5cf568f4a5dee4be6ec991e1a96497303fb019 04-Jan-2011 James Dong <jdong@google.com> Remove captureFrame from MediaMetadataRetriever.java class
It has been replaced by getFrameAtTime() method

Change-Id: I9ed762e10e61dbc188e2a740e489a3e2ef9a6bb2
tagefrightMetadataRetriever.cpp
65a170e3ac593a29abd0c76e9aa531fabad7f56d 04-Jan-2011 Andreas Huber <andih@google.com> Make AwesomePlayer's reset process more verbose to track down ANRs.

Change-Id: I8c9fa872263796ba61b3e8de6bc05d50f57833f5
related-to-bug: 3302399
wesomePlayer.cpp
8afe66571ba14c7f923966d7270287e6f950ef38 29-Dec-2010 Ying Wang <wangying@google.com> Fix build.

Due to a bug (fixed by 59163bf2f15e28712be6598144ae0fdb94dac52b),
libstagefright_yuv.so was actually not prelinked.

Change-Id: Idbc9b968708d0fc31a087d2e4f24398072d915e2
uv/Android.mk
5bc087c573c70c84c6a39946457590b42d392a33 23-Dec-2010 Andreas Huber <andih@google.com> Squashed commit of the following:

commit eaeaa2672d4e0a82891493b2bde8bdd0c0e79a1b
Author: Andreas Huber <andih@google.com>
Date: Thu Dec 23 10:26:48 2010 -0800

Remove lowest bandwidth stream if using the legacy player.

Change-Id: I2f885e26344996de9152f8fda9fd6bdef89bf953

commit 7d652972615b2750fd8f1c21b9fab0e136df2b82
Author: Andreas Huber <andih@google.com>
Date: Thu Dec 23 10:14:36 2010 -0800

Don't clear the packet source's format for legacy discontinuities.

Change-Id: I9bd5a21b9bd28043ad38bd0658ccc8eda3c1079a

commit 2b18a45aac17cbfe1aa089d0f6510957d438dd64
Author: Andreas Huber <andih@google.com>
Date: Thu Dec 23 10:13:55 2010 -0800

Use NuPlayer for HTTP live streaming based on runtime property.

adb shell setprop media.httplive.enable-nuplayer true

Change-Id: I22738df3403985dc8e6992b1ab5da5747309f773

commit 50d899fb7b9ea52c3994b0a58e993998d926aeed
Author: Andreas Huber <andih@google.com>
Date: Wed Dec 22 16:25:22 2010 -0800

Make ACodec a lot less verbose.

Change-Id: I94c7e499b61032321ffaf999f5ad2c913cde6a48

commit b19e1740cb4d02990a56844654b5d019987c6405
Author: Andreas Huber <andih@google.com>
Date: Wed Dec 22 16:22:22 2010 -0800

Wait until we have fresh codec-specific-data before instantiating the decoders

after a discontinuity involving a format change.

Change-Id: I7bcf9b5ae3319f08bf8978a117e8ee5220902e37

commit 06428c006906c9099e430aface3b439ff1d36ecc
Author: Andreas Huber <andih@google.com>
Date: Wed Dec 22 15:20:38 2010 -0800

Disable random seeks in the streaming tool for now.

Change-Id: Ie86fde422dcfc4b2c7a01be51a193fda9c88cd71

commit e19db68f3bea8a61c191f60f6940f30e3a0d5f1b
Author: Andreas Huber <andih@google.com>
Date: Wed Dec 22 15:20:27 2010 -0800

Tweak HTTP live parameters.

Change-Id: If4b71e12485facc523a8a43d8213d0feb190daab

commit 1e9942791538c2256b579d96c6c04264b0d8b087
Author: Andreas Huber <andih@google.com>
Date: Wed Dec 22 14:48:23 2010 -0800

Enable http live streaming through NuPlayer for http URLs containing the string m3u8

Change-Id: I1691fe12ae8f1507fe3673313959cd50bc324624

commit 4c33f96a6e499ee0efe0e70b687094430cb7c1c0
Author: Andreas Huber <andih@google.com>
Date: Wed Dec 22 14:40:27 2010 -0800

Support for HTTP live streaming in NuPlayer.

Change-Id: Iacba1c3ebaeb8d3b972185deaf4cff18c8009c54

commit ddf705ce553708bc5b13d89a878484cf839bd674
Author: Andreas Huber <andih@google.com>
Date: Wed Dec 22 13:42:47 2010 -0800

StreamingSource now a subclass of abstract NuPlayer::Source

Change-Id: Ia6c7c639628910b9d1f37decc55da48b07a70de3

commit 9e04a8406b1882a8e3fdeb7b4d52db5ae70b970a
Author: Andreas Huber <andih@google.com>
Date: Wed Dec 22 13:33:52 2010 -0800

Refactor media data sourcing to NuPlayer::Source.

Change-Id: I1db9fb08c4e527bf7b19c29978cf342c2b0a0bc9

Change-Id: I9610a097481dda58f22142eacda3ac2dba0b63f9
Codec.cpp
vc_utils.cpp
ttplive/LiveDataSource.cpp
ttplive/LiveDataSource.h
ttplive/LiveSession.cpp
nclude/LiveSession.h
peg2ts/ATSParser.cpp
peg2ts/AnotherPacketSource.cpp
peg2ts/AnotherPacketSource.h
peg2ts/ESQueue.cpp
53df1a460bcfdd129ca2bc416dee2009e35c042e 22-Dec-2010 Andreas Huber <andih@google.com> Distinguish discontinuities w/ a format change from those without.

Shutdown decoders as needed in anticipation of a format change, otherwise just flush.

Change-Id: Ieb04f8aa8658569b091409c4903075fd496e5abb
peg2ts/ATSParser.cpp
peg2ts/AnotherPacketSource.cpp
peg2ts/AnotherPacketSource.h
df42f949c8bd05b81d94633767514fff88f52062 21-Dec-2010 Andreas Huber <andih@google.com> Better handling of forming absolute https URLs, runtime error on https:// access.

Change-Id: I7f6275520b0bd070e645024dd151a8541b8787b2
ttplive/LiveSession.cpp
ttplive/M3UParser.cpp
27a932a79b99fd2d869125e4c08b230fb6108860 21-Dec-2010 Andreas Huber <andih@google.com> Merge "Squashed commit of the following:"
3831a066bcf1019864a94d2bc7b4c9241efc5c22 21-Dec-2010 Andreas Huber <andih@google.com> Squashed commit of the following:

commit 63be8ceb8b2354fb997a277c0092abae015ecf10
Author: Andreas Huber <andih@google.com>
Date: Fri Dec 17 13:45:34 2010 -0800

Enable handling of discontinuities that involve potential format changes.

Change-Id: I21848a113db8764abb54bdcf302b0923253eaf4d

commit d18a7f80ec09af382026809263dcbbfa9e7a9ec8
Author: Andreas Huber <andih@google.com>
Date: Fri Dec 17 13:45:01 2010 -0800

Signal whether or not a format change occured as part of the discontinuity.

Change-Id: I06e64f542f4369549c9cebbb892dc612346ae43d

commit c400adbd5fdbd65cfef7aed9ec65bcaace4bb69b
Author: Andreas Huber <andih@google.com>
Date: Fri Dec 17 13:44:46 2010 -0800

A little more instrumentation of ACodec

Change-Id: I07f4aeccbbd15cdd9f80f48c3f92ee984ef6d92b

commit 1d802ee01f47b3cdc5b89502cec7fbb595e197a3
Author: Andreas Huber <andih@google.com>
Date: Fri Dec 17 13:43:58 2010 -0800

Only sync audio/video queues if both types of media are actually present.

Change-Id: Ic88edf9bb1ebd4034c08747cce9877a4e28e0d35

commit e402da39d9a4d8b75653a78f728e20a3ef0fb497
Author: Andreas Huber <andih@google.com>
Date: Fri Dec 17 13:42:24 2010 -0800

Disable the random seek for now.

Change-Id: Iddd597b546e2f229e88214f9bdd6452bb188105e

Change-Id: I27c4d9ba916080be94ce6117dbb095e9022ed62b
Codec.cpp
ttplive/LiveSession.cpp
peg2ts/ATSParser.cpp
41152efd144ccf70c380d5c9a32105c02a039f43 21-Dec-2010 James Dong <jdong@google.com> Add more debugging code to track down hang during video recording

bug - 3276561

Change-Id: I1e02590b23031f29bcbfc4a1064f039ed80cb862
ameraSource.cpp
MXCodec.cpp
a4d153424bf33646a86a7e968064dabb8e073c52 20-Dec-2010 Jamie Gennis <jgennis@google.com> Merge "Change a Stagefright assert to an error check."
60693ddde0e435def1617848f545c78cec452766 18-Dec-2010 Jamie Gennis <jgennis@google.com> Change a Stagefright assert to an error check.

During OMX codec initialization it is possible that buffer allocation
fails. This changes Stagefright to set an error state and abort
initialization rather than crashing with an assert failure when that
happens.

Change-Id: I2fc2fadfe75657cdbf649cc8cafd2e4c251a5f8b
Bug: 3282700
MXCodec.cpp
6e6b1cae2bac1b78205cefab8e4e9e9538982965 16-Dec-2010 Andreas Huber <andih@google.com> Instead of asserting, gracefully abort and signal and error.

Change-Id: I170a602ed80e6c85a94e46deadfc02aaf92bfebb
ttplive/LiveSession.cpp
5a7f242cfc0bd3b5208c21c27c0f5f348e98a0dc 16-Dec-2010 Andreas Huber <andih@google.com> Merge "The HTTP/1.1 Host request header must include port if it's not the default (80)."
ac13b81c590386b3a42e381b31d7614ca53b79c5 16-Dec-2010 Andreas Huber <andih@google.com> The HTTP/1.1 Host request header must include port if it's not the default (80).

Change-Id: Idcc1429fbeecef99dad435208c9a1bd481132e2b
uHTTPDataSource.cpp
ttplive/M3UParser.cpp
f4a0e014f53c131dbb9ae86921b8064993c09e61 16-Dec-2010 Andreas Huber <andih@google.com> Merge "Remove now obsolete implementation of streaming from AwesomePlayer."
d0c5158d5244418880bb85122e9fd0e378892c2a 16-Dec-2010 Andreas Huber <andih@google.com> Merge "Properly announce decoder output format changes, make sure AMessage::dup does."
85704836f33a199d7e442a23db82abbd5620d35d 16-Dec-2010 Andreas Huber <andih@google.com> Remove now obsolete implementation of streaming from AwesomePlayer.

Change-Id: If62bedbf74c8e987d6651604d7bebc9da381e86a
wesomePlayer.cpp
2c2814b900a61fa07ddfff860b143fbbe9c740e9 16-Dec-2010 Andreas Huber <andih@google.com> Properly announce decoder output format changes, make sure AMessage::dup does.

Change-Id: Ia77f6b6d5e5c5055583740dfe876b8a3c22be9b6
oundation/AMessage.cpp
a6256238d9015c42129fe43791968768fe501efa 16-Dec-2010 James Dong <jdong@google.com> Give the standard not compliant video sample a chance if its size in the mp4 header is invalid

Change-Id: Ib573ededb9c73285822fa238120faa484402bcf7
PEG4Extractor.cpp
e071b055cee301d71335519601474c62b10af411 16-Dec-2010 James Dong <jdong@google.com> Opted to recognize "h263" or "H263" boxes in an mp4 file

bug - 3278240

Change-Id: Ifd1b1f3e5dd55dbf2c33bbad9dd51998c25bfc15
PEG4Extractor.cpp
c08bb264768f773cd6d10b8736ccfc4745645135 16-Dec-2010 Andreas Huber <andih@google.com> Merge "Properly order the data written out to the transport stream by timestamp."
f933441648ef6a71dee783d733aac17b9508b452 16-Dec-2010 Andreas Huber <andih@google.com> Initial support for a true streaming player for mpeg2 transport streams.

Change-Id: I153eec439d260a5524b21270e16d36940ec3161a
Codec.cpp
ndroid.mk
oundation/AHierarchicalStateMachine.cpp
oundation/Android.mk
peg2ts/ATSParser.cpp
peg2ts/ATSParser.h
peg2ts/AnotherPacketSource.cpp
peg2ts/AnotherPacketSource.h
peg2ts/ESQueue.cpp
peg2ts/ESQueue.h
peg2ts/MPEG2TSExtractor.cpp
3a1775247e26f274ef249442ef038ddf7217b68c 11-Dec-2010 Andreas Huber <andih@google.com> Properly order the data written out to the transport stream by timestamp.

This ensures data locality across tracks.

Change-Id: I823b9407e3603473422177ec02dff4860ffc5b4f
PEG2TSWriter.cpp
a093f92042cf65060d1474c0fe116c12f8981717 15-Dec-2010 Andreas Huber <andih@google.com> Proper recovery of timestamp information in the transport stream parser.

Change-Id: I647c73688c95529f54f0bb6af17d109dfe2bb11d
odecs/aacdec/AACDecoder.cpp
peg2ts/ESQueue.cpp
peg2ts/ESQueue.h
00502849dcc54086ad9fabbd90ef3d0e41ae78f5 15-Dec-2010 Andreas Huber <andih@google.com> Merge "Emit better (correct) timestamps that respect AAC upsampling."
41dabbcd9ab62d7ecea1570cc76c39ac485de2ce 15-Dec-2010 Andreas Huber <andih@google.com> Emit better (correct) timestamps that respect AAC upsampling.

Change-Id: I6587416c9caa0e263aa8ec6c6d89a42e28f6ff19
odecs/aacdec/AACDecoder.cpp
d27f1e6959cdcdadfa471b9824686d784ca55def 14-Dec-2010 James Dong <jdong@google.com> Merge "Fix an issue where a fixed number of bits per sample is used for seek position calculation."
123e95a584556a64a2e0f9e242f48b9a080750a5 14-Dec-2010 Andreas Huber <andih@google.com> Merge "Properly signal the condition if we run out of input data."
763b772bb6bca6a4aaef85cec840fd7061630d61 14-Dec-2010 Andreas Huber <andih@google.com> Properly signal the condition if we run out of input data.

Change-Id: I7a5ada8c25c1d32ca603b3b2c75e1808e140c367
MXCodec.cpp
428d96d5f882d01acb0abb7e1ceb51d4ccc48efa 14-Dec-2010 Andreas Huber <andih@google.com> Support malformed ID3 V2.4 tags written by early versions of iTunes.

Change-Id: I90c2a9bbf216e2ae9a37accdaa2214233f5e54ea
related-to-bug: 3275576
d3/ID3.cpp
nclude/ID3.h
36fb2077764093a0a19ed65770078b9987bd82b1 14-Dec-2010 James Dong <jdong@google.com> Fix an issue where a fixed number of bits per sample is used for seek position calculation.

The patch was from NV.

bug - 3278233

Change-Id: I9bc22b6b0ee6bfa5d4617a8c497f67eb577efca4
AVExtractor.cpp
985f838934510983d8a887461e98dca60a6e858f 07-Dec-2010 James Dong <jdong@google.com> Yield the omx threads so that file writer threads have a chance to retrieve the output buffers once they become ready

bug - 3252228

Change-Id: Iab7cf1c9a87cce7b814c63b42b21fcd6a7314b36
PEG4Writer.cpp
MXCodec.cpp
79e23b41fad961008bfde6e26b3c6f86878ca69d 11-Dec-2010 James Dong <jdong@google.com> Revert "Allows the authoring engine to skip frame."

o Skipping frames could lead to a lot of issues such as I frames is lost etc.
It is not being used anyway.

This reverts commit 53d4e0d58e2d5c18f6e026c705af833b9bdd7aba.

Conflicts:

media/libstagefright/AudioSource.cpp
media/libstagefright/CameraSource.cpp

Change-Id: I3abba1647de48db25bdc369066eb2a7ae4dedec2
udioSource.cpp
ameraSource.cpp
ediaSource.cpp
MXCodec.cpp
abdd2ba259a5dc863a821c9d1187d83f2e2395ac 10-Dec-2010 James Dong <jdong@google.com> Fixed a failure from timelapse video recording because of accidental use of metadata buffers

bug - 3274317

Change-Id: I2c0e9fcd30c9141ce5a85e9d72cbd0baf561458b
ameraSource.cpp
d69c7f654cc772b03717999c1b24402d5c40e69f 09-Dec-2010 James Dong <jdong@google.com> Release a recording frame only if mCamera exists and is not cleared.
and also call mCamera->stopRecording() only after CameraSource releases all the
outstanding video frames sent from CameraSource to its clients (such as video encoder).

Change-Id: I7eeed4e2f388e77c28668d52c24b5330d3d9ebde
ameraSource.cpp
b41ad26dba96d70f53fff46d10eb589c2b3eb6f8 10-Dec-2010 James Dong <jdong@google.com> Merge "First step towards renabling Timelapse video recording"
ba29002c7aee13c068049037cd14bba6a244da6b 10-Dec-2010 James Dong <jdong@google.com> First step towards renabling Timelapse video recording

Change-Id: I93836b066fb69d5152d3774546a9935057a1f12f
ameraSource.cpp
ameraSourceTimeLapse.cpp
424c6cbfa75da5f4f889ab6517dfee4dd024ba2d 11-Nov-2010 James Wylder <james.wylder@motorola.com> libstagefright: Compile MP3 & AAC decoders in 32bit ARM Mode

Speeds up the decoding leaving more time for cpuidle (lp2),
thus lowering overall current drain.

Change-Id: Ia4e0636b1813810072fe0a4f94f6921adf2eab31
Signed-off-by: James Wylder <james.wylder@motorola.com>
odecs/aacdec/Android.mk
odecs/mp3dec/Android.mk
7d44e4da3bc3d56c6a9aed1f27f51cfd5b54108f 09-Dec-2010 James Dong <jdong@google.com> am 1f5b133a: Merge "When INFO_FORMAT_CHANGED event comes in before the renderer was initialized, go back to read from source again" into gingerbread

* commit '1f5b133ae29090f1807be392874f6b7a5d92c6d4':
When INFO_FORMAT_CHANGED event comes in before the renderer was initialized, go back to read from source again
e8079d0f6afcb138a0e5882ccbaf93647ea77c5b 09-Dec-2010 James Dong <jdong@google.com> When INFO_FORMAT_CHANGED event comes in before the renderer was initialized, go back to read from source again

bug - 3264094

Change-Id: I291a9b09b335d0eb4acf91f992e59fc44bc57d01
wesomePlayer.cpp
cb0cb25002f1b5fe0d02c997bac487b5b6c5c682 08-Dec-2010 Andreas Huber <andih@google.com> Fix thumbnail extraction for extractors that don't have a preference.

Change-Id: Id305a44416b08a667aae86c2109aa4dff9f17342
tagefrightMetadataRetriever.cpp
92bf2f96c53d24adc1ace362439e82ca2cf6b856 07-Dec-2010 Andreas Huber <andih@google.com> Better buffer status management and verification in OMXCodec.

Change-Id: I90410f2ac0d8ff86076a239dc6e281b1bc4d8643
MXCodec.cpp
97f2c9d530c9663deeb840f332dee205a7a11cdd 07-Dec-2010 Andreas Huber <andih@google.com> Merge "API Support for both synchronous and queued commands, optionally associated metadata."
a3748084e110b2d7c689a3b38b274e6a95756c5d 06-Dec-2010 James Dong <jdong@google.com> Merge "Remove check if the target video resolution is not supported by CameraSource and clean up Camera is CameraSource could not created."
14acc736e336cbd6026df781d4f411e908831815 06-Dec-2010 Andreas Huber <andih@google.com> API Support for both synchronous and queued commands, optionally associated metadata.

Change-Id: Idb90d64cb638942210c5822b3cba2f05b087d601
wesomePlayer.cpp
oundation/AMessage.cpp
oundation/Android.mk
a44153c1a57202fb538659eb50706e60454d6273 04-Dec-2010 Andreas Huber <andih@google.com> Squashed commit of the following:

commit 9254c845d7c82976fd4b8be406ce4b17eeb0e119
Author: Andreas Huber <andih@google.com>
Date: Fri Dec 3 15:26:12 2010 -0800

Remove obsolete code from the cached data source.

Change-Id: I794b986ac8977cbc834dff189221a636ba564e36

commit 2ee33711064c58c53ba65ed9e63dd4b01ec2380e
Author: Andreas Huber <andih@google.com>
Date: Fri Dec 3 15:23:13 2010 -0800

LiveSource is dead, long live LiveSession.

Change-Id: Ibcd0731ecf9c94f0b3e5db3d53d012d9da2a1c66

commit 9eabb2c3cd8571ab859bdeae0aa7f655c414d8fa
Author: Andreas Huber <andih@google.com>
Date: Fri Dec 3 12:49:31 2010 -0800

Respect explicitly signalled discontinuities.

Change-Id: I3c0c16a2de7a99742d25db7d1b2ff0258de52271

commit 7f7f7b6b906b6ece6e4d43af7fd5f494e805c5e5
Author: Andreas Huber <andih@google.com>
Date: Fri Dec 3 11:45:57 2010 -0800

Better protection against syncword emulation in AAC ADTS content.

Change-Id: I867e80a4556dd46d24ab3e781177c248a5221719

commit fe765766582efcc350aed01135ea603576adccf6
Author: Andreas Huber <andih@google.com>
Date: Fri Dec 3 09:15:59 2010 -0800

New implementation of http live driving code.

Change-Id: I31ddf3d6a0d5929b121be704a2b9c3d6775f7737

Change-Id: Id8d1829c8fcb173756965013f848c1d426ef1048
wesomePlayer.cpp
uCachedSource2.cpp
uHTTPDataSource.cpp
ttplive/Android.mk
ttplive/LiveDataSource.cpp
ttplive/LiveDataSource.h
ttplive/LiveSession.cpp
ttplive/LiveSource.cpp
nclude/AwesomePlayer.h
nclude/LiveSession.h
nclude/LiveSource.h
nclude/MPEG2TSExtractor.h
nclude/NuCachedSource2.h
peg2ts/ESQueue.cpp
peg2ts/MPEG2TSExtractor.cpp
ea7b485595f8cec6a66668b5c54c8f297d843f77 05-Dec-2010 James Dong <jdong@google.com> Remove check if the target video resolution is not supported by CameraSource
and clean up Camera is CameraSource could not created.

bug - 3254411

Change-Id: I43497c450e7007de5ce027e2912b1421119e8887
ameraSource.cpp
16afe2fb439cab6125bb46a07a8078d4ce1c1ea5 03-Dec-2010 James Dong <jdong@google.com> Prepare for publishing MediaMetadataRetriever as public API

step one:
o replaced captureFrame with getFrameAtTime
o removed getMode

bug - 2433195

Change-Id: I38a8cecef29014692f0b08b8818326e3ebb40a12
tagefrightMetadataRetriever.cpp
nclude/StagefrightMetadataRetriever.h
1cc73922339a110d7ffc47e8842f958492dd85bf 02-Dec-2010 James Dong <jdong@google.com> If camera source uses the metadata, we must use HW encoder
Software video encoders are not able to deal with non-YUV metadata in the video buffer sent from camera

bug - 3242213

Change-Id: I97361ed88b2a687190e5129459011afff7f32c2d
odecs/avc/enc/AVCEncoder.cpp
odecs/m4v_h263/enc/M4vH263Encoder.cpp
3bac12183aa69cc83e1d19b49d4b06a75318d694 02-Dec-2010 Andreas Huber <andih@google.com> Merge "Squashed commit of the following:"
decd96988e495133e4a1728f612d4c9fdb4d218e 02-Dec-2010 Andreas Huber <andih@google.com> Squashed commit of the following:

commit de99ae4a523ff5ec40b47071f22fdde1a4b2a0bf
Author: Andreas Huber <andih@google.com>
Date: Thu Dec 2 13:18:40 2010 -0800

Scan for sync words to find H.264 frame/AAC frame boundaries if PES packets do not start with them.

Change-Id: If2861982ecb3006fac806105dbfcd1d43c2a4205

commit be23791ff0d037aa7073589cdc8bfc362e1c281d
Author: Andreas Huber <andih@google.com>
Date: Thu Dec 2 13:12:39 2010 -0800

Properly expand relative key URLs and strip surrounding quotes in the M3UParser.

Change-Id: I013a6d83a64f095d090e5c7730298bdac7d03ab4

commit 0f1d8f65effe0cc42a265dd91d8b91dce6534325
Author: Andreas Huber <andih@google.com>
Date: Thu Dec 2 13:11:27 2010 -0800

Ugly hack that assumes that any http url containing "m3u8" refers to an httplive stream.

Change-Id: I05d7bbc5dab0f9822558122b5b9dc2a109ed8518

commit 255f0d5cdb1072ecd66b47ee614bf574f1388e5a
Author: Andreas Huber <andih@google.com>
Date: Thu Dec 2 13:10:56 2010 -0800

Add one more mimetype "application/x-mpegurl" to identify httplive playlists.

Change-Id: I63fd3b8c2539c9ee23c077df533157af78b10863

Change-Id: I135687383009dbe32d690c9ba8dea60159adc616
wesomePlayer.cpp
ttplive/LiveSource.cpp
ttplive/M3UParser.cpp
nclude/M3UParser.h
peg2ts/ATSParser.cpp
peg2ts/ESQueue.cpp
f6882a9c8144dc0fd07f3434bb870e5251f51275 02-Dec-2010 James Dong <jdong@google.com> am 80639875: am d4c5478a: Merge "Be conservative in estimating the file size limit." into gingerbread

* commit '806398755fdc63438b607856574e5b885ad98e6b':
Be conservative in estimating the file size limit.
5c2ccf1a4ff8465c076689b6c2d74f2cd4498df2 02-Dec-2010 James Dong <jdong@google.com> am d4c5478a: Merge "Be conservative in estimating the file size limit." into gingerbread

* commit 'd4c5478a8664f64ff66db9ae25250afac78b7a74':
Be conservative in estimating the file size limit.
acd234bba9f048971d66890009eeff9a8db94be3 01-Dec-2010 James Dong <jdong@google.com> Be conservative in estimating the file size limit.

bug - 3045580

Change-Id: Ifdffa354b9433639c3f246a0eb581ef14af1e797
PEG4Writer.cpp
899ed7543ad9bb82f9d31f8b03ab2215c8c9cd2c 30-Nov-2010 Andreas Huber <andih@google.com> am 30c81844: Merge "DO NOT MERGE Support for "chunked" HTTP transfer encoding." into gingerbread

* commit '30c818444d876dd868b84adec2416308c90f32e3':
DO NOT MERGE Support for "chunked" HTTP transfer encoding.
03b55cc9d3529995925c8df0d4a35269e591188c 30-Nov-2010 Andreas Huber <andih@google.com> Merge "DO NOT MERGE Support for "chunked" HTTP transfer encoding." into gingerbread
8e37a5c7b8c9be46e3068d43e6caf7e81036a363 30-Nov-2010 Andreas Huber <andih@google.com> am a41c1e1d: Merge "DO NOT MERGE Upgrade to the latest version of libwebm to fix YouTube webm playback." into gingerbread

* commit 'a41c1e1de0d5fac57842ffe73e0a4f575fcc73fb':
DO NOT MERGE Upgrade to the latest version of libwebm to fix YouTube webm playback.
8cb5a643fe566acb720aab0bde6fead6e75ef8bc 30-Nov-2010 Andreas Huber <andih@google.com> Merge "DO NOT MERGE Upgrade to the latest version of libwebm to fix YouTube webm playback." into gingerbread
8ba606c3b8a807058c92d95dcd7bcfdbc28147ae 28-Oct-2010 Andreas Huber <andih@google.com> DO NOT MERGE Upgrade to the latest version of libwebm to fix YouTube webm playback.

DO NOT MERGE
related-to-bug: 3141937

Change-Id: Iaf1b0c5d45a6b5bb7624a59747041c27b4dde83b
atroska/MatroskaExtractor.cpp
atroska/mkvparser.cpp
atroska/mkvparser.hpp
462b1d71866fd53564e15db699eff47ad99915d1 18-Nov-2010 Andreas Huber <andih@google.com> DO NOT MERGE Support for "chunked" HTTP transfer encoding.

DO NOT MERGE

Change-Id: I253d48ea69f239a6d3d0bb7e0d31eef5c773a9d6
related-to-bug: 3205131
uHTTPDataSource.cpp
ttplive/LiveSource.cpp
nclude/HTTPStream.h
nclude/NuHTTPDataSource.h
acd441dd1f44a5c6c3702dbafe3f82d52dd83d67 30-Nov-2010 Andreas Huber <andih@google.com> am 567b2bd1: Merge "After seeking display the first new video frame right away without concern for A/V sync. This looks much more responsive to the user." into gingerbread

* commit '567b2bd1469b1c37e6249637d313253b7d84971e':
After seeking display the first new video frame right away without concern for A/V sync. This looks much more responsive to the user.
2d6dbfb5e3f16d800d2e0b5da283001e53e72768 30-Nov-2010 Andreas Huber <andih@google.com> am b690e55d: Merge "DO NOT MERGE - Instead of asserting that ISurface successfully registered buffers, report an error and propagate it up to the java client." into gingerbread

* commit 'b690e55d3f713d68c6ed9654a05a5370bda731d5':
DO NOT MERGE - Instead of asserting that ISurface successfully registered buffers, report an error and propagate it up to the java client.
09b3581ef7ddba70c5d89d252de3a15d512aa49b 30-Oct-2010 Andreas Huber <andih@google.com> After seeking display the first new video frame right away without concern for A/V sync. This looks much more responsive to the user.

Change-Id: Ifb1f8c91e95a5cafe30ae1035973316c210b98a5
related-to-bug: 3152363
wesomePlayer.cpp
4d0565de200e61f457e4d97fcfbc4c9ccd81bdad 12-Nov-2010 Andreas Huber <andih@google.com> DO NOT MERGE - Instead of asserting that ISurface successfully registered buffers, report an error and propagate it up to the java client.

Change-Id: Ibb14e5aff20920da4917d85de38ba3a8ee71d0bd
related-to-bug: 3188835
wesomePlayer.cpp
olorconversion/SoftwareRenderer.cpp
nclude/AwesomePlayer.h
nclude/SoftwareRenderer.h
mx/OMX.cpp
91a822eb44e7d70f92954304c5d574bb7350bcfd 24-Nov-2010 Andreas Huber <andih@google.com> Merge "Support streaming data across binder boundaries."
e2b1028852120bcfded33b8f06f66b780437fe92 23-Nov-2010 Andreas Huber <andih@google.com> Support streaming data across binder boundaries.

Change-Id: Ifbac61406dcb81343765f99ccba08bd90f9274cc
wesomePlayer.cpp
nclude/AwesomePlayer.h
495f154b602a0103b24b98226370349100a26adf 23-Nov-2010 James Dong <jdong@google.com> Do not getConfig on video encoder on output port

Change-Id: Id53e01dd8f3ec0c9ca94bb1d6dfccd7696254a2d
MXCodec.cpp
31d7235c79667f88002d9ad87207099ed438a197 23-Nov-2010 Gloria Wang <gwang@google.com> am 3e18dfab: am 4da48ec8: Merge "Notify the playback status to DRM agents before the playback starts"

* commit '3e18dfab3417e139c7ec3896cea9e303fdc8fa63':
Notify the playback status to DRM agents before the playback starts
e81e8153c85fa0b0aebae686f6ba51ed2c3a2d11 23-Nov-2010 Gloria Wang <gwang@google.com> am 4da48ec8: Merge "Notify the playback status to DRM agents before the playback starts"

* commit '4da48ec88338af2df6f9abba850fb4c65918bb82':
Notify the playback status to DRM agents before the playback starts
321b630783709eeb18952c3408303489db4ea9eb 23-Nov-2010 Andreas Huber <andih@google.com> Merge "Squashed commit of the following:"
f5ab57c2d5e02af7483c94eddb177e4f5c9e9892 22-Nov-2010 Andreas Huber <andih@google.com> Squashed commit of the following:

commit 0870f7bdd10a7cd36087d723d1957d8e1b967ca7
Author: Andreas Huber <andih@google.com>
Date: Mon Nov 22 12:57:04 2010 -0800

set_surface_crop doesn't seem to work right yet, stop using it in the SoftwareRenderer.

Change-Id: If0a24f78b7810a6cecaa82eb4f23d0f90c22cc42

commit 4767b52bee3a54ae117a8708d6832276a44e6a6a
Author: Andreas Huber <andih@google.com>
Date: Mon Nov 22 11:14:57 2010 -0800

info->mMediaBuffer may still be NULL at this point...

Change-Id: I25a71569015b1bb87f1ea7efff7588958774426f

commit 0cef79874e1f1ddb10b7402177a87d3cffc7de92
Author: Andreas Huber <andih@google.com>
Date: Mon Nov 22 10:55:12 2010 -0800

QCOM's YVU420 color format conversion has now been tested.

Change-Id: I7fef4b642a928af15d42f006f7cdc107d5ff1d67

commit 84fe05a6c969ede0ce8a85a530e110afca07c7a7
Author: Andreas Huber <andih@google.com>
Date: Mon Nov 22 09:59:50 2010 -0800

Removed remaining traces of suspend/resume. Proper reporting of video dimensions based on cropping rectangle.

Change-Id: Ib238b80cbc1f19e7d312f2422eb5e9ab6b06b1bc

commit 50970cdc837c5c498bcf0cb61b436196ca9e2ef7
Author: Andreas Huber <andih@google.com>
Date: Fri Nov 19 16:11:06 2010 -0800

Revamped Software Renderer respects the crop rectangle.

Removed obsolete ADRENO support code.

Change-Id: I984cbc8a99c4d97e09e7d1b1292099c88b9ae535

commit 8abbc6a5608bff650f968540f24a2eab75f254ed
Author: Andreas Huber <andih@google.com>
Date: Fri Nov 19 16:10:41 2010 -0800

The metadata retriever now respects the crop rectangle while capturing a video frame.

Change-Id: Id3377176060086d16717f62c77ce26fabe899050

commit 2d42e4466609d304e88bd2cdd6eb7b297340cc21
Author: Andreas Huber <andih@google.com>
Date: Fri Nov 19 16:09:50 2010 -0800

Changed ColorConverter APIs to be more general.

Clients can now refer to crop rectangles in both source and destination.

Change-Id: Ief151d736818396d0389ec04e7df5650e3ad7c04

commit 273184303d54a54febd3e9c3dd4df30507ea78b5
Author: Andreas Huber <andih@google.com>
Date: Fri Nov 19 15:04:06 2010 -0800

The stagefright commandline tool now writes the extracted video frame to /sdcard/out.jpg

Change-Id: Ieb2ab3fda7a7cd9294beccb8db0eed75096eeef4

commit 2d43390328cadf4ba94c1c3c02e4fb30baa29690
Author: Andreas Huber <andih@google.com>
Date: Fri Nov 19 14:36:55 2010 -0800

The AVC software decoder now properly advertises the cropping rectangle.

Change-Id: Idb7a8a7e2fde5740f0fc34b7e8c92eca2577104b

commit 9a7ed23c2fac8ce19dce7a34a603acee945a89f6
Author: Andreas Huber <andih@google.com>
Date: Fri Nov 19 13:40:39 2010 -0800

OMXCodec now signals a format change if the cropping rectangle changes.

...and puts the cropping info into its output format.

Change-Id: I3ffbd8e877ba286fe06a82c536ef20d92548d2e2

commit efe0323947029df1c502599ccc288c8d676dfd31
Author: Andreas Huber <andih@google.com>
Date: Fri Nov 19 11:29:39 2010 -0800

Stagefright's MetaData object now supports rectangle items.

Change-Id: I5667bb5ee6622c76104b99fb57f60abb802a8504

Change-Id: I27cb78f2c5e0353f95fdfc5cb53991949ed75b70
ndroid.mk
wesomePlayer.cpp
etaData.cpp
MXCodec.cpp
tagefrightMetadataRetriever.cpp
odecs/avc/dec/AVCDecoder.cpp
olorconversion/Android.mk
olorconversion/ColorConverter.cpp
olorconversion/SoftwareRenderer.cpp
nclude/AwesomePlayer.h
nclude/SoftwareRenderer.h
mx/Android.mk
c130b5bf563d049bd391ccd96985ac278ef8ff8d 05-Nov-2010 Gloria Wang <gwang@google.com> Notify the playback status to DRM agents before the playback starts

Change-Id: I288eae2d35ab175c720bb0dd9f69e3e08ada9b8a
wesomePlayer.cpp
f53263a7d580fb550dbc6c8d4f104119beb82ad7 20-Nov-2010 James Dong <jdong@google.com> Fixed an issue in SampleTable where the table index was incorrectly wrapped around to -1

bug - 3198642

Change-Id: Ia0544172502fc771f48fce22d5c1db19ac3554bb
ampleTable.cpp
8577676b0f9247f994ca00bc59fdbcd1318e32b6 20-Nov-2010 Jean-Baptiste Queru <jbq@google.com> am 716f60ce: resolved conflicts for merge of e2ec61b2 to gingerbread-plus-aosp

* commit '716f60ce605131429dc9efe8f351f0da0c8cc8c2':
StagefrightMediaScanner: Call endFile() for MIDI and OGG files.
5b12af0ea4b98ad60bc066bceb8504d16fcca41d 20-Nov-2010 James Dong <jdong@google.com> Merge "Removed uncessary FILE structure pointer for I/O"
97c9a2ec2a67969de0c5fcbcc03e9ffc8f50e807 20-Nov-2010 Jean-Baptiste Queru <jbq@google.com> resolved conflicts for merge of e2ec61b2 to gingerbread-plus-aosp

Change-Id: I81930c62e2f78b129995cffb8b1bf3332879c7cf
674ebd0b4e1143e38392a4e3bb38b4679a4577bc 19-Nov-2010 James Dong <jdong@google.com> Removed uncessary FILE structure pointer for I/O

o also move the fd owner from caller to callee in the Writers

Change-Id: I510ccfdd0fcc58f1777fea4ed1349fd251852c65
MRWriter.cpp
ileSource.cpp
PEG2TSWriter.cpp
PEG4Writer.cpp
tsp/ARTPWriter.cpp
60d88f898219b08603548a953749e417e399df62 19-Nov-2010 Andreas Huber <andih@google.com> Merge "Fix an artifact of going from off_t to off64_t"
a9a25c3113b0c744f7d4e69c55fcd7a661ae4cfd 19-Nov-2010 Jean-Baptiste Queru <jbq@google.com> am 14ac9546: Merge "build failed with g++ v. 4.4.5 err msg: frameworks/base/media/libstagefright/MediaExtractor.cpp:62: error: invalid conversion from ‘const char*’ to ‘char*’ strrchr provides two prototypes. the one used returns const char* instead of char*"

* commit '14ac9546367d4df37eead55f6762b944b49f33b2':
build failed with g++ v. 4.4.5 err msg: frameworks/base/media/libstagefright/MediaExtractor.cpp:62: error: invalid conversion from ‘const char*’ to ‘char*’ strrchr provides two prototypes. the one used returns const char* instead of char*
7fe4ed1207fa587c65231f9a32374ae4b618d6c0 19-Nov-2010 Andreas Huber <andih@google.com> Fix an artifact of going from off_t to off64_t

Change-Id: I999fb60a290f9b2db5b73bf926392c8f4e1b7829
uCachedSource2.cpp
87995623c1865721daeb0da9efffca42e940c854 19-Nov-2010 Andreas Huber <andih@google.com> Squashed commit of the following:

commit 610ed879d57785cb0457f7f127889496d325f732
Author: Andreas Huber <andih@google.com>
Date: Fri Nov 19 09:28:52 2010 -0800

HTTP header keys are to be treated case insensitive.

Change-Id: I9690880528a6b0f611958de7996c2753948a03c3

commit 554a2499a293d8d53907d01d972a9cfe9b92738e
Author: Andreas Huber <andih@google.com>
Date: Fri Nov 19 09:22:45 2010 -0800

Remove one more legacy "string" implementation.

Change-Id: I7638d849427a39bbc040082a8663b3b9b81a632b

Change-Id: I626a60abdcd1dd6403be880dad4d0499d77ca71f
ndroid.mk
TTPStream.cpp
uHTTPDataSource.cpp
houtcastSource.cpp
nclude/HTTPStream.h
nclude/stagefright_string.h
tring.cpp
6ed70d2d41f9929d1c3f5179d947766495f9efe5 06-Nov-2010 Hiroshi Takekawa <sian@big.or.jp> StagefrightMediaScanner: Call endFile() for MIDI and OGG files.

addStringTag() caches non-ascii metadata strings for later
processing, and then endFile() will be called at the end of
processFile() to convert non-ascii strings from locale's charset
to utf-8 if required.

Stagefright's processFile() failed to call endFile() when the
processing file is a MIDI file or an OGG file. This patch fixes
this problem to populate metadata correctly.

Reviewed by: Brad Fitzpatrick, Marco Nelissen.

Change-Id: I072e79d81dce1fec63297d2b5d2b870a72e5b66e
tagefrightMediaScanner.cpp
317ca79a49746dbd1b6bb83712e93e2dc5f6e4f0 19-Nov-2010 James Dong <jdong@google.com> Merge "64-bit file size/offset support for media framework"
c726bd8b7b9929fd917b01e5551a66ad5fe2c04e 18-Nov-2010 Jamie Gennis <jgennis@google.com> Set the external display usage bit in Stagefright.

Change-Id: Ie18fa773fdb83508d96300dd7e4e4c7c3cdc4540
MXCodec.cpp
olorconversion/SoftwareRenderer.cpp
c7fc37a3dab9bd1f96713649f351b5990e6316ff 16-Nov-2010 James Dong <jdong@google.com> 64-bit file size/offset support for media framework

Change-Id: I3452bc2c0f1d990cc67285df2fce1f9f86ff8e10
MRExtractor.cpp
MRWriter.cpp
wesomePlayer.cpp
ataSource.cpp
ileSource.cpp
PEGSource.cpp
P3Extractor.cpp
PEG4Extractor.cpp
PEG4Writer.cpp
uCachedSource2.cpp
uHTTPDataSource.cpp
ggExtractor.cpp
ampleIterator.cpp
ampleTable.cpp
tagefrightMediaScanner.cpp
hrottledSource.cpp
BRISeeker.cpp
AVExtractor.cpp
INGSeeker.cpp
ttplive/LiveSource.cpp
d3/ID3.cpp
nclude/LiveSource.h
nclude/MP3Extractor.h
nclude/MP3Seeker.h
nclude/MPEG2TSExtractor.h
nclude/MPEG4Extractor.h
nclude/NuCachedSource2.h
nclude/NuHTTPDataSource.h
nclude/SampleIterator.h
nclude/SampleTable.h
nclude/ThrottledSource.h
nclude/VBRISeeker.h
nclude/WAVExtractor.h
nclude/XINGSeeker.h
atroska/MatroskaExtractor.cpp
07e946ce4908eea5eebb30ea89f088fc7c679b5a 18-Nov-2010 Andreas Huber <andih@google.com> Log H.264 profile/level in OMXCodec

Change-Id: I5bf98e1ace701b543234dd9dae1315037ff363c2
MXCodec.cpp
7d23aa2a8354046ae0390eb5ad492346af5bce0f 18-Nov-2010 Andreas Huber <andih@google.com> Support for "chunked" HTTP transfer encoding.

Change-Id: I2f20d2d9ec0fa0c840b429049b0385289a30e774
related-to-bug: 3205131
uHTTPDataSource.cpp
ttplive/LiveSource.cpp
nclude/HTTPStream.h
nclude/NuHTTPDataSource.h
14d32754d3a9c1ccf49188c489f224800cd747a7 18-Nov-2010 Gloria Wang <gwang@google.com> Merge "Add getUri() for streaming"
771b85d9245a24273497792a2515d88d31c99e1e 10-Nov-2010 Gloria Wang <gwang@google.com> Add getUri() for streaming

Change-Id: I56e15e67cc5f4d0f41c9e2985404a4d89d757e7e
uCachedSource2.cpp
uHTTPDataSource.cpp
nclude/NuCachedSource2.h
nclude/NuHTTPDataSource.h
cf6a8d23345a6e54834e53b1eb7e465f3cb5e914 18-Nov-2010 Matthias Bady <aegirxx@googlemail.com> build failed with g++ v. 4.4.5
err msg: frameworks/base/media/libstagefright/MediaExtractor.cpp:62: error: invalid conversion from ‘const char*’ to ‘char*’
strrchr provides two prototypes. the one used returns const char* instead of char*

Change-Id: I6442ee642aebfbfc2f977bab40016cfedc7789ac
ediaExtractor.cpp
ba529e486dde15fe75ea1b48570f9d60a4cf3c48 17-Nov-2010 Andreas Huber <andih@google.com> Support post-decode video rotation.

Change-Id: I9ac90871269c5e132e98a9bf3ad8cae00f329f17
wesomePlayer.cpp
PEG4Extractor.cpp
olorconversion/SoftwareRenderer.cpp
nclude/MPEG4Extractor.h
nclude/SoftwareRenderer.h
0a5ca668c6f7d45706e9aec4a1dfec0aacc6d233 16-Nov-2010 Andreas Huber <andih@google.com> Remove all traces of legacy renderer support in stagefright.

Change-Id: I17b8e0dbf53fca37c96830c41131b4bc0c24ca6d
wesomePlayer.cpp
nclude/AwesomePlayer.h
nclude/OMX.h
nclude/SoftwareRenderer.h
mx/OMX.cpp
mx/OMXRenderer.h
6f9f029f7fc625bb2a1b448ad30a80a6a6a73b20 16-Nov-2010 Andreas Huber <andih@google.com> Make sure live streamed http live content does not start playing from the very beginning.

The different bandwidth streams may not all start on the same seqnum, so switching bandwidths may fail lateron if we start playing from the very beginning.

Change-Id: I03df8d1f44b3f7b4713d381a3d97847997e3ee59
related-to-bug: 2368598
ttplive/LiveSource.cpp
8fff6bb0000e43f02c9d04ca90f941fdefdc1356 15-Nov-2010 James Dong <jdong@google.com> Add initial stereo capture support for AAC encoder

Change-Id: I1b9335f036ff42d958d0b32f25359b21733f96d4
odecs/aacenc/AACEncoder.cpp
nclude/AACEncoder.h
b6c22ce7992f0ec3b39c5208e1dcccf70242c510 16-Nov-2010 Andreas Huber <andih@google.com> Merge "Proper support for variable NALsize lengths of AVC content in .mkv files."
b10f3669a9b73cd024662c2b70f5155bc0c2cd21 16-Nov-2010 Andreas Huber <andih@google.com> Proper support for variable NALsize lengths of AVC content in .mkv files.

Change-Id: If60cc80998b3231b6aaedc39fc3f5a94f84a5929
related-to-bug: 3197442
atroska/MatroskaExtractor.cpp
c42478ed7b8a379d2f8a43d4d349680c8a37573f 15-Nov-2010 James Dong <jdong@google.com> Fixed a race condition where some recording frames may not be released.

When startRecording() is called before setListener(), recording frames
are sent right after startRecording(), but there is no listener to
release the recording frames. This causes the hang in media server.

bug - 3166356

Change-Id: I19366ca682ef9f6b847590c190c30a15ed32b8e4
ameraSource.cpp
f9c2d3381e0bb174194347b927ef2b36329f3a54 15-Nov-2010 Andreas Huber <andih@google.com> Merge "More HTTP live support, AES encryption etc."
d42c40fdbf51cb384a4df4d0bd1b2a74d022c48f 15-Nov-2010 Andreas Huber <andih@google.com> Merge "Refactor h.264 profile/level support into avc_utils."
c62165b829f0244ad8e3646b3c4e314d6b4ccbb1 15-Nov-2010 Andreas Huber <andih@google.com> Provide bandwidth estimation support in NuHTTPDataSource

Change-Id: Ic98d8cf147bbba60ec735e7ca200addb2bd09f29
related-to-bug: 2368598
uHTTPDataSource.cpp
nclude/NuHTTPDataSource.h
e332a9181cf6a3155ed1a0fd2afc212ccb1f2753 15-Nov-2010 Andreas Huber <andih@google.com> More HTTP live support, AES encryption etc.

Change-Id: Ia5088042dd0a2181cb73cf8c7a2ff81e34b3064c
related-to-bug: 2368598
ndroid.mk
wesomePlayer.cpp
ttplive/Android.mk
ttplive/LiveSource.cpp
ttplive/M3UParser.cpp
nclude/LiveSource.h
nclude/M3UParser.h
peg2ts/ATSParser.cpp
peg2ts/ESQueue.cpp
bfd41f33c77c66ead48ee378e4ea4b7bfa5fca1f 15-Nov-2010 Andreas Huber <andih@google.com> Refactor h.264 profile/level support into avc_utils.

Change-Id: Idb33636dc723aa79ea0122dc3582109ada4b1358
related-to-bug: 2368598
MXCodec.cpp
vc_utils.cpp
nclude/avc_utils.h
393410a441b6d06daf286ed496470e9d6b2b6ca8 11-Nov-2010 James Dong <jdong@google.com> Separate the key for audio sampling rate and video frame rate in MetaData.h

Change-Id: Ia33befaa7e6df8762703002d01aa79c04f15f040
ameraSource.cpp
MXCodec.cpp
odecs/avc/enc/AVCEncoder.cpp
odecs/m4v_h263/enc/M4vH263Encoder.cpp
a628f89503e024e2b3f4dad88edd326845e058b9 12-Nov-2010 Andreas Huber <andih@google.com> Increase the prefetcher's low water mark so it restarts fetching data earlier.

720p high bitrate content pretty much requires this.

Change-Id: I2cb29d1fa2e3c511f1b88a106a02c53c68a10f2f
nclude/NuCachedSource2.h
3279bde5c424f58f630a16426bad42e074ca07d6 12-Nov-2010 Andreas Huber <andih@google.com> Merge "Make sure the prefetcher is actively fetching data if we pause playback due to cache underrun."
34ef0f32c8fc0186236a27e07405328cc1f7c56d 12-Nov-2010 Andreas Huber <andih@google.com> Make sure the prefetcher is actively fetching data if we pause playback due to cache underrun.

Change-Id: Id5f4b7a0387137380dcd39995390a8e0d084b4b3

Conflicts:

media/libstagefright/AwesomePlayer.cpp
wesomePlayer.cpp
uCachedSource2.cpp
nclude/AwesomePlayer.h
nclude/NuCachedSource2.h
b50a8033f1c7c2b58913212825f9200f1a9e5652 11-Nov-2010 James Dong <jdong@google.com> Add color format query support to QueryCodecs()

Change-Id: Ic8589649cd09392a1b969a30082b4c9c4e6cc6a7
MXCodec.cpp
f23c4f92c3b0202435cf87db2642156fabc46f02 11-Nov-2010 James Dong <jdong@google.com> Fix memory leak when 0-memcpy quirk is used

o minor change to the original patch by Andreas:
call restorePatchedDataPointer() method only if kAvoidMemcopyInputRecordingFrames is turned on

Change-Id: Idf3710e6f759d37d28e866613f98d39215722cb9
MXCodec.cpp
4f4d72de3bcf2a670c2a1007fdb46d78f47ed173 10-Nov-2010 James Dong <jdong@google.com> Merge "Fix missing breaks in the profile/level conversion code in M4vH263 encoder"
b2c59c3b3e670575cc0011176ca30e03bfde3e80 10-Nov-2010 James Dong <jdong@google.com> Fix missing breaks in the profile/level conversion code in M4vH263 encoder

Change-Id: Icd2cac68ffb0f38acb68b2968bbb36210431482d
odecs/m4v_h263/enc/M4vH263Encoder.cpp
42ea76335f4c582e9843d6bf4b1fe258bcbf27fc 09-Nov-2010 Andreas Huber <andih@google.com> Merge "Some refactoring and added support for another form of vbr headers."
4456da54bcd206ed1f518c69cc959ca65a179c83 09-Nov-2010 Andreas Huber <andih@google.com> Some refactoring and added support for another form of vbr headers.

related-to-bug: 3172324

Change-Id: Ic364da09eac7f0a815f9ceb719b6baa8a76e3730
ndroid.mk
P3Extractor.cpp
BRISeeker.cpp
INGSeeker.cpp
nclude/MP3Extractor.h
nclude/MP3Seeker.h
nclude/VBRISeeker.h
nclude/XINGSeeker.h
13f6284305e4b27395a23db7882d670bdb1bcae1 09-Nov-2010 James Dong <jdong@google.com> Rotation support

- We only support 0, 90, 180, and 270 degree clockwise rotation

- Some players are known to ignore composition matrix in the MP4 file,
although this is part of the MP4 file standard.
Both QT and YT are supporting the rotation

The original patch (65a73f4e8c79d05c0d9001b660325748d4ecf37b) was not merged.
The only change I made is to reuse the same kKeyRotation in MetaData.h;
and thus do not neeed to use kKeyRotationDegree.

Change-Id: Ib328716d4842201c4adf57e4ddfe1f1ac1ae4d8a
PEG4Writer.cpp
2cef2eff28fd5ba3eaa875dd2e22e74b6f464121 09-Nov-2010 James Dong <jdong@google.com> am c4a2ead2: am d2d62d04: Merge "Support extracting thumbnail from rotated video tracks" into gingerbread

* commit 'c4a2ead2aa5ab4403553e4956ba71b44782f0c84':
Support extracting thumbnail from rotated video tracks
beda607a0b2775484b10d7e6a15eec1e956b3cec 09-Nov-2010 James Dong <jdong@google.com> am d2d62d04: Merge "Support extracting thumbnail from rotated video tracks" into gingerbread

* commit 'd2d62d04fc387e2f51d414e101a3e8e3c45f415e':
Support extracting thumbnail from rotated video tracks
ce0febae177d1816ee7a6750ed9fba52472b9a71 09-Nov-2010 James Dong <jdong@google.com> Support extracting thumbnail from rotated video tracks

Change-Id: Ife0a2536aaac5ff1efdf1035b9d2c892773ee16c
tagefrightMetadataRetriever.cpp
3baff73198ce852fa60080bd32703028298b4d65 08-Nov-2010 Andreas Huber <andih@google.com> resolved conflicts for merge of 31dc911a to gingerbread-plus-aosp

Change-Id: I2f51b2120b3c552566d91a7dc498a5e8b130205f
4974d5eaf838d893c418b85bd47f6f114d9b5aaa 06-Nov-2010 James Dong <jdong@google.com> am 1653e261: Merge "Rotation support" into gingerbread

* commit '1653e261e84922facfe27d3d8acc455ed2b6b6da':
Rotation support
85d9b4225d024bb0d602b48bd6d5219cbebd7b8e 04-Nov-2010 Andreas Huber <andih@google.com> Support post-decode video rotation.

Change-Id: Ia371316e73a57e44610de86adce3eaa560afbf84
wesomePlayer.cpp
PEG4Extractor.cpp
olorconversion/SoftwareRenderer.cpp
nclude/MPEG4Extractor.h
nclude/OMX.h
nclude/SoftwareRenderer.h
mx/OMX.cpp
aca1fe35480ae76dd6bae167ade40adc955e2d0d 17-Aug-2010 James Dong <jdong@google.com> Rotation support

- We only support 0, 90, 180, and 270 degree clockwise rotation

- Some players are known to ignore composition matrix in the MP4 file,
although this is part of the MP4 file standard.
Both QT and YT are supporting the rotation

Change-Id: I1b7f66a801e9d9c49d889c9b06dd6173fa7e76c4
PEG4Writer.cpp
412abda7a92b842378ecb5fd9bdb43a73d29f468 05-Nov-2010 James Dong <jdong@google.com> Merge "Use meta data in the media recording framework"
c2daea219b626a961d5ccef0b6b22c2496509748 05-Nov-2010 Gloria Wang <gwang@google.com> Merge "Add support for WV DRM"
b371426ce4cf2fa6d8c3d1903b61322feb165d35 01-Nov-2010 Gloria Wang <gwang@google.com> Add support for WV DRM

Change-Id: I0408c5e0a488f112a84337b21b0cd4613a4da461
ndroid.mk
wesomePlayer.cpp
RMExtractor.cpp
ileSource.cpp
ediaDefs.cpp
ediaExtractor.cpp
uCachedSource2.cpp
uHTTPDataSource.cpp
VMExtractor.cpp
nclude/NuCachedSource2.h
nclude/NuHTTPDataSource.h
nclude/WVMExtractor.h
8480835b4bc1350646376aa7f3ae33742a7adeb1 02-Nov-2010 James Dong <jdong@google.com> Use meta data in the media recording framework

o This patch allows us to do 720p video recording

Change-Id: I2ea37e80a59630145396b08ebcdc6ee71df53333
MXCodec.cpp
ed45fe0730a7e7fc9944741428f5a484350acc8a 02-Nov-2010 Jamie Gennis <jgennis@google.com> Fix a MediaBuffer leak in Stagefright.

Change-Id: I548e60b07cf1676476874b156cfbc4ffefdfa2b9
MXCodec.cpp
dbd40762b0d68e1a8333ec2f46acaf71e5938673 03-Nov-2010 Andreas Huber <andih@google.com> Merge "Experimentally reenable mpeg4 and h.263 hardware decoders."
09ddead9fcb391efd718738245455398a7ec6887 27-Oct-2010 Andreas Huber <andih@google.com> Experimentally reenable mpeg4 and h.263 hardware decoders.

Change-Id: I1be266bd4534004a08e8836b48cc6c09ca890ccc
MXCodec.cpp
bf3122eed31cd24acdf5cfd25541db0beb77e6f0 03-Nov-2010 Gloria Wang <gwang@google.com> am cf393faa: Merge "resolved conflicts for merge of c1c45a4d to gingerbread-plus-aosp" into gingerbread-plus-aosp

* commit 'cf393faaa871333496a63c13196fdbc0f2bd9118':
- Move the business rule management down to DRM agents. - Do not register DRM sniffer because drmserver is not enabled.
26490f71a5a50b2200d60de28ad0ea6b1d0a1847 03-Nov-2010 James Dong <jdong@google.com> am f3847e87: Merge "DO NOT MERGE" into gingerbread

* commit 'f3847e875eb1c58094a2d159a2a6f3f0b381d77a':
DO NOT MERGE
63a0a11e8b3292253b3d3bf3a7f7dc733cf6762f 03-Nov-2010 James Dong <jdong@google.com> DO NOT MERGE

Fix premature release of recording frames when physical address or metadata is stored in input video buffers

- bug 3158459

Change-Id: If297189d2a87fc3abfda68c29ac75b490b30a902
MXCodec.cpp
606649635ecb5a7f1378f2538a25fee64214ff42 02-Nov-2010 Gloria Wang <gwang@google.com> resolved conflicts for merge of c1c45a4d to gingerbread-plus-aosp

Change-Id: I5411eaa0426cf208c6db3570f707d1b6b4baf455
0821a824a718a28fa5144309bf09ea40411c8ae0 30-Oct-2010 Jamie Gennis <jgennis@google.com> Stop using OMX_COLOR_FormatAndroidPrivateStart.

This removes the use (and definition) of the Android-private range of
OMX color formats from Stagefright. Instead we will just be
interpreting the video color format of an OMX port as an Android pixel
format if the port is in native buffer mode.

Change-Id: I3ea50703336a88249e7563bc7022dfedbeac506e
MXCodec.cpp
678d25019bd951a6af083bee0282e5b907713849 02-Nov-2010 Andreas Huber <andih@google.com> Merge "Notify surfaceflinger about (changes to) the crop rectangle output by the decoder."
55426ce7eded04c9993149edd86f861cfccb4d19 29-Oct-2010 Gloria Wang <gwang@google.com> - Move the business rule management down to DRM agents.
- Do not register DRM sniffer because drmserver is not enabled.

Change-Id: I7a1052fe406f5087051a482b7e85a458f3ec7b8f
wesomePlayer.cpp
ataSource.cpp
67f4cae120b49fad8b53a83499db1545bfa41e38 02-Nov-2010 Andreas Huber <andih@google.com> Notify surfaceflinger about (changes to) the crop rectangle output by the decoder.

Change-Id: I9c33618dd3351be1ecadcc7d0329654ea50bad3f
related-to-bug: 3153626
MXCodec.cpp
51ef3f681e275f6edc6886c7a2dd409e6734a0ee 01-Nov-2010 Gloria Wang <gwang@google.com> Media scanner support for FL(Forward Lock) DRM file types

Change-Id: Id85edbfc2851d9054a7433d24bb5cf33a457a4e5
tagefrightMediaScanner.cpp
02a1db7dc1de2f2df306ec10bab992bc8bbaaca8 30-Oct-2010 Andreas Huber <andih@google.com> After seeking display the first new video frame right away without concern for A/V sync. This looks much more responsive to the user.

related-to-bug: 3152363
Change-Id: Ia097bf61ca05e01365357cb23ff83e2ad417f3fd
wesomePlayer.cpp
565b4951c444fb6c3e273aa1ffe3008393f46bef 30-Oct-2010 James Dong <jdong@google.com> Merge "Added some debugging log messages at stop()"
a89082944308805b0def7de87c67e370e74b8789 29-Oct-2010 Gloria Wang <gwang@google.com> - register DRM sniffer only when drmserver is up
- notify DRM agents the status after seeking

Change-Id: Id77977fc7548970559dc8974461b0bd1d2aa9514
wesomePlayer.cpp
ataSource.cpp
cb09c03450bb09304ad5afd2d223254bf2e6e38c 30-Oct-2010 James Dong <jdong@google.com> Added some debugging log messages at stop()

There are so many cases where the codecs just could not stopped ...

Change-Id: If9ff261fcd4726c2ee21ec7c9336ca9c2917d399
PEG4Writer.cpp
c8ca26ed63edcf2731c4773b8ce3141930cc7245 29-Oct-2010 James Dong <jdong@google.com> Merge "Added profile and level translation in SW video encoders"
ff1df9951d09f1a1a8ae2dbc42b82b0f9c164e5e 28-Oct-2010 Andreas Huber <andih@google.com> Upgrade to the latest version of libwebm to fix YouTube webm playback.

Change-Id: I6a0f5e1aa07d3af428c314d36f69b119fa8d2d3a
related-to-bug: 3141937
atroska/MatroskaExtractor.cpp
atroska/mkvparser.cpp
atroska/mkvparser.hpp
5cb8fdbfeda95fdc70e8edb69adc20c57cb277be 20-Oct-2010 James Dong <jdong@google.com> Added profile and level translation in SW video encoders

Change-Id: I6b9c33c7e4b497f3dc61b2a0dcf4e65727f9bcdd
odecs/avc/enc/AVCEncoder.cpp
odecs/m4v_h263/enc/M4vH263Encoder.cpp
fc9ac988e08a8b4c42e58999300265989f26f24c 27-Oct-2010 Andreas Huber <andih@google.com> Better support for MP4A-LATM RTP disassembly. This used to fail if mNumSubFrames > 1 and the sub frames did not align with RTP packet boundaries.

Change-Id: I20e3b86f52b7f0f41663ffe8bc1f4db92280e884
tsp/AMPEG4AudioAssembler.cpp
tsp/AMPEG4AudioAssembler.h
tsp/ARTPSource.cpp
tsp/ASessionDescription.cpp
d0041bc2649a4989965e4684563200029e324808 27-Oct-2010 Andreas Huber <andih@google.com> Merge "Remove annoying warning during mpeg4 extraction."
51d6cc75dd2c1b343601b76a93fded170ce6cb43 27-Oct-2010 Andreas Huber <andih@google.com> Merge "FileSource may fail to open a file in which case subsequent code dereferences a NULL pointer. This fixes this recently introduced problem."
4e6572967da698d568a44d18797b751ec8ae5401 27-Oct-2010 Andreas Huber <andih@google.com> FileSource may fail to open a file in which case subsequent code dereferences a NULL pointer. This fixes this recently introduced problem.

Change-Id: I60dd9532b694a1b488743b71f43e107c778d6683
ileSource.cpp
75fc7654280ac2a72fa8124b88e616219a3e61e2 27-Oct-2010 Andreas Huber <andih@google.com> Remove annoying warning during mpeg4 extraction.

Change-Id: Iffadeefb43bab6da1299b0a0582d6c6990156c32
related-to-bug: 3093774
ampleTable.cpp
6d309134e3a2c8c1687724a8a8632424ce9a1e33 27-Oct-2010 Kristian Monsen <kristianm@google.com> Fix for simulator build break

strrchr returns a const char* in c++ if you give in a const char*

Change-Id: I15ac2ae9e1d41d7737193146c526fcbddccae27c
ediaExtractor.cpp
7b54d6652692ce078df9c606d2d72ebc8ee1f4a2 27-Oct-2010 Andreas Huber <andih@google.com> am e1e82745: am 2088e371: Merge "Assume that all of the decoded vorbis audio data is valid unless the source indicates otherwise." into gingerbread
7b74bba58149afe9ff4c67cd508928c303851cc3 27-Oct-2010 Andreas Huber <andih@google.com> am 2088e371: Merge "Assume that all of the decoded vorbis audio data is valid unless the source indicates otherwise." into gingerbread
53409d6fe668e695e92479371f0ec162723feed5 27-Oct-2010 Andreas Huber <andih@google.com> Assume that all of the decoded vorbis audio data is valid unless the source indicates otherwise.

Change-Id: Iea88e3f09955d82a9a11fbcc075db8d9c4007490
odecs/vorbis/dec/VorbisDecoder.cpp
bbf03557f2008fad77bf9340460d4e6a28cbb957 26-Oct-2010 James Dong <jdong@google.com> Merge "Add two creation flags to OMXCodec::Create()"
deeb96121e9d67ee4c0701c88d5b5cfadc4541b2 26-Oct-2010 Gloria Wang <gwang@google.com> A temporary fix for "Waiting for service drm.drmManager".

Change-Id: I554c9bbec8c63c3c8dbc5b5374614c1101f6d1d9
ataSource.cpp
d332a72e8f71caea0d3dc898db6a9d7a929fad32 23-Oct-2010 James Dong <jdong@google.com> Add two creation flags to OMXCodec::Create()

o This allows to force to use software codecs or hardware codecs
o If request cannot be fullfilled, Create() returns NULL.

Change-Id: I02b56a9229abb56d49703fe80ac18571d33f3748
MXCodec.cpp
1104688c53b1815b543dbe1ef1ca56c7a77f241c 26-Oct-2010 James Dong <jdong@google.com> Merge "Remove OMX.PV.* components from OMXCodec.cpp"
c810b75fd04eef8af509bb42aa8837566a374b32 23-Oct-2010 James Dong <jdong@google.com> Remove OMX.PV.* components from OMXCodec.cpp

Change-Id: Ie43c00a4d589e9cca6e9505a5dabd4e0d8af321a
MXCodec.cpp
b33fd3c77c59b93291135a36638b2777606863d2 26-Oct-2010 James Dong <jdong@google.com> Merge "Don't change the video recording frame rate if it is not requested."
aceaaf303422bbe3a7b8d9cdb96495dbf8109c23 26-Oct-2010 Gloria Wang <gwang@google.com> resolved conflicts for merge of 965f960e to master

Change-Id: I63cec8ffb3593216da1de03428134d89e75b9338
635730831e08c32a5fe7c59125e0919b7e7899cd 24-Oct-2010 James Dong <jdong@google.com> Don't change the video recording frame rate if it is not requested.

o set the default video frame rate to the current frame rate being used
o add check on whether the requested frame rate is supported
o fix an issue where the hardware video encoder setting was bypassed
o increases the max frame rate from 30 t0 120 frames per second
the actual frame rate will be clipped if the requested frame rate is too
high when recording starts by checking the hardware encoder capabilities

Change-Id: I1b47671d74da0ebcb9601bdca390d430cc048fbc
ameraSource.cpp
a9741a9232c81eaf59179acef91f5be46c42264e 26-Oct-2010 Gloria Wang <gwang@google.com> resolved conflicts for merge of 9084631d to gingerbread-plus-aosp

Change-Id: Ie2b675d50bfca3f33aee80f1a67c9f03d1f97472
c21143636f2c6078c8ad6b096f69a9208591342b 25-Oct-2010 Andreas Huber <andih@google.com> We don't have access to the md5 implementation on the simulator, let's disable digest authentication in rtsp for simulator targets.

Change-Id: I02a9b4af929601c899f04cee9864d0dd0716de62
tsp/ARTSPConnection.cpp
dcd25efb46c41c8d24a0a9cf61fb57f84149709e 22-Jun-2010 Gloria Wang <gwang@google.com> DRM framework support:
- add a sniffer for DRM files
- add DRMSource and DRMExtractor for es_based DRM
- add pread in FileSource.cpp for container_based DRM
- add native DRM framework API calls in the player for
DRM audio/video playback

Change-Id: I4b9ef19165c9b4f44ff40eeededb9a665e78a90f
ndroid.mk
wesomePlayer.cpp
RMExtractor.cpp
ataSource.cpp
ileSource.cpp
PEG4Extractor.cpp
ediaExtractor.cpp
nclude/AwesomePlayer.h
nclude/DRMExtractor.h
nclude/MPEG4Extractor.h
315940bf8ab4b49a49ff986afaf4775a2cacc381 15-Jul-2010 Mike Lockwood <lockwood@android.com> Fixes for simulator build on lucid

strchr and strrchr now return const char* instead of char*

Change-Id: Idc013222e86c80b1e91d5aeb09a1a24809a82358
uHTTPDataSource.cpp
ttplive/M3UParser.cpp
tsp/ARTSPConnection.cpp
tsp/ASessionDescription.cpp
tsp/MyHandler.h
5b2146fc017b02bb5f096b1ac336efd3558a117c 22-Oct-2010 James Dong <jdong@google.com> Merge "OMX extension to support storing meta data in video input buffers during recording"
7f6ff8eb6eed438590e24f0b536c65110976bcfb 22-Oct-2010 James Dong <jdong@google.com> am 6123e0f7: am 1bd8a8c8: Merge "Turn the media time adjustment in file writer back on" into gingerbread

Merge commit '6123e0f7c91ffc7534da99b4668879dacf662227'

* commit '6123e0f7c91ffc7534da99b4668879dacf662227':
Turn the media time adjustment in file writer back on
5b6a01e65aa4129a9226667536d1bc1dad5980d8 22-Oct-2010 James Dong <jdong@google.com> Turn the media time adjustment in file writer back on

o This was turned off to unblock the tests on some device
o The adjustment duration is increased to suppress fluctuations observed on some device

bug - 3058745

Change-Id: Iaeeb1c1c52783f5c679305645c995e57b4b2a573
PEG4Writer.cpp
e870772a78ffe08b1c14a791e368f1499f1be0f3 21-Oct-2010 James Dong <jdong@google.com> OMX extension to support storing meta data in video input buffers during recording

bug - 3042125

Change-Id: I7543809fa4ff61d48da35eec6c2bd5eaa7e8cead
nclude/OMX.h
nclude/OMXNodeInstance.h
mx/OMX.cpp
mx/OMXNodeInstance.cpp
cf5e77c0676f6af1685de30ad902fe94e476907f 21-Oct-2010 James Dong <jdong@google.com> am 8ad6335d: am fa7a87fb: Merge "File writer size estimation improvement" into gingerbread

Merge commit '8ad6335d2c22900de5b46460473495b5bcea9f99'

* commit '8ad6335d2c22900de5b46460473495b5bcea9f99':
File writer size estimation improvement
f83dd80384f70da1f6d36d60e831439ff7739ad7 21-Oct-2010 Jamie Gennis <jgennis@google.com> Fix a copy & paste logging error.

This change corrects the name of a variable used in a logging macro,
allowing AwesomePlayer.cpp to build with verbose logging enabled.

Change-Id: Ie23fe0fb17f08ac43348cee3209bfe68088e856e
wesomePlayer.cpp
edffc0fcbe02409e8e56e06c3b1dccc7215d2947 21-Oct-2010 Jamie Gennis <jgennis@google.com> Merge "Fix the non-ANW video decode path."
bf2ba2a97927c24d14c0e71158abe7b49c557c68 21-Oct-2010 Jamie Gennis <jgennis@google.com> Fix the non-ANW video decode path.

The BufferInfo::mOwnedByNativeWindow field was not being initialized in
the non-ANativeWindow video decode path.

Change-Id: If2f6249902a08690f6c62ef30791b9979050c0e5
MXCodec.cpp
642a8eac64b7370fd874c4d34654583c50c0850c 21-Oct-2010 Andreas Huber <andih@google.com> Merge "If we basically finished the preparation phase and are only buffering enough data to start playback, cancel this early on reset()."
6a05c9e912aeb8bfe1ef99516def91a177a481b6 19-Oct-2010 Andreas Huber <andih@google.com> If we basically finished the preparation phase and are only buffering enough data to start playback, cancel this early on reset().

Change-Id: I71a59d5e019e7b9ec3d9375d6231cc301ad3999b
wesomePlayer.cpp
nclude/AwesomePlayer.h
a3c740f68f30f3f929cdc8d6ad9ab562502bdff0 21-Oct-2010 Andreas Huber <andih@google.com> Merge "Support for BASIC and DIGEST authentication schemes in RTSP. Support for malformed packet descriptions that end lines in LF only, instead of CRLF."
4579b7d49f6dd4f37e6043e59debfd72d69b8e7b 21-Oct-2010 Andreas Huber <andih@google.com> Support for BASIC and DIGEST authentication schemes in RTSP. Support for malformed packet descriptions that end lines in LF only, instead of CRLF.

Change-Id: I57eaefdc4b300a8f56bbe5cf3a34c424e8efe63a
related-to-bug: 3084183
tsp/ARTSPConnection.cpp
tsp/ARTSPConnection.h
tsp/ASessionDescription.cpp
tsp/Android.mk
tsp/MyHandler.h
244c73a2f07d4d88e3aace982e522a1d90ff49cf 20-Oct-2010 Andreas Huber <andih@google.com> Merge "Make sure we can encode the size of the codec specific data in a single byte."
5f995b0e72ed6f186cb0ab2a525c4cfce614f3a9 20-Oct-2010 Andreas Huber <andih@google.com> Make sure we can encode the size of the codec specific data in a single byte.

Change-Id: If7680cbfb380180c8dd6d6019b9c6c67661e468d
PEG4Writer.cpp
dc99cd65fac3964637f2674db07323c07f720279 20-Oct-2010 James Dong <jdong@google.com> Merge "Fix an issue where the video size was incorrectly retrieved from preview size"
f96c9d193c70c7216b34e6c65f046a09a2a81f14 20-Oct-2010 James Dong <jdong@google.com> Fix an issue where the video size was incorrectly retrieved from preview size

bug - 3115814

Change-Id: I6aa59b3182ceee35c6d6ef54ff520f81077873f0
ameraSource.cpp
6a9da9fc558263548ebfbae2cbf177eb7454a41b 07-Oct-2010 Jamie Gennis <jgennis@google.com> Add decode-to-ANativeWindow support to Stagefright.

This change adds support to Stagefright for doing OMX video decoding directly
into buffers dequeued from an ANativeWindow. It does this by registering the
dequeued buffers with the OMX component using an Android-specific OMX
extension, and then exchanging buffers between the OMX component and the
ANativeWindow.

Change-Id: Ida66f836503255a68d378c6903d96dfe9747ce87
wesomePlayer.cpp
ediaBuffer.cpp
MXCodec.cpp
5c9523154d106b555db6c41f85ab205a4f189b02 19-Oct-2010 James Dong <jdong@google.com> Make camera source ready for handling meta-data video buffers.

bug - 3042125

Change-Id: I877b265c6bf8e0593121c8d5a95ae5599cdc6fb9
ameraSource.cpp
ameraSourceTimeLapse.cpp
78a1a286f736888ae7af8860b2c424af0d978848 20-Oct-2010 James Dong <jdong@google.com> File writer size estimation improvement

o Do not count the reserved space for moov if the meta data size is small
o Do not count the extra 1KB disturbing small file estimation.
o Reduce the default minimum reserved space from 4 KB to 3 KB.
o Estimate the moov size based on both duration AND file size limit is set
and set it to the smaller estimated value.

low risk change

bug - 3111983

Change-Id: I6ac2adb979d8cc12d6b4f1813d000c989add0199
PEG4Writer.cpp
74e1e56dfa15be0ffea82c60d81846c4f6615421 19-Oct-2010 Andreas Huber <andih@google.com> am 2d00c605: am 52bea277: Merge "If we encounter video stream EOS while seeking we may still need to seek audio." into gingerbread

Merge commit '2d00c6050977f3e03665fbfef93f4f6aed041a63'

* commit '2d00c6050977f3e03665fbfef93f4f6aed041a63':
If we encounter video stream EOS while seeking we may still need to seek audio.
a3764dee0d52e65d16005a411e2d4efd0af20953 19-Oct-2010 Andreas Huber <andih@google.com> am 8b5161c2: am d68cda47: An attempt to unregister a handler that\'s no longer registered should not cause an assertion.

Merge commit '8b5161c2aed8637de9bffb1d81298d60ea237caf'

* commit '8b5161c2aed8637de9bffb1d81298d60ea237caf':
An attempt to unregister a handler that's no longer registered should not cause an assertion.
2ad46bea6b7ef92b24e9bd98b0b459beb71b96ab 19-Oct-2010 Andreas Huber <andih@google.com> am 9b2f18df: am bc96c284: Merge "For thumbnail extraction make sure we instantiate a decoder that allows access to the framebuffer. Implement the samsung workaround to support this by reconfiguring the decoder." into gingerbread

Merge commit '9b2f18df2436b6c2d9735e65119b92f320bb57e2'

* commit '9b2f18df2436b6c2d9735e65119b92f320bb57e2':
For thumbnail extraction make sure we instantiate a decoder that allows access to the framebuffer. Implement the samsung workaround to support this by reconfiguring the decoder.
9969c0b798ad81764b67f5a098f7c417b82dcc89 19-Oct-2010 Andreas Huber <andih@google.com> am 8f5214eb: am 02ec432e: Merge "If the PES packet size exceeds 16-bit range, use a packet size of 0 instead. This is valid for video content according to the specs." into gingerbread

Merge commit '8f5214eb6fa6c85c9c6703da15c4a6cf95ac4b17'

* commit '8f5214eb6fa6c85c9c6703da15c4a6cf95ac4b17':
If the PES packet size exceeds 16-bit range, use a packet size of 0 instead. This is valid for video content according to the specs.
4769cc92740e3ab58e9263d42553c12bbf79e3be 19-Oct-2010 Andreas Huber <andih@google.com> If we encounter video stream EOS while seeking we may still need to seek audio.

Change-Id: Ie260942247b6810ca94e86328a3725d75b12181d
related-to-bug: 3108724
wesomePlayer.cpp
nclude/AwesomePlayer.h
f200777290d2e3e8b580c512cc0808eae9790705 19-Oct-2010 Andreas Huber <andih@google.com> An attempt to unregister a handler that's no longer registered should not cause an assertion.

There are edge cases in which a handler attempts to unregister itself while on another thread a message fails to be delivered to that very handler and causes automatic unregistration. In this case the handler's good cleanup intentions are thwarted by the CHECK.

Change-Id: I4e41b5e7b619159ecce4856c15cccca031a28b5b
related-to-bug: 3101247
QA-impact: no(!!!) risk
oundation/ALooperRoster.cpp
b5b39d2c348f54a40fc800c9efec17d7f1e8a486 18-Oct-2010 Andreas Huber <andih@google.com> Merge "For thumbnail extraction make sure we instantiate a decoder that allows access to the framebuffer. Implement the samsung workaround to support this by reconfiguring the decoder." into gingerbread
acc82a3bad22af17008a839d993e3bd7a5d9b5af 15-Oct-2010 Andreas Huber <andih@google.com> If the PES packet size exceeds 16-bit range, use a packet size of 0 instead. This is valid for video content according to the specs.

Change-Id: I686320d9d4cd826f43c0813c6ba1dc4949d1115f
PEG2TSWriter.cpp
f3712f026aad1fc46b1df18d1dba718281e39726 18-Oct-2010 Andreas Huber <andih@google.com> For thumbnail extraction make sure we instantiate a decoder that allows access to the framebuffer. Implement the samsung workaround to support this by reconfiguring the decoder.

related-to-bug: 3106534
Change-Id: Ie28d72af2f9e93818d1840ac83aa7bc11fa57b3b
MXCodec.cpp
tagefrightMetadataRetriever.cpp
c540e63b50c214ccb0eabc93806a64c5b145d110 18-Oct-2010 Jean-Baptiste Queru <jbq@google.com> Fix build (bad merge)

Bug: 3101573
Change-Id: I2c0518e31f39c9a6e88d86cc468653bbcb5be05e
olorconversion/Android.mk
8ac0cb9dc8a46f9b2badabc91cb5f7871e2215a9 18-Oct-2010 Jean-Baptiste Queru <jbq@google.com> Merge fb474872 from gingerbread-plus-aosp

Change-Id: I1bbb845a86a7b7df44ea175df3af22e5f47c44e3
b0d62457a9630b144187dcd5b143ee9c91f591d0 16-Oct-2010 Andreas Huber <andih@google.com> am cb90947b: am e1f3976b: Merge "Make sure we cache the sampleTable again if using the caching datasource." into gingerbread

Merge commit 'cb90947bf8ed2c898c1b7e529dd0c99d112ed611'

* commit 'cb90947bf8ed2c898c1b7e529dd0c99d112ed611':
Make sure we cache the sampleTable again if using the caching datasource.
56cfa2376ae87cba730ea7ce4a9e0ca4f0d07627 15-Oct-2010 Andreas Huber <andih@google.com> Include the framework copy of the OpenMAX headers instead of referencing external/opencore.

Change-Id: I762f59acf5e1f770e4d7c2d89af362bfffebefa6
related-to-bug: 3101573
ndroid.mk
odecs/avc/dec/Android.mk
odecs/avc/enc/Android.mk
odecs/m4v_h263/dec/Android.mk
odecs/m4v_h263/enc/Android.mk
odecs/on2/dec/Android.mk
olorconversion/Android.mk
ttplive/Android.mk
atroska/Android.mk
peg2ts/Android.mk
mx/Android.mk
mx/tests/Android.mk
tsp/Android.mk
b9d3038ec950665639e26acd51329ebc800e780d 15-Oct-2010 Andreas Huber <andih@google.com> Make sure we cache the sampleTable again if using the caching datasource.

QA-impact: This fixes http streaming again which I broke about 2 days ago. The previously observed symptoms were stuttering playback of http streams (think YouTube) after a certain playback position.

Change-Id: I14050e3522ecd62c90d29310efdf508fdd2e87b5
related-to-bug: 3098873
PEG4Extractor.cpp
6fed68ded4ab2c042b7ca14409a24aee916313d5 15-Oct-2010 Andreas Huber <andih@google.com> am bb5d7c21: am 5f423917: Merge "Attempt to derive the avg. bitrate of the entire stream from metadata." into gingerbread

Merge commit 'bb5d7c21615128630fc9d08274bb14ca01e2124b'

* commit 'bb5d7c21615128630fc9d08274bb14ca01e2124b':
Attempt to derive the avg. bitrate of the entire stream from metadata.
a44501ea0896c2508bd6b807185d9049be6752f3 15-Oct-2010 Andreas Huber <andih@google.com> am 8e4f3c76: am 646e0d5a: Merge "Some webcams output rtp streams but never send any rtcp data in violation of the specs. Attempt to use fake timestamps to be able to play these..." into gingerbread

Merge commit '8e4f3c76dd7f5596fa2fe10bdf008d4c02353160'

* commit '8e4f3c76dd7f5596fa2fe10bdf008d4c02353160':
Some webcams output rtp streams but never send any rtcp data in violation of
f9f083e2853740c97588f4db82c24645ae5880e4 15-Oct-2010 Kenny Root <kroot@google.com> resolved conflicts for merge of a127c07c to master

Change-Id: Ifdfc6681cba00f36456eaf7a97f34a75b9d0c086
d6119356f45c9c57cac812357d969ecc3001087e 15-Oct-2010 Andreas Huber <andih@google.com> am 28b93967: am 165c6579: Merge "HTTP Live content that are tagged as complete are now seekable." into gingerbread

Merge commit '28b93967d0e702304c7edec854a29d5ab88bfce0'

* commit '28b93967d0e702304c7edec854a29d5ab88bfce0':
HTTP Live content that are tagged as complete are now seekable.
a82c3c631a9c0bb721e35d03714715ffe3b0b0c3 13-Oct-2010 Andreas Huber <andih@google.com> Merge "Attempt to derive the avg. bitrate of the entire stream from metadata." into gingerbread
11b72e19970f620adfb1aa458b45ff06cec77f10 13-Oct-2010 James Dong <jdong@google.com> Remove hard-coded color format for Nvidia's video encoder

o camera would query the color format if camera source is used
o if camera source is not used, a MetaData can be passed to do the same.

Change-Id: Iff1f802cc4974b286085473e5384bd88e04fa05d
MXCodec.cpp
f61551f4fc79e7da879802e3974afa9b03ffb5d0 13-Oct-2010 Andreas Huber <andih@google.com> Some webcams output rtp streams but never send any rtcp data in violation of
the specs. Attempt to use fake timestamps to be able to play these...

Change-Id: Ia7a926616fb764e972955df4acdb59d85cdd93df
related-to-bug: 3087310
tsp/ARTPConnection.cpp
tsp/ARTPConnection.h
tsp/MyHandler.h
7fbdb0903dfbf70b314a74e64e28fb880cdb9247 13-Oct-2010 Andreas Huber <andih@google.com> Attempt to derive the avg. bitrate of the entire stream from metadata.

related-to-bug: 3093224
Change-Id: I4726b023373e04468cc12fd64f7fe6ee923add95
wesomePlayer.cpp
nclude/AwesomePlayer.h
5cb77e080ced5362b5f047e107327b3cb6ece6c9 13-Oct-2010 Andreas Huber <andih@google.com> Merge "Support for writing to MPEG2 transport stream files." into gingerbread
59b7dc39ea8332d3418a599e51447d7edb612ac4 12-Oct-2010 Andreas Huber <andih@google.com> Support for writing to MPEG2 transport stream files.

Change-Id: If3b7a807bc224a4b1cb2236537c3ebdc5aee0d97
PEG2TSWriter.cpp
bff07d0b22a5ee2d9f044f6cb5e4be1532017ab0 12-Oct-2010 Andreas Huber <andih@google.com> HTTP Live content that are tagged as complete are now seekable.

Change-Id: I9d0d2f009f883e5baf3e9de8c5c0aa05760e4bde
related-to-bug: 2368598
wesomePlayer.cpp
uCachedSource2.cpp
ttplive/LiveSource.cpp
ttplive/M3UParser.cpp
nclude/LiveSource.h
nclude/M3UParser.h
nclude/MPEG2TSExtractor.h
nclude/NuCachedSource2.h
peg2ts/ATSParser.cpp
peg2ts/ATSParser.h
peg2ts/AnotherPacketSource.cpp
peg2ts/AnotherPacketSource.h
peg2ts/ESQueue.cpp
peg2ts/MPEG2TSExtractor.cpp
43a2b3b5fd4e15ffed4235f348d5eba168e8432c 12-Oct-2010 Andreas Huber <andih@google.com> am 5b0d0630: am 1010da2e: Merge "Just in case we\'re behind a NAT router/firewall, attempt to poke holes into it for future incoming RTP/RTCP packets to pass through." into gingerbread

Merge commit '5b0d063010b364102ffb7a533e2b76ecfd9636d5'

* commit '5b0d063010b364102ffb7a533e2b76ecfd9636d5':
Just in case we're behind a NAT router/firewall, attempt to poke holes into it for future incoming RTP/RTCP packets to pass through.
2bc940b4f961e588459c83862b2c6bea314a4027 11-Oct-2010 Andreas Huber <andih@google.com> Just in case we're behind a NAT router/firewall, attempt to poke holes into it for future incoming RTP/RTCP packets to pass through.

Change-Id: Idd47968d4027f357222f19f15eecfd70fdec3282
related-to-bug: 3073813
tsp/MyHandler.h
250e051e564e3b6f5a88314379d5e145a2b5615f 11-Oct-2010 Andreas Huber <andih@google.com> am cac43e8a: am beffefa2: Merge "RTSP seeking is now asynchronous, MediaPlayer is not notified that the seek is complete until it actually is. Ignore seek requests on live streams." into gingerbread

Merge commit 'cac43e8a2ce59c1151d5a2028330b2a769591d22'

* commit 'cac43e8a2ce59c1151d5a2028330b2a769591d22':
RTSP seeking is now asynchronous, MediaPlayer is not notified that the seek is complete until it actually is. Ignore seek requests on live streams.
e31aa743466972764f9db5a88a713621ff0a29ae 11-Oct-2010 Andreas Huber <andih@google.com> am e0c8545a: am 0fd4e216: Merge "Refactor some more h.264 utility code out into avc_utils. Work around a hardware decoder issue by making sure the first access unit submitted to a decoder at startup or after seek is an IDR." into gingerbread

Merge commit 'e0c8545a2369881fe09582337a9de3db2db1a951'

* commit 'e0c8545a2369881fe09582337a9de3db2db1a951':
Refactor some more h.264 utility code out into avc_utils. Work around a hardware decoder issue by making sure the first access unit submitted to a decoder at startup or after seek is an IDR.
9086ce254ac8769dbe90afd5146fce509a86418f 11-Oct-2010 Andreas Huber <andih@google.com> am 2b4f1f4c: am f72dd019: Merge "Disable 10secs forward/backward seeking for rtsp as seek is a very expensive operation there. Decouple the 10sec forward/backward button functionality from seekbar functionality." into gingerbread

Merge commit '2b4f1f4cb814f7a7df8d2cb9fcb5210bfe7999c7'

* commit '2b4f1f4cb814f7a7df8d2cb9fcb5210bfe7999c7':
Disable 10secs forward/backward seeking for rtsp as seek is a very expensive operation there. Decouple the 10sec forward/backward button functionality from seekbar functionality.
f0dee1c7bb5ed2b90b2207bde7552d0f9ce2c3b1 11-Oct-2010 Andreas Huber <andih@google.com> am 5dcf588a: am b9bf5457: Merge "Respect the cropping rectangle when extracting the video dimensions from the sequence parameter set of H.264 streams." into gingerbread

Merge commit '5dcf588a81a59142985736d8bb0430586f68ec08'

* commit '5dcf588a81a59142985736d8bb0430586f68ec08':
Respect the cropping rectangle when extracting the video dimensions from the sequence parameter set of H.264 streams.
d10091147c620aab1ca8da97a3c55e1644859cb1 11-Oct-2010 James Dong <jdong@google.com> am d31fc239: am 6dcdfdb4: Merge "Name the writer threads" into gingerbread

Merge commit 'd31fc2397a494fc54679ac8fdb52983b60287183'

* commit 'd31fc2397a494fc54679ac8fdb52983b60287183':
Name the writer threads
1c8ef86f2c25272488c171f1469f996ebf335edc 11-Oct-2010 Andreas Huber <andih@google.com> am 14ea1048: am c5912acc: Merge "Disable the access unit timeout temporarily while a seek operation is in progress." into gingerbread

Merge commit '14ea1048e7e8a4b40836b5601bc86b91663525cb'

* commit '14ea1048e7e8a4b40836b5601bc86b91663525cb':
Disable the access unit timeout temporarily while a seek operation is in progress.
0714c8262054cb6a532025feb082b21b502a128b 11-Oct-2010 Andreas Huber <andih@google.com> am d96a068c: am bb245d35: Merge "Increase scratch buffers sizes in mp3 software decoder, this integrates a PV master/opensource patch." into gingerbread

Merge commit 'd96a068cc7b3519a5b7d122a12025684b6f28c76'

* commit 'd96a068cc7b3519a5b7d122a12025684b6f28c76':
Increase scratch buffers sizes in mp3 software decoder, this integrates a PV master/opensource patch.
0e4d896cb9ab813131c45b3b1fcd4cc66d341468 10-Oct-2010 Andreas Huber <andih@google.com> am bb708373: am 949f7d90: Merge "Work to support switching transport streams mid-stream and signalling discontinuities to the decoder." into gingerbread

Merge commit 'bb70837397e3fb437b7b4443b37d7a83c11e6e43'

* commit 'bb70837397e3fb437b7b4443b37d7a83c11e6e43':
Work to support switching transport streams mid-stream and signalling discontinuities to the decoder.
79e0ac144ca9bb771e2c6b1954c882da12a4bea8 10-Oct-2010 Andreas Huber <andih@google.com> am 45bd1159: am 02654f01: Merge "On this particular device the hardware video decoder spits out buffers that don\'t actually contain our video data, so we cannot use them to restore the video frame after suspend/resume." into gingerbread

Merge commit '45bd1159fa34b51ba077e0cde760d171ca092552'

* commit '45bd1159fa34b51ba077e0cde760d171ca092552':
On this particular device the hardware video decoder spits out buffers that don't actually contain our video data, so we cannot use them to restore the video frame after suspend/resume.
2b37ced30f89437c804c3945b901019b86d210ae 09-Oct-2010 James Dong <jdong@google.com> 0-memcpy video recording framework

Part III: Move startRecording() call earlier, asking camera hal
to allocate video buffers before CameraSource.start() is called.

Change-Id: I3f1d7d5636ca2644fe52af61f297d48c6b1ce89d
ameraSource.cpp
54ff19ac69ace7c05ea90d225e26dab3b133f487 08-Oct-2010 James Dong <jdong@google.com> Move Camera specific logic out from StagefrightRecorder to CameraSource

o updated comments and streamlined the logic in
checkVideoSize() and checkFrameRate() as suggested

Change-Id: I49d04ac7998d4a215997aa63555dfb6e814e38d3
ameraSource.cpp
ameraSourceTimeLapse.cpp
0dcd837af4169bdb6fb2a0c384722dc4f57433c6 09-Oct-2010 Andreas Huber <andih@google.com> RTSP seeking is now asynchronous, MediaPlayer is not notified that the seek is complete until it actually is. Ignore seek requests on live streams.

Change-Id: Ie61230cd60dd6c682baf72529100369ad6291189
related-to-bug: 3073955
wesomePlayer.cpp
nclude/ARTSPController.h
nclude/AwesomePlayer.h
tsp/ARTSPController.cpp
tsp/MyHandler.h
c68a48c474f609df3eeb7d9738675d6ac8835e0a 08-Oct-2010 Andreas Huber <andih@google.com> Refactor some more h.264 utility code out into avc_utils. Work around a hardware decoder issue by making sure the first access unit submitted to a decoder at startup or after seek is an IDR.

Change-Id: I61936601e55df7e4c23a8c13087579a4f85bd6e6
vc_utils.cpp
nclude/avc_utils.h
peg2ts/ESQueue.cpp
peg2ts/ESQueue.h
tsp/APacketSource.cpp
tsp/APacketSource.h
6f3cba53efdd985ab13734c7ad90eb373ae9b9f7 08-Oct-2010 Andreas Huber <andih@google.com> Merge "Disable 10secs forward/backward seeking for rtsp as seek is a very expensive operation there. Decouple the 10sec forward/backward button functionality from seekbar functionality." into gingerbread
e6d26450e5a01be5b7f1343578e7237e68db7737 08-Oct-2010 Andreas Huber <andih@google.com> Merge "Respect the cropping rectangle when extracting the video dimensions from the sequence parameter set of H.264 streams." into gingerbread
2d511ff0eb4c6127659795b642825c55879a15bc 08-Oct-2010 Andreas Huber <andih@google.com> Respect the cropping rectangle when extracting the video dimensions from the sequence parameter set of H.264 streams.

Change-Id: Id7f21d5ab8533b4e17ceaa8619a39c27f0306150
vc_utils.cpp
70f521de2675ce6eedf4b22beed94ea1289b0f38 08-Oct-2010 Andreas Huber <andih@google.com> Disable 10secs forward/backward seeking for rtsp as seek is a very expensive operation there. Decouple the 10sec forward/backward button functionality from seekbar functionality.

Change-Id: I016e79b688774f8ee91ac53216197b5fb9cb41b2
related-to-bug: 3073955
wesomePlayer.cpp
ediaExtractor.cpp
nclude/ARTSPController.h
cb71fba37c51352d6e980bfe1f3e93ff803d550e 08-Oct-2010 James Dong <jdong@google.com> Merge "Name the writer threads" into gingerbread
a9d9dd2425c32f6868c35f49a3e8f29aafba931a 08-Oct-2010 Andreas Huber <andih@google.com> Disable the access unit timeout temporarily while a seek operation is in progress.

Change-Id: I116cb76342aae4168f34ebae49ecb2301702a0ea
related-to-bug: 3073955
tsp/MyHandler.h
a6f61fc8e3d06373c17f0a38ff600e2b71c414fa 08-Oct-2010 James Dong <jdong@google.com> Name the writer threads

Change-Id: I51461c3800ac5850e21ff398e80eb20b562264b3
MRWriter.cpp
PEG4Writer.cpp
f4ea1f92bc56a8ffceddba0dbd3979fe0219b13c 08-Oct-2010 Andreas Huber <andih@google.com> Increase scratch buffers sizes in mp3 software decoder, this integrates a PV master/opensource patch.

Change-Id: I5a637f1b380e44c94040ec507843d58a1f5a9b61
related-to-bug: 3065605
odecs/mp3dec/src/pvmp3_reorder.cpp
odecs/mp3dec/src/pvmp3_reorder.h
odecs/mp3dec/src/s_tmp3dec_file.h
fa6a5d481474ba11517c8d0eb6431595d387b81e 07-Oct-2010 Andreas Huber <andih@google.com> Merge "Some instrumentation of OMXCodec for future investigation and a possibly temporary fix for the green tinge on video playback."
a240812f10335fe4c8677da824293b7e04aad7e9 07-Oct-2010 Andreas Huber <andih@google.com> Some instrumentation of OMXCodec for future investigation and a possibly temporary fix for the green tinge on video playback.

Change-Id: Iee9cd7b0c326bac96382007b4ea077d4368d7d01
related-to-bug: 3051572
MXCodec.cpp
olorconversion/SoftwareRenderer.cpp
2eb16c2250c57a8009ab58e9aeb1606ab62bbbbc 07-Oct-2010 Andreas Huber <andih@google.com> am 56ee1080: am 17bc4f65: Merge "Make sure to call AudioTrack::stop() instead of AudioTrack::pause() after submitting all samples to AudioTrack to make sure those remaining samples are actually played out." into gingerbread

Merge commit '56ee1080f004110bff622e5b60c243d9cabfe120'

* commit '56ee1080f004110bff622e5b60c243d9cabfe120':
Make sure to call AudioTrack::stop() instead of AudioTrack::pause() after submitting all samples to AudioTrack to make sure those remaining samples are actually played out.
2a4d22d79e927f2245537921e10fc5fda1c47a29 08-Sep-2010 Andreas Huber <andih@google.com> Work to support switching transport streams mid-stream and signalling discontinuities to the decoder.

Change-Id: I7150e5e7342e1117c524856b204aadcb763e06ed
related-to-bug: 2368598
wesomePlayer.cpp
MXCodec.cpp
ttplive/LiveSource.cpp
ttplive/M3UParser.cpp
nclude/AwesomePlayer.h
nclude/LiveSource.h
nclude/M3UParser.h
peg2ts/ATSParser.cpp
peg2ts/ATSParser.h
peg2ts/AnotherPacketSource.cpp
peg2ts/AnotherPacketSource.h
peg2ts/ESQueue.cpp
peg2ts/ESQueue.h
peg2ts/MPEG2TSExtractor.cpp
2b82e9652ba049e754c2cc74e381282f231d5fbf 07-Oct-2010 Andreas Huber <andih@google.com> On this particular device the hardware video decoder spits out buffers that don't actually contain our video data, so we cannot use them to restore the video frame after suspend/resume.

Change-Id: I1b8fe68c1766299844fe84ebbff49cb8b3e4cc7c
related-to-bug: 3070094
wesomePlayer.cpp
MXCodec.cpp
tagefrightMetadataRetriever.cpp
eba2d0611923ad75c3b894ebe5ce3d5fc7f6a946 07-Oct-2010 James Dong <jdong@google.com> am a86a6c4e: am 6f1c7bda: Merge "Fixed an issue where the reserved free space in the file writer was larger than intended" into gingerbread

Merge commit 'a86a6c4e326bfdfc351dacca95b23bb78f78efbe'

* commit 'a86a6c4e326bfdfc351dacca95b23bb78f78efbe':
Fixed an issue where the reserved free space in the file writer was larger than intended
185a9a54fb29d3d691c6ec16a7403af194a023b9 06-Oct-2010 James Dong <jdong@google.com> am 6a02ba01: am b99f0c7e: Merge "Resilent media time stamp adjustment" into gingerbread

Merge commit '6a02ba0100e030e0b8bf2b6f195eabac1f1812db'

* commit '6a02ba0100e030e0b8bf2b6f195eabac1f1812db':
Resilent media time stamp adjustment
b2e3954c94717e43b3dc9b880564f166cfbbc0a2 05-Oct-2010 Andreas Huber <andih@google.com> Make sure to call AudioTrack::stop() instead of AudioTrack::pause() after submitting all samples to AudioTrack to make sure those remaining samples are actually played out.

Change-Id: Id574a0203efcb5e565f1b0fe77869fc33b9a9d56
udioPlayer.cpp
wesomePlayer.cpp
nclude/AwesomePlayer.h
a007e8229fb2be4866c483f9cd6c4af238a2da5e 05-Oct-2010 James Dong <jdong@google.com> Fixed an issue where the reserved free space in the file writer was larger than intended

The problem was that even though user does not explicitly request the max file size
limit via MediaRecorder.setMaxFileSize(), the file writer sets an implicit file
size limit if 32-bit file offset is used on user's behalf. The reserved free space
is estimated based on the file size, if the file size limit is set by the user.

The fix is to add an extra bool to tell the difference between an
explit requested file size and an implicit file limit and use that
to set the estimated moov box size accordingly.

Change-Id: I731aca6c7833aa764ed7b905edb77721577471b3
PEG4Writer.cpp
3754a7901b6bed448eaecfbd29a4705b30a6b656 05-Oct-2010 James Dong <jdong@google.com> Merge "Resilent media time stamp adjustment" into gingerbread
872a481558350634a3fd5cb67939de288af00ecb 03-Oct-2010 James Dong <jdong@google.com> Resilent media time stamp adjustment

Change-Id: I13ab87c05f26bb11a3cc9bf8559f98e6ea0752db
PEG4Writer.cpp
05425bc043f6dc45cc093065d5270b70100681b5 04-Oct-2010 Andreas Huber <andih@google.com> am dfd03fe9: am aa1a694d: Merge "Make sure to finish the preparation phase even EOS occurs before we consider the cache to be completely filled up." into gingerbread

Merge commit 'dfd03fe99336792b6dae6c4c9fd5f5ba157e054c'

* commit 'dfd03fe99336792b6dae6c4c9fd5f5ba157e054c':
Make sure to finish the preparation phase even EOS occurs before we consider the cache to be completely filled up.
83977eb230d829cfe520f55d7977037a904ce548 04-Oct-2010 Andreas Huber <andih@google.com> Make sure to finish the preparation phase even EOS occurs before we consider the cache to be completely filled up.

Change-Id: I29143e357fb6ea7b860636100e010f2ea7436798
related-to-bug: 3037389
wesomePlayer.cpp
0074d69add482a351b4e0004d62b1cb8ed475505 04-Oct-2010 Andreas Huber <andih@google.com> am bb506dab: am 7fa69374: Merge "Don\'t retrieve metadata unless necessary for ogg-vorbis ringtone auto-looping." into gingerbread

Merge commit 'bb506dab1ff10e6939fcd0457571e0b46793dd80'

* commit 'bb506dab1ff10e6939fcd0457571e0b46793dd80':
Don't retrieve metadata unless necessary for ogg-vorbis ringtone auto-looping.
6954535ba64374e4e941cd83019a7af53edfb098 04-Oct-2010 Andreas Huber <andih@google.com> Don't retrieve metadata unless necessary for ogg-vorbis ringtone auto-looping.

Change-Id: Iaf5880bb3376f9cbf22aefe198878eaf6f3f08c7
related-to-bug: 3037389
wesomePlayer.cpp
c2945f514a66ac3ec2972f8d9dbb6219bb8f243a 02-Oct-2010 James Dong <jdong@google.com> am 2bf74b8f: am 6c609b6a: Merge "Turn off media time adjustment by default" into gingerbread

Merge commit '2bf74b8f0ad59b1379534e760a356adeb3673fd2'

* commit '2bf74b8f0ad59b1379534e760a356adeb3673fd2':
Turn off media time adjustment by default
1fd01cbce6edb54334579f89e49a679207204619 02-Oct-2010 James Dong <jdong@google.com> Merge "Turn off media time adjustment by default" into gingerbread
d0ea545d8357e7d86ad5f19cb2c6499c91786473 02-Oct-2010 James Dong <jdong@google.com> Turn off media time adjustment by default

Change-Id: I1f8021d605d0fd896e0639607a84e3f7c459612e
PEG4Writer.cpp
01c048aad73aec73f03cc79538839b08b8c1d1c7 01-Oct-2010 Andreas Huber <andih@google.com> am 57853559: am e619a9da: Merge "Start playing live streams from the start, no the middle..." into gingerbread

Merge commit '57853559c31154db9c202d653065c592169c5027'

* commit '57853559c31154db9c202d653065c592169c5027':
Start playing live streams from the start, no the middle...
a49c0d09653da20a7194d96fa43b230b2580ba75 01-Oct-2010 Andreas Huber <andih@google.com> Merge "Start playing live streams from the start, no the middle..." into gingerbread
fa1dc774ac8b929666519c57560bf2ce6d422e0f 01-Oct-2010 Andreas Huber <andih@google.com> am d6d5cfb9: am 469b8033: Merge "Remove development-only code." into gingerbread

Merge commit 'd6d5cfb91469d4f060db7cfccfd883903ce95f16'

* commit 'd6d5cfb91469d4f060db7cfccfd883903ce95f16':
Remove development-only code.
6466853f05e3f3b050de210490cc0fc855e60bb7 01-Oct-2010 Andreas Huber <andih@google.com> Start playing live streams from the start, no the middle...

Change-Id: Ie01ba1250b51155cb1fb32fc3340189a16c01476
related-to-bug: 2368598
ttplive/LiveSource.cpp
969247b7ab387743035dece47356678c8aec2ac4 01-Oct-2010 Andreas Huber <andih@google.com> am 14401bf7: am d1398db3: Merge "Squashed commit of the following:" into gingerbread

Merge commit '14401bf7bca34c692f248406c78bd8b49783217a'

* commit '14401bf7bca34c692f248406c78bd8b49783217a':
Squashed commit of the following:
caf5a483b16c2d123eddcf28241ad71131568033 01-Oct-2010 Andreas Huber <andih@google.com> Remove development-only code.

Change-Id: Ic2ca0efb631eb779ca157fb01b02aa19a1222c06
related-to-bug: 2368598
wesomePlayer.cpp
6a63a939601645404fd98f58c19cc38ca818d99e 01-Oct-2010 Andreas Huber <andih@google.com> Squashed commit of the following:

commit 46744c7697f29aec71aed8de3c95ce035c284d97
Author: Andreas Huber <andih@google.com>
Date: Thu Sep 30 16:44:57 2010 -0700

better separation of access units

Change-Id: I5a9e2138aed341f0bcf22cfe368a15ca5ea5a73c

commit d34952ac0feb1ae722ff65824d7353335502219b
Author: Andreas Huber <andih@google.com>
Date: Thu Sep 30 15:35:01 2010 -0700

Support for ES packets that do not start on PES packet boundaries.

Change-Id: I2cf012833948eddfb20b16a1901206cf22ce71e4
related-to-bug: 2368598

Change-Id: Ib9329bd6bb7149b5a6e2483788a96b1b158952fc
wesomePlayer.cpp
vc_utils.cpp
odecs/avc/dec/AVCDecoder.cpp
nclude/avc_utils.h
peg2ts/ATSParser.cpp
peg2ts/Android.mk
peg2ts/ESQueue.cpp
peg2ts/ESQueue.h
peg2ts/MPEG2TSExtractor.cpp
02d615bcb70a1bfe26dd5e3d719d621ee5c4ed87 29-Sep-2010 Chia-chi Yeh <chiachi@android.com> am 10b15c08: am d6877fa4: Merge "AMRNB: use Frame_Type_3GPP defined in frame_type_3gpp.h instead." into gingerbread

Merge commit '10b15c08bb8ffb1fddeac2e79c882a23ffe7a3de'

* commit '10b15c08bb8ffb1fddeac2e79c882a23ffe7a3de':
AMRNB: use Frame_Type_3GPP defined in frame_type_3gpp.h instead.
922855214d0e8ae4159794d7f751f780b3243552 29-Sep-2010 Chia-chi Yeh <chiachi@android.com> Merge "AMRNB: use Frame_Type_3GPP defined in frame_type_3gpp.h instead." into gingerbread
88cfb59fde78a07ac8797008cf79b22193e983d9 29-Sep-2010 Chia-chi Yeh <chiachi@android.com> AMRNB: use Frame_Type_3GPP defined in frame_type_3gpp.h instead.

This allows gsmamr_enc.h and gsmamr_dec.h to be included in the same
file without conflict definition.

Change-Id: I1c8dac235c122735ba14a1af2fda48c0f8d9f87b
odecs/amrnb/common/include/frame_type_3gpp.h
odecs/amrnb/dec/src/gsmamr_dec.h
odecs/amrnb/enc/src/gsmamr_enc.h
b91d92d7147c10dd19987706d30dea011ff459af 29-Sep-2010 Andreas Huber <andih@google.com> am 387bdcda: am 88a995ed: Merge "Properly flush the AudioTrack/AudioSink on a seek request and make sure that both the mp3 decoder and aac software decoders start fresh after a seek without any dependency on previously decoded content." into gingerbread

Merge commit '387bdcdadc312c8e9f702da164bd8bd53cbd92fd'

* commit '387bdcdadc312c8e9f702da164bd8bd53cbd92fd':
Properly flush the AudioTrack/AudioSink on a seek request and make sure that both the mp3 decoder and aac software decoders start fresh after a seek without any dependency on previously decoded content.
fb9b87b6c22d940e5e7cb4b5e7cfae99015a0131 28-Sep-2010 Andreas Huber <andih@google.com> am d6c30e8c: am be045061: Merge "Instead of constantly polling the AudioPlayer to see if it reached EOS or finished seeking, initiate the notification from the AudioPlayer when the event happens." into gingerbread

Merge commit 'd6c30e8c1521bc584f33500b8ee897dafdfec023'

* commit 'd6c30e8c1521bc584f33500b8ee897dafdfec023':
Instead of constantly polling the AudioPlayer to see if it reached EOS or finished seeking, initiate the notification from the AudioPlayer when the event happens.
8267b65adcfd944c3f465425183ad7f38b0999e5 28-Sep-2010 Andreas Huber <andih@google.com> am c889bbfa: am 4769f579: Merge "Vorbis files may have more samples encoded that should be used, i.e. we have to trim samples at the end of the stream. This is crucial for proper looping of some audio files." into gingerbread

Merge commit 'c889bbfa965f4ba90636f561c5e1353289d4cb06'

* commit 'c889bbfa965f4ba90636f561c5e1353289d4cb06':
Vorbis files may have more samples encoded that should be used, i.e. we have to trim samples at the end of the stream. This is crucial for proper looping of some audio files.
b8b92e517c4168a96f4d29d35cba7a87f0913c87 28-Sep-2010 Andreas Huber <andih@google.com> am 9d591860: am 3a9cc8ce: Merge "Squashed commit of the following:" into gingerbread

Merge commit '9d59186068891834272c2e3ee6f9c4228af24656'

* commit '9d59186068891834272c2e3ee6f9c4228af24656':
Squashed commit of the following:
036fad5034d05beecae19da6da46e1ce7be78e64 28-Sep-2010 Andreas Huber <andih@google.com> Merge "Properly flush the AudioTrack/AudioSink on a seek request and make sure that both the mp3 decoder and aac software decoders start fresh after a seek without any dependency on previously decoded content." into gingerbread
c7d368d990303dc5369c7c61579f88c5059dc8d7 28-Sep-2010 Andreas Huber <andih@google.com> Properly flush the AudioTrack/AudioSink on a seek request and make sure that both the mp3 decoder and aac software decoders start fresh after a seek without any dependency on previously decoded content.

Change-Id: I4909fdf19518dbabb6c340e2a31b50dfe6c5b067
related-to-bug: 3029947
udioPlayer.cpp
odecs/aacdec/AACDecoder.cpp
odecs/mp3dec/MP3Decoder.cpp
6fd2b44b156c4ef28e131183f0fe8f7dcecfcc6e 28-Sep-2010 Andreas Huber <andih@google.com> Merge "Instead of constantly polling the AudioPlayer to see if it reached EOS or finished seeking, initiate the notification from the AudioPlayer when the event happens." into gingerbread
ed54ad0f8619ae416b0968ade6248894cbfc4dba 28-Sep-2010 Andreas Huber <andih@google.com> Instead of constantly polling the AudioPlayer to see if it reached EOS or finished seeking, initiate the notification from the AudioPlayer when the event happens.

Change-Id: I43875b6adaf96d4e982ef3dfc3d6c8f7034ac51d
related-to-bug: 3036592
udioPlayer.cpp
wesomePlayer.cpp
nclude/AwesomePlayer.h
8211da9eabe28037ebcc23bbfbbe20cb21cb0cdc 28-Sep-2010 Andreas Huber <andih@google.com> Merge "Vorbis files may have more samples encoded that should be used, i.e. we have to trim samples at the end of the stream. This is crucial for proper looping of some audio files." into gingerbread
640d660f03b2dd52969ebcdf57d1d4b371581781 28-Sep-2010 Andreas Huber <andih@google.com> Merge "Squashed commit of the following:" into gingerbread
db6222212528637d8f2afa7f49fc3c8c915bafbe 28-Sep-2010 Andreas Huber <andih@google.com> Vorbis files may have more samples encoded that should be used, i.e. we have to trim samples at the end of the stream. This is crucial for proper looping of some audio files.

related-to-bug: 3036592
Change-Id: Ib142b171c829ed74156c0281d9d4543fcc96c802
ggExtractor.cpp
odecs/vorbis/dec/VorbisDecoder.cpp
nclude/VorbisDecoder.h
0da4dab0a45a2bc1d95cbc6ef6a4850ed2569584 27-Sep-2010 Andreas Huber <andih@google.com> Squashed commit of the following:

commit 29a4d3effb05a2e074cb0693316ab1977baeb0b6
Author: Andreas Huber <andih@google.com>
Date: Mon Sep 27 12:01:32 2010 -0700

Fully working implementation of MPEG2TSWriter (for AAC and AVC sources).

Change-Id: I8a32a47565b647bf6c078c520e39565e08ea0d84

commit f4dec4c3899f3be393508e180d6c07e249d3335e
Author: Andreas Huber <andih@google.com>
Date: Mon Sep 27 10:36:31 2010 -0700

More reliable identification of MPEG2 transport streams. Don't keep scanning forever in case the stream does not have both audio and video tracks.

Change-Id: Icc5b4e8be145b2805e8776559546a6818342aea7

commit 4fe3cc942f9b3d3cf54138b828c41214aa916dd2
Author: Andreas Huber <andih@google.com>
Date: Mon Sep 27 08:23:39 2010 -0700

test code

Change-Id: I16560a17661407d06497f99ff88230724bb898af

commit 64d988b24f49f179a90fa677be11c823959e734b
Author: Andreas Huber <andih@google.com>
Date: Thu Sep 23 14:42:52 2010 -0700

First shot at supporting writing to an MPEG2 transport stream.

Change-Id: Ie537939a99fa3ddc0c7661c47c18277584817c74

Change-Id: If78fd034af8f6e8ceac8dbeff96d5ecb3f6b96dc
ndroid.mk
PEG2TSWriter.cpp
peg2ts/ATSParser.cpp
peg2ts/MPEG2TSExtractor.cpp
c0540f0bfd5cc0a67e96855496918c9cd212f1ea 27-Sep-2010 James Dong <jdong@google.com> am a9f17c8b: am bf47092e: Merge "Fix track duration calculation if the start timestamp is non-zero" into gingerbread

Merge commit 'a9f17c8b424b505b50fdfb920cab37c32cbe628d'

* commit 'a9f17c8b424b505b50fdfb920cab37c32cbe628d':
Fix track duration calculation if the start timestamp is non-zero
e2dc4aa0578dea9ab8c13ea4b69b7e6d0d1711d8 27-Sep-2010 James Dong <jdong@google.com> Merge "Fix track duration calculation if the start timestamp is non-zero" into gingerbread
8428af5381e835cc783b7ecb0d71cb60961c99c2 24-Sep-2010 James Dong <jdong@google.com> Fix track duration calculation if the start timestamp is non-zero

o Updated the comments in the patch
o Added some additional checks on the timestamp

Change-Id: I8ad81eb6bfe358c1db5245cbb52efc905cdc234c
PEG4Writer.cpp
703f59f1c935c264dc11567d3d5183c76cc370ba 27-Sep-2010 Andreas Huber <andih@google.com> am fa5c8fc4: am abaabb2c: Merge "Support other kinds of HTTP redirect in NuHTTPDataSource" into gingerbread

Merge commit 'fa5c8fc4a48fab5c5c612bd4eed6ea9c568f6afc'

* commit 'fa5c8fc4a48fab5c5c612bd4eed6ea9c568f6afc':
Support other kinds of HTTP redirect in NuHTTPDataSource
7539a0594204c3436571bacabe50a14c78dedf5f 27-Sep-2010 Andreas Huber <andih@google.com> Support other kinds of HTTP redirect in NuHTTPDataSource

Change-Id: I3268a94cfb48cee9caa8914804d7907ff91d8a8e
related-to-bug: 3037686
uHTTPDataSource.cpp
6d59aa4bb8e9734a9197290a027356e88552f59a 24-Sep-2010 James Dong <jdong@google.com> Added two more video encoders

Change-Id: Ia426da5bfc255974d7bbf3915a473543e0841dc9
MXCodec.cpp
0597872f3ff7cc3c8549c26483158c22c3d09126 23-Sep-2010 Andreas Huber <andih@google.com> am 13770dcc: am 7b2ed5d7: Merge "Depending on our preference to write 2-byte or 4-byte NALs, patch the codec specific data \'avcC\' accordingly." into gingerbread

Merge commit '13770dcce2cc1b4268ba092b59bc5a4c049f3a33'

* commit '13770dcce2cc1b4268ba092b59bc5a4c049f3a33':
Depending on our preference to write 2-byte or 4-byte NALs, patch the codec specific data 'avcC' accordingly.
1f78badb5398c17526be021e3c9e3c4aa24536ec 23-Sep-2010 Andreas Huber <andih@google.com> Merge "Depending on our preference to write 2-byte or 4-byte NALs, patch the codec specific data 'avcC' accordingly." into gingerbread
95fcef25b48e35b625899288971ab628efbf8584 23-Sep-2010 Andreas Huber <andih@google.com> Depending on our preference to write 2-byte or 4-byte NALs, patch the codec specific data 'avcC' accordingly.

Change-Id: I1423923fafbcac6911218277e2bbfa068e49dcc6
PEG4Writer.cpp
45adaf601ea69f8bd060c8a219e1ccf7045bbfa4 23-Sep-2010 James Dong <jdong@google.com> am 693a430c: am 903fc221: Ignore errors from correction parameter query and config for M4v and H263 encoders

Merge commit '693a430cff3c9fac503b5005e9fd5419611eddde'

* commit '693a430cff3c9fac503b5005e9fd5419611eddde':
Ignore errors from correction parameter query and config for M4v and H263 encoders
8872633927679cfeb77948ba7b562e07e899ef91 23-Sep-2010 James Dong <jdong@google.com> am 30c7e132: am 697bd76e: Merge "Use the advertised profile and level from M4V and H263 video encoders" into gingerbread

Merge commit '30c7e132171edf41a787d6e29d169ac467f6f1ae'

* commit '30c7e132171edf41a787d6e29d169ac467f6f1ae':
Use the advertised profile and level from M4V and H263 video encoders
59f63db5d1cdc91336a2b82e195e0000091cd6e3 23-Sep-2010 James Dong <jdong@google.com> Ignore errors from correction parameter query and config for M4v and H263 encoders

This feature is not essential for camcorder application

Change-Id: Id560632207dcf24fe361280ebe8178ea7332f22d
MXCodec.cpp
97e0fcc0cb69692a6c518e2bfaf9892a164e7f58 23-Sep-2010 James Dong <jdong@google.com> Use the advertised profile and level from M4V and H263 video encoders

This is already the case for AVC video encoder

Change-Id: I9cc97a03ab457b4bd0b21832c09f6d0aa7f5fc39
MXCodec.cpp
9fb467e5c50795afda3675efd5ba0e5cd552fd75 22-Sep-2010 Andreas Huber <andih@google.com> Raise the amount of memory set aside for omx buffer allocations in the test harness to accomodate the new requirements of some codecs.

Change-Id: I73974a336852974e2fb95a9626c1a96f296449eb
mx/tests/OMXHarness.cpp
5a808f8de7b81081ac682e96b625d45fcf43fe46 22-Sep-2010 Andreas Huber <andih@google.com> Make sure we drain the avc software decoder's output queue once we run out of input data.

Change-Id: I3d92ebae4951b618a6dfcf42936cc4c63d4de539
odecs/avc/dec/AVCDecoder.cpp
nclude/AVCDecoder.h
079cc2e29823e16ff775cebb5709bcb3a24a809d 22-Sep-2010 Andreas Huber <andih@google.com> Merge "Raise the amount of memory set aside for omx buffer allocations in the test harness to accomodate the new requirements of some codecs." into gingerbread
3cc8eb61f0931b53e4a6ea5346ac5720d01161d8 22-Sep-2010 Andreas Huber <andih@google.com> Raise the amount of memory set aside for omx buffer allocations in the test harness to accomodate the new requirements of some codecs.

Change-Id: I0650af10acb3097e9f03c6079992305540b6bc86
mx/tests/OMXHarness.cpp
9dbd5240b3096b6a44525b22d8a10057ce13cec9 22-Sep-2010 Andreas Huber <andih@google.com> Merge "Make sure we drain the avc software decoder's output queue once we run out of input data." into gingerbread
15b1eeaf7f694939873bb28a2ef223e6826ef568 22-Sep-2010 Andreas Huber <andih@google.com> Make sure we drain the avc software decoder's output queue once we run out of input data.

Change-Id: I5de540675a64ac0b170eee10691d77a647950397
odecs/avc/dec/AVCDecoder.cpp
nclude/AVCDecoder.h
a60165dbfcc44c6114ce63dba38bb3f08f614081 22-Sep-2010 Andreas Huber <andih@google.com> am 0b2affe8: am 87d208f7: Merge "This log message is codec specific." into gingerbread

Merge commit '0b2affe8f05f887fcb6ae6314e2a0e586dabe9e1'

* commit '0b2affe8f05f887fcb6ae6314e2a0e586dabe9e1':
This log message is codec specific.
3f94dacbd43b48bb629a79e45e738ead37c5debd 22-Sep-2010 Andreas Huber <andih@google.com> am af909581: am 67738486: Merge "Remove stagefright foundation\'s incompatible logging interface and update callsites." into gingerbread

Merge commit 'af90958184fc5cfa1a4190e28bcfc4fdd4a5bcd6'

* commit 'af90958184fc5cfa1a4190e28bcfc4fdd4a5bcd6':
Remove stagefright foundation's incompatible logging interface and update callsites.
a3121424e0680647e8ab7beb4229db6d8d4f337f 22-Sep-2010 Andreas Huber <andih@google.com> Merge "This log message is codec specific." into gingerbread
6e4c5c499999c04c2477b987f9e64f3ff2bf1a06 21-Sep-2010 Andreas Huber <andih@google.com> Remove stagefright foundation's incompatible logging interface and update callsites.

Change-Id: I45fba7d60530ea0f233ac3695a97306b6dc1795c
uCachedSource2.cpp
hreadedSource.cpp
oundation/ADebug.cpp
oundation/ALooperRoster.cpp
oundation/Android.mk
oundation/hexdump.cpp
peg2ts/ATSParser.cpp
tsp/AAMRAssembler.cpp
tsp/AAVCAssembler.cpp
tsp/AMPEG4ElementaryAssembler.cpp
tsp/APacketSource.cpp
tsp/ARTPConnection.cpp
tsp/ARTPSession.cpp
tsp/ARTPSource.cpp
tsp/ARTPSource.h
tsp/ARTPWriter.cpp
tsp/ARTSPConnection.cpp
tsp/ASessionDescription.cpp
tsp/MyHandler.h
tsp/UDPPusher.cpp
tsp/rtp_test.cpp
955194dc6a9f74dc4aeb4559f71f0323dc2f8166 22-Sep-2010 Andreas Huber <andih@google.com> This log message is codec specific.

Change-Id: I603ae7bd13b186a6df0a26ea9abe073e89276caf
MXCodec.cpp
ddca588b03095141035f338b5dc4bb65b105ce62 21-Sep-2010 James Dong <jdong@google.com> am e436ef09: am e5206694: Merge "Another attempt for fixing AAC+/eAAC+ related issue" into gingerbread

Merge commit 'e436ef09d205eee473d5a4a4d0a1721b8dfbe193'

* commit 'e436ef09d205eee473d5a4a4d0a1721b8dfbe193':
Another attempt for fixing AAC+/eAAC+ related issue
18269453d3c6c350c9743a03820d41a69dbb4654 18-Sep-2010 James Dong <jdong@google.com> Another attempt for fixing AAC+/eAAC+ related issue

The decoder has to decode the very first two frames (decoder specific data + first data
frame) in order to be really sure whether a stream is AAC or AAC+/eAAC+.

bug - 2966336

Change-Id: Ib12a07285933df0d6c346370a12f70e99e811881
odecs/aacdec/AACDecoder.cpp
nclude/AACDecoder.h
979d233237271c2acc0c3902508e208fce16a1c9 18-Sep-2010 Andreas Huber <andih@google.com> am 7bc600cb: am f98197a7: Make sure the message dispatcher stays around until after OMX_FreeHandle is finished in case it posts some more messages during shutdown. Clear the source as soon as possible in OMXCodec\'s destructor.

Merge commit '7bc600cb08394e60eef984843976d4f79e5d94e8'

* commit '7bc600cb08394e60eef984843976d4f79e5d94e8':
Make sure the message dispatcher stays around until after OMX_FreeHandle is finished in case it posts some more messages during shutdown. Clear the source as soon as possible in OMXCodec's destructor.
6d2969a09ffe48c1600fd48caeb6293a92e204c2 18-Sep-2010 Andreas Huber <andih@google.com> resolved conflicts for merge of 1fc97385 to master

Change-Id: I9b1fb673844eb822313067d3be16b6c1ce1f2ccb
00998fbb52dfa78ac3a4b3706d64fc612926bfbc 17-Sep-2010 Andreas Huber <andih@google.com> Make sure the message dispatcher stays around until after OMX_FreeHandle is finished in case it posts some more messages during shutdown. Clear the source as soon as possible in OMXCodec's destructor.

Change-Id: I9c896cf07dea0c3201b6f074dbaf27e6d85cd784
MXCodec.cpp
mx/OMX.cpp
78eff720c86eb6d4e3d45a144df60b2ca464d2d4 16-Sep-2010 Nipun Kwatra <nkwatra@google.com> Implemented frequent read returns for quick stop in time lapse.

If the frame capture interval is large, read will block for a long time.
Due to the way the mediaRecorder framework works, a stop() call from
mediaRecorder waits until the read returns, causing a long wait for
stop() to return. To avoid this, we return a copy of the last read
frame with the same time stamp if a frame is not available quickly.
This keeps the read() call from blocking too long. This method is
triggered when startQuickReadReturns() is called on
CameraSourceTimeLapse.

In the still camera case, also using waitRelative on Condition
instaed of sleeping, so that we can wake it up.
Also for the idle check instead of sleeping, we now wait on a
condition variable, which is woken up when the last takePicture
callback gets called.

Change-Id: Ia74386e175536aee0f44ae2f8b114c353d3d72f5
ameraSource.cpp
ameraSourceTimeLapse.cpp
095916d92ea2378aea6fc35e80e368172c02021b 16-Sep-2010 Andreas Huber <andih@google.com> Register the new OMX components.

Change-Id: I795287c63073ca86ad0f97d6afcfc85c401dc984
MXCodec.cpp
302a965f4bf5d179ccc68b7d853e2806941de020 17-Sep-2010 Andreas Huber <andih@google.com> am 92aa28ad: am a7516e90: Merge "Make sure the .wav extractor does not read data outside the bounds of the \'data\' box." into gingerbread

Merge commit '92aa28addd5dbe576b2c1b66cbc00c561402f2b9'

* commit '92aa28addd5dbe576b2c1b66cbc00c561402f2b9':
Make sure the .wav extractor does not read data outside the bounds of the 'data' box.
876742d2526fdf03190dad2ab9deb76b7c02939f 17-Sep-2010 Andreas Huber <andih@google.com> Merge "Make sure the .wav extractor does not read data outside the bounds of the 'data' box." into gingerbread
104fcb88d4125caff74f63be4ce23537ca693ac7 16-Sep-2010 Andreas Huber <andih@google.com> Make sure the .wav extractor does not read data outside the bounds of the 'data' box.

Change-Id: Icf18f9224d97e6a78328dd429ebc3a3433e5cecd
related-to-bug: 3007790
AVExtractor.cpp
e2d8ba8c36fd39eb98f604b11654aa5466673260 16-Sep-2010 James Dong <jdong@google.com> Add YUV420P color format support for video output from camera hal

Change-Id: I5c8266348d0840361c8095ce351ac85c44d4068f
ameraSource.cpp
38a7476749eb4b4fd117b6e64027870077eb22d8 16-Sep-2010 James Dong <jdong@google.com> am e30d039f: am a7f5e476: Merge "Fixed a bug in the query to the supported profiles and levels" into gingerbread

Merge commit 'e30d039f0ef797c35dd9f75e590f0b819c1c6194'

* commit 'e30d039f0ef797c35dd9f75e590f0b819c1c6194':
Fixed a bug in the query to the supported profiles and levels
0270f47ffeee4907ba1626f6871f5157e529e54e 16-Sep-2010 James Dong <jdong@google.com> Merge "Fixed a bug in the query to the supported profiles and levels" into gingerbread
ada349a3340d495a89c322dead7fea09d3538919 16-Sep-2010 Andreas Huber <andih@google.com> am 62d4ebc0: am 49e1ae22: Merge "Sometimes the avc software decoder will signal that a frame is ready but then unexpectedly fail to return the frame... stop asserting on that and return an error instead." into gingerbread

Merge commit '62d4ebc0423831dfd8165d359e5b809f00f60656'

* commit '62d4ebc0423831dfd8165d359e5b809f00f60656':
Sometimes the avc software decoder will signal that a frame is ready but then unexpectedly fail to return the frame... stop asserting on that and return an error instead.
f01691f44dcbe38a0ab3914e7c709ddc009d95dc 16-Sep-2010 James Dong <jdong@google.com> Fixed a bug in the query to the supported profiles and levels

According to OMX spec, the levels returned is the max level settings.
In fact, we could not enum all the levels.

Change-Id: Ib1cba74100512800a5761c7567894c7ea5b5a452
MXCodec.cpp
47dc308b114f2ee83f71bc9787db343ff3cc64fd 16-Sep-2010 Andreas Huber <andih@google.com> am 7a848c0d: am 8946ab26: A ThreadedSource wraps around an existing MediaSource and reads output buffers on a separate thread. It\'s now used for the vpx decoder to decode frames ahead of time to improve playback performance.

Merge commit '7a848c0d7cb1978155ab7743aadb2e07bc4bdcc6'

* commit '7a848c0d7cb1978155ab7743aadb2e07bc4bdcc6':
A ThreadedSource wraps around an existing MediaSource and reads output buffers on a separate thread. It's now used for the vpx decoder to decode frames ahead of time to improve playback performance.
72b2749aafff4643bd91b845c621fb7211b96208 16-Sep-2010 Andreas Huber <andih@google.com> Sometimes the avc software decoder will signal that a frame is ready but then unexpectedly fail to return the frame... stop asserting on that and return an error instead.

Change-Id: I6c0782b51b57e9be0fd410bd34078dc3c2b088d6
related-to-bug: 3005156
odecs/avc/dec/AVCDecoder.cpp
aae3516293e58c0b015d4109bde58c11d503433c 16-Sep-2010 Andreas Huber <andih@google.com> A ThreadedSource wraps around an existing MediaSource and reads output buffers on a separate thread. It's now used for the vpx decoder to decode frames ahead of time to improve playback performance.

Change-Id: I57a798b00adeb2c8056e85aab29a2b57aef00b63
ndroid.mk
MXCodec.cpp
hreadedSource.cpp
nclude/ThreadedSource.h
ae0de4aa0a0eb85ff28ca9db6e7edf737a90ae52 16-Sep-2010 Andreas Huber <andih@google.com> am f8297ba0: am 24a2c2b5: Merge "Upgrade to the latest .webm project code." into gingerbread

Merge commit 'f8297ba011af959331873e09612665a486e1a1a7'

* commit 'f8297ba011af959331873e09612665a486e1a1a7':
Upgrade to the latest .webm project code.
0a1b9dcf0106731e1b8113fb77e933ffaf70bd0b 16-Sep-2010 James Dong <jdong@google.com> am 0cd2472b: am 82a39f4a: Merge "Add some explicit error log messages" into gingerbread

Merge commit '0cd2472bf8a0062b56b9cd4613c44791b32fe42f'

* commit '0cd2472bf8a0062b56b9cd4613c44791b32fe42f':
Add some explicit error log messages
3bdab1621022eddf125386daa7c097c3df64b16b 16-Sep-2010 James Dong <jdong@google.com> am beb55f57: am 9f882c0b: Merge "Fix audio input sample timestamp when audio driver loses audio samples" into gingerbread

Merge commit 'beb55f572fd217174ebf8f6679792a6b22896645'

* commit 'beb55f572fd217174ebf8f6679792a6b22896645':
Fix audio input sample timestamp when audio driver loses audio samples
ac5f724d00c8ac2040f01485873b6373f8994354 16-Sep-2010 Andreas Huber <andih@google.com> am 7ff94577: am 9909b948: Merge "Various fixes to improve resilience of the rtsp stack against spurious errors instead of asserting." into gingerbread

Merge commit '7ff945775210c60e6f113fb00903449cbb05c68a'

* commit '7ff945775210c60e6f113fb00903449cbb05c68a':
Various fixes to improve resilience of the rtsp stack against spurious errors instead of asserting.
616715ab614ce25ea395a8e9a553a82637f1021d 16-Sep-2010 James Dong <jdong@google.com> Fix potential unintialized variable yuvformat

Change-Id: If0a77855d98b45769a154b25d6535f30cd41536a
ameraSourceTimeLapse.cpp
eae61939e1dc3079fac58887ad1af08d1de074c7 16-Sep-2010 Andreas Huber <andih@google.com> Merge "Upgrade to the latest .webm project code." into gingerbread
acf67ea7f5ae70a093d8b164872ad1bce502f807 16-Sep-2010 Andreas Huber <andih@google.com> Upgrade to the latest .webm project code.

Change-Id: I645eff9b7c10bf33144977e6093663407af402e2
odecs/on2/dec/VPXDecoder.cpp
d79091075e470f5c59a5400027fd41f6c9ea848a 15-Sep-2010 James Dong <jdong@google.com> Merge "Add some explicit error log messages" into gingerbread
e78d3bba024e979715383e2c2b4b086749508090 15-Sep-2010 James Dong <jdong@google.com> Merge "Fix audio input sample timestamp when audio driver loses audio samples" into gingerbread
3b93208243d6f4caab3f0b27372e95c9be8d9893 15-Sep-2010 Andreas Huber <andih@google.com> Merge "Various fixes to improve resilience of the rtsp stack against spurious errors instead of asserting." into gingerbread
6f85dba3768089679ff5e35ad2f1841918d0adb2 15-Sep-2010 Andreas Huber <andih@google.com> Various fixes to improve resilience of the rtsp stack against spurious errors instead of asserting.

Change-Id: Idbec5996ed0675c70e911b9c0514961fea099fb4
tsp/APacketSource.cpp
tsp/ARTSPConnection.cpp
tsp/MyHandler.h
3ee899e0466ecce107257beec04a2178939cf24e 15-Sep-2010 Nipun Kwatra <nkwatra@google.com> Disable shutter sound and play recording sound for still mode time lapse.

Disabling shutter sound when using still capture for time lapse recording.
We also play recording sound at the start and stop of recording as is
done for usual video recording.

Change-Id: I6a6fa0c7c867979624105eea74fc17945db1f517
ameraSourceTimeLapse.cpp
a1abc1a76741914c7bc43f1df9e32744f023ab75 14-Sep-2010 James Dong <jdong@google.com> Add some explicit error log messages

Change-Id: I8a69157b75a67f0d3c19f05775a8cb0629232299
ameraSource.cpp
PEG4Writer.cpp
MXCodec.cpp
67e9269eaeab41a6c9a18794ebb32cbd1414381c 14-Sep-2010 James Dong <jdong@google.com> Fix audio input sample timestamp when audio driver loses audio samples

Change-Id: Ic0f1489f710929af50e7714867ae5153b3242dd8
udioSource.cpp
a01b7943b59eb869911f6a43b906f44ddefdebed 10-Sep-2010 Andreas Huber <andih@google.com> am 0d661b5e: am ff4c57ad: Merge "TimedEventQueue now explicitly sets its scheduling policy to foreground as it should." into gingerbread

Merge commit '0d661b5eb42aba49de8d4d6ddc5140a8b2348055'

* commit '0d661b5eb42aba49de8d4d6ddc5140a8b2348055':
TimedEventQueue now explicitly sets its scheduling policy to foreground as it should.
acb5621440968ddf62651a2e6c1ddb69cf675972 10-Sep-2010 Andreas Huber <andih@google.com> TimedEventQueue now explicitly sets its scheduling policy to foreground as it should.

Change-Id: I630c9fb51686d87a4075f01a6d7f6f9139ddcb4b
related-to-bug: 2944452
imedEventQueue.cpp
19997876b3af80adc2ae7395e6fab053268026fc 09-Sep-2010 Andreas Huber <andih@google.com> am 8986f62b: am f3de053c: Merge "Instead of asserting return a runtime error if the maximum sample size cannot be determined." into gingerbread

Merge commit '8986f62b30e494b68476ff8ef81acd4b1dd22674'

* commit '8986f62b30e494b68476ff8ef81acd4b1dd22674':
Instead of asserting return a runtime error if the maximum sample size cannot be determined.
ea162150921988808ee83195a913f015de5a3182 09-Sep-2010 James Dong <jdong@google.com> am e19df3dc: am 5c43a7af: Merge "When 32-bit offset is used, if the requested max file size is greater than the 32-bit offset limit, set the limit to the max 32-bit offset limit." into gingerbread

Merge commit 'e19df3dca1c8a1d9f783a6722c56f6ea82189412'

* commit 'e19df3dca1c8a1d9f783a6722c56f6ea82189412':
When 32-bit offset is used,
1432a0075c0f638206a8e59e33cc81d5caea4bcf 09-Sep-2010 Andreas Huber <andih@google.com> am f0eab98c: am a063cd64: Merge "Instead of asserting, publish no tracks if an MP3Extractor is used on non-mp3 content." into gingerbread

Merge commit 'f0eab98c4ef7449eb5a5ef659cd794e0003216b3'

* commit 'f0eab98c4ef7449eb5a5ef659cd794e0003216b3':
Instead of asserting, publish no tracks if an MP3Extractor is used on non-mp3 content.
31d2a4b01517a5e5d923d066269be49207b2c805 09-Sep-2010 Andreas Huber <andih@google.com> Merge "Instead of asserting return a runtime error if the maximum sample size cannot be determined." into gingerbread
4c73f1f95838a9cc86ff7d3beb7388f98eee562a 09-Sep-2010 James Dong <jdong@google.com> Merge "When 32-bit offset is used, if the requested max file size is greater than the 32-bit offset limit, set the limit to the max 32-bit offset limit." into gingerbread
49110ce0ed95918c85eebe6e09e900b905b37e23 09-Sep-2010 Andreas Huber <andih@google.com> Instead of asserting return a runtime error if the maximum sample size cannot be determined.

Change-Id: Icf17ed04323f5415e0f9f1e4fd9f19ca60ce15ac
related-to-bug: 2602446
PEG4Extractor.cpp
772bcc27ba7c1fd42c72ecaca55d533328bd18e7 09-Sep-2010 Andreas Huber <andih@google.com> Instead of asserting, publish no tracks if an MP3Extractor is used on non-mp3 content.

Change-Id: I26db4524c5306bf2346438d2bd359c5cfb95cead
related-to-bug: 2900419
P3Extractor.cpp
nclude/MP3Extractor.h
9b2cef27bbe953c0b5c37ada9bf18d706c396513 09-Sep-2010 James Dong <jdong@google.com> am 306cd58d: am d353c840: Merge "HW audio encoder expects timestamp via kKeyTime from each input buffer" into gingerbread

Merge commit '306cd58ddcc0cb8487bc6e015f8c692eea47a334'

* commit '306cd58ddcc0cb8487bc6e015f8c692eea47a334':
HW audio encoder expects timestamp via kKeyTime from each input buffer
d2518e0c0a5bffd30b0dccb04fe7bf5b77c354b1 09-Sep-2010 James Dong <jdong@google.com> When 32-bit offset is used,
if the requested max file size is greater than the 32-bit offset limit,
set the limit to the max 32-bit offset limit.

Change-Id: Ie74cbed98469721d4280a0b87491e888948f0046
PEG4Writer.cpp
3c3763d2ee1cd1fba7fe522fbaf0faca315d8c2a 09-Sep-2010 James Dong <jdong@google.com> HW audio encoder expects timestamp via kKeyTime from each input buffer

- This fixes media server crashes on droid

Change-Id: I7191cadc5275107425ec3ee3d437b2c5295858dc
udioSource.cpp
odecs/aacenc/AACEncoder.cpp
odecs/amrnb/enc/AMRNBEncoder.cpp
odecs/amrwbenc/AMRWBEncoder.cpp
5de4999e6dd8a3f2740d20e30e8a3fccdcb76362 07-Sep-2010 Andreas Huber <andih@google.com> Don't assert on unexpected surface flinger dequeue/enqueueBuffer errors, log a warning and ignore them instead.

Change-Id: Ia45887df82d66f393520e5a4308f430010402d5e
related-to-bug: 2976248
olorconversion/SoftwareRenderer.cpp
5d7d90a0dec80114e4e299aaca69e41df6ff296a 04-Sep-2010 Nipun Kwatra <nkwatra@google.com> Merge changes I71f5b0fc,I92c7accb

* changes:
Moving decision to use still camera to CameraSourceTimeLapse
pass auxiliary video parameters.
155e833a7a5fc3e193691324cf9326da1bc3289a 02-Sep-2010 Nipun Kwatra <nkwatra@google.com> Moving decision to use still camera to CameraSourceTimeLapse

CameraSourceTimeLapse now decides whether to use still or video
camera automatically. It checks if the passed in size is a valid
preview size and if it is, then uses the video camera else uses
the still camera.

Removed from StagefrightRecorder the support to set parameter
useStillCameraForTimeLapse.

Change-Id: I71f5b0fc7080ca524792381efe918d22e41a7f36
ameraSourceTimeLapse.cpp
734c3c96787e550b4a28bdf895438a7e79f30152 04-Sep-2010 James Dong <jdong@google.com> am d6fd133d: am 9077f8ec: Merge "Not all audio source has the drift time information" into gingerbread

Merge commit 'd6fd133d18c189ab112daef9dc649d0796df5d99'

* commit 'd6fd133d18c189ab112daef9dc649d0796df5d99':
Not all audio source has the drift time information
ddba3f0424340869f7819153cc8c1037caf62919 04-Sep-2010 James Dong <jdong@google.com> Merge "Not all audio source has the drift time information" into gingerbread
49ce029a6b62681c576a51f963d734eccd4eaccd 03-Sep-2010 Andreas Huber <andih@google.com> am 8e11c822: am 9fee0b2a: Ogg files can be tagged to be automatically looping, this setting always overrides the MediaPlayer\'s setLooping setting.

Merge commit '8e11c82247151085fa165c76bfbc157bc6091ca4'

* commit '8e11c82247151085fa165c76bfbc157bc6091ca4':
Ogg files can be tagged to be automatically looping, this setting always overrides the MediaPlayer's setLooping setting.
24beeac58c36b780ae61d1fb7a3421ffe5510a1e 03-Sep-2010 Jamie Gennis <jgennis@google.com> Merge "Add the new Stagefright ANativeWindow OMX codec API."
83750eaf5a3f38c243a9e7eb81d4b2421e3a0d88 31-Aug-2010 Jamie Gennis <jgennis@google.com> Add the new Stagefright ANativeWindow OMX codec API.

This change defines the two OMX_SetParameter calls that enable OMX codecs to
interact with ANativeWindows. It also adds the plumbing to the IOMX, OMX, and
OMXNodeInstance classes to use these new APIs.

This is try 2 for this change, after reverting the first one because it broke
the build.

Change-Id: I94249b72bdb5d5719360f03d7935fcca4ece5028
nclude/OMX.h
nclude/OMXNodeInstance.h
mx/OMX.cpp
mx/OMXNodeInstance.cpp
8ae49d87b98d57d6758b0c51b95e28a6581a79f1 03-Sep-2010 Andreas Huber <andih@google.com> Ogg files can be tagged to be automatically looping, this setting always overrides the MediaPlayer's setLooping setting.

Change-Id: Ifb564c6cdf6137eac14869f9ca7d471f05a5556a
related-to-bug: 2974691
wesomePlayer.cpp
ggExtractor.cpp
nclude/AwesomePlayer.h
511ea9823b1ab1d45eb86607cb291878c70b26ae 03-Sep-2010 Andreas Huber <andih@google.com> am af7a7c34: am cc4a38c6: Merge "Properly buffer a certain amount of data on streaming sources before finishing prepare()." into gingerbread

Merge commit 'af7a7c34e0752db2b8ec3dd7fa6e8d486ea010dc'

* commit 'af7a7c34e0752db2b8ec3dd7fa6e8d486ea010dc':
Properly buffer a certain amount of data on streaming sources before finishing prepare().
1a4c79eada496dc43918440608f15410eaecd28c 03-Sep-2010 Andreas Huber <andih@google.com> Merge "Properly buffer a certain amount of data on streaming sources before finishing prepare()." into gingerbread
8650e1960905097f6f1d6aa462ccb1c93c656834 03-Sep-2010 Andreas Huber <andih@google.com> Properly buffer a certain amount of data on streaming sources before finishing prepare().

Change-Id: I39bf3c6dafcbe003b51dea4795742dcd8548f207
related-to-bug: 2875110
wesomePlayer.cpp
nclude/AwesomePlayer.h
caa68a57f0b358b8fbe17447ffa453b9120a8610 03-Sep-2010 James Dong <jdong@google.com> Not all audio source has the drift time information

Change-Id: I74e502376348ca4a6ffaa7492bed35c1355e7e62
odecs/aacenc/AACEncoder.cpp
odecs/amrnb/enc/AMRNBEncoder.cpp
odecs/amrwbenc/AMRWBEncoder.cpp
35b8b488e0822854d411976710ed55f3a1c72bf3 03-Sep-2010 James Dong <jdong@google.com> am bc1452a3: am 7755cdd6: Remove unused/debugging code from MP4 file writer

Merge commit 'bc1452a307ac61ca87bf78722701ac85100952af'

* commit 'bc1452a307ac61ca87bf78722701ac85100952af':
Remove unused/debugging code from MP4 file writer
b4d5320bda29cd9694461c9b61d0211f801ff0af 02-Sep-2010 James Dong <jdong@google.com> Remove unused/debugging code from MP4 file writer

o also makes nal length in the recorded file modifiable at runtime

Change-Id: I731b4dde7070d8d9628b36b523a5b2c011c7c2cf
PEG4Writer.cpp
92be4e1735b54e2528fed455b87c813cdd73d8c2 03-Sep-2010 James Dong <jdong@google.com> am 3c3fc97e: am 46e63b34: Merge "Better file size estimate" into gingerbread

Merge commit '3c3fc97e104bd17af608727d82e965fc28f2c89d'

* commit '3c3fc97e104bd17af608727d82e965fc28f2c89d':
Better file size estimate
1f90c4b3fda9dbd2824d67fd679f850572f114dc 02-Sep-2010 James Dong <jdong@google.com> Better file size estimate

When the recorded file becomes large, the metadata size can
no longer be ignored. This makes it possible to save the
recorded file when the storage becomes almost full at the
end of the recording session.

Change-Id: Ief038080f825c9946ce550949c03e914aec1e31a
PEG4Writer.cpp
fbc6db2e7af12b88703b4cbaa4c7b979bc9d028e 03-Sep-2010 James Dong <jdong@google.com> am bb64e554: am 7ed7668b: Merge "Calculate audio media drift time from AudioSource" into gingerbread

Merge commit 'bb64e554d9a28fcf8eebf579e91ff71b8ffef1e3'

* commit 'bb64e554d9a28fcf8eebf579e91ff71b8ffef1e3':
Calculate audio media drift time from AudioSource
d707fcb3e29707ca4a5935c294ef0b38eb5aba5f 02-Sep-2010 James Dong <jdong@google.com> Calculate audio media drift time from AudioSource

The problem was that the time to receive an output buffer
from an audio encoder is different because the encoder does not
need to read from the source for all output buffers. This leads
to large fluctuation in terms of wall clock duration between two
neighboring audio sample outputs from the audio encoder. As a
result, the media time for the video track after adjustment using
the drifting changes wildly sometimes.

This patch addresses this issue by only updating the media drift
time when an audio source input buffer is read. the wall clock
for the audio track is also calculated at the same time when
the input audio buffer is read at AudioSource.

bug - 2959800

Change-Id: I3174aa182f744784b540f0a7198524d4eee8bd7b
udioSource.cpp
PEG4Writer.cpp
odecs/aacenc/AACEncoder.cpp
odecs/amrnb/enc/AMRNBEncoder.cpp
odecs/amrwbenc/AMRWBEncoder.cpp
6faf0cd82346b23075d1f8b9f70f7af43f2c5f04 02-Sep-2010 Andreas Huber <andih@google.com> am fd0eed00: am a2511da9: Merge "Better support for buffered streaming of rtsp content, if buffer drops below a certain threshold we will temporarily pause playback until we have sufficient data." into gingerbread

Merge commit 'fd0eed007d99178092ede56ec2c4799046615f70'

* commit 'fd0eed007d99178092ede56ec2c4799046615f70':
Better support for buffered streaming of rtsp content, if buffer drops below a certain threshold we will temporarily pause playback until we have sufficient data.
955c5d0e21097a4baccc3174fa43e9cfe45cfa9b 02-Sep-2010 James Dong <jdong@google.com> am 3fd01c4d: am d3c1bae4: Merge "Make sure that if initialization fails, AudioSource still behaves well." into gingerbread

Merge commit '3fd01c4da9b8fb7796d64096b9bbd6fcdee280e6'

* commit '3fd01c4da9b8fb7796d64096b9bbd6fcdee280e6':
Make sure that if initialization fails, AudioSource still behaves well.
9b93478fef2915a1d0cbb1fe17d2788ef8b5b230 02-Sep-2010 Andreas Huber <andih@google.com> Merge "Better support for buffered streaming of rtsp content, if buffer drops below a certain threshold we will temporarily pause playback until we have sufficient data." into gingerbread
e91b46246305ba233067e06bce8d8a82e6c5b101 02-Sep-2010 James Dong <jdong@google.com> Merge "Make sure that if initialization fails, AudioSource still behaves well." into gingerbread
c9e894872c298b25fe9d74e68aa1e7287a541ac3 02-Sep-2010 Andreas Huber <andih@google.com> Better support for buffered streaming of rtsp content, if buffer drops below a certain threshold we will temporarily pause playback until we have sufficient data.

Change-Id: Ice8564e902e48c89c9c00f6651c5504b3c41fcad
related-to-bug: 2556656
wesomePlayer.cpp
nclude/ARTSPController.h
tsp/APacketSource.cpp
tsp/APacketSource.h
tsp/ARTSPController.cpp
9f2d258645826c999a93a4206df157fec2e3b0f2 01-Sep-2010 Jamie Gennis <jgennis@google.com> Revert "Merge "Add the new Stagefright ANativeWindow OMX codec API.""

This reverts commit 8a643b411e1802977f742709113ce01b06a18e12, reversing
changes made to 73ea9beaf8eb3d0027e78cbc0ac5e626c3f8deb4.
nclude/OMX.h
nclude/OMXNodeInstance.h
mx/OMX.cpp
mx/OMXNodeInstance.cpp
6e20bdf799a6f4efa6c42121a958634ea32ed5cc 01-Sep-2010 James Dong <jdong@google.com> Make sure that if initialization fails, AudioSource still behaves well.

Change-Id: I16dfc90bcb8a324d6ee9a38a5a1a31cc094c820a
udioSource.cpp
9dd4931cca8e4a2fcbcabf4eb7078648e1c029cd 01-Sep-2010 Jamie Gennis <jgennis@google.com> Merge "Add the new Stagefright ANativeWindow OMX codec API."
56f2c6e529bc62d55fc8baa7d1b52326307474d4 01-Sep-2010 Andreas Huber <andih@google.com> am 47f2cf62: am 412fc7cd: Merge "Keep gtalk video chat specific code consistent with rtsp changes." into gingerbread

Merge commit '47f2cf620731226a9311db0f864a4e1404e54b96'

* commit '47f2cf620731226a9311db0f864a4e1404e54b96':
Keep gtalk video chat specific code consistent with rtsp changes.
bcbe5af62aad9d1ef64f799fcde58ac9a8adace8 01-Sep-2010 Andreas Huber <andih@google.com> Merge "Keep gtalk video chat specific code consistent with rtsp changes." into gingerbread
8852dbbdf3ceda01a96f3c8a814822e224239494 01-Sep-2010 Andreas Huber <andih@google.com> am 021a822e: am de2b1615: Merge "Properly extract all raw_data_blocks from an ADSP mpeg4 audio buffer." into gingerbread

Merge commit '021a822e76ab34a6404486e23157db6b6c50ec3e'

* commit '021a822e76ab34a6404486e23157db6b6c50ec3e':
Properly extract all raw_data_blocks from an ADSP mpeg4 audio buffer.
559dc605bfe2deb73ad718e0d5c5dc55e27c45df 31-Aug-2010 Jamie Gennis <jgennis@google.com> Add the new Stagefright ANativeWindow OMX codec API.

This change defines the two OMX_SetParameter calls that enable OMX codecs to
interact with ANativeWindows. It also adds the plumbing to the IOMX, OMX, and
OMXNodeInstance classes to use these new APIs.

Change-Id: Ibfbf893dc3513db0b3d3221bec5708c77287cddc
nclude/OMX.h
nclude/OMXNodeInstance.h
mx/OMX.cpp
mx/OMXNodeInstance.cpp
82f7321b03eec1e40af9d681370f754ee0279582 01-Sep-2010 Andreas Huber <andih@google.com> Properly extract all raw_data_blocks from an ADSP mpeg4 audio buffer.

Change-Id: I15e21eae50beb6057024ea42a7e9bf3b8d8a0603
related-to-bug: 2368598
wesomePlayer.cpp
peg2ts/ATSParser.cpp
389636ce967af15e72817e2133907a2cb2efd1ae 01-Sep-2010 Andreas Huber <andih@google.com> Keep gtalk video chat specific code consistent with rtsp changes.

Change-Id: I5f3f46c2150e16b26674432e427f79c04a69cd8e
tsp/ARTPSession.cpp
3ef9f98aebb76018d2ee48ae4ac727a05efa63df 01-Sep-2010 Andreas Huber <andih@google.com> am 6b52911c: am 48ac68e1: Merge "Support for RFC3640 - mpeg4-generic RTP packet type, AAC-lbr and AAC-hbr." into gingerbread

Merge commit '6b52911cc7ba548fd3a240ca61eba510a8581e6f'

* commit '6b52911cc7ba548fd3a240ca61eba510a8581e6f':
Support for RFC3640 - mpeg4-generic RTP packet type, AAC-lbr and AAC-hbr.
06124758ff402512f3c7a5fb2b35d8d09a0d6c2e 31-Aug-2010 Andreas Huber <andih@google.com> Merge "Support for RFC3640 - mpeg4-generic RTP packet type, AAC-lbr and AAC-hbr." into gingerbread
16c4e8c778d8518af4c0cbefadc5d5b1272c1762 31-Aug-2010 Andreas Huber <andih@google.com> am e1a3cddd: am 99fa510e: Merge "Better detection of connection problems - timeout if no rtcp packets arrive within a certain time, not a final frame (which may take longer)" into gingerbread

Merge commit 'e1a3cddd94749a42457a8f32cf21f663f07e4edf'

* commit 'e1a3cddd94749a42457a8f32cf21f663f07e4edf':
Better detection of connection problems - timeout if no rtcp packets arrive within a certain time, not a final frame (which may take longer)
4dba3e90f211eb5f5af19b10c5d3fc8c967b0086 31-Aug-2010 Andreas Huber <andih@google.com> Support for RFC3640 - mpeg4-generic RTP packet type, AAC-lbr and AAC-hbr.

Change-Id: Ied92ea8c2448a2cb1a732c72c21c69da1913dbc8
related-to-bug: 2556656
tsp/AMPEG4ElementaryAssembler.cpp
tsp/AMPEG4ElementaryAssembler.h
tsp/APacketSource.cpp
tsp/ARTPSource.cpp
e7d3e90d8761f52a6acfdcd926f0392aca8ebb52 31-Aug-2010 Andreas Huber <andih@google.com> Better detection of connection problems - timeout if no rtcp packets arrive within a certain time, not a final frame (which may take longer)

Change-Id: I3c1ae79bb9342770e959ebdcdc6b748549b76330
related-to-bug: 2556656
tsp/ARTPConnection.cpp
tsp/MyHandler.h
ad452ffadf0ced7449395585a55255c915734e17 30-Aug-2010 Nipun Kwatra <nkwatra@google.com> Added VideoSourceDownSampler

VideoSourceDownSampler takes in a real video source. The MediaSource
interface is then implemented by shortcircuiting calls to this real source,
except for the read() function. For read we first call read of the real
source, then downsample the frame to the desired size and return that.

Change-Id: I6e1b377e043e136a70a7b03792eb9165bbe26398
ndroid.mk
ideoSourceDownSampler.cpp
9c075bca0b75093ca0514a3c8f74d73c8e9e83fd 27-Aug-2010 Nipun Kwatra <nkwatra@google.com> Adding support for parallel recording sessions.

- Added setOutputFileAuxiliary to pass the auxiliary file descriptor. The java
interface through JNI will be checked in next.

- renamed setupCameraSource to setupCamera as the function just sets the camera.
- Added setupCameraSource which sets up the camera source. This functionality
was in setupVideoEncoder before.
- setupVideoEncoder now takes in a cameraSource instead of creating it on it
own.

- Refactored startMPEG4Recording() to use setupMPEG4Recording,
setupMPEG4MetaData.
- setupMPEG4Recording() takes in file descriptor, bitrates to setup a mpeg4
writer. This function can be called multiple times to setup multiple
writers.
- Added setupMPEG4MetaData() for setting up the meta data for mpeg4 writer.
startMPEG4Recording() now calls setupMPEG4Recording, setupMPEG4MetaData for
each recording session.

Change-Id: I07f5334a1ff8e12a36f58e94129fcfa6add2208b
ndroid.mk
d0e5b406dd0f86b01b3f550fbb894a7492454da2 31-Aug-2010 Andreas Huber <andih@google.com> Merge "Make sure we only reallocate buffers on a genuine port definition change."
5e9d8a22e974627e1b3273cc3ca3277998d93ed4 31-Aug-2010 Andreas Huber <andih@google.com> Make sure we only reallocate buffers on a genuine port definition change.

Change-Id: I434be98700e5d9333f75a3a9a8c78f1acc7e7247
related-to-bug: 2953523
MXCodec.cpp
ca999e0f936fc83f321e31ae13f93348d3f7454c 31-Aug-2010 Andreas Huber <andih@google.com> am 03e83d4a: am 68ae91cb: Merge "Recent changes to the rtsp code require every buffer fed to the packet source to have a timestamp, we\'re ignoring timestamps for gtalk videochat but we still have to have a placeholder." into gingerbread

Merge commit '03e83d4ad909f5c07fb2011e03348a413453e909'

* commit '03e83d4ad909f5c07fb2011e03348a413453e909':
Recent changes to the rtsp code require every buffer fed to the packet source to have a timestamp, we're ignoring timestamps for gtalk videochat but we still have to have a placeholder.
5d5f5dfcc16756fe80a7c46cff0949fce9d54fe9 31-Aug-2010 Andreas Huber <andih@google.com> Merge "Recent changes to the rtsp code require every buffer fed to the packet source to have a timestamp, we're ignoring timestamps for gtalk videochat but we still have to have a placeholder." into gingerbread
b186054757f4743eb9a6d6e81d262b9c7b36bec7 31-Aug-2010 Andreas Huber <andih@google.com> Recent changes to the rtsp code require every buffer fed to the packet source to have a timestamp, we're ignoring timestamps for gtalk videochat but we still have to have a placeholder.

Change-Id: Ib8615ce5a89a9a846ee2f9f96cdfb23462f72c7a
tsp/ARTPSession.cpp
b62029edb6e0f97759ffb6d8f587267bee2dc31b 31-Aug-2010 Andreas Huber <andih@google.com> am 987556bc: am abb8398e: Merge "Instead of closing the connection altogether if no UDP packets arrive after a certain time, try changing transports (to interleaved TCP). Also properly close the sockets on disconnection." into gingerbread

Merge commit '987556bc9bc1a61415b6e65bd600b8daf5b24d30'

* commit '987556bc9bc1a61415b6e65bd600b8daf5b24d30':
Instead of closing the connection altogether if no UDP packets arrive after a certain time, try changing transports (to interleaved TCP). Also properly close the sockets on disconnection.
7aef03379179c109c2547c33c410bfc93c8db576 31-Aug-2010 Andreas Huber <andih@google.com> Instead of closing the connection altogether if no UDP packets arrive after a certain time, try changing transports (to interleaved TCP). Also properly close the sockets on disconnection.

Change-Id: Ie8d6a3865a0477e28d4b76bb9038e468451287b1
related-to-bug: 2556656
tsp/ARTPConnection.cpp
tsp/MyHandler.h
9d876aca5ede85e6d9ccb82f11fae2834955c6f9 30-Aug-2010 Andreas Huber <andih@google.com> am 7ed9104c: am f6639c46: Finetune some rtsp timeout constants.

Merge commit '7ed9104c3acb172a480ebd7fd456fe69efd1ec3d'

* commit '7ed9104c3acb172a480ebd7fd456fe69efd1ec3d':
Finetune some rtsp timeout constants.
c5c4286bebffa4c2a9539c8e09207c3130351531 30-Aug-2010 Andreas Huber <andih@google.com> am 6df6d606: am df992ac9: Merge "ALoopers can now be named (useful to distinguish threads)." into gingerbread

Merge commit '6df6d60681be9d524ce7fc07f2511008de424d27'

* commit '6df6d60681be9d524ce7fc07f2511008de424d27':
ALoopers can now be named (useful to distinguish threads).
e56121bc4cb29c91d736eab181b1f51c4f125e78 30-Aug-2010 Andreas Huber <andih@google.com> Finetune some rtsp timeout constants.

Change-Id: Ice731c5097c2a2dee8a7f0cd45b547cd34f532c6
tsp/MyHandler.h
c01ec02269e3bf1fd57620149085407bf6750447 30-Aug-2010 Andreas Huber <andih@google.com> Merge "ALoopers can now be named (useful to distinguish threads)." into gingerbread
cc567f511a159867dcde8da824cab7464e687535 28-Aug-2010 Nipun Kwatra <nkwatra@google.com> Merge "client_id->clientId, bugfix for signaling of read abort on stop."
4caa5782afbf07da01532f7b8744157f0e92d01e 27-Aug-2010 Nipun Kwatra <nkwatra@google.com> client_id->clientId, bugfix for signaling of read abort on stop.

- changed client_id->clientId, mClient_id->mClientId
- there was a bug in the condition for calling
signalReadComplete_lock() in stop. We should call it only when
!mLastReadCompleted and also if the current client has not already
completed its read (this second check was missing before).

Change-Id: I9a57cf6b5c6f3260883a6c74d0c7b22f675c422e
ediaSourceSplitter.cpp
9bdccaca6a7a09457670138bf6cdd9b3ba5e7087 28-Aug-2010 James Dong <jdong@google.com> am a5fe77d0: am df8356ff: Merge "Workaround for a QCOM issue where the output buffer size advertised by the AVC encoder is occasionally too small." into gingerbread

Merge commit 'a5fe77d004091bd9521d087c2572f587191afbfc'

* commit 'a5fe77d004091bd9521d087c2572f587191afbfc':
Workaround for a QCOM issue where the output buffer size advertised by the AVC encoder
f00421ce0af03785a229552cb9738ac09b17a675 28-Aug-2010 James Dong <jdong@google.com> am 7d3ff384: am b86365ad: Merge "Suppress the video recording start signal - bug 2950297" into gingerbread

Merge commit '7d3ff3849c830f0136c692b6074f1ba5da288fe7'

* commit '7d3ff3849c830f0136c692b6074f1ba5da288fe7':
Suppress the video recording start signal
9fbd6ae6b6d9f3eb791a3385df6fed3524531bd4 28-Aug-2010 Andreas Huber <andih@google.com> am 05c1cada: am 577615c9: Merge "Better support for rtsp (normal play-)time display. Better seek support, timeout if no packets arrive for too long." into gingerbread

Merge commit '05c1cadaeaf272a70acc889bfccd607648058470'

* commit '05c1cadaeaf272a70acc889bfccd607648058470':
Better support for rtsp (normal play-)time display. Better seek support, timeout if no packets arrive for too long.
437ab8c4b66a6c9dc47faa257df90089ebef10a9 28-Aug-2010 Andreas Huber <andih@google.com> am e25e0361: am e250c220: Merge "We accidentally always aborted after 10 secs, even if the connection was fine." into gingerbread

Merge commit 'e25e03612e1a2988ed83f24d2658cf0898fd1944'

* commit 'e25e03612e1a2988ed83f24d2658cf0898fd1944':
We accidentally always aborted after 10 secs, even if the connection was fine.
a814c1fdc2acf0ed2ee3b175110f6039be7c4873 28-Aug-2010 Andreas Huber <andih@google.com> ALoopers can now be named (useful to distinguish threads).

Change-Id: Ieabaddb2e3a9e3a7a5bc36e55cd0721b60dbd50e
wesomePlayer.cpp
uCachedSource2.cpp
oundation/ALooper.cpp
tsp/ARTPWriter.cpp
tsp/MyHandler.h
824c9ff4a55e86faae4f8f158977329909cbfaf6 27-Aug-2010 James Dong <jdong@google.com> Workaround for a QCOM issue where the output buffer size advertised by the AVC encoder
is occasionally too small.

bug - 2882917

Change-Id: Id59d8529084c5689a26f272e0cd3b1e955fd8a30
MXCodec.cpp
d9a81d43fd23f10091afa4e78bd2f5db87f74e7f 27-Aug-2010 Nipun Kwatra <nkwatra@google.com> Merge "Added MediaSourceSplitter to split single source to multiple ones."
352c4683820c31eaad63e52a47d0d442bfe2c193 27-Aug-2010 James Dong <jdong@google.com> Merge "Suppress the video recording start signal - bug 2950297" into gingerbread
c7e5094ece8083bcaa8160564655df986126f4bd 27-Aug-2010 Nipun Kwatra <nkwatra@google.com> Added MediaSourceSplitter to split single source to multiple ones.

MediaSourceSplitter provides a way to split a single mediaSource
into multiple sources. It takes in the real mediaSource and multiple
clients can then be created which serve from the same real mediaSource.

Change-Id: I7254ead24b4c26c784b033e6bc7ff5a0d083a0c3
ediaSourceSplitter.cpp
8d342970108926c4ea355c90d26a2a353ec0fd47 27-Aug-2010 Andreas Huber <andih@google.com> Better support for rtsp (normal play-)time display. Better seek support, timeout if no packets arrive for too long.

Change-Id: Id491541a6ae501604cda815f8e961a3bfe26db7d
related-to-bug: 2556656
wesomePlayer.cpp
nclude/ARTSPController.h
nclude/AwesomePlayer.h
tsp/AAMRAssembler.cpp
tsp/AAVCAssembler.cpp
tsp/AH263Assembler.cpp
tsp/AMPEG4AudioAssembler.cpp
tsp/AMPEG4ElementaryAssembler.cpp
tsp/APacketSource.cpp
tsp/APacketSource.h
tsp/ARTPAssembler.cpp
tsp/ARTPAssembler.h
tsp/ARTSPController.cpp
tsp/MyHandler.h
cc6adf524c1bb3bfaa5be464b50b8bcca899761c 27-Aug-2010 Andreas Huber <andih@google.com> We accidentally always aborted after 10 secs, even if the connection was fine.

Change-Id: I3f2ae2f46ae62b84b1e253658d7182c04ee3dfae
tsp/MyHandler.h
f1ae1963f5028a670573b50a9c1cfb504fc426b4 27-Aug-2010 James Dong <jdong@google.com> Suppress the video recording start signal
- bug 2950297

Change-Id: I0044d07178691feb904cf81e87c1b6d4b714dc1a
udioSource.cpp
7cb54d6f0e6c89f45e3db0bd9246f35836d67b8f 27-Aug-2010 Andreas Huber <andih@google.com> am 74ae6973: am 17a765a1: Merge "Support for RTP packets arriving interleaved with RTSP responses." into gingerbread

Merge commit '74ae6973f8d5b7bc7bc4a7dcac5ddce90f382cd4'

* commit '74ae6973f8d5b7bc7bc4a7dcac5ddce90f382cd4':
Support for RTP packets arriving interleaved with RTSP responses.
bb28cd26054217303653f3271ea4702d769a89b7 27-Aug-2010 Andreas Huber <andih@google.com> Merge "Disable all the hardware decoders except for h.264 video decode, since the software decoders are faster."
27fdb181daebec3dbe477080adad94f81ed667ad 26-Aug-2010 Andreas Huber <andih@google.com> Disable all the hardware decoders except for h.264 video decode, since the software decoders are faster.

Change-Id: Ia41194752ef72feb4ed1d5199e97b1649075b646
MXCodec.cpp
1b07372a4004fec0ac9ab296741060ac348476ae 26-Aug-2010 Andreas Huber <andih@google.com> Merge "Support for RTP packets arriving interleaved with RTSP responses." into gingerbread
5291085d561f290b172e752da08fc3afab85c0b9 26-Aug-2010 James Dong <jdong@google.com> am 9509a0ce: am 318a759e: Merge "Make sure that timestamp does not go backward in MP4 file writer" into gingerbread

Merge commit '9509a0ce7ec1b10305bb6bd5fbf0edcf5b4f7fe1'

* commit '9509a0ce7ec1b10305bb6bd5fbf0edcf5b4f7fe1':
Make sure that timestamp does not go backward in MP4 file writer
0792ce7e0924ebb0dbe7b7cfcd79d12cbdb03ed2 26-Aug-2010 Andreas Huber <andih@google.com> Support for RTP packets arriving interleaved with RTSP responses.

Change-Id: Ib32fba257da32a199134cf8943117cf3eaa07a25
tsp/ARTPConnection.cpp
tsp/ARTPConnection.h
tsp/ARTPSession.cpp
tsp/ARTSPConnection.cpp
tsp/ARTSPConnection.h
tsp/MyHandler.h
640a72ecf2feb1ee5152d70234ff48d3be0e5ddf 26-Aug-2010 James Dong <jdong@google.com> Merge "Make sure that timestamp does not go backward in MP4 file writer" into gingerbread
bd49bd32eba737b334bb1398fa97ee8c4584a2bf 26-Aug-2010 Andreas Huber <andih@google.com> am e58cd37d: am 8ac0983e: Merge "Fix support for per-frame unsynchronization in ID3V2.4 tags." into gingerbread

Merge commit 'e58cd37d6667c8812ab8d40dd814f77eb7df1b96'

* commit 'e58cd37d6667c8812ab8d40dd814f77eb7df1b96':
Fix support for per-frame unsynchronization in ID3V2.4 tags.
f30274368327563021fb20faeb67b5661a0f373c 26-Aug-2010 Andreas Huber <andih@google.com> Merge "Fix support for per-frame unsynchronization in ID3V2.4 tags." into gingerbread
6067b47c0d2cff7d26e088d97dc8d5190c5a4d00 26-Aug-2010 Andreas Huber <andih@google.com> am cec075cc: am 23584022: Merge "Ensure that buffering updates eventually hit 100% after we download everything." into gingerbread

Merge commit 'cec075cc420e601602d6bfe16272c30006d262a6'

* commit 'cec075cc420e601602d6bfe16272c30006d262a6':
Ensure that buffering updates eventually hit 100% after we download everything.
ac994dfb88d414aeedf5998aa1c6015c5b47ec01 25-Aug-2010 Andreas Huber <andih@google.com> Fix support for per-frame unsynchronization in ID3V2.4 tags.

Change-Id: I6874b596f88817347756a375d9fb1c9bff418eca
related-to-bug: 2949149
d3/ID3.cpp
nclude/ID3.h
81ce48911035569c934e6555c2c94c6c19aec968 25-Aug-2010 Andreas Huber <andih@google.com> Merge "Ensure that buffering updates eventually hit 100% after we download everything." into gingerbread
d31cdebccaa64e4ce0012254aa4986fbea93a2a1 25-Aug-2010 Andreas Huber <andih@google.com> am 96dc4559: am b8814dce: Merge "Allow sniffers to return a packet of opaque data that the corresponding extractor can take advantage of to not duplicate work already done sniffing. The mp3 extractor takes advantage of this now." into gingerbread

Merge commit '96dc45597e53742a2c8453f9ce03f7d501a75668'

* commit '96dc45597e53742a2c8453f9ce03f7d501a75668':
Allow sniffers to return a packet of opaque data that the corresponding extractor can take advantage of to not duplicate work already done sniffing. The mp3 extractor takes advantage of this now.
5a1c3529e4fa2f8a11054181294e0ce79fff8dd3 25-Aug-2010 Andreas Huber <andih@google.com> Allow sniffers to return a packet of opaque data that the corresponding extractor can take advantage of to not duplicate work already done sniffing. The mp3 extractor takes advantage of this now.

Change-Id: Icb77ae3ee95a69c7da25b4d3b8696c0a2d33028a
related-to-bug: 2948754
MRExtractor.cpp
ataSource.cpp
P3Extractor.cpp
PEG4Extractor.cpp
ediaExtractor.cpp
ggExtractor.cpp
AVExtractor.cpp
nclude/AMRExtractor.h
nclude/MP3Extractor.h
nclude/MPEG2TSExtractor.h
nclude/MPEG4Extractor.h
nclude/OggExtractor.h
nclude/WAVExtractor.h
atroska/MatroskaExtractor.cpp
atroska/MatroskaExtractor.h
peg2ts/MPEG2TSExtractor.cpp
2a4b49bd3863024884a694b454e2e452752e6ea0 25-Aug-2010 Andreas Huber <andih@google.com> Ensure that buffering updates eventually hit 100% after we download everything.

Change-Id: I43bb85b1128fa9c1bc8632970d7101006393bcc8
related-to-bug: 2844095
wesomePlayer.cpp
5ac7b5def64625fdc9cfaf1bbdd013f5ada241f3 25-Aug-2010 Andreas Huber <andih@google.com> am 67ca90b3: am 6b6ae996: Merge "A first shot at proper support for seeking of rtsp streams." into gingerbread

Merge commit '67ca90b339feb8bb6889ca289a9dbc82c447b0d2'

* commit '67ca90b339feb8bb6889ca289a9dbc82c447b0d2':
A first shot at proper support for seeking of rtsp streams.
cce326fe43411855aca2f719e505b051bc4b61b3 24-Aug-2010 Andreas Huber <andih@google.com> A first shot at proper support for seeking of rtsp streams.

Change-Id: I9604f2d09feedc0074c0e715be58e719d4483760
related-to-bug: 2556656
wesomePlayer.cpp
nclude/ARTSPController.h
nclude/AwesomePlayer.h
tsp/APacketSource.cpp
tsp/APacketSource.h
tsp/ARTSPController.cpp
tsp/MyHandler.h
40e9940fadf22daa64c1e766fa8a855c7b149c17 24-Aug-2010 James Dong <jdong@google.com> Make sure that timestamp does not go backward in MP4 file writer

Change-Id: I90745b9df7f19d61f3ab826bf9d2419fe788554e
PEG4Writer.cpp
d9734dc5f25730944ec4e62bb028092e1841e4a3 24-Aug-2010 Andreas Huber <andih@google.com> am 31e71131: am 3e22ef1e: Merge "Better handling of rtsp connection and disconnection." into gingerbread

Merge commit '31e71131049c943a388134e796087e109248efcc'

* commit '31e71131049c943a388134e796087e109248efcc':
Better handling of rtsp connection and disconnection.
a8c88e810ea1b8e90fd6c250d4c0a87eb628d4d8 24-Aug-2010 James Dong <jdong@google.com> am 28a92120: am 3f51fa78: Runtime dump support for MediaWriter

Merge commit '28a92120a702289533a9c9d004bd60f83b2fd98b'

* commit '28a92120a702289533a9c9d004bd60f83b2fd98b':
Runtime dump support for MediaWriter
ee7a5d9f5506b494ad45946690d1edc8afe8b4c4 24-Aug-2010 James Dong <jdong@google.com> am 3fc01525: am b755e325: Merge "Only add 4 bytes offset for the output media buffer when SPS is not received for SW AVC encoder" into gingerbread

Merge commit '3fc01525ff33020d4d82a7fb8ade8cf18baaf4f5'

* commit '3fc01525ff33020d4d82a7fb8ade8cf18baaf4f5':
Only add 4 bytes offset for the output media buffer when SPS is not received for SW AVC encoder
82252a9a732c7325166c36589c1dfa9f2cb8ac04 23-Aug-2010 Andreas Huber <andih@google.com> Merge "Account for the _ADRENO constant being moved."
3e135cf939b4baf9902fe24fb0e50528e62c10bd 23-Aug-2010 Jamie Gennis <jgennis@google.com> Account for the _ADRENO constant being moved.

Change-Id: I443e2028c06f8b03e864525365c5c38de79314fe
olorconversion/Android.mk
olorconversion/SoftwareRenderer.cpp
fec932fda5b69cc8b572063decc0f64faa36ff4a 23-Aug-2010 Dima Zavin <dmitriyz@google.com> Merge changes Ic94c18a6,Iff770de1,Ifed6b4dc

* changes:
libstagefright: enable tegra hw audio decoders
libstagefright: Enable tegra hw video decoders
libstagefright: Enable tegra hw encoder
f143cc1866737c2ac24f4b2d7e4b2e776be10d56 23-Aug-2010 Andreas Huber <andih@google.com> Merge "Squashed commit of the following:"
5daeb129a2c2ba3d14ccd94af283b5f561c783ea 16-Aug-2010 Andreas Huber <andih@google.com> Squashed commit of the following:

commit 35cc68814a9537c31fde146e171e7b0bbdfe211e
Author: Andreas Huber <andih@google.com>
Date: Mon Aug 16 08:48:42 2010 -0700

Only enable support for yuv to yuv conversion on passion, where it's available, use the slower yuv->rgb565 path everywhere else.

commit d8ac5a8814103e60d11d2acf61997fc31a1dc58d
Author: Andreas Huber <andih@google.com>
Date: Fri Aug 13 13:56:44 2010 -0700

The software renderer takes over all rendering, converting from yuv to yuv if possible and rgb565 otherwise.

commit 684972074b74318bdcb826ed9b5b0864d2d2e273
Author: Andreas Huber <andih@google.com>
Date: Fri Aug 13 09:34:35 2010 -0700

A first shot at supporting the new rendering APIs.

Change-Id: Iea9b32856da46950501f1a700f616b5feac710fd
wesomePlayer.cpp
olorconversion/Android.mk
olorconversion/SoftwareRenderer.cpp
nclude/AwesomePlayer.h
nclude/SoftwareRenderer.h
mx/OMX.cpp
01f0908b3e8c759a9fcd565f6bc6cc6c4033678f 23-Aug-2010 Andreas Huber <andih@google.com> Merge "Better handling of rtsp connection and disconnection." into gingerbread
deb7457f43b58ddcb6fbc425321989236cd42f5a 23-Aug-2010 James Dong <jdong@google.com> am 3540760d: am 0ea4ed3b: Don\'t drop a late frame which may lead to missing I frames in the MP4 file

Merge commit '3540760d1d68cc883122d44ab1d38f542fb646e6'

* commit '3540760d1d68cc883122d44ab1d38f542fb646e6':
Don't drop a late frame which may lead to missing I frames in the MP4 file
a178be53c93ff3da273ebfcc456503e7e7612bf0 23-Aug-2010 James Dong <jdong@google.com> am 177a7ad8: am 439fe407: Merge "Return error from MPEG4Writer stop() if the check on codec specific data failed" into gingerbread

Merge commit '177a7ad825445acaeea38c48c74ad87db935d054'

* commit '177a7ad825445acaeea38c48c74ad87db935d054':
Return error from MPEG4Writer stop() if the check on codec specific data failed
1b543242102ef3c28145c6ad50ee8e8ce2fb26d3 23-Aug-2010 Andreas Huber <andih@google.com> Better handling of rtsp connection and disconnection.

Change-Id: Ib126af6c14c5a212a51a5ee3c4a0a7d1860ad167
nclude/ARTSPController.h
tsp/ARTSPController.cpp
tsp/MyHandler.h
8d9dda1ba28bbcd7730a9bec10ce70db4912688e 23-Aug-2010 Dima Zavin <dima@android.com> libstagefright: enable tegra hw audio decoders

Change-Id: Ic94c18a6a6df8e0370dc28634f95561056ed2d02
Signed-off-by: Dima Zavin <dima@android.com>
MXCodec.cpp
ea659e51af658d77bef7b88a2fb542ec2d69e032 27-Jul-2010 pgudadhe <pgudadhe@nvidia.com> libstagefright: Enable tegra hw video decoders

Change-Id: Iff770de1369e57e7833a8cfa9a30955030d9974c
MXCodec.cpp
dedf414d3fe2e79ee0aad0f1c82ca16ebd886ff6 18-Aug-2010 James Dong <jdong@google.com> Runtime dump support for MediaWriter

Change-Id: I10b2c474de612ee4cef4b7c9eae2ee1dd8c2e895
PEG4Writer.cpp
263ebfd8a17266eedc84eb879edb6a6a3395f760 21-Aug-2010 James Dong <jdong@google.com> am c8d2fa70: am cbd038fe: Merge "Make MediaWriter stop and pause return errors if necessary" into gingerbread

Merge commit 'c8d2fa704abebdbf0bd8aac185216dc068950217'

* commit 'c8d2fa704abebdbf0bd8aac185216dc068950217':
Make MediaWriter stop and pause return errors if necessary
9934d0cf66861d331adcad28dc4713874e607a76 21-Aug-2010 Andreas Huber <andih@google.com> am 873ebfb8: am 223e4f73: Merge "Support for MP4V-ES packetization format according to RFC3016." into gingerbread

Merge commit '873ebfb825cb498d9ff3012d1d31b02e31a79980'

* commit '873ebfb825cb498d9ff3012d1d31b02e31a79980':
Support for MP4V-ES packetization format according to RFC3016.
9b92412737095ab6a06f01a0c6daaebb79dffb55 21-Aug-2010 Andreas Huber <andih@google.com> am b29ebd39: am f0ad5484: Merge "In the absence of width/height information in the sdp, extract the dimensions from the avc codec specific data." into gingerbread

Merge commit 'b29ebd397e25a7176bcc1c81980f17b0190ebe7f'

* commit 'b29ebd397e25a7176bcc1c81980f17b0190ebe7f':
In the absence of width/height information in the sdp, extract the dimensions from the avc codec specific data.
91d113e8daa9d71c4ea8afd595a3921e03787cbf 21-Aug-2010 Andreas Huber <andih@google.com> am 6bcffcd2: am 8c192fe9: Merge "Better support for rtsp streamed through VLC. Temporarily make the socket blocking to read all of the session description." into gingerbread

Merge commit '6bcffcd2dc410db780c152c70a01b22da6ca58be'

* commit '6bcffcd2dc410db780c152c70a01b22da6ca58be':
Better support for rtsp streamed through VLC. Temporarily make the socket blocking to read all of the session description.
a0ced19fa96f26a25de708588a34ebfd452f250e 20-Aug-2010 Nipun Kwatra <nkwatra@google.com> Merge "Added downsample()"
c0d936ddacc4f7d883f3bd1dd8099586836c820f 20-Aug-2010 Nipun Kwatra <nkwatra@google.com> Added downsample()

Added a downsample function which downsamples the source image
starting at an offset and skipping every few pixels. Currently
no low pass filtering is done, but it should be added later.

Change-Id: Iec34092c536bfc661a15521e6a1ef2ef3f815c61
uv/YUVCanvas.cpp
47c0e2355fb18f567471c1a76f1bbe2ebcb5a419 20-Aug-2010 Nipun Kwatra <nkwatra@google.com> Merge "const correctness, validPixel test."
4937be23b485ce8edf180ff5e71ebf0884178f17 26-Jul-2010 pgudadhe <pgudadhe@nvidia.com> libstagefright: Enable tegra hw encoder

Change-Id: Ifed6b4dc4877e3fcab86ee81c9117a92b1d1ce8f
MXCodec.cpp
76c6e8f97cd6030454ebf60db06818e05d449f06 20-Aug-2010 James Dong <jdong@google.com> Only add 4 bytes offset for the output media buffer when SPS is not received for SW AVC encoder

Change-Id: Ia64c2751b6304e5d5891416bf23ff9b8ec54d5ef
odecs/avc/enc/AVCEncoder.cpp
4a6b74563ac0fe752fbdfd15f91772473f8a4711 20-Aug-2010 Nipun Kwatra <nkwatra@google.com> const correctness, validPixel test.

- made width(), height() const member functions.
- added validPixel() which returns true if pixel is in the allowed range.
- now testing validPixel in get/setPixelValue

Change-Id: I1dee5060bd4f8dcbdcd542ec4647ea328f0185c3
uv/YUVImage.cpp
4f86a980fee1880dca61b828599fa6d76755a485 19-Aug-2010 James Dong <jdong@google.com> Don't drop a late frame which may lead to missing I frames in the MP4 file

Change-Id: I8fef1454264230c1369561670236eb0a19ae4e76
PEG4Writer.cpp
690f546b0ee548dbfe997df36418e5302ec2d786 19-Aug-2010 James Dong <jdong@google.com> Return error from MPEG4Writer stop() if the check on codec specific data failed

Change-Id: Icbd08eec9b4201facbad56ff2040f0830cfb0115
PEG4Writer.cpp
e0b77ce97ef84c47ae408e92f2afb7509a5051b6 19-Aug-2010 James Dong <jdong@google.com> Merge "Make MediaWriter stop and pause return errors if necessary" into gingerbread
37187916a486504acaf83bea30147eb5fbf46ae5 19-Aug-2010 James Dong <jdong@google.com> Make MediaWriter stop and pause return errors if necessary

o Make the API consistent with SF framework, which the MediaSource
provides a return status for stop

o Also, helps to convey errors that occurred right when a
premature stop() is called, leading to a potentially
mal-formed output file.

Change-Id: I52a932345f38570fdf8ea04d67d73dd94ccd30ef
MRWriter.cpp
PEG4Writer.cpp
tsp/ARTPWriter.cpp
tsp/ARTPWriter.h
62cb04d23642a2ea7c005f050494c8ef3c370dd3 19-Aug-2010 Andreas Huber <andih@google.com> Support for MP4V-ES packetization format according to RFC3016.

Change-Id: I5e182936c52f9eb80cdcf6132ead03705ee32d61
tsp/AMPEG4ElementaryAssembler.cpp
tsp/AMPEG4ElementaryAssembler.h
tsp/APacketSource.cpp
tsp/ARTPConnection.cpp
tsp/ARTPSource.cpp
tsp/Android.mk
85f12e9b9062402d6110df3f7099707912040edb 19-Aug-2010 Andreas Huber <andih@google.com> In the absence of width/height information in the sdp, extract the dimensions from the avc codec specific data.

Change-Id: I98c4194593c7e6e24f6fc339c862245111800293
ndroid.mk
vc_utils.cpp
oundation/ABitReader.cpp
oundation/Android.mk
nclude/avc_utils.h
peg2ts/ABitReader.cpp
peg2ts/ABitReader.h
peg2ts/ATSParser.cpp
peg2ts/Android.mk
tsp/APacketSource.cpp
34c9ad88d3d827cca0c7b5f2fb1b0d4a1a20a2d1 19-Aug-2010 Andreas Huber <andih@google.com> Merge "Better support for rtsp streamed through VLC. Temporarily make the socket blocking to read all of the session description." into gingerbread
987b95fc9696f2e01a868455d40f0b61e38ba5bf 18-Aug-2010 Andreas Huber <andih@google.com> am 00557baf: am 4dda6ddb: Merge "Make the OggExtractor less verbose." into gingerbread

Merge commit '00557baf36ab62592ae1c424a7298a21e8588f5a'

* commit '00557baf36ab62592ae1c424a7298a21e8588f5a':
Make the OggExtractor less verbose.
ddcfcda09511c6641c4db81bc334788ee472ea28 18-Aug-2010 Andreas Huber <andih@google.com> am 31eb1ac1: am 0324ce9a: Merge "Be more lenient when validating ESDS information in mp4 audio tracks. Allow the absence of any codec specific data and assume that the mpeg4 headers are not lying to us." into gingerbread

Merge commit '31eb1ac1db38d0a5cd0b44dd5251941992f74b58'

* commit '31eb1ac1db38d0a5cd0b44dd5251941992f74b58':
Be more lenient when validating ESDS information in mp4 audio tracks. Allow the absence of any codec specific data and assume that the mpeg4 headers are not lying to us.
ef7af7fec702db2fde72b16dedf9064585e6db77 18-Aug-2010 Andreas Huber <andih@google.com> Better support for rtsp streamed through VLC. Temporarily make the socket blocking to read all of the session description.

Change-Id: Ibe71f5941485660510e24d714da3865b9c6f89a2
tsp/APacketSource.cpp
tsp/ARTSPConnection.cpp
tsp/ASessionDescription.cpp
tsp/ASessionDescription.h
tsp/MyHandler.h
d6831054e0c6995749ccc09e8241a478ccadb9c8 18-Aug-2010 Andreas Huber <andih@google.com> Merge "Make the OggExtractor less verbose." into gingerbread
a65ccbff6e8eb301c0d325b2ec080aeda8df2024 18-Aug-2010 Andreas Huber <andih@google.com> Be more lenient when validating ESDS information in mp4 audio tracks. Allow the absence of any codec specific data and assume that the mpeg4 headers are not lying to us.

Change-Id: Ia29b967cbee9eabb21c6c26508b27b379ff9ba17
PEG4Extractor.cpp
f1a97e53a58f47afa17a9b0d3a5cc9abf7e5ed19 17-Aug-2010 Rene Bolldorf <xsecute@googlemail.com> Fix compilation errors in libmedia, libstagefright.
(invalid conversion from 'const char*' to 'char*')

Change-Id: Idef85606b7cff629b2778ed8134c79c892af54c2
TTPDataSource.cpp
8206beb4953e42a727417286cdf9d52c35c2889d 17-Aug-2010 James Dong <jdong@google.com> am f54da15b: am eff30e3d: Change the default time scale for audio/video track during recording and reduce rounding errors in calculating the sample duration

Merge commit 'f54da15b7c3fa55268451c485544e831832fdf15'

* commit 'f54da15b7c3fa55268451c485544e831832fdf15':
Change the default time scale for audio/video track during recording
790f640ac3b573efd574d346d1bb338d9724ed48 17-Aug-2010 James Dong <jdong@google.com> am 4fc2c928: am b7208196: Use audio clock as the reference media clock

Merge commit '4fc2c9280c5262c835a4eb78961241de105313c1'

* commit '4fc2c9280c5262c835a4eb78961241de105313c1':
Use audio clock as the reference media clock
3e8843e8db702c8c9c97df2b4a31b66ea12961e6 16-Aug-2010 Andreas Huber <andih@google.com> Make the OggExtractor less verbose.

Change-Id: Ieea5f3fa98d93ca6ad8fa7dcd23054e1cd0b6338
ggExtractor.cpp
c059860c73678a202bfa33062723e8f82fb779d9 13-Aug-2010 James Dong <jdong@google.com> Change the default time scale for audio/video track during recording
and reduce rounding errors in calculating the sample duration

- Default time scale for tracks other than audio is set to 90000.
- Audio track by default uses the audio sampling rate as the time scale.
- Default movie time scale remains to be 1000.
- The default time scale values will be overwritten by a user-supplied value if exits.

Change-Id: I81b40ed0626ea45e9fd24a89e21a2c5a4a2c3415
PEG4Writer.cpp
e259531ce59ab1f31de5a23124b22536f6a5a767 03-Aug-2010 James Dong <jdong@google.com> Use audio clock as the reference media clock

o Only do this for realtime applications
o Adjust other track clock based on audio clock
o Assume other track uses wall clock as the media clock
o Use some heuristics to reduce the size of stts box by 2/3.

- also
o Remove one unused key from MetaData.h

Change-Id: Ib9432842627b61795b533508158c25258a527332
PEG4Writer.cpp
1e66e00113a063ed9af618d376961bcc036157de 13-Aug-2010 James Dong <jdong@google.com> am 38a9f405: am e95d192f: Mainly fix two mistakes that I made:

Merge commit '38a9f4050ac4b299c459e25bfff6b852bc8de54f'

* commit '38a9f4050ac4b299c459e25bfff6b852bc8de54f':
Mainly fix two mistakes that I made:
07bf58d9d62a9807443d27d8e1bde09126db7676 13-Aug-2010 Mike Dodd <mdodd@google.com> am 2f020449: am 5f96138b: Merge "Support getting codec, width, and height in URL for gtalk playback." into gingerbread

Merge commit '2f02044944d5c526020d4e8cceaae7e77382d56d'

* commit '2f02044944d5c526020d4e8cceaae7e77382d56d':
Support getting codec, width, and height in URL for gtalk playback.
abfedebe61a010bcce16a0d920c132dfe4ad5c31 13-Aug-2010 James Dong <jdong@google.com> Mainly fix two mistakes that I made:

1. When the ERROR_END_OF_STREAM is returned from read, the input buffer is not initialized
release it would lead to crash

2. The mPrevTimestampUs is not initialized and thus fail in the CHECK(mPrevTimestampUs, timeUs)

Change-Id: Id1e51575fb8b3ca48e80547efd3a3a82dfac773b
odecs/avc/enc/AVCEncoder.cpp
odecs/m4v_h263/enc/M4vH263Encoder.cpp
b9299d167f48f2562540cab8b0cf5959a7645503 13-Aug-2010 Mike Dodd <mdodd@google.com> Merge "Support getting codec, width, and height in URL for gtalk playback." into gingerbread
8d255f31e84e0f22233401678fe28e962c71892f 13-Aug-2010 Andreas Huber <andih@google.com> am 73af0a92: am 72ac1f26: Fix software avc encoder crash at EOS.

Merge commit '73af0a9211d0c4be663d287cefd9bf35746db1ba'

* commit '73af0a9211d0c4be663d287cefd9bf35746db1ba':
Fix software avc encoder crash at EOS.
60d77eb19ddcb283b947e5dfd34b9a8e9ee6686f 13-Aug-2010 Andreas Huber <andih@google.com> Fix software avc encoder crash at EOS.

Change-Id: I738dc24556e41ce518b67babeff16cd934c2d1b1
odecs/avc/enc/AVCEncoder.cpp
1aa4fed23595d45b0ad0af86c9e839196172abe5 13-Aug-2010 Mike Dodd <mdodd@google.com> Support getting codec, width, and height in URL for gtalk playback.

Format is rtsp://gtalk/codec/width/height

For example:
rtsp://gtalk/H263-1998/320/200

Change-Id: If7c73fea1e1d0de89b22a8f0d12acba1c862d6fe
wesomePlayer.cpp
cc760e477378117ef34fb2833d0b6521925b38ad 12-Aug-2010 Andreas Huber <andih@google.com> am 3bf8c342: am ae3a1f45: Merge "Fix the h.263 assembler to properly subset a buffer\'s range if it already has a range applied." into gingerbread

Merge commit '3bf8c3427f4c728bb88e5e266b85c96e3e727203'

* commit '3bf8c3427f4c728bb88e5e266b85c96e3e727203':
Fix the h.263 assembler to properly subset a buffer's range if it already has a range applied.
db3a7e67a82b48b9b7e2bfa639fc117f75682a76 12-Aug-2010 Andreas Huber <andih@google.com> am 53895c6a: am 66aa0f3d: Merge "APacketSource is too verbose." into gingerbread

Merge commit '53895c6a0e8ecb4e835aab7eca7480779c224356'

* commit '53895c6a0e8ecb4e835aab7eca7480779c224356':
APacketSource is too verbose.
c37ae8636ed61bab5c3a1f4c4b54b41431d8016b 12-Aug-2010 James Dong <jdong@google.com> am 8473db02: am 708ec39c: Don\'t send late frames to software encoders for encoding

Merge commit '8473db025423632d1145d895fe74af0e976efac4'

* commit '8473db025423632d1145d895fe74af0e976efac4':
Don't send late frames to software encoders for encoding
d1753e3dc21df38cb0fbe73b43ceda3ea555d102 12-Aug-2010 Andreas Huber <andih@google.com> Merge "Fix the h.263 assembler to properly subset a buffer's range if it already has a range applied." into gingerbread
9089ba65b7592c1719d8bcec2efbfe6744322767 12-Aug-2010 Andreas Huber <andih@google.com> Merge "APacketSource is too verbose." into gingerbread
a6238a1e5b603ca2ccf3b2297c9bc8a141cf8559 12-Aug-2010 Andreas Huber <andih@google.com> Fix the h.263 assembler to properly subset a buffer's range if it already has a range applied.

Change-Id: I7cc468a3095537347d86803579001458b62fcadb
tsp/AH263Assembler.cpp
tsp/ARTPWriter.cpp
5328abe1e36a39b1d4617a74ac82c201b8c14c43 12-Aug-2010 James Dong <jdong@google.com> Don't send late frames to software encoders for encoding

o Document on what frames will be rejected and what frames will be accepted

Change-Id: I5a5d489ad3d2b50dbb40a0f6e01529312ce81c54
odecs/avc/enc/AVCEncoder.cpp
odecs/m4v_h263/enc/M4vH263Encoder.cpp
nclude/AVCEncoder.h
nclude/M4vH263Encoder.h
ee6d226931477dc9c2c9e49aae5f2470f7181c61 12-Aug-2010 James Dong <jdong@google.com> am 8aa244ea: am 45cb3cfa: Merge "Handle large audio lost" into gingerbread

Merge commit '8aa244eab7ba834439cc919fd1f83d1e4ef49aff'

* commit '8aa244eab7ba834439cc919fd1f83d1e4ef49aff':
Handle large audio lost
586163779b241d4323e2940a53be8c4190054eba 12-Aug-2010 James Dong <jdong@google.com> am f4e26da1: am b6541f0a: Merge "Fix a crash due to unnecessary check on the codec config data for H263 video track" into gingerbread

Merge commit 'f4e26da1af90145564f6065d62cf8efcef0c6f04'

* commit 'f4e26da1af90145564f6065d62cf8efcef0c6f04':
Fix a crash due to unnecessary check on the codec config data for H263 video track
bef4b56250b7c9bd4cc34c5fad49fec7b57d4526 12-Aug-2010 James Dong <jdong@google.com> Merge "Handle large audio lost" into gingerbread
7704377e3f3daf5a7940ac759ff96e5e166f7cb3 12-Aug-2010 James Dong <jdong@google.com> Merge "Fix a crash due to unnecessary check on the codec config data for H263 video track" into gingerbread
6dc387a8c3f031f9f17d1138295368946563f7a5 12-Aug-2010 Andreas Huber <andih@google.com> APacketSource is too verbose.

Change-Id: I48ca7b070d89e43405d05e5f41e650db587e12b4
tsp/APacketSource.cpp
a37923e9a57d489e7bed2129369219039fa5f12c 12-Aug-2010 James Dong <jdong@google.com> Fix a crash due to unnecessary check on the codec config data for H263 video track

Change-Id: I00e8b65d25731153e4d9be6a443eeed91c8fb605
PEG4Writer.cpp
047be32ec88dd04a9aca23fa59773fe2eaccb8f8 11-Aug-2010 Nipun Kwatra <nkwatra@google.com> Merge "Call startPreview after stopping for mUseStillCameraForTimeLapse=true case."
030b888ef6a586a1f0fafe0adc4312f775878d2b 11-Aug-2010 Andreas Huber <andih@google.com> am 136d8336: am 90d1d104: Merge "This code in CameraSource really should hold the lock." into gingerbread

Merge commit '136d8336b6cb18067cd783185dacef34ae785519'

* commit '136d8336b6cb18067cd783185dacef34ae785519':
This code in CameraSource really should hold the lock.
4d074e81e8a8b3b057d31adcb64a088acad6d15c 11-Aug-2010 Andreas Huber <andih@google.com> Merge "This code in CameraSource really should hold the lock." into gingerbread
56223b96c2f6de5998496fac9d6703f06adc1dca 11-Aug-2010 Andreas Huber <andih@google.com> This code in CameraSource really should hold the lock.

Change-Id: I349520a14776bb83b7edb23fc62052b487246d9a
ameraSource.cpp
47204e1806da9f849464d0cef936851d7e561607 11-Aug-2010 James Dong <jdong@google.com> Handle large audio lost

Change-Id: I2687ad855aac758946954d0b3fe7aff9f7b5ae7c
udioSource.cpp
900c1297683ab50ca8a2d73f937bd09d9e9b100a 11-Aug-2010 Nipun Kwatra <nkwatra@google.com> Call startPreview after stopping for mUseStillCameraForTimeLapse=true case.

In the case when stop is pressed after takePicture has been called
but the CAMERA_MSG_COMPRESSED_IMAGE message from camera has not yet
been received, preview was not getting restarted. The reason was that
CameraSource::stop sets the camera listener to NULL and hence the
dataCallback() function which handles the CAMERA_MSG_COMPRESSED_IMAGE
message and restarts preview never got called.

Change-Id: Ib8f3bb77d9eab1ed5a67798569025ea0d63d7fd4
ameraSourceTimeLapse.cpp
ad2df1d0776066dc7c2e203390c336451238684a 10-Aug-2010 Andreas Huber <andih@google.com> am d35498f6: am 1a140bf6: Merge "Remove some obsolete code." into gingerbread

Merge commit 'd35498f6062410e777d6ad41a720db32336e2089'

* commit 'd35498f6062410e777d6ad41a720db32336e2089':
Remove some obsolete code.
eaf0e0786c4c21d6c63d8f1f4515cb2a5311493b 10-Aug-2010 Andreas Huber <andih@google.com> Remove some obsolete code.

Change-Id: Ic4d21afe3721173d48db44b8ee4f836deee017ad
wesomePlayer.cpp
f9080cc30532d19d818caa5feb696c410ac4f771 10-Aug-2010 James Dong <jdong@google.com> am b9ddd779: am 10ed3f74: Merge "Add input buffer size check for software video encoders" into gingerbread

Merge commit 'b9ddd779ae547b020764b89a0cbd96d589717609'

* commit 'b9ddd779ae547b020764b89a0cbd96d589717609':
Add input buffer size check for software video encoders
701019013dfd15745abf245449c3e17d78bd9570 10-Aug-2010 James Dong <jdong@google.com> Merge "Add input buffer size check for software video encoders" into gingerbread
5d8e9cd46d21d8cddebe82831b99927363fa896a 10-Aug-2010 Andreas Huber <andih@google.com> am 4dc41bb4: am 18f0174f: Merge "We\'re now going to ignore timestamps completely in gtalk video conferencing, playing video as soon as it comes in. We also make up fake timestamps in the rtp code, ignoring rtcp SR information to enable early startup." into gingerbrea

Merge commit '4dc41bb445860cfcb8c0dfbecdc8f0f5f15f5e28'

* commit '4dc41bb445860cfcb8c0dfbecdc8f0f5f15f5e28':
We're now going to ignore timestamps completely in gtalk video conferencing, playing video as soon as it comes in. We also make up fake timestamps in the rtp code, ignoring rtcp SR information to enable early startup.
8aacc475f8ad4392740ff5be505d58ea713d4110 10-Aug-2010 Andreas Huber <andih@google.com> Merge "We're now going to ignore timestamps completely in gtalk video conferencing, playing video as soon as it comes in. We also make up fake timestamps in the rtp code, ignoring rtcp SR information to enable early startup." into gingerbread
f30bccd5b5cd78a0c6d5479ba81b7aeea541f802 10-Aug-2010 Nipun Kwatra <nkwatra@google.com> Merge "use usleep instead of sleep."
7dbfa5a98c9f396ea63d0f322c3fa11df91d17a2 10-Aug-2010 Nipun Kwatra <nkwatra@google.com> use usleep instead of sleep.

Minor bugfix. sleep doesn't take fractional value for seconds, so use
usleep instead of sleep for sleeping small times.

Change-Id: I40e45c30cc595a54c18601117b9a1a3637652f60
ameraSourceTimeLapse.cpp
e13cf0973b927a59d7358ccce29371a22039923e 10-Aug-2010 Andreas Huber <andih@google.com> am 193985ff: am 235be391: Merge "Many, many developers misread or don\'t read the http specs and terminate lines with \'\n\' instead of CRLF \'\r\n\' as required. Enable the workaround for this by default. Also increase the socket read timeout to 30 secs." into ginger

Merge commit '193985ffd553c139e8c1094d7798edbe5b0797c5'

* commit '193985ffd553c139e8c1094d7798edbe5b0797c5':
Many, many developers misread or don't read the http specs and terminate lines with '\n' instead of CRLF '\r\n' as required. Enable the workaround for this by default. Also increase the socket read timeout to 30 secs.
ab68c7f0c835a0b6906e65d683c452cf352e30f7 10-Aug-2010 Andreas Huber <andih@google.com> Merge "Many, many developers misread or don't read the http specs and terminate lines with '\n' instead of CRLF '\r\n' as required. Enable the workaround for this by default. Also increase the socket read timeout to 30 secs." into gingerbread
f8ca90452ff3e252f20de38f1c3eee524c808c3e 10-Aug-2010 Andreas Huber <andih@google.com> We're now going to ignore timestamps completely in gtalk video conferencing, playing video as soon as it comes in. We also make up fake timestamps in the rtp code, ignoring rtcp SR information to enable early startup.

Change-Id: Idc3df74b42000f7a6aa3eae090718dc9d9c4186f
wesomePlayer.cpp
MXCodec.cpp
tsp/APacketSource.cpp
tsp/ARTPConnection.cpp
tsp/ARTPConnection.h
tsp/ARTPSession.cpp
tsp/ARTPSource.cpp
6ca767182fc51ce17fc34c4931d710f1a53512ab 10-Aug-2010 James Dong <jdong@google.com> am a0488341: am 532d2ac5: Merge "Only check the codec specific data when the output buffer contains kKeyIsCodecConfig in MP4 writer" into gingerbread

Merge commit 'a04883412ec1a5dac3e83c3fd3c335ab9579a990'

* commit 'a04883412ec1a5dac3e83c3fd3c335ab9579a990':
Only check the codec specific data when the output buffer contains kKeyIsCodecConfig in MP4 writer
db004e1c9ff995381e204135583c06758ba8f2a3 10-Aug-2010 James Dong <jdong@google.com> Add input buffer size check for software video encoders

Change-Id: I03953a1245060ed6656a965e1a8a61386126c441
odecs/avc/enc/AVCEncoder.cpp
odecs/m4v_h263/enc/M4vH263Encoder.cpp
51dfe6d646ddcc5fc252aa4c19c9936d32af8ad7 08-Aug-2010 James Dong <jdong@google.com> Only check the codec specific data when the output buffer contains kKeyIsCodecConfig in MP4 writer

o Assume there is only a single output buffer containing such information.
This simplifies the logic in MP4 file writer

o Output SPS and PPS in the very first buffer for software AVC encoder
This is to make AVC encoder work with the MP4 file writer

o Add timestamp value for codec config data

Change-Id: Iad27a04579e6028332429cd0bebd30976041e997
PEG4Writer.cpp
odecs/avc/enc/AVCEncoder.cpp
2097f5347b77861fe2559f8d76d7d455dc857f53 10-Aug-2010 Andreas Huber <andih@google.com> Many, many developers misread or don't read the http specs and terminate lines with '\n' instead of CRLF '\r\n' as required. Enable the workaround for this by default. Also increase the socket read timeout to 30 secs.

Change-Id: I51df3b8139b3009565b2271611050700a23cf1d7
TTPStream.cpp
1080f793fc7c88ea665a9796015832a1339e88fc 10-Aug-2010 James Dong <jdong@google.com> am fa4f57fe: am 959909ef: Merge "Support multiple PPS and SPS in avcC box" into gingerbread

Merge commit 'fa4f57fe0f85d2340524311f1409e0a1b2864a6e'

* commit 'fa4f57fe0f85d2340524311f1409e0a1b2864a6e':
Support multiple PPS and SPS in avcC box
0cde1a77ce02df9f0ab08d836b491bf8e809bf35 10-Aug-2010 Andreas Huber <andih@google.com> am e14923b0: am 4edf85ab: Merge "Support for extracting G.711 a-law and mu-law audio from WAV files and a corresponding software decoder." into gingerbread

Merge commit 'e14923b0c80b2e73e69b7917c1f170b356592d29'

* commit 'e14923b0c80b2e73e69b7917c1f170b356592d29':
Support for extracting G.711 a-law and mu-law audio from WAV files and a corresponding software decoder.
def871da284aa51f129943a86d44ba9ee9d68d28 09-Aug-2010 James Dong <jdong@google.com> Merge "Support multiple PPS and SPS in avcC box" into gingerbread
3266b2c04867f687e1e1b7b86088d6eb83077fd0 06-Aug-2010 James Dong <jdong@google.com> Support multiple PPS and SPS in avcC box

- Also
o do not use the hard-coded profile and levels.
Instead, we are using the profile and level found in the codec config data
o we are not supporting FRExt profile and levels for now, which requires
additional seq parameter set extension for instance.

Change-Id: If695b4c996d073d8e48aa45fdd7001e9f016f375
PEG4Writer.cpp
42d66f25af9cb8089a93c6796876a6bc16e36cea 09-Aug-2010 Andreas Huber <andih@google.com> Support for extracting G.711 a-law and mu-law audio from WAV files and a corresponding software decoder.

Change-Id: I92685d09456c220b8c09842defb721bd55b0b9f6
related-to-bug: 2900021
ndroid.mk
ediaDefs.cpp
MXCodec.cpp
AVExtractor.cpp
odecs/g711/Android.mk
odecs/g711/dec/Android.mk
odecs/g711/dec/G711Decoder.cpp
nclude/G711Decoder.h
nclude/WAVExtractor.h
1c9aed474a170c5177cafeb27bd658ccf7cda7fd 07-Aug-2010 Andreas Huber <andih@google.com> am c143ae7e: am ad98d383: Support for communicating if a buffer read from the _extractor_ is a sync sample or not.

Merge commit 'c143ae7eb74205eb2b71e63479988b9913956687'

* commit 'c143ae7eb74205eb2b71e63479988b9913956687':
Support for communicating if a buffer read from the _extractor_ is a sync sample or not.
fb6dcdf8ebe5b2995f53a750473396a40fd2db8d 07-Aug-2010 Andreas Huber <andih@google.com> am 4f25d033: am 261aaa16: Merge "Properly skip the \'skip\' chunk in mpeg4 files." into gingerbread

Merge commit '4f25d03382ca01a00c6f0e0967c5edf302f62b55'

* commit '4f25d03382ca01a00c6f0e0967c5edf302f62b55':
Properly skip the 'skip' chunk in mpeg4 files.
8bf59e735760af0b6a85747fd90bf8cf1e5388d7 06-Aug-2010 Andreas Huber <andih@google.com> Support for communicating if a buffer read from the _extractor_ is a sync sample or not.

Change-Id: Ie71506224d937cfff1fa1273bfac31c47db8845f
related-to-bug: 2900534
MRExtractor.cpp
P3Extractor.cpp
PEG4Extractor.cpp
ggExtractor.cpp
ampleTable.cpp
AVExtractor.cpp
nclude/SampleTable.h
atroska/MatroskaExtractor.cpp
2500c2d6ff55c26452ccba925a9f8b86b926f43e 07-Aug-2010 Andreas Huber <andih@google.com> Properly skip the 'skip' chunk in mpeg4 files.

Change-Id: I6795347f91f24d5379e8dc80a24ae016a9629c9c
related-to-bug: 2901311
PEG4Extractor.cpp
250a4cf8127a9ba572bae90de1e44437e0b78a94 06-Aug-2010 James Dong <jdong@google.com> am 9c09a605: am 1441bdfc: Merge "Use the target color format from the camera source if possible" into gingerbread

Merge commit '9c09a60513faf39901bb8e4681d39812204b3f73'

* commit '9c09a60513faf39901bb8e4681d39812204b3f73':
Use the target color format from the camera source if possible
af799e10a29e2ffbe09f9cead0c583221e8b2d0d 06-Aug-2010 James Dong <jdong@google.com> Merge "Use the target color format from the camera source if possible" into gingerbread
00c6c1a9cc34bd6bd95a113afdda59417a392e1e 05-Aug-2010 James Dong <jdong@google.com> am 41b29cb0: am 3aad8c38: Merge "Fix an issue where the track duration does not include the last sample duration" into gingerbread

Merge commit '41b29cb0a8e04e553357662b81bffea26f1c2d84'

* commit '41b29cb0a8e04e553357662b81bffea26f1c2d84':
Fix an issue where the track duration does not include the last sample duration
299766cdbf93fba14634e364b177b7f4d5811453 04-Aug-2010 James Dong <jdong@google.com> Use the target color format from the camera source if possible

- If the target color format is unavailable, the default
platform-dependent color format will be used.

- Also add some logic to prevent looping forever if the
omx component is buggy supporting color format enumeration.

Change-Id: I119a78f0d6201b4c3621235cca2f523ec14e24e3
MXCodec.cpp
c16acb7a9467831caf2c7c268a3fe57ec4bc69aa 05-Aug-2010 Andreas Huber <andih@google.com> am 870678a9: am 2c37f3d3: Merge "Better support for fake timestamps in RTP, H.263 video now also requests FIR." into gingerbread

Merge commit '870678a954e1e2a96caf76453c20de808253ffd1'

* commit '870678a954e1e2a96caf76453c20de808253ffd1':
Better support for fake timestamps in RTP, H.263 video now also requests FIR.
f084e5fbd35d5142a428c3de998d6001016fec56 05-Aug-2010 Andreas Huber <andih@google.com> am 2405988f: am 407ec58c: Merge "A better fix for the OggExtractor referring to the sample rate while it hasn\'t been initialized yet." into gingerbread

Merge commit '2405988fa07dfc7f6607cafe75322326628a9f52'

* commit '2405988fa07dfc7f6607cafe75322326628a9f52':
A better fix for the OggExtractor referring to the sample rate while it hasn't been initialized yet.
b6b546e72818988865d508e380d4445da71c4503 05-Aug-2010 Andreas Huber <andih@google.com> am c6d1519e: am fb861523: Merge "Specification of codec specific data as part of the session description is now optional." into gingerbread

Merge commit 'c6d1519e549740abd56df7a98b5348bd9095ae46'

* commit 'c6d1519e549740abd56df7a98b5348bd9095ae46':
Specification of codec specific data as part of the session description is now optional.
72cb2ee37595928ba8be034e555709de6a4105fb 05-Aug-2010 Marco Nelissen <marcone@google.com> am 533dc786: am 7d146197: Merge "Fix divide by zero." into gingerbread

Merge commit '533dc7866c19327e31ec6a13e36b997bcc74a650'

* commit '533dc7866c19327e31ec6a13e36b997bcc74a650':
Fix divide by zero.
214c163fbf6845b25743374702db852b2c55a884 05-Aug-2010 Andreas Huber <andih@google.com> am ac8e7060: am 86d2c088: Merge "Don\'t return a decoder error if the encoded stream does not start with SPS/PPS." into gingerbread

Merge commit 'ac8e7060e09cc8eecc3f959691185bf156939404'

* commit 'ac8e7060e09cc8eecc3f959691185bf156939404':
Don't return a decoder error if the encoded stream does not start with SPS/PPS.
982a93173bc84f005172152d823cbb59dfcbeb12 05-Aug-2010 Andreas Huber <andih@google.com> am 1f513d88: am c17f35dd: Merge "Support for Gtalk video, includes AMR/H.263 assembler and packetization support, extensions to MediaRecorder to stream via RTP over a pair of UDP sockets as well as various fixes to the RTP implementation." into gingerbread

Merge commit '1f513d8821670a33d6361ea521b6756163a3f9bf'

* commit '1f513d8821670a33d6361ea521b6756163a3f9bf':
Support for Gtalk video, includes AMR/H.263 assembler and packetization support, extensions to MediaRecorder to stream via RTP over a pair of UDP sockets as well as various fixes to the RTP implementation.
c5f0c714dc4225cd2ec305d5ddd297964a3dd3dc 05-Aug-2010 James Dong <jdong@google.com> Fix an issue where the track duration does not include the last sample duration

Change-Id: Ib6e01c1c84ad9b7404536f9c40bf90a13340ae53
PEG4Writer.cpp
cf168132b4e4ac8d9c29d02d8dfed89c33d06e9a 05-Aug-2010 Andreas Huber <andih@google.com> Merge "Better support for fake timestamps in RTP, H.263 video now also requests FIR." into gingerbread
ecaccb9f82dd07b29aa32ce36e8d15862dfdf547 05-Aug-2010 Andreas Huber <andih@google.com> A better fix for the OggExtractor referring to the sample rate while it hasn't been initialized yet.

Change-Id: I001fa36d3f5bf385b9f9d086c802673071c65db9
related-to-bug: 2896814
ggExtractor.cpp
ff53123821a3ec2e71fdb1a971ea2cbae3119826 05-Aug-2010 Andreas Huber <andih@google.com> Better support for fake timestamps in RTP, H.263 video now also requests FIR.

Change-Id: I2385461887197fe4062d329086e0204f6d6620fc
wesomePlayer.cpp
tsp/ARTPConnection.cpp
tsp/ARTPSource.cpp
tsp/ARTPSource.h
9cf3ce33d626543bd749241d0280f3900d5b8ed3 05-Aug-2010 Andreas Huber <andih@google.com> Merge "Specification of codec specific data as part of the session description is now optional." into gingerbread
f196d3ed76f38b131a89390bec12ff0152fb3727 05-Aug-2010 Marco Nelissen <marcone@google.com> Merge "Fix divide by zero." into gingerbread
e8c07d18201ac6d3a5458a2e15e5129159a1429e 05-Aug-2010 Marco Nelissen <marcone@google.com> Fix divide by zero.

Change-Id: I3113234aa5936965424dde5b24e448df1be0b603
ggExtractor.cpp
979c6c9720d8861375570b81222e55c43bb2838d 04-Aug-2010 Andreas Huber <andih@google.com> Merge "Don't return a decoder error if the encoded stream does not start with SPS/PPS." into gingerbread
2b3b9b2237468db96d9bb49dccd2b2a1eb8ae2db 04-Aug-2010 Andreas Huber <andih@google.com> Don't return a decoder error if the encoded stream does not start with SPS/PPS.

Change-Id: I960ada0c53f8ffe413ecd07c2c754a996841f592
odecs/avc/dec/AVCDecoder.cpp
nclude/AVCDecoder.h
33a8457868eb00b94b37b53321a80d9307202a9d 04-Aug-2010 Andreas Huber <andih@google.com> Specification of codec specific data as part of the session description is now optional.

Change-Id: Ie1953909e1d241381add3cc82a7a1f7d7d1540f2
wesomePlayer.cpp
tsp/APacketSource.cpp
39ddf8e0f18766f7ba1e3246b774aa6ebd93eea8 04-Aug-2010 Andreas Huber <andih@google.com> Support for Gtalk video, includes AMR/H.263 assembler and packetization support, extensions to MediaRecorder to stream via RTP over a pair of UDP sockets as well as various fixes to the RTP implementation.

Change-Id: I95b8dd487061add9bade15749e563b01cd99d9a6
ndroid.mk
wesomePlayer.cpp
MXCodec.cpp
nclude/AwesomePlayer.h
tsp/AAMRAssembler.cpp
tsp/AAMRAssembler.h
tsp/AAVCAssembler.cpp
tsp/AAVCAssembler.h
tsp/AH263Assembler.cpp
tsp/AH263Assembler.h
tsp/AMPEG4AudioAssembler.cpp
tsp/AMPEG4AudioAssembler.h
tsp/APacketSource.cpp
tsp/APacketSource.h
tsp/ARTPAssembler.h
tsp/ARTPConnection.cpp
tsp/ARTPConnection.h
tsp/ARTPSession.cpp
tsp/ARTPSession.h
tsp/ARTPSource.cpp
tsp/ARTPSource.h
tsp/ARTPWriter.cpp
tsp/ARTPWriter.h
tsp/ASessionDescription.cpp
tsp/Android.mk
tsp/MyHandler.h
tsp/UDPPusher.cpp
tsp/UDPPusher.h
tsp/rtp_test.cpp
216e5df78e958a3349ba4785fb79c688e1ad39a5 04-Aug-2010 James Dong <jdong@google.com> am 246aad12: am 3d84280c: Merge "File writer has a designated writer thread now" into gingerbread

Merge commit '246aad12cf2becda5111d03fd1dd8f39712686f2'

* commit '246aad12cf2becda5111d03fd1dd8f39712686f2':
File writer has a designated writer thread now
a7c61b8be205ce8db81ebbd15cd42abd649cbf4d 04-Aug-2010 James Dong <jdong@google.com> am 51a260d8: am 23796e3b: Merge "Add lost frame handling in AudioSource" into gingerbread

Merge commit '51a260d8c6e9a5c6b6c2cf808554ae013c1a7bef'

* commit '51a260d8c6e9a5c6b6c2cf808554ae013c1a7bef':
Add lost frame handling in AudioSource
26ab7ab7f543a03b65735a41de8496c54d3e490e 03-Aug-2010 James Dong <jdong@google.com> Merge "File writer has a designated writer thread now" into gingerbread
a5740924c0a71871f2697139effd43b137750597 03-Aug-2010 James Dong <jdong@google.com> Merge "Add lost frame handling in AudioSource" into gingerbread
1c9747a4653aec1395c2bd6896c9b87cb5447837 31-Jul-2010 James Dong <jdong@google.com> File writer has a designated writer thread now

+ This reduces the file I/O block time for audio/video track processing
- Since the file writer is buffering some output samples, the memory
usage would go up, depending on how many output samples are buffered.

Change-Id: I780cc5b26f4b53a5efbd643fcf9505dfc19cd4cd
PEG4Writer.cpp
fd150a8e03cdd8462eafd68f4a4231aa52f0e5a1 02-Aug-2010 Nipun Kwatra <nkwatra@google.com> including limits.h to fix simulator build.

Change-Id: I473a62ab8282e4e89e48ee6d7e99aec6ed37076a
ameraSourceTimeLapse.cpp
40e2f3f9b41f44bdb59f7708a421b87f169a6ede 31-Jul-2010 Nipun Kwatra <nkwatra@google.com> Implementing getSupportedPictureSizes

Go through all the supported picture sizes and choose the smallest one with
both dimensions higher than the passed in video width and height.

Change-Id: I4e9fe7a6384a0feeb9e069239ec68c70fb5f3033
ameraSourceTimeLapse.cpp
484c146281e39a04e32f4f13775210ab2a248c57 30-Jul-2010 James Dong <jdong@google.com> am 7600f934: am f0aa24d9: Merge "Added damr box for AMR (NB and WB) sample entry" into gingerbread

Merge commit '7600f934015cff4d678b0f4e8df0eb93749be7bb'

* commit '7600f934015cff4d678b0f4e8df0eb93749be7bb':
Added damr box for AMR (NB and WB) sample entry
46292fb347d72a314d985e34e5e3743d846cb9b6 30-Jul-2010 James Dong <jdong@google.com> Add lost frame handling in AudioSource

- Also collect stats on lost audio frames instead of time spent on reading

Change-Id: I6380b143e4fbdcd894491aaae523331e90d0f04f
udioSource.cpp
5aff464f67322cd13dc8ed165806971cfff2e4d5 30-Jul-2010 James Dong <jdong@google.com> Added damr box for AMR (NB and WB) sample entry

- Some players, like QT, sometimes are picky about the missing sample entry

Change-Id: Ia32d78e48ac9fd8af8285dbc67f0d69142ba98b4
PEG4Writer.cpp
c4e47d1e81c4e4403663cb911e98dbf3ada9942c 28-Jul-2010 Nipun Kwatra <nkwatra@google.com> Support for video size to be different from captured picture size.

Adding support to allow video size to be different than the supported
picture sizes. A picture size larger than the demanded video size is
chosen. Captured pictures are then cropped to the size of the desired
video size. Cropping is done from the the center portion of the picture.

Change-Id: I6bcbe16f94b6ecbcf28b7f46826a81b4b6b8cbc3
ndroid.mk
ameraSourceTimeLapse.cpp
db205a1d75c1e9a7d0dbd8fa011335249ad6f4ac 28-Jul-2010 Nipun Kwatra <nkwatra@google.com> Adding YUVImage and YUVCanvas.

YUVImage is a container class to hold YUV data and provide
various utilities, e.g. to set/get pixel values for different
YUV formats, fast copying routines, etc.
Currently supported YUV420 Planar and YUV420 Semi Planar.

YUVCanvas holds a reference to a YUVImage on which it can do various
drawing operations.

Change-Id: I052a57b7fbc834efe1626914f76c04c091996cac
uv/Android.mk
uv/YUVCanvas.cpp
uv/YUVImage.cpp
ac36fde15b7bc14ba27cdb21a0aeb5d7356c47f4 29-Jul-2010 Andreas Huber <andih@google.com> am 42556025: am 6dea6f4e: am 16263d9f: Squashed commit of the following:

Merge commit '425560259c6d41e7f413fdd0f517dc47f350c533'

* commit '425560259c6d41e7f413fdd0f517dc47f350c533':
Squashed commit of the following:
5caff27f4683d5e444f327a5beec15d9b8c7f252 29-Jul-2010 Andreas Huber <andih@google.com> am 16263d9f: Squashed commit of the following:

Merge commit '16263d9f8cc01392c2f3678b381ce897647c8c81' into gingerbread

* commit '16263d9f8cc01392c2f3678b381ce897647c8c81':
Squashed commit of the following:
3cc219dfc67b866e10828f0c17641668d47c1cd8 20-Jul-2010 Andreas Huber <andih@google.com> Squashed commit of the following:

commit 4abf16bb04dc9695fedf4007a84f903074312ccd
Author: Andreas Huber <andih@google.com>
Date: Tue Jul 20 09:21:17 2010 -0700

Support a single format change at the beginning of audio playback. This way the AAC+ decoder may change its output format from what is originally encoded in the audio stream and we'll still play it back correctly.

Change-Id: Icc790122744745e9a88099788d4818ca1e265a82
related-to-bug: 2826841

commit 09c74da63e6ad5cb5dafb70f62696d75d2978967
Author: James Dong <jdong@google.com>
Date: Sun Jul 18 17:57:01 2010 -0700

Fix MPEG4Extractor to extract sampling frequency correctly when SBR is enabled.

Change-Id: I883c81dad3ea465e71cb5590e89d763671a90ff8

commit f672bf2a782dc7d5fb6325d611a7fe17045dfe9a
Author: James Dong <jdong@google.com>
Date: Thu Jul 8 20:56:13 2010 -0700

Enable the support for decoding audio with AAC+ and eAAC+ features

bug - 282684

Change-Id: I73c8377af3cc4edd3ee7cea86dc3b1c369fbd78b

Change-Id: I012f1179e933b6d1345d2368f357576c722485f7
udioPlayer.cpp
odecs/aacdec/AACDecoder.cpp
nclude/AACDecoder.h
2c59bd383b4665fce878940c472af48f2597866d 29-Jul-2010 James Dong <jdong@google.com> am 8ddb8f81: am bc1daf01: Merge "Eliminate the linear cost associated with mSampleSizes.size()" into gingerbread

Merge commit '8ddb8f81902045ec8a53ec14b8fb936fd42517e0'

* commit '8ddb8f81902045ec8a53ec14b8fb936fd42517e0':
Eliminate the linear cost associated with mSampleSizes.size()
ff4a7fa411401910e6e5ac88aeb6e0080a8cc8b1 28-Jul-2010 James Dong <jdong@google.com> Eliminate the linear cost associated with mSampleSizes.size()

- The linear cost associated with mSampleSizes.size() call causes the
CPU load to increase overtime as more and more audio/video samples
are recorded.

- Other Lists used in the MP4 file writer may have similar issues, but
the size() call is not made for each output audio/video output sample,
or the size of the list is bounded (not linear to the total number
of audio/video output samples). As for now, we can live with the small
cost (tested with 30 minutes long recording).

Change-Id: I23bd93ea4256cb0be0c1649760e39e6809eb4946
PEG4Writer.cpp
6a372681547650d21e3b6264799cdbb4af881d09 28-Jul-2010 James Dong <jdong@google.com> am 84665f6d: am 7e397842: Reduce memory usage by the MP4 file writer - Don\'t store timestamp for each output sample - Don\'t store timestamp for statistical data collection if the collection of statistical data is not requested

Merge commit '84665f6dc2d0b5dfa6a46463677c51f2b670e511'

* commit '84665f6dc2d0b5dfa6a46463677c51f2b670e511':
Reduce memory usage by the MP4 file writer
3722abe1a6ae53034b9dee6b12e8513804622fd5 28-Jul-2010 James Dong <jdong@google.com> am cb51115c: am 5587bb7e: Merge "Interleave the audio and video by default - default interleave duration is set to 1 second" into gingerbread

Merge commit 'cb51115cca81ba47d00aa344f6ed16d1056b056b'

* commit 'cb51115cca81ba47d00aa344f6ed16d1056b056b':
Interleave the audio and video by default
8644c14618d30d9e57a69df40ed939986ebf02c4 28-Jul-2010 James Dong <jdong@google.com> Reduce memory usage by the MP4 file writer
- Don't store timestamp for each output sample
- Don't store timestamp for statistical data collection if the collection of statistical data is not requested

TODO:
1. Reduce CPU load by elimnating the list cost associated with List.size() call.

Change-Id: I590bc17176596a65952c982574b82ee3b15b7d1c
PEG4Writer.cpp
f01528f435e6b1f02d118fcd8305a148c27a89f1 28-Jul-2010 James Dong <jdong@google.com> Interleave the audio and video by default
- default interleave duration is set to 1 second

This can dramatically reduce the memory usage
by the MP4 file writer.

Change-Id: Ia3ff202cabfcd2d3f183065d31e4596617c2dded
PEG4Writer.cpp
e4e0a6994d39c4a7cba09c5fff442b2dca1df8f8 21-Jul-2010 Nipun Kwatra <nkwatra@google.com> Allowing setting of time lapse parameters through MediaRecorder.java

added setTimeLapseParameters() to MediaRecorder.java and SetParameter support
in StagefrightRecorder to allow enabling time lapse and setting the corresponding
parameters.

Change-Id: I509040aa71f8d3fc37337b0894a81d9c0fd7a40a
ameraSourceTimeLapse.cpp
55cb2b8319e6b36e88658de121c534e95cd240b4 23-Jul-2010 James Dong <jdong@google.com> am 9bc4dc11: am 53d4e0d5: Allows the authoring engine to skip frame.

Merge commit '9bc4dc114fce58606a81d65d4cb31348cc7c1bae'

* commit '9bc4dc114fce58606a81d65d4cb31348cc7c1bae':
Allows the authoring engine to skip frame.
542db5d438988360d491a5add1040a2df9aa90c9 21-Jul-2010 James Dong <jdong@google.com> Allows the authoring engine to skip frame.

This is 1st part of the work to allow audio and video resync if
we found out that audio and video are out of sync during authoring

- also fixed a problem in AACEncoder::read() where the buffer acquired
from the buffer group does not release when error out at
reading from source.

Change-Id: I8a2740097fcfdf85e6178869afeb9f3687a99118
udioSource.cpp
ameraSource.cpp
ediaSource.cpp
MXCodec.cpp
odecs/aacenc/AACEncoder.cpp
f661058d77d1484e5911d1962f8e1e8466240687 22-Jul-2010 Andreas Huber <andih@google.com> am b72d3180: am 81046c8c: Merge "Various changes to improve rtsp networking, reduce packet loss and adapt to ALooper API changes." into gingerbread

Merge commit 'b72d3180dc8d41d6269664bea808b04410bbe40f'

* commit 'b72d3180dc8d41d6269664bea808b04410bbe40f':
Various changes to improve rtsp networking, reduce packet loss and adapt to ALooper API changes.
348a8eab84f4bba76c04ca83b2f5418467aa1a48 22-Jul-2010 Andreas Huber <andih@google.com> Various changes to improve rtsp networking, reduce packet loss and adapt to ALooper API changes.

Change-Id: I110e19d5ce33e597add3ffbd3e3ff3815862396d
oundation/ALooper.cpp
tsp/AMPEG4AudioAssembler.cpp
tsp/ARTSPController.cpp
tsp/MyHandler.h
d3bc2528fca033f3d34969a095beec0bc3f79ffd 21-Jul-2010 Andreas Huber <andih@google.com> am 8a9a931f: am 8138e841: Merge "Support finer seek control on MediaSources." into gingerbread

Merge commit '8a9a931fff2d184f7cf77fdd8a425f682f006cfd'

* commit '8a9a931fff2d184f7cf77fdd8a425f682f006cfd':
Support finer seek control on MediaSources.
abd1f4f870925d6776dbe4b930b759a1ab6595ca 21-Jul-2010 Andreas Huber <andih@google.com> Support finer seek control on MediaSources.

related-to-bug: 2858448

Change-Id: Ifb4b13b990fd5889113e47e2c62249ac43391fa1
MRExtractor.cpp
wesomePlayer.cpp
ameraSource.cpp
PEGSource.cpp
P3Extractor.cpp
PEG4Extractor.cpp
ediaSource.cpp
MXCodec.cpp
ggExtractor.cpp
ampleTable.cpp
houtcastSource.cpp
AVExtractor.cpp
odecs/aacdec/AACDecoder.cpp
odecs/aacenc/AACEncoder.cpp
odecs/amrnb/dec/AMRNBDecoder.cpp
odecs/amrnb/enc/AMRNBEncoder.cpp
odecs/amrwb/AMRWBDecoder.cpp
odecs/amrwbenc/AMRWBEncoder.cpp
odecs/avc/dec/AVCDecoder.cpp
odecs/m4v_h263/dec/M4vH263Decoder.cpp
odecs/mp3dec/MP3Decoder.cpp
odecs/on2/dec/VPXDecoder.cpp
odecs/vorbis/dec/VorbisDecoder.cpp
nclude/AVCDecoder.h
nclude/M4vH263Decoder.h
nclude/SampleTable.h
nclude/VPXDecoder.h
atroska/MatroskaExtractor.cpp
932e0a11d74d5e236ccef9ee314442385c3d4e9d 21-Jul-2010 James Dong <jdong@google.com> am 9049fe60: am d7514ec6: Merge "Progress status notification" into gingerbread

Merge commit '9049fe60c20640bd606741c8f45f3f781a1684f5'

* commit '9049fe60c20640bd606741c8f45f3f781a1684f5':
Progress status notification
3108231d90e8aa324923fd8864ca2477948c5d25 20-Jul-2010 James Dong <jdong@google.com> Merge "Progress status notification" into gingerbread
0aacf105eea098a0b47761a4a9a5c4d820611f2d 19-Jul-2010 Nipun Kwatra <nkwatra@google.com> Restart preview after each takePicture is done.

Preview is called when CAMERA_MSG_COMPRESSED_IMAGE is recieved by
dataCallback(). It needs to be started as a new thread so that the
callback can return, and the camera can know that takePicture() is
done.

Change-Id: I4d0febbc993aac43b37f9f4a824e9c7b8785f19e
ameraSourceTimeLapse.cpp
385695764189477e963a749a5f107f6eaeb9c5f2 20-Jul-2010 Nipun Kwatra <nkwatra@google.com> Merge "Adding support for timelapse capture using still camera's takepicture. Also moving entire implementation into a new class CameraSourceTimeLapse which inherits from CameraSource."
fbfe57ba4403ad759a0ebd895914ff506a01b699 20-Jul-2010 Andreas Huber <andih@google.com> am ff45709f: am cc14a839: Support a single format change at the beginning of audio playback. This way the AAC+ decoder may change its output format from what is originally encoded in the audio stream and we\'ll still play it back correctly.

Merge commit 'ff45709fbd1f24de1cf75ce9ce9ac8694ff1abbe'

* commit 'ff45709fbd1f24de1cf75ce9ce9ac8694ff1abbe':
Support a single format change at the beginning of audio playback. This way the AAC+ decoder may change its output format from what is originally encoded in the audio stream and we'll still play it back correctly.
ee3d00420b64909b219d95a613d8e735ec337839 20-Jul-2010 Andreas Huber <andih@google.com> am 4df3ab54: am faf1d46a: Merge "Fix MPEG4Extractor to extract sampling frequency correctly when SBR is enabled." into gingerbread

Merge commit '4df3ab54ebf8dfc0ce3160992d4d5b47e103b71f'

* commit '4df3ab54ebf8dfc0ce3160992d4d5b47e103b71f':
Fix MPEG4Extractor to extract sampling frequency correctly when SBR is enabled.
3c3ddfa39635a2d39f4ee7c966fb9403fe1ec9d8 20-Jul-2010 Andreas Huber <andih@google.com> Support a single format change at the beginning of audio playback. This way the AAC+ decoder may change its output format from what is originally encoded in the audio stream and we'll still play it back correctly.

Change-Id: Icc790122744745e9a88099788d4818ca1e265a82
related-to-bug: 2826841
udioPlayer.cpp
PEG4Extractor.cpp
faed5cd124a54b8db3429f4c26b3220bbec4c8bb 16-Jul-2010 James Dong <jdong@google.com> Progress status notification

- Keep track of per-track progress

Change-Id: Ibd36f0e8c78581928c8aa2f5e23c5e7e0615c2cc
PEG4Writer.cpp
odecs/m4v_h263/enc/M4vH263Encoder.cpp
65e7e6facda89927cb26594b3b65ae81b3235ebc 12-Jul-2010 Nipun Kwatra <nkwatra@google.com> Adding support for timelapse capture using still camera's takepicture.
Also moving entire implementation into a new class CameraSourceTimeLapse
which inherits from CameraSource.

For timelapse capture using still camera, we start a thread which runs a
loop in which it calls Camera::takePicture() and then sleeps until the next
frame should be captured.
The function dataCallback() handles the callback from the camera with the
raw image data. This function copies the data and creates an artificial
timestamp corresponding to one frame time ahead of the last encoded frame's
time stamp. It then calls dataCallbackTimestamp() of the base class which
will think that it recieved the frame from a video camera and proceed as usual.

For moving the implementation to the subclass CameraSourceTimeLapse, added a
few virtual functions to CameraSource, which do the current thing for the base
class, but specialized things for CameraSourceTimeLapse.
E.g. startCameraRecording() in the base class just calls mCamera->startRecording(),
while in CameraSourceTimeLapse it may start a thread for the still camera case.

Change-Id: Ib787f24bd2e1f41681513f0257e1c4ca10a2b4de
ndroid.mk
ameraSource.cpp
ameraSourceTimeLapse.cpp
6cad99fefc7275f30886962e4193a336a2144b7b 19-Jul-2010 James Dong <jdong@google.com> Fix MPEG4Extractor to extract sampling frequency correctly when SBR is enabled.

Change-Id: I883c81dad3ea465e71cb5590e89d763671a90ff8
PEG4Extractor.cpp
odecs/aacdec/AACDecoder.cpp
f913c25c713cbe0fe16dd1cc17bdfaba6b77070f 19-Jul-2010 James Dong <jdong@google.com> am 5e782937: am faf775e7: Fix simulator build (1st attempt)

Merge commit '5e782937ead3042255d83f9c1192f2cc7b688d74'

* commit '5e782937ead3042255d83f9c1192f2cc7b688d74':
Fix simulator build (1st attempt)
46bf665ea3687f06069ebd1a0acd01ed7b5ac9cb 18-Jul-2010 James Dong <jdong@google.com> Fix simulator build (1st attempt)

Change-Id: I65a824c17929170b7b2bc75a13e756e92d8fe50a
odecs/m4v_h263/enc/src/mp4def.h
a6163d6948d9a89670720eea8d30b59c5b70fe37 16-Jul-2010 James Dong <jdong@google.com> am 10f8baa4: am 42ef0c71: Initial check-in for software m4v_h263 encoder

Merge commit '10f8baa46cc32f0024b3c65b1e6d0c01bf4ceefd'

* commit '10f8baa46cc32f0024b3c65b1e6d0c01bf4ceefd':
Initial check-in for software m4v_h263 encoder
59f566c4ec3dfc097ad8163523e522280b27e5c3 13-Jul-2010 James Dong <jdong@google.com> Initial check-in for software m4v_h263 encoder

Change-Id: I4b49fa5c3a5e6e21cfd2419441d98dd784046367
ndroid.mk
MXCodec.cpp
odecs/m4v_h263/enc/Android.mk
odecs/m4v_h263/enc/M4vH263Encoder.cpp
odecs/m4v_h263/enc/include/cvei.h
odecs/m4v_h263/enc/include/mp4enc_api.h
odecs/m4v_h263/enc/src/bitstream_io.cpp
odecs/m4v_h263/enc/src/bitstream_io.h
odecs/m4v_h263/enc/src/combined_encode.cpp
odecs/m4v_h263/enc/src/datapart_encode.cpp
odecs/m4v_h263/enc/src/dct.cpp
odecs/m4v_h263/enc/src/dct.h
odecs/m4v_h263/enc/src/dct_inline.h
odecs/m4v_h263/enc/src/fastcodemb.cpp
odecs/m4v_h263/enc/src/fastcodemb.h
odecs/m4v_h263/enc/src/fastidct.cpp
odecs/m4v_h263/enc/src/fastquant.cpp
odecs/m4v_h263/enc/src/fastquant_inline.h
odecs/m4v_h263/enc/src/findhalfpel.cpp
odecs/m4v_h263/enc/src/m4venc_oscl.h
odecs/m4v_h263/enc/src/me_utils.cpp
odecs/m4v_h263/enc/src/motion_comp.cpp
odecs/m4v_h263/enc/src/motion_est.cpp
odecs/m4v_h263/enc/src/mp4def.h
odecs/m4v_h263/enc/src/mp4enc_api.cpp
odecs/m4v_h263/enc/src/mp4enc_lib.h
odecs/m4v_h263/enc/src/mp4lib_int.h
odecs/m4v_h263/enc/src/rate_control.cpp
odecs/m4v_h263/enc/src/rate_control.h
odecs/m4v_h263/enc/src/sad.cpp
odecs/m4v_h263/enc/src/sad_halfpel.cpp
odecs/m4v_h263/enc/src/sad_halfpel_inline.h
odecs/m4v_h263/enc/src/sad_inline.h
odecs/m4v_h263/enc/src/sad_mb_offset.h
odecs/m4v_h263/enc/src/vlc_enc_tab.h
odecs/m4v_h263/enc/src/vlc_encode.cpp
odecs/m4v_h263/enc/src/vlc_encode.h
odecs/m4v_h263/enc/src/vlc_encode_inline.h
odecs/m4v_h263/enc/src/vop.cpp
nclude/M4vH263Encoder.h
852cdfcc694782f419022661855f078ffa8f576e 15-Jul-2010 Mike Lockwood <lockwood@android.com> Merge changes I93364c74,I5ca831b8

* changes:
Exclude MTP implementation from simulator build
Fixes for simulator build on lucid
4e2ffa400b82559cab2c5717c8dcdff393d334a9 15-Jul-2010 Mike Lockwood <lockwood@android.com> Fixes for simulator build on lucid

strchr and strrchr now return const char* instead of char*

Change-Id: I5ca831b8951af7e6306eb9d9d6f78ed2ec13d649
Signed-off-by: Mike Lockwood <lockwood@android.com>
uHTTPDataSource.cpp
ttplive/M3UParser.cpp
tsp/ARTSPConnection.cpp
tsp/ASessionDescription.cpp
tsp/MyHandler.h
cbcc684555a8774b21ba04c09b2f5cee8c88453a 15-Jul-2010 James Dong <jdong@google.com> am b068b47c: am d6a85a21: Merge "Support user-supplied timescales for authoring" into gingerbread

Merge commit 'b068b47c6d0214256116a0c661740bddf7acc18c'

* commit 'b068b47c6d0214256116a0c661740bddf7acc18c':
Support user-supplied timescales for authoring
8f5f2fcee5c12d08df71d17017410c50951fc2e3 02-Jul-2010 James Dong <jdong@google.com> Support user-supplied timescales for authoring

- also, change all the real time unit to microseconds in MPEG4Writer

Change-Id: I260f512f2eb670ade7b8858a56335a5d639de756
PEG4Writer.cpp
MXCodec.cpp
ac460be1e02f324656d5850ca6d8cf1165edbaaf 13-Jul-2010 James Dong <jdong@google.com> am 7a72f848: am 70c6c9a1: Fix simulator build - missing header file <string.h> - need to define -D__arm__

Merge commit '7a72f84801c3ad74f00f5d3d0da7e2212d07a911'

* commit '7a72f84801c3ad74f00f5d3d0da7e2212d07a911':
Fix simulator build
d54329e48d2ee6bc6b24d148770eec562e10e739 13-Jul-2010 James Dong <jdong@google.com> Fix simulator build
- missing header file <string.h>
- need to define -D__arm__

Change-Id: I18d2f1908684150784cf728234b5aedbc02447d1
odecs/avc/enc/Android.mk
odecs/avc/enc/src/avcenc_api.h
f6266bb1912255e92e590fcb6aedb719898545da 13-Jul-2010 James Dong <jdong@google.com> am f6bdc764: am 9d8bea11: Merge "Initial checkin for software AVC encoder" into gingerbread

Merge commit 'f6bdc764b7a21f8037504e1dc4f81227ea2bedea'

* commit 'f6bdc764b7a21f8037504e1dc4f81227ea2bedea':
Initial checkin for software AVC encoder
29a84457aed4c45bc900998b5e11c03023264208 03-Jul-2010 James Dong <jdong@google.com> Initial checkin for software AVC encoder

- Since the software encoder assumes the input is YUV420 planar,
color conversion needs to be added when the input color format
does not meet the requirement. With this patch, I only added
a single color conversion from YUV420 semi planar to YUV420
planar. We can add more as we go.

Change-Id: If8640c9e5a4f73d385ae9bb2022e57f7f62b91b9
ndroid.mk
MXCodec.cpp
odecs/avc/enc/AVCEncoder.cpp
odecs/avc/enc/Android.mk
odecs/avc/enc/src/avcenc_api.cpp
odecs/avc/enc/src/avcenc_api.h
odecs/avc/enc/src/avcenc_int.h
odecs/avc/enc/src/avcenc_lib.h
odecs/avc/enc/src/bitstream_io.cpp
odecs/avc/enc/src/block.cpp
odecs/avc/enc/src/findhalfpel.cpp
odecs/avc/enc/src/header.cpp
odecs/avc/enc/src/init.cpp
odecs/avc/enc/src/intra_est.cpp
odecs/avc/enc/src/motion_comp.cpp
odecs/avc/enc/src/motion_est.cpp
odecs/avc/enc/src/rate_control.cpp
odecs/avc/enc/src/residual.cpp
odecs/avc/enc/src/sad.cpp
odecs/avc/enc/src/sad_halfpel.cpp
odecs/avc/enc/src/sad_halfpel_inline.h
odecs/avc/enc/src/sad_inline.h
odecs/avc/enc/src/sad_mb_offset.h
odecs/avc/enc/src/slice.cpp
odecs/avc/enc/src/vlc_encode.cpp
nclude/AVCEncoder.h
31e179a6f1c154f5b8c80c0fb9451703c6839c9c 09-Jul-2010 James Dong <jdong@google.com> am a60337ce: am 6bb14e08: Merge "Enable the support for decoding audio with AAC+ and eAAC+ features" into gingerbread

Merge commit 'a60337ce578f91926a5e8ea30cb47740b994fc96'

* commit 'a60337ce578f91926a5e8ea30cb47740b994fc96':
Enable the support for decoding audio with AAC+ and eAAC+ features
004a77836d1963847acd20ea684e2ffe48aa3f19 09-Jul-2010 James Dong <jdong@google.com> am 4f440632: am 929642ee: Add runtime dumpsys support for media recorder client

Merge commit '4f4406322dafd6e128b437edbc541327f0b38d04'

* commit '4f4406322dafd6e128b437edbc541327f0b38d04':
Add runtime dumpsys support for media recorder client
fe02beaa83dab8d9bbf6aa0f2aefa530d4228824 09-Jul-2010 James Dong <jdong@google.com> Enable the support for decoding audio with AAC+ and eAAC+ features

bug - 282684

Change-Id: I73c8377af3cc4edd3ee7cea86dc3b1c369fbd78b
odecs/aacdec/AACDecoder.cpp
nclude/AACDecoder.h
b914122eb9cb54bbeae4ec03bfebb194aecdccbd 08-Jul-2010 James Dong <jdong@google.com> Add runtime dumpsys support for media recorder client

Change-Id: I4c8a81720f3be2db54678a7e84fe12849255046b
MXCodec.cpp
bf21177ccede8f01c0da0bd53392a289a5a84462 08-Jul-2010 James Dong <jdong@google.com> am b3598832: am c4243342: Merge "Allow application to set two more encoding paramters: video profile and level" into gingerbread

Merge commit 'b35988329ac1a574898db9226039e37e352c57a8'

* commit 'b35988329ac1a574898db9226039e37e352c57a8':
Allow application to set two more encoding paramters: video profile and level
8cafde196d36ab207f35fed89b9c1b9d468abb58 07-Jul-2010 James Dong <jdong@google.com> Merge "Allow application to set two more encoding paramters: video profile and level" into gingerbread
5bb4809a27ae962be32c67b705671cdada03be00 07-Jul-2010 Andreas Huber <andih@google.com> am dcf872dc: am c34c8c3f: Merge "Only send the playback complete notification if a) an error occurred on any track or b) all tracks have finished playing. The previous behaviour was to send the notification as soon as the first track finished playing." into gingerbrea

Merge commit 'dcf872dcfa6439514c886f8b9bf997beeeb3be85'

* commit 'dcf872dcfa6439514c886f8b9bf997beeeb3be85':
Only send the playback complete notification if a) an error occurred on any track or b) all tracks have finished playing. The previous behaviour was to send the notification as soon as the first track finished playing.
5d2de4da54504836e4b772b3010ac28c19f667f0 07-Jul-2010 Andreas Huber <andih@google.com> Only send the playback complete notification if a) an error occurred on any track or b) all tracks have finished playing. The previous behaviour was to send the notification as soon as the first track finished playing.

Change-Id: Icac8104d14f18b719aa0b8f1ab3215f24003b152
wesomePlayer.cpp
nclude/AwesomePlayer.h
145bfe5eb3e08c9689c28f6bf3287a979438b04b 02-Jul-2010 James Dong <jdong@google.com> Allow application to set two more encoding paramters: video profile and level

Change-Id: I673e681cefe184d5c556c612c54600a24a2143e5
MXCodec.cpp
f1ca5833464c0f6859f2a38b6af02cbe527c3335 07-Jul-2010 Andreas Huber <andih@google.com> am f5b4e342: am 2e6aff8e: Merge "ALooperRoster no longer holds strong references to handlers and loopers." into gingerbread

Merge commit 'f5b4e342b581a6e219b49141861b353fb139d00b'

* commit 'f5b4e342b581a6e219b49141861b353fb139d00b':
ALooperRoster no longer holds strong references to handlers and loopers.
0696f6824b16388f88930f58d1431133725af2f4 07-Jul-2010 Andreas Huber <andih@google.com> am ff119e74: am 6615defd: Make sure the OMX callback thread is properly shutdown after the node goes away.

Merge commit 'ff119e746afe834040afb1631caee355d94237e8'

* commit 'ff119e746afe834040afb1631caee355d94237e8':
Make sure the OMX callback thread is properly shutdown after the node goes away.
91952e5221d2151e10738d7228575c4afe444f5e 07-Jul-2010 Andreas Huber <andih@google.com> Merge "ALooperRoster no longer holds strong references to handlers and loopers." into gingerbread
11cc270ac5fd522c9e6491a7933516a96da4f62e 07-Jul-2010 Andreas Huber <andih@google.com> ALooperRoster no longer holds strong references to handlers and loopers.

Change-Id: I038d69b0a34eda1bfc5216d92c837a5ddf4fb802
oundation/ALooperRoster.cpp
2bd69f0df09cc67abdeeea2786e826914ee5ead0 07-Jul-2010 Andreas Huber <andih@google.com> am 877045aa: am 9406f626: Merge "An AHandler can now find its associated ALooper." into gingerbread

Merge commit '877045aa853aaf6e58ca3ac7bfa2bde9165b55ae'

* commit '877045aa853aaf6e58ca3ac7bfa2bde9165b55ae':
An AHandler can now find its associated ALooper.
f0128187491b4d65b9c2620d46f5af807f63d728 07-Jul-2010 Andreas Huber <andih@google.com> Make sure the OMX callback thread is properly shutdown after the node goes away.

Change-Id: Ib0b25855b0dfc191e5529193b4cb519f644a8412
mx/OMX.cpp
3ecb233c9c121af3e68ece11705043b1dbef505b 07-Jul-2010 Andreas Huber <andih@google.com> Merge "An AHandler can now find its associated ALooper." into gingerbread
e2b20987c2652a984d10520ef3542d50d91119c5 03-Jul-2010 Andreas Huber <andih@google.com> An AHandler can now find its associated ALooper.

Change-Id: Ic7087b8dcbc0d9abda272df0cb01b04b006f82ad
oundation/AHandler.cpp
oundation/ALooperRoster.cpp
oundation/Android.mk
a041596d1c4c85a2face27ead436721f8435e53a 02-Jul-2010 Andreas Huber <andih@google.com> am c4be155a: am 2cfd8198: Merge "Add an option to ALooper::start that allows it to call back into java or not." into gingerbread

Merge commit 'c4be155a540695c42bcd6589604f86d300f4548f'

* commit 'c4be155a540695c42bcd6589604f86d300f4548f':
Add an option to ALooper::start that allows it to call back into java or not.
34bbea84b8374f5d0ebe72b0be4418ace984fac0 02-Jul-2010 Andreas Huber <andih@google.com> Merge "Add an option to ALooper::start that allows it to call back into java or not." into gingerbread
1ef2a2b04c1e2488694c511bc954604da21b12d0 02-Jul-2010 Andreas Huber <andih@google.com> am 9f8c490e: am 5460d126: Merge "Added AMessage::debugString() for debugging purposes." into gingerbread

Merge commit '9f8c490e05f86cca1d60d6b6f383a1a98d7985fb'

* commit '9f8c490e05f86cca1d60d6b6f383a1a98d7985fb':
Added AMessage::debugString() for debugging purposes.
42d7f83904b8a91ce33e87a44de109572679ac1f 02-Jul-2010 Andreas Huber <andih@google.com> Add an option to ALooper::start that allows it to call back into java or not.

Change-Id: Iec172901a04a575d8d350bd162565f04677c3f26
oundation/ALooper.cpp
cbb56d14dad2785baf7a723b43aa6f1da32dc51f 02-Jul-2010 Andreas Huber <andih@google.com> Merge "Added AMessage::debugString() for debugging purposes." into gingerbread
bbc2b8289458cfde931b133bad0c9d1026674ee7 01-Jul-2010 Andreas Huber <andih@google.com> Added AMessage::debugString() for debugging purposes.

Change-Id: Id43ffd2c56d659dc29f37e277f8c7b38f11c1591
oundation/AMessage.cpp
fc20aab463f527ab3b0664986f0381a86b375884 01-Jul-2010 Nipun Kwatra <nkwatra@google.com> Adding timelapse capture from videocamera.

Current implementation looks at the timestamps of all incoming frames in
CameraSource::dataCallbackTimestamp().
It drops all frames until enough time has elapsed to get the next time lapse frame.
When enough time has passed to capture the next time lapse frame, the frame is no longer dropped
and the timestamp of this frame is modified to be one frame time (1/framerate) ahead of the
last encoded frame's time stamp.

Change-Id: I82b9d5e96113dffa6901aac3b8a8ef999ffc1d0b
ameraSource.cpp
19c9a1e2bb6ead5e1e895aea8be573fe0f8cc7bb 01-Jul-2010 Andreas Huber <andih@google.com> Support for writing the extracted data to an .mp4 file in the stagefright commandline tool.

Change-Id: I972324a8fc9757e6e8116b0270ec0882106f8733
PEG4Writer.cpp
1c8ed2e906576fd8d7fa03f577bdec518cbe13d7 30-Jun-2010 Andreas Huber <andih@google.com> Support for vanilla YUV420sp => RGB565 color conversion.

Change-Id: I22e5b554909e169eaf153d1f25b636f6f04a1871
olorconversion/ColorConverter.cpp
d329e21495eda9dbc531fdd0c26c77f1593ac3f4 30-Jun-2010 James Dong <jdong@google.com> Added encoding parameters set up for H263 video encoder

Also:
- Allowed start() call when encoder already starts and stop() call when encoder has not started yet
- Handled default value for audio/video sources/encoders and file output format

Change-Id: I03b2f7d3cf570baa0fd011a8c0ad200f2f2a5da1
MXCodec.cpp
odecs/aacenc/AACEncoder.cpp
odecs/amrnb/enc/AMRNBEncoder.cpp
odecs/amrwbenc/AMRWBEncoder.cpp
ae1f0036bd9cc52353fb3a8ad4556792e1e8047a 29-Jun-2010 Andreas Huber <andih@google.com> Add qcom's new OMX components to the list.

Change-Id: Ic8d261aaa5b15c1be7e6d57aee6be51cecb10bb1
MXCodec.cpp
215381ea729086b8359b7f59bdc2bd7cf55a0c45 26-Jun-2010 James Dong <jdong@google.com> Collect statistical data from authoring engine (second part)

- added sample duration to the statistcal log messages.
- fixed the bug on miscalcuting the average frame rate.

- also fixed an issue where both frame and time progress status notifications
are sent out even though only one of them is explicitly requsted.

Change-Id: Ib86f15a85fad3dbeabde120c3c782b79c16da46c
PEG4Writer.cpp
93d6b102a13afa23bfa80d74c399d93d542e6ad6 25-Jun-2010 James Dong <jdong@google.com> Provide progress status report during authoring

- Track either the number of A/V frames authored, or the time elapsed
- Track the completion of the authoring
- Add multiple camera support for authoring by accepting a camera id parameter
- Set file type based on the OUTPUT_FORMAT requested

Change-Id: I0f9d31b3b7a8fa43eb53f572410fb0ebd4fa0bb7
MRWriter.cpp
PEG4Writer.cpp
1f80fe4a1fb18dbf797720b5c3b4c1b437406faf 25-Jun-2010 Andreas Huber <andih@google.com> Merge "Finetune some of the prefetcher parameters to a) buffer as much as froyo did b) ensure that keepalives actually trigger a network read instead of just draining internal buffers" into gingerbread
9235bc896538e906e162aa5f9e11f8af04c29664 25-Jun-2010 Andreas Huber <andih@google.com> Finetune some of the prefetcher parameters to a) buffer as much as froyo did b) ensure that keepalives actually trigger a network read instead of just draining internal buffers

Change-Id: Iaedfb5645e3052a63789244c90900573f8449bac
nclude/NuCachedSource2.h
2dec2b5be2056c6d9428897dc672185872d30d17 20-Jun-2010 James Dong <jdong@google.com> Enable passing parameters to the MediaWriter at runtime (at start() call).

- estimate the moov box size for mp4 file writer based on the file
size/duration limit and target bit rate.
- can switch to use 64 bit file offset at runtime

rebased

Change-Id: Ibbe1f57e91ab2605820d5d96e8048d11e5559c53
MRWriter.cpp
PEG4Writer.cpp
d4b91aac78e565a135f8ef1bfda7e6317debaf35 25-Jun-2010 James Dong <jdong@google.com> Merge "Track maximum amplitude and fix getMaxAmplitude()" into gingerbread
d3d4e5069e1af0437c4f5a7b4ba344bda5b937af 25-Jun-2010 James Dong <jdong@google.com> Track maximum amplitude and fix getMaxAmplitude()

- only start to track the max amplitude after the first call to getMaxAmplitude()

Change-Id: I64d3d9ca0542202a8535a211425e8bccceca50fc
udioSource.cpp
a5522c94a437d9449fba9d8167409f5e357075b6 24-Jun-2010 Andreas Huber <andih@google.com> Merge "Properly identify malformed (too short) chunks in mpeg4 files." into gingerbread
71b1a4e975dfb65660a0119b9d6bf6db77eca09e 24-Jun-2010 Andreas Huber <andih@google.com> Properly identify malformed (too short) chunks in mpeg4 files.

Change-Id: Id2efb1bba195c4ad6f132cd706cc813135ead8a4
PEG4Extractor.cpp
47c778f4a5fa639b2082fcc74080d33ac847b232 24-Jun-2010 James Dong <jdong@google.com> Merge "Fixed the software AAC encoder" into gingerbread
7bf4fab9e5590d345b93b559f35b2fb0f6b17ca8 24-Jun-2010 Andreas Huber <andih@google.com> Merge "Remove most stagefright property overrides, remove VorbisPlayer and VorbisMetadataRetriever as this functionality is now provided by stagefright." into gingerbread
065d1aff96818df54456053f1574aec8a234d0de 24-Jun-2010 James Dong <jdong@google.com> Fixed the software AAC encoder

Make sure that each input frame contains at least 1024 samples, as
required by the AAC encoder, and fix the incorrect timestamp.

Change-Id: I344cafe8c89be51d6e64552fab70539990ff6049
PEG4Writer.cpp
odecs/aacenc/AACEncoder.cpp
nclude/AACEncoder.h
608d77b1cf4fb9f63dc861e4e1fa3e80a732f626 24-Jun-2010 Andreas Huber <andih@google.com> Remove most stagefright property overrides, remove VorbisPlayer and VorbisMetadataRetriever as this functionality is now provided by stagefright.

Change-Id: Ieafe75a4550c273ad59b4518d7cd4c0fce0f7cce
related-to-bug: 2370115
ndroid.mk
MXCodec.cpp
d3/Android.mk
mx/tests/Android.mk
2439a8d6d99864ba0c2d94f428e6c9ee258cdd45 24-Jun-2010 James Dong <jdong@google.com> Merge "Fixed some meta data issues in the recorded mp4 file" into gingerbread
1acfe8649f8169caf2ff098c2dc2de880d9a3760 23-Jun-2010 James Dong <jdong@google.com> Fixed some meta data issues in the recorded mp4 file

- Mainly correcting the location of stbl box which should be a child of minf box.
This resolved the issue where the mis-muxed encoded file could not be played by QT/VLC.

- Enabled the the recorded tracks by setting the flags to 0x07 by default

- Allows for encoding either 32-bit or 64-bit offsets. By default encoding
32-bit offsets to reduce the metadata overhead

- Fixed a edts box issue where an empty elst box was used at the end

Change-Id: I570621a26714a81dc9400271aa5d3a07b483172f
PEG4Writer.cpp
d255a4e04d06796441ae234e8f3a8277578b3446 23-Jun-2010 Andreas Huber <andih@google.com> Merge "Properly assign LOG_TAGs in OMXMaster.cpp and MediaScanner.cpp" into gingerbread
1629399bb578fc176613ccaf134d1be6e3047638 23-Jun-2010 Andreas Huber <andih@google.com> Properly assign LOG_TAGs in OMXMaster.cpp and MediaScanner.cpp

Change-Id: I863651619f84b2b66e9a926ce1fef8ce6a53a42d
related-to-bug: 2639116
mx/OMXMaster.cpp
3e0339f9ec42c2c31deb632254e9cc8a06d3db91 23-Jun-2010 Andreas Huber <andih@google.com> Fix a number of timestamp mismatches in the mp3 extractor and decoder that would lead to invalid reporting of the current playback time for mono and/or non-44100 kHz mp3s.

Change-Id: I11abc05b62a958ffbc99ca997cd184a2f2199352
related-to-bug: 2667479
P3Extractor.cpp
odecs/mp3dec/MP3Decoder.cpp
nclude/MP3Decoder.h
58ae9c530247668f8af36e30d228c716c226b3d4 22-Jun-2010 James Dong <jdong@google.com> Single track optimization

We don't need to do interleave when the total number of tracks to be recorded is one.
Metadata-wise, we only need to have one chunk in chunk offset table, and a
single entry in the stsc table.

Change-Id: I46f0e4b3860620311e7a91b68a9067acaa137bb2
PEG4Writer.cpp
40f388ef8bad7a9ab16db8f90904656cd39c793d 22-Jun-2010 Andreas Huber <andih@google.com> Merge "Make the prefetcher read packets from the network after a keep-alive timeout expires regardless of whether its currently actively fetching data or not." into gingerbread
a5273ebd1746368662a597643d6701a5046d5c7b 22-Jun-2010 Andreas Huber <andih@google.com> Make the prefetcher read packets from the network after a keep-alive timeout expires regardless of whether its currently actively fetching data or not.

Change-Id: I7d022ac494e1cecdd7f656806b7ed45979c02840
uCachedSource2.cpp
nclude/NuCachedSource2.h
f60cafe0e6aad8f9ce54660fa88b651ae4e749e6 19-Jun-2010 James Dong <jdong@google.com> Audio/video sync during recording (second part)

Change-Id: Iba0b35f57fdeac7ee1da16899406bf4b957a2c8c
udioSource.cpp
ameraSource.cpp
PEG4Writer.cpp
MXCodec.cpp
odecs/aacenc/AACEncoder.cpp
odecs/amrnb/enc/AMRNBEncoder.cpp
odecs/amrwbenc/AMRWBEncoder.cpp
d26b133beec4df8608db3958045650e661ae8666 17-Jun-2010 Dave Sparks <davidsparks@android.com> am 3242cc27: Merge "TimedEventQueue is apparently important for glitch-free media playback, and so having it inherit its priority from the thread that created it is a bad idea. Instead, set the priority explicitly, and bump it to slightly higher than normal." into fro

Merge commit '3242cc2719a4aeb64ac5ed273cf222d8d326d44b' into gingerbread

* commit '3242cc2719a4aeb64ac5ed273cf222d8d326d44b':
TimedEventQueue is apparently important for glitch-free media playback, and so
8fb4e091bc62b15bec2c05adcb50429bb76f1b28 17-Jun-2010 James Dong <jdong@google.com> Merge "Remove hard-coded number of audio channels in AudioSource" into gingerbread
e32283b15bbd60179424bdc740a4e4932da4c61e 17-Jun-2010 James Dong <jdong@google.com> Merge "When filling the cache, we always time out waiting for a condition that won't occur. We are actually improving the power consumption for streaming applications like Pandora." into froyo
d82ac9c464a83f36e87cc95b26f6030402dda256 16-Jun-2010 James Dong <jdong@google.com> When filling the cache, we always time out waiting for a condition that won't occur.
We are actually improving the power consumption for streaming applications like Pandora.

Change-Id: Id32bacbc962e8c69c056599479b308d6a07b7a20
refetcher.cpp
17e8ad9c4b8fbdebec4559702b82114fb6543b67 15-Jun-2010 Marco Nelissen <marcone@google.com> TimedEventQueue is apparently important for glitch-free media playback, and so
having it inherit its priority from the thread that created it is a bad idea.
Instead, set the priority explicitly, and bump it to slightly higher than normal.

Change-Id: I01843f24905790ce2e2cde5d11a99346cfbf968d
imedEventQueue.cpp
be6ec71af2d12e2a55f2f0b1b77d3fa5d593a1c7 15-Jun-2010 James Dong <jdong@google.com> Remove hard-coded number of audio channels in AudioSource

Change-Id: I5f362252c25e2251bbfa9818b711ee23b4975248
udioSource.cpp
78d26445a7dfe8f49d7005185f28b01cffe80adf 15-Jun-2010 James Dong <jdong@google.com> This patch enables each omx instance to have a separate message dispatcher, and
thus eliminates the sharing of the message dispatches between omx instances.

If the omx audio and video encoders share the same dispatcher, when the audio read
blocks in the AudioSource, the message dispatcher thread gets blocked. As a result,
the message for the omx video encoder can not be dispatched, hence gets blocked too.
If the blocking time is long enough, the video frame rate decreases significantly.
This is the case when we read 2048 bytes by default each time. Reading smaller blocks
of audio data helps mitigate the above-mentioned problem, but it is not an ideal
solution for two reasons: a) it is not efficient, and thus can cause a lot of overhead
passing buffers between the frame work and the omx encoders; b) also, the audio record
thread can overflow as a result, which lead to the loss of recorded audio frames.

This patch affects both authoring engine and the playback engine.

Change-Id: I26dfde7ac46c8752cf1793ce1bfcc7be7724580e
nclude/OMX.h
mx/OMX.cpp
8aa8fe5ea704b05d8f0ab3d7bf18de18151f1b50 14-Jun-2010 James Dong <jdong@google.com> Fixed a typo - maybe we should do comparison ignoring the case?

Change-Id: I498f8242e6ba3e3e8b8c7b714ed49bff51a3010b
MXCodec.cpp
a1ad27130107b4377cc94b310a1e6c51d4b17cde 12-Jun-2010 Andreas Huber <andih@google.com> Merge "Must hold lock here..." into gingerbread
623a0de03d72c17b4cf0701280c6cb1df365ea6c 11-Jun-2010 James Dong <jdong@google.com> Merge "Initial checkin for pause and resume control" into kraken
d17875a226491e3de60fa32d764a4cc92de7f949 11-Jun-2010 Andreas Huber <andih@google.com> Must hold lock here...

Change-Id: I179a5582c9246f78c988f85e2f969f32d547ac89
uCachedSource2.cpp
a7d1a2dd776bf356c228785a94ba8e0ff6a2ec7f 10-Jun-2010 James Dong <jdong@google.com> Initial checkin for pause and resume control

Change-Id: Ibdcf7bea5fb66baa81878704ba4091dfcfe382ee
MRWriter.cpp
udioSource.cpp
PEG4Writer.cpp
odecs/aacenc/AACEncoder.cpp
b55cf746536962d262c3b627e32a37464927b67b 11-Jun-2010 Andreas Huber <andih@google.com> Merge "Restore feature parity with the old HTTPDataSource as far as support for extra headers (cookies?) and socket-timeout are concerned." into kraken
79f77ef3b0a37660ba8c5bcb2dfbfda3860f2135 11-Jun-2010 Andreas Huber <andih@google.com> Restore feature parity with the old HTTPDataSource as far as support for extra headers (cookies?) and socket-timeout are concerned.

Change-Id: I506dc501faec60e974bf4968d8ba661df7a49aa8
wesomePlayer.cpp
ataSource.cpp
uHTTPDataSource.cpp
nclude/NuHTTPDataSource.h
6f5aae1bcba130d5b8092a19fca3627aa565df56 11-Jun-2010 Andreas Huber <andih@google.com> Fix a typo in NuCachedSource2 that would trigger an assert near the end of a stream.

Change-Id: I963ad7074b830d553b67c8925efd5369d0b7a5b9
uCachedSource2.cpp
0a5baa9b411fe086013d2a5e9126ed63fbad046c 10-Jun-2010 Andreas Huber <andih@google.com> Switch stagefright's approach to prefetching to the new model. The java MediaPlayer is now notified about rebuffering start/end via info messages.

Change-Id: If8185ba329ce8b6663b1ad39a4efb0ad3be81df2
ndroid.mk
wesomePlayer.cpp
achingDataSource.cpp
ataSource.cpp
TTPDataSource.cpp
refetcher.cpp
nclude/AwesomePlayer.h
nclude/Prefetcher.h
baef63d1ac0ec6f489f5e50d2a599ff96c1f44ba 11-Jun-2010 Andreas Huber <andih@google.com> Merge "Switch LiveSource to use the new http data source instead of the old one." into kraken
61ea6c1bc242841663cb6f3601f89fd929882d0b 11-Jun-2010 Andreas Huber <andih@google.com> Merge "Initial check-in of new caching/prefetching data source implementation." into kraken
80737bac407a36e99267f65fe162b8e282822af4 10-Jun-2010 Andreas Huber <andih@google.com> Merge "Support "pausing" of MediaSources with the effect that they no longer pull on their upstream source until a subsequent read-with-seek." into kraken
6a350a967766a197c161e69185c48f642cbaa460 10-Jun-2010 Andreas Huber <andih@google.com> Merge "Initial check in of a new http data source implementation." into kraken
1370cbe385c4295471910aacbef51a8a65ce533d 10-Jun-2010 Andreas Huber <andih@google.com> Switch LiveSource to use the new http data source instead of the old one.

Change-Id: I9623c480628c495dbfbe02bdc6372724a107e2e8
ttplive/LiveSource.cpp
nclude/LiveSource.h
d35bd5fb4e09c2cd8608497c279cbb2ef9c3a029 10-Jun-2010 Andreas Huber <andih@google.com> Support "pausing" of MediaSources with the effect that they no longer pull on their upstream source until a subsequent read-with-seek.

Change-Id: Ie4153a10ab36c1135f5fcfb572958129d886bcc3
MXCodec.cpp
5994b4798b01f3dd340577c9ea9657f09093a770 10-Jun-2010 Andreas Huber <andih@google.com> Initial check-in of new caching/prefetching data source implementation.

Change-Id: I97a6e3f03c69c9b1219f1f06bd109c0102f2c504
uCachedSource2.cpp
nclude/NuCachedSource2.h
f0821faac01c41cb3eb0ec057443f1507e7afcb5 10-Jun-2010 Andreas Huber <andih@google.com> Initial check in of a new http data source implementation.

Change-Id: I17c358288ffe9ef690d702c58723c766d0a0cf21
uHTTPDataSource.cpp
nclude/NuHTTPDataSource.h
decc91d5bc6e02acd52ca5bb6f87627285bb97c4 10-Jun-2010 James Dong <jdong@google.com> Merge "Remove the lock/unlock workaround from CameraService" into kraken
98c7c319907f4ed3915461ca62b1027590d351e5 10-Jun-2010 Andreas Huber <andih@google.com> Apparently the TI video decoder only supports H.264 up to baseline profile/level 3, not level 3.x as previously assumed.

Change-Id: I4a9aa80f392dbef72f81e25c67e5bd0654848b2c
MXCodec.cpp
9d7f58a7da8502a4174a17ac49fcba6efa35a457 10-Jun-2010 James Dong <jdong@google.com> Remove the lock/unlock workaround from CameraService

bug - 2677772

Change-Id: I7c996daad8b3bfc89e9fa2d655dc18c9a5c68f2f
ameraSource.cpp
ddcc4a66d848deef6fb4689e64e30cd9bd2684fe 08-Jun-2010 James Dong <jdong@google.com> Remove some hard-coded encoding parameters

Change-Id: I7a8ccd5d57891a6a585c8da2ee53acb094955913
ameraSource.cpp
MXCodec.cpp
365a963142093a1cd8efdcea76b5f65096a5b115 04-Jun-2010 James Dong <jdong@google.com> Initial check-in for collecting stats from authoring engine at runtime

Change-Id: I93a9d8bd260efc5e7fc135b726e3f1307c6df794
udioSource.cpp
ameraSource.cpp
PEG4Writer.cpp
cc2fc006594cccbf1a58a2933c1d18cf0f2e021f 08-Jun-2010 James Dong <jdong@google.com> Merge "Second part of speeding up video recording frame rate" into kraken
d07139e2e817a9b3ae9c87ba4e1e8d65d3e549da 07-Jun-2010 James Dong <jdong@google.com> Second part of speeding up video recording frame rate

1. Avoid copying the input recording frames to the encoder via OMX interface
for TI video encoder
This is a missing change for part one which help reduces the CPU load.

2. Release output buffers as early as possible. This is a little bit helpful, but not critical.

TODO:
We should save the underlying pointers allocated by the OMX component before we replace them
and restore them before we call OMX_FreeBuffer()!

Change-Id: Ib3a88978f4c3b1153808872eaa7ac4c265a811ff
PEG4Writer.cpp
MXCodec.cpp
cf7b9c7aae758ac0b99833915053c63c2ac46e09 08-Jun-2010 Andreas Huber <andih@google.com> Initial checkin of preliminary rtsp support for stagefright.

Change-Id: I0722aa888098c0c1361c97a4c1b123d910afc207
ndroid.mk
wesomePlayer.cpp
nclude/ARTSPController.h
nclude/AwesomePlayer.h
tsp/AAVCAssembler.cpp
tsp/AAVCAssembler.h
tsp/AMPEG4AudioAssembler.cpp
tsp/AMPEG4AudioAssembler.h
tsp/APacketSource.cpp
tsp/APacketSource.h
tsp/ARTPAssembler.cpp
tsp/ARTPAssembler.h
tsp/ARTPConnection.cpp
tsp/ARTPConnection.h
tsp/ARTPSource.cpp
tsp/ARTPSource.h
tsp/ARTSPConnection.cpp
tsp/ARTSPConnection.h
tsp/ARTSPController.cpp
tsp/ASessionDescription.cpp
tsp/ASessionDescription.h
tsp/Android.mk
tsp/MyHandler.h
tsp/MyTransmitter.h
tsp/VideoSource.h
e71d10e7ad55ccbcb0756c007caef1c959090384 07-Jun-2010 Andreas Huber <andih@google.com> Initial checkin of preliminary support for "http live" streaming in stagefright.

Change-Id: I20399f63d63af86a3ba22641c0e43385a108fb3f
ndroid.mk
wesomePlayer.cpp
ttplive/Android.mk
ttplive/LiveSource.cpp
ttplive/M3UParser.cpp
nclude/LiveSource.h
nclude/M3UParser.h
peg2ts/MPEG2TSExtractor.cpp
cda17c606b0fe3ccda4dc68a6d43882410ea2462 07-Jun-2010 Andreas Huber <andih@google.com> Initial checkin of mpeg2 transport stream parser for stagefright.

Change-Id: I328ce77404daf7127933b48c9d58ed504fb8fc6f
ndroid.mk
ataSource.cpp
ediaDefs.cpp
ediaExtractor.cpp
tagefrightMediaScanner.cpp
nclude/MPEG2TSExtractor.h
peg2ts/ABitReader.cpp
peg2ts/ABitReader.h
peg2ts/ATSParser.cpp
peg2ts/ATSParser.h
peg2ts/Android.mk
peg2ts/AnotherPacketSource.cpp
peg2ts/AnotherPacketSource.h
peg2ts/MPEG2TSExtractor.cpp
c46e8b9fdce32bafb0b84cdb16affbdd35c2e3ba 07-Jun-2010 Andreas Huber <andih@google.com> Merge "Initial checkin of "foundation" library for future stagefright development." into kraken
72961230a5890071bcca436eb5630172ce84ec41 07-Jun-2010 Andreas Huber <andih@google.com> Initial checkin of "foundation" library for future stagefright development.

Change-Id: I11714dcaa647d0437a13e4c5b953b35e712da8f3
oundation/AAtomizer.cpp
oundation/ABuffer.cpp
oundation/ADebug.cpp
oundation/ALooper.cpp
oundation/ALooperRoster.cpp
oundation/AMessage.cpp
oundation/AString.cpp
oundation/Android.mk
oundation/base64.cpp
oundation/hexdump.cpp
c00d6f3ffc0eace26954e1863568820bd21794c0 07-Jun-2010 James Dong <jdong@google.com> Merge "Remove hard-coded pixel format for recording frames in CameraSource. Retrieve the pixel format from Camera HAL at runtime." into kraken
c1640f49abb1efc31a5fb985cfde73913cebbe8b 04-Jun-2010 Andreas Huber <andih@google.com> am e896d416: am 2e3761ba: Merge "Changes to the prefetcher to allow for bursts of data to be transferred, hopefully allowing the radio to go to low-power mode while idle." into froyo

Merge commit 'e896d41699ffe7be932102d7ccc9566f41ddb447' into kraken

* commit 'e896d41699ffe7be932102d7ccc9566f41ddb447':
Changes to the prefetcher to allow for bursts of data to be transferred, hopefully allowing the radio to go to low-power mode while idle.
ddc43521f9e15b15edc6f7dce0965483f6a0f820 03-Jun-2010 Andreas Huber <andih@google.com> Changes to the prefetcher to allow for bursts of data to be transferred, hopefully allowing the radio to go to low-power mode while idle.

Change-Id: I03dbdac3cd250340059ea43b341129b30acce4e2
related-to-bug: 2736779
refetcher.cpp
653252be963c07c99109d20f942d1f30c52a9360 03-Jun-2010 James Dong <jdong@google.com> Remove hard-coded pixel format for recording frames in CameraSource.
Retrieve the pixel format from Camera HAL at runtime.

Change-Id: I63f820f54c59c2019dfd195320b9928da3362536
ameraSource.cpp
c282e3eee921453fc9188705b4879d6289b71f9c 01-Jun-2010 Andreas Huber <andih@google.com> A debugging DataSource artifically limiting the available bandwidth.

Change-Id: I4ca75337a52599d211ea066fd94e649748df052d
ndroid.mk
hrottledSource.cpp
nclude/ThrottledSource.h
aed27b016043c9f2cb33cf851f20698130be110c 28-May-2010 James Dong <jdong@google.com> Merge "Avoid copying for input recording frames in CameraSource" into kraken
7278cf32f1aa6a322f6dff1f8b7dacf7b6dddba6 28-May-2010 James Dong <jdong@google.com> Avoid copying for input recording frames in CameraSource

This is the part one.

- Let CameraSource be a MediaBufferObserver. It releases the recording frame when the ref count of a MediaBuffer containing
the recording frame drops to 0.

This reduces the CPU load from 90+% down to 50-60%.

Part two is related to the avoidance of copying the input video frames to the video encoder.
However, we are not able to use OMX_UseBuffer directly. Still work on the second part.

Change-Id: I906f1d054ae8bdcf82e1617f1fc120152f2eb2eb
ameraSource.cpp
1b52bd2874aef6c9cbc141f1cff5205830515f7d 27-May-2010 Andreas Huber <andih@google.com> Better sniffing of MPEG4 content by checking for a compatible sub-brand.

Change-Id: I076908822ad0e663b9932e61fb33edc12c2e1948
related-to-bug: 2673192
PEG4Extractor.cpp
8a74f1bc3f64943cafdc7c6c7e1900b4a3e9e4b1 27-May-2010 Andreas Huber <andih@google.com> Merge "After failing to create an AudioTrack, only stop the source if we were the ones starting it." into kraken
a7414ea2c7dfea7d2428ce543bd6331d6c56aead 27-May-2010 James Dong <jdong@google.com> Remove the logic in CameraSource using CameraParameters class to find out the buffer size.

Change-Id: I76eea76bda49529d08b46241d3dded1a804f891c
ameraSource.cpp
5b39604a55f1624ced347da7b790c4206d2d999f 27-May-2010 James Dong <jdong@google.com> Merge "Avoid repeatedly allocating and freeing memory in CameraSource" into kraken
cbe48a0678729eb863b259b4744e6ad12faf0475 20-May-2010 James Dong <jdong@google.com> Avoid repeatedly allocating and freeing memory in CameraSource

Change-Id: Ia3760820da0559e4e908dedae1f1df05f9a6a242
ameraSource.cpp
69ec58ee5216ad4eabc7775762c2468c42b632fb 26-May-2010 Andreas Huber <andih@google.com> After failing to create an AudioTrack, only stop the source if we were the ones starting it.

Change-Id: I1820c2634cfeb01af9eaf11b6473c5d7b87d1fa3
related-to-bug: 2716035
udioPlayer.cpp
5a4001ddb2536d65d966970fc0579bf6bd11b5a0 26-May-2010 Andreas Huber <andih@google.com> Convert a number of assertions into runtime errors (OggExtractor)

Change-Id: I8fcaec927d7b72e9d61cb7283e54523711980268
ggExtractor.cpp
1a9b892400dae0f63b4fd502770154a06e23b01b 26-May-2010 Andreas Huber <andih@google.com> Merge "Squashed commit of the following:" into kraken
5279d1d8c19e5fdbb177805db0da8e8aadac3079 25-May-2010 Andreas Huber <andih@google.com> Support for thumbnail extraction in the Matroska extractor.

Change-Id: I56f13fc4868baffe0bb8c2484d2753c766a73960
related-to-bug: 2483739
atroska/MatroskaExtractor.cpp
atroska/MatroskaExtractor.h
4595be952e3b1d6776a023e3f447c057797f1505 25-May-2010 Andreas Huber <andih@google.com> Support for ogg(vorbis) metadata in stagefright including album art.

Change-Id: I0c8c0136cebe2d2d97caabb7bc0c65be86329dbb
related-to-bug: 2713414
ggExtractor.cpp
tagefrightMediaScanner.cpp
4d1265cd007b9754d0645bc4fb95701140a45648 24-May-2010 Andreas Huber <andih@google.com> Squashed commit of the following:

commit a2194ecc341fa0c530d0007d8561286c8b8f2d15
Author: Andreas Huber <andih@google.com>
Date: Fri May 21 12:50:09 2010 -0700

Instead of including the libvpx libraries prebuilt in our tree, build them from sources.

Change-Id: I5ec57decf1200cf9137fe13ff77d06f47950c3d7

commit 711098ca3f16800a22ccdb26a07e57e471cca438
Author: Andreas Huber <andih@google.com>
Date: Thu May 20 15:00:27 2010 -0700

Support for VPX/VP8 decoding in stagefright

Change-Id: I16d93faf3f56a5f8ec39c14367704469f914db9e
related-to-bug: 2483739

Change-Id: Ibc124f6af540c2715cb2325151eecdd6edf085ec
ndroid.mk
MXCodec.cpp
odecs/on2/Android.mk
odecs/on2/dec/Android.mk
odecs/on2/dec/VPXDecoder.cpp
nclude/VPXDecoder.h
1cb8fa1e670786bf83ccde7571c5ac1fc087d4f1 24-May-2010 James Dong <jdong@google.com> Merge "Properly handle start code in H264/AVC encoder output" into kraken
3d8055ac96170de7a8c49b9ffbe83ed447ccddce 24-May-2010 Andreas Huber <andih@google.com> Interestingly, a call to fseek with a NULL file handle now blocks forever...

Change-Id: Ic80c579abcf2bdb73f7fd1da713649b7c7f25f56
ileSource.cpp
26fe83eb91aada45a75054753d4782e6bfc2fd04 21-May-2010 Andreas Huber <andih@google.com> Merge "Support for media extraction from .mkv/.mka Matroska files in stagefright." into kraken
e136c3bb38e88315bf8797a464ebf2c788296b22 21-May-2010 James Dong <jdong@google.com> Properly handle start code in H264/AVC encoder output

- Some H264/AVC encoder output start code in each output buffer, and others don't.
This patch always strips the start code first so that the sample contains the correct size.
- Also properly initialize the interleave duration.

Change-Id: I692043ce7e38f0215e1097aad9e847a57907b6e4
PEG4Writer.cpp
c02138636202d606ca4cfec2297e057e9158db7d 21-May-2010 Andreas Huber <andih@google.com> Merge "Update software AVC decoder to no longer require the kWantsNALFragments hack." into kraken
093437c388e5dff6903a3d43f2ca9f8a1ba4744a 20-May-2010 Andreas Huber <andih@google.com> Support for media extraction from .mkv/.mka Matroska files in stagefright.

Change-Id: I4c26579828ad575523ccf58b0b5cb144046c04ca
related-to-bug: 2483739
ndroid.mk
ataSource.cpp
ediaDefs.cpp
ediaExtractor.cpp
tagefrightMediaScanner.cpp
tagefrightMetadataRetriever.cpp
atroska/Android.mk
atroska/MatroskaExtractor.cpp
atroska/MatroskaExtractor.h
atroska/mkvparser.cpp
atroska/mkvparser.hpp
528b31476c16aefc4f886bf17b6d8bb4bd21292e 13-May-2010 Andreas Huber <andih@google.com> Update software AVC decoder to no longer require the kWantsNALFragments hack.

Change-Id: I7f1882530a891a57d0cd76cbbd7084ee31c59bd1
odecs/avc/dec/AVCDecoder.cpp
af991a9b24865af8b17c6282047638cf00466ea2 20-May-2010 James Dong <jdong@google.com> Merge "Workaround for preview frame rate setting and encoder profile and level settings on passion 1. QCOM camera HAL does not honor the preview frame rate set request. see bug - 2701282 2. QCOM video encoder has lots of 0-length output buffers if the default level setting is changed. see bug - 2660974" into kraken
7405500bb3b5f8e8e739e344bc9d036c2736fcdf 20-May-2010 James Dong <jdong@google.com> Workaround for preview frame rate setting and encoder profile and level settings on passion
1. QCOM camera HAL does not honor the preview frame rate set request. see bug - 2701282
2. QCOM video encoder has lots of 0-length output buffers if the default level setting is changed. see bug - 2660974

Change-Id: Id01d94bb77dc242c4712d56a91b0d69a96ba6c2f
MXCodec.cpp
cf14f10b7bf39a84205333b87d5c5b7db9598de3 20-May-2010 Andreas Huber <andih@google.com> am 3c16154a: am 2723e092: Merge "Better handling of codec initialization failure in the player and thumbnail extractor. Return a runtime error instead of asserting if the software MPEG4/H.263 decoder fails to initialize." into froyo

Merge commit '3c16154a3309fe250177d69f3fcd5b6e9a82d1b3' into kraken

* commit '3c16154a3309fe250177d69f3fcd5b6e9a82d1b3':
Better handling of codec initialization failure in the player and thumbnail extractor. Return a runtime error instead of asserting if the software MPEG4/H.263 decoder fails to initialize.
139a5d5bd33c9fc7708d0a79f11ee928f7796e6b 20-May-2010 Andreas Huber <andih@google.com> Better handling of codec initialization failure in the player and thumbnail extractor. Return a runtime error instead of asserting if the software MPEG4/H.263 decoder fails to initialize.

Change-Id: I5cba02ee85a41e43c2623053de40f26e2cf2efe4
related-to-bug: 2699505
wesomePlayer.cpp
tagefrightMetadataRetriever.cpp
odecs/m4v_h263/dec/M4vH263Decoder.cpp
956c553ab0ce72f8074ad0fda2ffd66a0305700c 15-May-2010 James Dong <jdong@google.com> Initial software encoder checkins

Change-Id: I27f387db23594e46384c4eb3a0093ce220bb6b60
ndroid.mk
PEG4Writer.cpp
MXCodec.cpp
odecs/aacenc/AACEncoder.cpp
odecs/aacenc/Android.mk
odecs/aacenc/SampleCode/AAC_E_SAMPLES.c
odecs/aacenc/SampleCode/Android.mk
odecs/aacenc/SampleCode/eclair/Makefile
odecs/aacenc/SampleCode/ms.mk
odecs/aacenc/Tools/doit.mk
odecs/aacenc/Tools/eclair.mk
odecs/aacenc/basic_op/basic_op.h
odecs/aacenc/basic_op/basicop2.c
odecs/aacenc/basic_op/oper_32b.c
odecs/aacenc/basic_op/oper_32b.h
odecs/aacenc/basic_op/typedef.h
odecs/aacenc/basic_op/typedefs.h
odecs/aacenc/build/eclair/ARMV5E/Makefile
odecs/aacenc/build/eclair/ARMV7/Makefile
odecs/aacenc/build/eclair/makefile
odecs/aacenc/build/ms.mk
odecs/aacenc/doc/voAACEncoderSDK.pdf
odecs/aacenc/inc/aac_rom.h
odecs/aacenc/inc/aacenc_core.h
odecs/aacenc/inc/adj_thr.h
odecs/aacenc/inc/adj_thr_data.h
odecs/aacenc/inc/band_nrg.h
odecs/aacenc/inc/bit_cnt.h
odecs/aacenc/inc/bitbuffer.h
odecs/aacenc/inc/bitenc.h
odecs/aacenc/inc/block_switch.h
odecs/aacenc/inc/channel_map.h
odecs/aacenc/inc/config.h
odecs/aacenc/inc/dyn_bits.h
odecs/aacenc/inc/grp_data.h
odecs/aacenc/inc/interface.h
odecs/aacenc/inc/line_pe.h
odecs/aacenc/inc/memalign.h
odecs/aacenc/inc/ms_stereo.h
odecs/aacenc/inc/pre_echo_control.h
odecs/aacenc/inc/psy_configuration.h
odecs/aacenc/inc/psy_const.h
odecs/aacenc/inc/psy_data.h
odecs/aacenc/inc/psy_main.h
odecs/aacenc/inc/qc_data.h
odecs/aacenc/inc/qc_main.h
odecs/aacenc/inc/quantize.h
odecs/aacenc/inc/sf_estim.h
odecs/aacenc/inc/spreading.h
odecs/aacenc/inc/stat_bits.h
odecs/aacenc/inc/tns.h
odecs/aacenc/inc/tns_func.h
odecs/aacenc/inc/tns_param.h
odecs/aacenc/inc/transform.h
odecs/aacenc/patent_disclaimer.txt
odecs/aacenc/src/aac_rom.c
odecs/aacenc/src/aacenc.c
odecs/aacenc/src/aacenc_core.c
odecs/aacenc/src/adj_thr.c
odecs/aacenc/src/asm/ARMV5E/AutoCorrelation_v5.s
odecs/aacenc/src/asm/ARMV5E/CalcWindowEnergy_v5.s
odecs/aacenc/src/asm/ARMV5E/PrePostMDCT_v5.s
odecs/aacenc/src/asm/ARMV5E/R4R8First_v5.s
odecs/aacenc/src/asm/ARMV5E/Radix4FFT_v5.s
odecs/aacenc/src/asm/ARMV5E/band_nrg_v5.s
odecs/aacenc/src/asm/ARMV7/PrePostMDCT_v7.s
odecs/aacenc/src/asm/ARMV7/R4R8First_v7.s
odecs/aacenc/src/asm/ARMV7/Radix4FFT_v7.s
odecs/aacenc/src/band_nrg.c
odecs/aacenc/src/bit_cnt.c
odecs/aacenc/src/bitbuffer.c
odecs/aacenc/src/bitenc.c
odecs/aacenc/src/block_switch.c
odecs/aacenc/src/channel_map.c
odecs/aacenc/src/dyn_bits.c
odecs/aacenc/src/grp_data.c
odecs/aacenc/src/interface.c
odecs/aacenc/src/line_pe.c
odecs/aacenc/src/memalign.c
odecs/aacenc/src/ms_stereo.c
odecs/aacenc/src/pre_echo_control.c
odecs/aacenc/src/psy_configuration.c
odecs/aacenc/src/psy_main.c
odecs/aacenc/src/qc_main.c
odecs/aacenc/src/quantize.c
odecs/aacenc/src/sf_estim.c
odecs/aacenc/src/spreading.c
odecs/aacenc/src/stat_bits.c
odecs/aacenc/src/tns.c
odecs/aacenc/src/transform.c
odecs/amrnb/enc/AMRNBEncoder.cpp
odecs/amrwbenc/AMRWBEncoder.cpp
odecs/amrwbenc/Android.mk
odecs/amrwbenc/SampleCode/AMRWB_E_SAMPLE.c
odecs/amrwbenc/SampleCode/Android.mk
odecs/amrwbenc/SampleCode/eclair/Makefile
odecs/amrwbenc/SampleCode/ms.mk
odecs/amrwbenc/build/eclair/ARMV5E/Makefile
odecs/amrwbenc/build/eclair/ARMV7/Makefile
odecs/amrwbenc/build/eclair/makefile
odecs/amrwbenc/build/eclair/ms.mk
odecs/amrwbenc/doc/voAMRWBEncoderSDK.pdf
odecs/amrwbenc/inc/acelp.h
odecs/amrwbenc/inc/basic_op.h
odecs/amrwbenc/inc/bits.h
odecs/amrwbenc/inc/cnst.h
odecs/amrwbenc/inc/cod_main.h
odecs/amrwbenc/inc/dtx.h
odecs/amrwbenc/inc/grid100.tab
odecs/amrwbenc/inc/ham_wind.tab
odecs/amrwbenc/inc/homing.tab
odecs/amrwbenc/inc/isp_isf.tab
odecs/amrwbenc/inc/lag_wind.tab
odecs/amrwbenc/inc/log2.h
odecs/amrwbenc/inc/log2_tab.h
odecs/amrwbenc/inc/main.h
odecs/amrwbenc/inc/math_op.h
odecs/amrwbenc/inc/mem_align.h
odecs/amrwbenc/inc/mime_io.tab
odecs/amrwbenc/inc/oper_32b.h
odecs/amrwbenc/inc/p_med_o.h
odecs/amrwbenc/inc/p_med_ol.tab
odecs/amrwbenc/inc/q_gain2.tab
odecs/amrwbenc/inc/q_pulse.h
odecs/amrwbenc/inc/qisf_ns.tab
odecs/amrwbenc/inc/qpisf_2s.tab
odecs/amrwbenc/inc/stream.h
odecs/amrwbenc/inc/typedef.h
odecs/amrwbenc/inc/typedefs.h
odecs/amrwbenc/inc/wb_vad.h
odecs/amrwbenc/inc/wb_vad_c.h
odecs/amrwbenc/patent_disclaimer.txt
odecs/amrwbenc/src/asm/ARMV5E/Deemph_32_opt.s
odecs/amrwbenc/src/asm/ARMV5E/Dot_p_opt.s
odecs/amrwbenc/src/asm/ARMV5E/Filt_6k_7k_opt.s
odecs/amrwbenc/src/asm/ARMV5E/Norm_Corr_opt.s
odecs/amrwbenc/src/asm/ARMV5E/Syn_filt_32_opt.s
odecs/amrwbenc/src/asm/ARMV5E/convolve_opt.s
odecs/amrwbenc/src/asm/ARMV5E/cor_h_vec_opt.s
odecs/amrwbenc/src/asm/ARMV5E/pred_lt4_1_opt.s
odecs/amrwbenc/src/asm/ARMV5E/residu_asm_opt.s
odecs/amrwbenc/src/asm/ARMV5E/scale_sig_opt.s
odecs/amrwbenc/src/asm/ARMV5E/syn_filt_opt.s
odecs/amrwbenc/src/asm/ARMV7/Deemph_32_neon.s
odecs/amrwbenc/src/asm/ARMV7/Dot_p_neon.s
odecs/amrwbenc/src/asm/ARMV7/Filt_6k_7k_neon.s
odecs/amrwbenc/src/asm/ARMV7/Norm_Corr_neon.s
odecs/amrwbenc/src/asm/ARMV7/Syn_filt_32_neon.s
odecs/amrwbenc/src/asm/ARMV7/convolve_neon.s
odecs/amrwbenc/src/asm/ARMV7/cor_h_vec_neon.s
odecs/amrwbenc/src/asm/ARMV7/pred_lt4_1_neon.s
odecs/amrwbenc/src/asm/ARMV7/residu_asm_neon.s
odecs/amrwbenc/src/asm/ARMV7/scale_sig_neon.s
odecs/amrwbenc/src/asm/ARMV7/syn_filt_neon.s
odecs/amrwbenc/src/autocorr.c
odecs/amrwbenc/src/az_isp.c
odecs/amrwbenc/src/bits.c
odecs/amrwbenc/src/c2t64fx.c
odecs/amrwbenc/src/c4t64fx.c
odecs/amrwbenc/src/cmnMemory.c
odecs/amrwbenc/src/convolve.c
odecs/amrwbenc/src/cor_h_x.c
odecs/amrwbenc/src/decim54.c
odecs/amrwbenc/src/deemph.c
odecs/amrwbenc/src/dtx.c
odecs/amrwbenc/src/g_pitch.c
odecs/amrwbenc/src/gpclip.c
odecs/amrwbenc/src/homing.c
odecs/amrwbenc/src/hp400.c
odecs/amrwbenc/src/hp50.c
odecs/amrwbenc/src/hp6k.c
odecs/amrwbenc/src/hp_wsp.c
odecs/amrwbenc/src/int_lpc.c
odecs/amrwbenc/src/isp_az.c
odecs/amrwbenc/src/isp_isf.c
odecs/amrwbenc/src/lag_wind.c
odecs/amrwbenc/src/levinson.c
odecs/amrwbenc/src/log2.c
odecs/amrwbenc/src/lp_dec2.c
odecs/amrwbenc/src/math_op.c
odecs/amrwbenc/src/mem_align.c
odecs/amrwbenc/src/oper_32b.c
odecs/amrwbenc/src/p_med_ol.c
odecs/amrwbenc/src/pit_shrp.c
odecs/amrwbenc/src/pitch_f4.c
odecs/amrwbenc/src/pred_lt4.c
odecs/amrwbenc/src/preemph.c
odecs/amrwbenc/src/q_gain2.c
odecs/amrwbenc/src/q_pulse.c
odecs/amrwbenc/src/qisf_ns.c
odecs/amrwbenc/src/qpisf_2s.c
odecs/amrwbenc/src/random.c
odecs/amrwbenc/src/residu.c
odecs/amrwbenc/src/scale.c
odecs/amrwbenc/src/stream.c
odecs/amrwbenc/src/syn_filt.c
odecs/amrwbenc/src/updt_tar.c
odecs/amrwbenc/src/util.c
odecs/amrwbenc/src/voAMRWBEnc.c
odecs/amrwbenc/src/voicefac.c
odecs/amrwbenc/src/wb_vad.c
odecs/amrwbenc/src/weight_a.c
odecs/common/Android.mk
odecs/common/Config.mk
odecs/common/cmnMemory.c
odecs/common/include/cmnMemory.h
odecs/common/include/voAAC.h
odecs/common/include/voAMRWB.h
odecs/common/include/voAudio.h
odecs/common/include/voIndex.h
odecs/common/include/voMem.h
odecs/common/include/voType.h
nclude/AACEncoder.h
nclude/AMRNBEncoder.h
nclude/AMRWBEncoder.h
ea10bc6158caa9f595c85a3dc3517d88ee989001 15-May-2010 Andreas Huber <andih@google.com> am a5cd816c: am eb9128f9: Fix sampleTable instantiation, this makes sure that the sample table refers to the custom datasource that caches the metadata to prevent needless seeking.

Merge commit 'a5cd816c720ed87b91a33aa5d000a0d308c74453' into kraken

* commit 'a5cd816c720ed87b91a33aa5d000a0d308c74453':
Fix sampleTable instantiation, this makes sure that the sample table refers to the custom datasource that caches the metadata to prevent needless seeking.
1edbcb2bb9988cc7cb54a865aaea4613bdd53a9d 15-May-2010 Andreas Huber <andih@google.com> Fix sampleTable instantiation, this makes sure that the sample table refers to the custom datasource that caches the metadata to prevent needless seeking.

Change-Id: I576178144ffd753b809e1c4ae269ffc3aa34b511
related-to-bug: 2686604
QA-Impact: well, ..., everything related to streaming mpeg4/aac content over http
PEG4Extractor.cpp
f0ce2fb0c7bf3a414279e5aba61105f3d9025c0e 14-May-2010 James Dong <jdong@google.com> Detect and handle premature termination of a recording session

Change-Id: Ifb83b19f3e68580345b23efed5d5956fb81baeb8
MRWriter.cpp
PEG4Writer.cpp
3c0131f02b6f008321608044c53bccce2ac5f6dd 13-May-2010 James Dong <jdong@google.com> Audio/video initial recording time synchronization

Change-Id: Iac58b63d474fe09c1d36ba6ecde91dafbb7fef9a
PEG4Writer.cpp
d599cd4573b5a2d5914c5040e0565ef866749b77 11-May-2010 James Dong <jdong@google.com> Handle recording file size and/or duration limit

Change-Id: Ib9ed1f3ebd8fef550cc130a7ef11f2905fa9aedc
MRWriter.cpp
PEG4Writer.cpp
65ae665befd929efd1a7d1c9addac41c699f04b2 13-May-2010 James Dong <jdong@google.com> Remove dummy surface in CameraSource

bug - 2680919

Change-Id: Ia0308cf57fd67058b4dd0e042b3ce97f13df475f
ameraSource.cpp
7838252956e00518afce33f9591252c5c8f9dbac 13-May-2010 Andreas Huber <andih@google.com> am 28fadef2: am 3c78a1b5: Return a runtime error instead of asserting if the AACDecoder is passed an unsupported config.

Merge commit '28fadef2ede2d74e9526266e779553bbd1dc66f4' into kraken

* commit '28fadef2ede2d74e9526266e779553bbd1dc66f4':
Return a runtime error instead of asserting if the AACDecoder is passed an unsupported config.
a945bfd91aa291fba4d9201ffcb38fce40eab7fe 13-May-2010 Andreas Huber <andih@google.com> Return a runtime error instead of asserting if the AACDecoder is passed an unsupported config.

Change-Id: Ie084ed4df5a5d286abd36d9149c2138f8e7ed08a
related-to-bug: 2682221
QA-impact: none
wesomePlayer.cpp
odecs/aacdec/AACDecoder.cpp
f8fb8b856427e9b1c406d516a114a9f37cfea4f2 13-May-2010 Mathias Agopian <mathias@google.com> should fix the build

Change-Id: I9957fc43d5fce317479f6c55fb0b9612bff9a495
ameraSource.cpp
8229dabcc36a015a6cf11a9b0b2e948ac0476552 12-May-2010 Andreas Huber <andih@google.com> am b003ad17: am e0dc80f8: Merge "Support for customizable socket-read timeouts through the HTTP response." into froyo

Merge commit 'b003ad17bffeba7875b9708ffeef2300ef28c916' into kraken

* commit 'b003ad17bffeba7875b9708ffeef2300ef28c916':
Support for customizable socket-read timeouts through the HTTP response.
f5ef7f22bbf73ba5c3910096f8f7f84cc6e21039 12-May-2010 Andreas Huber <andih@google.com> am 227e443a: am d6ad7c85: Merge "Better seek handling and proper reset of the vorbis decoder after a discontinuity (seek)" into froyo

Merge commit '227e443a43d70b9463b2e685688f73cfb1b72096' into kraken

* commit '227e443a43d70b9463b2e685688f73cfb1b72096':
Better seek handling and proper reset of the vorbis decoder after a discontinuity (seek)
d2333bda49f9d76f1b30b81dfc093d407bc6dbf0 11-May-2010 Andreas Huber <andih@google.com> Merge "Support for customizable socket-read timeouts through the HTTP response." into froyo
ba7c35717116e4dcb8242644f6ccf07c25c7b251 11-May-2010 Andreas Huber <andih@google.com> Support for customizable socket-read timeouts through the HTTP response.

Specify a response header of "X-SocketTimeout: 15" to override the default timeout
of 5 secs with a timeout of 15 seconds. Specify a negative value to disable the
timeout altogether.

Change-Id: I545adf3d8b3f7efe5f8d081a641c6404440a77db
related-to-bug: 2675721
TTPDataSource.cpp
TTPStream.cpp
nclude/HTTPStream.h
7837c17063a4c50bc856ba59418516fdab731de7 07-May-2010 James Dong <jdong@google.com> Output streamable MP4 file during MP4 file recording

When the reserved moov box space is not big enough,
fall back to non-streamable MP4 file.

Change-Id: I93382d037d657a3f3fe2af31e4ea26e1898b4d95
PEG4Writer.cpp
96f52cde23982f668592418a9548045237d5e327 11-May-2010 Andreas Huber <andih@google.com> Better seek handling and proper reset of the vorbis decoder after a discontinuity (seek)

Change-Id: I3c76d35da48e0964f7a0fa2816f8573b5e1a9436
related-to-bug: 2674036
QA-impact: low, only affects ogg-vorbis playback through http
ggExtractor.cpp
odecs/vorbis/dec/VorbisDecoder.cpp
10a49e9d73f16f5f924c4013cba49a6ca4a28bac 10-May-2010 James Dong <jdong@google.com> Merge "Metadata construction optimization" into kraken
b1ccb623d9db42c451aa9dd4e8cf0e76b164aa50 10-May-2010 Andreas Huber <andih@google.com> am 17078510: am d13efb20: Merge "A new OggExtractor/VorbisDecoder combo to support approximate seeking." into froyo

Merge commit '1707851090e6512a77247b0c260dd673ef687589' into kraken

* commit '1707851090e6512a77247b0c260dd673ef687589':
A new OggExtractor/VorbisDecoder combo to support approximate seeking.
35a055b8bfc6f3cbea409b2897caf936654519cb 06-May-2010 Chih-Chung Chang <chihchung@google.com> Support multiple cameras in framework.

Change-Id: I081f0fbdca4b633715ea7c3b3d42f8662d27598a
ameraSource.cpp
ee7ff20e69498ebd53dd9717a0f984188341a75e 07-May-2010 Andreas Huber <andih@google.com> A new OggExtractor/VorbisDecoder combo to support approximate seeking.

Change-Id: Id5d0c1c8b1adc62896bb5ed951f7b5cfda811e95
related-to-bug: 2654400
ndroid.mk
ataSource.cpp
ediaDefs.cpp
ediaExtractor.cpp
MXCodec.cpp
ggExtractor.cpp
tagefrightMediaScanner.cpp
tils.cpp
orbisExtractor.cpp
odecs/vorbis/Android.mk
odecs/vorbis/dec/Android.mk
odecs/vorbis/dec/VorbisDecoder.cpp
nclude/OggExtractor.h
nclude/VorbisDecoder.h
nclude/VorbisExtractor.h
be83c9e8c71ce16c0d0e9ed9df525510a49a541b 20-Apr-2010 James Dong <jdong@google.com> Metadata construction optimization

- Potentially much shorter stts box if samples have roughly the same duration
- Potentially much shorter stsz box if all samples have the same size

Change-Id: I4f7663dd64285070995585a02bb3ba1e1049a0cf
PEG4Writer.cpp
d8a30349da270715156d3f658b165481ce10cf71 06-May-2010 Andreas Huber <andih@google.com> am 71bd9fc8: am 100ef9be: Merge "Disable vorbis seek when streaming from localhost." into froyo

Merge commit '71bd9fc81e3154b9cad22ca7ff2d9c6ed6fdbe6c' into kraken

* commit '71bd9fc81e3154b9cad22ca7ff2d9c6ed6fdbe6c':
Disable vorbis seek when streaming from localhost.
f9325834de1ae004212aec2fd03445b4eebfa766 06-May-2010 Andreas Huber <andih@google.com> Merge "Disable vorbis seek when streaming from localhost." into froyo
acdd9d0f59c3d8bdc3de80664a609527ec3d21e2 06-May-2010 Andreas Huber <andih@google.com> Disable vorbis seek when streaming from localhost.

Change-Id: Icda523ae1c89e26482f1c1767fe3a8b9222bb30f
related-to-bug: 2654400
wesomePlayer.cpp
TTPDataSource.cpp
ediaExtractor.cpp
orbisExtractor.cpp
nclude/AwesomePlayer.h
nclude/VorbisExtractor.h
71ec1d320e61c490bd3fac172f1d1a206a7198e8 06-May-2010 Dan Bornstein <danfuzz@android.com> am 2a1674b1: am 2d315667: For issue #2651381, allow library prelinking.

Merge commit '2a1674b1d00fda68980ec834d6ce61aacd379bc8' into kraken

* commit '2a1674b1d00fda68980ec834d6ce61aacd379bc8':
For issue #2651381, allow library prelinking.
77356c37030215a4b8696b7d0af44a724341a0f9 05-May-2010 Dan Bornstein <danfuzz@android.com> For issue #2651381, allow library prelinking.

Change-Id: I119348b55ad0015a286e9c94709977cd1973a7e1
ndroid.mk
odecs/amrnb/common/Android.mk
odecs/avc/common/Android.mk
olorconversion/Android.mk
mx/Android.mk
13aec890216948b0c364f8f92792129d0335f506 22-Apr-2010 James Dong <jdong@google.com> Support audio and video track interleaving in the recorded mp4 file

Change-Id: Ifa27eb23ee265f84fe06773b29b0eb2b0b075b60
ameraSource.cpp
PEG4Writer.cpp
aa9ca29395eebfcfa64e070dc71009b99131769f 04-May-2010 James Dong <jdong@google.com> Merge "Support AAC recording" into kraken
3830a4f133893e6a77a967c84220d7baf9687f23 04-May-2010 Andreas Huber <andih@google.com> am 8ea45aad: am e083d0a2: Merge "Support for Ogg Vorbis decoding in stagefright." into froyo

Merge commit '8ea45aad100ee25067b2e83703454c71a968ba4f' into kraken

* commit '8ea45aad100ee25067b2e83703454c71a968ba4f':
Support for Ogg Vorbis decoding in stagefright.
3cf4e43cdd391502690c07e08e805aa8ff5db0c0 04-May-2010 Andreas Huber <andih@google.com> Support for Ogg Vorbis decoding in stagefright.

Set the magic property media.stagefright.enable-vorbis to true to use the new implementation instead of the standalon vorbis player for file-based playback. HTTP streaming of vorbis content will always go through stagefright.

Change-Id: Ie3843a99fadb22372f89540d0f8d65196e0c2af8
related-to-bug: 2654400
ndroid.mk
ataSource.cpp
ediaDefs.cpp
ediaExtractor.cpp
orbisExtractor.cpp
nclude/VorbisExtractor.h
050b28a593350047845a45a14cc5026221ac1620 23-Apr-2010 James Dong <jdong@google.com> Support AAC recording

- Extend the audio recording to AAC format
- Add support for setting some recording parameters
- Add stss box to the meta data in the recorded file

Change-Id: I41167bfd9d70ef9cd33906f8437b39c232b6d3b7
udioSource.cpp
PEG4Writer.cpp
MXCodec.cpp
c32cd79d9ad4aba7d959b5b3be7361b4715e6f18 27-Apr-2010 James Dong <jdong@google.com> Use timestamp from camera driver for CameraSource

Change-Id: I09ddec69997c43b8f17fdd21304c76cb4c5ab8cf
ameraSource.cpp
MXCodec.cpp
261741e728f2137f12b28df25c25e96acd942de9 26-Apr-2010 James Dong <jdong@google.com> am 31431b34: am 374aee68: Switch to use software MP3 decoder Hardware MP3 decoder could lead to hang in the Music application, although the chance is very low.

Merge commit '31431b34f895862ae13efba30bb5771085572687' into kraken

* commit '31431b34f895862ae13efba30bb5771085572687':
Switch to use software MP3 decoder
0b5ba9eeed56a80fed3735f5cd4951477fda79f0 26-Apr-2010 James Dong <jdong@google.com> Switch to use software MP3 decoder
Hardware MP3 decoder could lead to hang in the Music application, although the chance is very low.

bug - 2608400

Change-Id: Ia0b5b6521015fc8d3e086117fa914dcc20ace5bd
MXCodec.cpp
add08eb454bbe8b3a0a40d23621c102b72cd005d 21-Apr-2010 Andreas Huber <andih@google.com> am 89e28cbe: am 9e609b0d: Merge "Apparently select() does not immediately return if one of the masked socket descriptors is closed... Stop relying on select for read-with-timeout functionality and use SO_RCVTIMEO socket option instead." into froyo

Merge commit '89e28cbefaff6ae9499032bb446ae7e72e019466' into kraken

* commit '89e28cbefaff6ae9499032bb446ae7e72e019466':
Apparently select() does not immediately return if one of the masked socket descriptors is closed... Stop relying on select for read-with-timeout functionality and use SO_RCVTIMEO socket option instead.
4bf29cabaa7c94d0c74d5f945df6b51da51ed180 21-Apr-2010 Andreas Huber <andih@google.com> Apparently select() does not immediately return if one of the masked socket descriptors is closed... Stop relying on select for read-with-timeout functionality and use SO_RCVTIMEO socket option instead.

Change-Id: Ic2d4a8f5b6bbf16772fba39377809ec68d249c1f
related-to-bug: 2611257
TTPDataSource.cpp
TTPStream.cpp
fdce1ccd7e468f3229de8f4f1616d017465470cb 20-Apr-2010 Andreas Huber <andih@google.com> am 1e1edb2c: am 25dc5f30: Merge "Don\'t coalesce more than 250ms worth of encoded data into a single codec input buffer. This currently only applies to the component OMX.TI.AAC.decode, it is the only one to support coalescing in the first place." into froyo

Merge commit '1e1edb2c7376dbd9ca24bbeefbddbe4221f397a0' into kraken

* commit '1e1edb2c7376dbd9ca24bbeefbddbe4221f397a0':
Don't coalesce more than 250ms worth of encoded data into a single codec input buffer.
d2c6894b56a538aa807e20d3ef421807cd55c009 20-Apr-2010 Andreas Huber <andih@google.com> Don't coalesce more than 250ms worth of encoded data into a single codec input buffer.
This currently only applies to the component OMX.TI.AAC.decode, it is the only one to support coalescing in the first place.

In certain edge cases (encoded audio track contains silence), each buffer would turn out to be an amazing 6(!!!) bytes, we'd spend lots and lots of time streaming network data to fill the codec's buffers of size 6144 bytes with .. silence.

Change-Id: I9f449f310fc64ca384bd02e4a783e33cf5b46fcc
related-to-bug: 2609049
QA-Impact: streamed (http) playback of aac audio content on Droid.
MXCodec.cpp
cbe4b2cb591b5e7a6a25ee4ef85aaa61c537fef0 14-Apr-2010 Jean-Baptiste Queru <jbq@google.com> fix unintentional drift

Change-Id: I0bbf3d3f95296a41d71558d8de1ed2ed021f21cf
wesomePlayer.cpp
odecs/aacdec/AACDecoder.cpp
53fbf1d2eebd09e14a8995f51c47788670dbab1e 14-Apr-2010 James Dong <jdong@google.com> am c33f583b: am 4f3257cf: am dd684af8: Merge "Snif more 3GPP file types according to http://www.ftyps.com/3gpp.html" into froyo
73c30c5236858b72b74727bc627628672553add9 14-Apr-2010 Andreas Huber <andih@google.com> am d760afc3: am 30e9c2d4: am db281311: Merge "Better diagnostics in the stagefright commandline tool, support for playing sine-tones using a filename of "sine:[samplingrate]", i.e. sine:44100. Support for playing audio through to the speakers by using "-o" in addition
2f6ec4c07a830d9c22d4883e77592cf61d37baca 14-Apr-2010 James Dong <jdong@google.com> am ebaa935e: am 9bb8e65a: am c15f48d7: Merge "Don\'t set encoder component role while we query decoders" into froyo
d84201fcae22b71cfa9f4bca5ef4a4344d04fad5 14-Apr-2010 Gloria Wang <gwang@google.com> am 465934d1: am d4c072d3: am b19da8e1: Fix for 2581725. Keep the last frame after resume(), and delete it in the next suspend() or reuse it if no new frame is available.
b1c9bd26a3b916d2f6ca7cda1edab92f48da16c8 14-Apr-2010 James Dong <jdong@google.com> am 4f3257cf: am dd684af8: Merge "Snif more 3GPP file types according to http://www.ftyps.com/3gpp.html" into froyo

Merge commit '4f3257cf4667aa28908c401634db849fd2e516af' into kraken

* commit '4f3257cf4667aa28908c401634db849fd2e516af':
Snif more 3GPP file types according to http://www.ftyps.com/3gpp.html
b9dbba9285fb406bc6eb87779c8bfc405269b6f2 14-Apr-2010 James Dong <jdong@google.com> Snif more 3GPP file types according to http://www.ftyps.com/3gpp.html

bug - 2575956

Change-Id: Iaa79e74d3b0585397a7e833ec45472710fc52fa6
PEG4Extractor.cpp
07dd5a5a9cf8ea7c48473874b34d0dc6c5a6c231 13-Apr-2010 Andreas Huber <andih@google.com> am 30e9c2d4: am db281311: Merge "Better diagnostics in the stagefright commandline tool, support for playing sine-tones using a filename of "sine:[samplingrate]", i.e. sine:44100. Support for playing audio through to the speakers by using "-o" in addition to "-a"." in

Merge commit '30e9c2d4db145e02b5312ce29606b03dd78349d3' into kraken

* commit '30e9c2d4db145e02b5312ce29606b03dd78349d3':
Better diagnostics in the stagefright commandline tool, support for playing sine-tones using a filename of "sine:[samplingrate]", i.e. sine:44100. Support for playing audio through to the speakers by using "-o" in addition to "-a".
ea623087e93c6e27ce6284946f94c1d4aff7f91b 13-Apr-2010 James Dong <jdong@google.com> am 9bb8e65a: am c15f48d7: Merge "Don\'t set encoder component role while we query decoders" into froyo

Merge commit '9bb8e65a7d7dc57fdd7383d64d53414b1aa5cbbc' into kraken

* commit '9bb8e65a7d7dc57fdd7383d64d53414b1aa5cbbc':
Don't set encoder component role while we query decoders
25801bfe64dff414991fca2f62f16a61ba554357 13-Apr-2010 Andreas Huber <andih@google.com> Merge "Better diagnostics in the stagefright commandline tool, support for playing sine-tones using a filename of "sine:[samplingrate]", i.e. sine:44100. Support for playing audio through to the speakers by using "-o" in addition to "-a"." into froyo
a13da584aa7da751a7e6ebf00fc1c4e2382af611 13-Apr-2010 James Dong <jdong@google.com> Merge "Don't set encoder component role while we query decoders" into froyo
a98420e863c374d1f15309467f2a1fc58d979d3b 13-Apr-2010 Andreas Huber <andih@google.com> Better diagnostics in the stagefright commandline tool, support for playing sine-tones using a filename of "sine:[samplingrate]", i.e. sine:44100. Support for playing audio through to the speakers by using "-o" in addition to "-a".

related-to-bug: 2553359
Change-Id: Ic49eb89feb62474d9513bc21571e0e8fe3a15e0b
udioPlayer.cpp
3fed817bd114f7824d458ca62621417aa71cec84 13-Apr-2010 Gloria Wang <gwang@google.com> am d4c072d3: am b19da8e1: Fix for 2581725. Keep the last frame after resume(), and delete it in the next suspend() or reuse it if no new frame is available.

Merge commit 'd4c072d3f584db2cf9214c9d813c15d9e646c527' into kraken

* commit 'd4c072d3f584db2cf9214c9d813c15d9e646c527':
Fix for 2581725. Keep the last frame after resume(), and delete it
5e3cf6cf36feb3b73b8f8c0a8134c46f5bc85094 13-Apr-2010 James Dong <jdong@google.com> Don't set encoder component role while we query decoders

bug - 2558515

Change-Id: I29683507d234d963994c782c07508034ea807739
MXCodec.cpp
5c117390591da780e1f53c1c9c91c1efdacbc674 13-Apr-2010 Gloria Wang <gwang@google.com> Fix for 2581725. Keep the last frame after resume(), and delete it
in the next suspend() or reuse it if no new frame is available.

Change-Id: I84286030eaae9061077d6ccb485b7dd53ef05341
wesomePlayer.cpp
b851fc7071d87d7ac24599826d672e22d88f8fa2 13-Apr-2010 Andreas Huber <andih@google.com> am 7853c898: am 248ea4a9: am 5baa5e19: Merge "Distinguish QCELP audio from mpeg4 audio, ignore QCELP audio tracks since we don\'t have a decoder for it, ignore potentially malformed metadata for AMR NB and WB tracks." into froyo
88b1b1c7331023828108daa57fcea858c7706566 13-Apr-2010 Andreas Huber <andih@google.com> am 248ea4a9: am 5baa5e19: Merge "Distinguish QCELP audio from mpeg4 audio, ignore QCELP audio tracks since we don\'t have a decoder for it, ignore potentially malformed metadata for AMR NB and WB tracks." into froyo

Merge commit '248ea4a9f773210a7b7dbd7892e6b865a0f7add3' into kraken

* commit '248ea4a9f773210a7b7dbd7892e6b865a0f7add3':
Distinguish QCELP audio from mpeg4 audio, ignore QCELP audio tracks since we don't have a decoder for it, ignore potentially malformed metadata for AMR NB and WB tracks.
81f82c32459029bf0744e28c73f95a7f18cab5ac 13-Apr-2010 Andreas Huber <andih@google.com> Distinguish QCELP audio from mpeg4 audio, ignore QCELP audio tracks since we don't have a decoder for it, ignore potentially malformed metadata for AMR NB and WB tracks.

Change-Id: Ic9a9198413431db4ea40bb63b9de91aa8a7183af
related-to-bug: 2587341
wesomePlayer.cpp
SDS.cpp
PEG4Extractor.cpp
ediaDefs.cpp
nclude/ESDS.h
8e5d52bb00dc34608f2cd123a8387e6b15eb8126 13-Apr-2010 Jean-Baptiste Queru <jbq@google.com> manual merge

Change-Id: I9cdacbf1e445e7f6cf06ad03df541a744c242774
47acf12ffef0a5db470406b7db788adcc6240786 12-Apr-2010 Andreas Huber <andih@google.com> am 98c5bd55: am 6dbf80d0: Merge "Fix a race condition in TimedEventQueue, an event may be cancelled while we\'re waiting for its scheduled time to come in which case we\'d be removing it from the queue twice." into froyo

Merge commit '98c5bd5556f32a237d3483fb7298284869e32a40' into kraken

* commit '98c5bd5556f32a237d3483fb7298284869e32a40':
Fix a race condition in TimedEventQueue, an event may be cancelled while we're waiting for its scheduled time to come in which case we'd be removing it from the queue twice.
874b55f51c4c062c65aee043ec0f26044b504556 12-Apr-2010 Andreas Huber <andih@google.com> Fix a race condition in TimedEventQueue, an event may be cancelled while we're waiting for its scheduled time to come in which case we'd be removing it from the queue twice.

Change-Id: I4e42e318fd5373d1f352f54027d4bf823126266d
related-to-bug: 2585276
imedEventQueue.cpp
nclude/TimedEventQueue.h
a3387afbc6dc5db0fd534ab5e3200f46b5a36acd 12-Apr-2010 Andreas Huber <andih@google.com> am f0a49f68: am 1d7a8b44: Merge "Fix a case where the aac hardware decoder is in a transition state and refused a fillbuffer request." into froyo

Merge commit 'f0a49f68f0edc98fefbe14e3ddcf0d6853519293' into kraken

* commit 'f0a49f68f0edc98fefbe14e3ddcf0d6853519293':
Fix a case where the aac hardware decoder is in a transition state and refused a fillbuffer request.
23748a675245149d652b5ede781b4df90fca5d21 12-Apr-2010 Andreas Huber <andih@google.com> Merge "I accidentally broken passion encoding while working around problems with the sholes encoder." into kraken
a418a932aa9c800c527451ea93ec9a3a06fb7515 12-Apr-2010 Andreas Huber <andih@google.com> Merge "Remove unnecessary lock from AMRWriter." into kraken
88951e54c25b0cc58f78b48ffefa451cf87a8942 12-Apr-2010 Andreas Huber <andih@google.com> Merge "Various fixes to enable recording on passion and nexus1." into kraken
b547d09ecc3da8ee300099da8ca7e2826bb6849a 12-Apr-2010 Andreas Huber <andih@google.com> Merge "Fix a case where the aac hardware decoder is in a transition state and refused a fillbuffer request." into froyo
7110385b31c7bc65c8a923a09689ebb0c4a1e07a 12-Apr-2010 Andreas Huber <andih@google.com> Fix a case where the aac hardware decoder is in a transition state and refused a fillbuffer request.

Change-Id: I4cabd18709c29db0a2763a01cc86525ba0b0aeb7
related-to-bug: 2575976
MXCodec.cpp
f018aa38b808f2e5c6e6b2dc0b29406caa793c65 12-Apr-2010 Andreas Huber <andih@google.com> Merge "Ignore corrupt aac audio frames and substitute silence." into froyo
9dcda21086608a52a579ac8254991fdde686823a 12-Apr-2010 Andreas Huber <andih@google.com> Ignore corrupt aac audio frames and substitute silence.

Change-Id: I544f98a5c00d912061db7921fc4518435209b168
related-to-bug: 2575976
odecs/aacdec/AACDecoder.cpp
0a0583f9a6dd7fb0b72b7e072da4d55f8597c7ed 12-Apr-2010 Andreas Huber <andih@google.com> Start sending out buffering updates earlier (after preparation has completed) instead of only after playback has started.

Change-Id: Ieaa90cc9b54bd56963aa5f4daced2ba243801acf
related-to-bug: 2585913
wesomePlayer.cpp
548e31844937b37518fbb62ff69e9ff1f794183b 09-Apr-2010 Andreas Huber <andih@google.com> I accidentally broken passion encoding while working around problems with the sholes encoder.

Change-Id: Id91b837ed17083cb21efb08e1c1ab9cc3ff3fa8f
PEG4Writer.cpp
ebe87f32e442c9a8fb2931632311d6c5a126eddb 23-Mar-2010 Andreas Huber <andih@google.com> Remove unnecessary lock from AMRWriter.

Change-Id: Ia02966d936dd8cbb31e92051578a3fa816885710
MRWriter.cpp
03b268eac37ca2589bfff0bf58daf79d29cc14f4 19-Mar-2010 Andreas Huber <andih@google.com> Various fixes to enable recording on passion and nexus1.

Change-Id: I75a461c9882e2449082ad754ee7b231c1ceec039
ameraSource.cpp
PEG4Writer.cpp
MXCodec.cpp
mx/OMXNodeInstance.cpp
32f8c1cf4ab2abdd902535fc44a6549ba6f0ff33 09-Apr-2010 Andreas Huber <andih@google.com> Merge "Support for ID3 V2.4 tags." into froyo
bebd11b5a406bc4243cb7bd55f6849841bf911a7 08-Apr-2010 Andreas Huber <andih@google.com> Support for ID3 V2.4 tags.

Change-Id: I74ee02451bdfd7e50f0d5ff6fa5da5147b683e4c
related-to-bug: 2581869
d3/ID3.cpp
nclude/ID3.h
1ab1e4ec459ab549f79a98693a67f241861450be 08-Apr-2010 Andreas Huber <andih@google.com> Refactor connection/redirection code, support redirects on reconnection.

Change-Id: Id2517568000e028b01553c06a4893813a6883168
related-to-bug: 2580785
TTPDataSource.cpp
d8c76856c6d52dcd11a90124dafef0af99956e15 08-Apr-2010 Andreas Huber <andih@google.com> Increase the size of the pages used in CachingDataSource (total amount of memory used remains the same) to compensate for reduced locality of audio/video data requests. Also fixes a mistaken trailing "\r\n" in the range header and better error handling on http connection.

Change-Id: Ic9a6ef204362bc9afdc61e081c76bc62e5ef92ad
related-to-bug: 2580785
wesomePlayer.cpp
ataSource.cpp
TTPDataSource.cpp
dac4ee72bac87388a1495e098f39d73168c8078f 07-Apr-2010 Andreas Huber <andih@google.com> Report the requested seek time while seek is in progress.

Change-Id: I862bfb801701f9ce54dede51c492e4eb37591894
related-to-bug: 2576102
wesomePlayer.cpp
80eb61776f136c316f45ce4187a8bafedf9b3e88 06-Apr-2010 Andreas Huber <andih@google.com> Partial revert of previous change to improve hardware AAC decoder performance, increasing the input buffer size so dramatically accidentally broke streaming performance.

Change-Id: I14e9fbc1fdff61bcf89218d83cb1d2e3d6eb8438
related-to-bug: 2574491
MXCodec.cpp
b514a24eac5d9f5a3a9cdb3b7319918c39198769 02-Apr-2010 Andreas Huber <andih@google.com> Merge "Coalesce multiple encoded AAC frames into a single input buffer on this particular OMX codec to increase throughput significantly." into froyo
7f498b90a4300ef9badf14d202b0a67c26e20931 02-Apr-2010 Andreas Huber <andih@google.com> Coalesce multiple encoded AAC frames into a single input buffer on this particular OMX codec to increase throughput significantly.

Change-Id: I90c7db6656a53339c5d454336548c4f00d0d9064
related-to-bug: 2548426
MXCodec.cpp
fcdfad530df30d0e7fe21a7a463a3fe369ed325a 02-Apr-2010 Andreas Huber <andih@google.com> Merge "Support another kind of iso mpeg4 file." into froyo
983b449a27b5fa91eca82ede5204b4341899be62 01-Apr-2010 Andreas Huber <andih@google.com> Support another kind of iso mpeg4 file.

Change-Id: I052aa1c971c577e50679b6a9263acd32895906c7
related-to-bug: 2558114
PEG4Extractor.cpp
ab4412a1992ce7ec0965cdbf616d64d821b67183 01-Apr-2010 Dave Sparks <davidsparks@android.com> Update AMR codec.

Change-Id: I8ecd2712863f6962b762f26898002912d1c77afb
odecs/amrnb/dec/src/dec_amr.cpp
13ecb8d4e47fc5a8af8487a133d7c91b9ce55326 31-Mar-2010 Andreas Huber <andih@google.com> Merge "Skip any number of leading ID3v2 tags (instead of just the first), also simplify/fix the find-consecutive-mp3-frames functionality." into froyo
ba0707dc52b3ad2bec2244e1e6c39f31e06d467a 31-Mar-2010 Andreas Huber <andih@google.com> Skip any number of leading ID3v2 tags (instead of just the first), also simplify/fix the find-consecutive-mp3-frames functionality.

Change-Id: I30b93b21de9bd5509b617cca21f46331562c30ac
related-to-bug: 2553445
P3Extractor.cpp
a7313de4a402043fa5039558f05731189f354be6 31-Mar-2010 Andreas Huber <andih@google.com> Merge "Properly send a MEDIA_SEEK_COMPLETE notification for a seek request while paused (legacy behaviour)." into froyo
1321fdd94d354431b930735e9f38f32ecd189a2d 31-Mar-2010 Andreas Huber <andih@google.com> Properly send a MEDIA_SEEK_COMPLETE notification for a seek request while paused (legacy behaviour).

Change-Id: I64da5eb97c75b269b4668b3628ed0f05f2e36e51
related-to-bug: 2557482
wesomePlayer.cpp
nclude/AwesomePlayer.h
2d832a1292d57a1904190b6b95cb1d03e746e00a 31-Mar-2010 Andreas Huber <andih@google.com> Merge "Properly fill in the component name for the software decoders." into froyo
47f729a0543376773070aaeafc12e13eed03f7be 30-Mar-2010 Andreas Huber <andih@google.com> Properly fill in the component name for the software decoders.

Change-Id: I92071481f7ed94922b10856c981e507a9eec4c0c
related-to-bug: 2557787
odecs/aacdec/AACDecoder.cpp
odecs/amrnb/dec/AMRNBDecoder.cpp
odecs/amrnb/enc/AMRNBEncoder.cpp
odecs/amrwb/AMRWBDecoder.cpp
odecs/mp3dec/MP3Decoder.cpp
08f00853886c0d26e087c23da3e24df5d36d3674 30-Mar-2010 Andreas Huber <andih@google.com> Timeout on socket recv calls after 5secs, retry connection also if server unexpectedly closed the connection on its end and we know that there should've been more data available.

Change-Id: I749859dae28356080fe72ba035719754e7339c7f
related-to-bug: 2492187
TTPDataSource.cpp
TTPStream.cpp
65997f022fa3f557ba864ecc99a1aa33df54c2db 30-Mar-2010 Andreas Huber <andih@google.com> Limit the total amount of ID3 metadata to something (un-)reasonable: 3MB.

Change-Id: I3f9bbcdd4f563bac27c4ccae58e4179656c264b6
related-to-bug: 1903971
d3/ID3.cpp
fb8391bfe3f21d08add3b65ba08d4d097c2bfdb6 29-Mar-2010 Andreas Huber <andih@google.com> Merge "Fix a bug where the TimedEventQueue mistakenly accesses a bogus event if the only event in the queue has been cancelled while we're waiting for its scheduled time. Avoids potential int64_t overflow when converting from us to ns." into froyo
03f4e14ec612d53b5e2b987555b24afcbbe319d1 29-Mar-2010 Andreas Huber <andih@google.com> Fix a bug where the TimedEventQueue mistakenly accesses a bogus event if the only event in the queue has been cancelled while we're waiting for its scheduled time. Avoids potential int64_t overflow when converting from us to ns.

Change-Id: I50e8976ce8d0ecc47ee0eb497296930877ce306a
related-to-bug: 2549465
imedEventQueue.cpp
2415ecb5bb4e1459024f6d6c8ae2d6e3dc4fbdc7 26-Mar-2010 Andreas Huber <andih@google.com> Finer-grained locking in AwesomePlayer, position and duration are now protected by a separate mutex that's only held for brief moments of time.

Change-Id: I989baf5a0ea8923985c560c2ec274abda0780242
related-to-bug: 2546577
wesomePlayer.cpp
nclude/AwesomePlayer.h
246c817c7e4514a34f996a2f38d501b52f617b7e 24-Mar-2010 Andreas Huber <andih@google.com> Merge "QueryCodecs now returns the names of the software codecs (non-OpenMax) as well."
08a88e195d2b3697f2f967e9216491e8c5bd3c9e 24-Mar-2010 Andreas Huber <andih@google.com> QueryCodecs now returns the names of the software codecs (non-OpenMax) as well.

Change-Id: Ic4cd61f4dd722fb0dda544ffaa5615e87e3a4d40
related-to-bug: 2541647
MXCodec.cpp
e966fb05c7e67a7f5dce65024de60aac83eb6f81 24-Mar-2010 Andreas Huber <andih@google.com> Enable early termination of the prefetcher's preparation phase.

Change-Id: I929ac9b0fd0b6ebd98c1bc56be18ac8f8378d48c
related-to-bug: 2537407
wesomePlayer.cpp
refetcher.cpp
nclude/AwesomePlayer.h
nclude/Prefetcher.h
9584a0726582b6b7603032870c62b4fccd5ce076 23-Mar-2010 Andreas Huber <andih@google.com> Clear the local prefetcher strong reference before signalling that prepare() was cancelled early in order to avoid a race condition that occasionally triggered an assertion from the main thread.

Change-Id: I0db198fe5fd0fbe9a6c90a8e5924a2df05432c4c
related-to-bug: 2538486
wesomePlayer.cpp
589843b5969aa64a8f9a57fc8176c80b0ddce3c6 18-Mar-2010 Andreas Huber <andih@google.com> Merge "Report a runtime error rather than asserting if the amr software decoder reads more data than it was given(!)"
5d4f85d1e902a477ec7c8e3327693feee97e1c31 18-Mar-2010 Andreas Huber <andih@google.com> Report a runtime error rather than asserting if the amr software decoder reads more data than it was given(!)

Change-Id: I0a7ad65051a6663a583ea82da5fc75227dcdbbfa
odecs/amrnb/dec/AMRNBDecoder.cpp
1c6cebadf4579d997fdce946a1d00317c3e4c567 18-Mar-2010 Andreas Huber <andih@google.com> Tweak the omx tests to always do a seek-beyond-EOS on the first iteration, followed by a linear read on the second iteration.

Change-Id: I16fc9e42ee9f8e4cb120ab41364cae6dd4544634
related-to-bug: 2338792
mx/tests/OMXHarness.cpp
a89e12dfa46fe42b6309e945585310a89a5a1600 18-Mar-2010 Andreas Huber <andih@google.com> Either the software mp3 decoder's CRC computation is wrong (and PV never enabled it before) or there are files in the wild with wrong CRCs that nonetheless decode correctly, either way, opt out of CRC verification.

Change-Id: I1d9bd78f4efb53faa82c67110cf61f78122e40f8
related-to-bug: 2511393
odecs/mp3dec/MP3Decoder.cpp
2fd5624994d3dda4a4b1c2c485ec3e8f8b53cd6e 18-Mar-2010 Andreas Huber <andih@google.com> Merge "While streaming media data, upon a socket-read error, try reconnecting to the server and attempt to re-read for at most 3 times."
0887d170c7dc57411855382e326dd471824c9c02 18-Mar-2010 Andreas Huber <andih@google.com> While streaming media data, upon a socket-read error, try reconnecting to the server and attempt to re-read for at most 3 times.

Change-Id: I7534905e07a6456d18b26d5d60fa8915f25ae99e
related-to-bug: 2492187
TTPDataSource.cpp
TTPStream.cpp
c9915aed58b3846251406b337ba2e1813d71f07e 17-Mar-2010 Andreas Huber <andih@google.com> Instead of asserting that nothing bad happened during (software-)AAC decoding, return a runtime error if appropriate.

Change-Id: I175492aba8fd6cc1320d047bd2608750d7b193f9
related-to-bug: 2492187
odecs/aacdec/AACDecoder.cpp
15ff9300a667f7347e546eb1516e7cb0b775ba7a 16-Mar-2010 Andreas Huber <andih@google.com> "isPlaying" should never block, acquiring the mutex here is unnecessary, rather than investing in a separate mutex guarding just "mFlags" we accept returning "true" from isPlaying one too many times.

Change-Id: I597577cbb3ad1afd3cb3ca91979ef24cc1a44658
related-to-bug: 2518319
wesomePlayer.cpp
b4cfc6381503236f8fc959e77a64ab5ab5e639f1 16-Mar-2010 Andreas Huber <andih@google.com> Merge "Properly handle errors during the codec configuration phase, attempt to revert to next available (likely software-) codec if configuration fails."
2a3847ee1cbdaa8a65eee397a0173bb02211c459 16-Mar-2010 Andreas Huber <andih@google.com> Properly handle errors during the codec configuration phase, attempt to revert to next available (likely software-) codec if configuration fails.

Change-Id: Id1c699711e30139c9cc29df972254b5ba026e6fb
related-to-bug: 2517098
MXCodec.cpp
mx/OMXNodeInstance.cpp
35bb8f908b3f2970bd42d7bc4bf2402f9dd2c271 16-Mar-2010 Glenn Kasten <gkasten@google.com> Merge "Fixes bug 2502132, and masks bug 2518313."
aaaa12caef17f34cdcdf118fa7c2b4b8d0d7fe0e 16-Mar-2010 Glenn Kasten <gkasten@google.com> Fixes bug 2502132, and masks bug 2518313.

Change-Id: I5c5ecf1c10763f7b3f3d1e5c57dc5ce77cc344fd
MRExtractor.cpp
632a7dfdab89ffa79846ad37718d0582fd36affe 16-Mar-2010 Kenny Root <kroot@google.com> Adjust expected text frame length in ID3

When encountering a null character in an ID3 text frame, adjust the
expected size accordingly so it isn't misidentified as ASCII.

This fixes http://b/2517444

Change-Id: I19a3284d378e882c33b28ecee528a434716c7707
d3/ID3.cpp
746973186764292a84d11856ac315fa4b62957ad 15-Mar-2010 Andreas Huber <andih@google.com> We no longer do sanity checks based on "hdlr" tags in .mp4 files. Pretty soon we'll play any bytestream that even vaguely resembles the spec...

Change-Id: I43e05404860d8856b8aa566cc9b256bb3fa57e6f
related-to-bug: 2483328
PEG4Extractor.cpp
nclude/MPEG4Extractor.h
739d629c59758ca1832b8823daf98161a9e87615 15-Mar-2010 Andreas Huber <andih@google.com> Merge "Hack to "support" "enhanced" podcasts... slang for malformed .mp4 files."
a13cc2332acea28fb17dcb4de6fcb78441152828 15-Mar-2010 Andreas Huber <andih@google.com> Merge "Fix the media metadata retriever (tests). The native constants must match those published at the java layer."
c3df626e7d36c4d5d72c1cc3d7af9be7f44e81ae 15-Mar-2010 Andreas Huber <andih@google.com> Merge "Tag the "testid3" commandline tool as "debug-only". It doesn't need to be included in release builds."
643a00adc0cc73bf6ab426f9cc650973006dd859 15-Mar-2010 Andreas Huber <andih@google.com> Tag the "testid3" commandline tool as "debug-only". It doesn't need to be included in release builds.

Change-Id: I7e489af3d569015e2a93d340088e059e984f8153
related-to-bug: 2513148
d3/Android.mk
6f3a0c2dcb8d37d34e29e6a02acf1e3f8596088c 13-Mar-2010 Andreas Huber <andih@google.com> Hack to "support" "enhanced" podcasts... slang for malformed .mp4 files.

Change-Id: I690b9f336062a0ff1a667d6461d66b1386db866d
related-to-bug: 2511744
PEG4Extractor.cpp
nclude/MPEG4Extractor.h
fa71449d6c3b3da082d8fbedf9470ee8750a1646 15-Mar-2010 Andreas Huber <andih@google.com> Fixing the sim build.

Change-Id: I307f6d59f473471adcf855e66b4e8275ab1b3b74
mx/OMX.cpp
93e1fb99a0c66784b49b105ce84a23baf054ee9c 13-Mar-2010 Andreas Huber <andih@google.com> Fix the media metadata retriever (tests). The native constants must match those published at the java layer.

Change-Id: Ic1efed709e4d93c61913b231a8cd3ef1074f8ca0
tagefrightMetadataRetriever.cpp
52e71f87f1dac8d2f6bcaf77bb25b78cba664c43 12-Mar-2010 Andreas Huber <andih@google.com> Boost OMX callback dispatcher thread priority to prevent audio playback stuttering under increased system load

Change-Id: I1b5339b4d39bd964f286cdf1369d0e0492a465d7
related-to-bug: 2492002
mx/OMX.cpp
e94bd14078d327ef2f800e69907efce641a13272 12-Mar-2010 Andreas Huber <andih@google.com> HTTPStream and HTTPDataSource now support cancellation of the connection process, AwesomePlayer takes advantage of this in cases where ::reset() or ::suspend() is called while in the preparation phase to bail out early. Also fixes in issue where the audio codec was not properly stopped if no audio player object ever took ownership.

Change-Id: I6d73defe6d276693853a469db267bb2668d07af5
related-to-bugs: 2475845,2414536
wesomePlayer.cpp
ataSource.cpp
TTPDataSource.cpp
TTPStream.cpp
tagefrightMetadataRetriever.cpp
nclude/AwesomePlayer.h
nclude/HTTPStream.h
79b19b39acce9b1303f8cf1a11c6b7ef852dc5a8 11-Mar-2010 Andreas Huber <andih@google.com> Reduce buffer sizes related to HTTP media data transfer in order to reduce the probability of a connection timeout/reset due to long periods of time between socket activity.

Change-Id: I799ce1d58d56a31088a89603d8a18d24780f5b57
related-to-bug: 2492187
ataSource.cpp
tagefrightMetadataRetriever.cpp
2e39c1ca101e01ff13b03129a87939e7982b25bf 10-Mar-2010 Andreas Huber <andih@google.com> Instead of instantiating StagefrightMetadataRetriever directly, instantiate a MediaMetadataRetriever which will do-the-right-thing(tm) even for .wma/.wmv/.asf files.

Change-Id: Ibda4b5268514934f14a3d49a564902bc670f4384
related-to-bug: 2074137
tagefrightMediaScanner.cpp
69f722fb203371f9879f2b0c9670791ed6deb555 09-Mar-2010 Andreas Huber <andih@google.com> Use a more descriptive user-agent string (similar to PV's before) in stagefright http requests.

Change-Id: I4e8ea856327bdb65989f75dab3673baeaf9637c8
TTPDataSource.cpp
ebca2dccc0fbd41acf02d8a9c056e206eb29b089 09-Mar-2010 Andreas Huber <andih@google.com> Merge "The audio track was accidentally not participating in the prefetch since it wasn't started at the time prepare() was called. Also, properly report the cached duration even near the end when the source has no more data to fetch."
e7e3b785a0e7819db4c895a4f60e9a4dd755880c 09-Mar-2010 Andreas Huber <andih@google.com> The audio track was accidentally not participating in the prefetch since it wasn't started at the time prepare() was called. Also, properly report the cached duration even near the end when the source has no more data to fetch.

Change-Id: I66a92fec24c9bfb25f1c186f1c877127bae2b4f9
related-to-bug: 2444425
udioPlayer.cpp
wesomePlayer.cpp
refetcher.cpp
1ebb261c0c22955116d121e5d38dfa68df027c6c 08-Mar-2010 Andreas Huber <andih@google.com> Merge "Apparently a MemoryHeapPMem must be slap()ed for SurfaceFlinger to use the contained buffers."
0caaa95e11b700440f64e110b11f77a93acfa569 08-Mar-2010 Andreas Huber <andih@google.com> Apparently a MemoryHeapPMem must be slap()ed for SurfaceFlinger to use the contained buffers.

Change-Id: I86916a14c6cf9e65145711c6ded433b864f84456
related-to-bug: 2474091
olorconversion/SoftwareRenderer.cpp
1322e7ebc33e8e161fb73cd47e43dd93357608e4 08-Mar-2010 Andreas Huber <andih@google.com> Increase the amount of data buffered at preparation time. Make sure to start preparing after the codecs have been started, otherwise no buffering will happen.

Change-Id: I2c54db085cc76f4069ab381177e94e1b81005b02
related-to-bug: 2474091
wesomePlayer.cpp
refetcher.cpp
8eea8c3b2c48ce693a20eda4828ff188700b72e0 08-Mar-2010 Andreas Huber <andih@google.com> The prefetched source was unnecessarily holding a lock while receiving data from the network, sometimes blocking for seconds over 2G networks with corresponding drops in audio playback. Also, if the cache was full we'd report a cache duration of 0 instead of maximum size.

Change-Id: I46c8083f12f2dd728302095369197ca7e6b78bf8
related-to-bugs: 2492187, 2444425
refetcher.cpp
4a68c51b96ff93b7cb41dc682e5c031bee828df0 05-Mar-2010 Andreas Huber <andih@google.com> Merge "Instead of allocating the decoder instances in response to a call to setDataSource, postpone allocation to the preparation phase where it belongs."
88d8a83de12592635248aa1a3bd6b9ea46108501 05-Mar-2010 Andreas Huber <andih@google.com> Instead of allocating the decoder instances in response to a call to setDataSource, postpone allocation to the preparation phase where it belongs.

related-to-bug: 2492205
wesomePlayer.cpp
nclude/AwesomePlayer.h
ba1f481614b4a4dd290e3b75e0f3f1879a383a44 05-Mar-2010 Andreas Huber <andih@google.com> NPR's audio streams start with a 30sec segment whose mp3 headers are subtly different from those following. Allow certain bits to vary that were thought to be fixed before.

related-to-bug: 2490385
P3Extractor.cpp
25155ff8ccf7898d08ab62fae46297e046a571f0 01-Mar-2010 Andreas Huber <andih@google.com> Ensure that the audio codec instance is actually going away before we attempt to instantiate another one, otherwise we might end up with the software codec even though the hardware codec would have been available shortly.
udioPlayer.cpp
789c27a161f8ab7dba0835e015317ff4843c5cd2 26-Feb-2010 Andreas Huber <andih@google.com> Merge "The PV aac software decoder screws up if playing a mono-AACplus stream unless we output stereo data. Now we always output stereo data as the legacy OMX nodes did."
42569ac261af2cf8cefd0922a890c31b759c37b8 26-Feb-2010 Andreas Huber <andih@google.com> The PV aac software decoder screws up if playing a mono-AACplus stream unless we output stereo data. Now we always output stereo data as the legacy OMX nodes did.

related-to-bug: 2472545
odecs/aacdec/AACDecoder.cpp
ea5ea10a036f79c86bf5f204cb81804bf2bacdc7 26-Feb-2010 Andreas Huber <andih@google.com> Support vendor MPEG4 test content with apparently malformed chunks in them.

related-to-bug: 2472211
PEG4Extractor.cpp
d2d947bc8717697e983062147b51b5a0e307b84f 24-Feb-2010 Andreas Huber <andih@google.com> Recover from a certain mp3 decoder error instead of signalling an error and thereby stopping decoding.
odecs/mp3dec/MP3Decoder.cpp
5295c0c55d41a2906ea7f65a3f22e6278cb17d4b 23-Feb-2010 Andreas Huber <andih@google.com> Propagate errors all the way through the MediaSources and send either MEDIA_PLAYBACK_COMPLETE or MEDIA_ERROR depending on the final reason for running out of buffers to play back.

related-to-bug: 2463749
udioPlayer.cpp
wesomePlayer.cpp
PEG4Extractor.cpp
MXCodec.cpp
refetcher.cpp
nclude/AwesomePlayer.h
bd5d93f21e6f79c6d9ebe9d77542c3090d4a7ff4 23-Feb-2010 Andreas Huber <andih@google.com> Return runtime errors instead of asserting in MPEG4 file format validation, also add more validation to ensure presence of codec specific data for avc, aac and mpeg4.

related-to-bug: 2431967
PEG4Extractor.cpp
nclude/MPEG4Extractor.h
36efe505b61cf9d5d019f2021450401bde5d9858 22-Feb-2010 Andreas Huber <andih@google.com> Properly unload the renderer shared library after the renderer goes away.
mx/OMX.cpp
86559de0275b46a9bdba06b749fbd549ad2022d1 22-Feb-2010 Andreas Huber <andih@google.com> This hardware video decoder lies about its required input buffer sizes allocating 2.7 MB of memory instead of the required 176 KB... Added another quirk.

related-to-bug: 2281327
MXCodec.cpp
4b2f2c06ea5be0d95da53a3307ab4c1dd940f8dd 20-Feb-2010 Marco Nelissen <marcone@google.com> Merge "Make sure that the event callback thread is Java capable in the simulator."
0df82fcf56668bbde355cac7fb0828368441f6dc 20-Feb-2010 Marco Nelissen <marcone@google.com> Make sure that the event callback thread is Java capable in the simulator.
ndroid.mk
imedEventQueue.cpp
bd8a5cd484cf6197f89c5a28e091959970e7551d 19-Feb-2010 Andreas Huber <andih@google.com> Merge "Implement legacy behaviour for MediaPlayer's behaviour of starting from the start of the media on a start() call instead of resuming at the current position, if previously reached the end of the stream. Also properly report number of frames played to audio flinger. Finally, delay spawing the queue thread until actually used."
2e8ffaf95bd35358ecd14ddf00cddaf3abefe0a9 19-Feb-2010 Andreas Huber <andih@google.com> Implement legacy behaviour for MediaPlayer's behaviour of starting from the start of the media on a start() call instead of resuming at the current position, if previously reached the end of the stream. Also properly report number of frames played to audio flinger. Finally, delay spawing the queue thread until actually used.

related-to-bug: 2453220
wesomePlayer.cpp
nclude/AwesomePlayer.h
9068d69227703817a583d53627b8007063634425 19-Feb-2010 Andreas Huber <andih@google.com> Fix a race condition in the prefetcher, the source may be shutdown while we're reading data from it.

related-to-bug: 2453414
refetcher.cpp
e307dd2d8309a1f49de9a079a3f33cb063c10b24 18-Feb-2010 Kenny Root <kroot@google.com> Merge "Store AudioTrack return value for error condition"
32dcebf970356eb8599ea965d71535ed0c212c2d 18-Feb-2010 Kenny Root <kroot@google.com> Store AudioTrack return value for error condition

Store AudioTrack->initCheck()'s return value so we can return it after
the AudioTrack is deleted.

Change-Id: Ie042a7d6a54d7f9afd8a5767cfd167dbeb2e5c04
udioPlayer.cpp
d29345dfa29cdcc650f3705e43950ef2500f6728 18-Feb-2010 Andreas Huber <andih@google.com> We are cancelling this event during reset, but the event may have already been dispatched at the time, blocking on the mutex. While it's blocking, reset() cancels the event, we're then unblocked and bad things(tm) happen.

related-to-bug: 2451174
wesomePlayer.cpp
c2158a2f0fb68fe96d24b9bd85c32f15753d8ccb 18-Feb-2010 Andreas Huber <andih@google.com> Disable the TI AMR hardware decoder for audio decoding until its issues are resolved.

related-to-bug: 2450938
MXCodec.cpp
f759aa902596e0c8d13b756cecbb8f037769791c 16-Feb-2010 Andreas Huber <andih@google.com> Merge "If we never triggered a range request but know the content length make sure to not read more data than there could be, otherwise we'd block indefinitely if the server doesn't close the connection."
36d06e5a244a85f31854d559b8a8e10b3eb89577 16-Feb-2010 Andreas Huber <andih@google.com> Merge "Don't hold the prefetcher mutex while prefetching a single source, the lock protects the list of sources and does not guard access to the individual sources."
389a8b192cf18495ed0c7201a691f515d3b150dc 16-Feb-2010 Andreas Huber <andih@google.com> Don't hold the prefetcher mutex while prefetching a single source, the lock protects the list of sources and does not guard access to the individual sources.

related-to- bug: 2413024
refetcher.cpp
a5142a9282c972b5b2faf21f1cc3831a6dcf0436 16-Feb-2010 Andreas Huber <andih@google.com> If we never triggered a range request but know the content length make sure to not read more data than there could be, otherwise we'd block indefinitely if the server doesn't close the connection.

related-to-bug: 2442307
TTPDataSource.cpp
TTPStream.cpp
0e917ec1e86477ca22ed8d5dc87a36f4641a6733 16-Feb-2010 Andreas Huber <andih@google.com> The AMRSource failed to properly release a media buffer in case of error.

related-to-bug: 2441307
MRExtractor.cpp
3cf7054398a9c0f2f15ce1cd189ed88de42e5ec3 13-Feb-2010 Gloria Wang <gwang@google.com> Merge "Replace Tremor with Tremolo (an ARM optimised version of the Tremor library for doing Ogg Vorbis decompression)"
b56e992476d1bbeb4021d256852dbe02fc1064f8 13-Feb-2010 Gloria Wang <gwang@google.com> Replace Tremor with Tremolo (an ARM optimised version of the Tremor library for doing Ogg Vorbis decompression)
ndroid.mk
fa090f541bb84a546af2ec834e91a032ff10e66e 12-Feb-2010 Andreas Huber <andih@google.com> Preserve a preview frame to be restored after resuming the playback session.

related-to-bug: 2231576
wesomePlayer.cpp
nclude/AwesomePlayer.h
7b3396acc702451be9bafb19d7fe26d55d43a316 12-Feb-2010 Andreas Huber <andih@google.com> Squashed commit of the following:

commit 427e927298449826bb5b98327b0c05957aa051e6
Author: Andreas Huber <andih@google.com>
Date: Fri Feb 12 10:39:07 2010 -0800

Fixing a race condition in AwesomePlayer and support for suspend/resume.

commit 96201a04b6657b6bd69ec6100f4de66aebcaa0b4
Author: Andreas Huber <andih@google.com>
Date: Fri Feb 12 10:36:15 2010 -0800

Protect MPEG4Source's sanity by properly locking.

related-to-bug: 2231576
wesomePlayer.cpp
PEG4Extractor.cpp
refetcher.cpp
nclude/AwesomePlayer.h
328901bdc7c00ab361c5ef16d0d69c94a0458e95 11-Feb-2010 Marco Nelissen <marcone@google.com> Merge "Add support for "album artist" tag."
66ac4df65516ebfd0e500bfca75dc4b5ef8d674e 11-Feb-2010 Marco Nelissen <marcone@google.com> Add support for "album artist" tag.
P3Extractor.cpp
PEG4Extractor.cpp
tagefrightMediaScanner.cpp
tagefrightMetadataRetriever.cpp
3cf613507f1e2f7bd932d921a6e222e426fd3be4 10-Feb-2010 Mathias Agopian <mathias@google.com> split libsurfaceflinger_client and libcamera_client out of libui
ndroid.mk
wesomePlayer.cpp
ameraSource.cpp
olorconversion/Android.mk
olorconversion/SoftwareRenderer.cpp
988e3f0b2c74095deae580157c57935a98573052 11-Feb-2010 Andreas Huber <andih@google.com> Support for rendering through an overlay on the droid even if a software renderer is active.
ndroid.mk
wesomePlayer.cpp
olorconversion/SoftwareRenderer.cpp
b45c62c8e9b05c2703bdae18cc298ae55550db8a 11-Feb-2010 Andreas Huber <andih@google.com> Fixing AMR recording code.
MRWriter.cpp
cb5b4896ebc1ee36b254866f6c9a3f376d68d0ac 10-Feb-2010 Andreas Huber <andih@google.com> Merge "Properly detect Adobe's .f4v file format as an mp4 ISO compliant file."
c5b366a4b428e7dd0626e33193e51180ad3ab8ba 10-Feb-2010 Andreas Huber <andih@google.com> Properly detect Adobe's .f4v file format as an mp4 ISO compliant file.
PEG4Extractor.cpp
758cc74ff08487ded45f7ff4476c200fe727b366 10-Feb-2010 Andreas Huber <andih@google.com> TI does not want the hardware H.263 decoder to be enabled.
MXCodec.cpp
7d5b8a70c28c0d5746a600467b2887822dbff88e 10-Feb-2010 Andreas Huber <andih@google.com> Implementation of stagefright-enabled MediaPlayerService::decode functionality

related-to-bug: 2359268
udioPlayer.cpp
316f8352846a1470b0ffd1b94ac1ec535922a9f6 09-Feb-2010 Andreas Huber <andih@google.com> Merge "Defer actual work of setDataSource given a URI to the prepare phase in order to not block the calling thread for any significant amount of time..."
bd22c52280179b29eefac91ef7e7bbbc33d25904 09-Feb-2010 Andreas Huber <andih@google.com> Defer actual work of setDataSource given a URI to the prepare phase in order to not block the calling thread for any significant amount of time...

related-to-bug: 2431117
wesomePlayer.cpp
nclude/AwesomePlayer.h
c017cfcc24dd63c7efde5747a6ed2d4053788abc 09-Feb-2010 Andreas Huber <andih@google.com> If the codec's input buffer size is too small to accomodate the buffer read from the source, report and error instead of asserting.
MXCodec.cpp
26bae54d7a3d04215eba34c62c349f1be6ab1493 09-Feb-2010 Marco Nelissen <marcone@google.com> Support the disc number and custom genre tags for mp4.
PEG4Extractor.cpp
22c85664fead28bf376084de20d2f3a90552e000 09-Feb-2010 Andreas Huber <andih@google.com> Merge "A little less verbosity in stagefright and special treatment for the error state while shutting down."
ec9dd59902c8beea4ba6a842f3a843d46150d949 09-Feb-2010 Andreas Huber <andih@google.com> A little less verbosity in stagefright and special treatment for the error state while shutting down.
wesomePlayer.cpp
PEG4Extractor.cpp
MXCodec.cpp
cba8b3a18e92df3b2fc8820d55c85674cd9d0198 09-Feb-2010 Andreas Huber <andih@google.com> Merge "During shutdown, don't loop forever on a state transition to OMX_StateInvalid."
569e7f1b1444194d1aca5a0b23de154565ba12da 09-Feb-2010 Marco Nelissen <marcone@google.com> Use bswap_16 instead of swap16, because swap16 is not available in glibc
d3/ID3.cpp
4c23b7d543cd95250e766cef7558d0f4c941ddcb 08-Feb-2010 Andreas Huber <andih@google.com> ID3v1 tag's strings are ISO8859, not UTF-8, so do the proper conversion when extracting metadata.

related-to-bug: 2399408
d3/ID3.cpp
2dd73b65542c9eeb82bb567098f235349d18b06f 09-Feb-2010 Andreas Huber <andih@google.com> Merge "Properly implement asynchronous preparation of media playback."
940ad815a1a30abf0268949e3d3937d7e0d672c0 09-Feb-2010 Marco Nelissen <marcone@google.com> Merge "Skip the endianness marker when converting UCS-2 to UTF-8, since it ends up in the UTF-8 string otherwise."
c23f12af0394aa2f6651968a3c8840f1af317aa1 08-Feb-2010 Andreas Huber <andih@google.com> Properly implement asynchronous preparation of media playback.

related-to-bug: 2413002
wesomePlayer.cpp
refetcher.cpp
nclude/AwesomePlayer.h
nclude/Prefetcher.h
5a2621a64de196cbdb9a2a50357dee1c32fcf11b 09-Feb-2010 Marco Nelissen <marcone@google.com> Skip the endianness marker when converting UCS-2 to UTF-8, since it
ends up in the UTF-8 string otherwise.
d3/ID3.cpp
825bfc23eac1bc37f9eb7a14221b6dc5c303bdf0 09-Feb-2010 Gloria Wang <gwang@google.com> Merge "Use Tremor for sim-eng, and Tremolo for other targets."
6c8a9a4132337a3419a72a735f0b40df0b82061f 08-Feb-2010 Marco Nelissen <marcone@google.com> Add support for the TPOS/TPA (disc number) id3 tag.
P3Extractor.cpp
tagefrightMediaScanner.cpp
tagefrightMetadataRetriever.cpp
9636054b52f0de54e42b669805883c71a5196d42 08-Feb-2010 Gloria Wang <gwang@google.com> Use Tremor for sim-eng, and Tremolo for other targets.
ndroid.mk
0d681df3b0ded2c1e335b6b5785439da4ce2c238 08-Feb-2010 Andreas Huber <andih@google.com> During shutdown, don't loop forever on a state transition to OMX_StateInvalid.

related-to-bug: 2420917
mx/OMXNodeInstance.cpp
c9c4bef6b7f6793263a1f7659fe3641e856f2573 08-Feb-2010 Gloria Wang <gwang@google.com> Merge "Fix for 2224736. Sometimes mSeeking is reset without calling setSeekTo first."
7ebf475799f6ae1ec8c67983fc1028c487af4c2e 06-Feb-2010 Gloria Wang <gwang@google.com> Revert "Replace Tremor with Tremolo (an ARM optimised version of the Tremor library for doing Ogg Vorbis decompression)"

This reverts commit 2f46c062b05254671aec96a98b431f91ae7b270c.
ndroid.mk
5dd69302ffabd260d035fe309374892c7d681926 06-Feb-2010 Gloria Wang <gwang@google.com> Merge "Replace Tremor with Tremolo (an ARM optimised version of the Tremor library for doing Ogg Vorbis decompression)"
9d8bd1c6162b55f8f68c00038e6b75be25100c52 05-Feb-2010 James Dong <jdong@google.com> Merge "When the extractor is not able to be created successfully, don't crash"
b93ad64a423975748c7f5e1a5ea94ab8681bc899 05-Feb-2010 James Dong <jdong@google.com> When the extractor is not able to be created successfully, don't crash
mx/tests/OMXHarness.cpp
cb9859bcf5f00cee57de06e9968b88a69b2d6d9c 05-Feb-2010 Gloria Wang <gwang@google.com> Fix for 2224736. Sometimes mSeeking is reset without calling setSeekTo first.
udioPlayer.cpp
9944aaea3a4f0e7a68b448e666b025b458ecc595 04-Feb-2010 Gloria Wang <gwang@google.com> Replace Tremor with Tremolo (an ARM optimised version of the Tremor library for doing Ogg Vorbis decompression)
ndroid.mk
b25e2a948c8b5a96e284069a908c2fddb49efc48 04-Feb-2010 Andreas Huber <andih@google.com> Stop using the PV software decoders and use ours (based on PV code) instead even in non-FULL_STAGEFRIGHT builds.
ndroid.mk
MXCodec.cpp
odecs/Android.mk
d3/Android.mk
b399aa37056a3ce7a38b4a20cc0aef8e0e01b23e 04-Feb-2010 Andreas Huber <andih@google.com> Merge "Defer creating the video renderer until we see the first video frame."
a657f8deaf21acbe5faba7be1df9c6681d44d471 04-Feb-2010 Andreas Huber <andih@google.com> Defer creating the video renderer until we see the first video frame.

This avoids having to instantiate the renderer twice in case the video decoder sends a format change before the first frame.

related-to-bug: 2375037
wesomePlayer.cpp
80a68deec52c9a1b47215ed68526206ec88197f8 04-Feb-2010 Andreas Huber <andih@google.com> Previous change broke A/V sync, this is a better change to eliminate negative media positions.

related-to-bug: 2414900
udioPlayer.cpp
1862a33b246249630b654182afb5914da3480d4c 03-Feb-2010 Andreas Huber <andih@google.com> Fix a deadlock caused by the AudioPlayer notifying the observer that the stream had ended at the same time the observer was shutting down the AudioPlayer.

related-to-bug: 2414536
udioPlayer.cpp
wesomePlayer.cpp
nclude/AwesomePlayer.h
ad6516d9247bd0a76a393810b041c3e4094f0e36 03-Feb-2010 Andreas Huber <andih@google.com> AudioPlayer didn't properly account for the latency when calculating the current media time.

related-to-bug: 2414900
udioPlayer.cpp
7f8b69feef7bf9395ba4fda0619240f1237552b1 02-Feb-2010 Andreas Huber <andih@google.com> Workaround for misbehaving HTTP servers that terminate header lines with a single newline instead of the required CRLF sequence.

related-to-bug: 2414022
TTPStream.cpp
7574ca60ce85f816d3d7f6ee7a74285ff6b72a98 02-Feb-2010 Andreas Huber <andih@google.com> Merge "Don't use a HEAD request to determine redirects, instead do a regular GET (since that's always supported), also limit the number of redirects to avoid infinite redirects. Finally, properly handle the end of stream."
de6bec4ec04e9b8e9f96bc44fc15e6d072f851a8 02-Feb-2010 Andreas Huber <andih@google.com> Don't use a HEAD request to determine redirects, instead do a regular GET (since that's always supported), also limit the number of redirects to avoid infinite redirects. Finally, properly handle the end of stream.

related-to-bug: 2403674
TTPDataSource.cpp
TTPStream.cpp
3b240d6bf235f6f6b40ee4c37a2862de286ca1e4 02-Feb-2010 Andreas Huber <andih@google.com> Properly report the duration of a recording into .mp4 files.

related-to-bug: 2295468
PEG4Writer.cpp
4cf04b1bf703522b37a60427ef02f2a18b218c19 02-Feb-2010 Andreas Huber <andih@google.com> Properly advertise the content length of the HTTP stream if available.

related-to-bug: 2312941
achingDataSource.cpp
TTPDataSource.cpp
b8118650036a763b3cd91bc71f358b453ad28993 01-Feb-2010 Andreas Huber <andih@google.com> Merge "Use physical memory for software rendering to take a fast path through surface flinger if possible."
89e7fff6a5d7410815f42b4a55958a59d4463180 29-Jan-2010 Andreas Huber <andih@google.com> Use physical memory for software rendering to take a fast path through surface flinger if possible.

related-to-bug: 2386023
olorconversion/SoftwareRenderer.cpp
78d529eb330ab6c04b5c694403f5a7e7de4b702f 01-Feb-2010 Andreas Huber <andih@google.com> The TI MP3 decoder lies about the number of channels it outputs, add a quirk for that.
MXCodec.cpp
036a38099c9d339d77dc4a1a148db2907a618c2e 30-Jan-2010 Mathias Agopian <mathias@google.com> Merge "Simplify the MemoryDealer implementation"
e300a0c436a048e7568837d9cd8f4bb2bf5e6c72 30-Jan-2010 Andreas Huber <andih@google.com> Merge "Apparently the generic mpeg4 file header does not describe the actual samplerate and channel count of the content in the case of mpeg4 audio, instead the 'ESDS' atom must be consulted."
a83adc4131d5c1afa98fb78b9764be0fab6f1ef7 29-Jan-2010 Andreas Huber <andih@google.com> Merge "Support 24-bit LE PCM wave files in stagefright."
867d2f6ce668968e463eb86b856d21525f12fd67 26-Jan-2010 Mathias Agopian <mathias@google.com> Simplify the MemoryDealer implementation

At some point the implementation became complicated because of
SurfaceFlinger's special needs, since we are now relying on gralloc
we can go back to much simpler MemoryDealer.

Removed HeapInterface and AllocatorInterface, since those don't need
to be paramterized anymore. Merged SimpleMemory and Allocation.
Made SimplisticAllocator non virtual.

Removed MemoryDealer flags (READ_ONLY, PAGE_ALIGNED)

Removed a lot of unneeded code.
MXCodec.cpp
mx/tests/OMXHarness.cpp
ba7c7eeca462614251aec3d27f0f7ff3a83cefa1 29-Jan-2010 Andreas Huber <andih@google.com> Apparently the generic mpeg4 file header does not describe the actual samplerate and channel count of the content in the case of mpeg4 audio, instead the 'ESDS' atom must be consulted.

related-to-bug: 2407094
PEG4Extractor.cpp
nclude/MPEG4Extractor.h
984d8f40c15e7fd757a9fdc007aad75549aa0fce 29-Jan-2010 Andreas Huber <andih@google.com> Support 24-bit LE PCM wave files in stagefright.

related-to-bug: 2300197
AVExtractor.cpp
bbe1ed453aa0407237127fb45a30ba8ffd9e0941 29-Jan-2010 Andreas Huber <andih@google.com> Merge "Properly forward errors returned by AudioTrack up to the player."
1846096f274048a5882402e12be7c47db91b3834 29-Jan-2010 Andreas Huber <andih@google.com> The AVC software decoder always aligns the decoded dimensions to 16 pixel boundaries, report this properly to callers.
odecs/avc/dec/AVCDecoder.cpp
88c030e0e0152791ff74f90249f55fce01371198 29-Jan-2010 Andreas Huber <andih@google.com> Properly forward errors returned by AudioTrack up to the player.

related-to-bug: 2300197
udioPlayer.cpp
wesomePlayer.cpp
0fc863291096e9818fa83f8edc459f7f9c9cf794 29-Jan-2010 Andreas Huber <andih@google.com> Merge "Make sure the OMX component is synchronously shutdown before we try to instantiate another one. Also properly cleanup the software AVC decoder to avoid leaking memory."
69f5f4c021ee55055df39718244c036faf2d3382 29-Jan-2010 Andreas Huber <andih@google.com> Make sure the OMX component is synchronously shutdown before we try to instantiate another one. Also properly cleanup the software AVC decoder to avoid leaking memory.

related-to-bug: 2404786
wesomePlayer.cpp
odecs/avc/dec/AVCDecoder.cpp
50a9976892316c033cd90d522ecbfcc8e3c0eb9b 28-Jan-2010 Andreas Huber <andih@google.com> For mpeg4 files streamed through HTTP, cache the entire sampletable metadata chunk in memory if possible.

related-to-bug: 2295438
TTPDataSource.cpp
PEG4Extractor.cpp
5561ccf4a8db88a2e44eac1b3ed13b4ff53a7f20 28-Jan-2010 Andreas Huber <andih@google.com> Support the specification of additional HTTP headers in the creation of a DataSource.

related-to-bug: 2393577
wesomePlayer.cpp
ataSource.cpp
TTPDataSource.cpp
ediaExtractor.cpp
nclude/AwesomePlayer.h
mx/tests/OMXHarness.cpp
8566a635aa4bf6d2e908f0bc64d4fb8917025b58 28-Jan-2010 Andreas Huber <andih@google.com> Fix http streaming for shoutcast servers that do not support http ranges.

related-to-bug: 2295438
TTPDataSource.cpp
0463f07fe11e6b70d8c46a23abd88273952fabc4 27-Jan-2010 Andreas Huber <andih@google.com> Do not hold onto the master lock while reading data from the datasource. This would prevent consumers from reading cached data immediately if it is available.

related-to-bug: 2295438
refetcher.cpp
e9f8c544dbe0ac7ff88df18bfe9084c72e3ac1d5 27-Jan-2010 Andreas Huber <andih@google.com> Merge "Better support for HTTP streaming media content, fixes to the way HTTPDataSource streams the data, prefetcher implementation."
66b0a35c9a4136a84c3f73b1b25fcb5220138b95 27-Jan-2010 Andreas Huber <andih@google.com> Better support for HTTP streaming media content, fixes to the way HTTPDataSource streams the data, prefetcher implementation.

related-to-bug: 2295438
ndroid.mk
wesomePlayer.cpp
achingDataSource.cpp
TTPDataSource.cpp
refetcher.cpp
nclude/AwesomePlayer.h
nclude/Prefetcher.h
2dce41ad26cb3e9e15c9e456a84bcf5309548ca0 26-Jan-2010 Andreas Huber <andih@google.com> Support for audio recording into AMR NB/WB files as well as audio tracks in MPEG4 files.

related-to-bug: 2295449
MRWriter.cpp
PEG4Writer.cpp
e7c9cb48fec02697227bd847cd2e69432659adfd 25-Jan-2010 Andreas Huber <andih@google.com> Initial checkin of AudioSource and AMRWriter, a pair of classes supporting pure-audio recording in stagefright.

related-to-bug: 2295449
MRWriter.cpp
ndroid.mk
udioSource.cpp
213addfaf4b359c69da4e9b4490c511d116845bb 25-Jan-2010 Andreas Huber <andih@google.com> The qcom OMX video decoders do not allocate output buffer memory at the time OMX_AllocateBuffer is called, wait until we received the first FILL_BUFFER_DONE notification until we rely on the buffer data ptr.
MXCodec.cpp
ampleIterator.cpp
tagefrightMetadataRetriever.cpp
mx/OMX.cpp
a826028dc33a83538a2ac6bd13ca46a52de7a9be 22-Jan-2010 Andreas Huber <andih@google.com> Merge "Make sure to release the renderer before shutting down the hardware codec, qcom's hardware decoder will otherwise crash."
b9280d5c2313c41eb490f58198c4e59118e0e3e6 22-Jan-2010 Andreas Huber <andih@google.com> Make sure to release the renderer before shutting down the hardware codec, qcom's hardware decoder will otherwise crash.

related-to-bug: 2387981
wesomePlayer.cpp
a2a05bf4d24df4ccd2942bfc3766a2430701e8ba 22-Jan-2010 Chih-Chung Chang <chihchung@google.com> Add an orientation parameter for overlay, so we can do camera preview in portrait mode.
ameraSource.cpp
0726045216f576e97672ebeefc265d39c4ebaaa5 21-Jan-2010 Andreas Huber <andih@google.com> Fix circular dependency between StagefrightPlayer and AwesomePlayer that prevented proper cleanup.

related-to-bug: 2355922
wesomePlayer.cpp
nclude/AwesomePlayer.h
570a3cb7582daa030cb38eedc5eb6a06f86ecc7f 21-Jan-2010 Andreas Huber <andih@google.com> Fix no-copy-overhead OMXCodec implementation to actually work.
MXCodec.cpp
nclude/OMX.h
nclude/OMXNodeInstance.h
mx/OMX.cpp
mx/OMXNodeInstance.cpp
dfaddcc81f27bb9de47edec469a4a5fb2309bd6a 20-Jan-2010 Andreas Huber <andih@google.com> Merge "Adds support for 8-bit (unsigned) PCM wave files."
f99f049dd228333e3d6f886efe373f8e461ff2da 20-Jan-2010 Andreas Huber <andih@google.com> Adds support for 8-bit (unsigned) PCM wave files.

related-to-bug: 2382428
AVExtractor.cpp
nclude/WAVExtractor.h
72b8c5ae6a5f97a4fcfc6d23d33159d6ae50179c 20-Jan-2010 Andreas Huber <andih@google.com> Support for 'iTunes-style' metadata in .mp4 and .3gp files.

related-to-bug: 2368967
PEG4Extractor.cpp
tagefrightMetadataRetriever.cpp
nclude/MPEG4Extractor.h
08e7eb983fcb9860a574e964ff905f75aab88d2f 19-Jan-2010 Andreas Huber <andih@google.com> Fix trailing garbage after UCS-2 encoded strings in ID3 V2.

related-to-bug: 2381919
d3/ID3.cpp
83e5850bdf9c8b5c36c364b367b039674eb827ad 19-Jan-2010 Andreas Huber <andih@google.com> Support for ID3 version 1 (and 1.1) tags in .mp3 files.

related-to-bug: 2375219
d3/ID3.cpp
d3/testid3.cpp
nclude/ID3.h
7eaa9c9385535b651064e02d05a8ffa4b2359281 16-Jan-2010 Andreas Huber <andih@google.com> Avoid unnecessary buffer copying if at all possible, detect if running in the mediaserver process.
MXCodec.cpp
nclude/OMX.h
mx/OMX.cpp
a2ce85733c8e42c30927eefe3ff4e4bd36515041 19-Jan-2010 Andreas Huber <andih@google.com> Merge "Squashed commit of the following:"
8fd10b7add00c31a3f9317430d9bdcad9fb324a5 19-Jan-2010 Andreas Huber <andih@google.com> Merge "Remove totally unused code from OMX.cpp"
c57b67905c2128ddadfeca96785ee1f593b6605a 19-Jan-2010 Andreas Huber <andih@google.com> Squashed commit of the following:

commit 6689350d7e4dad6d873c1ed95f0a356e3bfd79d1
Author: Andreas Huber <andih@google.com>
Date: Tue Jan 19 09:23:02 2010 -0800

Some tweaks to the SampleIterator.

commit 5638bff6d31442a219806445c3106d47b081fcab
Author: Andreas Huber <andih@google.com>
Date: Fri Jan 15 14:46:29 2010 -0800

A much improved implementation of MPEG4 sample table operations through an iterator.
ndroid.mk
PEG4Extractor.cpp
ampleIterator.cpp
ampleTable.cpp
nclude/SampleIterator.h
nclude/SampleTable.h
81dbf71f4488ee1a4cb612f2aba341f365fb546a 15-Jan-2010 Andreas Huber <andih@google.com> Remove totally unused code from OMX.cpp
mx/OMX.cpp
a76e5ddf0bb77c04615db1916c21c1ba315e555b 19-Jan-2010 Andreas Huber <andih@google.com> Merge "Make sure the seek test attempts to seek on the very first iteration, as this appears to be a special case that decoders frequently get wrong."
97419ed670a12f48a7609673da8ee5dc0376f075 15-Jan-2010 Andreas Huber <andih@google.com> Merge "Squashed commit of the following:"
c2b00379dbc6389efbbbfc51e09207933b747c6d 15-Jan-2010 Andreas Huber <andih@google.com> Merge "Fix a few issues with determining the closest sample to a given time in the MPEG4 sampletable implementation."
2e26e7913c98827d5f0a54c9ca9b5e9ccba041d8 15-Jan-2010 Andreas Huber <andih@google.com> Merge "Squashed commit of the following:"
da76c64dee7d95c967e2841302300cfb081e67b2 14-Jan-2010 Andreas Huber <andih@google.com> Fix a few issues with determining the closest sample to a given time in the MPEG4 sampletable implementation.
ampleTable.cpp
4e202e779a8495091ab189fd88fc295a3e619c61 14-Jan-2010 Andreas Huber <andih@google.com> Squashed commit of the following:

commit cb11364feefc200f10af6a01f776803acba2792a
Author: Andreas Huber <andih@google.com>
Date: Thu Jan 14 14:05:36 2010 -0800

Even if the decoder didn't extract the thumbnail at the specified time, accept it for now.

commit a54c0244b305caf11e67db49b7d3d8dba5f77751
Author: Andreas Huber <andih@google.com>
Date: Thu Jan 14 11:37:15 2010 -0800

Add some checks to make sure we extract the correct thumbnail frame, also revert to the hardware decoders for thumnbail extraction if the software decoders failed.
tagefrightMetadataRetriever.cpp
e8a084958c27327b0aca749f69095605d2a21309 14-Jan-2010 Andreas Huber <andih@google.com> Squashed commit of the following:

commit 0014ab17f2e0986044327a5ab22159de50b81e0a
Author: Andreas Huber <andih@google.com>
Date: Thu Jan 14 14:05:09 2010 -0800

Another instance of returning an error instead of asserting makes sense.

commit d2cac8c498a65b449a25ec216601830d23c165e7
Author: Andreas Huber <andih@google.com>
Date: Thu Jan 14 13:34:33 2010 -0800

Instead of asserting on invalid data (incomplete NAL unit), return an error.
PEG4Extractor.cpp
b03fd8c97695d381e202f6a64989b51c7024c04a 14-Jan-2010 Andreas Huber <andih@google.com> Workaround for some hardware decoders not properly signaling end-of-output-stream properly.
MXCodec.cpp
ab13003c692f25c7c430e6b6c441d88aefdcf9d8 14-Jan-2010 Andreas Huber <andih@google.com> Make sure the seek test attempts to seek on the very first iteration, as this appears to be a special case that decoders frequently get wrong.
mx/tests/OMXHarness.cpp
7be6407f2ad7f2b0782d195d9f792072c084d6f5 13-Jan-2010 Andreas Huber <andih@google.com> Support for determining the mime type of media via metadata extraction.
MRExtractor.cpp
P3Extractor.cpp
PEG4Extractor.cpp
tagefrightMediaScanner.cpp
tagefrightMetadataRetriever.cpp
AVExtractor.cpp
nclude/AMRExtractor.h
nclude/MPEG4Extractor.h
nclude/WAVExtractor.h
bd4bc59262df90dc85752684a1d4a92833a535a3 13-Jan-2010 Andreas Huber <andih@google.com> More metadata support.
P3Extractor.cpp
tagefrightMetadataRetriever.cpp
6064017c61aa0bcadcff3119e176eab5fc3c001b 13-Jan-2010 Andreas Huber <andih@google.com> Properly respect NALLengthSize in the AVC Configuration header to determine how many bits encode the nal unit size.

related-to-bug: 2363596
PEG4Extractor.cpp
54a4b5e76faa0799231e24ea465ba6d6062b00eb 12-Jan-2010 Andreas Huber <andih@google.com> Make sure to release the buffer we're not using in case of an error.

related-to-bug: 2366606
odecs/mp3dec/MP3Decoder.cpp
fc9ba09e3bb368f823d473f5e2bb9aa32dba6289 12-Jan-2010 Andreas Huber <andih@google.com> Squashed commit of the following:

commit f81bb1dac5ef107bb0d7d5d756fb1ffa532ba2cc
Author: Andreas Huber <andih@google.com>
Date: Mon Jan 11 14:55:56 2010 -0800

Support for duration metadata, midi and ogg-vorbis files (in mediascanner)

commit 0b1385a0dc156ce27985a1ff757c4c142fd7ec39
Author: Andreas Huber <andih@google.com>
Date: Mon Jan 11 14:20:45 2010 -0800

Refactor meta data logic. Container specific metadata is now also returned by the MediaExtractor.

commit f9818dfac39c96e5fefe8c8295e60580692d5990
Author: Andreas Huber <andih@google.com>
Date: Fri Jan 8 14:26:09 2010 -0800

A first pass at supporting metadata through ID3 tags.

commit 476e9e253633336ab790f943e2d6c0cd8991d76a
Author: Andreas Huber <andih@google.com>
Date: Thu Jan 7 15:48:44 2010 -0800

Initial checkin of ID3 (V2.2 and V2.3) parser for use in stagefright.

related-to-bug: 2295456
ndroid.mk
udioPlayer.cpp
ataSource.cpp
ileSource.cpp
P3Extractor.cpp
ediaExtractor.cpp
tagefrightMediaScanner.cpp
tagefrightMetadataRetriever.cpp
odecs/avc/dec/AVCDecoder.cpp
d3/Android.mk
d3/ID3.cpp
d3/testid3.cpp
nclude/ID3.h
nclude/MP3Extractor.h
nclude/StagefrightMetadataRetriever.h
58e1f78683d9230932c4d5bee53b79fc685b5995 12-Jan-2010 Andreas Huber <andih@google.com> Merge "The mp3 decoder should not assert that decoding was successful but return an error instead."
cd231c8672056429003b452c6a97fb705ad0765e 11-Jan-2010 Andreas Huber <andih@google.com> The mp3 decoder should not assert that decoding was successful but return an error instead.
odecs/mp3dec/MP3Decoder.cpp
db74495dbf653a72018396607fae63946bed44ec 11-Jan-2010 Andreas Huber <andih@google.com> Fix an uninitialized read detected by valgrind. The array to be copied is statically sized and not a c-string.

related-to-bug: 2366619
P3Extractor.cpp
67e5a4f6f6879d512a859e5dba92e9beec7a2f91 08-Jan-2010 Andreas Huber <andih@google.com> Reorganize some of the stagefright implementation related to metadata.
ndroid.mk
tagefrightMediaScanner.cpp
tagefrightMetadataRetriever.cpp
nclude/StagefrightMetadataRetriever.h
23d7a43fb32482e2573b7f203fd9dd5a8349b329 05-Jan-2010 Andreas Huber <andih@google.com> Quick and dirty implementation to follow http redirects in stagefright.
TTPDataSource.cpp
tring.cpp
fcac3378879ab151d786f1ce89da2f032ba3ea97 05-Jan-2010 Andreas Huber <andih@google.com> Merge "Protect against possible temporary objects going away before we get at their data."
a66a27e07423c6ed1dde9c0267b555e83c44e58e 05-Jan-2010 Andreas Huber <andih@google.com> Protect against possible temporary objects going away before we get at their data.
odecs/aacdec/AACDecoder.cpp
odecs/avc/dec/AVCDecoder.cpp
odecs/m4v_h263/dec/M4vH263Decoder.cpp
717826ececd8d39596f62418677721d70776add1 05-Jan-2010 Andreas Huber <andih@google.com> I must have broken raw-audio decoding in the recent past, this fixes it.

related-to-bug: http://b/issue?id=2352199
wesomePlayer.cpp
82c162310a506f74741fb32cddee937a4beec1fa 05-Jan-2010 Andreas Huber <andih@google.com> Merge "Fix mpeg4/h.263 software decoder."
cb110ccbe4c275eba0857d9af341a75113243fa0 04-Jan-2010 Andreas Huber <andih@google.com> Fix mpeg4/h.263 software decoder.
odecs/m4v_h263/dec/M4vH263Decoder.cpp
nclude/M4vH263Decoder.h
c60bc4a7e25f6784644b8f6acf07bae2c58863b3 04-Jan-2010 Andreas Huber <andih@google.com> Fix avc software decoder to properly handle SEI nalType and access unit delimiter.
odecs/avc/dec/AVCDecoder.cpp
a17e2b9a98c836145d6b50c6b1407e2162c526ac 22-Dec-2009 Doug Kwan <dougkwan@google.com> Add missing shared libraries in linker commands. Currently these libraries are
linked implicitly via dependencies of other shared libraries.
mx/tests/Android.mk
01d48d20f8e69061cd41741c2ed5c7f2dc8f2116 19-Dec-2009 James Dong <jdong@google.com> am 122fe7e1: am 4d0e827d: Attempt to fix simular build break. Missing header file stdlib.h for free, malloc, etc

Merge commit '122fe7e10297ce51d63b6076a33573d217f3f1cc'

* commit '122fe7e10297ce51d63b6076a33573d217f3f1cc':
Attempt to fix simular build break.
2d3b2097320614cb088bd4eba795905c2a4130b5 19-Dec-2009 James Dong <jdong@google.com> Attempt to fix simular build break.
Missing header file stdlib.h for free, malloc, etc
odecs/m4v_h263/dec/M4vH263Decoder.cpp
odecs/m4v_h263/dec/include/m4vh263_decoder_pv_types.h
f9918ed60e9fb3050e93e68d714f92f647ef00ab 19-Dec-2009 James Dong <jdong@google.com> am 2473eb4a: am 4e4795c8: Fix a memory corruption problem in software M4v/H263 decoder due to out-of-scope local variable

Merge commit '2473eb4a33b226758e1f5db322cb8d687ce01602'

* commit '2473eb4a33b226758e1f5db322cb8d687ce01602':
Fix a memory corruption problem in software M4v/H263 decoder due to out-of-scope local variable
fd1fe13b4584628d73df31717794e8e886d6bc39 19-Dec-2009 James Dong <jdong@google.com> Fix a memory corruption problem in software M4v/H263 decoder due to out-of-scope local variable
MXCodec.cpp
odecs/m4v_h263/dec/M4vH263Decoder.cpp
nclude/M4vH263Decoder.h
ba871922175a52f85a4bb79d0ff24f3c2436f351 18-Dec-2009 Gloria Wang <gwang@google.com> am 254e0025: am 791c626a: Merge change Ibac388a3 into eclair-mr2

Merge commit '254e00253ce72ee7252c26aab3a9ec6fb72e0542'

* commit '254e00253ce72ee7252c26aab3a9ec6fb72e0542':
Add support for XING header
9801564dbff3c47e747add686feec622575a9869 18-Dec-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change Ibac388a3 into eclair-mr2

* changes:
Add support for XING header
8b77fa8f7b8515b3436ee31350e5fc73abf30c00 18-Dec-2009 James Dong <jdong@google.com> am 5614c2c6: am 02f5b544: Initial checkins of the mpeg4 and h263 software decoders based on PV

Merge commit '5614c2c677ce08561c93c6385dc3090dbf5760dc'

* commit '5614c2c677ce08561c93c6385dc3090dbf5760dc':
Initial checkins of the mpeg4 and h263 software decoders based on PV
ac6e6569f08911df9d5c96285cf15325cbbf0340 10-Dec-2009 Gloria Wang <gwang@google.com> Add support for XING header
P3Extractor.cpp
nclude/MP3Extractor.h
3bcbcd09b48deb2b498f7163f89f92e01b9fd43b 18-Dec-2009 Andreas Huber <andih@google.com> Attempt to fix the simulator build by including stdlib.h for NULL.
odecs/avc/common/include/avclib_common.h
3306cfee3bf38ab207a0504e49c2d492bb73ffbf 16-Dec-2009 James Dong <jdong@google.com> Initial checkins of the mpeg4 and h263 software decoders based on PV
ndroid.mk
MXCodec.cpp
odecs/m4v_h263/Android.mk
odecs/m4v_h263/dec/Android.mk
odecs/m4v_h263/dec/M4vH263Decoder.cpp
odecs/m4v_h263/dec/include/m4vh263_decoder_pv_types.h
odecs/m4v_h263/dec/include/mp4dec_api.h
odecs/m4v_h263/dec/include/visual_header.h
odecs/m4v_h263/dec/src/adaptive_smooth_no_mmx.cpp
odecs/m4v_h263/dec/src/bitstream.cpp
odecs/m4v_h263/dec/src/bitstream.h
odecs/m4v_h263/dec/src/block_idct.cpp
odecs/m4v_h263/dec/src/cal_dc_scaler.cpp
odecs/m4v_h263/dec/src/chv_filter.cpp
odecs/m4v_h263/dec/src/chvr_filter.cpp
odecs/m4v_h263/dec/src/combined_decode.cpp
odecs/m4v_h263/dec/src/conceal.cpp
odecs/m4v_h263/dec/src/datapart_decode.cpp
odecs/m4v_h263/dec/src/dcac_prediction.cpp
odecs/m4v_h263/dec/src/dec_pred_intra_dc.cpp
odecs/m4v_h263/dec/src/deringing_chroma.cpp
odecs/m4v_h263/dec/src/deringing_luma.cpp
odecs/m4v_h263/dec/src/find_min_max.cpp
odecs/m4v_h263/dec/src/get_pred_adv_b_add.cpp
odecs/m4v_h263/dec/src/get_pred_outside.cpp
odecs/m4v_h263/dec/src/idct.cpp
odecs/m4v_h263/dec/src/idct.h
odecs/m4v_h263/dec/src/idct_vca.cpp
odecs/m4v_h263/dec/src/max_level.h
odecs/m4v_h263/dec/src/mb_motion_comp.cpp
odecs/m4v_h263/dec/src/mb_utils.cpp
odecs/m4v_h263/dec/src/mbtype_mode.h
odecs/m4v_h263/dec/src/motion_comp.h
odecs/m4v_h263/dec/src/mp4dec_lib.h
odecs/m4v_h263/dec/src/mp4def.h
odecs/m4v_h263/dec/src/mp4lib_int.h
odecs/m4v_h263/dec/src/packet_util.cpp
odecs/m4v_h263/dec/src/post_filter.cpp
odecs/m4v_h263/dec/src/post_proc.h
odecs/m4v_h263/dec/src/post_proc_semaphore.cpp
odecs/m4v_h263/dec/src/pp_semaphore_chroma_inter.cpp
odecs/m4v_h263/dec/src/pp_semaphore_luma.cpp
odecs/m4v_h263/dec/src/pvdec_api.cpp
odecs/m4v_h263/dec/src/scaling.h
odecs/m4v_h263/dec/src/scaling_tab.cpp
odecs/m4v_h263/dec/src/vlc_dec_tab.h
odecs/m4v_h263/dec/src/vlc_decode.cpp
odecs/m4v_h263/dec/src/vlc_decode.h
odecs/m4v_h263/dec/src/vlc_dequant.cpp
odecs/m4v_h263/dec/src/vlc_tab.cpp
odecs/m4v_h263/dec/src/vop.cpp
odecs/m4v_h263/dec/src/zigzag.h
odecs/m4v_h263/dec/src/zigzag_tab.cpp
odecs/m4v_h263/patent_disclaimer.txt
nclude/M4vH263Decoder.h
134ee6a324c35f39e3576172e4eae4c6de6eb9dc 16-Dec-2009 Andreas Huber <andih@google.com> Squashed commit of the following:

commit 144b1c40e9cf08a584c50e1bef7ba3f287e81a4f
Author: Andreas Huber <andih@google.com>
Date: Wed Dec 16 09:28:23 2009 -0800

This H264 file shows a certain problem even better.

commit 3245f1f3b7471975aeeb824a756c987abd610f55
Author: Andreas Huber <andih@google.com>
Date: Wed Dec 16 09:20:08 2009 -0800

Using only the QA testfiles now.

commit 074817eb3816c5dd70858a3594e3b92d799d873b
Author: Andreas Huber <andih@google.com>
Date: Tue Dec 15 16:17:39 2009 -0800

Yay, roles are back again now that the API is in place.

commit 6d847e4932cc38301ae27cb7283b7f1553a95457
Author: Andreas Huber <andih@google.com>
Date: Tue Dec 15 13:01:20 2009 -0800

Added commandline option for specifying the random seed for reproducable tests.

commit 62ab37b26336eaa67e49791c41c996acb6acee3f
Author: Andreas Huber <andih@google.com>
Date: Mon Dec 14 10:53:27 2009 -0800

When issuing a seek it is important that only the first MediaSource::read call has the seek option.

commit e77c46644b2fb6862bafa3569f7d304252074f1e
Author: Andreas Huber <andih@google.com>
Date: Mon Dec 7 16:39:07 2009 -0800

Make sure the tests are actually built, sp<OMXCodec> becomes sp<MediaSource>

commit 6df56915bd55a9445b3c6f953d3cc251d81579b8
Author: Andreas Huber <andih@google.com>
Date: Thu Dec 3 14:25:36 2009 -0800

Temporarily disable support for querying the roles of OMX components.

commit 31bb26930df9e3658dea684cedb4b0f1a06a4a88
Author: Andreas Huber <andih@google.com>
Date: Tue Dec 1 13:36:52 2009 -0800

Disregard EOS events, slightly change the way the EOS flag on output buffers is handled.

commit 4c382fbc9aebee8197d5988d04378062809e7c48
Author: Andreas Huber <andih@google.com>
Date: Tue Dec 1 09:37:24 2009 -0800

New random seek test for the codec tests. Fixed "sticky" end-of-output-buffers flag behaviour in OMXCodec.

commit c762eac3e44309592b61a168d66e091cf609fa03
Author: Andreas Huber <andih@google.com>
Date: Tue Nov 3 14:13:43 2009 -0800

Fix a typo.

commit 50540a59b65c7d476b0193c7494cd75895e6ca6d
Author: Andreas Huber <andih@google.com>
Date: Tue Nov 3 09:48:35 2009 -0800

Some more fine tuning of the unit tests, make MPEG4Extractor less verbose.

commit 1157a7e52a0636706caa235abe16d2ff8a0b8140
Author: Andreas Huber <andih@google.com>
Date: Wed Oct 28 12:01:01 2009 -0700

Changes to the IOMX::listNodes API, this now returns the component's roles as well, unit tests now test all components in all supported roles by default.

commit 30fbf2d8c6cb927689f7ba75eb550a81e9df488a
Author: Andreas Huber <andih@google.com>
Date: Mon Oct 26 09:45:26 2009 -0700

Initial check-in of unit tests for OMX components.
PEG4Extractor.cpp
MXCodec.cpp
nclude/OMX.h
nclude/OMXNodeInstance.h
mx/Android.mk
mx/OMX.cpp
mx/OMXNodeInstance.cpp
mx/tests/Android.mk
mx/tests/OMXHarness.cpp
mx/tests/OMXHarness.h
8ae1d0bdcef22f2bdd8d283e0e615f3ba6c3f4cd 16-Dec-2009 Andreas Huber <andih@google.com> Add a new API to support determining the roles of an OMX component specified by name. Remove unneeded OMXSoftwareCodecsPlugin.
mx/Android.mk
mx/OMX.cpp
mx/OMXMaster.cpp
mx/OMXMaster.h
mx/OMXPVCodecsPlugin.cpp
mx/OMXPVCodecsPlugin.h
mx/OMXSoftwareCodecsPlugin.cpp
mx/OMXSoftwareCodecsPlugin.h
1af80bc3fefb999756ef4847e72b2dcfd0b88a4a 15-Dec-2009 Andreas Huber <andih@google.com> Properly integrate the software codecs into the OMXCodec::Create hierarchy of available components.
MXCodec.cpp
c1689e49ac867de33f2e81289449878ac2e536a0 15-Dec-2009 Andreas Huber <andih@google.com> It's important that seek requests are only specified in the initial call to MediaSource::read and are not repeated in subsequent calls.
wesomePlayer.cpp
68ddfc7f245bf31f16c3d65ba754cbb78e37fcbe 14-Dec-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change I1314e737 into eclair-mr2

* changes:
AwesomePlayer now renders either remote (IOMXRenderer) or locally depending on what kind of decoder was instantiated. Split off color conversion code into its own shared library.
733b7729ea462fae9c6899456444e28fef1c757c 14-Dec-2009 Andreas Huber <andih@google.com> AwesomePlayer now renders either remote (IOMXRenderer) or locally depending on what kind of decoder was instantiated. Split off color conversion code into its own shared library.
ndroid.mk
wesomePlayer.cpp
olorconversion/Android.mk
olorconversion/ColorConverter.cpp
olorconversion/SoftwareRenderer.cpp
nclude/AwesomePlayer.h
mx/Android.mk
mx/ColorConverter.cpp
mx/SoftwareRenderer.cpp
587423f64501606852f05393ce1edfac0c18d545 14-Dec-2009 Andreas Huber <andih@google.com> The software AVCDecoder now properly seeks as requested.
odecs/avc/dec/AVCDecoder.cpp
nclude/AVCDecoder.h
b841f14f8e51f2365945281fbfa54ef6a1b1b5a6 12-Dec-2009 Andreas Huber <andih@google.com> Initial checkin of software AMR NB encoder based on PV source code.
ndroid.mk
P3Extractor.cpp
MXCodec.cpp
odecs/amrnb/enc/AMRNBEncoder.cpp
odecs/amrnb/enc/Android.mk
odecs/amrnb/enc/src/amrencode.cpp
odecs/amrnb/enc/src/amrencode.h
odecs/amrnb/enc/src/autocorr.cpp
odecs/amrnb/enc/src/autocorr.h
odecs/amrnb/enc/src/c1035pf.cpp
odecs/amrnb/enc/src/c1035pf.h
odecs/amrnb/enc/src/c2_11pf.cpp
odecs/amrnb/enc/src/c2_11pf.h
odecs/amrnb/enc/src/c2_9pf.cpp
odecs/amrnb/enc/src/c2_9pf.h
odecs/amrnb/enc/src/c3_14pf.cpp
odecs/amrnb/enc/src/c3_14pf.h
odecs/amrnb/enc/src/c4_17pf.cpp
odecs/amrnb/enc/src/c4_17pf.h
odecs/amrnb/enc/src/c8_31pf.cpp
odecs/amrnb/enc/src/c8_31pf.h
odecs/amrnb/enc/src/calc_cor.cpp
odecs/amrnb/enc/src/calc_cor.h
odecs/amrnb/enc/src/calc_en.cpp
odecs/amrnb/enc/src/calc_en.h
odecs/amrnb/enc/src/cbsearch.cpp
odecs/amrnb/enc/src/cbsearch.h
odecs/amrnb/enc/src/cl_ltp.cpp
odecs/amrnb/enc/src/cl_ltp.h
odecs/amrnb/enc/src/cod_amr.cpp
odecs/amrnb/enc/src/cod_amr.h
odecs/amrnb/enc/src/convolve.cpp
odecs/amrnb/enc/src/convolve.h
odecs/amrnb/enc/src/cor_h.cpp
odecs/amrnb/enc/src/cor_h.h
odecs/amrnb/enc/src/cor_h_x.cpp
odecs/amrnb/enc/src/cor_h_x.h
odecs/amrnb/enc/src/cor_h_x2.cpp
odecs/amrnb/enc/src/cor_h_x2.h
odecs/amrnb/enc/src/corrwght_tab.cpp
odecs/amrnb/enc/src/dtx_enc.cpp
odecs/amrnb/enc/src/dtx_enc.h
odecs/amrnb/enc/src/enc_lag3.cpp
odecs/amrnb/enc/src/enc_lag3.h
odecs/amrnb/enc/src/enc_lag6.cpp
odecs/amrnb/enc/src/enc_lag6.h
odecs/amrnb/enc/src/enc_output_format_tab.cpp
odecs/amrnb/enc/src/ets_to_if2.cpp
odecs/amrnb/enc/src/ets_to_if2.h
odecs/amrnb/enc/src/ets_to_wmf.cpp
odecs/amrnb/enc/src/ets_to_wmf.h
odecs/amrnb/enc/src/g_adapt.cpp
odecs/amrnb/enc/src/g_adapt.h
odecs/amrnb/enc/src/g_code.cpp
odecs/amrnb/enc/src/g_code.h
odecs/amrnb/enc/src/g_pitch.cpp
odecs/amrnb/enc/src/g_pitch.h
odecs/amrnb/enc/src/gain_q.cpp
odecs/amrnb/enc/src/gain_q.h
odecs/amrnb/enc/src/gsmamr_enc.h
odecs/amrnb/enc/src/hp_max.cpp
odecs/amrnb/enc/src/hp_max.h
odecs/amrnb/enc/src/inter_36.cpp
odecs/amrnb/enc/src/inter_36.h
odecs/amrnb/enc/src/inter_36_tab.cpp
odecs/amrnb/enc/src/inter_36_tab.h
odecs/amrnb/enc/src/l_comp.cpp
odecs/amrnb/enc/src/l_extract.cpp
odecs/amrnb/enc/src/l_negate.cpp
odecs/amrnb/enc/src/lag_wind.cpp
odecs/amrnb/enc/src/lag_wind.h
odecs/amrnb/enc/src/lag_wind_tab.cpp
odecs/amrnb/enc/src/lag_wind_tab.h
odecs/amrnb/enc/src/levinson.cpp
odecs/amrnb/enc/src/levinson.h
odecs/amrnb/enc/src/lpc.cpp
odecs/amrnb/enc/src/lpc.h
odecs/amrnb/enc/src/ol_ltp.cpp
odecs/amrnb/enc/src/ol_ltp.h
odecs/amrnb/enc/src/p_ol_wgh.cpp
odecs/amrnb/enc/src/pitch_fr.cpp
odecs/amrnb/enc/src/pitch_fr.h
odecs/amrnb/enc/src/pitch_ol.cpp
odecs/amrnb/enc/src/pitch_ol.h
odecs/amrnb/enc/src/pre_big.cpp
odecs/amrnb/enc/src/pre_big.h
odecs/amrnb/enc/src/pre_proc.cpp
odecs/amrnb/enc/src/pre_proc.h
odecs/amrnb/enc/src/prm2bits.cpp
odecs/amrnb/enc/src/prm2bits.h
odecs/amrnb/enc/src/q_gain_c.cpp
odecs/amrnb/enc/src/q_gain_c.h
odecs/amrnb/enc/src/q_gain_p.cpp
odecs/amrnb/enc/src/q_gain_p.h
odecs/amrnb/enc/src/qgain475.cpp
odecs/amrnb/enc/src/qgain475.h
odecs/amrnb/enc/src/qgain795.cpp
odecs/amrnb/enc/src/qgain795.h
odecs/amrnb/enc/src/qua_gain.cpp
odecs/amrnb/enc/src/s10_8pf.cpp
odecs/amrnb/enc/src/s10_8pf.h
odecs/amrnb/enc/src/set_sign.cpp
odecs/amrnb/enc/src/set_sign.h
odecs/amrnb/enc/src/sid_sync.cpp
odecs/amrnb/enc/src/sid_sync.h
odecs/amrnb/enc/src/sp_enc.cpp
odecs/amrnb/enc/src/sp_enc.h
odecs/amrnb/enc/src/spreproc.cpp
odecs/amrnb/enc/src/spreproc.h
odecs/amrnb/enc/src/spstproc.cpp
odecs/amrnb/enc/src/spstproc.h
odecs/amrnb/enc/src/ton_stab.cpp
odecs/amrnb/enc/src/ton_stab.h
nclude/AMRNBEncoder.h
6b91407a918d755454ed396068ff7f67b7088f34 11-Dec-2009 Andreas Huber <andih@google.com> Propagate duration from input to output only if available, support multiple full frames of audio per input buffer in AMR/AAC decoders.
MXCodec.cpp
odecs/aacdec/AACDecoder.cpp
odecs/amrnb/dec/AMRNBDecoder.cpp
odecs/amrwb/AMRWBDecoder.cpp
odecs/avc/dec/AVCDecoder.cpp
odecs/mp3dec/MP3Decoder.cpp
72124cf05cd5b40f2902198aca2797616b813457 11-Dec-2009 Andreas Huber <andih@google.com> Removing an unused header file and a stale forward declaration. Also handling one more nalType as a no-op.
odecs/avc/dec/AVCDecoder.cpp
odecs/avc/dec/include/pvavcdecoder_factory.h
nclude/AVCDecoder.h
08411b75d4c30ce26180639f158e2f33d190eee8 11-Dec-2009 Andreas Huber <andih@google.com> remote destructors are not synchronously executed by the binder...
wesomePlayer.cpp
fd4a8e09a54469bbccea6248f84319a1eb78765e 11-Dec-2009 Andreas Huber <andih@google.com> Fix seek-on-startup behaviour in AwesomePlayer.
wesomePlayer.cpp
e8647636abd1294ae929a8f20c0afa5e9b6b268b 11-Dec-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change Ia67d5388 into eclair-mr2

* changes:
remote destructors are not synchronously executed by the binder...
4844ac54e8b5997c3b03872dbafe8ebed4787517 11-Dec-2009 Andreas Huber <andih@google.com> remote destructors are not synchronously executed by the binder...
wesomePlayer.cpp
609f1a00c96cf5605f4614e7bb6d0487c98969c5 10-Dec-2009 Andreas Huber <andih@google.com> Initial checkin of software AVC video decoder based on PV source code.
ndroid.mk
MXCodec.cpp
odecs/aacdec/Android.mk
odecs/amrnb/common/Android.mk
odecs/amrnb/dec/Android.mk
odecs/amrwb/Android.mk
odecs/avc/Android.mk
odecs/avc/common/Android.mk
odecs/avc/common/include/avc_types.h
odecs/avc/common/include/avcapi_common.h
odecs/avc/common/include/avcint_common.h
odecs/avc/common/include/avclib_common.h
odecs/avc/common/src/deblock.cpp
odecs/avc/common/src/dpb.cpp
odecs/avc/common/src/fmo.cpp
odecs/avc/common/src/mb_access.cpp
odecs/avc/common/src/reflist.cpp
odecs/avc/dec/AVCDecoder.cpp
odecs/avc/dec/Android.mk
odecs/avc/dec/include/avcdec_api.h
odecs/avc/dec/include/pvavcdecoder.h
odecs/avc/dec/include/pvavcdecoder_factory.h
odecs/avc/dec/include/pvavcdecoderinterface.h
odecs/avc/dec/src/avc_bitstream.cpp
odecs/avc/dec/src/avcdec_api.cpp
odecs/avc/dec/src/avcdec_bitstream.h
odecs/avc/dec/src/avcdec_int.h
odecs/avc/dec/src/avcdec_lib.h
odecs/avc/dec/src/header.cpp
odecs/avc/dec/src/itrans.cpp
odecs/avc/dec/src/pred_inter.cpp
odecs/avc/dec/src/pred_intra.cpp
odecs/avc/dec/src/residual.cpp
odecs/avc/dec/src/slice.cpp
odecs/avc/dec/src/vlc.cpp
odecs/avc/patent_disclaimer.txt
odecs/mp3dec/Android.mk
nclude/AVCDecoder.h
20352a300f84516ef615a023b7134733682b3223 10-Dec-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change I3c01bb62 into eclair-mr2

* changes:
Adding copyright headers to recently introduced decoder source files.
29340b0706b7b65e441c47d6f0c83c344d516435 10-Dec-2009 Andreas Huber <andih@google.com> Adding copyright headers to recently introduced decoder source files.
odecs/aacdec/AACDecoder.cpp
odecs/mp3dec/MP3Decoder.cpp
4f1efc098cb5791c3e9f483f2af84aef70d2d0a0 09-Dec-2009 Andreas Huber <andih@google.com> Initial check in of AMR (NB and WB) decoders based on PV source code.
ndroid.mk
MXCodec.cpp
odecs/amrnb/Android.mk
odecs/amrnb/common/Android.mk
odecs/amrnb/common/include/abs_s.h
odecs/amrnb/common/include/add.h
odecs/amrnb/common/include/az_lsp.h
odecs/amrnb/common/include/basic_op.h
odecs/amrnb/common/include/basic_op_arm_gcc_v5.h
odecs/amrnb/common/include/basic_op_arm_v5.h
odecs/amrnb/common/include/basic_op_c_equivalent.h
odecs/amrnb/common/include/basicop_malloc.h
odecs/amrnb/common/include/bitno_tab.h
odecs/amrnb/common/include/bitreorder_tab.h
odecs/amrnb/common/include/bits2prm.h
odecs/amrnb/common/include/bytesused.h
odecs/amrnb/common/include/cnst.h
odecs/amrnb/common/include/cnst_vad.h
odecs/amrnb/common/include/copy.h
odecs/amrnb/common/include/d_gain_c.h
odecs/amrnb/common/include/d_gain_p.h
odecs/amrnb/common/include/d_plsf.h
odecs/amrnb/common/include/div_32.h
odecs/amrnb/common/include/div_s.h
odecs/amrnb/common/include/dtx_common_def.h
odecs/amrnb/common/include/extract_h.h
odecs/amrnb/common/include/extract_l.h
odecs/amrnb/common/include/frame.h
odecs/amrnb/common/include/frame_type_3gpp.h
odecs/amrnb/common/include/gc_pred.h
odecs/amrnb/common/include/gmed_n.h
odecs/amrnb/common/include/gsm_amr_typedefs.h
odecs/amrnb/common/include/int_lpc.h
odecs/amrnb/common/include/int_lsf.h
odecs/amrnb/common/include/inv_sqrt.h
odecs/amrnb/common/include/l_abs.h
odecs/amrnb/common/include/l_add.h
odecs/amrnb/common/include/l_add_c.h
odecs/amrnb/common/include/l_comp.h
odecs/amrnb/common/include/l_deposit_h.h
odecs/amrnb/common/include/l_deposit_l.h
odecs/amrnb/common/include/l_extract.h
odecs/amrnb/common/include/l_mac.h
odecs/amrnb/common/include/l_msu.h
odecs/amrnb/common/include/l_mult.h
odecs/amrnb/common/include/l_negate.h
odecs/amrnb/common/include/l_shl.h
odecs/amrnb/common/include/l_shr.h
odecs/amrnb/common/include/l_shr_r.h
odecs/amrnb/common/include/l_sub.h
odecs/amrnb/common/include/log2.h
odecs/amrnb/common/include/log2_norm.h
odecs/amrnb/common/include/lsfwt.h
odecs/amrnb/common/include/lsp.h
odecs/amrnb/common/include/lsp_az.h
odecs/amrnb/common/include/lsp_lsf.h
odecs/amrnb/common/include/lsp_tab.h
odecs/amrnb/common/include/mac_32.h
odecs/amrnb/common/include/mode.h
odecs/amrnb/common/include/mpy_32.h
odecs/amrnb/common/include/mpy_32_16.h
odecs/amrnb/common/include/mult.h
odecs/amrnb/common/include/mult_r.h
odecs/amrnb/common/include/n_proc.h
odecs/amrnb/common/include/negate.h
odecs/amrnb/common/include/norm_l.h
odecs/amrnb/common/include/norm_s.h
odecs/amrnb/common/include/oper_32b.h
odecs/amrnb/common/include/p_ol_wgh.h
odecs/amrnb/common/include/pow2.h
odecs/amrnb/common/include/pred_lt.h
odecs/amrnb/common/include/pvgsmamr.h
odecs/amrnb/common/include/q_plsf.h
odecs/amrnb/common/include/q_plsf_3_tbl.h
odecs/amrnb/common/include/q_plsf_5_tbl.h
odecs/amrnb/common/include/qgain475_tab.h
odecs/amrnb/common/include/qua_gain.h
odecs/amrnb/common/include/qua_gain_tbl.h
odecs/amrnb/common/include/reorder.h
odecs/amrnb/common/include/residu.h
odecs/amrnb/common/include/reverse_bits.h
odecs/amrnb/common/include/round.h
odecs/amrnb/common/include/set_zero.h
odecs/amrnb/common/include/shl.h
odecs/amrnb/common/include/shr.h
odecs/amrnb/common/include/shr_r.h
odecs/amrnb/common/include/sqrt_l.h
odecs/amrnb/common/include/sub.h
odecs/amrnb/common/include/syn_filt.h
odecs/amrnb/common/include/typedef.h
odecs/amrnb/common/include/vad.h
odecs/amrnb/common/include/vad1.h
odecs/amrnb/common/include/vad2.h
odecs/amrnb/common/include/weight_a.h
odecs/amrnb/common/include/window_tab.h
odecs/amrnb/common/include/wmf_to_ets.h
odecs/amrnb/common/pvgsmamrdecoderinterface.h
odecs/amrnb/common/src/add.cpp
odecs/amrnb/common/src/az_lsp.cpp
odecs/amrnb/common/src/bitno_tab.cpp
odecs/amrnb/common/src/bitreorder_tab.cpp
odecs/amrnb/common/src/bits2prm.cpp
odecs/amrnb/common/src/bytesused.cpp
odecs/amrnb/common/src/c2_9pf_tab.cpp
odecs/amrnb/common/src/copy.cpp
odecs/amrnb/common/src/div_32.cpp
odecs/amrnb/common/src/div_s.cpp
odecs/amrnb/common/src/extract_h.cpp
odecs/amrnb/common/src/extract_l.cpp
odecs/amrnb/common/src/gains_tbl.cpp
odecs/amrnb/common/src/gc_pred.cpp
odecs/amrnb/common/src/gmed_n.cpp
odecs/amrnb/common/src/gray_tbl.cpp
odecs/amrnb/common/src/grid_tbl.cpp
odecs/amrnb/common/src/int_lpc.cpp
odecs/amrnb/common/src/inv_sqrt.cpp
odecs/amrnb/common/src/inv_sqrt_tbl.cpp
odecs/amrnb/common/src/l_abs.cpp
odecs/amrnb/common/src/l_deposit_h.cpp
odecs/amrnb/common/src/l_deposit_l.cpp
odecs/amrnb/common/src/l_shr_r.cpp
odecs/amrnb/common/src/log2.cpp
odecs/amrnb/common/src/log2_norm.cpp
odecs/amrnb/common/src/log2_tbl.cpp
odecs/amrnb/common/src/lsfwt.cpp
odecs/amrnb/common/src/lsp.cpp
odecs/amrnb/common/src/lsp_az.cpp
odecs/amrnb/common/src/lsp_lsf.cpp
odecs/amrnb/common/src/lsp_lsf_tbl.cpp
odecs/amrnb/common/src/lsp_tab.cpp
odecs/amrnb/common/src/mult_r.cpp
odecs/amrnb/common/src/negate.cpp
odecs/amrnb/common/src/norm_l.cpp
odecs/amrnb/common/src/norm_s.cpp
odecs/amrnb/common/src/overflow_tbl.cpp
odecs/amrnb/common/src/ph_disp_tab.cpp
odecs/amrnb/common/src/pow2.cpp
odecs/amrnb/common/src/pow2_tbl.cpp
odecs/amrnb/common/src/pred_lt.cpp
odecs/amrnb/common/src/q_plsf.cpp
odecs/amrnb/common/src/q_plsf_3.cpp
odecs/amrnb/common/src/q_plsf_3_tbl.cpp
odecs/amrnb/common/src/q_plsf_5.cpp
odecs/amrnb/common/src/q_plsf_5_tbl.cpp
odecs/amrnb/common/src/qua_gain_tbl.cpp
odecs/amrnb/common/src/reorder.cpp
odecs/amrnb/common/src/residu.cpp
odecs/amrnb/common/src/round.cpp
odecs/amrnb/common/src/set_zero.cpp
odecs/amrnb/common/src/shr.cpp
odecs/amrnb/common/src/shr_r.cpp
odecs/amrnb/common/src/sqrt_l.cpp
odecs/amrnb/common/src/sqrt_l_tbl.cpp
odecs/amrnb/common/src/sub.cpp
odecs/amrnb/common/src/syn_filt.cpp
odecs/amrnb/common/src/vad1.cpp
odecs/amrnb/common/src/weight_a.cpp
odecs/amrnb/common/src/window_tab.cpp
odecs/amrnb/dec/AMRNBDecoder.cpp
odecs/amrnb/dec/Android.mk
odecs/amrnb/dec/include/pvamrnbdecoder_api.h
odecs/amrnb/dec/src/a_refl.cpp
odecs/amrnb/dec/src/a_refl.h
odecs/amrnb/dec/src/agc.cpp
odecs/amrnb/dec/src/agc.h
odecs/amrnb/dec/src/amrdecode.cpp
odecs/amrnb/dec/src/amrdecode.h
odecs/amrnb/dec/src/b_cn_cod.cpp
odecs/amrnb/dec/src/b_cn_cod.h
odecs/amrnb/dec/src/bgnscd.cpp
odecs/amrnb/dec/src/bgnscd.h
odecs/amrnb/dec/src/c_g_aver.cpp
odecs/amrnb/dec/src/c_g_aver.h
odecs/amrnb/dec/src/d1035pf.cpp
odecs/amrnb/dec/src/d1035pf.h
odecs/amrnb/dec/src/d2_11pf.cpp
odecs/amrnb/dec/src/d2_11pf.h
odecs/amrnb/dec/src/d2_9pf.cpp
odecs/amrnb/dec/src/d2_9pf.h
odecs/amrnb/dec/src/d3_14pf.cpp
odecs/amrnb/dec/src/d3_14pf.h
odecs/amrnb/dec/src/d4_17pf.cpp
odecs/amrnb/dec/src/d4_17pf.h
odecs/amrnb/dec/src/d8_31pf.cpp
odecs/amrnb/dec/src/d8_31pf.h
odecs/amrnb/dec/src/d_gain_c.cpp
odecs/amrnb/dec/src/d_gain_p.cpp
odecs/amrnb/dec/src/d_plsf.cpp
odecs/amrnb/dec/src/d_plsf_3.cpp
odecs/amrnb/dec/src/d_plsf_5.cpp
odecs/amrnb/dec/src/dec_amr.cpp
odecs/amrnb/dec/src/dec_amr.h
odecs/amrnb/dec/src/dec_gain.cpp
odecs/amrnb/dec/src/dec_gain.h
odecs/amrnb/dec/src/dec_input_format_tab.cpp
odecs/amrnb/dec/src/dec_lag3.cpp
odecs/amrnb/dec/src/dec_lag3.h
odecs/amrnb/dec/src/dec_lag6.cpp
odecs/amrnb/dec/src/dec_lag6.h
odecs/amrnb/dec/src/dtx_dec.cpp
odecs/amrnb/dec/src/dtx_dec.h
odecs/amrnb/dec/src/ec_gains.cpp
odecs/amrnb/dec/src/ec_gains.h
odecs/amrnb/dec/src/ex_ctrl.cpp
odecs/amrnb/dec/src/ex_ctrl.h
odecs/amrnb/dec/src/gsmamr_dec.h
odecs/amrnb/dec/src/if2_to_ets.cpp
odecs/amrnb/dec/src/if2_to_ets.h
odecs/amrnb/dec/src/int_lsf.cpp
odecs/amrnb/dec/src/lsp_avg.cpp
odecs/amrnb/dec/src/lsp_avg.h
odecs/amrnb/dec/src/ph_disp.cpp
odecs/amrnb/dec/src/ph_disp.h
odecs/amrnb/dec/src/post_pro.cpp
odecs/amrnb/dec/src/post_pro.h
odecs/amrnb/dec/src/preemph.cpp
odecs/amrnb/dec/src/preemph.h
odecs/amrnb/dec/src/pstfilt.cpp
odecs/amrnb/dec/src/pstfilt.h
odecs/amrnb/dec/src/pvgsmamrdecoder.cpp
odecs/amrnb/dec/src/qgain475_tab.cpp
odecs/amrnb/dec/src/sp_dec.cpp
odecs/amrnb/dec/src/sp_dec.h
odecs/amrnb/dec/src/wmf_to_ets.cpp
odecs/amrnb/patent_disclaimer.txt
odecs/amrwb/AMRWBDecoder.cpp
odecs/amrwb/Android.mk
odecs/amrwb/include/pvamrwbdecoder_api.h
odecs/amrwb/patent_disclaimer.txt
odecs/amrwb/src/agc2_amr_wb.cpp
odecs/amrwb/src/band_pass_6k_7k.cpp
odecs/amrwb/src/dec_acelp_2p_in_64.cpp
odecs/amrwb/src/dec_acelp_4p_in_64.cpp
odecs/amrwb/src/dec_alg_codebook.cpp
odecs/amrwb/src/dec_gain2_amr_wb.cpp
odecs/amrwb/src/deemphasis_32.cpp
odecs/amrwb/src/dtx.h
odecs/amrwb/src/dtx_decoder_amr_wb.cpp
odecs/amrwb/src/e_pv_amrwbdec.h
odecs/amrwb/src/get_amr_wb_bits.cpp
odecs/amrwb/src/get_amr_wb_bits.h
odecs/amrwb/src/highpass_400hz_at_12k8.cpp
odecs/amrwb/src/highpass_50hz_at_12k8.cpp
odecs/amrwb/src/homing_amr_wb_dec.cpp
odecs/amrwb/src/interpolate_isp.cpp
odecs/amrwb/src/isf_extrapolation.cpp
odecs/amrwb/src/isp_az.cpp
odecs/amrwb/src/isp_isf.cpp
odecs/amrwb/src/lagconceal.cpp
odecs/amrwb/src/low_pass_filt_7k.cpp
odecs/amrwb/src/median5.cpp
odecs/amrwb/src/mime_io.cpp
odecs/amrwb/src/mime_io.h
odecs/amrwb/src/noise_gen_amrwb.cpp
odecs/amrwb/src/normalize_amr_wb.cpp
odecs/amrwb/src/normalize_amr_wb.h
odecs/amrwb/src/oversamp_12k8_to_16k.cpp
odecs/amrwb/src/phase_dispersion.cpp
odecs/amrwb/src/pit_shrp.cpp
odecs/amrwb/src/pred_lt4.cpp
odecs/amrwb/src/preemph_amrwb_dec.cpp
odecs/amrwb/src/pv_amr_wb_type_defs.h
odecs/amrwb/src/pvamrwb_math_op.cpp
odecs/amrwb/src/pvamrwb_math_op.h
odecs/amrwb/src/pvamrwbdecoder.cpp
odecs/amrwb/src/pvamrwbdecoder.h
odecs/amrwb/src/pvamrwbdecoder_acelp.h
odecs/amrwb/src/pvamrwbdecoder_basic_op.h
odecs/amrwb/src/pvamrwbdecoder_basic_op_armv5.h
odecs/amrwb/src/pvamrwbdecoder_basic_op_cequivalent.h
odecs/amrwb/src/pvamrwbdecoder_basic_op_gcc_armv5.h
odecs/amrwb/src/pvamrwbdecoder_cnst.h
odecs/amrwb/src/pvamrwbdecoder_mem_funcs.h
odecs/amrwb/src/q_gain2_tab.cpp
odecs/amrwb/src/q_pulse.h
odecs/amrwb/src/qisf_ns.cpp
odecs/amrwb/src/qisf_ns.h
odecs/amrwb/src/qisf_ns_tab.cpp
odecs/amrwb/src/qpisf_2s.cpp
odecs/amrwb/src/qpisf_2s.h
odecs/amrwb/src/qpisf_2s_tab.cpp
odecs/amrwb/src/scale_signal.cpp
odecs/amrwb/src/synthesis_amr_wb.cpp
odecs/amrwb/src/synthesis_amr_wb.h
odecs/amrwb/src/voice_factor.cpp
odecs/amrwb/src/wb_syn_filt.cpp
odecs/amrwb/src/weight_amrwb_lpc.cpp
nclude/AMRNBDecoder.h
nclude/AMRWBDecoder.h
c54176addef15699a518b69cd6bbd40ffc95e72e 08-Dec-2009 Andreas Huber <andih@google.com> Make sure to use the hand-tweaked-assembly version of the relevant mp3 code if building for ARM.
odecs/mp3dec/Android.mk
35dd25795bb83d41c1022b1aefe890ffc00e9a35 08-Dec-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change Ib16e5543 into eclair-mr2

* changes:
Fix the mp3 audio extractor that would occasionally return an invalid frame directly after a seek.
edf4e6f02b54481ecd74bbdb51e3f5e3db0f53ff 08-Dec-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change I8f658214 into eclair-mr2

* changes:
Minor tweaks to the mp3 and aac software decoders, propagate duration to output format.
d912f4646ece79832f9d852b39eb6b0d836ccfc4 08-Dec-2009 Andreas Huber <andih@google.com> Note to self: Don't reverse the arguments to fseek(o)...
ileSource.cpp
ebd0d94d2619280f9871ef2d0965d95fb880404c 08-Dec-2009 Andreas Huber <andih@google.com> Minor tweaks to the mp3 and aac software decoders, propagate duration to output format.
odecs/aacdec/AACDecoder.cpp
odecs/mp3dec/MP3Decoder.cpp
nclude/AACDecoder.h
541962997b4076da11546619f082467ffd9bcd1f 08-Dec-2009 Andreas Huber <andih@google.com> Fix the mp3 audio extractor that would occasionally return an invalid frame directly after a seek.
P3Extractor.cpp
d9618f23226f46c752e56f712bc4b505117d8b4b 07-Dec-2009 Andreas Huber <andih@google.com> Initial checkin of stagefright MP3 audio decoder based on PV source code.
ndroid.mk
MXCodec.cpp
odecs/mp3dec/Android.mk
odecs/mp3dec/MP3Decoder.cpp
odecs/mp3dec/include/mp3_decoder_selection.h
odecs/mp3dec/include/pvmp3_audio_type_defs.h
odecs/mp3dec/include/pvmp3decoder_api.h
odecs/mp3dec/patent_disclaimer.txt
odecs/mp3dec/src/asm/pvmp3_dct_16_gcc.s
odecs/mp3dec/src/asm/pvmp3_dct_9_arm.s
odecs/mp3dec/src/asm/pvmp3_dct_9_gcc.s
odecs/mp3dec/src/asm/pvmp3_mdct_18_arm.s
odecs/mp3dec/src/asm/pvmp3_mdct_18_gcc.s
odecs/mp3dec/src/asm/pvmp3_mdct_18_wm.asm
odecs/mp3dec/src/asm/pvmp3_polyphase_filter_window_arm.s
odecs/mp3dec/src/asm/pvmp3_polyphase_filter_window_gcc.s
odecs/mp3dec/src/asm/pvmp3_polyphase_filter_window_wm.asm
odecs/mp3dec/src/mp3_mem_funcs.h
odecs/mp3dec/src/pv_mp3_huffman.h
odecs/mp3dec/src/pv_mp3dec_fxd_op.h
odecs/mp3dec/src/pv_mp3dec_fxd_op_arm.h
odecs/mp3dec/src/pv_mp3dec_fxd_op_arm_gcc.h
odecs/mp3dec/src/pv_mp3dec_fxd_op_c_equivalent.h
odecs/mp3dec/src/pv_mp3dec_fxd_op_msc_evc.h
odecs/mp3dec/src/pvmp3_alias_reduction.cpp
odecs/mp3dec/src/pvmp3_alias_reduction.h
odecs/mp3dec/src/pvmp3_crc.cpp
odecs/mp3dec/src/pvmp3_crc.h
odecs/mp3dec/src/pvmp3_dct_16.cpp
odecs/mp3dec/src/pvmp3_dct_16.h
odecs/mp3dec/src/pvmp3_dct_6.cpp
odecs/mp3dec/src/pvmp3_dct_9.cpp
odecs/mp3dec/src/pvmp3_dec_defs.h
odecs/mp3dec/src/pvmp3_decode_header.cpp
odecs/mp3dec/src/pvmp3_decode_header.h
odecs/mp3dec/src/pvmp3_decode_huff_cw.cpp
odecs/mp3dec/src/pvmp3_decode_huff_cw.h
odecs/mp3dec/src/pvmp3_dequantize_sample.cpp
odecs/mp3dec/src/pvmp3_dequantize_sample.h
odecs/mp3dec/src/pvmp3_equalizer.cpp
odecs/mp3dec/src/pvmp3_equalizer.h
odecs/mp3dec/src/pvmp3_framedecoder.cpp
odecs/mp3dec/src/pvmp3_framedecoder.h
odecs/mp3dec/src/pvmp3_get_main_data_size.cpp
odecs/mp3dec/src/pvmp3_get_main_data_size.h
odecs/mp3dec/src/pvmp3_get_scale_factors.cpp
odecs/mp3dec/src/pvmp3_get_scale_factors.h
odecs/mp3dec/src/pvmp3_get_side_info.cpp
odecs/mp3dec/src/pvmp3_get_side_info.h
odecs/mp3dec/src/pvmp3_getbits.cpp
odecs/mp3dec/src/pvmp3_getbits.h
odecs/mp3dec/src/pvmp3_huffman_decoding.cpp
odecs/mp3dec/src/pvmp3_huffman_parsing.cpp
odecs/mp3dec/src/pvmp3_imdct_synth.cpp
odecs/mp3dec/src/pvmp3_imdct_synth.h
odecs/mp3dec/src/pvmp3_mdct_18.cpp
odecs/mp3dec/src/pvmp3_mdct_18.h
odecs/mp3dec/src/pvmp3_mdct_6.cpp
odecs/mp3dec/src/pvmp3_mdct_6.h
odecs/mp3dec/src/pvmp3_mpeg2_get_scale_data.cpp
odecs/mp3dec/src/pvmp3_mpeg2_get_scale_data.h
odecs/mp3dec/src/pvmp3_mpeg2_get_scale_factors.cpp
odecs/mp3dec/src/pvmp3_mpeg2_get_scale_factors.h
odecs/mp3dec/src/pvmp3_mpeg2_stereo_proc.cpp
odecs/mp3dec/src/pvmp3_mpeg2_stereo_proc.h
odecs/mp3dec/src/pvmp3_normalize.cpp
odecs/mp3dec/src/pvmp3_normalize.h
odecs/mp3dec/src/pvmp3_poly_phase_synthesis.cpp
odecs/mp3dec/src/pvmp3_poly_phase_synthesis.h
odecs/mp3dec/src/pvmp3_polyphase_filter_window.cpp
odecs/mp3dec/src/pvmp3_polyphase_filter_window.h
odecs/mp3dec/src/pvmp3_reorder.cpp
odecs/mp3dec/src/pvmp3_reorder.h
odecs/mp3dec/src/pvmp3_seek_synch.cpp
odecs/mp3dec/src/pvmp3_seek_synch.h
odecs/mp3dec/src/pvmp3_stereo_proc.cpp
odecs/mp3dec/src/pvmp3_stereo_proc.h
odecs/mp3dec/src/pvmp3_tables.cpp
odecs/mp3dec/src/pvmp3_tables.h
odecs/mp3dec/src/s_huffcodetab.h
odecs/mp3dec/src/s_mp3bits.h
odecs/mp3dec/src/s_tmp3dec_chan.h
odecs/mp3dec/src/s_tmp3dec_file.h
nclude/MP3Decoder.h
mx/Android.mk
mx/OMXSoftwareCodecsPlugin.cpp
mx/mp3dec/Android.mk
mx/mp3dec/MP3Decoder.cpp
mx/mp3dec/MP3Decoder.h
92616b5655b7aef260480f60f2aabf98e821c8f3 07-Dec-2009 Andreas Huber <andih@google.com> Fixing the build, only instantiate the software aac decoder in full stagefright builds.
ndroid.mk
MXCodec.cpp
f44de515d3b6098a0b585865c1a0c7b20d3075a6 07-Dec-2009 Andreas Huber <andih@google.com> Initial check in of stagefright software AAC decoder based on PV source code.
ndroid.mk
MXCodec.cpp
odecs/Android.mk
odecs/aacdec/AACDecoder.cpp
odecs/aacdec/Android.mk
odecs/aacdec/aac_mem_funcs.h
odecs/aacdec/analysis_sub_band.cpp
odecs/aacdec/analysis_sub_band.h
odecs/aacdec/apply_ms_synt.cpp
odecs/aacdec/apply_ms_synt.h
odecs/aacdec/apply_tns.cpp
odecs/aacdec/apply_tns.h
odecs/aacdec/bit_reversal_swap.h
odecs/aacdec/buf_getbits.cpp
odecs/aacdec/buf_getbits.h
odecs/aacdec/buffer_normalization.h
odecs/aacdec/byte_align.cpp
odecs/aacdec/calc_auto_corr.cpp
odecs/aacdec/calc_auto_corr.h
odecs/aacdec/calc_gsfb_table.cpp
odecs/aacdec/calc_sbr_anafilterbank.cpp
odecs/aacdec/calc_sbr_anafilterbank.h
odecs/aacdec/calc_sbr_envelope.cpp
odecs/aacdec/calc_sbr_envelope.h
odecs/aacdec/calc_sbr_synfilterbank.cpp
odecs/aacdec/calc_sbr_synfilterbank.h
odecs/aacdec/chans.h
odecs/aacdec/check_crc.cpp
odecs/aacdec/check_crc.h
odecs/aacdec/dct16.cpp
odecs/aacdec/dct16.h
odecs/aacdec/dct64.cpp
odecs/aacdec/dct64.h
odecs/aacdec/decode_huff_cw_binary.cpp
odecs/aacdec/decode_noise_floorlevels.cpp
odecs/aacdec/decode_noise_floorlevels.h
odecs/aacdec/deinterleave.cpp
odecs/aacdec/digit_reversal_tables.cpp
odecs/aacdec/digit_reversal_tables.h
odecs/aacdec/dst16.cpp
odecs/aacdec/dst16.h
odecs/aacdec/dst32.cpp
odecs/aacdec/dst32.h
odecs/aacdec/dst8.cpp
odecs/aacdec/dst8.h
odecs/aacdec/e_adif_const.h
odecs/aacdec/e_blockswitching.h
odecs/aacdec/e_coupling_mode.h
odecs/aacdec/e_elementid.h
odecs/aacdec/e_huffmanconst.h
odecs/aacdec/e_infoinitconst.h
odecs/aacdec/e_invf_mode.h
odecs/aacdec/e_maskstatus.h
odecs/aacdec/e_mp4ff_const.h
odecs/aacdec/e_progconfigconst.h
odecs/aacdec/e_rawbitstreamconst.h
odecs/aacdec/e_sbr_element_id.h
odecs/aacdec/e_sbr_error.h
odecs/aacdec/e_sbr_header_status.h
odecs/aacdec/e_sbr_master_status.h
odecs/aacdec/e_sbr_sync_state.h
odecs/aacdec/e_sr_mode.h
odecs/aacdec/e_tmp4audioobjecttype.h
odecs/aacdec/e_tns_const.h
odecs/aacdec/e_window_sequence.h
odecs/aacdec/e_window_shape.h
odecs/aacdec/esc_iquant_scaling.cpp
odecs/aacdec/esc_iquant_scaling.h
odecs/aacdec/extractframeinfo.cpp
odecs/aacdec/extractframeinfo.h
odecs/aacdec/fft_rx4.h
odecs/aacdec/fft_rx4_long.cpp
odecs/aacdec/fft_rx4_short.cpp
odecs/aacdec/fft_rx4_tables_fxp.cpp
odecs/aacdec/find_adts_syncword.cpp
odecs/aacdec/find_adts_syncword.h
odecs/aacdec/fwd_long_complex_rot.cpp
odecs/aacdec/fwd_long_complex_rot.h
odecs/aacdec/fwd_short_complex_rot.cpp
odecs/aacdec/fwd_short_complex_rot.h
odecs/aacdec/fxp_mul32.h
odecs/aacdec/fxp_mul32_arm_gcc.h
odecs/aacdec/fxp_mul32_arm_v4.h
odecs/aacdec/fxp_mul32_arm_v4_gcc.h
odecs/aacdec/fxp_mul32_arm_v5.h
odecs/aacdec/fxp_mul32_c_equivalent.h
odecs/aacdec/fxp_mul32_c_msc_evc.h
odecs/aacdec/fxp_mul32_c_msc_evc_armv5.h
odecs/aacdec/fxp_mul32_pentium.h
odecs/aacdec/gen_rand_vector.cpp
odecs/aacdec/gen_rand_vector.h
odecs/aacdec/get_adif_header.cpp
odecs/aacdec/get_adif_header.h
odecs/aacdec/get_adts_header.cpp
odecs/aacdec/get_adts_header.h
odecs/aacdec/get_audio_specific_config.cpp
odecs/aacdec/get_audio_specific_config.h
odecs/aacdec/get_dse.cpp
odecs/aacdec/get_dse.h
odecs/aacdec/get_ele_list.cpp
odecs/aacdec/get_ele_list.h
odecs/aacdec/get_ga_specific_config.cpp
odecs/aacdec/get_ga_specific_config.h
odecs/aacdec/get_ics_info.cpp
odecs/aacdec/get_ics_info.h
odecs/aacdec/get_prog_config.cpp
odecs/aacdec/get_prog_config.h
odecs/aacdec/get_pulse_data.cpp
odecs/aacdec/get_pulse_data.h
odecs/aacdec/get_sbr_bitstream.cpp
odecs/aacdec/get_sbr_bitstream.h
odecs/aacdec/get_sbr_startfreq.cpp
odecs/aacdec/get_sbr_startfreq.h
odecs/aacdec/get_sbr_stopfreq.cpp
odecs/aacdec/get_sbr_stopfreq.h
odecs/aacdec/get_sign_bits.h
odecs/aacdec/get_tns.cpp
odecs/aacdec/get_tns.h
odecs/aacdec/getbits.h
odecs/aacdec/getfill.cpp
odecs/aacdec/getfill.h
odecs/aacdec/getgroup.cpp
odecs/aacdec/getics.cpp
odecs/aacdec/getmask.cpp
odecs/aacdec/hcbtables.h
odecs/aacdec/hcbtables_binary.cpp
odecs/aacdec/huffcb.cpp
odecs/aacdec/huffdecode.cpp
odecs/aacdec/hufffac.cpp
odecs/aacdec/huffman.h
odecs/aacdec/huffspec_fxp.cpp
odecs/aacdec/ibstream.h
odecs/aacdec/idct16.cpp
odecs/aacdec/idct16.h
odecs/aacdec/idct32.cpp
odecs/aacdec/idct32.h
odecs/aacdec/idct8.cpp
odecs/aacdec/idct8.h
odecs/aacdec/imdct_fxp.cpp
odecs/aacdec/imdct_fxp.h
odecs/aacdec/infoinit.cpp
odecs/aacdec/init_sbr_dec.cpp
odecs/aacdec/init_sbr_dec.h
odecs/aacdec/intensity_right.cpp
odecs/aacdec/intensity_right.h
odecs/aacdec/inv_long_complex_rot.cpp
odecs/aacdec/inv_long_complex_rot.h
odecs/aacdec/inv_short_complex_rot.cpp
odecs/aacdec/inv_short_complex_rot.h
odecs/aacdec/iquant_table.cpp
odecs/aacdec/iquant_table.h
odecs/aacdec/long_term_prediction.cpp
odecs/aacdec/long_term_prediction.h
odecs/aacdec/long_term_synthesis.cpp
odecs/aacdec/long_term_synthesis.h
odecs/aacdec/lt_decode.cpp
odecs/aacdec/lt_decode.h
odecs/aacdec/lt_prediction.h
odecs/aacdec/ltp_common_internal.h
odecs/aacdec/mdct_fxp.cpp
odecs/aacdec/mdct_fxp.h
odecs/aacdec/mdct_tables_fxp.cpp
odecs/aacdec/mdst.cpp
odecs/aacdec/mdst.h
odecs/aacdec/mix_radix_fft.cpp
odecs/aacdec/mix_radix_fft.h
odecs/aacdec/ms_map_mask.h
odecs/aacdec/ms_synt.cpp
odecs/aacdec/ms_synt.h
odecs/aacdec/pns_corr.cpp
odecs/aacdec/pns_corr.h
odecs/aacdec/pns_intensity_right.cpp
odecs/aacdec/pns_intensity_right.h
odecs/aacdec/pns_left.cpp
odecs/aacdec/pns_left.h
odecs/aacdec/ps_all_pass_filter_coeff.cpp
odecs/aacdec/ps_all_pass_filter_coeff.h
odecs/aacdec/ps_all_pass_fract_delay_filter.cpp
odecs/aacdec/ps_all_pass_fract_delay_filter.h
odecs/aacdec/ps_allocate_decoder.cpp
odecs/aacdec/ps_allocate_decoder.h
odecs/aacdec/ps_applied.cpp
odecs/aacdec/ps_applied.h
odecs/aacdec/ps_bstr_decoding.cpp
odecs/aacdec/ps_bstr_decoding.h
odecs/aacdec/ps_channel_filtering.cpp
odecs/aacdec/ps_channel_filtering.h
odecs/aacdec/ps_constants.h
odecs/aacdec/ps_decode_bs_utils.cpp
odecs/aacdec/ps_decode_bs_utils.h
odecs/aacdec/ps_decorrelate.cpp
odecs/aacdec/ps_decorrelate.h
odecs/aacdec/ps_fft_rx8.cpp
odecs/aacdec/ps_fft_rx8.h
odecs/aacdec/ps_hybrid_analysis.cpp
odecs/aacdec/ps_hybrid_analysis.h
odecs/aacdec/ps_hybrid_filter_bank_allocation.cpp
odecs/aacdec/ps_hybrid_filter_bank_allocation.h
odecs/aacdec/ps_hybrid_synthesis.cpp
odecs/aacdec/ps_hybrid_synthesis.h
odecs/aacdec/ps_init_stereo_mixing.cpp
odecs/aacdec/ps_init_stereo_mixing.h
odecs/aacdec/ps_pwr_transient_detection.cpp
odecs/aacdec/ps_pwr_transient_detection.h
odecs/aacdec/ps_read_data.cpp
odecs/aacdec/ps_read_data.h
odecs/aacdec/ps_stereo_processing.cpp
odecs/aacdec/ps_stereo_processing.h
odecs/aacdec/pulse_nc.cpp
odecs/aacdec/pulse_nc.h
odecs/aacdec/pv_audio_type_defs.h
odecs/aacdec/pv_div.cpp
odecs/aacdec/pv_div.h
odecs/aacdec/pv_log2.cpp
odecs/aacdec/pv_log2.h
odecs/aacdec/pv_normalize.cpp
odecs/aacdec/pv_normalize.h
odecs/aacdec/pv_pow2.cpp
odecs/aacdec/pv_pow2.h
odecs/aacdec/pv_sine.cpp
odecs/aacdec/pv_sine.h
odecs/aacdec/pv_sqrt.cpp
odecs/aacdec/pv_sqrt.h
odecs/aacdec/pvmp4audiodecoder_api.h
odecs/aacdec/pvmp4audiodecoderconfig.cpp
odecs/aacdec/pvmp4audiodecoderframe.cpp
odecs/aacdec/pvmp4audiodecodergetmemrequirements.cpp
odecs/aacdec/pvmp4audiodecoderinitlibrary.cpp
odecs/aacdec/pvmp4audiodecoderresetbuffer.cpp
odecs/aacdec/pvmp4setaudioconfig.cpp
odecs/aacdec/q_normalize.cpp
odecs/aacdec/q_normalize.h
odecs/aacdec/qmf_filterbank_coeff.cpp
odecs/aacdec/qmf_filterbank_coeff.h
odecs/aacdec/s_adif_header.h
odecs/aacdec/s_bit_buffer.h
odecs/aacdec/s_bits.h
odecs/aacdec/s_ch_info.h
odecs/aacdec/s_crc_buffer.h
odecs/aacdec/s_elelist.h
odecs/aacdec/s_frameinfo.h
odecs/aacdec/s_hcb.h
odecs/aacdec/s_huffman.h
odecs/aacdec/s_hybrid.h
odecs/aacdec/s_lt_pred_status.h
odecs/aacdec/s_mc_info.h
odecs/aacdec/s_mixdown.h
odecs/aacdec/s_patch.h
odecs/aacdec/s_progconfig.h
odecs/aacdec/s_ps_dec.h
odecs/aacdec/s_pulseinfo.h
odecs/aacdec/s_sbr_channel.h
odecs/aacdec/s_sbr_dec.h
odecs/aacdec/s_sbr_element_stream.h
odecs/aacdec/s_sbr_frame_data.h
odecs/aacdec/s_sbr_header_data.h
odecs/aacdec/s_sbrbitstream.h
odecs/aacdec/s_sectinfo.h
odecs/aacdec/s_sr_info.h
odecs/aacdec/s_tdec_int_chan.h
odecs/aacdec/s_tdec_int_file.h
odecs/aacdec/s_tns_frame_info.h
odecs/aacdec/s_tnsfilt.h
odecs/aacdec/s_wnd_shape.h
odecs/aacdec/sbr_aliasing_reduction.cpp
odecs/aacdec/sbr_aliasing_reduction.h
odecs/aacdec/sbr_applied.cpp
odecs/aacdec/sbr_applied.h
odecs/aacdec/sbr_code_book_envlevel.cpp
odecs/aacdec/sbr_code_book_envlevel.h
odecs/aacdec/sbr_constants.h
odecs/aacdec/sbr_crc_check.cpp
odecs/aacdec/sbr_crc_check.h
odecs/aacdec/sbr_create_limiter_bands.cpp
odecs/aacdec/sbr_create_limiter_bands.h
odecs/aacdec/sbr_dec.cpp
odecs/aacdec/sbr_dec.h
odecs/aacdec/sbr_decode_envelope.cpp
odecs/aacdec/sbr_decode_envelope.h
odecs/aacdec/sbr_decode_huff_cw.cpp
odecs/aacdec/sbr_decode_huff_cw.h
odecs/aacdec/sbr_downsample_lo_res.cpp
odecs/aacdec/sbr_downsample_lo_res.h
odecs/aacdec/sbr_envelope_calc_tbl.cpp
odecs/aacdec/sbr_envelope_calc_tbl.h
odecs/aacdec/sbr_envelope_unmapping.cpp
odecs/aacdec/sbr_envelope_unmapping.h
odecs/aacdec/sbr_extract_extended_data.cpp
odecs/aacdec/sbr_extract_extended_data.h
odecs/aacdec/sbr_find_start_andstop_band.cpp
odecs/aacdec/sbr_find_start_andstop_band.h
odecs/aacdec/sbr_generate_high_freq.cpp
odecs/aacdec/sbr_generate_high_freq.h
odecs/aacdec/sbr_get_additional_data.cpp
odecs/aacdec/sbr_get_additional_data.h
odecs/aacdec/sbr_get_cpe.cpp
odecs/aacdec/sbr_get_cpe.h
odecs/aacdec/sbr_get_dir_control_data.cpp
odecs/aacdec/sbr_get_dir_control_data.h
odecs/aacdec/sbr_get_envelope.cpp
odecs/aacdec/sbr_get_envelope.h
odecs/aacdec/sbr_get_header_data.cpp
odecs/aacdec/sbr_get_header_data.h
odecs/aacdec/sbr_get_noise_floor_data.cpp
odecs/aacdec/sbr_get_noise_floor_data.h
odecs/aacdec/sbr_get_sce.cpp
odecs/aacdec/sbr_get_sce.h
odecs/aacdec/sbr_inv_filt_levelemphasis.cpp
odecs/aacdec/sbr_inv_filt_levelemphasis.h
odecs/aacdec/sbr_open.cpp
odecs/aacdec/sbr_open.h
odecs/aacdec/sbr_read_data.cpp
odecs/aacdec/sbr_read_data.h
odecs/aacdec/sbr_requantize_envelope_data.cpp
odecs/aacdec/sbr_requantize_envelope_data.h
odecs/aacdec/sbr_reset_dec.cpp
odecs/aacdec/sbr_reset_dec.h
odecs/aacdec/sbr_update_freq_scale.cpp
odecs/aacdec/sbr_update_freq_scale.h
odecs/aacdec/set_mc_info.cpp
odecs/aacdec/set_mc_info.h
odecs/aacdec/sfb.cpp
odecs/aacdec/sfb.h
odecs/aacdec/shellsort.cpp
odecs/aacdec/shellsort.h
odecs/aacdec/stereo_2_mono.h
odecs/aacdec/synthesis_sub_band.cpp
odecs/aacdec/synthesis_sub_band.h
odecs/aacdec/tns_ar_filter.cpp
odecs/aacdec/tns_ar_filter.h
odecs/aacdec/tns_decode_coef.cpp
odecs/aacdec/tns_decode_coef.h
odecs/aacdec/tns_inv_filter.cpp
odecs/aacdec/tns_inv_filter.h
odecs/aacdec/trans4m_freq_2_time_fxp.cpp
odecs/aacdec/trans4m_time_2_freq_fxp.cpp
odecs/aacdec/unpack_idx.cpp
odecs/aacdec/unpack_idx.h
odecs/aacdec/window_block_fxp.h
odecs/aacdec/window_tables_fxp.cpp
odecs/aacdec/write_output.h
nclude/AACDecoder.h
bf697e37550d9e8376089b0b5e498613bede798c 07-Dec-2009 Andreas Huber <andih@google.com> Change OMXCodec::Create to return an sp<MediaSource> instead of an sp<OMXCodec>, this is more general and does not sacrifice any functionality as the remaining OMXCodec APIs are not meant to be public anyway.
MXCodec.cpp
f0fb96c352f30b812a4903a1d783a715e1e817bd 04-Dec-2009 Andreas Huber <andih@google.com> Enable proper cleanup of OMX nodes managed through stagefright.
nclude/OMXNodeInstance.h
mx/OMX.cpp
mx/OMXMaster.cpp
mx/OMXMaster.h
mx/OMXNodeInstance.cpp
mx/OMXPVCodecsPlugin.cpp
mx/OMXPVCodecsPlugin.h
mx/OMXSoftwareCodecsPlugin.cpp
mx/OMXSoftwareCodecsPlugin.h
15478f3287c62a780d19b9059023331721bd4f4f 04-Dec-2009 Andreas Huber <andih@google.com> Two more uses of strlcpy that break the sim build. Now fixed.
mx/mp3dec/MP3Decoder.cpp
0ef47568ed93872feab423330b10a62a432decd5 04-Dec-2009 Andreas Huber <andih@google.com> Apparently strlcpy is not part of a standard linux distribution... Unbreaking the sim build.
mx/OMXSoftwareCodecsPlugin.cpp
e3ec3cec3a2e27033249ff82964d2cbd441d9873 03-Dec-2009 Andreas Huber <andih@google.com> Squashed commit of the following:

commit 543e192bf2ae13f573dc4c4e53b239ed4ea00e81
Author: Andreas Huber <andih@google.com>
Date: Thu Dec 3 11:33:57 2009 -0800

stagefright now acts as the OMX Master, vendors supply their own plugins through libstagefrighthw. In OpenCore-enabled builds we now sit on top of PVMaster...

commit 3cbfdbd9cecadbb77b63125c62883bf1065884fe
Author: Andreas Huber <andih@google.com>
Date: Wed Dec 2 12:39:07 2009 -0800

More OMX infrastructure, stagefright is now taking over the OMX Master, multiplexing all contributing OMX implementations under a common interface.
nclude/OMX.h
mx/Android.mk
mx/OMX.cpp
mx/OMXComponentBase.cpp
mx/OMXComponentBase.h
mx/OMXMaster.cpp
mx/OMXMaster.h
mx/OMXNodeInstance.cpp
mx/OMXPVCodecsPlugin.cpp
mx/OMXPVCodecsPlugin.h
mx/OMXSoftwareCodecsPlugin.cpp
mx/OMXSoftwareCodecsPlugin.h
mx/mp3dec/Android.mk
mx/mp3dec/MP3Decoder.cpp
mx/mp3dec/MP3Decoder.h
c297fccffc4ab1cb3b9f5c6a5b0802be057f3e0f 02-Dec-2009 Andreas Huber <andih@google.com> A small sample tool to encode pcm audio data to amr, decode it again and play it. Some changes to OMXCodec to properly configure the AMR decoder(s).
MXCodec.cpp
e5d6df402da9b6c5577470abb81a5e6801bd7752 23-Nov-2009 Andreas Huber <andih@google.com> Some playable/decodable streams have been found in the wild that violate this assertion, let's be lenient for now.
MXCodec.cpp
f83d9a75c4616b2da4db7b1559e918fbf8709005 23-Nov-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change I24b0a95d into eclair-mr2

* changes:
The original delay after which we dropped a frame was too aggressive. 40ms lateness seems more appropriate (about 25fps).
738c4315859395bfeeaae3d4c9d6fb9f414778f1 23-Nov-2009 Andreas Huber <andih@google.com> Make sure the decoder's input buffers are large enough to hold the largest input data. Verify that the setting actually sticks.
PEG4Extractor.cpp
MXCodec.cpp
650773d00356129ffd661cdaef3fb3095c343707 23-Nov-2009 Andreas Huber <andih@google.com> The original delay after which we dropped a frame was too aggressive. 40ms lateness seems more appropriate (about 25fps).
wesomePlayer.cpp
bfa6b2d7a1be1832ac40ed90aece1834f720b5c6 20-Nov-2009 Andreas Huber <andih@google.com> Squashed commit of the following:

commit 1efc38dc3c33fef57b759002db3965ed07a28cb0
Author: Andreas Huber <andih@google.com>
Date: Thu Nov 19 14:36:14 2009 -0800

Sending the SEEK-COMPLETE notification temporarily broke seeking backwards in time behaviour. This is now fixed.

Also, get rid of the semi-random delay after posting buffers to surface flinger in favour of delaying the buffer release until the next frame is displayed.

commit 51973062eb5ee63fd64b845d72bac517cc3369cf
Author: Andreas Huber <andih@google.com>
Date: Wed Nov 18 14:01:43 2009 -0800

Fix one more unit test, properly send seek-complete notification only after seek actually completed.

commit cb22250b34b1fcfe1bf459723a761fd003950229
Author: Andreas Huber <andih@google.com>
Date: Wed Nov 18 12:31:36 2009 -0800

Fix seek-while-paused in AwesomePlayer, revert to using FileSource if MmapSource fails.

commit 25eb9241138ddf7bb27ce90657116c5f8a94d880
Author: Andreas Huber <andih@google.com>
Date: Wed Nov 18 12:30:40 2009 -0800

Support seeking and duration in AMRExtractor, assuming all frames are the same size.

commit 44192f2ebb7ea3bbd3ba5910025692dbc6a08faa
Author: Andreas Huber <andih@google.com>
Date: Wed Nov 18 10:21:44 2009 -0800

MediaPlayerImpl is dead, long live AwesomePlayer.

commit c5b52d3c0674f5dc94db506afbce52401cceddac
Author: Andreas Huber <andih@google.com>
Date: Wed Nov 18 09:42:23 2009 -0800

New implementation of the stagefright mediaplayer.
MRExtractor.cpp
ndroid.mk
udioPlayer.cpp
wesomePlayer.cpp
ediaExtractor.cpp
ediaPlayerImpl.cpp
mapSource.cpp
MXCodec.cpp
imedEventQueue.cpp
nclude/AMRExtractor.h
nclude/AwesomePlayer.h
f78933fdfc5bc71881b3011f921b643d90387664 17-Nov-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change Iea6a38c6 into eclair-mr2

* changes:
Squashed commit of the following:
c77a293c4971d9f6c4e3b0c0573fb13276bedf18 17-Nov-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change Ib64ea2dd into eclair-mr2

* changes:
Improvements to TimedEventQueue.
be11f392a8b8ff1006cf536350cc8a85f8788ff4 17-Nov-2009 Andreas Huber <andih@google.com> Improvements to TimedEventQueue.

Events are now cancelled given their "unique" event_id instead of the event pointer
itself (which may be reallocated in place if we're unlucky). Also the ability to
cancel multiple events matching a predicate has been added.
imedEventQueue.cpp
nclude/TimedEventQueue.h
03475f5af25e4aa32d46d41dd2ec756853d8dd9d 17-Nov-2009 Andreas Huber <andih@google.com> Update FileSource to also accept a file descriptor and a range.
ileSource.cpp
30ab66297501757d745b9ae10da61adcd891f497 17-Nov-2009 Andreas Huber <andih@google.com> Squashed commit of the following:

commit 333057b355f8c260c549553b9a0634755c838b6a
Author: Andreas Huber <andih@google.com>
Date: Fri Nov 13 15:35:48 2009 -0800

Some more tweaks to AVC encoding on sholes.

commit 9981d0ee52ec5b8b0182aae733d1571e3ebb8390
Author: Andreas Huber <andih@google.com>
Date: Thu Nov 12 16:36:57 2009 -0800

Support for avc encoding, including sholes specific tweaks to pick the right colorspace for the camera to not require transcoding.

commit 5ba0ebbbd4efca51f3ae1f60e2ca31e7d2cf136d
Author: Andreas Huber <andih@google.com>
Date: Wed Nov 11 09:50:03 2009 -0800

Enable actual (camera) video-only recording using h.263 or mpeg4 encoding.

commit 3fd59c3526a37fe7c696f4a978925d1831c09313
Author: Andreas Huber <andih@google.com>
Date: Tue Nov 10 14:57:48 2009 -0800

Allow switching between the PV recorder implementation and one supported by stagefright.

This is controlled through the property "media.stagefright.enable-record".
ameraSource.cpp
PEG4Writer.cpp
MXCodec.cpp
53f45f0367d9563278f427db106736dcd1a433d1 12-Nov-2009 Andreas Huber <andih@google.com> resolved conflicts for merge of c66d53f9 to eclair-mr2
1dfc99f22fb9d8c798065938c24eeb4eb9691747 12-Nov-2009 Andreas Huber <andih@google.com> Delegate the platform dependent hardware renderer implementation to a shared library provided by the vendor.
mx/Android.mk
mx/OMX.cpp
mx/QComHardwareRenderer.cpp
mx/SoftwareRenderer.cpp
mx/TIHardwareRenderer.cpp
ca4bea0965f870c7d1d92357d860f50c6c18d51d 10-Nov-2009 Andreas Huber <andih@google.com> Make MediaPlayerImpl less verbose by default.
ediaPlayerImpl.cpp
5bb42b780a934386f26c1c1f0a8249494ec65f7c 06-Nov-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change I9a50fdf4 into eclair-mr2

* changes:
Handle OMX_StateInvalid in emergency shutdown properly (by ignoring it and hoping for the best) instead of asserting.
84ec55b736ae2278d6abdc1c7a0312de46ef5f3d 06-Nov-2009 Andreas Huber <andih@google.com> am fde273ba: Merge change Ic997acac into eclair

Merge commit 'fde273baf6592a5fde15ee4dd4d798d90368e440' into eclair-mr2

* commit 'fde273baf6592a5fde15ee4dd4d798d90368e440':
Make AudioPlayer a little less verbose, defer starting audio playback until after the first video frame has been decoded (if there's video at all).
fa70cad40b01627ac1c22e04cdd548ece9c2654f 06-Nov-2009 Andreas Huber <andih@google.com> Handle OMX_StateInvalid in emergency shutdown properly (by ignoring it and hoping for the best) instead of asserting.
mx/OMXNodeInstance.cpp
dae04ca7c4b5590786ffc336721ee8714cc79fef 06-Nov-2009 Andreas Huber <andih@google.com> Make AudioPlayer a little less verbose, defer starting audio playback until after the first video frame has been decoded (if there's video at all).
udioPlayer.cpp
ediaPlayerImpl.cpp
022ad466c95001eaf043b1f0aff89cde92e3387f 05-Nov-2009 Andreas Huber <andih@google.com> am 818a9cf8: Merge change Ia4eedace into eclair

Merge commit '818a9cf827f282addbf7c8ee23534e08a3aaa358' into eclair-mr2

* commit '818a9cf827f282addbf7c8ee23534e08a3aaa358':
Now that UseBuffer on this component is fixed, let's use it.
5b65c7043dada0c89d3a941742666ac40ea35746 05-Nov-2009 Andreas Huber <andih@google.com> DO NOT MERGE: Squashed commit of the following:

commit 08259dd3dc9026887f9bbfedaf45866eb56ea9bc
Author: Andreas Huber <andih@google.com>
Date: Thu Nov 5 12:02:31 2009 -0800

DO NOT MERGE: Use PV for metadata extraction even if stagefright is used for playback.

commit 991832fe4dc012e51d3d9ed8d647c7f09991858f
Author: Andreas Huber <andih@google.com>
Date: Thu Nov 5 11:24:11 2009 -0800

DO NOT MERGE: Do not assert if we encounter OMX_StateInvalid. All bets are off though.

commit cec45cf302d9218fe79956cbe8a462d7ca3a10bb
Author: Andreas Huber <andih@google.com>
Date: Mon Oct 26 16:11:54 2009 -0700

DO NOT MERGE: When freeing an OMX node, attempt to transition it from its current state all the way to "Loaded" in order to properly free any allocated buffers.

commit 34a1e885ef9113d68acbc26d36fcc47fdebbed84
Author: Andreas Huber <andih@google.com>
Date: Thu Nov 5 11:10:49 2009 -0800

DO NOT MERGE: Fix heap corruptin in OMXNodeInstance.

commit 5a47f7439a1298b330541a7e4e647a8b44487388
Author: Andreas Huber <andih@google.com>
Date: Thu Nov 5 11:08:19 2009 -0800

DO NOT MERGE: Fix seek-on-initial-read behaviour of OMXCodec.

commit 45bed64722501b9f411a2940aff5aff4cc4d2e98
Author: Andreas Huber <andih@google.com>
Date: Thu Nov 5 11:02:23 2009 -0800

DO NOT MERGE: Renaming string.h to stagefright_string.h to avoid conflicts.

commit 6738e306a50196f31a73d4fc7b7c45faff639903
Author: Andreas Huber <andih@google.com>
Date: Thu Oct 15 13:46:54 2009 -0700

DO NOT MERGE: Reimplement the OMX backend for stagefright.

Besides a major cleanup and refactoring, OMX is now a singleton living in the media server, it listens for death notifications of node observers/clients that allocated OMX nodes and performs/attempts cleanup.

Changed APIs to conform to the rest of the system.
ndroid.mk
TTPDataSource.cpp
MXClient.cpp
MXCodec.cpp
houtcastSource.cpp
nclude/OMX.h
nclude/OMXNodeInstance.h
mx/Android.mk
mx/OMX.cpp
mx/OMX.h
mx/OMXNodeInstance.cpp
tagefright_string.cpp
tring.cpp
d899d73308f987c932a4366977e67a3d8aa8bc8b 05-Nov-2009 Andreas Huber <andih@google.com> Now that UseBuffer on this component is fixed, let's use it.
MXCodec.cpp
2c814adaf6340ee3cf2b942f1dff0f2ea6904c81 04-Nov-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change I6bce6d87 into eclair-mr2

* changes:
Adds a WAVExtractor for 16-bit signed PCM audio wave files.
01b8bbb3a841729052860d8ca734e0e0e90bb40a 04-Nov-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change I313953dc into eclair-mr2

* changes:
Support raw audio sources in MediaPlayerImpl.
af2abc8634dcae706c0fae02b1381fe70e678f35 04-Nov-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change I5126e183 into eclair-mr2

* changes:
Fix MP3Extractor duration overflows...
0dba73763a04d39faf999dcc5ef12af3c99535a7 04-Nov-2009 Andreas Huber <andih@google.com> Adds a WAVExtractor for 16-bit signed PCM audio wave files.
ndroid.mk
ataSource.cpp
PEG4Extractor.cpp
ediaDefs.cpp
ediaExtractor.cpp
AVExtractor.cpp
nclude/WAVExtractor.h
1f9ad1d704a17533989a9274c55bd5bb9d3abcc0 04-Nov-2009 Andreas Huber <andih@google.com> Support raw audio sources in MediaPlayerImpl.
ediaPlayerImpl.cpp
c0bbcf32ac6ffa76409232d7156250e1092bfa24 04-Nov-2009 Andreas Huber <andih@google.com> Fix MP3Extractor duration overflows...
P3Extractor.cpp
202ff50113b293a80c8df60022e2c4ad8a829fbe 03-Nov-2009 Andreas Huber <andih@google.com> am 338ccf43: Merge change Id2906ad8 into eclair

Merge commit '338ccf43b6a4468aea6aa7d831be7d6c8d8d134d' into eclair-mr2

* commit '338ccf43b6a4468aea6aa7d831be7d6c8d8d134d':
Fix video flickering by propagating the NO_CACHING flag from the master to MemoryHeapPMem.
c6c6237a67661c7b2d8822b7360cdf01e64d2c7c 03-Nov-2009 Andreas Huber <andih@google.com> Fix video flickering by propagating the NO_CACHING flag from the master to MemoryHeapPMem.
mx/QComHardwareRenderer.cpp
888f72a4628eed3c136ff2e346a15d129da0d520 29-Oct-2009 Andreas Huber <andih@google.com> Revive support for video encoding in OMXCodec.
MXCodec.cpp
548403bfc52434b875d620a05cc88985e5cc879c 28-Oct-2009 Andreas Huber <andih@google.com> am 54620b1a: Merge change I6e50a8c6 into eclair

Merge commit '54620b1a77e51b3fa531dbd099bd69c39d7d0029' into eclair-mr2

* commit '54620b1a77e51b3fa531dbd099bd69c39d7d0029':
Revert "Now that the underlying bug is fixed we can continue using OMX_UseBuffer for this decoder's input buffers."
636df899721d7da23fc792f20df29937e628ab2f 28-Oct-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change I155e2ad0 into eclair-mr2

* changes:
Re-enable CameraSource.
be5c74f5da6a93b0d23f96e11848acfcc3b4d1d9 14-Oct-2009 Andreas Huber <andih@google.com> Re-enable CameraSource.
ndroid.mk
ameraSource.cpp
d6703ab22c85b43fdb2deb78a37e51465c902a5f 27-Oct-2009 Andreas Huber <andih@google.com> When freeing an OMX node, attempt to transition it from its current state all the way to "Loaded" in order to properly free any allocated buffers.
nclude/OMXNodeInstance.h
mx/OMX.cpp
mx/OMXNodeInstance.cpp
17d58a83356ba568861b3aa391c5df915d33c0f1 26-Oct-2009 Andreas Huber <andih@google.com> Revert "Now that the underlying bug is fixed we can continue using OMX_UseBuffer for this decoder's input buffers."

This reverts commit 7a03b074a554ba3fd08dbc20cfd4b2f37c5f3aaa.
MXCodec.cpp
34769bc913e9f6bb138e666d94a9d685bf3da217 23-Oct-2009 Andreas Huber <andih@google.com> New API to instantiate a MediaExtractor given a URI and optional MIME type.

Also DataSources now must provide a method initCheck()
and DataSource::reat_at has been renamed to readAt to conform to
standard API naming guidelines.
MRExtractor.cpp
achingDataSource.cpp
ataSource.cpp
ileSource.cpp
TTPDataSource.cpp
PEGSource.cpp
P3Extractor.cpp
PEG4Extractor.cpp
ediaExtractor.cpp
ediaPlayerImpl.cpp
mapSource.cpp
ampleTable.cpp
66326a5ee0869f1ee4d136a477e6effba428b3cb 23-Oct-2009 Andreas Huber <andih@google.com> Moving the individual extractor headers files to the private include directory.
MRExtractor.cpp
ataSource.cpp
P3Extractor.cpp
PEG4Extractor.cpp
ediaExtractor.cpp
nclude/AMRExtractor.h
nclude/MP3Extractor.h
nclude/MPEG4Extractor.h
47bed1a7755ed58fa5d4c0d35b20468deb83bd60 22-Oct-2009 Andreas Huber <andih@google.com> Make stagefright a little less verbose. Fix heap corruption for real.
ediaExtractor.cpp
mx/OMXNodeInstance.cpp
48ac1615d669b7ba3b212d174441b31755d02ef1 23-Oct-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change Ie13526ad into eclair-mr2

* changes:
Prefer software decoders over hardware for thumbnail extraction.
ba229b3faa98b3bb6567cf95040062be2d9c2b3f 22-Oct-2009 Andreas Huber <andih@google.com> Prefer software decoders over hardware for thumbnail extraction.

While our hardware decoders clearly outperform the software decoders in terms
of raw throughput, their startup latency makes them less suitable for thumbnail
extraction.
MXCodec.cpp
7b70cfc35c8555eda186fd0b792f013a4b082cff 23-Oct-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change Icb64cd2c into eclair-mr2

* changes:
Still don't know why the heap gets corrupted, but not deleting the OMXNodeInstance appears to prevent this from happening.
7e04dcf8d6784dd56f53aa90bf34431ab4f0710c 22-Oct-2009 Andreas Huber <andih@google.com> Extract video thumbnails from the largest sync sample among the first 20.

Also fixes OMXCodec seek behaviour on the very first call to OMXCodec::read()
MRExtractor.cpp
P3Extractor.cpp
PEG4Extractor.cpp
MXCodec.cpp
ampleTable.cpp
nclude/SampleTable.h
521bad496a8b80008abe573a6712a8051c9eb322 22-Oct-2009 Andreas Huber <andih@google.com> am b0e6a9a0: Merge change I7a03b074 into eclair

Merge commit 'b0e6a9a0e6e82327f52fd25f3a9e2463ff591905' into eclair-mr2

* commit 'b0e6a9a0e6e82327f52fd25f3a9e2463ff591905':
Now that the underlying bug is fixed we can continue using OMX_UseBuffer for this decoder's input buffers.
2d6d6e9a3d569eda4555c4eb68cec452be958bb1 22-Oct-2009 Andreas Huber <andih@google.com> Still don't know why the heap gets corrupted, but not deleting the OMXNodeInstance appears to prevent this from happening.
mx/OMXNodeInstance.cpp
4926a47afc079c8d9259f18a26accbfba2f976eb 22-Oct-2009 Andreas Huber <andih@google.com> Now that the underlying bug is fixed we can continue using OMX_UseBuffer for this decoder's input buffers.
MXCodec.cpp
c6323f9d72e0f08dd1e813550a56c8d2f0fd76a2 21-Oct-2009 Andreas Huber <andih@google.com> Some cleanup of OMXCodec code, make sure to ignore 0-length output buffers in the metadata retriever.
MXCodec.cpp
66d1e82ce5d5e189442285b6225977137b65c608 20-Oct-2009 Andreas Huber <andih@google.com> do not merge: The qcom video decoders always output yuv data after adjusting dimensions to be a multiple of 16.

Add a quirk mode to OMXCodec that makes it aware of this fact for proper display. Also integrate back a change from eclair-mr2 that delays releasing an output buffer briefly after posting it to surface flinger, as we don't know how long it'll take it to actually display the buffer's content.
MXCodec.cpp
mx/QComHardwareRenderer.cpp
12658b720b176b7d934444256d07ba3c595d9b44 19-Oct-2009 Andreas Huber <andih@google.com> Avoid signaling a format change to the client if its insubstantial.

For example, the original port settings change may just indicate a change
in the number of buffers to allocate, which won't be visible to the client
in any case.
MXCodec.cpp
a58568bc37ea3964ba116925fcc5fa52dfe6fa49 19-Oct-2009 Andreas Huber <andih@google.com> Fixing the build by renaming private "string.h" header file.
TTPDataSource.cpp
ediaPlayerImpl.cpp
houtcastSource.cpp
nclude/HTTPStream.h
nclude/stagefright_string.h
nclude/string.h
tring.cpp
318ad9c1d9d6515026dfc2c021359d27decaa7a1 15-Oct-2009 Andreas Huber <andih@google.com> Reimplement the OMX backend for stagefright.

Besides a major cleanup and refactoring, OMX is now a singleton living in the media server, it listens for death notifications of node observers/clients that allocated OMX nodes and performs/attempts cleanup.

Changed APIs to conform to the rest of the system.
MXClient.cpp
MXCodec.cpp
nclude/OMX.h
nclude/OMXNodeInstance.h
mx/Android.mk
mx/OMX.cpp
mx/OMX.h
mx/OMXNodeInstance.cpp
89e69da4d86348409994c9dafbbb2634ccd7c196 13-Oct-2009 Andreas Huber <andih@google.com> Separated private from public header files.
SDS.cpp
TTPDataSource.cpp
TTPStream.cpp
PEG4Extractor.cpp
ediaPlayerImpl.cpp
MXCodec.cpp
ampleTable.cpp
houtcastSource.cpp
imedEventQueue.cpp
nclude/ESDS.h
nclude/HTTPStream.h
nclude/QComHardwareRenderer.h
nclude/SampleTable.h
nclude/SoftwareRenderer.h
nclude/TIHardwareRenderer.h
nclude/TimedEventQueue.h
nclude/string.h
mx/OMX.cpp
mx/QComHardwareRenderer.cpp
mx/SoftwareRenderer.cpp
mx/TIHardwareRenderer.cpp
tring.cpp
549aa3741725ea2fd75c5fb717ff5a9316a5a55d 13-Oct-2009 Andreas Huber <andih@google.com> Fix various compiler warnings accumulated over time.
TTPDataSource.cpp
ediaBuffer.cpp
ediaPlayerImpl.cpp
ampleTable.cpp
7f281f87670c63775ea1ae8b24af31822d5ad416 09-Oct-2009 Andreas Huber <andih@google.com> OMXCodec now notifies the reader of changes in the output format by returning a special result/error code.
ediaPlayerImpl.cpp
MXCodec.cpp
0bf3921522461b1c7d321d0c667c1020ab3110bc 13-Oct-2009 Andreas Huber <andih@google.com> Proper chunk size computation for Layer II/III V2 and V2.5, skip optional ID3 tag.

related-to-bug: 1986192
P3Extractor.cpp
48c948b1137e7bbdb161b51908657ab72ac5e2da 08-Oct-2009 Andreas Huber <andih@google.com> Change to a int64_t usecs representation for timestamps and duration throughout stagefright.
MRExtractor.cpp
udioPlayer.cpp
ameraSource.cpp
P3Extractor.cpp
PEG4Extractor.cpp
PEG4Writer.cpp
ediaPlayerImpl.cpp
etaData.cpp
MXCodec.cpp
2a4a7d5af053a17586a262a1267ba993e31790f1 07-Oct-2009 Andreas Huber <andih@google.com> Split the ColorConverter off SoftwareRenderer, metadata support in stagefright.
mapSource.cpp
MXCodec.cpp
mx/Android.mk
mx/ColorConverter.cpp
mx/OMX.cpp
mx/SoftwareRenderer.cpp
36efa039efaae4526791336cb688032d22b34bec 08-Oct-2009 Andreas Huber <andih@google.com> Some decoders will return an error on OMX_EmptyThisBuffer to indicate that they don't support the media format, deal with this.
MXCodec.cpp
mx/OMX.cpp
mx/OMX.h
479ededc5b55e63ea9b425cbe465c93bb8b8b3dc 08-Oct-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change I729c3938 into eclair-mr2

* changes:
Insert a small delay after submitting to surface flinger and before returning the buffer to the decoder.
9749025189acc6c737be22007e90ed8bbbcdbc21 08-Oct-2009 Andreas Huber <andih@google.com> The vendor is about to check in a fix for this issue, the workaround is no longer needed
MXCodec.cpp
fcf6723f0974854a04bd0d9e676b5ed2a147ce09 08-Oct-2009 Andreas Huber <andih@google.com> Insert a small delay after submitting to surface flinger and before returning the buffer to the decoder.

Since we cannot tell how long it'll take until surface flinger
has displayed the data onscreen, we'll just have to guess...
We must not return the buffer to the decoder before it's been displayed.
mx/QComHardwareRenderer.cpp
ec430b158df17b2c766f7750a96c35d3902f5f49 07-Oct-2009 Andreas Huber <andih@google.com> Workaround for avc decoder misreporting output buffer size requirements if the content is not a multiple-16 width/height.
MXCodec.cpp
5228dd1b7468bfc86a807a299f515d33048f96ac 17-Sep-2009 Andreas Huber <andih@google.com> Another stagefright test-case and ignore end-of-stream notifications while we're flushing.
MXCodec.cpp
56a9496a8f4adf3bf27448e1f41757af513c2a40 16-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 25158 into eclair

* changes:
Another software color conversion implementation, this time OMX_QCOM_COLOR_FormatYVU420SemiPlanar => rgb565.
4265a834394bfe14a008a2ac58fbbe388566ad07 16-Sep-2009 Andreas Huber <andih@google.com> Another software color conversion implementation, this time OMX_QCOM_COLOR_FormatYVU420SemiPlanar => rgb565.
mx/SoftwareRenderer.cpp
269091da58951736dc2f4c8b74886b6a9aa12be1 16-Sep-2009 Andreas Huber <andih@google.com> The 8k chipset qcom decoders require that the input buffers be allocated using OMX_AllocateBuffer rather than OMX_UseBuffer for now.

If they aren't, a later call to OMX_FreeBuffer crashes...
MXCodec.cpp
430209e4d4d767e96d1e59a705d1b8b6624cb1e8 15-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 25128 into eclair

* changes:
Support CbYCrY -> RGB565 color conversion in IOMXRenderer.
10f75b8c71beb7f327e50bbac8e528af4e40fa24 15-Sep-2009 Andreas Huber <andih@google.com> Support CbYCrY -> RGB565 color conversion in IOMXRenderer.
mx/OMX.cpp
mx/SoftwareRenderer.cpp
1b84df1a0823fbcb9cec754311f53eaccfe85ae3 15-Sep-2009 Andreas Huber <andih@google.com> Added an API IOMX::createRendererFromJavaSurface.

This api allows to instantiate a renderer by specifying the hosting java Surface object. This hides the implementation details of (java-)Surface, (native-)Surface and friends.
ndroid.mk
mx/Android.mk
95301196d59fb88ef96342fd307a2be374b5079b 15-Sep-2009 Andreas Huber <andih@google.com> Added a little more logging in OMXCodec.cpp for vendors to be able to reproduce issues...
MXCodec.cpp
df4de7d7bd0060a84b064ce074d3f86d3a7aa0ae 11-Sep-2009 Andreas Huber <andih@google.com> Apparently I must not use OMX_UseBuffer on either input or output ports on any of the TI components... or else.
MXCodec.cpp
8f0e4aace6c0643f7c4005184c7df2c73368f0dc 11-Sep-2009 Andreas Huber <andih@google.com> Only build the "full" stagefright (including MediaExtractors and MediaPlayer) if BUILD_WITH_FULL_STAGEFRIGHT define is set (to true).
ndroid.mk
777893a928680f09e306b4b9efc1d5cf4479a9da 11-Sep-2009 Andreas Huber <andih@google.com> Move JPEGSource.{cpp,h} into libstagefright.
ndroid.mk
PEGSource.cpp
18291bc20e55e8f3fd5feb786771a8ed32c19c59 10-Sep-2009 Andreas Huber <andih@google.com> Media MIME types now have corresponding constants in MediaDefs.h, new codec enumeration API.
MRExtractor.cpp
ndroid.mk
udioPlayer.cpp
ameraSource.cpp
P3Extractor.cpp
PEG4Extractor.cpp
PEG4Writer.cpp
ediaDefs.cpp
ediaExtractor.cpp
MXCodec.cpp
houtcastSource.cpp
8cd11d23197209e2c2bdb7980bc17e3f1257a118 10-Sep-2009 Andreas Huber <andih@google.com> Add component name to informational logging in OMXCodec.cpp
MXCodec.cpp
44d4b64990c34fb69ee012fdec1b0ef1bd3edde8 10-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 24450 into eclair

* changes:
Minor API change in MPEG4Writer, support for amr output into MPEG4 containers.
51ae4a9426fbc0f512facb180439affdb9859645 10-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 24448 into eclair

* changes:
Support for amr-wb tracks in MPEG4Extractor.
25b130939339d57789a86fac837a2a8cedbcb7d8 10-Sep-2009 Andreas Huber <andih@google.com> Minor API change in MPEG4Writer, support for amr output into MPEG4 containers.
PEG4Writer.cpp
371e243b6638e74e577d56a24eee7d5a97e36d2b 10-Sep-2009 Andreas Huber <andih@google.com> Support for amr-wb tracks in MPEG4Extractor.
PEG4Extractor.cpp
2f7daa1d7e01bfc2cd7546edeeaea0c3c2ee728c 10-Sep-2009 Andreas Huber <andih@google.com> Added some more verbose output for AMR formats. Properly fill out the output format.
MXCodec.cpp
195ea1e0d4484f1deb2309e239f6a5cc9a7e5ba7 08-Sep-2009 Andreas Huber <andih@google.com> Calculate proper output buffer size for some more 16-bit RGB color spaces.
MXCodec.cpp
f75978f63a25e79c683e96611f95cb5cd49efd3d 09-Sep-2009 Andreas Huber <andih@google.com> Added a .amr file extractor (for AMR-NB and AMR-WB content).
MRExtractor.cpp
ndroid.mk
ataSource.cpp
ediaExtractor.cpp
MXCodec.cpp
456db75516efc889e1ee4e5e16021e77c03b0941 08-Sep-2009 Andreas Huber <andih@google.com> Support encoding amr-wb content in stagefright.
MXCodec.cpp
b7802d9ee9c9dbb471ae4f010bd67ba1aaa9f264 04-Sep-2009 Andreas Huber <andih@google.com> The qcom decoder requires that the output buffers be allocated by the component for hardware accelerated display to work.
MXCodec.cpp
7a6b9e2eca7d20457ace3538c689640e5bfda4f3 03-Sep-2009 Andreas Huber <andih@google.com> Setting the component role appears to be mandatory now for all mime types.

Also using CODEC_LOGV instead of vanilla LOGV to include the component name the message related to.
MXCodec.cpp
e5adbeee3401915ff8e1a983396ce3554436b11c 02-Sep-2009 Andreas Huber <andih@google.com> Some work to make audio encoding work.
MXCodec.cpp
bc327427531dddd3de2e55c093641207c013f0dd 02-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 23632 into eclair

* changes:
Increase buffer allocated to receive HTTP response, YouTube is rather verbose...
104b12d973d365d2ab66b77f638a117bf4496af8 02-Sep-2009 Andreas Huber <andih@google.com> Increase buffer allocated to receive HTTP response, YouTube is rather verbose...

Yes, I know, fixed buffers are bad.
TTPStream.cpp
37940eefcba982836b579fe1ffec6cada72b0974 02-Sep-2009 Andreas Huber <andih@google.com> Squashed commit of the following:

commit c45bfbb97ccd05982008df47181f9c73abaf0497
Author: Andreas Huber <andih@google.com>
Date: Tue Sep 1 15:58:12 2009 -0700

This quirk should not be enabled by default in order to make the bug reproducible by the vendor.

commit 21d72e80e795fcae53d9c3bcc8ba6312b081e420
Author: Andreas Huber <andih@google.com>
Date: Tue Sep 1 15:55:45 2009 -0700

Undoing the hack to temporarily give up the lock to facilitate reading from the buffer source.

This simply causes too many issues, there need to be independent threads providing input buffers and dequeuing output buffers.

commit 84d507def8999c146ce124cc8edfe106c9ca70c2
Author: Andreas Huber <andih@google.com>
Date: Tue Sep 1 15:16:23 2009 -0700

The AAC components appear to output stereo data even if the input data is mono...
MXCodec.cpp
53f2b2ae6417e8a32961e05cf21920c540d8b823 01-Sep-2009 Andreas Huber <andih@google.com> Temporarily unlock our mutex while fetching a buffer from the upstream source.
MXCodec.cpp
450bf4b0d25c933431b790d911a5fcae750fe38d 28-Aug-2009 Andreas Huber <andih@google.com> Fixes a race condition between entering ERROR state and initial buffer submit.
MXCodec.cpp
7f75ced4cdf3a1bbe7ace32e5e806aaaa38c7ad6 28-Aug-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 22991 into eclair

* changes:
Apparently setting the preferred role of the OMX component is now required on this platform.
7d719af770ddefc3739fd0597634dea553c5569a 28-Aug-2009 Andreas Huber <andih@google.com> Apparently setting the preferred role of the OMX component is now required on this platform.
MXCodec.cpp
ab0a5c456a5da571baa4c7f2bc4f3409194f11ba 28-Aug-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 22986 into eclair

* changes:
Squashed commit of the following:
e0f0b08aa692d15f3bfa19e10abfc84803c099b4 27-Aug-2009 Andreas Huber <andih@google.com> Squashed commit of the following:

commit 3fa5f3ce910f34da0cedb8bcce1bd593db7eb740
Author: Andreas Huber <andih@google.com>
Date: Thu Aug 27 14:48:54 2009 -0700

Getting rid of more code now obsolete with the departure of OMXDecoder.

commit e0d923ec0c7bb60bec8eb97739036a4c70c0feef
Author: Andreas Huber <andih@google.com>
Date: Thu Aug 27 14:33:06 2009 -0700

Remove obsoleted OMXDecoder class. OMXDecoder is dead, long live OMXCodec.
ndroid.mk
ediaPlayerImpl.cpp
MXClient.cpp
MXDecoder.cpp
83dc92f8733a7da4a8addf6075c58d3ddb47aa5c 27-Aug-2009 Andreas Huber <andih@google.com> Fix a typo.
ampleTable.cpp
284f513a4ce2c5aa0e250c07c873731aedb0be26 27-Aug-2009 Andreas Huber <andih@google.com> An attempt to fix a deadlock between OMXCodec::start and upstream ::read
MXCodec.cpp
8297cedd12f689167d74de5ddacb514e9f6896ea 27-Aug-2009 Andreas Huber <andih@google.com> Another quirk, some OMX components fail to properly flush before shutdown and we must do it for them...
MXCodec.cpp
0c89199745bc1bf05b997fc7c342017807676b6f 26-Aug-2009 Andreas Huber <andih@google.com> assert => CHECK in stagefright.
udioPlayer.cpp
achingDataSource.cpp
ameraSource.cpp
ileSource.cpp
TTPDataSource.cpp
TTPStream.cpp
P3Extractor.cpp
PEG4Writer.cpp
ediaBuffer.cpp
ediaBufferGroup.cpp
ediaPlayerImpl.cpp
etaData.cpp
mapSource.cpp
MXClient.cpp
MXCodec.cpp
MXDecoder.cpp
ampleTable.cpp
houtcastSource.cpp
imedEventQueue.cpp
mx/OMX.cpp
mx/QComHardwareRenderer.cpp
mx/SoftwareRenderer.cpp
355edcea2f15c0f619c1e1d0f4fa433b0d38098f 26-Aug-2009 Andreas Huber <andih@google.com> Disregard the EOS buffer flag while flushing or shutting down the decoder.
MXCodec.cpp
ea7d15629752256f6ea1d5c6ea796e59aefd030f 26-Aug-2009 Andreas Huber <andih@google.com> Keep up with latest changes to overlay handling on that unnamable platform.
MXCodec.cpp
mx/Android.mk
mx/TIHardwareRenderer.cpp
1beb760d920561679862ded945a04e370368c7f7 25-Aug-2009 Andreas Huber <andih@google.com> Make sure not to ask for more buffers when we know that there won't be any, added a quirk for the aac decoder.
MXCodec.cpp
7530e9c708275c273c134c36c68179f511c1940e 20-Aug-2009 Andreas Huber <andih@google.com> Dynamically allocate a pair of MemoryHeaps according buffer count/sizes required by the OMX component, respect JPEG compressed size.
MXCodec.cpp
bde3caae211e215e4bbfef1a267f8d680efa4764 19-Aug-2009 Andreas Huber <andih@google.com> Better (proper) parsing of the AVCDecoderConfigurationRecord, respect hardware decoder profile/level limits.
MXCodec.cpp
dbc03445db2bbf83b64f0c0a5dc62e61408864d7 19-Aug-2009 Andreas Huber <andih@google.com> The PV AVC software decoder expects each fragment of a NAL unit to be handed to the decoder unframed.
PEG4Extractor.cpp
MXCodec.cpp
MXDecoder.cpp
c1a8d2f170aef7bb7664e25d6a8275f246260d12 18-Aug-2009 Feng Qian <fqian@google.com> Fix missing -lpthread in linux-sim build.

It mimics the behavior in libstagefraight/Android.mk
mx/Android.mk
693d271e62a3726689ff68f4505ba49228eb94b2 14-Aug-2009 Andreas Huber <andih@google.com> Squashed commit of the following:

commit 5bb012f0065f7ffaaeb4f569d71f0e3a8d6b19c3
Author: Andreas Huber <andih@google.com>
Date: Fri Aug 14 10:40:08 2009 -0700

An attempt at fixing export using the qcom encoders. More quirks.

commit 0690e76bfa48118a68287ccf1bbfa82febaa620c
Author: Andreas Huber <andih@google.com>
Date: Fri Aug 14 09:08:28 2009 -0700

Callbacks are now dispatched from a separate thread in OMX.

commit c6571a039526df29b6343f9a1971dbc019088c61
Author: Andreas Huber <andih@google.com>
Date: Thu Aug 13 15:42:25 2009 -0700

Massive API changes throughout stagefright, smart pointers everywhere.

commit 900612af6a0555664d9ba195112cd859491265f4
Author: Andreas Huber <andih@google.com>
Date: Thu Aug 13 13:33:12 2009 -0700

OMXCodecs now properly shutdown.

commit 96732f05e1b0603dcd1b11f16a23512592eeb4f5
Author: Andreas Huber <andih@google.com>
Date: Thu Aug 13 12:04:04 2009 -0700

More work on JPEG decoding using the hardware OMX component.

commit 63839a073ac393e3a130434ba467969053b694ad
Author: Andreas Huber <andih@google.com>
Date: Wed Aug 12 13:13:31 2009 -0700

An attempt to drive the JPEG decoder OMX node.

commit 3ac2fe5ab2926eda81b2123610b2434c645294ff
Author: Andreas Huber <andih@google.com>
Date: Tue Aug 11 16:38:21 2009 -0700

Renamed StateMachine to OMXCodec and put it in its proper place.

commit 247da75a96bf8881956413023dd49a84d5b4f5b2
Author: Andreas Huber <andih@google.com>
Date: Tue Aug 11 16:06:19 2009 -0700

Statemachine is now a full-fledged MediaSource.

commit 045244f6771fa0b9b329495c953afda900a84b71
Author: Andreas Huber <andih@google.com>
Date: Fri Aug 7 09:16:54 2009 -0700

Properly setup the input format when exporting to AMR audio.

commit 271b984cb32c5cd9e46e3f90ae121f334e4b8da9
Author: Andreas Huber <andih@google.com>
Date: Thu Aug 6 09:59:38 2009 -0700

Added some code to test audio encoding to the OMX harness.

commit 79af4748e4af33bd66d3fbac606e332a69741cf4
Author: Andreas Huber <andih@google.com>
Date: Wed Aug 5 14:36:22 2009 -0700

Merge the old OMXDecoder and the new, shiny, StateMachine code.

commit 91cf5dd77a8762bc10a0b2ffce35e3bbeb262231
Author: Andreas Huber <andih@google.com>
Date: Tue Aug 4 17:41:43 2009 -0700

A new harness to test OMX node compliance (and quirks).
ndroid.mk
udioPlayer.cpp
achingDataSource.cpp
ataSource.cpp
P3Extractor.cpp
PEG4Extractor.cpp
PEG4Writer.cpp
ediaExtractor.cpp
ediaPlayerImpl.cpp
MXClient.cpp
MXCodec.cpp
MXDecoder.cpp
ampleTable.cpp
mx/OMX.cpp
mx/OMX.h
f4148b55c5d6f68b22462e3880015fefa91ae7c6 07-Aug-2009 Andreas Huber <andih@google.com> Expose a variation of the createRenderer API that works on a plain Surface.
ediaPlayerImpl.cpp
408b8e1073385d0d09bb96b9952f84731a0b4aeb 07-Aug-2009 Andreas Huber <andih@google.com> Deprecate/remove now unused socketpair ipc communication in favour of exclusive binder use.
MXClient.cpp
MXDecoder.cpp
mx/OMX.cpp
mx/OMX.h
47f59cfe40b0ebb3afd6c39f97dcd1eac2e966f7 07-Aug-2009 Andreas Huber <andih@google.com> Build the stagefright library by default.
ndroid.mk
mx/Android.mk
285ead29c9eee092d367effd89f1c9f4f0bb9d6c 07-Aug-2009 Andreas Huber <andih@google.com> The mp3 decoder now correctly uses microseconds to measure time. One less quirk.
MXDecoder.cpp
bf37f3364804f521cc61845b1f1ce16fe133814b 04-Aug-2009 Andreas Huber <andih@google.com> Recording/Export to .mp4/h.263 somewhat works on TI hardware.
PEG4Writer.cpp
MXDecoder.cpp
8b938cdab5bd3d074d9b41bc2915fcfc11e47f27 31-Jul-2009 Andreas Huber <andih@google.com> The IOMX interface now instantiates IOMXRenderers to hide the details of hardware accelerated blitting.
ndroid.mk
ediaPlayerImpl.cpp
MXDecoder.cpp
ComHardwareRenderer.cpp
oftwareRenderer.cpp
urfaceRenderer.cpp
IHardwareRenderer.cpp
mx/Android.mk
mx/OMX.cpp
mx/OMX.h
mx/OMXRenderer.h
mx/QComHardwareRenderer.cpp
mx/SoftwareRenderer.cpp
mx/TIHardwareRenderer.cpp
cfb3bc79a0e4d60ee2512c4ddbb85c424cc96c19 28-Jul-2009 Andreas Huber <andih@google.com> While other OMX nodes appear to now have switched to using microseconds to timestamp buffers, at least the TI AAC and MP3 decoders still use milliseconds.
MXDecoder.cpp
0024245e134467d120b40099da16c467dc365e76 28-Jul-2009 Andreas Huber <andih@google.com> Squashed commit of the following:

commit 374ea382ee3a9e3ce17e4c6357fc40d02e362810
Author: Andreas Huber <andih@google.com>
Date: Tue Jul 28 09:54:13 2009 -0700

PV's OMX implementation now uses (spec-compliant) microseconds instead of milliseconds in buffer timestamps.

commit 8d02f8ab5d7b022ad4ad34db2a9bdeea6ce2acfe
Author: Andreas Huber <andih@google.com>
Date: Mon Jul 27 14:24:26 2009 -0700

Support for using an overlay for video playback on TI hardware.

Appears to be currently constrained to CbYCrY 16-bit colorspace.

commit d17f321cb4b15c1fea378f33a7ef5998f23dd0fc
Author: Andreas Huber <andih@google.com>
Date: Mon Jul 27 09:45:38 2009 -0700

Added '--audio-only' commandline option to stagefright tool.

commit d8beef6be5c668c46451446d87e622933371cd75
Author: Andreas Huber <andih@google.com>
Date: Fri Jul 24 13:35:00 2009 -0700

Generalize the various workarounds for OMX nodes with their own unique interpretation of the spec.

commit c7dfd53eeadf8ed5a39bf2b19b014dcd62f3324d
Author: Andreas Huber <andih@google.com>
Date: Thu Jul 23 16:06:36 2009 -0700

Fixed erroneous TI AAC decoder behaviour wrt shutdown.

The AAC decoder appears to not return out buffers on an Executing->Idle transition, implemented a workaround that does a flush on all ports followed by the Executing->Idle. Oh, and flush with OMX_ALL doesn't properly work either. Fun.

commit d6377282e75060881336578f166f9c7feacf3f8f
Author: Andreas Huber <andih@google.com>
Date: Thu Jul 23 14:06:50 2009 -0700

Apparently the "channels" parameter in AudioTrack's constructor no longer counts channels but is a bitmask of enabled destinations, update the code accordingly.

commit ff698c79e851a2e57d362e9c3a09828af4048087
Author: Andreas Huber <andih@google.com>
Date: Wed Jul 22 16:54:44 2009 -0700

Fix MPEG4 decoding using TI's hardware decoder that I broke earlier...

commit 2ef78bb87cd856eb7f0b3d7dd68782a8650c12bf
Author: Andreas Huber <andih@google.com>
Date: Wed Jul 22 15:43:18 2009 -0700

Now that the qcom decoder properly advertises its own custom colorspace, update dependent code to reflect this fact.

commit bbaec96910727080fd7c8a6907c04facb9f5220f
Author: Andreas Huber <andih@google.com>
Date: Wed Jul 22 14:32:03 2009 -0700

Finishing up previous, incomplete change.

commit 76f14a1ae816b6f434771f8d12bdad81196f351e
Author: Andreas Huber <andih@google.com>
Date: Wed Jul 22 14:25:17 2009 -0700

The TI video decoder now properly decoder AVC/H.264 content.

commit e106130d8c100d5c94603e43864a7a93cca10252
Author: Andreas Huber <andih@google.com>
Date: Wed Jul 22 08:56:04 2009 -0700

Experimental support for the TI H.264 decoder, various modifications to OMXDecoder, non-functional still.

commit 241c3062dec3447db1a1ee74558cb4b9098fc404
Author: Andreas Huber <andih@google.com>
Date: Tue Jul 21 12:13:09 2009 -0700

Enable TI hardware OMX decoders (except for AVC/H.264 which still has issues).

This particular set of OMX nodes does not appear to properly return our buffers when sending the "disable" command on a port. Rather it reqires manually flushing that port and _then_ disabling it instead.

commit 1c34506a46e32ce25f2a86f3b4250dcfc037356a
Author: Andreas Huber <andih@google.com>
Date: Tue Jul 21 08:51:35 2009 -0700

Make it simpler to switch between the stagefright player and PVPlayer.

commit 249c6de05671d403f8dd51f095d49bf190430c9c
Author: Andreas Huber <andih@google.com>
Date: Mon Jul 20 14:38:15 2009 -0700

Prepare to use soon-to-be-available hardware decoders in the OMX decoder.
ndroid.mk
udioPlayer.cpp
P3Extractor.cpp
PEG4Extractor.cpp
ediaPlayerImpl.cpp
MXDecoder.cpp
IHardwareRenderer.cpp
919f7387f2eafc36223a5cd599fb46871f801b10 17-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 7701

* changes:
Clean up MP3Extractor code and fixes a bug that miscalculated the position of the header by a few bytes whenever we read in more data.
c8d6c8bdd84464e0c7e511241ede2299cf38fda4 17-Jul-2009 Andreas Huber <andih@google.com> Clean up MP3Extractor code and fixes a bug that miscalculated the position of the header by a few bytes whenever we read in more data.
P3Extractor.cpp
548681f9bd906600ab523b87e045c1e829b0c767 17-Jul-2009 Andreas Huber <andih@google.com> stagefright: initialize more of the OMX_BUFFERHEADERTYPE structure as they are apparently not cleared by the OMX implementation.
mx/OMX.cpp
72b56ef3d9f164159f58725781b01dd3b052b51a 17-Jul-2009 Marco Nelissen <marcone@google.com> Another fix for building libstagefright for the simulator, plus whitespace adjustments.
ndroid.mk
361f482fd229c4d0b683d04c93b9da4ab01660b7 17-Jul-2009 Marco Nelissen <marcone@google.com> Fixes to make libstagefright build for the simulator.
imeSource.cpp
imedEventQueue.cpp
20111aa043c5f404472bc63b90bc5aad906b1101 15-Jul-2009 Andreas Huber <andih@google.com> Squashed commit of the following:

commit 8d179995654c19d9094e51989dc84ed0deba6e04
Author: Andreas Huber <andih@google.com>
Date: Tue Jul 14 16:30:40 2009 -0700

Protect stagefright code with BUILD_WITH_STAGEFRIGHT build-define.

commit 99b41acb58c34e8f024c30c833a09fd7b31c4e1f
Author: Andreas Huber <andih@google.com>
Date: Tue Jul 14 14:06:00 2009 -0700

OMX::list_nodes API, stagefright --list now lists all available OMX components.

commit 94a74c5b24aae6d7e446fff83d62ae3a57dc351b
Author: Andreas Huber <andih@google.com>
Date: Mon Jul 13 16:04:29 2009 -0700

Reenabled "record" commandline application to test encoding, support for h263 codec specific data when writing to .mp4.

commit d363dd74f611577567c66d25900d6264c306468c
Author: Andreas Huber <andih@google.com>
Date: Mon Jul 13 10:59:58 2009 -0700

Make non-socket communication in IOMX the default.

commit e89fc82c4fd138c88339887baf72f1d0e67f8660
Author: Andreas Huber <andih@google.com>
Date: Mon Jul 13 10:32:33 2009 -0700

The OMX interface now optionally supports communication through the binder only (no sockets involved)

commit 28611de11223fba65299787cdd33f7fdbd6a60a3
Author: Andreas Huber <andih@google.com>
Date: Fri Jul 10 15:09:13 2009 -0700

Split off the logic to render to a Surface (not ISurface!) into SurfaceRender.{cpp,h}

commit c0cfa885faaeb17d3fc5436f6447b61708bd6fe1
Author: Andreas Huber <andih@google.com>
Date: Fri Jul 10 12:21:46 2009 -0700

Fix display dimensions vs. decoded dimensions display issues, unfortunately breaks software rendering a bit...

commit ae209a2b5d09caed5dd383c910f238926aaa8fc6
Author: Andreas Huber <andih@google.com>
Date: Fri Jul 10 09:33:29 2009 -0700

Simple video decoder performance test in "stagefright" commandline tool.

commit 59fe7840111d6f46dd3c48f4950146aed962dbd2
Author: Andreas Huber <andih@google.com>
Date: Thu Jul 9 16:05:12 2009 -0700

StagefrightPlayer: Properly publish video dimensions by notifying the listener.

commit 51b6598f0e47be5e12d77f1d14e111e71c593638
Author: Andreas Huber <andih@google.com>
Date: Thu Jul 9 11:38:15 2009 -0700

MediaPlayerInterface::AudioSink now supports the specification of a callback for pull-based audio.

commit 31ce53375d748da3e7d30e993ce89dae97fd65ea
Author: Andreas Huber <andih@google.com>
Date: Wed Jul 8 17:23:37 2009 -0700

Proper support for pushing audio to a specified AudioSink interface. Still not bulletproof: video falls behind frequently.

commit a23e312b10631a5d47f5c9831205beac6b84ab36
Author: Andreas Huber <andih@google.com>
Date: Wed Jul 8 15:10:13 2009 -0700

IGenesisPlayer and friends are no more, java interface now uses local playback instead
of playing inside the media server process.

commit 42ee5c06ab5ba1c16f50472b0b26a0526635c73c
Author: Andreas Huber <andih@google.com>
Date: Wed Jul 8 13:17:03 2009 -0700

MP3 extractor now supports seeking (only fixed bitrate files currently supported)

commit 96a790405763bfa738d1c6845c99a9fdf579b66f
Author: Andreas Huber <andih@google.com>
Date: Tue Jul 7 10:53:54 2009 -0700

Keeping up-to-date with new master-gl changes, removing CameraSource for now, removing unnecessary commandline utilities from the build.

commit 6c9dcb7c628c0347154dd7f37913a3a5f04deb99
Author: Andreas Huber <andih@google.com>
Date: Mon Jul 6 16:40:02 2009 -0700

Finally take advantage of the fact that the Qcom OMX decoders already place the output buffers into memory accessible by the hardware yuv converter and avoid extra allocations and memcpys in that case. Split of the render logic into subclasses of VideoRenderer.

commit e8d46e81cffc15ffb0bdf03f511e4a4497ca7621
Author: Andreas Huber <andih@google.com>
Date: Mon Jul 6 12:18:29 2009 -0700

Added a few more cases of valid MPEG4 files to the sniffer, fixed end of stream notifications in MPEG4 files.

commit 88bffc5ed4033a607080f8777a1c0ec9e3e079de
Author: Andreas Huber <andih@google.com>
Date: Thu Jul 2 12:25:03 2009 -0700

MediaPlayerImpl now properly pauses/resumes instead of tearing down the decoder chains and starting back up from the beginning.

commit 732aa0a87c7e8d8a10776b275712649954962414
Author: Andreas Huber <andih@google.com>
Date: Wed Jul 1 14:58:56 2009 -0700

Remove pthread_mutex_* and pthread_cond_* in favour of Mutex and Condition.

commit 669e5944b2fe0542a3b8dba0c441a94503e99fb0
Author: Andreas Huber <andih@google.com>
Date: Wed Jul 1 14:43:02 2009 -0700

Proper support for end-of-stream signalling of MediaSources.

commit afb038f2dc594c742e554b2d42b86ffc7434e3fc
Author: Andreas Huber <andih@google.com>
Date: Tue Jun 30 16:48:03 2009 -0700

Support for the "sniffing" of datasources to determine their probable mime type (along with confidence). Slightly refactored the MP3Extractor to share common code with the sniffer.

commit ed3644b8bd56807e1db4b32433a93a2467f1f3c5
Author: Andreas Huber <andih@google.com>
Date: Fri Jun 26 13:27:52 2009 -0700

I don't think prepare should automatically start the player.

commit 11eb9b49dc4a0819d366682817cba68613f4fe12
Author: Andreas Huber <andih@google.com>
Date: Fri Jun 26 11:09:22 2009 -0700

Somewhat better timing information implemented in the MP3Extractor.

commit cab023a1751735c0ed26c8493498a91d8644c6c9
Author: Andreas Huber <andih@google.com>
Date: Thu Jun 25 15:41:56 2009 -0700

Initial checkin for support of mp3 content, extraction and playback. Media extractors now abstracted in MediaExtractor baseclass.

commit 40f4146bb3c647e56690dd9b0fa3ffdea60030dc
Author: Andreas Huber <andih@google.com>
Date: Wed Jun 24 10:41:12 2009 -0700

Make sure we only allocate surface buffers if there is video to be played.

commit 7f85e7d92fe81740e102e09905b19354f4ac178e
Author: Andreas Huber <andih@google.com>
Date: Wed Jun 24 10:19:32 2009 -0700

Clean up a failed merge and implement stub for new API in MediaPlayerBase.

commit f0e9d494a4c03402ea7b54891848ca5a50c421b2
Author: Andreas Huber <andih@google.com>
Date: Fri Jun 12 15:38:03 2009 -0700

Support yuv420->rgb565 conversion if hardware color conversion is unavailable.

commit 87223248b3099cd5261b94169f84cfd1eba56a8f
Author: Andreas Huber <andih@google.com>
Date: Fri Jun 12 09:35:56 2009 -0700

Remove unimplemented and currently unnecessary blocking option from MediaSource::ReadOptions.

commit e07e651f0325892b797f3eb64dbeca0f317afdfd
Author: Andreas Huber <andih@google.com>
Date: Wed Jun 10 16:26:42 2009 -0700

Enable assertions in HTTPDataSource.

commit 0dc97adebea1721156880f4b3d5c70f8d50c53b2
Author: Andreas Huber <andih@google.com>
Date: Wed Jun 10 12:34:39 2009 -0700

delete foo.

commit 7f05845dda496e7defee284d32509d127e785784
Author: Andreas Huber <andih@google.com>
Date: Wed Jun 10 12:34:08 2009 -0700

added foo.

commit e432970c51eeec4e5d549bdb3e2d3e48ffb4f0e7
Author: Andreas Huber <andih@google.com>
Date: Wed Jun 10 11:44:31 2009 -0700

Make sure to initialize all fields in _all_ constructors... Use a Mutex instead of the raw pthread_mutex_t.

commit d6286a6bbca639952491448fa3e609b775a8a814
Author: Andreas Huber <andih@google.com>
Date: Tue Jun 9 17:11:49 2009 -0700

send_command is now implemented twice... ugly hack to get both shutdown working correctly and startup as well... playback now "works" on the emulator, too.

commit 8d657e004677a7c5dae4479e8519bcaa94c18aad
Author: Andreas Huber <andih@google.com>
Date: Tue Jun 9 11:58:55 2009 -0700

Instead of erasing codec specific data once it's been output to the omx node, retain the data and just rewind after a stop.

commit 279fede6ba35cbc37c35616c53406bf2c9720202
Author: Andreas Huber <andih@google.com>
Date: Tue Jun 9 10:58:11 2009 -0700

Various fixes related to play/pause. Decoder now properly frees OMXMediaBuffers, made MemoryDealer destructor protected instead of public to prevent accidental stack-allocation of MemoryDealer objects.

commit 0f717f15a6328efd3f34082929cd8ad2351095a9
Author: Andreas Huber <andih@google.com>
Date: Tue Jun 9 08:44:12 2009 -0700

Make sure to rewind codec specific data on OMXDecoder::stop and reset AudioPlayer's notion of time mapping.

commit 0cfb63e33270daf9b215214608ab383f93a31823
Author: Andreas Huber <andih@google.com>
Date: Mon Jun 8 14:25:48 2009 -0700

Massive rename.

commit 30ed8f476c4431a5275538958b3e281bd17d5eab
Author: Andreas Huber <andih@google.com>
Date: Mon Jun 8 13:52:41 2009 -0700

send_command and fill/empty buffer commands must be executed in sequence, send_command is now dispatched over the socket instead of through the binder interface to ensure this.

commit b832d04011b2dd8a9632eb7e575bfe1addd1270d
Author: Andreas Huber <andih@google.com>
Date: Mon Jun 8 10:21:17 2009 -0700

MediaBuffers can now be "clone()", they sit on top of the same data but have their own range and metadata. Once a clone's refcount drops to 0 it decrements the refcount on the original buffer.

commit 4e944672808bdf1ed40a69f3f602f93ebf7b4049
Author: Andreas Huber <andih@google.com>
Date: Mon Jun 8 10:01:01 2009 -0700

Split MediaBuffer.h into MediaBufferGroup.h and MediaBuffer.h, same with their respective source files.

commit ddb7529b4de4828db51432bd405fddd76cfa3b6a
Author: Andreas Huber <andih@google.com>
Date: Fri Jun 5 16:30:25 2009 -0700

More fudging with A/V sync...

commit 1e5a4d8df08237b58c06c6527a33152ae931addf
Author: Andreas Huber <andih@google.com>
Date: Fri Jun 5 11:54:20 2009 -0700

API cleanup of MediaSource. Got rid of MediaRing as it really doesn't serve a purpose if OMX decoders are used.

commit 0953c65232aa9753d17d2e25c5f5526eb810cf13
Author: Andreas Huber <andih@google.com>
Date: Thu Jun 4 16:59:19 2009 -0700

Experimental TimedEventQueue and an attempt at a cleaner player implementation using it, OMXDecoder is now a little less verbose.

commit 2085b8ea9484a21fa11f94194a27405d413aeecc
Author: Andreas Huber <andih@google.com>
Date: Thu Jun 4 10:17:01 2009 -0700

Properly bail out of the AV sync loop if the MediaPlayerImpl is stopped.

commit 471f143458a8a0d93cb1bf9568c63c3967279dc6
Author: Andreas Huber <andih@google.com>
Date: Wed Jun 3 17:32:27 2009 -0700

Now this is much better AV sync, defer seeking the audio source until we know where the video source synced to.

commit 4010d371dbe62ce4971e13437776cba32cb0bb3d
Author: Andreas Huber <andih@google.com>
Date: Wed Jun 3 16:01:07 2009 -0700

Tweaked some of the heuristics in AV sync, OMXDecoder is now a little less verbose, seek to a sync sample at or _after_ the requested position.

commit f3d4af1d5a4ac31fa02271b000f6c7ec593f0da9
Author: Andreas Huber <andih@google.com>
Date: Wed Jun 3 15:33:58 2009 -0700

Change the TimeSource interface's APIs, prefer microseconds over milliseconds now, changed the way MediaPlayerImpl does AV sync.

commit 08bb46fa61d12e852a424698ddb0c90700328f6e
Author: Andreas Huber <andih@google.com>
Date: Wed Jun 3 11:57:24 2009 -0700

Using framework's Mutex and Condition classes instead of pthread functions, much saner locking in OMXDecoder.

commit 4d77b4e09e59bbf8c1af009ae7dc62b10af52fd6
Author: Andreas Huber <andih@google.com>
Date: Tue Jun 2 17:12:03 2009 -0700

MediaSources now publish their format.

commit 7e429a26c57bf936e1a08035d2d11839f9f00310
Author: Andreas Huber <andih@google.com>
Date: Tue Jun 2 16:38:29 2009 -0700

MetaData is now implemented in terms of KeyedVector, MetaData is now reference counted.

commit 0fa957aa5c9bcb6ec122ed7b5b97430039be6797
Author: Andreas Huber <andih@google.com>
Date: Mon Jun 1 14:39:55 2009 -0700

Sync sample seek support.

commit 78a5f090d02e7e6e1a146b29bdb7771eecaa2f86
Author: Andreas Huber <andih@google.com>
Date: Mon Jun 1 13:51:11 2009 -0700

Distinguish shutdown from port-flush since one requires buffers to be freed and the other one doesn't. Fixes a problem with seek.

commit e57781d3b2c985a74cd8b60e7c8f2d576459d038
Author: Andreas Huber <andih@google.com>
Date: Mon Jun 1 10:52:20 2009 -0700

First shot at support for seeking a MediaSource. Sync frames are not properly handled yet.

commit 0551cd78fda78bf66877fb26c5a55e5ae23d8367
Author: Andreas Huber <andih@google.com>
Date: Thu May 28 16:23:38 2009 -0700

Preliminary support for camera input.

commit f8ebafa65d10d5a06944de6b2e2992a33121b857
Author: Andreas Huber <andih@google.com>
Date: Thu May 28 12:13:47 2009 -0700

Allow NativeMediaPlayer access to Surface's getISurface() method.

commit b1a9fb36eeccd9f49d28c1c64b31fccbd6506eeb
Author: Andreas Huber <andih@google.com>
Date: Thu May 28 11:38:25 2009 -0700

Header files are now in their own genesis2 hierarchy below frameworks/base/include.

commit f49b8b234b8f6ce83148787eef540dd920f04aa6
Author: Andreas Huber <andih@google.com>
Date: Thu May 28 11:22:03 2009 -0700

moved MPEG4Writer into libgenesis2.

commit 5224254919dac4728677335ea60429fa16f518b4
Author: Andreas Huber <andih@google.com>
Date: Thu May 28 11:13:38 2009 -0700

Everything now lives in the android namespace, integrated errors with android errors, renamed MediaPlayer to MediaPlayerImpl.

commit f9a9d84f7e0465ef5d1938a068655ba39527cf99
Author: Andreas Huber <andih@google.com>
Date: Wed May 27 16:43:11 2009 -0700

Support for getPosition() and getDuration().

commit 3206cc5140bcbc88be039f8d94b954af63e69752
Author: Andreas Huber <andih@google.com>
Date: Wed May 27 15:37:45 2009 -0700

Support for {MediaPlayer, GenesisPlayer, Genesis2Player}::isPlaying()

commit 9f41b248e0dfce71bbc50f883750cec52ebfd1fe
Author: Andreas Huber <andih@google.com>
Date: Wed May 27 13:49:50 2009 -0700

Proper disconnection from the OMX service.

commit cdcf47a2c31599109ee42277c7fa14af3c600091
Author: Andreas Huber <andih@google.com>
Date: Tue May 26 17:27:06 2009 -0700

New player type for the genesis player in libmediaplayerservice. Playing video through an ISurface now.

commit 0586af20ac9ae0403dd190bafd290b0f90549723
Author: Andreas Huber <andih@google.com>
Date: Fri May 22 15:53:19 2009 -0700

Fix a buffer overflow error by adding padding in case we need to de-frame AVC data.

commit eac62fff6ad2ffb7b75c0d4a1b9620d33e93fb9b
Author: Andreas Huber <andih@google.com>
Date: Fri May 22 13:35:30 2009 -0700

Support for http URIs in MediaPlayer, compensate for AudioTrack latency.

commit a7db456e3173d94d6b5e457547e2a6a5f7a8e1cc
Author: Andreas Huber <andih@google.com>
Date: Fri May 22 11:33:25 2009 -0700

Support for URIs in MediaPlayer class, support for shoutcast streams in MediaPlayer, force shutdown of OMX nodes if they don't shutdown cleanly within a second.

commit 1f0268f4f14ad5215668f34e06a420850174d665
Author: Andreas Huber <andih@google.com>
Date: Fri May 22 08:33:16 2009 -0700

and foo.txt is gone again.

commit 0feca4e0919f345704d78ec78894bac5027bd5ed
Author: Andreas Huber <andih@dhcp-172-19-27-148.mtv.corp.google.com>
Date: Fri May 22 08:28:49 2009 -0700

added foo.txt

commit 9c7d04b35cdc895a2de3602dc46522f608bd205f
Author: Andreas Huber <andih@google.com>
Date: Fri May 22 08:28:04 2009 -0700

delete foo again

commit fec3ca1720992cce51b9a92b86b945da88a6b16c
Author: Andreas Huber <andih@google.com>
Date: Fri May 22 08:27:45 2009 -0700

weird

commit 30a6571302333146e537e537a3a8986245cca87c
Author: Andreas Huber <andih@dhcp-172-19-27-148.mtv.corp.google.com>
Date: Fri May 22 08:18:55 2009 -0700

reverse test

commit dea3d99dd0fe9386e8a3c51954d9d0fe2be09d38
Author: Andreas Huber <andih@google.com>
Date: Fri May 22 08:18:22 2009 -0700

test

commit a9eeafec6e46072cac41e54ebdbd153cb7ae7518
Author: Andreas Huber <andih@google.com>
Date: Thu May 21 16:37:50 2009 -0700

Use the video ring again for now.

commit e05ff3d3c1c4f89ef499a2b172138a775fd694e3
Author: Andreas Huber <andih@google.com>
Date: Thu May 21 15:42:19 2009 -0700

Export to .mp4 now works for MPEG4 video content. Fixed a bug in the sample table wrt co64 chunks.

commit 5c44c540374a4e50c4e8aaab2b7a34aed6e1391e
Author: Andreas Huber <andih@google.com>
Date: Thu May 21 09:56:11 2009 -0700

Fix the build, all binder-related headers have moved and there's a new library libbinde
r to link against now.

commit 23e0a24404d16c898c2c6b3c7495ad303844bc71
Author: Andreas Huber <andih@google.com>
Date: Thu May 21 08:42:04 2009 -0700

Initial checkin of MPEG4Writer, a class to export media sources into an mpeg4 file. MPEG4/AVC metadata (efss & friends) not currently working.

commit 9cd77adb1ac194197364ffad00a0d7215f458e1a
Author: Andreas Huber <andih@google.com>
Date: Wed May 20 12:31:45 2009 -0700

New shell command to test recording/encoding. Various changes to OMXDecoder to support encoding properly. Now each OMXDecoder needs a dedicated thread on the client side since onEvent responses could block which would cause deadlocks if a node depends on the output of another node for example.

commit 5c510fb55ffed7ec25305999ed9b6c1eec48d503
Author: Andreas Huber <andih@google.com>
Date: Mon May 18 15:40:06 2009 -0700

Make media decoding the default in the genesis2 commandline app instead of shoutcast playback.

commit f6c7a2040b8eb43326621f12c3a936e09b3a70e3
Author: Andreas Huber <andih@google.com>
Date: Mon May 18 11:03:04 2009 -0700

The king is dead, long live the kind... Replaced old OMX binder interface with new OMX binder interface/socket hybrid.

commit 0d4955eb5df9bfafb576d22f2ed572644d6d69ac
Author: Andreas Huber <andih@google.com>
Date: Thu May 14 12:39:34 2009 -0700

dynamic negotiation of NAL framing with the MPEG4Source, removed stale code from genesis2 commandline tool. Enable support form PV H264 software decoder.

commit 380369f54a8027cbc9349305184d6bf527a24efe
Author: Andreas Huber <andih@google.com>
Date: Wed May 13 17:32:00 2009 -0700

Explore the option of running everything inside the mediaserver process by encapsulating the player in an IGenesisPlayer binder interface.

commit b5cada56b9089a23e0c461352a97dc71e08b424d
Author: Andreas Huber <andih@google.com>
Date: Wed May 13 12:11:06 2009 -0700

Introduction of TimeSource class, clean shutdown of OMX Nodes.

commit 89f6e582e605dcb2149eb67f73fe9345d4b9be2e
Author: Andreas Huber <andih@google.com>
Date: Tue May 12 17:11:56 2009 -0700

Helper classes MediaRing and MediaPlayer.

commit 9aaed8739b4bb941473da367fb88f63224d2f1b7
Author: Andreas Huber <andih@google.com>
Date: Tue May 12 14:19:18 2009 -0700

Using mmap to map a file instead of going through FILE* improves performance, who knew?

commit ad097a78bbd002c59193ffdc39b64935928426c7
Author: Andreas Huber <andih@google.com>
Date: Mon May 11 16:42:42 2009 -0700

Added a performance test, refactored AudioDecoder a little.

commit bdd1b80ab3f3ba43e04f1f996e7fa84ed2e2728a
Author: Andreas Huber <andih@google.com>
Date: Fri May 8 16:19:29 2009 -0700

No more copying the output buffers coming out of the decoder, NAL separation also done in the extractor to avoid copying the data.

commit 858955b42c29b8033841a8caaa56c2a449810ef3
Author: Andreas Huber <andih@google.com>
Date: Fri May 8 14:02:38 2009 -0700

Change from a model in which the caller specifies the destination buffer to one where the MediaSource returns a buffer.

commit 95098b6d4f8bdc37dfb6a109ca58db4d9e414e2d
Author: Andreas Huber <andih@google.com>
Date: Fri May 8 13:21:45 2009 -0700

Changes to support multiple pieces of codec specific data to the decoder, de-frame nal units from the h.264 stream and insert start codes

commit 3941fcf87a48dda81683df727dfb1381f62d9184
Author: Andreas Huber <andih@google.com>
Date: Thu May 7 16:37:45 2009 -0700

some refactoring. Most streams play now.

commit d3152862840d4dd39068e5197bec8674f3d55dd5
Author: Andreas Huber <andih@google.com>
Date: Thu May 7 15:37:32 2009 -0700

Misc. changes to support H264 decoding using the qcom hardware decoder

commit d4ecdfe7af36e7468270d1c2cbbdc540efe0351e
Author: Andreas Huber <andih@google.com>
Date: Thu May 7 09:28:18 2009 -0700

Timestamps are now stored as a fraction, i.e. units and scale, also, PV appears to violate OMX specs by assuming timestamps are in milliseconds instead of microseconds.

commit fe6a50943f885e065d4061aa727a54417e9f36db
Author: Andreas Huber <andih@google.com>
Date: Wed May 6 14:18:27 2009 -0700

Refactored commandline app instantiation of the decoder.

commit da1ff2724d0e78e8b360d9a2c34c55dd0e2c0492
Author: Andreas Huber <andih@google.com>
Date: Wed May 6 10:41:14 2009 -0700

Proper audio/video synchronization.

commit 569ee3a23f600f4b6b87c6178c0223b06e97f201
Author: Andreas Huber <andih@google.com>
Date: Wed May 6 09:17:20 2009 -0700

Preliminary support for timestamps.

commit e4e302a89207550d8a7170d8c0afbd9c15047c84
Author: Andreas Huber <andih@google.com>
Date: Tue May 5 15:13:12 2009 -0700

Another quick hack job to make CachingDataSource thread-safe as well.

commit dfb376a58bd7c09aa04e89558186fcfe13fe696c
Author: Andreas Huber <andih@google.com>
Date: Tue May 5 15:08:14 2009 -0700

Quick rushjob to make FileSource and SampleTable thread safe.

commit 02b29e7ebdab1f8b959b6c177ceb3b89d998f375
Author: Andreas Huber <andih@google.com>
Date: Mon May 4 17:22:04 2009 -0700

Made video decoding work for mpeg4/h263 and mostly(?) with AVC content.

commit 3a57b8ff15e48f5a0af03bf0a99c32e240dbb7ef
Author: Andreas Huber <andih@google.com>
Date: Mon May 4 09:26:42 2009 -0700

Getting rid of old sample code to drive the OMXNode binder interface.

commit 5b046aed0cf524a57ea711bc1e43ea80e57b2cb3
Author: Andreas Huber <andih@google.com>
Date: Fri May 1 16:21:11 2009 -0700

Moved files from the commandline utility into the framework, renamed MP3Decoder to AudioDecoder

commit 7f3fbba21512a078b732cc52c7bd5ba5acb9a317
Author: Andreas Huber <andih@google.com>
Date: Fri May 1 15:56:19 2009 -0700

Fixed buffer ordering and an off-by-1 error in the SampleTable code. Plays all AACs now :)

commit 024d06baab8f2c540dde16f7e7a4b6dd57f638c7
Author: Andreas Huber <andih@google.com>
Date: Fri May 1 11:52:48 2009 -0700

Some AAC content in .3gp or .mp4 files plays correctly now, other does not. Implemented ESFS parser.

commit 1470427866b0d3e0ce6848b4edc01c13a09be289
Author: Andreas Huber <andih@google.com>
Date: Thu Apr 30 15:19:31 2009 -0700

Another checkpoint, amr decoding now functional.

commit e612d044439f56331b6a2bc4a88622e04d4d42e7
Author: Andreas Huber <andih@google.com>
Date: Wed Apr 29 12:11:29 2009 -0700

string wrapper around String8, various fixes, shoutcast now works again.

commit 2ea52dfb1a39bf3a223ffc87855e54919e2daff7
Author: Andreas Huber <andih@google.com>
Date: Wed Apr 29 11:08:18 2009 -0700

Initial check-in of OMXNode binder interface.

commit 7880d2957f74c0d7fba7679431ff5adb3780543b
Author: Andreas Huber <andih@google.com>
Date: Wed Apr 29 10:05:01 2009 -0700

Initial check-in of both libgenesis2 and the genesis2 commandline tool.
ndroid.mk
udioPlayer.cpp
achingDataSource.cpp
ameraSource.cpp
ataSource.cpp
SDS.cpp
ileSource.cpp
TTPDataSource.cpp
TTPStream.cpp
P3Extractor.cpp
PEG4Extractor.cpp
PEG4Writer.cpp
ediaBuffer.cpp
ediaBufferGroup.cpp
ediaExtractor.cpp
ediaPlayerImpl.cpp
ediaSource.cpp
etaData.cpp
mapSource.cpp
MXClient.cpp
MXDecoder.cpp
ComHardwareRenderer.cpp
ampleTable.cpp
houtcastSource.cpp
oftwareRenderer.cpp
urfaceRenderer.cpp
imeSource.cpp
imedEventQueue.cpp
tils.cpp
mx/Android.mk
mx/OMX.cpp
mx/OMX.h
tring.cpp