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}
42 lines
1.3 KiB
C++
42 lines
1.3 KiB
C++
/*
|
|
* Copyright 2013 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.
|
|
*/
|
|
|
|
#ifndef WEBRTC_API_SCTPUTILS_H_
|
|
#define WEBRTC_API_SCTPUTILS_H_
|
|
|
|
#include <string>
|
|
|
|
#include "webrtc/api/datachannelinterface.h"
|
|
|
|
namespace rtc {
|
|
class Buffer;
|
|
} // namespace rtc
|
|
|
|
namespace webrtc {
|
|
struct DataChannelInit;
|
|
|
|
// Read the message type and return true if it's an OPEN message.
|
|
bool IsOpenMessage(const rtc::Buffer& payload);
|
|
|
|
bool ParseDataChannelOpenMessage(const rtc::Buffer& payload,
|
|
std::string* label,
|
|
DataChannelInit* config);
|
|
|
|
bool ParseDataChannelOpenAckMessage(const rtc::Buffer& payload);
|
|
|
|
bool WriteDataChannelOpenMessage(const std::string& label,
|
|
const DataChannelInit& config,
|
|
rtc::Buffer* payload);
|
|
|
|
void WriteDataChannelOpenAckMessage(rtc::Buffer* payload);
|
|
} // namespace webrtc
|
|
|
|
#endif // WEBRTC_API_SCTPUTILS_H_
|