From 3570232cf0cd63731e519bce82d8522898068df3 Mon Sep 17 00:00:00 2001 From: olly Date: Thu, 14 Jun 2018 02:23:28 -0700 Subject: [PATCH] CEA608 - Add space when handling mid-row codes Issue: #3906 ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=200526335 --- RELEASENOTES.md | 4 +++- .../com/google/android/exoplayer2/text/cea/Cea608Decoder.java | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 44ba911eac..44aae0ab9e 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -12,8 +12,10 @@ changes ([#4276](https://github.com/google/ExoPlayer/issues/4276)). * Fix `MediaCodec.native_setSurface` crash on Moto C ([#4315](https://github.com/google/ExoPlayer/issues/4315)). +* Fix missing whitespace in CEA-608 + ([#3906](https://github.com/google/ExoPlayer/issues/3906)). * Set `METADATA_KEY_TITLE` on media descriptions - ((#4292)[https://github.com/google/ExoPlayer/issues/4292]). + ([#4292](https://github.com/google/ExoPlayer/issues/4292)). * Allow apps to register custom MIME types ([#4264](https://github.com/google/ExoPlayer/issues/4264)). diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/cea/Cea608Decoder.java b/library/core/src/main/java/com/google/android/exoplayer2/text/cea/Cea608Decoder.java index f018e055fb..57614ae880 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/text/cea/Cea608Decoder.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/text/cea/Cea608Decoder.java @@ -374,6 +374,9 @@ public final class Cea608Decoder extends CeaDecoder { private void handleMidrowCtrl(byte cc2) { // TODO: support the extended styles (i.e. backgrounds and transparencies) + // A midrow control code advances the cursor. + currentCueBuilder.append(' '); + // cc2 - 0|0|1|0|ATRBT|U // ATRBT is the 3-byte encoded attribute, and U is the underline toggle boolean isUnderlined = (cc2 & 0x01) == 0x01;