| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | am c004a0c9: am 05e13b9e: am c1ded373: Merge "Revert "Use pread() to get the ↵ | James Dong | 2011-05-26 | 1 | -7/+0 |
| |\ | | | | | | | | | | | | | decrypted data for container based DRM file."" into honeycomb-mr2 * commit 'c004a0c925ea2c9c48bbf9670d2ebf96f432c90a': Revert "Use pread() to get the decrypted data for container based DRM file." | ||||
| | * | am 05e13b9e: am c1ded373: Merge "Revert "Use pread() to get the decrypted ↵ | James Dong | 2011-05-25 | 1 | -7/+0 |
| | |\ | | | | | | | | | | | | | | | | | | | data for container based DRM file."" into honeycomb-mr2 * commit '05e13b9edd3ef6edb286ddc2d92bebecf6666bf8': Revert "Use pread() to get the decrypted data for container based DRM file." | ||||
| | | * | am c1ded373: Merge "Revert "Use pread() to get the decrypted data for ↵ | James Dong | 2011-05-25 | 1 | -7/+0 |
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | container based DRM file."" into honeycomb-mr2 * commit 'c1ded373951f8bd489401e93f2dd512ff9705a49': Revert "Use pread() to get the decrypted data for container based DRM file." | ||||
| | | | * | Revert "Use pread() to get the decrypted data for container based DRM file." | James Dong | 2011-05-25 | 1 | -7/+0 |
| | | | | | | | | | | | | | | | | | This reverts commit a6f1104b9d829c636b60b9387e379f9667b5df09. | ||||
| * | | | | Merge "Support mpeg1,2 audio and mpeg1,2,4 video content extraction from .ts ↵ | Andreas Huber | 2011-05-26 | 18 | -280/+893 |
| |\ \ \ \ | | | | | | | | | | | | | | | | streams." | ||||
| | * | | | | Support mpeg1,2 audio and mpeg1,2,4 video content extraction from .ts streams. | Andreas Huber | 2011-05-25 | 18 | -280/+893 |
| | | | | | | | | | | | | | | | | | | | | | Change-Id: I9d2ee63495f161e30daba7c3aab16cb9d8ced6a5 | ||||
| * | | | | | Merge "For out of band timed text support (timed text in a separate file)." | Gloria Wang | 2011-05-25 | 10 | -41/+527 |
| |\ \ \ \ \ | |/ / / / |/| | | | | |||||
| | * | | | | For out of band timed text support (timed text in a separate file). | Gloria Wang | 2011-05-25 | 10 | -41/+527 |
| | | | | | | | | | | | | | | | | | | | | | Change-Id: I9e024a63eb9bf6f839deee3c7766a66e63126c96 | ||||
| * | | | | | Merge "Convert line breaks to Unix style" | James Dong | 2011-05-25 | 175 | -29631/+29631 |
| |\ \ \ \ \ | |||||
| | * | | | | | Convert line breaks to Unix style | Mans Rullgard | 2011-05-21 | 175 | -29631/+29631 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6219725a9fbd72432bad71a176c14f26fabdbd5f | ||||
| * | | | | | | Merge "Merge chromium to 10.0.634.0: Compile fix" | Kristian Monsen | 2011-05-25 | 1 | -1/+1 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Merge chromium to 10.0.634.0: Compile fix | Kristian Monsen | 2011-05-25 | 1 | -1/+1 |
| | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | base/thread.h moved to base/threading/thread.h: http://codereview.chromium.org/6028009 Change-Id: I4a7dd04055ed931f6bc2c6b63255f3832d0c78bd | ||||
| * | | | | | | Merge "Make sure all references to the decoder plugin are accounted for" | Andreas Huber | 2011-05-24 | 4 | -2/+10 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Make sure all references to the decoder plugin are accounted for | Andreas Huber | 2011-05-24 | 4 | -2/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | before calling dlunload(). Change-Id: I59aa1d19edf566b8a86a6f73b1c2eeb47c96b0de related-to-bug: 4466387 | ||||
| * | | | | | | | Merge "Make sure the software mpeg4 decoder supports multiple input frames ↵ | Andreas Huber | 2011-05-24 | 2 | -8/+21 |
| |\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | per input buffer" | ||||
| | * | | | | | | Make sure the software mpeg4 decoder supports multiple input frames per ↵ | Andreas Huber | 2011-05-24 | 2 | -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 Tinker | 2011-05-24 | 2 | -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 Tinker | 2011-05-23 | 2 | -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 Tinker | 2011-05-23 | 2 | -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 Tinker | 2011-05-23 | 2 | -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/111038 | Jeffrey Tinker | 2011-05-23 | 2 | -19/+19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix for b/4198446 HC - Support for Widevine Adaptive VOD Change-Id: Ia777c80825e3416bab6ae6273fba46a194135e60 | ||||
| * | | | | | | | resolved conflicts for merge of d5762583 to master | James Dong | 2011-05-24 | 2 | -1/+7 |
| |\ \ \ \ \ \ \ | |/ / / / / / | | | | | / / | |_|_|_|/ / |/| | | | | | Change-Id: Icba2bcdbc9f967288a65c930b198405fd8566abd | ||||
| | * | | | | | am ebae1923: am a5293d1c: Add some logging to track down where ANR happens ↵ | James Dong | 2011-05-23 | 2 | -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 Dong | 2011-05-23 | 2 | -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 Dong | 2011-05-23 | 2 | -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 Kasten | 2011-05-23 | 1 | -20/+0 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | HAVE_ANDROID_OS AUDIOFLINGER_SECURITY_ENABLED dead | Glenn Kasten | 2011-05-05 | 1 | -20/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove dead code from the days when Android ran in emulator. Change-Id: Ibadbbde0538239ad9b2811a3a2e8f8a6d3b6389c | ||||
| * | | | | | | | Reconcile with honeycomb-mr1-release | The Android Open Source Project | 2011-05-20 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia9ced1a9af3d7a04c08800387b1acf258f13bd95 | ||||
| | * \ \ \ \ \ \ | merge in honeycomb-mr1-release history after reset to honeycomb-mr1 | The Android Automerger | 2011-04-29 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ | merge in honeycomb-mr1-release history after reset to honeycomb-mr1 | The Android Automerger | 2011-04-27 | 0 | -0/+0 |
| | | |\ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ | merge in honeycomb-mr1-release history after reset to honeycomb-mr1 | The Android Automerger | 2011-04-25 | 0 | -0/+0 |
| | | | |\ \ \ \ \ \ \ | |||||
| | | | | * \ \ \ \ \ \ | merge in honeycomb-mr1-release history after reset to honeycomb-mr1 | The Android Automerger | 2011-04-13 | 0 | -0/+0 |
| | | | | |\ \ \ \ \ \ \ | |||||
| | | | | | * \ \ \ \ \ \ | merge in honeycomb-mr1-release history after reset to honeycomb-mr1 | The Android Automerger | 2011-03-31 | 0 | -0/+0 |
| | | | | | |\ \ \ \ \ \ \ | |||||
| | | | | | | * \ \ \ \ \ \ | merge in honeycomb-mr1-release history after reset to honeycomb-mr1 | The Android Automerger | 2011-03-28 | 0 | -0/+0 |
| | | | | | | |\ \ \ \ \ \ \ | |||||
| | | | | | | | * \ \ \ \ \ \ | keep previous history | The Android Automerger | 2011-03-25 | 0 | -0/+0 |
| | | | | | | | |\ \ \ \ \ \ \ | |||||
| | | | | | | | | * \ \ \ \ \ \ | keep previous history | The Android Automerger | 2011-03-25 | 0 | -0/+0 |
| | | | | | | | | |\ \ \ \ \ \ \ | |||||
| | | | | | | | | | * \ \ \ \ \ \ | merge in honeycomb-mr1-release history after reset to honeycomb-mr1 | The Android Automerger | 2011-03-24 | 0 | -0/+0 |
| | | | | | | | | | |\ \ \ \ \ \ \ | |||||
| | | | | | | | | | | * \ \ \ \ \ \ | merge in honeycomb-mr1-release history after reset to honeycomb-mr1 | The Android Automerger | 2011-03-23 | 0 | -0/+0 |
| | | | | | | | | | | |\ \ \ \ \ \ \ | |||||
| | | | | | | | | | | | * \ \ \ \ \ \ | merge in honeycomb-mr1-release history after reset to honeycomb-mr1 | The Android Automerger | 2011-03-22 | 0 | -0/+0 |
| | | | | | | | | | | | |\ \ \ \ \ \ \ | |||||
| | | | | | | | | | | | | * \ \ \ \ \ \ | merge in honeycomb-mr1-release history after reset to honeycomb-mr1 | The Android Automerger | 2011-03-21 | 0 | -0/+0 |
| | | | | | | | | | | | | |\ \ \ \ \ \ \ | |||||
| | | | | | | | | | | | | | * \ \ \ \ \ \ | merge in honeycomb-mr1-release history after reset to honeycomb-mr1 | The Android Automerger | 2011-03-18 | 0 | -0/+0 |
| | | | | | | | | | | | | | |\ \ \ \ \ \ \ | |||||
| | | | | | | | | | | | | | | * \ \ \ \ \ \ | merge in honeycomb-mr1-release history after reset to honeycomb-mr1 | The Android Automerger | 2011-03-17 | 0 | -0/+0 |
| | | | | | | | | | | | | | | |\ \ \ \ \ \ \ | |||||
| | | | | | | | | | | | | | | | * \ \ \ \ \ \ | merge in honeycomb-mr1-release history after reset to honeycomb-mr1 | The Android Automerger | 2011-03-16 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | |\ \ \ \ \ \ \ | |||||
| | | | | | | | | | | | | | | | | * \ \ \ \ \ \ | merge in honeycomb-mr1-release history after reset to honeycomb-mr1 | The Android Automerger | 2011-03-15 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | |\ \ \ \ \ \ \ | |||||
| | | | | | | | | | | | | | | | | | * \ \ \ \ \ \ | merge in honeycomb-mr1-release history after reset to honeycomb-mr1 | The Android Automerger | 2011-03-14 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ \ | |||||
| | | | | | | | | | | | | | | | | | | * \ \ \ \ \ \ | merge in honeycomb-mr1-release history after reset to honeycomb-mr1 | The Android Automerger | 2011-03-10 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ \ | |||||
| | | | | | | | | | | | | | | | | | | | * \ \ \ \ \ \ | merge in honeycomb-mr1-release history after reset to honeycomb-mr1 | The Android Automerger | 2011-03-08 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ \ | |||||
| | | | | | | | | | | | | | | | | | | | | * \ \ \ \ \ \ | merge in honeycomb-mr1-release history after reset to honeycomb-mr1 | The Android Automerger | 2011-03-07 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ \ | |||||
| | | | | | | | | | | | | | | | | | | | | | * | | | | | | | Do not enforce the rule in MP3Extractor that all audio frames in an mp3 file ↵ | James Dong | 2011-03-04 | 1 | -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-release | The Android Open Source Project | 2011-05-20 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I83818e0c61f0fcb53b154cd0a85f18924745912f | ||||
 |
index : frameworks_av.git | |
| frameworks/av | git repository hosting |
| summaryrefslogtreecommitdiffstats |