Skip to content

Commit

Permalink
fix unreachable code, cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
@EricBerendsen
EricBerendsen committed Sep 18, 2024
1 parent e4ac6df commit c634327
Show file tree
Hide file tree
Showing 3 changed files with 118 additions and 152 deletions.
54 changes: 23 additions & 31 deletions src/main/java/nl/digitalekabeltelevisie/data/mpeg/descriptors/dsmcc/DSMCCDescriptor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
*
* http://www.digitalekabeltelevisie.nl/dvb_inspector
*
* This code is Copyright 2009-2023 by Eric Berendsen ([email protected])
* This code is Copyright 2009-2024 by Eric Berendsen ([email protected])
*
* This file is part of DVB Inspector.
*
Expand Down Expand Up @@ -35,51 +35,43 @@
public class DSMCCDescriptor extends Descriptor {


/**
* @param b
* @param offset
* @param parent
*/
public DSMCCDescriptor(final byte[] b, final int offset) {
public DSMCCDescriptor(byte[] b, int offset) {
super(b, null);
}

@Override
public String getDescriptorname(){
return DSMCCDescriptor.getDescriptorname(descriptorTag);
return getDescriptorname(descriptorTag);
}

public static String getDescriptorname(final int tag){
public static String getDescriptorname(int tag){


if((tag>=0x72)&&(tag<=0x7f)){
if((tag>=0x73)&&(tag<=0x7f)){
return "reserved MHP";
}
if((tag>=0x80)&&(tag<=0xff)){
return "private_descriptor";
}

switch (tag) {
case 0x00: return "reserved";
case 0x01: return "type_descriptor";
case 0x02: return "name_descriptor";
case 0x03: return "info_descriptor";
case 0x04: return "module_link_descriptor";
case 0x05: return "CRC32_descriptor";
case 0x06: return "location_descriptor";
case 0x07: return "estimated_download_time_descriptor";
case 0x08: return "group_link_descriptor";
case 0x09: return "compressed_module_descriptor";
case 0x0A: return "SSU_module_type"; // was "subgroup_association_descriptor". looks like DVBSnoop made a mistake in dsmcc_str.c;
case 0x0B: return "subgroup_association_descriptor"; // was "reserved for future use by DVB";
case 0x70: return "label_descriptor"; // MHP
case 0x71: return "caching_priority_descriptor"; // MHP
case 0x72: return "content_type_descriptor"; // ETSI TS 102 809 V1.3.1 (2017-06) B.2.3.4 Content type descriptor Table B.17:
default:

return "illegal descriptor tag value in DSM-CC";

}
return switch (tag) {
case 0x00 -> "reserved";
case 0x01 -> "type_descriptor";
case 0x02 -> "name_descriptor";
case 0x03 -> "info_descriptor";
case 0x04 -> "module_link_descriptor";
case 0x05 -> "CRC32_descriptor";
case 0x06 -> "location_descriptor";
case 0x07 -> "estimated_download_time_descriptor";
case 0x08 -> "group_link_descriptor";
case 0x09 -> "compressed_module_descriptor";
case 0x0A -> "SSU_module_type"; // was "subgroup_association_descriptor". looks like DVBSnoop made a mistake in dsmcc_str.c;
case 0x0B -> "subgroup_association_descriptor"; // was "reserved for future use by DVB";
case 0x70 -> "label_descriptor"; // MHP
case 0x71 -> "caching_priority_descriptor"; // MHP
case 0x72 -> "content_type_descriptor"; // ETSI TS 102 809 V1.3.1 (2017-06) B.2.3.4 Content type descriptor Table B.17:
default -> "illegal descriptor tag value in DSM-CC";
};
}


Expand Down
53 changes: 22 additions & 31 deletions src/main/java/nl/digitalekabeltelevisie/data/mpeg/descriptors/untable/UNTDescriptor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
*
* http://www.digitalekabeltelevisie.nl/dvb_inspector
*
* This code is Copyright 2009-2022 by Eric Berendsen ([email protected])
* This code is Copyright 2009-2024 by Eric Berendsen ([email protected])
*
* This file is part of DVB Inspector.
*
Expand Down Expand Up @@ -43,48 +43,39 @@

public class UNTDescriptor extends Descriptor {


/**
* @param b
* @param offset
* @param parent
*/
public UNTDescriptor(final byte[] b, final int offset, final TableSection parent) {
public UNTDescriptor(byte[] b, int offset, TableSection parent) {
super(b, offset, parent);
}

@Override
public String getDescriptorname(){
return UNTDescriptor.getDescriptorname(descriptorTag, parentTableSection);
return getDescriptorname(descriptorTag, parentTableSection);
}

public static String getDescriptorname(final int tag, final TableSection tableSection){
public static String getDescriptorname(int tag, TableSection tableSection){


if((tag>=0x0C)&&(tag<=0x3f)){
if((tag>=0x0E)&&(tag<=0x3f)){
return "reserved for future SSU use";
}

switch (tag) {
case 0x00: return "reserved";
case 0x01: return "scheduling_descriptor";
case 0x02: return "update_descriptor";
case 0x03: return "ssu_location_descriptor";
case 0x04: return "message_descriptor";
case 0x05: return "ssu_event_name_descriptor";
case 0x06: return "target_smartcard_descriptor";
case 0x07: return "target_MAC_address_descriptor";
case 0x08: return "target_serial_number_descriptor";
case 0x09: return "target_IP_address_descriptor";
case 0x0A: return "target_IPv6_address_descriptor";
case 0x0B: return "ssu_subgroup_association_descriptor";
case 0x0C: return "enhanced_message_descriptor";
case 0x0D: return "ssu_uri_descriptor";
default:

return "illegal descriptor tag value in UNT";

}
return switch (tag) {
case 0x00 -> "reserved";
case 0x01 -> "scheduling_descriptor";
case 0x02 -> "update_descriptor";
case 0x03 -> "ssu_location_descriptor";
case 0x04 -> "message_descriptor";
case 0x05 -> "ssu_event_name_descriptor";
case 0x06 -> "target_smartcard_descriptor";
case 0x07 -> "target_MAC_address_descriptor";
case 0x08 -> "target_serial_number_descriptor";
case 0x09 -> "target_IP_address_descriptor";
case 0x0A -> "target_IPv6_address_descriptor";
case 0x0B -> "ssu_subgroup_association_descriptor";
case 0x0C -> "enhanced_message_descriptor";
case 0x0D -> "ssu_uri_descriptor";
default -> "illegal descriptor tag value in UNT";
};
}


Expand Down
Loading

0 comments on commit c634327

Please sign in to comment.