Must be positive or {@link C#LENGTH_UNSET}. + */ + @CanIgnoreReturnValue + public Builder setChannelCount(int channelCount) { + checkArgument(channelCount > 0 || channelCount == C.LENGTH_UNSET); + this.channelCount = channelCount; + return this; + } + + /** Sets the {@link C.PcmEncoding}. */ + @CanIgnoreReturnValue + public Builder setPcmEncoding(@C.PcmEncoding int pcmEncoding) { + this.pcmEncoding = pcmEncoding; + return this; + } + + /** + * Sets the sample rate. + * + *
Must be positive or {@link C#RATE_UNSET_INT}. + */ + @CanIgnoreReturnValue + public Builder setSampleRate(int sampleRate) { + checkArgument(sampleRate > 0 || sampleRate == C.RATE_UNSET_INT); + this.sampleRate = sampleRate; + return this; + } + /** Sets the name of the audio decoder used. */ @CanIgnoreReturnValue public Builder setAudioDecoderName(@Nullable String audioDecoderName) { @@ -107,6 +148,30 @@ public final class TransformationResult { return this; } + /** + * Sets the height. + * + *
Must be positive or {@link C#LENGTH_UNSET}. + */ + @CanIgnoreReturnValue + public Builder setHeight(int height) { + checkArgument(height > 0 || height == C.LENGTH_UNSET); + this.height = height; + return this; + } + + /** + * Sets the width. + * + *
Must be positive or {@link C#LENGTH_UNSET}. + */ + @CanIgnoreReturnValue + public Builder setWidth(int width) { + checkArgument(width > 0 || width == C.LENGTH_UNSET); + this.width = width; + return this; + } + /** * Sets the number of video frames. * @@ -146,9 +211,14 @@ public final class TransformationResult { durationMs, fileSizeBytes, averageAudioBitrate, + channelCount, + pcmEncoding, + sampleRate, audioDecoderName, audioEncoderName, averageVideoBitrate, + height, + width, videoFrameCount, videoDecoderName, videoEncoderName, @@ -165,6 +235,12 @@ public final class TransformationResult { * The average bitrate of the audio track data, or {@link C#RATE_UNSET_INT} if unset or unknown. */ 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 decoder used, or {@code null} if none were used. */ @Nullable public final String audioDecoderName; /** The name of the audio encoder used, or {@code null} if none were used. */ @@ -174,6 +250,10 @@ public final class TransformationResult { * The average bitrate of the video track data, or {@link C#RATE_UNSET_INT} if unset or unknown. */ public final int averageVideoBitrate; + /** The height of the video, or {@link C#LENGTH_UNSET} if unset or unknown. */ + public final int height; + /** The width of the video, or {@link C#LENGTH_UNSET} if unset or unknown. */ + public final int width; /** The number of video frames. */ public final int videoFrameCount; /** The name of the video decoder used, or {@code null} if none were used. */ @@ -191,9 +271,14 @@ public final class TransformationResult { long durationMs, long fileSizeBytes, int averageAudioBitrate, + int channelCount, + @C.PcmEncoding int pcmEncoding, + int sampleRate, @Nullable String audioDecoderName, @Nullable String audioEncoderName, int averageVideoBitrate, + int height, + int width, int videoFrameCount, @Nullable String videoDecoderName, @Nullable String videoEncoderName, @@ -201,9 +286,14 @@ public final class TransformationResult { this.durationMs = durationMs; this.fileSizeBytes = fileSizeBytes; this.averageAudioBitrate = averageAudioBitrate; + this.channelCount = channelCount; + this.pcmEncoding = pcmEncoding; + this.sampleRate = sampleRate; this.audioDecoderName = audioDecoderName; this.audioEncoderName = audioEncoderName; this.averageVideoBitrate = averageVideoBitrate; + this.height = height; + this.width = width; this.videoFrameCount = videoFrameCount; this.videoDecoderName = videoDecoderName; this.videoEncoderName = videoEncoderName; @@ -215,9 +305,14 @@ public final class TransformationResult { .setDurationMs(durationMs) .setFileSizeBytes(fileSizeBytes) .setAverageAudioBitrate(averageAudioBitrate) + .setChannelCount(channelCount) + .setPcmEncoding(pcmEncoding) + .setSampleRate(sampleRate) .setAudioDecoderName(audioDecoderName) .setAudioEncoderName(audioEncoderName) .setAverageVideoBitrate(averageVideoBitrate) + .setHeight(height) + .setWidth(width) .setVideoFrameCount(videoFrameCount) .setVideoDecoderName(videoDecoderName) .setVideoEncoderName(videoEncoderName) @@ -236,9 +331,14 @@ public final class TransformationResult { return durationMs == result.durationMs && fileSizeBytes == result.fileSizeBytes && averageAudioBitrate == result.averageAudioBitrate + && channelCount == result.channelCount + && pcmEncoding == result.pcmEncoding + && sampleRate == result.sampleRate && Objects.equals(audioDecoderName, result.audioDecoderName) && Objects.equals(audioEncoderName, result.audioEncoderName) && averageVideoBitrate == result.averageVideoBitrate + && height == result.height + && width == result.width && videoFrameCount == result.videoFrameCount && Objects.equals(videoDecoderName, result.videoDecoderName) && Objects.equals(videoEncoderName, result.videoEncoderName) @@ -250,9 +350,14 @@ public final class TransformationResult { int result = (int) durationMs; 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(audioDecoderName); result = 31 * result + Objects.hashCode(audioEncoderName); result = 31 * result + averageVideoBitrate; + result = 31 * result + height; + result = 31 * result + width; result = 31 * result + videoFrameCount; result = 31 * result + Objects.hashCode(videoDecoderName); result = 31 * result + Objects.hashCode(videoEncoderName); diff --git a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/TransformerInternal.java b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/TransformerInternal.java index 70800ad44a..ec822ce396 100644 --- a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/TransformerInternal.java +++ b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/TransformerInternal.java @@ -468,11 +468,25 @@ 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) { - transformationResultBuilder.setAverageAudioBitrate(averageBitrate); + transformationResultBuilder + .setAverageAudioBitrate(averageBitrate) + .setPcmEncoding(format.pcmEncoding); + if (format.channelCount != Format.NO_VALUE) { + transformationResultBuilder.setChannelCount(format.channelCount); + } + if (format.sampleRate != Format.NO_VALUE) { + transformationResultBuilder.setSampleRate(format.sampleRate); + } } else if (trackType == C.TRACK_TYPE_VIDEO) { transformationResultBuilder - .setVideoFrameCount(sampleCount) - .setAverageVideoBitrate(averageBitrate); + .setAverageVideoBitrate(averageBitrate) + .setVideoFrameCount(sampleCount); + if (format.height != Format.NO_VALUE) { + transformationResultBuilder.setHeight(format.height); + } + if (format.width != Format.NO_VALUE) { + transformationResultBuilder.setWidth(format.width); + } } }