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

Unified Diff: webrtc/common_types.cc

Issue 2990463002: [EXPERIMENTAL] Generic stereo codec with index header sending merged frames
Patch Set: Created 3 years, 5 months 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/common_types.h ('k') | webrtc/common_video/include/video_frame_buffer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/common_types.cc
diff --git a/webrtc/common_types.cc b/webrtc/common_types.cc
index a76175fbd90d3fcb1b86d3367e53d43d11db8b6f..e45ffea57ca90e4224dd801a1d54dc04b8c43225 100644
--- a/webrtc/common_types.cc
+++ b/webrtc/common_types.cc
@@ -101,12 +101,12 @@ const VideoCodecVP8& VideoCodec::VP8() const {
}
VideoCodecVP9* VideoCodec::VP9() {
- RTC_DCHECK_EQ(codecType, kVideoCodecVP9);
+ // RTC_DCHECK_EQ(codecType, kVideoCodecVP9);
return &codec_specific_.VP9;
}
const VideoCodecVP9& VideoCodec::VP9() const {
- RTC_DCHECK_EQ(codecType, kVideoCodecVP9);
+ // RTC_DCHECK_EQ(codecType, kVideoCodecVP9);
return codec_specific_.VP9;
}
@@ -127,6 +127,7 @@ static const char* kPayloadNameI420 = "I420";
static const char* kPayloadNameRED = "RED";
static const char* kPayloadNameULPFEC = "ULPFEC";
static const char* kPayloadNameGeneric = "Generic";
+static const char* kPayloadNameStereo = "stereo";
static bool CodecNamesEq(const char* name1, const char* name2) {
return _stricmp(name1, name2) == 0;
@@ -148,6 +149,8 @@ rtc::Optional<const char*> CodecTypeToPayloadName(VideoCodecType type) {
return rtc::Optional<const char*>(kPayloadNameULPFEC);
case kVideoCodecGeneric:
return rtc::Optional<const char*>(kPayloadNameGeneric);
+ case kVideoCodecStereo:
+ return rtc::Optional<const char*>(kPayloadNameStereo);
default:
return rtc::Optional<const char*>();
}
@@ -168,6 +171,8 @@ rtc::Optional<VideoCodecType> PayloadNameToCodecType(const std::string& name) {
return rtc::Optional<VideoCodecType>(kVideoCodecULPFEC);
if (CodecNamesEq(name.c_str(), kPayloadNameGeneric))
return rtc::Optional<VideoCodecType>(kVideoCodecGeneric);
+ if (CodecNamesEq(name.c_str(), kPayloadNameStereo))
+ return rtc::Optional<VideoCodecType>(kVideoCodecStereo);
return rtc::Optional<VideoCodecType>();
}
« no previous file with comments | « webrtc/common_types.h ('k') | webrtc/common_video/include/video_frame_buffer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698