summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | Merge "Update onVideoSizeChanged() callback method Java doc to explicitly spe...James Dong2011-12-071-0/+3
|\ \ \
| * | | Update onVideoSizeChanged() callback method Java doc to explicitly specify th...James Dong2011-12-061-0/+3
* | | | Merge "Fix audio effect tests"Eric Laurent2011-12-073-0/+18
|\ \ \ \
| * | | | Fix audio effect testsEric Laurent2011-11-183-0/+18
* | | | | 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 "Allow data uris to be data sources"Narayan Kamath2011-12-074-2/+156
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Allow data uris to be data sourcesNarayan Kamath2011-12-064-2/+156
* | | | | am 2be608f8: am 6db79c35: Merge "Fix for issue 5712743 video editor functiona...Hong Teng2011-12-061-1/+1
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge "Fix for issue 5712743 video editor functional test : testPreviewDuring...Hong Teng2011-12-061-1/+1
| |\ \ \ \
| | * | | | Fix for issue 5712743 video editor functional test : testPreviewDuringExport ...Hong Teng2011-12-061-1/+1
* | | | | | am d49ec62c: am f3364080: Merge "New and improved silent mode on lockscreen."...Amith Yamasani2011-12-061-2/+8
|\ \ \ \ \ \ | |/ / / / / | | | / / / | |_|/ / / |/| | | |
| * | | | Merge "New and improved silent mode on lockscreen." into ics-mr1Amith Yamasani2011-12-061-2/+8
| |\ \ \ \
| | * | | | New and improved silent mode on lockscreen.Amith Yamasani2011-12-061-2/+8
| * | | | | 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
| |/ / / /
* | | | | 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-022-42/+157
| * | | | MTP: Don't attempt to read more than 16K at a time from the MTP driver DO NOT...Mike Lockwood2011-12-021-2/+4
* | | | | am f8dad0b3: am afd01086: Merge "Further volume improvements." into ics-mr1Amith Yamasani2011-12-021-8/+2
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Further volume improvements." into ics-mr1Amith Yamasani2011-12-021-8/+2
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Further volume improvements.Amith Yamasani2011-12-011-8/+2
| | | |/ | | |/|
* | | | am 5126f1d4: am 613ed4c6: Merge "Fixd for 5490443 Native crash while exportin...Hong Teng2011-12-024-6/+51
|\ \ \ \ | |/ / /
| * | | Merge "Fixd for 5490443 Native crash while exporting a video - Add new onErro...Hong Teng2011-12-024-6/+51
| |\ \ \
| | * | | Fixd for 5490443 Native crash while exporting a videoHong Teng2011-12-014-6/+51
* | | | | Remove unused variable and imports in AudioManagerJean-Michel Trivi2011-12-021-6/+0
* | | | | Merge "MTP: Add support for restricting PTP to only certain subdirectories of...Mike Lockwood2011-12-022-42/+157
|\ \ \ \ \
| * | | | | MTP: Add support for restricting PTP to only certain subdirectories of the st...Mike Lockwood2011-12-022-42/+157
* | | | | | Merge "MTP: Don't attempt to read more than 16K at a time from the MTP driver"Mike Lockwood2011-12-021-2/+4
|\ \ \ \ \ \ | |/ / / / /
| * | | | | MTP: Don't attempt to read more than 16K at a time from the MTP driverMike Lockwood2011-12-011-2/+4
* | | | | | am 6cfa9e6c: am 0d3a2e93: Merge "AudioService: strengthen A2DP device detecti...Eric Laurent2011-12-011-159/+239
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / /
| * | | | Merge "AudioService: strengthen A2DP device detection" into ics-mr1Eric Laurent2011-12-011-159/+239
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | AudioService: strengthen A2DP device detectionEric Laurent2011-11-301-159/+239
| | |/ /
* | | | Merge "Add README for media "automated" tests"Glenn Kasten2011-12-011-0/+10
|\ \ \ \
| * | | | Add README for media "automated" testsGlenn Kasten2011-12-011-0/+10
* | | | | 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
generated by cgit v1.1 at 2024-09-13 06:29:11 +0000