summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* Merge "Implement a cancelation mechanism for queries."Jeff Brown2012-01-273-16/+16
|\
| * Implement a cancelation mechanism for queries.Jeff Brown2012-01-273-16/+16
* | Use final on new member variablesGlenn Kasten2012-01-2713-30/+31
* | Merge "Bug 5567648 disassociate audio mode and audio focus"Jean-Michel Trivi2012-01-272-40/+40
|\ \
| * | Bug 5567648 disassociate audio mode and audio focusJean-Michel Trivi2012-01-272-40/+40
* | | Merge "Use audio_source_t consistently"Glenn Kasten2012-01-275-11/+14
|\ \ \
| * | | Use audio_source_t consistentlyGlenn Kasten2012-01-265-11/+14
| | |/ | |/|
* | | Merge "The software AAC encoder is now an OMX component."Andreas Huber2012-01-266-8/+674
|\ \ \
| * | | The software AAC encoder is now an OMX component.Andreas Huber2012-01-266-8/+674
| | |/ | |/|
* | | Preserve NEON callee-save registers d8-d15.Ben Cheng2012-01-263-3/+30
|/ /
* | am 95306d85: am 64085d03: am 12045502: Merge "stagefright aacenc: Fix type de...Jean-Baptiste Queru2012-01-251-3/+3
|\ \
| * \ am 12045502: Merge "stagefright aacenc: Fix type definitions for 64 bit platf...Jean-Baptiste Queru2012-01-251-3/+3
| |\ \
| | * \ Merge "stagefright aacenc: Fix type definitions for 64 bit platforms"Jean-Baptiste Queru2012-01-251-3/+3
| | |\ \
| | | * | stagefright aacenc: Fix type definitions for 64 bit platformsMartin Storsjo2012-01-131-3/+3
* | | | | Merge "Update AudioTrack.stop() javadoc"Jean-Michel Trivi2012-01-251-2/+5
|\ \ \ \ \
| * | | | | Update AudioTrack.stop() javadocJean-Michel Trivi2012-01-241-2/+5
| | |_|_|/ | |/| | |
* | | | | am e2594b85: am 4cd2b343: am 98539a4e: Merge "stagefright amrwbenc: Make the ...Jean-Baptiste Queru2012-01-251-2/+7
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | am 98539a4e: Merge "stagefright amrwbenc: Make the mem_malloc function 64-bit...Jean-Baptiste Queru2012-01-241-2/+7
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge "stagefright amrwbenc: Make the mem_malloc function 64-bit safe"Jean-Baptiste Queru2012-01-241-2/+7
| | |\ \ \
| | | * | | stagefright amrwbenc: Make the mem_malloc function 64-bit safeMartin Storsjo2012-01-131-2/+7
| | | | |/ | | | |/|
* | | | | am a3946104: am fc2ea24b: am d80cbb8c: Merge "stagefright aacenc: Add missing...Jean-Baptiste Queru2012-01-2513-13/+13
|\ \ \ \ \ | |/ / / /
| * | | | am d80cbb8c: Merge "stagefright aacenc: Add missing newlines at the end of fi...Jean-Baptiste Queru2012-01-2413-13/+13
| |\ \ \ \ | | |/ / /
| | * | | Merge "stagefright aacenc: Add missing newlines at the end of files"Jean-Baptiste Queru2012-01-2413-13/+13
| | |\ \ \
| | | * | | stagefright aacenc: Add missing newlines at the end of filesMartin Storsjo2012-01-1313-13/+13
| | | |/ /
* | | | | Merge "More AudioManager tests"Jean-Michel Trivi2012-01-241-2/+175
|\ \ \ \ \
| * | | | | More AudioManager testsJean-Michel Trivi2012-01-241-2/+175
| | |_|_|/ | |/| | |
* | | | | am 10c4641c: am 2ae5805c: am 164a9842: Merge "stagefright aacenc: Properly te...Jean-Baptiste Queru2012-01-241-1/+1
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | am 164a9842: Merge "stagefright aacenc: Properly terminate a comment"Jean-Baptiste Queru2012-01-241-1/+1
| |\ \ \ | | |/ /
| | * | Merge "stagefright aacenc: Properly terminate a comment"Jean-Baptiste Queru2012-01-241-1/+1
| | |\ \
| | | * | stagefright aacenc: Properly terminate a commentMartin Storsjo2012-01-131-1/+1
| | | |/
| * | | am 9d25b82d: Merge "Rename LOG_ASSERT to ALOG_ASSERT"Jean-Baptiste Queru2012-01-191-1/+1
| |\ \ \ | | |/ /
| | * | Rename LOG_ASSERT to ALOG_ASSERTSteve Block2012-01-191-1/+1
| * | | am 6df477be: Merge "Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)"Jean-Baptiste Queru2012-01-19102-754/+754
| |\ \ \ | | |/ /
| | * | Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)Steve Block2012-01-19102-754/+754
| * | | am a826f9e2: Merge "Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)"Jean-Baptiste Queru2012-01-1954-187/+187
| |\ \ \ | | |/ /
| | * | Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)Steve Block2012-01-1954-187/+187
| * | | am 4f367f33: Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)"Jean-Baptiste Queru2012-01-1945-146/+146
| |\ \ \ | | |/ /
| | * | Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)Steve Block2012-01-1945-146/+146
| * | | am ba7f0d2a: Merge "Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)"Jean-Baptiste Queru2012-01-1915-48/+48
| |\ \ \ | | |/ /
| | * | Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)Steve Block2012-01-1915-48/+48
| * | | Merge ee4618bcJean-Baptiste Queru2012-01-19117-2100/+2100
| |\ \ \ | | |/ /
| | * | Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF)Steve Block2012-01-19117-2100/+2100
| | |/
* | | Merge "Fix warning for redundant typedef"Glenn Kasten2012-01-201-1/+1
|\ \ \
| * | | Fix warning for redundant typedefGlenn Kasten2012-01-201-1/+1
* | | | Use audio_format_t consistently, continuedGlenn Kasten2012-01-204-30/+30
* | | | Merge "Starhub RTSP apparently does not establish time on all tracks"Andreas Huber2012-01-201-1/+29
|\ \ \ \
| * | | | Starhub RTSP apparently does not establish time on all tracksAndreas Huber2012-01-201-1/+29
* | | | | Merge "Fix typos in string constants"Glenn Kasten2012-01-201-1/+1
|\ \ \ \ \
| * | | | | Fix typos in string constantsGlenn Kasten2012-01-191-1/+1
* | | | | | Merge "Remove redundant get()"Glenn Kasten2012-01-203-4/+4
|\ \ \ \ \ \