Fixing a few tests for the upcoming Opus 1.2-alpha.

webrtc/modules/audio_coding/neteq/neteq_unittest.cc

 /*
  *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 450 matching lines @@
 
   DecodeAndCompare(input_rtp_file,
                    output_checksum,
                    network_stats_checksum,
                    rtcp_stats_checksum,
                    FLAGS_gen_ref);
 }
 
 #if !defined(WEBRTC_IOS) && !defined(WEBRTC_ANDROID) &&             \
     defined(WEBRTC_NETEQ_UNITTEST_BITEXACT) &&                      \
-    defined(WEBRTC_CODEC_OPUS)
+    defined(WEBRTC_CODEC_OPUS) &&                                   \
+    !WEBRTC_OPUS_SUPPORT_120MS_PTIME
 #define MAYBE_TestOpusBitExactness TestOpusBitExactness
 #else
 #define MAYBE_TestOpusBitExactness DISABLED_TestOpusBitExactness
 #endif
 TEST_F(NetEqDecodingTest, MAYBE_TestOpusBitExactness) {
   const std::string input_rtp_file =
       webrtc::test::ResourcePath("audio_coding/neteq_opus", "rtp");
 
   const std::string output_checksum = PlatformChecksum(
       "9d7d52bc94e941d106aa518f324f16a58d231586",
@@ skipping 1099 matching lines @@
     if (muted) {
       EXPECT_TRUE(AudioFramesEqualExceptData(out_frame1, out_frame2));
     } else {
       EXPECT_TRUE(AudioFramesEqual(out_frame1, out_frame2));
     }
   }
   EXPECT_FALSE(muted);
 }
 
 }  // namespace webrtc