chore: Remove the custom logs from release build. (#54)

* chore: use exo's Log instead of L and set the default Log.logLevel to waning.
DiceTechnology · Jul 19, 2022 · ffdc7be · ffdc7be
1 parent 77c97af
commit ffdc7be
Showing 8 changed files with 28 additions and 16 deletions.
diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/SampleChooserActivity.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/SampleChooserActivity.java
@@ -90,6 +90,7 @@ public void onCreate(Bundle savedInstanceState) {
 
     sampleListView.setAdapter(sampleAdapter);
     sampleListView.setOnChildClickListener(this);
+    Log.setLogLevel(Log.LOG_LEVEL_ALL);
 
     Intent intent = getIntent();
     String dataUri = intent.getDataString();

diff --git a/library/common/src/main/java/com/google/android/exoplayer2/util/Log.java b/library/common/src/main/java/com/google/android/exoplayer2/util/Log.java
@@ -51,7 +51,7 @@ public final class Log {
   /** Log level to disable all logging. */
   public static final int LOG_LEVEL_OFF = Integer.MAX_VALUE;
 
-  private static int logLevel = LOG_LEVEL_ALL;
+  private static int logLevel = LOG_LEVEL_WARNING;
   private static boolean logStackTraces = true;
 
   private Log() {}
@@ -81,6 +81,14 @@ public static void setLogStackTraces(boolean logStackTraces) {
     Log.logStackTraces = logStackTraces;
   }
 
+  public static boolean isDebugEnabled() {
+    return logLevel == LOG_LEVEL_ALL;
+  }
+
+  public static boolean isInfoEnabled() {
+    return logLevel <= LOG_LEVEL_INFO;
+  }
+
   /** @see android.util.Log#d(String, String) */
   @Pure
   public static void d(@Size(max = 23) String tag, String message) {

diff --git a/...ary/core/src/main/java/com/google/android/exoplayer2/DefaultLivePlaybackSpeedControl.java b/...ary/core/src/main/java/com/google/android/exoplayer2/DefaultLivePlaybackSpeedControl.java
@@ -446,7 +446,7 @@ private void updateSmoothedMinPossibleLiveOffsetUs(long liveOffsetUs, long buffe
               minPossibleLiveOffsetDeviationUs,
               minPossibleLiveOffsetSmoothingFactor);
     }
-    if (DEBUG_DETAIL) {
+    if (DEBUG_DETAIL && Log.isDebugEnabled()) {
       StringBuilder builder = new StringBuilder(1024);
       builder.append("update speed: smooth [current ").append(WebUtil.us2s(liveOffsetUs));
       builder.append(", ").append(WebUtil.us2s(bufferedDurationUs));

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
@@ -951,7 +951,7 @@ && shouldUseLivePlaybackSpeedControl(playbackInfo.timeline, playbackInfo.periodI
   }
 
   private void debugSpeedControl(float oldSpeed, float newSpeed) {
-    if (!DebugUtil.debug_lowlatency) {
+    if (!DebugUtil.debug_lowlatency || !Log.isDebugEnabled()) {
       return;
     }
 

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSessionManager.java b/library/core/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSessionManager.java
@@ -544,13 +544,16 @@ private DrmSession acquireSession(
     if (offlineLicenseKeySetId == null) {
       schemeDatas = getSchemeDatas(checkNotNull(format.drmInitData), uuid, false);
       if (schemeDatas.isEmpty()) {
-        int sz = format.drmInitData.schemeDataCount;
-        String info = "missing scheme data, drmInitData size " + sz;
-        for (int i = 0; i < sz; i++) {
-          SchemeData schemeData = format.drmInitData.get(i);
-          info += (schemeData == null ? ", [empty" : ", [" + schemeData.data.length) + ": " + schemeData.uuid.toString() + "]";
+        if (Log.isDebugEnabled()) {
+          int sz = format.drmInitData.schemeDataCount;
+          String info = "missing scheme data, drmInitData size " + sz;
+          for (int i = 0; i < sz; i++) {
+            SchemeData schemeData = format.drmInitData.get(i);
+            info += (schemeData == null ? ", [empty" : ", [" + schemeData.data.length) + ": "
+                + schemeData.uuid.toString() + "]";
+          }
+          Log.d(WebUtil.DEBUG, info);
         }
-        Log.d(WebUtil.DEBUG, info);
         final MissingSchemeDataException error = new MissingSchemeDataException(uuid);
         Log.e(TAG, "DRM error", error);
         if (eventDispatcher != null) {

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/endeavor/LimitedSeekRange.java b/library/core/src/main/java/com/google/android/exoplayer2/endeavor/LimitedSeekRange.java
@@ -243,7 +243,7 @@ public String toString() {
         "LimitedSeekRange{startTime='%tT', factStartTime='%tT', duration=%.1fhr, timestampOffset=%.1fhr, seekToStart=%b, useAsLive=%b, playbackEnded=%b}",
         new Date(startTimeMs),
         new Date(factStartTimeMs),
-        useAsLive ? 24f : getDurationMs() / 3600_000f,
+        useAsLive ? 24f : (endTimeMs - startTimeMs) / 3600_000f,
         timestampOffsetMs / 3600_000f,
         seekToStart,
         useAsLive,

diff --git a/...re/src/main/java/com/google/android/exoplayer2/trackselection/AdaptiveTrackSelection.java b/...re/src/main/java/com/google/android/exoplayer2/trackselection/AdaptiveTrackSelection.java
@@ -547,10 +547,10 @@ public void setTrackCollector(TrackCollector trackCollector) {
         }
         Log.d(WebUtil.DEBUG,
             String.format("Initial video selection (%d), selected format [%d, %s] %s",
-            tracks.length,
-            videoSelected.bitrate,
-            TrackCollector.getAudioGroupId(videoSelected),
-            (index == C.INDEX_UNSET ? "not found!!!" : "used")));
+                tracks.length,
+                videoSelected.bitrate,
+                TrackCollector.getAudioGroupId(videoSelected),
+                (index == C.INDEX_UNSET ? "not found!!!" : "used")));
       }
       // Apply the bandwidth constraint.
       if (index == C.INDEX_UNSET) {

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/EventLogger.java b/library/core/src/main/java/com/google/android/exoplayer2/util/EventLogger.java
@@ -497,7 +497,7 @@ public void onLoadCompleted(
 
     String loadUri = (loadEventInfo != null && loadEventInfo.uri != null ? loadEventInfo.uri.toString() : null);
     if (loadUri != null) {
-      android.util.Log.d("====", String.format("loadCompleted [%.3f, %.3f kb, %.3f s], play %.3f s, buff %.3f s\n%s",
+      Log.d(WebUtil.DEBUG, String.format("loadCompleted [%.3f, %.3f kb, %.3f s], play %.3f s, buff %.3f s\n%s",
           System.currentTimeMillis() / 1000f,
           loadEventInfo.bytesLoaded / 1000f,
           loadEventInfo.loadDurationMs / 1000f,
@@ -512,7 +512,7 @@ public void onLoadCompleted(
   @Override
   public void onBandwidthEstimate(
       EventTime eventTime, int totalLoadTimeMs, long totalBytesLoaded, long bitrateEstimate) {
-    // Log.d("====", "onBandwidthEstimate [" + totalLoadTimeMs + " ms, " + (totalBytesLoaded / 1000f) + "], " + (bitrateEstimate / 1000f));
+    // Log.d(WebUtil.DEBUG, "onBandwidthEstimate [" + totalLoadTimeMs + " ms, " + (totalBytesLoaded / 1000f) + "], " + (bitrateEstimate / 1000f));
     // Do nothing.
   }