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

11147 Commits

Author SHA1 Message Date
xiaoli.xb.zuo
0d5bcda101 Merge \"Fix memory leak in MediaScannerConnection\" 
am: e40ab18590

Change-Id: I894584a5d193624acc78c20a6207b54b20b61563
 2016-07-26 15:43:55 +00:00
Marco Nelissen
e40ab18590 Merge "Fix memory leak in MediaScannerConnection" 2016-07-26 15:37:32 +00:00
Hangyu Kuang
2725d89822 media: Add hidden api to set video encoding profile and level. 
am: f70ad43f13

Change-Id: I3bb9bf5884d791dd5d97fbda8117d1d4f3b1b40f
 2016-07-25 23:45:35 +00:00
TreeHugger Robot
e7e1f0b788 Merge "media: Add hidden api to set video encoding profile and level." into nyc-mr1-dev 2016-07-25 23:40:00 +00:00
Hangyu Kuang
f70ad43f13 media: Add hidden api to set video encoding profile and level. 
bug: 30284097
Change-Id: I898f9a05571098a0ca0f57fb5abf58567c16fdd1
 2016-07-25 21:31:29 +00:00
Eino-Ville Talvala
bc20c106df ImageReader: Add discardFreeBuffers method 
am: 2e2aaf6e04

Change-Id: I142f1b011a045aa0f5af7c33eb76b059eb67e30d
 2016-07-22 21:52:51 +00:00
Eino-Ville Talvala
2e2aaf6e04 ImageReader: Add discardFreeBuffers method 
This method (currently @hide) discards all cached buffers for
the ImageReader, which can be useful to free up memory at the
cost of reallocationt time if more buffers are needed later.

It has no effect on acquired Images, filled Images waiting to be
acquired, or buffers being actively used by the source rendering to the
Surface.

Bug: 28695173
Change-Id: I427a8ba4ad73a267083f843dbf228bfc53a730d9
 2016-07-21 17:04:19 -07:00
xiaoli.xb.zuo
3579b0e1a7 Fix memory leak in MediaScannerConnection 
This patch adds releasing of MediaScannerConnection in ClientProxy
after disconnecting and releasing of ClientProxy and
IMediaScannerService in disconnection sequence in
MediaScannerConnection.

Bug: 30150344

Change-Id: I1e162e4c9a0b7a741ace20480bcf06f3151a93bf
 2016-07-21 20:34:09 +09:00
Bryan Mawhinney
642e50621a Merge \"Add .mov to MediaScanner video file types\" into nyc-mr1-dev 
am: 881bc352ee

Change-Id: I323e40003c87b2b892b1cb0712507cabc7b1d1d5
 2016-07-20 19:13:04 +00:00
Bryan Mawhinney
881bc352ee Merge "Add .mov to MediaScanner video file types" into nyc-mr1-dev 2016-07-20 18:58:30 +00:00
Pirama Arumuga Nainar
64baa7025d Merge \\\"Disable warning triggered in Clang r271374\\\" am: bba87840d3 am: 4643acaa34 
am: 46b64ae00e

Change-Id: If4fb63fc20ba9cd10bd10c8255f2275a29477801
 2016-07-19 23:59:37 +00:00
Stephen Hines
46b64ae00e Merge \\"Disable warning triggered in Clang r271374\\" am: bba87840d3 
am: 4643acaa34

Change-Id: Ie8f5bcee02f0235d06f7b0f5b11efd592026fce1
 2016-07-19 23:52:00 +00:00
Pirama Arumuga Nainar
4643acaa34 Merge \"Disable warning triggered in Clang r271374\" 
am: bba87840d3

Change-Id: I03686c2e9c341d927b295c150aea8eea37f69338
 2016-07-19 23:41:20 +00:00
Chien-Yu Chen
8b29ace33b Merge \"ImageReader: Make close thread safe\" into nyc-mr1-dev 
am: 2f8bf1f024

Change-Id: I9954f6b7b7ab997391acbe3f16cbce36d9c5de3c
 2016-07-19 21:12:07 +00:00
Pirama Arumuga Nainar
b6709700db Disable warning triggered in Clang r271374 
http://b/28149048
http://b/29823425

Disable -Wconstant-conversion that gets triggered in
native/imageproc/to_rgba.c.

Test: Tested build, boot and common usage for Arm, Arm64, x86, x86_64,
Mips images in AOSP and internal branch.

Change-Id: Ia8dbe49a1a8577599244642cbd2e3bb17ec1f83c
 2016-07-19 20:31:39 +00:00
Bryan Mawhinney
c9cb80e9e6 Add .mov to MediaScanner video file types 
Bug: 16162336
Change-Id: I34467c707494690a9e3e3890f295dd1f7df86c86
 2016-07-19 16:01:55 +01:00
Chien-Yu Chen
ca979b9d89 ImageReader: Make close thread safe 
Bug: 30191606
Change-Id: Ic5b53c416a7fe3ebcaad2ab78f2e9aef3b790c88
 2016-07-18 17:14:27 -07:00
Glenn Kasten
2ed8f215f1 Define low latency output stream (formerly primary) 
Bug: 29164107
Change-Id: Ic31ee9bc85f39026918f9a7b7f379454d99b0009
 2016-07-18 11:43:38 -07:00
Lajos Molnar
878069382e Merge \"media: document new temporal layering schema values.\" into nyc-mr1-dev 
am: 12f860f5a2

Change-Id: Ifb3c99ca6e4b2a9dcec6d58afacbcba474ea4d73
 2016-07-15 05:53:37 +00:00
Lajos Molnar
525d917ac9 Merge \"media: clarify MediaFormat.KEY_I_FRAME_INTERVAL\" into nyc-mr1-dev 
am: 991c240a88

Change-Id: Id1e1bfdb65b10f5e7b99a0e164afc05ca2518dbf
 2016-07-15 05:53:28 +00:00
Lajos Molnar
12f860f5a2 Merge "media: document new temporal layering schema values." into nyc-mr1-dev 2016-07-15 05:44:04 +00:00
Lajos Molnar
be00432071 media: clarify MediaFormat.KEY_I_FRAME_INTERVAL 
Bug: 30096321
Change-Id: I908b669caf5443fb272a2d274b7cbf7227913b3e
 2016-07-15 05:15:24 +00:00
Lajos Molnar
2cfca129d6 media: document new temporal layering schema values. 
Also fix doc as these are advertised on the output port.

Bug: 30150921
Bug: 27596987
Change-Id: Ia95876ade36bc82eea0e9795dea0268abbd1c1ef
 2016-07-14 19:56:35 -07:00
Lajos Molnar
1d356c895b Merge \"media: clarify notes in MediaCodec doc\" into nyc-mr1-dev 
am: 82d886434d

Change-Id: Iacc43f3db9a41a0373227fc09f3590cf275ec34f
 2016-07-15 00:35:12 +00:00
Lajos Molnar
82d886434d Merge "media: clarify notes in MediaCodec doc" into nyc-mr1-dev 2016-07-15 00:25:30 +00:00
Wei Jia
44d76c7a72 Merge \"MediaDataSource: add DrmInitialization for IDataSource.\" into nyc-dev 
am: 9604b3803c

Change-Id: Ibbb2272be91fb6c79795566cb9928bfb8adde002
 2016-07-14 01:14:42 +00:00
Wei Jia
509cbb6385 MediaDataSource: add DrmInitialization for IDataSource. 
Bug: 29342399
Bug: 28901867
Change-Id: Ib2049566582aa08783ff588dd25afef4e1c0b5e2
(cherry picked from commit a03dc2b5eb94a906eeeda5bf0afbcfb60588abb4)
 2016-07-13 23:24:20 +00:00
Sudheer Shanka
3b098778c6 Merge \"Fix disabling lockscreen for demo users.\" into nyc-mr1-dev 
am: 407fd1ea62

Change-Id: I5625a9ef9fd35ee0cbf6cad7651f7a39eee8f059
 2016-07-13 23:15:03 +00:00
Wei Jia
407fd1ea62 Merge "MediaPlayer: fix typo for OnInfoListener." into nyc-mr1-dev 2016-07-13 22:05:00 +00:00
Jean-Michel Trivi
96a8ee3aec Merge \"Optimize audio playback restriction check\" into nyc-mr1-dev 
am: 69c6166684

Change-Id: If626176f014e65f0248c5ae80d9196dd27076ec4
 2016-07-13 21:57:24 +00:00
Jean-Michel Trivi
69c6166684 Merge "Optimize audio playback restriction check" into nyc-mr1-dev 2016-07-13 21:50:59 +00:00
Jean-Michel Trivi
1293c060c8 Optimize audio playback restriction check 
Order the playback restriction checks from the most likely
  restriction to the least likely.

Bug 30073948

Change-Id: I6431d15a2ed8b5831f937eab8db940d942082b0e
 2016-07-13 19:30:56 +00:00
Eric Laurent
50768af5e1 Merge \"Make Dolby TrueHD audio format public\" into nyc-mr1-dev 
am: eb8de29269

Change-Id: I2cfe7a072d7bdbce4a1fad357b1608c1f9624688
 2016-07-13 16:01:29 +00:00
Eric Laurent
eb8de29269 Merge "Make Dolby TrueHD audio format public" into nyc-mr1-dev 2016-07-13 15:54:04 +00:00
Wei Jia
47efffff85 Merge \"MediaDataSource: add DrmInitialization for IDataSource.\" into nyc-mr1-dev 
am: e7982e05f6

Change-Id: I7376c0f985f1a625190481e134b24501e26ab7d2
 2016-07-13 02:09:07 +00:00
Wei Jia
a03dc2b5eb MediaDataSource: add DrmInitialization for IDataSource. 
Bug: 29342399
Bug: 28901867
Change-Id: Ib2049566582aa08783ff588dd25afef4e1c0b5e2
 2016-07-13 00:11:36 +00:00
Chris Thornton
0359337b9b Merge \"SoundTriggerDetector should look at the return code to honour success\" into nyc-mr1-dev 
am: 9b550cb188

Change-Id: Iafbd6b758768fc0f87651ac9086333fa74e07fdc
 2016-07-12 23:37:18 +00:00
Wei Jia
d973c00b4a MediaPlayer: fix typo for OnInfoListener. 
Bug: 30099323
Change-Id: Ic59fe64b4d2b6dcf28d31cb7c480ba6cb7a4cea1
 2016-07-12 14:38:50 -07:00
Chris Thornton
4ef887457a SoundTriggerDetector should look at the return code to honour success 
The SoundTriggerDetector calls to start/stop recognition should also
check what the return code from the SoundTriggerService are saying -
otherwise it looks like recognition has started when there's been a
problem.

Change-Id: Icd6d2ab5ec30a5ffe66082311a77cca376a37148
 2016-07-11 22:03:16 -07:00
Eric Laurent
abda9c33e5 Make Dolby TrueHD audio format public 
Bug: 30024357
Change-Id: I4e8e8cde6e6c87c96e07e1828da0fad96c0f9e76
 2016-07-11 17:08:14 -07:00
Eric Laurent
4b09c6bc9e Merge \"Add Dolby TrueHD audio format\" into nyc-mr1-dev 
am: b2fe804064

Change-Id: I2eba2e118c6ce34299ffe894d2c6e6ef9140fa24
 2016-07-08 23:13:13 +00:00
Eric Laurent
b2fe804064 Merge "Add Dolby TrueHD audio format" into nyc-mr1-dev 2016-07-08 23:08:02 +00:00
Jean-Michel Trivi
7cd1622ca3 Merge \\"More javadoc for audio recording activity API\\" into nyc-dev am: 8d5fd92314 
am: a90df50109

Change-Id: I256b03cae0e76b7a5c61a691c9359a091f1f666a
 2016-07-08 19:55:08 +00:00
Jean-Michel Trivi
ee0a01c8a6 Merge \"More javadoc for audio recording activity API\" into nyc-dev 
am: 8d5fd92314

Change-Id: If513added909df2135fb57a2f86804edec821177
 2016-07-08 19:49:09 +00:00
Jean-Michel Trivi
a90df50109 Merge \"More javadoc for audio recording activity API\" into nyc-dev 
am: 8d5fd92314

Change-Id: I58f991a41a6d17ca8e854109dad6ab41b14bc65a
 2016-07-08 19:45:54 +00:00
Jean-Michel Trivi
8d5fd92314 Merge "More javadoc for audio recording activity API" into nyc-dev 2016-07-08 19:36:33 +00:00
Eric Laurent
b4fae5ba39 Add Dolby TrueHD audio format 
Format is not public for now.
Unhide at next API bump.

Bug: 30024357
Change-Id: Ic307214d8ac8b7bb57609bf609366968efafd7cc
 2016-07-07 18:58:11 -07:00
Eric Laurent
be50351b72 Merge \\"SoundPool: fix enforced camera shutter sound\\" into nyc-dev am: a2266f7a0f 
am: a165d12737

Change-Id: I8e79a3f627ec38c736decdca2c88b56a4f5b5452
 2016-07-07 20:57:54 +00:00
Eric Laurent
f638978b07 Merge \"SoundPool: fix enforced camera shutter sound\" into nyc-dev 
am: a2266f7a0f

Change-Id: Ibb406207b55a532fdb42a68d0787b851deec8d05
 2016-07-07 20:49:13 +00:00
Eric Laurent
a165d12737 Merge \"SoundPool: fix enforced camera shutter sound\" into nyc-dev 
am: a2266f7a0f

Change-Id: I6ae2457bd8bd9f53b35373fb1be7eb66f80f1510
 2016-07-07 20:46:20 +00:00