1414 Commits

Author SHA1 Message Date
Andreas Huber
0d1ba15056 Merge "DRM errors signaled by the CryptoPlugin are now visible to MediaCodec clients" 2012-04-19 13:51:10 -07:00
Andreas Huber
bfc56f497d DRM errors signaled by the CryptoPlugin are now visible to MediaCodec clients
through a custom exception "MediaCodec.CryptoException".

Change-Id: I30215e9e13bab68abad23e27dcead7c1accd07f1
related-to-bug: 6365261
2012-04-19 13:42:14 -07:00
Jean-Michel Trivi
c9496495ba Merge "Unhide Visualizer scaling mode definitions and methods" 2012-04-19 10:52:25 -07:00
Jean-Michel Trivi
951794616f Unhide Visualizer scaling mode definitions and methods
Unhide Visualizer set/get methods, and associated constant
 definitions.

Change-Id: Iaafe5f7a2f1273f72c3f7f842b416b93614dfa65
2012-04-19 10:34:50 -07:00
Eric Laurent
6db653355b Merge "unhide API for synchronous audio capture." 2012-04-19 10:16:38 -07:00
Jean-Michel Trivi
5cef554cc8 Merge "Add support for scaling mode parameter in Visualizer effect" 2012-04-19 09:09:06 -07:00
Eric Laurent
ff2577da37 unhide API for synchronous audio capture.
unhide MediaSyncEvent class and AudioRecord.startRecording() method with synchronization
event allowing to start audio capture upon occurence of a specific event.
So far the only event defined is playback presentation complete but more events and synchronized
playback/capture methods could be defined in the future.

Change-Id: If05fc6cd125dd9afad451727f792a3fd9e916bef
2012-04-19 08:59:20 -07:00
Eric Laurent
8dfc10571a unhide audio pre processing API.
Unhide APIs for Noise Suppressor(NS), Acoustic Echo Canceler (AEC) and
Automatic Gain Control (AGC) audio pre processings.

Also unhide getAudioSessionId() method on AudioRecord.

Change-Id: I788f7a0724b152cc98c8167d9434e64c12bada95
2012-04-18 20:26:43 -07:00
Andreas Huber
91befdc0c4 Information required to decrypt buffers is now packaged into MediaCodec.CryptoInfo
New API on MediaExtractor to retrieve a CryptoInfo structure where applicable.

Change-Id: I18edfc9ac56a4544c8f17cba24401b96dacbff7d
related-to-bug: 6275919
2012-04-18 12:19:51 -07:00
James Dong
f7d3bdfc22 Merge "AddExternalSource(String path) needs to turn the path to fd if it is a file" 2012-04-17 18:36:48 -07:00
James Dong
c4c0284e45 AddExternalSource(String path) needs to turn the path to fd if it is a file
o related-to-bug: 5542712

Change-Id: Iea32012996ca9de4c86f144de916df64fcab3c52
2012-04-17 18:31:20 -07:00
Jean-Michel Trivi
e1123e7f36 Add support for scaling mode parameter in Visualizer effect
Add set/get methods to set how the Visualizer scales the captured
 data.

Change-Id: Ia1da00fd5474dd3484b59caf7d1d0a812d0347de
2012-04-17 14:44:23 -07:00
Andreas Huber
2952c5d03c MediaCrypto's constructor can throw RuntimeException.
Change-Id: I5718e9abab0d1465882580e826747d6a78bdefb5
related-to-bug: 6275919
2012-04-17 11:24:11 -07:00
Andreas Huber
07ea426e3a Unhide new media related java APIs.
Change-Id: If0b8201eaca74f51f3499b6ecdfb73088586ee24
2012-04-16 10:14:05 -07:00
James Dong
f3d9f5d097 Merge "Fix failure from setDataSource(String path) when path is a local file" 2012-04-12 12:08:31 -07:00
James Dong
e00b6f3a57 Fix failure from setDataSource(String path) when path is a local file
o the failure was because the mediaserver does not have read permission to sdcard
o related-to-bug: 6325960,6322913

Change-Id: I4feec01b8165c78563eee8aab69cb24df3244d03
2012-04-12 11:50:17 -07:00
James Dong
0041b5c561 Fix thumbnail generation failure
o Change the impl of MediaMetadataRetriever.setDataSource(String).
  It opens and passes an fd to the media framework
  rather than pass the file path directly to the media server. The change is needed since media
  server does not have read permission to sdcard
o Remove the unnecessary jni method

Change-Id: I5a2f47dde804523d264b588f855ba2575a99c179
2012-04-11 14:56:34 -07:00
Eric Laurent
855255d89f audio preprocessing: added static factory method
Added static methods to check availability and create audio preprocessing
effects.

Change-Id: I945e97fe41912ff8880befacaba162a08b5a1267
2012-04-10 12:34:07 -07:00
Eric Laurent
079f09c6ca Merge "Added support for USB audio devices" 2012-04-09 08:39:05 -07:00
Eric Laurent
59f482764e Added support for USB audio devices
Two types of USB audio devices are defined:
- USB audio device: the audio device in USB device mode while
the Android device is in USB host mode.
- USB audio accessory: the audio device in USB host mode while
the Android device is in USB device mode.

Renamed intents for analog and digital docks to avoid confusion:
 - ACTION_USB_ANLG_HEADSET_PLUG to ACTION_ANALOG_AUDIO_DOCK_PLUG
 - ACTION_USB_DGTL_HEADSET_PLUG to ACTION_DIGITAL_AUDIO_DOCK_PLUG

Factorized code in AudioService broadcast receiver.

Change-Id: I1b6d0257a9d68ecb9495c78c98bac8c67fec7891
2012-04-06 18:24:48 -07:00
Andreas Huber
9e6bcce17d New JAVA API to support submitting encrypted buffers of input data.
Change-Id: Ib0df9a9427b4580946179860495b26f743558597
related-to-bug: 6275919
2012-04-06 12:14:47 -07:00
Justin Koh
1c35d117f0 am db9b114b: Merge "Adds flag argument to setMasterMute." into ics-aah
* commit 'db9b114b2e1f9c2034c3cd6df00245b039d90c28':
  Adds flag argument to setMasterMute.
2012-04-05 10:43:06 -07:00
Justin Koh
0273af55cf Adds flag argument to setMasterMute.
Adds flag argument to setMasterMute. This allows third parties to edit it
without showing the UI, for example.

TESTED = runs on Tungsten.

Change-Id: Idfd99a2476e60059cd93c9dfe07d03a389c3f5f5
2012-04-04 18:40:36 -07:00
Justin Koh
75cf9e19a5 Fix the build.
Change-Id: Ibe818df8f360837688f12533cf0ac22ef89a8439
2012-04-04 15:27:37 -07:00
Justin Koh
5ac69a23e0 Merge "resolved conflicts for merge of bff6a514 to master" 2012-04-04 14:54:19 -07:00
Justin Koh
6a8096d7d5 resolved conflicts for merge of bff6a514 to master
Change-Id: I741d5ab8ed0ce25a27330ffb55ba210534d11c3d
2012-04-04 14:50:32 -07:00
Marco Nelissen
e313f721ad Store video width/height when scanning
b/5820120

Change-Id: If2faf554bbf49b341d2634915ba98c1efd70574e
2012-04-04 14:27:00 -07:00
Andreas Huber
8240d9239d New Crypto JAVA class to facilitate decryption via MediaCodec.
Change-Id: Ic4e395faa84f003793c2804f2badabab9e7f1034
related-to-bug: 6275919
2012-04-04 14:06:32 -07:00
Justin Koh
57978ed862 Persists the master mute volume setting.
Persists the master mute volume setting across reboots.

TESTED = runs on Tungsten.

Change-Id: I9628b9369ca528b22413f62a9e7d697bae61d8ac
2012-04-03 17:37:58 -07:00
Andreas Huber
991c8733c3 Merge "More DRM/crypto support." 2012-04-03 14:27:35 -07:00
Andreas Huber
0e97fc248e More DRM/crypto support.
related-to-bug: 6275919
Change-Id: I9179c03f1f91f939afcb3b1c6514a200bf586c93
2012-04-03 14:16:07 -07:00
Mike Lockwood
b5f2088c8e Merge commit '7f71d01' 2012-04-03 11:54:11 -07:00
Mike Lockwood
3e29718d34 Merge commit '830ad08' 2012-04-03 11:50:08 -07:00
Marco Nelissen
4a727e3421 Merge "Support audio/ogg mimetype" 2012-04-03 08:37:07 -07:00
Marco Nelissen
dc912ed9c6 Support audio/ogg mimetype
audio/ogg has been the official mimetype for ogg vorbis audio for
a while now, so we should support it.

b/5824157

Change-Id: Ica86bdb3099a10785f1da9c3413284f3e11dc27e
2012-04-02 16:00:44 -07:00
Justin Koh
3caba51725 Broadcast mastervolume regardless of change.
Broadcast mastervolume intents regardless of whether the system changed the
volume. This fixes the bug where the volume LEDs stop getting updates.

TESTED = runs on Tungsten.

Change-Id: Id363da3f825934fd7785ed3d3e436f74e657b7e6
2012-04-02 15:46:56 -07:00
Andreas Huber
5a04bf3955 New API to query available codecs and their capabilities.
Change-Id: I448ba443a96d8fee2bc9179750d57362ed31d9d9
2012-04-02 15:43:42 -07:00
Eric Laurent
3d275af3c3 Merge "implemented synchronous audio capture" 2012-03-30 16:00:26 -07:00
James Dong
18a38b9f41 Merge "Removed obsolete opencore related comments" 2012-03-30 15:55:58 -07:00
Chih-Chung Chang
6ef1eedac7 Merge "Fix b/5353417 Images downloaded from browser are showing incorrect details (Time is shown as dec 31 1969)" 2012-03-30 02:50:07 -07:00
Eric Laurent
505e5c8859 implemented synchronous audio capture
Added the infrastructure to support the synchronization of playback and
capture actions on specific events.
The first requirement for this feature is to synchronize the audio capture
start with the full rendering of a given audio content.
The applications can further be extended to other use cases
(synchronized playback start...) by adding new synchronization events and
new synchronous control methods on player or recorders.

Also added a method to query the audio session from a ToneGenerator.

Change-Id: I4e47f5108c7cbbd3bd334a7fad9b3b6c5ba55d88
2012-03-29 19:48:40 -07:00
James Dong
7ae82ce1fd Removed obsolete opencore related comments
Change-Id: Ia05a889ea54a8f38d126508ffdcd09fe2a263538
2012-03-29 10:44:36 -07:00
RoboErik
45edba1b8b b/6232528 Reduce volume persist delay to 500ms
Change-Id: I45c32da0a1089ce8bc865e12b51c069a6db28fd4
2012-03-27 17:54:36 -07:00
Ray Chen
872e7b7073 Fix b/5353417 Images downloaded from browser are showing incorrect details (Time is shown as dec 31 1969)
MediaScanner sets DATE_TAKEN with EXIF's datetime tag value. When this information is not available,
ExifInterface will simply return -1 which is accidentally used by MediaScanner.

Adding a check to avoid it so MediaProvider can calculate the date taken from last modified time instead.

Change-Id: I305b93a6c5602cbb9f97c3bbd384d358bda030c6
2012-03-27 23:37:41 +08:00
Andreas Huber
9b8e496f4d Provisional support for secure decryption of media streams.
Change-Id: Ib3982a9c960bfdb0cb7e1b174440b141b194cfbe
2012-03-26 11:24:04 -07:00
Marco Nelissen
7061b5ffb3 Merge "Speed up playlist processing" 2012-03-26 07:36:41 -07:00
Marco Nelissen
c164faa831 Speed up playlist processing
The recent removal of the cache from MediaScanner (commit 58ef68905d67e356eb)
slowed down processing of playlists, in some cases significantly, due to every
line in a playlist prompting a query that looped over the entire audio table.

With this change, the query is only done once instead of for every line,
and the code starts iterating over the Cursor starting near the point of
the last match, instead of from the start. The latter is especially helpful
when the entire query result is too large to fit in a CursorWindow, since
it reduces the number of times that sqlite has to perform an offset query
under the hood to refil the window.

Change-Id: I9fea990b3b8c86571384de2122708fb7e809c355
2012-03-23 16:37:50 -07:00
Lei Zhang
6c798970cc Add batch volume adjust support to adjustMasterVolume() in AudioManager and
AudioService.

Change-Id: I09b1dfc93f14ca836e1ba2a400c00caed01fd541
2012-03-22 15:09:18 -07:00
RoboErik
24b082f87e Fix Audio ramping code
The audio ramping was being ignored and we were always adjusting
by the same amount.

Change-Id: Id4a6587fd488132816ae26776c0f798782470b1d
2012-03-22 15:09:12 -07:00
Wu-cheng Li
485932f6af Merge "Do not set camera preview display if the surface is null." 2012-03-19 19:25:56 -07:00