zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adding partial authentication of the Generic RTP Frame Descriptor.

Browse Source 
Bug: None
Change-Id: I590e28acbd17b45dcb4e3bac34d223ad0903f7dc
Reviewed-on: https://webrtc-review.googlesource.com/c/113131
Commit-Queue: Philip Eliasson <philipel@webrtc.org>
Reviewed-by: Philip Eliasson <philipel@webrtc.org>
Reviewed-by: Ilya Nikolaevskiy <ilnik@webrtc.org>
Reviewed-by: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#25921}
This commit is contained in:
Benjamin Wright
2018-12-05 12:28:30 -08:00
committed by Commit Bot
parent e7862cc6b5
commit 722875f72e
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/rtp_rtcp/source/rtp_sender_video.cc
View File

@ -513,7 +513,7 @@ bool RTPSenderVideo::SendVideo(enum VideoCodecType video_type,
size_t bytes_written = 0;
if (frame_encryptor_->Encrypt(
cricket::MEDIA_TYPE_VIDEO, first_packet->Ssrc(),
/*additional_data=*/nullptr,
generic_descriptor_raw,
rtc::MakeArrayView(payload_data, payload_size),
encrypted_video_payload, &bytes_written) != 0) {
return false;

2
video/buffered_frame_decryptor.cc
View File

@ -73,7 +73,7 @@ BufferedFrameDecryptor::FrameDecision BufferedFrameDecryptor::DecryptFrame(
size_t bytes_written = 0;
if (frame_decryptor_->Decrypt(
cricket::MEDIA_TYPE_VIDEO, /*csrcs=*/{},
/*additional_data=*/nullptr, encrypted_frame_bitstream,
descriptor->GetByteRepresentation(), encrypted_frame_bitstream,
inline_decrypted_bitstream, &bytes_written) != 0) {
// Only stash frames if we have never decrypted a frame before.
return first_frame_decrypted_ ? FrameDecision::kDrop