summaryrefslogtreecommitdiffstats
path: root/media/java
Commit message (Collapse)AuthorAgeFilesLines
* 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 "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
* | | | 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
* | | "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-231-5/+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-221-2/+15
|\ \
| * | Add ability to test supported content types to MediaDrmJeff Tinker2013-08-211-2/+15
| | | | | | | | | | | | | | | 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
* | | | 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
* | | | Merge "Expose KEY_REPEAT_PREVIOUS_FRAME_AFTER and ↵Andreas Huber2013-08-191-0/+20
|\ \ \ \ | | | | | | | | | | | | | | | KEY_PUSH_BLANK_BUFFERS_ON_STOP" into klp-dev
| * | | | Expose KEY_REPEAT_PREVIOUS_FRAME_AFTER and KEY_PUSH_BLANK_BUFFERS_ON_STOPAndreas Huber2013-08-141-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MediaFormat keys. Change-Id: I37ec076f0b1f0aea9a460c9dc1751f1160860df9
* | | | | Merge "Adding support for Absolute Volume" into klp-devMatthew Xie2013-08-183-19/+121
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Adding support for Absolute VolumeJohn Du2013-08-163-19/+121
| | |_|/ | |/| | | | | | | | | | Change-Id: I7bbc6f9296221ca219a50a5e377ebac9dcf5a407
* | | | Merge "media: Fix ImageReader only using maxImages=1 no matter what" into ↵Igor Murashkin2013-08-161-6/+23
|\ \ \ \ | |_|_|/ |/| | | | | | | klp-dev
| * | | media: Fix ImageReader only using maxImages=1 no matter whatIgor Murashkin2013-08-161-6/+23
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | - No longer return null when some bad error happens - Throws OutOfResourcesException when images need to be closed - Throws IllegalStateException when an unknown internal error happens Bug: 10333400 Change-Id: Ia53a5dd33f9ce53abd036e080e6fcc4ded9b251d
* | | MediaFormat: added subtitle formatLajos Molnar2013-08-151-1/+29
|/ / | | | | | | | | | | | | | | | | Added KEY_LANGUAGE that for now only refers to subtitles. Added createSubtitleFormat() method to create base format. Signed-off-by: Lajos Molnar <lajos@google.com> Change-Id: I344c36a3fd0d88c285cdebf3f67e549553b37a8e Bug: 10326117
* | Merge "Expose MediaCodec.setParameters API to" into klp-devAndreas Huber2013-08-141-0/+46
|\ \
| * | Expose MediaCodec.setParameters API toAndreas Huber2013-08-121-0/+46
| |/ | | | | | | | | | | | | | | - change video target bitrate on the fly - request sync frames - temporarily suspend feeding input buffers to the encoder Change-Id: If5cf1162b2eeb28ac08288ecfa9f0e9823dd972e
* | MediaCodecInfo.java: Added isFeatureSupported method to CodecCapabilitiesLajos Molnar2013-08-131-1/+20
|/ | | | | | | | | | | | | | | Added isFeatureSupported method to CodecCapabilities, so that applications can query whether codecs support various features. For now added one video-decoder feature: FEATURE_AdaptivePlayback Media playback applications can query it to see if the codec supports seamless resolution changes during decoding. Change-Id: I56b2cf1429f39f9b9e0243a990c95e7a64dd7ff7 Signed-off-by: Lajos Molnar <lajos@google.com> Related-to-bug: 7093648
* am 53d86f6e: am f5cfe708: am e8acd367: Merge "When deleting a db file, ↵Marco Nelissen2013-08-081-1/+1
|\ | | | | | | | | | | | | Context.deleteDatabase() has to be called instead of File.delete() to guarantee all db related files like journal, wal, shm, etc are deleted together." * commit '53d86f6e495e3f950191419645e34970779a3fea': When deleting a db file, Context.deleteDatabase() has to be called instead of File.delete() to guarantee all db related files like journal, wal, shm, etc are deleted together.
| * Merge "When deleting a db file, Context.deleteDatabase() has to be called ↵Marco Nelissen2013-08-071-1/+1
| |\ | | | | | | | | | instead of File.delete() to guarantee all db related files like journal, wal, shm, etc are deleted together."
| | * When deleting a db file,jangwon.lee2013-07-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Context.deleteDatabase() has to be called instead of File.delete() to guarantee all db related files like journal, wal, shm, etc are deleted together. Signed-off-by: jangwon.lee<jangwon.lee@lge.com> Change-Id: I3c3d7dfa13ffbe709ab7d8a5c7cfe6cfa2864fea
* | | Merge "Update audio comments"Glenn Kasten2013-08-072-6/+8
|\ \ \
| * | | Update audio commentsGlenn Kasten2013-08-062-6/+8
| | | | | | | | | | | | | | | | Change-Id: If470efd77ed886da8d83a1b427c132bad77e668b
* | | | Merge "Define error codes for MediaCodec.CryptoException"Jeff Tinker2013-08-073-0/+47
|\ \ \ \
| * | | | Define error codes for MediaCodec.CryptoExceptionJeff Tinker2013-08-033-0/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Define specific failure cases so apps have the information they need to deal with these conditions. Also adds a new ResourceBusyException to MediaDrm Change-Id: Iaecf269d58108f28179974b05671bf29b9fe4b7d related-to-bug: 10157154 related-to-bug: 9695816
* | | | | Event handler should be private in MediaFocusControlJean-Michel Trivi2013-08-061-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I034224d42a3cfed8c49bfee55b332068796f9977
* | | | | Merge "Reorder and comment MediaFocusControl code"Jean-Michel Trivi2013-08-061-29/+33
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Reorder and comment MediaFocusControl codeJean-Michel Trivi2013-08-061-29/+33
| | | | | | | | | | | | | | | | | | | | Change-Id: Iacc03a7233789bd1588e9f7d2ca5df10a756fb0d
* | | | | ImageReader: Add RGB format support.Zhijun He2013-08-061-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 10155122 Change-Id: Id53d6ec815488e73bde6ca62b42c92d16bc813c9
* | | | | Merge "Don't doubly initialize fields in constructor"Glenn Kasten2013-08-051-5/+4
|\ \ \ \ \
| * | | | | Don't doubly initialize fields in constructorGlenn Kasten2013-08-021-5/+4
| |/ / / / | | | | | | | | | | | | | | | Change-Id: Id3b4911a7954a5a908764683cc7b8d8515d4482a
generated by cgit v1.1 at 2025-02-13 12:17:02 +0000