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

Side by Side Diff: webrtc/modules/audio_processing/test/process_test.cc

Issue 1698243003: Changed order of events when synthesizing a call in audioproc (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 10 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 | « no previous file | no next file » | 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) 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 822 matching lines...) Expand 10 before | Expand all | Expand 10 after
833 while (simulating || feof(event_file) == 0) { 833 while (simulating || feof(event_file) == 0) {
834 std::ostringstream trace_stream; 834 std::ostringstream trace_stream;
835 trace_stream << "Processed frames: " << reverse_count << " (reverse), " 835 trace_stream << "Processed frames: " << reverse_count << " (reverse), "
836 << primary_count << " (primary)"; 836 << primary_count << " (primary)";
837 SCOPED_TRACE(trace_stream.str()); 837 SCOPED_TRACE(trace_stream.str());
838 838
839 if (simulating) { 839 if (simulating) {
840 if (far_file == NULL) { 840 if (far_file == NULL) {
841 event = kCaptureEvent; 841 event = kCaptureEvent;
842 } else { 842 } else {
843 if (event == kRenderEvent) { 843 if (event == kCaptureEvent) {
hlundin-webrtc 2016/02/16 12:15:52 You could also write this as event = (event == kCa
peah-webrtc 2016/02/16 12:50:52 Done.
844 event = kRenderEvent;
845 } else {
844 event = kCaptureEvent; 846 event = kCaptureEvent;
845 } else {
846 event = kRenderEvent;
847 } 847 }
848 } 848 }
849 } else { 849 } else {
850 read_count = fread(&event, sizeof(event), 1, event_file); 850 read_count = fread(&event, sizeof(event), 1, event_file);
851 if (read_count != 1) { 851 if (read_count != 1) {
852 break; 852 break;
853 } 853 }
854 } 854 }
855 855
856 far_frame.sample_rate_hz_ = sample_rate_hz; 856 far_frame.sample_rate_hz_ = sample_rate_hz;
(...skipping 289 matching lines...) Expand 10 before | Expand all | Expand 10 after
1146 } // namespace 1146 } // namespace
1147 } // namespace webrtc 1147 } // namespace webrtc
1148 1148
1149 int main(int argc, char* argv[]) { 1149 int main(int argc, char* argv[]) {
1150 webrtc::void_main(argc, argv); 1150 webrtc::void_main(argc, argv);
1151 1151
1152 // Optional, but removes memory leak noise from Valgrind. 1152 // Optional, but removes memory leak noise from Valgrind.
1153 google::protobuf::ShutdownProtobufLibrary(); 1153 google::protobuf::ShutdownProtobufLibrary();
1154 return 0; 1154 return 0;
1155 } 1155 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698