drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
114,205 Commits 1 Branch 0 Tags
Commit Graph

7312 Commits

Author SHA1 Message Date
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
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
2a07bde607 Merge "Public API for LoudnessEnhancer audio effect" into klp-dev 2013-09-17 16:00:07 +00:00
Zhijun He
465d3f4e48 am 6ab1f235: am 48811160: Merge "ImageReader: fix the 0 crop rect size issue" into klp-dev 
* commit '6ab1f2355ca8f9464954ee8bf720fcfc7449052d':
  ImageReader: fix the 0 crop rect size issue
 2013-09-16 19:12:34 -07:00
Zhijun He
4881116047 Merge "ImageReader: fix the 0 crop rect size issue" into klp-dev 2013-09-17 02:07:21 +00: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
Zhijun He
9e6d073a99 ImageReader: fix the 0 crop rect size issue 
Rect isValid actually include the zero size case, which we don't want to include
in our case. This causes camera ImageReader test case fails at buffer size
sanity check.

Bug: 9802344
Change-Id: I561f5a049c6117c613df1e1b2789c43af9a19628
 2013-09-16 16:03:36 -07:00
Yu Shan Emily Lau
5a1490a75c am 8e09984a: am 98d18bbc: Merge "Fix media stress test." into klp-dev 
* commit '8e09984a56a4ff12c8726d7c2c6902f1bf081d6f':
  Fix media stress test.
 2013-09-16 14:19:15 -07:00
Yu Shan Emily Lau
98d18bbc5e Merge "Fix media stress test." into klp-dev 2013-09-16 21:11:25 +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
Yu Shan Emily Lau
c10b55a5e4 Fix media stress test. 
1) Fix the CamcorderProifle initalization.
2) Insert 2 seconds after camera release.

Change-Id: Ib22f1922a917233f3d1020dc67de834e00fd0959
 2013-09-16 12:50:12 -07:00
Glenn Kasten
d441ce0570 am b66cc514: am 6b2b8459: Merge "Miscellaneous fixes to SoundPool unit test" into klp-dev 
* commit 'b66cc5147f45b5fe181f18d0f6b55c5f470c731f':
  Miscellaneous fixes to SoundPool unit test
 2013-09-16 11:30:43 -07:00
Glenn Kasten
3a881d639a am ef5b1a05: am 36317eac: Merge "Stress test for AudioTrack shared memory bug" into klp-dev 
* commit 'ef5b1a05a084ea66d906c6014b4de0081893d16c':
  Stress test for AudioTrack shared memory bug
 2013-09-16 11:30:40 -07:00
Glenn Kasten
6b2b845948 Merge "Miscellaneous fixes to SoundPool unit test" into klp-dev 2013-09-16 18:24:13 +00:00
Glenn Kasten
36317eac4b Merge "Stress test for AudioTrack shared memory bug" into klp-dev 2013-09-16 18:23:54 +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
Zhijun He
6f4fcfe4f5 am 1a6e17e8: am 869f44cc: Merge "ImageReader: get correct crop size" into klp-dev 
* commit '1a6e17e80ae4e27b2135259aeca29e889f12872d':
  ImageReader: get correct crop size
 2013-09-16 10:41:30 -07:00
Zhijun He
cfa553369f ImageReader: get correct crop size 
Bug: 10752797
Change-Id: I2e56d69cde7f5ca669a366646b876861b277a239
 2013-09-16 09:49:28 -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
Glenn Kasten
53d1537606 Miscellaneous fixes to SoundPool unit test 
Explicitly specify API level 8, to permit same .apk be used with multiple platform versions.
In the priority test, use different samples for low and priority sounds,
    so it is possible to hear the difference.
Increase sleep times to make it easier to hear.
Only use Log.e for errors.
Add more logs and sleeps.
Pan more slowly.
Fix typos in logs about the test names.
Fix typo in pan comment.

Change-Id: Iebce07ca0cf3d6fa1b04faa8577faa1c6d25f8e6
 2013-09-13 13:48:38 -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