From 4275448cbc6074f61d4ea1bf610b02adb1e77dae Mon Sep 17 00:00:00 2001 From: philipel Date: Fri, 24 Sep 2021 12:26:53 +0200 Subject: [PATCH] Use new CopyOnWriteBuffer ctor/append function in H264PacketBuffer. Bug: none Change-Id: I02aace124f3f5a578a52348675b346ff890d8d82 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/232900 Commit-Queue: Philip Eliasson Reviewed-by: Danil Chapovalov Cr-Commit-Position: refs/heads/main@{#35082} --- modules/video_coding/h264_packet_buffer.cc | 4 ++-- modules/video_coding/h264_packet_buffer_unittest.cc | 7 +++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/modules/video_coding/h264_packet_buffer.cc b/modules/video_coding/h264_packet_buffer.cc index 8968539b63..7b821a13b7 100644 --- a/modules/video_coding/h264_packet_buffer.cc +++ b/modules/video_coding/h264_packet_buffer.cc @@ -107,13 +107,13 @@ rtc::CopyOnWriteBuffer FixVideoPayload(rtc::ArrayView payload, if (IsFirstPacketOfFragment(h264_header)) { result.AppendData(kStartCode); } - result.AppendData(payload.data(), payload.size()); + result.AppendData(payload); return result; } case kH264SingleNalu: { result.AppendData(kStartCode); - result.AppendData(payload.data(), payload.size()); + result.AppendData(payload); return result; } } diff --git a/modules/video_coding/h264_packet_buffer_unittest.cc b/modules/video_coding/h264_packet_buffer_unittest.cc index 3d2a432c54..4f2331da28 100644 --- a/modules/video_coding/h264_packet_buffer_unittest.cc +++ b/modules/video_coding/h264_packet_buffer_unittest.cc @@ -198,15 +198,14 @@ std::unique_ptr Packet::Build() { } rtc::CopyOnWriteBuffer Packet::BuildFuaPayload() const { - return rtc::CopyOnWriteBuffer(nalu_payloads_[0].data(), - nalu_payloads_[0].size()); + return rtc::CopyOnWriteBuffer(nalu_payloads_[0]); } rtc::CopyOnWriteBuffer Packet::BuildSingleNaluPayload() const { rtc::CopyOnWriteBuffer res; auto& h264_header = H264Header(); res.AppendData(&h264_header.nalus[0].type, 1); - res.AppendData(nalu_payloads_[0].data(), nalu_payloads_[0].size()); + res.AppendData(nalu_payloads_[0]); return res; } @@ -224,7 +223,7 @@ rtc::CopyOnWriteBuffer Packet::BuildStapAPayload() const { res.AppendData(length_as_array); res.AppendData(&h264_header.nalus[i].type, 1); - res.AppendData(nalu_payloads_[i].data(), nalu_payloads_[i].size()); + res.AppendData(nalu_payloads_[i]); } return res; }