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

9737 Commits

Author SHA1 Message Date
Sungsoo Lim
6dddc7d1a9 Merge "Send a message with data in MediaController.MessageHandler.post()" into mnc-dev 2015-05-29 01:37:00 +00:00
Glenn Kasten
ad43220384 Merge "Improve error handling for AudioTrack write with PTS" into mnc-dev 2015-05-29 00:12:54 +00:00
Glenn Kasten
626f0dc73b Merge "Deprecations are warnings not errors" into mnc-dev 2015-05-28 22:51:17 +00:00
Glenn Kasten
85d99546a0 Deprecations are warnings not errors 
Change-Id: Ib77f45fdc27ea53f1dd181f48c76810d03f8dcdb
 2015-05-28 07:59:36 -07:00
Glenn Kasten
16144ac378 Merge "Add comments to indicate code review was done for bugs" into mnc-dev 2015-05-28 14:52:37 +00:00
Sungsoo Lim
060b4e1f17 Send a message with data in MediaController.MessageHandler.post() 
Bug: 21478435
Change-Id: Ifd50b857c4503d39868540f6256c78f0cb510c83
 2015-05-28 15:08:47 +09:00
Marco Nelissen
59ac0b14f2 Merge "Handle unknown duration in playMediaSamples test" into mnc-dev 2015-05-27 23:05:15 +00:00
Chong Zhang
ebdfefa496 Merge "MediaCodec: unhide mime type for EAC3" into mnc-dev 2015-05-27 21:17:12 +00:00
Chong Zhang
52c58bb699 MediaCodec: unhide mime type for EAC3 
bug: 18723951
Change-Id: I8c77be6ede428e92b089b19b2bd627992466a591
 2015-05-27 14:07:29 -07:00
Marco Nelissen
e796ff912e Handle unknown duration in playMediaSamples test 
Bug: 21391417
Change-Id: I85d8f5921e8423da078acfe3aff34a6fcef69e78
 2015-05-27 12:33:03 -07:00
Glenn Kasten
68d5ebd1da Improve error handling for AudioTrack write with PTS 
Pick up some of the error handling from AudioTrack write ByteBuffer

Change-Id: I62f233c2026759dbe57d7e1f48d62babaa49e5b8
 2015-05-27 09:21:00 -07:00
Lajos Molnar
466507eb1c media: Update MediaCodec class description 
Bug: 11990465
Bug: 11019199
Bug: 11990564
Bug: 10672559
Change-Id: I22533dec98fb878ca87876c9ebc0fe59f4bfe995
 2015-05-26 19:50:43 +00:00
Jean-Michel Trivi
48d88128bd Remove temporary javadoc for android.media.AudioFormat 
Remove temporary text in javadoc for AudioFormat.
Start javadoc for encoding.

Change-Id: I3df5f868da50b8ba4b42a9f054d5cd472f68069d
 2015-05-26 11:50:11 -07:00
Jean-Michel Trivi
ed77bc0987 Merge "More android.media.AudioFormat javadoc" into mnc-dev 2015-05-23 01:19:03 +00:00
Jean-Michel Trivi
4ed06d2e30 More android.media.AudioFormat javadoc 
More doc about AudioFormat constants, use of the builder,
 sample rate, channel masks (position vs index, examples)

Bug 20921159

Change-Id: Ie60c2f3558b8b6008c6d9fb646ad9f6de396859d
 2015-05-22 18:10:06 -07:00
Chien-Yu Chen
9e07ffdbfb Merge "ImageReader: Register estimated native allocation" into mnc-dev 2015-05-22 20:33:26 +00:00
Jeff Tinker
08cfe2a5fc Doc update for MediaDrm's OnExpirationUpdate method 
Based on EME spec clarification that expiration time
of 0 means unlimited.

bug: 21393975
Change-Id: I96e50fb4300724f52aad2ca39c8495ad1aa78222
 2015-05-22 20:17:57 +00:00
Chien-Yu Chen
11c5d0dd01 ImageReader: Register estimated native allocation 
Estimate the native allocation and register it so it can be
accounted for during GC.

Bug: 20299272
Change-Id: I43af3058b6fe9a41e5e7e119e390ed079402c4b8
 2015-05-22 11:41:02 -07:00
Robert Shih
67ba691ad6 Merge "MediaPlayer: add mPreparing to weed out unwanted prepared messages" into mnc-dev 2015-05-22 16:02:06 +00:00
Robert Shih
410239b6bf MediaPlayer: add mPreparing to weed out unwanted prepared messages 
Bug: 21266735
Change-Id: Ie4fe76533c9b7f505c57ba63df7992f2490942cc
 2015-05-21 16:43:10 -07:00
Jean-Michel Trivi
59845bef8e Merge "Extra for ACTION_RINGTONE_PICKER for AudioAttributes flags" into mnc-dev 2015-05-21 16:24:02 +00:00
Jean-Michel Trivi
e6b874b1aa Merge "Fix reading attributes for playback restrictions" into mnc-dev 2015-05-21 16:16:19 +00:00
Eric Laurent
97de0c9a29 Merge "AudioService: indicate system ready to AudioFlinger" into mnc-dev 2015-05-21 16:13:04 +00:00
Chet Haase
4b901c4506 Merge "Fix docs to not refer to non-public classes." into mnc-dev 2015-05-21 04:47:42 +00:00
Jean-Michel Trivi
42697ffd42 Extra for ACTION_RINGTONE_PICKER for AudioAttributes flags 
Add EXTRA_RINGTONE_AUDIO_ATTRIBUTES_FLAGS to allow specifying
  AudioAttributes flags that will be used when playing the
  Ringtone.

Bug 19407114

Change-Id: I56a77d7308b21afc0766356e1b6a2d76dca21221
 2015-05-20 19:14:45 -07:00
Chet Haase
fa2dafa741 Fix docs to not refer to non-public classes. 
Issue #21328285 public Midi docs refer to internal utility class

Change-Id: Idddd5c98a78159190c6c34b17350f4630c33d6d5
 2015-05-20 18:20:08 -07:00
Eric Laurent
0867bed9dd AudioService: indicate system ready to AudioFlinger 
Indicate when JAVA services are ready to AudioFlinger so that
calls to power manager and scheduling service can be enabled.

Bug: 11520969.
Change-Id: Id977cab3208c34709011703d2dfdcf552e60371b
 2015-05-20 17:39:21 -07:00
Andy Hung
b14b7e188f Merge "Fix AudioTrack, AudioRecord, AudioFormat API" into mnc-dev 2015-05-20 23:01:39 +00:00
Andy Hung
e90a0a88f4 Fix AudioTrack, AudioRecord, AudioFormat API 
Rename getNativeFrameCount to getBufferSizeInFrames
Remove throw declaration on IllegalArgumentException and
IllegalStateException

Bug: 20887665
Bug: 21304902
Change-Id: Ia85d8010be46524b9a8b93105b16b7b9480f6bd9
 2015-05-20 22:58:31 +00:00
Jean-Michel Trivi
d3969546a8 Fix reading attributes for playback restrictions 
Playback restrictions can be lifted with the correct flag,
  FLAG_BYPASS_INTERRUPTION_POLICY, but this flag is for the
  system only. As such, it must be read by querying "all
  the flags" with AudioAttributes.getAllFlags() which is a
  system API which returns all the system flags. getFlags()
  only returns the public SDK flags.

Bug 19407114

Change-Id: I22dadfaf5d1b48b3c0754e1e6af00b734d790fec
 2015-05-20 13:58:18 -07:00
Eric Laurent
5aa384cdc8 Merge "AudioFormat: more compressed formats" into mnc-dev 2015-05-20 16:22:01 +00:00
Paul McLean
aa1cd25db7 Merge "Updating (and completing) documentation post API-council changes." into mnc-dev 2015-05-20 15:56:08 +00:00
Paul McLean
8e6c9f4617 Updating (and completing) documentation post API-council changes. 
1. Enum/Select/Notify API
2. (re)routing API

bug: 21151568
Change-Id: Idce969c8b8955022b7810cf5dddb800e6aa01000
 2015-05-20 07:48:12 -07:00
Dongwon Kang
cf4f3d5c4c TIF: Fix an incorrect conversion in timeShiftSetPlaybackParams() 
Bug: 21313401
Change-Id: I73e55c454cf0e2cd90d922acf5c6efe727f59204
 2015-05-20 13:57:34 +09:00
Eric Laurent
cae3466333 AudioFormat: more compressed formats 
Add MP3 and AAC as valid AudioFormat encodings.
Only @hide for now to allow system components to manage
audio patches with those formats.

Bug: 18649264.
Change-Id: I5ef5f151783308e31d8ac5b29454589077ef62ea
 2015-05-19 16:46:52 -07:00
Jean-Michel Trivi
1705113e91 Merge "API for converting AudioAttributes to stream type" into mnc-dev 2015-05-19 23:42:34 +00:00
Jean-Michel Trivi
d1d5a0a080 API for converting AudioAttributes to stream type 
Bug 21267880

Change-Id: I3389dcb3a35a3786ecdb8f56a917a0ae619e8417
 2015-05-19 16:35:25 -07:00
Glenn Kasten
b0e172304c Merge "Explain the void send() throws IOException" into mnc-dev 2015-05-19 17:34:22 +00:00
Glenn Kasten
5db6637f8c Explain the void send() throws IOException 
Bug: 21044677
Change-Id: If6b51058813aff3780821db7c619004622df64ca
 2015-05-19 08:46:48 -07:00
Glenn Kasten
c4ddf16c8b Merge "send without timestamp is not equivalent to send now" into mnc-dev 2015-05-19 15:38:01 +00:00
Glenn Kasten
a32d5c8472 send without timestamp is not equivalent to send now 
Change-Id: I68decbd005932c762ccd376ee80b52ac9884fba4
 2015-05-19 08:33:36 -07:00
Glenn Kasten
0e2c164a8a Merge "Update documentation for short transfer counts" into mnc-dev 2015-05-19 00:28:20 +00:00
Glenn Kasten
659e31fb29 Update documentation for short transfer counts 
Bug: 10891562
Change-Id: I6e24917a508aa29f1f6f00aa8c891ad4978dc3e6
 2015-05-18 14:11:26 -07:00
Glenn Kasten
14d226a2cd Add comments to indicate code review was done for bugs 
Bug: 20818955
Bug: 20890069
Change-Id: I243205b99b198eb1b5a1a027b27cbb7d5aaaa8db
 2015-05-18 13:54:40 -07:00
Glenn Kasten
20a0edf123 Merge "Minor cleanup of comments and code" into mnc-dev 2015-05-18 20:38:32 +00:00
Jae Seo
f03fb7f3a4 Merge "TIF: Pass the playback params as a whole" into mnc-dev 2015-05-18 18:10:31 +00:00
Jae Seo
194118f913 Merge "Make PlaybackParams parcelable" into mnc-dev 2015-05-18 18:05:34 +00:00
Jae Seo
76c4fc2977 Make PlaybackParams parcelable 
Bug: 21170699
Change-Id: I31b446e0b772bdfb65166564e48aa93cf73b74ae
 2015-05-18 17:54:47 +00:00
Lajos Molnar
c8304e86c8 Merge "media: clarify valid values in PlaybackParams and SyncParams" into mnc-dev 2015-05-18 17:32:17 +00:00
Robert Shih
40bdcb7c52 Merge "MediaPlayer: persistent track indices" into mnc-dev 2015-05-18 15:56:31 +00:00