Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(355)

Unified Diff: webrtc/media/base/codec.cc

Issue 2471573003: Split out target rtc_media_base from rtc_media (Closed)
Patch Set: Rebase Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/media/BUILD.gn ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/media/base/codec.cc
diff --git a/webrtc/media/base/codec.cc b/webrtc/media/base/codec.cc
index 0320e58c722a9245661c257af27de37159318044..aac21002b60a2b876a1a7c0558a640fbeaa19adb 100644
--- a/webrtc/media/base/codec.cc
+++ b/webrtc/media/base/codec.cc
@@ -13,7 +13,7 @@
#include <algorithm>
#include <sstream>
-#include "webrtc/base/common.h"
+#include "webrtc/base/checks.h"
#include "webrtc/base/logging.h"
#include "webrtc/base/stringencode.h"
#include "webrtc/base/stringutils.h"
@@ -54,7 +54,7 @@ void FeedbackParams::Add(const FeedbackParam& param) {
return;
}
params_.push_back(param);
- ASSERT(!HasDuplicateEntries());
+ RTC_CHECK(!HasDuplicateEntries());
}
void FeedbackParams::Intersect(const FeedbackParams& from) {
@@ -192,7 +192,7 @@ bool AudioCodec::Matches(const AudioCodec& codec) const {
webrtc::RtpCodecParameters AudioCodec::ToCodecParameters() const {
webrtc::RtpCodecParameters codec_params = Codec::ToCodecParameters();
- codec_params.channels = channels;
+ codec_params.channels = static_cast<int>(channels);
return codec_params;
}
« no previous file with comments | « webrtc/media/BUILD.gn ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698