diff options
| author | enen92 <92enen@gmail.com> | 2022-11-15 10:42:38 +0000 |
|---|---|---|
| committer | enen92 <92enen@gmail.com> | 2022-11-15 10:42:38 +0000 |
| commit | dac3e6e5964b5706da2d4f480858ebfdc2419849 (patch) | |
| tree | 820589659b815bdd3bef5afe4977096068ccf106 | |
| parent | 4173468cc9d3ad477028b554fe1728f2e84aebc1 (diff) | |
| download | xbmc-dac3e6e5964b5706da2d4f480858ebfdc2419849.tar.xz | |
Revert "[subtitles] Fix CC condition for valid captions"
This reverts commit e089287ab02181bb57189557365888858088502c.
| -rw-r--r-- | xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxCC.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxCC.cpp b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxCC.cpp index fc463d4011..ce374981cd 100644 --- a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxCC.cpp +++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxCC.cpp @@ -154,9 +154,7 @@ DemuxPacket* CDVDDemuxCC::Read(DemuxPacket *pSrcPacket) while ((len = pSrcPacket->iSize - p) > 3) { - uint8_t* buf = pSrcPacket->pData + p; - bool validCaption = (buf[0] & 0x04) > 0; - if (validCaption) + if ((startcode & 0xffffff00) == 0x00000100) { if (m_codec == AV_CODEC_ID_MPEG2VIDEO) { @@ -165,11 +163,13 @@ DemuxPacket* CDVDDemuxCC::Read(DemuxPacket *pSrcPacket) { if (len > 4) { + uint8_t *buf = pSrcPacket->pData + p; picType = (buf[1] & 0x38) >> 3; } } else if (scode == 0xb2) // user data { + uint8_t *buf = pSrcPacket->pData + p; if (len >= 6 && buf[0] == 'G' && buf[1] == 'A' && buf[2] == '9' && buf[3] == '4' && buf[4] == 3 && (buf[5] & 0x40)) @@ -231,6 +231,7 @@ DemuxPacket* CDVDDemuxCC::Read(DemuxPacket *pSrcPacket) // slice data comes after SEI if (scode >= 1 && scode <= 5) { + uint8_t *buf = pSrcPacket->pData + p; CBitstream bs(buf, len * 8); bs.readGolombUE(); int sliceType = bs.readGolombUE(); @@ -249,6 +250,7 @@ DemuxPacket* CDVDDemuxCC::Read(DemuxPacket *pSrcPacket) } if (scode == 0x06) // SEI { + uint8_t *buf = pSrcPacket->pData + p; if (len >= 12 && buf[3] == 0 && buf[4] == 49 && buf[5] == 'G' && buf[6] == 'A' && buf[7] == '9' && buf[8] == '4' && buf[9] == 3) |