summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | Merge "Move OMX_QCOM_COLOR_FormatYVU420SemiPlanar definition to OMX_IVCommon.h"James Dong2011-06-033-8/+0
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Move OMX_QCOM_COLOR_FormatYVU420SemiPlanar definition to OMX_IVCommon.hJames Dong2011-06-033-8/+0
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge "Initial-checkin for ON2 Software AVC/H264 decoder"James Dong2011-06-03403-0/+112275
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Initial-checkin for ON2 Software AVC/H264 decoderJames Dong2011-06-02403-0/+112275
| |/ / / / / / / /
* | | | | | | | | Merge "Don't advertise the (old-style) software decoders unless they're actua...Andreas Huber2011-06-021-0/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Don't advertise the (old-style) software decoders unless they're actually pre...Andreas Huber2011-06-021-0/+2
* | | | | | | | | Merge "Do not call getEstimatedBandwidth if the streaming is not HTTP-based"James Dong2011-06-025-9/+21
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Do not call getEstimatedBandwidth if the streaming is not HTTP-basedJames Dong2011-06-025-9/+21
* | | | | | | | | Remove unnecessary level of priority indirectionGlenn Kasten2011-06-012-4/+4
|/ / / / / / / /
* | | | | | | | Revert "Use AudioTrack::event_type not int in callback"Glenn Kasten2011-06-014-5/+5
* | | | | | | | Use AudioTrack::event_type not int in callbackGlenn Kasten2011-06-014-5/+5
* | | | | | | | Merge "Use channel mask instead of channel count for track creation"Jean-Michel Trivi2011-06-014-41/+42
|\ \ \ \ \ \ \ \
| * | | | | | | | Use channel mask instead of channel count for track creationJean-Michel Trivi2011-06-014-41/+42
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Send estimated bandwidth value as informational event when cache fetcher pausesJames Dong2011-05-3110-99/+156
|/ / / / / / /
* | | | | | | Removed interface to load audio effects librariesEric Laurent2011-05-273-74/+0
* | | | | | | New effect library APIEric Laurent2011-05-2711-379/+812
* | | | | | | Merge "Extract embedded cover art (aka poster frame) in mp4 files"James Dong2011-05-262-1/+37
|\ \ \ \ \ \ \
| * | | | | | | Extract embedded cover art (aka poster frame) in mp4 filesJames Dong2011-05-262-1/+37
* | | | | | | | am c004a0c9: am 05e13b9e: am c1ded373: Merge "Revert "Use pread() to get the ...James Dong2011-05-261-7/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| / / / / / / | |/ / / / / /
| * | | | | | am c1ded373: Merge "Revert "Use pread() to get the decrypted data for contain...James Dong2011-05-251-7/+0
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | Revert "Use pread() to get the decrypted data for container based DRM file."James Dong2011-05-251-7/+0
* | | | | | | Merge "Support mpeg1,2 audio and mpeg1,2,4 video content extraction from .ts ...Andreas Huber2011-05-2617-280/+892
|\ \ \ \ \ \ \
| * | | | | | | Support mpeg1,2 audio and mpeg1,2,4 video content extraction from .ts streams.Andreas Huber2011-05-2517-280/+892
* | | | | | | | Merge "For out of band timed text support (timed text in a separate file)."Gloria Wang2011-05-259-41/+526
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | For out of band timed text support (timed text in a separate file).Gloria Wang2011-05-259-41/+526
* | | | | | | | 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
| |\ \ \ \ \ \ \ | | |/ / / / / /