• Home
  • History
  • Annotate
  • only in /frameworks/av/media/libstagefright/codecs/
History log of /frameworks/av/media/libstagefright/codecs/
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
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
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
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
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
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
evcdec/SoftHEVC.cpp
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
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
315ac4a8700bc2d8a1da12b94f3a29e887632ce0 08-Jun-2016 Marco Nelissen <marcone@google.com> SoftAAC2: fix crash on all-zero adts buffer

Bug: 29153599
Change-Id: I1cb81c054098b86cf24f024f8479909ca7bc85a6
acdec/SoftAAC2.cpp
d0090759e79208d7203280166018bb7d5d4f9d02 08-Jun-2016 Marco Nelissen <marcone@google.com> Fix potential overflow

Bug: 28533562
Change-Id: I798ab24caa4c81f3ba564cad7c9ee019284fb702
n2/h264dec/source/h264bsd_dpb.c
596e81bc4f32f8a205b4885c03b240b90e7ef090 03-Jun-2016 Marco Nelissen <marcone@google.com> Merge "Turn off signed integer overflow checking for amrwbenc" 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
acdec/SoftAAC2.cpp
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
mrwbenc/Android.mk
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
vcdec/SoftAVCDec.cpp
evcdec/SoftHEVC.cpp
peg2dec/SoftMPEG2.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
n2/dec/SoftVPX.cpp
b4f67b37e9c92fae1af4ade10b1a0a95706db9ef 20-May-2016 Marco Nelissen <marcone@google.com> Merge "Fix yet more overflows in amrwbenc" into nyc-dev
5d453222ae6dcc10efedb1e4805247d7c22a4168 17-May-2016 Marco Nelissen <marcone@google.com> Fix yet more overflows in amrwbenc

Bug: 28786034
Change-Id: I619e63df93a562a1e3b017d07a8414776a00b855
mrwbenc/src/convolve.c
mrwbenc/src/pitch_f4.c
mrwbenc/src/voAMRWBEnc.c
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
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
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
n2/h264dec/source/h264bsd_storage.c
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
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)
peg2dec/SoftMPEG2.cpp
peg2dec/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)
vcdec/SoftAVCDec.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
n2/dec/SoftVPX.cpp
5bdfad1a45a7d5fd03732c75768eef65975660dc 29-Apr-2016 Marco Nelissen <marcone@google.com> Merge "Fix more potential overflows in amrwbenc" into nyc-dev
ef384d17fb870ba3c196b29b858a015c76864578 28-Apr-2016 Marco Nelissen <marcone@google.com> Fix more potential overflows in amrwbenc

Bug: 28268307
Change-Id: Ibe32bee8c73950e3a9cae13bd4b516f9c7428673
mrwbenc/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
mrwb/src/pvamrwbdecoder_basic_op_cequivalent.h
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
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
c002126cb05b1d640c0a0b51bc0de810a62ab2b1 22-Apr-2016 Marco Nelissen <marcone@google.com> Merge "DO NOT MERGE More OMX struct checking" into klp-dev
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
vc/enc/SoftAVCEncoder.cpp
4v_h263/enc/SoftMPEG4Encoder.cpp
n2/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
acdec/SoftAAC2.cpp
vc/enc/SoftAVCEncoder.cpp
4v_h263/enc/SoftMPEG4Encoder.cpp
n2/enc/SoftVPXEncoder.cpp
pus/dec/SoftOpus.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
acdec/SoftAAC2.cpp
acenc/SoftAACEncoder.cpp
acenc/SoftAACEncoder2.cpp
mrnb/dec/SoftAMR.cpp
mrnb/enc/SoftAMRNBEncoder.cpp
mrwbenc/SoftAMRWBEncoder.cpp
vc/enc/SoftAVCEncoder.cpp
lac/enc/SoftFlacEncoder.cpp
711/dec/SoftG711.cpp
sm/dec/SoftGSM.cpp
4v_h263/enc/SoftMPEG4Encoder.cpp
p3dec/SoftMP3.cpp
n2/enc/SoftVPXEncoder.cpp
pus/dec/SoftOpus.cpp
aw/SoftRaw.cpp
orbis/dec/SoftVorbis.cpp
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
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
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
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
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
b818309e1dc687e952b3151b71eecdf15ec92abf 13-Apr-2016 Wonsik Kim <wonsik@google.com> Merge "codecs: fix HEVC resolution change" into nyc-dev
02fd609b7fd54c471ab1f5e77567d60c98e943d1 12-Apr-2016 Wonsik Kim <wonsik@google.com> codecs: fix HEVC resolution change

Bug: 28086758
Change-Id: I3c38b91365b67f2b2125bd1f0876b8080c3eaf64
evcdec/SoftHEVC.cpp
e609fce7eb89da7a7445460493564cef724a7a3f 12-Apr-2016 Robert Shih <robertshih@google.com> SoftVorbis: increase input buffer size

Bug: 27923985
Change-Id: Ifd8d78361a5b0f6ef7d1615f91db5475d8fadc1f
orbis/dec/SoftVorbis.cpp
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
n2/h264dec/inc/H264SwDecApi.h
n2/h264dec/source/DecTestBench.c
n2/h264dec/source/EvaluationTestBench.c
n2/h264dec/source/H264SwDecApi.c
n2/h264dec/source/TestBenchMultipleInstance.c
n2/h264dec/source/h264bsd_decoder.c
n2/h264dec/source/h264bsd_util.h
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
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)
vcdec/SoftAVCDec.cpp
vcdec/SoftAVCDec.h
evcdec/SoftHEVC.cpp
evcdec/SoftHEVC.h
peg2dec/SoftMPEG2.cpp
peg2dec/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
711/dec/SoftG711.cpp
sm/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
711/dec/SoftG711.cpp
sm/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
711/dec/SoftG711.cpp
sm/dec/SoftGSM.cpp
9fde506b8d37bd472969524bcef1d03b24c39c6c 08-Apr-2016 Marco Nelissen <marcone@google.com> Fix print format specifier

Bug: 27793371
Change-Id: Id1bb10e41c2d9107a53dd807a3b7bd83dfafd49c
p3dec/SoftMP3.cpp
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
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
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
25bf5e20ef69cc8944c72d0eb6a4fb58d4bacbfd 07-Apr-2016 Marco Nelissen <marcone@google.com> Fix AMRWBEnc overflow

Bug: 27898843
Change-Id: Ib36833020e9203ef5e8acf18fdde900c0f102978
mrwbenc/src/voAMRWBEnc.c
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
acdec/SoftAAC2.cpp
acdec/SoftAAC2.h
30940b31b21f47eaa15786764e013d0a283d7d49 23-Mar-2016 Marco Nelissen <marcone@google.com> Check mp3 output buffer size

Bug: 27793371
Change-Id: I0fe40a4cfd0a5b488f93d3f3ba6f9495235926ac
p3dec/SoftMP3.cpp
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
acdec/SoftAAC2.cpp
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
4v_h263/dec/SoftMPEG4.cpp
n2/h264dec/SoftAVC.cpp
n2/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
4v_h263/dec/SoftMPEG4.cpp
n2/h264dec/SoftAVC.cpp
n2/h264dec/SoftAVC.h
ff64ea33382081f46d4b1061df00298bbbe3dd65 01-Apr-2016 Wonsik Kim <wonsik@google.com> codecs: fix wrong bug reference

Bug: 27833616
Change-Id: If5f1828ccff1e06aef2040234b86e73cbeba3326
vcdec/SoftAVCDec.cpp
evcdec/SoftHEVC.cpp
peg2dec/SoftMPEG2.cpp
pus/dec/SoftOpus.cpp
orbis/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
evcdec/SoftHEVC.cpp
evcdec/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
vcdec/SoftAVCDec.cpp
vcdec/SoftAVCDec.h
evcdec/SoftHEVC.cpp
evcdec/SoftHEVC.h
peg2dec/SoftMPEG2.cpp
peg2dec/SoftMPEG2.h
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
pus/dec/SoftOpus.cpp
orbis/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
pus/dec/SoftOpus.cpp
orbis/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
orbis/dec/SoftVorbis.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
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
mrwbenc/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
pus/dec/SoftOpus.cpp
orbis/dec/SoftVorbis.cpp
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
vcdec/SoftAVCDec.cpp
vcdec/SoftAVCDec.h
evcdec/SoftHEVC.cpp
evcdec/SoftHEVC.h
peg2dec/SoftMPEG2.cpp
peg2dec/SoftMPEG2.h
ca0cde2597b527083a2f86bda4db00dccaf394d6 28-Mar-2016 Wei Jia <wjia@google.com> Merge "SoftVorbis: fail gracefully when hitting invalid parameter." into nyc-dev
b5ce7ae2857d0ab1767244b9f212f5f3799f5aba 25-Mar-2016 Wei Jia <wjia@google.com> SoftVorbis: fail gracefully when hitting invalid parameter.

Bug: 27843650
Change-Id: I0150414854da6a5e61bc13f5cb5ff470b8e35894
orbis/dec/SoftVorbis.cpp
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
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
mrnb/dec/SoftAMR.cpp
14cbc370f37e0ab84b7b470470310a985526cf26 23-Mar-2016 Lajos Molnar <lajos@google.com> Merge "ACodec: enable support for non-16bit PCM data" into nyc-dev
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.
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
aw/SoftRaw.cpp
aw/SoftRaw.h
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.
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.
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.
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.
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.
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
mrnb/dec/SoftAMR.cpp
mrnb/dec/src/amrdecode.h
mrnb/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
mrnb/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
n2/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
n2/enc/SoftVPXEncoder.cpp
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
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
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
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
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
mrwbenc/inc/basic_op.h
mrwbenc/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
n2/dec/SoftVPX.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
n2/dec/SoftVPX.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
n2/dec/SoftVPX.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
vcenc/SoftAVCEnc.cpp
9515aca0c07a32128a65a68749bda3ea6851c109 24-Feb-2016 Doney Alex <doney.alex@ittiam.com> DO NOT MERGE SoftAvcEnc: Added support for Constrained intra prediction.

Change-Id: I1a3e8fbad0bea728311c2b4b0513c9565ecf9a14
vcenc/SoftAVCEnc.cpp
vcenc/SoftAVCEnc.h
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
vcenc/SoftAVCEnc.cpp
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
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
423766ca07beb7e3e9cd301385708ca13fcce3e1 29-Feb-2016 Marco Nelissen <marcone@google.com> DO NOT MERGE Verify OMX buffer sizes prior to access

Bug: 27207275
Change-Id: I4412825d1ee233d993af0a67708bea54304ff62d
acdec/SoftAAC2.cpp
acenc/SoftAACEncoder.cpp
acenc/SoftAACEncoder2.cpp
mrnb/dec/SoftAMR.cpp
mrnb/enc/SoftAMRNBEncoder.cpp
mrwbenc/SoftAMRWBEncoder.cpp
vc/enc/SoftAVCEncoder.cpp
lac/enc/SoftFlacEncoder.cpp
711/dec/SoftG711.cpp
sm/dec/SoftGSM.cpp
4v_h263/enc/SoftMPEG4Encoder.cpp
p3dec/SoftMP3.cpp
n2/enc/SoftVPXEncoder.cpp
aw/SoftRaw.cpp
orbis/dec/SoftVorbis.cpp
51f59b41eae9c4f493ebfd0972cee951895bdf19 29-Feb-2016 Marco Nelissen <marcone@google.com> DO NOT MERGE Verify OMX buffer sizes prior to access

Bug: 27207275
Change-Id: I4412825d1ee233d993af0a67708bea54304ff62d
acdec/SoftAAC2.cpp
acenc/SoftAACEncoder.cpp
acenc/SoftAACEncoder2.cpp
mrnb/dec/SoftAMR.cpp
mrnb/enc/SoftAMRNBEncoder.cpp
mrwbenc/SoftAMRWBEncoder.cpp
vc/enc/SoftAVCEncoder.cpp
lac/enc/SoftFlacEncoder.cpp
711/dec/SoftG711.cpp
sm/dec/SoftGSM.cpp
4v_h263/enc/SoftMPEG4Encoder.cpp
p3dec/SoftMP3.cpp
n2/enc/SoftVPXEncoder.cpp
aw/SoftRaw.cpp
orbis/dec/SoftVorbis.cpp
f1a2668f4f09e38722424a6a74f0ea26f49e4110 29-Feb-2016 Marco Nelissen <marcone@google.com> DO NOT MERGE Verify OMX buffer sizes prior to access

Bug: 27207275
Change-Id: I4412825d1ee233d993af0a67708bea54304ff62d
acdec/SoftAAC2.cpp
acenc/SoftAACEncoder.cpp
acenc/SoftAACEncoder2.cpp
mrnb/dec/SoftAMR.cpp
mrnb/enc/SoftAMRNBEncoder.cpp
mrwbenc/SoftAMRWBEncoder.cpp
vc/enc/SoftAVCEncoder.cpp
vcenc/SoftAVCEnc.cpp
lac/enc/SoftFlacEncoder.cpp
711/dec/SoftG711.cpp
sm/dec/SoftGSM.cpp
4v_h263/enc/SoftMPEG4Encoder.cpp
p3dec/SoftMP3.cpp
n2/enc/SoftVPXEncoder.cpp
pus/dec/SoftOpus.cpp
aw/SoftRaw.cpp
orbis/dec/SoftVorbis.cpp
2720c8b094cfa58de314daa8e5e4fb4fa81fe3b2 29-Feb-2016 Marco Nelissen <marcone@google.com> Verify OMX buffer sizes prior to access

Bug: 27207275
Change-Id: I4412825d1ee233d993af0a67708bea54304ff62d
acdec/SoftAAC2.cpp
acenc/SoftAACEncoder.cpp
acenc/SoftAACEncoder2.cpp
mrnb/dec/SoftAMR.cpp
mrnb/enc/SoftAMRNBEncoder.cpp
mrwbenc/SoftAMRWBEncoder.cpp
vc/enc/SoftAVCEncoder.cpp
vcdec/SoftAVCDec.cpp
vcenc/SoftAVCEnc.cpp
lac/enc/SoftFlacEncoder.cpp
711/dec/SoftG711.cpp
sm/dec/SoftGSM.cpp
evcdec/SoftHEVC.cpp
4v_h263/enc/SoftMPEG4Encoder.cpp
p3dec/SoftMP3.cpp
n2/enc/SoftVPXEncoder.cpp
pus/dec/SoftOpus.cpp
aw/SoftRaw.cpp
orbis/dec/SoftVorbis.cpp
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
n2/dec/SoftVPX.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
vcenc/SoftAVCEnc.cpp
vcenc/SoftAVCEnc.h
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
vcenc/SoftAVCEnc.cpp
vcenc/SoftAVCEnc.h
664041339740874917944c850b113656236edda6 06-Feb-2016 Hangyu Kuang <hkuang@google.com> Merge "stagefright: Support intra refresh in SoftAVC video encoder."
870aff9bd2442c8877f5d6b12c73032b5f24535a 28-Jan-2016 Hangyu Kuang <hkuang@google.com> stagefright: Support intra refresh in SoftAVC video encoder.

Bug: 26587630

Change-Id: Ia04dab11978fd8cc5d68bf721900775e13987a9a
vcenc/SoftAVCEnc.cpp
vcenc/SoftAVCEnc.h
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
acenc/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
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
mrwbenc/inc/basic_op.h
mrwbenc/src/c2t64fx.c
mrwbenc/src/c4t64fx.c
mrwbenc/src/cor_h_x.c
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
mrwbenc/Android.mk
mrwbenc/src/c4t64fx.c
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
mrwbenc/Android.mk
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
aw/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
n2/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
n2/dec/SoftVPX.cpp
05dc55452066f01b1c941ae0ef3c50a732dccede 13-Jan-2016 Ronghua Wu <ronghuawu@google.com> Merge "vorbis: reset codec state after a flush"
3d827263f2f471d65f8b5c0ee57cae77f0f8f343 13-Jan-2016 Ronghua Wu <ronghuawu@google.com> vorbis: reset codec state after a flush

Bug: 23361053
Change-Id: I163b356935a8574b3bfff94e9bcdeff08e6e0ddb
orbis/dec/SoftVorbis.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)
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>
acenc/Android.mk
mrwbenc/Android.mk
ommon/Config.mk
p3dec/Android.mk
n2/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
n2/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
mrwbenc/Android.mk
89a3d233da8c7166e64afe4249130ceda670339c 05-Jan-2016 Marco Nelissen <marcone@google.com> Fix more potential (benign) AMRWB overflows

Bug: 25843966
Change-Id: I18003aa20be1ff0a93473ecd8b4995861bed8c89
mrwbenc/inc/basic_op.h
mrwbenc/src/updt_tar.c
9f6cffe4ffbbe354187c241f3a7b14ae7c252726 12-Dec-2015 Marco Nelissen <marcone@google.com> Fix more amrwbenc overflows

Bug: 25843966
Change-Id: I16aa3eb0fc4c8d507b92d3a84139cfef6302c96c
mrwbenc/src/deemph.c
mrwbenc/src/math_op.c
mrwbenc/src/p_med_ol.c
mrwbenc/src/voAMRWBEnc.c
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
mrwbenc/src/deemph.c
mrwbenc/src/math_op.c
mrwbenc/src/p_med_ol.c
mrwbenc/src/voAMRWBEnc.c
e35ff4de22fec058d57f694e86b906ca8b8007dd 10-Dec-2015 Wei Jia <wjia@google.com> SoftVPXEncoder: keep mCodecContext as NULL when initEncoder fail.

Change-Id: I7d66942f03fee05959a9fe3a3013f0a70594c954
n2/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)
4v_h263/enc/SoftMPEG4Encoder.cpp
n2/enc/SoftVPXEncoder.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
mrwbenc/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
mrwbenc/inc/acelp.h
mrwbenc/inc/basic_op.h
mrwbenc/inc/bits.h
mrwbenc/inc/cod_main.h
mrwbenc/inc/dtx.h
mrwbenc/inc/log2.h
mrwbenc/inc/main.h
mrwbenc/inc/math_op.h
mrwbenc/inc/mem_align.h
mrwbenc/inc/p_med_o.h
mrwbenc/inc/q_pulse.h
mrwbenc/inc/stream.h
mrwbenc/inc/wb_vad.h
mrwbenc/inc/wb_vad_c.h
mrwbenc/src/autocorr.c
mrwbenc/src/az_isp.c
mrwbenc/src/bits.c
mrwbenc/src/c2t64fx.c
mrwbenc/src/c4t64fx.c
mrwbenc/src/convolve.c
mrwbenc/src/cor_h_x.c
mrwbenc/src/decim54.c
mrwbenc/src/deemph.c
mrwbenc/src/dtx.c
mrwbenc/src/g_pitch.c
mrwbenc/src/gpclip.c
mrwbenc/src/homing.c
mrwbenc/src/hp400.c
mrwbenc/src/hp50.c
mrwbenc/src/hp6k.c
mrwbenc/src/hp_wsp.c
mrwbenc/src/int_lpc.c
mrwbenc/src/isp_az.c
mrwbenc/src/isp_isf.c
mrwbenc/src/lag_wind.c
mrwbenc/src/levinson.c
mrwbenc/src/log2.c
mrwbenc/src/lp_dec2.c
mrwbenc/src/math_op.c
mrwbenc/src/mem_align.c
mrwbenc/src/oper_32b.c
mrwbenc/src/p_med_ol.c
mrwbenc/src/pit_shrp.c
mrwbenc/src/pitch_f4.c
mrwbenc/src/pred_lt4.c
mrwbenc/src/preemph.c
mrwbenc/src/q_gain2.c
mrwbenc/src/q_pulse.c
mrwbenc/src/qisf_ns.c
mrwbenc/src/qpisf_2s.c
mrwbenc/src/random.c
mrwbenc/src/residu.c
mrwbenc/src/scale.c
mrwbenc/src/stream.c
mrwbenc/src/syn_filt.c
mrwbenc/src/updt_tar.c
mrwbenc/src/util.c
mrwbenc/src/voAMRWBEnc.c
mrwbenc/src/voicefac.c
mrwbenc/src/wb_vad.c
mrwbenc/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
mrwbenc/src/c2t64fx.c
mrwbenc/src/c4t64fx.c
mrwbenc/src/deemph.c
mrwbenc/src/preemph.c
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
mrwbenc/src/c2t64fx.c
mrwbenc/src/c4t64fx.c
mrwbenc/src/deemph.c
mrwbenc/src/preemph.c
bbe860d522c7ce46eff6de49dab2ff7e4059a3d8 08-Dec-2015 Marco Nelissen <marcone@google.com> Fix integer overflow in amrwbenc

Bug: 25843966
Change-Id: Ib9b37712819d776496b7a06b9e85c5d1e43f9d25
mrwbenc/src/preemph.c
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)
4v_h263/enc/SoftMPEG4Encoder.cpp
n2/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)
4v_h263/enc/SoftMPEG4Encoder.cpp
n2/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)
4v_h263/enc/SoftMPEG4Encoder.cpp
n2/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.
883ff4f4c41ae9bf84d1912ab054fe38f7505dd0 03-Dec-2015 Marco Nelissen <marcone@google.com> Ignore benign overflows

Bug: 25843966
Change-Id: I40fe7aee3f40f224c0984a9bbeefb99d364345ac
mrwbenc/src/c4t64fx.c
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
4v_h263/enc/SoftMPEG4Encoder.cpp
n2/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
p3dec/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
mrnb/dec/Android.mk
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
p3dec/Android.mk
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.
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."
863a726ba8853ba7daba1e792d257be82ef0cdbb 07-Nov-2015 Dan Austin <danielaustin@google.com> Enable fsanitize unsigned-integer-overflow in soft FLAC encoder.

Bug: 23110888
Change-Id: I4c06c4c77207264c6b7bda925903a7ae07dc9b39
lac/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
p3dec/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
n2/dec/Android.mk
n2/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
pus/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
aw/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
orbis/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
acenc/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
mrnb/common/Android.mk
mrnb/enc/Android.mk
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
9cc6bb627e9683149f3d3f0609a83b8f14be7fde 03-Nov-2015 Dan Austin <danielaustin@google.com> Merge "Enable fsanitize unsigned-integer-overflow in GSM 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
sm/dec/Android.mk
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
711/dec/Android.mk
711/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
mrnb/common/Android.mk
mrnb/common/src/az_lsp.cpp
mrnb/common/src/sub.cpp
mrnb/common/src/syn_filt.cpp
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
acenc/AACEncoder.cpp
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
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.
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.
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
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
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
4v_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
4v_h263/dec/Android.mk
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
4v_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
n2/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
n2/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
n2/h264dec/Android.mk
1c38d8d16b6a44d64b3fb14d24f339971848c085 26-Oct-2015 Dan Austin <danielaustin@google.com> Enable fsanitize signed-integer-overflow in Soft MPEG3 decoder

Bug: 23752600
Change-Id: I9922b1b670d142c060764aada1670f38e7ce5de4
p3dec/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
peg2dec/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.
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
aw/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
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
3ae0a38a076d1a99d323c955d2d236bc7e53b460 26-Oct-2015 Dan Austin <danielaustin@google.com> Enable fsanitize signed-integer-overflow in Soft Opus decoder

Bug: 23756200
Change-Id: If4ace61bbf55424866fbf21a20007eac55dbd8ba
pus/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
orbis/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
evcdec/Android.mk
b64694b04abe4a6da350d4a89c36cf888425bd60 26-Oct-2015 Dan Austin <danielaustin@google.com> Enable fsanitize signed-integer-overflow in GSM decoder

Bug: 23752600
Change-Id: I1585689e35e3677dfef2e12115922d1ba18c26c0
sm/dec/Android.mk
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
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
711/dec/Android.mk
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
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
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"
b3d9f56313f1838649712297ebc8205c4ec14870 09-Oct-2015 Marco Nelissen <marcone@google.com> Reconcile with master after mass cherrypicks

Change-Id: I74649c9771212aa6309ea16c253723994b8e3622
vcenc/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
vcdec/SoftAVCDec.cpp
b4ec8d0558c78b94ec7bf09018a7bf653cfca525 02-Oct-2015 Harish Mahendrakar <harish.mahendrakar@ittiam.com> SoftAVCDec: Added a check for unsupported resolutions

Bug: 24542936

Change-Id: I97203353c7d026e02c8aad0f2c820a641e453c7c
vcdec/SoftAVCDec.cpp
ec62e13719cfbd663fd8b63a110747a2630e582c 01-Sep-2015 Harish Mahendrakar <harish.mahendrakar@ittiam.com> SoftHEVCDec: Reduced memory requirements

Change-Id: I8b5205dd8a149a02f78fb55fc3121daf4e69791a
evcdec/SoftHEVC.cpp
evcdec/SoftHEVC.h
a3f29527044ad61ae8e38b93ab9355a20c5fd2c0 13-Aug-2015 Harish Mahendrakar <harish.mahendrakar@ittiam.com> SoftMPEG2Dec: Added support for deinterlacer

Bug: 20932810

Change-Id: I16eadda6f26e73ed89c878d52c38bb43d84bfe40
peg2dec/SoftMPEG2.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.
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
mrwbenc/src/c2t64fx.c
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
vcdec/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
evcdec/SoftHEVC.cpp
evcdec/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"
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
mrwbenc/inc/basic_op.h
99e5e3b00291f2f7010a96dcdf014f4aa337ee23 02-Oct-2015 Harish Mahendrakar <harish.mahendrakar@ittiam.com> SoftAVCDec: Added a check for unsupported resolutions

Change-Id: I97203353c7d026e02c8aad0f2c820a641e453c7c
vcdec/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
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
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
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
257b3bc581bbc65318a4cc2d3c22a07a4429dc1d 05-Oct-2015 Marco Nelissen <marcone@google.com> Don't crash when there's no conceal frame

Bug: 24630158
Change-Id: If042aebebb58c218eb7bbf01dcddbcbd05dca1d6
4v_h263/dec/src/conceal.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
mrnb/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
mrwb/Android.mk
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
lac/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
vc/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
vc/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
vcdec/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
vcenc/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
mrnb/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
mrwbenc/Android.mk
ab9362826ee8957d77706d6d807db515768bfa89 11-Sep-2015 Dan Austin <danielaustin@google.com> Enable fsanitize signed-integer-overflow in AMR-NB common

Bug: 23752600
Change-Id: Idde4f45210d45965e687a52dd5d257a1909c2cdd
mrnb/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
mrnb/enc/Android.mk
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
acenc/Android.mk
d056e252969203c4627a870227448b118067a18e 24-Sep-2015 Dan Austin <danielaustin@google.com> Enable fsanitize unsigned-integer-overflow in AAC decoder

Bug: 23110888
Change-Id: I61a96900d79d244f04f83ba2d5ca8afde8db68a5
acdec/Android.mk
e6acb3859969660b7888fc949d69880f5e1a1d0a 11-Sep-2015 Dan Austin <danielaustin@google.com> Enable fsanitize signed-integer-overflow in AAC encoder

Bug: 23752600
Change-Id: I9f607d60b8c7bc93cb34af5f70305caf56df57ec
acenc/Android.mk
90e1e02ae6dc5379d479709c0283c2ef057d7376 11-Sep-2015 Dan Austin <danielaustin@google.com> Enable fsanitize signed-integer-overflow in AAC decoder

Bug: 23752600
Change-Id: Iede249b25e7a6977c20bbcce30f8fb7475d2fa84
acdec/Android.mk
6eda0b5770eeb215d0a37ef1478c5541bd8067fd 04-Aug-2015 Harish Mahendrakar <harish.mahendrakar@ittiam.com> SoftAVCDec: Reduced memory requirements

Bug: 24221026

Change-Id: I2aaaf88e7dc9a30156764f83a81fc0cad00142f9
vcdec/SoftAVCDec.cpp
vcdec/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
mrnb/dec/Android.mk
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.
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.
1277aea8405ea3256a2b0f730506c4610cadafa4 15-Sep-2015 Marco Nelissen <marcone@google.com> Make SoftVorbis fail more gracefully on errors

Change-Id: Idf047810580387a9e04a71ec27a5dd0cd910bc43
orbis/dec/SoftVorbis.cpp
orbis/dec/SoftVorbis.h
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.
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.
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)
mrnb/dec/src/a_refl.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
mrnb/dec/Android.mk
mrnb/dec/src/a_refl.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
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
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
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)
n2/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)
n2/dec/SoftVPX.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."
53766eb16e1e98bd101a7f8942fc16270febc0c6 13-Aug-2015 Harish Mahendrakar <harish.mahendrakar@ittiam.com> SoftMPEG2Dec: Added support for deinterlacer

Change-Id: I16eadda6f26e73ed89c878d52c38bb43d84bfe40
peg2dec/SoftMPEG2.cpp
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"
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.
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.
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.
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.
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)
4v_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
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.
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.
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.
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
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
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.
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.
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.
d7bb1cd786e5ea4ac61119cc1a08082474f7787b 20-Aug-2015 Wei Jia <wjia@google.com> libstagefright: fix overflow in pvdec_api.cpp.

Bug: 20674086
Change-Id: Ie2c711865c3b92f3fa2f3c7a436fa0e3687eb8b3
4v_h263/dec/src/pvdec_api.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
n2/h264dec/Android.mk
n2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_Average_4x_Align_unsafe_s.S
n2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_DeblockingChroma_unsafe_s.S
n2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_DeblockingLuma_unsafe_s.S
n2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_DecodeCoeffsToPair_s.S
n2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_InterpolateLuma_Align_unsafe_s.S
n2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_InterpolateLuma_Copy_unsafe_s.S
n2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_InterpolateLuma_DiagCopy_unsafe_s.S
n2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_InterpolateLuma_HalfDiagHorVer4x4_unsafe_s.S
n2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_InterpolateLuma_HalfDiagVerHor4x4_unsafe_s.S
n2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_InterpolateLuma_HalfHor4x4_unsafe_s.S
n2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_InterpolateLuma_HalfVer4x4_unsafe_s.S
n2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_Interpolate_Chroma_s.S
n2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_TransformResidual4x4_s.S
n2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_UnpackBlock4x4_s.S
n2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/omxVCM4P10_DeblockLuma_I.S
n2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/omxVCM4P10_DequantTransformResidualFromPairAndAdd_s.S
n2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/omxVCM4P10_FilterDeblockingChroma_HorEdge_I_s.S
n2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/omxVCM4P10_FilterDeblockingChroma_VerEdge_I_s.S
n2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/omxVCM4P10_FilterDeblockingLuma_HorEdge_I_s.S
n2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/omxVCM4P10_FilterDeblockingLuma_VerEdge_I_s.S
n2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/omxVCM4P10_InterpolateLuma_s.S
n2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/omxVCM4P10_PredictIntraChroma_8x8_s.S
n2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/omxVCM4P10_PredictIntra_16x16_s.S
n2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/omxVCM4P10_PredictIntra_4x4_s.S
n2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/omxVCM4P10_TransformDequantChromaDCFromPair_s.S
n2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/omxVCM4P10_TransformDequantLumaDCFromPair_s.S
n2/h264dec/source/arm_neon_asm_gcc/asm_common.S
n2/h264dec/source/arm_neon_asm_gcc/h264bsdClearMbLayer.S
n2/h264dec/source/arm_neon_asm_gcc/h264bsdCountLeadingZeros.S
n2/h264dec/source/arm_neon_asm_gcc/h264bsdFillRow7.S
n2/h264dec/source/arm_neon_asm_gcc/h264bsdFlushBits.S
n2/h264dec/source/arm_neon_asm_gcc/h264bsdWriteMacroblock.S
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.
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.
595fede0cf7b53b4d3f51d72df8d66fd7ff14d1c 18-Aug-2015 Wei Jia <wjia@google.com> libstagefright: fix overflow in SoftAVCEnc.

Bug: 20674674
Change-Id: I8e320218180926d46d223cb72523118079f72342
vcenc/SoftAVCEnc.cpp
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
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
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
9359e82213e6027b2390b76ba30e2e44f0d5cec6 18-Aug-2015 Abhishek Arya <aarya@google.com> am 8a34499a: am c23e3dd8: Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4

* commit '8a34499ab9987d962040881b4c8d66b655f65ae0':
Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4
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
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.
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.
91860b89488b3ee4644c539e89e657fbb79fb6ad 18-Aug-2015 Wei Jia <wjia@google.com> SoftAVCEncoder: fix auto merge error, member names have changed.

Bug: 20674674
Change-Id: I511c22d59789e1cc3a21fe13ea08ac3752e737c6
vc/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.
38eff9af5c032bf12f89d6e94df05f65eef51afc 18-Aug-2015 Wei Jia <wjia@google.com> SoftAVCEncoder: fix mismatched type for comparison.

Bug: 20674674
Change-Id: Iace5b8c882339b3a9d2e706375255aeeeb0532fe
vc/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"
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.
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
4v_h263/dec/src/pvdec_api.cpp
4v_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
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.
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."
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.
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
4v_h263/dec/src/pvdec_api.cpp
4v_h263/enc/src/mp4enc_api.cpp
c23e3dd8af7397f023aae040c4a03dd14091cbed 17-Aug-2015 Abhishek Arya <aarya@google.com> Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4

BUG: 20674086
Change-Id: Idaff17975b327adea65c39bdba1ab4e88789c0cd
4v_h263/dec/src/pvdec_api.cpp
4v_h263/enc/src/mp4enc_api.cpp
567b6551f8bc240cc267054ea5de55c46f10cc29 17-Aug-2015 Wei Jia <wjia@google.com> Merge "SoftAVCEnc: check requested memory size before allocation." into klp-dev
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)
vc/enc/SoftAVCEncoder.cpp
98e68e84f173aba6967770629d3ea7991a1dfb91 16-Aug-2015 Wei Jia <wjia@google.com> Revert "SoftAVCEnc: check requested memory size before allocation."

This reverts commit 479b4de0d267eb7d4c419f4da0069186a952ad17.

Change-Id: I014746db3f861cb1cd5bf1b76f86b0356836a128
vc/enc/SoftAVCEncoder.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)
pus/dec/SoftOpus.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)
vc/enc/SoftAVCEncoder.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)
4v_h263/dec/src/pvdec_api.cpp
4v_h263/enc/src/mp4enc_api.cpp
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.
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)
mrwbenc/src/util.c
98841d360524c3049a3b205cb975d937e2619700 13-Aug-2015 Ian Pedowitz <ijpedowitz@google.com> resolved conflicts for merge of bb37e84f to mnc-dev-plus-aosp

Change-Id: I90940a50d55395bfd61d5a5e21fac3aa0982ba40
5c4a35a9f58bd97b44e0905639b7f4f20d92cda0 13-Aug-2015 Bart Sears <bsears@google.com> resolved conflicts for merge of c1fdbd41 to mnc-dr-dev-plus-aosp

Change-Id: I96731df91a7f2646de26f21d3b984c3f58da3373
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
mrnb/common/Android.mk
mrnb/common/include/bytesused.h
mrnb/common/src/bytesused.cpp
mrnb/common/src/overflow_tbl.cpp
vc/enc/src/findhalfpel.cpp
n2/dec/SoftVPX.cpp
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
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
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
mrwbenc/src/util.c
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
mrnb/common/Android.mk
mrnb/common/include/bytesused.h
mrnb/common/src/bytesused.cpp
mrnb/common/src/overflow_tbl.cpp
vc/enc/src/findhalfpel.cpp
n2/dec/SoftVPX.cpp
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>
vc/enc/Android.mk
vc/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>
4v_h263/enc/Android.mk
4v_h263/enc/test/m4v_h263_enc_test.cpp
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
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>
mrwb/Android.mk
mrwb/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>
mrwbenc/Android.mk
mrwbenc/SampleCode/AMRWB_E_SAMPLE.c
mrwbenc/SampleCode/Android.mk
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
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>
mrnb/enc/Android.mk
mrnb/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>
p3dec/Android.mk
p3dec/test/mp3dec_test.cpp
p3dec/test/mp3reader.cpp
p3dec/test/mp3reader.h
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
mrnb/enc/src/l_negate.cpp
4d29fa302b4a93de9f4fc92b8054bae7b42688ac 04-Aug-2015 Harish Mahendrakar <harish.mahendrakar@ittiam.com> SoftAVCDec: Reduced memory requirements

Change-Id: I2aaaf88e7dc9a30156764f83a81fc0cad00142f9
vcdec/SoftAVCDec.cpp
vcdec/SoftAVCDec.h
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
vcdec/SoftAVCDec.cpp
evcdec/SoftHEVC.cpp
peg2dec/SoftMPEG2.cpp
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
vcenc/SoftAVCEnc.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"
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
vcdec/SoftAVCDec.cpp
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.
1640bd2d959432ce2b06a99e2a14e8c5c74efce2 14-Jul-2015 Ronghua Wu <ronghuawu@google.com> libstagefright: remove CHECK from SoftHEVC ctor.

Bug: 22478679
Change-Id: I81933856d1217a23b256cac83a6ee3924b409d31
evcdec/SoftHEVC.cpp
evcdec/SoftHEVC.h
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"
90599b61289fbeda8312e6633c551a6e3d1a0ada 25-Jun-2015 Hamsalekha S <hamsalekha.s@ittiam.com> SoftAVCDec: fail gracefully in onQueueFilled

Bug: 21942104
Change-Id: Ia3b16b39b53c3a4678f4bba9e80dd0a715409520
vcdec/SoftAVCDec.cpp
vcdec/SoftAVCDec.h
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
vcdec/SoftAVCDec.cpp
4v_h263/dec/SoftMPEG4.cpp
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.
f3a5cf243fc2608c0d5dc4984806a4a8176455cf 25-Jun-2015 Robert Shih <robertshih@google.com> SoftAVCDec: fail gracefully in onQueueFilled

Bug: 21942104
Change-Id: Ia3b16b39b53c3a4678f4bba9e80dd0a715409520
vcdec/SoftAVCDec.cpp
vcdec/SoftAVCDec.h
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
mrwbenc/src/util.c
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
vcdec/SoftAVCDec.cpp
evcdec/SoftHEVC.cpp
peg2dec/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
c015b84e5d6f5d1e116d71bfbd3bd8edc3b06511 01-Jun-2015 Andy Hung <hunga@google.com> Fix SoftMP3 divide by 0

Bug: 21525346
Change-Id: I19f1ec0f4e9571bd6aeb26efbcba5f16dc664e47
p3dec/SoftMP3.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
vcenc/SoftAVCEnc.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
vcenc/SoftAVCEnc.cpp
vcenc/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
vcdec/SoftAVCDec.cpp
vcdec/SoftAVCDec.h
vcenc/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."
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
vcdec/SoftAVCDec.cpp
n2/dec/SoftVPX.cpp
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
pus/dec/SoftOpus.cpp
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
vcenc/SoftAVCEnc.cpp
vcenc/SoftAVCEnc.h
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
vcdec/SoftAVCDec.cpp
vcdec/SoftAVCDec.h
vcenc/SoftAVCEnc.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.
ca097142ba4664858bc29bb538bcfcf5ea03ebe7 09-Jun-2015 Wei Jia <wjia@google.com> Merge "libstagefright: check memory size for overflow before allocation." 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
4v_h263/dec/src/pvdec_api.cpp
4v_h263/enc/src/mp4enc_api.cpp
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.
f6fe4340219a8e674f3250fe32d4697ec8184b24 04-Jun-2015 Wei Jia <wjia@google.com> SoftAVCEnc: check requested memory size before allocation.

Bug: 20674674
Change-Id: I569e7a9b33fe64779a40e55539929c3dc4303c19
vcenc/SoftAVCEnc.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."
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
pus/dec/SoftOpus.cpp
11aaefb57fdd0076eb5484c3c5bd3bff5f6cb5e0 03-Jun-2015 Marco Nelissen <marcone@google.com> SoftAVCDec: Added support for level greater than level at init

Bug: 21144884

Change-Id: Idda3fbf6c30e99d6df2b1e53a1f65c8ec55586ce
vcdec/SoftAVCDec.cpp
vcdec/SoftAVCDec.h
305a12e403d3ae7e12df0d9218c152f9bb423af0 30-May-2015 Andy Hung <hunga@google.com> Merge "libstagefright: Reset AMR decoder on input port flush" into mnc-dev
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
mrnb/dec/SoftAMR.cpp
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
vcenc/SoftAVCEnc.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
mrwbenc/Android.mk
mrwbenc/src/asm/ARMV5E/Deemph_32_opt.s
mrwbenc/src/asm/ARMV5E/Dot_p_opt.s
mrwbenc/src/asm/ARMV5E/Filt_6k_7k_opt.s
mrwbenc/src/asm/ARMV5E/Norm_Corr_opt.s
mrwbenc/src/asm/ARMV5E/Syn_filt_32_opt.s
mrwbenc/src/asm/ARMV5E/convolve_opt.s
mrwbenc/src/asm/ARMV5E/cor_h_vec_opt.s
mrwbenc/src/asm/ARMV5E/pred_lt4_1_opt.s
mrwbenc/src/asm/ARMV5E/residu_asm_opt.s
mrwbenc/src/asm/ARMV5E/scale_sig_opt.s
mrwbenc/src/asm/ARMV5E/syn_filt_opt.s
mrwbenc/src/asm/ARMV7/Deemph_32_neon.s
mrwbenc/src/asm/ARMV7/Dot_p_neon.s
mrwbenc/src/asm/ARMV7/Filt_6k_7k_neon.s
mrwbenc/src/asm/ARMV7/Norm_Corr_neon.s
mrwbenc/src/asm/ARMV7/Syn_filt_32_neon.s
mrwbenc/src/asm/ARMV7/convolve_neon.s
mrwbenc/src/asm/ARMV7/cor_h_vec_neon.s
mrwbenc/src/asm/ARMV7/pred_lt4_1_neon.s
mrwbenc/src/asm/ARMV7/residu_asm_neon.s
mrwbenc/src/asm/ARMV7/scale_sig_neon.s
mrwbenc/src/asm/ARMV7/syn_filt_neon.s
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
vcdec/SoftAVCDec.cpp
vcdec/SoftAVCDec.h
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)
acdec/SoftAAC2.cpp
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
48d41f651f4ef761a7477eac404e195a7fac0c8f 05-May-2015 Ronghua Wu <ronghuawu@google.com> Merge "SoftVPXEncoder: don't skip the last input buffer with eos flag." into mnc-dev
df0ebf5f9ea5c16aaec4752bdf06af101cc541b8 28-Apr-2015 Harish Mahendrakar <harish.mahendrakar@ittiam.com> SoftAVCEnc: Removed alignment requirement on input width

Change-Id: Id6e1abf588420beec6f1af4394b69b2e53487299
vcenc/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
orbis/dec/SoftVorbis.cpp
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
n2/enc/SoftVPXEncoder.cpp
ec7398f371d35a8801c29eb303c14ec85a6e5a9e 28-Apr-2015 Harish Mahendrakar <harish.mahendrakar@ittiam.com> SoftAVCEnc: Removed alignment requirement on input width

Change-Id: Id6e1abf588420beec6f1af4394b69b2e53487299
vcenc/SoftAVCEnc.cpp
a37f84ecce59a0d11a687b55527ccb18d4db7f52 24-Apr-2015 Evgenii Stepanov <eugenis@google.com> Fix new[] vs delete mismatch.

Detected with AddressSanitizer.

Bug: 18202869
Change-Id: I7fa9ee722766968e33faa4d9312385ca303ca274
acdec/SoftAAC2.cpp
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
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
peg2dec/SoftMPEG2.cpp
peg2dec/SoftMPEG2.h
ee4e1b1a63758941460ae79a064249d3a5189443 17-Apr-2015 Lajos Molnar <lajos@google.com> stagefright: warnings be gone, some are now errors, use clang

Change-Id: I81f438ae444f04c12ae27ae4ef6d073033de172c
vcdec/SoftAVCDec.cpp
vcenc/SoftAVCEnc.cpp
vcenc/SoftAVCEnc.h
evcdec/SoftHEVC.cpp
peg2dec/SoftMPEG2.cpp
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
22b3b44ae459974794403ed0f76d95ae43d92985 03-Apr-2015 Venkatarama Avadhani <venkatarama.avadhani@ittiam.com> stagefright: add SoftAVCEnc using libavc

Change-Id: Ic51e92e9d86db21109b8714e822697869e184cd1
vcenc/Android.mk
vcenc/SoftAVCEnc.cpp
vcenc/SoftAVCEnc.h
e5b9b3db87a55d3430f881ba59ba95f7d6ae41d0 02-Apr-2015 Venkatarama Avadhani <venkatarama.avadhani@ittiam.com> stagefright: add SoftAVCDec using libavc

Change-Id: Ie808aa82c624dbbcaeb6b41662c9b7770bc80bd9
vcdec/Android.mk
vcdec/SoftAVCDec.cpp
vcdec/SoftAVCDec.h
8f9d9d06ed6c8447c7fd02745b2a22dd4bba8e7e 31-Mar-2015 Venkatarama Avadhani <venkatarama.avadhani@ittiam.com> stagefright: add SoftMPEG2 decoder using libmpeg2

Change-Id: I74f5f4a1e6d7be8df45bcbc83a965111454b97ea
peg2dec/Android.mk
peg2dec/SoftMPEG2.cpp
peg2dec/SoftMPEG2.h
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
n2/dec/SoftVPX.cpp
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
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
711/dec/SoftG711.cpp
711/dec/SoftG711.h
434a6094f69542257864b4f4223ce915c77976b1 08-Mar-2015 Chong Zhang <chz@google.com> SoftAAC2: reset EOS status after a flush

bug:19656539
Change-Id: I27f41d885f4fd5bb5a0e29510f808fb84a0f75f3
acdec/SoftAAC2.cpp
0e225c442d8603afb55dc2567a7144ccb675b01e 04-Mar-2015 Chong Zhang <chz@google.com> SoftAAC2: calculate timestamp from aacSampleRate

bug: 19602975
Change-Id: Ie2e5a61d627980762080c4a8701b578143d123fa
acdec/SoftAAC2.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
sm/dec/SoftGSM.cpp
sm/dec/SoftGSM.h
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
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
78e52bfac041d71ce53b5b13c2abf78af742b09d 06-Feb-2015 Lajos Molnar <lajos@google.com> stagefright: change licensing headers on h264dec omxdl sources

Bug: 19030684
Change-Id: I6d4674fad126c26d3b6819fde91277a92dfd8862
n2/h264dec/omxdl/arm11/api/armCOMM.h
n2/h264dec/omxdl/arm11/api/armCOMM_BitDec_s.h
n2/h264dec/omxdl/arm11/api/armCOMM_Bitstream.h
n2/h264dec/omxdl/arm11/api/armCOMM_IDCTTable.h
n2/h264dec/omxdl/arm11/api/armCOMM_IDCT_s.h
n2/h264dec/omxdl/arm11/api/armCOMM_MaskTable.h
n2/h264dec/omxdl/arm11/api/armCOMM_s.h
n2/h264dec/omxdl/arm11/api/armOMX.h
n2/h264dec/omxdl/arm11/api/omxtypes_s.h
n2/h264dec/omxdl/arm11/build_vc.pl
n2/h264dec/omxdl/arm11/src/armCOMM.c
n2/h264dec/omxdl/arm11/src/armCOMM_Bitstream.c
n2/h264dec/omxdl/arm11/src/armCOMM_IDCTTable.c
n2/h264dec/omxdl/arm11/src/armCOMM_MaskTable.c
n2/h264dec/omxdl/arm11/vc/api/armVC.h
n2/h264dec/omxdl/arm11/vc/api/armVCCOMM_s.h
n2/h264dec/omxdl/arm11/vc/comm/src/omxVCCOMM_ExpandFrame_I_s.s
n2/h264dec/omxdl/arm11/vc/m4p10/api/armVCM4P10_CAVLCTables.h
n2/h264dec/omxdl/arm11/vc/m4p10/src/armVCM4P10_Average_4x_Align_unsafe_s.s
n2/h264dec/omxdl/arm11/vc/m4p10/src/armVCM4P10_CAVLCTables.c
n2/h264dec/omxdl/arm11/vc/m4p10/src/armVCM4P10_DeblockingChroma_unsafe_s.s
n2/h264dec/omxdl/arm11/vc/m4p10/src/armVCM4P10_DeblockingLuma_unsafe_s.s
n2/h264dec/omxdl/arm11/vc/m4p10/src/armVCM4P10_DecodeCoeffsToPair_s.s
n2/h264dec/omxdl/arm11/vc/m4p10/src/armVCM4P10_DequantTables_s.s
n2/h264dec/omxdl/arm11/vc/m4p10/src/armVCM4P10_InterpolateLuma_Align_unsafe_s.s
n2/h264dec/omxdl/arm11/vc/m4p10/src/armVCM4P10_InterpolateLuma_Copy_unsafe_s.s
n2/h264dec/omxdl/arm11/vc/m4p10/src/armVCM4P10_InterpolateLuma_DiagCopy_unsafe_s.s
n2/h264dec/omxdl/arm11/vc/m4p10/src/armVCM4P10_InterpolateLuma_HalfDiagHorVer4x4_unsafe_s.s
n2/h264dec/omxdl/arm11/vc/m4p10/src/armVCM4P10_InterpolateLuma_HalfDiagVerHor4x4_unsafe_s.s
n2/h264dec/omxdl/arm11/vc/m4p10/src/armVCM4P10_InterpolateLuma_HalfHor4x4_unsafe_s.s
n2/h264dec/omxdl/arm11/vc/m4p10/src/armVCM4P10_InterpolateLuma_HalfVer4x4_unsafe_s.s
n2/h264dec/omxdl/arm11/vc/m4p10/src/armVCM4P10_Interpolate_Chroma_s.s
n2/h264dec/omxdl/arm11/vc/m4p10/src/armVCM4P10_QuantTables_s.s
n2/h264dec/omxdl/arm11/vc/m4p10/src/armVCM4P10_TransformResidual4x4_s.s
n2/h264dec/omxdl/arm11/vc/m4p10/src/armVCM4P10_UnpackBlock4x4_s.s
n2/h264dec/omxdl/arm11/vc/m4p10/src/omxVCM4P10_DeblockChroma_I.c
n2/h264dec/omxdl/arm11/vc/m4p10/src/omxVCM4P10_DeblockLuma_I.c
n2/h264dec/omxdl/arm11/vc/m4p10/src/omxVCM4P10_DecodeChromaDcCoeffsToPairCAVLC.c
n2/h264dec/omxdl/arm11/vc/m4p10/src/omxVCM4P10_DecodeCoeffsToPairCAVLC.c
n2/h264dec/omxdl/arm11/vc/m4p10/src/omxVCM4P10_DequantTransformResidualFromPairAndAdd_s.s
n2/h264dec/omxdl/arm11/vc/m4p10/src/omxVCM4P10_FilterDeblockingChroma_HorEdge_I_s.s
n2/h264dec/omxdl/arm11/vc/m4p10/src/omxVCM4P10_FilterDeblockingChroma_VerEdge_I_s.s
n2/h264dec/omxdl/arm11/vc/m4p10/src/omxVCM4P10_FilterDeblockingLuma_HorEdge_I_s.s
n2/h264dec/omxdl/arm11/vc/m4p10/src/omxVCM4P10_FilterDeblockingLuma_VerEdge_I_s.s
n2/h264dec/omxdl/arm11/vc/m4p10/src/omxVCM4P10_InterpolateChroma.c
n2/h264dec/omxdl/arm11/vc/m4p10/src/omxVCM4P10_InterpolateLuma_s.s
n2/h264dec/omxdl/arm11/vc/m4p10/src/omxVCM4P10_PredictIntraChroma_8x8_s.s
n2/h264dec/omxdl/arm11/vc/m4p10/src/omxVCM4P10_PredictIntra_16x16_s.s
n2/h264dec/omxdl/arm11/vc/m4p10/src/omxVCM4P10_PredictIntra_4x4_s.s
n2/h264dec/omxdl/arm11/vc/m4p10/src/omxVCM4P10_TransformDequantChromaDCFromPair_s.s
n2/h264dec/omxdl/arm11/vc/m4p10/src/omxVCM4P10_TransformDequantLumaDCFromPair_s.s
n2/h264dec/omxdl/arm11/vc/m4p2/api/armVCM4P2_Huff_Tables_VLC.h
n2/h264dec/omxdl/arm11/vc/m4p2/api/armVCM4P2_ZigZag_Tables.h
n2/h264dec/omxdl/arm11/vc/m4p2/src/armVCM4P2_Clip8_s.s
n2/h264dec/omxdl/arm11/vc/m4p2/src/armVCM4P2_DecodeVLCZigzag_AC_unsafe_s.s
n2/h264dec/omxdl/arm11/vc/m4p2/src/armVCM4P2_Huff_Tables_VLC.c
n2/h264dec/omxdl/arm11/vc/m4p2/src/armVCM4P2_Lookup_Tables.c
n2/h264dec/omxdl/arm11/vc/m4p2/src/armVCM4P2_SetPredDir_s.s
n2/h264dec/omxdl/arm11/vc/m4p2/src/armVCM4P2_Zigzag_Tables.c
n2/h264dec/omxdl/arm11/vc/m4p2/src/omxVCM4P2_DecodeBlockCoef_Inter.c
n2/h264dec/omxdl/arm11/vc/m4p2/src/omxVCM4P2_DecodeBlockCoef_Intra.c
n2/h264dec/omxdl/arm11/vc/m4p2/src/omxVCM4P2_DecodePadMV_PVOP_s.s
n2/h264dec/omxdl/arm11/vc/m4p2/src/omxVCM4P2_DecodeVLCZigzag_Inter_s.s
n2/h264dec/omxdl/arm11/vc/m4p2/src/omxVCM4P2_DecodeVLCZigzag_IntraACVLC_s.s
n2/h264dec/omxdl/arm11/vc/m4p2/src/omxVCM4P2_DecodeVLCZigzag_IntraDCVLC_s.s
n2/h264dec/omxdl/arm11/vc/m4p2/src/omxVCM4P2_FindMVpred_s.s
n2/h264dec/omxdl/arm11/vc/m4p2/src/omxVCM4P2_IDCT8x8blk_s.s
n2/h264dec/omxdl/arm11/vc/m4p2/src/omxVCM4P2_MCReconBlock_s.s
n2/h264dec/omxdl/arm11/vc/m4p2/src/omxVCM4P2_PredictReconCoefIntra_s.s
n2/h264dec/omxdl/arm11/vc/m4p2/src/omxVCM4P2_QuantInvInter_I_s.s
n2/h264dec/omxdl/arm11/vc/m4p2/src/omxVCM4P2_QuantInvIntra_I_s.s
n2/h264dec/omxdl/arm_neon/api/armCOMM.h
n2/h264dec/omxdl/arm_neon/api/armCOMM_BitDec_s.h
n2/h264dec/omxdl/arm_neon/api/armCOMM_Bitstream.h
n2/h264dec/omxdl/arm_neon/api/armCOMM_IDCTTable.h
n2/h264dec/omxdl/arm_neon/api/armCOMM_IDCT_s.h
n2/h264dec/omxdl/arm_neon/api/armCOMM_MaskTable.h
n2/h264dec/omxdl/arm_neon/api/armCOMM_s.h
n2/h264dec/omxdl/arm_neon/api/armOMX.h
n2/h264dec/omxdl/arm_neon/api/omxtypes_s.h
n2/h264dec/omxdl/arm_neon/build_vc.pl
n2/h264dec/omxdl/arm_neon/src/armCOMM.c
n2/h264dec/omxdl/arm_neon/src/armCOMM_Bitstream.c
n2/h264dec/omxdl/arm_neon/src/armCOMM_IDCTTable.c
n2/h264dec/omxdl/arm_neon/src/armCOMM_MaskTable.c
n2/h264dec/omxdl/arm_neon/vc/api/armVC.h
n2/h264dec/omxdl/arm_neon/vc/api/armVCCOMM_s.h
n2/h264dec/omxdl/arm_neon/vc/comm/src/omxVCCOMM_ExpandFrame_I_s.s
n2/h264dec/omxdl/arm_neon/vc/m4p10/api/armVCM4P10_CAVLCTables.h
n2/h264dec/omxdl/arm_neon/vc/m4p10/src/armVCM4P10_Average_4x_Align_unsafe_s.s
n2/h264dec/omxdl/arm_neon/vc/m4p10/src/armVCM4P10_CAVLCTables.c
n2/h264dec/omxdl/arm_neon/vc/m4p10/src/armVCM4P10_DeblockingChroma_unsafe_s.s
n2/h264dec/omxdl/arm_neon/vc/m4p10/src/armVCM4P10_DeblockingLuma_unsafe_s.s
n2/h264dec/omxdl/arm_neon/vc/m4p10/src/armVCM4P10_DecodeCoeffsToPair_s.s
n2/h264dec/omxdl/arm_neon/vc/m4p10/src/armVCM4P10_DequantTables_s.s
n2/h264dec/omxdl/arm_neon/vc/m4p10/src/armVCM4P10_InterpolateLuma_Align_unsafe_s.s
n2/h264dec/omxdl/arm_neon/vc/m4p10/src/armVCM4P10_InterpolateLuma_Copy_unsafe_s.s
n2/h264dec/omxdl/arm_neon/vc/m4p10/src/armVCM4P10_InterpolateLuma_DiagCopy_unsafe_s.s
n2/h264dec/omxdl/arm_neon/vc/m4p10/src/armVCM4P10_InterpolateLuma_HalfDiagHorVer4x4_unsafe_s.s
n2/h264dec/omxdl/arm_neon/vc/m4p10/src/armVCM4P10_InterpolateLuma_HalfDiagVerHor4x4_unsafe_s.s
n2/h264dec/omxdl/arm_neon/vc/m4p10/src/armVCM4P10_InterpolateLuma_HalfHor4x4_unsafe_s.s
n2/h264dec/omxdl/arm_neon/vc/m4p10/src/armVCM4P10_InterpolateLuma_HalfVer4x4_unsafe_s.s
n2/h264dec/omxdl/arm_neon/vc/m4p10/src/armVCM4P10_Interpolate_Chroma_s.s
n2/h264dec/omxdl/arm_neon/vc/m4p10/src/armVCM4P10_QuantTables_s.s
n2/h264dec/omxdl/arm_neon/vc/m4p10/src/armVCM4P10_TransformResidual4x4_s.s
n2/h264dec/omxdl/arm_neon/vc/m4p10/src/armVCM4P10_UnpackBlock4x4_s.s
n2/h264dec/omxdl/arm_neon/vc/m4p10/src/omxVCM4P10_DeblockChroma_I.c
n2/h264dec/omxdl/arm_neon/vc/m4p10/src/omxVCM4P10_DeblockLuma_I.c
n2/h264dec/omxdl/arm_neon/vc/m4p10/src/omxVCM4P10_DecodeChromaDcCoeffsToPairCAVLC.c
n2/h264dec/omxdl/arm_neon/vc/m4p10/src/omxVCM4P10_DecodeCoeffsToPairCAVLC.c
n2/h264dec/omxdl/arm_neon/vc/m4p10/src/omxVCM4P10_DequantTransformResidualFromPairAndAdd_s.s
n2/h264dec/omxdl/arm_neon/vc/m4p10/src/omxVCM4P10_FilterDeblockingChroma_HorEdge_I_s.s
n2/h264dec/omxdl/arm_neon/vc/m4p10/src/omxVCM4P10_FilterDeblockingChroma_VerEdge_I_s.s
n2/h264dec/omxdl/arm_neon/vc/m4p10/src/omxVCM4P10_FilterDeblockingLuma_HorEdge_I_s.s
n2/h264dec/omxdl/arm_neon/vc/m4p10/src/omxVCM4P10_FilterDeblockingLuma_VerEdge_I_s.s
n2/h264dec/omxdl/arm_neon/vc/m4p10/src/omxVCM4P10_InterpolateChroma.c
n2/h264dec/omxdl/arm_neon/vc/m4p10/src/omxVCM4P10_InterpolateLuma_s.s
n2/h264dec/omxdl/arm_neon/vc/m4p10/src/omxVCM4P10_PredictIntraChroma_8x8_s.s
n2/h264dec/omxdl/arm_neon/vc/m4p10/src/omxVCM4P10_PredictIntra_16x16_s.s
n2/h264dec/omxdl/arm_neon/vc/m4p10/src/omxVCM4P10_PredictIntra_4x4_s.s
n2/h264dec/omxdl/arm_neon/vc/m4p10/src/omxVCM4P10_TransformDequantChromaDCFromPair_s.s
n2/h264dec/omxdl/arm_neon/vc/m4p10/src/omxVCM4P10_TransformDequantLumaDCFromPair_s.s
n2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_Average_4x_Align_unsafe_s.S
n2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_DeblockingChroma_unsafe_s.S
n2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_DeblockingLuma_unsafe_s.S
n2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_DecodeCoeffsToPair_s.S
n2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_DequantTables_s.S
n2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_InterpolateLuma_Align_unsafe_s.S
n2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_InterpolateLuma_Copy_unsafe_s.S
n2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_InterpolateLuma_DiagCopy_unsafe_s.S
n2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_InterpolateLuma_HalfDiagHorVer4x4_unsafe_s.S
n2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_InterpolateLuma_HalfDiagVerHor4x4_unsafe_s.S
n2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_InterpolateLuma_HalfHor4x4_unsafe_s.S
n2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_InterpolateLuma_HalfVer4x4_unsafe_s.S
n2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_Interpolate_Chroma_s.S
n2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_QuantTables_s.S
n2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_TransformResidual4x4_s.S
n2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_UnpackBlock4x4_s.S
n2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/omxVCM4P10_DeblockLuma_I.S
n2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/omxVCM4P10_DequantTransformResidualFromPairAndAdd_s.S
n2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/omxVCM4P10_FilterDeblockingChroma_HorEdge_I_s.S
n2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/omxVCM4P10_FilterDeblockingChroma_VerEdge_I_s.S
n2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/omxVCM4P10_FilterDeblockingLuma_HorEdge_I_s.S
n2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/omxVCM4P10_FilterDeblockingLuma_VerEdge_I_s.S
n2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/omxVCM4P10_InterpolateLuma_s.S
n2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/omxVCM4P10_PredictIntraChroma_8x8_s.S
n2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/omxVCM4P10_PredictIntra_16x16_s.S
n2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/omxVCM4P10_PredictIntra_4x4_s.S
n2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/omxVCM4P10_TransformDequantChromaDCFromPair_s.S
n2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/omxVCM4P10_TransformDequantLumaDCFromPair_s.S
n2/h264dec/omxdl/arm_neon/vc/m4p2/api/armVCM4P2_Huff_Tables_VLC.h
n2/h264dec/omxdl/arm_neon/vc/m4p2/api/armVCM4P2_ZigZag_Tables.h
n2/h264dec/omxdl/arm_neon/vc/m4p2/src/armVCM4P2_Clip8_s.s
n2/h264dec/omxdl/arm_neon/vc/m4p2/src/armVCM4P2_DecodeVLCZigzag_AC_unsafe_s.s
n2/h264dec/omxdl/arm_neon/vc/m4p2/src/armVCM4P2_Huff_Tables_VLC.c
n2/h264dec/omxdl/arm_neon/vc/m4p2/src/armVCM4P2_Lookup_Tables.c
n2/h264dec/omxdl/arm_neon/vc/m4p2/src/armVCM4P2_SetPredDir_s.s
n2/h264dec/omxdl/arm_neon/vc/m4p2/src/armVCM4P2_Zigzag_Tables.c
n2/h264dec/omxdl/arm_neon/vc/m4p2/src/omxVCM4P2_DecodeBlockCoef_Inter.c
n2/h264dec/omxdl/arm_neon/vc/m4p2/src/omxVCM4P2_DecodeBlockCoef_Intra.c
n2/h264dec/omxdl/arm_neon/vc/m4p2/src/omxVCM4P2_DecodePadMV_PVOP_s.s
n2/h264dec/omxdl/arm_neon/vc/m4p2/src/omxVCM4P2_DecodeVLCZigzag_Inter_s.s
n2/h264dec/omxdl/arm_neon/vc/m4p2/src/omxVCM4P2_DecodeVLCZigzag_IntraACVLC_s.s
n2/h264dec/omxdl/arm_neon/vc/m4p2/src/omxVCM4P2_DecodeVLCZigzag_IntraDCVLC_s.s
n2/h264dec/omxdl/arm_neon/vc/m4p2/src/omxVCM4P2_FindMVpred_s.s
n2/h264dec/omxdl/arm_neon/vc/m4p2/src/omxVCM4P2_IDCT8x8blk_s.s
n2/h264dec/omxdl/arm_neon/vc/m4p2/src/omxVCM4P2_MCReconBlock_s.s
n2/h264dec/omxdl/arm_neon/vc/m4p2/src/omxVCM4P2_PredictReconCoefIntra_s.s
n2/h264dec/omxdl/arm_neon/vc/m4p2/src/omxVCM4P2_QuantInvInter_I_s.s
n2/h264dec/omxdl/arm_neon/vc/m4p2/src/omxVCM4P2_QuantInvIntra_I_s.s
n2/h264dec/omxdl/reference/api/armCOMM.h
n2/h264dec/omxdl/reference/api/armCOMM_Bitstream.h
n2/h264dec/omxdl/reference/api/armOMX.h
n2/h264dec/omxdl/reference/build_vc.pl
n2/h264dec/omxdl/reference/src/armCOMM.c
n2/h264dec/omxdl/reference/src/armCOMM_Bitstream.c
n2/h264dec/omxdl/reference/vc/api/armVC.h
n2/h264dec/omxdl/reference/vc/comm/src/armVCCOMM_Average.c
n2/h264dec/omxdl/reference/vc/comm/src/armVCCOMM_SAD.c
n2/h264dec/omxdl/reference/vc/comm/src/omxVCCOMM_Average_16x.c
n2/h264dec/omxdl/reference/vc/comm/src/omxVCCOMM_Average_8x.c
n2/h264dec/omxdl/reference/vc/comm/src/omxVCCOMM_ComputeTextureErrorBlock.c
n2/h264dec/omxdl/reference/vc/comm/src/omxVCCOMM_ComputeTextureErrorBlock_SAD.c
n2/h264dec/omxdl/reference/vc/comm/src/omxVCCOMM_Copy16x16.c
n2/h264dec/omxdl/reference/vc/comm/src/omxVCCOMM_Copy8x8.c
n2/h264dec/omxdl/reference/vc/comm/src/omxVCCOMM_ExpandFrame_I.c
n2/h264dec/omxdl/reference/vc/comm/src/omxVCCOMM_LimitMVToRect.c
n2/h264dec/omxdl/reference/vc/comm/src/omxVCCOMM_SAD_16x.c
n2/h264dec/omxdl/reference/vc/comm/src/omxVCCOMM_SAD_8x.c
n2/h264dec/omxdl/reference/vc/m4p10/api/armVCM4P10_CAVLCTables.h
n2/h264dec/omxdl/reference/vc/m4p10/src/armVCM4P10_CAVLCTables.c
n2/h264dec/omxdl/reference/vc/m4p10/src/armVCM4P10_CompareMotionCostToMV.c
n2/h264dec/omxdl/reference/vc/m4p10/src/armVCM4P10_DeBlockPixel.c
n2/h264dec/omxdl/reference/vc/m4p10/src/armVCM4P10_DecodeCoeffsToPair.c
n2/h264dec/omxdl/reference/vc/m4p10/src/armVCM4P10_DequantTables.c
n2/h264dec/omxdl/reference/vc/m4p10/src/armVCM4P10_FwdTransformResidual4x4.c
n2/h264dec/omxdl/reference/vc/m4p10/src/armVCM4P10_InterpolateHalfDiag_Luma.c
n2/h264dec/omxdl/reference/vc/m4p10/src/armVCM4P10_InterpolateHalfHor_Luma.c
n2/h264dec/omxdl/reference/vc/m4p10/src/armVCM4P10_InterpolateHalfVer_Luma.c
n2/h264dec/omxdl/reference/vc/m4p10/src/armVCM4P10_Interpolate_Chroma.c
n2/h264dec/omxdl/reference/vc/m4p10/src/armVCM4P10_Interpolate_Luma.c
n2/h264dec/omxdl/reference/vc/m4p10/src/armVCM4P10_PredictIntraDC4x4.c
n2/h264dec/omxdl/reference/vc/m4p10/src/armVCM4P10_QuantTables.c
n2/h264dec/omxdl/reference/vc/m4p10/src/armVCM4P10_SADQuar.c
n2/h264dec/omxdl/reference/vc/m4p10/src/armVCM4P10_TransformResidual4x4.c
n2/h264dec/omxdl/reference/vc/m4p10/src/armVCM4P10_UnpackBlock2x2.c
n2/h264dec/omxdl/reference/vc/m4p10/src/armVCM4P10_UnpackBlock4x4.c
n2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_Average_4x.c
n2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_BlockMatch_Half.c
n2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_BlockMatch_Integer.c
n2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_BlockMatch_Quarter.c
n2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_DeblockChroma_I.c
n2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_DeblockLuma_I.c
n2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_DecodeChromaDcCoeffsToPairCAVLC.c
n2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_DecodeCoeffsToPairCAVLC.c
n2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_DequantTransformResidualFromPairAndAdd.c
n2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_FilterDeblockingChroma_HorEdge_I.c
n2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_FilterDeblockingChroma_VerEdge_I.c
n2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_FilterDeblockingLuma_HorEdge_I.c
n2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_FilterDeblockingLuma_VerEdge_I.c
n2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_GetVLCInfo.c
n2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_InterpolateChroma.c
n2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_InterpolateHalfHor_Luma.c
n2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_InterpolateHalfVer_Luma.c
n2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_InterpolateLuma.c
n2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_InvTransformDequant_ChromaDC.c
n2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_InvTransformDequant_LumaDC.c
n2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_InvTransformResidualAndAdd.c
n2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_MEGetBufSize.c
n2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_MEInit.c
n2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_MotionEstimationMB.c
n2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_PredictIntraChroma_8x8.c
n2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_PredictIntra_16x16.c
n2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_PredictIntra_4x4.c
n2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_SADQuar_16x.c
n2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_SADQuar_4x.c
n2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_SADQuar_8x.c
n2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_SAD_4x.c
n2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_SATD_4x4.c
n2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_SubAndTransformQDQResidual.c
n2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_TransformDequantChromaDCFromPair.c
n2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_TransformDequantLumaDCFromPair.c
n2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_TransformQuant_ChromaDC.c
n2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_TransformQuant_LumaDC.c
n2/h264dec/omxdl/reference/vc/m4p2/api/armVCM4P2_DCT_Table.h
n2/h264dec/omxdl/reference/vc/m4p2/api/armVCM4P2_Huff_Tables_VLC.h
n2/h264dec/omxdl/reference/vc/m4p2/api/armVCM4P2_ZigZag_Tables.h
n2/h264dec/omxdl/reference/vc/m4p2/src/armVCM4P2_ACDCPredict.c
n2/h264dec/omxdl/reference/vc/m4p2/src/armVCM4P2_BlockMatch_Half.c
n2/h264dec/omxdl/reference/vc/m4p2/src/armVCM4P2_BlockMatch_Integer.c
n2/h264dec/omxdl/reference/vc/m4p2/src/armVCM4P2_CheckVLCEscapeMode.c
n2/h264dec/omxdl/reference/vc/m4p2/src/armVCM4P2_CompareMV.c
n2/h264dec/omxdl/reference/vc/m4p2/src/armVCM4P2_DCT_Table.c
n2/h264dec/omxdl/reference/vc/m4p2/src/armVCM4P2_DecodeVLCZigzag_intra.c
n2/h264dec/omxdl/reference/vc/m4p2/src/armVCM4P2_EncodeVLCZigzag_intra.c
n2/h264dec/omxdl/reference/vc/m4p2/src/armVCM4P2_FillVLCBuffer.c
n2/h264dec/omxdl/reference/vc/m4p2/src/armVCM4P2_FillVLDBuffer.c
n2/h264dec/omxdl/reference/vc/m4p2/src/armVCM4P2_GetVLCBits.c
n2/h264dec/omxdl/reference/vc/m4p2/src/armVCM4P2_Huff_Tables_VLC.c
n2/h264dec/omxdl/reference/vc/m4p2/src/armVCM4P2_PutVLCBits.c
n2/h264dec/omxdl/reference/vc/m4p2/src/armVCM4P2_SetPredDir.c
n2/h264dec/omxdl/reference/vc/m4p2/src/armVCM4P2_Zigzag_Tables.c
n2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_BlockMatch_Half_16x16.c
n2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_BlockMatch_Half_8x8.c
n2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_BlockMatch_Integer_16x16.c
n2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_BlockMatch_Integer_8x8.c
n2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_DCT8x8blk.c
n2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_DecodeBlockCoef_Inter.c
n2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_DecodeBlockCoef_Intra.c
n2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_DecodePadMV_PVOP.c
n2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_DecodeVLCZigzag_Inter.c
n2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_DecodeVLCZigzag_IntraACVLC.c
n2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_DecodeVLCZigzag_IntraDCVLC.c
n2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_EncodeMV.c
n2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_EncodeVLCZigzag_Inter.c
n2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_EncodeVLCZigzag_IntraACVLC.c
n2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_EncodeVLCZigzag_IntraDCVLC.c
n2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_FindMVpred.c
n2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_IDCT8x8blk.c
n2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_MCReconBlock.c
n2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_MEGetBufSize.c
n2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_MEInit.c
n2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_MotionEstimationMB.c
n2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_PredictReconCoefIntra.c
n2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_QuantInter_I.c
n2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_QuantIntra_I.c
n2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_QuantInvInter_I.c
n2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_QuantInvIntra_I.c
n2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_TransRecBlockCoef_inter.c
n2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_TransRecBlockCoef_intra.c
9fdb3bd42af0876a9b76bae42d7aba2287b53af4 05-Feb-2015 Vignesh Venkatasubramanian <vigneshv@google.com> Merge "opus: Support for > 2 channels"
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
n2/h264dec/source/H264SwDecApi.c
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
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
mrnb/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
4v_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"
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
pus/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.
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.
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
n2/enc/Android.mk
841d22b0645ff48a03e7f500f95458f3d70a0a61 23-Jan-2015 Ronghua Wu <ronghuawu@google.com> libstagefright: Use aligned width and height.

Bug: 19014147
Change-Id: I33314b02448e436c43fcfad086b5edfa650dcf83
4v_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
4v_h263/dec/src/vop.cpp
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.
55dfeeb53fdd2e940d0b7c7e3661152ca51ed85e 07-Jan-2015 Ronghua Wu <ronghuawu@google.com> Use aligned width and height to compute size.

Bug: 18528130
Change-Id: I4d2304d8c8919c1cde60676848cfe2e4f2061a87
4v_h263/dec/src/pvdec_api.cpp
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
acenc/basic_op/oper_32b.c
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
acdec/SoftAAC2.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
vc/enc/SoftAVCEncoder.cpp
vc/enc/SoftAVCEncoder.h
evcdec/SoftHEVC.cpp
4v_h263/dec/SoftMPEG4.cpp
4v_h263/dec/SoftMPEG4.h
4v_h263/enc/SoftMPEG4Encoder.cpp
4v_h263/enc/SoftMPEG4Encoder.h
n2/dec/SoftVPX.cpp
n2/enc/SoftVPXEncoder.cpp
n2/enc/SoftVPXEncoder.h
n2/h264dec/SoftAVC.cpp
7e45789f5fbcbe68075f57b6d17f72b7b48df546 20-Nov-2014 Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org> Fix overload of SoftVideoDecoderOMXComponent::updatePortDefinitions

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

Bug: 18639027
Change-Id: I8327fe1b363917515cf76c8f76bdbc05b2c0fbf0
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
4v_h263/dec/SoftMPEG4.cpp
4v_h263/dec/SoftMPEG4.h
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
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."
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
n2/dec/SoftVPX.cpp
n2/dec/SoftVPX.h
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
acenc/basic_op/basic_op.h
acenc/src/block_switch.c
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>
acdec/SoftAAC2.cpp
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>
mrnb/common/include/basic_op_c_equivalent.h
mrnb/common/src/az_lsp.cpp
mrnb/common/src/div_s.cpp
mrnb/common/src/gc_pred.cpp
mrnb/common/src/gmed_n.cpp
mrnb/common/src/lsp_az.cpp
mrnb/common/src/mult_r.cpp
mrnb/common/src/norm_l.cpp
mrnb/common/src/norm_s.cpp
mrnb/common/src/pred_lt.cpp
mrnb/common/src/q_plsf_3.cpp
mrnb/common/src/residu.cpp
mrnb/common/src/shr.cpp
mrnb/common/src/weight_a.cpp
mrnb/dec/src/d1035pf.cpp
mrnb/dec/src/d_plsf_5.cpp
mrnb/dec/src/int_lsf.cpp
mrnb/dec/src/ph_disp.cpp
mrnb/dec/src/pstfilt.cpp
mrnb/enc/src/autocorr.cpp
mrnb/enc/src/c2_9pf.cpp
mrnb/enc/src/cl_ltp.cpp
mrnb/enc/src/convolve.cpp
mrnb/enc/src/cor_h.cpp
mrnb/enc/src/cor_h_x.cpp
mrnb/enc/src/cor_h_x2.cpp
mrnb/enc/src/dtx_enc.cpp
mrnb/enc/src/levinson.cpp
mrnb/enc/src/pitch_ol.cpp
mrnb/enc/src/pre_proc.cpp
mrnb/enc/src/set_sign.cpp
mrwb/src/pvamrwb_math_op.cpp
vc/enc/src/findhalfpel.cpp
4v_h263/dec/src/find_min_max.cpp
4v_h263/enc/src/dct.cpp
1a9c3954a20800dda3d6d18048c7f0edc8c53e6a 26-Nov-2014 Andreas Gampe <agampe@google.com> Merge "Stagefright: Fix unused variables, functions, values"
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
acdec/SoftAAC2.cpp
acenc/AACEncoder.cpp
acenc/basic_op/oper_32b.c
acenc/src/aacenc.c
acenc/src/aacenc_core.c
acenc/src/adj_thr.c
acenc/src/bitbuffer.c
acenc/src/block_switch.c
acenc/src/ms_stereo.c
acenc/src/sf_estim.c
acenc/src/tns.c
acenc/src/transform.c
mrnb/common/Android.mk
mrnb/dec/Android.mk
mrnb/enc/Android.mk
mrwb/Android.mk
mrwbenc/src/q_pulse.c
vc/enc/Android.mk
vc/enc/src/findhalfpel.cpp
vc/enc/src/rate_control.cpp
lac/enc/SoftFlacEncoder.cpp
4v_h263/enc/Android.mk
p3dec/Android.mk
f59eae9442374940b6b05f436f0598b3c482e6d0 25-Nov-2014 Chih-hung Hsieh <chh@google.com> Merge "Fix overload of SoftVideoDecoderOMXComponent::updatePortDefinitions"
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>
vc/common/src/deblock.cpp
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
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
6c7d332f252d5ae7b3cad810e7adb85e5aedb98a 25-Nov-2014 Chih-hung Hsieh <chh@google.com> Merge "Remove bogus forward declarations"
db1ce33e0159bbbc3946c163c9ba1077182823f1 24-Nov-2014 Chih-hung Hsieh <chh@google.com> Merge "Remove check for an impossible condition"
dcdc76994c150c09aadc5be8f86040ebc6865706 20-Nov-2014 Chih-hung Hsieh <chh@google.com> am d6048672: am 9d2e0dae: Merge "Remove extraneous parentheses"

* commit 'd60486723cdc0b4b83b77d57ce35023a7516c471':
Remove extraneous parentheses
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>
4v_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>
4v_h263/dec/SoftMPEG4.cpp
4v_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>
vc/enc/SoftAVCEncoder.h
4v_h263/enc/SoftMPEG4Encoder.h
3126b50345a9fc0e5d6d9e58226795735e04932f 18-Nov-2014 Chih-hung Hsieh <chh@google.com> am 5f3eef9a: am 7a200235: Merge "Remove extraneous parentheses"

* commit '5f3eef9a6a946347bc7d8c5dc76290c9e780f818':
Remove extraneous parentheses
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>
acenc/src/bitenc.c
mrwbenc/src/wb_vad.c
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
21e525fdcc234c22d843a8bf1a4ec35c4b376314 07-Nov-2014 Martin Storsjo <martin@martin.st> Remove the executable bit from source files

Change-Id: I3c105b7e2736ade22de0bb12f396859816b3adf7
mrnb/dec/test/amrnbdec_test.cpp
n2/h264dec/inc/H264SwDecApi.h
n2/h264dec/inc/basetype.h
n2/h264dec/omxdl/arm_neon/api/armCOMM.h
n2/h264dec/omxdl/arm_neon/api/armCOMM_BitDec_s.h
n2/h264dec/omxdl/arm_neon/api/armCOMM_Bitstream.h
n2/h264dec/omxdl/arm_neon/api/armCOMM_IDCTTable.h
n2/h264dec/omxdl/arm_neon/api/armCOMM_IDCT_s.h
n2/h264dec/omxdl/arm_neon/api/armCOMM_MaskTable.h
n2/h264dec/omxdl/arm_neon/api/armCOMM_Version.h
n2/h264dec/omxdl/arm_neon/api/armCOMM_s.h
n2/h264dec/omxdl/arm_neon/api/armOMX.h
n2/h264dec/omxdl/arm_neon/api/omxtypes.h
n2/h264dec/omxdl/arm_neon/api/omxtypes_s.h
n2/h264dec/omxdl/arm_neon/src/armCOMM.c
n2/h264dec/omxdl/arm_neon/src/armCOMM_Bitstream.c
n2/h264dec/omxdl/arm_neon/src/armCOMM_IDCTTable.c
n2/h264dec/omxdl/arm_neon/src/armCOMM_MaskTable.c
n2/h264dec/omxdl/arm_neon/vc/api/armVC.h
n2/h264dec/omxdl/arm_neon/vc/api/armVCCOMM_s.h
n2/h264dec/omxdl/arm_neon/vc/api/omxVC.h
n2/h264dec/omxdl/arm_neon/vc/api/omxVC_s.h
n2/h264dec/omxdl/arm_neon/vc/m4p10/api/armVCM4P10_CAVLCTables.h
n2/h264dec/omxdl/arm_neon/vc/m4p10/src/armVCM4P10_CAVLCTables.c
n2/h264dec/omxdl/arm_neon/vc/m4p10/src/omxVCM4P10_DeblockChroma_I.c
n2/h264dec/omxdl/arm_neon/vc/m4p10/src/omxVCM4P10_DeblockLuma_I.c
n2/h264dec/omxdl/arm_neon/vc/m4p10/src/omxVCM4P10_DecodeChromaDcCoeffsToPairCAVLC.c
n2/h264dec/omxdl/arm_neon/vc/m4p10/src/omxVCM4P10_DecodeCoeffsToPairCAVLC.c
n2/h264dec/omxdl/arm_neon/vc/m4p10/src/omxVCM4P10_InterpolateChroma.c
n2/h264dec/omxdl/arm_neon/vc/m4p2/api/armVCM4P2_Huff_Tables_VLC.h
n2/h264dec/omxdl/arm_neon/vc/m4p2/api/armVCM4P2_ZigZag_Tables.h
n2/h264dec/omxdl/arm_neon/vc/m4p2/src/armVCM4P2_Huff_Tables_VLC.c
n2/h264dec/omxdl/arm_neon/vc/m4p2/src/armVCM4P2_Lookup_Tables.c
n2/h264dec/omxdl/arm_neon/vc/m4p2/src/armVCM4P2_Zigzag_Tables.c
n2/h264dec/omxdl/arm_neon/vc/m4p2/src/omxVCM4P2_DecodeBlockCoef_Inter.c
n2/h264dec/omxdl/arm_neon/vc/m4p2/src/omxVCM4P2_DecodeBlockCoef_Intra.c
n2/h264dec/omxdl/arm_neon/vc/src/armVC_Version.c
n2/h264dec/source/DecTestBench.c
n2/h264dec/source/EvaluationTestBench.c
n2/h264dec/source/TestBenchMultipleInstance.c
n2/h264dec/source/h264bsd_byte_stream.c
n2/h264dec/source/h264bsd_byte_stream.h
n2/h264dec/source/h264bsd_cavlc.c
n2/h264dec/source/h264bsd_cavlc.h
n2/h264dec/source/h264bsd_cfg.h
n2/h264dec/source/h264bsd_conceal.c
n2/h264dec/source/h264bsd_conceal.h
n2/h264dec/source/h264bsd_container.h
n2/h264dec/source/h264bsd_deblocking.c
n2/h264dec/source/h264bsd_deblocking.h
n2/h264dec/source/h264bsd_dpb.c
n2/h264dec/source/h264bsd_dpb.h
n2/h264dec/source/h264bsd_image.c
n2/h264dec/source/h264bsd_image.h
n2/h264dec/source/h264bsd_inter_prediction.c
n2/h264dec/source/h264bsd_inter_prediction.h
n2/h264dec/source/h264bsd_intra_prediction.c
n2/h264dec/source/h264bsd_intra_prediction.h
n2/h264dec/source/h264bsd_macroblock_layer.c
n2/h264dec/source/h264bsd_macroblock_layer.h
n2/h264dec/source/h264bsd_nal_unit.c
n2/h264dec/source/h264bsd_nal_unit.h
n2/h264dec/source/h264bsd_neighbour.c
n2/h264dec/source/h264bsd_neighbour.h
n2/h264dec/source/h264bsd_pic_order_cnt.c
n2/h264dec/source/h264bsd_pic_order_cnt.h
n2/h264dec/source/h264bsd_pic_param_set.c
n2/h264dec/source/h264bsd_pic_param_set.h
n2/h264dec/source/h264bsd_reconstruct.c
n2/h264dec/source/h264bsd_reconstruct.h
n2/h264dec/source/h264bsd_sei.c
n2/h264dec/source/h264bsd_sei.h
n2/h264dec/source/h264bsd_seq_param_set.h
n2/h264dec/source/h264bsd_slice_data.c
n2/h264dec/source/h264bsd_slice_data.h
n2/h264dec/source/h264bsd_slice_group_map.c
n2/h264dec/source/h264bsd_slice_group_map.h
n2/h264dec/source/h264bsd_slice_header.c
n2/h264dec/source/h264bsd_slice_header.h
n2/h264dec/source/h264bsd_storage.c
n2/h264dec/source/h264bsd_storage.h
n2/h264dec/source/h264bsd_stream.c
n2/h264dec/source/h264bsd_stream.h
n2/h264dec/source/h264bsd_transform.c
n2/h264dec/source/h264bsd_transform.h
n2/h264dec/source/h264bsd_util.c
n2/h264dec/source/h264bsd_util.h
n2/h264dec/source/h264bsd_vlc.c
n2/h264dec/source/h264bsd_vlc.h
n2/h264dec/source/h264bsd_vui.c
n2/h264dec/source/h264bsd_vui.h
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
vc/enc/SoftAVCEncoder.cpp
4v_h263/enc/SoftMPEG4Encoder.cpp
n2/enc/SoftVPXEncoder.cpp
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
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.
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
n2/h264dec/Android.mk
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
acdec/SoftAAC2.cpp
d7050b75c2ef33d1aabf71cf902f734c44c24639 15-Oct-2014 Lajos Molnar <lajos@google.com> resolved conflicts for merge of f4147ee9 to lmp-mr1-dev-plus-aosp

Change-Id: I3b66673012989ab3707852b257844f2c3851f753
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
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
4fed5e4e7f2eb744b9f2e3c52ec23539256cdbca 14-Oct-2014 Lajos Molnar <lajos@google.com> resolved conflicts for merge of 2edda09a to lmp-dev-plus-aosp

Change-Id: I760286b72fe1ebda3e8b058ca2138cb97fbdb7e1
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
vc/enc/SoftAVCEncoder.cpp
vc/enc/SoftAVCEncoder.h
4v_h263/enc/SoftMPEG4Encoder.cpp
4v_h263/enc/SoftMPEG4Encoder.h
n2/enc/Android.mk
n2/enc/SoftVPXEncoder.cpp
n2/enc/SoftVPXEncoder.h
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
10d023beb0544591d0f5ff556f7f67356f0d9189 13-Oct-2014 Chong Zhang <chz@google.com> handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat

Bug: 17935293
Change-Id: Id09190ae813aa9e00a3c1ef6fb8a1bd3021deb6e
711/dec/SoftG711.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
4v_h263/dec/SoftMPEG4.cpp
n2/dec/SoftVPX.cpp
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
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.
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
mrwbenc/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
acdec/SoftAAC2.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>
vc/enc/src/init.cpp
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
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
4v_h263/dec/SoftMPEG4.cpp
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
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
d0b9efe7d8300e48f7a99c1dd746d60060206b3c 01-Oct-2014 Chong Zhang <chz@google.com> Merge "add AAC audio decoder params for PCM limiter enable" into lmp-dev
2965f4eb7dceaf1173f0e2d93c11c28293aeead7 01-Oct-2014 Chong Zhang <chz@google.com> add AAC audio decoder params for PCM limiter enable

Bug: 17470065
Change-Id: Ib67aa1c50e3b6c24c4b12b0f31a996cc6874abd1
acdec/SoftAAC2.cpp
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
acdec/SoftAAC2.cpp
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.
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.
d5a2f55034022f2d0425fa0701894d0c4787b726 24-Sep-2014 Ronghua Wu <ronghuawu@google.com> stagefright: fix cropping handling for SoftAVC and SoftMEPEG4.

Bug: 17326758
Change-Id: I9b0c281d92cf1803e275b1768e9edab9404ea577
4v_h263/dec/SoftMPEG4.cpp
n2/h264dec/SoftAVC.cpp
n2/h264dec/SoftAVC.h
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
1aa26f787afc525e0deae31d856dce74a4b28a0f 12-Sep-2014 Ronghua Wu <ronghuawu@google.com> stagefright: add adaptive playback support to SoftHEVC decoder.

Bug: 17326758
Change-Id: I245e2bd1490e810094ca550fdddfa87075bc2056
evcdec/SoftHEVC.cpp
evcdec/SoftHEVC.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
acdec/SoftAAC2.cpp
acdec/SoftAAC2.h
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
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
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
acdec/SoftAAC2.cpp
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
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
9b7db1c57ff2a3f854568dd61fcec82ff63addeb 17-Sep-2014 Marco Nelissen <marcone@google.com> Fix null pointer dereference

Bug: 17544813
Change-Id: I6c94cd3056a99bb42fc71ee583938a2e3806fdc7
acdec/SoftAAC2.cpp
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
de7e2ae67f198b3dcc861b0908ca099db10dab6f 13-Sep-2014 Marco Nelissen <marcone@google.com> Merge "Fix AAC timestamps for multiple aac frames per input buffer" 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.
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
4v_h263/dec/SoftMPEG4.cpp
4v_h263/dec/SoftMPEG4.h
4v_h263/dec/src/vop.cpp
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
2b16391d066d20f38f3556d65bce827a8d134e4d 11-Sep-2014 Glenn Kasten <gkasten@android.com> Merge "Add test for AMR-NB decoder"
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
acdec/SoftAAC2.cpp
acdec/SoftAAC2.h
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"
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
acdec/SoftAAC2.cpp
acdec/SoftAAC2.h
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
n2/dec/SoftVPX.cpp
n2/h264dec/SoftAVC.cpp
n2/h264dec/SoftAVC.h
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
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
acdec/SoftAAC2.cpp
acdec/SoftAAC2.h
8e2ad94c2f859988759629d813e0394d452e9fc6 04-Sep-2014 Narayan Kamath <narayan@google.com> am 13006b9d: am 032ecb7f: Merge "Fix in SoftAVCEncoder plugin"

* commit '13006b9d0586d17a0ea52e98124b54ebf6246feb':
Fix in SoftAVCEncoder plugin
032ecb7f233f392e6e68f030bf72a9bc7c861d11 04-Sep-2014 Narayan Kamath <narayan@google.com> Merge "Fix in SoftAVCEncoder plugin"
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.
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
n2/dec/SoftVPX.cpp
n2/dec/SoftVPX.h
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.
031be0f358b07732092a4d1bf02fc99f109a63c4 22-Aug-2014 Ronghua Wu <ronghuawu@google.com> Add adaptive playback support to VPX decoder.

Bug: 13842676
Change-Id: I9c054ea489fd3a71b3b2394f15a85b84d42edb5a
vc/enc/SoftAVCEncoder.h
4v_h263/enc/SoftMPEG4Encoder.h
n2/dec/SoftVPX.cpp
n2/enc/SoftVPXEncoder.h
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
acdec/SoftAAC2.cpp
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
acdec/SoftAAC2.cpp
143a951f1f19161fa12ca97f3dee85094078365a 21-Aug-2014 Robert Shih <robertshih@google.com> SoftAAC2: allow reconfiguring output after multiple output buffers

Bug: 17134697
Change-Id: Iaa8bdccbf1a8ccd3f898e48cfd22a0a443710fdd
acdec/SoftAAC2.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
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
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
62cb76f1a38475f0223660d5a9776d5e413b4160 08-Aug-2014 Dan Albert <danalbert@google.com> Resolved conflicts for merge of aed1d581 to lmp-dev-plus-aosp

Change-Id: Ib3877bfb60774d056fa2d934d2f4cb74e3b235ea
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
acdec/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)
evcdec/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)
mrwbenc/src/asm/ARMV5E/Filt_6k_7k_opt.s
mrwbenc/src/asm/ARMV5E/pred_lt4_1_opt.s
mrwbenc/src/asm/ARMV7/Filt_6k_7k_neon.s
mrwbenc/src/asm/ARMV7/pred_lt4_1_neon.s
p3dec/src/asm/pvmp3_polyphase_filter_window_gcc.s
n2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_DecodeCoeffsToPair_s.S
n2/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
ec8b67eb9fc678d1e33c424cb4a468082fd0b1b2 08-Aug-2014 Dan Albert <danalbert@google.com> Resolved conflicts for merge of 2af8711d to lmp-dev-plus-aosp

Change-Id: I016dbca0318998f17fc741f873589c414774e7ff
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
mrwbenc/Android.mk
p3dec/Android.mk
n2/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
mrwbenc/Android.mk
p3dec/Android.mk
n2/h264dec/Android.mk
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
mrwbenc/src/asm/ARMV5E/Filt_6k_7k_opt.s
mrwbenc/src/asm/ARMV5E/pred_lt4_1_opt.s
mrwbenc/src/asm/ARMV7/Filt_6k_7k_neon.s
mrwbenc/src/asm/ARMV7/pred_lt4_1_neon.s
p3dec/src/asm/pvmp3_polyphase_filter_window_gcc.s
n2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_DecodeCoeffsToPair_s.S
n2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_DequantTables_s.S
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
acenc/SoftAACEncoder2.cpp
acenc/SoftAACEncoder2.h
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()
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
evcdec/SoftHEVC.cpp
evcdec/SoftHEVC.h
b7a88e3101d2d871f1d90c08806577a859f1ea12 14-Jul-2014 Narayan Kamath <narayan@google.com> Merge "h264_enc: Use free() to release memory allocated with malloc()"
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>
vc/enc/SoftAVCEncoder.cpp
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
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>
4v_h263/enc/SoftMPEG4Encoder.cpp
4v_h263/enc/include/mp4enc_api.h
4v_h263/enc/src/motion_comp.cpp
4v_h263/enc/src/mp4def.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
acdec/SoftAAC2.cpp
acdec/SoftAAC2.h
a5750e0dad9e90f2195ce36f2c4457fa04b2b83e 19-Jun-2014 Mark Salyzyn <salyzyn@google.com> libstagefright: 64-bit compile warnings

Change-Id: I3d1146714fa23be3d4e696599b6f70cac1f9d28b
n2/enc/SoftVPXEncoder.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>
vc/enc/SoftAVCEncoder.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>
mrnb/dec/Android.mk
mrnb/dec/test/amrnbdec_test.cpp
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
acdec/SoftAAC2.cpp
3e648747e7e40752580ae7fd0ff2e803623680cd 07-Jun-2014 Lajos Molnar <lajos@google.com> add back HEVC SoftOMX decoder

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

Bug: 14571712
Change-Id: Ie3fb3743ec27a0cfdea612052ba15a06f2c891db
evcdec/Android.mk
evcdec/SoftHEVC.cpp
evcdec/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
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
evcdec/Android.mk
evcdec/SoftHEVC.cpp
evcdec/SoftHEVC.h
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>
n2/h264dec/omxdl/arm_neon/api/armCOMM.h
n2/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
acdec/SoftAAC2.cpp
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
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
acdec/Android.mk
acdec/DrcPresModeWrap.cpp
acdec/DrcPresModeWrap.h
acdec/SoftAAC2.cpp
acdec/SoftAAC2.h
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>
p3dec/src/asm/pvmp3_dct_9_arm.s
p3dec/src/asm/pvmp3_mdct_18_arm.s
p3dec/src/asm/pvmp3_mdct_18_wm.asm
p3dec/src/asm/pvmp3_polyphase_filter_window_arm.s
p3dec/src/asm/pvmp3_polyphase_filter_window_wm.asm
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
83f052a749b8e0ee5df3467d8332d6140fcafb50 01-May-2014 Glenn Kasten <gkasten@android.com> Temporary workaround for log spam

Bug: 13790505
Change-Id: Icfc403bceaefdede1af65dfd70ba3e8b26abab02
orbis/dec/SoftVorbis.cpp
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
n2/enc/SoftVPXEncoder.cpp
n2/enc/SoftVPXEncoder.h
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
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
n2/h264dec/omxdl/arm11/api/omxtypes.h
n2/h264dec/omxdl/arm_neon/api/omxtypes.h
n2/h264dec/omxdl/reference/api/omxtypes.h
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
lac/enc/SoftFlacEncoder.cpp
4v_h263/enc/SoftMPEG4Encoder.cpp
d6579cc9f06052f94bf5a2c34261c84de0efce23 10-Apr-2014 Mark Salyzyn <salyzyn@google.com> media: memset sizeof argument issues

Change-Id: I37ef154eea0f77fb7f22faf6891f3025f6ff346e
vc/enc/SoftAVCEncoder.cpp
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
acenc/SoftAACEncoder2.cpp
acenc/src/adj_thr.c
acenc/src/dyn_bits.c
mrnb/dec/SoftAMR.cpp
mrnb/enc/SoftAMRNBEncoder.cpp
mrwbenc/SoftAMRWBEncoder.cpp
ommon/cmnMemory.c
711/dec/SoftG711.cpp
sm/dec/SoftGSM.cpp
4v_h263/dec/SoftMPEG4.cpp
4v_h263/enc/SoftMPEG4Encoder.cpp
p3dec/SoftMP3.cpp
p3dec/src/pvmp3_mpeg2_get_scale_data.cpp
n2/dec/SoftVPX.cpp
n2/h264dec/SoftAVC.cpp
n2/h264dec/source/h264bsd_conceal.c
n2/h264dec/source/h264bsd_util.c
aw/SoftRaw.cpp
619fd4d6d4d815065becbdf360422ee40dfa7690 03-Apr-2014 Glenn Kasten <gkasten@google.com> Merge commit '52a23bd3' into manualmerge

Change-Id: I7a6105f467a2fa3631c62be3d306845e9cf9b365
66fe2e9ee30bcb4161bc487ec63d2ae4a05f4051 02-Apr-2014 Glenn Kasten <gkasten@google.com> 64-bit: Correction to OMX_U32 and OMX_S32

Change-Id: I9c41bb34c35595ac19a7ab8faaacde8cb4fa9a15
acdec/SoftAAC2.cpp
acenc/SoftAACEncoder2.cpp
vc/enc/SoftAVCEncoder.cpp
lac/enc/SoftFlacEncoder.cpp
711/dec/SoftG711.cpp
sm/dec/SoftGSM.cpp
4v_h263/enc/SoftMPEG4Encoder.cpp
08fce45fdb537e135868604522aba15461f516be 20-Sep-2013 Marco Nelissen <marcone@google.com> Fix aac decoder flush

b/8543366

Change-Id: I746ffed6289486b802a2292bfc492ea6c780ed0b
acdec/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
acdec/SoftAAC2.cpp
acdec/SoftAAC2.h
p3dec/SoftMP3.cpp
p3dec/SoftMP3.h
orbis/dec/SoftVorbis.cpp
orbis/dec/SoftVorbis.h
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
lac/enc/SoftFlacEncoder.cpp
4v_h263/enc/SoftMPEG4Encoder.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
n2/enc/SoftVPXEncoder.cpp
n2/enc/SoftVPXEncoder.h
259ace8f6057dbb0fdec4c8223aefc0282274be3 19-Mar-2014 Glenn Kasten <gkasten@google.com> Merge commit 'c250980f' into manualmerge

Change-Id: I254d456e8cb6c580dd77d602b391bed09110454e
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>
acenc/Android.mk
vc/enc/Android.mk
758799cef41fc5495f59eeb6249d02ce9154cde8 14-Mar-2014 Glenn Kasten <gkasten@google.com> resolved conflicts for merge of 3c780188 to master

Change-Id: Ic579d346c27ff05ea6444faaa60fa6caaec86fbf
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
acenc/Android.mk
vc/enc/Android.mk
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
p3dec/SoftMP3.cpp
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
17d653523898c01816457743ab376a7b0427611f 04-Mar-2014 Lajos Molnar <lajos@google.com> stagefright: SoftOpus: add explicit include files

Also resolved new warnings

Change-Id: I41423b20f80400567bf192c4b4e95c6a29d84782
pus/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.
pus/Android.mk
pus/dec/Android.mk
pus/dec/SoftOpus.cpp
pus/dec/SoftOpus.h
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>
ommon/Config.mk
n2/h264dec/Android.mk
3d2e09f0221693de08129edd02adf340a44e7a38 27-Feb-2014 Narayan Kamath <narayan@google.com> am d4c6052d: am 096d72a3: Merge "AArch64: Correction for LP64"

* commit 'd4c6052dd41dd5b942295cea5568783da7670eb4':
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>
n2/h264dec/source/h264bsd_intra_prediction.c
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
mrwbenc/src/pitch_f4.c
vc/enc/SoftAVCEncoder.cpp
4v_h263/enc/SoftMPEG4Encoder.cpp
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
n2/enc/Android.mk
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
7eacea1156a3896ee7813cd9a06c535e63c95f6a 11-Feb-2014 Lajos Molnar <lajos@google.com> Merge "avcenc: Only do startcode escaping if the next byte requires it"
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
vc/enc/src/bitstream_io.cpp
84333e0475bc911adc16417f4ca327c975cf6c36 08-Feb-2014 Andreas Huber <andih@google.com> warnings be gone.

Change-Id: Ie3bae3f037730e316d7fca12e7a3527973f752ef
acdec/Android.mk
acenc/Android.mk
acenc/SoftAACEncoder2.cpp
acenc/basic_op/oper_32b.c
acenc/src/aacenc.c
acenc/src/adj_thr.c
acenc/src/bitenc.c
acenc/src/dyn_bits.c
acenc/src/psy_main.c
acenc/src/qc_main.c
acenc/src/tns.c
mrnb/common/Android.mk
mrnb/dec/Android.mk
mrnb/dec/SoftAMR.cpp
mrnb/enc/Android.mk
mrnb/enc/SoftAMRNBEncoder.cpp
mrwb/Android.mk
mrwbenc/Android.mk
mrwbenc/SoftAMRWBEncoder.cpp
mrwbenc/src/autocorr.c
mrwbenc/src/convolve.c
mrwbenc/src/syn_filt.c
mrwbenc/src/voAMRWBEnc.c
vc/common/Android.mk
vc/enc/Android.mk
vc/enc/SoftAVCEncoder.cpp
ommon/Android.mk
ommon/cmnMemory.c
lac/enc/Android.mk
lac/enc/SoftFlacEncoder.cpp
711/dec/Android.mk
711/dec/SoftG711.cpp
sm/dec/Android.mk
sm/dec/SoftGSM.cpp
4v_h263/dec/Android.mk
4v_h263/dec/SoftMPEG4.cpp
4v_h263/enc/Android.mk
4v_h263/enc/SoftMPEG4Encoder.cpp
p3dec/Android.mk
p3dec/SoftMP3.cpp
p3dec/src/pvmp3_mpeg2_get_scale_data.cpp
n2/dec/Android.mk
n2/dec/SoftVPX.cpp
n2/enc/Android.mk
n2/h264dec/SoftAVC.cpp
n2/h264dec/source/H264SwDecApi.c
n2/h264dec/source/h264bsd_conceal.c
n2/h264dec/source/h264bsd_reconstruct.c
n2/h264dec/source/h264bsd_slice_header.c
n2/h264dec/source/h264bsd_util.c
aw/Android.mk
aw/SoftRaw.cpp
orbis/dec/Android.mk
1d6fa7af1288b550faabe4ec2cf98684236723db 11-Feb-2014 Narayan Kamath <narayan@google.com> resolved conflicts for merge of 566be7c3 to master

Change-Id: I7b1cc71057b2bd4f771e7bcf508a8c3abd6017ce
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
4v_h263/dec/src/get_pred_adv_b_add.cpp
4v_h263/enc/src/dct.cpp
4v_h263/enc/src/fastcodemb.cpp
4v_h263/enc/src/motion_comp.cpp
4v_h263/enc/src/sad_inline.h
n2/h264dec/source/h264bsd_util.h
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
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
7142d10a7a3941b2deb18869a7f7b79462e0aa52 10-Feb-2014 Lajos Molnar <lajos@google.com> Merge "avcenc: Update video port parameters in the base class"
6a9ebb41a8084b73e654a25d97a6ae26ff4166d4 07-Feb-2014 Marco Nelissen <marcone@google.com> Fix regression

CTS DecoderTest.testBug11696552 started failing again, and this fixes that

Change-Id: I422c3b249a1d5eb25422573d2106d1f142ccfab6
acdec/SoftAAC2.cpp
6e56e8024c98c3e6e62772e1dd345dd2c1c36717 05-Feb-2014 Marco Nelissen <marcone@google.com> Fix restart after EOS for mp3

b/12890850

Change-Id: I985a1ae94d7d62701296d95da34974eb29fcc535
p3dec/SoftMP3.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
acdec/SoftAAC2.cpp
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
n2/enc/SoftVPXEncoder.cpp
5bf2560ce9b70bee077e0c264ac06648f0f63acc 22-Nov-2013 The Android Open Source Project <initial-contribution@android.com> Merge commit 'b2059ff384eee8ffb70a7ec8fc5570405201c734' into HEAD
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
vc/enc/SoftAVCEncoder.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
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
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
n2/enc/SoftVPXEncoder.cpp
n2/enc/SoftVPXEncoder.h
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
n2/enc/SoftVPXEncoder.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
vc/enc/SoftAVCEncoder.cpp
ca1b3ee97a82a91c650da664ea2f2c47dbfaf621 20-Sep-2013 Marco Nelissen <marcone@google.com> Fix aac decoder flush

b/8543366

Change-Id: I746ffed6289486b802a2292bfc492ea6c780ed0b
acdec/SoftAAC2.cpp
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
acdec/SoftAAC2.cpp
acdec/SoftAAC2.h
p3dec/SoftMP3.cpp
p3dec/SoftMP3.h
orbis/dec/SoftVorbis.cpp
orbis/dec/SoftVorbis.h
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
acenc/SoftAACEncoder2.cpp
336da16a12423c496efba6ca9813d5d42a1f70f6 19-Jul-2013 Andreas Huber <andih@google.com> Enable support for explicitly requesting an encoded keyframe from the vp8

encoder.

Change-Id: I370d5831f7d6037faf361a92521390f19f179cbe
n2/enc/SoftVPXEncoder.cpp
n2/enc/SoftVPXEncoder.h
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
n2/enc/Android.mk
n2/enc/SoftVPXEncoder.cpp
n2/enc/SoftVPXEncoder.h
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.
n2/dec/SoftVPX.cpp
n2/dec/SoftVPX.h
n2/enc/SoftVPXEncoder.cpp
n2/enc/SoftVPXEncoder.h
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
n2/h264dec/SoftAVC.cpp
n2/h264dec/SoftAVC.h
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>
4v_h263/dec/SoftMPEG4.cpp
4v_h263/dec/SoftMPEG4.h
n2/dec/SoftVPX.cpp
n2/dec/SoftVPX.h
n2/h264dec/SoftAVC.cpp
n2/h264dec/SoftAVC.h
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)
4v_h263/dec/SoftMPEG4.cpp
4v_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)
4v_h263/dec/SoftMPEG4.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
acdec/SoftAAC2.cpp
mrnb/dec/SoftAMR.cpp
mrnb/dec/SoftAMR.h
4v_h263/dec/SoftMPEG4.cpp
4v_h263/dec/SoftMPEG4.h
p3dec/SoftMP3.cpp
n2/dec/SoftVPX.cpp
n2/dec/SoftVPX.h
n2/h264dec/SoftAVC.cpp
n2/h264dec/SoftAVC.h
orbis/dec/SoftVorbis.cpp
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
n2/dec/SoftVPX.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
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
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
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
lac/enc/SoftFlacEncoder.cpp
lac/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
lac/enc/SoftFlacEncoder.cpp
lac/enc/SoftFlacEncoder.h
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
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>
4v_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>
4v_h263/enc/SoftMPEG4Encoder.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
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
p3dec/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
p3dec/SoftMP3.cpp
e42f027d19b20cf581be11a89e26b2c96c50c335 17-Apr-2013 Marco Nelissen <marcone@google.com> Make sure the drain buffer is big enough

b/8614909

Change-Id: I9d973dcd74100b793791359c262b821207ff9ddd
acdec/SoftAAC2.cpp
f2334661f4047beddf0431e7fe5204ca1cf4380b 17-Apr-2013 Marco Nelissen <marcone@google.com> Make sure the drain buffer is big enough

b/8614909

Change-Id: I9d973dcd74100b793791359c262b821207ff9ddd
acdec/SoftAAC2.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
acdec/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
acdec/SoftAAC2.cpp
94b66227ff5a57dd810aafa7b3aa810b9a185b8d 16-Apr-2013 Marco Nelissen <marcone@google.com> Fix Vorbis decoder reset

b/8543366

Change-Id: I9f32e96fdfc355cf444259a7c40554e2de184728
orbis/dec/SoftVorbis.cpp
98391d3e9c0188d477fab6044d5259eeb0014113 16-Apr-2013 Marco Nelissen <marcone@google.com> Fix Vorbis decoder reset

b/8543366

Change-Id: I9f32e96fdfc355cf444259a7c40554e2de184728
orbis/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
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
acdec/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
acdec/SoftAAC2.cpp
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()
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
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
acdec/SoftAAC2.cpp
acdec/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
acdec/SoftAAC2.cpp
acdec/SoftAAC2.h
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
acdec/Android.mk
acenc/Android.mk
mrnb/dec/Android.mk
mrnb/enc/Android.mk
mrwbenc/Android.mk
vc/enc/Android.mk
lac/enc/Android.mk
711/dec/Android.mk
sm/dec/Android.mk
4v_h263/dec/Android.mk
4v_h263/enc/Android.mk
p3dec/Android.mk
n2/dec/Android.mk
n2/enc/Android.mk
n2/h264dec/Android.mk
aw/Android.mk
orbis/dec/Android.mk
ecba7488c5cceaacef95836b1b476433451e7761 10-Apr-2013 Ying Wang <wangying@google.com> Add liblog

Bug: 8580410
Change-Id: If493d87d60d71be664ad75b140c62acadb75b0d0
acdec/Android.mk
acenc/Android.mk
mrnb/dec/Android.mk
mrnb/enc/Android.mk
mrwbenc/Android.mk
vc/enc/Android.mk
lac/enc/Android.mk
711/dec/Android.mk
sm/dec/Android.mk
4v_h263/dec/Android.mk
4v_h263/enc/Android.mk
p3dec/Android.mk
n2/dec/Android.mk
n2/enc/Android.mk
n2/h264dec/Android.mk
aw/Android.mk
orbis/dec/Android.mk
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.
a5761dcb5f9f017ca9b83ec868565d7ce54a92ac 04-Apr-2013 Andreas Huber <andih@google.com> Fix a number of warnings in stagefright code.

Change-Id: If3edd00d991851797aeccdfe795a4a405e3a2ea3
acenc/SoftAACEncoder2.cpp
mrnb/enc/SoftAMRNBEncoder.cpp
n2/enc/SoftVPXEncoder.cpp
3d34fa7fe4df6fb66215303f721cc87ce4619cdc 04-Apr-2013 Andreas Huber <andih@google.com> Fix a number of warnings in stagefright code.

Change-Id: If3edd00d991851797aeccdfe795a4a405e3a2ea3
acenc/SoftAACEncoder2.cpp
mrnb/enc/SoftAMRNBEncoder.cpp
n2/enc/SoftVPXEncoder.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
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
n2/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
n2/h264dec/source/h264bsd_util.c
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
acenc/SampleCode/Android.mk
mrwbenc/SampleCode/Android.mk
n2/h264dec/Android.mk
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
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
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
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
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"
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
mrnb/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
mrnb/dec/SoftAMR.cpp
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>
n2/enc/Android.mk
n2/enc/MODULE_LICENSE_APACHE2
n2/enc/NOTICE
n2/enc/SoftVPXEncoder.cpp
n2/enc/SoftVPXEncoder.h
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>
n2/enc/Android.mk
n2/enc/MODULE_LICENSE_APACHE2
n2/enc/NOTICE
n2/enc/SoftVPXEncoder.cpp
n2/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.
n2/enc/Android.mk
n2/enc/MODULE_LICENSE_APACHE2
n2/enc/NOTICE
n2/enc/SoftVPXEncoder.cpp
n2/enc/SoftVPXEncoder.h
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.
n2/enc/Android.mk
n2/enc/MODULE_LICENSE_APACHE2
n2/enc/NOTICE
n2/enc/SoftVPXEncoder.cpp
n2/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>
n2/enc/Android.mk
n2/enc/MODULE_LICENSE_APACHE2
n2/enc/NOTICE
n2/enc/SoftVPXEncoder.cpp
n2/enc/SoftVPXEncoder.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>
n2/enc/Android.mk
n2/enc/MODULE_LICENSE_APACHE2
n2/enc/NOTICE
n2/enc/SoftVPXEncoder.cpp
n2/enc/SoftVPXEncoder.h
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
orbis/dec/SoftVorbis.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
orbis/dec/SoftVorbis.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
4v_h263/dec/SoftMPEG4.cpp
n2/h264dec/SoftAVC.cpp
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
4v_h263/dec/SoftMPEG4.cpp
n2/h264dec/SoftAVC.cpp
1c80821b0720175478981ac43e7ca9567b58b7c5 18-Dec-2012 Marco Nelissen <marcone@google.com> Make codecs reconfigurable

Change-Id: I3dd46cb4401493becbf6152f4dcd5a8f1e9a0b44
acdec/SoftAAC2.cpp
acdec/SoftAAC2.h
p3dec/SoftMP3.cpp
p3dec/SoftMP3.h
orbis/dec/SoftVorbis.cpp
orbis/dec/SoftVorbis.h
6fc72b01a3b67903b52f1d33b1ad5c960b5365f1 18-Dec-2012 Marco Nelissen <marcone@google.com> Make codecs reconfigurable

Change-Id: I3dd46cb4401493becbf6152f4dcd5a8f1e9a0b44
acdec/SoftAAC2.cpp
acdec/SoftAAC2.h
p3dec/SoftMP3.cpp
p3dec/SoftMP3.h
orbis/dec/SoftVorbis.cpp
orbis/dec/SoftVorbis.h
e81a9610343425e5bb76cdb297065426c6e75ef0 30-Oct-2012 Johann <johannkoenig@google.com> Match new paths and organization in external/libvpx

See I2c0a87b0fc049e855e21f455b806287b578091de

Change-Id: Iec8566bce0a4763a9a17b4a46f15aa39b5bcd141
n2/dec/Android.mk
a20fc62f23263c4220c1a14eb6a37165f7cdf327 30-Oct-2012 Johann <johannkoenig@google.com> Match new paths and organization in external/libvpx

See I2c0a87b0fc049e855e21f455b806287b578091de

Change-Id: Iec8566bce0a4763a9a17b4a46f15aa39b5bcd141
n2/dec/Android.mk
c8849107ad2fd0ab6b6464af2551fe3706ce643d 12-Dec-2012 Ying Wang <wangying@google.com> Merge "Match new paths and organization in external/libvpx"
8cade496e47fc7d8f01e286579a5db15b85c59cc 12-Dec-2012 Ying Wang <wangying@google.com> Merge "Match new paths and organization in external/libvpx"
3c81bfb86cfa2b0bae4fea41cc26e3ce50af8517 16-Nov-2012 Marco Nelissen <marcone@google.com> Merge "Add GSM 6.10 decoder"
a1c1a7e4c9cb37726e4afc10d6678666087f8e1d 16-Nov-2012 Marco Nelissen <marcone@google.com> Merge "Add GSM 6.10 decoder"
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
sm/Android.mk
sm/dec/Android.mk
sm/dec/MODULE_LICENSE_APACHE2
sm/dec/NOTICE
sm/dec/SoftGSM.cpp
sm/dec/SoftGSM.h
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
sm/Android.mk
sm/dec/Android.mk
sm/dec/MODULE_LICENSE_APACHE2
sm/dec/NOTICE
sm/dec/SoftGSM.cpp
sm/dec/SoftGSM.h
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
n2/dec/SoftVPX.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
n2/dec/SoftVPX.cpp
0b95d8a547316997b5e280f7acb1df362f3e820b 30-Oct-2012 Johann <johannkoenig@google.com> Match new paths and organization in external/libvpx

See I739f99d48b8d7e6354c416ef2ca79c954826307f

Change-Id: I42b51e2845a696a6e211dde00951afc8f571336f
n2/dec/Android.mk
fd88f86ec6788170fb4d903c1b0932a18ce1197c 30-Oct-2012 Johann <johannkoenig@google.com> Match new paths and organization in external/libvpx

See I739f99d48b8d7e6354c416ef2ca79c954826307f

Change-Id: I42b51e2845a696a6e211dde00951afc8f571336f
n2/dec/Android.mk
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
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
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
acdec/SoftAAC2.cpp
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
acdec/SoftAAC2.cpp
fec5b1333ab756f73677acf42ddd7b71cdbfafae 19-Oct-2012 Nick Kralevich <nnk@google.com> am 1baa01a5: Merge "hardening: eliminate more .text relocations"

* commit '1baa01a52f24566c134313fade8b19a582654638':
hardening: eliminate more .text relocations
4ad27b11f8c883a3131d1f81d883de01b8076be1 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
mrwbenc/src/asm/ARMV5E/pred_lt4_1_opt.s
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
acdec/SoftAAC2.cpp
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
acdec/SoftAAC2.cpp
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
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
1b0ae9e47273357e19a9beb22466319753e8242d 12-Sep-2012 Jean-Baptiste Queru <jbq@google.com> Merge "avcenc: Set OMX_BUFFERFLAG_EOS on the last output frame"
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
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
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
acdec/SoftAAC2.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
acdec/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
acenc/inc/aac_rom.h
acenc/src/aac_rom.c
acenc/src/block_switch.c
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
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
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
vc/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
vc/enc/SoftAVCEncoder.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
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
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
vc/enc/src/sad_halfpel_inline.h
vc/enc/src/sad_inline.h
vc/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
vc/enc/src/sad_halfpel_inline.h
vc/enc/src/sad_inline.h
vc/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
vc/enc/src/sad_halfpel_inline.h
vc/enc/src/sad_inline.h
vc/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
46b7eeb8be7449515082ecb1a61700affb44115f 20-Aug-2012 Nick Kralevich <nnk@google.com> Merge "hardening: eliminate text relocations from h264"
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
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
vc/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
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
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
acenc/Android.mk
acenc/SampleCode/Android.mk
mrwbenc/Android.mk
mrwbenc/SampleCode/Android.mk
ommon/Android.mk
ommon/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
ommon/include/voType.h
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
acdec/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
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
n2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_DecodeCoeffsToPair_s.S
n2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_Interpolate_Chroma_s.S
n2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/omxVCM4P10_DequantTransformResidualFromPairAndAdd_s.S
n2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/omxVCM4P10_PredictIntraChroma_8x8_s.S
n2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/omxVCM4P10_PredictIntra_16x16_s.S
n2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/omxVCM4P10_PredictIntra_4x4_s.S
n2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/omxVCM4P10_TransformDequantChromaDCFromPair_s.S
n2/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
p3dec/src/asm/pvmp3_dct_16_gcc.s
p3dec/src/asm/pvmp3_mdct_18_gcc.s
p3dec/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
mrwbenc/src/asm/ARMV5E/Filt_6k_7k_opt.s
mrwbenc/src/asm/ARMV7/Filt_6k_7k_neon.s
mrwbenc/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
5efa7bf945f53c419501b0a4f9718962f24f0df5 13-Aug-2012 Jean-Baptiste Queru <jbq@google.com> Merge "amrnb: Fix audio distortion in an AMR-NB clip"
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
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"
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
acdec/Android.mk
acdec/SoftAAC.cpp
acdec/SoftAAC.h
acdec/aac_mem_funcs.h
acdec/analysis_sub_band.cpp
acdec/analysis_sub_band.h
acdec/apply_ms_synt.cpp
acdec/apply_ms_synt.h
acdec/apply_tns.cpp
acdec/apply_tns.h
acdec/bit_reversal_swap.h
acdec/buf_getbits.cpp
acdec/buf_getbits.h
acdec/buffer_normalization.h
acdec/byte_align.cpp
acdec/calc_auto_corr.cpp
acdec/calc_auto_corr.h
acdec/calc_gsfb_table.cpp
acdec/calc_sbr_anafilterbank.cpp
acdec/calc_sbr_anafilterbank.h
acdec/calc_sbr_envelope.cpp
acdec/calc_sbr_envelope.h
acdec/calc_sbr_synfilterbank.cpp
acdec/calc_sbr_synfilterbank.h
acdec/chans.h
acdec/check_crc.cpp
acdec/check_crc.h
acdec/dct16.cpp
acdec/dct16.h
acdec/dct64.cpp
acdec/dct64.h
acdec/decode_huff_cw_binary.cpp
acdec/decode_noise_floorlevels.cpp
acdec/decode_noise_floorlevels.h
acdec/deinterleave.cpp
acdec/digit_reversal_tables.cpp
acdec/digit_reversal_tables.h
acdec/dst16.cpp
acdec/dst16.h
acdec/dst32.cpp
acdec/dst32.h
acdec/dst8.cpp
acdec/dst8.h
acdec/e_adif_const.h
acdec/e_blockswitching.h
acdec/e_coupling_mode.h
acdec/e_elementid.h
acdec/e_huffmanconst.h
acdec/e_infoinitconst.h
acdec/e_invf_mode.h
acdec/e_maskstatus.h
acdec/e_mp4ff_const.h
acdec/e_progconfigconst.h
acdec/e_rawbitstreamconst.h
acdec/e_sbr_element_id.h
acdec/e_sbr_error.h
acdec/e_sbr_header_status.h
acdec/e_sbr_master_status.h
acdec/e_sbr_sync_state.h
acdec/e_sr_mode.h
acdec/e_tmp4audioobjecttype.h
acdec/e_tns_const.h
acdec/e_window_sequence.h
acdec/e_window_shape.h
acdec/esc_iquant_scaling.cpp
acdec/esc_iquant_scaling.h
acdec/extractframeinfo.cpp
acdec/extractframeinfo.h
acdec/fft_rx4.h
acdec/fft_rx4_long.cpp
acdec/fft_rx4_short.cpp
acdec/fft_rx4_tables_fxp.cpp
acdec/find_adts_syncword.cpp
acdec/find_adts_syncword.h
acdec/fwd_long_complex_rot.cpp
acdec/fwd_long_complex_rot.h
acdec/fwd_short_complex_rot.cpp
acdec/fwd_short_complex_rot.h
acdec/fxp_mul32.h
acdec/fxp_mul32_arm_gcc.h
acdec/fxp_mul32_arm_v4.h
acdec/fxp_mul32_arm_v4_gcc.h
acdec/fxp_mul32_arm_v5.h
acdec/fxp_mul32_c_equivalent.h
acdec/fxp_mul32_c_msc_evc.h
acdec/fxp_mul32_c_msc_evc_armv5.h
acdec/fxp_mul32_pentium.h
acdec/gen_rand_vector.cpp
acdec/gen_rand_vector.h
acdec/get_adif_header.cpp
acdec/get_adif_header.h
acdec/get_adts_header.cpp
acdec/get_adts_header.h
acdec/get_audio_specific_config.cpp
acdec/get_audio_specific_config.h
acdec/get_dse.cpp
acdec/get_dse.h
acdec/get_ele_list.cpp
acdec/get_ele_list.h
acdec/get_ga_specific_config.cpp
acdec/get_ga_specific_config.h
acdec/get_ics_info.cpp
acdec/get_ics_info.h
acdec/get_prog_config.cpp
acdec/get_prog_config.h
acdec/get_pulse_data.cpp
acdec/get_pulse_data.h
acdec/get_sbr_bitstream.cpp
acdec/get_sbr_bitstream.h
acdec/get_sbr_startfreq.cpp
acdec/get_sbr_startfreq.h
acdec/get_sbr_stopfreq.cpp
acdec/get_sbr_stopfreq.h
acdec/get_sign_bits.h
acdec/get_tns.cpp
acdec/get_tns.h
acdec/getbits.h
acdec/getfill.cpp
acdec/getfill.h
acdec/getgroup.cpp
acdec/getics.cpp
acdec/getmask.cpp
acdec/hcbtables.h
acdec/hcbtables_binary.cpp
acdec/huffcb.cpp
acdec/huffdecode.cpp
acdec/hufffac.cpp
acdec/huffman.h
acdec/huffspec_fxp.cpp
acdec/ibstream.h
acdec/idct16.cpp
acdec/idct16.h
acdec/idct32.cpp
acdec/idct32.h
acdec/idct8.cpp
acdec/idct8.h
acdec/imdct_fxp.cpp
acdec/imdct_fxp.h
acdec/infoinit.cpp
acdec/init_sbr_dec.cpp
acdec/init_sbr_dec.h
acdec/intensity_right.cpp
acdec/intensity_right.h
acdec/inv_long_complex_rot.cpp
acdec/inv_long_complex_rot.h
acdec/inv_short_complex_rot.cpp
acdec/inv_short_complex_rot.h
acdec/iquant_table.cpp
acdec/iquant_table.h
acdec/long_term_prediction.cpp
acdec/long_term_prediction.h
acdec/long_term_synthesis.cpp
acdec/long_term_synthesis.h
acdec/lt_decode.cpp
acdec/lt_decode.h
acdec/lt_prediction.h
acdec/ltp_common_internal.h
acdec/mdct_fxp.cpp
acdec/mdct_fxp.h
acdec/mdct_tables_fxp.cpp
acdec/mdst.cpp
acdec/mdst.h
acdec/mix_radix_fft.cpp
acdec/mix_radix_fft.h
acdec/ms_map_mask.h
acdec/ms_synt.cpp
acdec/ms_synt.h
acdec/pns_corr.cpp
acdec/pns_corr.h
acdec/pns_intensity_right.cpp
acdec/pns_intensity_right.h
acdec/pns_left.cpp
acdec/pns_left.h
acdec/ps_all_pass_filter_coeff.cpp
acdec/ps_all_pass_filter_coeff.h
acdec/ps_all_pass_fract_delay_filter.cpp
acdec/ps_all_pass_fract_delay_filter.h
acdec/ps_allocate_decoder.cpp
acdec/ps_allocate_decoder.h
acdec/ps_applied.cpp
acdec/ps_applied.h
acdec/ps_bstr_decoding.cpp
acdec/ps_bstr_decoding.h
acdec/ps_channel_filtering.cpp
acdec/ps_channel_filtering.h
acdec/ps_constants.h
acdec/ps_decode_bs_utils.cpp
acdec/ps_decode_bs_utils.h
acdec/ps_decorrelate.cpp
acdec/ps_decorrelate.h
acdec/ps_fft_rx8.cpp
acdec/ps_fft_rx8.h
acdec/ps_hybrid_analysis.cpp
acdec/ps_hybrid_analysis.h
acdec/ps_hybrid_filter_bank_allocation.cpp
acdec/ps_hybrid_filter_bank_allocation.h
acdec/ps_hybrid_synthesis.cpp
acdec/ps_hybrid_synthesis.h
acdec/ps_init_stereo_mixing.cpp
acdec/ps_init_stereo_mixing.h
acdec/ps_pwr_transient_detection.cpp
acdec/ps_pwr_transient_detection.h
acdec/ps_read_data.cpp
acdec/ps_read_data.h
acdec/ps_stereo_processing.cpp
acdec/ps_stereo_processing.h
acdec/pulse_nc.cpp
acdec/pulse_nc.h
acdec/pv_audio_type_defs.h
acdec/pv_div.cpp
acdec/pv_div.h
acdec/pv_log2.cpp
acdec/pv_log2.h
acdec/pv_normalize.cpp
acdec/pv_normalize.h
acdec/pv_pow2.cpp
acdec/pv_pow2.h
acdec/pv_sine.cpp
acdec/pv_sine.h
acdec/pv_sqrt.cpp
acdec/pv_sqrt.h
acdec/pvmp4audiodecoder_api.h
acdec/pvmp4audiodecoderconfig.cpp
acdec/pvmp4audiodecoderframe.cpp
acdec/pvmp4audiodecodergetmemrequirements.cpp
acdec/pvmp4audiodecoderinitlibrary.cpp
acdec/pvmp4audiodecoderresetbuffer.cpp
acdec/pvmp4setaudioconfig.cpp
acdec/q_normalize.cpp
acdec/q_normalize.h
acdec/qmf_filterbank_coeff.cpp
acdec/qmf_filterbank_coeff.h
acdec/s_adif_header.h
acdec/s_bit_buffer.h
acdec/s_bits.h
acdec/s_ch_info.h
acdec/s_crc_buffer.h
acdec/s_elelist.h
acdec/s_frameinfo.h
acdec/s_hcb.h
acdec/s_huffman.h
acdec/s_hybrid.h
acdec/s_lt_pred_status.h
acdec/s_mc_info.h
acdec/s_mixdown.h
acdec/s_patch.h
acdec/s_progconfig.h
acdec/s_ps_dec.h
acdec/s_pulseinfo.h
acdec/s_sbr_channel.h
acdec/s_sbr_dec.h
acdec/s_sbr_element_stream.h
acdec/s_sbr_frame_data.h
acdec/s_sbr_header_data.h
acdec/s_sbrbitstream.h
acdec/s_sectinfo.h
acdec/s_sr_info.h
acdec/s_tdec_int_chan.h
acdec/s_tdec_int_file.h
acdec/s_tns_frame_info.h
acdec/s_tnsfilt.h
acdec/s_wnd_shape.h
acdec/sbr_aliasing_reduction.cpp
acdec/sbr_aliasing_reduction.h
acdec/sbr_applied.cpp
acdec/sbr_applied.h
acdec/sbr_code_book_envlevel.cpp
acdec/sbr_code_book_envlevel.h
acdec/sbr_constants.h
acdec/sbr_crc_check.cpp
acdec/sbr_crc_check.h
acdec/sbr_create_limiter_bands.cpp
acdec/sbr_create_limiter_bands.h
acdec/sbr_dec.cpp
acdec/sbr_dec.h
acdec/sbr_decode_envelope.cpp
acdec/sbr_decode_envelope.h
acdec/sbr_decode_huff_cw.cpp
acdec/sbr_decode_huff_cw.h
acdec/sbr_downsample_lo_res.cpp
acdec/sbr_downsample_lo_res.h
acdec/sbr_envelope_calc_tbl.cpp
acdec/sbr_envelope_calc_tbl.h
acdec/sbr_envelope_unmapping.cpp
acdec/sbr_envelope_unmapping.h
acdec/sbr_extract_extended_data.cpp
acdec/sbr_extract_extended_data.h
acdec/sbr_find_start_andstop_band.cpp
acdec/sbr_find_start_andstop_band.h
acdec/sbr_generate_high_freq.cpp
acdec/sbr_generate_high_freq.h
acdec/sbr_get_additional_data.cpp
acdec/sbr_get_additional_data.h
acdec/sbr_get_cpe.cpp
acdec/sbr_get_cpe.h
acdec/sbr_get_dir_control_data.cpp
acdec/sbr_get_dir_control_data.h
acdec/sbr_get_envelope.cpp
acdec/sbr_get_envelope.h
acdec/sbr_get_header_data.cpp
acdec/sbr_get_header_data.h
acdec/sbr_get_noise_floor_data.cpp
acdec/sbr_get_noise_floor_data.h
acdec/sbr_get_sce.cpp
acdec/sbr_get_sce.h
acdec/sbr_inv_filt_levelemphasis.cpp
acdec/sbr_inv_filt_levelemphasis.h
acdec/sbr_open.cpp
acdec/sbr_open.h
acdec/sbr_read_data.cpp
acdec/sbr_read_data.h
acdec/sbr_requantize_envelope_data.cpp
acdec/sbr_requantize_envelope_data.h
acdec/sbr_reset_dec.cpp
acdec/sbr_reset_dec.h
acdec/sbr_update_freq_scale.cpp
acdec/sbr_update_freq_scale.h
acdec/set_mc_info.cpp
acdec/set_mc_info.h
acdec/sfb.cpp
acdec/sfb.h
acdec/shellsort.cpp
acdec/shellsort.h
acdec/stereo_2_mono.h
acdec/synthesis_sub_band.cpp
acdec/synthesis_sub_band.h
acdec/tns_ar_filter.cpp
acdec/tns_ar_filter.h
acdec/tns_decode_coef.cpp
acdec/tns_decode_coef.h
acdec/tns_inv_filter.cpp
acdec/tns_inv_filter.h
acdec/trans4m_freq_2_time_fxp.cpp
acdec/trans4m_time_2_freq_fxp.cpp
acdec/unpack_idx.cpp
acdec/unpack_idx.h
acdec/window_block_fxp.h
acdec/window_tables_fxp.cpp
acdec/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
acdec/SoftAAC2.cpp
p3dec/SoftMP3.cpp
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
vc/enc/Android.mk
vc/enc/SoftAVCEncoder.cpp
vc/enc/SoftAVCEncoder.h
4v_h263/enc/Android.mk
4v_h263/enc/SoftMPEG4Encoder.cpp
4v_h263/enc/SoftMPEG4Encoder.h
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
vc/enc/src/avcenc_api.cpp
vc/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
vc/common/include/avcapi_common.h
vc/enc/SoftAVCEncoder.cpp
955585cca11173b07e2e7db3d636ee97b69b053b 13-Apr-2012 Martin Storsjo <martin@martin.st> avcenc: Fix indentation

Change-Id: I4fcdf619e3b75387a7909272f3164b8d608b6cc2
vc/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
vc/enc/Android.mk
vc/enc/src/sad_halfpel_inline.h
vc/enc/src/sad_inline.h
vc/enc/src/sad_mb_offset.h
2f3152dee8e763fd7eae9d7b71078d5c6aec5881 13-Apr-2012 Martin Storsjo <martin@martin.st> avcenc: Remove useless casts

Change-Id: I73a6f74268bcf6ca22d489d13936be8fd1b3fc92
vc/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
vc/common/include/avcapi_common.h
vc/common/src/dpb.cpp
vc/enc/SoftAVCEncoder.cpp
vc/enc/src/avcenc_api.cpp
vc/enc/src/bitstream_io.cpp
vc/enc/src/motion_est.cpp
vc/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
mrnb/common/include/pvgsmamr.h
mrnb/common/pvgsmamrdecoderinterface.h
mrnb/dec/Android.mk
mrnb/dec/include/pvamrnbdecoder_api.h
mrnb/dec/src/pvgsmamrdecoder.cpp
mrnb/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
mrnb/common/include/frame_type_3gpp.h
mrnb/common/pvgsmamrdecoderinterface.h
mrnb/dec/src/amrdecode.h
mrnb/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
mrnb/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
mrnb/enc/src/g_pitch.cpp
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
acdec/SoftAAC.h
acdec/SoftAAC2.h
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/
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
acdec/MODULE_LICENSE_APACHE2
acdec/NOTICE
acenc/MODULE_LICENSE_APACHE2
acenc/NOTICE
acenc/SampleCode/MODULE_LICENSE_APACHE2
acenc/SampleCode/NOTICE
mrnb/common/MODULE_LICENSE_APACHE2
mrnb/common/NOTICE
mrnb/dec/MODULE_LICENSE_APACHE2
mrnb/dec/NOTICE
mrnb/enc/MODULE_LICENSE_APACHE2
mrnb/enc/NOTICE
mrwb/MODULE_LICENSE_APACHE2
mrwb/NOTICE
mrwbenc/MODULE_LICENSE_APACHE2
mrwbenc/NOTICE
mrwbenc/SampleCode/MODULE_LICENSE_APACHE2
mrwbenc/SampleCode/NOTICE
vc/common/MODULE_LICENSE_APACHE2
vc/common/NOTICE
vc/enc/MODULE_LICENSE_APACHE2
vc/enc/NOTICE
ommon/MODULE_LICENSE_APACHE2
ommon/NOTICE
lac/enc/MODULE_LICENSE_APACHE2
lac/enc/NOTICE
711/dec/MODULE_LICENSE_APACHE2
711/dec/NOTICE
4v_h263/dec/MODULE_LICENSE_APACHE2
4v_h263/dec/NOTICE
4v_h263/enc/MODULE_LICENSE_APACHE2
4v_h263/enc/NOTICE
p3dec/MODULE_LICENSE_APACHE2
p3dec/NOTICE
aw/MODULE_LICENSE_APACHE2
aw/NOTICE
orbis/dec/MODULE_LICENSE_APACHE2
orbis/dec/NOTICE
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
n2/dec/MODULE_LICENSE_APACHE2
n2/dec/NOTICE
n2/h264dec/MODULE_LICENSE_APACHE2
n2/h264dec/NOTICE
8f1dd6fdc2f788492e5ca77344eac13755c304ff 12-Jun-2012 Dave Burke <daveburke@google.com> am 10cf121f: Merge "Update make file" into jb-dev

* commit '10cf121f7285e23c37264dab3bad7cffefd754b1':
Update make file
c68f4a226fc5af54a882b0603d3051793a781037 12-Jun-2012 Dave Burke <daveburke@google.com> Update make file

Change-Id: I7dbd128245f584df2689457df0dd12ce888cf8ef
acdec/Android.mk
acenc/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
acenc/src/adj_thr.c
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
acenc/src/aacenc.c
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
acdec/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.
503775e4e2c3ead1cbd3c10561e3bdd90f2e70d5 30-May-2012 Dave Burke <daveburke@google.com> Precautionary logging to identify a potential infinite loop.

Bug: 6571063
Change-Id: I433659c6da333d5acd25ad03cb7f4a6ab0b6a4a5
acdec/SoftAAC2.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
acenc/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.
1adacd921319ec52fac1a4596ab6eaf8689e6a7d 23-May-2012 Dave Burke <daveburke@google.com> Property to enable AAC 5.1 pass-through.

Bug: 6275957
Change-Id: I8debdce872fc8287a4f6340f1790e02c075886e3
acdec/Android.mk
acdec/SoftAAC2.cpp
acdec/SoftAAC2.h
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
acdec/Android.mk
acenc/Android.mk
d7d79a2bbf38d1d19ec7cc8d6a514fc999b5c444 19-May-2012 Dave Burke <daveburke@google.com> Revert to PV for AAC codec for FactoryROM.

Change-Id: I72cf856685c0c4bae745646f870a0415d416afb5
acdec/Android.mk
acenc/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
vc/enc/src/avcenc_api.cpp
vc/enc/src/motion_comp.cpp
vc/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
vc/common/src/deblock.cpp
vc/enc/src/motion_comp.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.
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
acdec/SoftAAC.cpp
acdec/SoftAAC2.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
acdec/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
acdec/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
acdec/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
acdec/SoftAAC2.cpp
acdec/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.
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
acdec/SoftAAC2.cpp
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.
e893150187191299002626c75232f8985189cb0d 17-May-2012 Dave Burke <daveburke@google.com> Add informational logging to track 0 channel issue.

Bug #: 6498711

Change-Id: I952777923569511a171fe8b79eab579625eda073
acdec/SoftAAC2.cpp
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
acdec/SoftAAC2.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.
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
p3dec/SoftMP3.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
acdec/SoftAAC2.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
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
acdec/SoftAAC.cpp
acdec/SoftAAC.h
acdec/SoftAAC2.cpp
acdec/SoftAAC2.h
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
acdec/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
mrnb/dec/SoftAMR.cpp
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
4v_h263/dec/include/mp4dec_api.h
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
lac/Android.mk
lac/enc/Android.mk
lac/enc/SoftFlacEncoder.cpp
lac/enc/SoftFlacEncoder.h
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.
02accddf8d69da7b2b5e05631ad222cd842ff547 08-May-2012 Andreas Huber <andih@google.com> Fix both H.263 and MPEG4 decoders.

Change-Id: I6c76fa33f6ea4b439abc14c396a86c3553c85189
related-to-bug: 6460112
4v_h263/dec/SoftMPEG4.cpp
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
ommon/Android.mk
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
vc/enc/AVCEncoder.cpp
vc/enc/Android.mk
4v_h263/enc/Android.mk
4v_h263/enc/M4vH263Encoder.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
acdec/SoftAAC2.cpp
acenc/SoftAACEncoder2.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
acdec/SoftAAC2.cpp
acdec/SoftAAC2.h
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
acdec/SoftAAC2.cpp
aeb8fd460ed87d032b3fb8bb61e21eb542ce0f5b 19-Apr-2012 Dave Burke <daveburke@google.com> Add Fraunhofer AAC encoder with AAC-ELD support.

Change-Id: I6cd499d257d72f50a5b508bed97796a591a51506
acenc/Android.mk
acenc/SoftAACEncoder2.cpp
acenc/SoftAACEncoder2.h
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
4v_h263/enc/Android.mk
4v_h263/enc/SoftMPEG4Encoder.cpp
4v_h263/enc/SoftMPEG4Encoder.h
5c61b361d1c55a93a215cfb2c325b4987f57f1c5 29-Mar-2012 James Dong <jdong@google.com> Software AVC encoder is now OMX-based

o related-to-bug: 6383440

Change-Id: I0b1ae50a704b0979857ea447585eabe86602149a
vc/enc/Android.mk
vc/enc/SoftAVCEncoder.cpp
vc/enc/SoftAVCEncoder.h
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
acdec/SoftAAC.cpp
acdec/SoftAAC2.cpp
05cd06e19f968c7320e8e85fc7122125f284741c 19-Apr-2012 Dave Burke <daveburke@google.com> Revert "Temporary revert of new AAC codec to fix build"

This reverts commit f356cc9c9995ba292bf116f1cb28a6caa1b65fd2.
acdec/Android.mk
f356cc9c9995ba292bf116f1cb28a6caa1b65fd2 19-Apr-2012 Dave Burke <daveburke@google.com> Temporary revert of new AAC codec to fix build

Change-Id: I5c7f0360883fc68e313d10b1aa5dac1463fae7fb
acdec/Android.mk
095c2da8d6c2058b02142c940f6e6346d6581780 13-Apr-2012 Dave Burke <daveburke@google.com> Make AAC 5.1 work
Fix bug with pausing audio

Change-Id: Icd6b095dac8d1a68b027de853d11ae02cc070b10
acdec/Android.mk
acdec/SoftAAC2.cpp
acdec/SoftAAC2.h
b7ddcc9460f488f0b032aeb27b52a423318a97ea 02-Apr-2012 Dave Burke <daveburke@google.com> Add support for a new AAC decoder library.

Change-Id: I867bf95f7c20503e55b38d0087ac027647834f37
acdec/Android.mk
acdec/SoftAAC2.cpp
acdec/SoftAAC2.h
ecdd39c5af016e2fa57cbfd837aa670b706dabd3 29-Mar-2012 Andreas Huber <andih@google.com> Implementation of a raw audio "decoder".

Change-Id: Ie89f01e59dd8106883937188afbb407550f0ac92
aw/Android.mk
aw/SoftRaw.cpp
aw/SoftRaw.h
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
acdec/Android.mk
acenc/Android.mk
mrnb/dec/Android.mk
mrnb/enc/Android.mk
mrwb/Android.mk
mrwbenc/Android.mk
vc/enc/Android.mk
711/dec/Android.mk
4v_h263/dec/Android.mk
4v_h263/enc/Android.mk
p3dec/Android.mk
n2/dec/Android.mk
n2/h264dec/Android.mk
orbis/dec/Android.mk
ed3e3e046840d5bf1ca84a8c0cc097425e89d6d6 26-Mar-2012 Andreas Huber <andih@google.com> Provisional support for secure decryption of media streams.

Change-Id: Ib3982a9c960bfdb0cb7e1b174440b141b194cfbe
acdec/SoftAAC.cpp
acdec/SoftAAC.h
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
p3dec/SoftMP3.cpp
p3dec/SoftMP3.h
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
mrnb/dec/SoftAMR.cpp
711/dec/SoftG711.cpp
ded61aa958278147b5a150c189f86d025165f095 16-Mar-2012 Andreas Huber <andih@google.com> Remove obsolete software codec header files and amr encoders.

Change-Id: Ifbdf252ee312c9cb5ab29498f1e06dae8f23faf7
mrnb/enc/AMRNBEncoder.cpp
mrnb/enc/Android.mk
mrwbenc/AMRWBEncoder.cpp
mrwbenc/Android.mk
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
acdec/Android.mk
acenc/Android.mk
mrnb/dec/Android.mk
mrnb/enc/Android.mk
mrwbenc/Android.mk
vc/enc/Android.mk
711/dec/Android.mk
4v_h263/dec/Android.mk
4v_h263/enc/Android.mk
p3dec/Android.mk
n2/dec/Android.mk
n2/h264dec/Android.mk
orbis/dec/Android.mk
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
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
381f475475b11a552a5233c48947cc570c28b1d8 08-Mar-2012 Dirk Dougherty <ddougherty@google.com> resolved conflicts for merge of 532679a5 to master

Change-Id: Id60d047c0e1f288acff97526c016cca632873b6b
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
4v_h263/dec/src/vop.cpp
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
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"
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
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
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
mrnb/enc/src/ton_stab.cpp
mrwb/src/get_amr_wb_bits.cpp
mrwb/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"
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
mrnb/common/src/bitno_tab.cpp
mrnb/common/src/bitreorder_tab.cpp
mrnb/common/src/bytesused.cpp
mrnb/common/src/c2_9pf_tab.cpp
mrnb/common/src/gains_tbl.cpp
mrnb/common/src/gray_tbl.cpp
mrnb/common/src/grid_tbl.cpp
mrnb/common/src/inv_sqrt_tbl.cpp
mrnb/common/src/log2_tbl.cpp
mrnb/common/src/lsp_lsf_tbl.cpp
mrnb/common/src/lsp_tab.cpp
mrnb/common/src/overflow_tbl.cpp
mrnb/common/src/ph_disp_tab.cpp
mrnb/common/src/pow2_tbl.cpp
mrnb/common/src/q_plsf_5_tbl.cpp
mrnb/common/src/qua_gain_tbl.cpp
mrnb/common/src/sqrt_l_tbl.cpp
mrnb/common/src/window_tab.cpp
mrnb/dec/src/dec_input_format_tab.cpp
mrnb/dec/src/qgain475_tab.cpp
mrnb/enc/src/corrwght_tab.cpp
mrnb/enc/src/enc_output_format_tab.cpp
mrnb/enc/src/inter_36_tab.cpp
mrnb/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
mrnb/common/src/bitreorder_tab.cpp
mrnb/common/src/grid_tbl.cpp
mrnb/common/src/inv_sqrt_tbl.cpp
mrnb/common/src/log2_tbl.cpp
mrnb/common/src/lsp_tab.cpp
mrnb/common/src/pow2_tbl.cpp
mrnb/common/src/q_plsf_5_tbl.cpp
mrnb/common/src/qua_gain_tbl.cpp
mrnb/common/src/sqrt_l_tbl.cpp
mrnb/common/src/window_tab.cpp
mrnb/dec/src/dec_input_format_tab.cpp
mrnb/enc/src/corrwght_tab.cpp
mrnb/enc/src/enc_output_format_tab.cpp
mrnb/enc/src/inter_36_tab.cpp
mrnb/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
mrnb/common/include/az_lsp.h
mrnb/common/include/inv_sqrt.h
mrnb/common/include/log2_norm.h
mrnb/common/include/pow2.h
mrnb/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
mrwb/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
mrwb/src/homing_amr_wb_dec.cpp
mrwb/src/isp_isf.cpp
mrwb/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
mrwb/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
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
acenc/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
acenc/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
mrwbenc/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
mrwbenc/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 ea22