summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/codecs/m4v_h263
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |\ \
| | * | Stagefright: Fix unused variables, functions, valuesAndreas Gampe2014-11-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | For build-system CFLAGS clean-up, remove unused functions and variables. Change-Id: Ic3dee56b589ea9a693efa1d72ba394036efff168
* | | | am e464018a: am f59eae94: Merge "Fix overload of ↵Chih-hung Hsieh2014-11-252-3/+3
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | SoftVideoDecoderOMXComponent::updatePortDefinitions" * commit 'e464018a7fdacdc3bef3058620eb09ec60d3cccf': Fix overload of SoftVideoDecoderOMXComponent::updatePortDefinitions
| * | | Merge "Fix overload of SoftVideoDecoderOMXComponent::updatePortDefinitions"Chih-hung Hsieh2014-11-252-3/+3
| |\ \ \
| | * | | Fix overload of SoftVideoDecoderOMXComponent::updatePortDefinitionsBernhard Rosenkränzer2014-11-202-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | 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 d6048672: am 9d2e0dae: Merge "Remove extraneous parentheses"Chih-hung Hsieh2014-11-201-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'd60486723cdc0b4b83b77d57ce35023a7516c471': Remove extraneous parentheses
| * | | Remove extraneous parenthesesBernhard Rosenkränzer2014-11-201-1/+1
| |/ / | | | | | | | | | | | | | | | | | | Remove extraneous parentheses that cause compiler warnings in clang Change-Id: I88a3d84738433db85e4a04b673f82da7b0b1be10 Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
| * | resolved conflicts for merge of 2edda09a to lmp-dev-plus-aospLajos Molnar2014-10-142-110/+31
| |\ \ | | | | | | | | | | | | 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-110/+31
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: I3b66673012989ab3707852b257844f2c3851f753
| * | | am 48be19a4: am 2edda09a: stagefright: fix surface input handling of ↵Lajos Molnar2014-10-142-103/+31
| |\ \ \ |/ / / / | | | _ | | | | | | | | | | | | software encoders * commit '48be19a4a17cfc1e0627039bf740fffd2fcbd9f8': stagefright: fix surface input handling of software encoders
| * | stagefright: fix surface input handling of software encodersLajos Molnar2014-10-132-103/+31
| |/ | | | | | | | | | | | | | | | | - 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
* | libstagefright: compile errorsMark Salyzyn2014-10-081-0/+1
|/ | | | Change-Id: I752d7d73f9c4939160a1ccaefc44ce1f8ffd9982
* stagefright: fix fake-stride handling for H263 SW decoderRonghua Wu2014-10-021-2/+3
| | | | | | | | | - Use outputBufferWidth/Height to init H263 decoder. - Handle stride change when using fake stride. Bug: 17773094 Bug: 17326758 Change-Id: I66ce7b9c650383456923d75417c590e3a8a814e7
* stagefright: fix cropping handling for SoftAVC and SoftMEPEG4.Ronghua Wu2014-09-241-8/+12
| | | | | Bug: 17326758 Change-Id: I9b0c281d92cf1803e275b1768e9edab9404ea577
* stagefright: add adaptive playback support to SoftMPEG decoder.Ronghua Wu2014-09-113-25/+29
| | | | | | | This covers both MPEG4 and H263 adaptive playback. Bug: 17326758 Change-Id: I80a67b7f3ceab05e792f0a459439a8274bd78e20
* Add adaptive playback support to VPX decoder.Ronghua Wu2014-08-281-4/+0
| | | | | Bug: 13842676 Change-Id: I9c054ea489fd3a71b3b2394f15a85b84d42edb5a
* am 782be1ec: am 1c1b5e51: am c37eaa32: Merge "m4v_h263_enc: Use uint32_t for ↵Narayan Kamath2014-07-094-7/+7
|\ | | | | | | | | | | | | ULong" * commit '782be1ecf1022d4e2da714b5aebe51ab616e9975': m4v_h263_enc: Use uint32_t for ULong
| * m4v_h263_enc: Use uint32_t for ULongAshok Bhat2014-07-024-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * libstagefright: fix 64-bit warningsColin Cross2014-04-141-1/+3
| | | | | | | | | | | | | | | | | | | | | | %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
| * warnings be gone.Andreas Huber2014-04-112-2/+2
| | | | | | | | | | | | | | | | (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
* | 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
* | libstagefright: fix 64-bit warningsColin Cross2014-03-191-1/+3
| | | | | | | | | | | | | | | | | | %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
* | Even more warnings (now errors) fixed to unbreak the sdk-x86 build(s).Andreas Huber2014-02-121-1/+1
| | | | | | | | Change-Id: Ib4a5ab1a9e50fe9e7747a907f8b4a8c207099fdb
* | warnings be gone.Andreas Huber2014-02-114-2/+10
|/ | | | Change-Id: Ie3bae3f037730e316d7fca12e7a3527973f752ef
* Make frameworks/av 64-bit compatibleKévin PETIT2014-02-115-14/+14
| | | | | | | | | | | | 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
* stagefright: created SoftVideoDecoderOMXComponentLajos Molnar2013-06-052-305/+48
| | | | | | | | 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>
* Track exact timestamps in SoftMPEG4/H263 decodersLajos Molnar2013-06-052-4/+15
| | | | | | Change-Id: I7772e3afec020f889dea80fd6372afbc36cd68d6 Signed-off-by: Lajos Molnar <lajos@google.com> Bug: 9285553 (cherry picked from commit e113aa1f078cb3d5f8182058e144fd14ce945fca)
* Reset PV decoder on SoftMPEG4 decoder resetLajos Molnar2013-06-051-0/+5
| | | | | | | | 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)
* Fix our software decoders to reset (more of) their internal stateAndreas Huber2013-06-032-0/+6
| | | | | | | properly on a transition from idle->loaded. Change-Id: I56ccfeef24c391e50e42b522194206e35c7ab700 related-to-bug: 9105408