Rename NetStream to Stream.

app/src/main/java/com/haishinkit/app/CameraTabFragment.kt

@@ -27,13 +27,13 @@ import com.haishinkit.graphics.effect.DefaultVideoEffect
 import com.haishinkit.graphics.effect.MonochromeVideoEffect
 import com.haishinkit.media.AudioRecordSource
 import com.haishinkit.media.Camera2Source
-import com.haishinkit.metrics.Rectangle
+import com.haishinkit.util.Rectangle
 import com.haishinkit.rtmp.RtmpConnection
 import com.haishinkit.rtmp.RtmpStream
 import com.haishinkit.screen.Screen
 import com.haishinkit.screen.ScreenObject
 import com.haishinkit.screen.Text
-import com.haishinkit.view.NetStreamDrawable
+import com.haishinkit.media.StreamDrawable
 import java.io.File
 import java.io.FileOutputStream
 import java.util.Date
@@ -47,7 +47,7 @@ class CameraTabFragment : Fragment(), IEventListener {
 
     private lateinit var connection: RtmpConnection
     private lateinit var stream: RtmpStream
-    private lateinit var cameraView: NetStreamDrawable
+    private lateinit var cameraView: StreamDrawable
     private lateinit var cameraSource: Camera2Source
     private val text: Text by lazy { Text() }
     private val callback: Screen.Callback by lazy { Callback(this) }

app/src/main/java/com/haishinkit/app/PlaybackTabFragment.kt

@@ -14,12 +14,12 @@ import com.haishinkit.event.IEventListener
 import com.haishinkit.graphics.VideoGravity
 import com.haishinkit.rtmp.RtmpConnection
 import com.haishinkit.rtmp.RtmpStream
-import com.haishinkit.view.NetStreamDrawable
+import com.haishinkit.media.StreamDrawable
 
 class PlaybackTabFragment : Fragment(), IEventListener {
     private lateinit var connection: RtmpConnection
     private lateinit var stream: RtmpStream
-    private lateinit var playbackView: NetStreamDrawable
+    private lateinit var playbackView: StreamDrawable
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)

haishinkit/src/main/java/com/haishinkit/gles/Framebuffer.kt

@@ -4,7 +4,7 @@ import android.graphics.Point
 import android.opengl.GLES20
 import android.util.Log
 import android.util.Size
-import com.haishinkit.metrics.Rectangle
+import com.haishinkit.util.Rectangle
 
 internal class Framebuffer {
     val isEnabled: Boolean

haishinkit/src/main/java/com/haishinkit/gles/screen/Screen.kt

@@ -8,8 +8,8 @@ import com.haishinkit.gles.Framebuffer
 import com.haishinkit.gles.GraphicsContext
 import com.haishinkit.gles.Utils
 import com.haishinkit.lang.Running
-import com.haishinkit.metrics.Rectangle
 import com.haishinkit.screen.ScreenObject
+import com.haishinkit.util.Rectangle
 import java.util.concurrent.atomic.AtomicBoolean
 
 internal class Screen(applicationContext: Context) :

haishinkit/src/main/java/com/haishinkit/gles/screen/ThreadScreen.kt

@@ -5,9 +5,9 @@ import android.os.HandlerThread
 import android.os.Looper
 import android.os.Message
 import com.haishinkit.gles.GraphicsContext
-import com.haishinkit.metrics.Rectangle
 import com.haishinkit.screen.Screen
 import com.haishinkit.screen.ScreenObject
+import com.haishinkit.util.Rectangle
 import java.lang.ref.WeakReference
 
 internal class ThreadScreen(applicationContext: Context) : Screen(applicationContext) {

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

@@ -10,7 +10,6 @@ import android.os.Build
 import android.util.Log
 import androidx.core.app.ActivityCompat
 import com.haishinkit.BuildConfig
-import com.haishinkit.net.NetStream
 import java.nio.ByteBuffer
 import java.util.concurrent.atomic.AtomicBoolean
 
@@ -25,7 +24,7 @@ class AudioRecordSource(
     var audioSource = DEFAULT_AUDIO_SOURCE
     var sampleRate = DEFAULT_SAMPLE_RATE
 
-    override var stream: NetStream? = null
+    override var stream: Stream? = null
     override val isRunning = AtomicBoolean(false)
 
     var minBufferSize = -1

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

@@ -16,7 +16,6 @@ import android.util.Size
 import android.view.Surface
 import com.haishinkit.BuildConfig
 import com.haishinkit.graphics.ImageOrientation
-import com.haishinkit.net.NetStream
 import com.haishinkit.screen.Video
 import java.util.concurrent.atomic.AtomicBoolean
 
@@ -39,7 +38,7 @@ class Camera2Source(context: Context) : VideoSource, CameraDevice.StateCallback(
         }
     var characteristics: CameraCharacteristics? = null
         private set
-    override var stream: NetStream? = null
+    override var stream: Stream? = null
     override val isRunning = AtomicBoolean(false)
     override val screen: Video by lazy {
         Video().apply {

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

@@ -3,14 +3,13 @@ package com.haishinkit.media
 import android.graphics.Point
 import android.util.Size
 import android.view.Surface
-import com.haishinkit.metrics.Rectangle
-import com.haishinkit.net.NetStream
 import com.haishinkit.screen.Video
+import com.haishinkit.util.Rectangle
 import java.util.concurrent.atomic.AtomicBoolean
 
 internal class MediaCodecSource(val size: Size) : VideoSource, Video.OnSurfaceChangedListener {
     override val isRunning: AtomicBoolean = AtomicBoolean(false)
-    override var stream: NetStream? = null
+    override var stream: Stream? = null
     override val screen: Video by lazy {
         Video().apply {
             isRotatesWithContent = false

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

@@ -18,9 +18,8 @@ import android.view.WindowManager
 import androidx.annotation.ChecksSdkIntAtLeast
 import com.haishinkit.BuildConfig
 import com.haishinkit.graphics.ImageOrientation
-import com.haishinkit.metrics.Rectangle
-import com.haishinkit.net.NetStream
 import com.haishinkit.screen.Video
+import com.haishinkit.util.Rectangle
 import com.haishinkit.util.swap
 import java.util.concurrent.atomic.AtomicBoolean
 
@@ -64,7 +63,7 @@ class MediaProjectionSource(
 
     var isRotatesWithContent = true
 
-    override var stream: NetStream? = null
+    override var stream: Stream? = null
     override val isRunning = AtomicBoolean(false)
     override val screen: Video by lazy { Video() }
     private var virtualDisplay: VirtualDisplay? = null

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

@@ -1,14 +1,13 @@
 package com.haishinkit.media
 
 import com.haishinkit.lang.Running
-import com.haishinkit.net.NetStream
 import java.nio.ByteBuffer
 
 /**
  * An interface that captures a source.
  */
 interface Source : Running {
-    var stream: NetStream?
+    var stream: Stream?
     val currentPresentationTimestamp: Long
         get() = 0
 

haishinkit/src/main/java/com/haishinkit/net/NetStream.kt → haishinkit/src/main/java/com/haishinkit/media/Stream.kt

@@ -1,4 +1,4 @@
-package com.haishinkit.net
+package com.haishinkit.media
 
 import android.content.Context
 import android.media.AudioAttributes
@@ -12,16 +12,13 @@ import com.haishinkit.codec.AudioCodec
 import com.haishinkit.codec.VideoCodec
 import com.haishinkit.graphics.effect.DefaultVideoEffect
 import com.haishinkit.graphics.effect.VideoEffect
-import com.haishinkit.media.AudioSource
-import com.haishinkit.media.VideoSource
 import com.haishinkit.screen.Screen
-import com.haishinkit.view.NetStreamDrawable
 
 /**
  * The NetStream class is the foundation of a RtmpStream.
  */
 @Suppress("UNUSED")
-abstract class NetStream(applicationContext: Context) {
+abstract class Stream(applicationContext: Context) {
     /**
      * The offscreen renderer for video output.
      */
@@ -58,7 +55,7 @@ abstract class NetStream(applicationContext: Context) {
     /**
      * Specifies the NetStreamDrawable object.
      */
-    var drawable: NetStreamDrawable? = null
+    var drawable: StreamDrawable? = null
 
     /**
      * The current audioSource object.
@@ -183,6 +180,6 @@ abstract class NetStream(applicationContext: Context) {
     }
 
     companion object {
-        private val TAG = NetStream::class.java.simpleName
+        private val TAG = Stream::class.java.simpleName
     }
 }

haishinkit/src/main/java/com/haishinkit/view/NetStreamDrawable.kt → haishinkit/src/main/java/com/haishinkit/media/StreamDrawable.kt

@@ -1,11 +1,10 @@
-package com.haishinkit.view
+package com.haishinkit.media
 
 import android.graphics.Bitmap
 import com.haishinkit.graphics.VideoGravity
 import com.haishinkit.graphics.effect.VideoEffect
-import com.haishinkit.net.NetStream
 
-interface NetStreamDrawable {
+interface StreamDrawable {
     /**
      * Specifies the videoGravity how the displays the visual content.
      */
@@ -24,7 +23,7 @@ interface NetStreamDrawable {
     /**
      * Attaches a video stream to the view.
      */
-    fun attachStream(stream: NetStream?)
+    fun attachStream(stream: Stream?)
 
     /**
      * Reads the pixels of a displayed image.

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

@@ -10,7 +10,7 @@ import com.haishinkit.event.IEventDispatcher
 import com.haishinkit.event.IEventListener
 import com.haishinkit.flv.FlvAudioCodec
 import com.haishinkit.flv.FlvVideoCodec
-import com.haishinkit.net.NetStream
+import com.haishinkit.media.Stream
 import com.haishinkit.rtmp.message.RtmpCommandMessage
 import com.haishinkit.rtmp.message.RtmpDataMessage
 import com.haishinkit.rtmp.message.RtmpMessage
@@ -22,7 +22,7 @@ import java.util.concurrent.atomic.AtomicInteger
  */
 @Suppress("UNUSED", "MemberVisibilityCanBePrivate")
 class RtmpStream(context: Context, internal var connection: RtmpConnection) :
-    NetStream(context),
+    Stream(context),
     IEventDispatcher {
     data class Info(
         var resourceName: String? = null

haishinkit/src/main/java/com/haishinkit/screen/ScreenObject.kt

@@ -2,8 +2,8 @@ package com.haishinkit.screen
 
 import android.graphics.Point
 import android.opengl.GLES20
-import com.haishinkit.metrics.EdgeInsets
-import com.haishinkit.metrics.Rectangle
+import com.haishinkit.util.EdgeInsets
+import com.haishinkit.util.Rectangle
 import kotlin.math.max
 
 /**

haishinkit/src/main/java/com/haishinkit/metrics/EdgeInsets.kt → haishinkit/src/main/java/com/haishinkit/util/EdgeInsets.kt

@@ -1,4 +1,4 @@
-package com.haishinkit.metrics
+package com.haishinkit.util
 
 data class EdgeInsets(var top: Int, var left: Int, var bottom: Int, var right: Int) {
     fun set(top: Int, left: Int, bottom: Int, right: Int) {

haishinkit/src/main/java/com/haishinkit/metrics/Rectangle.kt → haishinkit/src/main/java/com/haishinkit/util/Rectangle.kt

@@ -1,4 +1,4 @@
-package com.haishinkit.metrics
+package com.haishinkit.util
 
 import android.graphics.Point
 import android.util.Size

haishinkit/src/main/java/com/haishinkit/view/HkSurfaceView.kt

@@ -10,7 +10,8 @@ import android.view.WindowManager
 import com.haishinkit.graphics.PixelTransform
 import com.haishinkit.graphics.VideoGravity
 import com.haishinkit.graphics.effect.VideoEffect
-import com.haishinkit.net.NetStream
+import com.haishinkit.media.Stream
+import com.haishinkit.media.StreamDrawable
 
 /**
  * A view that displays a video content of a NetStream object which uses [SurfaceView].
@@ -22,7 +23,7 @@ constructor(
     attrs: AttributeSet? = null,
     defStyleAttr: Int = 0,
     defStyleRes: Int = 0
-) : SurfaceView(context, attrs, defStyleAttr, defStyleRes), NetStreamDrawable {
+) : SurfaceView(context, attrs, defStyleAttr, defStyleRes), StreamDrawable {
 
     override var videoGravity: VideoGravity
         get() = pixelTransform.videoGravity
@@ -44,7 +45,7 @@ constructor(
 
     private val pixelTransform: PixelTransform by lazy { PixelTransform.create(context) }
 
-    private var stream: NetStream? = null
+    private var stream: Stream? = null
         set(value) {
             field?.drawable = null
             field = value
@@ -80,7 +81,7 @@ constructor(
         )
     }
 
-    override fun attachStream(stream: NetStream?) {
+    override fun attachStream(stream: Stream?) {
         this.stream = stream
     }
 

haishinkit/src/main/java/com/haishinkit/view/HkTextureView.kt

@@ -11,7 +11,8 @@ import android.view.WindowManager
 import com.haishinkit.graphics.PixelTransform
 import com.haishinkit.graphics.VideoGravity
 import com.haishinkit.graphics.effect.VideoEffect
-import com.haishinkit.net.NetStream
+import com.haishinkit.media.Stream
+import com.haishinkit.media.StreamDrawable
 
 /**
  * A view that displays a video content of a NetStream object which uses [TextureView].
@@ -25,7 +26,7 @@ constructor(
     defStyleRes: Int = 0
 ) :
     TextureView(context, attrs, defStyleAttr, defStyleRes),
-    NetStreamDrawable,
+    StreamDrawable,
     TextureView.SurfaceTextureListener {
     override var videoGravity: VideoGravity
         get() = pixelTransform.videoGravity
@@ -47,7 +48,7 @@ constructor(
 
     private val pixelTransform: PixelTransform by lazy { PixelTransform.create(context) }
 
-    private var stream: NetStream? = null
+    private var stream: Stream? = null
         set(value) {
             field?.drawable = null
             field = value
@@ -59,7 +60,7 @@ constructor(
         surfaceTextureListener = this
     }
 
-    override fun attachStream(stream: NetStream?) {
+    override fun attachStream(stream: Stream?) {
         this.stream = stream
     }