generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix libjingle_media_unittest codec comparison issue

Browse Source 
Missing one comparison of AudioCodec

TBR=juberti@webrtc.org

BUG=

Review URL: https://webrtc-codereview.appspot.com/42409005

Cr-Commit-Position: refs/heads/master@{#8437}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8437 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
guoweis@webrtc.org 2015-02-19 18:14:36 +00:00
parent bc6961fe32
commit cce874b8d2
1 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
talk/media/base/codec.cc
View File

@ -90,10 +90,7 @@ bool FeedbackParams::HasDuplicateEntries() const {
} }
Codec::Codec(int id, const std::string& name, int clockrate, int preference) Codec::Codec(int id, const std::string& name, int clockrate, int preference)
: id(id), : id(id), name(name), clockrate(clockrate), preference(preference) {
name(name),
clockrate(clockrate),
preference(preference) {
} }
Codec::Codec() : id(0), clockrate(0), preference(0) { Codec::Codec() : id(0), clockrate(0), preference(0) {
@ -115,10 +112,8 @@ Codec& Codec::operator=(const Codec& c) {
bool Codec::operator==(const Codec& c) const { bool Codec::operator==(const Codec& c) const {
return this->id == c.id && // id is reserved in objective-c return this->id == c.id && // id is reserved in objective-c
name == c.name && name == c.name && clockrate == c.clockrate &&
clockrate == c.clockrate && preference == c.preference && params == c.params &&
preference == c.preference &&
params == c.params &&
feedback_params == c.feedback_params; feedback_params == c.feedback_params;
} }
@ -174,15 +169,10 @@ AudioCodec::AudioCodec(int pt,
int br, int br,
int cs, int cs,
int pr) int pr)
: Codec(pt, nm, cr, pr), : Codec(pt, nm, cr, pr), bitrate(br), channels(cs) {
bitrate(br),
channels(cs) {
} }
AudioCodec::AudioCodec() AudioCodec::AudioCodec() : Codec(), bitrate(0), channels(0) {
: Codec(),
bitrate(0),
channels(0) {
} }
AudioCodec::AudioCodec(const AudioCodec& c) = default; AudioCodec::AudioCodec(const AudioCodec& c) = default;
@ -195,8 +185,7 @@ AudioCodec& AudioCodec::operator=(const AudioCodec& c) {
} }
bool AudioCodec::operator==(const AudioCodec& c) const { bool AudioCodec::operator==(const AudioCodec& c) const {
return clockrate == c.clockrate && bitrate == c.bitrate && return bitrate == c.bitrate && channels == c.channels && Codec::operator==(c);
Codec::operator==(c);
} }
bool AudioCodec::Matches(const AudioCodec& codec) const { bool AudioCodec::Matches(const AudioCodec& codec) const {