mii/libdatachannel
1
0
Fork 0
mirror of https://github.com/mii443/libdatachannel.git synced 2025-09-03 15:49:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into feature/chainable-rtcp-handlers

Browse Source 
# Conflicts:
#	src/h264packetizationhandler.cpp
This commit is contained in:
Filip Klembara
2021-02-08 10:19:26 +01:00
parent 09dfc39fd9 986e5f985f
commit 36a88c605a
35 changed files with 260 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/rtc/rtc.h
View File

@ -216,8 +216,9 @@ RTC_EXPORT int rtcGetTrackDescription(int tr, char *buffer, int size);
/// @param _direction Direction
/// @param _name Name (optional)
/// @param _msid MSID (optional)
/// @param _trackID Track ID used in MSID (optional)
/// @returns Track id
RTC_EXPORT int rtcAddTrackEx(int pc, rtcCodec codec, int payloadType, uint32_t ssrc, const char *_mid, rtcDirection direction, const char *_name, const char *_msid);
RTC_EXPORT int rtcAddTrackEx(int pc, rtcCodec codec, int payloadType, uint32_t ssrc, const char *_mid, rtcDirection direction, const char *_name, const char *_msid, const char *_trackID);
/// Set H264PacketizationHandler for track
/// @param tr Track id