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

Side by Side Diff: webrtc/video/video_quality_test.cc

Issue 2443123002: Delete ShallowCopy, in favor of copy construction and assignment. (Closed)
Patch Set: Rebase. 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
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2015 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2015 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 #include "webrtc/video/video_quality_test.h" 10 #include "webrtc/video/video_quality_test.h"
(...skipping 459 matching lines...) Expand 10 before | Expand all | Expand 10 after
470 it = encoded_frame_sizes_.find(reference_timestamp - 1); 470 it = encoded_frame_sizes_.find(reference_timestamp - 1);
471 size_t encoded_size = it == encoded_frame_sizes_.end() ? 0 : it->second; 471 size_t encoded_size = it == encoded_frame_sizes_.end() ? 0 : it->second;
472 if (it != encoded_frame_sizes_.end()) 472 if (it != encoded_frame_sizes_.end())
473 encoded_frame_sizes_.erase(it); 473 encoded_frame_sizes_.erase(it);
474 474
475 VideoFrame reference_copy; 475 VideoFrame reference_copy;
476 VideoFrame render_copy; 476 VideoFrame render_copy;
477 477
478 rtc::CritScope crit(&comparison_lock_); 478 rtc::CritScope crit(&comparison_lock_);
479 if (comparisons_.size() < kMaxComparisons) { 479 if (comparisons_.size() < kMaxComparisons) {
480 reference_copy.ShallowCopy(reference); 480 reference_copy = reference;
481 render_copy.ShallowCopy(render); 481 render_copy = render;
482 } else { 482 } else {
483 // Copy the time to ensure that delay calculations can still be made. 483 // Copy the time to ensure that delay calculations can still be made.
484 reference_copy.set_ntp_time_ms(reference.ntp_time_ms()); 484 reference_copy.set_ntp_time_ms(reference.ntp_time_ms());
485 render_copy.set_ntp_time_ms(render.ntp_time_ms()); 485 render_copy.set_ntp_time_ms(render.ntp_time_ms());
486 } 486 }
487 comparisons_.push_back(FrameComparison(reference_copy, render_copy, dropped, 487 comparisons_.push_back(FrameComparison(reference_copy, render_copy, dropped,
488 send_time_ms, recv_time_ms, 488 send_time_ms, recv_time_ms,
489 render_time_ms, encoded_size)); 489 render_time_ms, encoded_size));
490 comparison_available_event_.Set(); 490 comparison_available_event_.Set();
491 } 491 }
(...skipping 931 matching lines...) Expand 10 before | Expand all | Expand 10 after
1423 std::ostringstream str; 1423 std::ostringstream str;
1424 str << receive_logs_++; 1424 str << receive_logs_++;
1425 std::string path = 1425 std::string path =
1426 params_.video.encoded_frame_base_path + "." + str.str() + ".recv.ivf"; 1426 params_.video.encoded_frame_base_path + "." + str.str() + ".recv.ivf";
1427 stream->EnableEncodedFrameRecording(rtc::CreatePlatformFile(path), 1427 stream->EnableEncodedFrameRecording(rtc::CreatePlatformFile(path),
1428 10000000); 1428 10000000);
1429 } 1429 }
1430 } 1430 }
1431 1431
1432 } // namespace webrtc 1432 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/video_processing/test/video_processing_unittest.cc ('k') | webrtc/video/vie_encoder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698