Merge branch 'master' into dev/3.2.0

AgoraIO-Extensions · Dec 18, 2020 · de52ca6 · de52ca6
2 parents ddeaefb + 75f572d
commit de52ca6
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/Callback.kt b/Callback.kt
@@ -5,7 +5,7 @@ import io.agora.rtc.RtcEngine
 import kotlin.math.abs
 
 abstract class Callback {
-  fun code(code: Int?, runnable: ((Int) -> Any?)? = null) {
+  fun code(code: Int?, runnable: ((Int?) -> Any?)? = null) {
     if (code == null || code < 0) {
       val newCode = abs(code ?: Constants.ERR_NOT_INITIALIZED)
       failure(newCode.toString(), RtcEngine.getErrorDescription(newCode))

diff --git a/MediaObserver.kt b/MediaObserver.kt
@@ -32,9 +32,7 @@ class MediaObserver(
 
   override fun onMetadataReceived(buffer: ByteArray, uid: Int, timeStampMs: Long) {
     emit(hashMapOf(
-      "buffer" to String(buffer),
-      "uid" to uid,
-      "timeStampMs" to timeStampMs
+      "data" to arrayListOf(String(buffer), uid, timeStampMs)
     ))
   }
 }
diff --git a/RtcSurfaceView.kt b/RtcSurfaceView.kt
@@ -71,6 +71,7 @@ class RtcSurfaceView(
     surface.setZOrderMediaOverlay(isMediaOverlay)
     surface.setZOrderOnTop(onTop)
     addView(surface)
+    surface.layout(0, 0, width, height)
     canvas.view = surface
     if (canvas.uid == 0) {
       engine.setupLocalVideo(canvas)

diff --git a/RtcTextureView.kt b/RtcTextureView.kt
@@ -45,6 +45,7 @@ class RtcTextureView(
     removeAllViews()
     texture = RtcEngine.CreateTextureView(context.applicationContext)
     addView(texture)
+    texture.layout(0, 0, width, height)
     canvas.view = texture
     if (canvas.uid == 0) {
       engine.setupLocalVideo(canvas)