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

Side by Side Diff: talk/media/webrtc/webrtcvideoengine2.cc

Issue 1306813009: H.264 video codec support using OpenH264/FFmpeg (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Re-enable H264 in video_loopback and screenshare_loopback after rebase (video_quality_test) Created 5 years, 2 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * libjingle 2 * libjingle
3 * Copyright 2014 Google Inc. 3 * Copyright 2014 Google Inc.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met: 6 * modification, are permitted provided that the following conditions are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright notice, 8 * 1. Redistributions of source code must retain the above copyright notice,
9 * this list of conditions and the following disclaimer. 9 * this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright notice, 10 * 2. Redistributions in binary form must reproduce the above copyright notice,
(...skipping 476 matching lines...) Expand 10 before | Expand all | Expand 10 after
487 bool automatic_resize = 487 bool automatic_resize =
488 !is_screencast && parameters_.config.rtp.ssrcs.size() == 1; 488 !is_screencast && parameters_.config.rtp.ssrcs.size() == 1;
489 bool frame_dropping = !is_screencast; 489 bool frame_dropping = !is_screencast;
490 bool denoising; 490 bool denoising;
491 if (is_screencast) { 491 if (is_screencast) {
492 denoising = false; 492 denoising = false;
493 } else { 493 } else {
494 options.video_noise_reduction.Get(&denoising); 494 options.video_noise_reduction.Get(&denoising);
495 } 495 }
496 496
497 if (CodecNamesEq(codec.name, kH264CodecName)) {
498 encoder_settings_.h264 = webrtc::VideoEncoder::GetDefaultH264Settings();
499 encoder_settings_.h264.frameDroppingOn = frame_dropping;
500 return &encoder_settings_.h264;
501 }
497 if (CodecNamesEq(codec.name, kVp8CodecName)) { 502 if (CodecNamesEq(codec.name, kVp8CodecName)) {
498 encoder_settings_.vp8 = webrtc::VideoEncoder::GetDefaultVp8Settings(); 503 encoder_settings_.vp8 = webrtc::VideoEncoder::GetDefaultVp8Settings();
499 encoder_settings_.vp8.automaticResizeOn = automatic_resize; 504 encoder_settings_.vp8.automaticResizeOn = automatic_resize;
500 encoder_settings_.vp8.denoisingOn = denoising; 505 encoder_settings_.vp8.denoisingOn = denoising;
501 encoder_settings_.vp8.frameDroppingOn = frame_dropping; 506 encoder_settings_.vp8.frameDroppingOn = frame_dropping;
502 return &encoder_settings_.vp8; 507 return &encoder_settings_.vp8;
503 } 508 }
504 if (CodecNamesEq(codec.name, kVp9CodecName)) { 509 if (CodecNamesEq(codec.name, kVp9CodecName)) {
505 encoder_settings_.vp9 = webrtc::VideoEncoder::GetDefaultVp9Settings(); 510 encoder_settings_.vp9 = webrtc::VideoEncoder::GetDefaultVp9Settings();
506 encoder_settings_.vp9.denoisingOn = denoising; 511 encoder_settings_.vp9.denoisingOn = denoising;
(...skipping 2230 matching lines...) Expand 10 before | Expand all | Expand 10 after
2737 video_codecs[i].rtx_payload_type = rtx_mapping[video_codecs[i].codec.id]; 2742 video_codecs[i].rtx_payload_type = rtx_mapping[video_codecs[i].codec.id];
2738 } 2743 }
2739 } 2744 }
2740 2745
2741 return video_codecs; 2746 return video_codecs;
2742 } 2747 }
2743 2748
2744 } // namespace cricket 2749 } // namespace cricket
2745 2750
2746 #endif // HAVE_WEBRTC_VIDEO 2751 #endif // HAVE_WEBRTC_VIDEO
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698