summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/codecs/m4v_h263
Commit message (Collapse)AuthorAgeFilesLines
* libstagefright: check requested memory size before allocation for ↵Wei Jia2015-12-101-0/+9
| | | | | | | | SoftMPEG4Encoder and SoftVPXEncoder. Bug: 25812794 Change-Id: I96dc74734380d462583f6efa33d09946f9532809 (cherry picked from commit 87f8cbb223ee516803dbb99699320c2484cbf3ba)
* am 8b3aa04a: am a0c94bc6: am 567ad5c6: am 7ce82583: am 13b6b51e: am ↵Marco Nelissen2015-10-061-0/+5
|\ | | | | | | | | | | | | f7d1f627: am 257b3bc5: Don\'t crash when there\'s no conceal frame * commit '8b3aa04a625dfd3adf68118e64da1eafec9db594': Don't crash when there's no conceal frame
| * am a0c94bc6: am 567ad5c6: am 7ce82583: am 13b6b51e: am f7d1f627: am ↵Marco Nelissen2015-10-061-0/+5
| |\ | | | | | | | | | | | | | | | | | | 257b3bc5: Don\'t crash when there\'s no conceal frame * commit 'a0c94bc6582dde27ed31fbb771d7eb758fb9adbe': Don't crash when there's no conceal frame
| | * am 7ce82583: am 13b6b51e: am f7d1f627: am 257b3bc5: Don\'t crash when ↵Marco Nelissen2015-10-061-0/+5
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | there\'s no conceal frame * commit '7ce825833ad65cebfded3f35457925ae9e00124a': Don't crash when there's no conceal frame
| | | * am f7d1f627: am 257b3bc5: Don\'t crash when there\'s no conceal frameMarco Nelissen2015-10-061-0/+5
| | | |\ | | | | | | | | | | | | | | | | | | | | * commit 'f7d1f627b0b1139f82f16baee482476cc10ccde4': Don't crash when there's no conceal frame
| | | | * Don't crash when there's no conceal frameMarco Nelissen2015-10-051-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 24630158 Change-Id: If042aebebb58c218eb7bbf01dcddbcbd05dca1d6
| * | | | am 3dcb448f: am 4bb01def: am 84a4221e: am a9b3cd3c: am 5221133b: am ↵Wei Jia2015-08-201-2/+2
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | b2ae4351: libstagefright: fix overflow in pvdec_api.cpp. * commit '3dcb448f52cf05e7e0434c28bade68e898707053': libstagefright: fix overflow in pvdec_api.cpp.
| | * | | am 84a4221e: am a9b3cd3c: am 5221133b: am b2ae4351: libstagefright: fix ↵Wei Jia2015-08-201-2/+2
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | overflow in pvdec_api.cpp. * commit '84a4221e305847fb0c8846122fe8f2bc7c2fda0a': libstagefright: fix overflow in pvdec_api.cpp.
| | | * | am 5221133b: am b2ae4351: libstagefright: fix overflow in pvdec_api.cpp.Wei Jia2015-08-201-2/+2
| | | |\ \ | | | | |/ | | | | | | | | | | | | | | | * commit '5221133bfa1585b4488b01cad165627b1cd17077': libstagefright: fix overflow in pvdec_api.cpp.
| | | | * libstagefright: fix overflow in pvdec_api.cpp.Wei Jia2015-08-201-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 20674086 Change-Id: Ie2c711865c3b92f3fa2f3c7a436fa0e3687eb8b3 (cherry picked from commit d7bb1cd786e5ea4ac61119cc1a08082474f7787b)
* | | | | Merge "libstagefright: fix overflow in pvdec_api.cpp." into mnc-devWei Jia2015-08-201-2/+2
|\ \ \ \ \
| * | | | | libstagefright: fix overflow in pvdec_api.cpp.Wei Jia2015-08-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 20674086 Change-Id: Ie2c711865c3b92f3fa2f3c7a436fa0e3687eb8b3
* | | | | | am 3e15e6d7: am 6e2dd587: am 8b0660e0: am 3c803e7f: am 6afd8574: am ↵Abhishek Arya2015-08-202-5/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 073a656d: am deba0610: Merge "Revert "Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4"" into klp-dev * commit '3e15e6d738d02efb4108251cdc75240569916b69': Revert "Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4"
| * | | | | am 6e2dd587: am 8b0660e0: am 3c803e7f: am 6afd8574: am 073a656d: am ↵Abhishek Arya2015-08-202-5/+0
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | deba0610: Merge "Revert "Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4"" into klp-dev * commit '6e2dd5874a9ee2eccb339187a936ef38dfa8634b': Revert "Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4"
| | * | | | am 3c803e7f: am 6afd8574: am 073a656d: am deba0610: Merge "Revert "Fix ↵Abhishek Arya2015-08-182-5/+0
| | |\ \ \ \ | | | | |/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4"" into klp-dev * commit '3c803e7f777ad745b1b2cae0bdb2a31b11d47e80': Revert "Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4"
| | | * | | am 073a656d: am deba0610: Merge "Revert "Fix compile after ↵Abhishek Arya2015-08-182-5/+0
| | | |\ \ \ | | | | | |/ | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | rI431aa2b7d30a942350ab6d105451c6b77e2f99d4"" into klp-dev * commit '073a656d7dd0b432e7c8d508745d9fb552955b9e': Revert "Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4"
| | | | * | Merge "Revert "Fix compile after ↵Abhishek Arya2015-08-182-5/+0
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | rI431aa2b7d30a942350ab6d105451c6b77e2f99d4"" into klp-dev
| | | | | * | Revert "Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4"Abhishek Arya2015-08-172-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit c23e3dd8af7397f023aae040c4a03dd14091cbed. This speculative fix didn't fix the compile failure, do checking locally. Change-Id: I1598f7208c8232ca38c0fcad17f211598591594e
* | | | | | | am 39f23993: am 06a1b202: am 5d629bf2: am 93bc6176: am 01841c73: am ↵Abhishek Arya2015-08-202-0/+15
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | af46239a: am 9abb7401: Fix compile failure after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4 * commit '39f239932e94cb47a984ce50393beba5d5a8564a': Fix compile failure after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4
| * | | | | | am 06a1b202: am 5d629bf2: am 93bc6176: am 01841c73: am af46239a: am ↵Abhishek Arya2015-08-202-0/+15
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9abb7401: Fix compile failure after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4 * commit '06a1b202613b861ae43d39510cdd47d0d1c84893': Fix compile failure after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4
| | * | | | | am 93bc6176: am 01841c73: am af46239a: am 9abb7401: Fix compile failure ↵Abhishek Arya2015-08-182-0/+15
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4 * commit '93bc61764eb8417165de2bbaa6384165f7298a32': Fix compile failure after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4
| | | * | | | am af46239a: am 9abb7401: Fix compile failure after ↵Abhishek Arya2015-08-182-0/+15
| | | |\ \ \ \ | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rI431aa2b7d30a942350ab6d105451c6b77e2f99d4 * commit 'af46239a10921980f5030222dff147a592480248': Fix compile failure after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4
| | | | * | | Fix compile failure after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4Abhishek Arya2015-08-172-0/+15
| | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | Bug: 20674086 Change-Id: I2ee6b7e0eabbf696c0986d08b2d759d48cb9eb7b
* | | | | | am 123c013b: am 7bc20ac5: am cc3411e3: am 0bf31aeb: am 9359e822: am ↵Abhishek Arya2015-08-202-0/+5
|\ \ \ \ \ \ | |/ / / / / | | | | | / | |_|_|_|/ |/| | | | | | | | | | | | | | 8a34499a: am c23e3dd8: Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4 * commit '123c013b14313f7824c0787e3b034af7913f4283': Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4
| * | | | am 7bc20ac5: am cc3411e3: am 0bf31aeb: am 9359e822: am 8a34499a: am ↵Abhishek Arya2015-08-202-0/+5
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | c23e3dd8: Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4 * commit '7bc20ac542e65af6f8f248031805632a55934f67': Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4
| | * | | am 0bf31aeb: am 9359e822: am 8a34499a: am c23e3dd8: Fix compile after ↵Abhishek Arya2015-08-182-0/+5
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | rI431aa2b7d30a942350ab6d105451c6b77e2f99d4 * commit '0bf31aeb5b0e58cd167aaee2a6cb4d9248e0e66b': Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4
| | | * | am 8a34499a: am c23e3dd8: Fix compile after ↵Abhishek Arya2015-08-182-0/+5
| | | |\ \ | | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | rI431aa2b7d30a942350ab6d105451c6b77e2f99d4 * commit '8a34499ab9987d962040881b4c8d66b655f65ae0': Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4
| | | | * Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4Abhishek Arya2015-08-172-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | BUG: 20674086 Change-Id: Idaff17975b327adea65c39bdba1ab4e88789c0cd
| * | | | am 4c5695d8: am f248e3ae: am 8369ac13: am 33235986: am 09c29ec4: am ↵Abhishek Arya2015-08-202-0/+65
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | 94c1969c: Merge "libstagefright: check memory size for overflow before allocation." into klp-dev * commit '4c5695d820723d9ce7f097fb6c40c09f21b13cd1': libstagefright: check memory size for overflow before allocation.
| | * | | am 8369ac13: am 33235986: am 09c29ec4: am 94c1969c: Merge "libstagefright: ↵Abhishek Arya2015-08-182-0/+65
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | check memory size for overflow before allocation." into klp-dev * commit '8369ac13ad207baebbaf4cd7b357a35dd54408c6': libstagefright: check memory size for overflow before allocation.
| | | * | am 09c29ec4: am 94c1969c: Merge "libstagefright: check memory size for ↵Abhishek Arya2015-08-182-0/+65
| | | |\ \ | | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | overflow before allocation." into klp-dev * commit '09c29ec42df51ae807725d4eea52c4cc305c13a0': libstagefright: check memory size for overflow before allocation.
| | | | * libstagefright: check memory size for overflow before allocation.Wei Jia2015-08-142-0/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 20674086 Change-Id: I431aa2b7d30a942350ab6d105451c6b77e2f99d4 (cherry picked from commit 42cccd7c8811597d56fb86afeacf6231d693dea6)
* | | | | SimpleSoftOMXComponent: change CHECK to error notification.Wei Jia2015-07-081-13/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | libstagefright: check memory size for overflow before allocation.Wei Jia2015-06-082-0/+65
|/ / / / | | | | | | | | | | | | | | | | Bug: 20674086 Change-Id: I431aa2b7d30a942350ab6d105451c6b77e2f99d4
* | | | am 29e609a8: am 628d4ea1: Merge "stagefright: do not reject SPL5 files ↵Ronghua Wu2015-01-281-2/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | outright in SoftMpeg4 decoder" into lmp-mr1-dev * commit '29e609a8c61b7c02d57495b71a4f82e7eb053dd6': stagefright: do not reject SPL5 files outright in SoftMpeg4 decoder
| * | | stagefright: do not reject SPL5 files outright in SoftMpeg4 decoderRonghua Wu2015-01-281-2/+2
| | | | | | | | | | | | | | | | | | | | Bug:19013118 Change-Id: I58f63ae13559c93ea5e627b658c9919e86769076
* | | | am 0fe24de8: am c0c2366c: Merge "stagefright: do not reject SPL4 files ↵Ronghua Wu2015-01-231-0/+4
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | outright in SoftMpeg4 decoder" into lmp-mr1-dev * commit '0fe24de8e5a077a8220542db282c06852aaff109': stagefright: do not reject SPL4 files outright in SoftMpeg4 decoder
| * | | Merge "stagefright: do not reject SPL4 files outright in SoftMpeg4 decoder" ↵Ronghua Wu2015-01-231-0/+4
| |\ \ \ | | | | | | | | | | | | | | | into lmp-mr1-dev
| | * | | stagefright: do not reject SPL4 files outright in SoftMpeg4 decoderRonghua Wu2015-01-221-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19014147 Change-Id: Ie90e8fc69e9ac2cb34d6362e67ad289d002a2c14
* | | | | am b3e1f71b: am 841d22b0: libstagefright: Use aligned width and height.Ronghua Wu2015-01-231-2/+4
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'b3e1f71bbc154f35a5c0b113bb923ac9bf9d33dd': libstagefright: Use aligned width and height.
| * | | | libstagefright: Use aligned width and height.Ronghua Wu2015-01-221-2/+4
| |/ / / | | | | | | | | | | | | | | | | Bug: 19014147 Change-Id: I33314b02448e436c43fcfad086b5edfa650dcf83
* | | | am d18196a1: am c8c68c88: Merge "Use aligned width and height to compute ↵Ronghua Wu2015-01-081-3/+6
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | size." into lmp-mr1-dev * commit 'd18196a140ea8eee971508ca4a9fcc5f060fe94b': Use aligned width and height to compute size.
| * | | Use aligned width and height to compute size.Ronghua Wu2015-01-071-3/+6
| | | | | | | | | | | | | | | | | | | | Bug: 18528130 Change-Id: I4d2304d8c8919c1cde60676848cfe2e4f2061a87
* | | | resolved conflicts for merge of 6571ed31 to lmp-mr1-dev-plus-aospLajos Molnar2014-12-114-313/+77
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: Ibaea3a0766f75a61964615482a9ef28651a42b37
| * | | stagefright: misc fixes to software video encoders (and decoders)Lajos Molnar2014-12-104-313/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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
| * | | Fix overload of SoftVideoDecoderOMXComponent::updatePortDefinitionsBernhard Rosenkränzer2014-12-092-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | am f143b608: am d1aeff55: Merge "Fix build with clang in C++11 mode"Lajos Molnar2014-12-092-6/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * commit 'f143b60856d275a9dcda1f3084c768655b242022': Fix build with clang in C++11 mode
| * | | | Fix build with clang in C++11 modeBernhard Rosenkränzer2014-11-272-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | resolved conflicts for merge of e5ba80c5 to lmp-mr1-dev-plus-aospAndreas Gampe2014-11-271-2/+2
|\ \ \ \ \ | |/ / / / | | | | | | | | | | Change-Id: Iea12c8a6cabf84584e4a89ad80e298c1f4ea3dd7
| * | | | Merge "Stagefright: Fix unused variables, functions, values"Andreas Gampe2014-11-261-2/+2
| |\ \ \ \