AV1のチェックを追加。

rigaya · Nov 17, 2022 · 5ed759e · 5ed759e
1 parent 9a921f9
commit 5ed759e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/Amatsukaze/EncoderOptionParser.hpp b/Amatsukaze/EncoderOptionParser.hpp
@@ -54,10 +54,12 @@ EncoderOptionInfo ParseEncoderOption(ENUM_ENCODER encoder, const tstring& str)
 	if (encoder == ENCODER_X264) {
 		info.format = VS_H264;
 		return info;
-	}
-	else if (encoder == ENCODER_X265) {
+	} else if (encoder == ENCODER_X265) {
 		info.format = VS_H265;
 		return info;
+	} else if (encoder == ENCODER_SVTAV1) {
+		info.format = VS_AV1;
+		return info;
 	}
 
 	auto argv = SplitOptions(str);
@@ -144,14 +146,13 @@ EncoderOptionInfo ParseEncoderOption(ENUM_ENCODER encoder, const tstring& str)
 		else if (arg == L"-c" || arg == L"--codec") {
 			if (next == L"h264") {
 				info.format = VS_H264;
-			}
-			else if (next == L"hevc") {
+			} else if (next == L"hevc") {
 				info.format = VS_H265;
-			}
-			else if (next == L"mpeg2") {
+			} else if (next == L"mpeg2") {
 				info.format = VS_MPEG2;
-			}
-			else {
+			} else if (next == L"av1") {
+				info.format = VS_AV1;
+			} else {
 				info.format = VS_UNKNOWN;
 			}
 		}

diff --git a/Amatsukaze/StreamUtils.hpp b/Amatsukaze/StreamUtils.hpp
@@ -571,7 +571,8 @@ enum VIDEO_STREAM_FORMAT {
 	VS_UNKNOWN,
 	VS_MPEG2,
 	VS_H264,
-	VS_H265
+	VS_H265,
+	VS_AV1
 };
 
 enum PICTURE_TYPE {