summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/codecs
Commit message (Collapse)AuthorAgeFilesLines
* SoftAAC2: reset EOS status after a flushChong Zhang2015-03-091-0/+2
| | | | | bug:19656539 Change-Id: I27f41d885f4fd5bb5a0e29510f808fb84a0f75f3
* SoftAAC2: calculate timestamp from aacSampleRateChong Zhang2015-03-041-2/+2
| | | | | bug: 19602975 Change-Id: Ie2e5a61d627980762080c4a8701b578143d123fa
* am cf09e292: am 2d9ded1d: am d607e5a5: Merge "Fixes for GSM decoder"Marco Nelissen2015-02-192-3/+28
|\ | | | | | | | | * commit 'cf09e2926e3f76ac54a6efb6626a7eb256d2aaff': Fixes for GSM decoder
| * am 2d9ded1d: am d607e5a5: Merge "Fixes for GSM decoder"Marco Nelissen2015-02-192-3/+28
| |\ | | | | | | | | | | | | * commit '2d9ded1d03653c747ba173f622e19ed6d56f26f4': Fixes for GSM decoder
| | * Fixes for GSM decoderMarco Nelissen2015-02-192-3/+28
| | | | | | | | | | | | | | | | | | | | | | | | Use larger buffer size, since otherwise it won't work with MediaExtractor which batches up GSM frames. Support reset and flush. Change-Id: I3a87e3744c088f7a40bbc428187fc44c073c63ec
* | | am 6d5a1afa: am 6d5a063d: am 0c11001c: Merge "stagefright: change licensing ↵Lajos Molnar2015-02-09290-332/+4575
|\ \ \ | |/ / | | | | | | | | | | | | | | | headers on h264dec omxdl sources" into lmp-mr1-dev * commit '6d5a1afac2a7bca6b171261ca9b237c3a516e567': stagefright: change licensing headers on h264dec omxdl sources
| * | am 6d5a063d: am 0c11001c: Merge "stagefright: change licensing headers on ↵Lajos Molnar2015-02-07290-332/+4575
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | h264dec omxdl sources" into lmp-mr1-dev * commit '6d5a063de358312e6d133f8937ffb1b795116129': stagefright: change licensing headers on h264dec omxdl sources
| | * | stagefright: change licensing headers on h264dec omxdl sourcesLajos Molnar2015-02-06290-332/+4575
| | | | | | | | | | | | | | | | | | | | Bug: 19030684 Change-Id: I6d4674fad126c26d3b6819fde91277a92dfd8862
* | | | Merge "opus: Support for > 2 channels"Vignesh Venkatasubramanian2015-02-051-3/+9
|\ \ \ \
| * | | | opus: Support for > 2 channelsVignesh Venkatasubramanian2015-01-261-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This CL adds support for Opus streams that have more than 2 channels. It also fixes a bug where codec delay and seek preroll are not transferred during metadata to message conversion. Change-Id: Ia9748d4f7024368b2aa3c5cbd27f8016c859ea00
* | | | | am 172f2578: am 3e7e574b: am 434c80e5: Merge "Add missing includes."Elliott Hughes2015-01-301-0/+1
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | * commit '172f257811886a216bf528006fc8445cec9d5480': Add missing includes.
| * | | | am 3e7e574b: am 434c80e5: Merge "Add missing includes."Elliott Hughes2015-01-301-0/+1
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | * commit '3e7e574b682603dc7431fbfc377c2fb107d378f1': Add missing includes.
| | * | | Add missing includes.Elliott Hughes2015-01-291-0/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I54abc8fbf9d4d48f747b6aac2ce42c23c7568c25
* | | | | am 6a0fbc68: am a3c9d5c3: am 166776fb: Merge "Add missing includes."Elliott Hughes2015-01-291-0/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '6a0fbc68e203058e3b7d62e95d46f2415bc3ed95': Add missing includes.
| * | | | am a3c9d5c3: am 166776fb: Merge "Add missing includes."Elliott Hughes2015-01-291-0/+1
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit 'a3c9d5c3982591042c7c6cb5fb7c32fbd4765832': Add missing includes.
| | * | | Merge "Add missing includes."Elliott Hughes2015-01-291-0/+1
| | |\ \ \
| | | * | | Add missing includes.Elliott Hughes2015-01-281-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib697ce44243e7cb07aee60944238e0854d82e9de
* | | | | | am 2588b453: am 29e609a8: am 628d4ea1: Merge "stagefright: do not reject ↵Ronghua Wu2015-01-291-2/+2
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SPL5 files outright in SoftMpeg4 decoder" into lmp-mr1-dev * commit '2588b453fc170f0691d5c503dab2285fef6976c2': stagefright: do not reject SPL5 files outright in SoftMpeg4 decoder
| * | | | | 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 0566949e: am ba553472: am aeccbffd: Merge "Avoid mixing declarations and ↵Andreas Gampe2015-01-281-2/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | statements in C89 source files" * commit '0566949e25bdd541e969af0b5ce1aca405666d5a': Avoid mixing declarations and statements in C89 source files
| * | | | | am ba553472: am aeccbffd: Merge "Avoid mixing declarations and statements in ↵Andreas Gampe2015-01-281-2/+1
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | C89 source files" * commit 'ba553472948080e05c653c44ece1357946c6efcb': Avoid mixing declarations and statements in C89 source files
| | * | | | Merge "Avoid mixing declarations and statements in C89 source files"Andreas Gampe2015-01-281-2/+1
| | |\ \ \ \ | | | |_|/ / | | |/| | |
| | | * | | Avoid mixing declarations and statements in C89 source filesMartin Storsjo2014-12-301-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prior to adding the UNUSED macro, this file built just fine in C89 mode. Move the macro call to after the local variable declarations, to avoid mixing declarations and statements (which isn't allowed in C89 mode). Change-Id: I09299a07103d47298a0086f7c639d2be696b19ce
* | | | | | am b7909adc: am 64b08d23: am cbb803a5: Merge "Remove superfluous OpenSSL ↵Kenny Root2015-01-261-1/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | include paths." * commit 'b7909adcef247c627fbe8026624b9ecbeba47655': Remove superfluous OpenSSL include paths.
| * | | | | am 64b08d23: am cbb803a5: Merge "Remove superfluous OpenSSL include paths."Kenny Root2015-01-261-1/+0
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit '64b08d230c94872e014831bdb7b8a323c4b584ec': Remove superfluous OpenSSL include paths.
| | * | | | Remove superfluous OpenSSL include paths.Adam Langley2015-01-221-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The libcrypto and libssl modules (and their respective static and host versions) use LOCAL_EXPORT_C_INCLUDE_DIRS thus just including the module is sufficient. Change-Id: If9df76e6fefb7419cbb2fb33a0264626c748561e
| | * | | | Don't signal an error at the end of a short fileMarco Nelissen2014-12-231-19/+11
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Just signaling EOS is sufficient Bug: 17933838 Change-Id: I04a1af57378115731febe7cacb35af5e55d5db83
* | | | | am 40a0ac3a: am 0fe24de8: am c0c2366c: Merge "stagefright: do not reject ↵Ronghua Wu2015-01-231-0/+4
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | SPL4 files outright in SoftMpeg4 decoder" into lmp-mr1-dev * commit '40a0ac3aba5ff8fc44e51ba4f7b0bac3448818c9': stagefright: do not reject SPL4 files outright in SoftMpeg4 decoder
| * | | | 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 d9e8b820: am b3e1f71b: am 841d22b0: libstagefright: Use aligned width and ↵Ronghua Wu2015-01-231-2/+4
|\ \ \ \ \ \ | |/ / / / / | | | | | / | |_|_|_|/ |/| | | | | | | | | | | | | | height. * commit 'd9e8b820116ee48237507da5ce0ffb29bc73350b': libstagefright: Use aligned width and height.
| * | | | 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 9a9c9be1: am d18196a1: am c8c68c88: Merge "Use aligned width and height ↵Ronghua Wu2015-01-081-3/+6
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | to compute size." into lmp-mr1-dev * commit '9a9c9be1f8c1664253d11f8913a30998a2950521': Use aligned width and height to compute size.
| * | | 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
* | | | am 3e08ca67: resolved conflicts for merge of 6571ed31 to lmp-mr1-dev-plus-aospLajos Molnar2014-12-1111-964/+177
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '3e08ca6709b5a75dc3b779cf3eba8196b08a0245': stagefright: misc fixes to software video encoders (and decoders)
| * | | resolved conflicts for merge of 6571ed31 to lmp-mr1-dev-plus-aospLajos Molnar2014-12-1111-964/+177
| |\ \ \ | | |/ / | | | | | | | | Change-Id: Ibaea3a0766f75a61964615482a9ef28651a42b37
| | * | stagefright: misc fixes to software video encoders (and decoders)Lajos Molnar2014-12-1011-964/+176
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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 33cc5c91: am f143b608: am d1aeff55: Merge "Fix build with clang in C++11 ↵Lajos Molnar2014-12-0935-95/+95
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | mode" * commit '33cc5c91e4bb9152ed122afacf7423e085420ac8': Fix build with clang in C++11 mode
| * | | am f143b608: am d1aeff55: Merge "Fix build with clang in C++11 mode"Lajos Molnar2014-12-0935-95/+95
| |\ \ \ | | | |/ | | |/| | | | | | | | | * commit 'f143b60856d275a9dcda1f3084c768655b242022': Fix build with clang in C++11 mode
| | * | Merge "Fix build with clang in C++11 mode"Lajos Molnar2014-12-0935-95/+95
| | |\ \
| | | * | Fix build with clang in C++11 modeBernhard Rosenkränzer2014-11-2735-95/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | am 853bc5a2: am f3c25346: am 66172f5c: Merge "Cast int64_t values to long ↵Lajos Molnar2014-12-091-2/+2
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | long before print." * commit '853bc5a2379a59859795027a9dd4bc11a54b2a5f': Cast int64_t values to long long before print.
| * | | | am f3c25346: am 66172f5c: Merge "Cast int64_t values to long long before print."Lajos Molnar2014-12-091-2/+2
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit 'f3c253464e0047a28960b27bbee7366d5bd63327': Cast int64_t values to long long before print.
| | * | | Merge "Cast int64_t values to long long before print."Lajos Molnar2014-12-091-2/+2
| | |\ \ \
| | | * | | Cast int64_t values to long long before print.Bernhard Rosenkränzer2014-12-041-2/+2
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So the "%lld" format will not have Clang warnings in 32-bit and 64-bit builds. Alternative is to use PRId64. Change-Id: I5fafc506fae012748a04ec261af62d9d13475cde Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>