summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* Support mpeg1,2 audio and mpeg1,2,4 video content extraction from .ts streams.Andreas Huber2011-05-2517-280/+892
* Merge "Convert line breaks to Unix style"James Dong2011-05-25175-29631/+29631
|\
| * Convert line breaks to Unix styleMans Rullgard2011-05-21175-29631/+29631
* | Merge "Merge chromium to 10.0.634.0: Compile fix"Kristian Monsen2011-05-251-1/+1
|\ \
| * | Merge chromium to 10.0.634.0: Compile fixKristian Monsen2011-05-251-1/+1
| |/
* | Merge "Make sure all references to the decoder plugin are accounted for"Andreas Huber2011-05-244-2/+10
|\ \
| * | Make sure all references to the decoder plugin are accounted forAndreas Huber2011-05-244-2/+10
* | | Merge "Make sure the software mpeg4 decoder supports multiple input frames pe...Andreas Huber2011-05-242-8/+21
|\ \ \ | |/ /
| * | Make sure the software mpeg4 decoder supports multiple input frames per input...Andreas Huber2011-05-242-8/+21
* | | am c41a17de: am 6e5cdca1: am ef89cc14: Merge "Multi-repository checkin, goes ...Jeffrey Tinker2011-05-242-19/+19
|\ \ \ | |/ / |/| |
| * | am ef89cc14: Merge "Multi-repository checkin, goes with https://android-git.c...Jeffrey Tinker2011-05-232-19/+19
| |\ \
| | * \ Merge "Multi-repository checkin, goes with https://android-git.corp.google.co...Jeffrey Tinker2011-05-232-19/+19
| | |\ \
| | | * | Multi-repository checkin, goes with https://android-git.corp.google.com/g/111038Jeffrey Tinker2011-05-232-19/+19
* | | | | resolved conflicts for merge of d5762583 to masterJames Dong2011-05-242-1/+7
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | |
| * | | am a5293d1c: Add some logging to track down where ANR happens during MediaPla...James Dong2011-05-232-1/+7
| |\ \ \ | | |/ /
| | * | Add some logging to track down where ANR happens during MediaPlayer._release().James Dong2011-05-232-1/+7
* | | | am 4d8ceada: am dbfd055d: am a6f1104b: Use pread() to get the decrypted data ...Gloria Wang2011-05-201-0/+7
|\ \ \ \ | |/ / /
| * | | am a6f1104b: Use pread() to get the decrypted data for container based DRM fi...Gloria Wang2011-05-201-0/+7
| |\ \ \ | | |/ /
| | * | Use pread() to get the decrypted data for container based DRM file.Gloria Wang2011-05-201-0/+7
| | |/
* | | Merge "Merge Chromium at 10.0.621.0: Fixes for libstagefreight"Kristian Monsen2011-05-202-21/+23
|\ \ \
| * | | Merge Chromium at 10.0.621.0: Fixes for libstagefreightKristian Monsen2011-05-132-21/+23
* | | | resolved conflicts for merge of a8939e0d to masterJames Dong2011-05-194-30/+162
|\ \ \ \ | | |/ / | |/| |
| * | | am d148a499: Merge "Using widevine:// to stream adaptive bitrate wvm content ...James Dong2011-05-184-29/+155
| |\ \ \ | | | |/ | | |/|
| | * | Merge "Using widevine:// to stream adaptive bitrate wvm content no longer" in...James Dong2011-05-184-29/+155
| | |\ \
| | | * | Using widevine:// to stream adaptive bitrate wvm content no longerAndreas Huber2011-05-104-29/+155
| * | | | am 07e9267d: Merge "DO NOT MERGE For bug 4422428 Squashed commit of the follo...Gloria Wang2011-05-182-8/+4
| |\ \ \ \ | | |/ / /
| | * | | Merge "DO NOT MERGE For bug 4422428 Squashed commit of the following:" into h...Gloria Wang2011-05-182-8/+4
| | |\ \ \
| | | * | | DO NOT MERGEGloria Wang2011-05-132-8/+4
| | | |/ /
| * | | | am c56e81c8: Merge "DO NOT MERGE: Properly construct the ESDS metadata even i...Andreas Huber2011-05-171-1/+7
| |\ \ \ \ | | |/ / /
| | * | | Merge "DO NOT MERGE: Properly construct the ESDS metadata even if sizeof(code...Andreas Huber2011-05-171-1/+7
| | |\ \ \
| | | * | | DO NOT MERGE: Properly construct the ESDS metadata even if sizeof(codec-speci...Andreas Huber2011-05-041-1/+7
| | | |/ /
* | | | | Properly forward rotation information from input format to output format.Andreas Huber2011-05-181-2/+10
* | | | | Revert "Add const to the finders method in MetaData.cpp"James Dong2011-05-172-7/+7
* | | | | Make track informational event optional, depending on system propertyJames Dong2011-05-171-0/+31
* | | | | Claim support for .3gpp2 A/B files.Andreas Huber2011-05-171-0/+3
* | | | | Disable yuv->yuv mode and external display support until various driver fixes...Andreas Huber2011-05-162-1/+11
* | | | | Merge "Instead of using an RGB surface and conversion yuv420->rgb565"Andreas Huber2011-05-161-7/+58
|\ \ \ \ \
| * | | | | Instead of using an RGB surface and conversion yuv420->rgb565Andreas Huber2011-05-051-7/+58
* | | | | | resolved conflicts for merge of b107f4de to masterMike Lockwood2011-05-162-4/+8
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | am 15afd076: Merge "MTP: Have GetStorageInfo command return correct storage t...Mike Lockwood2011-05-162-4/+8
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | MTP: Have GetStorageInfo command return correct storage type for removable st...Mike Lockwood2011-05-162-4/+8
| | | |/ / | | |/| |
| | * | | DO NOT MERGE MediaScanner: Fix bug in "no media" handling logicMike Lockwood2011-05-031-3/+4
| | * | | DO NOT MERGE MTP: Implement GetThumb commandMike Lockwood2011-05-035-1/+34
| | * | | DO NOT MERGE MTP: Fix file descriptor leak in file editing extensionsMike Lockwood2011-05-032-24/+29
| | * | | DO NOT MERGE MTP: Add extended operations to support in-place editing of filesMike Lockwood2011-05-035-8/+268
| | * | | DO NOT MERGE MediaScanner: reimplement the ".nomedia" feature for hiding file...Mike Lockwood2011-05-031-13/+11
| | * | | DO NOT MERGE MTP and media provider support for multiple storage devices:Mike Lockwood2011-05-034-8/+9
| * | | | DO NOT MERGE MediaScanner: Fix bug in "no media" handling logicMike Lockwood2011-05-041-3/+4
| * | | | DO NOT MERGE MTP: Implement GetThumb commandMike Lockwood2011-05-045-1/+34
| * | | | DO NOT MERGE MTP: Fix file descriptor leak in file editing extensionsMike Lockwood2011-05-042-24/+29