summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "MediaCodec: set state to UNINITIALIZED when receiving fatal error." in...Wei Jia2014-08-302-2/+6
|\
| * MediaCodec: set state to UNINITIALIZED when receiving fatal error.Wei Jia2014-08-292-2/+6
* | Merge "Tunneled Video Playback: Changed AudioHwSync token to int32_t to match...Rachad2014-08-302-5/+5
|\ \
| * | Tunneled Video Playback:Rachad2014-08-282-5/+5
* | | Merge "stagefright: add codec capability info for google video codecs" into l...Lajos Molnar2014-08-291-10/+81
|\ \ \
| * | | stagefright: add codec capability info for google video codecsLajos Molnar2014-08-141-10/+81
* | | | Merge "sound trigger: fix cross deadlock between service and client" into lmp...Eric Laurent2014-08-291-20/+38
|\ \ \ \
| * | | | sound trigger: fix cross deadlock between service and clientEric Laurent2014-08-281-20/+38
* | | | | Merge "audio policy: fix input source passed to openInput()" into lmp-devEric Laurent2014-08-291-2/+4
|\ \ \ \ \
| * | | | | audio policy: fix input source passed to openInput()Eric Laurent2014-08-281-2/+4
| |/ / / /
* | | | | Merge "audiopolicy: Indicate output device change to all input threads for pr...Dmitry Shmidt2014-08-291-0/+14
|\ \ \ \ \
| * | | | | audiopolicy: Indicate output device change to all input threads for pre-proce...bryant_liu2014-08-281-0/+14
| |/ / / /
* | | | | Merge "[AU]Sync libmedia/Android.mk modification from KLP-Sprout" into lmp-devBart Sears2014-08-291-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | [AU]Sync libmedia/Android.mk modification from KLP-SproutHochi Huang2014-08-291-1/+1
* | | | | frameworks: av: AudioPolicyEffect: Add refCount for each sessionbryant_liu2014-08-282-11/+29
* | | | | Merge "CameraService: Create a dummy stream when 0 streams are requested." in...Eino-Ville Talvala2014-08-285-1/+286
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | CameraService: Create a dummy stream when 0 streams are requested.Eino-Ville Talvala2014-08-285-1/+286
* | | | | Merge "PlaylistFetcher: add lower bound check when starting live streams" int...Robert Shih2014-08-281-0/+3
|\ \ \ \ \
| * | | | | PlaylistFetcher: add lower bound check when starting live streamsRobert Shih2014-08-281-0/+3
| | |_|_|/ | |/| | |
* | | | | Merge "Fix audio dropouts with multiple playback streams." into lmp-devPaul McLean2014-08-281-1/+16
|\ \ \ \ \
| * | | | | Fix audio dropouts with multiple playback streams.Paul McLean2014-08-271-1/+16
| | |/ / / | |/| | |
* | | | | Merge "audio policy: remove audio patch when closing input or output" into lm...Eric Laurent2014-08-282-3/+51
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | audio policy: remove audio patch when closing input or outputEric Laurent2014-08-272-3/+51
* | | | | Merge "cameraservice: decrease zsl metadata queue size by 1" into lmp-devYin-Chia Yeh2014-08-271-2/+6
|\ \ \ \ \
| * | | | | cameraservice: decrease zsl metadata queue size by 1Yin-Chia Yeh2014-08-271-2/+6
| |/ / / /
* | | | | Merge "Camera API1: Fix ZSLProcessor3 deadlock" into lmp-devZhijun He2014-08-271-1/+3
|\ \ \ \ \
| * | | | | Camera API1: Fix ZSLProcessor3 deadlockZhijun He2014-08-271-1/+3
| |/ / / /
* | | | | Merge "Fix potential deadlock in unregisterStaleHandlers()" into lmp-devMarco Nelissen2014-08-271-7/+19
|\ \ \ \ \
| * | | | | Fix potential deadlock in unregisterStaleHandlers()Marco Nelissen2014-08-271-7/+19
| |/ / / /
* | | | | Merge "AudioPlayback: delay the post of EOS based on pending playout." into l...Ronghua Wu2014-08-272-22/+19
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | AudioPlayback: delay the post of EOS based on pending playout.Ronghua Wu2014-08-272-22/+19
| | |/ / | |/| |
* | | | CameraService: Correct API2 error handlingEino-Ville Talvala2014-08-276-83/+265
* | | | Merge "Fix memory leak in getConnectionState" into lmp-devMarco Nelissen2014-08-272-10/+11
|\ \ \ \ | |_|/ / |/| | |
| * | | Fix memory leak in getConnectionStateMarco Nelissen2014-08-262-10/+11
| |/ /
* | | Merge "Fix AudioMixer MONO muted track handling" into lmp-devAndy Hung2014-08-271-5/+21
|\ \ \
| * | | Fix AudioMixer MONO muted track handlingAndy Hung2014-08-251-5/+21
* | | | Merge "NuPlayer: set controlledByApp to true when creating Surface." into lmp...Wei Jia2014-08-271-1/+1
|\ \ \ \
| * | | | NuPlayer: set controlledByApp to true when creating Surface.Wei Jia2014-08-261-1/+1
| | |/ / | |/| |
* | | | Merge "Fix SoundPool lockup" into lmp-devMarco Nelissen2014-08-261-6/+8
|\ \ \ \
| * | | | Fix SoundPool lockupMarco Nelissen2014-08-261-6/+8
| |/ / /
* | | | Merge "do string compare with mime immediately after we get the value" into l...Chong Zhang2014-08-261-2/+6
|\ \ \ \ | |/ / / |/| | |
| * | | do string compare with mime immediately after we get the valueChong Zhang2014-08-261-2/+6
* | | | Merge "Revert "disable AwesomePlayer for Ogg vorbis"" into lmp-devRachad Alao2014-08-252-14/+12
|\ \ \ \
| * | | | Revert "disable AwesomePlayer for Ogg vorbis"Rachad Alao2014-08-252-14/+12
* | | | | Merge "NuPlayer: remember and resubmit CSDs after flush" into lmp-devLajos Molnar2014-08-254-21/+117
|\ \ \ \ \
| * | | | | NuPlayer: remember and resubmit CSDs after flushLajos Molnar2014-08-234-21/+117
* | | | | | Merge "HTTPLiveSource: check for NULL before getTrackCount/Info" into lmp-devRobert Shih2014-08-251-2/+10
|\ \ \ \ \ \
| * | | | | | HTTPLiveSource: check for NULL before getTrackCount/InfoRobert Shih2014-08-181-2/+10
* | | | | | | stagefright: process CSD regardless of what port was last queuedLajos Molnar2014-08-231-3/+2
| |/ / / / / |/| | | | |
* | | | | | Merge "MediaCodec: handle errors during flushing." into lmp-devWei Jia2014-08-231-6/+10
|\ \ \ \ \ \