| OLD | NEW | 
|    1 /* |    1 /* | 
|    2  *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved. |    2  *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved. | 
|    3  * |    3  * | 
|    4  *  Use of this source code is governed by a BSD-style license |    4  *  Use of this source code is governed by a BSD-style license | 
|    5  *  that can be found in the LICENSE file in the root of the source |    5  *  that can be found in the LICENSE file in the root of the source | 
|    6  *  tree. An additional intellectual property rights grant can be found |    6  *  tree. An additional intellectual property rights grant can be found | 
|    7  *  in the file PATENTS.  All contributing project authors may |    7  *  in the file PATENTS.  All contributing project authors may | 
|    8  *  be found in the AUTHORS file in the root of the source tree. |    8  *  be found in the AUTHORS file in the root of the source tree. | 
|    9  */ |    9  */ | 
|   10  |   10  | 
| (...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  195     ASSERT_TRUE(rtx_map.has_payload_type()); |  195     ASSERT_TRUE(rtx_map.has_payload_type()); | 
|  196     ASSERT_TRUE(rtx_map.has_config()); |  196     ASSERT_TRUE(rtx_map.has_config()); | 
|  197     EXPECT_EQ(1u, config.rtp.rtx_payload_types.count(rtx_map.payload_type())); |  197     EXPECT_EQ(1u, config.rtp.rtx_payload_types.count(rtx_map.payload_type())); | 
|  198     const rtclog::RtxConfig& rtx_config = rtx_map.config(); |  198     const rtclog::RtxConfig& rtx_config = rtx_map.config(); | 
|  199     ASSERT_TRUE(rtx_config.has_rtx_ssrc()); |  199     ASSERT_TRUE(rtx_config.has_rtx_ssrc()); | 
|  200     ASSERT_TRUE(rtx_config.has_rtx_payload_type()); |  200     ASSERT_TRUE(rtx_config.has_rtx_payload_type()); | 
|  201     EXPECT_EQ(config.rtp.rtx_ssrc, rtx_config.rtx_ssrc()); |  201     EXPECT_EQ(config.rtp.rtx_ssrc, rtx_config.rtx_ssrc()); | 
|  202     EXPECT_EQ(config.rtp.rtx_payload_types.at(rtx_map.payload_type()), |  202     EXPECT_EQ(config.rtp.rtx_payload_types.at(rtx_map.payload_type()), | 
|  203               rtx_config.rtx_payload_type()); |  203               rtx_config.rtx_payload_type()); | 
|  204   } |  204   } | 
 |  205 #if 0 | 
|  205   // Check header extensions. |  206   // Check header extensions. | 
|  206   ASSERT_EQ(static_cast<int>(config.rtp.extensions.size()), |  207   ASSERT_EQ(static_cast<int>(config.rtp.extensions.size()), | 
|  207             receiver_config.header_extensions_size()); |  208             receiver_config.header_extensions_size()); | 
|  208   for (int i = 0; i < receiver_config.header_extensions_size(); i++) { |  209   for (int i = 0; i < receiver_config.header_extensions_size(); i++) { | 
|  209     ASSERT_TRUE(receiver_config.header_extensions(i).has_name()); |  210     ASSERT_TRUE(receiver_config.header_extensions(i).has_name()); | 
|  210     ASSERT_TRUE(receiver_config.header_extensions(i).has_id()); |  211     ASSERT_TRUE(receiver_config.header_extensions(i).has_id()); | 
|  211     const std::string& name = receiver_config.header_extensions(i).name(); |  212     const std::string& name = receiver_config.header_extensions(i).name(); | 
|  212     int id = receiver_config.header_extensions(i).id(); |  213     int id = receiver_config.header_extensions(i).id(); | 
|  213     EXPECT_EQ(config.rtp.extensions[i].id, id); |  214     EXPECT_EQ(config.rtp.extensions[i].id, id); | 
|  214     EXPECT_EQ(config.rtp.extensions[i].uri, name); |  215     EXPECT_EQ(config.rtp.extensions[i].uri, name); | 
|  215   } |  216   } | 
 |  217 #endif | 
|  216   // Check decoders. |  218   // Check decoders. | 
|  217   ASSERT_EQ(static_cast<int>(config.decoders.size()), |  219   ASSERT_EQ(static_cast<int>(config.decoders.size()), | 
|  218             receiver_config.decoders_size()); |  220             receiver_config.decoders_size()); | 
|  219   for (int i = 0; i < receiver_config.decoders_size(); i++) { |  221   for (int i = 0; i < receiver_config.decoders_size(); i++) { | 
|  220     ASSERT_TRUE(receiver_config.decoders(i).has_name()); |  222     ASSERT_TRUE(receiver_config.decoders(i).has_name()); | 
|  221     ASSERT_TRUE(receiver_config.decoders(i).has_payload_type()); |  223     ASSERT_TRUE(receiver_config.decoders(i).has_payload_type()); | 
|  222     const std::string& decoder_name = receiver_config.decoders(i).name(); |  224     const std::string& decoder_name = receiver_config.decoders(i).name(); | 
|  223     int decoder_type = receiver_config.decoders(i).payload_type(); |  225     int decoder_type = receiver_config.decoders(i).payload_type(); | 
|  224     EXPECT_EQ(config.decoders[i].payload_name, decoder_name); |  226     EXPECT_EQ(config.decoders[i].payload_name, decoder_name); | 
|  225     EXPECT_EQ(config.decoders[i].payload_type, decoder_type); |  227     EXPECT_EQ(config.decoders[i].payload_type, decoder_type); | 
|  226   } |  228   } | 
|  227  |  229  | 
|  228   // Check consistency of the parser. |  230   // Check consistency of the parser. | 
|  229   VideoReceiveStream::Config parsed_config(nullptr); |  231   VideoReceiveStream::Config parsed_config(nullptr); | 
|  230   parsed_log.GetVideoReceiveConfig(index, &parsed_config); |  232   parsed_log.GetVideoReceiveConfig(index, &parsed_config); | 
|  231   EXPECT_EQ(config.rtp.remote_ssrc, parsed_config.rtp.remote_ssrc); |  233   EXPECT_EQ(config.rtp.remote_ssrc, parsed_config.rtp.remote_ssrc); | 
|  232   EXPECT_EQ(config.rtp.local_ssrc, parsed_config.rtp.local_ssrc); |  234   EXPECT_EQ(config.rtp.local_ssrc, parsed_config.rtp.local_ssrc); | 
|  233   // Check RTCP settings. |  235   // Check RTCP settings. | 
|  234   EXPECT_EQ(config.rtp.rtcp_mode, parsed_config.rtp.rtcp_mode); |  236   EXPECT_EQ(config.rtp.rtcp_mode, parsed_config.rtp.rtcp_mode); | 
|  235   EXPECT_EQ(config.rtp.remb, parsed_config.rtp.remb); |  237   EXPECT_EQ(config.rtp.remb, parsed_config.rtp.remb); | 
|  236   // Check RTX map. |  238   // Check RTX map. | 
|  237   EXPECT_EQ(config.rtp.rtx_ssrc, parsed_config.rtp.rtx_ssrc); |  239   EXPECT_EQ(config.rtp.rtx_ssrc, parsed_config.rtp.rtx_ssrc); | 
|  238   EXPECT_EQ(config.rtp.rtx_payload_types.size(), |  240   EXPECT_EQ(config.rtp.rtx_payload_types.size(), | 
|  239             parsed_config.rtp.rtx_payload_types.size()); |  241             parsed_config.rtp.rtx_payload_types.size()); | 
|  240   for (const auto& kv : config.rtp.rtx_payload_types) { |  242   for (const auto& kv : config.rtp.rtx_payload_types) { | 
|  241     auto parsed_kv = parsed_config.rtp.rtx_payload_types.find(kv.first); |  243     auto parsed_kv = parsed_config.rtp.rtx_payload_types.find(kv.first); | 
|  242     EXPECT_EQ(kv.first, parsed_kv->first); |  244     EXPECT_EQ(kv.first, parsed_kv->first); | 
|  243     EXPECT_EQ(kv.second, parsed_kv->second); |  245     EXPECT_EQ(kv.second, parsed_kv->second); | 
|  244   } |  246   } | 
 |  247 #if 0 | 
|  245   // Check header extensions. |  248   // Check header extensions. | 
|  246   EXPECT_EQ(config.rtp.extensions.size(), parsed_config.rtp.extensions.size()); |  249   EXPECT_EQ(config.rtp.extensions.size(), parsed_config.rtp.extensions.size()); | 
|  247   for (size_t i = 0; i < parsed_config.rtp.extensions.size(); i++) { |  250   for (size_t i = 0; i < parsed_config.rtp.extensions.size(); i++) { | 
|  248     EXPECT_EQ(config.rtp.extensions[i].uri, |  251     EXPECT_EQ(config.rtp.extensions[i].uri, | 
|  249               parsed_config.rtp.extensions[i].uri); |  252               parsed_config.rtp.extensions[i].uri); | 
|  250     EXPECT_EQ(config.rtp.extensions[i].id, parsed_config.rtp.extensions[i].id); |  253     EXPECT_EQ(config.rtp.extensions[i].id, parsed_config.rtp.extensions[i].id); | 
|  251   } |  254   } | 
 |  255 #endif | 
|  252   // Check decoders. |  256   // Check decoders. | 
|  253   EXPECT_EQ(config.decoders.size(), parsed_config.decoders.size()); |  257   EXPECT_EQ(config.decoders.size(), parsed_config.decoders.size()); | 
|  254   for (size_t i = 0; i < parsed_config.decoders.size(); i++) { |  258   for (size_t i = 0; i < parsed_config.decoders.size(); i++) { | 
|  255     EXPECT_EQ(config.decoders[i].payload_name, |  259     EXPECT_EQ(config.decoders[i].payload_name, | 
|  256               parsed_config.decoders[i].payload_name); |  260               parsed_config.decoders[i].payload_name); | 
|  257     EXPECT_EQ(config.decoders[i].payload_type, |  261     EXPECT_EQ(config.decoders[i].payload_type, | 
|  258               parsed_config.decoders[i].payload_type); |  262               parsed_config.decoders[i].payload_type); | 
|  259   } |  263   } | 
|  260 } |  264 } | 
|  261  |  265  | 
| (...skipping 371 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  633   ASSERT_TRUE(bwe_event.has_id()); |  637   ASSERT_TRUE(bwe_event.has_id()); | 
|  634   EXPECT_EQ(id, bwe_event.id()); |  638   EXPECT_EQ(id, bwe_event.id()); | 
|  635   ASSERT_TRUE(bwe_event.has_result()); |  639   ASSERT_TRUE(bwe_event.has_result()); | 
|  636   EXPECT_EQ(GetProbeResultType(failure_reason), bwe_event.result()); |  640   EXPECT_EQ(GetProbeResultType(failure_reason), bwe_event.result()); | 
|  637   ASSERT_FALSE(bwe_event.has_bitrate_bps()); |  641   ASSERT_FALSE(bwe_event.has_bitrate_bps()); | 
|  638  |  642  | 
|  639   // TODO(philipel): Verify the parser when parsing has been implemented. |  643   // TODO(philipel): Verify the parser when parsing has been implemented. | 
|  640 } |  644 } | 
|  641  |  645  | 
|  642 }  // namespace webrtc |  646 }  // namespace webrtc | 
| OLD | NEW |