diff --git a/cloudphone/src/main/cpp/CasCommon.h b/cloudphone/src/main/cpp/CasCommon.h index 7ac8ad2f20712c690e4dbb3ea8e3985dcb107426..b6f9d2964d78c89567bff1e82af92b48f8c21502 100644 --- a/cloudphone/src/main/cpp/CasCommon.h +++ b/cloudphone/src/main/cpp/CasCommon.h @@ -34,11 +34,11 @@ const std::string KEY_CLIENT_TYPE = "client_type"; const std::string KEY_MEDIA_CONFIG = "media_config"; const std::string KEY_USER_ID = "user_id"; -const std::string KEY_FRAME_RATE = "frame_rate"; +const std::string KEY_FRAME_RATE = "fps"; const std::string KEY_FRAME_TYPE = "frame_type"; const std::string KEY_BITRATE = "bitrate"; -const std::string KEY_VIRTUAL_WIDTH = "virtual_width"; -const std::string KEY_VIRTUAL_HEIGHT = "virtual_height"; +const std::string KEY_STREAM_WIDTH = "stream_width"; +const std::string KEY_STREAM_HEIGHT = "stream_height"; enum VirtualDevice { VIRTUAL_CAMERA, diff --git a/cloudphone/src/main/cpp/CasController.cpp b/cloudphone/src/main/cpp/CasController.cpp index da8b3bf1c748ac12bb362e9f8f4820b3e7c02636..75721b49bbec064fbe55f81b87d92876393dde9c 100644 --- a/cloudphone/src/main/cpp/CasController.cpp +++ b/cloudphone/src/main/cpp/CasController.cpp @@ -219,19 +219,19 @@ bool CasController::IsValidMediaConfig(map mediaConfig) } // 校验虚拟宽高,虚拟宽高需满足同时设置或同时未设置,且大于等于240,小于等于4096,与8对齐 - bool containsStreamWidth = mediaConfig.find(KEY_VIRTUAL_WIDTH) != mediaConfig.end(); - bool containsStreamHeight = mediaConfig.find(KEY_VIRTUAL_HEIGHT) != mediaConfig.end(); + bool containsStreamWidth = mediaConfig.find(KEY_STREAM_WIDTH) != mediaConfig.end(); + bool containsStreamHeight = mediaConfig.find(KEY_STREAM_HEIGHT) != mediaConfig.end(); if (containsStreamWidth && containsStreamHeight) { - uint32_t streamWidth = static_cast(atoi(mediaConfig[KEY_VIRTUAL_WIDTH].c_str())); - uint32_t streamHeight = static_cast(atoi(mediaConfig[KEY_VIRTUAL_HEIGHT].c_str())); + uint32_t streamWidth = static_cast(atoi(mediaConfig[KEY_STREAM_WIDTH].c_str())); + uint32_t streamHeight = static_cast(atoi(mediaConfig[KEY_STREAM_HEIGHT].c_str())); if (streamWidth > streamHeight || streamWidth < WIDTH_MIN || streamWidth > WIDTH_MAX || streamWidth % TIMES != 0 || streamHeight < HEIGHT_MIN || streamHeight > HEIGHT_MAX || streamHeight % TIMES != 0) { - ERR("Virtual width or virtual height is invalid, virtual width %u virtual height %u", streamWidth, streamHeight); + ERR("Stream width or Stream height is invalid, Stream width %u Stream height %u", streamWidth, streamHeight); return false; } } else if (containsStreamWidth || containsStreamHeight) { - ERR("Virtual width or virtual height is not included"); + ERR("Stream width or Stream height is not included"); return false; } return true; diff --git a/cloudphone/src/main/cpp/cas_decoder/CasDecodeController.cpp b/cloudphone/src/main/cpp/cas_decoder/CasDecodeController.cpp index 1f0fae9894a706032e693ce528f760b6409ec9c9..46cd9c7072c6960424ea071ad9976e90736bf51b 100644 --- a/cloudphone/src/main/cpp/cas_decoder/CasDecodeController.cpp +++ b/cloudphone/src/main/cpp/cas_decoder/CasDecodeController.cpp @@ -90,7 +90,6 @@ void OutputTaskEntry(CasDecodeController *controller) if (casVideoUtil != nullptr) { startUs = casVideoUtil->GetNow(); } - iRet = static_cast(controller->m_decoder->OutputAndDisplay()); if (iRet == DECODER_OUTPUT_ERR) { ERR("Sub-Thread exited."); @@ -99,7 +98,6 @@ void OutputTaskEntry(CasDecodeController *controller) if (!isDecodeFirstFrame) { isDecodeFirstFrame = true; if (controller->m_firstFrameListener != nullptr) { - ERR("isDecodeFirstFrame-----------------------%d", isDecodeFirstFrame); controller->m_firstFrameListener->OnFirstFrame(); } } diff --git a/config.gradle b/config.gradle index daefbcbfbb2cc221f06b38fa2859c3f1c8adf324..ed1c3292bf327b6bb26b6ada955b700af8916362 100644 --- a/config.gradle +++ b/config.gradle @@ -5,5 +5,5 @@ ext.versions = [ compileSdkVersion : 28, buildToolsVersion : '28.0.3', versionCode : 1, - versionName : '23.5.8', + versionName : '23.6.0', ] \ No newline at end of file