summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* Merge "MediaFormat.java: Add KEY_MAX_WIDTH and KEY_MAX_HEIGHT" into klp-devLajos Molnar2013-09-121-0/+24
|\
| * MediaFormat.java: Add KEY_MAX_WIDTH and KEY_MAX_HEIGHTLajos Molnar2013-09-061-0/+24
* | Merge "Add HOTWORD as an AudioSource" into klp-devEric Laurent2013-09-123-11/+15
|\ \
| * | Add HOTWORD as an AudioSourceEric Laurent2013-09-103-11/+15
* | | Merge changes Ia6300c23,Idd2ae8ad into klp-devEino-Ville Talvala2013-09-123-119/+49
|\ \ \
| * | | Camera2: Immutable metadataEino-Ville Talvala2013-09-113-119/+49
* | | | Merge "Remove dependency on JNIHelp header side effects." into klp-devRuben Brunk2013-09-1211-0/+23
|\ \ \ \
| * | | | Remove dependency on JNIHelp header side effects.Ruben Brunk2013-09-1011-0/+23
* | | | | Merge "Pass subtitle track properties to SubtitleController" into klp-devChong Zhang2013-09-112-4/+44
|\ \ \ \ \
| * | | | | Pass subtitle track properties to SubtitleControllerChong Zhang2013-09-112-4/+44
* | | | | | Merge "ImageReader: Skip size check for BLOB format" into klp-devZhijun He2013-09-111-7/+14
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | ImageReader: Skip size check for BLOB formatZhijun He2013-09-111-7/+14
* | | | | | Fix issue #10688644: Java crash in com.android.phone:Dianne Hackborn2013-09-111-13/+13
| |_|/ / / |/| | | |
* | | | | Merge "MediaMuxer: Add setLocation API" into klp-devZhijun He2013-09-102-0/+51
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | |
| * | | MediaMuxer: Add setLocation APIZhijun He2013-09-102-0/+51
* | | | Merge "AudioTrack.getTimestamp() return type is now boolean" into klp-devGlenn Kasten2013-09-101-15/+12
|\ \ \ \ | |/ / / |/| | |
| * | | AudioTrack.getTimestamp() return type is now booleanGlenn Kasten2013-09-091-15/+12
| |/ /
* | | Merge "Add WebVTT caption renderer" into klp-devAlan Viverette2013-09-093-66/+847
|\ \ \ | |/ / |/| |
| * | Add WebVTT caption rendererAlan Viverette2013-09-063-66/+847
* | | Unhide AudioTimestamp and getTimestampGlenn Kasten2013-09-062-7/+1
* | | MediaPlayer.MTP: fix issue when main thread had no looperLajos Molnar2013-09-061-9/+42
| |/ |/|
* | Merge "Java API for AudioTrack timestamps" into klp-devGlenn Kasten2013-09-042-0/+97
|\ \ | |/ |/|
| * Java API for AudioTrack timestampsGlenn Kasten2013-09-042-0/+97
* | Merge "Add subtitle support to VideoView." into klp-devLajos Molnar2013-09-041-2/+206
|\ \
| * | Add subtitle support to VideoView.Lajos Molnar2013-09-031-2/+206
* | | Merge "Internal WebVtt subtitle support" into klp-devLajos Molnar2013-09-041-0/+1094
|\ \ \
| * | | Internal WebVtt subtitle supportLajos Molnar2013-09-041-0/+1094
| | |/ | |/|
* | | Merge "Camera2: Updated Rational for denom=0." into klp-devTimothy Knight2013-09-041-7/+44
|\ \ \
| * | | Camera2: Updated Rational for denom=0.Timothy Knight2013-09-041-7/+44
| |/ /
* | | Merge "Add MediaTimeProvider to MediaPlayer" into klp-devLajos Molnar2013-09-041-1/+382
|\ \ \ | |/ / |/| / | |/
| * Add MediaTimeProvider to MediaPlayerLajos Molnar2013-09-031-1/+382
* | Fix the build.Ben Murdoch2013-09-041-1/+1
* | SubtitleController: update to new CaptioningManager APIsLajos Molnar2013-09-031-2/+5
* | Internal subtitle base supportLajos Molnar2013-09-033-0/+1047
|/
* Merge "VideoView: add addSubtitleSource" into klp-devLajos Molnar2013-09-031-0/+12
|\
| * VideoView: add addSubtitleSourceLajos Molnar2013-08-301-0/+12
* | Merge "Public API for RemoteControlClient ratings and editable metadata" into...Jean-Michel Trivi2013-09-031-44/+44
|\ \
| * | Public API for RemoteControlClient ratings and editable metadataJean-Michel Trivi2013-08-291-44/+44
* | | Merge "media: ImageReader throws OutOfResourcesException when out of buffers"...Igor Murashkin2013-08-291-3/+6
|\ \ \
| * | | media: ImageReader throws OutOfResourcesException when out of buffersIgor Murashkin2013-08-271-3/+6
* | | | Merge "Use explicit intent for MediaScannerConnection" into klp-devMarco Nelissen2013-08-281-0/+3
|\ \ \ \
| * | | | Use explicit intent for MediaScannerConnectionMarco Nelissen2013-08-221-0/+3
* | | | | Merge "ImageReader: Fix null listener case" into klp-devZhijun He2013-08-281-2/+2
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | ImageReader: Fix null listener caseZhijun He2013-08-271-2/+2
| | |/ / | |/| |
* | | | Merge "Camera2: Add CameraDevice#flush()" into klp-devEino-Ville Talvala2013-08-271-0/+30
|\ \ \ \ | |/ / / |/| | |
| * | | Camera2: Add CameraDevice#flush()Eino-Ville Talvala2013-08-231-0/+30
* | | | "Year" is an authorized metadate long field.Jean-Michel Trivi2013-08-261-0/+1
| |_|/ |/| |
* | | Merge "wifi-display: add certification options" into klp-devChong Zhang2013-08-231-3/+14
|\ \ \
| * | | wifi-display: add certification optionsChong Zhang2013-08-231-3/+14
* | | | Merge "Return EXIF thumbnails when available." into klp-devJeff Sharkey2013-08-231-0/+16
|\ \ \ \ | |/ / / |/| | |
generated by cgit v1.1 at 2025-01-07 21:06:22 +0000