| OLD | NEW |
| 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 |
| (...skipping 11 matching lines...) Expand all Loading... |
| 22 InternalEncoderFactory(); | 22 InternalEncoderFactory(); |
| 23 virtual ~InternalEncoderFactory(); | 23 virtual ~InternalEncoderFactory(); |
| 24 | 24 |
| 25 // WebRtcVideoEncoderFactory implementation. | 25 // WebRtcVideoEncoderFactory implementation. |
| 26 webrtc::VideoEncoder* CreateVideoEncoder( | 26 webrtc::VideoEncoder* CreateVideoEncoder( |
| 27 const cricket::VideoCodec& codec) override; | 27 const cricket::VideoCodec& codec) override; |
| 28 const std::vector<cricket::VideoCodec>& supported_codecs() const override; | 28 const std::vector<cricket::VideoCodec>& supported_codecs() const override; |
| 29 void DestroyVideoEncoder(webrtc::VideoEncoder* encoder) override; | 29 void DestroyVideoEncoder(webrtc::VideoEncoder* encoder) override; |
| 30 | 30 |
| 31 private: | 31 private: |
| 32 // Disable overloaded virtual function warning. TODO(magjed): Remove once | |
| 33 // http://crbug/webrtc/6402 is fixed. | |
| 34 using WebRtcVideoEncoderFactory::CreateVideoEncoder; | |
| 35 | |
| 36 std::vector<cricket::VideoCodec> supported_codecs_; | 32 std::vector<cricket::VideoCodec> supported_codecs_; |
| 37 }; | 33 }; |
| 38 | 34 |
| 39 } // namespace cricket | 35 } // namespace cricket |
| 40 | 36 |
| 41 #endif // WEBRTC_MEDIA_ENGINE_INTERNALENCODERFACTORY_H_ | 37 #endif // WEBRTC_MEDIA_ENGINE_INTERNALENCODERFACTORY_H_ |
| OLD | NEW |