summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* am 59ca7038: am 4df79c2c: am d6e7f1e1: Merge "Fix for AOSP force ↵Ricardo Garcia2014-12-091-4/+6
|\ | | | | | | | | | | | | virtualization mode" into lmp-mr1-dev * commit '59ca7038364cd6fa3e7e1b52e0e90fa0960af038': Fix for AOSP force virtualization mode
| * am 4df79c2c: am d6e7f1e1: Merge "Fix for AOSP force virtualization mode" ↵Ricardo Garcia2014-12-081-4/+6
| |\ | | | | | | | | | | | | | | | | | | into lmp-mr1-dev * commit '4df79c2c13f6163f7d99360a7fb34bf3bd2a5115': Fix for AOSP force virtualization mode
| | * Merge "Fix for AOSP force virtualization mode" into lmp-mr1-devRicardo Garcia2014-12-051-4/+6
| | |\
| | | * Fix for AOSP force virtualization modeRicardo Garcia2014-12-041-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Forcing virtualization mode with AOSP code might erroneously return a failed code, whilst it was correct. Fixing the condition for Automatic mode. bug: 18538537 Change-Id: I5837ff40cfed04c99889813cd56ebe3d90793e74
* | | | am 5f480891: am 4c56f8e0: am b65842dd: Merge "Fix NuPlayer assertion on ↵Andy Hung2014-12-0910-82/+88
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | failure to create AudioTrack" into lmp-mr1-dev * commit '5f480891e5818f111f431ae69b4c1354e302242a': Fix NuPlayer assertion on failure to create AudioTrack
| * | | am 4c56f8e0: am b65842dd: Merge "Fix NuPlayer assertion on failure to create ↵Andy Hung2014-12-0810-82/+88
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | AudioTrack" into lmp-mr1-dev * commit '4c56f8e0329cbdd0f3406bde96fc6f0bba65664d': Fix NuPlayer assertion on failure to create AudioTrack
| | * | Merge "Fix NuPlayer assertion on failure to create AudioTrack" into lmp-mr1-devAndy Hung2014-12-0510-82/+88
| | |\ \
| | | * | Fix NuPlayer assertion on failure to create AudioTrackAndy Hung2014-12-0310-82/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Under heavy media load or monkey/stress testing, more than 32 AudioTracks may be created or memory resources may be scarce. Remove the assertion on failure to create AudioTrack and signal MEDIA_ERROR. Bug: 17319843 Change-Id: I5d4e200b5f50d800046851a33e035cdc6ff10075
* | | | | am 3202a2dc: am 7cc9a1c5: am 76c156f7: Merge "fix threading in RTSPSource ↵Chong Zhang2014-12-094-39/+172
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | and StreamingSource" into lmp-mr1-dev * commit '3202a2dc337a3f4eb5410781e35f1ca0a1428615': fix threading in RTSPSource and StreamingSource
| * | | | am 7cc9a1c5: am 76c156f7: Merge "fix threading in RTSPSource and ↵Chong Zhang2014-12-084-39/+172
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | StreamingSource" into lmp-mr1-dev * commit '7cc9a1c59af8a583d33971c0d12e32dc66f742a5': fix threading in RTSPSource and StreamingSource
| | * | | Merge "fix threading in RTSPSource and StreamingSource" into lmp-mr1-devChong Zhang2014-12-054-39/+172
| | |\ \ \
| | | * | | fix threading in RTSPSource and StreamingSourceChong Zhang2014-12-034-39/+172
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18532335 Change-Id: I9c34401a928dc0ddbd0923aa5f127dc628efbb92
* | | | | am 5185c956: am 25bad49c: am 852dc963: Merge "avc_util: try to find the ↵Wei Jia2014-12-092-17/+15
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | first start code prefix 0x000001 even though there is non-zero byte at the beginning of the buffer." into lmp-mr1-dev * commit '5185c95673f7c6facd6d57fdc9fc53f52e44eed8': avc_util: try to find the first start code prefix 0x000001 even though there is non-zero byte at the beginning of the buffer.
| * | | | 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 4eb26aa2: am 7f099ffd: am 8790740d: media_codecs.xml: extend vorbis ↵Lajos Molnar2014-12-091-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sample rate to 8-96kHz * commit '4eb26aa2b549aef5a2e0863a95a5cd2c1138cd7b': media_codecs.xml: extend vorbis sample rate to 8-96kHz
| * | | | | 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
* | | | | stagefright: support VP9 frame parallel decode in Soft VPXhkuang2014-12-052-66/+179
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | VPX component now works with both serial decode mode and frame parallel mode. But VP9 frame parallel decode is not enabled yet until libvpx library enable it. In frame parallel decode, libvpx decoder decodes several frames on all cpus in parallel fashion. If not being flushed, it will only return frame when all the cpus are busy. If getting flushed, it will return all the frames in the decoder. Compare with current serial decode mode in which libvpx decoder is idle between decode calls, libvpx decoder is busy between decode calls. VP9 frame parallel decode is >30% faster than serial decode which will makes devices play 1080P VP9 videos more easily. Bug:17325438 Change-Id: I3c53329c6d0a9ff44f5a34d91ea06697478f08e2
* | | | | am 4d82c2f0: am 848b4c67: am 814cbb4e: Merge "ESQueue: add frame length ↵Wei Jia2014-12-051-4/+19
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | checking in validation of ADTS header." into lmp-mr1-dev * commit '4d82c2f0d0361cd0062c3454d557bb1064e92020': ESQueue: add frame length checking in validation of ADTS header.
| * | | | 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 105860ce: am 93f5b333: am 050ff19e: Merge "libstagefright: defer ↵Lajos Molnar2014-12-041-0/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | kWhatSetParameters in OutputPortSettingsChangedState" * commit '105860cea2956f31f1c64d7a83a4a3bb21789cb8': libstagefright: defer kWhatSetParameters in OutputPortSettingsChangedState
| * | | 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 c7883e6a: am b783a705: am ab05b4cc: StreamingSource: check mTSParser ↵Wei Jia2014-12-041-0/+4
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | before dereferencing it. * commit 'c7883e6a5381bbc96029f2dc9f949d6b2f8b3558': StreamingSource: check mTSParser before dereferencing it.
| * | | | | 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 aef46aa8: am bde85d05: am 5458756a: Merge "Track volume should be ↵Glenn Kasten2014-12-021-1/+5
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | maintained even if track is restored" * commit 'aef46aa8eff1f975ae5253a334cf0c978427ca86': Track volume should be maintained even if track is restored
| * | | | 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 48662b3a: am 779d4164: am f1828910: nuplayer: clear pending audio access ↵Ronghua Wu2014-12-022-6/+14
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | unit on flush. * commit '48662b3a0e88c85dc1ff401427892c695f1937b5': nuplayer: clear pending audio access unit on flush.
| * | | | | 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 6c5db47a: am 3253bef3: am d8731629: Merge "notify seek complete upon ↵Chong Zhang2014-12-028-28/+107
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | first video output frame" into lmp-mr1-dev * commit '6c5db47a612c52533066dde2d867454689ea30ff': notify seek complete upon first video output frame
| * | | | | 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 d03179ac: am 42495ddc: am 592f3bc8: Merge "Added support for YEAR ↵Glenn Kasten2014-12-011-0/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | metadata key from VorbisComments" * commit 'd03179ac50bc59129215e9272129665da24a27cc': Added support for YEAR metadata key from VorbisComments
| * | | | | | 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
* | | | | | am 5a88501c: resolved conflicts for merge of e5ba80c5 to lmp-mr1-dev-plus-aospAndreas Gampe2014-11-2742-237/+95
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '5a88501c8f677e34afb2043d7e81d8e09d6fa5f4': Stagefright: Fix unused variables, functions, values
| * | | | | 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 61280541: am 390ef843: am f20c4356: Merge "AudioRecord: use audio ↵Eric Laurent2014-11-274-39/+75
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | attributes instead of audio source." into lmp-mr1-dev * commit '61280541836947ce0b281b240ffa4c55bbf5bd55': AudioRecord: use audio attributes instead of audio source.