sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-03-31 10:25:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Suggestions from Code Review

Browse source
This commit is contained in:
Jovche Mitrejchevski 2018-07-26 12:26:29 +02:00
parent 46232977f6
commit 72a2b82370
1 changed files with 4 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerView.java
View file

@ -22,16 +22,13 @@ import android.content.res.Resources;
import android.content.res.TypedArray;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.graphics.Canvas;
import android.graphics.Matrix;
import android.graphics.RectF;
import android.graphics.drawable.BitmapDrawable;
import android.graphics.drawable.Drawable;
import android.os.Build;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.v4.content.ContextCompat;
import android.support.v4.graphics.drawable.DrawableCompat;
import android.util.AttributeSet;
import android.view.KeyEvent;
import android.view.LayoutInflater;
@ -568,7 +565,9 @@ public class PlayerView extends FrameLayout {
* present in the media.
*
* @param defaultArtwork the default artwork to display.
* @deprecated use (@link {@link #setDefaultArtwork(Drawable)} instead.
*/
@Deprecated
public void setDefaultArtwork(Bitmap defaultArtwork) {
setDefaultArtwork(new BitmapDrawable(getResources(), defaultArtwork));
}
@ -1071,37 +1070,19 @@ public class PlayerView extends FrameLayout {
if (metadataEntry instanceof ApicFrame) {
byte[] bitmapData = ((ApicFrame) metadataEntry).pictureData;
Bitmap bitmap = BitmapFactory.decodeByteArray(bitmapData, 0, bitmapData.length);
return setArtworkFromBitmap(new BitmapDrawable(getResources(), bitmap));
return setDrawableArtwork(new BitmapDrawable(getResources(), bitmap));
}
}
return false;
}
private boolean setDrawableArtwork(Drawable drawable) {
if(drawable instanceof BitmapDrawable) {
return setArtworkFromBitmap(((BitmapDrawable) drawable));
} else {
if(drawable != null) {
artworkView.setImageDrawable(drawable);
}
return true;
}
private boolean setArtworkFromBitmap(BitmapDrawable bitmapDrawable) {
if (bitmapDrawable != null) {
int bitmapWidth = bitmapDrawable.getBitmap().getWidth();
int bitmapHeight = bitmapDrawable.getBitmap().getHeight();
if (bitmapWidth > 0 && bitmapHeight > 0) {
if (contentFrame != null) {
contentFrame.setAspectRatio((float) bitmapWidth / bitmapHeight);
}
artworkView.setImageBitmap(bitmapDrawable.getBitmap());
artworkView.setVisibility(VISIBLE);
return true;
}
}
return false;
}
private void hideArtwork() {
if (artworkView != null) {
artworkView.setImageResource(android.R.color.transparent); // Clears any bitmap reference.