diff --git a/modules/include/module_common_types.h b/modules/include/module_common_types.h index fc28531d5e..10a3e0556e 100644 --- a/modules/include/module_common_types.h +++ b/modules/include/module_common_types.h @@ -24,19 +24,6 @@ namespace webrtc { -struct WebRtcRTPHeader { - RTPVideoHeader& video_header() { return video; } - const RTPVideoHeader& video_header() const { return video; } - RTPVideoHeader video; - - RTPHeader header; - // Used for video only. - // TODO(nisse): Delete, now included on RTPVideoHeader. - VideoFrameType frameType; - // NTP time of the capture time in local timebase in milliseconds. - int64_t ntp_time_ms; -}; - class RTC_EXPORT RTPFragmentationHeader { public: RTPFragmentationHeader(); diff --git a/modules/video_coding/include/video_coding.h b/modules/video_coding/include/video_coding.h index 5e0741764f..2ee2ab81fa 100644 --- a/modules/video_coding/include/video_coding.h +++ b/modules/video_coding/include/video_coding.h @@ -137,11 +137,6 @@ class VideoCodingModule : public Module { const RTPHeader& rtp_header, const RTPVideoHeader& video_header) = 0; - // DEPRECATED - virtual int32_t IncomingPacket(const uint8_t* incomingPayload, - size_t payloadLength, - const WebRtcRTPHeader& rtpInfo) = 0; - // Robustness APIs // DEPRECATED. diff --git a/modules/video_coding/video_coding_impl.cc b/modules/video_coding/video_coding_impl.cc index d2741eae32..d0d946123d 100644 --- a/modules/video_coding/video_coding_impl.cc +++ b/modules/video_coding/video_coding_impl.cc @@ -90,13 +90,6 @@ class VideoCodingModuleImpl : public VideoCodingModule { return receiver_.Decode(maxWaitTimeMs); } - int32_t IncomingPacket(const uint8_t* incomingPayload, - size_t payloadLength, - const WebRtcRTPHeader& rtpInfo) override { - return IncomingPacket(incomingPayload, payloadLength, rtpInfo.header, - rtpInfo.video_header()); - } - int32_t IncomingPacket(const uint8_t* incomingPayload, size_t payloadLength, const RTPHeader& rtp_header, diff --git a/video/rtp_video_stream_receiver_unittest.cc b/video/rtp_video_stream_receiver_unittest.cc index d88def3890..eb6fbc5c08 100644 --- a/video/rtp_video_stream_receiver_unittest.cc +++ b/video/rtp_video_stream_receiver_unittest.cc @@ -839,13 +839,4 @@ TEST_F(RtpVideoStreamReceiverTest, RepeatedSecondarySinkDisallowed) { } #endif -// Initialization of WebRtcRTPHeader is a bit convoluted, with some fields -// zero-initialized. RtpVideoStreamReceiver depends on proper default values for -// the playout delay. -TEST(WebRtcRTPHeader, DefaultPlayoutDelayIsUnspecified) { - WebRtcRTPHeader webrtc_rtp_header = {}; - EXPECT_EQ(webrtc_rtp_header.video_header().playout_delay.min_ms, -1); - EXPECT_EQ(webrtc_rtp_header.video_header().playout_delay.max_ms, -1); -} - } // namespace webrtc