3969 Commits

Author SHA1 Message Date
Andy Hung
25d4a63983 Merge "Add channel index mask to AudioRecord" 2015-04-23 01:30:05 +00:00
Jae Seo
c6e64a95ce Merge "TIF: Cache multiple app private commands" 2015-04-23 00:17:37 +00:00
Jae Seo
411d58d330 TIF: Cache multiple app private commands
Bug: 19809952
Change-Id: I458ab436761e8fd7e54fc7f49d86550e7945dca9
2015-04-22 17:02:04 -07:00
Andy Hung
98d4ca6229 Add channel index mask to AudioRecord
Change-Id: I5d2504d3a7af6611d3ffa9a4c2d3665a2cf97fef
2015-04-22 15:43:48 -07:00
Andy Hung
263b4c9782 Add PlaybackSettings for use with AudioTrack
Change-Id: Ie59686d46869558d489a7600170ddace00e548d5
2015-04-22 15:27:16 -07:00
Marco Nelissen
29f16933a8 Sometimes the application context is null
when called from systemui.

Bug: https://code.google.com/p/android/issues/detail?id=152173
Change-Id: I27153a48d7edce7006517507d813e24ce6f63a7d
2015-04-22 13:11:30 -07:00
Marco Nelissen
ba43f7e914 Merge "Revert "Sometimes the application context is null"" 2015-04-22 20:08:38 +00:00
Marco Nelissen
360f2ab62d Revert "Sometimes the application context is null"
This reverts commit d86281cb3da685672d89f964228980f6753adcae.

Change-Id: Icaf8e1e4812f64060066331f9000be15c134d1d2
2015-04-22 20:07:15 +00:00
Marco Nelissen
0601a280e5 Merge "Sometimes the application context is null" 2015-04-22 19:06:47 +00:00
Lajos Molnar
99f8072386 media: add annotations to low-level Media* classes
Also remove explicit runtime exception added to
MediaExtractor.setDataSource, as other methods don't
explicitly declare it.

Includes MediaCodec, Crypto, Drm, Extractor, Muxer, Sync.

Bug: 19756615
Bug: 19967103
Bug: 16906375
Change-Id: If511d85af7f61808fbe63fbdc6e04a3d2e7e262c
2015-04-22 09:44:03 -07:00
Lajos Molnar
b1fa78c132 media: define codec color formats (part 1)
Define supported color formats. Deprecate old color formats.

Change-Id: I909acf33a2019e2d5b55080298d5d00f8e9ce71d
2015-04-22 16:18:31 +00:00
Jae Seo
03b5bf53a3 Merge "TIF: Cache the stream volume on TvView" 2015-04-21 22:36:29 +00:00
Jae Seo
1da8fb3949 TIF: Cache the stream volume on TvView
Also added explanation of the default value.

Bug: 18939663
Change-Id: Idffd45738b0299779c245a11022faadc12004060
2015-04-21 15:02:38 -07:00
Rachad
753f90081e Merge "AudioTrack.write() with timestamp support" 2015-04-21 19:29:45 +00:00
Jae Seo
b55b838c17 Merge "TIF: Fix incorrect uses of INPUT_STATE_XXX" 2015-04-21 16:13:01 +00:00
Jae Seo
82fce64530 TIF: Fix incorrect uses of INPUT_STATE_XXX
Also changed TvInputManager.getTvInputState to return
INPUT_STATE_DISCONNECTED for removed inputs and fixed documentation.

Bug: 18563677, Bug: 20435950
Change-Id: Idb81cee852b797eb3f5113d68468905f327928e7
2015-04-21 09:11:29 -07:00
Marco Nelissen
d86281cb3d Sometimes the application context is null
when called from systemui.

Bug: https://code.google.com/p/android/issues/detail?id=152173
Change-Id: Ic7b98e39fd9ad2436b855cf9f7f53d3e7a1948c0
2015-04-21 08:28:04 -07:00
Wei Jia
161537c816 MediaSync: update code example for setCallback.
Bug: 19666434
Change-Id: I03c16e94c6bdf531426a9b0ccd09c82a76daf009
2015-04-20 17:28:58 -07:00
Alex Klyubin
363cbe5f7d am 132617de: am 7b55b8f0: am c77c14c2: Merge "Make MediaPlayer fail fast on UnknownServiceException."
* commit '132617de897a1de256114c1a6cc3680983d37e84':
  Make MediaPlayer fail fast on UnknownServiceException.
2015-04-20 18:56:22 +00:00
Alex Klyubin
6db04b369e Make MediaPlayer fail fast on UnknownServiceException.
This makes MediaPlayer's network streaming code fail fast when an
UnknownServiceException is encountered. This currently occurs when the
application declares that it does not perform cleartext network
traffic and tries to load media over cleartext HTTP. Without this CL,
MediaPlayer blocks for 30 seconds because it treats this error as
recoverable and goes into a ten retry loop with a three second delay
before each retry.

The result at MediaPlayer client level is
MediaPlayer.MEDIA_ERROR_UNKNOWN error. This error code is used for
non-recoverable situations such as when an invalid redirect is
encountered or the destination is unreachable.

Bug: 20026006
Change-Id: I10f0dadb7740902f8c7c73d0df96cfff31f08ada
2015-04-20 10:11:57 -07:00
Dongwon Kang
2f732bf9f0 TIF: Document the default sort order for the tables in TvContract.
Bug: 19357901
Change-Id: If9f1053c5f74cb6781433d3fe8d09b10a19ca513
2015-04-20 08:06:15 +09:00
Robert Shih
b14e37cb37 Merge "MediaPlayer: initial timed id3 support" 2015-04-18 02:50:13 +00:00
Robert Shih
ac033f033d MediaPlayer: initial timed id3 support
Change-Id: Ibf2ea8fa1b44f2953bda49cdc6da979c2d3f6be2
2015-04-17 19:49:13 -07:00
P.Y. Laligand
928bfc4e1c Merge "Consistent null-checking in MediaRouter." 2015-04-18 01:56:43 +00:00
Rachad
cfe964a09c AudioTrack.write() with timestamp support
Add AudioTrack.write() method that supports timestamps for HW_AV_SYNC tracks

Bug: 19384172
Change-Id: I6a452ae94f1da253c1b1118dece5b3073b941c09
2015-04-17 18:26:31 -07:00
Andy Hung
4aacc903e3 Add non-blocking writes to AudioTrack
Change-Id: I4ff47c2851be1b085f4e758f67e391932371027d
2015-04-17 00:16:17 -07:00
Andy Hung
0e9e2f3724 Add non-blocking reads to AudioRecord
Change-Id: I63d5345129f197f96f9a13696996071c96551efe
2015-04-16 23:57:13 -07:00
Eric Laurent
71a9cfc08c Merge "Adding explicit routing API to AudioTrack" 2015-04-17 00:30:03 +00:00
P.Y. Laligand
9d93a378c5 Consistent null-checking in MediaRouter.
b/19747094

Change-Id: I5f8d086f717a11a9d03874e633471efed787a6c3
2015-04-16 16:22:35 -07:00
Wei Jia
ba5997e574 MediaSync: get original sample rate from audio track.
Bug: 19666434
Change-Id: I787b7b06fc5bbff038fb6d06b6f0b869d744ebb3
2015-04-16 15:30:51 -07:00
Paul McLean
88e1d86a87 Adding explicit routing API to AudioTrack
Change-Id: Iee7e1ce79e3efd3f8aafd0a5899fe037d314e1be
2015-04-16 14:02:16 -06:00
Chris Watkins
56d16568c0 Merge "Unhide the android.media.[Media]DataSource interface." 2015-04-16 17:06:46 +00:00
Ronghua Wu
9e9ec943ce media: add reason to CodecException ctor.
Bug: 19620911
Change-Id: I3e9d1824c438253e9a7c303478f3cb75d0bb5c75
2015-04-15 18:00:52 -07:00
Chris Watkins
4eaa293808 Unhide the android.media.[Media]DataSource interface.
This allows apps to implement MediaDataSource, which is modeled on
stagefright's DataSource, to supply media data to the framework. This
was already implemented for MediaExtractor, but it was renamed from
DataSource.

MediaExtractor, MediaPlayer and MediaMetadataRetriever each have a new
overload: #setDataSource(android.media.MediaDataSource)

Only NuPlayer supports this new data source.

The change introduces:
 * IDataSource:        The binder interface for DataSource.
 * JMediaDataSource:   The native counterpart to the java interface. It
                       implements IDataSource.
 * CallbackDataSource: A stagefright DataSource that wraps an IDataSource.

Change-Id: I6d9c1167b4a7384c469b1e928f31791a7ebed716
2015-04-15 16:33:15 -07:00
Paul McLean
55787399c9 Merge "Audio Devices Enumeration/Notification API" 2015-04-15 21:08:27 +00:00
Paul McLean
a33be211e7 Audio Devices Enumeration/Notification API
Change-Id: I4eecfa43e4fecfe309ddd805ed193d078b10d5e6
2015-04-15 10:56:49 -06:00
Jae Seo
b744e47959 Merge "TIF: Add pixel aspect ratio to TvTrackInfo" 2015-04-15 05:51:18 +00:00
Jean-Michel Trivi
f14c535041 Merge "Define AudioMix state constants" 2015-04-15 02:05:44 +00:00
Andy Hung
8f08d04b4e Merge "Default to minimum buffer size for AudioRecord.Builder" 2015-04-15 01:54:20 +00:00
Ronghua Wu
0e08a225da Merge "media: Add reason to CodecException." 2015-04-15 01:40:52 +00:00
Andy Hung
864ae67852 Default to minimum buffer size for AudioRecord.Builder
Add AudioRecord.getNativeFrameCount to allow apps to
retrieve the size of the buffer created.

Change-Id: I4c539677726f89afd36fe7b1d24c8b29ada91402
2015-04-14 18:40:02 -07:00
Ronghua Wu
4823dee929 Merge "Revert "media: add new MediaCodec Callback onCodecReleased."" 2015-04-15 01:38:23 +00:00
Jae Seo
24ed8072f5 TIF: Add pixel aspect ratio to TvTrackInfo
Needed to handle scaling properly for some video formats such as 720x576
4:3 and 720x576 16:9 (the most common European SD formats) where pixels
are not square.

Bug: 19500694
Change-Id: I4d245ed40e8b80f7efd6acdb059d20b63b4ef9de
2015-04-14 18:29:51 -07:00
Jean-Michel Trivi
cc98c67ef7 Define AudioMix state constants
Bug 20226914

Change-Id: Ie513fcdaaffd4ae3ed7fbd8d24fe8683959739e3
2015-04-14 15:10:30 -07:00
Ronghua Wu
4fd31a2a71 media: Add reason to CodecException.
Bug: 19620911
Change-Id: Ic7244a2369a04bfd69e703415a8c9aacdcbf3c57
2015-04-14 15:00:32 -07:00
Ronghua Wu
41eedcf311 Revert "media: add new MediaCodec Callback onCodecReleased."
This reverts commit 4c302e8b141cd490733130e86e44fa4f216de457.

Change-Id: I563ba6419cf61968bf356c5b096445dde55abac2
2015-04-14 21:12:07 +00:00
John Spurlock
1740c625c6 Merge "Zen: Enter alarms only on volume down from vibrate." 2015-04-14 20:00:42 +00:00
John Spurlock
b02c744f05 Zen: Enter alarms only on volume down from vibrate.
And vice versa (when dialog is showing).

Also make alarms only the default mode when DND is switched on
via the switch.

Bug: 19260237
Change-Id: I16e4a27944bc8245bb2beed84c0421d493b0b876
2015-04-14 09:36:28 -04:00
Ronghua Wu
69fec1aafc Merge "media: add CodecCapabilities.getMaxSupportedInstances." 2015-04-14 01:10:30 +00:00
Andy Hung
4bd513e6ed Default to minimum buffer size for AudioTrack.Builder
Expose AudioTrack.getNativeFrameCount as public to allow apps to
retrive the size of the buffer created.

Change-Id: Ifc07196d65d6a68657fd879bcc1819c2077de202
2015-04-13 16:25:51 -07:00