sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-04-27 15:07:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert back to default cue parameters until we support positioning

Browse source 
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=134673236
This commit is contained in:
olly 2016-09-29 09:57:45 -07:00 committed by Oliver Woodman
parent 21626c417e
commit 7971a18a83
1 changed files with 1 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
library/src/main/java/com/google/android/exoplayer2/text/cea/Cea608Decoder.java
View file

@ -15,7 +15,6 @@
*/ */
package com.google.android.exoplayer2.text.cea; package com.google.android.exoplayer2.text.cea;
import android.text.Layout.Alignment;
import android.text.TextUtils; import android.text.TextUtils;
import com.google.android.exoplayer2.text.Cue; import com.google.android.exoplayer2.text.Cue;
import com.google.android.exoplayer2.text.Subtitle; import com.google.android.exoplayer2.text.Subtitle;
@ -156,14 +155,6 @@ public final class Cea608Decoder extends CeaDecoder {
0xC5, 0xE5, 0xD8, 0xF8, 0x250C, 0x2510, 0x2514, 0x2518 0xC5, 0xE5, 0xD8, 0xF8, 0x250C, 0x2510, 0x2514, 0x2518
}; };
private static final Alignment CUE_TEXT_ALIGNMENT = Alignment.ALIGN_NORMAL;
private static final float CUE_LINE = Cue.DIMEN_UNSET;
private static final int CUE_LINE_TYPE = Cue.TYPE_UNSET;
private static final int CUE_LINE_ANCHOR = Cue.TYPE_UNSET;
private static final float CUE_POSITION = 0.1f;
private static final int CUE_POSITION_ANCHOR = Cue.TYPE_UNSET;
private static final float CUE_SIZE = 0.8f;
private final ParsableByteArray ccData; private final ParsableByteArray ccData;
private final StringBuilder captionStringBuilder; private final StringBuilder captionStringBuilder;
@ -218,8 +209,7 @@ public final class Cea608Decoder extends CeaDecoder {
@Override @Override
protected Subtitle createSubtitle() { protected Subtitle createSubtitle() {
lastCaptionString = captionString; lastCaptionString = captionString;
return new CeaSubtitle(new Cue(captionString, CUE_TEXT_ALIGNMENT, CUE_LINE, CUE_LINE_TYPE, return new CeaSubtitle(new Cue(captionString));
CUE_LINE_ANCHOR, CUE_POSITION, CUE_POSITION_ANCHOR, CUE_SIZE));
} }
@Override @Override