More work

Vouk · Mar 1, 2023 · 2b6eb73 · 2b6eb73
1 parent e1fd970
commit 2b6eb73
Show file tree

Hide file tree

Showing 3 changed files with 72 additions and 68 deletions.
diff --git a/Core/resources/encoders/libx265.json b/Core/resources/encoders/libx265.json
@@ -55,7 +55,7 @@
  "sao-non-deblock": "1",
 
  "deblock": "0:-1",
- "no-open-gop": "1",
+ "open-gop": "0",
  "allow-non-conformance": "1"
  }
  },
@@ -110,7 +110,7 @@
  "sao-non-deblock": "1",
  "deblock": "0:-1",
 
- "no-open-gop": "1",
+ "open-gop": "0",
  "allow-non-conformance": "1"
  }
  },
@@ -165,7 +165,7 @@
  "sao-non-deblock": "1",
 
  "deblock": "0:-1",
- "no-open-gop": "1",
+ "open-gop": "0",
  "allow-non-conformance": "1"
  }
  },
@@ -220,7 +220,7 @@
  "sao-non-deblock": "1",
 
  "deblock": "0:-1",
- "no-open-gop": "1",
+ "open-gop": "0",
  "allow-non-conformance": "1",
  "opt-qp-pps": "1",
  "opt-ref-list-length-pps": "1"
@@ -313,15 +313,15 @@
  "tskip-fast": "1",
 
  "psy-rd": "1.6",
- "rd-refine": "1",
+ "rd-refine": "0",
  "rdpenalty": "1",
  "qp-adaptation-range": "3",
 
  "deblock": "0:0",
  "limit-sao": "1",
  "sao-non-deblock": "1",
 
- "no-open-gop": "1",
+ "open-gop": "0",
  "allow-non-conformance": "1"
  }
  },
@@ -383,15 +383,15 @@
  "tskip-fast": "1",
 
  "psy-rd": "1.6",
- "rd-refine": "1",
+ "rd-refine": "0",
  "rdpenalty": "1",
  "qp-adaptation-range": "3",
 
  "deblock": "0:0",
  "limit-sao": "1",
  "sao-non-deblock": "1",
 
- "no-open-gop": "1",
+ "open-gop": "0",
  "allow-non-conformance": "1"
  }
  },
@@ -453,15 +453,15 @@
  "tskip-fast": "1",
 
  "psy-rd": "1.6",
- "rd-refine": "1",
+ "rd-refine": "0",
  "rdpenalty": "1",
  "qp-adaptation-range": "3",
 
  "deblock": "0:0",
- "limit-sao": "1",
+ "limit-sao": "0",
  "sao-non-deblock": "1",
 
- "no-open-gop": "1",
+ "open-gop": "0",
  "allow-non-conformance": "1"
  }
  },
@@ -522,15 +522,15 @@
  "tskip-fast": "1",
 
  "psy-rd": "1.6",
- "rd-refine": "1",
+ "rd-refine": "0",
  "rdpenalty": "1",
  "qp-adaptation-range": "3",
 
  "deblock": "0:0",
  "limit-sao": "1",
  "sao-non-deblock": "1",
 
- "no-open-gop": "1",
+ "open-gop": "0",
  "allow-non-conformance": "1"
  }
  },
@@ -595,7 +595,7 @@
  "tskip-fast": "1",
 
  "psy-rd": "1.5",
- "rd-refine": "1",
+ "rd-refine": "0",
  "rdpenalty": "2",
  "qp-adaptation-range": "3",
 
@@ -604,7 +604,7 @@
  "limit-sao": "1",
  "sao-non-deblock": "1",
 
- "no-open-gop": "1",
+ "open-gop": "0",
  "allow-non-conformance": "1"
  }
  },
@@ -669,7 +669,7 @@
  "tskip-fast": "1",
 
  "psy-rd": "1.5",
- "rd-refine": "1",
+ "rd-refine": "0",
  "rdpenalty": "2",
  "qp-adaptation-range": "3",
 
@@ -678,7 +678,7 @@
  "limit-sao": "1",
  "sao-non-deblock": "1",
 
- "no-open-gop": "1",
+ "open-gop": "0",
  "allow-non-conformance": "1"
  }
  },
@@ -748,7 +748,7 @@
  "limit-sao": "1",
  "sao-non-deblock": "1",
 
- "no-open-gop": "1",
+ "open-gop": "0",
  "allow-non-conformance": "1",
  "pme": "1"
  }
@@ -819,7 +819,7 @@
  "no-sao": "1",
  "single-sei": "1",
 
- "no-open-gop": "1",
+ "open-gop": "0",
  "allow-non-conformance": "1",
  "opt-qp-pps": "1",
  "opt-ref-list-length-pps": "1"
@@ -902,7 +902,6 @@
  "psy-rd",
  "psy-rdoq",
  "open-gop",
- "no-open-gop",
  "keyint",
  "min-keyint",
  "scenecut",

diff --git a/Core/src/EncoderUtils.cpp b/Core/src/EncoderUtils.cpp
@@ -197,7 +197,12 @@ bool EncoderUtils::IsEncoderAvailable(const wxString name)
  // Open the codec
  try
  {
- const int res = avcodec_open2(codecContext, codec, NULL);
+ // TODO: Workaround for https://trac.ffmpeg.org/ticket/10093
+ AVDictionary* dict = nullptr;
+ if (name == "hevc_nvenc")
+ av_dict_set(&dict, "b_ref_mode", "0", 0);
+
+ const int res = avcodec_open2(codecContext, codec, &dict);
 
  // Only 0 is successful
  ret = res == 0;

diff --git a/Voukoder.sln b/Voukoder.sln
@@ -1,47 +1,47 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.30204.135
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Core", "Core\Core.vcxproj", "{359C3690-9837-4368-9322-FD633464842C}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Voukoder", "Voukoder\Voukoder.vcxproj", "{8603D9F4-BC08-4FB2-BB81-04A7583D222C}"
-EndProject
-Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Installer", "Installer\Installer.wixproj", "{28F27AFF-4920-4DE6-9000-1BE251C85C1F}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|x64 = Debug|x64
- Debug|x86 = Debug|x86
- Release|x64 = Release|x64
- Release|x86 = Release|x86
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {359C3690-9837-4368-9322-FD633464842C}.Debug|x64.ActiveCfg = Debug|x64
- {359C3690-9837-4368-9322-FD633464842C}.Debug|x64.Build.0 = Debug|x64
- {359C3690-9837-4368-9322-FD633464842C}.Debug|x86.ActiveCfg = Debug|Win32
- {359C3690-9837-4368-9322-FD633464842C}.Debug|x86.Build.0 = Debug|Win32
- {359C3690-9837-4368-9322-FD633464842C}.Release|x64.ActiveCfg = Release|x64
- {359C3690-9837-4368-9322-FD633464842C}.Release|x64.Build.0 = Release|x64
- {359C3690-9837-4368-9322-FD633464842C}.Release|x86.ActiveCfg = Release|Win32
- {359C3690-9837-4368-9322-FD633464842C}.Release|x86.Build.0 = Release|Win32
- {8603D9F4-BC08-4FB2-BB81-04A7583D222C}.Debug|x64.ActiveCfg = Debug|x64
- {8603D9F4-BC08-4FB2-BB81-04A7583D222C}.Debug|x64.Build.0 = Debug|x64
- {8603D9F4-BC08-4FB2-BB81-04A7583D222C}.Debug|x86.ActiveCfg = Debug|x64
- {8603D9F4-BC08-4FB2-BB81-04A7583D222C}.Release|x64.ActiveCfg = Release|x64
- {8603D9F4-BC08-4FB2-BB81-04A7583D222C}.Release|x64.Build.0 = Release|x64
- {8603D9F4-BC08-4FB2-BB81-04A7583D222C}.Release|x86.ActiveCfg = Release|x64
- {28F27AFF-4920-4DE6-9000-1BE251C85C1F}.Debug|x64.ActiveCfg = Debug|x64
- {28F27AFF-4920-4DE6-9000-1BE251C85C1F}.Debug|x64.Build.0 = Debug|x64
- {28F27AFF-4920-4DE6-9000-1BE251C85C1F}.Debug|x86.ActiveCfg = Debug|x64
- {28F27AFF-4920-4DE6-9000-1BE251C85C1F}.Release|x64.ActiveCfg = Release|x64
- {28F27AFF-4920-4DE6-9000-1BE251C85C1F}.Release|x64.Build.0 = Release|x64
- {28F27AFF-4920-4DE6-9000-1BE251C85C1F}.Release|x86.ActiveCfg = Release|x64
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
- GlobalSection(ExtensibilityGlobals) = postSolution
- SolutionGuid = {7E37E9CD-3D66-4A65-B3A2-C90C3167F376}
- EndGlobalSection
-EndGlobal
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.4.33213.308
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Core", "Core\Core.vcxproj", "{359C3690-9837-4368-9322-FD633464842C}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Voukoder", "Voukoder\Voukoder.vcxproj", "{8603D9F4-BC08-4FB2-BB81-04A7583D222C}"
+EndProject
+Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Installer", "Installer\Installer.wixproj", "{28F27AFF-4920-4DE6-9000-1BE251C85C1F}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|x64 = Debug|x64
+ Debug|x86 = Debug|x86
+ Release|x64 = Release|x64
+ Release|x86 = Release|x86
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {359C3690-9837-4368-9322-FD633464842C}.Debug|x64.ActiveCfg = Debug|x64
+ {359C3690-9837-4368-9322-FD633464842C}.Debug|x64.Build.0 = Debug|x64
+ {359C3690-9837-4368-9322-FD633464842C}.Debug|x86.ActiveCfg = Debug|Win32
+ {359C3690-9837-4368-9322-FD633464842C}.Debug|x86.Build.0 = Debug|Win32
+ {359C3690-9837-4368-9322-FD633464842C}.Release|x64.ActiveCfg = Release|x64
+ {359C3690-9837-4368-9322-FD633464842C}.Release|x64.Build.0 = Release|x64
+ {359C3690-9837-4368-9322-FD633464842C}.Release|x86.ActiveCfg = Release|Win32
+ {359C3690-9837-4368-9322-FD633464842C}.Release|x86.Build.0 = Release|Win32
+ {8603D9F4-BC08-4FB2-BB81-04A7583D222C}.Debug|x64.ActiveCfg = Debug|x64
+ {8603D9F4-BC08-4FB2-BB81-04A7583D222C}.Debug|x64.Build.0 = Debug|x64
+ {8603D9F4-BC08-4FB2-BB81-04A7583D222C}.Debug|x86.ActiveCfg = Debug|x64
+ {8603D9F4-BC08-4FB2-BB81-04A7583D222C}.Release|x64.ActiveCfg = Release|x64
+ {8603D9F4-BC08-4FB2-BB81-04A7583D222C}.Release|x64.Build.0 = Release|x64
+ {8603D9F4-BC08-4FB2-BB81-04A7583D222C}.Release|x86.ActiveCfg = Release|x64
+ {28F27AFF-4920-4DE6-9000-1BE251C85C1F}.Debug|x64.ActiveCfg = Debug|x64
+ {28F27AFF-4920-4DE6-9000-1BE251C85C1F}.Debug|x64.Build.0 = Debug|x64
+ {28F27AFF-4920-4DE6-9000-1BE251C85C1F}.Debug|x86.ActiveCfg = Debug|x64
+ {28F27AFF-4920-4DE6-9000-1BE251C85C1F}.Release|x64.ActiveCfg = Release|x64
+ {28F27AFF-4920-4DE6-9000-1BE251C85C1F}.Release|x64.Build.0 = Release|x64
+ {28F27AFF-4920-4DE6-9000-1BE251C85C1F}.Release|x86.ActiveCfg = Release|x64
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+ GlobalSection(ExtensibilityGlobals) = postSolution
+ SolutionGuid = {7E37E9CD-3D66-4A65-B3A2-C90C3167F376}
+ EndGlobalSection
+EndGlobal