Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(83)

Side by Side Diff: webrtc/test/configurable_frame_size_encoder.cc

Issue 2685783014: Replace NULL with nullptr in all C++ files. (Closed)
Patch Set: Fixing android. Created 3 years, 10 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
11 #include "webrtc/test/configurable_frame_size_encoder.h" 11 #include "webrtc/test/configurable_frame_size_encoder.h"
12 12
13 #include <string.h> 13 #include <string.h>
14 14
15 #include "webrtc/base/checks.h" 15 #include "webrtc/base/checks.h"
16 #include "webrtc/common_video/include/video_image.h" 16 #include "webrtc/common_video/include/video_image.h"
17 #include "webrtc/modules/video_coding/include/video_codec_interface.h" 17 #include "webrtc/modules/video_coding/include/video_codec_interface.h"
18 #include "webrtc/test/gtest.h" 18 #include "webrtc/test/gtest.h"
19 19
20 namespace webrtc { 20 namespace webrtc {
21 namespace test { 21 namespace test {
22 22
23 ConfigurableFrameSizeEncoder::ConfigurableFrameSizeEncoder( 23 ConfigurableFrameSizeEncoder::ConfigurableFrameSizeEncoder(
24 size_t max_frame_size) 24 size_t max_frame_size)
25 : callback_(NULL), 25 : callback_(nullptr),
26 max_frame_size_(max_frame_size), 26 max_frame_size_(max_frame_size),
27 current_frame_size_(max_frame_size), 27 current_frame_size_(max_frame_size),
28 buffer_(new uint8_t[max_frame_size]) { 28 buffer_(new uint8_t[max_frame_size]) {
29 memset(buffer_.get(), 0, max_frame_size); 29 memset(buffer_.get(), 0, max_frame_size);
30 } 30 }
31 31
32 ConfigurableFrameSizeEncoder::~ConfigurableFrameSizeEncoder() {} 32 ConfigurableFrameSizeEncoder::~ConfigurableFrameSizeEncoder() {}
33 33
34 int32_t ConfigurableFrameSizeEncoder::InitEncode( 34 int32_t ConfigurableFrameSizeEncoder::InitEncode(
35 const VideoCodec* codec_settings, 35 const VideoCodec* codec_settings,
36 int32_t number_of_cores, 36 int32_t number_of_cores,
37 size_t max_payload_size) { 37 size_t max_payload_size) {
38 return WEBRTC_VIDEO_CODEC_OK; 38 return WEBRTC_VIDEO_CODEC_OK;
39 } 39 }
40 40
41 int32_t ConfigurableFrameSizeEncoder::Encode( 41 int32_t ConfigurableFrameSizeEncoder::Encode(
42 const VideoFrame& inputImage, 42 const VideoFrame& inputImage,
43 const CodecSpecificInfo* codecSpecificInfo, 43 const CodecSpecificInfo* codecSpecificInfo,
44 const std::vector<FrameType>* frame_types) { 44 const std::vector<FrameType>* frame_types) {
45 EncodedImage encodedImage( 45 EncodedImage encodedImage(
46 buffer_.get(), current_frame_size_, max_frame_size_); 46 buffer_.get(), current_frame_size_, max_frame_size_);
47 encodedImage._completeFrame = true; 47 encodedImage._completeFrame = true;
48 encodedImage._encodedHeight = inputImage.height(); 48 encodedImage._encodedHeight = inputImage.height();
49 encodedImage._encodedWidth = inputImage.width(); 49 encodedImage._encodedWidth = inputImage.width();
50 encodedImage._frameType = kVideoFrameKey; 50 encodedImage._frameType = kVideoFrameKey;
51 encodedImage._timeStamp = inputImage.timestamp(); 51 encodedImage._timeStamp = inputImage.timestamp();
52 encodedImage.capture_time_ms_ = inputImage.render_time_ms(); 52 encodedImage.capture_time_ms_ = inputImage.render_time_ms();
53 RTPFragmentationHeader* fragmentation = NULL; 53 RTPFragmentationHeader* fragmentation = nullptr;
54 CodecSpecificInfo specific; 54 CodecSpecificInfo specific;
55 memset(&specific, 0, sizeof(specific)); 55 memset(&specific, 0, sizeof(specific));
56 callback_->OnEncodedImage(encodedImage, &specific, fragmentation); 56 callback_->OnEncodedImage(encodedImage, &specific, fragmentation);
57 57
58 return WEBRTC_VIDEO_CODEC_OK; 58 return WEBRTC_VIDEO_CODEC_OK;
59 } 59 }
60 60
61 int32_t ConfigurableFrameSizeEncoder::RegisterEncodeCompleteCallback( 61 int32_t ConfigurableFrameSizeEncoder::RegisterEncodeCompleteCallback(
62 EncodedImageCallback* callback) { 62 EncodedImageCallback* callback) {
63 callback_ = callback; 63 callback_ = callback;
(...skipping 20 matching lines...) Expand all
84 } 84 }
85 85
86 int32_t ConfigurableFrameSizeEncoder::SetFrameSize(size_t size) { 86 int32_t ConfigurableFrameSizeEncoder::SetFrameSize(size_t size) {
87 RTC_DCHECK_LE(size, max_frame_size_); 87 RTC_DCHECK_LE(size, max_frame_size_);
88 current_frame_size_ = size; 88 current_frame_size_ = size;
89 return WEBRTC_VIDEO_CODEC_OK; 89 return WEBRTC_VIDEO_CODEC_OK;
90 } 90 }
91 91
92 } // namespace test 92 } // namespace test
93 } // namespace webrtc 93 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698