sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-03-30 10:15:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove AudioTrack API level 16 dependency.

Browse source 
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=121685491
This commit is contained in:
olly 2016-05-06 10:15:33 -07:00 committed by Oliver Woodman
parent 523f2662ef
commit e284d6166a
3 changed files with 25 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
library/src/main/java/com/google/android/exoplayer/MediaCodecAudioTrackRenderer.java
View file

@ -237,7 +237,13 @@ public class MediaCodecAudioTrackRenderer extends MediaCodecTrackRenderer implem
@Override
protected void onOutputFormatChanged(MediaCodec codec, MediaFormat outputFormat) {
boolean passthrough = passthroughMediaFormat != null;
audioTrack.configure(passthrough ? passthroughMediaFormat : outputFormat, passthrough);
String mimeType = passthrough
? passthroughMediaFormat.getString(android.media.MediaFormat.KEY_MIME)
: MimeTypes.AUDIO_RAW;
android.media.MediaFormat format = passthrough ? passthroughMediaFormat : outputFormat;
int channelCount = format.getInteger(android.media.MediaFormat.KEY_CHANNEL_COUNT);
int sampleRate = format.getInteger(android.media.MediaFormat.KEY_SAMPLE_RATE);
audioTrack.configure(mimeType, channelCount, sampleRate);
}
/**

34
library/src/main/java/com/google/android/exoplayer/audio/AudioTrack.java
View file

@ -26,7 +26,6 @@ import android.annotation.TargetApi;
import android.media.AudioFormat;
import android.media.AudioManager;
import android.media.AudioTimestamp;
import android.media.MediaFormat;
import android.media.PlaybackParams;
import android.os.ConditionVariable;
import android.os.SystemClock;
@ -57,7 +56,6 @@ import java.nio.ByteBuffer;
* <p>
* Call {@link #release()} when the instance will no longer be used.
*/
@TargetApi(16)
public final class AudioTrack {
/**
@ -333,26 +331,27 @@ public final class AudioTrack {
}
/**
* Configures (or reconfigures) the audio track to play back media in {@code format}, inferring a
* buffer size from the format.
* Configures (or reconfigures) the audio track, inferring a suitable buffer size automatically.
*
* @param format Specifies the channel count and sample rate to play back.
* @param passthrough Whether to play back using a passthrough encoding.
* @param mimeType The mime type.
* @param channelCount The number of channels.
* @param sampleRate The sample rate in Hz.
*/
public void configure(MediaFormat format, boolean passthrough) {
configure(format, passthrough, 0);
public void configure(String mimeType, int channelCount, int sampleRate) {
configure(mimeType, channelCount, sampleRate, 0);
}
/**
* Configures (or reconfigures) the audio track to play back media in {@code format}.
* Configures (or reconfigures) the audio track.
*
* @param format Specifies the channel count and sample rate to play back.
* @param passthrough Whether to play back using a passthrough encoding.
* @param specifiedBufferSize A specific size for the playback buffer in bytes, or 0 to use a
* size inferred from the format.
* @param mimeType The mime type.
* @param channelCount The number of channels.
* @param sampleRate The sample rate in Hz.
* @param specifiedBufferSize A specific size for the playback buffer in bytes, or 0 to infer a
* suitable buffer size automatically.
*/
public void configure(MediaFormat format, boolean passthrough, int specifiedBufferSize) {
int channelCount = format.getInteger(MediaFormat.KEY_CHANNEL_COUNT);
public void configure(String mimeType, int channelCount, int sampleRate,
int specifiedBufferSize) {
int channelConfig;
switch (channelCount) {
case 1:
@ -382,8 +381,7 @@ public final class AudioTrack {
default:
throw new IllegalArgumentException("Unsupported channel count: " + channelCount);
}
int sampleRate = format.getInteger(MediaFormat.KEY_SAMPLE_RATE);
String mimeType = format.getString(MediaFormat.KEY_MIME);
boolean passthrough = !MimeTypes.AUDIO_RAW.equals(mimeType);
int encoding = passthrough ? getEncodingForMimeType(mimeType) : AudioFormat.ENCODING_PCM_16BIT;
if (isInitialized() && this.sampleRate == sampleRate && this.channelConfig == channelConfig
&& this.encoding == encoding) {
@ -543,7 +541,7 @@ public final class AudioTrack {
* <p>
* If the data was not written in full then the same {@link ByteBuffer} must be provided to
* subsequent calls until it has been fully consumed, except in the case of an interleaving call
* to {@link #configure(MediaFormat, boolean)} or {@link #reset}.
* to {@link #configure} or {@link #reset}.
*
* @param buffer The buffer containing audio data to play back.
* @param presentationTimeUs Presentation timestamp of the next buffer in microseconds.

3
library/src/main/java/com/google/android/exoplayer/util/extensions/AudioDecoderTrackRenderer.java
View file

@ -27,6 +27,7 @@ import com.google.android.exoplayer.MediaClock;
import com.google.android.exoplayer.TrackRenderer;
import com.google.android.exoplayer.TrackStream;
import com.google.android.exoplayer.audio.AudioTrack;
import com.google.android.exoplayer.util.MimeTypes;
import android.os.Handler;
@ -291,7 +292,7 @@ public abstract class AudioDecoderTrackRenderer extends TrackRenderer implements
int result = readSource(formatHolder, null);
if (result == TrackStream.FORMAT_READ) {
format = formatHolder.format;
audioTrack.configure(format.getFrameworkMediaFormatV16(), false);
audioTrack.configure(MimeTypes.AUDIO_RAW, format.channelCount, format.sampleRate);
return true;
}
return false;