From d4cc57e0dd563d953ccff757e58614c5a52c3a28 Mon Sep 17 00:00:00 2001 From: xiaowusky Date: Mon, 18 Dec 2023 17:08:08 +0800 Subject: [PATCH] =?UTF-8?q?desc:=E6=8E=A8=E9=80=81=E5=B0=8F=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/yinuo/safetywatcher/watcher/ui/HomeActivity.kt | 2 +- .../java/com/yinuo/library/vlc/encoder/MediaCodecManager.java | 4 ++-- 2 files changed, 3 insertions(+), 3 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 dbea929..8216adb 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 @@ -225,7 +225,7 @@ class HomeActivity : NoOptionsActivity() { if (!AppData.hasSensorData()) { // 有传感器数据回调 AppData.setSensorData(true) -// closeLoadingDialog() + closeLoadingDialog() changeViewStatus() } watchSensor(DELAY_TIME_CHECK_SENSOR) diff --git a/library-push/src/main/java/com/yinuo/library/vlc/encoder/MediaCodecManager.java b/library-push/src/main/java/com/yinuo/library/vlc/encoder/MediaCodecManager.java index 41bed30..5ef2931 100644 --- a/library-push/src/main/java/com/yinuo/library/vlc/encoder/MediaCodecManager.java +++ b/library-push/src/main/java/com/yinuo/library/vlc/encoder/MediaCodecManager.java @@ -173,12 +173,12 @@ public class MediaCodecManager { int videoH = rotation == 90 || rotation == 270 ? dstWidth : dstHeight; mediaFormat = MediaFormat.createVideoFormat(MIME_TYPE,//注意这里旋转后有一个大坑，就是要交换mHeight，和mWidth的位置。否则录制出来的视频时花屏的。 videoW, videoH); - int frameRate = 24; // 15fps + int frameRate = 17; // 15fps int compressRatio = 256; int bitRate = dstWidth * dstHeight * 3 * 8 * frameRate / compressRatio; mediaFormat.setInteger(MediaFormat.KEY_BIT_RATE, bitRate); - mediaFormat.setInteger(MediaFormat.KEY_FRAME_RATE, (int) (frameRate * 0.3)); + mediaFormat.setInteger(MediaFormat.KEY_FRAME_RATE, frameRate); mediaFormat.setInteger(MediaFormat.KEY_COLOR_FORMAT, mColorFormat); mediaFormat.setInteger(MediaFormat.KEY_I_FRAME_INTERVAL, 3); LogUtils.w("prepare format: " + mediaFormat);