OSDN Git Service

android-x86/frameworks-av.git
7 years agoMerge "CameraBase: Don't return an sp<> by reference" into nyc-dev
Eino-Ville Talvala [Thu, 2 Feb 2017 23:42:07 +0000 (23:42 +0000)]
Merge "CameraBase: Don't return an sp<> by reference" into nyc-dev

7 years agoRevert "Turn off overflow protection for various math functions" am: 2dd1d5e02e am...
Marco Nelissen [Thu, 2 Feb 2017 21:46:21 +0000 (21:46 +0000)]
Revert "Turn off overflow protection for various math functions" am: 2dd1d5e02e am: aa5498018f am: ce9cab33b7 am: 4c1ad41c8b am: bd91a6540d am: 08ccbcc16f am: 9070697124 am: 9986938f08 am: 245b572340
am: d0bc460432

Change-Id: I28693f257be18393f0d5711f33ca0eb9260cd361

7 years agoRevert "Turn off overflow protection for various math functions" am: 2dd1d5e02e am...
Marco Nelissen [Thu, 2 Feb 2017 21:44:21 +0000 (21:44 +0000)]
Revert "Turn off overflow protection for various math functions" am: 2dd1d5e02e am: aa5498018f am: ce9cab33b7 am: 4c1ad41c8b am: bd91a6540d am: 08ccbcc16f am: 9070697124 am: 9986938f08
am: 245b572340

Change-Id: I4a6bc9c420277062d46d57e734c77f67ae861ac4

7 years agoRevert "Turn off overflow protection for various math functions" am: 2dd1d5e02e am...
Marco Nelissen [Thu, 2 Feb 2017 21:41:52 +0000 (21:41 +0000)]
Revert "Turn off overflow protection for various math functions" am: 2dd1d5e02e am: aa5498018f am: ce9cab33b7 am: 4c1ad41c8b am: bd91a6540d am: 08ccbcc16f am: 9070697124
am: 9986938f08

Change-Id: I9d46125d775350691fd30b79fc3672212ab463d3

7 years agoRevert "Turn off overflow protection for various math functions" am: 2dd1d5e02e am...
Marco Nelissen [Thu, 2 Feb 2017 21:38:51 +0000 (21:38 +0000)]
Revert "Turn off overflow protection for various math functions" am: 2dd1d5e02e am: aa5498018f am: ce9cab33b7 am: 4c1ad41c8b am: bd91a6540d am: 08ccbcc16f
am: 9070697124

Change-Id: Icc7f1e5688d39f1ed4d4ea3bafa1474ec55090aa

7 years agoRevert "Turn off overflow protection for various math functions" am: 2dd1d5e02e am...
Marco Nelissen [Thu, 2 Feb 2017 21:36:23 +0000 (21:36 +0000)]
Revert "Turn off overflow protection for various math functions" am: 2dd1d5e02e am: aa5498018f am: ce9cab33b7 am: 4c1ad41c8b am: bd91a6540d
am: 08ccbcc16f

Change-Id: I7e920284bf69cc450d36f813e7e001ae30f656ee

7 years agoRevert "Turn off overflow protection for various math functions" am: 2dd1d5e02e am...
Marco Nelissen [Thu, 2 Feb 2017 21:33:50 +0000 (21:33 +0000)]
Revert "Turn off overflow protection for various math functions" am: 2dd1d5e02e am: aa5498018f am: ce9cab33b7 am: 4c1ad41c8b
am: bd91a6540d

Change-Id: Idafa3a702149b0dff4c8e6460a7ccfe342da1160

7 years agoRevert "Turn off overflow protection for various math functions" am: 2dd1d5e02e am...
Marco Nelissen [Thu, 2 Feb 2017 21:31:21 +0000 (21:31 +0000)]
Revert "Turn off overflow protection for various math functions" am: 2dd1d5e02e am: aa5498018f am: ce9cab33b7
am: 4c1ad41c8b

Change-Id: I7a754e278cdc719a0bf6543f8a2accbc43301f86

7 years agoRevert "Turn off overflow protection for various math functions" am: 2dd1d5e02e am...
Marco Nelissen [Thu, 2 Feb 2017 21:28:50 +0000 (21:28 +0000)]
Revert "Turn off overflow protection for various math functions" am: 2dd1d5e02e am: aa5498018f
am: ce9cab33b7

Change-Id: Id9318840db48994196c72eb5f14e132e23776bda

7 years agoRevert "Turn off overflow protection for various math functions" am: 2dd1d5e02e
Marco Nelissen [Thu, 2 Feb 2017 21:26:19 +0000 (21:26 +0000)]
Revert "Turn off overflow protection for various math functions" am: 2dd1d5e02e
am: aa5498018f

Change-Id: Ica9690b213037f6bd4c13bf14a4d66b77b7def41

7 years agoRevert "Turn off overflow protection for various math functions"
Marco Nelissen [Thu, 2 Feb 2017 21:24:19 +0000 (21:24 +0000)]
Revert "Turn off overflow protection for various math functions"
am: 2dd1d5e02e

Change-Id: I37734de98f269e6886be0578b4ff9db31229c8de

7 years agoRevert "Turn off overflow protection for various math functions"
Marco Nelissen [Thu, 2 Feb 2017 20:53:17 +0000 (20:53 +0000)]
Revert "Turn off overflow protection for various math functions"

This reverts commit cbf5e6915c42c691a6ccb9a5d249e450f9e67467.

Change-Id: I0a81c26d22fee36485b21c285dcc91fbd518e1dd

7 years agoCameraBase: Don't return an sp<> by reference
Eino-Ville Talvala [Wed, 1 Feb 2017 23:27:41 +0000 (15:27 -0800)]
CameraBase: Don't return an sp<> by reference

If the server dies, the binder death callback clears out
the global camera service sp<>, and any current references to it
will become quite unhappy.

Test: Camera CTS passes
Bug: 31992879
Change-Id: I2966bed35d0319e3f26e3d4b1b8dc08006a22348

7 years agoTurn off overflow protection for various math functions am: cbf5e6915c am: 72b1fdbf49...
Marco Nelissen [Thu, 2 Feb 2017 19:53:54 +0000 (19:53 +0000)]
Turn off overflow protection for various math functions am: cbf5e6915c am: 72b1fdbf49 am: a25eb35608 am: 3d58f94eec am: 1edbc699b5 am: c0118375e5 am: ba78beef56 am: b0ceb402c1 am: e7a758e220
am: 350db71bea

Change-Id: I8d1260360f806a605831ac070d20da52696e3608

7 years agoTurn off overflow protection for various math functions am: cbf5e6915c am: 72b1fdbf49...
Marco Nelissen [Thu, 2 Feb 2017 19:50:55 +0000 (19:50 +0000)]
Turn off overflow protection for various math functions am: cbf5e6915c am: 72b1fdbf49 am: a25eb35608 am: 3d58f94eec am: 1edbc699b5 am: c0118375e5 am: ba78beef56 am: b0ceb402c1
am: e7a758e220

Change-Id: I2e348f157daa783988fe0690f9df3d922eff34b9

7 years agoTurn off overflow protection for various math functions am: cbf5e6915c am: 72b1fdbf49...
Marco Nelissen [Thu, 2 Feb 2017 19:49:37 +0000 (19:49 +0000)]
Turn off overflow protection for various math functions am: cbf5e6915c am: 72b1fdbf49 am: a25eb35608 am: 3d58f94eec am: 1edbc699b5 am: c0118375e5 am: ba78beef56
am: b0ceb402c1

Change-Id: I3ac829f893058cec956296aeb6d2aab12a6ad758

7 years agoTurn off overflow protection for various math functions am: cbf5e6915c am: 72b1fdbf49...
Marco Nelissen [Thu, 2 Feb 2017 19:46:32 +0000 (19:46 +0000)]
Turn off overflow protection for various math functions am: cbf5e6915c am: 72b1fdbf49 am: a25eb35608 am: 3d58f94eec am: 1edbc699b5 am: c0118375e5
am: ba78beef56

Change-Id: I9c609d9a4032aca4806f3bf660722e98c7b7bd1b

7 years agoTurn off overflow protection for various math functions am: cbf5e6915c am: 72b1fdbf49...
Marco Nelissen [Thu, 2 Feb 2017 19:44:23 +0000 (19:44 +0000)]
Turn off overflow protection for various math functions am: cbf5e6915c am: 72b1fdbf49 am: a25eb35608 am: 3d58f94eec am: 1edbc699b5
am: c0118375e5

Change-Id: Ie92b4cba6575ce1c01f96ac19d4b6cd79392a19c

7 years agoTurn off overflow protection for various math functions am: cbf5e6915c am: 72b1fdbf49...
Marco Nelissen [Thu, 2 Feb 2017 19:41:52 +0000 (19:41 +0000)]
Turn off overflow protection for various math functions am: cbf5e6915c am: 72b1fdbf49 am: a25eb35608 am: 3d58f94eec
am: 1edbc699b5

Change-Id: Ibcef66b9fa5eeffd3f77e3d6da5fea1556f36113

7 years agoTurn off overflow protection for various math functions am: cbf5e6915c am: 72b1fdbf49...
Marco Nelissen [Thu, 2 Feb 2017 19:39:34 +0000 (19:39 +0000)]
Turn off overflow protection for various math functions am: cbf5e6915c am: 72b1fdbf49 am: a25eb35608
am: 3d58f94eec

Change-Id: I6be57dc624b46c1517fab973f34dd98b7d808a28

7 years agoTurn off overflow protection for various math functions am: cbf5e6915c am: 72b1fdbf49
Marco Nelissen [Thu, 2 Feb 2017 19:36:52 +0000 (19:36 +0000)]
Turn off overflow protection for various math functions am: cbf5e6915c am: 72b1fdbf49
am: a25eb35608

Change-Id: Ia0f2f794297ab8b4c5070e5948c748d0265aa54b

7 years agoTurn off overflow protection for various math functions am: cbf5e6915c
Marco Nelissen [Thu, 2 Feb 2017 19:34:21 +0000 (19:34 +0000)]
Turn off overflow protection for various math functions am: cbf5e6915c
am: 72b1fdbf49

Change-Id: I46daf840866183690f27ff7b3e6ed7ffe8bec9f5

7 years agoTurn off overflow protection for various math functions
Marco Nelissen [Thu, 2 Feb 2017 19:31:52 +0000 (19:31 +0000)]
Turn off overflow protection for various math functions
am: cbf5e6915c

Change-Id: Iee62ce7ef71208e30d9ee7b98342163bfc997779

7 years agoTurn off overflow protection for various math functions
Marco Nelissen [Wed, 1 Feb 2017 23:35:35 +0000 (15:35 -0800)]
Turn off overflow protection for various math functions

These functions also exist as arm assembly files, where the overflows
just wrap around, and this makes their plain C equivalents behave
the same.

Bug: 32577290
Bug: 33071964
Test: ran PoC for bug 32577290 using plain C source code
Change-Id: I73c2609589e7a89d36f6c44391548312259daf14

7 years agoavc_utils: skip empty NALs from malformed bistreams am: 91fe76a157 am: f79f26d257...
Robert Shih [Mon, 30 Jan 2017 19:59:13 +0000 (19:59 +0000)]
avc_utils: skip empty NALs from malformed bistreams am: 91fe76a157 am: f79f26d257 am: 2b5d2c4a10 am: b6e8b6b875 am: e277181b71 am: 1a9f5250d8
am: 4bf710727b

Change-Id: Ic381f846d804f473dbb3bbb29041dd525806699f

7 years agoavc_utils: skip empty NALs from malformed bistreams am: 91fe76a157 am: f79f26d257...
Robert Shih [Mon, 30 Jan 2017 19:57:12 +0000 (19:57 +0000)]
avc_utils: skip empty NALs from malformed bistreams am: 91fe76a157 am: f79f26d257 am: 2b5d2c4a10 am: b6e8b6b875 am: e277181b71
am: 1a9f5250d8

Change-Id: I3cb8cc1b6a7886333a17556f38656c93b96fc7f8

7 years agoavc_utils: skip empty NALs from malformed bistreams am: 91fe76a157 am: f79f26d257...
Robert Shih [Mon, 30 Jan 2017 19:54:43 +0000 (19:54 +0000)]
avc_utils: skip empty NALs from malformed bistreams am: 91fe76a157 am: f79f26d257 am: 2b5d2c4a10 am: b6e8b6b875
am: e277181b71

Change-Id: I6870c07e169adaec88fd5eaa839d586dcf7aec5b

7 years agoavc_utils: skip empty NALs from malformed bistreams am: 91fe76a157 am: f79f26d257...
Robert Shih [Mon, 30 Jan 2017 19:52:11 +0000 (19:52 +0000)]
avc_utils: skip empty NALs from malformed bistreams am: 91fe76a157 am: f79f26d257 am: 2b5d2c4a10
am: b6e8b6b875

Change-Id: Icdc6674c87de89ceb06bea42fd9fc4525ba993ce

7 years agoavc_utils: skip empty NALs from malformed bistreams am: 91fe76a157 am: f79f26d257
Robert Shih [Mon, 30 Jan 2017 19:50:10 +0000 (19:50 +0000)]
avc_utils: skip empty NALs from malformed bistreams am: 91fe76a157 am: f79f26d257
am: 2b5d2c4a10

Change-Id: Idf43a017719d40c95e5a353985915ff80c02c0e2

7 years agoavc_utils: skip empty NALs from malformed bistreams am: 91fe76a157
Robert Shih [Mon, 30 Jan 2017 19:48:13 +0000 (19:48 +0000)]
avc_utils: skip empty NALs from malformed bistreams am: 91fe76a157
am: f79f26d257

Change-Id: I25e94c3a8cf32c58a74a9af9afb8bc46a275543f

7 years agoavc_utils: skip empty NALs from malformed bistreams
Robert Shih [Mon, 30 Jan 2017 19:46:10 +0000 (19:46 +0000)]
avc_utils: skip empty NALs from malformed bistreams
am: 91fe76a157

Change-Id: I4fc3e40dbfe2839611265ba178a9f35e05bcc28a

7 years agoavc_utils: skip empty NALs from malformed bistreams
Robert Shih [Wed, 25 Jan 2017 02:08:59 +0000 (18:08 -0800)]
avc_utils: skip empty NALs from malformed bistreams

Avoid a CHECK and make it the decoder's repsonsibility to handle a
malformed bistream gracefully.

Bug: 34509901
Bug: 33137046
Test: StagefrightTest#testStagefright_bug_27855419_CVE_2016_2463
Change-Id: I2d94f8da63d65a86a9c711c45546e4c695e0f3b4

7 years agoDO NOT MERGE - improve audio effect framwework thread safety am: 7da83aadf4 am: 5717b...
Eric Laurent [Wed, 18 Jan 2017 17:54:39 +0000 (17:54 +0000)]
DO NOT MERGE - improve audio effect framwework thread safety am: 7da83aadf4 am: 5717bb1acb  -s ours am: 199484a558 am: fff4a6aff9 am: c8fbf1a97c
am: 8e24a55a3c  -s ours

Change-Id: Ib577ae77e113b8c0a545ae40fa6d00abbc614f1b

7 years agoDO NOT MERGE - improve audio effect framwework thread safety am: 7da83aadf4 am: 5717b...
Eric Laurent [Wed, 18 Jan 2017 17:46:39 +0000 (17:46 +0000)]
DO NOT MERGE - improve audio effect framwework thread safety am: 7da83aadf4 am: 5717bb1acb  -s ours am: 199484a558 am: fff4a6aff9
am: c8fbf1a97c

Change-Id: I8f2e7e5154a16aaa9c365d001866d7372b451471

7 years agoDO NOT MERGE - improve audio effect framwework thread safety am: 7da83aadf4 am: 5717b...
Eric Laurent [Wed, 18 Jan 2017 17:39:38 +0000 (17:39 +0000)]
DO NOT MERGE - improve audio effect framwework thread safety am: 7da83aadf4 am: 5717bb1acb  -s ours am: 199484a558
am: fff4a6aff9

Change-Id: I0cc78503ad574ae50f2e8ccba5b5d396c5ef8514

7 years agoDO NOT MERGE - improve audio effect framwework thread safety am: 7da83aadf4 am: 5717b...
Eric Laurent [Wed, 18 Jan 2017 17:33:07 +0000 (17:33 +0000)]
DO NOT MERGE - improve audio effect framwework thread safety am: 7da83aadf4 am: 5717bb1acb  -s ours
am: 199484a558

Change-Id: Ic0a17b1de1483de2f12a64d6b159d149abe64923

7 years agoDO NOT MERGE - improve audio effect framwework thread safety am: 7da83aadf4
Eric Laurent [Wed, 18 Jan 2017 17:26:19 +0000 (17:26 +0000)]
DO NOT MERGE - improve audio effect framwework thread safety am: 7da83aadf4
am: 5717bb1acb  -s ours

Change-Id: I52dedef569daef7a901ac924575b04c06e431ee0

7 years agoDO NOT MERGE - improve audio effect framwework thread safety
Eric Laurent [Wed, 18 Jan 2017 17:19:50 +0000 (17:19 +0000)]
DO NOT MERGE - improve audio effect framwework thread safety
am: 7da83aadf4

Change-Id: I39621a0f71df766342b5b768fce1eb524ae5adcd

7 years agoDO NOT MERGE - improve audio effect framwework thread safety
Eric Laurent [Thu, 1 Dec 2016 23:28:29 +0000 (15:28 -0800)]
DO NOT MERGE - improve audio effect framwework thread safety

- Reorganize handle effect creation code to make sure the effect engine
is created with both thread and effect chain mutex held.
- Reorganize handle disconnect code to make sure the effect engine
is released with both thread and effect chain mutex held.
- Protect IEffect interface methods in EffectHande with a Mutex.
- Only pin effect if the session was acquired first.
- Do not use strong pointer to EffectModule in EffectHandles:
only the EffectChain has a single strong reference to the EffectModule.
- Check reply size before writing status in EffectHandle::command()

Bug: 32707507
Bug: 32095713
Change-Id: Ia1098cba2cd32cc2d1c9dfdff4adc2388dfed80e
(cherry picked from commit 84c392104e905bfacc753ec0ddb96ce7813d1889)

7 years agoDon't CHECK when buffer is too large am: c2f0c73bfc am: acb7186e6e am: 0a4db601b4...
Marco Nelissen [Tue, 17 Jan 2017 21:24:08 +0000 (21:24 +0000)]
Don't CHECK when buffer is too large am: c2f0c73bfc am: acb7186e6e am: 0a4db601b4 am: 8474c51aaf am: a5333c0056 am: 7e5936e666 am: 81341d9c16 am: 5a62595e8e am: a2c05e0318
am: 04a45728f2  -s ours

Change-Id: I10352f5bd8621059ffc97156115adbac27625fbc

7 years agoDon't CHECK when buffer is too large am: c2f0c73bfc am: acb7186e6e am: 0a4db601b4...
Marco Nelissen [Tue, 17 Jan 2017 19:23:22 +0000 (19:23 +0000)]
Don't CHECK when buffer is too large am: c2f0c73bfc am: acb7186e6e am: 0a4db601b4 am: 8474c51aaf am: a5333c0056 am: 7e5936e666 am: 81341d9c16 am: 5a62595e8e
am: a2c05e0318

Change-Id: I065a2fcd2ba52123c0ce0acfda947b864923a626

7 years agoDon't CHECK when buffer is too large am: c2f0c73bfc am: acb7186e6e am: 0a4db601b4...
Marco Nelissen [Tue, 17 Jan 2017 19:18:56 +0000 (19:18 +0000)]
Don't CHECK when buffer is too large am: c2f0c73bfc am: acb7186e6e am: 0a4db601b4 am: 8474c51aaf am: a5333c0056 am: 7e5936e666 am: 81341d9c16
am: 5a62595e8e

Change-Id: Ib934e29990941bb7e30196be3ff7b1d67e61b211

7 years agoDon't CHECK when buffer is too large am: c2f0c73bfc am: acb7186e6e am: 0a4db601b4...
Marco Nelissen [Tue, 17 Jan 2017 19:16:55 +0000 (19:16 +0000)]
Don't CHECK when buffer is too large am: c2f0c73bfc am: acb7186e6e am: 0a4db601b4 am: 8474c51aaf am: a5333c0056 am: 7e5936e666
am: 81341d9c16

Change-Id: I701b122b4f3f97b7b8b76af25cd6fe9c67ef792b

7 years agoDon't CHECK when buffer is too large am: c2f0c73bfc am: acb7186e6e am: 0a4db601b4...
Marco Nelissen [Tue, 17 Jan 2017 19:14:26 +0000 (19:14 +0000)]
Don't CHECK when buffer is too large am: c2f0c73bfc am: acb7186e6e am: 0a4db601b4 am: 8474c51aaf am: a5333c0056
am: 7e5936e666

Change-Id: I8f4d5bb31a2600f6679d21fed9ebc02c2a3e3521

7 years agoDon't CHECK when buffer is too large am: c2f0c73bfc am: acb7186e6e am: 0a4db601b4...
Marco Nelissen [Tue, 17 Jan 2017 19:12:27 +0000 (19:12 +0000)]
Don't CHECK when buffer is too large am: c2f0c73bfc am: acb7186e6e am: 0a4db601b4 am: 8474c51aaf
am: a5333c0056

Change-Id: I572634a3e7e9161d0f6811adf83d37178e3895c3

7 years agoDon't CHECK when buffer is too large am: c2f0c73bfc am: acb7186e6e am: 0a4db601b4
Marco Nelissen [Tue, 17 Jan 2017 19:10:23 +0000 (19:10 +0000)]
Don't CHECK when buffer is too large am: c2f0c73bfc am: acb7186e6e am: 0a4db601b4
am: 8474c51aaf

Change-Id: I8a151eff3d02600134c929754c1420353f6a6ab1

7 years agoDon't CHECK when buffer is too large am: c2f0c73bfc am: acb7186e6e
Marco Nelissen [Tue, 17 Jan 2017 19:06:56 +0000 (19:06 +0000)]
Don't CHECK when buffer is too large am: c2f0c73bfc am: acb7186e6e
am: 0a4db601b4

Change-Id: I46806d03da614119b805087d995f8f40c70ee3b2

7 years agoDon't CHECK when buffer is too large am: c2f0c73bfc
Marco Nelissen [Tue, 17 Jan 2017 18:46:50 +0000 (18:46 +0000)]
Don't CHECK when buffer is too large am: c2f0c73bfc
am: acb7186e6e

Change-Id: I9af93746702bb746a48420dbb03fc29878ef730f

7 years agoDon't CHECK when buffer is too large
Marco Nelissen [Tue, 17 Jan 2017 18:27:32 +0000 (18:27 +0000)]
Don't CHECK when buffer is too large
am: c2f0c73bfc

Change-Id: Ibcc5b7a28092fdcba5082b956e3bbdb0fc2d3f4a

7 years agoDon't initialize sync sample parameters until the end am: a9660fe122 am: 22386993b5...
Marco Nelissen [Sat, 14 Jan 2017 02:46:26 +0000 (02:46 +0000)]
Don't initialize sync sample parameters until the end am: a9660fe122 am: 22386993b5 am: 902d8e90cc am: 25a057e427 am: c3ea68a1c8 am: a59dca6634
am: 5cc0712ce0

Change-Id: If8703ef19663c7f25493101a871976e54ab2a3e8

7 years agoDon't initialize sync sample parameters until the end am: a9660fe122 am: 22386993b5...
Marco Nelissen [Sat, 14 Jan 2017 02:44:24 +0000 (02:44 +0000)]
Don't initialize sync sample parameters until the end am: a9660fe122 am: 22386993b5 am: 902d8e90cc am: 25a057e427 am: c3ea68a1c8
am: a59dca6634

Change-Id: I80ed5f790d1ceb2aa9f779397f75a36a5a4db8b6

7 years agoDon't initialize sync sample parameters until the end am: a9660fe122 am: 22386993b5...
Marco Nelissen [Sat, 14 Jan 2017 02:41:23 +0000 (02:41 +0000)]
Don't initialize sync sample parameters until the end am: a9660fe122 am: 22386993b5 am: 902d8e90cc am: 25a057e427
am: c3ea68a1c8

Change-Id: Ica12b7c73830bfbdb8a6aad323835f264a4110e3

7 years agoDon't initialize sync sample parameters until the end am: a9660fe122 am: 22386993b5...
Marco Nelissen [Sat, 14 Jan 2017 02:39:22 +0000 (02:39 +0000)]
Don't initialize sync sample parameters until the end am: a9660fe122 am: 22386993b5 am: 902d8e90cc
am: 25a057e427

Change-Id: Ica77a9017bd8446b03057563172e9f807708634c

7 years agoDon't initialize sync sample parameters until the end am: a9660fe122 am: 22386993b5
Marco Nelissen [Sat, 14 Jan 2017 02:36:54 +0000 (02:36 +0000)]
Don't initialize sync sample parameters until the end am: a9660fe122 am: 22386993b5
am: 902d8e90cc

Change-Id: I6ba553f3ac3f04ef983e498756a19718b04f5206

7 years agoDon't initialize sync sample parameters until the end am: a9660fe122
Marco Nelissen [Sat, 14 Jan 2017 02:34:21 +0000 (02:34 +0000)]
Don't initialize sync sample parameters until the end am: a9660fe122
am: 22386993b5

Change-Id: Ia743be4048c57929c59b06a12b53f993b5b00111

7 years agoDon't initialize sync sample parameters until the end
Marco Nelissen [Sat, 14 Jan 2017 02:31:51 +0000 (02:31 +0000)]
Don't initialize sync sample parameters until the end
am: a9660fe122

Change-Id: Ia072f16604c3e766d4d2cdc49b88efcf182ca5f7

7 years agoMerge "DO NOT MERGE ANYWHERE - improve audio effect framwework thread safety" into...
Eric Laurent [Sat, 14 Jan 2017 00:41:48 +0000 (00:41 +0000)]
Merge "DO NOT MERGE ANYWHERE - improve audio effect framwework thread safety" into nyc-dev

7 years agoDon't initialize sync sample parameters until the end
Marco Nelissen [Thu, 12 Jan 2017 23:49:04 +0000 (15:49 -0800)]
Don't initialize sync sample parameters until the end

to avoid leaving them in a partially initialized state.

Bug: 33137046
Test: ran CTS tests
Change-Id: I1f5c070233c5917d85da9e930e01a3fc51a0a0ec

7 years agoDon't CHECK when buffer is too large
Marco Nelissen [Fri, 6 Jan 2017 21:57:51 +0000 (13:57 -0800)]
Don't CHECK when buffer is too large

Bug: 31647370
Test: ran CTS test with and without patch
Change-Id: I4e3a37aabc9387432671c1c0c469241142612cc4

7 years agoDO NOT MERGE - improve audio effect framwework thread safety am: b47a5ab107 am: 26cf2...
Eric Laurent [Wed, 4 Jan 2017 22:37:31 +0000 (22:37 +0000)]
DO NOT MERGE - improve audio effect framwework thread safety am: b47a5ab107 am: 26cf2f4d73 am: 73a152960b  -s ours am: 21d6eafd26  -s ours am: 6c5deab4f2 am: 9685820100  -s ours am: 6608eddab9 am: c6a7a42379 am: d1b6293802
am: 1771044fd4  -s ours

Change-Id: Ic726e6af40883eed9cd15ffd57314c03bce03f1d

7 years agoDO NOT MERGE - improve audio effect framwework thread safety am: b47a5ab107 am: 26cf2...
Eric Laurent [Wed, 4 Jan 2017 22:35:02 +0000 (22:35 +0000)]
DO NOT MERGE - improve audio effect framwework thread safety am: b47a5ab107 am: 26cf2f4d73 am: 73a152960b  -s ours am: 21d6eafd26  -s ours am: 6c5deab4f2 am: 9685820100  -s ours am: 6608eddab9 am: c6a7a42379
am: d1b6293802

Change-Id: Iec2ba59fd23c72b83efd444bba0e1024109b627c

7 years agoDO NOT MERGE - improve audio effect framwework thread safety am: b47a5ab107 am: 26cf2...
Eric Laurent [Wed, 4 Jan 2017 22:32:31 +0000 (22:32 +0000)]
DO NOT MERGE - improve audio effect framwework thread safety am: b47a5ab107 am: 26cf2f4d73 am: 73a152960b  -s ours am: 21d6eafd26  -s ours am: 6c5deab4f2 am: 9685820100  -s ours am: 6608eddab9
am: c6a7a42379

Change-Id: I675bfc4d6c17c718f2411f415bf8e18d6601ab0a

7 years agoDO NOT MERGE - improve audio effect framwework thread safety am: b47a5ab107 am: 26cf2...
Eric Laurent [Wed, 4 Jan 2017 22:30:01 +0000 (22:30 +0000)]
DO NOT MERGE - improve audio effect framwework thread safety am: b47a5ab107 am: 26cf2f4d73 am: 73a152960b  -s ours am: 21d6eafd26  -s ours am: 6c5deab4f2 am: 9685820100  -s ours
am: 6608eddab9

Change-Id: I90c4642628db7be0f6756885bb56b09b780bdbe3

7 years agoDO NOT MERGE - improve audio effect framwework thread safety am: 84c392104e -s ours...
Eric Laurent [Wed, 4 Jan 2017 22:28:29 +0000 (22:28 +0000)]
DO NOT MERGE - improve audio effect framwework thread safety am: 84c392104e  -s ours am: 5d5f9cd28a am: 10f61954ba  -s ours am: bb4c9408ec am: 642e5857fe am: b763905a4f
am: eef8dc0294  -s ours

Change-Id: If09aa28d0491848e7d46cd1543817954935d7e96

7 years agoDO NOT MERGE - improve audio effect framwework thread safety am: b47a5ab107 am: 26cf2...
Eric Laurent [Wed, 4 Jan 2017 22:27:59 +0000 (22:27 +0000)]
DO NOT MERGE - improve audio effect framwework thread safety am: b47a5ab107 am: 26cf2f4d73 am: 73a152960b  -s ours am: 21d6eafd26  -s ours am: 6c5deab4f2
am: 9685820100  -s ours

Change-Id: I84f3371cf4ac96e94b7f321b25fe51cf5e0cf4af

7 years agoDO NOT MERGE - improve audio effect framwework thread safety am: b47a5ab107 am: 26cf2...
Eric Laurent [Wed, 4 Jan 2017 22:25:30 +0000 (22:25 +0000)]
DO NOT MERGE - improve audio effect framwework thread safety am: b47a5ab107 am: 26cf2f4d73 am: 73a152960b  -s ours am: 21d6eafd26  -s ours
am: 6c5deab4f2

Change-Id: I680ead77538594903bc5140f68eeb920a7ac39c0

7 years agoDO NOT MERGE - improve audio effect framwework thread safety am: 84c392104e -s ours...
Eric Laurent [Wed, 4 Jan 2017 22:25:30 +0000 (22:25 +0000)]
DO NOT MERGE - improve audio effect framwework thread safety am: 84c392104e  -s ours am: 5d5f9cd28a am: 10f61954ba  -s ours am: bb4c9408ec am: 642e5857fe
am: b763905a4f

Change-Id: I14f1399192ca95dc061cae572455eedfc01fcefe

7 years agoDO NOT MERGE - improve audio effect framwework thread safety am: b47a5ab107 am: 26cf2...
Eric Laurent [Wed, 4 Jan 2017 22:22:59 +0000 (22:22 +0000)]
DO NOT MERGE - improve audio effect framwework thread safety am: b47a5ab107 am: 26cf2f4d73 am: 73a152960b  -s ours
am: 21d6eafd26  -s ours

Change-Id: I8ad30b3c76e746ed85dde65a841ebb17af519ce6

7 years agoDO NOT MERGE - improve audio effect framwework thread safety am: 84c392104e -s ours...
Eric Laurent [Wed, 4 Jan 2017 22:22:59 +0000 (22:22 +0000)]
DO NOT MERGE - improve audio effect framwework thread safety am: 84c392104e  -s ours am: 5d5f9cd28a am: 10f61954ba  -s ours am: bb4c9408ec
am: 642e5857fe

Change-Id: I105c98cc9d580a34aa6edbfbe4e58ce3cda966de

7 years agoDO NOT MERGE - improve audio effect framwework thread safety am: bc7f347ff5 am: 06888...
Eric Laurent [Wed, 4 Jan 2017 22:20:58 +0000 (22:20 +0000)]
DO NOT MERGE - improve audio effect framwework thread safety am: bc7f347ff5 am: 068881e79c am: 35912764e9
am: d9e0deef93  -s ours

Change-Id: I8bf018f1103c6201ad6dd54657449aceda052921

7 years agoDO NOT MERGE - improve audio effect framwework thread safety am: b47a5ab107 am: 26cf2...
Eric Laurent [Wed, 4 Jan 2017 22:20:47 +0000 (22:20 +0000)]
DO NOT MERGE - improve audio effect framwework thread safety am: b47a5ab107 am: 26cf2f4d73
am: 73a152960b  -s ours

Change-Id: Id10c17b4bbdc1dd90a1cad25b6c697f8b6a0bcd0

7 years agoDO NOT MERGE - improve audio effect framwework thread safety am: 84c392104e -s ours...
Eric Laurent [Wed, 4 Jan 2017 22:20:30 +0000 (22:20 +0000)]
DO NOT MERGE - improve audio effect framwework thread safety am: 84c392104e  -s ours am: 5d5f9cd28a am: 10f61954ba  -s ours
am: bb4c9408ec

Change-Id: Ifbee9dc70a27ff2f4e2d4641dca40914619fb185

7 years agoDO NOT MERGE - improve audio effect framwework thread safety am: 84c392104e -s ours...
Eric Laurent [Wed, 4 Jan 2017 22:18:00 +0000 (22:18 +0000)]
DO NOT MERGE - improve audio effect framwework thread safety am: 84c392104e  -s ours am: 5d5f9cd28a
am: 10f61954ba  -s ours

Change-Id: I8c86f95b8f3bdb4c20372207c55bffe9a43b5dbb

7 years agoDO NOT MERGE - improve audio effect framwework thread safety am: bc7f347ff5 am: 06888...
Eric Laurent [Wed, 4 Jan 2017 22:17:59 +0000 (22:17 +0000)]
DO NOT MERGE - improve audio effect framwework thread safety am: bc7f347ff5 am: 068881e79c
am: 35912764e9

Change-Id: I9f13363bb537031a3c252c91efee911561cf1633

7 years agoDO NOT MERGE - improve audio effect framwework thread safety am: b47a5ab107
Eric Laurent [Wed, 4 Jan 2017 22:17:58 +0000 (22:17 +0000)]
DO NOT MERGE - improve audio effect framwework thread safety am: b47a5ab107
am: 26cf2f4d73

Change-Id: I6513190cce6756c47e5ede0dc578fa0d2c5889b3

7 years agoDO NOT MERGE - improve audio effect framwework thread safety am: 84c392104e -s ours
Eric Laurent [Wed, 4 Jan 2017 22:15:59 +0000 (22:15 +0000)]
DO NOT MERGE - improve audio effect framwework thread safety am: 84c392104e  -s ours
am: 5d5f9cd28a

Change-Id: I3f732f9e0c346c0e7989e22401062011ef7c7ed2

7 years agoDO NOT MERGE - improve audio effect framwework thread safety am: bc7f347ff5
Eric Laurent [Wed, 4 Jan 2017 22:15:58 +0000 (22:15 +0000)]
DO NOT MERGE - improve audio effect framwework thread safety am: bc7f347ff5
am: 068881e79c

Change-Id: I03e5bd37b916c2b3390a20f59f69de8cf970b1db

7 years agoDO NOT MERGE - improve audio effect framwework thread safety
Eric Laurent [Wed, 4 Jan 2017 22:15:29 +0000 (22:15 +0000)]
DO NOT MERGE - improve audio effect framwework thread safety
am: b47a5ab107

Change-Id: I46af7560653784852e771a2eefd581989aac0644

7 years agoDO NOT MERGE - improve audio effect framwework thread safety
Eric Laurent [Wed, 4 Jan 2017 22:12:58 +0000 (22:12 +0000)]
DO NOT MERGE - improve audio effect framwework thread safety
am: 84c392104e  -s ours

Change-Id: Ia65e289c7383406c719226e8f404b392ca4303b2

7 years agoDO NOT MERGE - improve audio effect framwework thread safety
Eric Laurent [Wed, 4 Jan 2017 22:12:58 +0000 (22:12 +0000)]
DO NOT MERGE - improve audio effect framwework thread safety
am: bc7f347ff5

Change-Id: I75cb2ddf4df152e740d773a4904b581b1ff5f811

7 years agoDO NOT MERGE - improve audio effect framwework thread safety
Eric Laurent [Thu, 1 Dec 2016 23:28:29 +0000 (15:28 -0800)]
DO NOT MERGE - improve audio effect framwework thread safety

- Reorganize handle effect creation code to make sure the effect engine
is created with both thread and effect chain mutex held.
- Reorganize handle disconnect code to make sure the effect engine
is released with both thread and effect chain mutex held.
- Protect IEffect interface methods in EffectHande with a Mutex.
- Only pin effect if the session was acquired first.
- Do not use strong pointer to EffectModule in EffectHandles:
only the EffectChain has a single strong reference to the EffectModule.
- Check reply size before writing status in EffectHandle::command()

Bug: 32707507
Bug: 32095713

Change-Id: Ia1098cba2cd32cc2d1c9dfdff4adc2388dfed80e

7 years agoDO NOT MERGE - improve audio effect framwework thread safety
Eric Laurent [Thu, 1 Dec 2016 23:28:29 +0000 (15:28 -0800)]
DO NOT MERGE - improve audio effect framwework thread safety

- Reorganize handle effect creation code to make sure the effect engine
is created with both thread and effect chain mutex held.
- Reorganize handle disconnect code to make sure the effect engine
is released with both thread and effect chain mutex held.
- Protect IEffect interface methods in EffectHande with a Mutex.
- Only pin effect if the session was acquired first.
- Do not use strong pointer to EffectModule in EffectHandles:
only the EffectChain has a single strong reference to the EffectModule.
- Check reply size before writing status in EffectHandle::command()

Bug: 32707507
Bug: 32095713
Change-Id: Ia1098cba2cd32cc2d1c9dfdff4adc2388dfed80e

7 years agoDO NOT MERGE - improve audio effect framwework thread safety
Eric Laurent [Thu, 1 Dec 2016 23:28:29 +0000 (15:28 -0800)]
DO NOT MERGE - improve audio effect framwework thread safety

- Reorganize handle effect creation code to make sure the effect engine
is created with both thread and effect chain mutex held.
- Reorganize handle disconnect code to make sure the effect engine
is released with both thread and effect chain mutex held.
- Protect IEffect interface methods in EffectHande with a Mutex.
- Only pin effect if the session was acquired first.
- Do not use strong pointer to EffectModule in EffectHandles:
only the EffectChain has a single strong reference to the EffectModule.
- Check reply size before writing status in EffectHandle::command()

Bug: 32707507
Bug: 32095713

Change-Id: Ia1098cba2cd32cc2d1c9dfdff4adc2388dfed80e

7 years agoDO NOT MERGE ANYWHERE - improve audio effect framwework thread safety
Eric Laurent [Thu, 1 Dec 2016 23:28:29 +0000 (15:28 -0800)]
DO NOT MERGE ANYWHERE - improve audio effect framwework thread safety

- Reorganize handle effect creation code to make sure the effect engine
is created with both thread and effect chain mutex held.
- Reorganize handle disconnect code to make sure the effect engine
is released with both thread and effect chain mutex held.
- Protect IEffect interface methods in EffectHande with a Mutex.
- Only pin effect if the session was acquired first.
- Do not use strong pointer to EffectModule in EffectHandles:
only the EffectChain has a single strong reference to the EffectModule.

Bug: 32707507
Bug: 32095713
Change-Id: Ia1098cba2cd32cc2d1c9dfdff4adc2388dfed80e

7 years agoMerge "Effect: Use local cached data for Effect commit" into klp-dev am: 1576f5968c...
Andy Hung [Sat, 3 Dec 2016 00:56:22 +0000 (00:56 +0000)]
Merge "Effect: Use local cached data for Effect commit" into klp-dev am: 1576f5968c am: 308e51173e am: 94d5167a91 am: 98c2151dc3 am: 110d4d31b3 am: 71840c6a36 am: ec982d4628 am: 21556821c9 am: be0097ba0f
am: f462a8c127

Change-Id: I0bc2c2cface0464b4d05e90f5115df1016206500

7 years agoEffect: Use local cached data for Effect commit am: dd79ccda92 am: 82c8c7656f am...
Andy Hung [Sat, 3 Dec 2016 00:56:04 +0000 (00:56 +0000)]
Effect: Use local cached data for Effect commit am: dd79ccda92 am: 82c8c7656f am: 9851dee7da am: 4242950061 am: a661c82829 am: b45c856249 am: 39ca98f547 am: 9ea4b8abdf am: 25813f0a7a
am: 1155d119b4

Change-Id: Ia29bfe12f493e94b451b973e8e027007630b4c55

7 years agoMerge "Effect: Use local cached data for Effect commit" into klp-dev am: 1576f5968c...
Andy Hung [Sat, 3 Dec 2016 00:53:51 +0000 (00:53 +0000)]
Merge "Effect: Use local cached data for Effect commit" into klp-dev am: 1576f5968c am: 308e51173e am: 94d5167a91 am: 98c2151dc3 am: 110d4d31b3 am: 71840c6a36 am: ec982d4628 am: 21556821c9
am: be0097ba0f

Change-Id: Idbff578bea011b744f5fc729ace6fe3e03d155d4

7 years agoEffect: Use local cached data for Effect commit am: dd79ccda92 am: 82c8c7656f am...
Andy Hung [Sat, 3 Dec 2016 00:53:35 +0000 (00:53 +0000)]
Effect: Use local cached data for Effect commit am: dd79ccda92 am: 82c8c7656f am: 9851dee7da am: 4242950061 am: a661c82829 am: b45c856249 am: 39ca98f547 am: 9ea4b8abdf
am: 25813f0a7a

Change-Id: I7232cde71eb075f5446d3a1297cb73f9197f9f38

7 years agoMerge "Effect: Use local cached data for Effect commit" into klp-dev am: 1576f5968c...
Andy Hung [Sat, 3 Dec 2016 00:51:52 +0000 (00:51 +0000)]
Merge "Effect: Use local cached data for Effect commit" into klp-dev am: 1576f5968c am: 308e51173e am: 94d5167a91 am: 98c2151dc3 am: 110d4d31b3 am: 71840c6a36 am: ec982d4628
am: 21556821c9

Change-Id: I6e8aedd746761799ce24f0b51859a8ad1c2aa9f8

7 years agoEffect: Use local cached data for Effect commit am: dd79ccda92 am: 82c8c7656f am...
Andy Hung [Sat, 3 Dec 2016 00:51:33 +0000 (00:51 +0000)]
Effect: Use local cached data for Effect commit am: dd79ccda92 am: 82c8c7656f am: 9851dee7da am: 4242950061 am: a661c82829 am: b45c856249 am: 39ca98f547
am: 9ea4b8abdf

Change-Id: I71203acd393a5104c121d1d3c91ee84c5af64143

7 years agoMerge "Effect: Use local cached data for Effect commit" into klp-dev am: 1576f5968c...
Andy Hung [Sat, 3 Dec 2016 00:49:19 +0000 (00:49 +0000)]
Merge "Effect: Use local cached data for Effect commit" into klp-dev am: 1576f5968c am: 308e51173e am: 94d5167a91 am: 98c2151dc3 am: 110d4d31b3 am: 71840c6a36
am: ec982d4628

Change-Id: Ie333d2a27f06bd7feaaef72cdc437df2d41da524

7 years agoEffect: Use local cached data for Effect commit am: dd79ccda92 am: 82c8c7656f am...
Andy Hung [Sat, 3 Dec 2016 00:49:03 +0000 (00:49 +0000)]
Effect: Use local cached data for Effect commit am: dd79ccda92 am: 82c8c7656f am: 9851dee7da am: 4242950061 am: a661c82829 am: b45c856249
am: 39ca98f547

Change-Id: Id699ab91ec473ee08de7782e8c606209b6372fe5

7 years agoMerge "Effect: Use local cached data for Effect commit" into klp-dev am: 1576f5968c...
Andy Hung [Sat, 3 Dec 2016 00:47:21 +0000 (00:47 +0000)]
Merge "Effect: Use local cached data for Effect commit" into klp-dev am: 1576f5968c am: 308e51173e am: 94d5167a91 am: 98c2151dc3 am: 110d4d31b3
am: 71840c6a36

Change-Id: Idcef3a5a9a0adb89bcffa1c5e1b4e0bcbd7fb880

7 years agoEffect: Use local cached data for Effect commit am: dd79ccda92 am: 82c8c7656f am...
Andy Hung [Sat, 3 Dec 2016 00:47:04 +0000 (00:47 +0000)]
Effect: Use local cached data for Effect commit am: dd79ccda92 am: 82c8c7656f am: 9851dee7da am: 4242950061 am: a661c82829
am: b45c856249

Change-Id: I6cb0c8e2dbaa2ebe3d4fd4f283a2028ac099f3c3

7 years agoMerge "Effect: Use local cached data for Effect commit" into klp-dev am: 1576f5968c...
Andy Hung [Sat, 3 Dec 2016 00:45:17 +0000 (00:45 +0000)]
Merge "Effect: Use local cached data for Effect commit" into klp-dev am: 1576f5968c am: 308e51173e am: 94d5167a91 am: 98c2151dc3
am: 110d4d31b3

Change-Id: Id0e2e230e2ccd08f46cfd33cab5d7585e9623cf0

7 years agoEffect: Use local cached data for Effect commit am: dd79ccda92 am: 82c8c7656f am...
Andy Hung [Sat, 3 Dec 2016 00:45:02 +0000 (00:45 +0000)]
Effect: Use local cached data for Effect commit am: dd79ccda92 am: 82c8c7656f am: 9851dee7da am: 4242950061
am: a661c82829

Change-Id: I8318ec70f93d1ed10b5606511eb2d1885121f355

7 years agoMerge "Effect: Use local cached data for Effect commit" into klp-dev am: 1576f5968c...
Andy Hung [Sat, 3 Dec 2016 00:42:49 +0000 (00:42 +0000)]
Merge "Effect: Use local cached data for Effect commit" into klp-dev am: 1576f5968c am: 308e51173e am: 94d5167a91
am: 98c2151dc3

Change-Id: I0105fd0ddab374f8d1e95cc9e45af094367edd30

7 years agoEffect: Use local cached data for Effect commit am: dd79ccda92 am: 82c8c7656f am...
Andy Hung [Sat, 3 Dec 2016 00:42:33 +0000 (00:42 +0000)]
Effect: Use local cached data for Effect commit am: dd79ccda92 am: 82c8c7656f am: 9851dee7da
am: 4242950061

Change-Id: I9cee35a3c8df1747c5461dc62c3210a0de134b87

7 years agoMerge "Effect: Use local cached data for Effect commit" into klp-dev am: 1576f5968c...
Andy Hung [Sat, 3 Dec 2016 00:40:47 +0000 (00:40 +0000)]
Merge "Effect: Use local cached data for Effect commit" into klp-dev am: 1576f5968c am: 308e51173e
am: 94d5167a91

Change-Id: I3a4af7a28adcd54d4590f447845b134acb80f053

7 years agoEffect: Use local cached data for Effect commit am: dd79ccda92 am: 82c8c7656f
Andy Hung [Sat, 3 Dec 2016 00:40:33 +0000 (00:40 +0000)]
Effect: Use local cached data for Effect commit am: dd79ccda92 am: 82c8c7656f
am: 9851dee7da

Change-Id: I3d375c671122e61cf0b530457c37c1cd5c06e563