summaryrefslogtreecommitdiffstats
path: root/media/libstagefright
Commit message (Collapse)AuthorAgeFilesLines
* resolved conflicts for merge of 6571ed31 to lmp-mr1-dev-plus-aospLajos Molnar2014-12-1118-997/+595
|\ | | | | | | Change-Id: Ibaea3a0766f75a61964615482a9ef28651a42b37
| * stagefright: misc fixes to software video encoders (and decoders)Lajos Molnar2014-12-1018-997/+594
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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 c15a72f6: am 1914e7ed: Merge "Fix print format mismatches."Chih-Hung Hsieh2014-12-102-3/+3
|\ \ | | | | | | | | | | | | * commit 'c15a72f66add3c1f1b5b6a53488628c3843472bf': Fix print format mismatches.
| * | Fix print format mismatches.Chih-Hung Hsieh2014-12-092-3/+3
| | | | | | | | | | | | | | | | | | Clang complains about mismatch of argument type and print format. Change-Id: Ib07da09d8b1b62b3018033f9eaf7aa01bf7f7f9c
* | | am 6eb3b520: am f6a364ed: Merge "Fix AAC recording issue" into lmp-mr1-devMarco Nelissen2014-12-091-1/+2
|\ \ \ | | |/ | |/| | | | | | | * commit '6eb3b5205354ee41ae79abb692abb1490a8c3019': Fix AAC recording issue
| * | Merge "Fix AAC recording issue" into lmp-mr1-devMarco Nelissen2014-12-091-1/+2
| |\ \
| | * | Fix AAC recording issueMarco Nelissen2014-12-091-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix uninitialized variable that caused ADTS recording to incorrectly specify LTP object in the header. Bug: 17895547 Change-Id: I75650f4963f4f371cd191bc635e32c9ab17fa8c9
* | | | am f143b608: am d1aeff55: Merge "Fix build with clang in C++11 mode"Lajos Molnar2014-12-0936-97/+97
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | * commit 'f143b60856d275a9dcda1f3084c768655b242022': Fix build with clang in C++11 mode
| * | | Merge "Fix build with clang in C++11 mode"Lajos Molnar2014-12-0936-97/+97
| |\ \ \
| | * | | Fix build with clang in C++11 modeBernhard Rosenkränzer2014-11-2736-97/+97
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 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>
* | | | | | am ce48b3a8: am f3df58c7: Merge "Stagefright: Fix unused variables"Andreas Gampe2014-12-092-4/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit 'ce48b3a821f0c17aa68b114d964a26fce22cdd49': Stagefright: Fix unused variables
| * | | | | Stagefright: Fix unused variablesAndreas Gampe2014-12-042-4/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For build-system CFLAGS clean-up, fix unused variables. These variables are unused in aarch64. Bug: 18632512 Change-Id: I6ae41f64e721a0f3188f0ee045a734b366ee72a6
* | | | | am 6874ed79: am a9d2f9fb: Merge "stagefright: preserve output format flags ↵Lajos Molnar2014-12-081-2/+5
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | on format change" into lmp-mr1-dev * commit '6874ed79fd525cf5d6ec8a953475c14f5a185cb4': stagefright: preserve output format flags on format change
| * | | | stagefright: preserve output format flags on format changeLajos Molnar2014-12-051-2/+5
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Some flags are only set in configure, and get lost when output format changes. Bug: 17383204 Change-Id: I2011bce70920c4ee46fccc378da3b428f3395c11
* | | | am 25bad49c: am 852dc963: Merge "avc_util: try to find the first start code ↵Wei Jia2014-12-082-17/+15
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | prefix 0x000001 even though there is non-zero byte at the beginning of the buffer." into lmp-mr1-dev * commit '25bad49ce75758b2f68b278f54d7272b1cf4d08c': avc_util: try to find the first start code prefix 0x000001 even though there is non-zero byte at the beginning of the buffer.
| * | | Merge "avc_util: try to find the first start code prefix 0x000001 even ↵Wei Jia2014-12-052-17/+15
| |\ \ \ | | | | | | | | | | | | | | | though there is non-zero byte at the beginning of the buffer." into lmp-mr1-dev
| | * | | avc_util: try to find the first start code prefix 0x000001 even though there ↵Wei Jia2014-12-042-17/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is non-zero byte at the beginning of the buffer. ESQueue: allow one PES playload contains multiple ADTS AAC frames. Bug: 18532335 Change-Id: I1f42017cff139d5e932e0aaa3e7d33164d1a48e7
* | | | | am 7f099ffd: am 8790740d: media_codecs.xml: extend vorbis sample rate to 8-96kHzLajos Molnar2014-12-081-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '7f099ffd8feeca1d9ac6616e64f422a35cdb9890': media_codecs.xml: extend vorbis sample rate to 8-96kHz
| * | | | media_codecs.xml: extend vorbis sample rate to 8-96kHzLajos Molnar2014-12-041-1/+1
| |/ / / | | | | | | | | | | | | | | | | Bug: 18615604 Change-Id: I0245556b8164959dd52fe677901cbfc517627cb4
* | | | am 848b4c67: am 814cbb4e: Merge "ESQueue: add frame length checking in ↵Wei Jia2014-12-051-4/+19
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | validation of ADTS header." into lmp-mr1-dev * commit '848b4c676c3295508b74f85947fc5243ce9466f4': ESQueue: add frame length checking in validation of ADTS header.
| * | | ESQueue: add frame length checking in validation of ADTS header.Wei Jia2014-12-031-4/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows an invalid ADTS buffer to be abandoned when frame length in the header exceeds buffer size. Bug: 18532335 Change-Id: I8057db525d06ff00ca24afd075a7c6c17b87eaa8
* | | | am 93f5b333: am 050ff19e: Merge "libstagefright: defer kWhatSetParameters in ↵Lajos Molnar2014-12-041-0/+1
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | OutputPortSettingsChangedState" * commit '93f5b333d31fd5fe425faa01b25d1b4d3115a8e6': libstagefright: defer kWhatSetParameters in OutputPortSettingsChangedState
| * | | Merge "libstagefright: defer kWhatSetParameters in ↵Lajos Molnar2014-12-041-0/+1
| |\ \ \ | | | | | | | | | | | | | | | OutputPortSettingsChangedState"
| | * | | libstagefright: defer kWhatSetParameters in OutputPortSettingsChangedStatePer Persson2014-12-041-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9719f1698bf411914eb753d3c349a15b9fbf9df6 Signed-off-by: Per Persson <per.persson@intel.com> Signed-off-by: Persson, Mikael <mikael.persson@intel.com> Signed-off-by: Fagerstedt, Axel <axel.fagerstedt@intel.com> Signed-off-by: Yong Yao <yong.yao@intel.com>
* | | | | am 42495ddc: am 592f3bc8: Merge "Added support for YEAR metadata key from ↵Glenn Kasten2014-12-011-0/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | VorbisComments" * commit '42495ddc3501c947441f892a56f2ac9ee96d7082': Added support for YEAR metadata key from VorbisComments
| * | | | Merge "Added support for YEAR metadata key from VorbisComments"Glenn Kasten2014-12-011-0/+1
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Added support for YEAR metadata key from VorbisCommentsAndreas Lillvik2014-11-111-0/+1
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | The OggExtractor wasn't extracting the YEAR key when the metadata in the file was parsed. The YEAR key is now extracted when the file metadata is parsed. Change-Id: Idf0d1a37fb141491dce5de527703ca1b27f621e7
* | | | resolved conflicts for merge of e5ba80c5 to lmp-mr1-dev-plus-aospAndreas Gampe2014-11-2742-237/+95
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: Iea12c8a6cabf84584e4a89ad80e298c1f4ea3dd7
| * | | Merge "Stagefright: Fix unused variables, functions, values"Andreas Gampe2014-11-2643-241/+95
| |\ \ \
| | * | | Stagefright: Fix unused variables, functions, valuesAndreas Gampe2014-11-2543-241/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For build-system CFLAGS clean-up, remove unused functions and variables. Change-Id: Ic3dee56b589ea9a693efa1d72ba394036efff168
* | | | | am 9574c274: am 5d2c5fcb: Merge "MediaCodec: resume codec if state is ↵Chong Zhang2014-11-261-0/+2
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | FLUSHED in async mode" into lmp-mr1-dev * commit '9574c274bf03900b56628b0c923d40f03cb30562': MediaCodec: resume codec if state is FLUSHED in async mode
| * | | | Merge "MediaCodec: resume codec if state is FLUSHED in async mode" into ↵Chong Zhang2014-11-261-0/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | lmp-mr1-dev
| | * | | | MediaCodec: resume codec if state is FLUSHED in async modeChong Zhang2014-11-261-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 18513091 Change-Id: I192625c61834584f711de76db788c2c0332ae774
* | | | | | am 20918be9: am b2cf160f: Merge "stagefright: add graceful handling when ↵Lajos Molnar2014-11-261-12/+12
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | setting port definition" into lmp-mr1-dev * commit '20918be9309eda037074388f046c84e187a259c8': stagefright: add graceful handling when setting port definition
| * | | | | stagefright: add graceful handling when setting port definitionLajos Molnar2014-11-251-12/+12
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - don't crash when count of buffers is incorrect, or when the buffer size decreases. This allows configuring SW video encoders for smaller than QCIF size. Bug: 18513091 Change-Id: Ibfcd6b883a892156e408e94fbc329103b9ac09ac
* | | | | 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 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-252-4/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '112ba59269c4d7192cb4f590b05c6058f5daafb9': Remove bogus forward declarations
| * | | | | Merge "Remove bogus forward declarations"Chih-hung Hsieh2014-11-242-4/+0
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | Remove bogus forward declarationsBernhard Rosenkränzer2014-11-202-4/+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 865449b4: am e4f6ecb9: Merge "Stagefright: Fix default typo"Andreas Gampe2014-11-251-2/+2
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '865449b4619c7cd9b75bcf7f75a42f0de68f1f00': Stagefright: Fix default typo
| * | | | Stagefright: Fix default typoAndreas Gampe2014-11-241-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: Ie2fef95a45dd124572bf062011a272898a371924
* | | | | 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
generated by cgit v1.1 at 2024-05-28 01:09:09 +0000