A patch to add support for covers stored in the media files ID3Tag. (#796)

* A patch to add support for covers stored in the media files IDTag.

* implement some suggested changes

* implement review comments
This commit is contained in:
Ub1Catcrush authored and Adrian Ulrich committed 2018-07-21 17:53:20 +02:00
1 parent 4e3c440f80
commit 317641bc30
6 files changed
+29

No files matched your search

@@ -27,6 +27,7 @@ import android.database.sqlite.SQLiteOpenHelper;
import android.graphics.Bitmap;
import android.graphics.Bitmap.CompressFormat;
import android.graphics.BitmapFactory;
import android.media.MediaMetadataRetriever;
import android.net.Uri;
import android.os.Environment;
import android.util.Log;
@@ -66,6 +67,10 @@ public class CoverCache {
* Use vanilla musics SHADOW cover load mechanism
*/
public static final int COVER_MODE_SHADOW = 0x4;
/**
* Use vanilla musics INLINE cover load mechanism
*/
public static final int COVER_MODE_INLINE = 0x8;
/**
* Shared on-disk cache class
*/
@@ -463,6 +468,18 @@ public class CoverCache {
}
}
if (inputStream == null && (CoverCache.mCoverLoadMode & CoverCache.COVER_MODE_INLINE) != 0) {
MediaMetadataRetriever mmr = new MediaMetadataRetriever();
mmr.setDataSource(song.path);
byte[] data = mmr.getEmbeddedPicture();
if (data != null) {
sampleInputStream = new ByteArrayInputStream(data);
inputStream = new ByteArrayInputStream(data);
}
mmr.release();
}
if (inputStream != null) {
BitmapFactory.Options bopts = new BitmapFactory.Options();
bopts.inPreferredConfig = Bitmap.Config.RGB_565;
@@ -471,6 +471,7 @@ public final class PlaybackService extends Service
CoverCache.mCoverLoadMode = settings.getBoolean(PrefKeys.COVERLOADER_ANDROID, PrefDefaults.COVERLOADER_ANDROID) ? CoverCache.mCoverLoadMode | CoverCache.COVER_MODE_ANDROID : CoverCache.mCoverLoadMode & ~(CoverCache.COVER_MODE_ANDROID);
CoverCache.mCoverLoadMode = settings.getBoolean(PrefKeys.COVERLOADER_VANILLA, PrefDefaults.COVERLOADER_VANILLA) ? CoverCache.mCoverLoadMode | CoverCache.COVER_MODE_VANILLA : CoverCache.mCoverLoadMode & ~(CoverCache.COVER_MODE_VANILLA);
CoverCache.mCoverLoadMode = settings.getBoolean(PrefKeys.COVERLOADER_SHADOW , PrefDefaults.COVERLOADER_SHADOW) ? CoverCache.mCoverLoadMode | CoverCache.COVER_MODE_SHADOW : CoverCache.mCoverLoadMode & ~(CoverCache.COVER_MODE_SHADOW);
CoverCache.mCoverLoadMode = settings.getBoolean(PrefKeys.COVERLOADER_INLINE , PrefDefaults.COVERLOADER_INLINE) ? CoverCache.mCoverLoadMode | CoverCache.COVER_MODE_INLINE : CoverCache.mCoverLoadMode & ~(CoverCache.COVER_MODE_INLINE);
mHeadsetOnly = settings.getBoolean(PrefKeys.HEADSET_ONLY, PrefDefaults.HEADSET_ONLY);
mStockBroadcast = settings.getBoolean(PrefKeys.STOCK_BROADCAST, PrefDefaults.STOCK_BROADCAST);
@@ -33,6 +33,7 @@ public class PrefDefaults {
public static final boolean COVERLOADER_ANDROID = true;
public static final boolean COVERLOADER_VANILLA = true;
public static final boolean COVERLOADER_SHADOW = true;
public static final boolean COVERLOADER_INLINE = true;
public static final boolean COVER_ON_LOCKSCREEN = true;
public static final boolean DISABLE_LOCKSCREEN = false;
public static final String DISPLAY_MODE = "2";
@@ -34,6 +34,7 @@ public class PrefKeys {
public static final String COVERLOADER_ANDROID = "coverloader_android";
public static final String COVERLOADER_VANILLA = "coverloader_vanilla";
public static final String COVERLOADER_SHADOW = "coverloader_shadow";
public static final String COVERLOADER_INLINE = "coverloader_inline";
public static final String COVER_ON_LOCKSCREEN = "cover_on_lockscreen";
public static final String DISABLE_LOCKSCREEN = "disable_lockscreen";
public static final String DISPLAY_MODE = "display_mode";