diff --git a/app/build.gradle b/app/build.gradle index 5b975f7fb..25f19d1ac 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -6,6 +6,7 @@ plugins { id "kotlin-parcelize" id "dagger.hilt.android.plugin" id "kotlin-kapt" + id 'org.jetbrains.kotlin.android' } android { @@ -81,6 +82,7 @@ dependencies { implementation "androidx.recyclerview:recyclerview:1.2.1" implementation "androidx.constraintlayout:constraintlayout:2.1.4" implementation "androidx.viewpager2:viewpager2:1.1.0-beta01" + implementation 'androidx.core:core-ktx:+' // Lifecycle def lifecycle_version = "2.5.1" diff --git a/app/src/main/java/org/oxycblt/auxio/image/extractor/Covers.kt b/app/src/main/java/org/oxycblt/auxio/image/extractor/Covers.kt index 7d1aeb9d1..16b14f1a1 100644 --- a/app/src/main/java/org/oxycblt/auxio/image/extractor/Covers.kt +++ b/app/src/main/java/org/oxycblt/auxio/image/extractor/Covers.kt @@ -24,6 +24,7 @@ import com.google.android.exoplayer2.MediaMetadata import com.google.android.exoplayer2.MetadataRetriever import com.google.android.exoplayer2.metadata.flac.PictureFrame import com.google.android.exoplayer2.metadata.id3.ApicFrame +import com.google.android.exoplayer2.source.DefaultMediaSourceFactory import java.io.ByteArrayInputStream import java.io.InputStream import kotlinx.coroutines.Dispatchers @@ -31,6 +32,7 @@ import kotlinx.coroutines.withContext import org.oxycblt.auxio.image.CoverMode import org.oxycblt.auxio.image.ImageSettings import org.oxycblt.auxio.music.Album +import org.oxycblt.auxio.music.AudioOnlyExtractors import org.oxycblt.auxio.util.logD import org.oxycblt.auxio.util.logW @@ -103,7 +105,9 @@ object Covers { */ private suspend fun fetchExoplayerCover(context: Context, album: Album): InputStream? { val uri = album.songs[0].uri - val future = MetadataRetriever.retrieveMetadata(context, MediaItem.fromUri(uri)) + val future = + MetadataRetriever.retrieveMetadata( + DefaultMediaSourceFactory(context, AudioOnlyExtractors), MediaItem.fromUri(uri)) // future.get is a blocking call that makes us spin until the future is done. // This is bad for a co-routine, as it prevents cancellation and by extension diff --git a/app/src/main/java/org/oxycblt/auxio/music/AudioOnlyExtractors.kt b/app/src/main/java/org/oxycblt/auxio/music/AudioOnlyExtractors.kt new file mode 100644 index 000000000..75eb1bdd1 --- /dev/null +++ b/app/src/main/java/org/oxycblt/auxio/music/AudioOnlyExtractors.kt @@ -0,0 +1,44 @@ +/* + * Copyright (c) 2023 Auxio Project + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package org.oxycblt.auxio.music + +import com.google.android.exoplayer2.extractor.ExtractorsFactory +import com.google.android.exoplayer2.extractor.flac.FlacExtractor +import com.google.android.exoplayer2.extractor.mkv.MatroskaExtractor +import com.google.android.exoplayer2.extractor.mp3.Mp3Extractor +import com.google.android.exoplayer2.extractor.mp4.Mp4Extractor +import com.google.android.exoplayer2.extractor.ogg.OggExtractor +import com.google.android.exoplayer2.extractor.ts.AdtsExtractor +import com.google.android.exoplayer2.extractor.wav.WavExtractor + +/** + * A [ExtractorsFactory] that only provides audio containers to save APK space. + * @author Alexander Capehart (OxygenCobalt) + */ +object AudioOnlyExtractors : ExtractorsFactory { + override fun createExtractors() = + arrayOf( + FlacExtractor(), + WavExtractor(), + Mp4Extractor(), + OggExtractor(), + MatroskaExtractor(), + // Enable constant bitrate seeking so that certain MP3s/AACs are seekable + AdtsExtractor(AdtsExtractor.FLAG_ENABLE_CONSTANT_BITRATE_SEEKING), + Mp3Extractor(Mp3Extractor.FLAG_ENABLE_CONSTANT_BITRATE_SEEKING)) +} diff --git a/app/src/main/java/org/oxycblt/auxio/music/metadata/TagExtractor.kt b/app/src/main/java/org/oxycblt/auxio/music/metadata/TagExtractor.kt index 53ebf6999..581ff63c7 100644 --- a/app/src/main/java/org/oxycblt/auxio/music/metadata/TagExtractor.kt +++ b/app/src/main/java/org/oxycblt/auxio/music/metadata/TagExtractor.kt @@ -21,10 +21,12 @@ import android.content.Context import androidx.core.text.isDigitsOnly import com.google.android.exoplayer2.MediaItem import com.google.android.exoplayer2.MetadataRetriever +import com.google.android.exoplayer2.source.DefaultMediaSourceFactory import dagger.hilt.android.qualifiers.ApplicationContext import javax.inject.Inject import kotlinx.coroutines.channels.Channel import kotlinx.coroutines.yield +import org.oxycblt.auxio.music.AudioOnlyExtractors import org.oxycblt.auxio.music.model.RawSong import org.oxycblt.auxio.music.storage.toAudioUri import org.oxycblt.auxio.util.logD @@ -113,7 +115,7 @@ private class Task(context: Context, private val rawSong: RawSong) { // listener is used, instead crashing the app entirely. private val future = MetadataRetriever.retrieveMetadata( - context, + DefaultMediaSourceFactory(context, AudioOnlyExtractors), MediaItem.fromUri( requireNotNull(rawSong.mediaStoreId) { "Invalid raw: No id" }.toAudioUri())) diff --git a/app/src/main/java/org/oxycblt/auxio/playback/system/PlaybackService.kt b/app/src/main/java/org/oxycblt/auxio/playback/system/PlaybackService.kt index a9a8f934b..aa4497534 100644 --- a/app/src/main/java/org/oxycblt/auxio/playback/system/PlaybackService.kt +++ b/app/src/main/java/org/oxycblt/auxio/playback/system/PlaybackService.kt @@ -35,14 +35,6 @@ import com.google.android.exoplayer2.audio.AudioAttributes import com.google.android.exoplayer2.audio.AudioCapabilities import com.google.android.exoplayer2.audio.MediaCodecAudioRenderer import com.google.android.exoplayer2.ext.ffmpeg.FfmpegAudioRenderer -import com.google.android.exoplayer2.extractor.ExtractorsFactory -import com.google.android.exoplayer2.extractor.flac.FlacExtractor -import com.google.android.exoplayer2.extractor.mkv.MatroskaExtractor -import com.google.android.exoplayer2.extractor.mp3.Mp3Extractor -import com.google.android.exoplayer2.extractor.mp4.Mp4Extractor -import com.google.android.exoplayer2.extractor.ogg.OggExtractor -import com.google.android.exoplayer2.extractor.ts.AdtsExtractor -import com.google.android.exoplayer2.extractor.wav.WavExtractor import com.google.android.exoplayer2.mediacodec.MediaCodecSelector import com.google.android.exoplayer2.source.DefaultMediaSourceFactory import dagger.hilt.android.AndroidEntryPoint @@ -52,6 +44,7 @@ import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Job import kotlinx.coroutines.launch import org.oxycblt.auxio.BuildConfig +import org.oxycblt.auxio.music.AudioOnlyExtractors import org.oxycblt.auxio.music.MusicRepository import org.oxycblt.auxio.music.MusicSettings import org.oxycblt.auxio.music.Song @@ -125,17 +118,6 @@ class PlaybackService : // Define our own extractors so we can exclude non-audio parsers. // Ordering is derived from the DefaultExtractorsFactory's optimized ordering: // https://docs.google.com/document/d/1w2mKaWMxfz2Ei8-LdxqbPs1VLe_oudB-eryXXw9OvQQ. - val extractorsFactory = ExtractorsFactory { - arrayOf( - FlacExtractor(), - WavExtractor(), - Mp4Extractor(), - OggExtractor(), - MatroskaExtractor(), - // Enable constant bitrate seeking so that certain MP3s/AACs are seekable - AdtsExtractor(AdtsExtractor.FLAG_ENABLE_CONSTANT_BITRATE_SEEKING), - Mp3Extractor(Mp3Extractor.FLAG_ENABLE_CONSTANT_BITRATE_SEEKING)) - } // Since Auxio is a music player, only specify an audio renderer to save // battery/apk size/cache size val audioRenderer = RenderersFactory { handler, _, audioListener, _, _ -> @@ -152,7 +134,7 @@ class PlaybackService : player = ExoPlayer.Builder(this, audioRenderer) - .setMediaSourceFactory(DefaultMediaSourceFactory(this, extractorsFactory)) + .setMediaSourceFactory(DefaultMediaSourceFactory(this, AudioOnlyExtractors)) // Enable automatic WakeLock support .setWakeMode(C.WAKE_MODE_LOCAL) .setAudioAttributes( diff --git a/build.gradle b/build.gradle index eb1cf1826..b47468ebe 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ buildscript { ext { - kotlin_version = '1.7.21' + kotlin_version = '1.8.0' navigation_version = "2.5.3" hilt_version = '2.45' }