- validating checksum when loading dtv_cmdb_2.bin

- added write support for dtv_cmdb_2.bin
- File / Information no longer shows duplicate program number warnings for negative numbers (-2 is an allowed dupe for dtv_cmdb_2)
- fixed Sony unit test (Sky option channels are now counted as TV and not data)
This commit is contained in:
Horst Beham
2021-09-05 00:46:26 +02:00
parent ccf090ddfd
commit 70138d5ac5
8 changed files with 165 additions and 121 deletions

View File

@@ -16,7 +16,7 @@ struct Flags
{
byte u1 : 3;
byte protected : 1;
byte u2 : 1;
byte crypt : 1;
byte skip : 1;
byte locked : 1;
byte u3 : 1;
@@ -40,19 +40,20 @@ struct Channel_5048
word channelIndex;
byte u1[11];
Flags flags;
byte u1b;
byte u2;
ChannelType channelType;
word serviceType;
byte u2[2];
word fav;
word transponderIndex;
word pmtPid;
DvbId pmtPid;
word u3;
word PcrPid;
word u4[2];
DvbId pcrPid;
DvbId videoPid;
word u4;
word programNr;
word serviceId;
byte u5[22];
word audioPid;
DvbId audioPid;
byte u6[186];
char name[66];
char provider[270];
@@ -126,20 +127,20 @@ struct Channel_4532
word channelIndex;
byte u1[11];
Flags flags;
byte u1b;
byte u2;
ChannelType channelType;
word serviceType;
byte u2[2];
word fav;
word transponderIndex;
word pmtPid;
DvbId pmtPid;
word u3;
word pcrPid;
word videoPid;
DvbId pcrPid;
DvbId videoPid;
word u4;
word programNr;
word serviceId;
byte u5[22];
word audioPid;
DvbId audioPid;
byte u6[186];
char name[66];
char provider[270];
@@ -213,15 +214,15 @@ struct Channel_1684
word channelIndex;
byte u1[11];
Flags flags;
byte u1b;
byte u2;
ChannelType channelType;
word serviceType;
byte u2[2];
word fav;
word transponderIndex;
DvbId pmtPid;
word u3;
DvbId pcrPid;
DvbId videoPid_Maybe;
DvbId videoPid;
word u4;
word programNr;
word serviceId;
@@ -306,8 +307,8 @@ struct Channel_1322
word transponderIndex;
DvbId pmtPid;
byte u2[2];
DvbId videoPid_maybe;
DvbId PcrPid;
DvbId pcrPid;
DvbId videoPid;
word u4[2];
word programNr;
word serviceId;
@@ -384,13 +385,13 @@ struct Channel_1296
Flags flags_maybe;
byte u1a;
ChannelTypeNibble type;
byte u1b;
byte u2;
byte serviceType;
word transponderIndex;
DvbId pmtPid;
byte u2[2];
byte u3[2];
DvbId pcrPid;
DvbId videoPid_maybe;
DvbId videoPid;
word u4;
word programNr;
word u4b;