summaryrefslogtreecommitdiffstats
path: root/media/libstagefright
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * | | | 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>
* | | | | | am 902dc42d: am 07715ac3: Merge "C++11 compatibility."Dan Albert2014-11-201-4/+4
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '902dc42d79b075395d484ce1c71f215b199aaa2a': C++11 compatibility.
| * | | | | Merge "C++11 compatibility."Dan Albert2014-11-201-4/+4
| |\ \ \ \ \
| | * | | | | C++11 compatibility.Dan Albert2014-11-201-4/+4
| | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix string literal concatenation to not be interpreted as UD literals. * Add constexpr compatibility for non-integral static members. * Use __typeof__ instead of typeof (should become decltype once this actually becomes C++11). * Add an appropriate cast for atomic_uintptr_t, since moving to C++11 means moving from <stdatomic.h> to <atomic>, which has better typechecking (hooray for not macros!). Bug: 18466763 Change-Id: I9561dcb2526578687819ff85421ba80d8e1a9694
* | | | | | am 6597c00f: stagefright: add (temporary) support for automatic video frcLajos Molnar2014-11-201-0/+18
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 73c5c94 * commit '73c5c94ab53bf0c14fffe5edc62706865cff271d': stagefright: add (temporary) support for automatic video frc
| * | | | | stagefright: add (temporary) support for automatic video frcLajos Molnar2014-11-191-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use MediaFormat.setInteger("auto-frc", 1) to turn this feature on. If supported, this feature will show up in codec.getOutputFormat().getInteger("auto-frc") Otherwise, this key will not be present. Bug: 17383204 Change-Id: I03549b3ede4de156e9e2d81b3883010360bb42ae
* | | | | | 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>
* | | | | am 2bbc61fe: am 408dba5f: Merge "HLS: fix live lock after missing the boat ↵Robert Shih2014-11-191-0/+20
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | during configuration change" into lmp-mr1-dev * commit '2bbc61fe75a98e39c844c034cdcaf4d01b311834': HLS: fix live lock after missing the boat during configuration change
| * | | | Merge "HLS: fix live lock after missing the boat during configuration ↵Robert Shih2014-11-191-0/+20
| |\ \ \ \ | | | | | | | | | | | | | | | | | | change" into lmp-mr1-dev
| | * | | | HLS: fix live lock after missing the boat during configuration changeRobert Shih2014-11-181-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug:17488643 Change-Id: I4f5de42f86d6c616a67dc803f35c026b35347983
* | | | | | am db95b7db: am ba0790bf: Merge "Don\'t autoloop notifications" into lmp-mr1-devMarco Nelissen2014-11-191-0/+10
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit 'db95b7dbba21fc0b1112f9c362d4d942dddefba0': Don't autoloop notifications
| * | | | | Don't autoloop notificationsMarco Nelissen2014-11-181-0/+10
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some apps think it's cool to use ringtones as notification sounds, but ringtones often loop, which is not appropriate for notifications. Bug: 15929273 Change-Id: I77c4277801cb2561743f8c676ef76ab4d1668b08
* | | | | am 5f3eef9a: am 7a200235: Merge "Remove extraneous parentheses"Chih-hung Hsieh2014-11-182-2/+2
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | * commit '5f3eef9a6a946347bc7d8c5dc76290c9e780f818': Remove extraneous parentheses
| * | | | Merge "Remove extraneous parentheses"Chih-hung Hsieh2014-11-182-2/+2
| |\ \ \ \
| | * | | | Remove extraneous parenthesesBernhard Rosenkränzer2014-11-182-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove extraneous parentheses - they cause compiler warnings in clang Change-Id: Ie2efd9714f9e2251cf3b204b5c5dd1a8b8aaca13 Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
* | | | | | am dd9d3e50: am 48b447fe: Merge "Fix uninitialized variable"Chih-hung Hsieh2014-11-181-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit 'dd9d3e5046da2b36c291957ccdf3291147b847f1': Fix uninitialized variable
generated by cgit v1.1 at 2024-05-29 18:18:10 +0000