6168 Commits

Author SHA1 Message Date
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
125c32ebe7 Merge "Add functional tests for Visualizer volume scaling mode" 2012-04-19 09:38:55 -07:00
Jean-Michel Trivi
997592b3ce Add functional tests for Visualizer volume scaling mode
Add test to set/get the volume scaling mode.

Add test to verify that volume decreases diminish the commputed
  energy.

Change-Id: I0a5d45d064a46a18e5c4b9d7a304c9572f100cdf
2012-04-19 09:13:22 -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
ab57d03bdb Fix a typo and choose a reasonable default for crypto-mode (0 would be unencrypted)
Change-Id: Ia46a7d7dd405bd569f319a64e43123d802c867d3
related-to-bug: 6275919
2012-04-18 15:59: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
Andreas Huber
2b9d6bd092 Make seekTo not throw exceptions.
Change-Id: I9d0469962364b86fbab920e9ac65f468fc630737
related-to-bug: 6276111
2012-04-17 15:02:22 -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
Yu Shan Emily Lau
8fa23393e9 Merge "Insert the 2 seconds before test start to workaround the race conditon for requesting the surface." 2012-04-04 21:20:54 -07:00
Yu Shan Emily Lau
a79edb7233 Insert the 2 seconds before test start to
workaround the race conditon for requesting
the surface.

Change-Id: Ic8ba358400492860b0d38fc71468ea4bb4d3d7bd
2012-04-04 21:17:04 -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
bff6a514da Merge "Persists the master mute volume setting." into ics-aah 2012-04-04 09:45:27 -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
Jason Noguchi
c0c4a20c0f am a72a06f3: am f5693a6a: am a784b3de: Fix build break introduced by missing parenthesis in camera stress test.
* commit 'a72a06f37ecdd615fb2a29faed99c7f128196211':
  Fix build break introduced by missing parenthesis in camera stress test.
2012-04-03 17:37:10 -07:00
Jason Noguchi
f5693a6a50 am a784b3de: Fix build break introduced by missing parenthesis in camera stress test.
* commit 'a784b3dea15dd0dfedfe25552b87fbb92a5eea52':
  Fix build break introduced by missing parenthesis in camera stress test.
2012-04-03 17:31:00 -07:00
Jason Noguchi
f499a0722b am a784b3de: Fix build break introduced by missing parenthesis in camera stress test.
* commit 'a784b3dea15dd0dfedfe25552b87fbb92a5eea52':
  Fix build break introduced by missing parenthesis in camera stress test.
2012-04-03 17:30:55 -07:00
Jason Noguchi
a784b3dea1 Fix build break introduced by missing parenthesis in camera stress test.
Change-Id: I8da9321a7674dbbe48cc0c214c0b043fbce8eeab
2012-04-03 17:01:50 -07:00
Jason Noguchi
b7cc80d8f3 am a5408a8c: am 34a4e519: am 6e6d8df5: Merge "Adding camera zoom test to mediaframework stress suite." into ics-mr1
* commit 'a5408a8c75a2839f1b0704f024cc4e523830c128':
  Adding camera zoom test to mediaframework stress suite.
2012-04-03 16:32:40 -07:00
Jason Noguchi
34a4e519b2 am 6e6d8df5: Merge "Adding camera zoom test to mediaframework stress suite." into ics-mr1
* commit '6e6d8df5d0ad0f97be8344c78aa4d70dadceb9a8':
  Adding camera zoom test to mediaframework stress suite.
2012-04-03 15:32:34 -07:00
Jason Noguchi
e371ed8de5 am 6e6d8df5: Merge "Adding camera zoom test to mediaframework stress suite." into ics-mr1
* commit '6e6d8df5d0ad0f97be8344c78aa4d70dadceb9a8':
  Adding camera zoom test to mediaframework stress suite.
2012-04-03 15:32:30 -07:00
Jason Noguchi
6e6d8df5d0 Merge "Adding camera zoom test to mediaframework stress suite." into ics-mr1 2012-04-03 15:30:22 -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