generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Removed a segmentation fault error when processing near_file only.

Browse Source 
Review URL: http://webrtc-codereview.appspot.com/174001

git-svn-id: http://webrtc.googlecode.com/svn/trunk@650 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
bjornv@google.com 2011-09-27 08:04:45 +00:00
parent 961885a8bb
commit a2c6ea09b0
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/modules/audio_processing/main/test/process_test/process_test.cc
View File

@ -482,13 +482,6 @@ void void_main(int argc, char* argv[]) {
<< aecm_echo_path_out_filename; << aecm_echo_path_out_filename;
} }
enum Events {
kInitializeEvent,
kRenderEvent,
kCaptureEvent,
kResetEventDeprecated
};
int16_t event = 0;
size_t read_count = 0; size_t read_count = 0;
int reverse_count = 0; int reverse_count = 0;
int primary_count = 0; int primary_count = 0;
@ -666,6 +659,13 @@ void void_main(int argc, char* argv[]) {
ASSERT_TRUE(feof(pb_file)); ASSERT_TRUE(feof(pb_file));
} else { } else {
enum Events {
kInitializeEvent,
kRenderEvent,
kCaptureEvent,
kResetEventDeprecated
};
int16_t event = 0;
while (simulating || feof(event_file) == 0) { while (simulating || feof(event_file) == 0) {
std::ostringstream trace_stream; std::ostringstream trace_stream;
trace_stream << "Processed frames: " << reverse_count << " (reverse), " trace_stream << "Processed frames: " << reverse_count << " (reverse), "
@ -778,10 +778,6 @@ void void_main(int argc, char* argv[]) {
} }
if (simulating) { if (simulating) {
if (read_count != near_frame._payloadDataLengthInSamples) { if (read_count != near_frame._payloadDataLengthInSamples) {
// Read an equal amount from the far file to avoid errors due to
// not reaching end-of-file.
EXPECT_EQ(0, fseek(far_file, read_count * sizeof(WebRtc_Word16),
SEEK_CUR));
break; // This is expected. break; // This is expected.
} }