Delete WebRtcRTPHeader, this struct is no longer used.
Bug: webrtc:10397 Change-Id: I1b7acd9c89b9e14d1d8e1914c8c12c51fe4c643f Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/134203 Reviewed-by: Philip Eliasson <philipel@webrtc.org> Reviewed-by: Karl Wiberg <kwiberg@webrtc.org> Commit-Queue: Niels Moller <nisse@webrtc.org> Cr-Commit-Position: refs/heads/master@{#27773}
This commit is contained in:
@ -24,19 +24,6 @@
|
|||||||
|
|
||||||
namespace webrtc {
|
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 {
|
class RTC_EXPORT RTPFragmentationHeader {
|
||||||
public:
|
public:
|
||||||
RTPFragmentationHeader();
|
RTPFragmentationHeader();
|
||||||
|
@ -137,11 +137,6 @@ class VideoCodingModule : public Module {
|
|||||||
const RTPHeader& rtp_header,
|
const RTPHeader& rtp_header,
|
||||||
const RTPVideoHeader& video_header) = 0;
|
const RTPVideoHeader& video_header) = 0;
|
||||||
|
|
||||||
// DEPRECATED
|
|
||||||
virtual int32_t IncomingPacket(const uint8_t* incomingPayload,
|
|
||||||
size_t payloadLength,
|
|
||||||
const WebRtcRTPHeader& rtpInfo) = 0;
|
|
||||||
|
|
||||||
// Robustness APIs
|
// Robustness APIs
|
||||||
|
|
||||||
// DEPRECATED.
|
// DEPRECATED.
|
||||||
|
@ -90,13 +90,6 @@ class VideoCodingModuleImpl : public VideoCodingModule {
|
|||||||
return receiver_.Decode(maxWaitTimeMs);
|
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,
|
int32_t IncomingPacket(const uint8_t* incomingPayload,
|
||||||
size_t payloadLength,
|
size_t payloadLength,
|
||||||
const RTPHeader& rtp_header,
|
const RTPHeader& rtp_header,
|
||||||
|
@ -839,13 +839,4 @@ TEST_F(RtpVideoStreamReceiverTest, RepeatedSecondarySinkDisallowed) {
|
|||||||
}
|
}
|
||||||
#endif
|
#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
|
} // namespace webrtc
|
||||||
|
Reference in New Issue
Block a user