Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

psi: ReadPMT skips over packets without a program map table #85

Merged
merged 2 commits into from
Jun 15, 2018
Merged

psi: ReadPMT skips over packets without a program map table #85

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4aed8ce
psi: ReadPMT skips over packets without a program map table
tmm1 May 11, 2018
4243d66
Merge branch 'master' into pmt-missing-table
Jun 15, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions psi/pmt.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,6 +355,10 @@ func ReadPMT(r io.Reader, pid uint16) (PMT, error) {
if err != nil {
return nil, err
}
if len(pmt.Pids()) == 0 {
done = false
pmtAcc = packet.NewAccumulator(PmtAccumulatorDoneFunc)
}
}
}
return pmt, nil
Expand Down
29 changes: 29 additions & 0 deletions psi/pmt_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -680,6 +680,7 @@ func TestReadPMTForSmoke(t *testing.T) {
pmt, err := ReadPMT(r, pid)
if err != nil {
t.Errorf("Unexpected error reading PMT: %v", err)
return
}
// sanity check (tests integration a bit)
if len(pmt.ElementaryStreams()) != 2 {
Expand All @@ -703,6 +704,34 @@ func TestReadPMTIncomplete(t *testing.T) {
}
}

func TestReadPMTSCTE(t *testing.T) {
bs, _ := hex.DecodeString("47403b1b00c0001500000100810000000000000100000000002f832c69ff" +
"ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff" +
"ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff" +
"ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff" +
"ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff" +
"ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff" +
"ffffffffffffffff47403b1c0002b0b20001cb0000f13df01809044749e1" +
"0b050441432d330504454143330504435545491bf13df0102a027e1f9700" +
"e9080c001f418507d04181f13ef00f810706380fff1f003f0a04656e6700" +
"81f13ff00f8107061003ff1f003f0a047370610086f140f00f8a01009700" +
"e9080c001f418507d041c0f141f012050445545631a100e9080c001f4185" +
"07d041c0f142f013050445545631a20100e9080c001f418507d041c0f164" +
"f008bf06496e766964690bcfa64bffff") // two PMT packets, first with SCTE 0xc0 table only
r := bytes.NewReader(bs)

pid := uint16(59)
pmt, err := ReadPMT(r, pid)
if err != nil {
t.Errorf("Unexpected error reading PMT: %v", err)
return
}
// sanity check (tests integration a bit)
if len(pmt.ElementaryStreams()) != 7 {
t.Errorf("PMT read is invalid, did not have expected number of streams")
}
}

func TestIsDolbyATMOS(t *testing.T) {
d, _ := hex.DecodeString("00ff")
desc := &pmtDescriptor{tag: uint8(204), data: d}
Expand Down