summaryrefslogtreecommitdiffstats
path: root/media
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 b783a705: am ab05b4cc: StreamingSource: check mTSParser before ↵Wei Jia2014-12-031-0/+4
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | dereferencing it. * commit 'b783a70593c85493a2578dd8fbd7935f1bf00420': StreamingSource: check mTSParser before dereferencing it.
| * | | StreamingSource: check mTSParser before dereferencing it.Wei Jia2014-12-021-0/+4
| | | | | | | | | | | | | | | | | | | | Bug: 18532335 Change-Id: I7819d8d359fe75ea4c827138e9aaa2454ccfe3b1
* | | | am bde85d05: am 5458756a: Merge "Track volume should be maintained even if ↵Glenn Kasten2014-12-021-1/+5
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | track is restored" * commit 'bde85d05414cdd3888071635dd05e9ff78679d5e': Track volume should be maintained even if track is restored
| * | | Merge "Track volume should be maintained even if track is restored"Glenn Kasten2014-12-021-1/+5
| |\ \ \
| | * | | Track volume should be maintained even if track is restoredseunghak.han2014-12-011-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If track is restored when it set its volume to a non-unity value (such as mute), the volume was forced to unity again. Now, the previous volume is restored. Bug: 18570664 Change-Id: I79f34c6c7d6f535baba813fd3b8ba8e55cac8ad7
* | | | | am 779d4164: am f1828910: nuplayer: clear pending audio access unit on flush.Ronghua Wu2014-12-022-6/+14
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | * commit '779d41640615177524ecc8ce5cef4113de0c8ca2': nuplayer: clear pending audio access unit on flush.
| * | | | nuplayer: clear pending audio access unit on flush.Ronghua Wu2014-12-012-6/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also add flag to avoid reading on flush. Bug: 18540219 Change-Id: I2fc351c32c87db9a8c8c2aad12ee2bd56a0370ab
* | | | | am 3253bef3: am d8731629: Merge "notify seek complete upon first video ↵Chong Zhang2014-12-028-28/+107
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | output frame" into lmp-mr1-dev * commit '3253bef38cd6653768e7858f95d8baf371d58bf0': notify seek complete upon first video output frame
| * | | | Merge "notify seek complete upon first video output frame" into lmp-mr1-devChong Zhang2014-12-028-28/+107
| |\ \ \ \
| | * | | | notify seek complete upon first video output frameChong Zhang2014-12-018-28/+107
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18541814 Change-Id: Ie4e0976885f26eb253460eab371cb181ea85f2db
* | | | | | 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 390ef843: am f20c4356: Merge "AudioRecord: use audio attributes instead ↵Eric Laurent2014-11-274-39/+75
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | of audio source." into lmp-mr1-dev * commit '390ef84373b7edd1397381f780ca235326357094': AudioRecord: use audio attributes instead of audio source.
| * | | | | Merge "AudioRecord: use audio attributes instead of audio source." into ↵Eric Laurent2014-11-264-39/+75
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev
| | * | | | | AudioRecord: use audio attributes instead of audio source.Eric Laurent2014-11-254-39/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added AudioRecord constructor with audio attributes. Replaced AudioPolicymanager::getInput() by getInputForAttr(). No new functionality for now. Also: - Fixed warnings in AudioPolicyManager - Allocate audio session ID before calling getOutputForAttr() in AudioTrack. Bug: 16006090. Change-Id: I15df21e4411db688e3096dd801cf579d76d81711
* | | | | | | 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 bf14c62e: am 72bf901c: Merge "audio policy: new getOutputForAttr() ↵Eric Laurent2014-11-264-223/+128
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prototype." into lmp-mr1-dev * commit 'bf14c62e7973ed793a3b00c2c67beca4484c1c7a': audio policy: new getOutputForAttr() prototype.
| * | | | | Merge "audio policy: new getOutputForAttr() prototype." into lmp-mr1-devEric Laurent2014-11-264-223/+128
| |\ \ \ \ \
| | * | | | | audio policy: new getOutputForAttr() prototype.Eric Laurent2014-11-254-223/+128
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update getOutputForAttr() prototype and group all logic dealing with audio attributes to stream type conversion in audio policy manager. getOutputForAttr(): - specifies the audio session (for future use) - returns a status code - receives either stream type (for legacy) or audio attributes - returns an updated streamtype Remove logic dealing with legacy stream types to attributes conversion from AudioTrack. Use correct type for audio sessions in other APIs (startOutput() ...). releaseOutput() specifies the audio session (for future use). Bug: 18067208. Change-Id: I1bfbe9626c04c7955d77f8a70aecfad2cb204817
* | | | | | | am 1e18795a: am d325005e: Merge "Fix AudioTrack loop mode to play audio from ↵Andy Hung2014-11-262-4/+9
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | buffer start" into lmp-mr1-dev * commit '1e18795a4847e9368baa7ecee146d3901b283cd0': Fix AudioTrack loop mode to play audio from buffer start
| * | | | | | Merge "Fix AudioTrack loop mode to play audio from buffer start" into ↵Andy Hung2014-11-252-4/+9
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev
| | * | | | | | Fix AudioTrack loop mode to play audio from buffer startAndy Hung2014-11-242-4/+9
| | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18217633 Change-Id: Ica77acf0a32832d9b04eb657ef2f4f5329f8fbda
* | | | | | | 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
| * | | | | | Merge "stagefright: add graceful handling when setting port definition" into ↵Lajos Molnar2014-11-251-12/+12
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | lmp-mr1-dev
| | * | | | | 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 1a475921: am 223fd5c9: audio: new routing strategies and stream typesEric Laurent2014-11-261-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '1a475921c0577a4650d1bbe40a85b732d1766939': audio: new routing strategies and stream types
| * | | | | audio: new routing strategies and stream typesEric Laurent2014-11-211-1/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added new routing strategies and stream type for internal use by audio policy manager and audio flinger: - One for accessibility to allow different routing than media - One for re-routing (remote submix) in preparation of dynamic policies - Added stream type for "internal" audio flinger tracks used for audio patches and duplication. Bug: 18067208. Change-Id: I88f884b552e51e4a49c29125e5a1204cf58ff434
* | | | | 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 e30dc38b: am 7877cb80: Merge "Img_utils: Fix "unused" variables"Andreas Gampe2014-11-252-2/+2
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit 'e30dc38b0df66eaed56b3c37b45a68670808d6c9': Img_utils: Fix "unused" variables
| * | | | | Merge "Img_utils: Fix "unused" variables"Andreas Gampe2014-11-252-2/+2
| |\ \ \ \ \
generated by cgit v1.1 at 2024-05-15 18:17:58 +0000