summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* am fd45c1e6: am 41debbc6: Merge "Provide progress status report during author...James Dong2010-06-254-28/+155
|\
| * am 41debbc6: Merge "Provide progress status report during authoring" into gin...James Dong2010-06-254-28/+155
| |\
| | * Provide progress status report during authoringJames Dong2010-06-254-28/+155
* | | am cdf1357b: am 8e103da1: Merge "Various fixes and improvements in audio effe...Eric Laurent2010-06-2513-84/+196
|\ \ \ | |/ /
| * | am 8e103da1: Merge "Various fixes and improvements in audio effects implement...Eric Laurent2010-06-2513-84/+196
| |\ \ | | |/
| | * Merge "Various fixes and improvements in audio effects implementation" into g...Eric Laurent2010-06-2513-84/+196
| | |\
| | | * Various fixes and improvements in audio effects implementationEric Laurent2010-06-2513-84/+196
* | | | am f29fbc58: merge from froyo-plus-aospThe Android Open Source Project2010-06-251-1/+5
|\ \ \ \ | |/ / /
| * | | merge from froyo-plus-aospThe Android Open Source Project2010-06-251-1/+5
| |\ \ \ | | |/ / | |/| |
| | * | merge from open-source masterThe Android Open Source Project2010-06-181-1/+5
| | |\ \
| | | * | Change in media scanner to set correct dateMikael2 Svensson2010-06-061-1/+5
| | * | | am 39e876ad: Merge "When filling the cache, we always time out waiting for a ...James Dong2010-06-171-1/+3
| | |\ \ \
| | | * \ \ Merge "When filling the cache, we always time out waiting for a condition tha...James Dong2010-06-161-1/+3
| | | |\ \ \
| | | | * | | When filling the cache, we always time out waiting for a condition that won't...James Dong2010-06-161-1/+3
| | * | | | | am 3242cc27: Merge "TimedEventQueue is apparently important for glitch-free m...Dave Sparks2010-06-171-0/+3
| | |\ \ \ \ \ | | | |/ / / /
* | | | | | | am 75fb44b2: am 357f8209: Merge "Finetune some of the prefetcher parameters t...Andreas Huber2010-06-251-2/+2
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Finetune some of the prefetcher parameters to a) buffer as much as fro...Andreas Huber2010-06-251-2/+2
| |\ \ \ \ \ \
| | * | | | | | Finetune some of the prefetcher parameters to a) buffer as much as froyo did ...Andreas Huber2010-06-251-2/+2
* | | | | | | | am bc704ddd: am 6feaa464: Enable passing parameters to the MediaWriter at run...James Dong2010-06-254-11/+95
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Enable passing parameters to the MediaWriter at runtime (at start() call).James Dong2010-06-254-11/+95
* | | | | | | | am d115304c: am 5a905ceb: Merge "Track maximum amplitude and fix getMaxAmplit...James Dong2010-06-253-1/+38
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "Track maximum amplitude and fix getMaxAmplitude()" into gingerbreadJames Dong2010-06-253-1/+38
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Track maximum amplitude and fix getMaxAmplitude()James Dong2010-06-243-1/+38
* | | | | | | | am 95d26de9: am 7b5b27ad: Merge "Properly identify malformed (too short) chun...Andreas Huber2010-06-241-0/+8
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "Properly identify malformed (too short) chunks in mpeg4 files." into g...Andreas Huber2010-06-241-0/+8
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Properly identify malformed (too short) chunks in mpeg4 files.Andreas Huber2010-06-241-0/+8
* | | | | | | | am 40d9f010: am 7fd22aab: Merge "Fixed the software AAC encoder" into gingerb...James Dong2010-06-243-31/+64
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "Fixed the software AAC encoder" into gingerbreadJames Dong2010-06-243-31/+64
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Fixed the software AAC encoderJames Dong2010-06-233-31/+64
| | | |_|_|_|/ | | |/| | | |
* | | | | | | am 0d964c94: am a2549bb6: Merge "Remove most stagefright property overrides, ...Andreas Huber2010-06-2415-947/+47
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Remove most stagefright property overrides, remove VorbisPlayer and Vo...Andreas Huber2010-06-2415-947/+47
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Remove most stagefright property overrides, remove VorbisPlayer and VorbisMet...Andreas Huber2010-06-2315-947/+47
* | | | | | | am 90ade3f2: am 9afc1b3e: Merge "Fixed some meta data issues in the recorded ...James Dong2010-06-231-31/+68
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Fixed some meta data issues in the recorded mp4 file" into gingerbreadJames Dong2010-06-231-31/+68
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Fixed some meta data issues in the recorded mp4 fileJames Dong2010-06-231-31/+68
* | | | | | | am 03e90f7e: am 58e9402b: Merge "Properly assign LOG_TAGs in OMXMaster.cpp an...Andreas Huber2010-06-232-0/+8
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Properly assign LOG_TAGs in OMXMaster.cpp and MediaScanner.cpp" into g...Andreas Huber2010-06-232-0/+8
| |\ \ \ \ \ \
| | * | | | | | Properly assign LOG_TAGs in OMXMaster.cpp and MediaScanner.cppAndreas Huber2010-06-232-0/+8
| | |/ / / / /
* | | | | | | am 800af390: am b64af9a2: Fix a number of timestamp mismatches in the mp3 ext...Andreas Huber2010-06-233-30/+39
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Fix a number of timestamp mismatches in the mp3 extractor and decoder that wo...Andreas Huber2010-06-233-30/+39
| |/ / / / /
* | | | | | am 845f5414: am 2c2ce8e5: Merge "Added support for audio sessions in MediaPla...Eric Laurent2010-06-238-32/+215
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Added support for audio sessions in MediaPlayer and AudioTrack." into ...Eric Laurent2010-06-228-32/+215
| |\ \ \ \ \
| | * | | | | Added support for audio sessions in MediaPlayer and AudioTrack.Eric Laurent2010-06-228-32/+215
* | | | | | | am da9269af: am 3238302b: Merge "media: add AudioRecord::getMinFrameCount()."...Chia-chi Yeh2010-06-231-25/+38
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "media: add AudioRecord::getMinFrameCount()." into gingerbreadChia-chi Yeh2010-06-221-25/+38
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | media: add AudioRecord::getMinFrameCount().Chia-chi Yeh2010-06-231-25/+38
* | | | | | | am 7d329785: am d1559d6b: Merge "Fix issue 2301630: Mismatch of state occurs...Eric Laurent2010-06-231-0/+9
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Fix issue 2301630: Mismatch of state occurs when media server is kill...Eric Laurent2010-06-221-0/+9
| |\ \ \ \ \ \
| | * | | | | | Fix issue 2301630: Mismatch of state occurs when media server is killed whil...Eric Laurent2010-06-221-0/+9
* | | | | | | | am 9666d3c0: am 750600a1: Merge "Single track optimization" into gingerbreadJames Dong2010-06-231-1/+19
|\ \ \ \ \ \ \ \ | |/ / / / / / /