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

Fixed build error.

Browse Source 
Merge branch 'master' into voe_rewrites

Conflicts:
	src/voice_engine/main/test/auto_test/standard/after_streaming_fixture.cc

Revert "Rewrote network-before-streaming."

This reverts commit f1a07b813a90e4feef0a0737ebde9fb15acfd459.

Rewrote network-before-streaming.

Fixed strange build error.

Merge branch 'master' into voe_rewrites

Revert "Rewrote network-before-streaming."

This reverts commit f1a07b813a90e4feef0a0737ebde9fb15acfd459.

Rewrote network-before-streaming.

Nit fixes

Clarified some comments and method names.

Style fixes.

Removed tab characters.

Merge branch 'master' into voe_rewrites

Conflicts:
	src/voice_engine/main/test/auto_test/voe_standard_test.cc

Revert "Rewrote network-before-streaming."

This reverts commit f1a07b813a90e4feef0a0737ebde9fb15acfd459.

Rewrote network-before-streaming.

Rewrote the hold test.

Abstracted out resource handling and created a new fixture for starting and stopping playing.

Rewrote network-before-streaming.

Revert "Rewrote network-before-streaming."

This reverts commit f1a07b813a90e4feef0a0737ebde9fb15acfd459.

Rewrote network-before-streaming.

BUG=
TEST=

Review URL: http://webrtc-codereview.appspot.com/333007

git-svn-id: http://webrtc.googlecode.com/svn/trunk@1230 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
phoglund@webrtc.org
2011-12-19 10:24:46 +00:00
parent b33f9dccd6
commit 86a9f9b946
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/voice_engine/main/test/auto_test/standard/after_streaming_fixture.cc
View File

@@ -21,7 +21,7 @@ AfterStreamingFixture::AfterStreamingFixture()
EXPECT_GE(channel_, 0); EXPECT_GE(channel_, 0);
const std::string& input_file = resource_manager_.long_audio_file_path(); const std::string& input_file = resource_manager_.long_audio_file_path();
ASSERT_FALSE(input_file.empty()); EXPECT_FALSE(input_file.empty());
SetUpLocalPlayback(); SetUpLocalPlayback();
StartPlaying(input_file); StartPlaying(input_file);