1187 Commits

Author SHA1 Message Date
Jerry Zhang
008585f7d5 Merge "Add storageId to moveObjects" am: 1f4f6d2a18 am: 18abf57e99 am: 59ff05a59f
am: 3b997d0773

Change-Id: I93d06954ceb4942e3efdbd9e5ce2ddb25dee8ab7
2017-10-19 18:48:11 +00:00
Jerry Zhang
3b997d0773 Merge "Add storageId to moveObjects" am: 1f4f6d2a18 am: 18abf57e99
am: 59ff05a59f

Change-Id: I024be0c75e20e58152dbe0c81e5548d70f06a925
2017-10-19 18:36:22 +00:00
Jerry Zhang
18abf57e99 Merge "Add storageId to moveObjects"
am: 1f4f6d2a18

Change-Id: Id4f53fc283850d8f93cde7e67581355dc50e595e
2017-10-19 18:11:49 +00:00
Jerry Zhang
def7b19300 Add storageId to moveObjects
When moving between different storages, the storageId
must be changed as well.

Bug: 67028892
Test: Move between storages with virtual sdcard.
Change-Id: Ie82aa8d53686bfffb7c26b46a49524a00f2f0214
2017-10-17 15:27:03 -07:00
Dongwon Kang
70d2ba3c06 Remove libmedia and libstagefright dependency from extractors
- MediaSource, DataSource and MediaExtractor are moved to
  libmediaextractor so that they can be used by extractor
  implementations without depending on libmedia and libstagefright.
- XXXFactory classes has been added in order not to expose CreateXXX
  methods in libmediaextractor.
- avc_utils is moved to libstagefright_foundation since most of
  extractor implementations are relying on that.

Test: build
Bug: 65851881

Change-Id: Idba410c3dc0abbfb4d73c186d44b5069cdb5780f
2017-10-12 21:44:30 -07:00
Dongwon Kang
efada569e6 Move UXX_AT families to libstagefright_foundation
Byte handling utilities moved to libstagefright_foundation so that
they can be used in extractors without depending on libstagefright.

Test: build
Bug: 65851881

Change-Id: Ib4e530563dd8640d3a57456a8fa200012a2129ce
2017-10-09 11:46:39 -07:00
Jerry Zhang
c8d44372e6 Merge "Add moveObject method to change object's path and parent." am: 33a200e572 am: 0f09ac317d am: f9696617bd
am: 3a13ab1fd3

Change-Id: I58a1ca9b3b5e63e73eb4db58ac3588f6bf9e3249
2017-10-03 00:44:23 +00:00
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
TreeHugger Robot
7bccb79b04 Merge "cpp: use proper nativehelper headers" 2017-09-27 03:25:24 +00:00
Steven Moreland
60cc6c03ff cpp: 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 cpp find headers
Bug: 63762847
Change-Id: I34722bb961327b0128703ab925bc86961ca66cb6
2017-09-25 21:42:29 +00:00
Derek Sollenberger
71b36912e0 Merge "Reduce overhead by combining libskia and libhwui into a single library." 2017-09-25 15:45:34 +00:00
TreeHugger Robot
6bc7eba04e Merge "MediaPlayer: add notifyAt for TimeProvider" 2017-09-15 20:15:35 +00:00
Wei Jia
c02f09d0d1 MediaPlayer: add notifyAt for TimeProvider
Test: TimeProvider gets correct media time when playback rate is not 1.0
Bug: 65204641
Change-Id: I5020515415e14a2c37eec0d1ece511518b9239e7
2017-09-15 09:11:51 -07:00
Jeff Tinker
8062cd497c Merge "Merge "Define priority for video threads" into oc-mr1-dev am: 70ab6cb09c" into oc-mr1-dev-plus-aosp
am: 1f962f664b

Change-Id: I7ab6afdf6ec6f8c3641e299e0486c30a10720fb1
2017-09-08 20:43:21 +00: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
Ivan Lozano
9f6a292f6a Merge "Moving IPlayer.aidl to frameworks/av/." 2017-09-01 23:07:07 +00:00
Ivan Lozano
330d876a62 Moving IPlayer.aidl to frameworks/av/.
As part of migrating native binder services to AIDL, this moves IPlayer.aidl to
the frameworks/av/ project and links in the new AIDL generated binder library to
the JNI libraries.

Test: run cts --module CtsMediaTestCases
Bug: 64223827

Change-Id: I7e346a471b98c78ceb35dceed9e6c0df1000cfb1
2017-09-01 08:24:14 -07:00
Chong Zhang
48fa890b61 heif: add new file and mime types to MediaScanner
bug: 64077740
Change-Id: I6d36c2394a5ae527026c98c83786009e70b20958
(cherry picked from commit 6e18ccee2afd30a1b0874c5e26b2c8289309b432)
2017-08-22 20:00:58 +00: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
Derek Sollenberger
d938e5a2e2 Reduce overhead by combining libskia and libhwui into a single library.
This is a multiproject change as we need to both the libraries
themselves as well as those that had dependencies on libskia.so

Bug: 31971097
Test: compile only
Change-Id: Ie6ff1f4682d03289205f4d6048cde9f95c61a90f
2017-07-24 09:42:07 -04: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