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 |
11 #include <vector> | 11 #include <vector> |
12 | 12 |
13 #include "webrtc/test/gtest.h" | 13 #include "webrtc/test/gtest.h" |
14 #include "webrtc/test/gmock.h" | 14 #include "webrtc/test/gmock.h" |
15 | 15 |
16 #include "webrtc/api/video_codecs/video_decoder.h" | 16 #include "webrtc/api/video_codecs/video_decoder.h" |
17 #include "webrtc/base/criticalsection.h" | 17 #include "webrtc/base/criticalsection.h" |
18 #include "webrtc/base/event.h" | 18 #include "webrtc/base/event.h" |
19 #include "webrtc/call/rtp_stream_receiver_controller.h" | |
19 #include "webrtc/media/base/fakevideorenderer.h" | 20 #include "webrtc/media/base/fakevideorenderer.h" |
20 #include "webrtc/modules/pacing/packet_router.h" | 21 #include "webrtc/modules/pacing/packet_router.h" |
21 #include "webrtc/modules/rtp_rtcp/source/rtp_packet_to_send.h" | 22 #include "webrtc/modules/rtp_rtcp/source/rtp_packet_to_send.h" |
22 #include "webrtc/modules/utility/include/process_thread.h" | 23 #include "webrtc/modules/utility/include/process_thread.h" |
23 #include "webrtc/video/call_stats.h" | 24 #include "webrtc/video/call_stats.h" |
24 #include "webrtc/video/video_receive_stream.h" | 25 #include "webrtc/video/video_receive_stream.h" |
25 #include "webrtc/system_wrappers/include/clock.h" | 26 #include "webrtc/system_wrappers/include/clock.h" |
26 #include "webrtc/test/field_trial.h" | 27 #include "webrtc/test/field_trial.h" |
27 | 28 |
28 using testing::_; | 29 using testing::_; |
danilchap
2017/06/13 15:58:32
move these 2 usings inside unnamed namespace too (
nisse-webrtc
2017/06/14 06:31:06
Done.
| |
29 using testing::Invoke; | 30 using testing::Invoke; |
30 | 31 |
32 namespace webrtc { | |
33 namespace { | |
34 | |
31 constexpr int kDefaultTimeOutMs = 50; | 35 constexpr int kDefaultTimeOutMs = 50; |
32 | 36 |
33 namespace webrtc { | |
34 | |
35 namespace { | |
36 | |
37 const char kNewJitterBufferFieldTrialEnabled[] = | 37 const char kNewJitterBufferFieldTrialEnabled[] = |
38 "WebRTC-NewVideoJitterBuffer/Enabled/"; | 38 "WebRTC-NewVideoJitterBuffer/Enabled/"; |
39 | 39 |
40 class MockTransport : public Transport { | 40 class MockTransport : public Transport { |
41 public: | 41 public: |
42 MOCK_METHOD3(SendRtp, | 42 MOCK_METHOD3(SendRtp, |
43 bool(const uint8_t* packet, | 43 bool(const uint8_t* packet, |
44 size_t length, | 44 size_t length, |
45 const PacketOptions& options)); | 45 const PacketOptions& options)); |
46 MOCK_METHOD2(SendRtcp, bool(const uint8_t* packet, size_t length)); | 46 MOCK_METHOD2(SendRtcp, bool(const uint8_t* packet, size_t length)); |
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
84 {"sprop-parameter-sets", "Z0IACpZTBYmI,aMljiA=="}); | 84 {"sprop-parameter-sets", "Z0IACpZTBYmI,aMljiA=="}); |
85 h264_decoder.decoder = &mock_h264_video_decoder_; | 85 h264_decoder.decoder = &mock_h264_video_decoder_; |
86 config_.decoders.push_back(h264_decoder); | 86 config_.decoders.push_back(h264_decoder); |
87 VideoReceiveStream::Decoder null_decoder; | 87 VideoReceiveStream::Decoder null_decoder; |
88 null_decoder.payload_type = 98; | 88 null_decoder.payload_type = 98; |
89 null_decoder.payload_name = "null"; | 89 null_decoder.payload_name = "null"; |
90 null_decoder.decoder = &mock_null_video_decoder_; | 90 null_decoder.decoder = &mock_null_video_decoder_; |
91 config_.decoders.push_back(null_decoder); | 91 config_.decoders.push_back(null_decoder); |
92 | 92 |
93 video_receive_stream_.reset(new webrtc::internal::VideoReceiveStream( | 93 video_receive_stream_.reset(new webrtc::internal::VideoReceiveStream( |
94 kDefaultNumCpuCores, | 94 &rtp_stream_receiver_controller_, kDefaultNumCpuCores, |
95 &packet_router_, config_.Copy(), process_thread_.get(), &call_stats_)); | 95 &packet_router_, config_.Copy(), process_thread_.get(), &call_stats_)); |
96 } | 96 } |
97 | 97 |
98 protected: | 98 protected: |
99 webrtc::test::ScopedFieldTrials override_field_trials_; | 99 webrtc::test::ScopedFieldTrials override_field_trials_; |
100 VideoReceiveStream::Config config_; | 100 VideoReceiveStream::Config config_; |
101 CallStats call_stats_; | 101 CallStats call_stats_; |
102 MockVideoDecoder mock_h264_video_decoder_; | 102 MockVideoDecoder mock_h264_video_decoder_; |
103 MockVideoDecoder mock_null_video_decoder_; | 103 MockVideoDecoder mock_null_video_decoder_; |
104 cricket::FakeVideoRenderer fake_renderer_; | 104 cricket::FakeVideoRenderer fake_renderer_; |
105 MockTransport mock_transport_; | 105 MockTransport mock_transport_; |
106 PacketRouter packet_router_; | 106 PacketRouter packet_router_; |
107 std::unique_ptr<ProcessThread> process_thread_; | 107 std::unique_ptr<ProcessThread> process_thread_; |
108 RtpStreamReceiverController rtp_stream_receiver_controller_; | |
108 std::unique_ptr<webrtc::internal::VideoReceiveStream> video_receive_stream_; | 109 std::unique_ptr<webrtc::internal::VideoReceiveStream> video_receive_stream_; |
109 }; | 110 }; |
110 | 111 |
111 TEST_F(VideoReceiveStreamTest, CreateFrameFromH264FmtpSpropAndIdr) { | 112 TEST_F(VideoReceiveStreamTest, CreateFrameFromH264FmtpSpropAndIdr) { |
112 constexpr uint8_t idr_nalu[] = {0x05, 0xFF, 0xFF, 0xFF}; | 113 constexpr uint8_t idr_nalu[] = {0x05, 0xFF, 0xFF, 0xFF}; |
113 RtpPacketToSend rtppacket(nullptr); | 114 RtpPacketToSend rtppacket(nullptr); |
114 uint8_t* payload = rtppacket.AllocatePayload(sizeof(idr_nalu)); | 115 uint8_t* payload = rtppacket.AllocatePayload(sizeof(idr_nalu)); |
115 memcpy(payload, idr_nalu, sizeof(idr_nalu)); | 116 memcpy(payload, idr_nalu, sizeof(idr_nalu)); |
116 rtppacket.SetMarker(true); | 117 rtppacket.SetMarker(true); |
117 rtppacket.SetSsrc(1111); | 118 rtppacket.SetSsrc(1111); |
118 rtppacket.SetPayloadType(99); | 119 rtppacket.SetPayloadType(99); |
119 rtppacket.SetSequenceNumber(1); | 120 rtppacket.SetSequenceNumber(1); |
120 rtppacket.SetTimestamp(0); | 121 rtppacket.SetTimestamp(0); |
121 rtc::Event init_decode_event_(false, false); | 122 rtc::Event init_decode_event_(false, false); |
122 EXPECT_CALL(mock_h264_video_decoder_, InitDecode(_, _)) | 123 EXPECT_CALL(mock_h264_video_decoder_, InitDecode(_, _)) |
123 .WillOnce(Invoke([&init_decode_event_](const VideoCodec* config, | 124 .WillOnce(Invoke([&init_decode_event_](const VideoCodec* config, |
124 int32_t number_of_cores) { | 125 int32_t number_of_cores) { |
125 init_decode_event_.Set(); | 126 init_decode_event_.Set(); |
126 return 0; | 127 return 0; |
127 })); | 128 })); |
128 EXPECT_CALL(mock_h264_video_decoder_, RegisterDecodeCompleteCallback(_)); | 129 EXPECT_CALL(mock_h264_video_decoder_, RegisterDecodeCompleteCallback(_)); |
129 video_receive_stream_->Start(); | 130 video_receive_stream_->Start(); |
130 EXPECT_CALL(mock_h264_video_decoder_, Decode(_, false, _, _, _)); | 131 EXPECT_CALL(mock_h264_video_decoder_, Decode(_, false, _, _, _)); |
131 RtpPacketReceived parsed_packet; | 132 RtpPacketReceived parsed_packet; |
132 ASSERT_TRUE(parsed_packet.Parse(rtppacket.data(), rtppacket.size())); | 133 ASSERT_TRUE(parsed_packet.Parse(rtppacket.data(), rtppacket.size())); |
133 video_receive_stream_->OnRtpPacket(parsed_packet); | 134 rtp_stream_receiver_controller_.OnRtpPacket(parsed_packet); |
134 EXPECT_CALL(mock_h264_video_decoder_, Release()); | 135 EXPECT_CALL(mock_h264_video_decoder_, Release()); |
135 // Make sure the decoder thread had a chance to run. | 136 // Make sure the decoder thread had a chance to run. |
136 init_decode_event_.Wait(kDefaultTimeOutMs); | 137 init_decode_event_.Wait(kDefaultTimeOutMs); |
137 } | 138 } |
139 | |
138 } // namespace webrtc | 140 } // namespace webrtc |
OLD | NEW |