summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Make sure all references to the decoder plugin are accounted for"Andreas Huber2011-05-244-2/+10
|\
| * Make sure all references to the decoder plugin are accounted forAndreas Huber2011-05-244-2/+10
| | | | | | | | | | | | | | before calling dlunload(). Change-Id: I59aa1d19edf566b8a86a6f73b1c2eeb47c96b0de related-to-bug: 4466387
* | Merge "Make sure the software mpeg4 decoder supports multiple input frames ↵Andreas Huber2011-05-242-8/+21
|\ \ | |/ | | | | per input buffer"
| * Make sure the software mpeg4 decoder supports multiple input frames per ↵Andreas Huber2011-05-242-8/+21
| | | | | | | | | | | | | | | | input buffer to enable faster throughput in ACodec. Change-Id: I6f6a1c70d9446f9d52c3df257b2d22358b0e71f4
* | am c41a17de: am 6e5cdca1: am ef89cc14: Merge "Multi-repository checkin, goes ↵Jeffrey Tinker2011-05-242-19/+19
|\ \ | |/ |/| | | | | | | | | with https://android-git.corp.google.com/g/111038" into honeycomb-mr2 * commit 'c41a17de2b2e80f246adeef4962073916dcfff0b': Multi-repository checkin, goes with https://android-git.corp.google.com/g/111038
| * am 6e5cdca1: am ef89cc14: Merge "Multi-repository checkin, goes with ↵Jeffrey Tinker2011-05-232-19/+19
| |\ | | | | | | | | | | | | | | | | | | https://android-git.corp.google.com/g/111038" into honeycomb-mr2 * commit '6e5cdca12bdbc26dd4d4eb1b1d986783b13601aa': Multi-repository checkin, goes with https://android-git.corp.google.com/g/111038
| | * am ef89cc14: Merge "Multi-repository checkin, goes with ↵Jeffrey Tinker2011-05-232-19/+19
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | https://android-git.corp.google.com/g/111038" into honeycomb-mr2 * commit 'ef89cc14957ab631346564801841190346632ac9': Multi-repository checkin, goes with https://android-git.corp.google.com/g/111038
| | | * Merge "Multi-repository checkin, goes with ↵Jeffrey Tinker2011-05-232-19/+19
| | | |\ | | | | | | | | | | | | | | | https://android-git.corp.google.com/g/111038" into honeycomb-mr2
| | | | * Multi-repository checkin, goes with https://android-git.corp.google.com/g/111038Jeffrey Tinker2011-05-232-19/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix for b/4198446 HC - Support for Widevine Adaptive VOD Change-Id: Ia777c80825e3416bab6ae6273fba46a194135e60
* | | | | resolved conflicts for merge of d5762583 to masterJames Dong2011-05-242-1/+7
|\ \ \ \ \ | |/ / / / | | | | | | | | | | Change-Id: Icba2bcdbc9f967288a65c930b198405fd8566abd
| * | | | am ebae1923: am a5293d1c: Add some logging to track down where ANR happens ↵James Dong2011-05-232-1/+7
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | during MediaPlayer._release(). * commit 'ebae1923869ee71ab119f766ac01c5a320619290': Add some logging to track down where ANR happens during MediaPlayer._release().
| | * | | am a5293d1c: Add some logging to track down where ANR happens during ↵James Dong2011-05-232-1/+7
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | MediaPlayer._release(). * commit 'a5293d1ca4459293f4993ea39c09ea703a022844': Add some logging to track down where ANR happens during MediaPlayer._release().
| | | * | Add some logging to track down where ANR happens during MediaPlayer._release().James Dong2011-05-232-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | o add a log message in AwesomePlayer::reset before acquiring the lock Change-Id: I9f228f615f99c03c394e9d0dd78c855c0b9fcfbb related-to-bug: 4409547
* | | | | Merge "HAVE_ANDROID_OS AUDIOFLINGER_SECURITY_ENABLED dead"Glenn Kasten2011-05-231-20/+0
|\ \ \ \ \
| * | | | | HAVE_ANDROID_OS AUDIOFLINGER_SECURITY_ENABLED deadGlenn Kasten2011-05-051-20/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove dead code from the days when Android ran in emulator. Change-Id: Ibadbbde0538239ad9b2811a3a2e8f8a6d3b6389c
* | | | | | Reconcile with honeycomb-mr1-releaseThe Android Open Source Project2011-05-200-0/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia9ced1a9af3d7a04c08800387b1acf258f13bd95
| * \ \ \ \ \ merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-04-290-0/+0
| |\ \ \ \ \ \
| | * \ \ \ \ \ merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-04-270-0/+0
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-04-250-0/+0
| | | |\ \ \ \ \ \
| | | | * \ \ \ \ \ merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-04-130-0/+0
| | | | |\ \ \ \ \ \
| | | | | * \ \ \ \ \ merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-03-310-0/+0
| | | | | |\ \ \ \ \ \
| | | | | | * \ \ \ \ \ merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-03-280-0/+0
| | | | | | |\ \ \ \ \ \
| | | | | | | * \ \ \ \ \ keep previous historyThe Android Automerger2011-03-250-0/+0
| | | | | | | |\ \ \ \ \ \
| | | | | | | | * \ \ \ \ \ keep previous historyThe Android Automerger2011-03-250-0/+0
| | | | | | | | |\ \ \ \ \ \
| | | | | | | | | * \ \ \ \ \ merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-03-240-0/+0
| | | | | | | | | |\ \ \ \ \ \
| | | | | | | | | | * \ \ \ \ \ merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-03-230-0/+0
| | | | | | | | | | |\ \ \ \ \ \
| | | | | | | | | | | * \ \ \ \ \ merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-03-220-0/+0
| | | | | | | | | | | |\ \ \ \ \ \
| | | | | | | | | | | | * \ \ \ \ \ merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-03-210-0/+0
| | | | | | | | | | | | |\ \ \ \ \ \
| | | | | | | | | | | | | * \ \ \ \ \ merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-03-180-0/+0
| | | | | | | | | | | | | |\ \ \ \ \ \
| | | | | | | | | | | | | | * \ \ \ \ \ merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-03-170-0/+0
| | | | | | | | | | | | | | |\ \ \ \ \ \
| | | | | | | | | | | | | | | * \ \ \ \ \ merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-03-160-0/+0
| | | | | | | | | | | | | | | |\ \ \ \ \ \
| | | | | | | | | | | | | | | | * \ \ \ \ \ merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-03-150-0/+0
| | | | | | | | | | | | | | | | |\ \ \ \ \ \
| | | | | | | | | | | | | | | | | * \ \ \ \ \ merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-03-140-0/+0
| | | | | | | | | | | | | | | | | |\ \ \ \ \ \
| | | | | | | | | | | | | | | | | | * \ \ \ \ \ merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-03-100-0/+0
| | | | | | | | | | | | | | | | | | |\ \ \ \ \ \
| | | | | | | | | | | | | | | | | | | * \ \ \ \ \ merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-03-080-0/+0
| | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \
| | | | | | | | | | | | | | | | | | | | * \ \ \ \ \ merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-03-070-0/+0
| | | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \
| | | | | | | | | | | | | | | | | | | | | * | | | | | Do not enforce the rule in MP3Extractor that all audio frames in an mp3 file ↵James Dong2011-03-041-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | must have the same mode For some mp3 files, the mode can be changed from one audio frame to another. Without the capability to switch modes, the decoded audio may have lots of artifacts. bug - 3253310 Change-Id: Id57bb1f204642d15e38a800c72214f6794cfaa37
* | | | | | | | | | | | | | | | | | | | | | | | | | | Reconcile with honeycomb-releaseThe Android Open Source Project2011-05-200-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I83818e0c61f0fcb53b154cd0a85f18924745912f
| * | | | | | | | | | | | | | | | | | | | | | | | | | | DO NOT MERGE: MTP: Add support for dynamically adding and removing storage unitsMike Lockwood2011-02-285-25/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUG: 3402847 Change-Id: I46e90f546a8d72c273cd7f2de2d086bb6dbdc1b8 Signed-off-by: Mike Lockwood <lockwood@android.com>
| * | | | | | | | | | | | | | | | | | | | | | | | | | | DO NOT MERGE: Cherry picked hacks to better hide A/V sync issues.Andreas Huber2011-02-282-61/+153
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Squashed commit of the following: commit b1732e9b8bfea4c99bd07907c9aac9fcf1e8b264 Author: Andreas Huber <andih@google.com> Date: Thu Feb 24 12:05:40 2011 -0800 DO NOT MERGE: Alternate patch for late video issue: seek only the video ahead to the next syncframe after the current audio media position, leave audio untouched. Change-Id: I4f6eb4e577147bc12ed2e998bea299f4bcfaf936 related-to-bug: 3375737 commit 5e7282cf0b5c7a613da5e65fd6c8cb33a1058f8e Author: Andreas Huber <andih@google.com> Date: Fri Feb 11 13:09:36 2011 -0800 DO NOT MERGE: Start playing (and decoding) audio only after the first video frame has been decoded. if there's both audio and video content. This gives the video decoder an opportunity to fill its internal buffer queue at the start of playback. Change-Id: If17c4243546b1c27c8e5ee43941654d0e36f5ee5 related-to-bug: 3431702 Change-Id: Ic3a6be467ff7ad09da04b1d2bb1a692ee38002b4
| * | | | | | | | | | | | | | | | | | | | | | | | | | | merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-02-030-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-01-310-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-01-300-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-01-280-0/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-01-270-0/+0
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-01-260-0/+0
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-01-250-0/+0
| | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-01-230-0/+0
| | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-01-220-0/+0
| | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-01-210-0/+0
| | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
generated by cgit v1.1 at 2024-09-12 10:28:29 +0000