| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2017 The WebRTC Project Authors. All rights reserved. | 2 * Copyright 2017 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 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 86 h264_decoder.decoder = &mock_h264_video_decoder_; | 86 h264_decoder.decoder = &mock_h264_video_decoder_; |
| 87 config_.decoders.push_back(h264_decoder); | 87 config_.decoders.push_back(h264_decoder); |
| 88 VideoReceiveStream::Decoder null_decoder; | 88 VideoReceiveStream::Decoder null_decoder; |
| 89 null_decoder.payload_type = 98; | 89 null_decoder.payload_type = 98; |
| 90 null_decoder.payload_name = "null"; | 90 null_decoder.payload_name = "null"; |
| 91 null_decoder.decoder = &mock_null_video_decoder_; | 91 null_decoder.decoder = &mock_null_video_decoder_; |
| 92 config_.decoders.push_back(null_decoder); | 92 config_.decoders.push_back(null_decoder); |
| 93 | 93 |
| 94 video_receive_stream_.reset(new webrtc::internal::VideoReceiveStream( | 94 video_receive_stream_.reset(new webrtc::internal::VideoReceiveStream( |
| 95 kDefaultNumCpuCores, | 95 kDefaultNumCpuCores, |
| 96 false, // flex_fec | |
| 97 &packet_router_, config_.Copy(), process_thread_.get(), &call_stats_, | 96 &packet_router_, config_.Copy(), process_thread_.get(), &call_stats_, |
| 98 nullptr)); // remb | 97 nullptr)); // remb |
| 99 } | 98 } |
| 100 | 99 |
| 101 protected: | 100 protected: |
| 102 webrtc::test::ScopedFieldTrials override_field_trials_; | 101 webrtc::test::ScopedFieldTrials override_field_trials_; |
| 103 VideoReceiveStream::Config config_; | 102 VideoReceiveStream::Config config_; |
| 104 CallStats call_stats_; | 103 CallStats call_stats_; |
| 105 MockVideoDecoder mock_h264_video_decoder_; | 104 MockVideoDecoder mock_h264_video_decoder_; |
| 106 MockVideoDecoder mock_null_video_decoder_; | 105 MockVideoDecoder mock_null_video_decoder_; |
| (...skipping 25 matching lines...) Expand all Loading... |
| 132 video_receive_stream_->Start(); | 131 video_receive_stream_->Start(); |
| 133 EXPECT_CALL(mock_h264_video_decoder_, Decode(_, false, _, _, _)); | 132 EXPECT_CALL(mock_h264_video_decoder_, Decode(_, false, _, _, _)); |
| 134 EXPECT_EQ(true, | 133 EXPECT_EQ(true, |
| 135 video_receive_stream_->OnRecoveredPacket(rtppacket.data(), | 134 video_receive_stream_->OnRecoveredPacket(rtppacket.data(), |
| 136 rtppacket.size())); | 135 rtppacket.size())); |
| 137 EXPECT_CALL(mock_h264_video_decoder_, Release()); | 136 EXPECT_CALL(mock_h264_video_decoder_, Release()); |
| 138 // Make sure the decoder thread had a chance to run. | 137 // Make sure the decoder thread had a chance to run. |
| 139 init_decode_event_.Wait(kDefaultTimeOutMs); | 138 init_decode_event_.Wait(kDefaultTimeOutMs); |
| 140 } | 139 } |
| 141 } // namespace webrtc | 140 } // namespace webrtc |
| OLD | NEW |