Skip to content

Commit e08ba88

Browse files
committed
webrtc: update libdatachannel to v0.23
1 parent 98c7d21 commit e08ba88

File tree

2 files changed

+5
-25
lines changed

2 files changed

+5
-25
lines changed

output/webrtc/webrtc.cc

Lines changed: 4 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ extern "C" {
3333
#include <rtc/peerconnection.hpp>
3434
#include <rtc/rtcpsrreporter.hpp>
3535
#include <rtc/h264rtppacketizer.hpp>
36-
#include <rtc/h264packetizationhandler.hpp>
3736
#include <rtc/rtcpnackresponder.hpp>
3837

3938
#include "third_party/magic_enum/include/magic_enum.hpp"
@@ -63,23 +62,6 @@ struct ClientTrackData
6362

6463
void startStreaming()
6564
{
66-
double currentTime_s = get_monotonic_time_us(NULL, NULL)/(1000.0*1000.0);
67-
sender->rtpConfig->setStartTime(currentTime_s, rtc::RtpPacketizationConfig::EpochStart::T1970);
68-
sender->startRecording();
69-
}
70-
71-
void sendTime()
72-
{
73-
double currentTime_s = get_monotonic_time_us(NULL, NULL)/(1000.0*1000.0);
74-
75-
auto rtpConfig = sender->rtpConfig;
76-
uint32_t elapsedTimestamp = rtpConfig->secondsToTimestamp(currentTime_s);
77-
78-
sender->rtpConfig->timestamp = sender->rtpConfig->startTimestamp + elapsedTimestamp;
79-
auto reportElapsedTimestamp = sender->rtpConfig->timestamp - sender->previousReportedTimestamp;
80-
if (sender->rtpConfig->timestampToSeconds(reportElapsedTimestamp) > 1) {
81-
sender->setNeedsToReport();
82-
}
8365
}
8466

8567
bool wantsFrame() const
@@ -176,7 +158,6 @@ class Client
176158
}
177159

178160
rtc::binary data((std::byte*)buf->start, (std::byte*)buf->start + buf->used);
179-
video->sendTime();
180161
video->track->send(data);
181162
}
182163

@@ -249,14 +230,13 @@ static std::shared_ptr<ClientTrackData> webrtc_add_video(const std::shared_ptr<r
249230
video.setBitrate(1000);
250231
video.addSSRC(ssrc, cname, msid, cname);
251232
auto track = pc->addTrack(video);
252-
auto rtpConfig = std::make_shared<rtc::RtpPacketizationConfig>(ssrc, cname, payloadType, rtc::H264RtpPacketizer::defaultClockRate);
233+
auto rtpConfig = std::make_shared<rtc::RtpPacketizationConfig>(ssrc, cname, payloadType, rtc::H264RtpPacketizer::ClockRate);
253234
auto packetizer = std::make_shared<rtc::H264RtpPacketizer>(rtc::H264RtpPacketizer::Separator::LongStartSequence, rtpConfig);
254-
auto h264Handler = std::make_shared<rtc::H264PacketizationHandler>(packetizer);
255235
auto srReporter = std::make_shared<rtc::RtcpSrReporter>(rtpConfig);
256-
h264Handler->addToChain(srReporter);
236+
packetizer->addToChain(srReporter);
257237
auto nackResponder = std::make_shared<rtc::RtcpNackResponder>();
258-
h264Handler->addToChain(nackResponder);
259-
track->setMediaHandler(h264Handler);
238+
packetizer->addToChain(nackResponder);
239+
track->setMediaHandler(packetizer);
260240
return std::shared_ptr<ClientTrackData>(new ClientTrackData{track, srReporter});
261241
}
262242

third_party/libdatachannel

Submodule libdatachannel updated 246 files

0 commit comments

Comments
 (0)