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

Merge "Rename NumberOfSegment to NumberOfSegments."

Browse Source
This commit is contained in:
TreeHugger Robot
2021-12-07 08:47:51 +00:00
committed by Android (Google) Code Review
parent d8f5f3bb4f 08af0322f0
commit ae2a751c56
3 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7589,7 +7589,7 @@ package android.media.tv.tuner.frontend {
method @NonNull public static android.media.tv.tuner.frontend.IsdbtFrontendSettings.IsdbtLayerSettings.Builder builder();
method public int getCodeRate();
method public int getModulation();
method @IntRange(from=0, to=255) public int getNumberOfSegment();
method @IntRange(from=0, to=255) public int getNumberOfSegments();
method public int getTimeInterleaveMode();
}
@@ -7597,7 +7597,7 @@ package android.media.tv.tuner.frontend {
method @NonNull public android.media.tv.tuner.frontend.IsdbtFrontendSettings.IsdbtLayerSettings build();
method @NonNull public android.media.tv.tuner.frontend.IsdbtFrontendSettings.IsdbtLayerSettings.Builder setCodeRate(int);
method @NonNull public android.media.tv.tuner.frontend.IsdbtFrontendSettings.IsdbtLayerSettings.Builder setModulation(int);
method @IntRange(from=0, to=255) @NonNull public android.media.tv.tuner.frontend.IsdbtFrontendSettings.IsdbtLayerSettings.Builder setNumberOfSegment(int);
method @IntRange(from=0, to=255) @NonNull public android.media.tv.tuner.frontend.IsdbtFrontendSettings.IsdbtLayerSettings.Builder setNumberOfSegments(int);
method @NonNull public android.media.tv.tuner.frontend.IsdbtFrontendSettings.IsdbtLayerSettings.Builder setTimeInterleaveMode(int);
}

22
media/java/android/media/tv/tuner/frontend/IsdbtFrontendSettings.java
View File

@@ -546,14 +546,14 @@ public class IsdbtFrontendSettings extends FrontendSettings {
private final int mModulation;
private final int mTimeInterleaveMode;
private final int mCodeRate;
private final int mNumOfSegment;
private final int mNumOfSegments;
private IsdbtLayerSettings(
int modulation, int timeInterleaveMode, int codeRate, int numOfSegment) {
int modulation, int timeInterleaveMode, int codeRate, int numOfSegments) {
mModulation = modulation;
mTimeInterleaveMode = timeInterleaveMode;
mCodeRate = codeRate;
mNumOfSegment = numOfSegment;
mNumOfSegments = numOfSegments;
}
/**
@@ -578,11 +578,11 @@ public class IsdbtFrontendSettings extends FrontendSettings {
return mCodeRate;
}
/**
* Gets Number of Segment.
* Gets Number of Segments.
*/
@IntRange(from = 0, to = 0xff)
public int getNumberOfSegment() {
return mNumOfSegment;
public int getNumberOfSegments() {
return mNumOfSegments;
}
/**
@@ -600,7 +600,7 @@ public class IsdbtFrontendSettings extends FrontendSettings {
private int mModulation = MODULATION_UNDEFINED;
private int mTimeInterleaveMode = TIME_INTERLEAVE_MODE_UNDEFINED;
private int mCodeRate = DvbtFrontendSettings.CODERATE_UNDEFINED;
private int mNumOfSegment = 0;
private int mNumOfSegments = 0;
private Builder() {}
@@ -633,14 +633,14 @@ public class IsdbtFrontendSettings extends FrontendSettings {
return this;
}
/**
* Sets number of segment.
* Sets number of segments.
*
* <p>Default value is 0.
*/
@NonNull
@IntRange(from = 0, to = 0xff)
public Builder setNumberOfSegment(int numOfSegment) {
mNumOfSegment = numOfSegment;
public Builder setNumberOfSegments(int numOfSegments) {
mNumOfSegments = numOfSegments;
return this;
}
@@ -650,7 +650,7 @@ public class IsdbtFrontendSettings extends FrontendSettings {
@NonNull
public IsdbtLayerSettings build() {
return new IsdbtLayerSettings(
mModulation, mTimeInterleaveMode, mCodeRate, mNumOfSegment);
mModulation, mTimeInterleaveMode, mCodeRate, mNumOfSegments);
}
}
}

2
media/jni/android_media_tv_Tuner.cpp
View File

@@ -2961,7 +2961,7 @@ static FrontendSettings getIsdbtFrontendSettings(JNIEnv *env, const jobject& set
frontendIsdbtSettings.layerSettings[i].coderate = static_cast<FrontendIsdbtCoderate>(
env->GetIntField(layer, env->GetFieldID(layerClazz, "mCodeRate", "I")));
frontendIsdbtSettings.layerSettings[i].numOfSegment =
env->GetIntField(layer, env->GetFieldID(layerClazz, "mNumOfSegment", "I"));
env->GetIntField(layer, env->GetFieldID(layerClazz, "mNumOfSegments", "I"));
}
frontendSettings.set<FrontendSettings::Tag::isdbt>(frontendIsdbtSettings);