commit 2f23676092757bf926edcd8decb3c759b2055ff6
author Hirokazu Honda <hiroh@chromium.org> Thu Mar 28 10:11:36 2024
committer Chromium LUCI CQ <chromium-scoped@luci-project-accounts.iam.gserviceaccount.com> Thu Mar 28 10:11:36 2024
tree 14e99b2698b1e973a5cbdcac59afa1cb85a2de10
parent 850e4e7de0a697f17be9d42595bab9d7b6ffa597

VideoTrackRecorder: Don't crash when no h264 encoder is available

This fixes the crash introduced in https://crrev.com/c/5294502 by
rather invoking the error callback.

Bug: 331628586
Test: unit test
Change-Id: Icdcaaf506833b2cac2c946f27408acfd5e50d91f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5400939
Reviewed-by: Guido Urdaneta <guidou@chromium.org>
Reviewed-by: Markus Handell <handellm@google.com>
Commit-Queue: Hirokazu Honda <hiroh@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1279540}

third_party/blink/renderer/modules/mediarecorder/video_track_recorder.cc

diff --git a/third_party/blink/renderer/modules/mediarecorder/video_track_recorder.cc b/third_party/blink/renderer/modules/mediarecorder/video_track_recorder.cc
index 14db449..82fbead4 100644
--- a/third_party/blink/renderer/modules/mediarecorder/video_track_recorder.cc
+++ b/third_party/blink/renderer/modules/mediarecorder/video_track_recorder.cc
@@ -247,7 +247,7 @@
 }
 
 // Returns the default codec profile for |codec_id|.
-media::VideoCodecProfile DefaultCodecProfile(
+std::optional<media::VideoCodecProfile> DefaultCodecProfile(
     VideoTrackRecorder::CodecId codec_id) {
   switch (codec_id) {
 #if BUILDFLAG(ENABLE_OPENH264)
@@ -263,8 +263,8 @@
       return media::AV1PROFILE_MIN;
 #endif  // BUILDFLAG(ENABLE_LIBAOM)
     default:
-      NOTREACHED_NORETURN()
-          << "Unsupported codec: " << static_cast<int>(codec_id);
+      NOTREACHED() << "Unsupported codec: " << static_cast<int>(codec_id);
+      return std::nullopt;
   }
 }
 
@@ -999,12 +999,6 @@
   const gfx::Size& input_size = frame->visible_rect().size();
   const bool can_use_vea = CanUseAcceleratedEncoder(
       codec_profile, input_size.width(), input_size.height());
-  // If |can_use_vea| is true, codec_profile.profile must be filled after
-  // CanUseAcceleratedEncoder().
-  if (!codec_profile.profile.has_value()) {
-    CHECK(!can_use_vea);
-    codec_profile.profile = DefaultCodecProfile(codec_profile.codec_id);
-  }
 
 #if BUILDFLAG(USE_PROPRIETARY_CODECS) && !BUILDFLAG(ENABLE_OPENH264)
   if (MustUseVEA(codec_profile.codec_id) &&
@@ -1019,10 +1013,25 @@
   }
 #endif
 
+  // If |can_use_vea| is true, codec_profile.profile must be filled after
+  // CanUseAcceleratedEncoder().
+  if (!codec_profile.profile.has_value()) {
+    CHECK(!can_use_vea);
+    std::optional<media::VideoCodecProfile> default_profile =
+        DefaultCodecProfile(codec_profile.codec_id);
+    if (!default_profile) {
+      DLOG(ERROR) << "No software encoder is available for the codec";
+      callback_interface()->OnVideoEncodingError();
+      return;
+    }
+    codec_profile.profile = *default_profile;
+  }
+
   // Avoid reinitializing |encoder_| when there are multiple frames sent to the
   // sink to initialize, https://crbug.com/698441.
-  if (encoder_)
+  if (encoder_) {
     return;
+  }
 
   DisconnectFromTrack();