Commit Graph

941 Commits

Author SHA1 Message Date
Treehugger Robot
c78f9f21f6 Merge "[DON'T BLOCK] Test ownership migration rules" into main am: 27e97308c4 am: 74dc4cc5d7
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2950589

Change-Id: I9a26bb26763d77e109f1d911d0ea7c95f632703f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-07 02:26:27 +00:00
Treehugger Robot
74dc4cc5d7 Merge "[DON'T BLOCK] Test ownership migration rules" into main am: 27e97308c4
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2950589

Change-Id: Ie4f36b193820490e606e7f5100ca29200f832fa2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-07 01:45:21 +00:00
Aditya Choudhary
ad2ba1b851 [DON'T BLOCK] Test ownership migration rules
This CL is created as a best effort to migrate test targets
to the new android ownership model. If you find incorrect or unnecessary
attribution in this CL, please create a separate CL to fix that.

For more details please refer to the link below,
go/new-android-ownership-model

Bug: 304529413
Test: N/A
Change-Id: Ic8c4bd6ac246e7efa98bbdaf822d12ae8e1230a5
2024-02-05 15:45:22 +00:00
Aditya Choudhary
39ed8dc1ad [DON'T BLOCK] Test ownership migration rules am: c5c6c62995 am: 85d604d0db
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2939799

Change-Id: I68af10e082403fcfdbd89e7d63bb07f207bc06e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-31 17:46:24 +00:00
Aditya Choudhary
85d604d0db [DON'T BLOCK] Test ownership migration rules am: c5c6c62995
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2939799

Change-Id: I1046113ffdcd09649fa65e023aae0969262772e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-31 17:06:10 +00:00
Aditya Choudhary
c5c6c62995 [DON'T BLOCK] Test ownership migration rules
This CL is created as a best effort to migrate test targets
to the new android ownership model. If you find incorrect or unnecessary
attribution in this CL, please create a separate CL to fix that.

For more details please refer to the link below,
<add g3 doc link>

Bug: 304529413
Test: N/A
Change-Id: I3322344f595f974f730dc824af0110388076d838
2024-01-31 11:06:17 +00:00
Xin Li
763c473c3d Merge Android 24Q1 Release (ab/11220357)
Bug: 319669529
Merged-In: I976f80006aeb88bde2ae34ca4f9be72cea727d9e
Change-Id: Id94b25af52bd2e2847b6858697ab21cc6ce27aa3
2024-01-30 10:36:50 -08:00
Sadiq Sada
ee6e1f9c70 Merge changes from topic "iptv_vts_fix" into main
* changes:
  Reenable VTS tests for IPTV
  Terminate IPTV read thread on demux close
  Fix tune byte alignment
  mFilterCount cannot be negative
  Refactor plugin interface, streamer creation
2024-01-29 18:45:50 +00:00
Ray Chin
fa19a0a614 Bypass Live if there is no HW FE nor SW FE. am: aeaabf3c1f am: 4c41641825 am: 215e28b7e0
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2926211

Change-Id: I2027ce21bce13f0f10b812f332c35caba37f4f1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-26 09:18:07 +00:00
Ray Chin
4c41641825 Bypass Live if there is no HW FE nor SW FE. am: aeaabf3c1f
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2926211

Change-Id: Ib6af8a30193c6dc3fdf9e94292ca78dd7a0d0b93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-26 07:54:16 +00:00
Ray Chin
aeaabf3c1f Bypass Live if there is no HW FE nor SW FE.
Bug: 321774563
Test: atest VtsHalTvTunerTargetTest on cf_x86_tv-userdebug
Change-Id: I801bd81f80e4b15f1e3064ed796951aead087557
2024-01-25 12:26:56 +00:00
sadiqsada
db9c51aaf3 Reenable VTS tests for IPTV
Some of the VTS tests were disabled because they were failing
because of IPTV implmementation. Reenabling them since VTS is
passing with the fixes.

Bug: 288170590
Test: atest VtsHalTvTunerTargetTest
Change-Id: I5863c0e561a059f093fc59eae28826fb17648dfa
2024-01-18 14:05:37 -08:00
sadiqsada
5494506c79 Terminate IPTV read thread on demux close
IPTV reading thread doesn't have a termination condition. This CL
adds a flag mIsIptvReadThreadTerminated which tracks whether the
thread resources should be cleaned up.

Bug: 288170590
Test: atest VtsHalTvTunerTargetTest
Change-Id: I3a19e1045ee67dac2d95457d217adb1375674ed4
2024-01-18 14:04:53 -08:00
sadiqsada
c5707a25f1 Fix tune byte alignment
When reading data from the socket, one byte is read during tuning
and remaining data is read during playback. Since the same streamer
is used for reading data, there is an offset of 1 when tuning is
performed before playback. The extra byte is stored in a buffer
and prepended to the playback buffer.

Bug: 288170590
Test: atest VtsHalTvTunerTargetTest
Change-Id: Ie5d112dbc3c3e3bbb0bb07e60d15ddc26cacaf8c
2024-01-18 14:02:52 -08:00
sadiqsada
cf14e8ca5b mFilterCount cannot be negative
mFilterCount is a reference counter for Filters, and it's decremented
when Filter.stop() is called. Added a check to make sure the value
is not decremented when it's already 0.

Bug: 288170590
Test: atest VtsHalTvTunerTargetTest
Change-Id: I72fe7e5c4babd7e7426d8a52b40887a8c411ce81
2024-01-18 13:58:30 -08:00
sadiqsada
25a0f6fece Refactor plugin interface, streamer creation
Bug: 288170590
Test: atest VtsHalTvTunerTargetTest
Change-Id: Ib141bbb05df8ce17eb5fdb1fed017110fd46a510
2024-01-18 13:58:00 -08:00
sadiqsada
2bc967a9c3 Initialize mFp file pointer to null
Bug: 288170590
Test: atest VtsHalTvTunerTargetTest
Change-Id: Ia1d78e42094073c6cfc7e4e00d65a540d148f02e
2024-01-02 10:50:04 -08:00
Ray Chin
8ef6a81771 Blind scan should be an optional feature based on the design document am: 58be11ecc4
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2890674

Change-Id: I99083d453ebc4e41b46f40abbbf883f254312f3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-26 07:27:41 +00:00
Ray Chin
58be11ecc4 Blind scan should be an optional feature based on the design document
Bug: 317215552
Bug: 305118733
Test: cf_x86_tv-staging-userdebug
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:740a0a8c5ebd0218139aded763fb3204886c2dd0)
Merged-In: Id0153700cfa2c02933c23e13ca1305b0a96b00ca
Change-Id: Id0153700cfa2c02933c23e13ca1305b0a96b00ca

NOTE FOR REVIEWERS - errors occurred while applying the patch.
PLEASE REVIEW CAREFULLY.
Errors:
Error applying patch in tv/tuner/aidl/vts/functional/VtsHalTvTunerTargetTest.cpp, hunk HunkHeader[1258,6->1262,10]: Hunk cannot be applied

Original patch:
 From 740a0a8c5e Mon Sep 17 00:00:00 2001
From: Ray Chin <raychin@google.com>
Date: Fri, 22 Dec 2023 19:10:46 +0800
Subject: [PATCH] Blind scan should be an optional feature based on the design document

Bug: 317215552
Bug: 305118733
Test: cf_x86_tv-staging-userdebug
Change-Id: Id0153700cfa2c02933c23e13ca1305b0a96b00ca
---
2023-12-26 10:28:05 +08:00
Ray Chin
740a0a8c5e Blind scan should be an optional feature based on the design document
Bug: 317215552
Bug: 305118733
Test: cf_x86_tv-staging-userdebug
Change-Id: Id0153700cfa2c02933c23e13ca1305b0a96b00ca
2023-12-25 10:51:50 +08:00
sadiqsada
e36450b213 Add demux to mFrontendTests am: 86aa7010fd am: 6afaf8d190 am: 123934b067 am: 71be20f910 am: d3763ef9fc am: 9477c42cf9
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2886926

Change-Id: Id4db4aebadf2348f29c7dce96938da12508c9809
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-22 01:35:55 +00:00
sadiqsada
aa02c517d3 Add demux to mFrontendTests am: 86aa7010fd am: 6afaf8d190 am: 123934b067 am: 71be20f910
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2886926

Change-Id: Ia4c93f3c45da032e639d97dd2eb8e2b6ecc5bf28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-22 00:32:04 +00:00
sadiqsada
71be20f910 Add demux to mFrontendTests am: 86aa7010fd am: 6afaf8d190 am: 123934b067
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2886926

Change-Id: I7de5829fa3f3fdaa816516ee057546b29af68e2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-21 23:54:34 +00:00
Sadiq Sada
df69b43b12 Merge "Add demux to mFrontendTests" into android14-tests-dev am: f91c15c69e am: 6b983a3723 am: b0c8621858
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2886668

Change-Id: I58a4d763dcd11cd349959b1944bb3b9521323839
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-21 23:54:10 +00:00
sadiqsada
123934b067 Add demux to mFrontendTests am: 86aa7010fd am: 6afaf8d190
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2886926

Change-Id: I915317c40513987417d4e0de332e1205c2115d11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-21 23:20:37 +00:00
Sadiq Sada
e1790b4419 Merge "Add demux to mFrontendTests" into android14-tests-dev am: f91c15c69e
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2886668

Change-Id: I8208255dc67576ec833972f023ffcc9fcfb71e76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-21 22:51:22 +00:00
sadiqsada
6afaf8d190 Add demux to mFrontendTests am: 86aa7010fd
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2886926

Change-Id: I422f6448d26a5e5f2e7915309636503ac92e2c7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-21 22:49:41 +00:00
Sadiq Sada
3e714692a8 Merge "Update VTS cases for IPTV tuning" into main 2023-12-21 22:20:59 +00:00
Sadiq Sada
fe560e6d02 Merge "Add IP Streamer interface" into main 2023-12-21 22:19:02 +00:00
sadiqsada
86aa7010fd Add demux to mFrontendTests
aosp/2640754 adds a tuneFrontend call with testWithDemux enabled.
tuneFrontend() has some logic that calls DvrTests->openDvrInDemux()
which requires mDemux to be available, but mFrontendTests does not
have an associated demux. This CL adds a demux resource.

Bug: 317268814
Test: atest VtsHalTvTunerV1_1TargetTest
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:e7c5595ee5cfe79eb181e60399d8d857526d1af7)
Merged-In: I62ad038829ca3ed0ecc077527197eec444a5eb12
Change-Id: I62ad038829ca3ed0ecc077527197eec444a5eb12
2023-12-20 22:51:16 +00:00
sadiqsada
630a974006 Add demux to mFrontendTests
aosp/2640754 adds a tuneFrontend call with testWithDemux enabled.
tuneFrontend() has some logic that calls DvrTests->openDvrInDemux()
which requires mDemux to be available, but mFrontendTests does not
have an associated demux. This CL adds a demux resource.

Bug: 317268814
Test: atest VtsHalTvTunerTargetTest
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:e75c56787a1a9cd6280ab758788bc810ff50cb58)
Merged-In: I3eb69d8dc10cd2cdbb2d3526317faee2909787f5
Change-Id: I3eb69d8dc10cd2cdbb2d3526317faee2909787f5
2023-12-20 22:14:31 +00:00
Yixiao Luo
cbb2468533 Make sideband stream handle validation configurable
Bug: 311341683
Test: VtsHalTvInputTargetTest
Change-Id: I3f4319793039cc1dce39ce4e6a31f4c5abdbb7e0
2023-12-14 14:50:21 -08:00
Treehugger Robot
fad991542b Merge "HDMI Connection Fuzzer Fix" into main am: 3d3dab4875 am: c542085763 am: fef2bd5bad
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2864471

Change-Id: I428f5c41b4e4dc819bd7f023d4f4c78df8863555
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-12 13:46:02 +00:00
Sham Rathod
d0a67fada3 HDMI Connection Fuzzer Fix
Added explicit destructor to HdmiConnectionMock that stops the loop and
join the thread.

Bug: 300674264
Test: android.hardware.tv.hdmi.connection-service_fuzzer
Change-Id: I761ed4b8db5e5312535ecf99be3b490622bf0a8e
2023-12-08 16:37:09 +05:30
Treehugger Robot
1526a0bda5 Merge "CEC Fuzzer Fix" into main am: db3d24bb3f am: 3037d5f57a am: c6e0f40051
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2766489

Change-Id: I0b6a3597a87f1de4f7115e5ae5be271d3eef6a5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-04 06:15:49 +00:00
Venkatarama Avadhani
e017878151 CEC Fuzzer Fix
Ensure that the mock CEC exits cleanly when the service that created it
dies.

Bug: 293249165
Test: android.hardware.tv.hdmi.cec-service_fuzzer

Change-Id: Ic7b69ddb10414cbdf6570056144b8013f497e7dc
2023-11-30 16:37:32 +05:30
Sadiq Sada
78bc62c3d7 Merge "Initialize new Frontend params as nullptr" into main 2023-11-17 21:33:44 +00:00
sadiqsada
59a40429b6 Initialize new Frontend params as nullptr
Bug: 288170590
Test: m
Change-Id: Ic5fdf73d5221f2a04232f3820cbf84fb31c135e4
2023-11-10 14:49:46 -08:00
sadiqsada
7a19139503 Update VTS cases for IPTV tuning
IPTV tuning relies on a socket streaming TS data. This CL uses
the interface defined in IpStreamer to test whether TS data
is availble on a socket, and decides to send LOCKED event based
on the result.

Bug: 288170590
Test: atest VtsHalTvTunerTargetTest
Change-Id: I79c933458f01f18d35e85c53f67f3c1d3d21dbce
2023-11-08 23:06:55 +00:00
sadiqsada
6c3ed373a0 Add IP Streamer interface
This interface is used to push TS data from a socket to test IPTV
frontend.

Bug: 288170590
Test: atest VtsHalTvTunerTargetTest
Change-Id: I95f0f74cb6bb9b73c9584d335b52937ab56830e1
2023-11-08 23:05:07 +00:00
sadiqsada
94eddcf3ce Handle IPTV tuning read error
bytes_read will be -1 if recv_from() fails to capture data from
the udp socket.

Bug: 288170590
Test: atest VtsHalTvTunerTargetTest
Change-Id: I7f3c4789d2631c5add8dff778e2155b7e95a3ffc
2023-11-08 23:03:33 +00:00
sadiqsada
028f27618d Demux thread reads data after filter start
Demux thread should read socket data only when there are active
filters reading data. When a filter is started, the reading
thread on the demux is notified of the active filter, and it
starts reading data. When the last filter is stoped, the thread
is notified and it stops reading data.

Bug: 288170590
Test: manual
Change-Id: Idd380bc0d86c445ce9faef8e445d636bbe4e91fc
2023-11-08 22:36:56 +00:00
sadiqsada
08cae81678 Add reference counter for Filter
Filters should start demux reading thread for IPTV when start()
is called and they should PAUSE the thread when stop() is called.
They should only be paused when all associated filters of the
demux are closed. This CL adds reference counters for filters to
track that.

Bug: 288170590
Test: manual
Change-Id: I087175a685a4559918ceaa511971b79e7fcb0a51
2023-11-08 22:36:45 +00:00
sadiqsada
52b7f34ad7 Send DVR FMQ Status back to Filter
Events about how full DVR FMQ is should be sent back to Filter.

Bug: 288170590
Test: manual
Change-Id: Id87c652f0f92f8d7afed072eb7415af7ce48b0c4
2023-11-08 22:36:28 +00:00
sadiqsada
56c98294a2 Add IPTV default implementation
Frontend::tune(): create a streamer using plugin interface to
read a byte and return LOCKED event if byte is read

Demux::setFrontendDataSource():open a new stream to read data
from the socket and push the data read to DVR FMQ.

Test: atest VtsHalTvTunerTargetTest
Bug: 288170590
Change-Id: Iaf2eae7b4dc9e7d69b1f7b3a367d24f6acdd68be
2023-11-02 16:45:31 -07:00
Lyn Han
51cc83a7b1 Merge "Revert "Add IPTV default implementation"" into main 2023-11-02 23:40:12 +00:00
Sadiq Sada
6c46c89a33 Revert "Add IPTV default implementation"
This reverts commit 1f3f0ac11c.

Reason for revert: build failure https://android-build.corp.google.com/build_explorer/branch_dashboard/git_main/build_id/11044788/ quarterdeck https://android-build.corp.google.com/builds/quarterdeck?branch=git_main-without-vendor&target=aosp_x86_64-trunk_staging-userdebug&lkgb=11044124&lkbb=11044818&fkbb=11044818

Bug: 309021506
Change-Id: I27c938017785e8a5ee4f8aa708b4e0f6ab448420
2023-11-02 23:38:06 +00:00
Sadiq Sada
f82af0c6c1 Merge "Add IPTV default implementation" into main 2023-11-02 22:29:36 +00:00
Henry Fang
b7e63bc6ea Merge "Add fix vts fail when configureMonitorEvent" into android14-tests-dev am: 7bb2ce9795 am: 0804e9f8b2 am: 2f1b872b1c am: 80ac05a2a0
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2807334

Change-Id: I1faf8fa444ee4b34f823046059aa1bc6569971eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-01 02:46:22 +00:00
Henry Fang
0804e9f8b2 Merge "Add fix vts fail when configureMonitorEvent" into android14-tests-dev am: 7bb2ce9795
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2807334

Change-Id: I6cf77e7655b3ee02514743610be2b285cf7bde35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-01 01:03:26 +00:00