2544 Commits

Author SHA1 Message Date
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
Matthew Xie
c9d1d5f350 Adjust absolute volume only when the device is streaming music
The device has to be A2DP device
Remove AudioManager#avrcpUpdateVolume
bug 10681804

Change-Id: I2bc85e48fdff374638b984af593c6f1c4ddd3ee6
2013-09-17 23:48:19 +00:00
Jean-Michel Trivi
d5ed25f805 am 144835ae: am f03ceff2: Merge "Revise new public API for ratings in RemoteControlClient" into klp-dev
* commit '144835aef8045039ea303bd7d7f03114aea21935':
  Revise new public API for ratings in RemoteControlClient
2013-09-17 15:40:54 -07:00
Jean-Michel Trivi
f03ceff2f5 Merge "Revise new public API for ratings in RemoteControlClient" into klp-dev 2013-09-17 22:35:08 +00:00
Jean-Michel Trivi
88183e67d4 Revise new public API for ratings in RemoteControlClient
Refactor RemoteControlClient.MetadataEditor to move functionality
 in new abstract class MediaMetadataEditor, so it can be also
 used on the "display" side of the RemoteControl functionality.
Compatibility of these changes has been tested against
 existing Play applications which use the RemoteControlClient API.

Move the new constants and method definitions related to the
 ratings feature to MediaMetadataEditor. This changes the
 yet-to-be-published ratings API, so this doesn't break
 compatibility.
Rating feature is handled by the new Rating class with a set
 of constructors that handle the different rating models.

Bug 8440498

Change-Id: I9b6dc2204bfc48594bad5cd6449d357f8a485da0
2013-09-17 15:13:00 -07:00
Lajos Molnar
d486f9656a Add CaptioningManager listener Subtitle support.
Update default track selection based on settings change.
Implement HLS track selection scheme.
This requires synchronization for subtitletrack and controller.

Change-Id: I8295956d264ab2016a83957ace37d9d7b1acde4c
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug: 10326117
2013-09-17 10:09:18 -07:00
Jean-Michel Trivi
cb49d18c27 am eded3b50: am 2a07bde6: Merge "Public API for LoudnessEnhancer audio effect" into klp-dev
* commit 'eded3b50d7f5a334e138338fbeac508fb0c7b679':
  Public API for LoudnessEnhancer audio effect
2013-09-17 09:05:43 -07:00
Jean-Michel Trivi
c3c0b9921f Public API for LoudnessEnhancer audio effect
Follows the API style of the other audio effects

Bug 8413913

Change-Id: I1ee21b0af7d9fc565d9cdacd006684577eeb7b21
2013-09-16 18:07:02 -07:00
Jean-Michel Trivi
4d567f538d am 49e12b69: am 3fb53d82: Merge "Loudness enhancer audio effect" into klp-dev
* commit '49e12b699df1a132445640afd1403b47dc5b4bee':
  Loudness enhancer audio effect
2013-09-16 17:59:56 -07:00
Jean-Michel Trivi
3fb53d8238 Merge "Loudness enhancer audio effect" into klp-dev 2013-09-17 00:52:19 +00:00
Igor Murashkin
8f64e3cd42 am 14297141: am 5cf86aa7: Merge "media: Update ImageReader to remove MaxImagesAcquiredException" into klp-dev
* commit '142971418c8e9ca539dae40f3c2532956f258e6b':
  media: Update ImageReader to remove MaxImagesAcquiredException
2013-09-16 14:08:23 -07:00
Igor Murashkin
5cf86aa756 Merge "media: Update ImageReader to remove MaxImagesAcquiredException" into klp-dev 2013-09-16 21:02:32 +00:00
Igor Murashkin
5454e3ddcc am 720b1fce: am 26cb5fd5: Merge "media: Update ImageReader APIs" into klp-dev
* commit '720b1fcecd6c21bf4fbe6d3822e52c8a092b93c4':
  media: Update ImageReader APIs
2013-09-16 13:24:58 -07:00
Igor Murashkin
26cb5fd5ff Merge "media: Update ImageReader APIs" into klp-dev 2013-09-16 20:19:15 +00:00
Jean-Michel Trivi
d69e4e1422 Loudness enhancer audio effect
LoudnessEnhancer as android.media.AudioEffect subclass

Define UUID for loudness enhancer effect

Bug 8413913

Change-Id: If0ae6023f77ccf3aafbb55f2b3135b2ea1bb8365
2013-09-16 11:12:27 -07:00
Igor Murashkin
e3351f1942 media: Update ImageReader to remove MaxImagesAcquiredException
* acquiring images now throws IllegalStateException instead of
    MaxImagesAcquiredException

Bug: 10691447
Change-Id: I7ce68f990fb96703705b9181012a28633fea0b7a
2013-09-13 23:27:44 -07:00
Alan Viverette
d17e719da0 Merge "Clean up layout constructors, make them consistent" 2013-09-14 01:22:45 +00:00
Jeff Tinker
62642e1b8e am 3b3b2efb: am fff175ae: Merge "Part of corrections from KLP API Review: Media" into klp-dev
* commit '3b3b2efb077b56f65a9c48c95f8dfab9af5ec531':
  Part of corrections from KLP API Review: Media
2013-09-13 17:32:10 -07:00
Jeff Tinker
fff175aedc Merge "Part of corrections from KLP API Review: Media" into klp-dev 2013-09-14 00:16:34 +00:00
Jeff Tinker
b6f0f962d9 Part of corrections from KLP API Review: Media
b/10461617

Change-Id: Ic2e102c39428f7cef2923d00a67aec8c77cd108e
2013-09-13 15:32:08 -07:00
Lajos Molnar
4e8f5e3f78 am 6118745b: am ab62870c: Merge "MediaFormat: add getInteger with default value convenience method" into klp-dev
* commit '6118745be53fed977edf1b29a2b0ecd2222e33a8':
  MediaFormat: add getInteger with default value convenience method
2013-09-12 21:57:28 -07:00
Lajos Molnar
fb73df74d5 am 736469ad: am 8c16943e: Merge "Fix CalledFromWrongThreadException in MediaPlayer\'s subtitle support" into klp-dev
* commit '736469ad5d9b21071d187a07e8f2575910960b7d':
  Fix CalledFromWrongThreadException in MediaPlayer's subtitle support
2013-09-12 21:57:21 -07:00
Igor Murashkin
5e712064df media: Update ImageReader APIs
Bug: 10461757
Change-Id: Ic04e4c41965e3d417b29004f3f08e0cd56b8f4cb
2013-09-12 16:57:57 -07:00
Lajos Molnar
24390c11b2 MediaFormat: add getInteger with default value convenience method
Change-Id: I58947a2f4a286fef74f74cb189469278056d4759
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug: 10326117
2013-09-12 15:35:31 -07:00
Lajos Molnar
9d48089595 Fix CalledFromWrongThreadException in MediaPlayer's subtitle support
Call selectTrack/setSubtitleWidget only from MP's looper or the
applications's event thread, which is the same for now (we only
support subtitles in VideoView.)

Change-Id: Ic1de923b801f28657f37e0330b95c321931a6960
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug: 10691837
Bug: 10326117
2013-09-12 15:35:31 -07:00
Lajos Molnar
c4eae8ec47 am 5481e5fe: am 03cd51cd: Merge "MediaFormat.java: Add KEY_MAX_WIDTH and KEY_MAX_HEIGHT" into klp-dev
* commit '5481e5fe30e3708f8a7a9ea8a1dabfa4ae050370':
  MediaFormat.java: Add KEY_MAX_WIDTH and KEY_MAX_HEIGHT
2013-09-11 17:31:00 -07:00
Eric Laurent
835b5f344b am e33b79ef: am 95a18139: Merge "Add HOTWORD as an AudioSource" into klp-dev
* commit 'e33b79ef373fd3db9de035b5ecf2137a0684a441':
  Add HOTWORD as an AudioSource
2013-09-11 17:25:05 -07:00
Chong Zhang
0b8dd03313 am 1c6835a2: am bcb97996: Merge "Pass subtitle track properties to SubtitleController" into klp-dev
* commit '1c6835a28a03409eb6f3368b2466993fb993c7a6':
  Pass subtitle track properties to SubtitleController
2013-09-11 17:24:35 -07:00
Lajos Molnar
03cd51cd17 Merge "MediaFormat.java: Add KEY_MAX_WIDTH and KEY_MAX_HEIGHT" into klp-dev 2013-09-12 00:19:17 +00:00
Eric Laurent
95a181397d Merge "Add HOTWORD as an AudioSource" into klp-dev 2013-09-12 00:15:31 +00:00
Dianne Hackborn
8d717b917c resolved conflicts for merge of 03422d26 to master
Change-Id: I5d012fb122224c949a0039450bf0a9a475dc8e82
2013-09-11 16:43:22 -07:00
Chong Zhang
f8ca13b7a0 Pass subtitle track properties to SubtitleController
Bug: 10326117
Change-Id: I387406adf3e1bd835b031dd5fbd2e1cdeaf2fe87
2013-09-11 15:02:47 -07:00
Dianne Hackborn
95d785346b Fix issue #10688644: Java crash in com.android.phone:
java.lang.SecurityException: Operation not allowed

There was a situation I wasn't taking into account -- components
declared by the system has a special ability to run in the processes
of other uids.  This means that if that code loaded into another
process tries to do anything needing an app op verification, it will
fail, because it will say it is calling as the system package name but
it is not actually coming from the system uid.

To fix this, we add a new Context.getOpPackageName() to go along-side
getBasePackageName().  This is a special call for use by all app ops
verification, which will be initialized with either the base package
name, the actual package name, or now the default package name of the
process if we are creating a context for system code being loaded into
a non-system process.

I had to update all of the code doing app ops checks to switch to this
method to get the calling package name.

Also improve the security exception throw to have a more descriptive
error message.

Change-Id: Ic04f77b3938585b02fccabbc12d2f0dc62b9ef25
2013-09-11 09:59:47 -07:00
Eric Laurent
357263da0e Add HOTWORD as an AudioSource
- This is a low-priority source that can be preempted by others
- This is required for scenarios where someone wants an alway-on
  graceful microphone

Bug: 10640877.

Change-Id: Idb3577541103717cb713a7a93d3762ad2c2f4710
2013-09-10 18:03:10 -07:00
Alan Viverette
d6479ec5ee Clean up layout constructors, make them consistent
All constructors now flow through to each class's own 4-argument
constructor. This ensures that theme attributes are applied even
if a base AttributeSet is not provided.

BUG: 10680863
Change-Id: I727d2961bf017c6a5e0206367081670782583394
2013-09-10 17:03:02 -07:00
Zhijun He
b87857b50b am 487a8fc9: am 82d11f8e: Merge "MediaMuxer: Add setLocation API" into klp-dev
* commit '487a8fc9d487a68159c57b4de896ba7be88f1c2b':
  MediaMuxer: Add setLocation API
2013-09-10 12:48:13 -07:00
Zhijun He
82d11f8e94 Merge "MediaMuxer: Add setLocation API" into klp-dev 2013-09-10 19:41:11 +00:00