summaryrefslogtreecommitdiffstats
path: root/media/libstagefright
Commit message (Expand)AuthorAgeFilesLines
* Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGESteve Block2012-01-034-12/+12
* Merge "Fix for 5754998 testPerformanceTransitionWithEffectOverlapping test fa...Hong Teng2011-12-161-0/+7
|\
| * Fix for 5754998 testPerformanceTransitionWithEffectOverlapping test failed.Hong Teng2011-12-161-0/+7
* | am 0cc1e42d: am ac279de9: Merge "SurfaceMediaSource: use the HW_TEXTURE usage...Dave Burke2011-12-151-1/+3
|\ \ | |/ |/|
| * SurfaceMediaSource: use the HW_TEXTURE usage bitJamie Gennis2011-12-151-1/+3
* | 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
* | | am aa82c39b: am 0ba9380a: Merge "Fix Bitreader "putBits" implementation, make...Andreas Huber2011-12-092-6/+16
|\ \ \ | | |/ | |/|
| * | Fix Bitreader "putBits" implementation, make sure we emulate timestampsAndreas Huber2011-12-082-6/+16
* | | 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
| |/
* | 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
* | | Fix the broken buildJames Dong2011-11-291-3/+3
* | | am 52607c53: am d12dc284: Merge "If an error occurs that prevents us from rea...Andreas Huber2011-11-291-0/+32
|\ \ \ | |/ /
| * | Merge "If an error occurs that prevents us from reallocating buffers during a...Andreas Huber2011-11-291-0/+32
| |\ \
| | * | If an error occurs that prevents us from reallocating buffers during a format...Andreas Huber2011-11-281-0/+32
* | | | resolved conflicts for merge of 998a929a to masterAndreas Huber2011-11-295-40/+92
|\ \ \ \ | |/ / /
| * | | Finer granularity discontinuity support.Andreas Huber2011-11-285-40/+92
| |/ /
* | | split ComposerService out of SurfaceComposerClient.hMathias Agopian2011-11-281-0/+2
* | | Merge "Fix a subtitle bug: multiple blank lines in SubRip(srt) file."James Dong2011-11-221-6/+11
|\ \ \
| * | | Fix a subtitle bug: multiple blank lines in SubRip(srt) file.Insun Kang2011-11-221-6/+11
* | | | am 31626b30: am cb6fbc89: Merge "Report a runtime error instead of asserting ...Andreas Huber2011-11-221-57/+87
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Merge "Report a runtime error instead of asserting on malformed avc configura...Andreas Huber2011-11-221-57/+87
| |\ \
| | * | Report a runtime error instead of asserting on malformed avc configuration data.Andreas Huber2011-11-181-57/+87
* | | | am d0a25456: am 02740dc4: Merge "Fix log spamming during time lapse video rec...James Dong2011-11-212-10/+15
|\ \ \ \ | |/ / /
| * | | Fix log spamming during time lapse video recordingJames Dong2011-11-212-10/+15
| | |/ | |/|
| * | am d4b22ab4: status_t != boolMarco Nelissen2011-11-181-2/+2
| |\ \ | | |/ | |/|
| | * status_t != boolMarco Nelissen2011-11-181-2/+2
* | | status_t != boolMarco Nelissen2011-11-181-2/+2
* | | am 624efe45: am c1b1709b: Merge "Make sure not to cancel pending seek/EOS not...Andreas Huber2011-11-172-8/+9
|\ \ \ | |/ /
generated by cgit v1.1 at 2024-05-18 00:47:51 +0000