From 97c16ab73538122d06aec9a42bdbcdbfbc24c86a Mon Sep 17 00:00:00 2001 From: xiaowusky Date: Mon, 29 Jan 2024 15:59:16 +0800 Subject: [PATCH] =?UTF-8?q?desc:=E5=A3=B0=E5=85=89=E6=8A=A5=E8=AD=A6?= =?UTF-8?q?=E5=99=A8gpio=E6=94=B9=E4=B8=BA140?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/yinuo/safetywatcher/watcher/ui/HomeActivity.kt | 1 - .../com/yinuo/safetywatcher/watcher/utils/LztekUtil.kt | 1 - .../com/yinuo/safetywatcher/watcher/utils/SoundUtils.kt | 6 +++--- .../yinuo/library/vlc/encoder/VideoEncoderCoreAvc.java | 1 - .../yinuo/library/vlc/encoder/VideoEncoderCoreHevc.java | 1 - library-push/src/main/java/org/easydarwin/PushHelper.kt | 9 +-------- .../src/main/java/org/easydarwin/push/HWConsumer.java | 2 ++ 7 files changed, 6 insertions(+), 15 deletions(-) diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/HomeActivity.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/HomeActivity.kt index 6deb895..1f1cf1e 100644 --- a/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/HomeActivity.kt +++ b/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/HomeActivity.kt @@ -120,7 +120,6 @@ class HomeActivity : NoOptionsActivity() { private fun onCameraOpen() { // 启动推送 PushHelper.opSwitch(true) - PushHelper.startStream(true) // 开启GPIO GPIOUtils.openCamera() setForCamera() diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/utils/LztekUtil.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/utils/LztekUtil.kt index c6f1078..f69c592 100644 --- a/app/src/main/java/com/yinuo/safetywatcher/watcher/utils/LztekUtil.kt +++ b/app/src/main/java/com/yinuo/safetywatcher/watcher/utils/LztekUtil.kt @@ -62,7 +62,6 @@ object LztekUtil { this.rtspUrl = str rtspUrl?.let { PushHelper.setPushUrl(it) - PushHelper.startStream(true) } } diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/utils/SoundUtils.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/utils/SoundUtils.kt index dafbabc..f3751a8 100644 --- a/app/src/main/java/com/yinuo/safetywatcher/watcher/utils/SoundUtils.kt +++ b/app/src/main/java/com/yinuo/safetywatcher/watcher/utils/SoundUtils.kt @@ -40,14 +40,14 @@ object SoundUtils { if (soundPlaying) { return } - GPIOUtils.setGpioDirection(152, "out") + GPIOUtils.setGpioDirection(140, "out") var gpioValue = 0 soundPlaying = true GlobalScope.launch(Dispatchers.IO) { while (soundPlaying) { gpioValue = if (gpioValue > 0) 0 else 1 LogUtils.w("cyy gpioValue ${gpioValue}") - GPIOUtils.setGpioValue(152, gpioValue) + GPIOUtils.setGpioValue(140, gpioValue) delay(500) } } @@ -55,6 +55,6 @@ object SoundUtils { fun stopSoundIo() { soundPlaying = false - GPIOUtils.setGpioValue(152, 0) + GPIOUtils.setGpioValue(140, 0) } } \ No newline at end of file diff --git a/library-push/src/main/java/com/yinuo/library/vlc/encoder/VideoEncoderCoreAvc.java b/library-push/src/main/java/com/yinuo/library/vlc/encoder/VideoEncoderCoreAvc.java index 6b56178..256e38d 100644 --- a/library-push/src/main/java/com/yinuo/library/vlc/encoder/VideoEncoderCoreAvc.java +++ b/library-push/src/main/java/com/yinuo/library/vlc/encoder/VideoEncoderCoreAvc.java @@ -53,7 +53,6 @@ public class VideoEncoderCoreAvc extends MediaEncoderCore { public VideoEncoderCoreAvc(AndroidMuxer muxer, int width, int height) { super(muxer); prepareEncoder(width, height); - PushHelper.INSTANCE.startStream(false); } private void prepareEncoder(int width, int height) { diff --git a/library-push/src/main/java/com/yinuo/library/vlc/encoder/VideoEncoderCoreHevc.java b/library-push/src/main/java/com/yinuo/library/vlc/encoder/VideoEncoderCoreHevc.java index 8f1e1b7..bba4374 100644 --- a/library-push/src/main/java/com/yinuo/library/vlc/encoder/VideoEncoderCoreHevc.java +++ b/library-push/src/main/java/com/yinuo/library/vlc/encoder/VideoEncoderCoreHevc.java @@ -53,7 +53,6 @@ public class VideoEncoderCoreHevc extends MediaEncoderCore { public VideoEncoderCoreHevc(AndroidMuxer muxer, int width, int height) { super(muxer); prepareEncoder(width, height); - PushHelper.INSTANCE.startStream(true); } private void prepareEncoder(int width, int height) { diff --git a/library-push/src/main/java/org/easydarwin/PushHelper.kt b/library-push/src/main/java/org/easydarwin/PushHelper.kt index e0302c7..a56e601 100644 --- a/library-push/src/main/java/org/easydarwin/PushHelper.kt +++ b/library-push/src/main/java/org/easydarwin/PushHelper.kt @@ -59,13 +59,6 @@ object PushHelper { } } - fun startStream(hevc: Boolean) { - if (switchOpen) { - stop() - initHelper(hevc) - } - } - fun stop() { mPusher?.stop() mInitialized = false @@ -82,7 +75,7 @@ object PushHelper { } if (!mInitialized) { LogUtils.e("PushHelper error, please init first!!") - return + initHelper(true) } mPusher?.push(h264, 0, length, timeStamp, type) } diff --git a/library-rtsp/src/main/java/org/easydarwin/push/HWConsumer.java b/library-rtsp/src/main/java/org/easydarwin/push/HWConsumer.java index 951c5ec..08295ba 100644 --- a/library-rtsp/src/main/java/org/easydarwin/push/HWConsumer.java +++ b/library-rtsp/src/main/java/org/easydarwin/push/HWConsumer.java @@ -130,6 +130,8 @@ public class HWConsumer extends Thread implements VideoConsumer { if (androidMuxer != null && mTrackIndex != -1) { androidMuxer.writeSampleData(mTrackIndex, outputBuffer, bufferInfo); } + outputBuffer.position(bufferInfo.offset); + outputBuffer.limit(bufferInfo.offset + bufferInfo.size); byte[] outData = new byte[bufferInfo.size]; outputBuffer.get(outData); int offset = 4;