summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* Remove dependency on JNIHelp header side effects.Ruben Brunk2013-09-1011-0/+23
* 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
|\ \ \ \ | |/ / / |/| | |
| * | | Return EXIF thumbnails when available.Jeff Sharkey2013-08-231-0/+16
| | |/ | |/|
* | | ImageReader: Fix API doc table misalignment issueZhijun He2013-08-232-6/+5
| |/ |/|
* | Merge "Add ability to test supported content types to MediaDrm" into klp-devJeff Tinker2013-08-223-8/+26
|\ \
| * | Add ability to test supported content types to MediaDrmJeff Tinker2013-08-213-8/+26
* | | Merge "Ratings for RemoteControl" into klp-devJean-Michel Trivi2013-08-226-2/+267
|\ \ \
| * | | Ratings for RemoteControlJean-Michel Trivi2013-08-226-2/+267
* | | | Updating Force Use toggling for Communication use caseJohan Gustavsson2013-08-211-2/+16
| |_|/ |/| |
* | | Merge "MediaPlayer: add listener for subtitle data" into klp-devChong Zhang2013-08-202-0/+129
|\ \ \
| * | | MediaPlayer: add listener for subtitle dataChong Zhang2013-08-162-0/+129
* | | | Merge "MediaPlayer.TrackInfo: add getFormat() method" into klp-devChong Zhang2013-08-201-4/+26
|\ \ \ \ | |/ / /
| * | | MediaPlayer.TrackInfo: add getFormat() methodLajos Molnar2013-08-151-4/+26
* | | | Merge "Add the checking for the camcorder profile." into klp-devYu Shan Emily Lau2013-08-201-43/+55
|\ \ \ \
| * | | | Add the checking for the camcorder profile.Yu Shan Emily Lau2013-08-191-43/+55
* | | | | AudioSystem: new audioflinger restart detectionEric Laurent2013-08-192-49/+29
* | | | | Merge changes Id3815fe8,I90a85921 into klp-devJeff Brown2013-08-194-41/+22
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Define AudioSource.REMOTE_SUBMIX.Jeff Brown2013-08-191-1/+22
| * | | | Remove setRemoteSubmixOn method.Jeff Brown2013-08-163-40/+0
* | | | | Camera2: Remove redundant Keys classesEino-Ville Talvala2013-08-191-2/+2
| |_|/ / |/| | |