summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* frameworks/base: switch audio to hdmi when cable is plugged inPraveen Bharathi2010-11-031-1/+3
* Merge "Add STATE_AUDIO_CONNECTING state."Jaikumar Ganesh2010-11-031-0/+4
|\
| * Add STATE_AUDIO_CONNECTING state.Jaikumar Ganesh2010-11-031-0/+4
* | Merge "Experimentally reenable mpeg4 and h.263 hardware decoders."Andreas Huber2010-11-031-2/+2
|\ \
| * | Experimentally reenable mpeg4 and h.263 hardware decoders.Andreas Huber2010-11-031-2/+2
* | | am cf393faa: Merge "resolved conflicts for merge of c1c45a4d to gingerbread-p...Gloria Wang2010-11-031-23/+6
|\ \ \ | |/ / |/| |
| * | resolved conflicts for merge of c1c45a4d to gingerbread-plus-aospGloria Wang2010-11-022-24/+14
| |\ \
| | * | - Move the business rule management down to DRM agents.Gloria Wang2010-11-012-24/+14
* | | | Merge "Use SoftReference for WaveformData"Gil Dobjanschi2010-11-022-8/+38
|\ \ \ \
| * | | | Use SoftReference for WaveformDataGil Dobjanschi2010-11-022-8/+38
* | | | | Use SystemProperties.get() instead of System.getProperty()Gloria Wang2010-11-021-1/+1
| |_|_|/ |/| | |
* | | | In java, System.getProperty returns null when the property doesn't exist,Marco Nelissen2010-11-021-3/+7
* | | | Added support for dock headset observerPraveen Bharathi2010-11-012-0/+39
* | | | Stop using OMX_COLOR_FormatAndroidPrivateStart.Jamie Gennis2010-11-011-6/+1
* | | | Merge "Notify surfaceflinger about (changes to) the crop rectangle output by ...Andreas Huber2010-11-011-0/+11
|\ \ \ \
| * | | | Notify surfaceflinger about (changes to) the crop rectangle output by the dec...Andreas Huber2010-11-011-0/+11
* | | | | MTP: Changes to support /mnt/sdcard paths from MediaProvider.Mike Lockwood2010-11-011-4/+16
* | | | | Media scanner support for FL(Forward Lock) DRM file typesGloria Wang2010-11-013-1/+41
|/ / / /
* | | | After seeking display the first new video frame right away without concern fo...Andreas Huber2010-11-011-0/+6
|/ / /
* | | Merge "Added some debugging log messages at stop()"James Dong2010-10-291-1/+5
|\ \ \
| * | | Added some debugging log messages at stop()James Dong2010-10-291-1/+5
* | | | Merge "- register DRM sniffer only when drmserver is up - notify DRM agents t...Gloria Wang2010-10-292-8/+15
|\ \ \ \ | |/ / / |/| | |
| * | | - register DRM sniffer only when drmserver is upGloria Wang2010-10-292-8/+15
* | | | Squashed commit of the following:Andreas Huber2010-10-298-131/+0
|/ / /
* | | Merge "Added profile and level translation in SW video encoders"James Dong2010-10-292-5/+188
|\ \ \
| * | | Added profile and level translation in SW video encodersJames Dong2010-10-272-5/+188
* | | | Merge "Upgrade to the latest version of libwebm to fix YouTube webm playback."Andreas Huber2010-10-293-3533/+5067
|\ \ \ \
| * | | | Upgrade to the latest version of libwebm to fix YouTube webm playback.Andreas Huber2010-10-283-3533/+5067
| |/ / /
* | | | Merge "Bug fix: Use getDuration vs. getTimelineDuration in Effect and Overlay...Gil Dobjanschi2010-10-285-23/+36
|\ \ \ \ | |/ / / |/| | |
| * | | Bug fix: Use getDuration vs. getTimelineDuration in Effect and Overlay limits...Gil Dobjanschi2010-10-285-23/+36
* | | | Better support for MP4A-LATM RTP disassembly. This used to fail if mNumSubFra...Andreas Huber2010-10-274-20/+382
|/ / /
* | | Merge "Waveform member variables must be private"Gil Dobjanschi2010-10-271-3/+3
|\ \ \
| * | | Waveform member variables must be privateGil Dobjanschi2010-10-271-3/+3
* | | | am 751cc424: am 8b023a2e: Merge "Add the mediaplayer release in the test vali...Yu Shan Emily Lau2010-10-271-0/+1
|\ \ \ \ | | |/ / | |/| |
| * | | am 8b023a2e: Merge "Add the mediaplayer release in the test validation. This ...Yu Shan Emily Lau2010-10-271-0/+1
| |\ \ \
| | * \ \ Merge "Add the mediaplayer release in the test validation. This is to ensure ...Yu Shan Emily Lau2010-10-271-0/+1
| | |\ \ \
| | | * | | Add the mediaplayer release in the test validation. This is to ensure the med...Yu Shan Emily Lau2010-10-261-0/+1
* | | | | | am cd08ada7: am 67c7a4ae: Merge "Fix off-by-two and other bugs in the visuali...Marco Nelissen2010-10-271-9/+12
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 67c7a4ae: Merge "Fix off-by-two and other bugs in the visualization code. ...Marco Nelissen2010-10-271-9/+12
| |\ \ \ \ \ | | |/ / / /
| | * | | | Fix off-by-two and other bugs in the visualization code.Marco Nelissen2010-10-271-9/+12
* | | | | | Merge "Remove annoying warning during mpeg4 extraction."Andreas Huber2010-10-271-1/+1
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Remove annoying warning during mpeg4 extraction.Andreas Huber2010-10-271-1/+1
* | | | | | Merge "Added waveform data support"Gil Dobjanschi2010-10-273-2/+111
|\ \ \ \ \ \
| * | | | | | Added waveform data supportGil Dobjanschi2010-10-273-2/+111
| |/ / / / /
* | | | | | Merge "FileSource may fail to open a file in which case subsequent code deref...Andreas Huber2010-10-271-1/+1
|\ \ \ \ \ \
| * | | | | | FileSource may fail to open a file in which case subsequent code dereferences...Andreas Huber2010-10-271-1/+1
| |/ / / / /
* | | | | | Fix for simulator build breakKristian Monsen2010-10-271-1/+1
|/ / / / /
* | | | | Merge "Removed the start and end transition types."Gil Dobjanschi2010-10-266-247/+15
|\ \ \ \ \
| * | | | | Removed the start and end transition types.Gil Dobjanschi2010-10-266-247/+15
* | | | | | Merge "add method in MediaFile to determine if a file is a mediatype of not"Vasu Nori2010-10-261-0/+6
|\ \ \ \ \ \