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

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

Issue 2405173006: Remove deprected functions from EncodedImageCallback and RtpRtcp (Closed)
Patch Set: fix android 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 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 continue; 104 continue;
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 RTC_DCHECK(callback_ != NULL); 112 RTC_DCHECK(callback_ != NULL);
113 specifics.codec_name = ImplementationName(); 113 specifics.codec_name = ImplementationName();
114 if (callback_->Encoded(encoded, &specifics, NULL) != 0) 114 if (callback_->OnEncodedImage(encoded, &specifics, NULL).error !=
115 EncodedImageCallback::Result::OK) {
115 return -1; 116 return -1;
117 }
116 bits_available -= std::min(encoded._length * 8, bits_available); 118 bits_available -= std::min(encoded._length * 8, bits_available);
117 } 119 }
118 return 0; 120 return 0;
119 } 121 }
120 122
121 int32_t FakeEncoder::RegisterEncodeCompleteCallback( 123 int32_t FakeEncoder::RegisterEncodeCompleteCallback(
122 EncodedImageCallback* callback) { 124 EncodedImageCallback* callback) {
123 callback_ = callback; 125 callback_ = callback;
124 return 0; 126 return 0;
125 } 127 }
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
205 delay_ms_(delay_ms) {} 207 delay_ms_(delay_ms) {}
206 208
207 int32_t DelayedEncoder::Encode(const VideoFrame& input_image, 209 int32_t DelayedEncoder::Encode(const VideoFrame& input_image,
208 const CodecSpecificInfo* codec_specific_info, 210 const CodecSpecificInfo* codec_specific_info,
209 const std::vector<FrameType>* frame_types) { 211 const std::vector<FrameType>* frame_types) {
210 SleepMs(delay_ms_); 212 SleepMs(delay_ms_);
211 return FakeEncoder::Encode(input_image, codec_specific_info, frame_types); 213 return FakeEncoder::Encode(input_image, codec_specific_info, frame_types);
212 } 214 }
213 } // namespace test 215 } // namespace test
214 } // namespace webrtc 216 } // 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