summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* Merge "TIF: Fix incorrect uses of INPUT_STATE_XXX"Jae Seo2015-04-211-44/+43
|\
| * TIF: Fix incorrect uses of INPUT_STATE_XXXJae Seo2015-04-211-44/+43
* | MediaSync: update code example for setCallback.Wei Jia2015-04-201-1/+1
|/
* Merge "Revert "Change how Java Bitmaps are accessed in a few places""John Reck2015-04-201-5/+4
|\
| * Revert "Change how Java Bitmaps are accessed in a few places"John Reck2015-04-201-5/+4
* | am 132617de: am 7b55b8f0: am c77c14c2: Merge "Make MediaPlayer fail fast on U...Alex Klyubin2015-04-201-1/+5
|\ \
| * | Make MediaPlayer fail fast on UnknownServiceException.Alex Klyubin2015-04-201-1/+5
* | | TIF: Document the default sort order for the tables in TvContract.Dongwon Kang2015-04-201-1/+11
* | | Merge "MediaPlayer: initial timed id3 support"Robert Shih2015-04-182-0/+125
|\ \ \
| * | | MediaPlayer: initial timed id3 supportRobert Shih2015-04-172-0/+125
* | | | Merge "Consistent null-checking in MediaRouter."P.Y. Laligand2015-04-181-3/+9
|\ \ \ \
| * | | | Consistent null-checking in MediaRouter.P.Y. Laligand2015-04-161-3/+9
* | | | | Revert "A bunch more cleanups"John Reck2015-04-171-2/+1
* | | | | Add non-blocking writes to AudioTrackAndy Hung2015-04-171-11/+89
* | | | | Add non-blocking reads to AudioRecordAndy Hung2015-04-161-17/+114
* | | | | Merge "Adding explicit routing API to AudioTrack"Eric Laurent2015-04-171-0/+35
|\ \ \ \ \
| * | | | | Adding explicit routing API to AudioTrackPaul McLean2015-04-161-0/+35
* | | | | | MediaSync: get original sample rate from audio track.Wei Jia2015-04-161-15/+11
* | | | | | Merge "Unhide the android.media.[Media]DataSource interface."Chris Watkins2015-04-1612-120/+361
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Unhide the android.media.[Media]DataSource interface.Chris Watkins2015-04-1512-120/+361
* | | | | | Merge "MediaSync: pass the error code of setPlaybackRate from native code to ...Wei Jia2015-04-162-6/+18
|\ \ \ \ \ \
| * | | | | | MediaSync: pass the error code of setPlaybackRate from native code to JAVA.Wei Jia2015-04-152-6/+18
* | | | | | | media: add reason to CodecException ctor.Ronghua Wu2015-04-152-4/+21
* | | | | | | Merge "Audio Devices Enumeration/Notification API"Paul McLean2015-04-154-234/+274
|\ \ \ \ \ \ \
| * | | | | | | Audio Devices Enumeration/Notification APIPaul McLean2015-04-154-234/+274
* | | | | | | | Merge "Camera2: Add prepare method for output buffer pre-allocation"Eino-Ville Talvala2015-04-152-0/+20
|\ \ \ \ \ \ \ \
| * | | | | | | | Camera2: Add prepare method for output buffer pre-allocationEino-Ville Talvala2015-04-142-0/+20
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge "A bunch more cleanups"John Reck2015-04-151-1/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | A bunch more cleanupsJohn Reck2015-04-141-1/+2
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge "TIF: Add pixel aspect ratio to TvTrackInfo"Jae Seo2015-04-151-2/+39
|\ \ \ \ \ \ \ \
| * | | | | | | | TIF: Add pixel aspect ratio to TvTrackInfoJae Seo2015-04-141-2/+39
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge "Define AudioMix state constants"Jean-Michel Trivi2015-04-151-0/+36
|\ \ \ \ \ \ \ \
| * | | | | | | | Define AudioMix state constantsJean-Michel Trivi2015-04-141-0/+36
* | | | | | | | | Merge "Default to minimum buffer size for AudioRecord.Builder"Andy Hung2015-04-151-3/+28
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Default to minimum buffer size for AudioRecord.BuilderAndy Hung2015-04-141-3/+28
* | | | | | | | | | Merge "media: Add reason to CodecException."Ronghua Wu2015-04-151-0/+24
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | media: Add reason to CodecException.Ronghua Wu2015-04-141-0/+24
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge "Revert "media: add new MediaCodec Callback onCodecReleased.""Ronghua Wu2015-04-152-40/+0
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Revert "media: add new MediaCodec Callback onCodecReleased."Ronghua Wu2015-04-142-40/+0
* | | | | | | | | | | Merge "MediaRecorderTest: verify capture fps meta key is set"Chong Zhang2015-04-141-3/+31
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | |
| * | | | | | | | | | MediaRecorderTest: verify capture fps meta key is setChong Zhang2015-04-071-3/+31
* | | | | | | | | | | Merge "Zen: Enter alarms only on volume down from vibrate."John Spurlock2015-04-141-0/+19
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | |
| * | | | | | | | | | Zen: Enter alarms only on volume down from vibrate.John Spurlock2015-04-141-0/+19
* | | | | | | | | | | Merge "camera2: add reprocess support"Chien-Yu Chen2015-04-141-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | camera2: add reprocess supportChien-Yu Chen2015-04-131-1/+1
* | | | | | | | | | | Merge "media: add CodecCapabilities.getMaxSupportedInstances."Ronghua Wu2015-04-143-0/+58
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | |
| * | | | | | | | | | media: add CodecCapabilities.getMaxSupportedInstances.Ronghua Wu2015-04-133-0/+58
| | |_|_|_|_|/ / / / | |/| | | | | | | |
* | | | | | | | | | Default to minimum buffer size for AudioTrack.BuilderAndy Hung2015-04-131-20/+39
| |_|/ / / / / / / |/| | | | | | | |
* | | | | | | | | Merge "Increase AudioRecord sample rate limit to 96kHz"Andy Hung2015-04-131-1/+7
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Increase AudioRecord sample rate limit to 96kHzAndy Hung2015-04-131-1/+7
| |/ / / / / / / /