diff --git a/arib_std_b25.sln b/arib_std_b25.sln
index 90a7e7a..4c3019a 100644
--- a/arib_std_b25.sln
+++ b/arib_std_b25.sln
@@ -3,14 +3,18 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.31702.278
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "b25", "aribb25\b25.vcxproj", "{6E77C1AC-A31A-49B9-9A52-9FE1E03B8FEC}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libaribb25", "aribb25\libaribb25.vcxproj", "{32FCD075-2C1D-4796-926B-A0009ECCD1E8}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "arib-b1-stream-test", "aribb25\arib-b1-stream-test.vcxproj", "{DE5EB7E1-56B9-440C-B3C6-5014E94FBC62}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "b1", "aribb25\b1.vcxproj", "{26304970-9A5E-4DF0-AF69-8E01B9DEDDAE}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libaribb1", "aribb25\libaribb1.vcxproj", "{92B17263-5DE9-49F5-8B3C-7A89F7561ED5}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "arib-b25-stream-test", "aribb25\arib-b25-stream-test.vcxproj", "{06BCA6CD-77A7-441B-BEEA-63A6561D6CDE}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "b25", "aribb25\b25.vcxproj", "{6E77C1AC-A31A-49B9-9A52-9FE1E03B8FEC}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libaribb25", "aribb25\libaribb25.vcxproj", "{32FCD075-2C1D-4796-926B-A0009ECCD1E8}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -51,6 +55,22 @@ Global
{92B17263-5DE9-49F5-8B3C-7A89F7561ED5}.Release|Win32.Build.0 = Release|Win32
{92B17263-5DE9-49F5-8B3C-7A89F7561ED5}.Release|x64.ActiveCfg = Release|x64
{92B17263-5DE9-49F5-8B3C-7A89F7561ED5}.Release|x64.Build.0 = Release|x64
+ {DE5EB7E1-56B9-440C-B3C6-5014E94FBC62}.Debug|Win32.ActiveCfg = Debug|Win32
+ {DE5EB7E1-56B9-440C-B3C6-5014E94FBC62}.Debug|Win32.Build.0 = Debug|Win32
+ {DE5EB7E1-56B9-440C-B3C6-5014E94FBC62}.Debug|x64.ActiveCfg = Debug|x64
+ {DE5EB7E1-56B9-440C-B3C6-5014E94FBC62}.Debug|x64.Build.0 = Debug|x64
+ {DE5EB7E1-56B9-440C-B3C6-5014E94FBC62}.Release|Win32.ActiveCfg = Release|Win32
+ {DE5EB7E1-56B9-440C-B3C6-5014E94FBC62}.Release|Win32.Build.0 = Release|Win32
+ {DE5EB7E1-56B9-440C-B3C6-5014E94FBC62}.Release|x64.ActiveCfg = Release|x64
+ {DE5EB7E1-56B9-440C-B3C6-5014E94FBC62}.Release|x64.Build.0 = Release|x64
+ {06BCA6CD-77A7-441B-BEEA-63A6561D6CDE}.Debug|Win32.ActiveCfg = Debug|Win32
+ {06BCA6CD-77A7-441B-BEEA-63A6561D6CDE}.Debug|Win32.Build.0 = Debug|Win32
+ {06BCA6CD-77A7-441B-BEEA-63A6561D6CDE}.Debug|x64.ActiveCfg = Debug|x64
+ {06BCA6CD-77A7-441B-BEEA-63A6561D6CDE}.Debug|x64.Build.0 = Debug|x64
+ {06BCA6CD-77A7-441B-BEEA-63A6561D6CDE}.Release|Win32.ActiveCfg = Release|Win32
+ {06BCA6CD-77A7-441B-BEEA-63A6561D6CDE}.Release|Win32.Build.0 = Release|Win32
+ {06BCA6CD-77A7-441B-BEEA-63A6561D6CDE}.Release|x64.ActiveCfg = Release|x64
+ {06BCA6CD-77A7-441B-BEEA-63A6561D6CDE}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/aribb25/arib-b1-stream-test.vcxproj b/aribb25/arib-b1-stream-test.vcxproj
new file mode 100644
index 0000000..8925477
--- /dev/null
+++ b/aribb25/arib-b1-stream-test.vcxproj
@@ -0,0 +1,212 @@
+
+
+
+
+ Debug
+ Win32
+
+
+ Debug
+ x64
+
+
+ Release
+ Win32
+
+
+ Release
+ x64
+
+
+
+ {DE5EB7E1-56B9-440C-B3C6-5014E94FBC62}
+ arib-b1-stream-test
+ Win32Proj
+ 10.0
+
+
+
+ Application
+ v142
+ Unicode
+ true
+
+
+ Application
+ v142
+ Unicode
+ true
+
+
+ Application
+ v142
+ Unicode
+
+
+ Application
+ v142
+ Unicode
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <_ProjectFileVersion>12.0.30501.0
+
+
+ $(SolutionDir)$(Platform)\$(Configuration)\
+ $(SolutionDir)Intermediate\$(ProjectName)\$(Platform)\$(Configuration)\
+ true
+ $(ProjectName)
+
+
+ true
+ $(ProjectName)
+ $(SolutionDir)Intermediate\$(ProjectName)\$(Platform)\$(Configuration)\
+
+
+ $(SolutionDir)$(Platform)\$(Configuration)\
+ $(SolutionDir)Intermediate\$(ProjectName)\$(Platform)\$(Configuration)\
+ false
+ $(ProjectName)
+
+
+ false
+ $(ProjectName)
+ $(SolutionDir)Intermediate\$(ProjectName)\$(Platform)\$(Configuration)\
+
+
+
+ Disabled
+ ENABLE_ARIB_STD_B1;ENABLE_ARIB_STREAM_TEST;ENABLE_MULTI2_SIMD;USE_BENCHMARK;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)
+ true
+ EnableFastChecks
+ MultiThreadedDebug
+
+ Level3
+ EditAndContinue
+ /source-charset:utf-8 %(AdditionalOptions)
+
+
+ winscard.lib;%(AdditionalDependencies)
+ $(OutDir)$(TargetName)$(TargetExt)
+ Debug
+ Console
+ MachineX86
+
+
+
+
+
+ Disabled
+ ENABLE_ARIB_STD_B1;ENABLE_ARIB_STREAM_TEST;ENABLE_MULTI2_SIMD;USE_BENCHMARK;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)
+ EnableFastChecks
+ MultiThreadedDebug
+
+
+ Level3
+ ProgramDatabase
+ /source-charset:utf-8 %(AdditionalOptions)
+
+
+ winscard.lib;%(AdditionalDependencies)
+ $(OutDir)$(TargetName)$(TargetExt)
+ Debug
+ Console
+
+
+
+
+ ENABLE_ARIB_STD_B1;ENABLE_ARIB_STREAM_TEST;ENABLE_MULTI2_SIMD;USE_BENCHMARK;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)
+ MultiThreadedDLL
+
+ Level3
+ ProgramDatabase
+ MaxSpeed
+ AnySuitable
+ true
+ Speed
+ true
+ false
+ true
+ Fast
+ /source-charset:utf-8 %(AdditionalOptions)
+
+
+ winscard.lib;%(AdditionalDependencies)
+ $(OutDir)$(TargetName)$(TargetExt)
+ false
+ Console
+ true
+ true
+ MachineX86
+ UseLinkTimeCodeGeneration
+
+
+
+
+ ENABLE_ARIB_STD_B1;ENABLE_ARIB_STREAM_TEST;ENABLE_MULTI2_SIMD;USE_BENCHMARK;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)
+ MultiThreadedDLL
+
+
+ Level3
+ ProgramDatabase
+ MaxSpeed
+ AnySuitable
+ true
+ Speed
+ true
+ false
+ true
+ Fast
+ /source-charset:utf-8 %(AdditionalOptions)
+
+
+ winscard.lib;%(AdditionalDependencies)
+ $(OutDir)$(TargetName)$(TargetExt)
+ false
+ Console
+ true
+ true
+ UseLinkTimeCodeGeneration
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/aribb25/arib-b1-stream-test.vcxproj.filters b/aribb25/arib-b1-stream-test.vcxproj.filters
new file mode 100644
index 0000000..037073b
--- /dev/null
+++ b/aribb25/arib-b1-stream-test.vcxproj.filters
@@ -0,0 +1,75 @@
+
+
+
+
+ {4FC737F1-C7A5-4376-A066-2A32D752A2FF}
+ cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx
+
+
+ {93995380-89BD-4b04-88EB-625FBE52EBFB}
+ h;hpp;hxx;hm;inl;inc;xsd
+
+
+ {67DA6AB6-F800-4c08-8B7A-83BB121AAD01}
+ rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav
+
+
+
+
+ ソース ファイル
+
+
+ ソース ファイル
+
+
+ ソース ファイル
+
+
+ ソース ファイル
+
+
+ ソース ファイル
+
+
+ ソース ファイル
+
+
+
+
+ ヘッダー ファイル
+
+
+ ヘッダー ファイル
+
+
+ ヘッダー ファイル
+
+
+ ヘッダー ファイル
+
+
+ ヘッダー ファイル
+
+
+ ヘッダー ファイル
+
+
+ ヘッダー ファイル
+
+
+ ヘッダー ファイル
+
+
+ ヘッダー ファイル
+
+
+ ヘッダー ファイル
+
+
+ ヘッダー ファイル
+
+
+ ヘッダー ファイル
+
+
+
\ No newline at end of file
diff --git a/aribb25/arib-b25-stream-test.vcxproj b/aribb25/arib-b25-stream-test.vcxproj
new file mode 100644
index 0000000..4be0b39
--- /dev/null
+++ b/aribb25/arib-b25-stream-test.vcxproj
@@ -0,0 +1,212 @@
+
+
+
+
+ Debug
+ Win32
+
+
+ Debug
+ x64
+
+
+ Release
+ Win32
+
+
+ Release
+ x64
+
+
+
+ {06BCA6CD-77A7-441B-BEEA-63A6561D6CDE}
+ arib-b25-stream-test
+ Win32Proj
+ 10.0
+
+
+
+ Application
+ v142
+ Unicode
+ true
+
+
+ Application
+ v142
+ Unicode
+ true
+
+
+ Application
+ v142
+ Unicode
+
+
+ Application
+ v142
+ Unicode
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <_ProjectFileVersion>12.0.30501.0
+
+
+ $(SolutionDir)$(Platform)\$(Configuration)\
+ $(SolutionDir)Intermediate\$(ProjectName)\$(Platform)\$(Configuration)\
+ true
+ $(ProjectName)
+
+
+ true
+ $(ProjectName)
+ $(SolutionDir)Intermediate\$(ProjectName)\$(Platform)\$(Configuration)\
+
+
+ $(SolutionDir)$(Platform)\$(Configuration)\
+ $(SolutionDir)Intermediate\$(ProjectName)\$(Platform)\$(Configuration)\
+ false
+ $(ProjectName)
+
+
+ false
+ $(ProjectName)
+ $(SolutionDir)Intermediate\$(ProjectName)\$(Platform)\$(Configuration)\
+
+
+
+ Disabled
+ ENABLE_ARIB_STREAM_TEST;ENABLE_MULTI2_SIMD;USE_BENCHMARK;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)
+ true
+ EnableFastChecks
+ MultiThreadedDebug
+
+ Level3
+ EditAndContinue
+ /source-charset:utf-8 %(AdditionalOptions)
+
+
+ winscard.lib;%(AdditionalDependencies)
+ $(OutDir)$(TargetName)$(TargetExt)
+ Debug
+ Console
+ MachineX86
+
+
+
+
+
+ Disabled
+ ENABLE_ARIB_STREAM_TEST;ENABLE_MULTI2_SIMD;USE_BENCHMARK;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)
+ EnableFastChecks
+ MultiThreadedDebug
+
+
+ Level3
+ ProgramDatabase
+ /source-charset:utf-8 %(AdditionalOptions)
+
+
+ winscard.lib;%(AdditionalDependencies)
+ $(OutDir)$(TargetName)$(TargetExt)
+ Debug
+ Console
+
+
+
+
+ ENABLE_ARIB_STREAM_TEST;ENABLE_MULTI2_SIMD;USE_BENCHMARK;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)
+ MultiThreadedDLL
+
+ Level3
+ ProgramDatabase
+ MaxSpeed
+ AnySuitable
+ true
+ Speed
+ true
+ false
+ true
+ Fast
+ /source-charset:utf-8 %(AdditionalOptions)
+
+
+ winscard.lib;%(AdditionalDependencies)
+ $(OutDir)$(TargetName)$(TargetExt)
+ false
+ Console
+ true
+ true
+ MachineX86
+ UseLinkTimeCodeGeneration
+
+
+
+
+ ENABLE_ARIB_STREAM_TEST;ENABLE_MULTI2_SIMD;USE_BENCHMARK;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)
+ MultiThreadedDLL
+
+
+ Level3
+ ProgramDatabase
+ MaxSpeed
+ AnySuitable
+ true
+ Speed
+ true
+ false
+ true
+ Fast
+ /source-charset:utf-8 %(AdditionalOptions)
+
+
+ winscard.lib;%(AdditionalDependencies)
+ $(OutDir)$(TargetName)$(TargetExt)
+ false
+ Console
+ true
+ true
+ UseLinkTimeCodeGeneration
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/aribb25/arib-b25-stream-test.vcxproj.filters b/aribb25/arib-b25-stream-test.vcxproj.filters
new file mode 100644
index 0000000..037073b
--- /dev/null
+++ b/aribb25/arib-b25-stream-test.vcxproj.filters
@@ -0,0 +1,75 @@
+
+
+
+
+ {4FC737F1-C7A5-4376-A066-2A32D752A2FF}
+ cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx
+
+
+ {93995380-89BD-4b04-88EB-625FBE52EBFB}
+ h;hpp;hxx;hm;inl;inc;xsd
+
+
+ {67DA6AB6-F800-4c08-8B7A-83BB121AAD01}
+ rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav
+
+
+
+
+ ソース ファイル
+
+
+ ソース ファイル
+
+
+ ソース ファイル
+
+
+ ソース ファイル
+
+
+ ソース ファイル
+
+
+ ソース ファイル
+
+
+
+
+ ヘッダー ファイル
+
+
+ ヘッダー ファイル
+
+
+ ヘッダー ファイル
+
+
+ ヘッダー ファイル
+
+
+ ヘッダー ファイル
+
+
+ ヘッダー ファイル
+
+
+ ヘッダー ファイル
+
+
+ ヘッダー ファイル
+
+
+ ヘッダー ファイル
+
+
+ ヘッダー ファイル
+
+
+ ヘッダー ファイル
+
+
+ ヘッダー ファイル
+
+
+
\ No newline at end of file
diff --git a/aribb25/td.c b/aribb25/td.c
index 1d2c2c3..03a033d 100644
--- a/aribb25/td.c
+++ b/aribb25/td.c
@@ -227,7 +227,11 @@ static int parse_arg(OPTION *dst, int argc, TCHAR **argv)
#endif
default:
_ftprintf(stderr, _T("error - unknown option '-%c'\n"), argv[i][1]);
+#ifdef ENABLE_ARIB_STREAM_TEST
+ return -1; // show usage
+#else
return argc;
+#endif
}
}
@@ -240,7 +244,11 @@ static void test_arib_std_b25(OPTION *opt)
static void test_arib_std_b25(const TCHAR *src, const TCHAR *dst, OPTION *opt)
#endif
{
+#ifdef ENABLE_ARIB_STREAM_TEST
+ int code,i,n;
+#else
int code,i,n,m;
+#endif
int sfd,dfd;
#ifndef ENABLE_ARIB_STREAM_TEST