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

Issue 1461083002: Use EGL14 if supported on Android (Closed)

Created:
5 years, 1 month ago by perkj_webrtc
Modified:
5 years ago
Reviewers:
magjed_webrtc, AlexG
CC:
webrtc-reviews_webrtc.org, yujie_mao (webrtc), Andrew MacDonald, tterriberry_mozilla.com, qiang.lu, niklas.enbom, peah-webrtc
Base URL:
https://chromium.googlesource.com/external/webrtc.git@master
Target Ref:
refs/pending/heads/master
Project:
webrtc
Visibility:
Public.

Description

This cl change so that we use EGL14 where it is supported and EGL10 otherwise. The idea is to make this agnostic to an application and for WebRTC except in EGLBase. The reason we want to use EGL14 is to be able to use EGLExt.eglPresentationTimeANDROID when writing textures to MediaEncoder. BUG=webrtc:4993 TBR=glaznew@webrtc.org Committed: https://crrev.com/40455d6f37fda78ea069a51d95f28994bd736864 Cr-Commit-Position: refs/heads/master@{#10864}

Patch Set 1 #

Patch Set 2 : #

Total comments: 8

Patch Set 3 : Rebased #

Patch Set 4 : Fixed comments #

Patch Set 5 : Revert Apprt Changes in this cl and add suggestion for how to land separate. #

Patch Set 6 : Fixed tests #

Total comments: 2

Patch Set 7 : Changed back to keep EglBase #

Patch Set 8 : Fixed VideoCapturerAndroidTest again. #

Total comments: 8

Patch Set 9 : Addressed comments. #

Patch Set 10 : #

Patch Set 11 : Rebased #

Patch Set 12 : Fix problem when egl context is null. #

Patch Set 13 : Changed VideoRendererGui to return an EglBase.Context. #

Unified diffs Side-by-side diffs Delta from patch set Stats (+464 lines, -84 lines) Patch
M talk/app/webrtc/androidtests/src/org/webrtc/GlRectDrawerTest.java View 1 2 3 4 5 6 7 8 9 10 11 12 7 chunks +9 lines, -12 lines 0 comments Download
M talk/app/webrtc/androidtests/src/org/webrtc/MediaCodecVideoEncoderTest.java View 1 2 3 4 5 6 7 8 9 10 11 12 5 chunks +8 lines, -6 lines 0 comments Download
M talk/app/webrtc/androidtests/src/org/webrtc/SurfaceTextureHelperTest.java View 1 2 3 4 5 6 7 8 9 10 11 12 7 chunks +15 lines, -15 lines 0 comments Download
M talk/app/webrtc/androidtests/src/org/webrtc/SurfaceViewRendererOnMeasureTest.java View 1 2 3 4 5 6 3 chunks +2 lines, -4 lines 0 comments Download
M talk/app/webrtc/androidtests/src/org/webrtc/VideoCapturerAndroidTest.java View 1 2 3 4 5 6 7 8 9 10 11 12 10 chunks +30 lines, -11 lines 0 comments Download
M talk/app/webrtc/java/android/org/webrtc/EglBase.java View 1 2 3 4 5 6 7 8 9 10 11 12 8 chunks +55 lines, -9 lines 0 comments Download
A talk/app/webrtc/java/android/org/webrtc/EglBase14.java View 1 2 3 4 5 6 7 8 9 10 11 12 1 chunk +281 lines, -0 lines 0 comments Download
M talk/app/webrtc/java/android/org/webrtc/SurfaceTextureHelper.java View 1 2 3 4 5 6 4 chunks +6 lines, -6 lines 0 comments Download
M talk/app/webrtc/java/android/org/webrtc/SurfaceViewRenderer.java View 1 2 3 4 5 6 7 8 9 10 3 chunks +10 lines, -3 lines 0 comments Download
M talk/app/webrtc/java/android/org/webrtc/VideoCapturerAndroid.java View 1 2 3 4 5 6 7 8 9 10 4 chunks +3 lines, -7 lines 0 comments Download
M talk/app/webrtc/java/android/org/webrtc/VideoRendererGui.java View 1 2 3 4 5 6 7 8 9 10 11 12 1 chunk +5 lines, -0 lines 0 comments Download
M talk/app/webrtc/java/jni/androidmediadecoder_jni.cc View 1 2 3 4 5 6 1 chunk +1 line, -1 line 0 comments Download
M talk/app/webrtc/java/jni/androidmediaencoder_jni.cc View 1 2 3 4 5 6 7 8 9 10 2 chunks +2 lines, -2 lines 0 comments Download
M talk/app/webrtc/java/jni/classreferenceholder.cc View 1 2 3 4 5 6 1 chunk +1 line, -0 lines 0 comments Download
M talk/app/webrtc/java/jni/peerconnection_jni.cc View 1 2 3 4 5 6 7 8 9 10 11 2 chunks +30 lines, -2 lines 0 comments Download
M talk/app/webrtc/java/jni/surfacetexturehelper_jni.cc View 1 2 3 5 6 1 chunk +1 line, -1 line 0 comments Download
M talk/app/webrtc/java/src/org/webrtc/MediaCodecVideoEncoder.java View 1 2 3 5 6 3 chunks +2 lines, -4 lines 0 comments Download
M talk/libjingle.gyp View 1 2 5 6 1 chunk +1 line, -0 lines 0 comments Download
M webrtc/examples/androidapp/src/org/appspot/apprtc/PeerConnectionClient.java View 1 2 3 4 5 6 2 chunks +2 lines, -1 line 0 comments Download

Messages

Total messages: 22 (9 generated)
perkj_webrtc
please?
5 years, 1 month ago (2015-11-20 13:51:22 UTC) #4
magjed_webrtc
https://codereview.webrtc.org/1461083002/diff/20001/talk/app/webrtc/java/android/org/webrtc/EglBase.java File talk/app/webrtc/java/android/org/webrtc/EglBase.java (right): https://codereview.webrtc.org/1461083002/diff/20001/talk/app/webrtc/java/android/org/webrtc/EglBase.java#newcode38 talk/app/webrtc/java/android/org/webrtc/EglBase.java:38: final EglBaseInterface eglDelegate; This is an unnecessary indirection. Return ...
5 years, 1 month ago (2015-11-20 17:05:30 UTC) #5
perkj_webrtc
PTAL This cl does not break AppRTC and should not break other apps either. When ...
5 years, 1 month ago (2015-11-23 14:55:56 UTC) #6
magjed_webrtc
https://codereview.webrtc.org/1461083002/diff/100001/talk/app/webrtc/java/android/org/webrtc/Egl.java File talk/app/webrtc/java/android/org/webrtc/Egl.java (right): https://codereview.webrtc.org/1461083002/diff/100001/talk/app/webrtc/java/android/org/webrtc/Egl.java#newcode58 talk/app/webrtc/java/android/org/webrtc/Egl.java:58: return (sharedContext == null && EglBase14.isEGL14Supported() This is correct ...
5 years ago (2015-11-25 10:53:19 UTC) #7
perkj_webrtc
PTAL
5 years ago (2015-11-25 14:23:03 UTC) #8
perkj_webrtc
PTAL
5 years ago (2015-11-25 14:23:03 UTC) #9
magjed_webrtc
https://codereview.webrtc.org/1461083002/diff/140001/talk/app/webrtc/java/android/org/webrtc/EglBase.java File talk/app/webrtc/java/android/org/webrtc/EglBase.java (right): https://codereview.webrtc.org/1461083002/diff/140001/talk/app/webrtc/java/android/org/webrtc/EglBase.java#newcode47 talk/app/webrtc/java/android/org/webrtc/EglBase.java:47: * Holds EGL state and utility methods for handling ...
5 years ago (2015-11-26 09:54:48 UTC) #10
perkj_webrtc
please https://codereview.webrtc.org/1461083002/diff/140001/talk/app/webrtc/java/android/org/webrtc/EglBase.java File talk/app/webrtc/java/android/org/webrtc/EglBase.java (right): https://codereview.webrtc.org/1461083002/diff/140001/talk/app/webrtc/java/android/org/webrtc/EglBase.java#newcode47 talk/app/webrtc/java/android/org/webrtc/EglBase.java:47: * Holds EGL state and utility methods for ...
5 years ago (2015-11-26 10:05:21 UTC) #11
magjed_webrtc
lgtm
5 years ago (2015-11-26 11:28:20 UTC) #12
perkj_webrtc
Alex, do you want to take a look and have an opinion.
5 years ago (2015-11-30 15:04:24 UTC) #14
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1461083002/240001 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1461083002/240001
5 years ago (2015-12-02 09:04:01 UTC) #17
commit-bot: I haz the power
Committed patchset #13 (id:240001)
5 years ago (2015-12-02 09:07:23 UTC) #20
commit-bot: I haz the power
5 years ago (2015-12-02 09:07:25 UTC) #22
Message was sent while issue was closed.
Patchset 13 (id:??) landed as
https://crrev.com/40455d6f37fda78ea069a51d95f28994bd736864
Cr-Commit-Position: refs/heads/master@{#10864}

Powered by Google App Engine
This is Rietveld 408576698