summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* The software AMR NB encoder is now an OMX component.Andreas Huber2012-02-016-5/+510
| | | | Change-Id: I890eab052a7c36409b8b694c964884e28dd8d8fc
* Merge "add tests module tag to omx_tests"James Dong2012-01-311-2/+4
|\
| * add tests module tag to omx_testsJames Dong2012-01-311-2/+4
| | | | | | | | Change-Id: I5dcb5187f09a7ae980ac5857b7ade81001d459f8
* | Merge "First step of refactoring 'timedtext' code."James Dong2012-01-3115-629/+960
|\ \
| * | First step of refactoring 'timedtext' code.Insun Kang2012-01-3115-629/+960
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Goal 1. Removed dependency of TimedTextPlayer on AwsomePlayer. 2. Generalized TimedTextParser to TimedTextSource and its subclasses. Summary 1. Introduced TimedTextDriver, TimedTextPlayer (new implementation), TimedTextSource (and its subclasses). 2. Removed TimedTextParser. Remaining TODOs 1. Revise VideoVidew, Gallery3D app, AwesomePlayer to check if 'pause' and 'resume' works well. 2. Consider revising MediaPlayer APIs such as setParameter() -> addTextSource(). Need more thoughts. Change-Id: Ie0c4f15b9690102de755cef6940f8c31ccf78e27
* | | Slighly improve the API to discover if the OMX stack is running in the localAndreas Huber2012-01-315-9/+12
| |/ |/| | | | | | | | | process. Change-Id: Idd3c2f0d4a9542af01a3fdfd3b0bfab90e083505
* | Make sure our aac decoder handles this parameter.Andreas Huber2012-01-301-0/+12
|/ | | | Change-Id: I212ef0c21776b99d0c6662b118ca0ec16b1d3d5e
* Merge "Instantiate software codecs locally whenever possible."Andreas Huber2012-01-302-1/+295
|\
| * Instantiate software codecs locally whenever possible.Andreas Huber2012-01-302-1/+295
| | | | | | | | Change-Id: I58d5c30b9de9873a239e91955a8900e2c72518a7
* | Merge "Handle adding/removing/renaming nomedia paths"Marco Nelissen2012-01-302-0/+54
|\ \ | |/ |/|
| * Handle adding/removing/renaming nomedia pathsMarco Nelissen2012-01-272-0/+54
| | | | | | | | | | b/5849015 Change-Id: I3ec7419498d1ecc83db6d4605b3d7610349231f7
* | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added new API to enable cancelation of SQLite and content provider queries by means of a CancelationSignal object. The application creates a CancelationSignal object and passes it as an argument to the query. The cancelation signal can then be used to cancel the query while it is executing. If the cancelation signal is raised before the query is executed, then it is immediately terminated. Change-Id: If2c76e9a7e56ea5e98768b6d4f225f0a1ca61c61
* | | Use final on new member variablesGlenn Kasten2012-01-2713-30/+31
| | | | | | | | | | | | | | | | | | Use final for member fields initialized to a new and that are never modified. Change-Id: I042352c7bc21879613e7a50b1205b6923f8083cf
* | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't automatically change the audio focus when the audio mode changes. This is best handled by the applications that change the audio mode so they can address their usecases as they please (for instance to define the behavior when switching calls). Replaced the implicit "mode to focus" behavior with two methods to request and abandon audio focus. These methods are only to be used by the framework, and maintain the logic in AudioService to prevent other apps to request audio focus during a call. A susequent change will update com.android.internal.telephony.CallManager to take advantage of these two methods. Change-Id: If84ebd508e985083e8cac82ece44940c72b5c669
* | | Merge "Use audio_source_t consistently"Glenn Kasten2012-01-275-11/+14
|\ \ \
| * | | Use audio_source_t consistentlyGlenn Kasten2012-01-265-11/+14
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Was a mix of audio_source_t, uint8_t, and int. Related fixes: - fix comments in MediaRecorder.java - AudioPolicyService server side was not checking source parameter at all, so if the client wrapper was bypassed, invalid values could be passed into audio HAL - JNI android_media_AudioRecord_setup was checking source for positive values, but not negative values. This test is redundant, since already checked at Java and now checked by AudioPolicyService also, but might as well make it correct. Change-Id: Ie5e25d646dcd59a86d7985aa46cfcb4a1ba64a4a
* | | 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
| | |/ | |/| | | | | | | | | | | | | Yay. Change-Id: I74938a20b4e0a622836ea5184d3761180eb0f5de
* | | Preserve NEON callee-save registers d8-d15.Ben Cheng2012-01-263-3/+30
|/ / | | | | | | | | BUG:5918479 Change-Id: I574bd5845d9e7e007c637aabbf170d03217d10ad
* | am 95306d85: am 64085d03: am 12045502: Merge "stagefright aacenc: Fix type ↵Jean-Baptiste Queru2012-01-251-3/+3
|\ \ | | | | | | | | | | | | | | | | | | definitions for 64 bit platforms" * commit '95306d85005f165e10a25ad45cadadec6e1f6a31': stagefright aacenc: Fix type definitions for 64 bit platforms
| * \ am 12045502: Merge "stagefright aacenc: Fix type definitions for 64 bit ↵Jean-Baptiste Queru2012-01-251-3/+3
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | platforms" * commit '12045502c49bfee40d7d3cb806d9b70d3b5d3ed3': stagefright aacenc: Fix type definitions for 64 bit platforms
| | * \ 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also don't require LINUX to be defined, enable the MSVC typedefs only within _MSC_VER. This fixes a lot of warnings about dereferencing pointer 'winPtr' breaking strict aliasing rules. Change-Id: I4afbe0ed81295ebe6e5ee2c7f0fb0cc2dc83c89b
* | | | | Merge "Update AudioTrack.stop() javadoc"Jean-Michel Trivi2012-01-251-2/+5
|\ \ \ \ \
| * | | | | Update AudioTrack.stop() javadocJean-Michel Trivi2012-01-241-2/+5
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add more information on the behavior of android.media.AudioTrack.stop() Change-Id: Id0f968e6bb8fe38765a86c43fc065908ee84edf1
* | | | | am e2594b85: am 4cd2b343: am 98539a4e: Merge "stagefright amrwbenc: Make the ↵Jean-Baptiste Queru2012-01-251-2/+7
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | mem_malloc function 64-bit safe" * commit 'e2594b85093441e03150c7cfc540abc626884eaf': stagefright amrwbenc: Make the mem_malloc function 64-bit safe
| * | | | am 98539a4e: Merge "stagefright amrwbenc: Make the mem_malloc function ↵Jean-Baptiste Queru2012-01-241-2/+7
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | 64-bit safe" * commit '98539a4eba7677c0b1ddc12f800c7075851ef302': stagefright amrwbenc: Make the mem_malloc function 64-bit safe
| | * | | 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
| | | | |/ | | | |/| | | | | | | | | | | Change-Id: Iab0dbfdc6be09c62d353bee46596635686b784a6
* | | | | am a3946104: am fc2ea24b: am d80cbb8c: Merge "stagefright aacenc: Add ↵Jean-Baptiste Queru2012-01-2513-13/+13
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | missing newlines at the end of files" * commit 'a39461047eae6022e2c0ef873ffa2c7241b393a9': stagefright aacenc: Add missing newlines at the end of files
| * | | | am d80cbb8c: Merge "stagefright aacenc: Add missing newlines at the end of ↵Jean-Baptiste Queru2012-01-2413-13/+13
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | files" * commit 'd80cbb8c7b13203704c00e2f5941588811c15665': stagefright aacenc: Add missing newlines at the end of files
| | * | | 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
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | This avoids compiler warnings about missing newlines. Change-Id: Ieb2bb7152d794dca47c629588879032d3ba65677
* | | | | Merge "More AudioManager tests"Jean-Michel Trivi2012-01-241-2/+175
|\ \ \ \ \
| * | | | | More AudioManager testsJean-Michel Trivi2012-01-241-2/+175
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add tests for AudioFocus: - create a looper for AudioManager to use so listener callbacks can be used - test each type of audio focus gain causes the expected type of focus loss - stress test audio focus request and abandon, with and without a listener Change-Id: I7d9c84ccd8ea49cf20ede57b1245899a81e99ab0
* | | | | am 10c4641c: am 2ae5805c: am 164a9842: Merge "stagefright aacenc: Properly ↵Jean-Baptiste Queru2012-01-241-1/+1
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | | | | | | | | | | | | terminate a comment" * commit '10c4641c2e2f747f8fef7d217d550b7f9a6de588': stagefright aacenc: Properly terminate a comment
| * | | am 164a9842: Merge "stagefright aacenc: Properly terminate a comment"Jean-Baptiste Queru2012-01-241-1/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '164a984224f5d430757628028f2522329987350f': stagefright aacenc: Properly terminate a comment
| | * | 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
| | | |/ | | | | | | | | | | | | | | | | | | | | This avoids a warning about /* within a comment. Change-Id: I9079909734d35db5ab0fd54b46173d7a1848d0c9
| * | | am 9d25b82d: Merge "Rename LOG_ASSERT to ALOG_ASSERT"Jean-Baptiste Queru2012-01-191-1/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '9d25b82d280c2d979d500e7da4447148f32f820b': Rename LOG_ASSERT to ALOG_ASSERT
| | * | Rename LOG_ASSERT to ALOG_ASSERTSteve Block2012-01-191-1/+1
| | | | | | | | | | | | | | | | Change-Id: Ie2c7ea6560656d65bad791a61996174c75677517
| * | | am 6df477be: Merge "Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)"Jean-Baptiste Queru2012-01-19102-754/+754
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '6df477be186233e36fc370c4d2db6c1ed928a740': Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)
| | * | Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)Steve Block2012-01-19102-754/+754
| | | | | | | | | | | | | | | | Change-Id: I1de629b4632a4b3187ca1a28d6416daccd35f924
| * | | am a826f9e2: Merge "Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)"Jean-Baptiste Queru2012-01-1954-187/+187
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit 'a826f9e2c4f6329d8d48c927f6e942e78ffaf92f': Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)
| | * | Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)Steve Block2012-01-1954-187/+187
| | | | | | | | | | | | | | | | Change-Id: I8fbdfa7a7581f481968dbb65aa40f7042936d7cb
| * | | am 4f367f33: Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)"Jean-Baptiste Queru2012-01-1945-146/+146
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '4f367f3387887c538c81c34cc8becaea6fa5e430': Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)
| | * | Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)Steve Block2012-01-1945-146/+146
| | | | | | | | | | | | | | | | Change-Id: I26f76452ac49e2890b14d133c065493d8df0fb4a
| * | | am ba7f0d2a: Merge "Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)"Jean-Baptiste Queru2012-01-1915-48/+48
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit 'ba7f0d2a03643ce429421b81febf18fd50473070': Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)
generated by cgit v1.1 at 2024-12-26 22:28:46 +0000