summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/codecs/avc
Commit message (Collapse)AuthorAgeFilesLines
* Merge tag 'android-6.0.1_r46' into HEADJessica Wagantall2016-06-071-0/+16
|\ | | | | | | | | | | Android 6.0.1 release 46 Change-Id: I4fcabf5775aebd2cb8dc0e352d1b1460d3214573
| * DO NOT MERGE Verify OMX buffer sizes prior to accessMarco Nelissen2016-04-211-0/+16
| | | | | | | | | | Bug: 27207275 Change-Id: I4412825d1ee233d993af0a67708bea54304ff62d
* | Stagefright: Remove unused variables and filesAndreas Gampe2016-03-221-13/+0
|/ | | | | | | | | | For build-system CFLAGS clean-up. Bug: 18632512 (cherry picked from commit 765b4172f1ffb2c4e2de89163bb888fa352de664) Change-Id: I765dc394f39f60801843851760fdf9838958d7a4
* am 051b8572: am 91860b89: SoftAVCEncoder: fix auto merge error, member names ↵Wei Jia2015-08-201-1/+1
|\ | | | | | | | | | | | | have changed. * commit '051b8572c2751781925c0e58698dcbb52c8e268e': SoftAVCEncoder: fix auto merge error, member names have changed.
| * SoftAVCEncoder: fix auto merge error, member names have changed.Wei Jia2015-08-171-1/+1
| | | | | | | | | | Bug: 20674674 Change-Id: I511c22d59789e1cc3a21fe13ea08ac3752e737c6
* | am e264b770: am d9d6c465: am 5d1e62e2: am 9cebcc5f: Merge "SoftAVCEncoder: ↵Wei Jia2015-08-201-1/+1
|\ \ | |/ | | | | | | | | | | fix mismatched type for comparison." into lmp-dev * commit 'e264b770b41eff604ca730ef9172c249b652557b': SoftAVCEncoder: fix mismatched type for comparison.
| * am 5d1e62e2: am 9cebcc5f: Merge "SoftAVCEncoder: fix mismatched type for ↵Wei Jia2015-08-181-1/+1
| |\ | | | | | | | | | | | | | | | | | | comparison." into lmp-dev * commit '5d1e62e24628e86fc0485113db18b31973a5cf4b': SoftAVCEncoder: fix mismatched type for comparison.
| | * SoftAVCEncoder: fix mismatched type for comparison.Wei Jia2015-08-171-1/+1
| | | | | | | | | | | | | | | Bug: 20674674 Change-Id: Iace5b8c882339b3a9d2e706375255aeeeb0532fe
* | | am 50b600d6: am ab33de61: am 78df80c2: am 65842db0: Merge commit ↵Wei Jia2015-08-201-0/+8
|\ \ \ | |/ / | | | | | | | | | | | | | | | \'b46eb8d9\' into HEAD * commit '50b600d66eb87bccf8010f30bece4e1f135322d1': SoftAVCEnc: check requested memory size before allocation.
| * | am 78df80c2: am 65842db0: Merge commit \'b46eb8d9\' into HEADWei Jia2015-08-181-0/+8
| |\ \ | | |/ | | | | | | | | | * commit '78df80c26352bdbe3dc3725a6d937f60fc340127': SoftAVCEnc: check requested memory size before allocation.
| | * Merge commit 'b46eb8d9' into HEADWei Jia2015-08-171-0/+8
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SoftAVCEnc: check requested memory size before allocation. Bug: 20674674 (cherry picked from commit f6fe4340219a8e674f3250fe32d4697ec8184b24) Change-Id: Ib52a26de912fd5a9a08dd9948885fb4a9b32e9e6
| | | * am 479b4de0: SoftAVCEnc: check requested memory size before allocation.Wei Jia2015-08-181-0/+12
| | | |\ | | | | | | | | | | | | | | | | | | | | * commit '479b4de0d267eb7d4c419f4da0069186a952ad17': SoftAVCEnc: check requested memory size before allocation.
| | | | * SoftAVCEnc: check requested memory size before allocation.Wei Jia2015-08-141-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 20674674 Change-Id: I569e7a9b33fe64779a40e55539929c3dc4303c19 (cherry picked from commit f6fe4340219a8e674f3250fe32d4697ec8184b24)
| | | | * Add liblogYing Wang2013-04-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8580410 Change-Id: If493d87d60d71be664ad75b140c62acadb75b0d0
| | | | * am a923dd4e: am 1b0ae9e4: Merge "avcenc: Set OMX_BUFFERFLAG_EOS on the last ↵Jean-Baptiste Queru2012-09-121-0/+3
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | output frame" * commit 'a923dd4e6c14f5cba2fc5f6f152619ec6bc70c5d': avcenc: Set OMX_BUFFERFLAG_EOS on the last output frame
| | | | * \ am bf30787f: am 735d1b92: Merge "avcenc: Don\'t erase the InputBufferInfo ↵Jean-Baptiste Queru2012-08-291-1/+1
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | before reading info from it" * commit 'bf30787f2694057e775f3b527b649a9f8074237b': avcenc: Don't erase the InputBufferInfo before reading info from it
* | | | | \ \ resolved conflicts for merge of 6571ed31 to lmp-mr1-dev-plus-aospLajos Molnar2014-12-112-299/+59
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | Change-Id: Ibaea3a0766f75a61964615482a9ef28651a42b37
| * | | | | | stagefright: misc fixes to software video encoders (and decoders)Lajos Molnar2014-12-102-299/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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
* | | | | | | am f143b608: am d1aeff55: Merge "Fix build with clang in C++11 mode"Lajos Molnar2014-12-091-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f143b60856d275a9dcda1f3084c768655b242022': Fix build with clang in C++11 mode
| * | | | | | | Fix build with clang in C++11 modeBernhard Rosenkränzer2014-11-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-273-5/+3
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | Change-Id: Iea12c8a6cabf84584e4a89ad80e298c1f4ea3dd7
| * | | | | | | Merge "Stagefright: Fix unused variables, functions, values"Andreas Gampe2014-11-263-5/+3
| |\ \ \ \ \ \ \
| | * | | | | | | Stagefright: Fix unused variables, functions, valuesAndreas Gampe2014-11-253-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For build-system CFLAGS clean-up, remove unused functions and variables. Change-Id: Ic3dee56b589ea9a693efa1d72ba394036efff168
* | | | | | | | | am 7fca411f: am b44760cf: Merge "Remove deprecated register keyword"Chih-hung Hsieh2014-11-251-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7fca411f36f76493491fd45f91fac2e9bd70fd6d': Remove deprecated register keyword
| * | | | | | | | Remove deprecated register keywordBernhard Rosenkränzer2014-11-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In C++11 mode, clang errors out on the register keyword. Change-Id: I034ba5815e37e3ff5e017551977e97b8516123e8 Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
* | | | | | | | | am 112ba592: am 6c7d332f: Merge "Remove bogus forward declarations"Chih-hung Hsieh2014-11-251-2/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '112ba59269c4d7192cb4f590b05c6058f5daafb9': Remove bogus forward declarations
| * | | | | | | | Merge "Remove bogus forward declarations"Chih-hung Hsieh2014-11-241-2/+0
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Remove bogus forward declarationsBernhard Rosenkränzer2014-11-201-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | | | | | am 128b7850: am db1ce33e: Merge "Remove check for an impossible condition"Chih-hung Hsieh2014-11-251-4/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '128b785027033c8c74a858a3dac27cfcb2a9ae7f': Remove check for an impossible condition
| * | | | | | | | Merge "Remove check for an impossible condition"Chih-hung Hsieh2014-11-241-4/+0
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Remove check for an impossible conditionBernhard Rosenkraenzer2014-10-041-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | offset_for_ref_frame is an array rather than a pointer - it can't be NULL (and the check causes a warning in clang). Change-Id: I9b96e1e723e3b8caebd41821137ed6fb669d8cd4 Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
| * | | | | | | | resolved conflicts for merge of 2edda09a to lmp-dev-plus-aospLajos Molnar2014-10-142-113/+19
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | | | | | | | | | | | Change-Id: I760286b72fe1ebda3e8b058ca2138cb97fbdb7e1
* | | | | | | | | Merge "libstagefright: set actual stride info for SW encoder input port" ↵Lajos Molnar2014-10-281-0/+4
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-mr1-dev automerge: 701b964 automerge: 294c7f3 * commit '294c7f36e6a92419017e7fe2a204fba1284cdc08': libstagefright: set actual stride info for SW encoder input port
| * | | | | | | | libstagefright: set actual stride info for SW encoder input portLajos Molnar2014-10-251-0/+4
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | resolved conflicts for merge of f4147ee9 to lmp-mr1-dev-plus-aospLajos Molnar2014-10-142-113/+19
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | / / / / / / | |/ / / / / / |/| | | | | | Change-Id: I3b66673012989ab3707852b257844f2c3851f753
| * | | | | | stagefright: fix surface input handling of software encodersLajos Molnar2014-10-132-107/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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
* | | | | | | am 13006b9d: am 032ecb7f: Merge "Fix in SoftAVCEncoder plugin"Narayan Kamath2014-09-041-3/+4
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | * commit '13006b9d0586d17a0ea52e98124b54ebf6246feb': Fix in SoftAVCEncoder plugin
| * | | | | | Merge "Fix in SoftAVCEncoder plugin"Narayan Kamath2014-09-041-3/+4
| |\ \ \ \ \ \
| | * | | | | | Fix in SoftAVCEncoder pluginAshok Bhat2014-07-091-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | size of buffer_handle_t, a pointer type, was assumed to be 4 bytes. This patch uses sizeof(buffer_handle_t) instead. In addition, replaced magic number 4 with sizeof(OMX_U32) Change-Id: Id5a7ed805a7b8e9867d8e51655cd334a66ac2c2b Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
* | | | | | | | am e4478feb: Merge "Add adaptive playback support to VPX decoder." into lmp-devRonghua Wu2014-09-021-4/+0
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | * commit 'e4478febd87f6a663bbdf2c22dd829af2a8166a6': Add adaptive playback support to VPX decoder.
| * | | | | | | Add adaptive playback support to VPX decoder.Ronghua Wu2014-08-281-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 13842676 Change-Id: I9c054ea489fd3a71b3b2394f15a85b84d42edb5a
* | | | | | | | am 24a5a7c3: am b7a88e31: Merge "h264_enc: Use free() to release memory ↵Narayan Kamath2014-07-141-2/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| / / / / / / | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | allocated with malloc()" * commit '24a5a7c30ad041971ca511f4c7f784936090dfc6': h264_enc: Use free() to release memory allocated with malloc()
| * | | | | | h264_enc: Use free() to release memory allocated with malloc()Ashok Bhat2014-06-251-2/+2
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mInputFrameData and mSliceGroup are allocated memory with malloc() but released using delete. Changed this to use free() instead. Change-Id: Iecf6684d97fabb2229d9abd94279a24faf9ac2d7 Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
| * | | | | media: memset sizeof argument issuesMark Salyzyn2014-04-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I37ef154eea0f77fb7f22faf6891f3025f6ff346e
* | | | | | Merge commit '52a23bd3' into manualmergeGlenn Kasten2014-04-031-2/+2
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | Change-Id: I7a6105f467a2fa3631c62be3d306845e9cf9b365
| * | | | | 64-bit: Correction to OMX_U32 and OMX_S32Glenn Kasten2014-04-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9c41bb34c35595ac19a7ab8faaacde8cb4fa9a15
* | | | | | Merge commit 'c250980f' into manualmergeGlenn Kasten2014-03-191-2/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | Change-Id: I254d456e8cb6c580dd77d602b391bed09110454e
| * | | | | libstagefright is no longer 32 bit only.Narayan Kamath2014-03-191-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I88d5fcfc005a2c2acd0246cdd9c08b6c00b6c39b Signed-off-by: Glenn Kasten <gkasten@android.com>
* | | | | | resolved conflicts for merge of 3c780188 to masterGlenn Kasten2014-03-141-0/+2
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | Change-Id: Ic579d346c27ff05ea6444faaa60fa6caaec86fbf
| * | | | | mediaserver and associated services are 32-bit onlyGlenn Kasten2014-03-121-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | also 32-bit only command-line apps Change-Id: I9ac557a8d02bbf6986a9b5c3cdce23d400b306a3
generated by cgit v1.1 at 2024-05-31 02:05:34 +0000