194e3bcc53
Reason for revert:
I'm really sorry for having to revert this but it seems this hit an unexpected compile error downstream:
webrtc/media/sctp/sctpdataengine.cc: In function 'void cricket::VerboseLogPacket(const void*, size_t, int)':
webrtc/media/sctp/sctpdataengine.cc:172:37: error: invalid conversion from 'const void*' to 'void*' [-fpermissive]
data, length, direction)) != NULL) {
^
In file included from webrtc/media/sctp/sctpdataengine.cc:20:0:
third_party/usrsctp/usrsctplib/usrsctp.h:964:1: error: initializing argument 1 of 'char* usrsctp_dumppacket(void*, size_t, int)' [-fpermissive]
usrsctp_dumppacket(void *, size_t, int);
^
I'm sure you can fix this easily and just re-land this CL, while I'm going to look into how to add this warning at the public bots (on Monday).
Original issue's description:
> Use CopyOnWriteBuffer instead of Buffer to avoid unnecessary copies.
>
> This CL removes copy and assign support from Buffer and changes various
> parameters from Buffer to CopyOnWriteBuffer so they can be passed along
> and copied without actually copying the underlying data.
>
> With this changed some parameters to be "const" and fixed an issue when
> creating a CopyOnWriteBuffer with empty data.
>
> BUG=webrtc:5155
>
> Committed: https://crrev.com/944c39006f1c52aee20919676002dac7a42b1c05
> Cr-Commit-Position: refs/heads/master@{#12058}
TBR=kwiberg@webrtc.org,tkchin@webrtc.org,tommi@webrtc.org,pthatcher@webrtc.org,jbauch@webrtc.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=webrtc:5155
Review URL: https://codereview.webrtc.org/1817753003
Cr-Commit-Position: refs/heads/master@{#12060}
47 lines
1.2 KiB
C++
47 lines
1.2 KiB
C++
/*
|
|
* Copyright 2015 The WebRTC Project Authors. All rights reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
#include "webrtc/base/buffer.h"
|
|
|
|
#include <algorithm>
|
|
#include <utility>
|
|
|
|
namespace rtc {
|
|
|
|
Buffer::Buffer() : size_(0), capacity_(0), data_(nullptr) {
|
|
RTC_DCHECK(IsConsistent());
|
|
}
|
|
|
|
Buffer::Buffer(const Buffer& buf) : Buffer(buf.data(), buf.size()) {
|
|
}
|
|
|
|
Buffer::Buffer(Buffer&& buf)
|
|
: size_(buf.size()),
|
|
capacity_(buf.capacity()),
|
|
data_(std::move(buf.data_)) {
|
|
RTC_DCHECK(IsConsistent());
|
|
buf.OnMovedFrom();
|
|
}
|
|
|
|
Buffer::Buffer(size_t size) : Buffer(size, size) {
|
|
}
|
|
|
|
Buffer::Buffer(size_t size, size_t capacity)
|
|
: size_(size),
|
|
capacity_(std::max(size, capacity)),
|
|
data_(new uint8_t[capacity_]) {
|
|
RTC_DCHECK(IsConsistent());
|
|
}
|
|
|
|
// Note: The destructor works even if the buffer has been moved from.
|
|
Buffer::~Buffer() = default;
|
|
|
|
}; // namespace rtc
|