2035 Commits

Author SHA1 Message Date
hkuang
92f2a6daf8 transcoding: Remove MediaTranscodeManager's jni files.
Bug: 160260102
Test: Unit test
Change-Id: Ie29b0c3ccf0955801df99b9dc8bc3d7358cf7a18
2020-08-31 20:00:39 +00:00
Colin Cross
082aec6c84 Revert "Snap for 6793014 from bbbccc3c2b7fc7c5780f6c415c4223e1d0..."
Revert "Snap for 6793014 from 44725f06b7f7d6407b5ee82d989bdd6c7a..."

Revert "Snap for 6793014 from f22ad3164937a8f2e309965c102b6366d5..."

Revert "Snap for 6793014 from 11467102abddb6026aaa164c1361439c2d..."

Revert "Snap for 6793014 from 265280bf5cb4bc14e132c3a35ae5f7ae65..."

Revert "Snap for 6793014 from f2989f9c65556d5155dbd57f82f0c93a16..."

Revert "Snap for 6793014 from 8b8bf0a07b0521bbe8483fbbab1222ffd6..."

Revert "Snap for 6793014 from 3777d883a3857b1a1589181c436d9018d7..."

Revert "Snap for 6793014 from 3157b4ee4325286f0c2ab0f26528460c8b..."

Revert "Snap for 6793014 from a43295d1825da62af038d345a7a861ed7a..."

Revert "Snap for 6793014 from 2076be4d27078d6ebc0a6b5e5ceb386109..."

Revert "Snap for 6793014 from d0e31526c62b2aeb35c293ac96feb180fc..."

Revert "Snap for 6793014 from 7a3a8c6351d5167a6ae0b33bc376efabd2..."

Revert "Snap for 6793014 from 41471cb21bb16b5c3bcc92f84293b79684..."

Revert "Snap for 6793014 from 42e5cca3cfb829690c9d8c6aca57a8e7d5..."

Revert "Snap for 6793014 from 4f81304963d19f4511b1e8e7d0aad87a67..."

Revert "Snap for 6793014 from 07602cdacf5bcc835db41f7eaa24af9964..."

Revert "Snap for 6793014 from 14cb57e107a3abce8b14937b1f92c28d18..."

Revert "Snap for 6793014 from ab1e4a81d09a540a5f927059e5bc03a606..."

Revert "Snap for 6793014 from 8c65adad0bcdfb3acc561063b4048dca24..."

Revert "Snap for 6793014 from b3061942700265e2bf04af9997775dcbbb..."

Revert "Snap for 6793014 from 551c5953fc62e339e4ee884ec2cd0ac3be..."

Revert "Snap for 6793014 from 4919273b2ac5c6347a18e17c5ec70d8da6..."

Revert "Snap for 6793014 from 988d4244914e0c749655e8cb6db18ba44f..."

Revert submission 12465146-release-request-6b259cbc-1f45-4b05-bc7e-c9b893b79d68-for-git_main-busytown-release-6793014

Reason for revert: b/166531456
Reverted Changes:
I5ff7a6c0d:Snap for 6793014 from f2989f9c65556d5155dbd57f82f0...
I77bdff943:Snap for 6793014 from a43295d1825da62af038d345a7a8...
I2ac5c520a:Snap for 6793014 from c3f124cca05579acf0a6cb589ebd...
I023b9702f:Snap for 6793014 from 98756d6d3e2bb0ba28eb125caa7a...
Ibc7893d72:Snap for 6793014 from fd1ad6750ef332d3f50f218f4d5d...
Ic27847bee:Snap for 6793014 from 8c65adad0bcdfb3acc561063b404...
If20bc9352:Snap for 6793014 from 7a3a8c6351d5167a6ae0b33bc376...
I6542d17e8:Snap for 6793014 from 3777d883a3857b1a1589181c436d...
I66e6bb8a9:Snap for 6793014 from 8b8bf0a07b0521bbe8483fbbab12...
I3cd190b6b:Snap for 6793014 from 424180bdc4aa18249e678daebfd0...
If92db7402:Snap for 6793014 from ab1e4a81d09a540a5f927059e5bc...
Iaced03c87:Snap for 6793014 from d0e31526c62b2aeb35c293ac96fe...
I5d28c6b4b:Snap for 6793014 from 4f81304963d19f4511b1e8e7d0aa...
I30d07bea3:Snap for 6793014 from 7594ec6384c4da320726def34f47...
I473205f48:Snap for 6793014 from 551c5953fc62e339e4ee884ec2cd...
I0656b41af:Snap for 6793014 from 44725f06b7f7d6407b5ee82d989b...
I0f9796067:Snap for 6793014 from 4919273b2ac5c6347a18e17c5ec7...
I9a38cda8f:Snap for 6793014 from 2076be4d27078d6ebc0a6b5e5ceb...
I876a82f51:Snap for 6793014 from 11467102abddb6026aaa164c1361...
I749d7d023:Snap for 6793014 from 41471cb21bb16b5c3bcc92f84293...
I038daea41:Snap for 6793014 from 07602cdacf5bcc835db41f7eaa24...
I47aa3131c:Snap for 6793014 from 14cb57e107a3abce8b14937b1f92...
I32dba8a95:Snap for 6793014 from 3157b4ee4325286f0c2ab0f26528...
I2ebc9f9db:Snap for 6793014 from 988d4244914e0c749655e8cb6db1...
Iae7c3370f:Snap for 6793014 from 9ffb8852294e06e2d387dc1fb868...
I6467a7f1b:Snap for 6793014 from 42e5cca3cfb829690c9d8c6aca57...
I8c6375203:Snap for 6793014 from b3061942700265e2bf04af999777...
I843b2e1f3:Snap for 6793014 from 265280bf5cb4bc14e132c3a35ae5...
Ie254f7079:Snap for 6793014 from f22ad3164937a8f2e309965c102b...
I01e0974ed:Snap for 6793014 from bbbccc3c2b7fc7c5780f6c415c42...

Change-Id: I9160aa1ae5523d8e92c618ae1922576bb70a7ac8
2020-08-27 04:12:26 +00:00
Henry Fang
af7f386a8a Fix typo to get correct innerFec and Annex for cable signal
bug: 165808730
Test: manual
Change-Id: I9213246c87512480cb08ab10b102b26f9fd9f681
2020-08-20 14:25:35 -07:00
jiabin
f40141ddbc Introduce device(s) role for strategy.
Adding interface for set/remove/getDevicesRoleForStrategy. This will be
used for setting device(s) role, such as preferred, for strategy.
Set/remove/getPreferreDeviceForStrategy are reimplemented by calling
the new interfaces.

Test: atest AudioHostTest
Test: atest AudioServiceHostTest
Test: atest AudioServiceTest
Test: atest audiopolicy_tests
Bug: 160352965
Change-Id: I2ba02c6b50af80846a25010ead05c4ae364868de
2020-08-12 14:44:28 -07:00
Henry Fang
7b0d02cd8b Merge "Tuner JNI: Correct memcpy of C2DataIdInfo" 2020-08-04 03:48:42 +00:00
Mikhail Naganov
88441891a5 Update Visualizer implementation after changes in AudioEffect
AudioEffect was fixed to remove a call to AudioEffect::set
away from the constructor.

Bug: 162323621
Test: repro steps from the bug
      atest android.media.cts.VisualizerTest
Change-Id: I90ac6e4fe0a1229758a98a63a3b7810de60469be
Merged-In: I90ac6e4fe0a1229758a98a63a3b7810de60469be
2020-08-04 00:42:08 +00:00
Mikhail Naganov
1c1667bff4 Update Visualizer implementation after changes in AudioEffect
AudioEffect was fixed to remove a call to AudioEffect::set
away from the constructor.

Bug: 162012829
Bug: 162323621
Test: repro steps from the bug
      atest android.media.cts.VisualizerTest
Change-Id: I90ac6e4fe0a1229758a98a63a3b7810de60469be
Merged-In: I90ac6e4fe0a1229758a98a63a3b7810de60469be
2020-08-03 23:45:13 +00:00
shubang
df82804342 Tuner JNI: Correct memcpy of C2DataIdInfo
Bug: 162778666
Test: mannual test by MTK
Change-Id: Ic97717e5fc32d97837e218fe769087b5abece2cb
2020-08-03 16:10:33 -07:00
TreeHugger Robot
a74a6ced2a Merge "Update Visualizer implementation after changes in AudioEffect" 2020-08-03 20:45:39 +00:00
Treehugger Robot
0f54ce6bd2 Merge "Update language to comply with Android's inclusive language guidance" am: 4e6e7d7238 am: 19cb457e94 am: bde18f58a7 am: f42249506e am: 79f4337f1b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1380556

Change-Id: If0cc7a92a8ac8ac6f5456a9fead00be935b2d0d6
2020-08-03 00:28:31 +00:00
Treehugger Robot
bde18f58a7 Merge "Update language to comply with Android's inclusive language guidance" am: 4e6e7d7238 am: 19cb457e94
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1380556

Change-Id: I4711a07ce3df64317c0f8ef562506b91353ab691
2020-08-02 23:07:26 +00:00
Mikhail Naganov
12223f0edc Update Visualizer implementation after changes in AudioEffect
AudioEffect was fixed to remove a call to AudioEffect::set
away from the constructor.

Bug: 162323621
Test: repro steps from the bug
      atest android.media.cts.VisualizerTest
Change-Id: I90ac6e4fe0a1229758a98a63a3b7810de60469be
2020-07-31 18:05:21 -07:00
Clément Julliard
cc217e3b8c Pass WRITE usage flag to the mapper if ImageReader was created with a
WRITE usage flag.

Since some producers rely on these buffers being unchanged (eg. for
partial rendering), this feature should be used with caution. A warning
to this effect was added in the Javadoc.

Bug: 162287616
Test: built emulator, confirmed no SIGSEGV anymore (b/162287616 fixed).
Change-Id: Ia1f8b8754b0d6ae75a2af33147645e744d593d82
2020-07-31 21:44:35 +00:00
Alice Kuo
c2c679d6cf Update language to comply with Android's inclusive language guidance
See https://source.android.com/setup/contribute/respectful-code for reference


Bug: 161896447
Change-Id: Ib87c9ebd45c5ee1b5f7296776e5978c12f7b45fc
2020-07-30 16:15:09 +00:00
Henry Fang
cc7d12ea29 Fix issue which Ion handle are free twice.
bug: 162083545
Test: Manual
Change-Id: I3a53fe949ecfdff4614a44cc1ddecdbeaa583dd8
2020-07-24 13:12:11 -07:00
shubang
870676c977 Tuner JNI: fix the DATA_READY and DATA_CONSUMED flags
Bug: 161481210
Test: cuttlefish
Change-Id: Ifd8b03259eff2296d1420695176d34026ba586fd
2020-07-16 14:33:30 -07:00
Henry Fang
c908b42a72 add offset to calculate buffer size
bug: 160886488
Test: Manual
Change-Id: I6890b02c0f5a5732f1302348d7bff773dac1401f
2020-07-09 19:13:15 +00:00
Glenn Kasten
f2ca5dbd8e Merge "Include what you use: <cutils/bitops.h> for popcount" am: 644015b732 am: b9379f26d3 am: 866d56789c am: 4cf80ec611 am: 2cc10f4dac
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1353065

Change-Id: If6c60f55992fa3fe60b810fc2cc524a617bc0297
2020-07-01 16:27:33 +00:00
Glenn Kasten
866d56789c Merge "Include what you use: <cutils/bitops.h> for popcount" am: 644015b732 am: b9379f26d3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1353065

Change-Id: I36077d8b84a3a8fe959c18d8f5e516e03303e3f6
2020-07-01 15:49:31 +00:00
Glenn Kasten
a0ab0de818 Include what you use: <cutils/bitops.h> for popcount
Test: builds OK
Change-Id: I4ebd459a124b6480bb0ce1ccb49b76c727ced0bd
2020-06-30 16:26:28 -07:00
TreeHugger Robot
08ba6d96ee Merge "ImageWriter: always detach the origially attached buffer" into rvc-dev am: baa0a1faa3 am: 01045bfcdf am: 1820b5ff4f am: b4c1f92808
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11988333

Change-Id: I9a8add6a2c981138bcc0f3d08e1ee06032ebbdb0
2020-06-27 02:44:34 +00:00
TreeHugger Robot
1820b5ff4f Merge "ImageWriter: always detach the origially attached buffer" into rvc-dev am: baa0a1faa3 am: 01045bfcdf
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11988333

Change-Id: Iaa21b05435aea753d3abefc88932ad6595e02bb7
2020-06-26 16:35:58 +00:00
TreeHugger Robot
2ec74baef2 Merge "ImageWriter: always detach the origially attached buffer" into rvc-dev am: baa0a1faa3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11988333

Change-Id: I00b6f73f1799a30d0fa53a3e5c7ead7cdd797563
2020-06-26 16:21:41 +00:00
Shuzhen Wang
b9adb57604 ImageWriter: always detach the origially attached buffer
This avoids buffers piling up in the ImageWriter queue with no way to
free them.

Test: Camera CTS
Bug: 150658436
Change-Id: I70b10ddaa75aa9ab29f6ad7de9871a634a88813e
2020-06-26 16:14:19 +00:00
Orion Hodson
3e10c5111d Merge "Update to use nativehelper/JNIPlatformHelp.h" into rvc-dev-plus-aosp 2020-06-24 21:02:39 +00:00
Automerger Merge Worker
9eedf333f6 Merge "Merge "Merge "Fixed a invalid fd issue" into rvc-dev am: 6f8ee88a04 am: 8e295ad202" into rvc-d1-dev-plus-aosp am: d62b0a6301" into rvc-qpr-dev-plus-aosp am: a48e3dedda
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11978883

Change-Id: Ic202c31a6e0fba22bfd8e807a55b1fc1b809759c
2020-06-24 16:39:30 +00:00
Orion Hodson
b3459d4fe6 Update to use nativehelper/JNIPlatformHelp.h
Reflects refactoring of JNI helper code that depends on private
methods within libnativehelper.

Bug: 151443957
Test: Treehugger
Change-Id: I7af128f42ae89a77a8e3fb113ea533331153c535
Merged-In: I7af128f42ae89a77a8e3fb113ea533331153c535
Exempt-From-Owner-Approval: cherry pick
(cherry picked from commit 329c612e3d5ae440bf13e1f5fc9a4012263524e9)
2020-06-24 14:13:49 +01:00
Orion Hodson
864d304156 Update to use nativehelper/JNIPlatformHelp.h
Reflects refactoring of JNI helper code that depends on private
methods within libnativehelper.

Bug: 151443957
Test: Treehugger
Change-Id: I7af128f42ae89a77a8e3fb113ea533331153c535
Merged-In: I7af128f42ae89a77a8e3fb113ea533331153c535
Exempt-From-Owner-Approval: cherry pick
(cherry picked from commit 329c612e3d5ae440bf13e1f5fc9a4012263524e9)
2020-06-24 12:46:47 +00:00
Orion Hodson
196ad7277e Merge changes from topic "lnh-platform-split"
* changes:
  Sync with libnativehelper refactoring
  Update to use nativehelper/JNIPlatformHelp.h
2020-06-24 06:18:23 +00:00
Henry Fang
7f61a67c41 Fixed a invalid fd issue
LinearBlock close the fd why it's recycled, so we need dup the fd to create a LinearBlock.

bug: 159753135
Test: Manual
Change-Id: Ic2b4e3c535e60983b2a4fc5f5ce6e809731fd581
2020-06-23 17:47:51 -07:00
Orion Hodson
329c612e3d Update to use nativehelper/JNIPlatformHelp.h
Reflects refactoring of JNI helper code that depends on private
methods within libnativehelper.

Bug: 151443957
Test: Treehugger
Change-Id: I7af128f42ae89a77a8e3fb113ea533331153c535
2020-06-23 11:50:20 +01:00
Wonsik Kim
212e81bb31 Merge "media: fix race condition on async release" into rvc-dev am: 7e1b558949 am: fddc33a377 am: 9d030d5a3f am: 710d84d751
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11927284

Change-Id: Ib0532162cb28a9a3211368d61f3553f0a7ed7a8e
2020-06-20 01:33:21 +00:00
Wonsik Kim
7e1b558949 Merge "media: fix race condition on async release" into rvc-dev 2020-06-20 00:39:43 +00:00
Wonsik Kim
e37ef4bc92 media: fix race condition on async release
Clear Java object state at releaseAsync(), and delete native object
upon async release complete.
Clearing CodecBase object only led to a rare race condition which
caused null pointer dereference.

Bug: 158501286
Test: atest CtsMediaTestCases:MediaCodecTest#testAsyncRelease (100 times)
Test: atest CtsMediaTestCases:MediaCodecCapabilitiesTest#testGetMaxSupportedInstances
Test: atest CtsMediaTestCases -- --module-arg CtsMediaTestCases:size:small
Change-Id: I691d39007c0ea770318f4038558ad338252bd2fb
2020-06-19 13:04:02 -07:00
TreeHugger Robot
1a6f38da2b Merge "Fix MediaEvent release issue" into rvc-dev am: c266b0398e am: c32bb0577d am: 1180b48519 am: b83982a989
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11897358

Change-Id: I677801fed78ff9c2c5e30b16d2e5c8a18d05fa69
2020-06-19 08:28:17 +00:00
shubang
c84fe12f1d Fix MediaEvent release issue
Bug: 158876323
Test: make;
Change-Id: Idedf41620b5a32ca552836d00b1db78adcfd1a7f
2020-06-17 14:57:10 -07:00
TreeHugger Robot
c86b533e57 Merge "media: further resource cleanup for async release" into rvc-dev am: 275248ddfe am: 46bc5d070e am: 50d0b096cb am: 86bbd07325
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11795061

Change-Id: I076593827131a1592a2efec203c6e7d39d0074d5
2020-06-09 18:22:51 +00:00
Wonsik Kim
d4ce4e3074 media: further resource cleanup for async release
Bug: 158158088
Test: atest CtsMediaTestCases:MediaCodecCapabilitiesTest#testGetMaxSupportedInstances
Test: atest CtsMediaTestCases -- --module-arg CtsMediaTestCases:size:small
Change-Id: Ie8ab527516836624837c96fa4fdae4dcffe18f43
2020-06-08 11:58:16 -07:00
Andy Hung
c5b50e664e Merge "SoundPool: fix fcntl argument" into rvc-dev am: 27630cbb4e am: cbedd4a3f0 am: ba5099bef3 am: e35dc1cf80
Original change: undetermined

Change-Id: I7b98d9e0e62584e5bcf68b00fa19889574014612
2020-06-02 03:41:55 +00:00
Andy Hung
09e865b694 SoundPool: fix fcntl argument
Fixes flakiness introduced by commit 77eb2bda0e5758b7c350db2991d6fc5806680b57

Test: android.media.cts.SoundPoolAacTest
Test: android.media.cts.SoundPoolHapticTest
Test: android.media.cts.SoundPoolMidiTest
Test: android.media.cts.SoundPoolOggTest
Test: android.media.cts.AudioManagerTest#testSoundEffects
Bug: 157924783
Change-Id: I8371c93337852424e2b47a17e5a19a1caaf2600f
2020-06-01 16:38:26 -07:00
Andy Hung
3b61b447e3 Merge "SoundPool: Fix verbose logging compilation" into rvc-dev am: 7360685765 am: 95b5d5e0be am: bf192ccb0a am: 5a72267752
Original change: undetermined

Change-Id: I57cbf9b61fcfbfd25712bb27e10189b5941e2703
2020-06-01 22:08:42 +00:00
Andy Hung
ce8e6daa9a SoundPool: Fix verbose logging compilation
Make compatible with clang warning / thread safety.

Test: build verbose and logcat
Bug: 157618660
Change-Id: I773f446561b86a0f3a8b5ddc355cfe6adf0d4294
2020-06-01 09:51:46 -07:00
Automerger Merge Worker
1a5b1b4750 Merge "Merge "media: fix JNI call for 32-bit" into rvc-dev am: dc53f28811 am: 61de665007 am: ce35ab1577" into rvc-qpr-dev-plus-aosp am: 917715ec43
Change-Id: I1bd7ebef0ca0afc933dc84ae2d52010a75f07245
2020-05-29 21:29:52 +00:00
Wonsik Kim
dc53f28811 Merge "media: fix JNI call for 32-bit" into rvc-dev 2020-05-29 20:18:13 +00:00
Wonsik Kim
d319a44c11 media: fix JNI call for 32-bit
Bug: 157528365
Test: atest CtsMediaTestCases:MediaCodecBlockModelTest
Change-Id: Ibe64c8c5187a6c00b14027823a4d19de1c131530
2020-05-28 17:57:17 -07:00
Andy Hung
45c7f37b78 Merge "SoundPool: Add clang-tidy and fix" into rvc-dev am: 8b5bc1ff73 am: 429f26b3ee am: 5f84bed36c am: ed3eab87e7
Change-Id: I52fe4594d52a434711e5e84a375e3de0a66006f1
2020-05-27 20:03:00 +00:00
Andy Hung
8b5bc1ff73 Merge "SoundPool: Add clang-tidy and fix" into rvc-dev 2020-05-27 19:31:29 +00:00
Andy Hung
77eb2bda0e SoundPool: Add clang-tidy and fix
Test: soundpool_stress
Test: SoundPoolAacTest
Test: SoundPoolHapticTest
Test: SoundPoolMidiTest
Test: SoundPoolOggTest
Bug: 157501605
Change-Id: I7bba857a8b44b6255d423086127da0e2df4ce1c4
2020-05-27 10:47:41 -07:00
TreeHugger Robot
dc8e918f52 Merge "Tuner FW: fix filter type check." into rvc-dev am: 9c03ae0623 am: e0ab676c03 am: 6cd700178c am: 5740cc08dc
Change-Id: I7525b570e6d6d9a3073e21b9315159b6bf57ead4
2020-05-27 05:13:27 +00:00
shubang
491eaba9be Tuner FW: fix filter type check.
Java subtype and HAL subtype don't match, which lead to a bug in
configure();

Other minor fixes.

Bug: 157278203
Test: make; cts;
Change-Id: I791d3a06c68499cf359fd718d2ca24a20ac35796
2020-05-27 00:07:12 +00:00