summaryrefslogtreecommitdiffstats
path: root/include/media
Commit message (Expand)AuthorAgeFilesLines
* am e80631aa: am 839d11d1: Merge changes I0a744dc7,Id993a70dMark Salyzyn2014-04-151-1/+1
|\
| * am 839d11d1: Merge changes I0a744dc7,Id993a70dMark Salyzyn2014-04-151-1/+1
| |\
| | * media: 64 bit compile issuesMark Salyzyn2014-04-151-1/+1
| * | am 52a861d2: Merge "warnings be gone."Mark Salyzyn2014-04-111-1/+1
| |\ \ | | |/
| | * warnings be gone.Andreas Huber2014-04-111-1/+1
* | | stagefright: log uri protocols, and opt-in to log full uriLajos Molnar2014-04-041-0/+2
* | | stagefright: add AString constructor from String8Lajos Molnar2014-04-041-0/+3
* | | Merge "Remove deprecated BufferQueue constructor"Dan Stoza2014-04-041-4/+5
|\ \ \
| * | | Remove deprecated BufferQueue constructorDan Stoza2014-03-121-4/+5
* | | | Merge "ACodec: do not signal kWhatShutdownCompleted on codec error"Lajos Molnar2014-04-021-0/+1
|\ \ \ \
| * | | | ACodec: do not signal kWhatShutdownCompleted on codec errorLajos Molnar2014-04-011-0/+1
* | | | | am f356a123: am 68d9d71a: Support CAST V2 Authentication in MediaDrmJeff Tinker2014-04-011-2/+12
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| |
| * | | am 68d9d71a: Support CAST V2 Authentication in MediaDrmJeff Tinker2014-04-011-2/+12
| |\ \ \
| | * | | Support CAST V2 Authentication in MediaDrmJeff Tinker2014-03-291-2/+12
| * | | | am 1000d426: am f780d28d: Merge "DO NOT MERGE: Revert "mediaplayer: keep more...Lajos Molnar2014-03-281-1/+0
| |\ \ \ \ | | |/ / /
| | * | | am f780d28d: Merge "DO NOT MERGE: Revert "mediaplayer: keep more buffers with...Lajos Molnar2014-03-281-1/+0
| | |\ \ \
| | | * | | DO NOT MERGE: Revert "mediaplayer: keep more buffers with the BufferQueue"Lajos Molnar2014-03-271-1/+0
| * | | | | am 9cde5172: am b635b0e6: mediaplayer: keep more buffers with the BufferQueueLajos Molnar2014-03-191-0/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | am b635b0e6: mediaplayer: keep more buffers with the BufferQueueLajos Molnar2014-03-191-0/+1
| | |\ \ \ \ | | | |/ / /
| | | * | | mediaplayer: keep more buffers with the BufferQueueLajos Molnar2014-03-191-0/+1
| * | | | | am a671f943: am c69bc40a: Merge "Cap pts gap between adjacent frames to speci...Chong Zhang2014-03-132-0/+2
| |\ \ \ \ \ | | |/ / / /
| | * | | | am c69bc40a: Merge "Cap pts gap between adjacent frames to specified value" i...Chong Zhang2014-03-132-0/+2
| | |\ \ \ \ | | | |/ / /
| | | * | | Cap pts gap between adjacent frames to specified valueChong Zhang2014-03-112-0/+2
| * | | | | am 38efe8eb: am 6db20dcb: Merge "AudioTrack: When paused, return cached playb...Eric Laurent2014-03-081-0/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | am 6db20dcb: Merge "AudioTrack: When paused, return cached playback position"...Eric Laurent2014-03-081-0/+1
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge "AudioTrack: When paused, return cached playback position" into klp-devEric Laurent2014-03-081-0/+1
| | | |\ \ \
| | | | * | | AudioTrack: When paused, return cached playback positionHaynes Mathew George2014-03-061-0/+1
| * | | | | | am 72d09f62: am 2613347d: Merge "Added support to query ACodec whether adapti...Lajos Molnar2014-03-071-0/+3
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | am 2613347d: Merge "Added support to query ACodec whether adaptive playback i...Lajos Molnar2014-03-071-0/+3
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Merge "Added support to query ACodec whether adaptive playback is enabled." i...Lajos Molnar2014-03-071-0/+3
| | | |\ \ \ \ | | | | |/ / / | | | |/| | |
| | | | * | | Added support to query ACodec whether adaptive playback is enabled.Robert Shih2014-03-061-0/+3
| | | * | | | stagefright: do not offload LD-AAC decodingEric Laurent2014-03-061-0/+1
| | | |/ / /
| | | * | | update offloaded audio track sampling rateEric Laurent2014-03-053-2/+3
| | * | | | am 6b260425: am 85b3013e: fix deadlock issues that arise when there are simul...jpadmana2014-03-051-24/+0
| | |\ \ \ \
| | | * \ \ \ am 85b3013e: fix deadlock issues that arise when there are simultaneous effec...jpadmana2014-03-051-24/+0
| | | |\ \ \ \ | | | | |/ / /
| | | | * | | fix deadlock issues that arise when there are simultaneousjpadmana2014-03-041-24/+0
* | | | | | | Merge "Use symbol AUDIO_IO_HANDLE_NONE from <system/audio.h>"Glenn Kasten2014-03-262-4/+5
|\ \ \ \ \ \ \
| * | | | | | | Use symbol AUDIO_IO_HANDLE_NONE from <system/audio.h>Glenn Kasten2014-03-262-4/+5
* | | | | | | | Update commentsGlenn Kasten2014-03-262-10/+3
|/ / / / / / /
* | | | | | | Merge "Use symbolic constants from <system/audio.h>"Glenn Kasten2014-03-261-5/+0
|\ \ \ \ \ \ \
| * | | | | | | Use symbolic constants from <system/audio.h>Glenn Kasten2014-03-251-5/+0
* | | | | | | | Merge "Remove stream type from AudioSystem::getRenderPosition()"Glenn Kasten2014-03-261-4/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove stream type from AudioSystem::getRenderPosition()Glenn Kasten2014-03-261-4/+2
| |/ / / / / / /
* | | | | | | | Merge "Use symbol AUDIO_SESSION_OUTPUT_MIX from <system/audio.h>"Glenn Kasten2014-03-261-5/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | Use symbol AUDIO_SESSION_OUTPUT_MIX from <system/audio.h>Glenn Kasten2014-03-261-5/+6
| |/ / / / / / /
* | | | | | | | Merge "Fix uses of KeyedVector"Glenn Kasten2014-03-261-2/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix uses of KeyedVectorGlenn Kasten2014-03-251-2/+0
| |/ / / / / / /
* | | | | | | | Merge "Remove streamType parameter from AudioSystem::getLatency()"Glenn Kasten2014-03-261-1/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove streamType parameter from AudioSystem::getLatency()Glenn Kasten2014-03-251-1/+0
| |/ / / / / / /
* | | | | | | | Document AudioSystem::newAudioSessionId() failuresGlenn Kasten2014-03-251-0/+6
|/ / / / / / /