9505 Commits

Author SHA1 Message Date
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
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
Paul McLean
e56f57c375 Merge "(Re)routing Notification API in AudioTrack/AudioRecord." 2015-04-23 22:26:17 +00:00
Paul McLean
ec4097b0ca Merge "Explicit routing in AudioRecord" 2015-04-23 22:25:19 +00:00
Paul McLean
2d6de4c38c Explicit routing in AudioRecord
Change-Id: Ib3af1041d9f7bbccefd6b86cd3c35baf742be861
2015-04-23 16:11:34 -06:00
Paul McLean
d5bad53a0c (Re)routing Notification API in AudioTrack/AudioRecord.
Change-Id: If6594df7e3ed4c4a67878f98c05e3153633cf263
2015-04-23 15:38:25 -06:00
Lajos Molnar
cca7893f52 Merge "media: surface parity for MediaCodec & Recorder" 2015-04-23 13:39:22 +00:00
Lajos Molnar
17d79047c7 media: surface parity for MediaCodec & Recorder
allow setting output surface dynamically on MediaCodec
allow creating persistent input surface for MediaCodec and MediaRecorder

Bug: 19127604
Bug: 19489395
Change-Id: I68d95ce012574f1cc161556fd7d016be104e5076
2015-04-23 13:38:39 +00:00
Lajos Molnar
c3e41da545 Merge "media: VideoCapabilities: publish codec performance data" 2015-04-23 13:35:44 +00:00
Lajos Molnar
8bd7375115 Merge "media: add OnFrameRenderedListener to MediaCodec" 2015-04-23 13:33:11 +00:00
Lajos Molnar
fd81041a63 media: add OnFrameRenderedListener to MediaCodec
Also allow setting the handler for async callbacks.

Bug: 20503131
Change-Id: If9d24bce75c253a1c7f9c5d41ff5f6447b4622a1
2015-04-23 13:31:36 +00:00
Dongwon Kang
23d076ba7f Merge "TIF: add more documentation on Session.onTimeShiftSetPlaybackRate()." 2015-04-23 10:49:08 +00:00
Lajos Molnar
38a296a65f media: VideoCapabilities: publish codec performance data
Bug: 20507129
Change-Id: I0508bdc9aec8eeeb3ebe16ef21f58d5c0d75af4b
2015-04-23 01:02:39 -07:00
Lajos Molnar
aba29b77a5 media: rename MediaSync.configureSurface/AudioTrack to set...
Change-Id: Ia1ebf5747959a89635dd45b8966a201397374c71
2015-04-23 07:40:46 +00:00
Lajos Molnar
7f08763f41 media: make MediaTimestamp an immutable class
Change-Id: I75efee22c4f4babbeaa02624349b5e164fbfe0ec
2015-04-23 00:16:23 -07:00
Dongwon Kang
8b40086449 TIF: add more documentation on Session.onTimeShiftSetPlaybackRate().
Specifies that the playback rate should be preserved after pause/resume
/seek as MediaPlayer does.

Bug: 20129784
Change-Id: Ibdd4145258580127351adcee28022523a862effa
2015-04-23 15:48:10 +09:00
Lajos Molnar
c98f58efd1 media: add SyncSettings to MediaSync and MediaPlayer
Bug: 18249558
Change-Id: I76d7e20d0e0c2d1d24bf60ade6386986573476f0
2015-04-22 22:45:08 -07:00
Lajos Molnar
b3d5fd2528 media: use PlaybackSettings in MediaSync and MediaPlayer
Bug: 19666434
Change-Id: Ic5e517534a26f4e3b0294205e0b93f95338bf072
2015-04-22 21:22:04 -07:00
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
463cb818ba Merge "Add PlaybackSettings for use with AudioTrack" 2015-04-22 22:36:17 +00:00
Andy Hung
263b4c9782 Add PlaybackSettings for use with AudioTrack
Change-Id: Ie59686d46869558d489a7600170ddace00e548d5
2015-04-22 15:27:16 -07:00
John Reck
f7de58130a Merge "GraphicsJNI Canvas cleanup" 2015-04-22 20:00:46 +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
John Reck
c1b33d665c GraphicsJNI Canvas cleanup
Change-Id: I72e142986a8bc9f464c1951b6b5187919de3462e
2015-04-22 09:34:34 -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
Mike Lockwood
76659c5990 Merge "BluetoothMidiService: Use MidiBtleTimeTracker to interpret incoming Bluetooth MIDI timestamps" 2015-04-21 20:46:53 +00:00
Mike Lockwood
ff001809f6 BluetoothMidiService: Use MidiBtleTimeTracker to interpret incoming Bluetooth MIDI timestamps
Also fixed some problems handling timestamp wrapping.

Change-Id: Ic0aefc54f2560425bea6d07ca0c4529d16699eaa
2015-04-21 13:28:08 -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
Wei Jia
161537c816 MediaSync: update code example for setCallback.
Bug: 19666434
Change-Id: I03c16e94c6bdf531426a9b0ccd09c82a76daf009
2015-04-20 17:28:58 -07:00
John Reck
8222a7ec81 Merge "Revert "Change how Java Bitmaps are accessed in a few places"" 2015-04-20 22:07:45 +00:00
John Reck
edc22fba59 Revert "Change how Java Bitmaps are accessed in a few places"
Bug: 20207616

This reverts commit a771b9861d11671c780092d35c0062eeefcf37c0.

Change-Id: Ifd891cc075274a7986e987229e0fed5a04ed9ff0
2015-04-20 22:06:31 +00: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