2278 Commits

Author SHA1 Message Date
Lajos Molnar
06429fba90 am 36c4adf9: am 990615e3: am fcd61bb5: Merge "Fix MediaTimeProvider seek & time drift recovery issue" into klp-dev
* commit '36c4adf9f713602722ebd99c4b44137f6240fca7':
  Fix MediaTimeProvider seek & time drift recovery issue
2013-10-02 09:43:17 -07:00
Jean-Michel Trivi
4c9110fcfc am 13715943: am b4c6b241: Merge "Cache RemoteController artwork bitmap size, use it in registration" into klp-dev
* commit '13715943f24760fbeb462dd601a52af410faac20':
  Cache RemoteController artwork bitmap size, use it in registration
2013-10-01 23:10:49 -07:00
Jean-Michel Trivi
e8e560e061 am db0944de: am 60e7f819: Merge "Improve RemoteControlDisplay registration" into klp-dev
* commit 'db0944de128247e7e6016982a14513b04ac5e6f1':
  Improve RemoteControlDisplay registration
2013-10-01 23:10:46 -07:00
Lajos Molnar
fcd61bb587 Merge "Fix MediaTimeProvider seek & time drift recovery issue" into klp-dev 2013-10-01 16:37:06 +00:00
Jean-Michel Trivi
b4c6b241fb Merge "Cache RemoteController artwork bitmap size, use it in registration" into klp-dev 2013-09-30 23:24:01 +00:00
Jean-Michel Trivi
60e7f8191e Merge "Improve RemoteControlDisplay registration" into klp-dev 2013-09-30 23:22:58 +00:00
Lajos Molnar
d58b122208 Fix MediaTimeProvider seek & time drift recovery issue
Handle MEDIA_SKIPPED event

Prevent notifyTimedEvent events (REFRESH_AND_/NOTIFY_TIME)
to eclipse NOTIFY_SEEK events.

Add automatic seek when time drifts too much.  This should
not happen under normal circumstances, but is there to recover
from any unannounced media time discontinuity.

Change-Id: I8d7fdac2b0b6a9e62d2860461e6a25788e77fef8
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug: 10954008
2013-09-30 15:50:31 -07:00
David Friedman
9da75524d1 am d42e4132: am 233a341b: am 1b8e3197: am 8c38ea39: Merge "Docs: Fixed wrong parameter in SoundPool file; fixed typo in security file. Bug: 10807931 10796994" into jb-mr2-docs
* commit 'd42e4132bafe1b7cf6a665b6a0ed3160fe3ac991':
  Docs: Fixed wrong parameter in SoundPool file; fixed typo in security file. Bug: 10807931 10796994
2013-09-30 14:16:57 -07:00
Lajos Molnar
acb1088189 am 974a6e12: Merge "Make SubtitleController thread safe" into klp-dev
* commit '974a6e1231f80644e382567c5f0a5fb9b6962d27':
  Make SubtitleController thread safe
2013-09-30 14:16:49 -07:00
Jean-Michel Trivi
86142da1ce Improve RemoteControlDisplay registration
When a new RemoteControlDisplay gets registered, don't cause all
  existing RemoteControlDisplays to re-receive RemoteControl
  information they already have.

Bug 8417073

Change-Id: Icc8e7104d6870f748fddd702692789dbaef948ac
2013-09-29 16:57:08 -07:00
Jean-Michel Trivi
8ab8c2d061 Cache RemoteController artwork bitmap size, use it in registration
Allow an app to set the artwork configuration at any point
  regardless of the registration state, and cache the width/height
  values.
If the RemoteController is already registered, apply them.
If the RemoteController is not registered, use the cached value
  when the object gets registered.

Bug 10862527

Change-Id: If633e2b9383e7d59690288d2271113e98b195cd8
2013-09-29 12:17:13 -07:00
David Friedman
d42e4132ba am 233a341b: am 1b8e3197: am 8c38ea39: Merge "Docs: Fixed wrong parameter in SoundPool file; fixed typo in security file. Bug: 10807931 10796994" into jb-mr2-docs
* commit '233a341b6d9477f7f41d5a954fa7f7a150972ccb':
  Docs: Fixed wrong parameter in SoundPool file; fixed typo in security file. Bug: 10807931 10796994
2013-09-27 15:57:56 -07:00
Lajos Molnar
974a6e1231 Merge "Make SubtitleController thread safe" into klp-dev 2013-09-27 22:57:22 +00:00
Lajos Molnar
29f5183794 Make SubtitleController thread safe
Add the concept of an anchor looper.
Allow show/hide/selectTrack/selectDefaultTrack to be called from thread
other than anchor looper.

Change-Id: Iaf2f3d3c46d1b00a0a24156745ec16b301c80c04
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug: 10919206
2013-09-27 14:55:36 -07:00
David Friedman
233a341b6d am 1b8e3197: am 8c38ea39: Merge "Docs: Fixed wrong parameter in SoundPool file; fixed typo in security file. Bug: 10807931 10796994" into jb-mr2-docs
* commit '1b8e319784a1bb166aaa6b0f1dc306f8d4b6e57f':
  Docs: Fixed wrong parameter in SoundPool file; fixed typo in security file. Bug: 10807931 10796994
2013-09-27 10:37:07 -07:00
David Friedman
36b692d8ef Docs: Fixed wrong parameter in SoundPool file; fixed typo in security file.
Bug: 10807931 10796994

Change-Id: I8c8e07c3e8606d5983c2545fa6638af45650d27c
2013-09-27 10:04:48 -07:00
Marco Nelissen
4cce5d76df am 6e14f9bc: am 2c702990: Merge "Fix logic in fallback ringtone handling" into klp-dev
* commit '6e14f9bc9086edf1112ea5e7f5f010251b65f926':
  Fix logic in fallback ringtone handling
2013-09-26 13:01:20 -07:00
Marco Nelissen
2c70299029 Merge "Fix logic in fallback ringtone handling" into klp-dev 2013-09-26 19:56:13 +00:00
Marco Nelissen
19a4671b10 Fix logic in fallback ringtone handling
The existing code would only play a fallback ringtone if the requested
ringtone was one of the three ringtone uris that are defined by settings,
and it wasn't set to "silent".
Now it also plays the fallback for custom ringtone uris.

b/10891718

Change-Id: I79c2298c6497165e6845b98532cce0855347e50b
2013-09-26 12:44:55 -07:00
Alan Viverette
e4b0a9a940 am 607ea331: am 812b6426: Merge "Fix caption rendering" into klp-dev
* commit '607ea331ebe6f133a7e95a0e37d4c00085646708':
  Fix caption rendering
2013-09-25 15:26:57 -07:00
Alan Viverette
7fe420f31b Fix caption rendering
Fixed rendering of captions in regions and incorrect caption width
measurement. Removes minimum-difference line wrapping, since the
results weren't consistent with StaticLayout's rendering.

BUG: 10917766, 10822229
Change-Id: I55ef28cbf383fd6b945c0be62e440781288364f1
2013-09-25 12:35:00 -07:00
Jean-Michel Trivi
8a7ae6708d am 6dda4984: am 80e8a28c: Merge "Fix artwork not received in RemoteController metadata update." into klp-dev
* commit '6dda4984cf636c2804ee6c6b109bcbb69d4baa04':
  Fix artwork not received in RemoteController metadata update.
2013-09-24 16:42:49 -07:00
Jean-Michel Trivi
80e8a28c33 Merge "Fix artwork not received in RemoteController metadata update." into klp-dev 2013-09-24 23:37:22 +00:00
Lajos Molnar
9ae69e73af am 6ce2967f: am 566d6b65: Merge "WebVttRenderer: allow BOM at beginning of a WebVTT file." into klp-dev
* commit '6ce2967fa4e9c2a8f8dab741c58c622bacb34a4c':
  WebVttRenderer: allow BOM at beginning of a WebVTT file.
2013-09-24 11:41:52 -07:00
Lajos Molnar
566d6b6534 Merge "WebVttRenderer: allow BOM at beginning of a WebVTT file." into klp-dev 2013-09-24 18:37:12 +00:00
Jean-Michel Trivi
62719220a1 am e783ffab: am bc05918c: Merge "Public API for peak and RMS monitoring through the Visualizer effect" into klp-dev
* commit 'e783ffab89dbe612a4865a1a1e1a7814522b0ef4':
  Public API for peak and RMS monitoring through the Visualizer effect
2013-09-24 10:26:46 -07:00
Jean-Michel Trivi
30231077a7 am b25f2640: am e9b0dd89: Merge "Add audio level monitoring capabilities in Visualizer effect" into klp-dev
* commit 'b25f26405234f5f8e98467f4f09184990dd5a496':
  Add audio level monitoring capabilities in Visualizer effect
2013-09-24 10:23:01 -07:00
Lajos Molnar
283fe37aa2 WebVttRenderer: allow BOM at beginning of a WebVTT file.
This is part of the spec.

Change-Id: I61ccc259c0b9d3a2bc4273925665d107b0c89c62
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug: 10900755
2013-09-24 10:13:43 -07:00
Jean-Michel Trivi
6d298811ef Fix artwork not received in RemoteController metadata update.
Regardless of the artwork value, always update the metadata.

When updating the metadata, make sure the artwork is stored
 in the artwork field, not in the bundle of the MetadataEditor.

Bug 10862527

Change-Id: Iec83fd9bb358a91c852099b30bb6d307a52a034c
2013-09-23 18:34:23 -07:00
Jean-Michel Trivi
01b5743aee Public API for peak and RMS monitoring through the Visualizer effect
Public API to extend the capabilities of the Visualizer audio
  effect with measurements of peak and RMS values.

Bug 8413913

Change-Id: Ifc6646e013ec55fde3523fab685add1d043f1272
2013-09-23 16:41:53 -07:00
Jean-Michel Trivi
badca26cb2 Add audio level monitoring capabilities in Visualizer effect
Extend the visualizer audio effect with the capability to query
 peak and RMS values for the currently playing audio.
Values are expressed in mB and are retrieved as an array of
 int values in the native layer, and written directly as
 object fields for the JNI.

Bug 8413913

Change-Id: I808075a18e61f85c566544a2bdaae10e5c4a644b
2013-09-23 14:03:39 -07:00
Jean-Michel Trivi
80326646b7 am 58910a74: am 1608f496: Merge "Public API for RemoteController" into klp-dev
* commit '58910a746ebf915264b87536ab25148a94714ca2':
  Public API for RemoteController
2013-09-19 08:57:33 -07:00
Jean-Michel Trivi
1608f496a3 Merge "Public API for RemoteController" into klp-dev 2013-09-19 15:49:40 +00:00
Jean-Michel Trivi
a83487e8c6 Public API for RemoteController
Public API, under system|signature permission for access to
  currently playing metadata and playback state.
Public API for sending media key events.

Bug 8209392

Change-Id: I39b9309ca3fb1bc305492bad98740df0ae0842b2
2013-09-18 18:12:51 -07:00
Zhijun He
44ed752191 am 30ba38ac: am bf143ff1: Merge "ImageReader: disable NV21 support" into klp-dev
* commit '30ba38ac783dfaa5b784fef9450a173abc6710f3':
  ImageReader: disable NV21 support
2013-09-18 10:54:54 -07:00
Zhijun He
bf143ff195 Merge "ImageReader: disable NV21 support" into klp-dev 2013-09-18 17:49:30 +00:00
Zhijun He
4eda9f5359 ImageReader: disable NV21 support
Bug: 10787131
Change-Id: I5ff0a67144b5ec49eabde6129423a41c9597c2b8
2013-09-18 10:30:50 -07:00
Lajos Molnar
161f7c9be8 am 0fe0fe95: am b8462457: Merge "Misc. media API changes" into klp-dev
* commit '0fe0fe95015040f4b413bfad8c32e125e8d824d0':
  Misc. media API changes
2013-09-18 10:26:51 -07:00
Lajos Molnar
b84624571b Merge "Misc. media API changes" into klp-dev 2013-09-18 17:20:08 +00:00
Lajos Molnar
370da09782 am e3d75c9d: am e23ce3b1: Merge "Add CaptioningManager listener Subtitle support." into klp-dev
* commit 'e3d75c9dc8d45f3a1f16601e6d20a2fe10d5d479':
  Add CaptioningManager listener Subtitle support.
2013-09-18 09:53:01 -07:00
Lajos Molnar
e23ce3b1fc Merge "Add CaptioningManager listener Subtitle support." into klp-dev 2013-09-18 16:46:39 +00:00
Jesse Hall
0741bdefef am 1f9b4861: am 11c92012: Merge "Fix ImageReader onImageAvailable synchronization" into klp-dev
* commit '1f9b486142408bcdd24d31d6f4a3b2fc96aa6f64':
  Fix ImageReader onImageAvailable synchronization
2013-09-17 20:36:29 -07:00
Jesse Hall
11c9201240 Merge "Fix ImageReader onImageAvailable synchronization" into klp-dev 2013-09-18 03:32:17 +00:00
Jean-Michel Trivi
14517e6978 am d9250563: am f841d701: Fix javadoc in RemoteControlClient and MediaMetadataEditor
* commit 'd925056344ca2bd8e3418aefe68774893802f10f':
  Fix javadoc in RemoteControlClient and MediaMetadataEditor
2013-09-17 19:33:08 -07:00
Jean-Michel Trivi
cac8a1c08c am f54f7d70: am 15bcc323: Merge "RemoteController class to expose IRemoteControlDisplay features" into klp-dev
* commit 'f54f7d707546a99ffc5345591f2c9488e6149e84':
  RemoteController class to expose IRemoteControlDisplay features
2013-09-17 19:29:09 -07:00
Jean-Michel Trivi
f841d70155 Fix javadoc in RemoteControlClient and MediaMetadataEditor
Change-Id: Ibd333d9cb47e74c4ca1d8ec7bd950224d81783b0
2013-09-17 19:13:55 -07:00
Lajos Molnar
8a39021dfa Misc. media API changes
- MediaCodec.setParameter signature to take android.os.Bundle
- PARAMETER_KEY_VIDEO_BITRATE value
- comments for MediaFormat.KEY_LANGUAGE and createSubtitleFormat

Change-Id: I092e9830cb21df08b331854cbd28c758db06bc10
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug: 10461617
2013-09-17 19:05:37 -07:00
Jean-Michel Trivi
7ddd226e7c RemoteController class to expose IRemoteControlDisplay features
Wrap all the features of IRemoteControlDisplay.aidl in a
 new class, RemoteController, that implements the
 IRemoteControlDisplay interface.

The API functions to expose in the SDK are tagged with
 "CANDIDATE FOR API"

Bug 8209392

Change-Id: I597bcd503ac93e73889c9ae8b47b16c4fcb363bc
2013-09-18 01:47:25 +00:00
Jesse Hall
c395fffd90 Fix ImageReader onImageAvailable synchronization
This avoids a race where close() can return while there are still
onImageAvailable callbacks pending.

Bug: 10666923
Change-Id: Ic519b68f3132ceb7f95a9a42ebd1032c1638fbf5
2013-09-17 18:21:30 -07:00
Matthew Xie
9c1109fa07 am 1d47f003: am c9d1d5f3: Adjust absolute volume only when the device is streaming music
* commit '1d47f0033b8d46ec476c9e5985f6ce913d4a63aa':
  Adjust absolute volume only when the device is streaming music
2013-09-17 16:55:21 -07:00