Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Remove streaming related logic from preview player. | James Dong | 2012-01-12 | 6 | -307/+32 |
* | Use audio_format_t consistently | Glenn Kasten | 2012-01-12 | 2 | -2/+2 |
* | Remove unnecessary drm handling logic in PreviewPlayerBase class | James Dong | 2012-01-11 | 2 | -185/+9 |
* | Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE | Steve Block | 2012-01-08 | 13 | -85/+85 |
* | Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGE | Steve Block | 2012-01-05 | 5 | -8/+8 |
* | Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE | Steve Block | 2012-01-04 | 8 | -24/+24 |
* | Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGE | Steve Block | 2012-01-03 | 3 | -11/+11 |
* | Merge "ditherAndClamp from libaudioutils not AudioMixer" | Glenn Kasten | 2011-12-16 | 4 | -3/+8 |
|\ | |||||
| * | ditherAndClamp from libaudioutils not AudioMixer | Glenn Kasten | 2011-12-16 | 4 | -3/+8 |
* | | am 576bb4a6: Reconcile with ics-mr1-release | The Android Open Source Project | 2011-12-09 | 0 | -0/+0 |
|\ \ | |/ |/| | |||||
| * | Reconcile with ics-mr1-release | The Android Open Source Project | 2011-12-08 | 0 | -0/+0 |
| |\ | |||||
* | \ | Reconcile with ics-mr1-release | The Android Open Source Project | 2011-12-05 | 0 | -0/+0 |
|\ \ \ | | |/ | |/| | |||||
| * | | merge in ics-mr1-release history after reset to ics-mr1 | The Android Automerger | 2011-12-02 | 0 | -0/+0 |
| |\ \ | | |/ | |/| | |||||
* | | | am 38ca8aaf: Fix for issue 5490443 Native crash while exporting a video Handl... | Hong Teng | 2011-12-02 | 1 | -0/+5 |
|\ \ \ | |/ / | |||||
| * | | Fix for issue 5490443 Native crash while exporting a video | Hong Teng | 2011-11-30 | 1 | -0/+5 |
* | | | Reconcile with ics-mr1-release | The Android Open Source Project | 2011-11-30 | 0 | -0/+0 |
|\ \ \ | | |/ | |/| | |||||
| * | | merge in ics-mr1-release history after reset to ics-mr1 | The Android Automerger | 2011-11-28 | 0 | -0/+0 |
| |\ \ | | |/ | |/| | |||||
* | | | am 8e611132: Fix for 5638097 KenBurn generation time increased from 19 secs t... | Hong Teng | 2011-11-22 | 1 | -0/+5 |
|\ \ \ | |/ / | |||||
| * | | Fix for 5638097 KenBurn generation time increased from 19 secs to 30 secs | Hong Teng | 2011-11-21 | 1 | -0/+5 |
* | | | Reconcile with ics-mr1-release | The Android Open Source Project | 2011-11-18 | 0 | -0/+0 |
|\ \ \ | | |/ | |/| | |||||
| * | | merge in ics-mr1-release history after reset to ics-mr1 | The Android Automerger | 2011-11-16 | 0 | -0/+0 |
| |\ \ | | |/ | |/| | |||||
* | | | resolved conflicts for merge of fbb122bf to master | Chih-Chung Chang | 2011-11-16 | 2 | -1/+11 |
|\ \ \ | |/ / | |||||
| * | | Merge "Fix 5607624: Native crash in movie studio while previewing the movie" ... | Chih-Chung Chang | 2011-11-15 | 2 | -1/+11 |
| |\ \ | |||||
| | * | | Fix 5607624: Native crash in movie studio while previewing the movie | Chih-Chung Chang | 2011-11-15 | 2 | -1/+11 |
* | | | | am 811c53c5: Fix for issue 5309336 -add videoeditor maximum prefetch... | Hong Teng | 2011-11-15 | 3 | -8/+47 |
|\ \ \ \ | |/ / / | |||||
| * | | | Fix for issue 5309336 | Hong Teng | 2011-11-14 | 3 | -8/+47 |
| |/ / | |||||
* | | | Reconcile with ics-mr1-release | The Android Open Source Project | 2011-10-31 | 0 | -0/+0 |
|\ \ \ | | |/ | |/| | |||||
| * | | merge in ics-release history after reset to master | The Android Automerger | 2011-10-20 | 0 | -0/+0 |
| |\ \ | | |/ | |/| | |||||
| | * | merge in ics-release history after reset to master | The Android Automerger | 2011-10-19 | 0 | -0/+0 |
| | |\ | |||||
| | | * | merge in ics-release history after reset to master | The Android Automerger | 2011-10-16 | 0 | -0/+0 |
| | | |\ | |||||
| | | | * | merge in ics-release history after reset to master | The Android Automerger | 2011-10-06 | 0 | -0/+0 |
| | | | |\ | |||||
| | | | | * | merge in ics-release history after reset to master | The Android Automerger | 2011-10-05 | 0 | -0/+0 |
| | | | | |\ | |||||
| | | | | | * | merge in ics-release history after reset to master | The Android Automerger | 2011-09-27 | 0 | -0/+0 |
| | | | | | |\ | |||||
| | | | | | | * | merge in ics-release history after reset to master | The Android Automerger | 2011-09-25 | 0 | -0/+0 |
| | | | | | | |\ | |||||
| | | | | | | | * | merge in ics-release history after reset to master | The Android Automerger | 2011-09-18 | 0 | -0/+0 |
| | | | | | | | |\ | |||||
| | | | | | | | | * | merge in ics-release history after reset to master | The Android Automerger | 2011-09-14 | 0 | -0/+0 |
| | | | | | | | | |\ | |||||
| | | | | | | | | | * | merge in ics-release history after reset to master | The Android Automerger | 2011-09-06 | 0 | -0/+0 |
| | | | | | | | | | |\ | |||||
| | | | | | | | | | | * | merge in ics-release history after reset to master | The Android Automerger | 2011-09-01 | 0 | -0/+0 |
| | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | * | merge in ics-release history after reset to master | The Android Automerger | 2011-08-30 | 0 | -0/+0 |
| | | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | | * | merge in ics-release history after reset to master | The Android Automerger | 2011-08-30 | 0 | -0/+0 |
| | | | | | | | | | | | | |\ | | | | | | | | | | | | | |/ | | | | | | | | | | | | |/| | |||||
* | | | | | | | | | | | | | | Rename LOGV(_IF) to ALOGV(_IF) DO NOT MERGE | Steve Block | 2011-10-25 | 21 | -688/+688 |
|/ / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | am f23f7257: Merge "Fix for 5477832 Movie Studio crash when trying to import ... | James Dong | 2011-10-20 | 2 | -0/+18 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge "Fix for 5477832 Movie Studio crash when trying to import the attached ... | James Dong | 2011-10-20 | 2 | -0/+18 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | Fix for 5477832 Movie Studio crash when trying to import the attached h263 file. | Rajneesh Chowdury | 2011-10-19 | 2 | -0/+18 |
* | | | | | | | | | | | | | | | am 52da22e1: Fix for 5234840 Corrupted frames in transition | Hong Teng | 2011-10-19 | 1 | -3/+6 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | | | / / / / / / / / / / / / | |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Fix for 5234840 Corrupted frames in transition | Hong Teng | 2011-10-19 | 1 | -3/+6 |
| |/ / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | am 71184927: Fix for 5154138 Titles are not aligned properly in a exported mo... | Hong Teng | 2011-10-18 | 3 | -336/+428 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | / / / / / / / / / / / | |/ / / / / / / / / / / |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | Fix for 5154138 Titles are not aligned properly in a exported movie from Movi... | Hong Teng | 2011-10-18 | 3 | -336/+428 |
| |/ / / / / / / / / / | |||||
* | | | | | | | | | | | Remove RTSP support from libvideoeditor's PreviewPlayer... | Andreas Huber | 2011-10-12 | 3 | -77/+4 |
|/ / / / / / / / / / | |||||
* | | | | | | | | | | Merge "Fix for 5369981 Native crash : testPreviewWithEndAudioTrack functional... | Hong Teng | 2011-10-05 | 2 | -3/+20 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | |