commit 6de33e1ca7b39e9c330bac8fcedd05606d003490
author Lajos Molnar <lajos@google.com> Mon Apr 29 16:44:41 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Apr 29 16:44:41 2019 +0000
tree a1ec7f72d5ae64456f0efcfffd9270bb37dac94d
parent 87dbdeab7be5e7e82c6928987e684cc509c0d3bb
parent 27ff6911e8798b30000178577b5ec12328cf502f

Merge "media: MediaCodecInfo: remove PerformancePoint logs" into qt-dev

media/java/android/media/MediaCodecInfo.java

diff --git a/media/java/android/media/MediaCodecInfo.java b/media/java/android/media/MediaCodecInfo.java
index 35c691d..a56e7f5 100644
--- a/media/java/android/media/MediaCodecInfo.java
+++ b/media/java/android/media/MediaCodecInfo.java
@@ -1709,7 +1709,6 @@
                                 * mBlockSize.getHeight());
                 mMaxFrameRate = Math.max(1, Math.max(frameRate, maxFrameRate));
                 mMaxMacroBlockRate = Math.max(1, frameRate) * getMaxMacroBlocks();
-                Log.i("PP", "Created " + this);
             }
 
             /**
@@ -1730,14 +1729,6 @@
                         new Size(Math.max(newBlockSize.getWidth(), pp.mBlockSize.getWidth() * 16),
                                  Math.max(newBlockSize.getHeight(), pp.mBlockSize.getHeight() * 16))
                 );
-                /*
-                // these are guaranteed not to overflow as size * blockSize is decimated by 16
-                width = align(pp.width * pp.blockSize.getWidth(), blockSize.getWidth());
-                height = align(pp.height * pp.blockSize.getHeight(), blockSize.getHeight());
-                frameRate = pp.frameRate;
-                macroBlockRate = align(pp.macroBlockRate, blockSize.getWidth * blockSize.getHeight());
-                */
-                Log.i("PP", " from " + pp + " and " + newBlockSize);
             }
 
             /**