Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use char16_t instead of int in FilterClient to pass 16-bit data defined in TunerHAL" into sc-dev

Browse Source
This commit is contained in:
Amy Zhang
2021-04-20 17:04:52 +00:00
committed by Android (Google) Code Review
parent fae5e14059 e17fcccb1c
commit 9e0575aa07
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
media/jni/tuner/FrontendClient.cpp
View File

@@ -982,7 +982,7 @@ TunerFrontendAtsc3Settings FrontendClient::getAidlAtsc3Settings(const FrontendSe
TunerFrontendIsdbsSettings FrontendClient::getAidlIsdbsSettings(const FrontendSettings& settings) {
TunerFrontendIsdbsSettings isdbsSettings{
.frequency = (int)settings.isdbs().frequency,
.streamId = (int)settings.isdbs().streamId,
.streamId = (char16_t)settings.isdbs().streamId,
.streamIdType = (int)settings.isdbs().streamIdType,
.modulation = (int)settings.isdbs().modulation,
.codeRate = (int)settings.isdbs().coderate,
@@ -996,7 +996,7 @@ TunerFrontendIsdbs3Settings FrontendClient::getAidlIsdbs3Settings(
const FrontendSettings& settings) {
TunerFrontendIsdbs3Settings isdbs3Settings{
.frequency = (int)settings.isdbs3().frequency,
.streamId = (int)settings.isdbs3().streamId,
.streamId = (char16_t)settings.isdbs3().streamId,
.streamIdType = (int)settings.isdbs3().streamIdType,
.modulation = (int)settings.isdbs3().modulation,
.codeRate = (int)settings.isdbs3().coderate,