@@ -4,6 +4,7 @@ import android.media.*
44import android.os.SystemClock
55import android.util.Log
66import java.lang.Exception
7+ import java.util.concurrent.atomic.AtomicBoolean
78
89/* *
910 * 1. Using MediaExtractor to demux audio.
@@ -23,6 +24,7 @@ open class AudioTrackController {
2324 private const val SLEEP_TIME : Long = 20
2425 }
2526
27+ private var running: AtomicBoolean ? = null
2628 private var audioTrack: AudioTrack ? = null
2729 private var mediaCodec: MediaCodec ? = null
2830 private var mediaExtractor: MediaExtractor ? = null
@@ -66,13 +68,23 @@ open class AudioTrackController {
6668 } else {
6769 AudioFormat .CHANNEL_OUT_STEREO
6870 }
69- val audioFormat = AudioFormat .ENCODING_PCM_16BIT
70- val bufferSize = AudioTrack .getMinBufferSize(sampleRate, channelConfig, audioFormat )
71+ val encoding = AudioFormat .ENCODING_PCM_16BIT
72+ val bufferSize = AudioTrack .getMinBufferSize(sampleRate, channelConfig, encoding )
7173 Log .e(TAG , " sampleRate=$sampleRate , channelCount=$channelCount , bufferSize=$bufferSize " )
7274
7375 try {
74- audioTrack = AudioTrack (AudioManager .STREAM_MUSIC , sampleRate, channelConfig, audioFormat, bufferSize, AudioTrack .MODE_STREAM )
76+ val audioFormat = AudioFormat .Builder ()
77+ .setEncoding(encoding)
78+ .setSampleRate(sampleRate)
79+ .setChannelMask(channelConfig)
80+ .build()
81+ val audioAttributes = AudioAttributes .Builder ()
82+ .setLegacyStreamType(AudioManager .STREAM_MUSIC )
83+ .build()
84+ audioTrack = AudioTrack (audioAttributes, audioFormat,
85+ bufferSize, AudioTrack .MODE_STREAM , AudioManager .AUDIO_SESSION_ID_GENERATE )
7586 audioTrack!! .play()
87+ // audioTrack!!.audioSessionId
7688// audioTrack!!.attachAuxEffect()
7789 } catch (e: Exception ) {
7890 Log .e(TAG , " initAudioTrack err=$e " )
@@ -94,11 +106,13 @@ open class AudioTrackController {
94106 audioTrack!! .release()
95107 audioTrack = null
96108 }
109+ Log .e(TAG , " release done..." )
97110 }
98111
99112 fun playAudio (path : String ) {
100- val data = ByteArray (10 * 1024 )
101113 var finished = false
114+ val data = ByteArray (10 * 1024 )
115+ running = AtomicBoolean (true )
102116 val bufferInfo = MediaCodec .BufferInfo ()
103117 val mediaFormat = parseAudioFormat(path) ? : return release()
104118 var result = initMediaCodec(mediaFormat)
@@ -111,18 +125,22 @@ open class AudioTrackController {
111125 }
112126
113127 while (! finished) {
128+ if (! running!! .get()) {
129+ break
130+ }
114131 val inputIndex = mediaCodec!! .dequeueInputBuffer(DEQUEUE_TIME )
115132 if (inputIndex >= 0 ) {
116133 val inputBuffer = mediaCodec!! .getInputBuffer(inputIndex)
117134 // demux
118135 val sampleSize = mediaExtractor!! .readSampleData(inputBuffer!! , 0 )
119- Log .e(TAG , " sampleSize=$sampleSize " )
120136 // decode
121137 if (sampleSize < 0 ) {
122- mediaCodec!! .queueInputBuffer(inputIndex, 0 , 0 , 0 , MediaCodec .BUFFER_FLAG_END_OF_STREAM )
138+ mediaCodec!! .queueInputBuffer(inputIndex, 0 , 0 ,
139+ 0 , MediaCodec .BUFFER_FLAG_END_OF_STREAM )
123140 finished = true
124141 } else {
125- mediaCodec!! .queueInputBuffer(inputIndex, 0 , sampleSize, mediaExtractor!! .sampleTime, mediaExtractor!! .sampleFlags)
142+ mediaCodec!! .queueInputBuffer(inputIndex, 0 , sampleSize,
143+ mediaExtractor!! .sampleTime, mediaExtractor!! .sampleFlags)
126144 mediaExtractor!! .advance()
127145 }
128146 }
@@ -132,8 +150,7 @@ open class AudioTrackController {
132150 if (outputIndex >= 0 ) {
133151 val outputBuffer = mediaCodec!! .getOutputBuffer(outputIndex)
134152 val size = outputBuffer!! .limit()
135- Log .e(TAG , " outputIndex=$outputIndex , position=" + outputBuffer.position() + " ,limit=" + size)
136- outputBuffer.get(data, outputBuffer.position(), size)
153+ outputBuffer.get(data, outputBuffer.position(), size - outputBuffer.position())
137154 audioTrack!! .write(data, 0 , size)
138155 mediaCodec!! .releaseOutputBuffer(outputIndex, false )
139156 SystemClock .sleep(SLEEP_TIME )
@@ -143,4 +160,8 @@ open class AudioTrackController {
143160 release()
144161 }
145162
163+ fun stop () {
164+ running?.set(false )
165+ }
166+
146167}
0 commit comments