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

Side by Side Diff: talk/app/webrtc/androidtests/src/org/webrtc/SurfaceViewRendererOnMeasureTest.java

Issue 1461083002: Use EGL14 if supported on Android (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Changed VideoRendererGui to return an EglBase.Context. Created 5 years 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 18 matching lines...) Expand all
29 29
30 import android.graphics.Point; 30 import android.graphics.Point;
31 import android.test.ActivityTestCase; 31 import android.test.ActivityTestCase;
32 import android.test.suitebuilder.annotation.MediumTest; 32 import android.test.suitebuilder.annotation.MediumTest;
33 import android.view.View.MeasureSpec; 33 import android.view.View.MeasureSpec;
34 34
35 import java.nio.ByteBuffer; 35 import java.nio.ByteBuffer;
36 import java.util.Arrays; 36 import java.util.Arrays;
37 import java.util.List; 37 import java.util.List;
38 38
39 import javax.microedition.khronos.egl.EGL10;
40
41 public final class SurfaceViewRendererOnMeasureTest extends ActivityTestCase { 39 public final class SurfaceViewRendererOnMeasureTest extends ActivityTestCase {
42 /** 40 /**
43 * List with all possible scaling types. 41 * List with all possible scaling types.
44 */ 42 */
45 private static final List<RendererCommon.ScalingType> scalingTypes = Arrays.as List( 43 private static final List<RendererCommon.ScalingType> scalingTypes = Arrays.as List(
46 RendererCommon.ScalingType.SCALE_ASPECT_FIT, 44 RendererCommon.ScalingType.SCALE_ASPECT_FIT,
47 RendererCommon.ScalingType.SCALE_ASPECT_FILL, 45 RendererCommon.ScalingType.SCALE_ASPECT_FILL,
48 RendererCommon.ScalingType.SCALE_ASPECT_BALANCED); 46 RendererCommon.ScalingType.SCALE_ASPECT_BALANCED);
49 47
50 /** 48 /**
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 assertMeasuredSize(surfaceViewRenderer, scalingType, frameDimensions, 102 assertMeasuredSize(surfaceViewRenderer, scalingType, frameDimensions,
105 0, 0, zeroMeasureSize, zeroMeasureSize); 103 0, 0, zeroMeasureSize, zeroMeasureSize);
106 assertMeasuredSize(surfaceViewRenderer, scalingType, frameDimensions, 104 assertMeasuredSize(surfaceViewRenderer, scalingType, frameDimensions,
107 1280, 720, 105 1280, 720,
108 MeasureSpec.makeMeasureSpec(1280, measureSpecMode), 106 MeasureSpec.makeMeasureSpec(1280, measureSpecMode),
109 MeasureSpec.makeMeasureSpec(720, measureSpecMode)); 107 MeasureSpec.makeMeasureSpec(720, measureSpecMode));
110 } 108 }
111 } 109 }
112 110
113 // Test behaviour after SurfaceViewRenderer.init() is called, but still no fr ame. 111 // Test behaviour after SurfaceViewRenderer.init() is called, but still no fr ame.
114 surfaceViewRenderer.init(EGL10.EGL_NO_CONTEXT, null); 112 surfaceViewRenderer.init((EglBase.Context) null, null);
115 for (RendererCommon.ScalingType scalingType : scalingTypes) { 113 for (RendererCommon.ScalingType scalingType : scalingTypes) {
116 for (int measureSpecMode : measureSpecModes) { 114 for (int measureSpecMode : measureSpecModes) {
117 final int zeroMeasureSize = MeasureSpec.makeMeasureSpec(0, measureSpecMo de); 115 final int zeroMeasureSize = MeasureSpec.makeMeasureSpec(0, measureSpecMo de);
118 assertMeasuredSize(surfaceViewRenderer, scalingType, frameDimensions, 116 assertMeasuredSize(surfaceViewRenderer, scalingType, frameDimensions,
119 0, 0, zeroMeasureSize, zeroMeasureSize); 117 0, 0, zeroMeasureSize, zeroMeasureSize);
120 assertMeasuredSize(surfaceViewRenderer, scalingType, frameDimensions, 118 assertMeasuredSize(surfaceViewRenderer, scalingType, frameDimensions,
121 1280, 720, 119 1280, 720,
122 MeasureSpec.makeMeasureSpec(1280, measureSpecMode), 120 MeasureSpec.makeMeasureSpec(1280, measureSpecMode),
123 MeasureSpec.makeMeasureSpec(720, measureSpecMode)); 121 MeasureSpec.makeMeasureSpec(720, measureSpecMode));
124 } 122 }
125 } 123 }
126 124
127 surfaceViewRenderer.release(); 125 surfaceViewRenderer.release();
128 } 126 }
129 127
130 /** 128 /**
131 * Test how SurfaceViewRenderer.onMeasure() behaves with a 1280x720 frame. 129 * Test how SurfaceViewRenderer.onMeasure() behaves with a 1280x720 frame.
132 */ 130 */
133 @MediumTest 131 @MediumTest
134 public void testFrame1280x720() { 132 public void testFrame1280x720() {
135 final SurfaceViewRenderer surfaceViewRenderer = 133 final SurfaceViewRenderer surfaceViewRenderer =
136 new SurfaceViewRenderer(getInstrumentation().getContext()); 134 new SurfaceViewRenderer(getInstrumentation().getContext());
137 surfaceViewRenderer.init(EGL10.EGL_NO_CONTEXT, null); 135 surfaceViewRenderer.init((EglBase.Context) null, null);
138 136
139 // Test different rotation degress, but same rotated size. 137 // Test different rotation degress, but same rotated size.
140 for (int rotationDegree : new int[] {0, 90, 180, 270}) { 138 for (int rotationDegree : new int[] {0, 90, 180, 270}) {
141 final int rotatedWidth = 1280; 139 final int rotatedWidth = 1280;
142 final int rotatedHeight = 720; 140 final int rotatedHeight = 720;
143 final int unrotatedWidth = (rotationDegree % 180 == 0 ? rotatedWidth : rot atedHeight); 141 final int unrotatedWidth = (rotationDegree % 180 == 0 ? rotatedWidth : rot atedHeight);
144 final int unrotatedHeight = (rotationDegree % 180 == 0 ? rotatedHeight : r otatedWidth); 142 final int unrotatedHeight = (rotationDegree % 180 == 0 ? rotatedHeight : r otatedWidth);
145 final VideoRenderer.I420Frame frame = 143 final VideoRenderer.I420Frame frame =
146 createFrame(unrotatedWidth, unrotatedHeight, rotationDegree); 144 createFrame(unrotatedWidth, unrotatedHeight, rotationDegree);
147 assertEquals(rotatedWidth, frame.rotatedWidth()); 145 assertEquals(rotatedWidth, frame.rotatedWidth());
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
208 for (RendererCommon.ScalingType scalingType : scalingTypes) { 206 for (RendererCommon.ScalingType scalingType : scalingTypes) {
209 assertMeasuredSize(surfaceViewRenderer, scalingType, frameDimensions, 207 assertMeasuredSize(surfaceViewRenderer, scalingType, frameDimensions,
210 720, 1280, widthSpec, heightSpec); 208 720, 1280, widthSpec, heightSpec);
211 } 209 }
212 } 210 }
213 } 211 }
214 212
215 surfaceViewRenderer.release(); 213 surfaceViewRenderer.release();
216 } 214 }
217 } 215 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698