AudioCodingModule: Specify decoders using SdpAudioFormat

webrtc/modules/audio_coding/neteq/neteq_impl_unittest.cc

Index: webrtc/modules/audio_coding/neteq/neteq_impl_unittest.cc
diff --git a/webrtc/modules/audio_coding/neteq/neteq_impl_unittest.cc b/webrtc/modules/audio_coding/neteq/neteq_impl_unittest.cc
index 8e5a21d8763b24fc793a7c3a80b260c076aee350..1859e566e7d2cb4d728d69effea09932619d8c34 100644
--- a/webrtc/modules/audio_coding/neteq/neteq_impl_unittest.cc
+++ b/webrtc/modules/audio_coding/neteq/neteq_impl_unittest.cc
@@ -211,7 +211,7 @@ TEST(NetEq, CreateAndDestroy) {
   delete neteq;
 }
 
-TEST_F(NetEqImplTest, RegisterPayloadType) {
+TEST_F(NetEqImplTest, RegisterPayloadTypeNetEqDecoder) {
   CreateInstance();
   uint8_t rtp_payload_type = 0;
   NetEqDecoder codec_type = NetEqDecoder::kDecoderPCMu;
@@ -221,6 +221,15 @@ TEST_F(NetEqImplTest, RegisterPayloadType) {
   neteq_->RegisterPayloadType(codec_type, kCodecName, rtp_payload_type);
 }
 
+TEST_F(NetEqImplTest, RegisterPayloadType) {
+  CreateInstance();
+  constexpr int rtp_payload_type = 0;

[hlundin-webrtc, 2016/10/05 13:39:14]

Compile-time constant => kRtpPayloadType.

[kwiberg-webrtc, 2016/10/06 09:20:46]

That naming rule is mandatory only for variables with static storage duration.
For variables with automatic storage duration, it's optional (and since I don't
particularly like how names look in that style, I chose not to use it).

Speculation: The reason to enforce a special style for static but not automatic
constants is probably that the latter are typically used far from where they're
declared, whereas the latter are used much more locally. In this case, the
variable goes out of scope four lines after it's declared, so it isn't hard to
see what's going on even without the kNamingStyle.

+  const SdpAudioFormat format("pcmu", 8000, 1);
+  EXPECT_CALL(*mock_decoder_database_,
+              RegisterPayload(rtp_payload_type, format));
+  neteq_->RegisterPayloadType(rtp_payload_type, format);
+}
+
 TEST_F(NetEqImplTest, RemovePayloadType) {
   CreateInstance();
   uint8_t rtp_payload_type = 0;