• Home
  • History
  • Annotate
  • only in /frameworks/av/media/libstagefright/codecs/m4v_h263/
History log of /frameworks/av/media/libstagefright/codecs/m4v_h263/
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
f0c558d0f620e5b85affe993dba7d85cce73e9b8 06-Jun-2017 Ray Essick <essick@google.com> Merge "better manage buffer for libstagefright_soft_mpeg4enc" into klp-dev am: 021575025c am: 5944b611e5 am: 1a419c7b2a am: 70a63bdf27 am: 40833da7b9 am: 2ad98cf1c7 am: be560fcb1c am: b9f302c2f0 am: 1c1d3116d9 am: f7350dd989 am: a06d2eb83e am: ce15503bf9 am: 6ff81f0096 am: feecaecca1
am: fde4cbba53

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Change-Id: I3fc4c73813fa895796747b63ee849988f94f671a
90d2dd403bc8faa421cfc6b26930e5aa69879943 02-Jun-2017 Ray Essick <essick@google.com> better manage buffer for libstagefright_soft_mpeg4enc

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

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

Bug: 36075363
Test: ran poc against patched nyc-mr2-dev tree
Change-Id: I7013ff5883a945c4647517b2980c76a6558f23d2
nc/src/mp4enc_api.cpp
nc/src/mp4lib_int.h
38142b60f5144f92d99463fa1d65c543382d1264 19-May-2017 Wei Jia <wjia@google.com> m4v_h263: check header first before decoding a frame.

Test: fix the file in the bug
Bug: 37660827
Change-Id: I9d6919f96c0c9f29221be1e8e852ecb21062bad9
(cherry picked from commit db545366c2e893dbbe1a42d858c52067101beda6)
ec/SoftMPEG4.cpp
677010098a3451960654be6f7649b38fa14760f3 19-May-2017 Wei Jia <wjia@google.com> DO NOT MERGE - m4v_h263: check header first before decoding a frame.

Test: fix the file in the bug
Bug: 37660827
Change-Id: I9d6919f96c0c9f29221be1e8e852ecb21062bad9
ec/SoftMPEG4.cpp
0b5726782d5f9764325057870cef2750853f286a 18-May-2017 Wei Jia <wjia@google.com> m4v_h263: update width/height only when they are valid.

Test: the file in the bug doesn't crash
Bug: 37079296
Change-Id: Ie092971dda568119ca38ec67d65ccfc00df93185
ec/src/vop.cpp
9744d5a95e4de0f0a63f313984acceb033b64c1d 14-Mar-2017 Marco Nelissen <marcone@google.com> Merge "Fix NPDs in h263 decoder" into klp-dev am: 012e5fd39e am: 9e8dfb5938 am: 9e4a0e1fab am: 3c4401fce8 am: 8867ca40df am: 4ba3934ec3 am: 89349b8d29 am: 176e7e8183 am: 0cbbb5c561 am: 2e1457123f am: bd47b7e23c am: 33745e6537 am: d79e9c79f7 am: a83fb59933 am: 16b4299141
am: 12921733fe

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

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

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

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

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

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

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

Bug: 35269635
Test: decoded PoC with and without patch
Change-Id: I636a14360c7801cc5bca63c9cb44d1d235df8fd8
ec/src/mb_motion_comp.cpp
ec/src/pvdec_api.cpp
bc1713d3b85d7ce656e032da6e4b6b342f14db03 14-Feb-2017 Mathias Agopian <mathias@google.com> fallout of splitting rect.h out of libandroid.

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

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

Test: built and booted device
Bug: 35164655
Change-Id: I72e8f0b7bd25c6a67eedc17afe52c4c484a147fe
nc/SoftMPEG4Encoder.cpp
31ae35a83a8384b942d60c32456d7e2e707eb2fa 16-Feb-2017 Wonsik Kim <wonsik@google.com> resolve merge conflicts of 7fa2b10732 to master

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

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

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

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

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

Change-Id: Ifd851c8840abc615eecf0da1f6b32f30cfb4e0b2
5443b57cc54f2e46b35246637be26a69e9f493e1 10-Feb-2017 Wonsik Kim <wonsik@google.com> codecs: handle onReset() for a few encoders

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

Test: Run PoC binaries
Bug: 34749392
Bug: 34705519
Change-Id: I3356eb615b0e79272d71d72578d363671038c6dd
nc/SoftMPEG4Encoder.cpp
nc/SoftMPEG4Encoder.h
a4a6d63ec590a3be60a60527c619fb0bf7870b59 21-Dec-2016 Vishwath Mohan <vishwath@google.com> Enable CFI for some media components.

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

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

Bug: 30227045
Test: m -j40 and device builds and boots
Test: CFI is not enabled unless built with ENABLE_CFI=true
Test: CFI enabled build passes the media CTS tests.
ec/Android.mk
nc/Android.mk
ad880540d13db9e39c94496fd9bc89dfbfd1e1f5 10-Jan-2017 Mark Salyzyn <salyzyn@google.com> Merge "liblog: use log/log.h for ALOG macros" am: 06d8feefec am: 71bf335ffa am: 8790fb2613
am: 9033512273

Change-Id: I67837417d7c8fbc2cc5239f903a0cdf3b107558b
eb16561336e6445f7edae047998f2459e046cdfe 10-Jan-2017 Mark Salyzyn <salyzyn@google.com> liblog: use log/log.h for ALOG macros

Test: compile
Bug: 30465923
Change-Id: I247151363604714088b6059279702702b4e9f89a
ec/src/conceal.cpp
32a5f5d53f9fe2ba584d2ecdf3edd487fb4146a7 22-Dec-2016 Mark Salyzyn <salyzyn@google.com> resolve merge conflicts of 4532a36 to master

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

Test: compile
Bug: 31289077
Change-Id: I795a76f978d2213737f1fa908da789c543219b75
ec/src/conceal.cpp
4f197ec220d2c9634429692dd37896233273111d 04-Nov-2016 Marco Nelissen <marcone@google.com> Merge "Remove unneeded links with dynamic libraries"
am: 46d0a5b493

Change-Id: Ica6dd538c30b9aeccddad229cb24ade4d82d2e4c
263506542fbe480ddb247597bdcef16c437b48dd 25-Oct-2016 Marco Nelissen <marcone@google.com> Remove unneeded links with dynamic libraries

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

Test: built and booted

Change-Id: I7379506fd06d4e28e0eff0001fd073a2d3860f8e
nc/Android.mk
c661ae6165338fd5f0bca50a63058b4bcd6def4b 25-Oct-2016 Marco Nelissen <marcone@google.com> Remove unneeded links with dynamic libraries

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

Test: built and booted

Change-Id: I7379506fd06d4e28e0eff0001fd073a2d3860f8e
nc/Android.mk
5f5ee1110dd85001b43db7637a97474acfe8d681 16-Aug-2016 Glenn Kasten <gkasten@google.com> LOCAL_CLANG := true is now the default

Test: verify that build has no failures
Change-Id: Ib249b276c6295e55eb54fa37b6d15486415dfbed
ec/Android.mk
nc/Android.mk
080d666878c3f3ad091f85af95b43271a990c8f5 19-Aug-2016 Pawin Vongmasa <pawin@google.com> resolve merge conflicts of f37ad28 to master

Change-Id: I301ca44edf99188636c1113c9a705e8cc292f101
f37ad284433d0b858a1b147ab25a3c767b486689 19-Aug-2016 Pawin Vongmasa <pawin@google.com> Fix build breakage caused by commit 940829f69b52d6038db66a9c727534636ecc456d. am: baa9146401 am: 0aaa2c606c am: 784c8ac91a am: b65f47d30a am: 1cdd3c4262 am: 0954180087 am: be50e42a6c am: d82d9f0b1f am: dd6fc9a192
am: 8ab082c4f5

Change-Id: I9ab308a8f8fbe8579b8748ce1e7758ef1bd5c9f8
8ab082c4f56719538c2312ba38440124b8e01af0 19-Aug-2016 Pawin Vongmasa <pawin@google.com> Fix build breakage caused by commit 940829f69b52d6038db66a9c727534636ecc456d. am: baa9146401 am: 0aaa2c606c am: 784c8ac91a am: b65f47d30a am: 1cdd3c4262 am: 0954180087 am: be50e42a6c am: d82d9f0b1f
am: dd6fc9a192

Change-Id: Ice914669970f397c494bda1727a79d912dedc48f
941e41588ffc329d03dd935c62e61838cf9b5728 19-Aug-2016 Pawin Vongmasa <pawin@google.com> Fix build breakage caused by commit 940829f69b52d6038db66a9c727534636ecc456d. am: baa9146401 am: 0aaa2c606c am: 784c8ac91a am: b65f47d30a am: 1cdd3c4262 am: 0954180087 am: be50e42a6c am: d82d9f0b1f
am: dd6fc9a192

Change-Id: Ia7a3d1a4d1cd7d00eb97040171b55dae0a2a4127
dd6fc9a1926e15267caf89bbf1806ff127b798b1 19-Aug-2016 Pawin Vongmasa <pawin@google.com> Fix build breakage caused by commit 940829f69b52d6038db66a9c727534636ecc456d. am: baa9146401 am: 0aaa2c606c am: 784c8ac91a am: b65f47d30a am: 1cdd3c4262 am: 0954180087 am: be50e42a6c
am: d82d9f0b1f

Change-Id: I574b7261bba02014565b3754e75959ec23665164
1cdd3c42620555c82320ffc2f25d688448c5cc9a 19-Aug-2016 Pawin Vongmasa <pawin@google.com> Fix build breakage caused by commit 940829f69b52d6038db66a9c727534636ecc456d. am: baa9146401 am: 0aaa2c606c am: 784c8ac91a
am: b65f47d30a

Change-Id: I18c74610c4fbbedf047e64c3bd01e5704422234c
b65f47d30ab56058e23752f0146f359b72bfb9d5 19-Aug-2016 Pawin Vongmasa <pawin@google.com> Fix build breakage caused by commit 940829f69b52d6038db66a9c727534636ecc456d. am: baa9146401 am: 0aaa2c606c
am: 784c8ac91a

Change-Id: I1dd6a8c51d485de7af539339f7c6199935ee9fa8
0aaa2c606c3e2db24068e0742576e9ea7d1be7b8 19-Aug-2016 Pawin Vongmasa <pawin@google.com> Fix build breakage caused by commit 940829f69b52d6038db66a9c727534636ecc456d.
am: baa9146401

Change-Id: I3c8f4edbc3b75f50bc6393271314a71f681ac43d
d994ffa4279a60a09b0a419935f4c54bddb2161c 19-Aug-2016 Iliyan Malchev <malchev@google.com> fix the build

Change-Id: I349c3c42b74aa4a6e87bdfb8427012367ae60099
Signed-off-by: Iliyan Malchev <malchev@google.com>
ec/SoftMPEG4.cpp
ad929db743806aa55b2b8f795be61d21224b0f05 19-Aug-2016 Pawin Vongmasa <pawin@google.com> DO NOT MERGE - Fix build breakage caused by commit
940829f69b52d6038db66a9c727534636ecc456d.

Change-Id: Ic55a9ab25ddb57f270c21d78ffcb556f3e11dd5d
ec/SoftMPEG4.cpp
baa9146401e28c5acf54dea21ddd197f0d3a8fcd 19-Aug-2016 Pawin Vongmasa <pawin@google.com> Fix build breakage caused by commit
940829f69b52d6038db66a9c727534636ecc456d.

Change-Id: I4776db4a26fb3c31bb994d48788373fe569c812a
ec/SoftMPEG4.cpp
23caea2f66f72a122d6fcb7fa4c941abd415eed8 19-Aug-2016 Pawin Vongmasa <pawin@google.com> SoftMPEG4: Check the buffer size before writing the reference frame. am: 6951231950 am: af39271e11 am: 3efed2f14c am: 1cfd97c331 am: 792a43273e am: 8c0f6d6ad4 am: f4e8d14499 am: f28464e0e1 am: dd6314bb10
am: 6645f9d62c

Change-Id: I2f7ada71fcdbe891dab25a7ddd753bf7e06cf187
9d84fed5412124881e2ae463c7e1ab26b5363a6d 19-Aug-2016 Pawin Vongmasa <pawin@google.com> SoftMPEG4: Check the buffer size before writing the reference frame. am: 6951231950 am: af39271e11 am: 3efed2f14c am: 1cfd97c331 am: 792a43273e am: 8c0f6d6ad4 am: f4e8d14499
am: f28464e0e1

Change-Id: Ie3b3d459fae620b3dea055e1638970d0abb92fd7
6645f9d62c2633d5e3fe5918c71c0f25c661f004 19-Aug-2016 Pawin Vongmasa <pawin@google.com> SoftMPEG4: Check the buffer size before writing the reference frame. am: 6951231950 am: af39271e11 am: 3efed2f14c am: 1cfd97c331 am: 792a43273e am: 8c0f6d6ad4 am: f4e8d14499 am: f28464e0e1
am: dd6314bb10

Change-Id: Ifa2cf12957d044ae18fd8f425c38629e88c31440
dd6314bb10085dddd457e73d22c29a68e1734053 19-Aug-2016 Pawin Vongmasa <pawin@google.com> SoftMPEG4: Check the buffer size before writing the reference frame. am: 6951231950 am: af39271e11 am: 3efed2f14c am: 1cfd97c331 am: 792a43273e am: 8c0f6d6ad4 am: f4e8d14499
am: f28464e0e1

Change-Id: I5c4bfb0e36c6c1927497be0cadfc6aa1c2c187a3
f28464e0e1711b8b11bc7ec8fb15da9385c5c777 19-Aug-2016 Pawin Vongmasa <pawin@google.com> SoftMPEG4: Check the buffer size before writing the reference frame. am: 6951231950 am: af39271e11 am: 3efed2f14c am: 1cfd97c331 am: 792a43273e am: 8c0f6d6ad4
am: f4e8d14499

Change-Id: I0787c59a4d4094332b4145eac367ba6514fdd04e
1cfd97c33126ecfc2458470a7ba88c68853e398e 19-Aug-2016 Pawin Vongmasa <pawin@google.com> SoftMPEG4: Check the buffer size before writing the reference frame. am: 6951231950 am: af39271e11
am: 3efed2f14c

Change-Id: I33b4226d5aa42a1adc14988789ac2f0965cfb606
3efed2f14c5e556b3a14e25a0a83d0bf9492d3ab 19-Aug-2016 Pawin Vongmasa <pawin@google.com> SoftMPEG4: Check the buffer size before writing the reference frame. am: 6951231950
am: af39271e11

Change-Id: I2d263d12fecf7dc3974b665ca568d3db5dcd76b3
180185da195c42d366a16d9c087413dd8c07d58b 19-Jul-2016 Pawin Vongmasa <pawin@google.com> DO NOT MERGE - SoftMPEG4: Check the buffer size before writing the reference frame.

Also prevent overflow in SoftMPEG4 and division by zero in SoftMPEG4Encoder.

Bug: 30033990
Change-Id: I7701f5fc54c2670587d122330e5dc851f64ed3c2
(cherry picked from commit 695123195034402ca76169b195069c28c30342d3)
ec/SoftMPEG4.cpp
nc/SoftMPEG4Encoder.cpp
940829f69b52d6038db66a9c727534636ecc456d 19-Jul-2016 Pawin Vongmasa <pawin@google.com> DO NOT MERGE - SoftMPEG4: Check the buffer size before writing the reference frame.

Also prevent overflow in SoftMPEG4 and division by zero in SoftMPEG4Encoder.

Bug: 30033990
Change-Id: I7701f5fc54c2670587d122330e5dc851f64ed3c2
(cherry picked from commit 695123195034402ca76169b195069c28c30342d3)
ec/SoftMPEG4.cpp
nc/SoftMPEG4Encoder.cpp
7d64d30d0dcdb97be921790e2702e5adfe751d92 12-Aug-2016 Chih-Hung Hsieh <chh@google.com> resolve merge conflicts of 6ae8c7b to stage-aosp-master am: 32d6e5f0eb
am: a944197b97

Change-Id: I03472be260cbfdaf436514d319e91063c738b82c
32d6e5f0ebe9e00f80401e5f4fd6e285a474590d 12-Aug-2016 Chih-Hung Hsieh <chh@google.com> resolve merge conflicts of 6ae8c7b to stage-aosp-master

Change-Id: Iabb5d9b93b98e428c53f0504fbfe832ed24d988d
0d1ed381fde5dac12dd84fcf3da66dac46699378 09-Aug-2016 Chih-Hung Hsieh <chh@google.com> Fix clang-tidy warnings in stagefright.

* Add explicit keyword to conversion constructors.
* Or add NOLINT to implicit conversion constructors.
Bug: 28341362
* Use const reference type for read-only parameters.
Bug: 30407689
* Use const reference type to avoid unnecessary copy.
Bug: 30413862
Test: build with WITH_TIDY=1

Change-Id: I7a15ac1e37973fe2c661f577a6106b913653de40
Merged-In: I7a15ac1e37973fe2c661f577a6106b913653de40
ec/include/m4vh263_decoder_pv_types.h
40d8899f60c5212af9d727ba0ffaaecf676ebd1d 09-Aug-2016 Chih-Hung Hsieh <chh@google.com> Fix clang-tidy warnings in stagefright.

* Add explicit keyword to conversion constructors.
* Or add NOLINT to implicit conversion constructors.
Bug: 28341362
* Use const reference type for read-only parameters.
Bug: 30407689
* Use const reference type to avoid unnecessary copy.
Bug: 30413862
Test: build with WITH_TIDY=1

Change-Id: I7a15ac1e37973fe2c661f577a6106b913653de40
ec/include/m4vh263_decoder_pv_types.h
695123195034402ca76169b195069c28c30342d3 19-Jul-2016 Pawin Vongmasa <pawin@google.com> SoftMPEG4: Check the buffer size before writing the reference frame.

Also prevent overflow in SoftMPEG4 and division by zero in SoftMPEG4Encoder.

Bug: 30033990
Change-Id: I7701f5fc54c2670587d122330e5dc851f64ed3c2
ec/SoftMPEG4.cpp
nc/SoftMPEG4Encoder.cpp
009c54d610a68a39dc6336c57d491940b4048f01 15-Jul-2016 Lajos Molnar <lajos@google.com> Merge \\"SoftAVCEnc/SoftMPEG4Enc: support updated i-frame interval and encoder settings\\" into nyc-mr1-dev am: 9f6392250b
am: 927326caf3

Change-Id: Ib8b947da0ccf4515098189d24ab6c961cd1b6ac0
927326caf324d555d2966d40ff435222d913066e 15-Jul-2016 Lajos Molnar <lajos@google.com> Merge \"SoftAVCEnc/SoftMPEG4Enc: support updated i-frame interval and encoder settings\" into nyc-mr1-dev
am: 9f6392250b

Change-Id: If3eafbea61f1fdb8e40fb335fe8c9dcf91fa99da
d72e751fa185f053773603222fd220ab77c92b2f 15-Jul-2016 Lajos Molnar <lajos@google.com> SoftAVCEnc/SoftMPEG4Enc: support updated i-frame interval and encoder settings

- use key-frame interval in MPEG4 encoder
- use updated definition of nBFrames and nPFrames in AVC encoder

Bug: 30096321
Bug: 28027692
Change-Id: I68d0d5182b462cad567c329a07fdafea55d19ff7
nc/SoftMPEG4Encoder.cpp
nc/SoftMPEG4Encoder.h
ce4df5e534eb86748fe80c84efb6b7fc0b6b5b46 04-Mar-2016 Wonsik Kim <wonsik@google.com> stagefright: move MedaDefs from libstagefright to libmedia

Bug: 24761407
Change-Id: If4914340a645c6f3c14eea0c873c162926d72ca2
ec/Android.mk
nc/Android.mk
276b60e1be8ed92149411240d95705c642c7531a 19-May-2016 Chih-hung Hsieh <chh@google.com> Merge "Fix misc-macro-parentheses warnings." am: 8a6d716a1e
am: f89b497da8

* commit 'f89b497da89aefbf32b3bdfd62d92c4ca00c4928':
Fix misc-macro-parentheses warnings.

Change-Id: I137b2728a00dbdfdceb44504f4f3f4707c441d93
183d387706417863076873ec566ca5966d8f5560 18-May-2016 Chih-Hung Hsieh <chh@google.com> Fix misc-macro-parentheses warnings.

Bug: 28705665
Change-Id: I9b4b253100cc06a5f37eb3129b0d54991471e382
ec/src/idct.h
ec/src/motion_comp.h
ec/src/mp4def.h
ec/src/post_proc.h
ec/src/vlc_decode.h
nc/src/fastidct.cpp
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
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
nc/SoftMPEG4Encoder.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
nc/SoftMPEG4Encoder.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
nc/SoftMPEG4Encoder.cpp
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
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
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
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
ec/SoftMPEG4.cpp
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
ec/SoftMPEG4.cpp
423766ca07beb7e3e9cd301385708ca13fcce3e1 29-Feb-2016 Marco Nelissen <marcone@google.com> DO NOT MERGE Verify OMX buffer sizes prior to access

Bug: 27207275
Change-Id: I4412825d1ee233d993af0a67708bea54304ff62d
nc/SoftMPEG4Encoder.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
nc/SoftMPEG4Encoder.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
nc/SoftMPEG4Encoder.cpp
2720c8b094cfa58de314daa8e5e4fb4fa81fe3b2 29-Feb-2016 Marco Nelissen <marcone@google.com> Verify OMX buffer sizes prior to access

Bug: 27207275
Change-Id: I4412825d1ee233d993af0a67708bea54304ff62d
nc/SoftMPEG4Encoder.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)
nc/SoftMPEG4Encoder.cpp
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)
nc/SoftMPEG4Encoder.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)
nc/SoftMPEG4Encoder.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)
nc/SoftMPEG4Encoder.cpp
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.
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
nc/SoftMPEG4Encoder.cpp
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.
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
nc/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
ec/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
nc/src/fastcodemb.cpp
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
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
257b3bc581bbc65318a4cc2d3c22a07a4429dc1d 05-Oct-2015 Marco Nelissen <marcone@google.com> Don't crash when there's no conceal frame

Bug: 24630158
Change-Id: If042aebebb58c218eb7bbf01dcddbcbd05dca1d6
ec/src/conceal.cpp
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.
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)
ec/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
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
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
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
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.
d7bb1cd786e5ea4ac61119cc1a08082474f7787b 20-Aug-2015 Wei Jia <wjia@google.com> libstagefright: fix overflow in pvdec_api.cpp.

Bug: 20674086
Change-Id: Ie2c711865c3b92f3fa2f3c7a436fa0e3687eb8b3
ec/src/pvdec_api.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
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.
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
ec/src/pvdec_api.cpp
nc/src/mp4enc_api.cpp
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
ec/src/pvdec_api.cpp
nc/src/mp4enc_api.cpp
c23e3dd8af7397f023aae040c4a03dd14091cbed 17-Aug-2015 Abhishek Arya <aarya@google.com> Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4

BUG: 20674086
Change-Id: Idaff17975b327adea65c39bdba1ab4e88789c0cd
ec/src/pvdec_api.cpp
nc/src/mp4enc_api.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)
ec/src/pvdec_api.cpp
nc/src/mp4enc_api.cpp
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
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>
nc/Android.mk
nc/test/m4v_h263_enc_test.cpp
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
ec/SoftMPEG4.cpp
42cccd7c8811597d56fb86afeacf6231d693dea6 03-Jun-2015 Wei Jia <wjia@google.com> libstagefright: check memory size for overflow before allocation.

Bug: 20674086
Change-Id: I431aa2b7d30a942350ab6d105451c6b77e2f99d4
ec/src/pvdec_api.cpp
nc/src/mp4enc_api.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
ec/src/vop.cpp
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.
841d22b0645ff48a03e7f500f95458f3d70a0a61 23-Jan-2015 Ronghua Wu <ronghuawu@google.com> libstagefright: Use aligned width and height.

Bug: 19014147
Change-Id: I33314b02448e436c43fcfad086b5edfa650dcf83
ec/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
ec/src/vop.cpp
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
ec/src/pvdec_api.cpp
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
ec/SoftMPEG4.cpp
ec/SoftMPEG4.h
nc/SoftMPEG4Encoder.cpp
nc/SoftMPEG4Encoder.h
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>
ec/SoftMPEG4.cpp
ec/SoftMPEG4.h
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
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>
ec/src/find_min_max.cpp
nc/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
nc/Android.mk
f59eae9442374940b6b05f436f0598b3c482e6d0 25-Nov-2014 Chih-hung Hsieh <chh@google.com> Merge "Fix overload of SoftVideoDecoderOMXComponent::updatePortDefinitions"
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
6c7d332f252d5ae7b3cad810e7adb85e5aedb98a 25-Nov-2014 Chih-hung Hsieh <chh@google.com> Merge "Remove bogus forward declarations"
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>
nc/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>
ec/SoftMPEG4.cpp
ec/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>
nc/SoftMPEG4Encoder.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
nc/SoftMPEG4Encoder.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
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
nc/SoftMPEG4Encoder.cpp
nc/SoftMPEG4Encoder.h
dba83c1cb1bef03bc5d1760c2639d06ff71c0fa7 08-Oct-2014 Mark Salyzyn <salyzyn@google.com> libstagefright: compile errors

Change-Id: I752d7d73f9c4939160a1ccaefc44ce1f8ffd9982
ec/SoftMPEG4.cpp
0f694a12f92a01f95807242320bd65e88c699708 02-Oct-2014 Ronghua Wu <ronghuawu@google.com> stagefright: fix fake-stride handling for H263 SW decoder

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

Bug: 17773094
Bug: 17326758
Change-Id: I66ce7b9c650383456923d75417c590e3a8a814e7
ec/SoftMPEG4.cpp
d5a2f55034022f2d0425fa0701894d0c4787b726 24-Sep-2014 Ronghua Wu <ronghuawu@google.com> stagefright: fix cropping handling for SoftAVC and SoftMEPEG4.

Bug: 17326758
Change-Id: I9b0c281d92cf1803e275b1768e9edab9404ea577
ec/SoftMPEG4.cpp
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
ec/SoftMPEG4.cpp
ec/SoftMPEG4.h
ec/src/vop.cpp
031be0f358b07732092a4d1bf02fc99f109a63c4 22-Aug-2014 Ronghua Wu <ronghuawu@google.com> Add adaptive playback support to VPX decoder.

Bug: 13842676
Change-Id: I9c054ea489fd3a71b3b2394f15a85b84d42edb5a
nc/SoftMPEG4Encoder.h
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>
nc/SoftMPEG4Encoder.cpp
nc/include/mp4enc_api.h
nc/src/motion_comp.cpp
nc/src/mp4def.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
nc/SoftMPEG4Encoder.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
ec/SoftMPEG4.cpp
nc/SoftMPEG4Encoder.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
nc/SoftMPEG4Encoder.cpp
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
nc/SoftMPEG4Encoder.cpp
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
nc/SoftMPEG4Encoder.cpp
84333e0475bc911adc16417f4ca327c975cf6c36 08-Feb-2014 Andreas Huber <andih@google.com> warnings be gone.

Change-Id: Ie3bae3f037730e316d7fca12e7a3527973f752ef
ec/Android.mk
ec/SoftMPEG4.cpp
nc/Android.mk
nc/SoftMPEG4Encoder.cpp
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
ec/src/get_pred_adv_b_add.cpp
nc/src/dct.cpp
nc/src/fastcodemb.cpp
nc/src/motion_comp.cpp
nc/src/sad_inline.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>
ec/SoftMPEG4.cpp
ec/SoftMPEG4.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)
ec/SoftMPEG4.cpp
ec/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)
ec/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
ec/SoftMPEG4.cpp
ec/SoftMPEG4.h
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
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>
nc/SoftMPEG4Encoder.cpp
da0dc0af0effe9fbfb3ce3187c8472fca2baf3c6 10-Apr-2013 Ying Wang <wangying@google.com> Add liblog

Bug: 8580410
Change-Id: If493d87d60d71be664ad75b140c62acadb75b0d0
ec/Android.mk
nc/Android.mk
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
ec/SoftMPEG4.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
nc/Android.mk
nc/SoftMPEG4Encoder.cpp
nc/SoftMPEG4Encoder.h
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
ec/MODULE_LICENSE_APACHE2
ec/NOTICE
nc/MODULE_LICENSE_APACHE2
nc/NOTICE
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
ec/include/mp4dec_api.h
02accddf8d69da7b2b5e05631ad222cd842ff547 08-May-2012 Andreas Huber <andih@google.com> Fix both H.263 and MPEG4 decoders.

Change-Id: I6c76fa33f6ea4b439abc14c396a86c3553c85189
related-to-bug: 6460112
ec/SoftMPEG4.cpp
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
nc/Android.mk
nc/M4vH263Encoder.cpp
1700744ae0ce2fcf722816453ae0af2cd5646458 24-Apr-2012 James Dong <jdong@google.com> Software MPEG4/H263 video encoder is now OMX-based

o related-to-bug: 6401068

Change-Id: If8eccea060f38e42ad31eb6e91aaa832e67c5559
nc/Android.mk
nc/SoftMPEG4Encoder.cpp
nc/SoftMPEG4Encoder.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
ec/Android.mk
nc/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
ec/Android.mk
nc/Android.mk
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
ec/src/vop.cpp
f1d5aa162c02a16b7195a43a9bcea4d592600ac4 07-Feb-2012 James Dong <jdong@google.com> Move away from MediaDebug and use ADebug instead

Change-Id: I963a3b6f79a7292891973cbeeaf3378b38629f08
nc/M4vH263Encoder.cpp
9a8ded7348c5b2302dd27b285b395416bc842c49 06-Jan-2012 Steve Block <steveblock@google.com> Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)

Change-Id: I1de629b4632a4b3187ca1a28d6416daccd35f924
ec/SoftMPEG4.cpp
nc/M4vH263Encoder.cpp
aa70226152d2084f85a96b52359dbc8476a86a45 06-Jan-2012 Steve Block <steveblock@google.com> Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)

Change-Id: I8fbdfa7a7581f481968dbb65aa40f7042936d7cb
ec/SoftMPEG4.cpp
nc/M4vH263Encoder.cpp
53feeb42c721e8fc9285e35e679906a951f3277c 04-Jan-2012 Steve Block <steveblock@google.com> Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)

Change-Id: I26f76452ac49e2890b14d133c065493d8df0fb4a
nc/M4vH263Encoder.cpp
3812256de32e73e38ba16e50ac0451c10223d4eb 20-Oct-2011 Steve Block <steveblock@google.com> Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF)

Change-Id: I5321ebd12e9c6248a108529e82c4e1af2a4405e3
ec/SoftMPEG4.cpp
nc/M4vH263Encoder.cpp
29357bc2c0dd7c43ad3bd0c8e3efa4e6fd9bfd47 06-Jan-2012 Steve Block <steveblock@google.com> Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE

See https://android-git.corp.google.com/g/#/c/157220

Bug: 5449033
Change-Id: Ic9c19d30693bd56755f55906127cd6bd7126096c
ec/SoftMPEG4.cpp
nc/M4vH263Encoder.cpp
5ff1dd576bb93c45b44088a51544a18fc43ebf58 06-Jan-2012 Steve Block <steveblock@google.com> Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGE

See https://android-git.corp.google.com/g/157065

Bug: 5449033
Change-Id: I00a4b904f9449e6f93b7fd35eac28640d7929e69
ec/SoftMPEG4.cpp
nc/M4vH263Encoder.cpp
df64d15042bbd5e0e4933ac49bf3c177dd94752c 04-Jan-2012 Steve Block <steveblock@google.com> Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE

See https://android-git.corp.google.com/g/156801

Bug: 5449033
Change-Id: Ib08fe86d23db91ee153e9f91a99a35c42b9208ea
nc/M4vH263Encoder.cpp
a585407bd04f2f4189dc393fc7e3f7f58d4f1a7a 10-Nov-2011 Andreas Huber <andih@google.com> am 2dff5cdc: am b42aea5b: Merge "Don\'t believe the PV decoder\'s lies..." into ics-mr1

* commit '2dff5cdc362ff6026e71d4b96faea8f2d7bd7063':
Don't believe the PV decoder's lies...
0029faf8f4efbca3844c4174b75d46c432f8f272 09-Nov-2011 Andreas Huber <andih@google.com> Don't believe the PV decoder's lies...

Change-Id: I97391235255afb8a4890a4ff52d4e8e9ca954f27
ec/SoftMPEG4.cpp
3856b090cd04ba5dd4a59a12430ed724d5995909 20-Oct-2011 Steve Block <steveblock@google.com> Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF) DO NOT MERGE

See https://android-git.corp.google.com/g/#/c/143865

Bug: 5449033
Change-Id: I0122812ed6ff6f5b59fe4a43ab8bff0577adde0a
ec/SoftMPEG4.cpp
nc/M4vH263Encoder.cpp
15825c7b6f6b19092a5949b4e46aea4fa229932c 14-Jul-2011 James Dong <jdong@google.com> Merge "Support profile and level query for SW video decoders"
87e031caf905145cb6e362a8c60f02736b87deef 13-Jul-2011 Andreas Huber <andih@google.com> Remove old-style software decoders.

Change-Id: Ie0729d6a65470ffdc38229791f25a75a22c724d8
ec/Android.mk
ec/M4vH263Decoder.cpp
457116d3a01618acf9a875020ca5860551ba03a6 11-Jul-2011 James Dong <jdong@google.com> Support profile and level query for SW video decoders

Change-Id: I9c20db128be96cd36cf2083e08e8c21f5e6d1fdf
ec/SoftMPEG4.cpp
ba499b591db0e26081e38545493144755eb72fff 30-Jun-2011 James Dong <jdong@google.com> Return ERROR_END_OF_STREAM when the input source reaches eos

Change-Id: I334313b054dcf388d2e05d56efb10ceea4980638
nc/M4vH263Encoder.cpp
f2af5a2c607e71ff4cd39da28b077c0a68b206fe 24-May-2011 Andreas Huber <andih@google.com> Make sure the software mpeg4 decoder supports multiple input frames per input buffer

to enable faster throughput in ACodec.

Change-Id: I6f6a1c70d9446f9d52c3df257b2d22358b0e71f4
ec/SoftMPEG4.cpp
a920660c2ae1548471c40c664ed3ac01b87c57b6 16-May-2011 Andreas Huber <andih@google.com> Fix module tags on stagefright software decoders.

Change-Id: I8b3f60760e1e8eaa0f66eb6c7ce3df8e425638fb
related-to-bug: 4427361
ec/Android.mk
bbba88cb1bdc34705d1477208990a06904c022e7 11-May-2011 Andreas Huber <andih@google.com> Squashed commit of the following:

commit c80992e419ed567abef451042f09c4958534b90d
Author: Andreas Huber <andih@google.com>
Date: Wed May 11 14:00:07 2011 -0700

Support for the mp3 audio decoder as a software OMX component.

Change-Id: I66e10c4d0be4c3aecdef1c21b15a2c7359ceb807

commit a358d0e1bf2a88897887445f42ccdda0f5f2f528
Author: Andreas Huber <andih@google.com>
Date: Wed May 11 13:11:23 2011 -0700

Support for G.711 alaw and mulaw decoders as software OMX components

Change-Id: Ia5c76c02cb83a9f94ce39a27b2251e5880218f03

commit 79088b9c9a5c8b8c97ea66cb4f90a2b0f0d34553
Author: Andreas Huber <andih@google.com>
Date: Thu May 5 15:43:32 2011 -0700

Instead of using an RGB surface and conversion yuv420->rgb565

convert from OMX_COLOR_FormatYUV420Planar to HAL_PIXEL_FORMAT_YV12 instead.

Change-Id: I8c4fc3c54c963f0d4ba6377f3c4ab4e0013152e5
related-to-bug: 4394005

commit 69469d3bd84425777b11b9fc938c5e0c61af26a7
Author: Andreas Huber <andih@google.com>
Date: Tue May 10 15:46:42 2011 -0700

voip mustn't link against libstagefright.so

Change-Id: I4d0ba9a8b9dc9380b792a1bd04bcda231964862c

commit 2a9a9eeeeeb36ae3a9e680469c3016d509ff08c3
Author: Andreas Huber <andih@google.com>
Date: Tue May 10 14:37:10 2011 -0700

Remove most non-OMX software decoders by default

Change-Id: Ic56514bc1b56b8fa952e8c4a164ea7379ecb69d0

commit a4de62c37b335c318217765403a9fb282b20a216
Author: Andreas Huber <andih@google.com>
Date: Mon May 9 16:50:02 2011 -0700

Conditionally build the old-style software decoders.

Change-Id: I5de609e1d76c92d26d6eb81d1551462258f3f15f

commit 5d8b039f9449dc3dad1e77c42c80cc0b54b0c846
Author: Andreas Huber <andih@google.com>
Date: Mon May 9 16:13:12 2011 -0700

Support for MPEG4 and H.263 video decoders as soft OMX components.

Change-Id: I5e3a4835afab89f98e3aa128d013628f5830eafe

commit b25a1bfbeb0ff6e62e1cc694ce2599c91489c7d0
Author: Andreas Huber <andih@google.com>
Date: Mon May 9 11:49:10 2011 -0700

Boost Soft OMX thread priority, fix timestamp handling in vorbis Soft OMX decoder.

Change-Id: I68d26d4999f06fcc451d69e5303663fab0cba9e8

commit c0574362f8dc3319ce84d981097867062a698527
Author: Andreas Huber <andih@google.com>
Date: Mon May 9 11:28:53 2011 -0700

Support for the AMR decoders (NB and WB) as Soft OMX components.

Change-Id: Ia565f59833fb52653e23f26536e7e41fc329a754

commit 3e5575a8f0e27a490cb7bde77bd9456087837f08
Author: Andreas Huber <andih@google.com>
Date: Wed May 4 13:41:25 2011 -0700

Signal an error if the aac decoder failed to initialize from codec specific data.

Change-Id: I01da7831bdf722edd7d6dc5974486daa2cf2b209
related-to-bug: 4272179

commit f94aeaa9886e772ff4823e671ed237096649f4af
Author: Andreas Huber <andih@google.com>
Date: Tue May 3 13:07:38 2011 -0700

Software OMX nodes don't (yet?) support native_window mode.

Change-Id: I7d9ca9164ef4abf66b573ca21dba12d672f8b12d

commit eefdfabac8dc659e00daa56da69aea705c49cb67
Author: Andreas Huber <andih@google.com>
Date: Tue May 3 12:57:16 2011 -0700

Fixing the OMX tests to refer to appropriate files from test content.

Change-Id: I5b61c3498749bfb876abbd3946a5132356e3f6ff

commit f31b7326aef14b6a1b7946520a9688f092e844d5
Author: Andreas Huber <andih@google.com>
Date: Tue May 3 11:08:38 2011 -0700

Soft OMX components are now dynamiclly loaded/unloaded, not directly linked against.

Change-Id: I1e2ecfbfab67a8869886f738eaf0c7b3c948b6d9

commit b7f0343879e4df06f0a1c9bfece24df557954e2f
Author: Andreas Huber <andih@google.com>
Date: Mon May 2 15:58:36 2011 -0700

Support for the AVC software decoder as an OMX component.

Change-Id: I13c12df435ba4afbd968a9fc659f66b91c818bc2

commit 5bb9e616d6c8e1b13d531fe996b9a9affdfb2977
Author: Andreas Huber <andih@google.com>
Date: Fri Apr 29 12:05:37 2011 -0700

Fix Vorbis OMX decoder's component role.

Change-Id: I5e871e5e11b3f951c93590210e63fd7987c467b5

commit 089c91f2333062e196c7afd5fb0ca914878aa474
Author: Andreas Huber <andih@google.com>
Date: Fri Apr 29 12:05:18 2011 -0700

Support vorbis_decoder OMX testing.

Change-Id: I1985be178a12ae3f8768bc72067d9236238be170

commit 56e241fa36fc37219bc536b823bdc2ab82dc1fad
Author: Andreas Huber <andih@google.com>
Date: Fri Apr 29 12:01:46 2011 -0700

SoftVorbis OMX component now respects the number of valid frames per page.

Change-Id: I82a117a064d9b083fc58a54ad900a987a763ef03

commit fcd618ec520c376fdb78f4cbb44b8d9f5d213e2b
Author: Andreas Huber <andih@google.com>
Date: Fri Apr 29 10:59:38 2011 -0700

Support for the vorbis audio decoder as a soft OMX component.

Change-Id: Iaeb057e58ca306d3dce205c0445b74d5aefef492

commit d1fcc3203fc8003ad79c6e96b3a1fc4261743f16
Author: Andreas Huber <andih@google.com>
Date: Fri Apr 29 10:07:50 2011 -0700

VPX decoder now properly resizes buffers after a port settings change.

Change-Id: I110749a31b6cba087891d8e5dfe420830bdbf831

commit 35c7168243cb69849d88911144a2c7fdfed5c54e
Author: Andreas Huber <andih@google.com>
Date: Thu Apr 28 13:23:34 2011 -0700

Support for the VPX video decoder as a Software OMX component.

Change-Id: Ic345add2d6d768d4af631160153f2e9b97fcea71

commit 923b2534b4211fc5405377b5190bfa6f2dd27f32
Author: Andreas Huber <andih@google.com>
Date: Thu Apr 28 11:34:40 2011 -0700

Table-based registration of soft omx components.

Change-Id: I7f45f0fa5b3a7950776e69c66349731f7674e937

commit 04a88f3edb2266a463da9c4481b80178be460902
Author: Andreas Huber <andih@google.com>
Date: Thu Apr 28 11:22:31 2011 -0700

Apparently OMX_GetParameter is valid in any state other than OMX_StateInvalid

OMX_SetParameter is still constrained to OMX_StateLoaded or a disabled port.

Change-Id: I1032d7cf4011982d306aa369d4158a82830d26fb

commit 9d70ca68445e7c40f5c9b2d12466e468f514de88
Author: Andreas Huber <andih@google.com>
Date: Wed Apr 27 15:03:18 2011 -0700

Use the new soft OMX aac decoder for HTTP live playback.

Change-Id: Ifbcfb732a9edb855cb46b49f6d0ac942170ee28f

commit 213fe4a10ea93cce08e8622dc3908053f29878a1
Author: Andreas Huber <andih@google.com>
Date: Tue Apr 12 16:39:45 2011 -0700

Foundation for supporting software decoders as OMX components

Change-Id: I7fdab256563b35d1d090617abaea9a26b198d816

Change-Id: I83e9236beed4af985d10333c203f065df9e09a42
ec/Android.mk
ec/SoftMPEG4.cpp
ec/SoftMPEG4.h
b9ff4b4f631239a6a37fe6588e025cb387150c0e 24-Jan-2011 Andreas Huber <andih@google.com> Support non-multiple-of-16 dimensions in MPEG4/H.263 software decoder

Change-Id: Ia22ebce66d9c35de4b04c3eedc9495847796901d
related-to-bug: 3384367
ec/M4vH263Decoder.cpp
ec/include/mp4dec_api.h
ec/src/pvdec_api.cpp
0ecfbd1cf37dbfb44d19c27351f5769309ac028d 10-Jan-2011 Andreas Huber <andih@google.com> Return a runtime error instead of asserting if the M4vH263Decoder fails in start()

Change-Id: Ie704a72685f749613fa0ed5fa6f461abc0406371
related-to-bug: 3328200
ec/M4vH263Decoder.cpp
1cc73922339a110d7ffc47e8842f958492dd85bf 02-Dec-2010 James Dong <jdong@google.com> If camera source uses the metadata, we must use HW encoder
Software video encoders are not able to deal with non-YUV metadata in the video buffer sent from camera

bug - 3242213

Change-Id: I97361ed88b2a687190e5129459011afff7f32c2d
nc/M4vH263Encoder.cpp
393410a441b6d06daf286ed496470e9d6b2b6ca8 11-Nov-2010 James Dong <jdong@google.com> Separate the key for audio sampling rate and video frame rate in MetaData.h

Change-Id: Ia33befaa7e6df8762703002d01aa79c04f15f040
nc/M4vH263Encoder.cpp
b2c59c3b3e670575cc0011176ca30e03bfde3e80 10-Nov-2010 James Dong <jdong@google.com> Fix missing breaks in the profile/level conversion code in M4vH263 encoder

Change-Id: Icd2cac68ffb0f38acb68b2968bbb36210431482d
nc/M4vH263Encoder.cpp
5cb8fdbfeda95fdc70e8edb69adc20c57cb277be 20-Oct-2010 James Dong <jdong@google.com> Added profile and level translation in SW video encoders

Change-Id: I6b9c33c7e4b497f3dc61b2a0dcf4e65727f9bcdd
nc/M4vH263Encoder.cpp
56cfa2376ae87cba730ea7ce4a9e0ca4f0d07627 15-Oct-2010 Andreas Huber <andih@google.com> Include the framework copy of the OpenMAX headers instead of referencing external/opencore.

Change-Id: I762f59acf5e1f770e4d7c2d89af362bfffebefa6
related-to-bug: 3101573
ec/Android.mk
nc/Android.mk
abfedebe61a010bcce16a0d920c132dfe4ad5c31 13-Aug-2010 James Dong <jdong@google.com> Mainly fix two mistakes that I made:

1. When the ERROR_END_OF_STREAM is returned from read, the input buffer is not initialized
release it would lead to crash

2. The mPrevTimestampUs is not initialized and thus fail in the CHECK(mPrevTimestampUs, timeUs)

Change-Id: Id1e51575fb8b3ca48e80547efd3a3a82dfac773b
nc/M4vH263Encoder.cpp
5328abe1e36a39b1d4617a74ac82c201b8c14c43 12-Aug-2010 James Dong <jdong@google.com> Don't send late frames to software encoders for encoding

o Document on what frames will be rejected and what frames will be accepted

Change-Id: I5a5d489ad3d2b50dbb40a0f6e01529312ce81c54
nc/M4vH263Encoder.cpp
db004e1c9ff995381e204135583c06758ba8f2a3 10-Aug-2010 James Dong <jdong@google.com> Add input buffer size check for software video encoders

Change-Id: I03953a1245060ed6656a965e1a8a61386126c441
nc/M4vH263Encoder.cpp
abd1f4f870925d6776dbe4b930b759a1ab6595ca 21-Jul-2010 Andreas Huber <andih@google.com> Support finer seek control on MediaSources.

related-to-bug: 2858448

Change-Id: Ifb4b13b990fd5889113e47e2c62249ac43391fa1
ec/M4vH263Decoder.cpp
3108231d90e8aa324923fd8864ca2477948c5d25 20-Jul-2010 James Dong <jdong@google.com> Merge "Progress status notification" into gingerbread
faed5cd124a54b8db3429f4c26b3220bbec4c8bb 16-Jul-2010 James Dong <jdong@google.com> Progress status notification

- Keep track of per-track progress

Change-Id: Ibd36f0e8c78581928c8aa2f5e23c5e7e0615c2cc
nc/M4vH263Encoder.cpp
46bf665ea3687f06069ebd1a0acd01ed7b5ac9cb 18-Jul-2010 James Dong <jdong@google.com> Fix simulator build (1st attempt)

Change-Id: I65a824c17929170b7b2bc75a13e756e92d8fe50a
nc/src/mp4def.h
59f566c4ec3dfc097ad8163523e522280b27e5c3 13-Jul-2010 James Dong <jdong@google.com> Initial check-in for software m4v_h263 encoder

Change-Id: I4b49fa5c3a5e6e21cfd2419441d98dd784046367
nc/Android.mk
nc/M4vH263Encoder.cpp
nc/include/cvei.h
nc/include/mp4enc_api.h
nc/src/bitstream_io.cpp
nc/src/bitstream_io.h
nc/src/combined_encode.cpp
nc/src/datapart_encode.cpp
nc/src/dct.cpp
nc/src/dct.h
nc/src/dct_inline.h
nc/src/fastcodemb.cpp
nc/src/fastcodemb.h
nc/src/fastidct.cpp
nc/src/fastquant.cpp
nc/src/fastquant_inline.h
nc/src/findhalfpel.cpp
nc/src/m4venc_oscl.h
nc/src/me_utils.cpp
nc/src/motion_comp.cpp
nc/src/motion_est.cpp
nc/src/mp4def.h
nc/src/mp4enc_api.cpp
nc/src/mp4enc_lib.h
nc/src/mp4lib_int.h
nc/src/rate_control.cpp
nc/src/rate_control.h
nc/src/sad.cpp
nc/src/sad_halfpel.cpp
nc/src/sad_halfpel_inline.h
nc/src/sad_inline.h
nc/src/sad_mb_offset.h
nc/src/vlc_enc_tab.h
nc/src/vlc_encode.cpp
nc/src/vlc_encode.h
nc/src/vlc_encode_inline.h
nc/src/vop.cpp
139a5d5bd33c9fc7708d0a79f11ee928f7796e6b 20-May-2010 Andreas Huber <andih@google.com> Better handling of codec initialization failure in the player and thumbnail extractor. Return a runtime error instead of asserting if the software MPEG4/H.263 decoder fails to initialize.

Change-Id: I5cba02ee85a41e43c2623053de40f26e2cf2efe4
related-to-bug: 2699505
ec/M4vH263Decoder.cpp
a66a27e07423c6ed1dde9c0267b555e83c44e58e 05-Jan-2010 Andreas Huber <andih@google.com> Protect against possible temporary objects going away before we get at their data.
ec/M4vH263Decoder.cpp
cb110ccbe4c275eba0857d9af341a75113243fa0 04-Jan-2010 Andreas Huber <andih@google.com> Fix mpeg4/h.263 software decoder.
ec/M4vH263Decoder.cpp
2d3b2097320614cb088bd4eba795905c2a4130b5 19-Dec-2009 James Dong <jdong@google.com> Attempt to fix simular build break.
Missing header file stdlib.h for free, malloc, etc
ec/M4vH263Decoder.cpp
ec/include/m4vh263_decoder_pv_types.h
fd1fe13b4584628d73df31717794e8e886d6bc39 19-Dec-2009 James Dong <jdong@google.com> Fix a memory corruption problem in software M4v/H263 decoder due to out-of-scope local variable
ec/M4vH263Decoder.cpp
3306cfee3bf38ab207a0504e49c2d492bb73ffbf 16-Dec-2009 James Dong <jdong@google.com> Initial checkins of the mpeg4 and h263 software decoders based on PV
ndroid.mk
ec/Android.mk
ec/M4vH263Decoder.cpp
ec/include/m4vh263_decoder_pv_types.h
ec/include/mp4dec_api.h
ec/include/visual_header.h
ec/src/adaptive_smooth_no_mmx.cpp
ec/src/bitstream.cpp
ec/src/bitstream.h
ec/src/block_idct.cpp
ec/src/cal_dc_scaler.cpp
ec/src/chv_filter.cpp
ec/src/chvr_filter.cpp
ec/src/combined_decode.cpp
ec/src/conceal.cpp
ec/src/datapart_decode.cpp
ec/src/dcac_prediction.cpp
ec/src/dec_pred_intra_dc.cpp
ec/src/deringing_chroma.cpp
ec/src/deringing_luma.cpp
ec/src/find_min_max.cpp
ec/src/get_pred_adv_b_add.cpp
ec/src/get_pred_outside.cpp
ec/src/idct.cpp
ec/src/idct.h
ec/src/idct_vca.cpp
ec/src/max_level.h
ec/src/mb_motion_comp.cpp
ec/src/mb_utils.cpp
ec/src/mbtype_mode.h
ec/src/motion_comp.h
ec/src/mp4dec_lib.h
ec/src/mp4def.h
ec/src/mp4lib_int.h
ec/src/packet_util.cpp
ec/src/post_filter.cpp
ec/src/post_proc.h
ec/src/post_proc_semaphore.cpp
ec/src/pp_semaphore_chroma_inter.cpp
ec/src/pp_semaphore_luma.cpp
ec/src/pvdec_api.cpp
ec/src/scaling.h
ec/src/scaling_tab.cpp
ec/src/vlc_dec_tab.h
ec/src/vlc_decode.cpp
ec/src/vlc_decode.h
ec/src/vlc_dequant.cpp
ec/src/vlc_tab.cpp
ec/src/vop.cpp
ec/src/zigzag.h
ec/src/zigzag_tab.cpp
atent_disclaimer.txt