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

Side by Side Diff: webrtc/media/engine/webrtcvideoengine.cc

Issue 2982053002: Revert "Prefer external video codecs over internal in SDP" (Closed)
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 unified diff | Download patch
« no previous file with comments | « no previous file | webrtc/media/engine/webrtcvideoengine_unittest.cc » ('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 * Copyright (c) 2014 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 519 matching lines...) Expand 10 before | Expand all | Expand 10 after
530 } 530 }
531 531
532 static std::vector<VideoCodec> GetSupportedCodecs( 532 static std::vector<VideoCodec> GetSupportedCodecs(
533 const WebRtcVideoEncoderFactory* external_encoder_factory) { 533 const WebRtcVideoEncoderFactory* external_encoder_factory) {
534 const std::vector<VideoCodec> internal_codecs = 534 const std::vector<VideoCodec> internal_codecs =
535 InternalEncoderFactory().supported_codecs(); 535 InternalEncoderFactory().supported_codecs();
536 LOG(LS_INFO) << "Internally supported codecs: " 536 LOG(LS_INFO) << "Internally supported codecs: "
537 << CodecVectorToString(internal_codecs); 537 << CodecVectorToString(internal_codecs);
538 538
539 std::vector<VideoCodec> unified_codecs; 539 std::vector<VideoCodec> unified_codecs;
540 AppendVideoCodecs(internal_codecs, &unified_codecs);
541
540 if (external_encoder_factory != nullptr) { 542 if (external_encoder_factory != nullptr) {
541 const std::vector<VideoCodec>& external_codecs = 543 const std::vector<VideoCodec>& external_codecs =
542 external_encoder_factory->supported_codecs(); 544 external_encoder_factory->supported_codecs();
543 AppendVideoCodecs(external_codecs, &unified_codecs); 545 AppendVideoCodecs(external_codecs, &unified_codecs);
544 LOG(LS_INFO) << "Codecs supported by the external encoder factory: " 546 LOG(LS_INFO) << "Codecs supported by the external encoder factory: "
545 << CodecVectorToString(external_codecs); 547 << CodecVectorToString(external_codecs);
546 } 548 }
547 549
548 AppendVideoCodecs(internal_codecs, &unified_codecs);
549
550 return unified_codecs; 550 return unified_codecs;
551 } 551 }
552 552
553 WebRtcVideoChannel::WebRtcVideoChannel( 553 WebRtcVideoChannel::WebRtcVideoChannel(
554 webrtc::Call* call, 554 webrtc::Call* call,
555 const MediaConfig& config, 555 const MediaConfig& config,
556 const VideoOptions& options, 556 const VideoOptions& options,
557 WebRtcVideoEncoderFactory* external_encoder_factory, 557 WebRtcVideoEncoderFactory* external_encoder_factory,
558 WebRtcVideoDecoderFactory* external_decoder_factory) 558 WebRtcVideoDecoderFactory* external_decoder_factory)
559 : VideoMediaChannel(config), 559 : VideoMediaChannel(config),
(...skipping 2081 matching lines...) Expand 10 before | Expand all | Expand 10 after
2641 stream.temporal_layer_thresholds_bps.resize(GetDefaultVp9TemporalLayers() - 2641 stream.temporal_layer_thresholds_bps.resize(GetDefaultVp9TemporalLayers() -
2642 1); 2642 1);
2643 } 2643 }
2644 2644
2645 std::vector<webrtc::VideoStream> streams; 2645 std::vector<webrtc::VideoStream> streams;
2646 streams.push_back(stream); 2646 streams.push_back(stream);
2647 return streams; 2647 return streams;
2648 } 2648 }
2649 2649
2650 } // namespace cricket 2650 } // namespace cricket
OLDNEW
« no previous file with comments | « no previous file | webrtc/media/engine/webrtcvideoengine_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698