Commit graph

466 commits

Author SHA1 Message Date
Treehugger Robot
d2079d0fac Merge "Remove TV CEC HAL v2.0 definitions" am: 81eef45d64 am: aa0b6fed40 am: a33b0d41bd
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1567421

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I282d77d7371fefba7cec48c0f07bf18df6ba2aba
2021-02-03 18:40:56 +00:00
Marvin Ramin
a106772aea Remove TV CEC HAL v2.0 definitions
This HAL version is not supported by the framework. Remove the code to
avoid confusion.

Bug: 178772241
Test: make
Change-Id: I278415d1945fbf5010539840efdc9e9502957f3f
2021-02-02 21:47:49 +00:00
Amy Zhang
3c22ce3bf7 Enhance Tuner 1.0 VTS testing and configurations
Broadcom shared a valuable patch to enhance Tuner 1.0 VTS per their
testing experience on the real devices.

We evaluated the suggestions and fix the following issues:
1. Allow testers to set a default frontend
2. Allow testers to enable/disable frontend
3. Skip FMQ creation on filters that do not need FMQ
4. Don't fail if the vendor impl rejects a foreign keytoken
5. Better logs
6. Clean up filter and its callback on close regardless of the closing
result
7. More filter size constants options

Suggestions from: Gareth Fenn <gfenn@broadcom.com>
Test: atest VtsHalTvTunerV1_0TargetTest
Bug: 177960135

Change-Id: Ie4dcc6cb284b2b57879f286c436f5bd9adf43201
Merged-In: Ie4dcc6cb284b2b57879f286c436f5bd9adf43201
2021-01-20 21:22:40 +00:00
Amy Zhang
a30063f406 Merge "Enhance Tuner 1.0 VTS testing and configurations" 2021-01-20 18:19:13 +00:00
Amy Zhang
37719f3879 Enhance Tuner 1.0 VTS testing and configurations
Broadcom shared a valuable patch to enhance Tuner 1.0 VTS per their
testing experience on the real devices.

We evaluated the suggestions and fix the following issues:
1. Allow testers to set a default frontend
2. Allow testers to enable/disable frontend
3. Skip FMQ creation on filters that do not need FMQ
4. Don't fail if the vendor impl rejects a foreign keytoken
5. Better logs
6. Clean up filter and its callback on close regardless of the closing
result
7. More filter size constants options

Suggestions from: Gareth Fenn <gfenn@broadcom.com>
Test: atest VtsHalTvTunerV1_0TargetTest
Bug: 177960135

Change-Id: Ie4dcc6cb284b2b57879f286c436f5bd9adf43201
2021-01-19 20:00:11 -08:00
Henry Fang
4589dec0e2 Merge "update connect status along with stream_configuration_change event." am: 1c15423de7 am: f4866e5baa am: 7ba0cdc709
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1532561

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id0fc15e3ddaacfafa0246dde8cae35f6d4671a6a
2021-01-15 21:16:53 +00:00
Henry Fang
64a3a731c2 update connect status along with stream_configuration_change event.
bug: 142698113
Test: Manual
Change-Id: Ieab767bb333bbe4ba24702668908edec69240d8d
2021-01-08 11:38:26 -08:00
Amy Zhang
e852ece374 Add Tuner VTS test assets and configure the push file preparer
Test: atest VtsHalTvTunerV1_0TargetTest
Test: atest VtsHalTvTunerV1_1TargetTest
Bug: 161745584
Change-Id: I5fe55bc846ef8b4b3336ea65b2efb63c2de829ac
2020-12-02 18:48:35 +00:00
Amy Zhang
39bd464d0c Revert "Revert "Add monitor for ip cid change""
This reverts commit d1d3f70fd3.

Reason for revert:

I5fcd0d4dff55453023a730caa36995f13f074a8f broke the build since the java framework and JNI side of the codes have not been merged yet.

I9b1e2493f1bc93393b634d6b841a56c6d0171542 reverted I5fcd0d4dff55453023a730caa36995f13f074a8f to fix the breakage.

This double revert would be committed with the jni code in the same topic.

Change-Id: Ic5263ea9f18c097c3584356fa113a4f019f08692
2020-11-17 00:13:45 +00:00
Amy Zhang
d1d3f70fd3 Revert "Add monitor for ip cid change"
This CL will be re-revert once the corresponding JNI and framework CL are ready to commit

This reverts commit b6064e59c7.

Reason for revert: build breakage

Change-Id: I9b1e2493f1bc93393b634d6b841a56c6d0171542
2020-11-16 23:17:35 +00:00
Amy Zhang
b6064e59c7 Add monitor for ip cid change
Previously we added scrambling status monitoring.
Now we are merging the configuration of these two monitoring into one.
They are going through the same interface by configuring Filter Event Monitoring Type.

Test: atest VtsHalTvTunerV1_1TargetTest
Bug: 153595125
Change-Id: I5fcd0d4dff55453023a730caa36995f13f074a8f
2020-11-13 13:30:09 -08:00
Amy Zhang
ff82d7ca94 Add startId in Filter Event to work with filter reconfiguration
Test: atest VtsHalTvTunerV1_1TargetTest
Bug: 172593389
Change-Id: I77e45366b737068aa0aa20c2b384f2e3160c7398
2020-11-12 17:41:39 -08:00
TreeHugger Robot
aa2d1ac429 Merge "Get offset of recorded keyframe from MTP table" 2020-11-05 02:48:42 +00:00
Amy Zhang
b12ccd3e30 Get offset of recorded keyframe from MTP table
Test: atest VtsHalTvTunerV1_1TargetTest
Bug: 158816517
Change-Id: Ia48637554fc5020b6de422feac7efc04c070fae7
2020-11-02 17:50:13 -08:00
Amy Zhang
25a79e2b8b Merge "Add some invalid constants in Tuner HAL 1.1" 2020-10-30 22:44:45 +00:00
Amy Zhang
961125f904 Add some invalid constants in Tuner HAL 1.1
Test: make
Bug: 171866656
Change-Id: I799d45c77bab923869107ae178a979b8f55dc330
2020-10-29 13:49:34 -07:00
Amy Zhang
b6d44ea486 Add Scrambling Status Monitor merchanism in Tuner 1.1
Test: atest VtsHalTvTunerV1_1TargetTest
Bug: 158779948
Change-Id: Ie6d837dba732e213180ae5fac0ee86f9d310fa33
2020-10-26 10:56:49 -07:00
Amy Zhang
7e669ce577 Add new Frontend Status Types and a new scan msg in Tuner HAL 1.1
Test: atest VtsHalTvTunerV1_1TargetTest
Bug: 169868608
Change-Id: I04b108bab20e6a1969998bb954e48c2f1c5e0772
2020-10-22 15:55:02 -07:00
Amy Zhang
2576dcc525 Add Dvbc Frontend Bandwidth settings in Tuner 1.1
Test: make -j44 dist
Bug: 169868608
Change-Id: Ief4d795a1671d77722d554f6af6536eaa1f8013d
2020-10-20 17:57:33 -07:00
Amy Zhang
4a6663fd32 Add the address of the first macroblock as an extended field in Tuner 1.1
Record event

Test: atest VtsHalTvTunerV1_1TargetTest
Bug: 158816517
Change-Id: I46b77210d5b97325f770bbb4095897f431aa0ee6
2020-10-20 17:56:40 -07:00
Amy Zhang
1ea0c17ea4 Extend DemuxScIndex in Tuner 1.1
Test: make
Bug: 158816517
Change-Id: I0fffd428e18b36b5c4d421d89743de330c854425
2020-10-20 17:55:54 -07:00
Amy Zhang
57909db2e7 Add API to configure media filter stream type for Demux Framing
Test: atest VtsHalTvTunerV1_1TargetTest
Bug: 170339836
Change-Id: Ib42e041ddcd6de36df8af6732715c54097995e92
2020-10-13 15:33:17 -07:00
TreeHugger Robot
daaa620614 Merge "Support Link/Unlink Cicam to Frontend in Tuner HAL 1.1" 2020-10-09 19:12:03 +00:00
Xin Li
50393137ed Merge ab/6749736 in stage.
Bug: 167233921
Merged-In: I6756cad681e4cfa01868450214da0d7b2d5261e4
Change-Id: Ia529ecf4f48248d5af63673f359916486f71bc35
2020-10-08 23:22:52 -07:00
Amy Zhang
e8a5737720 Support Link/Unlink Cicam to Frontend in Tuner HAL 1.1
The previous linkCicam API does not support local transport stream id
return. Added the support in this CL.

Also added an unlink API to unlink the cicam when needed.

INVALID_LTS_ID will be used on failed operation of linkCicam
and in Tuner java framework as the default value

Test: make android.hardware.tv.tuner@1.1-service
Bug: 158818696
Change-Id: Ief9c5097c667ce41a534b0d1d759869acd79ca7f
2020-10-07 12:39:57 -07:00
Amy Zhang
7ec2b704fa Add isHighPriority scan message type into Tuner HAL 1.1
Test: atest VtsHalTvTunerV1_1TargetTest
Bug: 169868608
Change-Id: I49a82dc9eda0fc9b1f90bc67cd6d1a20bbafcc00
2020-10-05 18:07:20 -07:00
Amy Zhang
5763ea76bb Merge "Add DVBC Time Interleave Mode enum in Tuner HAL 1.1" 2020-10-01 23:44:59 +00:00
Amy Zhang
b27802acfe Merge "Extend Scan Message and Message Type in Tuner HAL 1.1" 2020-09-30 23:00:54 +00:00
Amy Zhang
549a39c120 Merge changes I8cbbf1e3,I4ed8ec1f
* changes:
  Add FrontendStatusExt1_1 and getStatusExt1_1 to get 1.1 Extended Frontend Status
  Add DTMB Frontend Type and Related Capabilities enums
2020-09-30 20:01:15 +00:00
Amy Zhang
621887a91a Add DVBC Time Interleave Mode enum in Tuner HAL 1.1
Test: make android.hardware.tv.tuner@1.1
Bug: 158818695
Change-Id: I11ea762a789aaab1cf3a17b3c0515c6a37942098
2020-09-30 11:33:34 -07:00
Amy Zhang
19ed17bf1d Extend Scan Message and Message Type in Tuner HAL 1.1
A new API would be added in IFrontendCallback 1.1:
onScanMessageExt to receive the extended scan message

Test: atest VtsHalTvTunerV1_1TargetTest
Bug: 158818695
Change-Id: If12535dada78ee2d2c7282ff17f9ab5f4983c750
2020-09-29 19:04:33 -07:00
Amy Zhang
422bb11cca Add FrontendStatusExt1_1 and getStatusExt1_1 to get 1.1 Extended Frontend Status
Test: atest VtsHalTvTunerV1_1TargetTest
Bug: 158818695
Change-Id: I8cbbf1e3bca7f2ddda90ad6dd4a2ae0368561bfd
2020-09-29 19:04:18 -07:00
Amy Zhang
4c49c15e55 Add DTMB Frontend Type and Related Capabilities enums
Test: atest VtsHalTvTunerV1_1TargetTest
Bug: 159064654
Change-Id: I4ed8ec1f47d74ba3d585725cb64ba925d7ddf910
2020-09-29 16:26:52 -07:00
nchalko
539362f912 Remove outdated warning now that the v1.0 had shipped am: 897f0d48bb am: 1366d334a1 am: 3b12885c63 am: 149d54ec95 am: 2810f12eae
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1441474

Change-Id: Ia9f0af343a7d1ea020a68c7bbc5b93eadf7d986b
2020-09-29 21:44:30 +00:00
nchalko
2810f12eae Remove outdated warning now that the v1.0 had shipped am: 897f0d48bb am: 1366d334a1 am: 3b12885c63 am: 149d54ec95
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1441474

Change-Id: I783eb94f4a36a7f8288150f99a867aa90eac6065
2020-09-29 21:23:41 +00:00
nchalko
3b12885c63 Remove outdated warning now that the v1.0 had shipped am: 897f0d48bb am: 1366d334a1
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1441474

Change-Id: I244def095eece3f8b28349d566f3672a1461c041
2020-09-29 21:13:52 +00:00
nchalko
897f0d48bb Remove outdated warning now that the v1.0 had shipped
Change-Id: I28f8f137db92b390c8ec27680a5c305e3cef43ba
Test: n/a
2020-09-29 18:29:16 +00:00
Amy Zhang
bc15b5964e Rename Tuner HAL 1.1 frontendSettingsExt into frontendSettingsExt1_1
Test: make
Bug: 158818695
Change-Id: I1d9e89556fc7de0962dcfbf379c115ea4a0e8d32
2020-09-29 10:29:45 -07:00
Dan Shi
3437ee6816 Rename vts-core to vts
Bug: 151896491
Test: none
Change-Id: If74547c56b46ebc7fd728c1bf52fe9dedac65ffa
Merged-In: I562b4dc50765e953800a814a8fd84a01c1b9352b
2020-09-29 06:51:43 +00:00
Dan Shi
f2b950f470 Rename vts-core to vts
Bug: 151896491
Test: none
Change-Id: If74547c56b46ebc7fd728c1bf52fe9dedac65ffa
Merged-In: I562b4dc50765e953800a814a8fd84a01c1b9352b
2020-09-26 04:11:28 +00:00
Amy Zhang
f2659f5fb8 Merge "Add API to get the shared memory Audio/Video handle" 2020-09-22 17:17:56 +00:00
Amy Zhang
976c640464 Add API to get the shared memory Audio/Video handle
In the MediaEvent of AV filters, the AV memory handle is mapped/unmapped on each event.
If the vendor allocates a persistent memory block, and use MediaEvent.offset to access the data,
the mapping change is unnecessary.

To improve this, a new API to get shared AV Memory is introduced.
To pass additional information to Codec2 for AV memory,
the index for Codec2 to setup additional information can be carried in the handle.

Test: atest VtsHalTvTunerV1_1TargetTest
Bug: 162013047
Bug: 157143515
Bug: 156664393
Change-Id: Ibd4471ff8e19b0a99b8bcbc982dc08dbcc92efcf
2020-09-21 17:42:29 -07:00
Amy Zhang
83529a402b Merge "IP and CID filtering configuration of IP filter" 2020-09-21 21:18:59 +00:00
Amy Zhang
cbd93156bd IP and CID filtering configuration of IP filter
Add the cid configuration API in IFilter and some related
enums

Test: atest VtsHalTvTunerV1_1TargetTest
Bug: 153595125
Change-Id: I6e43c0f71466192f9fa69c76f9c635ecefe99d5e
2020-09-17 17:17:54 -07:00
Amy Zhang
4699ec631e Extend DVBT Constellation to report the rotation status
Test: make
Bug:
Change-Id: I24356125ec889c313459beba5e3caef2d3413fa7
2020-09-16 17:59:21 -07:00
Treehugger Robot
c9e5075d36 Merge "Add Tuner HAL and TvInput HAL VTS tests into the exception list of the uninstantiated parameterized tests." 2020-09-16 19:07:33 +00:00
Amy Zhang
585bb5e581 Revert "Add a getAvSyncHwId_64bit in Tuner HAL 1.1 to support 64 bit hw sync id"
This reverts commit 80cb96048b.

Reason for revert: This change is not specifically requested by vendors
Might be unnecessary

Test: make -j44, atest VtsHalTvTunerV1_1TargetTest
Bug: 159058358
Change-Id: I305c17b4778608a59d04d93030f4ec19fa1b7137
2020-09-15 16:30:42 -07:00
Amy Zhang
6ec20d27f7 Add Tuner HAL and TvInput HAL VTS tests into the exception list of the uninstantiated
parameterized tests.

This test can be disabled on the phone target once there is
a cuttlefish tv target enabled to run the test continuously.

The test will be removed from the exception list afterwards.

Test: make VtsHalTvTunerV1_0TargetTest
Bug: 161805444
Change-Id: I7a2ad0e8a43c6262628354be316c530ab00ac520
Merged-In: I7a2ad0e8a43c6262628354be316c530ab00ac520
2020-09-15 17:42:33 +00:00
Amy Zhang
a5207dcde7 Add Tuner HAL VTS tests into the exception list of the uninstantiated
parameterized tests

Test: atest VtsHalTvTunerV1_0TargetTest
Bug: 168345664
Change-Id: I1fabb01ea308c286d2b3f29d520afc7518bb2d8a
2020-09-14 12:03:24 -07:00
Amy Zhang
17f8eac2a4 Add linkCicam API in Frontend 1.1
This API is mostly for restoring the by-pass mode
Frontend and Cicam connection

Test: make
Bug: 158818696
Change-Id: I62ba19a1c6c531769db6286d3bcd41ab1529bb99
2020-09-02 12:34:47 -07:00