summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* Unhide AudioTimestamp and getTimestampGlenn Kasten2013-09-062-7/+1
| | | | Change-Id: I56687f42f83c4be7dc3fd1baa81a13e71113f22e
* MediaPlayer.MTP: fix issue when main thread had no looperLajos Molnar2013-09-061-9/+42
| | | | | | | | | | | | | | We fall back to using the application's main looper similarly to MP, and even create our own looper if MP was created outside of an application context. Always creating our own looper is a waste of resources. Also resolved issue with MP.reset() when created outside of an application context, and removed MP.MTP's unused getHandler(). Change-Id: I9c3b8a2f05a9e231ae9c008bc1a48d6b991cec1d Signed-off-by: Lajos Molnar <lajos@google.com> Bug: 10634238
* Merge "Java API for AudioTrack timestamps" into klp-devGlenn Kasten2013-09-042-0/+97
|\
| * Java API for AudioTrack timestampsGlenn Kasten2013-09-042-0/+97
| | | | | | | | | | | | | | This change adds android.media.AudioTimestamp and android.media.AudioTrack.getTimestamp, with implementation, but hidden. Change-Id: Ic314f04ff775baca05c57d19b5ea91133dbd0be1
* | 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
| | | | | | | | | | | | | | | | | | Change-Id: Ibfde491a624272c4f9733098529ad70c6aa93fe0 Signed-off-by: Lajos Molnar <lajos@google.com> Bug: 10326117
* | | Merge "Internal WebVtt subtitle support" into klp-devLajos Molnar2013-09-041-0/+1094
|\ \ \
| * | | Internal WebVtt subtitle supportLajos Molnar2013-09-041-0/+1094
| | |/ | |/| | | | | | | | | | | | | Change-Id: Ia55673a68a99c277dd6e3246e6f1913c8eb476d8 Signed-off-by: Lajos Molnar <lajos@google.com> Bug: 10326117
* | | 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
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Handle NaN and INF using the same semantics as Java floats. No longer throw an exception if a rational is constructed with a zero-denominator. This commit is required for the ITS pdk app, since without it, the app fails when it tries to deserialize rational values that are (incorrectly) set to 0/0. Bug: 10337323 Change-Id: I890ec2092f2945abc0f531fc46f9a7f5c71d2dbf
* | | Merge "Add MediaTimeProvider to MediaPlayer" into klp-devLajos Molnar2013-09-041-1/+382
|\ \ \ | |/ / |/| / | |/
| * Add MediaTimeProvider to MediaPlayerLajos Molnar2013-09-031-1/+382
| | | | | | | | | | | | Change-Id: Ie56331ef4eb4bdffa606598f241edb1cb2c2e2dc Signed-off-by: Lajos Molnar <lajos@google.com> Bug: 10326117
* | Fix the build.Ben Murdoch2013-09-041-1/+1
| | | | | | | | | | | | Fix javadoc typo. Change-Id: I3e5f8f43650ce7b0958512bacc36e0ee744efa40
* | SubtitleController: update to new CaptioningManager APIsLajos Molnar2013-09-031-2/+5
| | | | | | | | | | | | | | | | This resolves the build issue. Change-Id: I4db018c1abd9677ceb6d355921e4f7fa4be3b037 Signed-off-by: Lajos Molnar <lajos@google.com> Bug: 10326117
* | Internal subtitle base supportLajos Molnar2013-09-033-0/+1047
|/ | | | | | Change-Id: I3fc57d6280773dc24f4822be21c9497ae70f7374 Signed-off-by: Lajos Molnar <lajos@google.com> Bug: 10326117
* Merge "VideoView: add addSubtitleSource" into klp-devLajos Molnar2013-09-031-0/+12
|\
| * VideoView: add addSubtitleSourceLajos Molnar2013-08-301-0/+12
| | | | | | | | | | | | | | | | A way to add external subtitle file to VideoView. Change-Id: Ic110238408550a5b4088851bc5da5e94eb58d831 Signed-off-by: Lajos Molnar <lajos@google.com> Bug: 10326117
* | Merge "Public API for RemoteControlClient ratings and editable metadata" ↵Jean-Michel Trivi2013-09-031-44/+44
|\ \ | | | | | | | | | into klp-dev
| * | Public API for RemoteControlClient ratings and editable metadataJean-Michel Trivi2013-08-291-44/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A rating for RemoteControlClient content is: - a value between 0 and 100 - or a value indicating there is no rating For a same piece of content, a rating can come from: - the user - "others" (i.e. not the user), to provide an average rating Rating styles are: - heart (a toggle) - thumb up / down - stars (with a configurable maximum number of stars) For editable metadata, add: - methods to control which keys can be edited, - interface for an application to receive new values for a key. Rating by user is editable metadata. Bug 8440498 Change-Id: Ia9f61e750772658051cea1ac7c316187717f0f58
* | | Merge "media: ImageReader throws OutOfResourcesException when out of ↵Igor Murashkin2013-08-291-3/+6
|\ \ \ | | | | | | | | | | | | buffers" into klp-dev
| * | | media: ImageReader throws OutOfResourcesException when out of buffersIgor Murashkin2013-08-271-3/+6
| | | | | | | | | | | | | | | | | | | | Bug: 10507939 Change-Id: I34c66485695ad6141388be85903cbecb9ebaa5ab
* | | | Merge "Use explicit intent for MediaScannerConnection" into klp-devMarco Nelissen2013-08-281-0/+3
|\ \ \ \
| * | | | Use explicit intent for MediaScannerConnectionMarco Nelissen2013-08-221-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b/10278751 Change-Id: I3fbc2b935a4fe6ec449c4bbf79400d4b48e613f7
* | | | | Merge "ImageReader: Fix null listener case" into klp-devZhijun He2013-08-281-2/+2
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | ImageReader: Fix null listener caseZhijun He2013-08-271-2/+2
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | Only do the handler check when listener is not null. Bug: 10360518 Change-Id: I9940942ae95a492c92e028e5f862beea16e1da80
* | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - For quickly clearing out all pending and in-progress captures Bug: 9758581 Change-Id: Ie4123fcc4d4b648a11d4a6257c531f07182bab39
* | | | "Year" is an authorized metadate long field.Jean-Michel Trivi2013-08-261-0/+1
| |_|/ |/| | | | | | | | | | | | | | | | | | | | MediaMetadataRetriever.METADATA_KEY_YEAR is listed as one of the supported long fields but is not declared in the list of authorized long keys. Change-Id: If277f0c300e2bfed10472e23a2eeba08bfa6ed33
* | | Merge "wifi-display: add certification options" into klp-devChong Zhang2013-08-231-3/+14
|\ \ \
| * | | wifi-display: add certification optionsChong Zhang2013-08-231-3/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When certification mode is enabled: - Pass wfd session info to wifi display settings - Allow sink to connect to source - Add interface in display manager for pausing/resuming session - Add interface in WifiP2pManager for setting lc, oc and starting autonomous GO Note that we're compliant regardless of certification mode, but some confusing options (eg. allowing incoming connection from sink) we want to hide when not being tested. Bug: 9371882 Change-Id: Icc7dcae4e046453796cfa03f5f197055fabf234b
* | | | 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
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds new ExifInterface method to extract the thumbnail range from a larger image file, and use that to return an AssetFileDescriptor. When decoding an AssetFileDescriptor thumbnail with offsets, read out the raw data entirely, since Skia uses lseek() aggressively. Bug: 10412208 Change-Id: I7906cdf82c0c3794cec7043c801a86f66efeb143
* | | ImageReader: Fix API doc table misalignment issueZhijun He2013-08-232-6/+5
| |/ |/| | | | | | | | | | | Also cleanup unused macro in ImageReader. Bug: 10360518 Change-Id: I2332703c92df771a6339ff92069e92d50a6c5cd5
* | 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
| | | | | | | | | | | | | | | bug: 10244066 Change-Id: Ic96c2e23f36809faf1c88ede500f4bc2bad4142a
* | | Merge "Ratings for RemoteControl" into klp-devJean-Michel Trivi2013-08-226-2/+267
|\ \ \
| * | | Ratings for RemoteControlJean-Michel Trivi2013-08-226-2/+267
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for metadata of a RemoteControlClient that can be updated: - methods to control which keys can be edited, - interface for an application to receive new values for a key. Add definitions for ratings. A rating is: - a value between 0 and 100 - or a value indicating there is no rating For a same piece of content, a rating can come from: - the user - "others" (i.e. not the user), to provide an average rating Rating styles are: - heart (a toggle) - thumb up / down - stars (with a configurable maximum number of stars) Rating by user is editable metadata. Bug 8440498 Change-Id: I1d45972f9ace4cb505ee0757e917f1d5dedd264e
* | | | Updating Force Use toggling for Communication use caseJohan Gustavsson2013-08-211-2/+16
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | setForceUse toggling is shaky when toggling either through setSpeakerphoneOn and setBluetoothScoOn. Depending on call sequence an application may unintentionally trigger a routing use case it does not want. The main root cause is that neither of these calls take the previous state into account. A call to setSpeakerPhoneOn will for example partly disable any active BT SCO routing. Change-Id: I436ee5a8da2d9ea5a2e4e89eec083c8118a5ff7e
* | | 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
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 10326117 Change-Id: I8fbd54df70e37a061c7c875743ded09f1922ef8f
* | | | Merge "MediaPlayer.TrackInfo: add getFormat() method" into klp-devChong Zhang2013-08-201-4/+26
|\ \ \ \ | |/ / /
| * | | MediaPlayer.TrackInfo: add getFormat() methodLajos Molnar2013-08-151-4/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This returns the MediaFormat of the track or null (for now). Change-Id: Ib88fc229b661942b2ed136204fdc43da427d7aed Signed-off-by: Lajos Molnar <lajos@google.com> Bug: 10326117
* | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Not all the devie have camera. Only run the recording test when the camcorder profile is not null. Change-Id: Ib38df363fe5e6049b72e97ae229964fb65882269
* | | | | AudioSystem: new audioflinger restart detectionEric Laurent2013-08-192-49/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a specific method to AudioSystem for AudioService to poll for AudioFlinger service restart instead of relying on current callback mechanism which is flaky. Bug: 9693068. Change-Id: Id21d142a22b257205700201978cce1cb8b15180d
* | | | | Merge changes Id3815fe8,I90a85921 into klp-devJeff Brown2013-08-194-41/+22
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | * changes: Define AudioSource.REMOTE_SUBMIX. Remove setRemoteSubmixOn method.
| * | | | Define AudioSource.REMOTE_SUBMIX.Jeff Brown2013-08-191-1/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add an API to allow applications to record from the remote submix when they have the required permissions. Bug: 10265163 Change-Id: Id3815fe82a6713e058ce4b8ab6128a898481df7e
| * | | | Remove setRemoteSubmixOn method.Jeff Brown2013-08-163-40/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The submix will be controlled automatically from now on based on whether there is an active audio recorder. Bug: 10265163 Change-Id: I90a8592136c6507680e70f054243df70cc82efad
* | | | | Camera2: Remove redundant Keys classesEino-Ville Talvala2013-08-191-2/+2
| |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | Also update tests accordingly Bug: 10345522 Change-Id: I8c7d17cdfbda6faba09134745a96089bf1b70cb7
* | | | Merge "Expose KEY_REPEAT_PREVIOUS_FRAME_AFTER and ↵Andreas Huber2013-08-191-0/+20
|\ \ \ \ | | | | | | | | | | | | | | | KEY_PUSH_BLANK_BUFFERS_ON_STOP" into klp-dev
generated by cgit v1.1 at 2025-03-15 10:37:15 +0000