Remove PCM encoding from ExportResult.

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

PiperOrigin-RevId: 515580886

libraries/transformer/src/androidTest/java/androidx/media3/transformer/ExportTestResult.java

@@ -20,7 +20,6 @@ import static androidx.media3.transformer.AndroidTestUtil.processedInputsAsJsonA
 
 import androidx.annotation.Nullable;
 import androidx.media3.common.C;
-import androidx.media3.common.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);
     }

libraries/transformer/src/main/java/androidx/media3/transformer/ExportResult.java

@@ -20,7 +20,6 @@ import static androidx.media3.common.util.Assertions.checkArgument;
 import androidx.annotation.Nullable;
 import androidx.media3.common.C;
 import androidx.media3.common.ColorInfo;
-import androidx.media3.common.Format;
 import androidx.media3.common.MediaItem;
 import androidx.media3.common.util.UnstableApi;
 import com.google.common.collect.ImmutableList;
@@ -38,7 +37,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;
@@ -56,7 +54,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;
@@ -118,13 +115,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.
      *
@@ -221,7 +211,6 @@ public final class ExportResult {
           fileSizeBytes,
           averageAudioBitrate,
           channelCount,
-          pcmEncoding,
           sampleRate,
           audioEncoderName,
           averageVideoBitrate,
@@ -272,8 +261,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. */
@@ -306,7 +293,6 @@ public final class ExportResult {
       long fileSizeBytes,
       int averageAudioBitrate,
       int channelCount,
-      @C.PcmEncoding int pcmEncoding,
       int sampleRate,
       @Nullable String audioEncoderName,
       int averageVideoBitrate,
@@ -321,7 +307,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;
@@ -340,7 +325,6 @@ public final class ExportResult {
         .setFileSizeBytes(fileSizeBytes)
         .setAverageAudioBitrate(averageAudioBitrate)
         .setChannelCount(channelCount)
-        .setPcmEncoding(pcmEncoding)
         .setSampleRate(sampleRate)
         .setAudioEncoderName(audioEncoderName)
         .setAverageVideoBitrate(averageVideoBitrate)
@@ -366,7 +350,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
@@ -385,7 +368,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;

libraries/transformer/src/main/java/androidx/media3/transformer/TransformationResult.java

@@ -20,7 +20,6 @@ import static androidx.media3.common.util.Assertions.checkArgument;
 import androidx.annotation.Nullable;
 import androidx.media3.common.C;
 import androidx.media3.common.ColorInfo;
-import androidx.media3.common.Format;
 import androidx.media3.common.MediaItem;
 import androidx.media3.common.util.UnstableApi;
 import com.google.common.collect.ImmutableList;
@@ -44,7 +43,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;
@@ -62,7 +60,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;
@@ -85,7 +82,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;
@@ -154,13 +150,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.
      *
@@ -258,7 +247,6 @@ public final class TransformationResult {
           fileSizeBytes,
           averageAudioBitrate,
           channelCount,
-          pcmEncoding,
           sampleRate,
           audioEncoderName,
           averageVideoBitrate,
@@ -312,8 +300,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. */
@@ -346,7 +332,6 @@ public final class TransformationResult {
       long fileSizeBytes,
       int averageAudioBitrate,
       int channelCount,
-      @C.PcmEncoding int pcmEncoding,
       int sampleRate,
       @Nullable String audioEncoderName,
       int averageVideoBitrate,
@@ -361,7 +346,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;
@@ -380,7 +364,6 @@ public final class TransformationResult {
         .setFileSizeBytes(fileSizeBytes)
         .setAverageAudioBitrate(averageAudioBitrate)
         .setChannelCount(channelCount)
-        .setPcmEncoding(pcmEncoding)
         .setSampleRate(sampleRate)
         .setAudioEncoderName(audioEncoderName)
         .setAverageVideoBitrate(averageVideoBitrate)
@@ -406,7 +389,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
@@ -425,7 +407,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;

libraries/transformer/src/main/java/androidx/media3/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);
       }