Removing a hack for CNG

However, two other "hacks" had to be added to maintain bit-exactness
with legacy.

Note that this change requires a new version of the universal.rtp test
input, although the output reference stays the same.

Moving reference files, and using a new input vector for NetEq4.
The new input vector neteq_universal_new.rtp is identical to the old
neteq_universal.rtp, except that the payload type for CNG packets that
follows a wideband codec is changed to 98.

Update to resources revision 15 where the new reference files are.

Also changing a faulty log error.

Review URL: https://webrtc-codereview.appspot.com/1078009

git-svn-id: http://webrtc.googlecode.com/svn/trunk@3442 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
henrik.lundin@webrtc.org
2013-01-31 13:32:51 +00:00
parent 96a08cef68
commit 73deaadd0e
4 changed files with 48 additions and 22 deletions

View File

@@ -374,19 +374,19 @@ void NetEqDecodingTest::PopulateCng(int frame_index,
TEST_F(NetEqDecodingTest, TestBitExactness) {
const std::string kInputRtpFile = webrtc::test::ProjectRootPath() +
"resources/neteq_universal.rtp";
"resources/audio_coding/neteq_universal_new.rtp";
const std::string kInputRefFile =
webrtc::test::ResourcePath("neteq_universal_ref", "pcm");
webrtc::test::ResourcePath("audio_coding/neteq_universal_ref", "pcm");
DecodeAndCompare(kInputRtpFile, kInputRefFile);
}
TEST_F(NetEqDecodingTest, TestNetworkStatistics) {
const std::string kInputRtpFile = webrtc::test::ProjectRootPath() +
"resources/neteq_universal.rtp";
"resources/audio_coding/neteq_universal_new.rtp";
const std::string kNetworkStatRefFile =
webrtc::test::ResourcePath("neteq_network_stats", "dat");
webrtc::test::ResourcePath("audio_coding/neteq_network_stats", "dat");
const std::string kRtcpStatRefFile =
webrtc::test::ResourcePath("neteq_rtcp_stats", "dat");
webrtc::test::ResourcePath("audio_coding/neteq_rtcp_stats", "dat");
DecodeAndCheckStats(kInputRtpFile, kNetworkStatRefFile, kRtcpStatRefFile);
}