キーフレーム生成を共通ではなくコーデック別に変更する

Author: voluntas

src/hwenc_amf/amf_video_encoder.cpp

@@ -297,16 +297,40 @@ int32_t AMFVideoEncoderImpl::Encode(
   }
 
   if (send_key_frame) {
-    res = surface_->SetProperty(AMF_VIDEO_ENCODER_FORCE_PICTURE_TYPE,
-                                AMF_VIDEO_ENCODER_PICTURE_TYPE_IDR);
-    RETURN_IF_FAILED(
-        res, "Failed to SetProperty(AMF_VIDEO_ENCODER_FORCE_PICTURE_TYPE)");
-    res = surface_->SetProperty(AMF_VIDEO_ENCODER_INSERT_SPS, true);
-    RETURN_IF_FAILED(res,
-                     "Failed to SetProperty(AMF_VIDEO_ENCODER_INSERT_SPS)");
-    res = surface_->SetProperty(AMF_VIDEO_ENCODER_INSERT_PPS, true);
-    RETURN_IF_FAILED(res,
-                     "Failed to SetProperty(AMF_VIDEO_ENCODER_INSERT_PPS)");
+    switch (codec_) {
+      case webrtc::VideoCodecType::kVideoCodecH264:
+        res = surface_->SetProperty(AMF_VIDEO_ENCODER_FORCE_PICTURE_TYPE,
+                                    AMF_VIDEO_ENCODER_PICTURE_TYPE_IDR);
+        RETURN_IF_FAILED(
+            res, "Failed to SetProperty(AMF_VIDEO_ENCODER_FORCE_PICTURE_TYPE)");
+        res = surface_->SetProperty(AMF_VIDEO_ENCODER_INSERT_SPS, true);
+        RETURN_IF_FAILED(res,
+                         "Failed to SetProperty(AMF_VIDEO_ENCODER_INSERT_SPS)");
+        res = surface_->SetProperty(AMF_VIDEO_ENCODER_INSERT_PPS, true);
+        RETURN_IF_FAILED(res,
+                         "Failed to SetProperty(AMF_VIDEO_ENCODER_INSERT_PPS)");
+        break;
+      case webrtc::VideoCodecType::kVideoCodecH265:
+        res = surface_->SetProperty(AMF_VIDEO_ENCODER_HEVC_FORCE_PICTURE_TYPE,
+                                    AMF_VIDEO_ENCODER_HEVC_PICTURE_TYPE_IDR);
+        RETURN_IF_FAILED(
+            res, "Failed to SetProperty(AMF_VIDEO_ENCODER_HEVC_FORCE_PICTURE_TYPE)");
+        res = surface_->SetProperty(AMF_VIDEO_ENCODER_HEVC_INSERT_HEADER, true);
+        RETURN_IF_FAILED(res,
+                         "Failed to SetProperty(AMF_VIDEO_ENCODER_HEVC_INSERT_HEADER)");
+        break;
+      case webrtc::VideoCodecType::kVideoCodecAV1:
+        res = surface_->SetProperty(AMF_VIDEO_ENCODER_AV1_FORCE_FRAME_TYPE,
+                                    AMF_VIDEO_ENCODER_AV1_FORCE_FRAME_TYPE_KEY);
+        RETURN_IF_FAILED(
+            res, "Failed to SetProperty(AMF_VIDEO_ENCODER_AV1_FORCE_FRAME_TYPE)");
+        res = surface_->SetProperty(AMF_VIDEO_ENCODER_AV1_FORCE_INSERT_SEQUENCE_HEADER, true);
+        RETURN_IF_FAILED(res,
+                         "Failed to SetProperty(AMF_VIDEO_ENCODER_AV1_FORCE_INSERT_SEQUENCE_HEADER)");
+        break;
+      default:
+        break;
+    }
   }
 
   res = encoder_->SubmitInput(surface_);