commit 2837edce997b469a702bb96f84ac49dfb727531d
author philipel <philipel@webrtc.org> Tue Oct 02 13:55:47 2018 +0200
committer Commit Bot <commit-bot@chromium.org> Tue Oct 02 13:35:29 2018 +0000
tree 74fb1b652c14b31dac25eeba032f10744bd3591d
parent 3fc5a2087d6fe72dd09b588d16b6c66ccd0ba9c8

Make RtpGenericFrameDescriptor available for E2EE.

This CL makes the RtpGenericFrameDescriptor available in
RTPSenderVideo::SendVideo for encryption and in
RtpVideoStreamReceiver::OnReceivedFrame for decryption.

Bug: webrtc:9361
Change-Id: I5b6d10138c0874657862f103c8c9a2328e6d4a66
Reviewed-on: https://webrtc-review.googlesource.com/102720
Commit-Queue: Philip Eliasson <philipel@webrtc.org>
Reviewed-by: Erik Språng <sprang@webrtc.org>
Reviewed-by: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#24929}

modules/video_coding/frame_object.cc

diff --git a/modules/video_coding/frame_object.cc b/modules/video_coding/frame_object.cc
index 32b0cc1..7f823da 100644
--- a/modules/video_coding/frame_object.cc
+++ b/modules/video_coding/frame_object.cc
@@ -159,6 +159,15 @@
   return packet->video_header;
 }
 
+absl::optional<RtpGenericFrameDescriptor>
+RtpFrameObject::GetGenericFrameDescriptor() const {
+  rtc::CritScope lock(&packet_buffer_->crit_);
+  VCMPacket* packet = packet_buffer_->GetPacket(first_seq_num_);
+  if (!packet)
+    return absl::nullopt;
+  return packet->generic_descriptor;
+}
+
 absl::optional<FrameMarking> RtpFrameObject::GetFrameMarking() const {
   rtc::CritScope lock(&packet_buffer_->crit_);
   VCMPacket* packet = packet_buffer_->GetPacket(first_seq_num_);