Partial revert of r9936.

talk/app/webrtc/java/android/org/webrtc/SurfaceViewRenderer.java

 /*
  * libjingle
  * Copyright 2015 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  *  1. Redistributions of source code must retain the above copyright notice,
  *     this list of conditions and the following disclaimer.
  *  2. Redistributions in binary form must reproduce the above copyright notice,
  *     this list of conditions and the following disclaimer in the documentation
  *     and/or other materials provided with the distribution.
  *  3. The name of the author may not be used to endorse or promote products
  *     derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
  * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
  * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
  * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
  * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 package org.webrtc;
 
-import java.nio.ByteBuffer;
-
 import android.content.Context;
 import android.graphics.Point;
 import android.graphics.SurfaceTexture;
 import android.opengl.EGLContext;
 import android.opengl.GLES20;
 import android.opengl.Matrix;
 import android.os.Handler;
 import android.os.HandlerThread;
 import android.util.AttributeSet;
+import android.util.Log;
 import android.view.SurfaceHolder;
 import android.view.SurfaceView;
 
-import org.webrtc.Logging;
-
 /**
  * Implements org.webrtc.VideoRenderer.Callbacks by displaying the video stream on a SurfaceView.
  * renderFrame() is asynchronous to avoid blocking the calling thread.
  * This class is thread safe and handles access from potentially four different threads:
  * Interaction from the main app in init, release, setMirror, and setScalingtype.
  * Interaction from C++ webrtc::VideoRendererInterface in renderFrame and canApplyRotation.
  * Interaction from the Activity lifecycle in surfaceCreated, surfaceChanged, and surfaceDestroyed.
  * Interaction with the layout framework in onMeasure and onSizeChanged.
  */
 public class SurfaceViewRenderer extends SurfaceView
@@ skipping 84 matching lines @@
   }
 
   /**
    * Initialize this class, sharing resources with |sharedContext|.
    */
   public void init(
       EGLContext sharedContext, RendererCommon.RendererEvents rendererEvents) {
     if (renderThreadHandler != null) {
       throw new IllegalStateException("Already initialized");
     }
-    Logging.d(TAG, "Initializing");
+    Log.d(TAG, "Initializing");
     this.rendererEvents = rendererEvents;
     renderThread = new HandlerThread(TAG);
     renderThread.start();
     renderThreadHandler = new Handler(renderThread.getLooper());
     eglBase = new EglBase(sharedContext, EglBase.ConfigType.PLAIN);
     drawer = new GlRectDrawer();
     getHolder().addCallback(this);
   }
 
   /**
    * Release all resources. This needs to be done manually, otherwise the resources are leaked. You
    * should call this before the Activity is destroyed, while the EGLContext is still valid.
    */
   public void release() {
     synchronized (threadLock) {
       if (renderThreadHandler == null) {
-        Logging.d(TAG, "Already released");
+        Log.d(TAG, "Already released");
         return;
       }
       // Release EGL and GL resources on render thread.
       // TODO(magjed): This might not be necessary - all OpenGL resources are automatically deleted
       // when the EGL context is lost. It might be dangerous to delete them manually in
       // Activity.onDestroy().
       renderThreadHandler.post(new Runnable() {
         @Override public void run() {
           drawer.release();
           drawer = null;
@@ skipping 39 matching lines @@
   }
 
   // VideoRenderer.Callbacks interface.
   @Override
   public void renderFrame(VideoRenderer.I420Frame frame) {
     synchronized (statisticsLock) {
       ++framesReceived;
     }
     synchronized (threadLock) {
       if (renderThreadHandler == null) {
-        Logging.d(TAG, "Dropping frame - SurfaceViewRenderer not initialized or already released.");
+        Log.d(TAG, "Dropping frame - SurfaceViewRenderer not initialized or already released.");
       } else {
         synchronized (frameLock) {
           if (pendingFrame == null) {
             updateFrameDimensionsAndReportEvents(frame);
             pendingFrame = frame;
             renderThreadHandler.post(renderFrameRunnable);
             return;
           }
         }
       }
@@ skipping 39 matching lines @@
       layoutWidth = right - left;
       layoutHeight = bottom - top;
     }
     // Might have a pending frame waiting for a layout of correct size.
     runOnRenderThread(renderFrameRunnable);
   }
 
   // SurfaceHolder.Callback interface.
   @Override
   public void surfaceCreated(final SurfaceHolder holder) {
-    Logging.d(TAG, "Surface created");
+    Log.d(TAG, "Surface created");
     runOnRenderThread(new Runnable() {
       @Override public void run() {
         eglBase.createSurface(holder.getSurface());
         eglBase.makeCurrent();
         // Necessary for YUV frames with odd width.
         GLES20.glPixelStorei(GLES20.GL_UNPACK_ALIGNMENT, 1);
       }
     });
   }
 
   @Override
   public void surfaceDestroyed(SurfaceHolder holder) {
-    Logging.d(TAG, "Surface destroyed");
+    Log.d(TAG, "Surface destroyed");
     synchronized (layoutLock) {
       surfaceWidth = 0;
       surfaceHeight = 0;
     }
     runOnRenderThread(new Runnable() {
       @Override public void run() {
         eglBase.releaseSurface();
       }
     });
   }
 
   @Override
   public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) {
-    Logging.d(TAG, "Surface changed: " + width + "x" + height);
+    Log.d(TAG, "Surface changed: " + width + "x" + height);
     synchronized (layoutLock) {
       surfaceWidth = width;
       surfaceHeight = height;
     }
     // Might have a pending frame waiting for a surface of correct size.
     runOnRenderThread(renderFrameRunnable);
   }
 
   /**
    * Private helper function to post tasks safely.
    */
   private void runOnRenderThread(Runnable runnable) {
     synchronized (threadLock) {
       if (renderThreadHandler != null) {
         renderThreadHandler.post(runnable);
       }
     }
   }
 
   /**
    * Requests new layout if necessary. Returns true if layout and surface size are consistent.
    */
   private boolean checkConsistentLayout() {
     synchronized (layoutLock) {
       final Point desiredLayoutSize = getDesiredLayoutSize();
       if (desiredLayoutSize.x != layoutWidth || desiredLayoutSize.y != layoutHeight) {
-        Logging.d(TAG, "Requesting new layout with size: "
+        Log.d(TAG, "Requesting new layout with size: "
             + desiredLayoutSize.x + "x" + desiredLayoutSize.y);
         // Request layout update on UI thread.
         post(new Runnable() {
           @Override public void run() {
             requestLayout();
           }
         });
         return false;
       }
       // Wait for requestLayout() to propagate through this sequence before returning true:
       // requestLayout() -> onMeasure() -> onLayout() -> surfaceChanged().
       return surfaceWidth == layoutWidth && surfaceHeight == layoutHeight;
     }
   }
 
   /**
    * Renders and releases |pendingFrame|.
    */
   private void renderFrameOnRenderThread() {
     if (eglBase == null || !eglBase.hasSurface()) {
-      Logging.d(TAG, "No surface to draw on");
+      Log.d(TAG, "No surface to draw on");
       return;
     }
     if (!checkConsistentLayout()) {
       // Output intermediate black frames while the layout is updated.
       GLES20.glClear(GLES20.GL_COLOR_BUFFER_BIT);
       eglBase.swapBuffers();
       return;
     }
     // After a surface size change, the EGLSurface might still have a buffer of the old size in the
     // pipeline. Querying the EGLSurface will show if the underlying buffer dimensions haven't yet
@@ skipping 72 matching lines @@
   }
 
   // Update frame dimensions and report any changes to |rendererEvents|.
   private void updateFrameDimensionsAndReportEvents(VideoRenderer.I420Frame frame) {
     synchronized (layoutLock) {
       if (frameWidth != frame.width || frameHeight != frame.height
           || frameRotation != frame.rotationDegree) {
         if (rendererEvents != null) {
           final String id = getResources().getResourceEntryName(getId());
           if (frameWidth == 0 || frameHeight == 0) {
-            Logging.d(TAG, "ID: " + id + ". Reporting first rendered frame.");
+            Log.d(TAG, "ID: " + id + ". Reporting first rendered frame.");
             rendererEvents.onFirstFrameRendered();
           }
-          Logging.d(TAG, "ID: " + id + ". Reporting frame resolution changed to "
+          Log.d(TAG, "ID: " + id + ". Reporting frame resolution changed to "
               + frame.width + "x" + frame.height + " with rotation " + frame.rotationDegree);
           rendererEvents.onFrameResolutionChanged(frame.width, frame.height, frame.rotationDegree);
         }
         frameWidth = frame.width;
         frameHeight = frame.height;
         frameRotation = frame.rotationDegree;
       }
     }
   }
 
   private void logStatistics() {
     synchronized (statisticsLock) {
-      Logging.d(TAG, "ID: " + getResources().getResourceEntryName(getId()) + ". Frames received: "
+      Log.d(TAG, "ID: " + getResources().getResourceEntryName(getId()) + ". Frames received: "
           + framesReceived + ". Dropped: " + framesDropped + ". Rendered: " + framesRendered);
       if (framesReceived > 0 && framesRendered > 0) {
         final long timeSinceFirstFrameNs = System.nanoTime() - firstFrameTimeNs;
-        Logging.d(TAG, "Duration: " + (int) (timeSinceFirstFrameNs / 1e6) +
+        Log.d(TAG, "Duration: " + (int) (timeSinceFirstFrameNs / 1e6) +
             " ms. FPS: " + (float) framesRendered * 1e9 / timeSinceFirstFrameNs);
-        Logging.d(TAG, "Average render time: "
+        Log.d(TAG, "Average render time: "
             + (int) (renderTimeNs / (1000 * framesRendered)) + " us.");
       }
     }
   }
 }