commit cf1308fddd9974a1fdf5f9d2fb03e93af69b6d1b
author Danil Chapovalov <danilchap@webrtc.org> Wed Nov 18 17:27:37 2020
committer Commit Bot <commit-bot@chromium.org> Mon Nov 23 10:52:06 2020
tree f676f7e46b981b30599ff5cbc0ccb449210a204f
parent 28cf2efd08518bee4a80da98d517a9a7edcda7e2

Ignore frame type when calculating generic frame dependencies.

When spatial scalability is used, both vpx and aom set key frame flag
for all spatial layers of the first frame, while rtp code expect it to
be set only on the frame without spatial dependencies.

That creates confusion for the frame dependency calculator.
Simplest solution seems to ignore that confusing signal and instead
rely encoder wrappers update frame buffer usages when key frame is generated.

Bug: webrtc:11999
Change-Id: Ica24f1d8d42d32dd24664beabf32ac24872cd15a
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/194002
Reviewed-by: Philip Eliasson <philipel@webrtc.org>
Reviewed-by: Erik Språng <sprang@webrtc.org>
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#32667}

call/rtp_payload_params.cc

diff --git a/call/rtp_payload_params.cc b/call/rtp_payload_params.cc
index f8d6776..5c9c6c0 100644
--- a/call/rtp_payload_params.cc
+++ b/call/rtp_payload_params.cc
@@ -235,12 +235,11 @@
 RTPVideoHeader::GenericDescriptorInfo
 RtpPayloadParams::GenericDescriptorFromFrameInfo(
     const GenericFrameInfo& frame_info,
-    int64_t frame_id,
-    VideoFrameType frame_type) {
+    int64_t frame_id) {
   RTPVideoHeader::GenericDescriptorInfo generic;
   generic.frame_id = frame_id;
   generic.dependencies = dependencies_calculator_.FromBuffersUsage(
-      frame_type, frame_id, frame_info.encoder_buffers);
+      frame_id, frame_info.encoder_buffers);
   generic.chain_diffs =
       chains_calculator_.From(frame_id, frame_info.part_of_chain);
   generic.spatial_index = frame_info.spatial_id;
@@ -261,9 +260,8 @@
       chains_calculator_.Reset(
           codec_specific_info->generic_frame_info->part_of_chain);
     }
-    rtp_video_header->generic =
-        GenericDescriptorFromFrameInfo(*codec_specific_info->generic_frame_info,
-                                       frame_id, rtp_video_header->frame_type);
+    rtp_video_header->generic = GenericDescriptorFromFrameInfo(
+        *codec_specific_info->generic_frame_info, frame_id);
     return;
   }