summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Let RemoteControlDisplay know more about playback position" into ↵Zhihai Xu2013-06-112-2/+52
|\ | | | | | | jb-mr2-dev
| * Let RemoteControlDisplay know more about playback positionJean-Michel Trivi2013-06-072-2/+52
| | | | | | | | | | | | | | | | | | | | | | The BT stack needs to differentiate between applications that use the new RemoteControlClient APIs to pass a playback position but don't have one yet, and applications that use the legacy API and will never pass a position. Bug 9294855 Change-Id: I05cba82a073e6e0aaea1d8bbf9cc8c99da715f58
* | Unhide MediaExtractor.getPsshInfo()Marco Nelissen2013-06-101-2/+2
|/ | | | | | b/9373882 Change-Id: I2af42656d6a7eb19e8e9ec798b615dab0d9d33cb
* javadoc cleanup for audioeffectScott Main2013-06-031-7/+25
| | | | Change-Id: I87917309d1da6529e16d72ad2b4ec9ce04d10569
* Listen for HTTP proxy changes and propagate the information to the mediaAndreas Huber2013-05-312-3/+139
| | | | | | | | framework. related-to-bug: 8873723 Change-Id: I2a34343f8006fa1b1448a1f047458fd58fe14fda (cherry picked from commit bfe9154142428aa8abecaf943dfeffc55f411ea7)
* Merge "MediaMuxer sample code update, no functional change" into jb-mr2-devztenghui2013-05-311-8/+17
|\
| * MediaMuxer sample code update, no functional changeztenghui2013-05-311-8/+17
| | | | | | | | | | | | bug:9213533 Change-Id: I0d42ec58576d9fd797dba9c9c9f5ebed1170a818
* | Merge "Rename CALLBACK_FLAG_ACTIVE_SCAN for clarity." into jb-mr2-devJeff Brown2013-05-311-5/+5
|\ \ | |/ |/|
| * Rename CALLBACK_FLAG_ACTIVE_SCAN for clarity.Jeff Brown2013-05-301-5/+5
| | | | | | | | | | Bug: 9210033 Change-Id: I973c03b3a37e12af72a27c46d7da7fb59a30b606
* | Merge "Monitor device rotation" into jb-mr2-devJean-Michel Trivi2013-05-301-6/+50
|\ \
| * | Monitor device rotationJean-Michel Trivi2013-05-281-6/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | If requested by ro.audio.monitorOrientation property, set orientation information as audio system parameter on configuration changes. Bug 9095903 Change-Id: I669d4084eade3c14feb63f644bdd5b74fddc8857
* | | Merge "Refactor of camera stress test to add camera test helper. Also add ↵Jason Noguchi2013-05-306-197/+995
|\ \ \ | |_|/ |/| | | | | additional functional tests for: flash, exposure, white balance, and focus mode. Also add pairwise tests." into jb-mr2-dev
| * | Refactor of camera stress test to add camera test helper. Also addJason Noguchi2013-05-286-197/+995
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | additional functional tests for: flash, exposure, white balance, and focus mode. Also add pairwise tests. Slight refactor to add camera test helper and also additional tests for: flash, exposure, white balance, and focus mode Bug: 9174937 Change-Id: I3d26b545dc8ff972c8173066df59a2e572a837ef
* | | Merge "android.media.MediaMuxer: remove SAMPLE_SYNC_FLAG" into jb-mr2-devLajos Molnar2013-05-291-11/+4
|\ \ \ | |_|/ |/| |
| * | android.media.MediaMuxer: remove SAMPLE_SYNC_FLAGLajos Molnar2013-05-291-11/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SAMPLE_SYNC_FLAG is not used by MediaMuxer; instead, MediaCodec.BUFFER_FLAG_SYNC_FRAME is used, which has the same value. Remove this now, so that users will not have to translate MediaCodec flags to MediaMuxer flags, even though MediaMuxer takes in MediaCodec.BufferInfo objects to specify these flags. Change-Id: I4b2f2039ca16debf4788a530a36bdd06d516f417 Signed-off-by: Lajos Molnar <lajos@google.com> Bug: 9169479
* | | Merge "Update test with CamercorderProfile video size." into jb-mr2-devYu Shan Emily Lau2013-05-251-16/+15
|\ \ \ | |/ / |/| |
| * | Update test with CamercorderProfile video size.Yu Shan Emily Lau2013-05-231-16/+15
| | | | | | | | | | | | | | | Bug:9114681 Change-Id: Id8ac6e98849715d21cd4a983fc13935debea5e5f
* | | Merge "Improve exception error messages to help diagnose app errors" into ↵Jeff Tinker2013-05-221-32/+70
|\ \ \ | | | | | | | | | | | | jb-mr2-dev
| * | | Improve exception error messages to help diagnose app errorsJeff Tinker2013-05-211-32/+70
| | | | | | | | | | | | | | | | | | | | | | | | bug: 9072051 Change-Id: I45057951d1a62b1b4a996e85f01601239e1b7161
* | | | Fix invalid keyType translation in MediaDrm.getKeyRequestJeff Tinker2013-05-211-5/+29
|/ / / | | | | | | | | | | | | bug: 9070897 Change-Id: Ib9b4174e08b1c828d0204e0ab65bc3d7c2efcedf
* | | Add route description API.Jeff Brown2013-05-161-7/+55
|/ / | | | | | | | | Bug: 8175766 Change-Id: I65dbc10fc04f9ff8f6abc1bda23fbf5baa227737
* | Merge "Add an API to determine if a route is connecting." into jb-mr2-devJeff Brown2013-05-101-1/+13
|\ \
| * | Add an API to determine if a route is connecting.Jeff Brown2013-05-091-1/+13
| | | | | | | | | | | | | | | Bug: 8175766 Change-Id: I54d5f31d4e7d79c471c0e1bbc438cd8ebb4f8a1e
* | | Fix buildMarco Nelissen2013-05-101-0/+5
| | | | | | | | | | | | Change-Id: I2eb54a936630094b4bd9c19a944579670a4e0bb8
* | | Merge "Fix build" into jb-mr2-devMarco Nelissen2013-05-101-0/+5
|\ \ \ | |/ / |/| |
| * | Fix buildMarco Nelissen2013-05-101-0/+5
| | | | | | | | | | | | Change-Id: I4afe65f73d8607a97a561615ebfc34aadfe00b95
* | | Add an API to allow a callback to request active scans.Jeff Brown2013-05-091-28/+143
| | | | | | | | | | | | | | | | | | | | | | | | | | | This API is needed by the support library media router to ensure that wifi display routes can be discovered while the route chooser dialog is open. Bug: 8175766 Change-Id: I3773773d93384aa4a3c009e71a5444ee8ce37caf
* | | Fix bug managing wifi display routes.Jeff Brown2013-05-091-13/+9
|/ / | | | | | | | | | | | | | | | | We could sometimes crash due to some inconsistencies in the way the wifi display routes were updates when connecting, disconnecting or scanning wifi displays. Bug: 8837094 Change-Id: I10c7ccb163ec33c4ea107dfcb5074741049fe955
* | Correct java API docs for MediaDrm offline use caseJeff Tinker2013-05-071-5/+10
|/ | | | | | | Documentation only change, no APIs are affected Change-Id: I4f3978751928de503f51afa77e0983d4c385ff7b related-to-bug: 8621588
* Merge "MediaDrm API: Add two exceptions to handle error path scenarios" into ↵Jeff Tinker2013-05-016-17/+120
|\ | | | | | | jb-mr2-dev
| * MediaDrm API: Add two exceptions to handle error path scenariosJeff Tinker2013-04-306-17/+120
| | | | | | | | | | bug: 8725707 Change-Id: Ia00c495ac591cc2993f4d11ad3480b59833d009e
* | Merge "Fix a crash case" into jb-mr2-devMike J. Chen2013-05-011-5/+6
|\ \
| * | Fix a crash caseMike J. Chen2013-04-261-5/+6
| |/ | | | | | | | | | | | | | | | | | | | | There's a runtime check for a bad argument, but it is after the usage of the bad argument. Move the usage after the check. Bug 8687716 Change-Id: Iddfa457951bac69b436a430cda21b5d7a563107b Signed-off-by: Mike J. Chen <mjchen@google.com>
* | libdrm: fix bad strncpy / snprintf callsNick Kralevich2013-04-292-7/+43
|/ | | | | | | | | | | | Fix the following bugs reported by IOActive: * GOOGLE-AN01 - Android libdrm drm_parseDM.c Boundary-CRLF Buffer Overflow * GOOGLE-AN02 - Android libdrm 'drm_parseDM.c' contentType-CRLF Buffer Overflow * GOOGLE-AN03 - Android libdrm drm_parseDM.c contentID-CRLF Buffer Overflow * GOOGLE-AN04 - Android libdrm 'parser_dcf.c' Multiple Headers Buffer Overflow * GOOGLE-AN05 - Android libdrm 'parser_dcf.c' ContentType Buffer Overflow Bug: 8727221 Change-Id: If386922e907567f54e26897beffaa1cfe4777896
* Merge "Identify in logs launch of voice search from key events" into jb-mr2-devJean-Michel Trivi2013-04-231-0/+2
|\
| * Identify in logs launch of voice search from key eventsJean-Michel Trivi2013-04-191-0/+2
| | | | | | | | | | | | | | | | | | | | | | Clearly identify in the logs when AudioService starts one of the following two intents in response to long-press on the KEYCODE_HEADSETHOOK key: ACTION_WEB_SEARCH and ACTION_VOICE_SEARCH_HANDS_FREE. Bug 8095981 Change-Id: I14ca99533dfb011cdc530c0bafd8104ff2436c7d
* | Merge "Opt-in mechanism for RemoteControlClient position anti-drift check" ↵Jean-Michel Trivi2013-04-225-23/+182
|\ \ | | | | | | | | | into jb-mr2-dev
| * | Opt-in mechanism for RemoteControlClient position anti-drift checkJean-Michel Trivi2013-04-225-23/+182
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RemoteControlClient has an interface for the framework to query the playback position. This mechanism is used to detect when the estimated position drifts from the real position by having the framework regularly poll (every 15s when playing at 1x) this interface and compare against the estimation. But this mechanism: - should only be used when IRemoteControlDisplay implementation care about position display - should not be used by default because the implementation of the position query interface might involve network traffic in some remote media player implementation for instance. This CL implements an opt-in mechanism to be used by implementators of IRemoteControlDisplay, to request the anti-drift mechanism to be turned on. bug 8120740 Change-Id: I1baa3e515546ac41e0ac9c3a41bfa3147ecf3d7f
* | Change doc comment to match API changeKenny Root2013-04-191-1/+1
| | | | | | | | | | | | | | | | API change in f0d4777473f25847d67fc17fc082fada08cf678d didn't update a comment to match which caused doc build failures. Bug: 8603279 Change-Id: I475dc569747ae5d34b4267537370f18446386bb9
* | Correct algorithm property name and clarify javadoc description ofJeff Tinker2013-04-191-3/+3
|/ | | | | | | device unique id property. bug: 8603279 Change-Id: If56d568072b3c09e5f63901e285d0eaa3c77ff7a
* Merge "Anti-drift in RCC playback position" into jb-mr2-devJean-Michel Trivi2013-04-191-1/+118
|\
| * Anti-drift in RCC playback positionJean-Michel Trivi2013-04-181-1/+118
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Periodically verify that the reported playback position hasn't drifted from the estimated playback position. If a drift is noticed, re-synchronize registered IRemoteControlDisplay implementations. bug 8120740 Note that this implementation updates the playback position of all IRemoteControlDisplay implementations, and always causes the OnGetPlaybackPositionListener to be called. This might be undesirable in some circumstances and will be addressed in a subsequent CL. Change-Id: Ib9f40e1b000e912f6c35fa03e41adf81efadc894
* | Merge "AudioService: SCO audio backward compatibility" into jb-mr2-devEric Laurent2013-04-193-13/+55
|\ \
| * | AudioService: SCO audio backward compatibilityEric Laurent2013-04-173-13/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After commit 25fc29b3, AudioManager.startBluetoothSco() does not use virtual voice call mode anymore when starting the SCO audio connection to the headset. To help backward compatibility, this change makes that virtual voice call is used if the request comes from an application targeting a SDK version before JB MR2. For applications targeted to JB MR2 and above a raw SCO audio connection is established. Bug 8157702 Change-Id: If1ded2fd99b7ed76d2435d95ee03659e78a7882a
* | | Merge "Add some documentation to MediaCodecInfo" into jb-mr2-devAndreas Huber2013-04-191-0/+14
|\ \ \
| * | | Add some documentation to MediaCodecInfoAndreas Huber2013-04-181-0/+14
| | | | | | | | | | | | | | | | | | | | Change-Id: Ia94cde04af37e46b5d4b9c171dc50112134042b8 related-to-bug: 8657165
* | | | Merge "Improve error handling for DRM errors reported by plugins" into ↵Jeff Tinker2013-04-181-0/+53
|\ \ \ \ | |/ / / |/| | | | | | | jb-mr2-dev
| * | | Improve error handling for DRM errors reported by pluginsJeff Tinker2013-04-171-0/+53
| | | | | | | | | | | | | | | | | | | | Change-Id: I25df78f16379b32c54189949daa3ab9c91187375 related-to-bug: 8621516
* | | | Merge "Make MediaDrm APIs public" into jb-mr2-devJeff Tinker2013-04-183-150/+305
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | Make MediaDrm APIs publicJeff Tinker2013-04-173-150/+305
| |/ | | | | | | | | | | bug: 8603279 Change-Id: I9fab2673867ad413a084933cee7239d13e8b7893
generated by cgit v1.1 at 2025-02-11 11:54:13 +0000