webrtc/modules/rtp_rtcp/source/forward_error_correction.cc - Issue 1924443002: Revert of Replace the remaining scoped_ptr with unique_ptr in webrtc/modules/

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: webrtc/modules/rtp_rtcp/source/forward_error_correction.cc

Issue 1924443002: Revert of Replace the remaining scoped_ptr with unique_ptr in webrtc/modules/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: Created 4 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « webrtc/modules/rtp_rtcp/source/fec_receiver_unittest.cc ('k') | webrtc/modules/rtp_rtcp/source/h264_bitstream_parser.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: webrtc/modules/rtp_rtcp/source/forward_error_correction.cc

diff --git a/webrtc/modules/rtp_rtcp/source/forward_error_correction.cc b/webrtc/modules/rtp_rtcp/source/forward_error_correction.cc

index 623c658a17401b877bd6748471f1e7ed8b9f3552..b85d813790d57d099eda23688d211e4f9b73ba5a 100644

--- a/webrtc/modules/rtp_rtcp/source/forward_error_correction.cc

+++ b/webrtc/modules/rtp_rtcp/source/forward_error_correction.cc

@@ -15,7 +15,6 @@

#include <algorithm>

#include <iterator>

-#include <memory>

#include "webrtc/base/checks.h"

#include "webrtc/base/logging.h"

@@ -164,7 +163,7 @@

// -- Generate packet masks --

// Always allocate space for a large mask.

- std::unique_ptr<uint8_t[]> packet_mask(

+ rtc::scoped_ptr<uint8_t[]> packet_mask(

new uint8_t[num_fec_packets * kMaskSizeLBitSet]);

memset(packet_mask.get(), 0, num_fec_packets * num_mask_bytes);

internal::GeneratePacketMasks(num_media_packets, num_fec_packets,

« no previous file with comments | « webrtc/modules/rtp_rtcp/source/fec_receiver_unittest.cc ('k') | webrtc/modules/rtp_rtcp/source/h264_bitstream_parser.cc » ('j') | no next file with comments »