[Bf-blender-cvs] [e1ee86b63c6] master: Change default AV1 encoder for "slowest"

[Stephen Seo]

Commit: e1ee86b63c6140983e315a073242d441a2e5ae75
Author: Stephen Seo
Date:   Wed Feb 1 17:46:32 2023 +0100
Branches: master
https://developer.blender.org/rBe1ee86b63c6140983e315a073242d441a2e5ae75

Change default AV1 encoder for "slowest"

Previously, having the "Encoding speed" set to "slowest" would choose
libaom-av1 first and librav1e second. This change makes Blender choose
librav1e first (and has a fallback to whatever other AV1 codec is
available if librav1e is not installed).

Addresses /T103849 on systems where librav1e codec available.

Reviewed By: sergey, ISS

Maniphest Tasks: T103849

Differential Revision: https://developer.blender.org/D17002

===================================================================

M	source/blender/blenkernel/intern/writeffmpeg.c

===================================================================

diff --git a/source/blender/blenkernel/intern/writeffmpeg.c b/source/blender/blenkernel/intern/writeffmpeg.c
index 8d6dba440fd..3b402730ee9 100644
--- a/source/blender/blenkernel/intern/writeffmpeg.c
+++ b/source/blender/blenkernel/intern/writeffmpeg.c
@@ -476,11 +476,12 @@ static const AVCodec *get_av1_encoder(
   const AVCodec *codec = NULL;
   switch (context->ffmpeg_preset) {
     case FFM_PRESET_BEST:
-      /* Default to libaom-av1 for BEST preset due to it performing better than rav1e in terms of
-       * video quality (VMAF scores). Fallback to rav1e if libaom-av1 isn't available. */
-      codec = avcodec_find_encoder_by_name("libaom-av1");
+      /* libaom-av1 may produce better VMAF-scoring videos in serveral cases, but there are cases
+       * where using a different encoder is desireable, such as in T103849. */
+      codec = avcodec_find_encoder_by_name("librav1e");
       if (!codec) {
-        codec = avcodec_find_encoder_by_name("librav1e");
+      /* Fallback to libaom-av1 if librav1e is not found. */
+        codec = avcodec_find_encoder_by_name("libaom-av1");
       }
       break;
     case FFM_PRESET_REALTIME: