summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* audio effects: rename configure commandEric Laurent2011-12-197-75/+263
* Merge "Fix indentation and whitespace"Glenn Kasten2011-12-141-1/+0
|\
| * Fix indentation and whitespaceGlenn Kasten2011-12-141-1/+0
* | Merge "Audio C++ comments"Glenn Kasten2011-12-141-1/+1
|\ \
| * | Audio C++ commentsGlenn Kasten2011-12-141-1/+1
| |/
* | Merge "Remove unnecessary this->"Glenn Kasten2011-12-141-15/+15
|\ \
| * | Remove unnecessary this->Glenn Kasten2011-12-141-15/+15
| |/
* | Merge "Delete obsolete includes"Glenn Kasten2011-12-141-6/+0
|\ \
| * | Delete obsolete includesGlenn Kasten2011-12-121-6/+0
| |/
* | Merge "Remove redundant clear()"Glenn Kasten2011-12-141-2/+0
|\ \
| * | Remove redundant clear()Glenn Kasten2011-12-141-2/+0
| |/
* | Merge "AudioTrack::setVolume check range"Glenn Kasten2011-12-141-1/+1
|\ \
| * | AudioTrack::setVolume check rangeGlenn Kasten2011-12-141-1/+1
| |/
* | am 3f6a7d1e: am d70c64db: Revert the following patches because they may lead ...James Dong2011-12-146-81/+25
|\ \
| * | Revert the following patches because they may lead to power regression becaus...James Dong2011-12-146-81/+25
| * | DO NOT MERGE: Support for parsing of "folded" RTSP header valuesAndreas Huber2011-12-132-9/+31
* | | am dc44e06e: am ef664f62: Merge "Fix drm flag setting missed in false drm rec...Jeff Tinker2011-12-121-0/+1
|\ \ \ | |/ /
| * | Fix drm flag setting missed in false drm recognition fix.Jeff Tinker2011-12-091-0/+1
* | | am 406dd5d1: am aadbd80b: Fixed the false drm recognition.James Dong2011-12-122-10/+17
|\ \ \ | |/ /
| * | Fixed the false drm recognition.James Dong2011-12-082-10/+17
* | | Merge "Support for parsing of "folded" RTSP header values and some tweaks to ...Andreas Huber2011-12-122-9/+31
|\ \ \
| * | | Support for parsing of "folded" RTSP header values and some tweaks to the AMR...Andreas Huber2011-12-092-9/+31
| | |/ | |/|
* | | Fix the build. (Change LOGV to ALOGV)Owen Lin2011-12-121-1/+1
* | | am ebfce84f: am 68f592a8: Merge "Don\'t perform RTSP seeks right away but que...Andreas Huber2011-12-092-4/+31
|\ \ \ | | |/ | |/|
| * | Merge "Don't perform RTSP seeks right away but queue them for 200ms" into ics...Andreas Huber2011-12-082-4/+31
| |\ \
| | * | Don't perform RTSP seeks right away but queue them for 200msAndreas Huber2011-12-082-4/+31
* | | | am aa82c39b: am 0ba9380a: Merge "Fix Bitreader "putBits" implementation, make...Andreas Huber2011-12-094-13/+37
|\ \ \ \ | |/ / /
| * | | Fix Bitreader "putBits" implementation, make sure we emulate timestampsAndreas Huber2011-12-084-13/+37
| |/ /
* | | am a5038d16: am a693a4b5: Merge "Fix ANRs due to Widevine DRM plugin sniff ta...Jeff Tinker2011-12-095-15/+63
|\ \ \ | |/ / | | / | |/ |/|
| * Merge "Fix ANRs due to Widevine DRM plugin sniff taking too long." into ics-mr1Jeff Tinker2011-12-085-15/+63
| |\
| | * Fix ANRs due to Widevine DRM plugin sniff taking too long.Jeff Tinker2011-12-075-15/+63
* | | am 6727a43f: am 54a53841: Merge "Fetch at least 192KB to avoid our mp3 sniffe...Dave Burke2011-12-071-2/+2
|\ \ \ | |/ /
| * | Fetch at least 192KB to avoid our mp3 sniffer from blocking on data.Andreas Huber2011-12-071-2/+2
| * | Merge "DO NOT MERGE - Consider I-Frame at zeroeth position when searching for...James Dong2011-12-061-0/+8
| |\ \
| | * | DO NOT MERGE - Consider I-Frame at zeroeth position when searching for sync f...James Dong2011-12-051-0/+8
| * | | DO NOT MERGE: Remove the AVI extractor.Andreas Huber2011-12-063-6/+0
| |/ /
* | | Allow data uris to be data sourcesNarayan Kamath2011-12-064-2/+156
* | | resolved conflicts for merge of 07bacabe to masterAndreas Huber2011-12-052-26/+134
|\ \ \ | |/ /
| * | Properly identify how much metadata we need to cache in order to instantiateAndreas Huber2011-12-053-41/+136
| * | MTP: Add support for restricting PTP to only certain subdirectories of the st...Mike Lockwood2011-12-021-4/+7
| * | MTP: Don't attempt to read more than 16K at a time from the MTP driver DO NOT...Mike Lockwood2011-12-021-2/+4
| |/
* | MTP: Add support for restricting PTP to only certain subdirectories of the st...Mike Lockwood2011-12-021-4/+7
* | MTP: Don't attempt to read more than 16K at a time from the MTP driverMike Lockwood2011-12-011-2/+4
* | am 10526a0b: am 2c2ed7be: Merge "Fixes a typo in AVIExtractor that would adve...Andreas Huber2011-12-011-1/+1
|\ \ | |/
| * Fixes a typo in AVIExtractor that would advertise the wrong video dimensionsAndreas Huber2011-12-011-1/+1
* | am c040e1e7: am 6f1dd757: Merge "SurfaceMediaSource: use the vid enc usage bi...Jamie Gennis2011-11-301-1/+1
|\ \ | |/
| * Merge "SurfaceMediaSource: use the vid enc usage bit" into ics-mr1Jamie Gennis2011-11-291-1/+1
| |\
| | * SurfaceMediaSource: use the vid enc usage bitJamie Gennis2011-11-211-1/+1
* | | resolved conflicts for merge of 3d630e86 to masterAndreas Huber2011-11-302-2/+20
|\ \ \ | |/ /
| * | Merge "Make sure we can properly shutdown even if" into ics-mr1Andreas Huber2011-11-292-2/+20
| |\ \