From b25d6ef2495678d16cb6d9aeeee796ecc0af7805 Mon Sep 17 00:00:00 2001 From: shahddaghash Date: Mon, 13 Jan 2025 09:27:38 -0800 Subject: [PATCH] Rollback of https://github.com/androidx/media/commit/72a71e8b9c7fffd6455b60a1ab6269bd8717f1e0 PiperOrigin-RevId: 714997645 --- .../transformer/EditingMetricsCollector.java | 23 +++---------------- .../media3/transformer/FrameworkMuxer.java | 2 -- .../media3/transformer/InAppMuxer.java | 4 ---- .../media3/transformer/Transformer.java | 10 +------- 4 files changed, 4 insertions(+), 35 deletions(-) diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/EditingMetricsCollector.java b/libraries/transformer/src/main/java/androidx/media3/transformer/EditingMetricsCollector.java index 42e9b89818..ced33d76eb 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/EditingMetricsCollector.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/EditingMetricsCollector.java @@ -105,8 +105,6 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull; } private static final int SUCCESS_PROGRESS_PERCENTAGE = 100; - private final String exporterName; - @Nullable private final String muxerName; private @MonotonicNonNull EditingSession editingSession; private long startTimeMs; @@ -115,16 +113,9 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull; * *

A new instance must be created before starting a new export. * - *

Both {@code exporterName} and {@code muxerName} should follow the format - * ":". - * * @param context The {@link Context}. - * @param exporterName Java package name and version of the library or application implementing - * the editing operation. - * @param muxerName Java package name and version of the library or application that writes to the - * output file. */ - public EditingMetricsCollector(Context context, String exporterName, @Nullable String muxerName) { + public EditingMetricsCollector(Context context) { @Nullable MediaMetricsManager mediaMetricsManager = (MediaMetricsManager) context.getSystemService(Context.MEDIA_METRICS_SERVICE); @@ -132,8 +123,6 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull; editingSession = checkNotNull(mediaMetricsManager.createEditingSession()); startTimeMs = SystemClock.DEFAULT.elapsedRealtime(); } - this.exporterName = exporterName; - this.muxerName = muxerName; } /** @@ -212,14 +201,8 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull; private EditingEndedEvent.Builder createEditingEndedEventBuilder(int finalState) { long endTimeMs = SystemClock.DEFAULT.elapsedRealtime(); - EditingEndedEvent.Builder editingEndedEventBuilder = - new EditingEndedEvent.Builder(finalState) - .setTimeSinceCreatedMillis(endTimeMs - startTimeMs) - .setExporterName(exporterName); - if (muxerName != null) { - editingEndedEventBuilder.setMuxerName(muxerName); - } - return editingEndedEventBuilder; + return new EditingEndedEvent.Builder(finalState) + .setTimeSinceCreatedMillis(endTimeMs - startTimeMs); } private static List getMediaItemInfos( diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/FrameworkMuxer.java b/libraries/transformer/src/main/java/androidx/media3/transformer/FrameworkMuxer.java index f0acc5c0f7..34744a8c9c 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/FrameworkMuxer.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/FrameworkMuxer.java @@ -96,8 +96,6 @@ import java.util.Locale; } public static final String MUXER_STOPPING_FAILED_ERROR_MESSAGE = "Failed to stop the MediaMuxer"; - public static final String MUXER_NAME = - checkNotNull(MediaMuxer.class.getPackage()).getName() + ":" + SDK_INT; // MediaMuxer supported sample formats are documented in MediaMuxer.addTrack(MediaFormat). private static final ImmutableList SUPPORTED_VIDEO_SAMPLE_MIME_TYPES = diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/InAppMuxer.java b/libraries/transformer/src/main/java/androidx/media3/transformer/InAppMuxer.java index a87b3f1f43..ddfd1fc325 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/InAppMuxer.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/InAppMuxer.java @@ -22,7 +22,6 @@ import android.media.MediaCodec.BufferInfo; import androidx.annotation.Nullable; import androidx.media3.common.C; import androidx.media3.common.Format; -import androidx.media3.common.MediaLibraryInfo; import androidx.media3.common.Metadata; import androidx.media3.common.MimeTypes; import androidx.media3.common.util.Log; @@ -206,9 +205,6 @@ public final class InAppMuxer implements Muxer { } } - public static final String MUXER_NAME = - "androidx.media3.media3-muxer:" + MediaLibraryInfo.VERSION; - private static final String TAG = "InAppMuxer"; private static final int TRACK_ID_UNSET = -1; diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/Transformer.java b/libraries/transformer/src/main/java/androidx/media3/transformer/Transformer.java index f92499eca9..3d137d37b2 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/Transformer.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/Transformer.java @@ -1580,15 +1580,7 @@ public final class Transformer { } DebugTraceUtil.reset(); if (canCollectEditingMetrics()) { - String exporterName = - checkNotNull(this.getClass().getPackage()).getName() + ":" + MediaLibraryInfo.VERSION; - String muxerName = null; - if (muxerFactory instanceof InAppMuxer.Factory) { - muxerName = InAppMuxer.MUXER_NAME; - } else if (muxerFactory instanceof FrameworkMuxer.Factory) { - muxerName = FrameworkMuxer.MUXER_NAME; - } - editingMetricsCollector = new EditingMetricsCollector(context, exporterName, muxerName); + editingMetricsCollector = new EditingMetricsCollector(context); } transformerInternal = new TransformerInternal(