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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: talk/app/webrtc/java/android/org/webrtc/VideoRendererGui.java

Issue 1343163003: Partial revert of r9936. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master
Patch Set: 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « talk/app/webrtc/java/android/org/webrtc/VideoCapturerAndroid.java ('k') | talk/app/webrtc/java/src/org/webrtc/MediaCodecVideoDecoder.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: talk/app/webrtc/java/android/org/webrtc/VideoRendererGui.java
diff --git a/talk/app/webrtc/java/android/org/webrtc/VideoRendererGui.java b/talk/app/webrtc/java/android/org/webrtc/VideoRendererGui.java
index 9909bff49246b2ff8502af37417aa06bf884ea15..3072613fa427c9060c153e0c01423b2e6d9f761f 100644
--- a/talk/app/webrtc/java/android/org/webrtc/VideoRendererGui.java
+++ b/talk/app/webrtc/java/android/org/webrtc/VideoRendererGui.java
@@ -44,7 +44,6 @@ import android.opengl.GLSurfaceView;
import android.opengl.Matrix;
import android.util.Log;
-import org.webrtc.Logging;
import org.webrtc.VideoRenderer.I420Frame;
/**
@@ -159,7 +158,7 @@ public class VideoRendererGui implements GLSurfaceView.Renderer {
GLSurfaceView surface, int id,
int x, int y, int width, int height,
RendererCommon.ScalingType scalingType, boolean mirror) {
- Logging.d(TAG, "YuvImageRenderer.Create id: " + id);
+ Log.d(TAG, "YuvImageRenderer.Create id: " + id);
this.surface = surface;
this.id = id;
this.scalingType = scalingType;
@@ -180,7 +179,7 @@ public class VideoRendererGui implements GLSurfaceView.Renderer {
}
private void createTextures() {
- Logging.d(TAG, " YuvImageRenderer.createTextures " + id + " on GL thread:" +
+ Log.d(TAG, " YuvImageRenderer.createTextures " + id + " on GL thread:" +
Thread.currentThread().getId());
// Generate 3 texture ids for Y/U/V and place them into |yuvTextures|.
@@ -201,7 +200,7 @@ public class VideoRendererGui implements GLSurfaceView.Renderer {
(screenHeight * layoutInPercentage.top + 99) / 100,
(screenWidth * layoutInPercentage.right) / 100,
(screenHeight * layoutInPercentage.bottom) / 100);
- Logging.d(TAG, "ID: " + id + ". AdjustTextureCoords. Allowed display size: "
+ Log.d(TAG, "ID: " + id + ". AdjustTextureCoords. Allowed display size: "
+ displayLayout.width() + " x " + displayLayout.height() + ". Video: " + videoWidth
+ " x " + videoHeight + ". Rotation: " + rotationDegree + ". Mirror: " + mirror);
final float videoAspectRatio = (rotationDegree % 180 == 0)
@@ -212,12 +211,12 @@ public class VideoRendererGui implements GLSurfaceView.Renderer {
videoAspectRatio, displayLayout.width(), displayLayout.height());
displayLayout.inset((displayLayout.width() - displaySize.x) / 2,
(displayLayout.height() - displaySize.y) / 2);
- Logging.d(TAG, " Adjusted display size: " + displayLayout.width() + " x "
+ Log.d(TAG, " Adjusted display size: " + displayLayout.width() + " x "
+ displayLayout.height());
layoutMatrix = RendererCommon.getLayoutMatrix(
mirror, videoAspectRatio, (float) displayLayout.width() / displayLayout.height());
updateLayoutProperties = false;
- Logging.d(TAG, " AdjustTextureCoords done");
+ Log.d(TAG, " AdjustTextureCoords done");
}
}
@@ -284,13 +283,13 @@ public class VideoRendererGui implements GLSurfaceView.Renderer {
private void logStatistics() {
long timeSinceFirstFrameNs = System.nanoTime() - startTimeNs;
- Logging.d(TAG, "ID: " + id + ". Type: " + rendererType +
+ Log.d(TAG, "ID: " + id + ". Type: " + rendererType +
". Frames received: " + framesReceived +
". Dropped: " + framesDropped + ". Rendered: " + framesRendered);
if (framesReceived > 0 && framesRendered > 0) {
- Logging.d(TAG, "Duration: " + (int)(timeSinceFirstFrameNs / 1e6) +
+ Log.d(TAG, "Duration: " + (int)(timeSinceFirstFrameNs / 1e6) +
" ms. FPS: " + (float)framesRendered * 1e9 / timeSinceFirstFrameNs);
- Logging.d(TAG, "Draw time: " +
+ Log.d(TAG, "Draw time: " +
(int) (drawTimeNs / (1000 * framesRendered)) + " us. Copy time: " +
(int) (copyTimeNs / (1000 * framesReceived)) + " us");
}
@@ -301,7 +300,7 @@ public class VideoRendererGui implements GLSurfaceView.Renderer {
if (screenWidth == this.screenWidth && screenHeight == this.screenHeight) {
return;
}
- Logging.d(TAG, "ID: " + id + ". YuvImageRenderer.setScreenSize: " +
+ Log.d(TAG, "ID: " + id + ". YuvImageRenderer.setScreenSize: " +
screenWidth + " x " + screenHeight);
this.screenWidth = screenWidth;
this.screenHeight = screenHeight;
@@ -318,7 +317,7 @@ public class VideoRendererGui implements GLSurfaceView.Renderer {
&& mirror == this.mirror) {
return;
}
- Logging.d(TAG, "ID: " + id + ". YuvImageRenderer.setPosition: (" + x + ", " + y +
+ Log.d(TAG, "ID: " + id + ". YuvImageRenderer.setPosition: (" + x + ", " + y +
") " + width + " x " + height + ". Scaling: " + scalingType +
". Mirror: " + mirror);
this.layoutInPercentage.set(layoutInPercentage);
@@ -334,20 +333,20 @@ public class VideoRendererGui implements GLSurfaceView.Renderer {
return;
}
if (rendererEvents != null) {
- Logging.d(TAG, "ID: " + id +
+ Log.d(TAG, "ID: " + id +
". Reporting frame resolution changed to " + videoWidth + " x " + videoHeight);
rendererEvents.onFrameResolutionChanged(videoWidth, videoHeight, rotation);
}
synchronized (updateLayoutLock) {
- Logging.d(TAG, "ID: " + id + ". YuvImageRenderer.setSize: " +
+ Log.d(TAG, "ID: " + id + ". YuvImageRenderer.setSize: " +
videoWidth + " x " + videoHeight + " rotation " + rotation);
this.videoWidth = videoWidth;
this.videoHeight = videoHeight;
rotationDegree = rotation;
updateLayoutProperties = true;
- Logging.d(TAG, " YuvImageRenderer.setSize done.");
+ Log.d(TAG, " YuvImageRenderer.setSize done.");
}
}
@@ -359,7 +358,7 @@ public class VideoRendererGui implements GLSurfaceView.Renderer {
return;
}
if (!seenFrame && rendererEvents != null) {
- Logging.d(TAG, "ID: " + id + ". Reporting first rendered frame.");
+ Log.d(TAG, "ID: " + id + ". Reporting first rendered frame.");
rendererEvents.onFirstFrameRendered();
}
framesReceived++;
@@ -369,7 +368,7 @@ public class VideoRendererGui implements GLSurfaceView.Renderer {
if (frame.yuvStrides[0] < frame.width ||
frame.yuvStrides[1] < frame.width / 2 ||
frame.yuvStrides[2] < frame.width / 2) {
- Logging.e(TAG, "Incorrect strides " + frame.yuvStrides[0] + ", " +
+ Log.e(TAG, "Incorrect strides " + frame.yuvStrides[0] + ", " +
frame.yuvStrides[1] + ", " + frame.yuvStrides[2]);
VideoRenderer.renderFrameDone(frame);
return;
@@ -395,7 +394,7 @@ public class VideoRendererGui implements GLSurfaceView.Renderer {
/** Passes GLSurfaceView to video renderer. */
public static synchronized void setView(GLSurfaceView surface,
Runnable eglContextReadyCallback) {
- Logging.d(TAG, "VideoRendererGui.setView");
+ Log.d(TAG, "VideoRendererGui.setView");
instance = new VideoRendererGui(surface);
eglContextReady = eglContextReadyCallback;
}
@@ -409,7 +408,7 @@ public class VideoRendererGui implements GLSurfaceView.Renderer {
if (instance == null){
return;
}
- Logging.d(TAG, "VideoRendererGui.dispose");
+ Log.d(TAG, "VideoRendererGui.dispose");
synchronized (instance.yuvImageRenderers) {
for (YuvImageRenderer yuvImageRenderer : instance.yuvImageRenderers) {
yuvImageRenderer.release();
@@ -490,7 +489,7 @@ public class VideoRendererGui implements GLSurfaceView.Renderer {
public static synchronized void update(
VideoRenderer.Callbacks renderer, int x, int y, int width, int height,
RendererCommon.ScalingType scalingType, boolean mirror) {
- Logging.d(TAG, "VideoRendererGui.update");
+ Log.d(TAG, "VideoRendererGui.update");
if (instance == null) {
throw new RuntimeException(
"Attempt to update yuv renderer before setting GLSurfaceView");
@@ -506,7 +505,7 @@ public class VideoRendererGui implements GLSurfaceView.Renderer {
public static synchronized void setRendererEvents(
VideoRenderer.Callbacks renderer, RendererCommon.RendererEvents rendererEvents) {
- Logging.d(TAG, "VideoRendererGui.setRendererEvents");
+ Log.d(TAG, "VideoRendererGui.setRendererEvents");
if (instance == null) {
throw new RuntimeException(
"Attempt to set renderer events before setting GLSurfaceView");
@@ -521,7 +520,7 @@ public class VideoRendererGui implements GLSurfaceView.Renderer {
}
public static synchronized void remove(VideoRenderer.Callbacks renderer) {
- Logging.d(TAG, "VideoRendererGui.remove");
+ Log.d(TAG, "VideoRendererGui.remove");
if (instance == null) {
throw new RuntimeException(
"Attempt to remove yuv renderer before setting GLSurfaceView");
@@ -529,7 +528,7 @@ public class VideoRendererGui implements GLSurfaceView.Renderer {
synchronized (instance.yuvImageRenderers) {
final int index = instance.yuvImageRenderers.indexOf(renderer);
if (index == -1) {
- Logging.w(TAG, "Couldn't remove renderer (not present in current list)");
+ Log.w(TAG, "Couldn't remove renderer (not present in current list)");
} else {
instance.yuvImageRenderers.remove(index).release();
}
@@ -539,12 +538,12 @@ public class VideoRendererGui implements GLSurfaceView.Renderer {
@SuppressLint("NewApi")
@Override
public void onSurfaceCreated(GL10 unused, EGLConfig config) {
- Logging.d(TAG, "VideoRendererGui.onSurfaceCreated");
+ Log.d(TAG, "VideoRendererGui.onSurfaceCreated");
// Store render EGL context.
if (CURRENT_SDK_VERSION >= EGL14_SDK_VERSION) {
synchronized (VideoRendererGui.class) {
eglContext = EGL14.eglGetCurrentContext();
- Logging.d(TAG, "VideoRendererGui EGL Context: " + eglContext);
+ Log.d(TAG, "VideoRendererGui EGL Context: " + eglContext);
}
}
@@ -571,7 +570,7 @@ public class VideoRendererGui implements GLSurfaceView.Renderer {
@Override
public void onSurfaceChanged(GL10 unused, int width, int height) {
- Logging.d(TAG, "VideoRendererGui.onSurfaceChanged: " +
+ Log.d(TAG, "VideoRendererGui.onSurfaceChanged: " +
width + " x " + height + " ");
screenWidth = width;
screenHeight = height;
« no previous file with comments | « talk/app/webrtc/java/android/org/webrtc/VideoCapturerAndroid.java ('k') | talk/app/webrtc/java/src/org/webrtc/MediaCodecVideoDecoder.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698