Z991239-2465 #comment other: 优化libvideocapture库结构，兼容windows版

Module/mod_mediacontroller/capture.cpp

@@ -1241,14 +1241,14 @@ static int video_capture_start_linux(video_capture_t* video_cap)
 	if (video_cap->camera_type == CAMERA_TYPE_ENV){
 		dev_id = rvc_videocap_get_video_device_id(conf->strVideoEnv.GetData());
 		if (-1 == dev_id){
-			Dbg("No environment camera,please check config file or device!");
+			Dbg("No environment camera, please check config file or device!");
 			return iret;
 		}
 	}
 	else{
-		dev_id = capture_get_video_device_id(conf->strVideoOpt);
+		dev_id = rvc_videocap_get_video_device_id(conf->strVideoOpt.GetData());
 		if (-1 == dev_id){
-			Dbg("No operation camera,please check config file or device!");
+			Dbg("No operation camera, please check config file or device!");
 			return iret;
 		}
 	}

Other/libmediadeviceinfo/linux/videodevice_info_linux.cpp

@@ -286,8 +286,6 @@ int  rvc_videocap_get_video_device_id(const char* dev_name)
 		char strfullname[2*MAX_PATH] = { 0 };
 		if (0 == rvc_videocap_get_device_fullpathname(i, strfullname, 2 * MAX_PATH)){
 			ifound++;
-			printf("camera name is: %s\n", strfullname);
-			printf("   dev name is: %s\n", dev_name);
 			if (0 == strcasecmp(strfullname, dev_name))
 			{
 				iret = i;

Other/libvideocapture/CMakeLists.txt

@@ -12,8 +12,8 @@ endif(RVC_DEBUG_MODE)
 set(${MODULE_PREFIX}_SRCS
     ivideocaptureinterface.h
 	ivideocaptureinterface.cpp
-	libvideocapture.h
-	libvideocapture.cpp
+	./linux/videocapture_linux.h
+	./linux/videocapture_linux.cpp
 )
 
 add_library(${MODULE_NAME} SHARED ${${MODULE_PREFIX}_SRCS})

Other/libvideocapture/ivideocaptureinterface.cpp

@@ -1,5 +1,5 @@
 #include "ivideocaptureinterface.h"
-#include "libvideocapture.h"
+#include "./linux/videocapture_linux.h"
 
 
 IVideoCapture* CreateVideoCaptureObj(ICaptureCallback* pCallback)

Other/libvideocapture/libvideocapture.cpp → Other/libvideocapture/linux/videocapture_linux.cpp

@@ -1,6 +1,6 @@
-#include"libvideocapture.h"
-#include "../libvideoframework/videoutil.h"
-#include "../libvideoframework/aligned_malloc.h"
+#include"videocapture_linux.h"
+#include "../../libvideoframework/videoutil.h"
+#include "../../libvideoframework/aligned_malloc.h"
 
 #include <stdlib.h>
 #include <string.h>
@@ -31,6 +31,7 @@ extern "C" {
 
 static const int kBufferAlignment = 64;
 
+
 // Get FourCC code as a string.
 int GetFourccName(char* strbuf, uint32_t ulen, uint32_t fourcc)
 {
@@ -136,8 +137,8 @@ int VideoCaptureImpl::VideoCaptureSetParam(videocap_param_t* param)
 		}
 	}
 	else {
-		if (m_callback){
-			m_callback->Debug("param->option & VIDEOCAP_OPT_EANBLE_RESIZE success.");
+		if (m_callback) {
+			m_callback->Debug("%s", "param->option & VIDEOCAP_OPT_EANBLE_RESIZE success.");
 		}
 	}
 

Other/libvideocapture/libvideocapture.h → Other/libvideocapture/linux/videocapture_linux.h

@@ -1,8 +1,8 @@
 #pragma once
 
-#include "ivideocaptureinterface.h"
-#include "../libvideoframework/videoutil.h"
-#include "../rvcmediacommon/common_video/videocommon.h"
+#include "../ivideocaptureinterface.h"
+#include "../../libvideoframework/videoutil.h"
+#include "../../rvcmediacommon/common_video/videocommon.h"
 #include "videocapturedefines.h"
 #include <pthread.h>