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

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

Issue 2253563002: Add codec name to CodecSpecificInfo and get the codec name stats from there instead. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Fix fake_encoder.cc Created 4 years, 4 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
« no previous file with comments | « webrtc/modules/video_coding/video_sender.cc ('k') | webrtc/video/send_statistics_proxy.h » ('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 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 encoded_buffer_, stream_bytes, sizeof(encoded_buffer_)); 101 encoded_buffer_, stream_bytes, sizeof(encoded_buffer_));
102 encoded._timeStamp = input_image.timestamp(); 102 encoded._timeStamp = input_image.timestamp();
103 encoded.capture_time_ms_ = input_image.render_time_ms(); 103 encoded.capture_time_ms_ = input_image.render_time_ms();
104 encoded._frameType = (*frame_types)[i]; 104 encoded._frameType = (*frame_types)[i];
105 encoded._encodedWidth = config_.simulcastStream[i].width; 105 encoded._encodedWidth = config_.simulcastStream[i].width;
106 encoded._encodedHeight = config_.simulcastStream[i].height; 106 encoded._encodedHeight = config_.simulcastStream[i].height;
107 // Always encode something on the first frame. 107 // Always encode something on the first frame.
108 if (min_stream_bits > bits_available && i > 0) 108 if (min_stream_bits > bits_available && i > 0)
109 continue; 109 continue;
110 assert(callback_ != NULL); 110 assert(callback_ != NULL);
111 specifics.codec_name = ImplementationName();
111 if (callback_->Encoded(encoded, &specifics, NULL) != 0) 112 if (callback_->Encoded(encoded, &specifics, NULL) != 0)
112 return -1; 113 return -1;
113 bits_available -= std::min(encoded._length * 8, bits_available); 114 bits_available -= std::min(encoded._length * 8, bits_available);
114 } 115 }
115 return 0; 116 return 0;
116 } 117 }
117 118
118 int32_t FakeEncoder::RegisterEncodeCompleteCallback( 119 int32_t FakeEncoder::RegisterEncodeCompleteCallback(
119 EncodedImageCallback* callback) { 120 EncodedImageCallback* callback) {
120 callback_ = callback; 121 callback_ = callback;
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
199 delay_ms_(delay_ms) {} 200 delay_ms_(delay_ms) {}
200 201
201 int32_t DelayedEncoder::Encode(const VideoFrame& input_image, 202 int32_t DelayedEncoder::Encode(const VideoFrame& input_image,
202 const CodecSpecificInfo* codec_specific_info, 203 const CodecSpecificInfo* codec_specific_info,
203 const std::vector<FrameType>* frame_types) { 204 const std::vector<FrameType>* frame_types) {
204 SleepMs(delay_ms_); 205 SleepMs(delay_ms_);
205 return FakeEncoder::Encode(input_image, codec_specific_info, frame_types); 206 return FakeEncoder::Encode(input_image, codec_specific_info, frame_types);
206 } 207 }
207 } // namespace test 208 } // namespace test
208 } // namespace webrtc 209 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/video_coding/video_sender.cc ('k') | webrtc/video/send_statistics_proxy.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698