Z991239-1387 #comment other:解决存在localmediaplay实体加载失败问题

Other/libmediaplayer/CMakeLists.txt

@@ -55,9 +55,6 @@ message(STATUS "CONAN_LIBS_SDL2 == ${CONAN_LIBS_SDL2}")
 target_link_libraries(${MODULE_NAME} PRIVATE ${${MODULE_PREFIX}_LIBS} PRIVATE
 	${CONAN_LIBS_FFMPEG}
 	${CONAN_LIBS_SDL2}
-	dl
-	m
-	pthread
 	)  
 
 target_compile_definitions(${MODULE_NAME} PUBLIC "LIBMEDIAPLAYER_EXPORTS")
@@ -79,8 +76,8 @@ install(TARGETS ${MODULE_NAME}
 endif(MSVC)
 
 # ����Ҫ���������ĵ�������
-#if(MSVC)
-#set(OTHER_CONAN_DEP_LIBS ${OTHER_CONAN_DEP_LIBS} ${CONAN_BIN_DIRS} PARENT_SCOPE)
-#else()
-#set(OTHER_CONAN_DEP_LIBS ${OTHER_CONAN_DEP_LIBS} ${CONAN_LIB_DIRS} PARENT_SCOPE)
-#ENDIF(MSVC)
+if(MSVC)
+set(OTHER_CONAN_DEP_LIBS ${OTHER_CONAN_DEP_LIBS} ${CONAN_BIN_DIRS} PARENT_SCOPE)
+else()
+set(OTHER_CONAN_DEP_LIBS ${OTHER_CONAN_DEP_LIBS} ${CONAN_LIB_DIRS} PARENT_SCOPE)
+ENDIF(MSVC)

Other/libmediaplayer/player.cpp

@@ -175,7 +175,7 @@ static int player_deinit(player_stat_t *is)
     {
         SDL_DestroyTexture(is->sdl_video.texture);
     }
-	is->rvc_hostapi->Debug("av_free is.");
+	is->rvc_hostapi->Debug("av_free player_stat_t.");
 
     av_free(is);
 
@@ -232,8 +232,6 @@ CMediaPlayer::~CMediaPlayer()
 
 int CMediaPlayer::Init(rvc_media_player_param_t* pMedia_Player)
 {
-	m_hostapi->Debug("Init()");
-
 	int iRet = -1;
 	if (NULL == pMedia_Player){
 		return iRet;
@@ -400,6 +398,8 @@ int CMediaPlayer::StopMediaPlay()
 {
 	int iRet = -1;
 
+	m_hostapi->Debug("StopMediaPlay called.");
+
 	SDL_QuitRequested();
 
 	iRet = 0;
@@ -412,17 +412,21 @@ int CMediaPlayer::ExitMediaPlayingThread()
 {
 	int iRet = -1;
 
-	if (NULL == m_player_stat)
-	{
+	if (NULL == m_player_stat){
 		return iRet;
 	}
 
 	m_hostapi->Debug("ExitMediaPlayingThread called.");
 
-	if (m_player_stat->sdl_video.renderer)
-		SDL_DestroyRenderer(m_player_stat->sdl_video.renderer);
-	if (m_player_stat->sdl_video.window)
-		SDL_DestroyWindow(m_player_stat->sdl_video.window);
+	if(eVideo_Type == m_player_stat->eMType){
+		if (m_player_stat->sdl_video.renderer){
+			SDL_DestroyRenderer(m_player_stat->sdl_video.renderer);
+		}
+		
+		if (m_player_stat->sdl_video.window){
+			SDL_DestroyWindow(m_player_stat->sdl_video.window);
+		}
+	}
 
 	avformat_network_deinit();
 

Other/libpictureplayer/CMakeLists.txt

@@ -36,9 +36,6 @@ target_link_directories(${MODULE_NAME} PRIVATE
 
 target_link_libraries(${MODULE_NAME} PRIVATE ${${MODULE_PREFIX}_LIBS}	PRIVATE
 	${CONAN_LIBS_SDL2}
-	dl
-	m
-	pthread
 	)