Make MIDI renderer respect custom audio sink

This commit is contained in:
nift4 2025-02-22 21:18:14 +01:00 committed by Ian Baker
parent 3b38a7a43b
commit 5b97ad71f4
3 changed files with 17 additions and 4 deletions

View File

@ -16,12 +16,15 @@
package androidx.media3.decoder.midi; package androidx.media3.decoder.midi;
import android.content.Context; import android.content.Context;
import android.os.Handler;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.media3.common.C; import androidx.media3.common.C;
import androidx.media3.common.Format; import androidx.media3.common.Format;
import androidx.media3.common.MimeTypes; import androidx.media3.common.MimeTypes;
import androidx.media3.common.util.UnstableApi; import androidx.media3.common.util.UnstableApi;
import androidx.media3.decoder.CryptoConfig; import androidx.media3.decoder.CryptoConfig;
import androidx.media3.exoplayer.audio.AudioRendererEventListener;
import androidx.media3.exoplayer.audio.AudioSink;
import androidx.media3.exoplayer.audio.DecoderAudioRenderer; import androidx.media3.exoplayer.audio.DecoderAudioRenderer;
/** Decodes and renders MIDI audio. */ /** Decodes and renders MIDI audio. */
@ -31,7 +34,11 @@ public final class MidiRenderer extends DecoderAudioRenderer<MidiDecoder> {
private final Context context; private final Context context;
/** Creates the renderer instance. */ /** Creates the renderer instance. */
public MidiRenderer(Context context) { public MidiRenderer(Context context,
@Nullable Handler eventHandler,
@Nullable AudioRendererEventListener eventListener,
AudioSink audioSink) {
super(eventHandler, eventListener, audioSink);
this.context = context.getApplicationContext(); this.context = context.getApplicationContext();
} }

View File

@ -31,7 +31,7 @@
} }
-dontnote androidx.media3.decoder.midi.MidiRenderer -dontnote androidx.media3.decoder.midi.MidiRenderer
-keepclassmembers class androidx.media3.decoder.midi.MidiRenderer { -keepclassmembers class androidx.media3.decoder.midi.MidiRenderer {
<init>(android.content.Context); <init>(android.content.Context, android.os.Handler, androidx.media3.exoplayer.audio.AudioRendererEventListener, androidx.media3.exoplayer.audio.AudioSink);
} }
-dontnote androidx.media3.decoder.mpegh.MpeghAudioRenderer -dontnote androidx.media3.decoder.mpegh.MpeghAudioRenderer
-keepclassmembers class androidx.media3.decoder.mpegh.MpeghAudioRenderer { -keepclassmembers class androidx.media3.decoder.mpegh.MpeghAudioRenderer {

View File

@ -557,9 +557,15 @@ public class DefaultRenderersFactory implements RenderersFactory {
// Full class names used for constructor args so the LINT rule triggers if any of them move. // Full class names used for constructor args so the LINT rule triggers if any of them move.
// LINT.IfChange // LINT.IfChange
Class<?> clazz = Class.forName("androidx.media3.decoder.midi.MidiRenderer"); Class<?> clazz = Class.forName("androidx.media3.decoder.midi.MidiRenderer");
Constructor<?> constructor = clazz.getConstructor(Context.class); Constructor<?> constructor =
clazz.getConstructor(
Context.class,
android.os.Handler.class,
androidx.media3.exoplayer.audio.AudioRendererEventListener.class,
androidx.media3.exoplayer.audio.AudioSink.class);
// LINT.ThenChange(../../../../../../proguard-rules.txt) // LINT.ThenChange(../../../../../../proguard-rules.txt)
Renderer renderer = (Renderer) constructor.newInstance(context); Renderer renderer =
(Renderer) constructor.newInstance(context, eventHandler, eventListener, audioSink);
out.add(extensionRendererIndex++, renderer); out.add(extensionRendererIndex++, renderer);
Log.i(TAG, "Loaded MidiRenderer."); Log.i(TAG, "Loaded MidiRenderer.");
} catch (ClassNotFoundException e) { } catch (ClassNotFoundException e) {