commit a48dd43fe185ed6a826b7ce3bfee0b2187329159
author Danil Chapovalov <danilchap@webrtc.org> Mon Jun 08 17:47:08 2020
committer Commit Bot <commit-bot@chromium.org> Tue Jun 09 10:31:35 2020
tree 417666882071341186b43d276e82423717787339
parent c186e1498be9e80d90265f1214755f23386bfbb4

Add builder setters for ScalableVideoStructure::LayerFrameConfig

Bug: None
Change-Id: I19721f87b9f4641e093dc51f9c023b0493adcf97
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/176702
Reviewed-by: Philip Eliasson <philipel@webrtc.org>
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#31473}

modules/video_coding/codecs/av1/libaom_av1_encoder.cc

diff --git a/modules/video_coding/codecs/av1/libaom_av1_encoder.cc b/modules/video_coding/codecs/av1/libaom_av1_encoder.cc
index 0ac3951..ed2507d 100644
--- a/modules/video_coding/codecs/av1/libaom_av1_encoder.cc
+++ b/modules/video_coding/codecs/av1/libaom_av1_encoder.cc
@@ -331,8 +331,8 @@
 void LibaomAv1Encoder::SetSvcLayerId(
     const ScalableVideoController::LayerFrameConfig& layer_frame) {
   aom_svc_layer_id_t layer_id = {};
-  layer_id.spatial_layer_id = layer_frame.spatial_id;
-  layer_id.temporal_layer_id = layer_frame.temporal_id;
+  layer_id.spatial_layer_id = layer_frame.SpatialId();
+  layer_id.temporal_layer_id = layer_frame.TemporalId();
   aom_codec_err_t ret =
       aom_codec_control(&ctx_, AV1E_SET_SVC_LAYER_ID, &layer_id);
   if (ret != AOM_CODEC_OK) {
@@ -354,9 +354,9 @@
   static constexpr int kAv1NumBuffers = 8;
 
   aom_svc_ref_frame_config_t ref_frame_config = {};
-  RTC_CHECK_LE(layer_frame.buffers.size(), ABSL_ARRAYSIZE(kPreferedSlotName));
-  for (size_t i = 0; i < layer_frame.buffers.size(); ++i) {
-    const CodecBufferUsage& buffer = layer_frame.buffers[i];
+  RTC_CHECK_LE(layer_frame.Buffers().size(), ABSL_ARRAYSIZE(kPreferedSlotName));
+  for (size_t i = 0; i < layer_frame.Buffers().size(); ++i) {
+    const CodecBufferUsage& buffer = layer_frame.Buffers()[i];
     int slot_name = kPreferedSlotName[i];
     RTC_CHECK_GE(buffer.id, 0);
     RTC_CHECK_LT(buffer.id, kAv1NumBuffers);
@@ -442,7 +442,7 @@
 
   for (ScalableVideoController::LayerFrameConfig& layer_frame : layer_frames) {
     aom_enc_frame_flags_t flags =
-        layer_frame.is_keyframe ? AOM_EFLAG_FORCE_KF : 0;
+        layer_frame.IsKeyframe() ? AOM_EFLAG_FORCE_KF : 0;
 
     if (svc_enabled_) {
       SetSvcLayerId(layer_frame);
@@ -486,9 +486,10 @@
         }
         encoded_image.SetEncodedData(EncodedImageBuffer::Create(data, size));
 
-        layer_frame.is_keyframe =
-            ((pkt->data.frame.flags & AOM_EFLAG_FORCE_KF) != 0);
-        encoded_image._frameType = layer_frame.is_keyframe
+        if ((pkt->data.frame.flags & AOM_EFLAG_FORCE_KF) != 0) {
+          layer_frame.Keyframe();
+        }
+        encoded_image._frameType = layer_frame.IsKeyframe()
                                        ? VideoFrameType::kVideoFrameKey
                                        : VideoFrameType::kVideoFrameDelta;
         encoded_image.SetTimestamp(frame.timestamp());
@@ -517,7 +518,7 @@
     if (encoded_image.size() > 0) {
       CodecSpecificInfo codec_specific_info;
       codec_specific_info.codecType = kVideoCodecAV1;
-      bool is_keyframe = layer_frame.is_keyframe;
+      bool is_keyframe = layer_frame.IsKeyframe();
       codec_specific_info.generic_frame_info =
           svc_controller_->OnEncodeDone(std::move(layer_frame));
       if (is_keyframe && codec_specific_info.generic_frame_info) {