3985 Commits

Author SHA1 Message Date
Dongwon Kang
13d43ff02a am d3fad391: am 633a45a0: am 25466e0a: Merge "TIF: throw an exception if an operation takes too long." into mnc-dev
* commit 'd3fad391e1ccc79fbd0b9330f2aab60bf5b2075b':
  TIF: throw an exception if an operation takes too long.
2015-04-29 06:04:43 +00:00
Dongwon Kang
d3fad391e1 am 633a45a0: am 25466e0a: Merge "TIF: throw an exception if an operation takes too long." into mnc-dev
* commit '633a45a0d4e095ae81fc2c3e882c23a6513bbaee':
  TIF: throw an exception if an operation takes too long.
2015-04-29 05:52:39 +00:00
Dongwon Kang
25466e0a8f Merge "TIF: throw an exception if an operation takes too long." into mnc-dev 2015-04-29 05:34:26 +00:00
Dongwon Kang
21add3ecc9 TIF: throw an exception if an operation takes too long.
Bug: 19383373
Change-Id: I915f77af3ab12d10810fd85e55d7d5c5da3d6136
2015-04-29 14:33:24 +09:00
Jae Seo
7e18baa354 Merge "TIF: Put comments for the newly added US and Canadian rating strings" 2015-04-29 02:57:27 +00:00
Svet Ganov
fa5ecdc4ac Respect the record audio app op - framework
Change-Id: I5696d2ef22738ccffaf8bd7a0ee68cbc3dea3bf1
2015-04-28 16:31:58 -07:00
Marco Nelissen
8dc50416a2 resolved conflicts for merge of 375e21f8 to mnc-dev-plus-aosp
Change-Id: I5681890381beed09e8719b066d0c37accae1658d
2015-04-28 09:42:54 -07:00
Marco Nelissen
375e21f811 Merge "Sometimes the application context is null" 2015-04-28 15:26:54 +00:00
Dongwon Kang
b73868ddf8 TIF: add new audio modes to the timeShiftSetPlaybackRate() javadoc.
Bug: 20509313
Change-Id: I762bb74ae2a1688e1bc6cdbf6bf5a8b931ae0689
2015-04-28 17:24:51 +09:00
Arunesh Mishra
bc92227d6c Add near-ultrasound properties to AudioManager.java
Change-Id: I582275aa5f2a2ca55d4028e81ff3e79cf7c793cc
2015-04-27 10:37:17 -07:00
Andy Hung
09f9a7adb3 Merge "Hide stretch mode from PlaybackSettings" 2015-04-25 01:28:47 +00:00
Andy Hung
18cb3b5a27 Hide stretch mode from PlaybackSettings
Different timestretch modes won't be ready for M.

Change-Id: I4fe5ceee5bdf90cb735eb415185812603b5c68a8
2015-04-24 17:32:57 -07:00
Andy Hung
14862ad8a9 Merge "Move channel index computation to native AudioTrack JNI" 2015-04-25 00:18:22 +00:00
Andy Hung
50c1ed73cd Merge "Unhide new channel masks and deprecate old channel masks" 2015-04-24 23:43:35 +00:00
Jae Seo
344f9e5e9a Merge "TIF: Add TvContentRating constant for unrated content" 2015-04-24 23:41:21 +00:00
Arunesh Mishra
b4d533ba53 Merge "Add AudioManager property strings for ultrasound." 2015-04-24 23:29:39 +00:00
Andy Hung
30d794360f Move channel index computation to native AudioTrack JNI
Change-Id: I047a9dcce13a38c11da165607d668dfb9d7fa335
2015-04-24 16:08:27 -07:00
Zhijun He
f9c2dcf6b4 Merge "Image: fix build break" 2015-04-24 22:38:50 +00:00
Zhijun He
766ba09207 Image: fix build break
Change-Id: I51e91a6c370626603f79371c16c8a10195ba63da
2015-04-24 15:34:11 -07:00
Jae Seo
9677822097 Merge "TIF: Use Preconditions.checkNotNull for null checking" 2015-04-24 22:03:44 +00:00
Zhijun He
18191b4a52 Merge "ImageWriter: fix and cleanup the closed Image Handling" 2015-04-24 21:59:21 +00:00
Lajos Molnar
e0112b51a1 MediaSync: rename onReturnAudioBuffer to onAudioBufferConsumed
Bug: 19666434
Change-Id: I117d4a1ab29e5c8e02879d2321316b669c8e43ae
2015-04-24 14:47:38 -07:00
Wei Jia
197b3daed7 Merge "MediaSync: add OnErrorListener." 2015-04-24 21:46:22 +00:00
Wei Jia
746306521a MediaSync: add OnErrorListener.
Bug: 19666434
Change-Id: I34983d6101cc0f93ee74bdcec5d272808842a5c2
2015-04-24 14:32:36 -07:00
Andy Hung
7fdf51b18a Unhide new channel masks and deprecate old channel masks
Change-Id: Ie95a38e782fe491ffc2f2670c2b9f52afb33abdd
2015-04-24 14:27:21 -07:00
Zhijun He
a58271419e ImageWriter: fix and cleanup the closed Image Handling
Attempting to access an Image after it is closed will result in an ISE.

Also fixed some minor doc issues.

Bug: 19872785
Change-Id: I91f037b2b2f243fcbd905d5a646b505bc9c10638
2015-04-24 13:35:07 -07:00
Arunesh Mishra
d08715e503 Add AudioManager property strings for ultrasound.
Change-Id: Ia1bc257affdb5afe2b6a00bcca53651f924be7d2
2015-04-24 13:01:08 -07:00
Jae Seo
de08be8f79 TIF: Use Preconditions.checkNotNull for null checking
Bug: 19941047
Change-Id: Ib2b5d86d21ecc48888f9343a0e8f16b08fef6925
2015-04-24 12:46:36 -07:00
Andy Hung
5a4ee7b62e Merge "Fix API level in documentation to refer to MNC" 2015-04-24 19:22:22 +00:00
Andy Hung
35e576e792 Fix API level in documentation to refer to MNC
Change-Id: I2ab646fce1c3f58b11d88a47e733621d8f1fec79
2015-04-24 12:18:14 -07:00
Andy Hung
980d25ea4a Merge "Increase AudioTrack and AudioRecord max sample rate to 192kHz" 2015-04-24 19:16:21 +00:00
Andy Hung
8fd0928cdb Increase AudioTrack and AudioRecord max sample rate to 192kHz
For pro-audio purposes.

Change-Id: Ie5de6736175879c074ed393a14ca88720de083c7
2015-04-23 23:49:17 -07:00
Jae Seo
7843e10e60 TIF: Add TvContentRating constant for unrated content
Bug: 19102311
Change-Id: I159a3d05197539b4badee6dccf21f15c388b186e
2015-04-23 23:36:07 -07:00
Jae Seo
c8b7356434 TIF: Start using the @NonNull annotation
Added the @NonNull annotation to the code where null check is required

Bug: 19941047
Change-Id: I9fd1f4c7ea4679c03bf831d90804488282a1c5d4
2015-04-23 22:47:24 -07:00
Dongwon Kang
c30327cbb3 Merge "TIF: use <p> tag in a consistent way." 2015-04-24 04:57:05 +00:00
Dongwon Kang
0610e12733 TIF: use <p> tag in a consistent way.
Bug: 20340510
Change-Id: I2422646f01542f571d033ee363df58e0906f3514
2015-04-24 13:55:44 +09:00
Dongwon Kang
7771d4e125 Merge "TIF: start using @Nullable annotation." 2015-04-24 04:42:56 +00:00
Chong Zhang
f2ae3a8ead Merge "MediaHTTPConnection: set connect time out" 2015-04-24 03:47:50 +00:00
Lajos Molnar
61044cfd9c Merge "media: deprecate correct codec color formats, add flexible formats" 2015-04-24 02:57:18 +00:00
Lajos Molnar
1af95701f7 Merge "media: add flexible YUV422, 444, and RGB/RGBA formats" 2015-04-24 02:56:47 +00:00
Lajos Molnar
931ae62f29 media: unhide and document already used fields
Bug: 18134807
Bug: 19300915
Bug: 11990564
Change-Id: Iaeab4a5359b946c4b1aeef6083d10045079b9720
2015-04-23 19:39:57 -07:00
Lajos Molnar
e7f12bfdf6 media: deprecate correct codec color formats, add flexible formats
Change-Id: Ie79c4027fa969fe352da224b3f1844b0a7eaaeaa
2015-04-24 02:34:48 +00:00
Andy Hung
b33d878de3 Merge "Add getFormat to AudioTrack and AudioRecord" 2015-04-24 02:26:29 +00:00
Lajos Molnar
d1d27c1543 media: add flexible YUV422, 444, and RGB/RGBA formats
These are used by Media.Image on getOutputImage.

Change-Id: I171c5b90423800eeab4e36625dcf727a2a2affcd
2015-04-23 19:14:32 -07:00
Dongwon Kang
4bf607b00c TIF: start using @Nullable annotation.
Added @Nullable annotation when the javadoc sprcifies the return value
or argument can be null.

Bug: 19941047
Change-Id: I823189a242fae10ca14788fee9747bf5d59f5eb3
2015-04-24 10:31:14 +09:00
Chong Zhang
90b5975043 MediaHTTPConnection: set connect time out
bug: 19890444
Change-Id: Ib669e6d1524620b37a683612369b405c8367f4a5
2015-04-23 18:21:05 -07:00
Andy Hung
463a8c7743 Add getFormat to AudioTrack and AudioRecord
This enables getting channel index masks and is future-friendly.

Change-Id: Ia0bb9a855e97e8279b2226cf75e0ddd03af3fb7f
2015-04-23 18:10:58 -07:00
Wei Jia
c87326127e Merge "MediaSync: fix message delay based on play time for pending audio frames." 2015-04-24 00:46:27 +00:00
Glenn Kasten
9e29086d5d Fix build
Change-Id: I0f83f4d1df85f4b3c59cfff54b8c78ea4aefbd1d
2015-04-23 16:42:47 -07:00
Wei Jia
25b802d472 MediaSync: fix message delay based on play time for pending audio frames.
Bug: 19666434
Change-Id: Ia9ad3858d4ddccf8aa476f2506785f1d76f90b32
2015-04-23 15:47:50 -07:00