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

Unified Diff: webrtc/video/screenshare_loopback.cc

Issue 1306813009: H.264 video codec support using OpenH264/FFmpeg (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Misc (WebRtcVideoChannel2::...::ConfigureVideoEncoderSettings care about H264 case) Created 5 years, 3 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
« webrtc/video/loopback.cc ('K') | « webrtc/video/loopback.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/video/screenshare_loopback.cc
diff --git a/webrtc/video/screenshare_loopback.cc b/webrtc/video/screenshare_loopback.cc
index a221e9c52f14e44797b853ac2fa5b655b9a8f25a..6b1d6d421335bcda29e334a673ebbb1a735d1f5e 100644
--- a/webrtc/video/screenshare_loopback.cc
+++ b/webrtc/video/screenshare_loopback.cc
@@ -163,6 +163,9 @@ class ScreenshareLoopback : public test::Loopback {
CHECK_LT(config.tl_discard_threshold, config.num_temporal_layers);
CHECK_LT(config.sl_discard_threshold, config.num_spatial_layers);
+ h264_settings_ = VideoEncoder::GetDefaultH264Settings();
+ h264_settings_.frameDroppingOn = false;
+
vp8_settings_ = VideoEncoder::GetDefaultVp8Settings();
vp8_settings_.denoisingOn = false;
vp8_settings_.frameDroppingOn = false;
@@ -186,7 +189,10 @@ class ScreenshareLoopback : public test::Loopback {
encoder_config.content_type = VideoEncoderConfig::ContentType::kScreen;
encoder_config.min_transmit_bitrate_bps = flags::MinTransmitBitrate();
int num_temporal_layers;
- if (config_.codec == "VP8") {
+ if (config_.codec == "H264") {
+ encoder_config.encoder_specific_settings = &h264_settings_;
+ num_temporal_layers = 1;
+ } else if (config_.codec == "VP8") {
encoder_config.encoder_specific_settings = &vp8_settings_;
num_temporal_layers = vp8_settings_.numberOfTemporalLayers;
} else if (config_.codec == "VP9") {
@@ -234,6 +240,7 @@ class ScreenshareLoopback : public test::Loopback {
return capturer;
}
+ VideoCodecH264 h264_settings_;
VideoCodecVP8 vp8_settings_;
VideoCodecVP9 vp9_settings_;
};
« webrtc/video/loopback.cc ('K') | « webrtc/video/loopback.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698