summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * am d6e7f1e1: Merge "Fix for AOSP force virtualization mode" into lmp-mr1-devRicardo Garcia2014-12-051-4/+6
| |\ | | | | | | | | | | | | * commit 'd6e7f1e1f8b1dfa6a87c7c0b1a5c68d435096b01': 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 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
| * | | am b65842dd: Merge "Fix NuPlayer assertion on failure to create AudioTrack" ↵Andy Hung2014-12-0510-82/+88
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | into lmp-mr1-dev * commit 'b65842dd9447a7925046b2285b2aa8459dc63ed3': 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 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
| * | | | am 76c156f7: Merge "fix threading in RTSPSource and StreamingSource" into ↵Chong Zhang2014-12-054-39/+172
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev * commit '76c156f71f398d08fd88100f499a8a41ddfd3808': 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 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.
| * | | | | am 852dc963: Merge "avc_util: try to find the first start code prefix ↵Wei Jia2014-12-052-17/+15
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0x000001 even though there is non-zero byte at the beginning of the buffer." into lmp-mr1-dev * commit '852dc963a53487f2e2f197ab095299aed9c60a5e': 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 561f50de: am db995fe3: Merge "Fix getTimestamp if offload thread is not ↵Andy Hung2014-12-081-1/+2
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | initialized." into lmp-mr1-dev * commit '561f50de82ce47f11ba8d4f25db1ca1d8467b2a7': Fix getTimestamp if offload thread is not initialized.
| * | | | | | am db995fe3: Merge "Fix getTimestamp if offload thread is not initialized." ↵Andy Hung2014-12-051-1/+2
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-mr1-dev * commit 'db995fe3239276be9dfd9e446b10417e07948acc': Fix getTimestamp if offload thread is not initialized.
| | * | | | | Merge "Fix getTimestamp if offload thread is not initialized." into lmp-mr1-devAndy Hung2014-12-051-1/+2
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | |
| | | * | | | Fix getTimestamp if offload thread is not initialized.Andy Hung2014-12-031-1/+2
| | | | |/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Returns INVALID_OPERATION. Bug: 18605649 Change-Id: I440fb687fbf9249098e049982fa83bcd1515fd80
* | | | | | 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
| * | | | | am 8790740d: media_codecs.xml: extend vorbis sample rate to 8-96kHzLajos Molnar2014-12-051-1/+1
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit '8790740d6bb1546dee6c87270976415503283820': 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.
| * | | | am 814cbb4e: Merge "ESQueue: add frame length checking in validation of ADTS ↵Wei Jia2014-12-041-4/+19
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | header." into lmp-mr1-dev * commit '814cbb4e33396fce559475270d6f6c0bd7c43fc5': ESQueue: add frame length checking in validation of ADTS header.
| | * | | Merge "ESQueue: add frame length checking in validation of ADTS header." ↵Wei Jia2014-12-041-4/+19
| | |\ \ \ | | | | | | | | | | | | | | | | | | into lmp-mr1-dev
| | | * | | 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 94d91778: am 18f2f90c: [FM] Fix Buganizer ID: 18456930 - FM radio audio ↵Hochi Huang2014-12-051-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | got routed to loudspeaker unexpectedly * commit '94d9177849bb68434d3839a9b0886e09489de7f2': [FM] Fix Buganizer ID: 18456930 - FM radio audio got routed to loudspeaker unexpectedly
| * | | | am 18f2f90c: [FM] Fix Buganizer ID: 18456930 - FM radio audio got routed to ↵Hochi Huang2014-12-041-1/+1
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | loudspeaker unexpectedly * commit '18f2f90cff65c384a4e8292cc3296dafafb43d52': [FM] Fix Buganizer ID: 18456930 - FM radio audio got routed to loudspeaker unexpectedly
| | * | | [FM] Fix Buganizer ID: 18456930 - FM radio audio got routed to loudspeaker ↵Hochi Huang2014-12-041-1/+1
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | unexpectedly https://partner-android-review.git.corp.google.com/#/c/187894/ Change-Id: I3f9175bbc302e382155e568e66b88400ec05ffa5 Signed-off-by: Hochi Huang <hochi.huang@mediatek.com>
* | | | am 93f5b333: am 050ff19e: Merge "libstagefright: defer kWhatSetParameters in ↵Lajos Molnar2014-12-041-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OutputPortSettingsChangedState" * commit '93f5b333d31fd5fe425faa01b25d1b4d3115a8e6': libstagefright: defer kWhatSetParameters in OutputPortSettingsChangedState
| * \ \ \ am 050ff19e: Merge "libstagefright: defer kWhatSetParameters in ↵Lajos Molnar2014-12-041-0/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OutputPortSettingsChangedState" * commit '050ff19e650a53fd2b6f1f2490758b4bf3104ca4': 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.
| * | | | | | am ab05b4cc: StreamingSource: check mTSParser before dereferencing it.Wei Jia2014-12-031-0/+4
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | * commit 'ab05b4ccb8ea59079d7f773aa0e090029c479bad': StreamingSource: check mTSParser before dereferencing it.
| | * | | | | StreamingSource: check mTSParser before dereferencing it.Wei Jia2014-12-021-0/+4
| | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | Bug: 18532335 Change-Id: I7819d8d359fe75ea4c827138e9aaa2454ccfe3b1
* | | | | | am eb05bacc: am b0eb7b0a: Merge "__ARM_HAVE_HALFWORD_MULTIPLY is always true ↵Elliott Hughes2014-12-031-4/+1
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | for __arm__." * commit 'eb05baccea81f125d042be33c36dcf1893d903d9': __ARM_HAVE_HALFWORD_MULTIPLY is always true for __arm__.
| * | | | | am b0eb7b0a: Merge "__ARM_HAVE_HALFWORD_MULTIPLY is always true for __arm__."Elliott Hughes2014-12-031-4/+1
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | * commit 'b0eb7b0a4c1c8f437d099eb14007863a94fcfbf0': __ARM_HAVE_HALFWORD_MULTIPLY is always true for __arm__.
| | * | | | Merge "__ARM_HAVE_HALFWORD_MULTIPLY is always true for __arm__."Elliott Hughes2014-12-031-4/+1
| | |\ \ \ \
| | | * | | | __ARM_HAVE_HALFWORD_MULTIPLY is always true for __arm__.Elliott Hughes2014-12-021-4/+1
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | And this is the only user of that macro... Bug: 18556103 Change-Id: I1b515a54ac8530b150f4dd93070db60c701a5603
* | | | | | 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
| * | | | | am 5458756a: Merge "Track volume should be maintained even if track is restored"Glenn Kasten2014-12-021-1/+5
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit '5458756afe20079055d65d9545399288b9298055': 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.
| * | | | | | am f1828910: nuplayer: clear pending audio access unit on flush.Ronghua Wu2014-12-022-6/+14
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | * commit 'f1828910d48bbd22e1392e6ab0ce31298d1f115c': 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
| * | | | | | am d8731629: Merge "notify seek complete upon first video output frame" into ↵Chong Zhang2014-12-028-28/+107
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev * commit 'd8731629bed46ff573b1ef904e5366d28f23dc0a': notify seek complete upon first video output frame