Commit 363b8522 by samrobinson Committed by Andrew Lewis

Pass AudioFormat to ASP#computeNextEncoderInputBufferTimeUs.

This method uses sampleRate, channelCount and pcmEncoding, so passing
AudioFormat is easier.

This will lead into a future change that builds the
encoderInputAudioFormat from encoder.getConfigurationFormat()

PiperOrigin-RevId: 510956177
parent ae37d33b
......@@ -326,9 +326,7 @@ import org.checkerframework.dataflow.qual.Pure;
encoderInputBufferData.put(inputBuffer);
encoderInputBuffer.timeUs = nextEncoderInputBufferTimeUs;
computeNextEncoderInputBufferTimeUs(
/* bytesWritten= */ encoderInputBufferData.position(),
encoderInputAudioFormat.bytesPerFrame,
encoderInputAudioFormat.sampleRate);
/* bytesWritten= */ encoderInputBufferData.position(), encoderInputAudioFormat);
encoderInputBuffer.setFlags(0);
encoderInputBuffer.flip();
inputBuffer.limit(bufferLimit);
......@@ -355,15 +353,14 @@ import org.checkerframework.dataflow.qual.Pure;
return transformationRequest.buildUpon().setAudioMimeType(actualFormat.sampleMimeType).build();
}
private void computeNextEncoderInputBufferTimeUs(
long bytesWritten, int bytesPerFrame, int sampleRate) {
private void computeNextEncoderInputBufferTimeUs(long bytesWritten, AudioFormat audioFormat) {
// The calculation below accounts for remainders and rounding. Without that it corresponds to
// the following:
// bufferDurationUs = numberOfFramesInBuffer * sampleDurationUs
// where numberOfFramesInBuffer = bytesWritten / bytesPerFrame
// and sampleDurationUs = C.MICROS_PER_SECOND / sampleRate
long numerator = bytesWritten * C.MICROS_PER_SECOND + encoderBufferDurationRemainder;
long denominator = (long) bytesPerFrame * sampleRate;
long denominator = (long) audioFormat.bytesPerFrame * audioFormat.sampleRate;
long bufferDurationUs = numerator / denominator;
encoderBufferDurationRemainder = numerator - bufferDurationUs * denominator;
if (encoderBufferDurationRemainder > 0) { // Ceil division result.
......
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