소스 검색

Z991239-5298 #comment feat: Try to replace SIGKILL by SIGTERM when killing VTM process, hence releasing fully.

chenliangyu 1 년 전
부모
커밋
d7ee942534
2개의 변경된 파일7개의 추가작업 그리고 7개의 파일을 삭제
  1. 1 1
      CMakeLists.txt
  2. 6 6
      Module/mod_chromium/CWSCodec.cpp

+ 1 - 1
CMakeLists.txt

@@ -288,7 +288,7 @@ conan_cmake_run(REQUIRES RvcFramework/1.2.0.120@LR04.02_FrameworkLib/dev
 	Audio/2024.0118.01@LR04.02_MediaRes/testing
 BASIC_SETUP CMAKE_TARGETS)
 else()
-conan_cmake_run(REQUIRES RvcFramework/1.2.0.120@LR04.02_FrameworkLib/dev
+conan_cmake_run(REQUIRES RvcFramework/1.2.0.121@LR04.02_FrameworkLib/dev
 	Audio/2024.0118.01@LR04.02_MediaRes/testing
 BASIC_SETUP CMAKE_TARGETS)
 endif(MSVC)

+ 6 - 6
Module/mod_chromium/CWSCodec.cpp

@@ -1239,9 +1239,9 @@ namespace Chromium {
 		{
 			if (it->mType == "int")
 			{
-				unsigned int d = 0;
-				GetCJsonIntergerValue(js, it->mName.c_str(), d, errmsg);
-				WriteT(data, d, wpos, capacity);
+				unsigned int d_int = 0;
+				GetCJsonIntergerValue(js, it->mName.c_str(), d_int, errmsg);
+				WriteT(data, d_int, wpos, capacity);
 			}
 			else if (it->mType == "bool")
 			{
@@ -1303,10 +1303,10 @@ namespace Chromium {
 			}
 			else if (it->mType == "string")
 			{
-				CSimpleStringA d = "";
-				GetCJsonObjectValue(js, it->mName.c_str(), d, errmsg);
+				CSimpleStringA d_str = "";
+				GetCJsonObjectValue(js, it->mName.c_str(), d_str, errmsg);
 				//DbgEx("GeneralSerialize string %s -> %s", it->mName.c_str(), d);
-				WriteT(data, d, wpos, capacity);
+				WriteT(data, d_str, wpos, capacity);
 			}
 			else if (it->mType == "wstring")
 			{