Commit graph

638 commits

Author SHA1 Message Date
TreeHugger Robot
d709be7d8c Merge "Add blindScan condition to blindScan test" 2021-11-16 20:03:56 +00:00
ming.lo
d4c22d8e55 Add blindScan condition to blindScan test
Bug: 203389496
Test: Tested by partners
Change-Id: If44df620ab90b5b0247fbee15e2b2a57e27683b5
2021-11-16 10:53:38 -08:00
Hongguang
ad63be13cf Restart media.tuner when tuner HAL is restarted.
Bug: 206042321
Test: Kill tuner HAL and check media.tuner
Change-Id: I527a5b517042494140af9d6e0e671d07f996ff78
2021-11-13 00:15:45 +00:00
Hongguang
3d17d7d5b4 Flush events before stopping filter.
All the filter events in scheduler should be cleaned before stopping.
Sending events after stopping may cause problems if frameworks has
release some references.

Bug: 205763272
Test: atest VtsHalTvTunerTargetTest
Test: atest android.media.tv.tuner.cts
Change-Id: I2d3875b348035e14314034ff90aa8c066108affe
2021-11-11 14:20:29 -08:00
TreeHugger Robot
dd8ae189ce Merge "add note to FilterDelayHint" 2021-11-08 16:46:23 +00:00
Patrick Rohr
7ddf1046cc clean up notification of FilterCallbackScheduler when stopping
I am adding two minor tweaks to change
I2b9d45fa7df3f2490893cc24d98c0e0baaaf0c2c which notifies the condition
variable when trying to join the thread:
    1. the mutex lock does not need to be held to notify the condition
    variable.
    2. adding isRunning check to existing if condition in
    threadLoopOnce to condense the code.

Bug: 183057734
Test: atest android.media.tv.tuner.cts
Change-Id: Ia35e645bddd5005218e8e017a22b87b349997658
2021-11-08 14:41:00 +00:00
Patrick Rohr
0d3ff43405 add note to FilterDelayHint
FilterDelayHints are not supported for media events.

Bug: 183057734
Test: TreeHugger
Change-Id: I71cf3dd23c864e6aac2f350bea1d597e93753d82
2021-11-05 10:17:32 +01:00
Hongguang
74bc43bdc2 Notify FilterCallbackScheduler to wake up it while stopping.
Bug: 183057734
Test: atest android.media.tv.tuner.cts
Change-Id: I2b9d45fa7df3f2490893cc24d98c0e0baaaf0c2c
2021-11-05 00:02:36 +00:00
Hongguang Chen
bdd3958912 Merge "Add ISDB-T Multi-Layer Support." 2021-11-04 21:29:23 +00:00
TreeHugger Robot
05c7eced95 Merge changes I03f744b2,I154eb05b
* changes:
  remove dead code from FilterTests
  add filter delay hint default implementation
2021-11-04 17:42:46 +00:00
Patrick Rohr
1030b6dcdc remove dead code from FilterTests
Test: atest VtsHalTvTunerTargetTest
Change-Id: I03f744b28367fa5cd8850f1f721bd1c73b5c77e5
2021-11-04 15:43:32 +01:00
Patrick Rohr
1ac8d4a6df add filter delay hint default implementation
Adds a event buffering / scheduling mechanism that is configured using
the delay hint.

Bug: 183057734
Test: atest VtsHalTvTunerTargetTest
Change-Id: I154eb05bc419f827008161f85a6304a8599dc399
2021-11-04 15:43:32 +01:00
Hongguang
788284fb57 Add ISDB-T Multi-Layer Support.
Because ISDB-T has up to three layers
(1) It is necessary to be able to obtain the hierarchical structure and
information of each hierarchy by getFrontendStatus. Various transmission
parameters, partial reception flags, error states at each level, etc.
(2) It is necessary to be able to set the transmission parameters of
each layer at the time of request. Various transmission parameters and
partial reception flags.

Bug: 171537116
Test: atest VtsHalTvTunerTargetTest
Test: atest android.media.tv.tuner.cts
Change-Id: I9a4b2296b83d97dcea5806f464ccf50885829f76
2021-11-02 14:45:12 -07:00
Nathalie Le Clair
e8e607e7f9 Merge "CEC: Add support for multiple ports to default HdmiCec" am: 63a8152f8e am: bfd12e9bf5 am: db777a32de am: 482a869a8e am: bed065db43
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1773889

Change-Id: I0c328b758fcdb2f3cddb5789b446a5125d772f10
2021-11-02 18:26:21 +00:00
Nathalie Le Clair
031bdef8a5 Merge "CEC: Add implementation of SYSTEM_CEC_CONTROL option to default HdmiCec" am: 3f3e91faa9 am: abb6a8067b am: 1296b84014 am: 0a3de30dce am: a1803dbd83
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1772433

Change-Id: I0930b639e0bd0360ee969d9a44059fd832315038
2021-11-02 18:26:04 +00:00
Nathalie Le Clair
a0ba3a5b66 Merge "CEC: Refactor HdmiCecDefault class" am: a2b3a8ffca am: 4e169ac218 am: 9dcb8e29b4 am: 23c5235371 am: 936af16a1a
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1833914

Change-Id: I6094e3389b2451266b9af688433868d906676481
2021-11-02 18:24:55 +00:00
Nathalie Le Clair
db777a32de Merge "CEC: Add support for multiple ports to default HdmiCec" am: 63a8152f8e am: bfd12e9bf5
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1773889

Change-Id: I66714a05753aeea2f2fcc17c5605f387c6662947
2021-11-02 17:48:22 +00:00
Nathalie Le Clair
1296b84014 Merge "CEC: Add implementation of SYSTEM_CEC_CONTROL option to default HdmiCec" am: 3f3e91faa9 am: abb6a8067b
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1772433

Change-Id: Id140ea6b62689eb8cac5d5f3822aa6ea31b7ddf5
2021-11-02 17:48:14 +00:00
Nathalie Le Clair
9dcb8e29b4 Merge "CEC: Refactor HdmiCecDefault class" am: a2b3a8ffca am: 4e169ac218
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1833914

Change-Id: I2bcfdc24141142657b6e1a2694f6069797223239
2021-11-02 17:48:00 +00:00
Patrick Rohr
6a4e929c1c add filter delay hint
Test: TreeHugger
Bug: 183057734
Change-Id: Ifcff75b0d46661678bce79d5587c898a2348c2dc
2021-10-28 19:45:43 +02:00
Gareth Fenn
53ae3838d5 Fix TunerHAL deadlock issue
testRecordOutput() holds msgLock preventing record thread from progressing
  Calls to stopRecordThread() block forever
  Therefore remove the calls to stopRecordThread()
Fix mDataOutputBuffer copy size
Fix getCiCamInfo config

Bug: 201556155
Test: VtsHalTvTunerV1_{0,1}TargetTest on BCM device
Signed-off-by: Pierre Couillaud <pierre@broadcom.com>
Change-Id: I7faeed032281b58fdc3361f297cb541491c4049d
2021-10-19 12:37:43 -07:00
Gareth Fenn
282fb370ab TunerHAL fixes
TunerHAL expects Hz
Fix stopRecordThread race
Push segment000000.ts to device
getFrontendIdByType() should return INVALID_ID when no FE found

Bug: 201556155
Test: VtsHalTvTunerV1_{0,1}TargetTest on BCM device
Change-Id: Idab6817e47f3e10f07a36a8b2fd805336b9f0e5d
Signed-off-by: Pierre Couillaud <pierre@broadcom.com>
2021-10-19 12:34:22 -07:00
Shraddha Basantwani
65165d5b94 CEC: Add support for multiple ports to default HdmiCec
Bug: 185434120
Test: manual
Change-Id: I4e1a1f2ff7cb4530e8b223169d8efd452412089b
2021-10-19 11:11:50 +05:30
Shraddha Basantwani
9fb5e8232e CEC: Add implementation of SYSTEM_CEC_CONTROL option to default HdmiCec
SYSTEM_CEC_CONTROL is updated when system goes into or comes out of
standby mode.
When set to true, Android system is handling CEC commands.
When set to false, microprocessor is handling CEC commands.

Bug: 185434120
Test: manual
Change-Id: I0fbb13a65639508634c6c163b5eaed1885f9e127
2021-10-18 18:12:37 +05:30
Shraddha Basantwani
dedd40e3e8 CEC: Refactor HdmiCecDefault class
Use class member variables instead of global variables
Remove struct keyword since it is redundant
Replace property_get_int32 usage with libbase API

Bug: 185434120
Test: manual
Change-Id: Ide477efd0f1d65bb684993aff783447adbe43aed
2021-10-18 18:12:36 +05:30
Hongguang
76ca9a880e Stop current tuning before starting a new tuning.
If a new tuning request comes before stop old tuning, there is race
condition that the Frontend loop thread may crash while terminate().

Bug: 202335601
Fix: 202335601
Test: atest android.media.tv.tuner.cts
Change-Id: Ic168b585f0a8fe36bd8eeceee3e0b4c83d5388aa
2021-10-07 12:43:58 -07:00
Pierre Couillaud
626bb861e7 Fix closure of record thread am: f8a4e2ae3a am: 13a2db008e
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/15698544

Change-Id: Iaa9df7ee2817296bd3a4b11c659cc07d01504b4d
2021-09-15 23:07:13 +00:00
Pierre Couillaud
f8a4e2ae3a Fix closure of record thread
Bug: 197763854
Fix: 197763854
Change-Id: I8c3e843ddac6ad77aecaca7c91f0884204145ee6
2021-09-15 17:49:00 +00:00
Treehugger Robot
bef23cceeb Merge "Adding OWNERS for CEC HAL" am: 52f4717d0e
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1816196

Change-Id: Icc18218ba1422e956a4ed039939ad1359092e544
2021-09-06 12:13:11 +00:00
Nathalie Le Clair
4fc4870973 Adding OWNERS for CEC HAL
Bug: 185434120
Test: none

Change-Id: Ie475d581a7e703f9f82a7afb9188c9a2c789189b
Merged-In: Ie475d581a7e703f9f82a7afb9188c9a2c789189b
2021-09-01 15:50:00 +00:00
Pierre Couillaud
d73352eab9 Fix closure of record thread
Bug: 197763854
Fix: 197763854
Change-Id: I8c3e843ddac6ad77aecaca7c91f0884204145ee6
2021-08-27 17:18:20 -07:00
Hongguang
901aa7b754 Refine tuner aidl hal threads.
Bug: 197763854
Test: VtsHalTvTunerTargetTest
Test: atest android.media.tv.tuner.cts
Test: sampletunertvinput
Change-Id: Id707438178ed93731919f0155cab805436147f86
2021-08-26 13:07:09 -07:00
Hongguang
11da2cb5f7 Adjust tuner default implementation and VTS types size.
Bug: 195693712
Test: atest VtsHalTvTunerTargetTest
Test: atest android.media.tv.tuner.cts
Change-Id: Ie9d20c74b05ecc10333ca883fe38d26d78f33949
2021-08-16 17:33:24 -07:00
Hongguang
22122b3014 Adjust some tuner aidl types size to align with frameworks.
Bug: 195693712
Test: atest VtsHalTvTunerTargetTest
Change-Id: Ia558614759928579bda7dd8e88f5e3fb538bf412
2021-08-16 16:32:33 -07:00
Hongguang Chen
ff2c6b0d85 Add init() to avoid crash when creating ref in constructor.
This reverts commit 50899fb269.

Bug: 195717690
Fix: 195717690
Test: atest VtsHalTvTunerTargetTest
Change-Id: Icae435f1166e6cf2e2f235979e3d1d37d182d517
2021-08-09 15:41:50 -07:00
Hongguang
50899fb269 Fix tuner example crash.
Bug: 195717690
Fix: 195717690
Test: atest VtsHalTvTunerTargetTest
Change-Id: Ie1ac0f12f9802ac55f1e35ff8dc7c0c34ccce086
2021-08-06 06:26:33 +00:00
Jiyong Park
1519b41bdd Merge "Remove ndk_platform backend. Use the ndk backend." 2021-08-05 13:51:02 +00:00
Hongguang
278bb563bc Cast packetSize to uint8_t before using.
packetSize is int8_t on AIDL HAL, but packet size may be longer than
128, which will cause a HAL crash.

Bug: 191825295
Test: atest android.media.tv.tuner.cts
Test: atest VtsHalTvTunerTargetTest
Change-Id: I9ee52d3cacab40e69f5f01dbe51c397fa09bfea0
2021-08-04 15:00:17 -07:00
TreeHugger Robot
b728aeb3b2 Merge changes from topic "tuner_aidl_isdbt_update"
* changes:
  Update tuner AIDL default implementation.
  Fix a typo in ISDBT Frontend.
2021-08-04 18:10:19 +00:00
Jiyong Park
c426c6dbdc Remove ndk_platform backend. Use the ndk backend.
The ndk_platform backend will soon be deprecated because the ndk backend
can serve the same purpose. This is to eliminate the confusion about
having two variants (ndk and ndk_platform) for the same ndk backend.

Bug: 161456198
Test: m
Change-Id: I0652f1efe920111d79dd8c2ecd52e55dda54538f
2021-08-04 12:48:07 +09:00
Lu Chen
79129882f8 Merge "Make a few function parameters to be reference" 2021-08-04 01:52:11 +00:00
Hongguang
e69a3b29e7 Update tuner AIDL default implementation.
*) Fix ISDBT Frontend in the default implementation.
*) Merge ag/15455889.

Bug: 191825295
Test: atest VtsHalTvTunerTargetTest
Change-Id: I70029cfc856aadcdfda0d3c3a1eb1a80f9674e25
2021-08-03 17:50:52 -07:00
Hongguang
5fc72a6379 Fix a typo in ISDBT Frontend.
FrontendIsdbtCoderate and FrontendIsdbtGuardInterval are typedefs in
HIDL HAL. The hidl2aidl tool used the original types in the parcelable
while conversion. And the wrong comment on FrontendIsdbtCoderate was
herited from HIDL too.

Bug: 191825295
Test: atest VtsHalTvTunerTargetTest
Change-Id: I44679e171b353010e9ea9cdd84b09a715459b4e7
2021-08-03 17:50:10 -07:00
Lu Chen
fdf37fc742 Make a few function parameters to be reference
To avoid redundant copies of input data, const reference is used.

Note that there is a behavior change when calling
createMediaFilterEventWithIon: the output buffer will be cleared even if
the operation fails to unblock future calls.

Test: vts-tradefed run vts -m VtsHalTvTunerV1_1TargetTest
Change-Id: Ib26f90930d288738c5b55843e2aecde5318c3786
2021-08-03 16:07:02 -07:00
Hongguang
ce1e30d578 Update tuner default implementation and VTS.
*) DemuxFilterTypeDemuxFilterSubType -> DemuxFilterSubType.

Bug: 191825295
Test: make and run VtsHalTvTunerTargetTest
Change-Id: I9069ff91d35b58ee1db4297f888ef241cdfbc135
2021-08-03 08:57:32 -07:00
Hongguang
e24a0dce53 Update tuner AIDL HAL.
*) Remove unused FrontendDtmbCapabilities from ITuner.
*) DemuxFilterTypeDemuxFilterSubType -> DemuxFilterSubType.

Bug: 191825295
Test: make and run VtsHalTvTunerTargetTest
Change-Id: I79cb58d3eff559d381a6cf13711250330d2066b1
2021-08-03 08:57:02 -07:00
Hongguang
e423acd4b5 Update tuner default AIDL HAL.
*) Use tuner AIDL HAL return values.
*) Replace mTunerService with mTuner to avoid confusing.
*) Merge other HIDL HAL changes.
   *) ag/15371813, ag/15371814 and ag/15371815.

Bug: 191825295
Test: make and run VtsHalTvTunerTargetTest
Change-Id: Ibbf94c4fc36c3bda94a7e0f3e0697c83ac414d0e
2021-07-28 19:33:47 -07:00
Hongguang
84d45ee992 Add Tuner AIDL error codes to align with HIDL.
Aidl will return these error codes as service specific errors in
EX_SERVICE_SPECIFIC.

Bug: 191825295
Test: make and run VtsHalTvTunerTargetTest
Change-Id: Ib27300229e30f40bd779188083f1db309dec89e4
2021-07-28 18:34:49 -07:00
Patrick Rohr
7d34149e8a Merge changes I388fc2b8,I639e8314
* changes:
  Remove Unused Function Declarations from DVR Default Implementation
  Clean Up Playback Thread in DVR Test Implementation
2021-07-27 06:55:32 +00:00
TreeHugger Robot
3884b0f221 Merge "Remove Unused Member from Default Impl" 2021-07-27 01:25:57 +00:00