Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / third_party / webrtc / modules / audio_coding / codecs / opus / opus_unittest.cc

diff --git a/src/third_party/webrtc/modules/audio_coding/codecs/opus/opus_unittest.cc b/src/third_party/webrtc/modules/audio_coding/codecs/opus/opus_unittest.cc
index 582bb73..e76dcdc 100644 (file)
--- a/src/third_party/webrtc/modules/audio_coding/codecs/opus/opus_unittest.cc
+++ b/src/third_party/webrtc/modules/audio_coding/codecs/opus/opus_unittest.cc
@@ -30,7 +30,7 @@ class OpusTest : public ::testing::Test {
   OpusTest();
   virtual void SetUp();
 
-  void TestSetMaxBandwidth(opus_int32 expect, int32_t set);
+  void TestSetMaxPlaybackRate(opus_int32 expect, int32_t set);
 
   WebRtcOpusEncInst* opus_mono_encoder_;
   WebRtcOpusEncInst* opus_stereo_encoder_;
@@ -66,15 +66,15 @@ void OpusTest::SetUp() {
   input_file = NULL;
 }
 
-void OpusTest::TestSetMaxBandwidth(opus_int32 expect, int32_t set) {
+void OpusTest::TestSetMaxPlaybackRate(opus_int32 expect, int32_t set) {
   opus_int32 bandwidth;
   // Test mono encoder.
-  EXPECT_EQ(0, WebRtcOpus_SetMaxBandwidth(opus_mono_encoder_, set));
+  EXPECT_EQ(0, WebRtcOpus_SetMaxPlaybackRate(opus_mono_encoder_, set));
   opus_encoder_ctl(opus_mono_encoder_->encoder,
                    OPUS_GET_MAX_BANDWIDTH(&bandwidth));
   EXPECT_EQ(expect, bandwidth);
   // Test stereo encoder.
-  EXPECT_EQ(0, WebRtcOpus_SetMaxBandwidth(opus_stereo_encoder_, set));
+  EXPECT_EQ(0, WebRtcOpus_SetMaxPlaybackRate(opus_stereo_encoder_, set));
   opus_encoder_ctl(opus_stereo_encoder_->encoder,
                    OPUS_GET_MAX_BANDWIDTH(&bandwidth));
   EXPECT_EQ(expect, bandwidth);
@@ -131,7 +131,6 @@ TEST_F(OpusTest, OpusEncodeDecodeMono) {
   int16_t audio_type;
   int16_t output_data_decode_new[kOpusMaxFrameSamples];
   int16_t output_data_decode[kOpusMaxFrameSamples];
-  int16_t* coded = reinterpret_cast<int16_t*>(bitstream_);
   encoded_bytes = WebRtcOpus_Encode(opus_mono_encoder_, speech_data_,
                                     kOpus20msFrameSamples, kMaxBytes,
                                     bitstream_);
@@ -140,7 +139,7 @@ TEST_F(OpusTest, OpusEncodeDecodeMono) {
                                  encoded_bytes, output_data_decode_new,
                                  &audio_type));
   EXPECT_EQ(kOpus20msFrameSamples,
-            WebRtcOpus_Decode(opus_mono_decoder_, coded,
+            WebRtcOpus_Decode(opus_mono_decoder_, bitstream_,
                               encoded_bytes, output_data_decode,
                               &audio_type));
 
@@ -175,7 +174,6 @@ TEST_F(OpusTest, OpusEncodeDecodeStereo) {
   int16_t output_data_decode_new[kOpusMaxFrameSamples];
   int16_t output_data_decode[kOpusMaxFrameSamples];
   int16_t output_data_decode_slave[kOpusMaxFrameSamples];
-  int16_t* coded = reinterpret_cast<int16_t*>(bitstream_);
   encoded_bytes = WebRtcOpus_Encode(opus_stereo_encoder_, speech_data_,
                                     kOpus20msFrameSamples, kMaxBytes,
                                     bitstream_);
@@ -184,11 +182,11 @@ TEST_F(OpusTest, OpusEncodeDecodeStereo) {
                                  encoded_bytes, output_data_decode_new,
                                  &audio_type));
   EXPECT_EQ(kOpus20msFrameSamples,
-            WebRtcOpus_Decode(opus_stereo_decoder_, coded,
+            WebRtcOpus_Decode(opus_stereo_decoder_, bitstream_,
                               encoded_bytes, output_data_decode,
                               &audio_type));
   EXPECT_EQ(kOpus20msFrameSamples,
-            WebRtcOpus_DecodeSlave(opus_stereo_decoder_, coded,
+            WebRtcOpus_DecodeSlave(opus_stereo_decoder_, bitstream_,
                                    encoded_bytes, output_data_decode_slave,
                                    &audio_type));
 
@@ -259,7 +257,6 @@ TEST_F(OpusTest, OpusDecodeInit) {
   int16_t output_data_decode_new[kOpusMaxFrameSamples];
   int16_t output_data_decode[kOpusMaxFrameSamples];
   int16_t output_data_decode_slave[kOpusMaxFrameSamples];
-  int16_t* coded = reinterpret_cast<int16_t*>(bitstream_);
   encoded_bytes = WebRtcOpus_Encode(opus_stereo_encoder_, speech_data_,
                                     kOpus20msFrameSamples, kMaxBytes,
                                     bitstream_);
@@ -268,11 +265,11 @@ TEST_F(OpusTest, OpusDecodeInit) {
                                  encoded_bytes, output_data_decode_new,
                                  &audio_type));
   EXPECT_EQ(kOpus20msFrameSamples,
-            WebRtcOpus_Decode(opus_stereo_decoder_, coded,
+            WebRtcOpus_Decode(opus_stereo_decoder_, bitstream_,
                               encoded_bytes, output_data_decode,
                               &audio_type));
   EXPECT_EQ(kOpus20msFrameSamples,
-            WebRtcOpus_DecodeSlave(opus_stereo_decoder_, coded,
+            WebRtcOpus_DecodeSlave(opus_stereo_decoder_, bitstream_,
                                    encoded_bytes, output_data_decode_slave,
                                    &audio_type));
 
@@ -293,11 +290,11 @@ TEST_F(OpusTest, OpusDecodeInit) {
                                  encoded_bytes, output_data_decode_new,
                                  &audio_type));
   EXPECT_EQ(kOpus20msFrameSamples,
-            WebRtcOpus_Decode(opus_stereo_decoder_, coded,
+            WebRtcOpus_Decode(opus_stereo_decoder_, bitstream_,
                               encoded_bytes, output_data_decode,
                               &audio_type));
   EXPECT_EQ(kOpus20msFrameSamples,
-            WebRtcOpus_DecodeSlave(opus_stereo_decoder_, coded,
+            WebRtcOpus_DecodeSlave(opus_stereo_decoder_, bitstream_,
                                    encoded_bytes, output_data_decode_slave,
                                    &audio_type));
 
@@ -355,22 +352,25 @@ TEST_F(OpusTest, OpusSetPacketLossRate) {
   EXPECT_EQ(0, WebRtcOpus_EncoderFree(opus_stereo_encoder_));
 }
 
-TEST_F(OpusTest, OpusSetMaxBandwidth) {
+TEST_F(OpusTest, OpusSetMaxPlaybackRate) {
   // Test without creating encoder memory.
-  EXPECT_EQ(-1, WebRtcOpus_SetMaxBandwidth(opus_mono_encoder_, 20000));
-  EXPECT_EQ(-1, WebRtcOpus_SetMaxBandwidth(opus_stereo_encoder_, 20000));
+  EXPECT_EQ(-1, WebRtcOpus_SetMaxPlaybackRate(opus_mono_encoder_, 20000));
+  EXPECT_EQ(-1, WebRtcOpus_SetMaxPlaybackRate(opus_stereo_encoder_, 20000));
 
   // Create encoder memory, try with different bitrates.
   EXPECT_EQ(0, WebRtcOpus_EncoderCreate(&opus_mono_encoder_, 1));
   EXPECT_EQ(0, WebRtcOpus_EncoderCreate(&opus_stereo_encoder_, 2));
 
-  TestSetMaxBandwidth(OPUS_BANDWIDTH_FULLBAND, 24000);
-  TestSetMaxBandwidth(OPUS_BANDWIDTH_FULLBAND, 14000);
-  TestSetMaxBandwidth(OPUS_BANDWIDTH_SUPERWIDEBAND, 10000);
-  TestSetMaxBandwidth(OPUS_BANDWIDTH_WIDEBAND, 7000);
-  TestSetMaxBandwidth(OPUS_BANDWIDTH_MEDIUMBAND, 6000);
-  TestSetMaxBandwidth(OPUS_BANDWIDTH_NARROWBAND, 4000);
-  TestSetMaxBandwidth(OPUS_BANDWIDTH_NARROWBAND, 3000);
+  TestSetMaxPlaybackRate(OPUS_BANDWIDTH_FULLBAND, 48000);
+  TestSetMaxPlaybackRate(OPUS_BANDWIDTH_FULLBAND, 24001);
+  TestSetMaxPlaybackRate(OPUS_BANDWIDTH_SUPERWIDEBAND, 24000);
+  TestSetMaxPlaybackRate(OPUS_BANDWIDTH_SUPERWIDEBAND, 16001);
+  TestSetMaxPlaybackRate(OPUS_BANDWIDTH_WIDEBAND, 16000);
+  TestSetMaxPlaybackRate(OPUS_BANDWIDTH_WIDEBAND, 12001);
+  TestSetMaxPlaybackRate(OPUS_BANDWIDTH_MEDIUMBAND, 12000);
+  TestSetMaxPlaybackRate(OPUS_BANDWIDTH_MEDIUMBAND, 8001);
+  TestSetMaxPlaybackRate(OPUS_BANDWIDTH_NARROWBAND, 8000);
+  TestSetMaxPlaybackRate(OPUS_BANDWIDTH_NARROWBAND, 4000);
 
   // Free memory.
   EXPECT_EQ(0, WebRtcOpus_EncoderFree(opus_mono_encoder_));
@@ -396,7 +396,6 @@ TEST_F(OpusTest, OpusDecodePlcMono) {
   int16_t audio_type;
   int16_t output_data_decode_new[kOpusMaxFrameSamples];
   int16_t output_data_decode[kOpusMaxFrameSamples];
-  int16_t* coded = reinterpret_cast<int16_t*>(bitstream_);
   encoded_bytes = WebRtcOpus_Encode(opus_mono_encoder_, speech_data_,
                                     kOpus20msFrameSamples, kMaxBytes,
                                     bitstream_);
@@ -405,7 +404,7 @@ TEST_F(OpusTest, OpusDecodePlcMono) {
                                  encoded_bytes, output_data_decode_new,
                                  &audio_type));
   EXPECT_EQ(kOpus20msFrameSamples,
-            WebRtcOpus_Decode(opus_mono_decoder_, coded,
+            WebRtcOpus_Decode(opus_mono_decoder_, bitstream_,
                               encoded_bytes, output_data_decode,
                               &audio_type));
 
@@ -448,7 +447,6 @@ TEST_F(OpusTest, OpusDecodePlcStereo) {
   int16_t output_data_decode_new[kOpusMaxFrameSamples];
   int16_t output_data_decode[kOpusMaxFrameSamples];
   int16_t output_data_decode_slave[kOpusMaxFrameSamples];
-  int16_t* coded = reinterpret_cast<int16_t*>(bitstream_);
   encoded_bytes = WebRtcOpus_Encode(opus_stereo_encoder_, speech_data_,
                                     kOpus20msFrameSamples, kMaxBytes,
                                     bitstream_);
@@ -457,11 +455,11 @@ TEST_F(OpusTest, OpusDecodePlcStereo) {
                                  encoded_bytes, output_data_decode_new,
                                  &audio_type));
   EXPECT_EQ(kOpus20msFrameSamples,
-            WebRtcOpus_Decode(opus_stereo_decoder_, coded,
+            WebRtcOpus_Decode(opus_stereo_decoder_, bitstream_,
                               encoded_bytes, output_data_decode,
                               &audio_type));
   EXPECT_EQ(kOpus20msFrameSamples,
-            WebRtcOpus_DecodeSlave(opus_stereo_decoder_, coded,
+            WebRtcOpus_DecodeSlave(opus_stereo_decoder_, bitstream_,
                                    encoded_bytes,
                                    output_data_decode_slave,
                                    &audio_type));