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 24 matching lines...) Expand all Loading... |
35 | 35 |
36 private: | 36 private: |
37 // Disable overloaded virtual function warning. TODO(magjed): Remove once | 37 // Disable overloaded virtual function warning. TODO(magjed): Remove once |
38 // http://crbug/webrtc/6402 is fixed. | 38 // http://crbug/webrtc/6402 is fixed. |
39 using cricket::WebRtcVideoEncoderFactory::CreateVideoEncoder; | 39 using cricket::WebRtcVideoEncoderFactory::CreateVideoEncoder; |
40 | 40 |
41 jobject egl_context_; | 41 jobject egl_context_; |
42 | 42 |
43 // Empty if platform support is lacking, const after ctor returns. | 43 // Empty if platform support is lacking, const after ctor returns. |
44 std::vector<cricket::VideoCodec> supported_codecs_; | 44 std::vector<cricket::VideoCodec> supported_codecs_; |
| 45 std::vector<cricket::VideoCodec> supported_codecs_with_h264_hp_; |
45 }; | 46 }; |
46 | 47 |
47 } // namespace webrtc_jni | 48 } // namespace webrtc_jni |
48 | 49 |
49 #endif // WEBRTC_SDK_ANDROID_SRC_JNI_ANDROIDMEDIAENCODER_JNI_H_ | 50 #endif // WEBRTC_SDK_ANDROID_SRC_JNI_ANDROIDMEDIAENCODER_JNI_H_ |
OLD | NEW |