OLD | NEW |
1 /* | 1 /* |
2 * Copyright 2015 The WebRTC project authors. All Rights Reserved. | 2 * Copyright 2015 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 10 matching lines...) Expand all Loading... |
21 // Implementation of Android MediaCodec based encoder factory. | 21 // Implementation of Android MediaCodec based encoder factory. |
22 class MediaCodecVideoEncoderFactory | 22 class MediaCodecVideoEncoderFactory |
23 : public cricket::WebRtcVideoEncoderFactory { | 23 : public cricket::WebRtcVideoEncoderFactory { |
24 public: | 24 public: |
25 MediaCodecVideoEncoderFactory(); | 25 MediaCodecVideoEncoderFactory(); |
26 virtual ~MediaCodecVideoEncoderFactory(); | 26 virtual ~MediaCodecVideoEncoderFactory(); |
27 | 27 |
28 void SetEGLContext(JNIEnv* jni, jobject egl_context); | 28 void SetEGLContext(JNIEnv* jni, jobject egl_context); |
29 | 29 |
30 // WebRtcVideoEncoderFactory implementation. | 30 // WebRtcVideoEncoderFactory implementation. |
31 webrtc::VideoEncoder* CreateVideoEncoder(webrtc::VideoCodecType type) | 31 webrtc::VideoEncoder* CreateVideoEncoder( |
32 override; | 32 const cricket::VideoCodec& codec) override; |
33 const std::vector<VideoCodec>& codecs() const override; | 33 const std::vector<cricket::VideoCodec>& supported_codecs() const override; |
34 void DestroyVideoEncoder(webrtc::VideoEncoder* encoder) override; | 34 void DestroyVideoEncoder(webrtc::VideoEncoder* encoder) override; |
35 | 35 |
36 private: | 36 private: |
| 37 // Disable overloaded virtual function warning. TODO(magjed): Remove once |
| 38 // http://crbug/webrtc/6402 is fixed. |
| 39 using cricket::WebRtcVideoEncoderFactory::CreateVideoEncoder; |
| 40 |
37 jobject egl_context_; | 41 jobject egl_context_; |
38 | 42 |
39 // Empty if platform support is lacking, const after ctor returns. | 43 // Empty if platform support is lacking, const after ctor returns. |
40 std::vector<VideoCodec> supported_codecs_; | 44 std::vector<cricket::VideoCodec> supported_codecs_; |
41 }; | 45 }; |
42 | 46 |
43 } // namespace webrtc_jni | 47 } // namespace webrtc_jni |
44 | 48 |
45 #endif // WEBRTC_API_JAVA_JNI_ANDROIDMEDIAENCODER_JNI_H_ | 49 #endif // WEBRTC_API_JAVA_JNI_ANDROIDMEDIAENCODER_JNI_H_ |
OLD | NEW |