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

just use original plane width to calculate width proportion to use later as size and keep aspect ratio for height

Browse source
This commit is contained in:
Drew Hill 2017-01-05 21:27:24 -05:00
parent 8804ecded4
commit 0468a80d41
2 changed files with 8 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
library/src/main/java/com/google/android/exoplayer2/text/Cue.java
View file

@ -90,8 +90,6 @@ public class Cue {
* <p>
* For horizontal text and {@link #lineType} equal to {@link #LINE_TYPE_FRACTION}, this is the
* fractional vertical position relative to the top of the viewport.
* <p>
* If {@link #bitmap} is not null then this value is used to indicate the top position
*/
public final float line;
/**
@ -126,8 +124,6 @@ public class Cue {
* For horizontal text, this is the horizontal position relative to the left of the viewport. Note
* that positioning is relative to the left of the viewport even in the case of right-to-left
* text.
* <p>
* If {@link #bitmap} is not null then this value is used to indicate the left position
*/
public final float position;
/**
@ -143,23 +139,15 @@ public class Cue {
/**
* The size of the cue box in the writing direction specified as a fraction of the viewport size
* in that direction, or {@link #DIMEN_UNSET}.
* <p>
* If {@link #bitmap} is not null then this value is used to indicate the width
*/
public final float size;
/**
* The height size of the cue box when a {@link #bitmap} is set specified as a fraction of the
* viewport size in that direction, or {@link #DIMEN_UNSET}.
*/
public final float size_height;
/**
*
*/
public Cue(Bitmap bitmap, float left, float top, float size, float size_height) {
this(null, null, top, LINE_TYPE_FRACTION, TYPE_UNSET, left, TYPE_UNSET, size, size_height,
bitmap);
public Cue(Bitmap bitmap, float left, float top, int plane_width) {
this(null, null, top, LINE_TYPE_FRACTION, ANCHOR_TYPE_START, left, ANCHOR_TYPE_START,
(float) bitmap.getWidth() / plane_width, bitmap);
}
/**
@ -184,8 +172,7 @@ public class Cue {
*/
public Cue(CharSequence text, Alignment textAlignment, float line, @LineType int lineType,
@AnchorType int lineAnchor, float position, @AnchorType int positionAnchor, float size) {
this(text, textAlignment, line, lineType, lineAnchor, position, positionAnchor, size,
DIMEN_UNSET, null);
this(text, textAlignment, line, lineType, lineAnchor, position, positionAnchor, size, null);
}
/**
* @param text See {@link #text}.
@ -196,12 +183,11 @@ public class Cue {
* @param position See {@link #position}.
* @param positionAnchor See {@link #positionAnchor}.
* @param size See {@link #size}.
* @param size_height See {@link #size_height}.
* @param bitmap See {@link #bitmap}.
*/
private Cue(CharSequence text, Alignment textAlignment, float line, @LineType int lineType,
@AnchorType int lineAnchor, float position, @AnchorType int positionAnchor, float size,
float size_height, Bitmap bitmap) {
Bitmap bitmap) {
this.text = text;
this.textAlignment = textAlignment;
this.line = line;
@ -210,7 +196,6 @@ public class Cue {
this.position = position;
this.positionAnchor = positionAnchor;
this.size = size;
this.size_height = size_height;
this.bitmap = bitmap;
}

7
library/src/main/java/com/google/android/exoplayer2/ui/SubtitlePainter.java
View file

@ -77,7 +77,6 @@ import com.google.android.exoplayer2.util.Util;
@Cue.AnchorType
private int cuePositionAnchor;
private float cueSize;
private float cueSizeHeight;
private boolean applyEmbeddedStyles;
private int foregroundColor;
private int backgroundColor;
@ -192,7 +191,6 @@ import com.google.android.exoplayer2.util.Util;
this.cuePosition = cue.position;
this.cuePositionAnchor = cue.positionAnchor;
this.cueSize = cue.size;
this.cueSizeHeight = cue.size_height;
this.applyEmbeddedStyles = applyEmbeddedStyles;
this.foregroundColor = style.foregroundColor;
this.backgroundColor = style.backgroundColor;
@ -224,8 +222,9 @@ import com.google.android.exoplayer2.util.Util;
int parentHeight = parentBottom - parentTop;
int x = parentLeft + (int) ((float) parentWidth * cuePosition);
int y = parentTop + (int) ((float) parentHeight * cueLine);
bitmapRect = new Rect(x,y,
x + (int)((float) parentWidth * cueSize),y + (int)((float) parentHeight * cueSizeHeight));
int width = (int) (parentWidth * cueSize);
int height = (int) (width * ((float) cueBitmap.getHeight() / cueBitmap.getWidth()));
bitmapRect = new Rect(x, y, x + width, y + height);
}
/**