admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove MediaContentDescriptionImpl<Codec>

Browse Source 
after dependencies adopted the RtpMediaContentDescription which
this is currently aliased to.

Also move definition of AudioCodecs and VideoCodecs to the place
where codecs are defined.

BUG=webrtc:15214

Change-Id: I9b0456e1c69c8b23e0cc7665a59baae268872d9c
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/325021
Reviewed-by: Henrik Boström <hbos@webrtc.org>
Commit-Queue: Philipp Hancke <phancke@microsoft.com>
Reviewed-by: Florent Castelli <orphis@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#41020}
This commit is contained in:
Philipp Hancke 2023-10-25 14:31:03 +02:00 committed by WebRTC LUCI CQ
parent 9df93c1190
commit 971f8de35a
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
media/base/codec.h
View File

@ -28,7 +28,7 @@
namespace cricket {
typedef std::map<std::string, std::string> CodecParameterMap;
using CodecParameterMap = std::map<std::string, std::string>;
class FeedbackParam {
public:
@ -187,6 +187,9 @@ struct RTC_EXPORT Codec {
using VideoCodec = Codec;
using AudioCodec = Codec;
using VideoCodecs = std::vector<Codec>;
using AudioCodecs = std::vector<Codec>;
Codec CreateAudioCodec(int id,
const std::string& name,
int clockrate,

15
pc/session_description.h
View File

@ -43,10 +43,8 @@
namespace cricket {
typedef std::vector<AudioCodec> AudioCodecs;
typedef std::vector<VideoCodec> VideoCodecs;
typedef std::vector<CryptoParams> CryptoParamsVec;
typedef std::vector<webrtc::RtpExtension> RtpHeaderExtensions;
using CryptoParamsVec = std::vector<CryptoParams>;
using RtpHeaderExtensions = std::vector<webrtc::RtpExtension>;
// Options to control how session descriptions are generated.
const int kAutoBandwidth = -1;
@ -258,8 +256,9 @@ class MediaContentDescription {
}
protected:
// TODO(bugs.webrtc.org/15214): move all RTP related things to a subclass that
// the SCTP content description does not inherit from.
// TODO(bugs.webrtc.org/15214): move all RTP related things to
// RtpMediaDescription that the SCTP content description does
// not inherit from.
std::string protocol_;
private:
@ -290,9 +289,7 @@ class MediaContentDescription {
std::vector<Codec> codecs_;
};
template <class C>
class MediaContentDescriptionImpl : public MediaContentDescription {};
using RtpMediaContentDescription = MediaContentDescriptionImpl<Codec>;
class RtpMediaContentDescription : public MediaContentDescription {};
class AudioContentDescription : public RtpMediaContentDescription {
public: