From 4f6f92a986579df82721db3fb5053cd65d5ef094 Mon Sep 17 00:00:00 2001
From: Fanny Linderborg <linderborg@webrtc.org>
Date: Thu, 3 Oct 2024 10:31:26 +0200
Subject: [PATCH] Convert CorruptionDetectionMessage to
 FrameInstrumentationSyncData
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bug: webrtc:358039777
Change-Id: I7504573cdee40ee3224242e19c254de815e0311b
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/364485
Auto-Submit: Fanny Linderborg <linderborg@webrtc.org>
Reviewed-by: Erik Språng <sprang@webrtc.org>
Commit-Queue: Erik Språng <sprang@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#43163}
---
 video/rtp_video_stream_receiver2.cc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/video/rtp_video_stream_receiver2.cc b/video/rtp_video_stream_receiver2.cc
index 9c8f28c1f8..4604180304 100644
--- a/video/rtp_video_stream_receiver2.cc
+++ b/video/rtp_video_stream_receiver2.cc
@@ -617,9 +617,9 @@ bool RtpVideoStreamReceiver2::OnReceivedPayloadData(
     CorruptionDetectionMessage message;
     rtp_packet.GetExtension<CorruptionDetectionExtension>(&message);
     if (message.sample_values().empty()) {
-      // TODO: bugs.webrtc.org/358039777 - Convert message to sync data and
-      // use that for assignment instead of `std::nullptr`.
-      video_header.frame_instrumentation_data = std::nullopt;
+      video_header.frame_instrumentation_data =
+          ConvertCorruptionDetectionMessageToFrameInstrumentationSyncData(
+              message, last_corruption_detection_index_);
     } else {
       video_header.frame_instrumentation_data =
           ConvertCorruptionDetectionMessageToFrameInstrumentationData(