diff --git a/src/src/Settings.cpp b/src/src/Settings.cpp index 645dc00c..725aa15b 100644 --- a/src/src/Settings.cpp +++ b/src/src/Settings.cpp @@ -54,12 +54,8 @@ void Settings::init() if (DataManager::instance()->encodeEnv() == FFmpeg_Env) { if (DataManager::instance()->encExists()) { GlobalUtils::loadCameraConf(); - if (!GlobalUtils::isLowPerformanceBoard()) { - videoFormatList << tr("mp4") << tr("webm"); - } else { - videoFormatList << tr("webm") << tr("mp4"); - } - + // webm 作为默认格式(索引0),mp4 作为备选(索引1) + videoFormatList << tr("webm") << tr("mp4"); } else { videoFormatList << tr("webm"); m_settings->setOption("outsetting.outformat.vidformat", 0); diff --git a/src/src/videowidget.cpp b/src/src/videowidget.cpp index 58f28dd5..92e619dc 100644 --- a/src/src/videowidget.cpp +++ b/src/src/videowidget.cpp @@ -222,14 +222,17 @@ videowidget::videowidget(DWidget *parent) // 默认不显示网格线 setGridType(Grid_None); - if (DataManager::instance()->encodeEnv() != FFmpeg_Env || !DataManager::instance()->encExists() || GlobalUtils::isLowPerformanceBoard()) { + // 默认使用 webm 格式 + if (DataManager::instance()->encodeEnv() != FFmpeg_Env || !DataManager::instance()->encExists()) { m_videoFormat = "webm"; - } - if (dc::Settings::get().getOption("outsetting.outformat.vidformat").toInt()) { - if (!GlobalUtils::isLowPerformanceBoard()) - m_videoFormat = "webm"; - else + } else { + // 根据配置选择格式:0=webm(默认), 1=mp4 + int formatIndex = dc::Settings::get().getOption("outsetting.outformat.vidformat").toInt(); + if (formatIndex == 1) { m_videoFormat = "mp4"; + } else { + m_videoFormat = "webm"; + } } }