summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* Merge "Hide project media by creating the .nomedia file"Gil Dobjanschi2010-10-081-0/+6
|\
| * Hide project media by creating the .nomedia fileGil Dobjanschi2010-10-081-0/+6
* | MTP: Throw a NullPointerException if client is null in MtpCursor constructorMike Lockwood2010-10-081-0/+3
* | Merge "MediaScanner: don't call pruneDeadThumbnailFiles unless the images tab...Mike Lockwood2010-10-071-0/+12
|\ \
| * | MediaScanner: don't call pruneDeadThumbnailFiles unless the images table is e...Mike Lockwood2010-10-071-0/+12
| |/
* | Merge "Remove MediaVideoItem and AudioTrack playback APIs."Gil Dobjanschi2010-10-072-363/+0
|\ \
| * | Remove MediaVideoItem and AudioTrack playback APIs.Gil Dobjanschi2010-10-072-363/+0
| |/
* | Merge "Some instrumentation of OMXCodec for future investigation and a possib...Andreas Huber2010-10-072-0/+26
|\ \
| * | Some instrumentation of OMXCodec for future investigation and a possibly temp...Andreas Huber2010-10-072-0/+26
| |/
* | am 56ee1080: am 17bc4f65: Merge "Make sure to call AudioTrack::stop() instead...Andreas Huber2010-10-073-11/+26
|\ \ | |/ |/|
| * am 17bc4f65: Merge "Make sure to call AudioTrack::stop() instead of AudioTrac...Andreas Huber2010-10-053-11/+26
| |\
| | * Make sure to call AudioTrack::stop() instead of AudioTrack::pause() after sub...Andreas Huber2010-10-053-11/+26
* | | am f358cecb: am 79a3981e: Fix Looper leaks in MediaRecorderStressTest.Jeff Brown2010-10-061-111/+89
|\ \ \ | |/ /
| * | am 79a3981e: Fix Looper leaks in MediaRecorderStressTest.Jeff Brown2010-10-041-111/+89
| |\ \ | | |/
| | * Fix Looper leaks in MediaRecorderStressTest.Jeff Brown2010-10-041-111/+89
* | | am a86a6c4e: am 6f1c7bda: Merge "Fixed an issue where the reserved free space...James Dong2010-10-061-2/+14
|\ \ \ | |/ /
| * | am 6f1c7bda: Merge "Fixed an issue where the reserved free space in the file ...James Dong2010-10-041-2/+14
| |\ \ | | |/
| | * Fixed an issue where the reserved free space in the file writer was larger th...James Dong2010-10-041-2/+14
* | | Added VideoEditor reference to protected AudioTrack constructorGil Dobjanschi2010-10-062-3/+5
* | | Added the video editor to the media items and audio track constructors.Gil Dobjanschi2010-10-065-13/+23
* | | Merge "Adjust start time and duration for overlays and effects."Gil Dobjanschi2010-10-065-88/+111
|\ \ \
| * | | Adjust start time and duration for overlays and effects.Gil Dobjanschi2010-10-055-88/+111
* | | | Merge "Use setVideoSize API in StagefrightRecorder"James Dong2010-10-052-2/+72
|\ \ \ \
| * | | | Use setVideoSize API in StagefrightRecorderJames Dong2010-10-042-2/+72
* | | | | am 6a02ba01: am b99f0c7e: Merge "Resilent media time stamp adjustment" into g...James Dong2010-10-051-24/+181
|\ \ \ \ \ | |_|/ / / |/| | / / | | |/ / | |/| |
| * | | am b99f0c7e: Merge "Resilent media time stamp adjustment" into gingerbreadJames Dong2010-10-041-24/+181
| |\ \ \ | | | |/ | | |/|
| | * | Merge "Resilent media time stamp adjustment" into gingerbreadJames Dong2010-10-041-24/+181
| | |\ \
| | | * | Resilent media time stamp adjustmentJames Dong2010-10-041-24/+181
* | | | | Added mute APIs for MediaVideoItem and AudioTrackGil Dobjanschi2010-10-043-8/+65
* | | | | Save AudioTrack to XMLGil Dobjanschi2010-10-044-10/+117
* | | | | Merge "Added audio track playback API"Gil Dobjanschi2010-10-042-9/+178
|\ \ \ \ \
| * | | | | Added audio track playback APIGil Dobjanschi2010-10-042-9/+178
| | |_|_|/ | |/| | |
* | | | | am dfd03fe9: am aa1a694d: Merge "Make sure to finish the preparation phase ev...Andreas Huber2010-10-041-0/+4
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | am aa1a694d: Merge "Make sure to finish the preparation phase even EOS occurs...Andreas Huber2010-10-041-0/+4
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Make sure to finish the preparation phase even EOS occurs before we consider ...Andreas Huber2010-10-041-0/+4
* | | | | am bb506dab: am 7fa69374: Merge "Don\'t retrieve metadata unless necessary fo...Andreas Huber2010-10-041-5/+11
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | |
| * | | am 7fa69374: Merge "Don\'t retrieve metadata unless necessary for ogg-vorbis ...Andreas Huber2010-10-041-5/+11
| |\ \ \ | | |/ /
| | * | Don't retrieve metadata unless necessary for ogg-vorbis ringtone auto-looping.Andreas Huber2010-10-041-5/+11
| | |/
* | | am 2bf74b8f: am 6c609b6a: Merge "Turn off media time adjustment by default" i...James Dong2010-10-011-1/+1
|\ \ \ | |/ /
| * | am 6c609b6a: Merge "Turn off media time adjustment by default" into gingerbreadJames Dong2010-10-011-1/+1
| |\ \ | | |/
| | * Merge "Turn off media time adjustment by default" into gingerbreadJames Dong2010-10-011-1/+1
| | |\
| | | * Turn off media time adjustment by defaultJames Dong2010-10-011-1/+1
* | | | am 57853559: am e619a9da: Merge "Start playing live streams from the start, n...Andreas Huber2010-10-011-1/+1
|\ \ \ \ | |/ / /
| * | | am e619a9da: Merge "Start playing live streams from the start, no the middle....Andreas Huber2010-10-011-1/+1
| |\ \ \ | | |/ /
| | * | Merge "Start playing live streams from the start, no the middle..." into ging...Andreas Huber2010-10-011-1/+1
| | |\ \
| | | * | Start playing live streams from the start, no the middle...Andreas Huber2010-10-011-1/+1
* | | | | am d6d5cfb9: am 469b8033: Merge "Remove development-only code." into gingerbreadAndreas Huber2010-10-011-15/+0
|\ \ \ \ \ | |/ / / /
| * | | | am 469b8033: Merge "Remove development-only code." into gingerbreadAndreas Huber2010-10-011-15/+0
| |\ \ \ \ | | |/ / /
| | * | | Remove development-only code.Andreas Huber2010-10-011-15/+0
| | |/ /
* | | | am 14401bf7: am d1398db3: Merge "Squashed commit of the following:" into ging...Andreas Huber2010-10-019-357/+597
|\ \ \ \ | |/ / /