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

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

Issue 2639423006: Clear out cached codecs when calculating new codec lists. (Closed)
Patch Set: Format cl. Created 3 years, 11 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 | « webrtc/media/BUILD.gn ('k') | webrtc/media/engine/webrtcvideoencoderfactory_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) 2016 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2016 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
11 #include "webrtc/media/engine/webrtcvideoencoderfactory.h" 11 #include "webrtc/media/engine/webrtcvideoencoderfactory.h"
12 12
13 #include "webrtc/common_types.h" 13 #include "webrtc/common_types.h"
14 14
15 namespace cricket { 15 namespace cricket {
16 16
17 webrtc::VideoEncoder* WebRtcVideoEncoderFactory::CreateVideoEncoder( 17 webrtc::VideoEncoder* WebRtcVideoEncoderFactory::CreateVideoEncoder(
18 const cricket::VideoCodec& codec) { 18 const cricket::VideoCodec& codec) {
19 return CreateVideoEncoder(webrtc::PayloadNameToCodecType(codec.name) 19 return CreateVideoEncoder(webrtc::PayloadNameToCodecType(codec.name)
20 .value_or(webrtc::kVideoCodecUnknown)); 20 .value_or(webrtc::kVideoCodecUnknown));
21 } 21 }
22 22
23 const std::vector<cricket::VideoCodec>& 23 const std::vector<cricket::VideoCodec>&
24 WebRtcVideoEncoderFactory::supported_codecs() const { 24 WebRtcVideoEncoderFactory::supported_codecs() const {
25 codecs_.clear();
25 const std::vector<VideoCodec>& encoder_codecs = codecs(); 26 const std::vector<VideoCodec>& encoder_codecs = codecs();
26 for (const VideoCodec& encoder_codec : encoder_codecs) { 27 for (const VideoCodec& encoder_codec : encoder_codecs) {
27 codecs_.push_back(cricket::VideoCodec(encoder_codec.name)); 28 codecs_.push_back(cricket::VideoCodec(encoder_codec.name));
28 } 29 }
29 return codecs_; 30 return codecs_;
30 } 31 }
31 32
32 webrtc::VideoEncoder* WebRtcVideoEncoderFactory::CreateVideoEncoder( 33 webrtc::VideoEncoder* WebRtcVideoEncoderFactory::CreateVideoEncoder(
33 webrtc::VideoCodecType type) { 34 webrtc::VideoCodecType type) {
34 const cricket::VideoCodec codec( 35 const cricket::VideoCodec codec(
35 webrtc::CodecTypeToPayloadName(type).value_or("Unknown codec")); 36 webrtc::CodecTypeToPayloadName(type).value_or("Unknown codec"));
36 return CreateVideoEncoder(codec); 37 return CreateVideoEncoder(codec);
37 } 38 }
38 39
39 const std::vector<WebRtcVideoEncoderFactory::VideoCodec>& 40 const std::vector<WebRtcVideoEncoderFactory::VideoCodec>&
40 WebRtcVideoEncoderFactory::codecs() const { 41 WebRtcVideoEncoderFactory::codecs() const {
42 encoder_codecs_.clear();
41 const std::vector<cricket::VideoCodec>& codecs = supported_codecs(); 43 const std::vector<cricket::VideoCodec>& codecs = supported_codecs();
42 for (const cricket::VideoCodec& codec : codecs) { 44 for (const cricket::VideoCodec& codec : codecs) {
43 encoder_codecs_.push_back( 45 encoder_codecs_.push_back(
44 VideoCodec(webrtc::PayloadNameToCodecType(codec.name) 46 VideoCodec(webrtc::PayloadNameToCodecType(codec.name)
45 .value_or(webrtc::kVideoCodecUnknown), 47 .value_or(webrtc::kVideoCodecUnknown),
46 codec.name)); 48 codec.name));
47 } 49 }
48 return encoder_codecs_; 50 return encoder_codecs_;
49 } 51 }
50 52
51 } // namespace cricket 53 } // namespace cricket
OLDNEW
« no previous file with comments | « webrtc/media/BUILD.gn ('k') | webrtc/media/engine/webrtcvideoencoderfactory_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698