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

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

Issue 2467373003: Reland of move deprected functions from EncodedImageCallback and RtpRtcp (Closed)
Patch Set: Created 4 years, 1 month 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
« no previous file with comments | « webrtc/test/configurable_frame_size_encoder.cc ('k') | webrtc/video/payload_router_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 EncodedImage encoded( 105 EncodedImage encoded(
106 encoded_buffer_, stream_bytes, sizeof(encoded_buffer_)); 106 encoded_buffer_, stream_bytes, sizeof(encoded_buffer_));
107 encoded._timeStamp = input_image.timestamp(); 107 encoded._timeStamp = input_image.timestamp();
108 encoded.capture_time_ms_ = input_image.render_time_ms(); 108 encoded.capture_time_ms_ = input_image.render_time_ms();
109 encoded._frameType = (*frame_types)[i]; 109 encoded._frameType = (*frame_types)[i];
110 encoded._encodedWidth = config_.simulcastStream[i].width; 110 encoded._encodedWidth = config_.simulcastStream[i].width;
111 encoded._encodedHeight = config_.simulcastStream[i].height; 111 encoded._encodedHeight = config_.simulcastStream[i].height;
112 encoded.rotation_ = input_image.rotation(); 112 encoded.rotation_ = input_image.rotation();
113 RTC_DCHECK(callback_ != NULL); 113 RTC_DCHECK(callback_ != NULL);
114 specifics.codec_name = ImplementationName(); 114 specifics.codec_name = ImplementationName();
115 if (callback_->Encoded(encoded, &specifics, NULL).error != 0) 115 if (callback_->OnEncodedImage(encoded, &specifics, NULL).error !=
116 EncodedImageCallback::Result::OK) {
116 return -1; 117 return -1;
118 }
117 bits_available -= std::min(encoded._length * 8, bits_available); 119 bits_available -= std::min(encoded._length * 8, bits_available);
118 } 120 }
119 return 0; 121 return 0;
120 } 122 }
121 123
122 int32_t FakeEncoder::RegisterEncodeCompleteCallback( 124 int32_t FakeEncoder::RegisterEncodeCompleteCallback(
123 EncodedImageCallback* callback) { 125 EncodedImageCallback* callback) {
124 callback_ = callback; 126 callback_ = callback;
125 return 0; 127 return 0;
126 } 128 }
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
216 int delay_ms = 0; 218 int delay_ms = 0;
217 { 219 {
218 rtc::CritScope lock(&lock_); 220 rtc::CritScope lock(&lock_);
219 delay_ms = delay_ms_; 221 delay_ms = delay_ms_;
220 } 222 }
221 SleepMs(delay_ms); 223 SleepMs(delay_ms);
222 return FakeEncoder::Encode(input_image, codec_specific_info, frame_types); 224 return FakeEncoder::Encode(input_image, codec_specific_info, frame_types);
223 } 225 }
224 } // namespace test 226 } // namespace test
225 } // namespace webrtc 227 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/test/configurable_frame_size_encoder.cc ('k') | webrtc/video/payload_router_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698