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

Side by Side Diff: webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest.h

Issue 2998293002: Make CodecType conversion functions non-optional. (Closed)
Patch Set: Keep old functions for backwards-compat Created 3 years, 3 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) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 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 181 matching lines...) Expand 10 before | Expand all | Expand 10 after
192 config_.input_filename, config_.codec_settings.width, 192 config_.input_filename, config_.codec_settings.width,
193 config_.codec_settings.height)); 193 config_.codec_settings.height));
194 analysis_frame_writer_.reset(new YuvFrameWriterImpl( 194 analysis_frame_writer_.reset(new YuvFrameWriterImpl(
195 config_.output_filename, config_.codec_settings.width, 195 config_.output_filename, config_.codec_settings.width,
196 config_.codec_settings.height)); 196 config_.codec_settings.height));
197 EXPECT_TRUE(analysis_frame_reader_->Init()); 197 EXPECT_TRUE(analysis_frame_reader_->Init());
198 EXPECT_TRUE(analysis_frame_writer_->Init()); 198 EXPECT_TRUE(analysis_frame_writer_->Init());
199 199
200 if (visualization_params) { 200 if (visualization_params) {
201 const std::string codec_name = 201 const std::string codec_name =
202 CodecTypeToPayloadName(config_.codec_settings.codecType) 202 CodecTypeToPayloadString(config_.codec_settings.codecType);
203 .value_or("unknown");
204 const std::string implementation_type = config_.hw_codec ? "hw" : "sw"; 203 const std::string implementation_type = config_.hw_codec ? "hw" : "sw";
205 // clang-format off 204 // clang-format off
206 const std::string output_filename_base = 205 const std::string output_filename_base =
207 OutputPath() + config_.filename + "-" + 206 OutputPath() + config_.filename + "-" +
208 codec_name + "-" + implementation_type + "-" + 207 codec_name + "-" + implementation_type + "-" +
209 std::to_string(initial_bitrate_kbps); 208 std::to_string(initial_bitrate_kbps);
210 // clang-format on 209 // clang-format on
211 if (visualization_params->save_encoded_ivf) { 210 if (visualization_params->save_encoded_ivf) {
212 rtc::File post_encode_file = 211 rtc::File post_encode_file =
213 rtc::File::Create(output_filename_base + ".ivf"); 212 rtc::File::Create(output_filename_base + ".ivf");
(...skipping 508 matching lines...) Expand 10 before | Expand all | Expand 10 after
722 float target_size_key_frame_initial_; 721 float target_size_key_frame_initial_;
723 float target_size_key_frame_; 722 float target_size_key_frame_;
724 float sum_key_frame_size_mismatch_; 723 float sum_key_frame_size_mismatch_;
725 int num_key_frames_; 724 int num_key_frames_;
726 }; 725 };
727 726
728 } // namespace test 727 } // namespace test
729 } // namespace webrtc 728 } // namespace webrtc
730 729
731 #endif // WEBRTC_MODULES_VIDEO_CODING_CODECS_TEST_VIDEOPROCESSOR_INTEGRATIONTES T_H_ 730 #endif // WEBRTC_MODULES_VIDEO_CODING_CODECS_TEST_VIDEOPROCESSOR_INTEGRATIONTES T_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698