Skip to content

SDK / exoplayer

Go to a project
Commit c7350f36 by samrobinson Committed by tonihei
Options

Remove PCM encoding from ExportResult. 

PCM encoding is a property of decoded audio, however Transformer does
not output decoded audio.

PiperOrigin-RevId: 515580886
parent c109e396
Inline Side-by-side
Showing with 1 additions and 42 deletions
library/transformer/src/androidTest/java/com/google/android/exoplayer2/transformer/ExportTestResult.java
......@@ -20,7 +20,6 @@ import static com.google.android.exoplayer2.transformer.AndroidTestUtil.processe
import androidx.annotation.Nullable;
import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.Format;
import com.google.errorprone.annotations.CanIgnoreReturnValue;
import org.json.JSONException;
import org.json.JSONObject;
......@@ -191,9 +190,6 @@ public class ExportTestResult {
if (exportResult.height != C.LENGTH_UNSET) {
jsonObject.put("height", exportResult.height);
}
if (exportResult.pcmEncoding != Format.NO_VALUE) {
jsonObject.put("pcmEncoding", exportResult.pcmEncoding);
}
if (exportResult.sampleRate != C.RATE_UNSET_INT) {
jsonObject.put("sampleRate", exportResult.sampleRate);
}
......
library/transformer/src/main/java/com/google/android/exoplayer2/transformer/ExportResult.java
......@@ -19,7 +19,6 @@ import static com.google.android.exoplayer2.util.Assertions.checkArgument;
import androidx.annotation.Nullable;
import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.Format;
import com.google.android.exoplayer2.MediaItem;
import com.google.android.exoplayer2.video.ColorInfo;
import com.google.common.collect.ImmutableList;
......@@ -36,7 +35,6 @@ public final class ExportResult {
private long fileSizeBytes;
private int averageAudioBitrate;
private int channelCount;
private @C.PcmEncoding int pcmEncoding;
private int sampleRate;
@Nullable private String audioEncoderName;
private int averageVideoBitrate;
......@@ -54,7 +52,6 @@ public final class ExportResult {
fileSizeBytes = C.LENGTH_UNSET;
averageAudioBitrate = C.RATE_UNSET_INT;
channelCount = C.LENGTH_UNSET;
pcmEncoding = Format.NO_VALUE;
sampleRate = C.RATE_UNSET_INT;
averageVideoBitrate = C.RATE_UNSET_INT;
height = C.LENGTH_UNSET;
......@@ -116,13 +113,6 @@ public final class ExportResult {
return this;
}
/** Sets the {@link C.PcmEncoding}. */
@CanIgnoreReturnValue
public Builder setPcmEncoding(@C.PcmEncoding int pcmEncoding) {
this.pcmEncoding = pcmEncoding;
return this;
}
/**
* Sets the sample rate.
*
......@@ -219,7 +209,6 @@ public final class ExportResult {
fileSizeBytes,
averageAudioBitrate,
channelCount,
pcmEncoding,
sampleRate,
audioEncoderName,
averageVideoBitrate,
......@@ -270,8 +259,6 @@ public final class ExportResult {
public final int averageAudioBitrate;
/** The channel count of the audio, or {@link C#LENGTH_UNSET} if unset or unknown. */
public final int channelCount;
/** The {@link C.PcmEncoding} of the audio, or {@link Format#NO_VALUE} if unset or unknown. */
public final @C.PcmEncoding int pcmEncoding;
/** The sample rate of the audio, or {@link C#RATE_UNSET_INT} if unset or unknown. */
public final int sampleRate;
/** The name of the audio encoder used, or {@code null} if none were used. */
......@@ -304,7 +291,6 @@ public final class ExportResult {
long fileSizeBytes,
int averageAudioBitrate,
int channelCount,
@C.PcmEncoding int pcmEncoding,
int sampleRate,
@Nullable String audioEncoderName,
int averageVideoBitrate,
......@@ -319,7 +305,6 @@ public final class ExportResult {
this.fileSizeBytes = fileSizeBytes;
this.averageAudioBitrate = averageAudioBitrate;
this.channelCount = channelCount;
this.pcmEncoding = pcmEncoding;
this.sampleRate = sampleRate;
this.audioEncoderName = audioEncoderName;
this.averageVideoBitrate = averageVideoBitrate;
......@@ -338,7 +323,6 @@ public final class ExportResult {
.setFileSizeBytes(fileSizeBytes)
.setAverageAudioBitrate(averageAudioBitrate)
.setChannelCount(channelCount)
.setPcmEncoding(pcmEncoding)
.setSampleRate(sampleRate)
.setAudioEncoderName(audioEncoderName)
.setAverageVideoBitrate(averageVideoBitrate)
......@@ -364,7 +348,6 @@ public final class ExportResult {
&& fileSizeBytes == result.fileSizeBytes
&& averageAudioBitrate == result.averageAudioBitrate
&& channelCount == result.channelCount
&& pcmEncoding == result.pcmEncoding
&& sampleRate == result.sampleRate
&& Objects.equals(audioEncoderName, result.audioEncoderName)
&& averageVideoBitrate == result.averageVideoBitrate
......@@ -383,7 +366,6 @@ public final class ExportResult {
result = 31 * result + (int) fileSizeBytes;
result = 31 * result + averageAudioBitrate;
result = 31 * result + channelCount;
result = 31 * result + pcmEncoding;
result = 31 * result + sampleRate;
result = 31 * result + Objects.hashCode(audioEncoderName);
result = 31 * result + averageVideoBitrate;
......
library/transformer/src/main/java/com/google/android/exoplayer2/transformer/TransformationResult.java
......@@ -19,7 +19,6 @@ import static com.google.android.exoplayer2.util.Assertions.checkArgument;
import androidx.annotation.Nullable;
import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.Format;
import com.google.android.exoplayer2.MediaItem;
import com.google.android.exoplayer2.video.ColorInfo;
import com.google.common.collect.ImmutableList;
......@@ -42,7 +41,6 @@ public final class TransformationResult {
private long fileSizeBytes;
private int averageAudioBitrate;
private int channelCount;
private @C.PcmEncoding int pcmEncoding;
private int sampleRate;
@Nullable private String audioEncoderName;
private int averageVideoBitrate;
......@@ -60,7 +58,6 @@ public final class TransformationResult {
fileSizeBytes = C.LENGTH_UNSET;
averageAudioBitrate = C.RATE_UNSET_INT;
channelCount = C.LENGTH_UNSET;
pcmEncoding = Format.NO_VALUE;
sampleRate = C.RATE_UNSET_INT;
averageVideoBitrate = C.RATE_UNSET_INT;
height = C.LENGTH_UNSET;
......@@ -83,7 +80,6 @@ public final class TransformationResult {
fileSizeBytes = exportResult.fileSizeBytes;
averageAudioBitrate = exportResult.averageAudioBitrate;
channelCount = exportResult.channelCount;
pcmEncoding = exportResult.pcmEncoding;
sampleRate = exportResult.sampleRate;
audioEncoderName = exportResult.audioEncoderName;
averageVideoBitrate = exportResult.averageVideoBitrate;
......@@ -152,13 +148,6 @@ public final class TransformationResult {
return this;
}
/** Sets the {@link C.PcmEncoding}. */
@CanIgnoreReturnValue
public Builder setPcmEncoding(@C.PcmEncoding int pcmEncoding) {
this.pcmEncoding = pcmEncoding;
return this;
}
/**
* Sets the sample rate.
*
......@@ -256,7 +245,6 @@ public final class TransformationResult {
fileSizeBytes,
averageAudioBitrate,
channelCount,
pcmEncoding,
sampleRate,
audioEncoderName,
averageVideoBitrate,
......@@ -310,8 +298,6 @@ public final class TransformationResult {
public final int averageAudioBitrate;
/** The channel count of the audio, or {@link C#LENGTH_UNSET} if unset or unknown. */
public final int channelCount;
/** The {@link C.PcmEncoding} of the audio, or {@link Format#NO_VALUE} if unset or unknown. */
public final @C.PcmEncoding int pcmEncoding;
/** The sample rate of the audio, or {@link C#RATE_UNSET_INT} if unset or unknown. */
public final int sampleRate;
/** The name of the audio encoder used, or {@code null} if none were used. */
......@@ -344,7 +330,6 @@ public final class TransformationResult {
long fileSizeBytes,
int averageAudioBitrate,
int channelCount,
@C.PcmEncoding int pcmEncoding,
int sampleRate,
@Nullable String audioEncoderName,
int averageVideoBitrate,
......@@ -359,7 +344,6 @@ public final class TransformationResult {
this.fileSizeBytes = fileSizeBytes;
this.averageAudioBitrate = averageAudioBitrate;
this.channelCount = channelCount;
this.pcmEncoding = pcmEncoding;
this.sampleRate = sampleRate;
this.audioEncoderName = audioEncoderName;
this.averageVideoBitrate = averageVideoBitrate;
......@@ -378,7 +362,6 @@ public final class TransformationResult {
.setFileSizeBytes(fileSizeBytes)
.setAverageAudioBitrate(averageAudioBitrate)
.setChannelCount(channelCount)
.setPcmEncoding(pcmEncoding)
.setSampleRate(sampleRate)
.setAudioEncoderName(audioEncoderName)
.setAverageVideoBitrate(averageVideoBitrate)
......@@ -404,7 +387,6 @@ public final class TransformationResult {
&& fileSizeBytes == result.fileSizeBytes
&& averageAudioBitrate == result.averageAudioBitrate
&& channelCount == result.channelCount
&& pcmEncoding == result.pcmEncoding
&& sampleRate == result.sampleRate
&& Objects.equals(audioEncoderName, result.audioEncoderName)
&& averageVideoBitrate == result.averageVideoBitrate
......@@ -423,7 +405,6 @@ public final class TransformationResult {
result = 31 * result + (int) fileSizeBytes;
result = 31 * result + averageAudioBitrate;
result = 31 * result + channelCount;
result = 31 * result + pcmEncoding;
result = 31 * result + sampleRate;
result = 31 * result + Objects.hashCode(audioEncoderName);
result = 31 * result + averageVideoBitrate;
......
library/transformer/src/main/java/com/google/android/exoplayer2/transformer/TransformerInternal.java
......@@ -210,7 +210,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
public void onTrackEnded(
@C.TrackType int trackType, Format format, int averageBitrate, int sampleCount) {
if (trackType == C.TRACK_TYPE_AUDIO) {
exportResultBuilder.setAverageAudioBitrate(averageBitrate).setPcmEncoding(format.pcmEncoding);
exportResultBuilder.setAverageAudioBitrate(averageBitrate);
if (format.channelCount != Format.NO_VALUE) {
exportResultBuilder.setChannelCount(format.channelCount);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment