use const val property

build.gradle

@@ -7,7 +7,7 @@ buildscript {
  google()
  }
  dependencies {
- classpath 'com.android.tools.build:gradle:3.6.3'
+ classpath 'com.android.tools.build:gradle:4.0.0'
  classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
  // NOTE: Do not place your application dependencies here; they belong

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Tue May 05 19:44:43 JST 2020
+#Mon Aug 10 22:19:05 JST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\:https://services.gradle.org/distributions/gradle-5.6.4-all.zip
+distributionUrl=https\:https://services.gradle.org/distributions/gradle-6.1.1-all.zip

haishinkit/src/main/java/com/haishinkit/amf/AMF0Deserializer.kt

@@ -12,7 +12,7 @@ import java.util.HashMap
 import java.util.IllegalFormatFlagsException
 import java.nio.ByteBuffer
 
-final internal class AMF0Deserializer(private val buffer: ByteBuffer) {
+internal class AMF0Deserializer(private val buffer: ByteBuffer) {
  val `object`: Any?
  get() {
  val marker = buffer.get()
@@ -186,13 +186,13 @@ final internal class AMF0Deserializer(private val buffer: ByteBuffer) {
 
  private fun getString(asShort: Boolean): String {
  var length = if (asShort) buffer.short.toInt() else buffer.int
- try {
+ return try {
  val bytes = ByteArray(length)
  buffer.get(bytes)
- return String(bytes, charset("UTF-8"))
+ String(bytes, charset("UTF-8"))
  } catch (e: UnsupportedEncodingException) {
  Log.e(javaClass.getName(), e.toString())
- return ""
+ ""
  }
  }
 }

haishinkit/src/main/java/com/haishinkit/amf/AMF0Serializer.kt

@@ -4,7 +4,7 @@ import com.haishinkit.amf.data.ASUndefined
 import java.util.Date
 import java.nio.ByteBuffer
 
-final internal class AMF0Serializer(private val buffer: ByteBuffer) {
+internal class AMF0Serializer(private val buffer: ByteBuffer) {
 
  fun putBoolean(value: Boolean): AMF0Serializer {
  buffer.put(AMF0Marker.BOOL.rawValue)

haishinkit/src/main/java/com/haishinkit/events/Event.kt

@@ -31,7 +31,7 @@ open class Event(type: String, bubbles: Boolean, data: Any?) {
  }
 
  companion object {
- val RTMP_STATUS = "rtmpStatus"
- var IO_ERROR = "ioError"
+ const val RTMP_STATUS = "rtmpStatus"
+ const val IO_ERROR = "ioError"
  }
 }

haishinkit/src/main/java/com/haishinkit/iso/AVCConfigurationRecord.kt

@@ -111,10 +111,10 @@ class AVCConfigurationRecord {
  }
 
  companion object {
- val RESERVE_LENGTH_SIZE_MINUS_ONE = 0x3F
- val RESERVE_NUM_OF_SEQUENCE_PARAMETER_SETS = 0xE0
- val RESERVE_CHROME_FORMAT = 0xFC
- val RESERVE_BIT_DEPTH_LUMA_MINUS8 = 0xF8
- val RESERVE_BIT_DEPTH_CHROME_MINUS8 = 0xF8
+ const val RESERVE_LENGTH_SIZE_MINUS_ONE = 0x3F
+ const val RESERVE_NUM_OF_SEQUENCE_PARAMETER_SETS = 0xE0
+ const val RESERVE_CHROME_FORMAT = 0xFC
+ const val RESERVE_BIT_DEPTH_LUMA_MINUS8 = 0xF8
+ const val RESERVE_BIT_DEPTH_CHROME_MINUS8 = 0xF8
  }
 }

haishinkit/src/main/java/com/haishinkit/iso/AudioSpecificConfig.kt

@@ -87,6 +87,6 @@ internal class AudioSpecificConfig {
  }
 
  companion object {
- val ADTS_HEADER_SIZE = 7
+ const val ADTS_HEADER_SIZE = 7
  }
 }

haishinkit/src/main/java/com/haishinkit/media/Audio.kt

@@ -79,7 +79,7 @@ class Audio: AudioRecord.OnRecordPositionUpdateListener, IDevice {
  currentPresentationTimestamp += timestamp()
  }
 
- fun timestamp():Double {
+ private fun timestamp():Double {
  return 1000000 * (minBufferSize.toDouble() / 2 / samplingRate.toDouble())
  }
 
@@ -88,8 +88,8 @@ class Audio: AudioRecord.OnRecordPositionUpdateListener, IDevice {
  }
 
  companion object {
- val DEFAULT_CHANNEL = AudioFormat.CHANNEL_IN_MONO
- val DEFAULT_ENCODING = AudioFormat.ENCODING_PCM_16BIT
- val DEFAULT_SAMPLING_RATE = 44100
+ const val DEFAULT_CHANNEL = AudioFormat.CHANNEL_IN_MONO
+ const val DEFAULT_ENCODING = AudioFormat.ENCODING_PCM_16BIT
+ const val DEFAULT_SAMPLING_RATE = 44100
  }
 }

haishinkit/src/main/java/com/haishinkit/media/Camera.kt

@@ -70,8 +70,8 @@ class Camera: SurfaceHolder.Callback, android.hardware.Camera.PreviewCallback, I
  }
 
  companion object {
- var DEFAULT_WIDTH:Int = 640
- var DEFAULT_HEIGHT:Int = 480
+ const val DEFAULT_WIDTH:Int = 640
+ const val DEFAULT_HEIGHT:Int = 480
  }
 }
 

haishinkit/src/main/java/com/haishinkit/media/codec/AACEncoder.kt

@@ -21,10 +21,10 @@ internal class AACEncoder : EncoderBase(MIME) {
  }
 
  companion object {
- val MIME = "audio/mp4a-latm"
+ const val MIME = "audio/mp4a-latm"
 
- val DEFAULT_SAMPLE_RATE:Int = 44100
- val DEFAULT_CHANNEL_COUNT:Int = 1
- val DEFAULT_BIT_RATE:Int = 64000
+ const val DEFAULT_SAMPLE_RATE:Int = 44100
+ const val DEFAULT_CHANNEL_COUNT:Int = 1
+ const val DEFAULT_BIT_RATE:Int = 64000
  }
 }

haishinkit/src/main/java/com/haishinkit/media/codec/H264Encoder.kt

@@ -40,13 +40,13 @@ internal class H264Encoder : EncoderBase(MIME) {
  }
 
  companion object {
- val MIME = "video/avc"
- val DEFAULT_BIT_RATE = 125000
- val DEFAULT_FRAME_RATE = 15
- val DEFAULT_I_FRAME_INTERVAL = 2
- val DEFAULT_WIDTH = 1920
- val DEFAULT_HEIGHT = 1080
- val DEFAULT_PROFILE = MediaCodecInfo.CodecProfileLevel.AVCProfileBaseline
- val DEFAULT_LEVEL = MediaCodecInfo.CodecProfileLevel.AVCLevel31
+ const val MIME = "video/avc"
+ const val DEFAULT_BIT_RATE = 125000
+ const val DEFAULT_FRAME_RATE = 15
+ const val DEFAULT_I_FRAME_INTERVAL = 2
+ const val DEFAULT_WIDTH = 1920
+ const val DEFAULT_HEIGHT = 1080
+ const val DEFAULT_PROFILE = MediaCodecInfo.CodecProfileLevel.AVCProfileBaseline
+ const val DEFAULT_LEVEL = MediaCodecInfo.CodecProfileLevel.AVCLevel31
  }
 }

haishinkit/src/main/java/com/haishinkit/media/util/MediaCodecUtils.kt

@@ -112,13 +112,13 @@ object MediaCodecUtils {
  }
 
  private fun isSupportedFormat(colorFormat: Int):Boolean {
- when (colorFormat) {
- MediaCodecInfo.CodecCapabilities.COLOR_FormatYUV420Planar -> return false
- MediaCodecInfo.CodecCapabilities.COLOR_FormatYUV420PackedPlanar -> return false
- MediaCodecInfo.CodecCapabilities.COLOR_FormatYUV420SemiPlanar -> return true
- MediaCodecInfo.CodecCapabilities.COLOR_FormatYUV420PackedSemiPlanar -> return true
- MediaCodecInfo.CodecCapabilities.COLOR_TI_FormatYUV420PackedSemiPlanar -> return true
- else -> return false
+ return when (colorFormat) {
+ MediaCodecInfo.CodecCapabilities.COLOR_FormatYUV420Planar -> false
+ MediaCodecInfo.CodecCapabilities.COLOR_FormatYUV420PackedPlanar -> false
+ MediaCodecInfo.CodecCapabilities.COLOR_FormatYUV420SemiPlanar -> true
+ MediaCodecInfo.CodecCapabilities.COLOR_FormatYUV420PackedSemiPlanar -> true
+ MediaCodecInfo.CodecCapabilities.COLOR_TI_FormatYUV420PackedSemiPlanar -> true
+ else -> false
  }
  }
 }

haishinkit/src/main/java/com/haishinkit/net/Socket.kt

@@ -15,7 +15,7 @@ import java.util.concurrent.ArrayBlockingQueue
 import java.util.concurrent.BlockingQueue
 
 abstract class Socket {
- protected var inputBuffer: ByteBuffer? = null
+ private var inputBuffer: ByteBuffer? = null
  private var socket: java.net.Socket? = null
  private var output: Thread? = null
  private var network: Thread? = null

haishinkit/src/main/java/com/haishinkit/rtmp/RTMPChunk.kt

@@ -161,10 +161,10 @@ internal enum class RTMPChunk(val rawValue: Byte) {
  }
 
  companion object {
- val CONTROL: Short = 0x02
- val COMMAND: Short = 0x03
- val AUDIO: Short = 0x04
- val VIDEO: Short = 0x05
- val DEFAULT_SIZE = 128
+ const val CONTROL: Short = 0x02
+ const val COMMAND: Short = 0x03
+ const val AUDIO: Short = 0x04
+ const val VIDEO: Short = 0x05
+ const val DEFAULT_SIZE = 128
  }
 }

haishinkit/src/main/java/com/haishinkit/rtmp/RTMPConnection.kt

@@ -216,17 +216,17 @@ open class RTMPConnection : EventDispatcher(null) {
  val paths = uri!!.path.split("/".toRegex()).dropLastWhile({ it.isEmpty() }).toTypedArray()
  val message = RTMPCommandMessage(RTMPObjectEncoding.AMF0)
  val commandObject = HashMap<String, Any?>()
- commandObject.put("app", paths[1])
- commandObject.put("flashVer", flashVer)
- commandObject.put("swfUrl", swfUrl)
- commandObject.put("tcUrl", uri!!.toString())
- commandObject.put("fpad", false)
- commandObject.put("capabilities", RTMPConnection.DEFAULT_CAPABILITIES)
- commandObject.put("audioCodecs", SupportSound.AAC.rawValue)
- commandObject.put("videoCodecs", SupportVideo.H264.rawValue)
- commandObject.put("videoFunction", VideoFunction.CLIENT_SEEK.rawValue)
- commandObject.put("pageUrl", pageUrl)
- commandObject.put("objectEncoding", objectEncoding.rawValue)
+ commandObject["app"] = paths[1]
+ commandObject["flashVer"] = flashVer
+ commandObject["swfUrl"] = swfUrl
+ commandObject["tcUrl"] = uri!!.toString()
+ commandObject["fpad"] = false
+ commandObject["capabilities"] = RTMPConnection.DEFAULT_CAPABILITIES
+ commandObject["audioCodecs"] = SupportSound.AAC.rawValue
+ commandObject["videoCodecs"] = SupportVideo.H264.rawValue
+ commandObject["videoFunction"] = VideoFunction.CLIENT_SEEK.rawValue
+ commandObject["pageUrl"] = pageUrl
+ commandObject["objectEncoding"] = objectEncoding.rawValue
  message.chunkStreamID = RTMPChunk.COMMAND
  message.streamID = 0
  message.commandName = "connect"
@@ -239,11 +239,11 @@ open class RTMPConnection : EventDispatcher(null) {
  }
 
  companion object {
- val DEFAULT_PORT = 1935
- val DEFAULT_FLASH_VER = "FMLE/3.0 (compatible; FMSc/1.0)"
+ const val DEFAULT_PORT = 1935
+ const val DEFAULT_FLASH_VER = "FMLE/3.0 (compatible; FMSc/1.0)"
  val DEFAULT_OBJECT_ENCODING = RTMPObjectEncoding.AMF0
 
- private val DEFAULT_CHUNK_SIZE_S = 1024 * 8
- private val DEFAULT_CAPABILITIES = 239
+ private const val DEFAULT_CHUNK_SIZE_S = 1024 * 8
+ private const val DEFAULT_CAPABILITIES = 239
  }
 }

haishinkit/src/main/java/com/haishinkit/rtmp/RTMPHandshake.kt

@@ -48,6 +48,6 @@ internal class RTMPHandshake {
  }
 
  companion object {
- var SIGNAL_SIZE = 1536
+ const val SIGNAL_SIZE = 1536
  }
 }

haishinkit/src/main/java/com/haishinkit/rtmp/RTMPStream.kt

@@ -230,7 +230,9 @@ open class RTMPStream(connection: RTMPConnection) : EventDispatcher(null) {
 
  if (streamName == null) {
  when (readyState) {
- RTMPStream.ReadyState.PLAYING -> connection?.socket?.doOutput(RTMPChunk.ZERO, message)
+ RTMPStream.ReadyState.PLAYING -> {
+ connection?.socket?.doOutput(RTMPChunk.ZERO, message)
+ }
  else -> {}
  }
  return

haishinkit/src/main/java/com/haishinkit/rtmp/messages/RTMPAACAudioMessage.kt

@@ -42,6 +42,6 @@ internal class RTMPAACAudioMessage : RTMPAudioMessage() {
  }
 
  companion object {
- private val AAC = (0x0A shl 4 or (0x03 shl 2) or (0x01 shl 1) or 0x01).toByte()
+ private const val AAC = (0x0A shl 4 or (0x03 shl 2) or (0x01 shl 1) or 0x01).toByte()
  }
 }

haishinkit/src/main/java/com/haishinkit/rtmp/messages/RTMPAbortMessage.kt

@@ -28,6 +28,6 @@ internal class RTMPAbortMessage : RTMPMessage(RTMPMessage.Type.ABORT) {
  }
 
  companion object {
- private val CAPACITY = 4
+ private const val CAPACITY = 4
  }
 }

haishinkit/src/main/java/com/haishinkit/rtmp/messages/RTMPAcknowledgementMessage.kt

@@ -31,6 +31,6 @@ internal class RTMPAcknowledgementMessage : RTMPMessage(RTMPMessage.Type.ACK) {
  }
 
  companion object {
- private val CAPACITY = 4
+ private const val CAPACITY = 4
  }
 }

haishinkit/src/main/java/com/haishinkit/rtmp/messages/RTMPCommandMessage.kt

@@ -14,7 +14,7 @@ import com.haishinkit.util.Log
 /**
  * 7.1.1. Command Message (20, 17)
  */
-internal class RTMPCommandMessage(val objectEncoding: RTMPObjectEncoding) : RTMPMessage(objectEncoding.commandType) {
+internal class RTMPCommandMessage(private val objectEncoding: RTMPObjectEncoding) : RTMPMessage(objectEncoding.commandType) {
  var commandName: String? = null
  var transactionID = 0
  var commandObject: Map<String, Any?>? = null
@@ -85,6 +85,6 @@ internal class RTMPCommandMessage(val objectEncoding: RTMPObjectEncoding) : RTMP
  }
 
  companion object {
- private val CAPACITY = 1024
+ private const val CAPACITY = 1024
  }
 }

haishinkit/src/main/java/com/haishinkit/rtmp/messages/RTMPDataMessage.kt

@@ -12,7 +12,7 @@ import java.util.ArrayList
 /**
  * 7.1.2. Data Message (18, 15)
  */
-internal class RTMPDataMessage(val objectEncoding: RTMPObjectEncoding) : RTMPMessage(objectEncoding.dataType) {
+internal class RTMPDataMessage(objectEncoding: RTMPObjectEncoding) : RTMPMessage(objectEncoding.dataType) {
  var handlerName: String? = null
  var arguments: ArrayList<Any?> = ArrayList()
 

haishinkit/src/main/java/com/haishinkit/rtmp/messages/RTMPMessage.kt

@@ -8,7 +8,7 @@ import org.apache.commons.lang3.NotImplementedException
 import org.apache.commons.lang3.builder.ToStringBuilder
 import java.nio.ByteBuffer
 
-open internal class RTMPMessage(val type: Type) {
+internal open class RTMPMessage(val type: Type) {
  enum class Type(val rawValue: Byte) {
  CHUNK_SIZE(0x01),
  ABORT(0x02),
@@ -51,18 +51,18 @@ open internal class RTMPMessage(val type: Type) {
 
  companion object {
  fun create(value: Byte): RTMPMessage {
- when (value) {
- Type.CHUNK_SIZE.rawValue -> return RTMPSetChunkSizeMessage()
- Type.ABORT.rawValue -> return RTMPAbortMessage()
- Type.ACK.rawValue -> return RTMPAcknowledgementMessage()
- Type.USER.rawValue -> return RTMPUserControlMessage()
- Type.WINDOW_ACK.rawValue -> return RTMPWindowAcknowledgementSizeMessage()
- Type.BANDWIDTH.rawValue -> return RTMPSetPeerBandwidthMessage()
- Type.AUDIO.rawValue -> return RTMPAudioMessage()
- Type.VIDEO.rawValue -> return RTMPVideoMessage()
- Type.AMF0_DATA.rawValue -> return RTMPDataMessage(RTMPObjectEncoding.AMF0)
- Type.AMF0_COMMAND.rawValue -> return RTMPCommandMessage(RTMPObjectEncoding.AMF0)
- else -> return RTMPMessage(Type.UNKNOWN)
+ return when (value) {
+ Type.CHUNK_SIZE.rawValue -> RTMPSetChunkSizeMessage()
+ Type.ABORT.rawValue -> RTMPAbortMessage()
+ Type.ACK.rawValue -> RTMPAcknowledgementMessage()
+ Type.USER.rawValue -> RTMPUserControlMessage()
+ Type.WINDOW_ACK.rawValue -> RTMPWindowAcknowledgementSizeMessage()
+ Type.BANDWIDTH.rawValue -> RTMPSetPeerBandwidthMessage()
+ Type.AUDIO.rawValue -> RTMPAudioMessage()
+ Type.VIDEO.rawValue -> RTMPVideoMessage()
+ Type.AMF0_DATA.rawValue -> RTMPDataMessage(RTMPObjectEncoding.AMF0)
+ Type.AMF0_COMMAND.rawValue -> RTMPCommandMessage(RTMPObjectEncoding.AMF0)
+ else -> RTMPMessage(Type.UNKNOWN)
  }
  }
  }

haishinkit/src/main/java/com/haishinkit/rtmp/messages/RTMPSetChunkSizeMessage.kt

@@ -28,6 +28,6 @@ internal class RTMPSetChunkSizeMessage : RTMPMessage(RTMPMessage.Type.CHUNK_SIZE
  }
 
  companion object {
- private val CAPACITY = 4
+ private const val CAPACITY = 4
  }
 }

haishinkit/src/main/java/com/haishinkit/rtmp/messages/RTMPSetPeerBandwidthMessage.kt

@@ -41,6 +41,6 @@ internal class RTMPSetPeerBandwidthMessage : RTMPMessage(RTMPMessage.Type.BANDWI
  }
 
  companion object {
- private val CAPACITY = 5
+ private const val CAPACITY = 5
  }
 }

haishinkit/src/main/java/com/haishinkit/rtmp/messages/RTMPUserControlMessage.kt

@@ -69,7 +69,7 @@ internal class RTMPUserControlMessage : RTMPMessage(RTMPMessage.Type.USER) {
  }
 
  companion object {
- private val CAPACITY = 6
+ private const val CAPACITY = 6
  }
 }
 

haishinkit/src/main/java/com/haishinkit/rtmp/messages/RTMPVideoMessage.kt

@@ -5,7 +5,7 @@ import com.haishinkit.rtmp.RTMPSocket
 
 import java.nio.ByteBuffer
 
-open internal class RTMPVideoMessage : RTMPMessage(RTMPMessage.Type.VIDEO) {
+internal open class RTMPVideoMessage : RTMPMessage(RTMPMessage.Type.VIDEO) {
  var frame: Byte = 0x00
  var codec: Byte = 0x00
  var payload: ByteBuffer? = null

haishinkit/src/main/java/com/haishinkit/rtmp/messages/RTMPWindowAcknowledgementSizeMessage.kt

@@ -32,6 +32,6 @@ internal class RTMPWindowAcknowledgementSizeMessage : RTMPMessage(RTMPMessage.Ty
  }
 
  companion object {
- private val CAPACITY = 4
+ private const val CAPACITY = 4
  }
 }