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

3885 Commits

Author SHA1 Message Date
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
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
263b4c9782 Add PlaybackSettings for use with AudioTrack 
Change-Id: Ie59686d46869558d489a7600170ddace00e548d5
 2015-04-22 15:27:16 -07: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
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