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

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

Issue 1364083002: Remove ChannelManager::GetCapabilities() (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: rebase 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
« no previous file with comments | « talk/media/webrtc/webrtcvideoengine2.h ('k') | talk/media/webrtc/webrtcvoiceengine.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 554 matching lines...) Expand 10 before | Expand all | Expand 10 after
565 565
566 WebRtcVideoEngine2::~WebRtcVideoEngine2() { 566 WebRtcVideoEngine2::~WebRtcVideoEngine2() {
567 LOG(LS_INFO) << "WebRtcVideoEngine2::~WebRtcVideoEngine2"; 567 LOG(LS_INFO) << "WebRtcVideoEngine2::~WebRtcVideoEngine2";
568 } 568 }
569 569
570 void WebRtcVideoEngine2::Init() { 570 void WebRtcVideoEngine2::Init() {
571 LOG(LS_INFO) << "WebRtcVideoEngine2::Init"; 571 LOG(LS_INFO) << "WebRtcVideoEngine2::Init";
572 initialized_ = true; 572 initialized_ = true;
573 } 573 }
574 574
575 int WebRtcVideoEngine2::GetCapabilities() { return VIDEO_RECV | VIDEO_SEND; }
576
577 bool WebRtcVideoEngine2::SetDefaultEncoderConfig( 575 bool WebRtcVideoEngine2::SetDefaultEncoderConfig(
578 const VideoEncoderConfig& config) { 576 const VideoEncoderConfig& config) {
579 const VideoCodec& codec = config.max_codec; 577 const VideoCodec& codec = config.max_codec;
580 bool supports_codec = false; 578 bool supports_codec = false;
581 for (size_t i = 0; i < video_codecs_.size(); ++i) { 579 for (size_t i = 0; i < video_codecs_.size(); ++i) {
582 if (CodecNamesEq(video_codecs_[i].name, codec.name)) { 580 if (CodecNamesEq(video_codecs_[i].name, codec.name)) {
583 video_codecs_[i].width = codec.width; 581 video_codecs_[i].width = codec.width;
584 video_codecs_[i].height = codec.height; 582 video_codecs_[i].height = codec.height;
585 video_codecs_[i].framerate = codec.framerate; 583 video_codecs_[i].framerate = codec.framerate;
586 supports_codec = true; 584 supports_codec = true;
(...skipping 2158 matching lines...) Expand 10 before | Expand all | Expand 10 after
2745 video_codecs[i].rtx_payload_type = rtx_mapping[video_codecs[i].codec.id]; 2743 video_codecs[i].rtx_payload_type = rtx_mapping[video_codecs[i].codec.id];
2746 } 2744 }
2747 } 2745 }
2748 2746
2749 return video_codecs; 2747 return video_codecs;
2750 } 2748 }
2751 2749
2752 } // namespace cricket 2750 } // namespace cricket
2753 2751
2754 #endif // HAVE_WEBRTC_VIDEO 2752 #endif // HAVE_WEBRTC_VIDEO
OLDNEW
« no previous file with comments | « talk/media/webrtc/webrtcvideoengine2.h ('k') | talk/media/webrtc/webrtcvoiceengine.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698