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

Ignore repeated control characters in EIA608 subtitles.

Browse source 
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=117220536
This commit is contained in:
olly 2016-03-15 02:56:39 -07:00 committed by Oliver Woodman
parent a1c74cb259
commit 16f57e3919
2 changed files with 19 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
library/src/main/java/com/google/android/exoplayer/text/eia608/ClosedCaptionCtrl.java
View file

@ -94,4 +94,8 @@ package com.google.android.exoplayer.text.eia608;
return (cc1 >= 0x10 && cc1 <= 0x1F) && (cc2 >= 0x40 && cc2 <= 0x7F); return (cc1 >= 0x10 && cc1 <= 0x1F) && (cc2 >= 0x40 && cc2 <= 0x7F);
} }
public boolean isRepeatable() {
return cc1 >= 0x10 && cc1 <= 0x1F;
}
} }

15
library/src/main/java/com/google/android/exoplayer/text/eia608/Eia608TrackRenderer.java
View file

@ -66,6 +66,7 @@ public final class Eia608TrackRenderer extends SampleSourceTrackRenderer impleme
private int captionRowCount; private int captionRowCount;
private String caption; private String caption;
private String lastRenderedCaption; private String lastRenderedCaption;
private ClosedCaptionCtrl repeatableControl;
/** /**
* @param textRenderer The text renderer. * @param textRenderer The text renderer.
@ -94,6 +95,7 @@ public final class Eia608TrackRenderer extends SampleSourceTrackRenderer impleme
@Override @Override
protected void onReset(long positionUs) { protected void onReset(long positionUs) {
inputStreamEnded = false; inputStreamEnded = false;
repeatableControl = null;
pendingCaptionLists.clear(); pendingCaptionLists.clear();
clearPendingSample(); clearPendingSample();
captionRowCount = DEFAULT_CAPTIONS_ROW_COUNT; captionRowCount = DEFAULT_CAPTIONS_ROW_COUNT;
@ -193,10 +195,20 @@ public final class Eia608TrackRenderer extends SampleSourceTrackRenderer impleme
return; return;
} }
boolean isRepeatableControl = false;
for (int i = 0; i < captionBufferSize; i++) { for (int i = 0; i < captionBufferSize; i++) {
ClosedCaption caption = captionList.captions[i]; ClosedCaption caption = captionList.captions[i];
if (caption.type == ClosedCaption.TYPE_CTRL) { if (caption.type == ClosedCaption.TYPE_CTRL) {
ClosedCaptionCtrl captionCtrl = (ClosedCaptionCtrl) caption; ClosedCaptionCtrl captionCtrl = (ClosedCaptionCtrl) caption;
isRepeatableControl = captionBufferSize == 1 && captionCtrl.isRepeatable();
if (isRepeatableControl && repeatableControl != null
&& repeatableControl.cc1 == captionCtrl.cc1
&& repeatableControl.cc2 == captionCtrl.cc2) {
repeatableControl = null;
continue;
} else if (isRepeatableControl) {
repeatableControl = captionCtrl;
}
if (captionCtrl.isMiscCode()) { if (captionCtrl.isMiscCode()) {
handleMiscCode(captionCtrl); handleMiscCode(captionCtrl);
} else if (captionCtrl.isPreambleAddressCode()) { } else if (captionCtrl.isPreambleAddressCode()) {
@ -207,6 +219,9 @@ public final class Eia608TrackRenderer extends SampleSourceTrackRenderer impleme
} }
} }
if (!isRepeatableControl) {
repeatableControl = null;
}
if (captionMode == CC_MODE_ROLL_UP || captionMode == CC_MODE_PAINT_ON) { if (captionMode == CC_MODE_ROLL_UP || captionMode == CC_MODE_PAINT_ON) {
caption = getDisplayCaption(); caption = getDisplayCaption();
} }