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

7291 Commits

Author SHA1 Message Date
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
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
Eino-Ville Talvala
1663033d96 am fb09a738: am ede3eeb7: Merge changes Ia6300c23,Idd2ae8ad into klp-dev 
* commit 'fb09a7381992c6ca88b35d3d0103b38051174928':
  Camera2: Immutable metadata
  Camera2: Listener rework and other API updates
 2013-09-11 17:24:56 -07:00
Ruben Brunk
b78b4af70d am fae16ab3: am 91019c9e: Merge "Remove dependency on JNIHelp header side effects." into klp-dev 
* commit 'fae16ab39fe651f97bf86e6f5fe07f95342450aa':
  Remove dependency on JNIHelp header side effects.
 2013-09-11 17:24:49 -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
Zhijun He
ed3544a695 am 10ccc326: am e550446d: Merge "ImageReader: Skip size check for BLOB format" into klp-dev 
* commit '10ccc3266e5e66a49a0c64678936fb0402b93c4a':
  ImageReader: Skip size check for BLOB format
 2013-09-11 17:24:00 -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
Eino-Ville Talvala
ede3eeb72c Merge changes Ia6300c23,Idd2ae8ad into klp-dev 
* changes:
  Camera2: Immutable metadata
  Camera2: Listener rework and other API updates
 2013-09-12 00:08:04 +00:00
Ruben Brunk
91019c9ef3 Merge "Remove dependency on JNIHelp header side effects." into klp-dev 2013-09-12 00:01:28 +00:00
Chong Zhang
bcb97996eb Merge "Pass subtitle track properties to SubtitleController" into klp-dev 2013-09-11 23:51:45 +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
Zhijun He
e550446dcf Merge "ImageReader: Skip size check for BLOB format" into klp-dev 2013-09-11 21:31:54 +00:00
Eino-Ville Talvala
70c2207c34 Camera2: Immutable metadata 
Make all camera metadata immutable once created; requests are
created using CameraRequest.Builder.

- Separate CameraMetadata implementation from interface
- Implement deep copying of metadata
- Requests/results/properties have-a native implementation

Bug: 10360518
Change-Id: Ia6300c237219d39f70c63156fa9ca666d951a36e
 2013-09-11 13:18:10 -07:00
Zhijun He
37682135da ImageReader: Skip size check for BLOB format 
HAL_PIXEL_FORMAT_BLOB is for JPEG capture, the buffer width/height by definition
shouldn't be the same as the image width/height.

Bug: 10360518
Change-Id: I32146a0e8e15439bb8fe199403db4ff37d1ab1af
 2013-09-11 13:18:00 -07:00
Eric Laurent
d5da9de816 Stress test for AudioTrack shared memory bug 
Changes in patch set 2:
 - add call to ProcessState::self()->startThreadPool()
 - remove dead code AudioSystem::get_audio_flinger
 - use simpler MemoryDealer isntead of MemoryHeapBase
 - AudioTrack now must be sp<> instead of raw pointer
 - use new constants from audio.h
 - change LOGx macros to ALOGx
 - fix file permission on Android.mk

Bug: 2801375
Change-Id: I899b08e0aa91deca328523f66f71e667011b4522
 2013-09-11 12:48:17 -07:00