Add log messages

Add button

Author: thetwom

app/build.gradle

@@ -10,8 +10,8 @@ android {
         applicationId "de.moekadu.decodertest"
         minSdkVersion 23
         targetSdkVersion 29
-        versionCode 5
-        versionName "5.0"
+        versionCode 6
+        versionName "6.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

app/src/main/java/de/moekadu/decodertest/MainActivity.kt

@@ -8,13 +8,16 @@ import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import android.os.SystemClock
 import android.text.method.ScrollingMovementMethod
+import android.util.Log
+import android.widget.Button
 import android.widget.TextView
 import java.nio.ByteOrder
 import kotlin.math.ceil
 
 class MainActivity : AppCompatActivity() {
 
     var text : TextView? = null
+    var isound = 0
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -27,30 +30,29 @@ class MainActivity : AppCompatActivity() {
 
         text?.movementMethod = ScrollingMovementMethod()
 
-        val textViewText= StringBuilder()
+        val button = findViewById<Button>(R.id.button)
 
-        for(s in sounds) {
-            audioToPCM(s, textViewText)
+        button.setOnClickListener {
+            if(isound == sounds.size)
+                isound = 0
+            val textViewText = StringBuilder()
+            textViewText.append("Decoding sound $isound \n")
+            audioToPCM(sounds[isound], textViewText)
             textViewText.append("\n")
-        }
 
-        text?.text = textViewText.toString()
-        text?.invalidate()
+            text?.text = textViewText.toString()
+            text?.invalidate()
+            ++isound
+        }
     }
 
     fun audioToPCM(id : Int, textViewText : StringBuilder) : FloatArray {
 
         val decodingStart = SystemClock.uptimeMillis()
 
-        textViewText.append("opening ressource\n")
-        text?.text = textViewText.toString()
-        text?.invalidate()
         val sampleFD = resources.openRawResourceFd(id)
         val mediaExtractor = MediaExtractor()
 
-        textViewText.append("setting data source\n")
-        text?.text = textViewText.toString()
-        text?.invalidate()
         mediaExtractor.setDataSource(sampleFD.fileDescriptor, sampleFD.startOffset, sampleFD.length)
         val format = mediaExtractor.getTrackFormat(0)
 
@@ -59,9 +61,6 @@ class MainActivity : AppCompatActivity() {
         val duration = format.getLong(MediaFormat.KEY_DURATION)
         val channelCount = format.getInteger(MediaFormat.KEY_CHANNEL_COUNT)
 
-        textViewText.append("getting decoder format\n")
-        text?.text = textViewText.toString()
-        text?.invalidate()
         val mediaCodecList = MediaCodecList(MediaCodecList.REGULAR_CODECS)
         val mediaCodecName = mediaCodecList.findDecoderForFormat(format)
 
@@ -79,13 +78,11 @@ class MainActivity : AppCompatActivity() {
         // Log.v("AudioMixer", "AudioEncoder.decode: channel count $channelCount")
         // Log.v("AudioMixer", "AudioEncoder.decode: track count: " + mediaExtractor.trackCount)
         // Log.v("AudioMixer", "AudioEncoder.decode: media codec name: $mediaCodecName")
-        text?.text = textViewText.toString()
-        text?.invalidate()
 
         if (nFrames > 50000)
             return floatArrayOf(0f)
 
-        val result = FloatArray(10 * nFrames) { 0f }
+        val result = FloatArray(2 * nFrames) { 0f }
         // Log.v("AudioMixer", "AudioEncoder.decode: result.size = " + result.size)
 
         //val codec = MediaCodec.createByCodecName(mediaCodecName)
@@ -94,52 +91,42 @@ class MainActivity : AppCompatActivity() {
             return floatArrayOf(0f)
         }
 
-        textViewText.append("creating decoder\n")
-        text?.text = textViewText.toString()
-        text?.invalidate()
         val codec = MediaCodec.createDecoderByType(mime)
         textViewText.append("codecs name based on mime: ${codec.name}\n")
-        text?.text = textViewText.toString()
-        textViewText.append("configuring codec\n")
-        text?.text = textViewText.toString()
-        text?.invalidate()
         codec.configure(format, null, null, 0)
 
-        textViewText.append("starting codec\n")
-        text?.text = textViewText.toString()
-        text?.invalidate()
         codec.start()
 
-        textViewText.append("selecting track\n")
-        text?.text = textViewText.toString()
-        text?.invalidate()
         mediaExtractor.selectTrack(0)
         var numSamples = 0
         val bufferInfo = MediaCodec.BufferInfo()
-        val timeOutUs = 5000L
+        val timeOutUs = 1000L
         var sawOutputEOS = false
         var sawInputEOS = false
         var numNoOutput = 0
         var counter = 0
 
-        textViewText.append("starting loop\n")
-        text?.text = textViewText.toString()
-        text?.invalidate()
         while (!sawOutputEOS) {
 
             if(!sawInputEOS) {
                 // get input buffer index and then the input buffer itself
+                Log.v("DecoderTest", "dequeInputBuffer")
                 val inputBufferIndex = codec.dequeueInputBuffer(timeOutUs)
+                Log.v("DecoderTest", "Done")
                 if (inputBufferIndex >= 0) {
-
+                    Log.v("DecoderTest", "getInputBuffer")
                     val inputBuffer = codec.getInputBuffer(inputBufferIndex)
+                    Log.v("DecoderTest", "Done")
                     if (inputBuffer == null) {
                         textViewText.append("AudioEncoder.decode: failed to acquire input buffer\n")
+                        Log.v("DecoderTest", "failed to acquire input buffer")
                         return floatArrayOf(0f)
                     }
 
                     // write the next bunch of data from our media file to the input buffer
+                    Log.v("DecoderTest", "read sample data")
                     var sampleSize = mediaExtractor.readSampleData(inputBuffer, 0)
+                    Log.v("DecoderTest", "Done")
 
                     var presentationTimeUs = 0L
                     var eosFlag = 0
@@ -153,53 +140,70 @@ class MainActivity : AppCompatActivity() {
                     }
 
                     // queue the input buffer such that the codec can decode it
+                    Log.v("DecoderTest", "queue input buffer")
                     codec.queueInputBuffer(
                         inputBufferIndex,
                         0,
                         sampleSize,
                         presentationTimeUs,
                         eosFlag
                     )
+                    Log.v("DecoderTest", "Done")
 
-                    if (!sawInputEOS)
+                    if (!sawInputEOS) {
+                        Log.v("DecoderTest", "advance media extractor")
                         mediaExtractor.advance()
+                        Log.v("DecoderTest", "Done")
+                    }
                 }
             }
 
             // we are done decoding and can now read our result
+            Log.v("DecoderTest", "deque output buffer")
             val outputBufferIndex = codec.dequeueOutputBuffer(bufferInfo, timeOutUs)
+            Log.v("DecoderTest", "Done")
 
             if(outputBufferIndex >= 0) {
                 // finally get our output data and create a view to a short buffer which is the
                 // standard data type for 16bit audio
+                Log.v("DecoderTest", "get output buffer")
                 val outputBuffer = codec.getOutputBuffer(outputBufferIndex)
+                Log.v("DecoderTest", "Done")
+
                 if (outputBuffer == null) {
                     textViewText.append("Cannot acquire output buffer\n")
                     return floatArrayOf(0f)
                 }
 
+                Log.v("DecoderTest", "create short buffer")
                 val shortBuffer = outputBuffer.order(ByteOrder.nativeOrder()).asShortBuffer()
+                Log.v("DecoderTest", "Done")
 
                 var c2 = 0
                 // convert the short data to floats and store it to the result-array which will be
                 // returned later. We want to have mono output stream, so we add different channel
                 // to the same index.
+                Log.v("DecoderTest", "read short buffer from ${shortBuffer.position()} to ${shortBuffer.limit()}")
                 while (shortBuffer.position() < shortBuffer.limit()) {
                     if(numSamples/channelCount >= result.size) {
                         textViewText.append("Too many samples, something is wrong with track duration")
+                        Log.v("DecoderTest", "Too many samples, something is wrong with track duration")
                         return result
                     }
                     result[numSamples / channelCount] += shortBuffer.get().toFloat()
                     ++numSamples
                     ++c2
                    if(c2 > 50000) {
                        textViewText.append("c2 too big, something is wrong")
+                       Log.v("DecoderTest", "c2 too big, something is wrong")
                        return result
                    }
 
                 }
 
+                Log.v("DecoderTest", "release output buffer")
                 codec.releaseOutputBuffer(outputBufferIndex, false)
+                Log.v("DecoderTest", "Done")
 
                 if ((bufferInfo.flags and MediaCodec.BUFFER_FLAG_END_OF_STREAM) != 0)
                     sawOutputEOS = true
@@ -209,30 +213,31 @@ class MainActivity : AppCompatActivity() {
                 ++numNoOutput
                 if(numNoOutput > 50) {
                     textViewText.append("it seems as I don't get output data from codec\n")
+                    Log.v("DecoderTest", "it seems as I don't get output data from codec")
                     break
                 }
             }
 
 
             counter++
-            if(counter > 50000) {
+            if(counter > 50) {
                 textViewText.append("stopping decoding early since something seems wrong\n")
+                Log.v("DecoderTest", "stopping decoding early since something seems wrong")
                 break
             }
         }
-
+        Log.v("DecoderTest", "COUNTER: $counter")
         val decodingEnd = SystemClock.uptimeMillis()
         textViewText.append("decoded frames (total)= $numSamples\n")
         textViewText.append("decoded frames (per channel)= ${numSamples/channelCount}\n")
         textViewText.append("time for decoding = ${decodingEnd-decodingStart} ms\n")
-        text?.text = textViewText.toString()
-        text?.invalidate()
 
         mediaExtractor.release()
         codec.stop()
         codec.release()
         sampleFD.close()
 
+        Log.v("DecoderTest", "scaling result")
         val channelCountInv = 1.0f / channelCount
         for (i in result.indices)
             result[i] = channelCountInv * result[i] / 32768.0f //peak * peakValue

app/src/main/res/layout/activity_main.xml

@@ -6,16 +6,23 @@
     android:layout_height="match_parent"
     tools:context=".MainActivity">
 
+    <Button
+        android:id="@+id/button"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="decode next track"
+        app:layout_constraintTop_toTopOf="parent"
+        />
     <TextView
         android:id="@+id/text"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="0dp"
         android:text="Hello World!"
         android:textSize="12sp"
         android:scrollbars="vertical"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toBottomOf="@id/button" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>