1206 Commits

Author SHA1 Message Date
jiabin
fe3e6024ed Add AudioRouting interface in MediaRecorder.
Bug: 64038649
Test: Run cts in RoutingTest
      Switching input device when using MediaRecorder

Change-Id: I3f2a9f670565c6e55d612c1477a505fa3d096e3d
2017-11-28 17:25:46 -08:00
Wei Jia
49ca7252e4 MediaPlayer: simplify buffering control.
Test: pass cts tests
Bug: 36280094
Change-Id: If1e2dac511d038b88f7e867eb7ff8b345cb04478
2017-11-12 15:07:00 -08:00
Jae Shin
a0f51ba484 Remove libmedia_omx_defaults from libmedia
libmedia_omx_defaults includes source files and this default was
used in both libmedia.so and libmedia_omx.so. This is an issue because
libmedia_omx and libmedia are both loaded in the framework process
through dependency chains such as libstagefright ->
libstagefright_omx_utils -> libmedia_omx.

To fix the issue, libmedia_omx_defaults is removed from libmedia and
libmedia now depends on libmedia_omx. Other modules/libs that originally
depended on libmedia and need access to libmedia_omx_defaults' source
files, now depend on libmedia_omx as well.

Bug: 67871061
Test: mma -j and boot test
Change-Id: I096d58d1e3338b70d5dae9d0f9919b908070d071
2017-11-07 02:53:16 +00:00
TreeHugger Robot
f8a6f1da8f Merge "Add AudioRouting interface in MediaPlayer" 2017-11-03 19:54:39 +00:00
TreeHugger Robot
416a66cd6c Merge "Fix exception on MediaDrm invalid property access" 2017-11-03 07:52:50 +00:00
Jeff Tinker
eb13c764c6 Fix exception on MediaDrm invalid property access
Accessing an invalid MediaDrm property would result in
an IllegalStateException.  This change causes
IllegalArgumentException to be thrown instead, which
is more appropriate.

Test: android.media.cts.ClearKeySystemTest passes
  and it fails prior to this CL.

bug:68765217
Change-Id: I858575dc8fe643a88381da49b543c5cc0d266e02
2017-11-02 18:13:02 +00:00
jiabin
6e5a628ab6 Add AudioRouting interface in MediaPlayer
Bug: b/64038649
Test: Run cts in RoutingTest
      && switch output device when using MediaPlayer playing music/video

Change-Id: I48dcfd40c3a6ce01c818f6268cc86ed02b7eaa58
2017-11-01 09:53:17 -07:00
Chong Zhang
884162b81b Merge "heif: support heif image sequence and dual-function files" 2017-10-31 18:34:51 +00:00
Chong Zhang
ab2cf191c0 Merge "mtp: fix double free of thumbnail data" into nyc-dev am: 914bc14e82 am: f9e16c9899 am: 396487f5aa am: 5330335288 am: db258ebba8 am: e3ac25eb0c am: bd7101937a am: b48acd86c0
am: c4ac607916

Change-Id: I23eeff8ab3dfd281585ef4650a6f036b6c80f4f9
2017-10-31 01:09:46 +00:00
Chong Zhang
c4ac607916 Merge "mtp: fix double free of thumbnail data" into nyc-dev am: 914bc14e82 am: f9e16c9899 am: 396487f5aa am: 5330335288 am: db258ebba8 am: e3ac25eb0c am: bd7101937a
am: b48acd86c0

Change-Id: I5aba8558427da76da5bbe331c207f04415990ac1
2017-10-31 00:55:23 +00:00
Chong Zhang
b48acd86c0 Merge "mtp: fix double free of thumbnail data" into nyc-dev am: 914bc14e82 am: f9e16c9899 am: 396487f5aa am: 5330335288 am: db258ebba8 am: e3ac25eb0c
am: bd7101937a

Change-Id: I78a26c3abfb72e9b873b719506f869df0aa87da1
2017-10-31 00:41:00 +00:00
Chong Zhang
bd7101937a Merge "mtp: fix double free of thumbnail data" into nyc-dev am: 914bc14e82 am: f9e16c9899 am: 396487f5aa am: 5330335288 am: db258ebba8
am: e3ac25eb0c

Change-Id: Iba4bcd510ea20aa6fe928074912a864fe325680a
2017-10-31 00:26:33 +00:00
Chong Zhang
e3ac25eb0c Merge "mtp: fix double free of thumbnail data" into nyc-dev am: 914bc14e82 am: f9e16c9899 am: 396487f5aa am: 5330335288
am: db258ebba8

Change-Id: Ic9821f05d30a57fad1567e834804cec6ff5dca97
2017-10-31 00:11:32 +00:00
Chong Zhang
396487f5aa Merge "mtp: fix double free of thumbnail data" into nyc-dev am: 914bc14e82
am: f9e16c9899

Change-Id: Id780ff2bfb2f3881cbf33032971ed3b397a2fcde
2017-10-30 23:16:40 +00:00
Chong Zhang
4342f08fab heif: support heif image sequence and dual-function files
- Add a few methods to MediaMetadataRetriever to get still
  images and frames by index.

- Declare keys in MediaFormat related to heif still images.

bug: 63633199

test:
cts-tradefed run cts-dev --module CtsMediaTestCases --compatibility:module-arg CtsMediaTestCases:include-annotation:android.platform.test.annotations.RequiresDevice

Change-Id: I9556b27f7395a163aadd01e979930061878994d0
2017-10-30 19:59:43 +00:00
Chong Zhang
e6b98532ee mtp: fix double free of thumbnail data
bug: 67864232
Change-Id: I6eb51be839df12317273830521c70a4ed80f9496
2017-10-24 17:03:43 -07:00
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
Leon Scroggins III
f32424b90d Merge "Stop explicitly using kCallerPasses_Ownership" into nyc-dev am: cfe2352d88
am: 2399d935bc

Change-Id: Ib219c4c5299b681b6f3858cb67c70a7fd9110f20
2017-10-06 16:18:49 +00: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
Leon Scroggins III
adb5e0ba6d Stop explicitly using kCallerPasses_Ownership
Bug: 65646012
Bug: 65426286

Cherry-picked from master. The original CL just updates BitmapFactory.
This also updates ExifInterface in the same way. ExifInterface.cpp no
longer existed by the time the Skia change landed.

Required for Ib7aaf367f68f8764147887d858f65ee14fa7a1d9, which fixes
the aforementioned bugs.

Test: No change in behavior, no new tests.

This enum is going away in https://skia-review.googlesource.com/c/9498,
and this method is using the default anyway.

Merged-In: I928a72851f90e84f45ce2fa49560f8ba894a8058
Merged-In: I8f6c761e50cb29476dc0784f58908ec35e3c70e9
Change-Id: I928a72851f90e84f45ce2fa49560f8ba894a8058
2017-09-14 20:10:22 +00: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