1170 Commits

Author SHA1 Message Date
Jerry Zhang
3a13ab1fd3 Merge "Add moveObject method to change object's path and parent." am: 33a200e572 am: 0f09ac317d
am: f9696617bd

Change-Id: Ia6ba6d0cf89879914894d35a0dbf110d905966ac
2017-10-03 00:33:02 +00:00
Jerry Zhang
0f09ac317d Merge "Add moveObject method to change object's path and parent."
am: 33a200e572

Change-Id: Iabb8c9989ad35140ab1c752fb70741f52e56c04d
2017-10-03 00:04:03 +00:00
Jerry Zhang
952558d4e5 Add moveObject method to change object's path and parent.
This is needed to implement the MTP MOVE_OBJECT operation.

Bug: 66679910
Test: Move objects and folders, verify mediastore is consistent
Change-Id: I2f4f0c43134fb3ff82745166c051712cc1736b7f
2017-10-02 11:48:38 -07:00
Jeff Tinker
b562f9a088 Merge "Define priority for video threads" into oc-mr1-dev
am: 70ab6cb09c

Change-Id: I28a3f46bb690a3d18986db26e5cca6a43fb550e8
2017-09-08 20:22:01 +00:00
Jeff Tinker
e182d20137 Define priority for video threads
Video threads have soft realtime requirements that
must be met in order to maintain reliable frame delivery
even when the system is under high load. A new priority
has been defined that can be used by video threads to
enable them to be scheduled appropriately relative
to other system threads. This CL updates the media codec
looper to use the new priority.

Tests: GTS media tests, Manual verification with
Play Movies, Netflix, com.google.vr.sdk.samples.videoplayer

Change-Id: Ibfee09bb6a5359ab96ec2184775c486e4bd77871
related-to-bug:63898080
2017-09-07 19:13:21 -07:00
Chong Zhang
3c453a4c42 Merge "heif: add new file and mime types to MediaScanner -- DO NOT MERGE" into oc-mr1-dev
am: 1ec1ab6803

Change-Id: Iec7567b12486593631a1cb48523d1fa19382af80
2017-08-21 05:44:38 +00:00
Chong Zhang
6e18ccee2a heif: add new file and mime types to MediaScanner -- DO NOT MERGE
bug: 64077740
Change-Id: I6d36c2394a5ae527026c98c83786009e70b20958
2017-08-19 00:05:06 +00:00
Steven Moreland
e04a0bf5c7 Merge "ScopedUtfChars: use proper nativehelper headers"
am: 75c9e4d594

Change-Id: I170b5846981683eacee1081587c7149bab454d91
2017-08-11 21:07:06 +00:00
Steven Moreland
c195af9d0c ScopedUtfChars: use proper nativehelper headers
libnativehelper exports headers under nativehelper. These were
available before incorrectly as global headers in order to give
access to jni.h.

Test: modules using ScopedUtfChars find headers
Bug: 63762847
Merged-In: I5e9f2b56f569b83ece0d854f7066655e1d64cc65
Change-Id: I5e9f2b56f569b83ece0d854f7066655e1d64cc65
2017-08-10 18:08:37 -07:00
Steven Moreland
350b0ed191 Merge "ScopedUtfChars: use proper nativehelper headers" into oc-dr1-dev-plus-aosp
am: 1e8d712b78

Change-Id: I52b50aec4319183bebacaf7fb03e51dd6b51157a
2017-08-11 00:50:50 +00:00
Steven Moreland
65e2ca2808 ScopedUtfChars: use proper nativehelper headers
libnativehelper exports headers under nativehelper. These were
available before incorrectly as global headers in order to give
access to jni.h.

Test: modules using ScopedUtfChars find headers
Bug: 63762847
Change-Id: I5e9f2b56f569b83ece0d854f7066655e1d64cc65
2017-08-10 23:00:10 +00:00
Hangyu Kuang
0552036bc8 media: Add scaled video thumbnail extractor api.
Bug: 62198298
Test: CTS test
Change-Id: Ic78e2dac38b596a10d2fae76bc22f8c43fadf444
2017-07-27 13:31:46 -07:00
Steven Moreland
2412b4d979 Merge "frameworks/base: use proper nativehelper headers" am: 826eafd958 am: 5c091dc944 am: c840945a78
am: 9f430b2782

Change-Id: Ibe321dd4a8aae9342c76da0780edf94b90e8cd3a
2017-07-20 03:11:00 +00:00
Steven Moreland
9f430b2782 Merge "frameworks/base: use proper nativehelper headers" am: 826eafd958 am: 5c091dc944
am: c840945a78

Change-Id: I654e14f0d1b495450db81592a2e564e308746350
2017-07-20 03:05:02 +00:00
Steven Moreland
5c091dc944 Merge "frameworks/base: use proper nativehelper headers"
am: 826eafd958

Change-Id: I36f10ff4d963284a313f1cc5b368f82549a4adb2
2017-07-20 02:50:53 +00:00
Steven Moreland
2279b25342 frameworks/base: use proper nativehelper headers
libnativehelper exports headers under nativehelper. These were
available before incorrectly as global headers in order to give
access to jni.h.

Test: modules using frameworks/base find headers
Bug: 63762847
Change-Id: I0f9f231acdebe460f279135462f43d3e32eff64d
2017-07-19 10:06:40 -07:00
Steven Moreland
8e9b7efefd Reference nativehelper/jni.h as jni.h am: d82cdb4624
am: 6b9d4b76ae

Change-Id: I27f7f300b0a4e3d8d8d150e7902ed2763b442a4b
2017-07-19 02:41:21 +00:00
Steven Moreland
d82cdb4624 Reference nativehelper/jni.h as jni.h
nativehelper will no longer export nativehelper/jni.h so that everywhere
can reference this file with the same name.

Bug: 63762847
Change-Id: I3e58d478a2eb17b19db540414545a3c1f9c381af
(cherry picked from commit 98f40c71399e63f2b10cf6e3dffbbcea84d52490)
2017-07-19 02:26:57 +00:00
Steven Moreland
b36ef40c8a Merge "Merge "Reference nativehelper/jni.h as jni.h" am: 899a1f23c5 am: d2bf323c40 am: 238be4a67b" into oc-dr1-dev-plus-aosp
am: 319a28880e

Change-Id: I082d52f29c824dc6534f73ab073b520091057a2c
2017-07-18 22:05:50 +00:00
Steven Moreland
9882d6da79 Merge "Reference nativehelper/jni.h as jni.h" am: 899a1f23c5 am: d2bf323c40
am: 238be4a67b

Change-Id: Icb75bc6c2ba9750349de0e4f0ea15c29b5502b7b
2017-07-18 21:51:49 +00:00
Steven Moreland
d2bf323c40 Merge "Reference nativehelper/jni.h as jni.h"
am: 899a1f23c5

Change-Id: I30ec4f6b329360ea4161f2ad5538ecd238db7b62
2017-07-18 20:05:36 +00:00
Steven Moreland
98f40c7139 Reference nativehelper/jni.h as jni.h
nativehelper will no longer export nativehelper/jni.h so that everywhere
can reference this file with the same name.

Bug: 63762847
Change-Id: I3e58d478a2eb17b19db540414545a3c1f9c381af
2017-07-17 19:00:43 -07:00
Steven Moreland
889f9952d8 Reference nativehelper/jni.h as jni.h
nativehelper will no longer export nativehelper/jni.h so that everywhere
can reference this file with the same name.

Bug: 63762847
Change-Id: I8d2e9587439efa2d6ab03a5bdfa749fc620759e1
2017-07-17 12:08:45 -07:00
TreeHugger Robot
b6d9ba31de Merge "cas: convert MediaCas to HIDL" 2017-06-28 20:37:24 +00:00
Marco Nelissen
2ac1690bb7 Merge "Revert "Multiple worker threads for SoundPool"" into oc-dr1-dev am: 59a66b8601
am: b0bb373286

Change-Id: I859b99e3dc68396abccc0f399004860042d6cb07
2017-06-27 00:31:33 +00:00
Chong Zhang
2659c2f16c cas: convert MediaCas to HIDL
- Replace AIDL interfaces with corresponding HIDL ones.

bug: 22804304
Change-Id: I8c552ce6fc3766715cd1bc0ea05c0988d56f590e
2017-06-23 16:18:55 -07:00
Marco Nelissen
beea9f7636 Revert "Multiple worker threads for SoundPool"
This reverts commit 7201d9cb6a5d9bcd4f82dfde32e25a1ca8e825e2.

This reduces CPU usage during Camera startup.

Bug: 38031165
Bug: 62447848
Change-Id: I857aefec9dd7566bfdd3b84873eb5d495449815c
2017-06-21 19:30:17 +00:00
Dongwon Kang
bef01e4be6 Fix mistyped exceptions; InvalidArgumentException
Test: manually tested MediaCodec throws IllegalArgumentException
Bug: 62700434
Change-Id: Id3bc37200c5d1b83ba978e6971ad3310083c8319
2017-06-16 14:58:50 -07:00
Eino-Ville Talvala
20e2394f75 Merge "ImageReader: Set BufferItem mGraphicBuffer to null when returning it" into oc-dev
am: 20c2116c1f

Change-Id: I8385f1e65de888d602e5775f6811ec7c908f9073
2017-06-15 21:12:29 +00:00
Eino-Ville Talvala
730a1168e6 Merge "ImageReader: Set BufferItem mGraphicBuffer to null when returning it" into oc-dev
am: 20c2116c1f

Change-Id: I82b234f1fa7ea6b231bacdd99543b68fa8be51c6
2017-06-15 21:10:51 +00:00
Eino-Ville Talvala
0af9435572 ImageReader: Set BufferItem mGraphicBuffer to null when returning it
The ImageReader JNI layer needs to maintain a list of BufferItems that
back the Java Image objects. At start, we allocate maxImages of these
in a list, and acquire and release them from this list as the
application acquires and releases Images.

However, on release, the contents of the BufferItem are not adjusted,
so it can retain a reference to a GraphicBuffer until the BufferItem
is reused.

Test: Camera CTS passes, memory usage drops after camera bursts
Bug: 62652080
Change-Id: I9aade5e32cbe0af0c15a3886e16ada1a70392b74
2017-06-15 06:34:31 -07:00
Marco Nelissen
7201d9cb6a Multiple worker threads for SoundPool
This makes SoundPool create multiple worker threads for loading sounds.
Threads are created on demand, and go away when no work is available.
Bug: 38031165
Test: manual

Change-Id: Ic73f2777215e4aa65aa1c41b283b7838cebd165d
2017-06-01 12:37:29 -07:00
Andy Hung
0dc609a113 Merge "VolumeShaper: Enable xOffset from Java" into oc-dev am: b33c0eb07a
am: 0cc01b5bc2

Change-Id: I9afcd844391b56991b5cc686808f89b4ec878a31
2017-05-18 16:34:39 +00:00
Andy Hung
0cc01b5bc2 Merge "VolumeShaper: Enable xOffset from Java" into oc-dev
am: b33c0eb07a

Change-Id: Icc37873492d612a66484d731168de5c5e27213c9
2017-05-18 16:26:41 +00:00
Andy Hung
3c0f5d296e VolumeShaper: Enable xOffset from Java
Previously only accessible from native.
Also improve documentation and comments.

Test: CTS VolumeShaperTest, Ducking
Bug: 38353147
Change-Id: I27bb34f0a5d28f80d138111bbeeb92653b5195c5
2017-05-17 18:31:38 -07:00
Colin Cross
0bd45d3f2c Merge "Convert libsoundpool to Android.bp" am: dde9ee9edd am: e9ffa404ae
am: 13ea256d71

Change-Id: I8af55458b0bba29701249f7a8165f30055262f46
2017-05-17 22:03:06 +00:00
Colin Cross
da8082bda2 Convert libsoundpool to Android.bp
See build/soong/README.md for more information.

Test: m -j checkbuild
Change-Id: If0b7cb1e2c86ff1be41c00d98fd9ddec31287a53
Merged-In: If0b7cb1e2c86ff1be41c00d98fd9ddec31287a53
(cherry picked from commit 98c127f8cc652d1179871ad47cac99d15ea1a5a0)
2017-05-17 13:22:34 -07:00
Colin Cross
b5af660ff6 Merge "Convert libsoundpool to Android.bp" 2017-05-17 20:15:20 +00:00
Colin Cross
58d87e8ab7 Convert libmedia_jni to Android.bp
See build/soong/README.md for more information.

Test: m -j checkbuild
Change-Id: I1817c75ee45537ca0d5fc40a035f94a3dfeccc11
Merged-In: I1817c75ee45537ca0d5fc40a035f94a3dfeccc11
(cherry picked from commit 76de4f6b4d09423b3a5d3603527ce79acae4ed32)
2017-05-16 22:05:39 -07:00
Colin Cross
eb27d2798a Convert libmedia_jni to Android.bp
See build/soong/README.md for more information.

Test: m -j checkbuild
Change-Id: I1817c75ee45537ca0d5fc40a035f94a3dfeccc11
Merged-In: I1817c75ee45537ca0d5fc40a035f94a3dfeccc11
(cherry picked from commit 76de4f6b4d09423b3a5d3603527ce79acae4ed32)
2017-05-17 03:02:21 +00:00
Colin Cross
14b2beb0ef Merge "Convert libmedia_jni to Android.bp" 2017-05-17 02:42:41 +00:00
Andy Hung
f7162a3a43 Merge "AudioEffect: return DEAD_OBJECT for FAILED_TRANSACTION" into oc-dev am: 52f57cb720
am: 24ac07e1e0

Change-Id: I0c662869ebda4d99a81a0c31407a47ea6699a907
2017-05-17 01:46:12 +00:00
Andy Hung
24ac07e1e0 Merge "AudioEffect: return DEAD_OBJECT for FAILED_TRANSACTION" into oc-dev
am: 52f57cb720

Change-Id: Idb0f8a1565c4eb36ad0031a86b244f698e9cefbd
2017-05-17 01:39:55 +00:00
Colin Cross
98c127f8cc Convert libsoundpool to Android.bp
See build/soong/README.md for more information.

Test: m -j checkbuild
Change-Id: If0b7cb1e2c86ff1be41c00d98fd9ddec31287a53
2017-05-16 13:08:19 -07:00
Colin Cross
76de4f6b4d Convert libmedia_jni to Android.bp
See build/soong/README.md for more information.

Test: m -j checkbuild
Change-Id: I1817c75ee45537ca0d5fc40a035f94a3dfeccc11
2017-05-16 13:07:57 -07:00
Andy Hung
32d516381c AudioEffect: return DEAD_OBJECT for FAILED_TRANSACTION
Test: CTS AudioSecurityTest
Bug: 38346284
Change-Id: I96b4995c2d11b4a33c4b2fa6987922e26c91d336
2017-05-16 12:33:56 -07:00
Jeff Tinker
dffb216140 Merge "Fix drm hal resource leaks" into oc-dev am: 63398bbd71
am: 8b1e0e1254

Change-Id: I14d864345f84d801aef48b45af1c59a1e08f7087
2017-05-15 20:14:15 +00:00
Jeff Tinker
8b1e0e1254 Merge "Fix drm hal resource leaks" into oc-dev
am: 63398bbd71

Change-Id: Iae4c7f407e638dd2dba5acfc43a3ca894f665bd4
2017-05-15 20:03:16 +00:00
Jeff Tinker
94dd36cae9 Fix drm hal resource leaks
bug:36408047
test: manual testing to verify leaks are fixed
Change-Id: Ic6a29572874a9fe30f36e7fdabb68d2ddeffb278
2017-05-15 09:27:18 -07:00
Colin Cross
2a5d782689 Update path for libmediandk headers
Platform usages of libmediandk headers are now in media/.

Test: builds
Change-Id: I16385cab86ae9cac225304557df416bbb232ecf3
(cherry picked from commit c8ed45d38f3b42e06c9e0980e133a84181752b5e)
2017-05-05 13:05:55 -07:00