Commit Graph

346 Commits

Author SHA1 Message Date
Mikhail Naganov
718b510080 audio: Fix StreamOut ownership in default wrapper
StreamOut::asyncCallback could became an owner of StreamOut
causing the destructor to be called on the offload callback
thread, while the legacy HAL is holding a mutex, which resulted
in a deadlock.

Removed erroneous usage of sp<StreamOut> in asyncCallback.
The legacy HAL joins the offload callback thread when closing
output stream, thus StreamOut destructor is guaranteed to finish
only after the offload callback thread has exited, and using
a raw pointer to StreamOut inside asyncCallback is correct.

Bug: 70863217
Change-Id: I0d77018cf3df5ad07251732733288d425dd836eb
Test: manual
2017-12-21 13:21:58 -08:00
Kevin Rocard
b5433136dd Add the audio team as owner of the audio VTS
am: c691e18332

Change-Id: I3fa55d02549c1827737f8e0d85bae99226506f17
2017-11-29 22:23:57 +00:00
Daniel Van Veen
3770968cf9 Merge "Fix inequality typo in StreamIn::getCapturePosition"
am: ba3225718b

Change-Id: I9ec534a8ec45525021180fa9219a1e3d4f34d0a7
2017-11-29 20:46:08 +00:00
Kevin Rocard
c691e18332 Add the audio team as owner of the audio VTS
Change-Id: I7744929814e3e7ba99f1cb664153cdffac58f01e
Merged-In: I514c37b3c9da3df700fa208e79ff6597f8914092
Signed-off-by: Kevin Rocard <krocard@google.com>
2017-11-29 12:41:25 -08:00
Mikhail Naganov
8c0c030ee9 Add OWNERS for audio-related HAL default implementations
Test: not needed
Change-Id: I2893c84ac2ac72095baac810947fac56235a9d79
Merged-In: Idefe7be10bde22866be82f87118b9b54e74c3f40
2017-11-29 12:39:55 -08:00
Treehugger Robot
ba3225718b Merge "Fix inequality typo in StreamIn::getCapturePosition" 2017-11-29 20:28:20 +00:00
Treehugger Robot
adf8208c52 Merge "Remove subdirs" 2017-11-29 17:53:33 +00:00
Daniel Van Veen
0c7d58b00a Fix inequality typo in StreamIn::getCapturePosition
This was preventing getCapturePosition() being called from
the default HIDL implementation.

Test: cts-tradefed run cts -m CtsMediaTestCases \
      -t android.media.cts.AudioRecordTest
Change-Id: I9c920108f68fb895a7f7a9d2ea27c291a91c1afb
2017-11-29 17:06:27 +00:00
Steven Moreland
7b9888217e Remove subdirs
Removing whenever I see these in code reviews.

Test: none
Merged-In: I4322f533a837d55618ec2ed2125e8966ace9d61d
Change-Id: I4322f533a837d55618ec2ed2125e8966ace9d61d
2017-11-28 17:19:46 -08:00
Steven Moreland
e5c6548346 Remove subdirs
Removing whenever I see these in code reviews.

Test: none
Merged-In: I4322f533a837d55618ec2ed2125e8966ace9d61d
Change-Id: I4322f533a837d55618ec2ed2125e8966ace9d61d
2017-11-28 14:23:43 -08:00
Chih-Hung Hsieh
ae9fb022a3 Merge "Use -Werror in hardware/interfaces/audio"
am: 7a4422d2a5

Change-Id: Ib0cf1e15856fd58f0f2ea726e3d5b94177ab33a1
2017-11-28 19:03:31 +00:00
Chih-Hung Hsieh
b38c1aebc1 Use -Werror in hardware/interfaces/audio
* Remove unused variables, lambda function parameters..

Bug: 66996870
Test: build with WITH_TIDY=1
Change-Id: I28e8eb1af434f62cab6f41285b9a400f7f57cd13
2017-11-28 17:11:33 +00:00
Xin Li
bb9e38fef9 Merge commit '1a06284b24f5eb7bb9c1fea0817da8898b3b1bff' from
oc-mr1-dev-plus-aosp into stage-aosp-master

Change-Id: I2a044eb8c9981d0a8198ffe2df55559afbd76341
Merged-In: I4fb9f18884f7ef21162015a0032c4431444f7025
2017-11-14 12:08:38 -08:00
Steven Moreland
a1169dd600 Update makefiles for hidl_interface.
Bug: 35570956
Test: manual
Change-Id: I7a220b78ee081240e1dc30ef5672ba39e3e98375
2017-11-10 09:06:55 -08:00
Steven Moreland
90e3a50f03 Automatic mk -> bp.
Automatic mk -> bp conversion for all modules here
which can be converted and built automatically.

Test: Soong resolves all dependencies
Bug: 37512442
Change-Id: Ib789212cb88d55731397c600d132e7c672c0d8be
2017-11-03 16:30:28 +00:00
Tri Vo
976bfa63f8 Merge "Set pipe size to >1MB for debugDump test cases." am: d928053397 am: 04fcc83578
am: bd9b6d5c68

Change-Id: I0719153562f638d958f68f823bace7fb2dad3888
2017-10-18 02:56:55 +00:00
Tri Vo
bd9b6d5c68 Merge "Set pipe size to >1MB for debugDump test cases." am: d928053397
am: 04fcc83578

Change-Id: I268c1f1fd16732ffce1569a19d8efa47897fc329
2017-10-18 02:28:01 +00:00
Tri Vo
04fcc83578 Merge "Set pipe size to >1MB for debugDump test cases."
am: d928053397

Change-Id: If7cca83c1da491e5c399170e2669995e878fdc57
2017-10-18 02:21:29 +00:00
Tri Vo
7d35a3d0f2 Set pipe size to >1MB for debugDump test cases.
Test: VtsHalAudioV2_0Target
Change-Id: I2dd43851a43609ad2953030303edaeb684b63096
2017-10-17 16:51:33 -07:00
Tri Vo
e9c924d756 Merge "Use a pipe instead of tmp for debugDump tests." am: 458b8fa5bd am: c62e184a27
am: a56e32dca2

Change-Id: I9f450d87bc7737e14ad4ed0bab9670c6765fd5e2
2017-10-15 03:44:38 +00:00
Tri Vo
a56e32dca2 Merge "Use a pipe instead of tmp for debugDump tests." am: 458b8fa5bd
am: c62e184a27

Change-Id: If0f38272ff7a4e7982ef9273ed09be7d70b9de16
2017-10-15 03:01:13 +00:00
Tri Vo
c62e184a27 Merge "Use a pipe instead of tmp for debugDump tests."
am: 458b8fa5bd

Change-Id: Ife2cfb8b89c0f550648ea28c339e7278015399c0
2017-10-15 02:56:25 +00:00
Tri Vo
6c00ac31bb Use a pipe instead of tmp for debugDump tests.
Audio hal does not have selinux permissions to files under
/data/locat/tmp. We pass an fd to a pipe to the HAL instead.

Bug: 67665722
Test: VtsHalAudioV2_0Target
Change-Id: I695917be1816ba007f48afab5e978ab31024ffba
2017-10-12 15:47:34 -07:00
Steven Moreland
116161d94e Update for Soong java makefiles. am: c3e80fa01e am: 0fff75dee1
am: 6c811964a1

Change-Id: I85ccbb4a15cd18938607f5bca4e065b9d7e0182b
2017-10-11 16:31:07 +00:00
Steven Moreland
6c811964a1 Update for Soong java makefiles. am: c3e80fa01e
am: 0fff75dee1

Change-Id: I5b524ccf13233f3696881a2a670b5d2134fd5f15
2017-10-11 16:27:24 +00:00
Steven Moreland
0fff75dee1 Update for Soong java makefiles.
am: c3e80fa01e

Change-Id: Ia8835f9c95bd98a96f5fd3aff11191e7d3726fb9
2017-10-11 16:23:54 +00:00
Mikhail Naganov
d4cb163f12 Audio VTS: Allow 4GB buffer prepareToWrite/Read to succeed on 64 bits am: ce607879ba
am: 5b122a7408

Change-Id: Ifd8600fd7d24657dff4ed5b6f563806509c8029b
2017-10-11 01:35:41 +00:00
Mikhail Naganov
5b122a7408 Audio VTS: Allow 4GB buffer prepareToWrite/Read to succeed on 64 bits
am: ce607879ba

Change-Id: I6869d49ab5ceb12e1b0d3e50e0952094c34b3c07
2017-10-11 01:33:25 +00:00
Kevin Rocard
0534965a28 Merge "Legacy wrapper: Use arbitrary limit on buffer size" into oc-mr1-dev
am: 0f65d6e38a

Change-Id: I08d5eb2a782cb5fc60f6e297282ff179e6098ff0
2017-10-11 00:17:36 +00:00
Steven Moreland
c3e80fa01e Update for Soong java makefiles.
Test: pass
Bug: 33420795
Change-Id: Id9b1919a19b8ff682738cfb0869a479b4dbb4293
2017-10-10 23:07:20 +00:00
Mikhail Naganov
ce607879ba Audio VTS: Allow 4GB buffer prepareToWrite/Read to succeed on 64 bits
Because on oc-dev the runtime image can not be modified and that this is
not a bug but a test and implementation misalignment,
allow prepareForWrite/Read(UINT32_MAX, UINT32_MAX) to succeed on oc-dev.

MR1 will have a better fix where the HAL will always reject > 1GiB
buffers independently of the architecture.

Test: vts-tradefed run commandAndExit vts --module VtsHalAudioV2_0Target
Bug: 67030516
Change-Id: I10a5ee3868c67c45ed5297d9c5c89129d762c7cd
Merged-In: I4cc3efda9bb66e6dae8b4e6785f52d9e51440aee
Signed-off-by: Kevin Rocard <krocard@google.com>
2017-10-10 14:30:00 -07:00
Kevin Rocard
46cba442d2 Legacy wrapper: Use arbitrary limit on buffer size
The legacy HAL wrapper prepareForWrite and prepareForRead used
to return INVALID_ARGUMENTS if the computed buffer size just
under SIZE_MAX.

This meant that the limitation depended on the architecture (32 vs 64
bit size_t). This caused VTS test failure on 64 bits.

Instead of dynamically calculating an arbitrary max size,
choose a fixed one. This max buffer size has been chosen at 1GiB.
It should be enough for the foreseeable future and not too close
from the 4GiB max on 32 bit.

Test: vts-tradefed run commandAndExit vts --module VtsHalAudioV2_0Target
Bug: 67030516
Change-Id: I4cc3efda9bb66e6dae8b4e6785f52d9e51440aee
Signed-off-by: Kevin Rocard <krocard@google.com>
2017-10-10 09:22:02 -07:00
Steven Moreland
0653f3b212 Merge "Remove useless Android.mk files." am: 75d5cf515a am: f27cfa15d7
am: 33dc30ce49

Change-Id: Ia35d20e0fc1df6f7c46b5581537d7ed387965899
2017-10-05 21:51:13 +00:00
Steven Moreland
33dc30ce49 Merge "Remove useless Android.mk files." am: 75d5cf515a
am: f27cfa15d7

Change-Id: I2c554896e817483493faa5bbe54746d4f1c8b8da
2017-10-05 21:46:16 +00:00
Steven Moreland
f27cfa15d7 Merge "Remove useless Android.mk files."
am: 75d5cf515a

Change-Id: I8c0918c4a787cc3f4c7c69f52737d3a0d9d64426
2017-10-05 21:44:26 +00:00
Treehugger Robot
75d5cf515a Merge "Remove useless Android.mk files." 2017-10-05 21:40:27 +00:00
Steven Moreland
4b60470f1a Remove useless Android.mk files.
These have been c/p'd all over the place.

Test: m -j nothing
Bug: 33420795
Change-Id: I77979866dbb2345a41a873c84ec3fccd7b127510
2017-10-04 15:52:40 -07:00
Steven Moreland
9a17f41f6f Merge "Update for hidl adapter module defaults." am: 988c977079 am: 861651985f
am: b53e6ad535

Change-Id: I23269fb7a9bdd352e670a80f390527d9eef31412
2017-10-04 21:51:00 +00:00
Steven Moreland
b53e6ad535 Merge "Update for hidl adapter module defaults." am: 988c977079
am: 861651985f

Change-Id: Ifdb878720d42120e7309dd2a49e5a91059ff4b72
2017-10-04 21:48:04 +00:00
Steven Moreland
861651985f Merge "Update for hidl adapter module defaults."
am: 988c977079

Change-Id: I289818be1b30397391847ba1c532d1014fdbed27
2017-10-04 21:45:09 +00:00
Treehugger Robot
988c977079 Merge "Update for hidl adapter module defaults." 2017-10-04 21:36:25 +00:00
Chih-hung Hsieh
9890348480 Merge "Use -Werror in hardware/interfaces" am: 85bb01dd6b am: 3ed04cd35d
am: baf19e17b3

Change-Id: I8806a9887178a7f778cc556c804a5b7a05d59836
2017-10-04 21:04:44 +00:00
Chih-hung Hsieh
baf19e17b3 Merge "Use -Werror in hardware/interfaces" am: 85bb01dd6b
am: 3ed04cd35d

Change-Id: I66c74139be9c7736beb354b5da0381668f4e68c5
2017-10-04 20:49:30 +00:00
Chih-hung Hsieh
3ed04cd35d Merge "Use -Werror in hardware/interfaces"
am: 85bb01dd6b

Change-Id: I9169eb99a256f3a1db9e6f82e11fd96228d9558a
2017-10-04 20:40:30 +00:00
Steven Moreland
527fd76a0e Update for hidl adapter module defaults.
Test: pass
Change-Id: Idc6a943149a279bf17cfcfd0f2571473e53bbbbf
2017-10-04 12:47:03 -07:00
Chih-Hung Hsieh
3da5b01946 Use -Werror in hardware/interfaces
* Remove unused local variables.

Bug: 66996870
Test: build with WITH_TIDY=1
Change-Id: I48dbbf670cc9eeff2391983788983420f8547cc9
2017-10-04 11:16:31 -07:00
Steven Moreland
9fdd241905 Merge "Fix typo in update makefiles." am: 9960148420 am: f07e364ce3
am: 71a193a425

Change-Id: I45ae43f07323254212532acbf0f891d11143b05f
2017-09-26 23:58:51 +00:00
Steven Moreland
71a193a425 Merge "Fix typo in update makefiles." am: 9960148420
am: f07e364ce3

Change-Id: If5bbf259458363b755989578c2f3828cbcb3d07c
2017-09-26 23:55:59 +00:00
Steven Moreland
f07e364ce3 Merge "Fix typo in update makefiles."
am: 9960148420

Change-Id: I949634e72f817f3a5411130e968acd8efd1d7725
2017-09-26 23:51:07 +00:00
Steven Moreland
a5299ee739 Fix typo in update makefiles.
Bug: 37518178
Test: pass
Change-Id: Ic401b3a473f15ca4c01e58b3072e19db7c31b653
2017-09-26 21:59:43 +00:00