| Index: webrtc/modules/video_coding/codecs/i420/i420.cc
|
| diff --git a/webrtc/modules/video_coding/codecs/i420/i420.cc b/webrtc/modules/video_coding/codecs/i420/i420.cc
|
| index d05ba7f519bf26e5a4147a65b62e2b078b3ffd36..e85bf3c517705f1978424fcd497d8b9568b15c6c 100644
|
| --- a/webrtc/modules/video_coding/codecs/i420/i420.cc
|
| +++ b/webrtc/modules/video_coding/codecs/i420/i420.cc
|
| @@ -23,7 +23,7 @@ const size_t kI420HeaderSize = 4;
|
| namespace webrtc {
|
|
|
| I420Encoder::I420Encoder()
|
| - : _inited(false), _encodedImage(), _encodedCompleteCallback(NULL) {}
|
| + : _inited(false), _encodedImage(), _encodedCompleteCallback(nullptr) {}
|
|
|
| I420Encoder::~I420Encoder() {
|
| _inited = false;
|
| @@ -33,9 +33,9 @@ I420Encoder::~I420Encoder() {
|
| int I420Encoder::Release() {
|
| // Should allocate an encoded frame and then release it here, for that we
|
| // actually need an init flag.
|
| - if (_encodedImage._buffer != NULL) {
|
| + if (_encodedImage._buffer != nullptr) {
|
| delete[] _encodedImage._buffer;
|
| - _encodedImage._buffer = NULL;
|
| + _encodedImage._buffer = nullptr;
|
| }
|
| _inited = false;
|
| return WEBRTC_VIDEO_CODEC_OK;
|
| @@ -44,7 +44,7 @@ int I420Encoder::Release() {
|
| int I420Encoder::InitEncode(const VideoCodec* codecSettings,
|
| int /*numberOfCores*/,
|
| size_t /*maxPayloadSize */) {
|
| - if (codecSettings == NULL) {
|
| + if (codecSettings == nullptr) {
|
| return WEBRTC_VIDEO_CODEC_ERR_PARAMETER;
|
| }
|
| if (codecSettings->width < 1 || codecSettings->height < 1) {
|
| @@ -52,16 +52,16 @@ int I420Encoder::InitEncode(const VideoCodec* codecSettings,
|
| }
|
|
|
| // Allocating encoded memory.
|
| - if (_encodedImage._buffer != NULL) {
|
| + if (_encodedImage._buffer != nullptr) {
|
| delete[] _encodedImage._buffer;
|
| - _encodedImage._buffer = NULL;
|
| + _encodedImage._buffer = nullptr;
|
| _encodedImage._size = 0;
|
| }
|
| const size_t newSize =
|
| CalcBufferSize(kI420, codecSettings->width, codecSettings->height) +
|
| kI420HeaderSize;
|
| uint8_t* newBuffer = new uint8_t[newSize];
|
| - if (newBuffer == NULL) {
|
| + if (newBuffer == nullptr) {
|
| return WEBRTC_VIDEO_CODEC_MEMORY;
|
| }
|
| _encodedImage._size = newSize;
|
| @@ -78,7 +78,7 @@ int I420Encoder::Encode(const VideoFrame& inputImage,
|
| if (!_inited) {
|
| return WEBRTC_VIDEO_CODEC_UNINITIALIZED;
|
| }
|
| - if (_encodedCompleteCallback == NULL) {
|
| + if (_encodedCompleteCallback == nullptr) {
|
| return WEBRTC_VIDEO_CODEC_UNINITIALIZED;
|
| }
|
|
|
| @@ -139,10 +139,7 @@ int I420Encoder::RegisterEncodeCompleteCallback(
|
| }
|
|
|
| I420Decoder::I420Decoder()
|
| - : _width(0),
|
| - _height(0),
|
| - _inited(false),
|
| - _decodeCompleteCallback(NULL) {}
|
| + : _width(0), _height(0), _inited(false), _decodeCompleteCallback(nullptr) {}
|
|
|
| I420Decoder::~I420Decoder() {
|
| Release();
|
| @@ -150,7 +147,7 @@ I420Decoder::~I420Decoder() {
|
|
|
| int I420Decoder::InitDecode(const VideoCodec* codecSettings,
|
| int /*numberOfCores */) {
|
| - if (codecSettings == NULL) {
|
| + if (codecSettings == nullptr) {
|
| return WEBRTC_VIDEO_CODEC_ERR_PARAMETER;
|
| } else if (codecSettings->width < 1 || codecSettings->height < 1) {
|
| return WEBRTC_VIDEO_CODEC_ERR_PARAMETER;
|
| @@ -166,10 +163,10 @@ int I420Decoder::Decode(const EncodedImage& inputImage,
|
| const RTPFragmentationHeader* /*fragmentation*/,
|
| const CodecSpecificInfo* /*codecSpecificInfo*/,
|
| int64_t /*renderTimeMs*/) {
|
| - if (inputImage._buffer == NULL) {
|
| + if (inputImage._buffer == nullptr) {
|
| return WEBRTC_VIDEO_CODEC_ERR_PARAMETER;
|
| }
|
| - if (_decodeCompleteCallback == NULL) {
|
| + if (_decodeCompleteCallback == nullptr) {
|
| return WEBRTC_VIDEO_CODEC_UNINITIALIZED;
|
| }
|
| if (inputImage._length <= 0) {
|
|
|