talk/app/webrtc/java/jni/androidmediacodeccommon.h - Issue 1304063011: Move shared EGL context initialization to a separate function.

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

Issue 1304063011: Move shared EGL context initialization to a separate function. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master

Patch Set: Address comment + fix Linux build. Created 5 years, 3 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 | « talk/app/webrtc/androidtests/src/org/webrtc/VideoCapturerAndroidTest.java ('k') | talk/app/webrtc/java/jni/androidmediadecoder_jni.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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 29 matching lines...) Expand all Loading...
40 // video frame.	40 // video frame.

41 //#define TRACK_BUFFER_TIMING	41 //#define TRACK_BUFFER_TIMING

42	42

43 #define TAG "MediaCodecVideo"	43 #define TAG "MediaCodecVideo"

44 #ifdef TRACK_BUFFER_TIMING	44 #ifdef TRACK_BUFFER_TIMING

45 #define ALOGV(...) __android_log_print(ANDROID_LOG_VERBOSE, TAG, __VA_ARGS__)	45 #define ALOGV(...) __android_log_print(ANDROID_LOG_VERBOSE, TAG, __VA_ARGS__)

46 #else	46 #else

47 #define ALOGV(...)	47 #define ALOGV(...)

48 #endif	48 #endif

49 #define ALOGD(...) __android_log_print(ANDROID_LOG_DEBUG, TAG, __VA_ARGS__)	49 #define ALOGD(...) __android_log_print(ANDROID_LOG_DEBUG, TAG, __VA_ARGS__)

	50 #define ALOGW(...) __android_log_print(ANDROID_LOG_WARN, TAG, __VA_ARGS__)

50 #define ALOGE(...) __android_log_print(ANDROID_LOG_ERROR, TAG, __VA_ARGS__)	51 #define ALOGE(...) __android_log_print(ANDROID_LOG_ERROR, TAG, __VA_ARGS__)

51	52

52 // Color formats supported by encoder - should mirror supportedColorList	53 // Color formats supported by encoder - should mirror supportedColorList

53 // from MediaCodecVideoEncoder.java	54 // from MediaCodecVideoEncoder.java

54 enum COLOR_FORMATTYPE {	55 enum COLOR_FORMATTYPE {

55 COLOR_FormatYUV420Planar = 0x13,	56 COLOR_FormatYUV420Planar = 0x13,

56 COLOR_FormatYUV420SemiPlanar = 0x15,	57 COLOR_FormatYUV420SemiPlanar = 0x15,

57 COLOR_QCOM_FormatYUV420SemiPlanar = 0x7FA30C00,	58 COLOR_QCOM_FormatYUV420SemiPlanar = 0x7FA30C00,

58 // NV12 color format supported by QCOM codec, but not declared in MediaCodec -	59 // NV12 color format supported by QCOM codec, but not declared in MediaCodec -

59 // see /hardware/qcom/media/mm-core/inc/OMX_QCOMExtns.h	60 // see /hardware/qcom/media/mm-core/inc/OMX_QCOMExtns.h

(...skipping 40 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
100 jni->ExceptionDescribe();	101 jni->ExceptionDescribe();

101 jni->ExceptionClear();	102 jni->ExceptionClear();

102 return true;	103 return true;

103 }	104 }

104 return false;	105 return false;

105 }	106 }

106	107

107 } // namespace webrtc_jni	108 } // namespace webrtc_jni

108	109

109 #endif // TALK_APP_WEBRTC_JAVA_JNI_ANDROIDMEDIACODECCOMMON_H_	110 #endif // TALK_APP_WEBRTC_JAVA_JNI_ANDROIDMEDIACODECCOMMON_H_

OLD	NEW