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

Merge "Deprecate int getFecCapability() and add long getCodeRateCapability() instead"

Browse Source
This commit is contained in:
Amy Zhang
2020-11-10 18:15:31 +00:00
committed by Android (Google) Code Review
parent 0af12be72d fa7d53ccff
commit bc7a75b738
4 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
api/system-current.txt
View File

@@ -5811,7 +5811,8 @@ package android.media.tv.tuner.frontend {
public class DvbcFrontendCapabilities extends android.media.tv.tuner.frontend.FrontendCapabilities {
method public int getAnnexCapability();
method public int getFecCapability();
method public long getCodeRateCapability();
method @Deprecated public int getFecCapability();
method public int getModulationCapability();
}

3
core/api/system-current.txt
View File

@@ -5751,7 +5751,8 @@ package android.media.tv.tuner.frontend {
public class DvbcFrontendCapabilities extends android.media.tv.tuner.frontend.FrontendCapabilities {
method public int getAnnexCapability();
method public int getFecCapability();
method public long getCodeRateCapability();
method @Deprecated public int getFecCapability();
method public int getModulationCapability();
}

19
media/java/android/media/tv/tuner/frontend/DvbcFrontendCapabilities.java
View File

@@ -26,10 +26,10 @@ import android.annotation.SystemApi;
@SystemApi
public class DvbcFrontendCapabilities extends FrontendCapabilities {
private final int mModulationCap;
private final int mFecCap;
private final long mFecCap;
private final int mAnnexCap;
private DvbcFrontendCapabilities(int modulationCap, int fecCap, int annexCap) {
private DvbcFrontendCapabilities(int modulationCap, long fecCap, int annexCap) {
mModulationCap = modulationCap;
mFecCap = fecCap;
mAnnexCap = annexCap;
@@ -44,9 +44,24 @@ public class DvbcFrontendCapabilities extends FrontendCapabilities {
}
/**
* Gets inner FEC capability.
*
* @deprecated Use {@link getInnerFecCapability()} with long return value instead. This function
* returns the correct cap value when the value is not bigger than the max integer
* value. Otherwise it returns {@link FrontendSettings#FEC_UNDEFINED}.
*/
@Deprecated
@FrontendSettings.InnerFec
public int getFecCapability() {
if (mFecCap > Integer.MAX_VALUE) {
return (int) FrontendSettings.FEC_UNDEFINED;
}
return (int) mFecCap;
}
/**
* Gets code rate capability.
*/
@FrontendSettings.InnerFec
public long getCodeRateCapability() {
return mFecCap;
}
/**

4
media/jni/android_media_tv_Tuner.cpp
View File

@@ -1242,10 +1242,10 @@ jobject JTuner::getAtscFrontendCaps(JNIEnv *env, FrontendInfo::FrontendCapabilit
jobject JTuner::getDvbcFrontendCaps(JNIEnv *env, FrontendInfo::FrontendCapabilities& caps) {
jclass clazz = env->FindClass("android/media/tv/tuner/frontend/DvbcFrontendCapabilities");
jmethodID capsInit = env->GetMethodID(clazz, "<init>", "(III)V");
jmethodID capsInit = env->GetMethodID(clazz, "<init>", "(IJI)V");
jint modulationCap = caps.dvbcCaps().modulationCap;
jint fecCap = caps.dvbcCaps().fecCap;
jlong fecCap = caps.dvbcCaps().fecCap;
jint annexCap = caps.dvbcCaps().annexCap;
return env->NewObject(clazz, capsInit, modulationCap, fecCap, annexCap);