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

Side by Side Diff: talk/app/webrtc/java/jni/androidmediadecoder_jni.h

Issue 1587193006: Move talk/media to webrtc/media (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebased to b647aca12a884a13c1728118586245399b55fa3d (#11493) Created 4 years, 10 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
OLDNEW
1 /* 1 /*
2 * libjingle 2 * libjingle
3 * Copyright 2015 Google Inc. 3 * Copyright 2015 Google Inc.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met: 6 * modification, are permitted provided that the following conditions are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright notice, 8 * 1. Redistributions of source code must retain the above copyright notice,
9 * this list of conditions and the following disclaimer. 9 * this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright notice, 10 * 2. Redistributions in binary form must reproduce the above copyright notice,
(...skipping 12 matching lines...) Expand all
23 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR 23 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
24 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF 24 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 * 26 *
27 */ 27 */
28 28
29 #ifndef TALK_APP_WEBRTC_JAVA_JNI_ANDROIDMEDIADECODER_JNI_H_ 29 #ifndef TALK_APP_WEBRTC_JAVA_JNI_ANDROIDMEDIADECODER_JNI_H_
30 #define TALK_APP_WEBRTC_JAVA_JNI_ANDROIDMEDIADECODER_JNI_H_ 30 #define TALK_APP_WEBRTC_JAVA_JNI_ANDROIDMEDIADECODER_JNI_H_
31 31
32 #include "talk/app/webrtc/java/jni/eglbase_jni.h" 32 #include "talk/app/webrtc/java/jni/eglbase_jni.h"
33 #include "talk/media/webrtc/webrtcvideodecoderfactory.h" 33 #include "webrtc/media/webrtc/webrtcvideodecoderfactory.h"
34 34
35 namespace webrtc_jni { 35 namespace webrtc_jni {
36 36
37 // Implementation of Android MediaCodec based decoder factory. 37 // Implementation of Android MediaCodec based decoder factory.
38 class MediaCodecVideoDecoderFactory 38 class MediaCodecVideoDecoderFactory
39 : public cricket::WebRtcVideoDecoderFactory { 39 : public cricket::WebRtcVideoDecoderFactory {
40 public: 40 public:
41 MediaCodecVideoDecoderFactory(); 41 MediaCodecVideoDecoderFactory();
42 virtual ~MediaCodecVideoDecoderFactory(); 42 virtual ~MediaCodecVideoDecoderFactory();
43 43
44 void SetEGLContext(JNIEnv* jni, jobject render_egl_context); 44 void SetEGLContext(JNIEnv* jni, jobject render_egl_context);
45 45
46 // WebRtcVideoDecoderFactory implementation. 46 // WebRtcVideoDecoderFactory implementation.
47 webrtc::VideoDecoder* CreateVideoDecoder(webrtc::VideoCodecType type) 47 webrtc::VideoDecoder* CreateVideoDecoder(webrtc::VideoCodecType type)
48 override; 48 override;
49 49
50 void DestroyVideoDecoder(webrtc::VideoDecoder* decoder) override; 50 void DestroyVideoDecoder(webrtc::VideoDecoder* decoder) override;
51 51
52 private: 52 private:
53 EglBase egl_; 53 EglBase egl_;
54 std::vector<webrtc::VideoCodecType> supported_codec_types_; 54 std::vector<webrtc::VideoCodecType> supported_codec_types_;
55 }; 55 };
56 56
57 } // namespace webrtc_jni 57 } // namespace webrtc_jni
58 58
59 #endif // TALK_APP_WEBRTC_JAVA_JNI_ANDROIDMEDIADECODER_JNI_H_ 59 #endif // TALK_APP_WEBRTC_JAVA_JNI_ANDROIDMEDIADECODER_JNI_H_
OLDNEW
« no previous file with comments | « talk/app/webrtc/java/jni/androidmediacodeccommon.h ('k') | talk/app/webrtc/java/jni/androidmediadecoder_jni.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698