summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am ffd5cdbd: Merge "audio policy: add support for ↵Eric Laurent2014-10-102-1/+13
|\ | | | | | | | | | | | | ro.audio.media_deep_buffer" into lmp-dev * commit 'ffd5cdbd3e3faa203539e26adc755f860c8cac80': audio policy: add support for ro.audio.media_deep_buffer
| * Merge "audio policy: add support for ro.audio.media_deep_buffer" into lmp-devEric Laurent2014-10-102-1/+13
| |\
| | * audio policy: add support for ro.audio.media_deep_bufferEric Laurent2014-10-102-1/+13
| | | | | | | | | | | | | | | Bug: 17931716. Change-Id: Ife170f20f5d02b71059fbd384bd29759fafee826
* | | am aec1dbfd: Merge "handle case OMX_AUDIO_CodingG711 in ↵Chong Zhang2014-10-101-0/+21
|\ \ \ | |/ / | | | | | | | | | | | | | | | ACodec::getPortFormat" into lmp-dev * commit 'aec1dbfd10150da3f28b64471b4dc249a58a104e': handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat
| * | Merge "handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat" into lmp-devChong Zhang2014-10-101-0/+21
| |\ \ | | |/ | |/|
| | * handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormatChong Zhang2014-10-091-0/+21
| | | | | | | | | | | | | | | Bug: 17935293 Change-Id: I8eab0acf55df6934e05947b0dbdd1fd456130088
* | | am f5ada6ed: audio policy: move intializations to onFirstRef()Eric Laurent2014-10-102-0/+7
|\ \ \ | |/ / | | | | | | | | | * commit 'f5ada6edcc83bb1b313abcd4c4fbdc4f7724f04d': audio policy: move intializations to onFirstRef()
| * | audio policy: move intializations to onFirstRef()Eric Laurent2014-10-102-0/+7
| | | | | | | | | | | | | | | | | | Bug: 17896324. Change-Id: I3bb74f5397142ac354bd815eb362e5ddacdcb463
* | | am a4c3d8f0: Merge "MediaCodec: fix onError and onInputBufferAvailable" into ↵Lajos Molnar2014-10-101-9/+15
|\ \ \ | |/ / | | | | | | | | | | | | | | | lmp-dev * commit 'a4c3d8f0f9aab53b106d95e6139e0465908909f4': MediaCodec: fix onError and onInputBufferAvailable
| * | Merge "MediaCodec: fix onError and onInputBufferAvailable" into lmp-devLajos Molnar2014-10-101-9/+15
| |\ \
| | * | MediaCodec: fix onError and onInputBufferAvailableLajos Molnar2014-10-091-9/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - don't call onInputBufferAvailable if we created an input surface - keep component name alive if an error occurs Bug: 17934966 Change-Id: I396c6e6cfd9fa589a1a95c6169492089255e6993
* | | | am 185a295d: Merge "NuPlayerRenderer: adjust anchor time correctly for video ↵Wei Jia2014-10-102-1/+19
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | only case." into lmp-dev * commit '185a295d4518878d5e2bca7b7c3e51df44492df1': NuPlayerRenderer: adjust anchor time correctly for video only case.
| * | | Merge "NuPlayerRenderer: adjust anchor time correctly for video only case." ↵Wei Jia2014-10-102-1/+19
| |\ \ \ | | |/ / | |/| | | | | | into lmp-dev
| | * | NuPlayerRenderer: adjust anchor time correctly for video only case.Wei Jia2014-10-092-1/+19
| | | | | | | | | | | | | | | | | | | | Bug: 17922171 Change-Id: I4c7e9e7f5ab96d3675d012ae30f78ef945394103
* | | | am af238382: Merge "Fix VideoFrame class layout for 64/32 bit" into lmp-devMarco Nelissen2014-10-091-1/+4
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'af238382e33a027494a53556e6104b7245e7213f': Fix VideoFrame class layout for 64/32 bit
| * | | Merge "Fix VideoFrame class layout for 64/32 bit" into lmp-devMarco Nelissen2014-10-091-1/+4
| |\ \ \
| | * | | Fix VideoFrame class layout for 64/32 bitMarco Nelissen2014-10-091-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This structure is passed between 64 and 32 bit processes via shared memory, so ensure it's the same size, and that the members we care about are in the same place. Bug: 17569156 Change-Id: Id776bc825af1fbf43a6dd3407cca064f6d932902
* | | | | am ce26e9d1: Merge "AudioTrack: fix AudioTrackThread crash upon exit" into ↵Eric Laurent2014-10-081-0/+3
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | lmp-dev * commit 'ce26e9d13da7a4a4443b9be775bb12fb3ac97d23': AudioTrack: fix AudioTrackThread crash upon exit
| * | | | Merge "AudioTrack: fix AudioTrackThread crash upon exit" into lmp-devEric Laurent2014-10-081-0/+3
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | AudioTrack: fix AudioTrackThread crash upon exitEric Laurent2014-10-071-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In case of error during createTrack_l(), there is a possibility that a newly created AudioTrackThread is resumed by requestExit() just after entering the Thread class _threadLoop() but before entering the class threadLoop(). In this case, processAudioBuffer() is executed once with mCblk == 0 and we assert. Bug: 17894033. Change-Id: I93d0d0d4dbf14bcb88dad23e6ad49d2ecd47badd
* | | | | am ac4d8b31: am 6ade0417: Merge "Remove dead code."Chih-Hung Hsieh2014-10-071-8/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ac4d8b31d4c7785ccaed28977e05e158d554ce38': Remove dead code.
| * \ \ \ \ am 6ade0417: Merge "Remove dead code."Chih-Hung Hsieh2014-10-071-8/+0
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6ade0417485d964f8a9462105e6507bfb7d19914': Remove dead code.
| | * \ \ \ \ Merge "Remove dead code."Chih-Hung Hsieh2014-10-071-8/+0
| | |\ \ \ \ \
| | | * | | | | Remove dead code.Chih-Hung Hsieh2014-10-071-8/+0
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUG: 17364950 Change-Id: I7c55fd918a8c0d1a3375807eaece9ae9176ffeea
* | | | | | | am 07811789: Merge "audio policy: fix build with USE_LEGACY_AUDIO_POLICY" ↵Eric Laurent2014-10-072-2/+3
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-dev * commit '07811789ebf31f5317403356f624d04282e666aa': audio policy: fix build with USE_LEGACY_AUDIO_POLICY
| * | | | | | Merge "audio policy: fix build with USE_LEGACY_AUDIO_POLICY" into lmp-devEric Laurent2014-10-072-2/+3
| |\ \ \ \ \ \
| | * | | | | | audio policy: fix build with USE_LEGACY_AUDIO_POLICYEric Laurent2014-10-072-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17894512. Change-Id: I6431c0b03ba02cf561413c34848a334caa0261fa
* | | | | | | | am 5bee844f: Merge "audio policy: fix lockup during mediaserver restart" ↵Eric Laurent2014-10-075-115/+186
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-dev * commit '5bee844fd8c2f6d9fa78ed5e063a8e3df9f2f7b6': audio policy: fix lockup during mediaserver restart
| * | | | | | | Merge "audio policy: fix lockup during mediaserver restart" into lmp-devEric Laurent2014-10-075-115/+186
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | audio policy: fix lockup during mediaserver restartEric Laurent2014-10-075-115/+186
| | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When pre or post processing effects are applied by audio policy service automatically there is a potential lockup if the first call into AudioPolicyService is made while creating one of those effects. This is because effects are created with AudioPolicyService mutex held and effect creation calls into methods (e.g registerClient()) which also acquire the mutex. The fix consists in adding a new mutex to AudioPolicyEffects class and not hold the AudioPolicyService mutex when calling methods in of class. Bug: 17830596. Change-Id: Ie61c3671d3147f46e99ba208f39c1a3bf180779f
* | | | | | | am 73d0a798: Merge "NuPlayer: wait for renderer flush before decoder ↵Andy Hung2014-10-073-52/+64
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | shutdown" into lmp-dev * commit '73d0a798747c8d022e8a9c8cf4e284ac97508b1e': NuPlayer: wait for renderer flush before decoder shutdown
| * | | | | | Merge "NuPlayer: wait for renderer flush before decoder shutdown" into lmp-devAndy Hung2014-10-073-52/+64
| |\ \ \ \ \ \
| | * | | | | | NuPlayer: wait for renderer flush before decoder shutdownAndy Hung2014-10-063-52/+64
| | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17679341 Change-Id: Ie3883686891e7ee6fb45ceb01af1eb60b559d3a0
* | | | | | | am 5002d02e: Merge "Recover from errors" into lmp-devMarco Nelissen2014-10-071-5/+14
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit '5002d02e545dafbcf129b2e5bccf087e765019e5': Recover from errors
| * | | | | | Merge "Recover from errors" into lmp-devMarco Nelissen2014-10-071-5/+14
| |\ \ \ \ \ \
| | * | | | | | Recover from errorsMarco Nelissen2014-10-061-5/+14
| | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the AAC decoder encounters an error, the lists of submitted and consumed sizes need to be resynchronized, to prevent timestamp drift. Bug: 17638652 Change-Id: Ia6d5f48dc36be355803589e4a5796b01559942b8
* | | | | | | am 584c14c3: Merge "stagefright: do not allocate output buffers for tunneled ↵Rachad2014-10-072-1/+30
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | playback" into lmp-dev * commit '584c14c370f141685b7e8963a13ed91584383ca1': stagefright: do not allocate output buffers for tunneled playback
| * | | | | | Merge "stagefright: do not allocate output buffers for tunneled playback" ↵Rachad2014-10-072-1/+30
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into lmp-dev
| | * | | | | | stagefright: do not allocate output buffers for tunneled playbackRachad2014-09-282-1/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not allocate native window buffers for tunneled video playback codecs. Bug: 17112525 Change-Id: I262d8030a9df6188938fde5d62ebce8faf7dba1f
* | | | | | | | am 566a6fba: am ae38d425: Merge "Add -no-integrated-as at local level."Chih-Hung Hsieh2014-10-061-0/+3
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | * commit '566a6fba127771c752fd40db84f1e7aafa520ea6': Add -no-integrated-as at local level.
| * | | | | | | am ae38d425: Merge "Add -no-integrated-as at local level."Chih-Hung Hsieh2014-10-061-0/+3
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | * commit 'ae38d425fdb3e3fea015c161d635d631172350c3': Add -no-integrated-as at local level.
| | * | | | | | Merge "Add -no-integrated-as at local level."Chih-Hung Hsieh2014-10-061-0/+3
| | |\ \ \ \ \ \
| | | * | | | | | Add -no-integrated-as at local level.Chih-Hung Hsieh2014-10-061-0/+3
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Later we will enable integrated-as as default at the global level. BUG: 17820427 Change-Id: I8e67a152f82afdd1d6b81793ee7dd721ab2b59df
* | | | | | | | am e48b90d6: Merge "StageFrightRecorder: Enable meta-data mode for VP8 ↵Chong Zhang2014-10-061-0/+1
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | hardware encoder." into lmp-dev * commit 'e48b90d634f9e6190a788e6225927d418b11d162': StageFrightRecorder: Enable meta-data mode for VP8 hardware encoder.
| * | | | | | | Merge "StageFrightRecorder: Enable meta-data mode for VP8 hardware encoder." ↵Chong Zhang2014-10-061-0/+1
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | into lmp-dev
| | * | | | | | StageFrightRecorder: Enable meta-data mode for VP8 hardware encoder.Praveen Chavan2014-10-061-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Meta-data mode for input is preferred (rather required) for recording with camera v1. This capability is queried and enabled per codec; enable it for VP8 hardware encoder. Bug: 17664960 Change-Id: I4735c61670ebe0a555002cc25ef3ed823ab02f1f
* | | | | | | | am c4da004d: Merge "NuPlayer: add audioDecoderStillNeeded." into lmp-devRonghua Wu2014-10-062-3/+10
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c4da004d4baef8cc4a631058549216c8d2383824': NuPlayer: add audioDecoderStillNeeded.
| * | | | | | | Merge "NuPlayer: add audioDecoderStillNeeded." into lmp-devRonghua Wu2014-10-062-3/+10
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| | * | | | | | NuPlayer: add audioDecoderStillNeeded.Ronghua Wu2014-10-032-3/+10
| | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17752358 Change-Id: Ia3b3ee4df65e5564afd0723943d2d747f3a604af
* | | | | | | am 57c27c55: am dc28fa7e: Merge "Add missing #includes"Dan Albert2014-10-044-2/+7
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | * commit '57c27c55006f0137a8ad5a87ec62eb89084dcdc6': Add missing #includes
generated by cgit v1.1 at 2025-01-25 09:37:48 +0000