Skip to content

Commit 20ce5db

Browse files
committed
升级p2p sdk,启动跟随设备配置;修复自定义保存裸流功能
1 parent 7c25490 commit 20ce5db

File tree

3 files changed

+12
-3
lines changed

3 files changed

+12
-3
lines changed

sdk/video-link-android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ dependencies {
5050
// api('com.tencent.iot.thirdparty.android:xp2p-sdk:latest.integration') {
5151
// changing = true
5252
// }
53-
api 'com.tencent.iot.thirdparty.android:xp2p-sdk:2.4.57'
53+
api 'com.tencent.iot.thirdparty.android:xp2p-sdk:2.4.58'
5454
api 'com.tencent.iot.thirdparty.android:iot-gvoice-android:1.0.4'
5555
api 'com.tencent.iot.thirdparty.android:media-server:1.0.8'
5656
api 'com.tencent.iot.thirdparty.android:iot-soundtouch:1.0.2'

sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/video/preview/VideoPreviewActivity.kt

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import android.graphics.SurfaceTexture
99
import android.media.AudioFormat
1010
import android.media.AudioManager
1111
import android.os.Bundle
12+
import android.os.Environment
1213
import android.os.Handler
1314
import android.os.Message
1415
import android.text.TextUtils
@@ -134,6 +135,8 @@ class VideoPreviewActivity : VideoPreviewBaseActivity<ActivityVideoPreviewBindin
134135
}
135136
getDeviceP2PInfo()
136137
XP2P.setCallback(this)
138+
// val filaPath = getExternalFilesDir(Environment.DIRECTORY_DOCUMENTS)?.absolutePath + "/data_video.flv"
139+
// XP2P.recordstreamPath(filaPath) //自定义采集裸流路径
137140
//实例化对象并设置监听器
138141
volumeChangeObserver = VolumeChangeObserver(this)
139142
volumeChangeObserver?.volumeChangeListener = this
@@ -186,7 +189,6 @@ class VideoPreviewActivity : VideoPreviewBaseActivity<ActivityVideoPreviewBindin
186189

187190
private fun delegateHttpFlv() {
188191
val id = "${presenter.getProductId()}/${presenter.getDeviceName()}"
189-
// XP2P.recordstreamPath("/storage/emulated/0/data_video.flv") //自定义采集裸流路径
190192
// XP2P.recordstream(id) //开启自定义采集裸流
191193
val prefix = XP2P.delegateHttpFlv(id)
192194
if (prefix.isNotEmpty()) {
@@ -449,6 +451,11 @@ class VideoPreviewActivity : VideoPreviewBaseActivity<ActivityVideoPreviewBindin
449451
}
450452

451453
player.setOnInfoListener(this@VideoPreviewActivity)
454+
player.setOnPreparedListener(object : IMediaPlayer.OnPreparedListener {
455+
override fun onPrepared(mp: IMediaPlayer?) {
456+
}
457+
458+
})
452459
player.reset()
453460
player.setOption(IjkMediaPlayer.OPT_CATEGORY_FORMAT, "analyzemaxduration", 100)
454461
player.setOption(IjkMediaPlayer.OPT_CATEGORY_FORMAT, "probesize", 50 * 1024)

sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/video/preview/VideoTestActivity.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import android.content.pm.ActivityInfo
66
import android.graphics.SurfaceTexture
77
import android.media.AudioFormat
88
import android.media.AudioManager
9+
import android.os.Environment
910
import android.os.Handler
1011
import android.os.Message
1112
import android.text.TextUtils
@@ -117,6 +118,8 @@ class VideoTestActivity : VideoBaseActivity<ActivityVideoTestBinding>(), XP2PCal
117118
binding.tvVideoQuality.text = getString(R.string.video_quality_medium_str)
118119

119120
XP2P.setCallback(this)
121+
// val filaPath = getExternalFilesDir(Environment.DIRECTORY_DOCUMENTS)?.absolutePath + "/data_video.flv"
122+
// XP2P.recordstreamPath(filaPath) //自定义采集裸流路径
120123
val wm = this.getSystemService(WINDOW_SERVICE) as WindowManager
121124
val dm = DisplayMetrics()
122125
wm.defaultDisplay.getMetrics(dm)
@@ -169,7 +172,6 @@ class VideoTestActivity : VideoBaseActivity<ActivityVideoTestBinding>(), XP2PCal
169172

170173
private fun delegateHttpFlv() {
171174
val id = "${productId}/${deviceName}"
172-
// XP2P.recordstreamPath("/storage/emulated/0/data_video.flv") //自定义采集裸流路径
173175
// XP2P.recordstream(id) //开启自定义采集裸流
174176
val prefix = XP2P.delegateHttpFlv(id)
175177
if (prefix.isNotEmpty()) {

0 commit comments

Comments
 (0)