OSDN Git Service

(root) / csp-qt / common_source_project-fm7.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
[VM][DATAREC][FDD] Add sounds of SEEK/CMT, excepts either pseudo devices / bios.
[csp-qt/common_source_project-fm7.git] / source / src / config.cpp
diff --git a/source/src/config.cpp b/source/src/config.cpp
index 227b488..6dd9efd 100644 (file)
--- a/source/src/config.cpp
+++ b/source/src/config.cpp
@@ -6,20 +6,11 @@
 
        [ config ]
 */
-#if defined(_USE_AGAR)
-#include <SDL/SDL.h>
-#include <agar/core.h>
-#include <string>
-#include <vector>
-#include "fileio.h"
-#include "agar_logger.h"
-#endif
-
 #if defined(_USE_QT)
 #include <string>
 #include <vector>
 #include "fileio.h"
-#include "agar_logger.h"
+#include "csp_logger.h"
 #include "qt_main.h"
 # if defined(Q_OS_WIN)
 # include <windows.h>
@@ -138,14 +129,24 @@ void initialize_config()
 #if defined(USE_QT)
        config.video_width = 640;
        config.video_height = 480;
-       config.video_bitrate = 512;
-       config.video_bframes = 4;
-       config.video_b_adapt = 2;
-       config.video_minq = 14;
-       config.video_maxq = 25;
-       config.video_subme = 8;
+       config.video_codec_type = 0; // MPEG4
+       
+       config.video_h264_bitrate = 512;
+       config.video_h264_bframes = 4;
+       config.video_h264_b_adapt = 2;
+       config.video_h264_minq = 14;
+       config.video_h264_maxq = 25;
+       config.video_h264_subme = 8;
+       
+       config.video_mpeg4_bitrate = 512;
+       config.video_mpeg4_bframes = 4;
+       config.video_mpeg4_minq = 1;
+       config.video_mpeg4_maxq = 20;
+       
+       config.audio_codec_type = 0;
        config.video_threads = 0;
-       config.audio_bitrate = 128;
+       config.audio_bitrate = 160;
+       config.video_frame_rate = 30;
 #endif
        // screen
 #ifndef ONE_BOARD_MICRO_COMPUTER
@@ -161,6 +162,9 @@ void initialize_config()
        config.opengl_scanline_horiz = false;
        config.use_opengl_filters = false;
        config.opengl_filter_num = 0;
+
+       config.log_to_syslog = false;
+       config.log_to_console = true;
 #endif 
 }
 
@@ -362,29 +366,58 @@ void load_config(const _TCHAR *config_path)
        config.video_height  = MyGetPrivateProfileInt(_T("Video"), _T("VideoHeight"), config.video_height, config_path);
        if(config.video_height < 80) config.video_height = 80;
        
-       config.video_bitrate = MyGetPrivateProfileInt(_T("Video"), _T("VideoBitrate"), config.video_bitrate, config_path);
-       if(config.video_bitrate < 64) config.video_bitrate = 64;
+       config.video_codec_type = MyGetPrivateProfileInt(_T("Video"), _T("VideoCodecType"), config.video_codec_type, config_path);
+       if(config.video_codec_type > 1) config.video_codec_type = 1;
+       if(config.video_codec_type < 0) config.video_codec_type = 0;
+       
+       config.audio_codec_type = MyGetPrivateProfileInt(_T("Video"), _T("AudioCodecType"), config.audio_codec_type, config_path);
+       if(config.video_codec_type > 2) config.audio_codec_type = 2;
+       if(config.video_codec_type < 0) config.audio_codec_type = 0;
+       
+       config.video_h264_bitrate = MyGetPrivateProfileInt(_T("Video"), _T("H264Bitrate"), config.video_h264_bitrate, config_path);
+       if(config.video_h264_bitrate < 64) config.video_h264_bitrate = 64;
 
-       config.video_bframes = MyGetPrivateProfileInt(_T("Video"), _T("VideoBFrames"), config.video_bframes, config_path);
-       if(config.video_bframes < 0) config.video_bframes = 0;
-       if(config.video_bframes > 10) config.video_bframes = 10;
+       config.video_h264_bframes = MyGetPrivateProfileInt(_T("Video"), _T("H264BFrames"), config.video_h264_bframes, config_path);
+       if(config.video_h264_bframes < 0) config.video_h264_bframes = 0;
+       if(config.video_h264_bframes > 10) config.video_h264_bframes = 10;
 
-       config.video_b_adapt = MyGetPrivateProfileInt(_T("Video"), _T("VideoBAdapt"), config.video_b_adapt, config_path);
-       if(config.video_b_adapt < 0) config.video_b_adapt = 0;
-       if(config.video_b_adapt > 2) config.video_b_adapt = 2;
+       config.video_h264_b_adapt = MyGetPrivateProfileInt(_T("Video"), _T("H264BAdapt"), config.video_h264_b_adapt, config_path);
+       if(config.video_h264_b_adapt < 0) config.video_h264_b_adapt = 0;
+       if(config.video_h264_b_adapt > 2) config.video_h264_b_adapt = 2;
        
-       config.video_subme   = MyGetPrivateProfileInt(_T("Video"), _T("VideoSubme"), config.video_subme, config_path);
-       if(config.video_subme < 0) config.video_subme = 0;
-       if(config.video_subme > 11) config.video_subme = 11;
+       config.video_h264_subme   = MyGetPrivateProfileInt(_T("Video"), _T("H264Subme"), config.video_h264_subme, config_path);
+       if(config.video_h264_subme < 0) config.video_h264_subme = 0;
+       if(config.video_h264_subme > 11) config.video_h264_subme = 11;
 
-       config.video_minq   = MyGetPrivateProfileInt(_T("Video"), _T("VideoMinQ"), config.video_minq, config_path);
-       if(config.video_minq < 0) config.video_minq = 0;
-       if(config.video_minq > 63) config.video_minq = 63;
+       config.video_h264_minq   = MyGetPrivateProfileInt(_T("Video"), _T("H264MinQ"), config.video_h264_minq, config_path);
+       if(config.video_h264_minq < 0) config.video_h264_minq = 0;
+       if(config.video_h264_minq > 63) config.video_h264_minq = 63;
 
-       config.video_maxq   = MyGetPrivateProfileInt(_T("Video"), _T("VideoMaxQ"), config.video_maxq, config_path);
-       if(config.video_maxq < 0) config.video_maxq = 0;
-       if(config.video_maxq > 63) config.video_maxq = 63;
+       config.video_h264_maxq   = MyGetPrivateProfileInt(_T("Video"), _T("H264MaxQ"), config.video_h264_maxq, config_path);
+       if(config.video_h264_maxq < 0) config.video_h264_maxq = 0;
+       if(config.video_h264_maxq > 63) config.video_h264_maxq = 63;
        
+       config.video_mpeg4_bitrate = MyGetPrivateProfileInt(_T("Video"), _T("MPEG4Bitrate"), config.video_mpeg4_bitrate, config_path);
+       if(config.video_mpeg4_bitrate < 64) config.video_mpeg4_bitrate = 64;
+
+       config.video_mpeg4_bframes = MyGetPrivateProfileInt(_T("Video"), _T("MPEG4BFrames"), config.video_mpeg4_bframes, config_path);
+       if(config.video_mpeg4_bframes < 0) config.video_mpeg4_bframes = 0;
+       if(config.video_mpeg4_bframes > 10) config.video_mpeg4_bframes = 10;
+
+       config.video_mpeg4_minq   = MyGetPrivateProfileInt(_T("Video"), _T("MPEG4MinQ"), config.video_mpeg4_minq, config_path);
+       if(config.video_mpeg4_minq < 1) config.video_mpeg4_minq = 1;
+       if(config.video_mpeg4_minq > 31) config.video_mpeg4_minq = 31;
+
+       config.video_mpeg4_maxq   = MyGetPrivateProfileInt(_T("Video"), _T("MPEG4MaxQ"), config.video_mpeg4_maxq, config_path);
+       if(config.video_mpeg4_maxq < 1) config.video_mpeg4_maxq = 1;
+       if(config.video_mpeg4_maxq > 31) config.video_mpeg4_maxq = 31;
+       if(config.video_mpeg4_maxq < config.video_mpeg4_minq) {
+               int n;
+               n = config.video_mpeg4_maxq;
+               config.video_mpeg4_maxq  = config.video_mpeg4_minq;
+               config.video_mpeg4_minq = n;
+       }
+
        config.video_threads = MyGetPrivateProfileInt(_T("Video"), _T("VideoThreads"), config.video_threads, config_path);
        if(config.video_threads < 0) config.video_threads = 0;
        if(config.video_threads > 16) config.video_threads = 16;
@@ -393,9 +426,39 @@ void load_config(const _TCHAR *config_path)
        if(config.audio_bitrate < 16) config.audio_bitrate = 16;
        if(config.audio_bitrate > 448) config.audio_bitrate = 448;
        
+       config.video_frame_rate = MyGetPrivateProfileInt(_T("Video"), _T("VideoFramerate"), config.video_frame_rate, config_path);
+       if(config.video_frame_rate < 15) config.video_frame_rate = 15;
+       if(config.video_frame_rate > 75) config.video_frame_rate = 75;
+
 #endif 
-#if defined(_USE_QT) && !defined(Q_OS_WIN)
-       AGAR_DebugLog(AGAR_LOG_INFO, "Read Done.");
+#if defined(_USE_QT)
+       config.log_to_syslog = MyGetPrivateProfileBool(_T("Emulator"), _T("WriteToSyslog"), config.log_to_syslog, config_path);
+       config.log_to_console = MyGetPrivateProfileBool(_T("Emulator"), _T("WriteToConsole"), config.log_to_console, config_path);
+       for(int ii = 0; ii < (CSP_LOG_TYPE_VM_DEVICE_END - CSP_LOG_TYPE_VM_DEVICE_0 + 1); ii++) {
+               uint32_t flags = 0;
+               flags = MyGetPrivateProfileInt(_T("Emulator"), create_string(_T("SyslogEnabled%d"), ii), 0x0000, config_path);
+               for(int jj = 0; jj < 8; jj++) {
+                       config.dev_log_to_syslog[ii][jj] = ((flags & 0x0001) != 0) ? true : false;
+                       csp_logger->set_device_node_log(ii, 1, jj, config.dev_log_to_syslog[ii][jj]);
+                       flags >>= 1;
+               }
+               flags = 0;
+               flags = MyGetPrivateProfileInt(_T("Emulator"), create_string(_T("ConsoleLogEnabled%d"), ii), 0xffff, config_path);
+               for(int jj = 0; jj < 8; jj++) {
+                       config.dev_log_to_console[ii][jj] = ((flags & 0x0001) != 0) ? true : false;
+                       csp_logger->set_device_node_log(ii, 2, jj, config.dev_log_to_console[ii][jj]);
+                       flags >>= 1;
+               }
+               flags = MyGetPrivateProfileInt(_T("Emulator"), create_string(_T("RecordLogEnabled%d"), ii), 0xffff, config_path);
+               for(int jj = 0; jj < 8; jj++) {
+                       config.dev_log_recording[ii][jj] = ((flags & 0x0001) != 0) ? true : false;
+                       csp_logger->set_device_node_log(ii, 0, jj, config.dev_log_recording[ii][jj]);
+                       flags >>= 1;
+               }
+       }
+#endif
+#if defined(_USE_QT)
+       csp_logger->debug_log(CSP_LOG_INFO, CSP_LOG_TYPE_GENERAL, "Read config done.");
 #endif
 }
 
@@ -596,17 +659,55 @@ void save_config(const _TCHAR *config_path)
 #if defined(_USE_QT)
        MyWritePrivateProfileInt(_T("Video"), _T("VideoWidth"), config.video_width, config_path);
        MyWritePrivateProfileInt(_T("Video"), _T("VideoHeight"), config.video_height, config_path);
-       MyWritePrivateProfileInt(_T("Video"), _T("VideoBitrate"), config.video_bitrate, config_path);
-       MyWritePrivateProfileInt(_T("Video"), _T("VideoBFrames"), config.video_bframes, config_path);
-       MyWritePrivateProfileInt(_T("Video"), _T("VideoBAdapt"), config.video_b_adapt, config_path);
-       MyWritePrivateProfileInt(_T("Video"), _T("VideoMinQ"), config.video_minq, config_path);
-       MyWritePrivateProfileInt(_T("Video"), _T("VideoMaxQ"), config.video_maxq, config_path);
-       MyWritePrivateProfileInt(_T("Video"), _T("VideoSubme"), config.video_subme, config_path);
+       MyWritePrivateProfileInt(_T("Video"), _T("VideoCodecType"), config.video_codec_type, config_path);
+       MyWritePrivateProfileInt(_T("Video"), _T("AudioCodecType"), config.audio_codec_type, config_path);
+       
+       MyWritePrivateProfileInt(_T("Video"), _T("H264Bitrate"), config.video_h264_bitrate, config_path);
+       MyWritePrivateProfileInt(_T("Video"), _T("H264BFrames"), config.video_h264_bframes, config_path);
+       MyWritePrivateProfileInt(_T("Video"), _T("H264BAdapt"), config.video_h264_b_adapt, config_path);
+       MyWritePrivateProfileInt(_T("Video"), _T("H264MinQ"), config.video_h264_minq, config_path);
+       MyWritePrivateProfileInt(_T("Video"), _T("H264MaxQ"), config.video_h264_maxq, config_path);
+       MyWritePrivateProfileInt(_T("Video"), _T("H264Subme"), config.video_h264_subme, config_path);
+       
+       MyWritePrivateProfileInt(_T("Video"), _T("MPEG4Bitrate"), config.video_mpeg4_bitrate, config_path);
+       MyWritePrivateProfileInt(_T("Video"), _T("MPEG4BFrames"), config.video_mpeg4_bframes, config_path);
+       MyWritePrivateProfileInt(_T("Video"), _T("MPEG4MinQ"), config.video_mpeg4_minq, config_path);
+       MyWritePrivateProfileInt(_T("Video"), _T("MPEG4MaxQ"), config.video_mpeg4_maxq, config_path);
+       
        MyWritePrivateProfileInt(_T("Video"), _T("VideoThreads"), config.video_threads, config_path);
        MyWritePrivateProfileInt(_T("Video"), _T("AudioBitrate"), config.audio_bitrate, config_path);
+       MyWritePrivateProfileInt(_T("Video"), _T("VideoFramerate"), config.video_frame_rate, config_path);
 #endif 
+#if defined(_USE_QT)
+       MyWritePrivateProfileBool(_T("Emulator"), _T("WriteToSyslog"), config.log_to_syslog, config_path);
+       MyWritePrivateProfileBool(_T("Emulator"), _T("WriteToConsole"), config.log_to_console, config_path);
+       
+       for(int ii = 0; ii < (CSP_LOG_TYPE_VM_DEVICE_END - CSP_LOG_TYPE_VM_DEVICE_0 + 1); ii++) {
+               uint32_t flags = 0;
+               flags = 0;
+               for(int jj = 0; jj < 8; jj++) {
+                       flags <<= 1;
+                       if(config.dev_log_to_syslog[ii][jj]) flags |= 0x0001;
+               }
+               flags = MyWritePrivateProfileInt(_T("Emulator"), create_string(_T("SyslogEnabled%d"), ii), flags, config_path);
+
+               flags = 0;
+               for(int jj = 0; jj < 8; jj++) {
+                       flags <<= 1;
+                       if(config.dev_log_to_console[ii][jj]) flags |= 0x0001;
+               }
+               flags = MyWritePrivateProfileInt(_T("Emulator"), create_string(_T("ConsoleLogEnabled%d"), ii), flags, config_path);
+
+               flags = 0;
+               for(int jj = 0; jj < 8; jj++) {
+                       flags <<= 1;
+                       if(config.dev_log_recording[ii][jj]) flags |= 0x0001;
+               }
+               flags = MyWritePrivateProfileInt(_T("Emulator"), create_string(_T("RecordLogEnabled%d"), ii), flags, config_path);
+       }
+#endif
 #if defined(_USE_QT) && !defined(Q_OS_WIN)
-       AGAR_DebugLog(AGAR_LOG_INFO, "Write done.");
+       csp_logger->debug_log(CSP_LOG_INFO, CSP_LOG_TYPE_GENERAL, "Write config done.");
 #endif
 
        
Common Source Code Project for Qt (a.k.a for FM-7).
About OSDN
Find Software
Develop Software
Help