From 36fef95f47de48bd540c0321691f9ac78e43eb23 Mon Sep 17 00:00:00 2001 From: andrewlewis Date: Thu, 1 Nov 2018 00:58:32 -0700 Subject: [PATCH] Fix extended service number calculation ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=219597894 --- .../google/android/exoplayer2/text/cea/Cea708Decoder.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/cea/Cea708Decoder.java b/library/core/src/main/java/com/google/android/exoplayer2/text/cea/Cea708Decoder.java index a95f1de738..b3be88b851 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/text/cea/Cea708Decoder.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/text/cea/Cea708Decoder.java @@ -272,7 +272,10 @@ public final class Cea708Decoder extends CeaDecoder { if (serviceNumber == 7) { // extended service numbers serviceBlockPacket.skipBits(2); - serviceNumber += serviceBlockPacket.readBits(6); + serviceNumber = serviceBlockPacket.readBits(6); + if (serviceNumber < 7) { + Log.w(TAG, "Invalid extended service number: " + serviceNumber); + } } // Ignore packets in which blockSize is 0