From 69f269238955c901cd524fee5a6164e89ee952f7 Mon Sep 17 00:00:00 2001 From: olly Date: Mon, 11 Oct 2021 13:16:11 +0100 Subject: [PATCH] Register modules with common PiperOrigin-RevId: 402267733 --- .../exoplayer2/ext/workmanager/WorkManagerScheduler.java | 5 +++++ .../java/com/google/android/exoplayer2/ExoPlayerImpl.java | 4 ++++ .../android/exoplayer2/extractor/DefaultExtractorInput.java | 5 +++++ .../google/android/exoplayer2/transformer/Transformer.java | 5 +++++ 4 files changed, 19 insertions(+) diff --git a/extensions/workmanager/src/main/java/com/google/android/exoplayer2/ext/workmanager/WorkManagerScheduler.java b/extensions/workmanager/src/main/java/com/google/android/exoplayer2/ext/workmanager/WorkManagerScheduler.java index ff9335ad84..1c593e5291 100644 --- a/extensions/workmanager/src/main/java/com/google/android/exoplayer2/ext/workmanager/WorkManagerScheduler.java +++ b/extensions/workmanager/src/main/java/com/google/android/exoplayer2/ext/workmanager/WorkManagerScheduler.java @@ -26,6 +26,7 @@ import androidx.work.OneTimeWorkRequest; import androidx.work.WorkManager; import androidx.work.Worker; import androidx.work.WorkerParameters; +import com.google.android.exoplayer2.ExoPlayerLibraryInfo; import com.google.android.exoplayer2.scheduler.Requirements; import com.google.android.exoplayer2.scheduler.Scheduler; import com.google.android.exoplayer2.util.Assertions; @@ -35,6 +36,10 @@ import com.google.android.exoplayer2.util.Util; /** A {@link Scheduler} that uses {@link WorkManager}. */ public final class WorkManagerScheduler implements Scheduler { + static { + ExoPlayerLibraryInfo.registerModule("goog.exo.workmanager"); + } + private static final String TAG = "WorkManagerScheduler"; private static final String KEY_SERVICE_ACTION = "service_action"; private static final String KEY_SERVICE_PACKAGE = "service_package"; diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java index fbf79d766c..bb66139cd1 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java @@ -63,6 +63,10 @@ import java.util.concurrent.CopyOnWriteArraySet; /** An {@link ExoPlayer} implementation. */ /* package */ final class ExoPlayerImpl extends BasePlayer { + static { + ExoPlayerLibraryInfo.registerModule("goog.exo.exoplayer"); + } + private static final String TAG = "ExoPlayerImpl"; /** diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/DefaultExtractorInput.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/DefaultExtractorInput.java index e04307bad7..b54131ce55 100644 --- a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/DefaultExtractorInput.java +++ b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/DefaultExtractorInput.java @@ -18,6 +18,7 @@ package com.google.android.exoplayer2.extractor; import static java.lang.Math.min; import com.google.android.exoplayer2.C; +import com.google.android.exoplayer2.ExoPlayerLibraryInfo; import com.google.android.exoplayer2.upstream.DataReader; import com.google.android.exoplayer2.util.Assertions; import com.google.android.exoplayer2.util.Util; @@ -29,6 +30,10 @@ import java.util.Arrays; /** An {@link ExtractorInput} that wraps a {@link DataReader}. */ public final class DefaultExtractorInput implements ExtractorInput { + static { + ExoPlayerLibraryInfo.registerModule("goog.exo.extractor"); + } + private static final int PEEK_MIN_FREE_SPACE_AFTER_RESIZE = 64 * 1024; private static final int PEEK_MAX_FREE_SPACE = 512 * 1024; private static final int SCRATCH_SPACE_SIZE = 4096; diff --git a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/Transformer.java b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/Transformer.java index 80c0a73846..370ff1e167 100644 --- a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/Transformer.java +++ b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/Transformer.java @@ -38,6 +38,7 @@ import androidx.annotation.VisibleForTesting; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.DefaultLoadControl; import com.google.android.exoplayer2.ExoPlayer; +import com.google.android.exoplayer2.ExoPlayerLibraryInfo; import com.google.android.exoplayer2.MediaItem; import com.google.android.exoplayer2.PlaybackException; import com.google.android.exoplayer2.Player; @@ -83,6 +84,10 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull; @RequiresApi(18) public final class Transformer { + static { + ExoPlayerLibraryInfo.registerModule("goog.exo.transformer"); + } + /** A builder for {@link Transformer} instances. */ public static final class Builder {