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

9610 Commits

Author SHA1 Message Date
Harish Mahendrakar
34265cd94f media: Added MPEG2 profile/levels and tests 
Bug: 20852831
Change-Id: I172f2f08c30d12bf684f32a52db64823cc286d35
 2015-05-05 11:05:22 -07:00
Prerepa Viswanadham
d1808401ca Merge changes from topic 'mwd-merge-050415' into mnc-dev 
* changes:
  Merge commit 'b6f59f4' into master_merge
  Merge commit 'f6db0ce' into master_merge
  Merge commit '17455a3' into master_merge
  Merge commit 'b4d5b32' into master_merge
  Merge commit 'a1a2fa7' into master_merge
  Merge commit '8dfdb98' into master_merge
  Merge commit 'eba66c3' into master_merge
 2015-05-05 01:06:38 +00:00
Robert Shih
5eac1da3bb Merge "MediaPlayer: setSubtitleAnchor on a HandlerThread" into mnc-dev 2015-05-04 23:50:07 +00:00
Robert Shih
98b6842e30 MediaPlayer: setSubtitleAnchor on a HandlerThread 
This ensures that we wouldn't run into the error `Can't create handler
inside thread that has not called Looper.prepare` no matter on which
thread we attempt to set the SubtitleController internally.

Bug: 20821869
Change-Id: Ie53d60b58f5382428e7b7a01deccfa516b61b25f
 2015-05-04 16:38:30 -07:00
Wei Jia
d80d6f6b05 MediaSync: clean up configureAudioTrack and configureSurface. 
Bug: 19666434

Change-Id: I8b112843d430c0730a879abc9aa25f143bdcf09d
 2015-05-04 15:59:20 -07:00
Svetoslav
e9fc4cda50 Merge "Add camera app op - framework" into mnc-dev 2015-05-03 00:41:50 +00:00
Svetoslav
fbf0ecabac Add camera app op - framework 
Change-Id: I17736a8abe2c6775e990b88fb3eab963f47167d0
 2015-05-02 16:23:19 -07:00
Mike Lockwood
5ba44affe6 Merge "BluetoothMidiService: Add support for sending SysEx messages that span multiple Bluetooth packets" into mnc-dev 2015-05-02 16:09:47 +00:00
Lajos Molnar
4971de2a2e Merge "media: hook up MediaCodec.setSurface" into mnc-dev 2015-05-02 02:23:11 +00:00
Chong Zhang
039cd7ffaa Merge "MediaRecorderTest: test recording from persistent surface" into mnc-dev 2015-05-02 02:20:47 +00:00
Chong Zhang
0335916173 MediaRecorder: implement persistent input surface APIs 
Bug: 19127604
Bug: 19489395

Change-Id: Ic8e151b97ea6b85fc65f724d3e68e1cb6b500866
 2015-05-02 02:20:20 +00:00
Chong Zhang
ac95f1ac77 MediaRecorderTest: test recording from persistent surface 
Bug: 19127604
Bug: 19489395

Change-Id: I17984e0febaf0541a0ce650a07e0c485ffc41c08
 2015-05-01 18:37:07 -07:00
Chong Zhang
8034d60f6e MediaCodec: implement persistent input surface APIs 
Bug: 19127604
Bug: 19489395

Change-Id: If0d723c9ecd6fe81d9df210bd2fd026b8603ea4a
 2015-05-01 18:30:09 -07:00
Lajos Molnar
5e02ba977e media: hook up MediaCodec.setSurface 
Bug: 11990461
Change-Id: Id2dc952594c21c6be68e4ffd039c7f74006a2374
 2015-05-01 17:39:37 -07:00
Mike Lockwood
8c26d843a7 BluetoothMidiService: Add support for sending SysEx messages that span multiple Bluetooth packets 
Change-Id: Id56f7c82ec97b6a46258111bbfd46ab1dc14dfe9
 2015-05-01 16:16:42 -07:00
Robert Shih
043b26ba9a am 4816ebe8: am e8a8440d: am f1207122: Merge "MediaPlayer: provide mime type for all track types" into mnc-dev 
* commit '4816ebe8c2f312bca44d95abdfec0dba137c4fd4':
  MediaPlayer: provide mime type for all track types
 2015-05-01 01:35:13 +00:00
Lajos Molnar
f0afeb2373 am 0486d03d: am 607dab36: am 05ebffe6: media: Hook up MediaPlayer and MediaSync to new settings 
* commit '0486d03dc0c843f31852afc2812c934f10aeb21e':
  media: Hook up MediaPlayer and MediaSync to new settings
 2015-05-01 01:34:53 +00:00
John Reck
6dc2c89b49 am 0385dc8d: am 1d8aae3b: am db672b03: Merge "Change how Java Bitmaps are accessed in a few places" into mnc-dev 
* commit '0385dc8d12088d98ab76de86db4cd8e1ffa34af7':
  Change how Java Bitmaps are accessed in a few places
 2015-05-01 01:32:46 +00:00
Robert Shih
4816ebe8c2 am e8a8440d: am f1207122: Merge "MediaPlayer: provide mime type for all track types" into mnc-dev 
* commit 'e8a8440d70222750ad9b8563cbc80ca5c563b9c1':
  MediaPlayer: provide mime type for all track types
 2015-05-01 00:57:33 +00:00
Robert Shih
f12071222f Merge "MediaPlayer: provide mime type for all track types" into mnc-dev 2015-05-01 00:31:24 +00:00
Lajos Molnar
0486d03dc0 am 607dab36: am 05ebffe6: media: Hook up MediaPlayer and MediaSync to new settings 
* commit '607dab369580d8510f42b1a796ee623eaf4b2adf':
  media: Hook up MediaPlayer and MediaSync to new settings
 2015-05-01 00:28:36 +00:00
Lajos Molnar
05ebffe6bf media: Hook up MediaPlayer and MediaSync to new settings 
Bug: 19666434
Change-Id: Ib815a80a991d4be9ce179514ac517c54f98234fd
 2015-04-30 16:49:36 -07:00
Robert Shih
29767a8c34 MediaPlayer: provide mime type for all track types 
Bug: 20729923
Change-Id: Id05ca0616a72f66abe6a541417baef491c49a417
 2015-04-30 16:34:57 -07:00
John Reck
0385dc8d12 am 1d8aae3b: am db672b03: Merge "Change how Java Bitmaps are accessed in a few places" into mnc-dev 
* commit '1d8aae3b1924b2340250bdffe491819a26eea5fe':
  Change how Java Bitmaps are accessed in a few places
 2015-04-30 21:20:51 +00:00
John Reck
db672b03a2 Merge "Change how Java Bitmaps are accessed in a few places" into mnc-dev 2015-04-30 21:00:08 +00:00
Glenn Kasten
cc2f85a406 am f7de1bc8: am 2757fed2: Merge "Clarifying which receiver method to call." into mnc-dev 
* commit 'f7de1bc8f11aeb133bc916f020c6c6bb5eb859bf':
  Clarifying which receiver method to call.
 2015-04-30 20:53:46 +00:00
Glenn Kasten
2757fed2d6 Merge "Clarifying which receiver method to call." into mnc-dev 2015-04-30 20:28:00 +00:00
John Reck
ed207b9274 Change how Java Bitmaps are accessed in a few places 
Stop assuming that a Java Bitmap has a SkBitmap* that
has some externally managed lifecycle, and instead switch
a bunch of users to accessing the bitmap by providing
their own SkBitmap* on which to set the (ref counted!)
SkPixelRef* instead

Attempt #2 to land this, original issue was in getSkBitmap
and should be fixed

Change-Id: I0fd9e193968b41e5597784140d56b4885906864a
 2015-04-30 12:46:57 -07:00
Peter Brinkmann
d8f6363a5d Clarifying which receiver method to call. 
Change-Id: Iaf89e1ff27e257fd25c54e189e8fcd1b10e8edfc
 2015-04-30 12:43:02 -07:00
Peter Brinkmann
ffe0498abb Merge "Clarifying which receiver method to call." 2015-04-30 18:58:29 +00:00
Peter Brinkmann
0abae734f0 Clarifying which receiver method to call. 
Change-Id: Iaf89e1ff27e257fd25c54e189e8fcd1b10e8edfc
 2015-04-30 14:46:07 -04:00
Jean-Michel Trivi
e36846cbf1 am c8efc449: am 3d42d238: am f764d219: Merge "AudioService receives callback for dynamic policy mix state changes" into mnc-dev 
* commit 'c8efc4490df6fb58bf333540cf746c68070345f5':
  AudioService receives callback for dynamic policy mix state changes
 2015-04-30 17:26:29 +00:00
Jean-Michel Trivi
c8efc4490d am 3d42d238: am f764d219: Merge "AudioService receives callback for dynamic policy mix state changes" into mnc-dev 
* commit '3d42d2380f5af53ce299610e27f40a8d88930c89':
  AudioService receives callback for dynamic policy mix state changes
 2015-04-30 17:14:30 +00:00
Jean-Michel Trivi
f764d219f0 Merge "AudioService receives callback for dynamic policy mix state changes" into mnc-dev 2015-04-30 16:43:19 +00:00
Ronghua Wu
2e52f82440 am 5054f906: am c98070a4: am 1b12db9e: Merge "media: set codec exception reason." into mnc-dev 
* commit '5054f906170f343312a299ec9e72aefb2ac24b7a':
  media: set codec exception reason.
 2015-04-30 16:25:14 +00:00
Ronghua Wu
5054f90617 am c98070a4: am 1b12db9e: Merge "media: set codec exception reason." into mnc-dev 
* commit 'c98070a46168c14e54899bfca69889154e3a565d':
  media: set codec exception reason.
 2015-04-30 16:16:08 +00:00
Ronghua Wu
1b12db9e62 Merge "media: set codec exception reason." into mnc-dev 2015-04-30 15:40:36 +00:00
Andy Hung
02f6890289 am 426a0c33: am f388c9e6: am f3d3856f: Merge "Check for null codec from AMediaCodec_createDecoderByType" into mnc-dev 
* commit '426a0c3358099b909f72a34e04af4b0758d28b21':
  Check for null codec from AMediaCodec_createDecoderByType
 2015-04-30 01:21:03 +00:00
Andy Hung
426a0c3358 am f388c9e6: am f3d3856f: Merge "Check for null codec from AMediaCodec_createDecoderByType" into mnc-dev 
* commit 'f388c9e654781c26debe53a0eecce5b6d9234373':
  Check for null codec from AMediaCodec_createDecoderByType
 2015-04-30 01:01:41 +00:00
Jean-Michel Trivi
5a56109d1f AudioService receives callback for dynamic policy mix state changes 
AudioService registers a callback for dynamic policies from
  AudioSystem.
AudioSystem keeps track of a single callback for dynamic policies.

Bug 20226914

Change-Id: I48899d20d1dbb47bb680e733a3bc9fd064b60f07
 2015-04-29 17:56:19 -07:00
Andy Hung
f3d3856f3e Merge "Check for null codec from AMediaCodec_createDecoderByType" into mnc-dev 2015-04-30 00:37:58 +00:00
Andy Hung
6344c67e2b am edcf5e1e: am f17dd0b4: am 1afdbe3b: Merge "Pass PlaybackSettings as class object for AudioTrack JNI" into mnc-dev 
* commit 'edcf5e1e05b7c258665476a75af8440b12050ace':
  Pass PlaybackSettings as class object for AudioTrack JNI
 2015-04-30 00:27:27 +00:00
Andy Hung
edcf5e1e05 am f17dd0b4: am 1afdbe3b: Merge "Pass PlaybackSettings as class object for AudioTrack JNI" into mnc-dev 
* commit 'f17dd0b48c894fda00b1d2068ef54b05221b1d7a':
  Pass PlaybackSettings as class object for AudioTrack JNI
 2015-04-30 00:16:16 +00:00
Andy Hung
1afdbe3b77 Merge "Pass PlaybackSettings as class object for AudioTrack JNI" into mnc-dev 2015-04-29 23:50:46 +00:00
Mike Lockwood
4e17165287 am 62b4cbce: am bcec6a49: am e1d00395: Merge "MidiDeviceInfo: Add version string property" into mnc-dev 
* commit '62b4cbceb33dc657cfaee2971ad6bc3d1aab3fbb':
  MidiDeviceInfo: Add version string property
 2015-04-29 21:26:01 +00:00
Mike Lockwood
62b4cbceb3 am bcec6a49: am e1d00395: Merge "MidiDeviceInfo: Add version string property" into mnc-dev 
* commit 'bcec6a4980366f10182c8dc09ec1eff6f78d7043':
  MidiDeviceInfo: Add version string property
 2015-04-29 21:15:25 +00:00
Andy Hung
26eca01c49 Check for null codec from AMediaCodec_createDecoderByType 
NULL codec can now occur if codec cannot be created.

Bug: 20566134
Change-Id: I08d54e733a01d0614313673dc49a6f5e702633ac
 2015-04-29 14:09:45 -07:00
Andy Hung
fe48e0dfb9 Pass PlaybackSettings as class object for AudioTrack JNI 
Change-Id: Ic7fb5f84ed1fc4cc2286e5c207fee5298a64a5a4
 2015-04-29 14:09:18 -07:00
Mike Lockwood
e1d003958d Merge "MidiDeviceInfo: Add version string property" into mnc-dev 2015-04-29 20:50:35 +00:00
Mike Lockwood
02868b1625 MidiDeviceInfo: Add version string property 
For USB devices, this is populated with the USB device version string.

Change-Id: Ia9286d5f41783e4e960a9c724bf6b85b6599fe12
 2015-04-29 13:44:34 -07:00