77 Commits

Author SHA1 Message Date
TreeHugger Robot
46fcbd69e6 Merge changes from topic "tuner_api_filter_read"
* changes:
  Add read methods for filter
  Add a cpp filter wraper
  Filter settings and configure()
2019-12-09 21:39:29 +00:00
shubang
964e6137e0 Add read methods for filter
Test: make; cuttlefish;

Change-Id: Id04843051e2060eb6612643dff8f889f1266c1f2
2019-12-09 10:57:46 -08:00
Robert Shih
9064ede6ba Merge "MediaDrm: enumerate supported schemes" 2019-12-04 19:40:30 +00:00
Robert Shih
d2e8b43f6f MediaDrm: enumerate supported schemes
Bug: 139134043
Test: MediaDrmTest
Change-Id: If6f8c8afb7f96a424556638d6909ff0396f0612e
2019-11-27 18:53:49 +00:00
Robert Shih
ba6777e524 MediaDrm jni: use DrmMetricsConsumer
Bug: 134787536
Test: MediaDrmMetricsTest
Change-Id: Ied0b106f6d4a59ad32ada5f674da1bfd400e68c1
2019-11-27 02:38:12 +00:00
Marco Nelissen
f24e207ddc Merge "Remove unused link libraries from libmedia_jni_utils" am: 8d132dd384 am: 7224f7b7c8
am: f91c2a0f22

Change-Id: I9e23a9f58532b4ad2ad3c8ec52c48a7be11cddc5
2019-10-31 10:44:40 -07:00
Marco Nelissen
e83368fcfa Remove unused link libraries from libmedia_jni_utils
Test: build
Change-Id: If11573e26f1b4e610b936d63870da962c8e128a2
2019-10-30 07:48:25 -07:00
shubang
7e849b0509 Add frontend constants and callback
Test: make; acloud;
Change-Id: I255aa05c9e0dddc261bb92982fec82355a6021b7
2019-10-24 10:49:34 -07:00
shubang
8ab43b1b4a Create MediaTuner Java class and JNI
Test: make; acloud create;
Change-Id: Idac63c5ecf370e2b6b209e9e57d9453876b307d9
2019-10-23 14:35:54 -07:00
Marco Nelissen
f0ef85669c Move JetPlayer implemention and JNI
The JetPlayer implementation in libmedia was only used by the
JetPlayer JNI code in libandroid_runtime. This change moves
both implementation and JNI to libmedia_jni. This reduces
libandroid_runtime's dependency on libmedia, and results in
a net size reduction of the libraries involved.

Test: atest JetPlayerTest
Change-Id: I028c774fdea167924b064855267254c15f22fddb
Merged-In: I028c774fdea167924b064855267254c15f22fddb
2019-10-17 21:33:07 +00:00
Marco Nelissen
5ff1173ab1 Move JetPlayer implemention and JNI
The JetPlayer implementation in libmedia was only used by the
JetPlayer JNI code in libandroid_runtime. This change moves
both implementation and JNI to libmedia_jni. This reduces
libandroid_runtime's dependency on libmedia, and results in
a net size reduction of the libraries involved.

Test: atest JetPlayerTest
Change-Id: I028c774fdea167924b064855267254c15f22fddb
2019-10-17 11:11:46 -07:00
Dongwon Kang
097fc5fe58 libmedia_jni: separate codeclist from libmedia
Test: build.
Bug: 139201422
Change-Id: I8d4279af883198e1276955831ecb9e3ae7a6e0af
Merged-In: I8d4279af883198e1276955831ecb9e3ae7a6e0af
2019-10-11 23:52:48 +00:00
Jeff Sharkey
f8e15d9019 Finish deprecating legacy MediaScanner.
We switched completely over to using ModernMediaScanner in Android Q,
and this legacy code is no longer being used.  Clean it up, but leave
enough remnants behind to begrudgingly keep reflecting apps working.

Bug: 128243527
Test: atest --test-mapping packages/providers/MediaProvider
Change-Id: Ib2bc341fafcd4c2e049c864a35fbe651d013f6fd
2019-10-11 15:57:23 -06:00
Marco Nelissen
3495d4f857 Fix DRM includes
Test: build
Change-Id: Ia2345b03d54deef9bd2f5ed67ae9ce2216507b10
Merged-In: Ia2345b03d54deef9bd2f5ed67ae9ce2216507b10
2019-10-01 13:43:52 -07:00
Marco Nelissen
a2eedd5d99 Fix DRM includes
Test: build
Change-Id: Ia2345b03d54deef9bd2f5ed67ae9ce2216507b10
2019-09-30 14:04:48 -07:00
Dongwon Kang
cc73dda80b libmedia_jni: separate codeclist from libmedia
Test: build.
Bug: 139201422
Change-Id: I8d4279af883198e1276955831ecb9e3ae7a6e0af
2019-09-26 15:56:11 -07:00
Marco Nelissen
845fa76419 Remove MediaPlayer2
Bug: 141546997
Test: build, boot
Change-Id: I1550c14f3a0967910809cc2415d10f62c967bd44
Merged-In: I1550c14f3a0967910809cc2415d10f62c967bd44
2019-09-25 08:15:54 -07:00
Marco Nelissen
a9a802f976 Remove MediaPlayer2
Bug: 141546997
Test: build, boot
Change-Id: I1550c14f3a0967910809cc2415d10f62c967bd44
2019-09-24 12:47:41 -07:00
Steven Moreland
0daed48a88 Remove libhwbinder/libhidltransport deps
Since these were combined into libhidlbase.

Bug: 135686713
Test: build only (libhwbinder/libhidltransport are empty)
Change-Id: I136e4d4459bb8c3c5abf3c0758dd5ae14d0ad2a2
2019-09-09 16:28:55 +00:00
Marco Nelissen
292fdc1c93 Remove libexif usage from libmedia_jni.so
Test: manual, connect with MTP and PTP
Change-Id: I33128db25b8aae60df7854c61fc2a3873a1bced9
(cherry picked from commit f7ec16802c0ff22feeaed9d4011c4a18c9d0dd96)
(cherry picked from commit efb865ace2885723d37e0ef9e6bae695d6dcabb0)
(cherry picked from commit 5954d210d324bd97fc585b6a238a15d1d52e64a1)
2019-07-08 05:29:38 +00:00
TreeHugger Robot
c56f3bbfba Merge "Revert "libmedia_jni pulls in libsfplugin_ccodec"" into qt-dev 2019-06-24 19:52:28 +00:00
Mikhail Naganov
03bb294e57 Revert "libmedia_jni pulls in libsfplugin_ccodec"
This reverts commit 16c0c46f208c2a6b4d321352fbc5fc6acff6261e.

Reason for revert: causes b/135763139 (volume adjustment for music does not work)

There is no clear explanation how this change breaks volume adjustment, but by bisection and by reverting the change locally it does somehow.

Bug: 133186424
Bug: 135763139
Change-Id: If6eed10f23c6b6006a6468c2a793230cd98c0501
2019-06-24 18:48:51 +00:00
TreeHugger Robot
1c0b6aa767 Merge "libmedia_jni pulls in libsfplugin_ccodec" into qt-dev 2019-06-20 20:27:22 +00:00
Ray Essick
16c0c46f20 libmedia_jni pulls in libsfplugin_ccodec
libmedia_jni now pulls in libsfplugin_ccodec instead of deferring it
until an actual reference. This eliminates some codec startup latency
later. this is only "load it", there is no actual use of
libsfplugin_ccodec by libmedia_jni.

Bug: 133186424
Test: boot, logcat, forrest startup timing measurements
Change-Id: Iacf8783cb45d33f5cec67863d4bf89da6dff9c2d
2019-06-20 09:35:54 -07:00
Steven Moreland
e5da40639c libmedia2_jni: remove libhwbinder_noltopgo ref
No longer needed, these symbols are in libhidlbase.

Bug: 134961554
Test: boot
Change-Id: I79f0fd6edd329012929b7cbd161ed6b7202995d4
2019-06-18 17:20:06 -07:00
Chong Zhang
12a24cd125 make libmedia_jni_utils depends on libgui
libmedia_jni_utils only has dependencies on libgui,
not entire libmedia_omx, it's linking to libmedia_omx
to get to libgui/bufferqueue headers.

bug: 129272021
test: builds

Change-Id: I48453cb53d36e6ecb2a6f6dd2b09f9a99e8479f0
(cherry picked from commit a527e6d94b77b74545e09bd617b0060e2075eee2)
2019-04-04 19:21:36 +00:00
Yifan Hong
f7cbc11d0c libmedia2_jni: link to libcgrouprc
libcgrouprc is an LLNDK library used by libprocessgroup.
libprocessgroup is linked statically, so the dependency needs
to be explicitly stated in libmedia2_jni.

Test: boots (sanity)
Bug: 123664216
Change-Id: Ieebba36417d1f83a5946f927043f15dc8abc188a
2019-03-27 15:20:53 -07:00
Dongwon Kang
3b9f51840b Merge "Remove static linking of libstagefright and libmedia_helper from libmedia2_jni" 2019-02-26 19:23:09 +00:00
Dongwon Kang
7c682056f7 Remove static linking of libstagefright and libmedia_helper from libmedia2_jni
Test: build and boot
Bug: 126159708
Change-Id: I35e1266425529d611d560d837ae3cd965b1057da
2019-02-25 14:26:37 -08:00
Jooyung Han
cb1e896d57 Extract android_media_Utils.cpp as a lib
This is a part of job to cut dependency from libmediandk
to libandroid_runtime. As a LL-NDK, libmediandk desn't have
to depend on libandroid_runtime.

dependency: libmediandk -> libmedia_jni -> libandroid_runtime

Libmediandk calls three utility functions defined in
android_media_Utils.cpp. But these functions are independent
from libandroid_runtime.

By extracting those utility functions into its own shared library
(libmedia_jni_utils), the dependency from libmediandk to
libmedia_jni is cut down.

However, some classes and other functions in android_media_Utils.cpp
are moved into new file, android_media_Streams.cpp since they
depend on libandroid_runtime.

Bug: 124268753
Test: m -j
Change-Id: I1e1ea4bc1ff7022d8d9c42785c8c00e3ca153a50
2019-02-22 08:47:24 +00:00
Suren Baghdasaryan
3fc4af6568 Replace hardcoded cgroup paths
Replace hardcoded cgroup paths with new processgroup library API calls,
include required headers. Add required dependencies.

Bug: 111307099
Test: builds, boots

Change-Id: Ic2dc2a94328cf1927fafaa9506537aeb213df413
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
2019-02-02 09:07:43 +00:00
Pirama Arumuga Nainar
5b6c39d94c Use the non-LTO/PGO hwbinder in libmedia2_jni
Bug: http://b/119560349

Currently, any binary links in a PGO-enabled static library also needs
to opt into PGO.  With b/119560349, this should be done automatically by
the build system.  Until then, use the non-PGO version of libhwbinder in
libmedia2_jni.

Test: m ANDROID_PGO_INSTRUMENT=all
Change-Id: I0bdd1b56c9e9417ea62d9db8986a10b93b2260b9
2019-01-29 10:35:07 -08:00
Dongwon Kang
72d83dc5ab Clean up build rule for libmedia2_jni
- Remove unused cas libraries.
- Remove unused libz.
- Statically include libutils and cas libs.
- Remove libbinder.

Test: build
Bug: 123361167
Change-Id: Iffb57a74c442ab0de928025e4afee1f00c397868
2019-01-25 20:28:06 -08:00
Ray Essick
d35a9c7535 mediaplayer2 uses the new mediametrics C apis
cut mediaplayer2 over to use the new mediametrics C apis to support
updateable components.

Bug: 112555455
Test: boot
Change-Id: I35150dc5445b6597fce739395d0132bcd29366b4
2019-01-24 14:25:46 -08:00
Ray Essick
c535a55cd6 Further work on libmediametrics stable API
implement a missing method (for inflight metrics), enumerate exported
symbols. Reconcile common source files
core/jni/android_media_MediaMetricsJNI and media/jni/android_media_MediaMetricsJNI
use new "libmediametrics_stable" library for mediaplayer2

Bug: 119675363
Test: build, CTS media/codec tests
Change-Id: Ide72dfe891231c3764329686955e1b4682094b1e
2019-01-24 14:25:34 -08:00
Dongwon Kang
fc86964668 Revert "Load MediaPlayer2 implementation with a linker namespace."
This reverts commit 6ac67f7293648405c623889b62ad3d2e384f5110.

Reason for revert: This change is no longer needed thanks to upcoming
                   native_loader change for applying linker namespace.

Bug: 112766913
Test: build and boot
Change-Id: Idb29b6cd6a4baaf791b67e6e7fc3a97f98292be4
2019-01-21 10:16:52 -08:00
Dongwon Kang
d5c8fa1dd9 Merge "Load MediaPlayer2 implementation with a linker namespace." 2019-01-16 17:48:21 +00:00
Dongwon Kang
6ac67f7293 Load MediaPlayer2 implementation with a linker namespace.
MediaPlayer2 calls System.loadLibrary(media2_jni) and
libmedia2_jni loads the MediaPlayer2 native implementation
in libmediaplayer2_jni with an isolated linker namespace.

Test: build & boot & atest MediaPlayer2Test
Bug: 112766913
Change-Id: I07c542da5ccb305f839cda488c9e83b43c98c9e1
2019-01-14 13:33:28 -08:00
Marco Nelissen
4632573631 libmediaextractor doesn't exist anymore
Test: build

Change-Id: I19fef2ea96b3f309c7c6bc668413a13f25cd8654
2019-01-14 08:47:39 -08:00
Dichen Zhang
8022ba126a jWakeLock
replace native binder with java PowerManager in JWakeLock

Test: MediaPlayer2Test
Bug: 122470692
Change-Id: I1e5871a50ecac4b0785f064801107e4b6035889a
2019-01-08 14:30:18 -08:00
Dongwon Kang
c7011b0862 MediaPlayer2: replace IPCThreadState with libbinder_ndk.
Test: make libmedia2_jni
Bug: 112766913
Change-Id: I49c77faea008e873f41f5e496a525d77fe6230c4
2019-01-07 15:04:56 -08:00
Dongwon Kang
7890a61a44 Remove libgui.so and re-order shared library list.
Test: build
Bug: 112766913
Change-Id: Ic2f04e30acb68ec6264f46d5dbfbdff5252fe970
2018-12-21 15:31:08 -08:00
Chong Zhang
c1c60d46ca Fix build for libmedia2_jni
Mpeg2ts static lib now uses the hidl allocator
to get the hidl memory.

bug: 112766913
bug: 111407253
Change-Id: I588e9a603a0dd34dd90a69a32a9b355222507ff2
2018-12-17 16:56:58 -08:00
Wei Jia
073e1b11b3 MediaPlayer2: rename Media2DataSource to DataSourceCallback
Test: cts
Bug: 112549021
Change-Id: I4f623d2c94e855f7af51f20a207db05b6da4b221
2018-11-28 16:54:57 -08:00
Dongwon Kang
90282b4a59 MediaPlayer2: remove libaudioclient.so dependency.
Test: build
Bug: 112549970
Change-Id: Iad5e843f37911ebf747253cd842ff85a45222ccf
2018-11-15 10:47:54 -08:00
TreeHugger Robot
36e0320cf9 Merge "MediaPlayer2: remove libnetd_client dependency." 2018-11-03 06:46:40 +00:00
Dongwon Kang
354eb38f58 Merge "MediaPlayer2: remove unused libraries." 2018-11-02 22:51:20 +00:00
Dongwon Kang
a6e29ae210 MediaPlayer2: remove libnetd_client dependency.
Test: build
Bug: 112767419
Change-Id: Ib7f8535ee3074c6ce4c5c609a80f8230ea3d68e2
2018-11-01 17:41:50 -07:00
Dongwon Kang
fc676fe538 MediaPlayer2: remove unused libraries.
Test: build
Bug: 112767419
Change-Id: I40a2afcce027007d887afe1a9d0fcc234f3e4298
2018-11-01 16:32:47 -07:00
Ray Essick
67004bc46d annotate intentional fallthroughs in switch()
also disable the temporary 'suppress the warning' flags

Bug: 118756460
Test: compilation
Change-Id: Iefeb66be13099021940ec8bce2515c62052b9304
2018-11-01 15:25:23 -07:00