diff --git a/TouhouVideoFeatureExtractor.vcxproj b/TouhouVideoFeatureExtractor.vcxproj index 3547888..4a576a9 100644 --- a/TouhouVideoFeatureExtractor.vcxproj +++ b/TouhouVideoFeatureExtractor.vcxproj @@ -31,7 +31,7 @@ - + @@ -42,12 +42,12 @@ true - C:\Users\unknown\source\repos\FFmpeg\include;$(VC_IncludePath);$(WindowsSDK_IncludePath); - C:\Users\unknown\source\repos\FFmpeg\lib\x64;$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64) + C:\Users\wangbar\gpu cuda\Video_Codec_SDK_11.1.5\Samples\External\FFmpeg\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v11.5\Interface + C:\Users\wangbar\gpu cuda\Video_Codec_SDK_11.1.5\Samples\External\FFmpeg\lib\x64;$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64) - C:\Users\unknown\source\repos\FFmpeg\include;$(IncludePath) - C:\Users\unknown\source\repos\FFmpeg\lib\x64;$(LibraryPath) + C:\Users\wangbar\gpu cuda\Video_Codec_SDK_11.1.5\Samples\External\FFmpeg\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v11.5\Interface + C:\Users\wangbar\gpu cuda\Video_Codec_SDK_11.1.5\Samples\External\FFmpeg\lib\x64;$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64) @@ -60,12 +60,16 @@ true Console nppisu.lib;nppig.lib;avcodec.lib;avformat.lib;avutil.lib;swresample.lib;nvcuvid.lib;nvinfer.lib;cuda.lib;cudart_static.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v11.5\lib;%(AdditionalLibraryDirectories) 64 -std=c++17 --expt-relaxed-constexpr %(AdditionalOptions) compute_75,sm_75;compute_86,sm_86 + + false + @@ -82,6 +86,7 @@ true Console nppig.lib;avcodec.lib;avformat.lib;avutil.lib;swresample.lib;nvcuvid.lib;nvinfer.lib;cuda.lib;cudart_static.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v11.5\lib;%(AdditionalLibraryDirectories) 64 @@ -146,6 +151,6 @@ - + \ No newline at end of file diff --git a/fast_io/fast_io_core_impl/concepts/operation_details.h b/fast_io/fast_io_core_impl/concepts/operation_details.h index 724b699..0d048ec 100644 --- a/fast_io/fast_io_core_impl/concepts/operation_details.h +++ b/fast_io/fast_io_core_impl/concepts/operation_details.h @@ -19,7 +19,7 @@ namespace fast_io template concept type_has_c_str_method = requires(T&& t) { - {t.c_str()}->::fast_io::details::c_str_pointer; + {t.c_str()}->fast_io::details::c_str_pointer; }; template diff --git a/main.cc b/main.cc index ef13f98..18a6ee2 100644 --- a/main.cc +++ b/main.cc @@ -54,6 +54,16 @@ struct VideoProvider { delete file; } + std::string clean_line_string(std::string line) + { + size_t n = line.find_last_not_of(" \r\n\t"); + if (n != std::string::npos) { + line.erase(n + 1, line.size() - n); + } + + return line; + } + std::optional> TryFetchNextVideo() { std::string video_id; std::string filepath; @@ -63,11 +73,11 @@ struct VideoProvider { catch (...) { return {}; } - return { { video_id , filepath } }; + return { { clean_line_string(video_id) , clean_line_string(filepath) } }; } }; -enum class TLVTags: u8 { +enum class TLVTags : u8 { VideoId = 0, //av or BV BasicInfo = 1, FeatureIndices = 2, @@ -85,7 +95,7 @@ struct ReorderBuffer { typename decorators, std::size_t bfs, ::fast_io::freestanding::random_access_iterator Iter > requires (((mde& fast_io::buffer_mode::out) == fast_io::buffer_mode::out) && fast_io::details::allow_iobuf_punning) - bool Complete(usize pos, fast_io::basic_io_buffer& bios, u8 const* const data) { + bool Complete(usize pos, fast_io::basic_io_buffer& bios, u8 const* const data) { } }; @@ -105,7 +115,7 @@ nvinfer1::ICudaEngine* LoadEngineFromFile(std::string_view filename, nvinfer1::I return nullptr; } -int main(int argc, char **argv) +int main(int argc, char** argv) { if (argc != 3) { perrln("Usage: ", fast_io::mnp::os_c_str(argv[0]), " "); @@ -236,4 +246,4 @@ int main(int argc, char **argv) fast_io::flush(fast_io::c_stdout()); return 0; -} +} \ No newline at end of file