mpeg descriptor: update Registration Descriptor (0x05)

The descriptor contains a registered MPEG TS Identifier. Which full des-
cription may be found at https://smpte-ra.org/registered-mpeg-ts-ids.
I added displaying of a readable MPEG TS identifier and an organization
name.

1 files changed, 190 insertions, 1 deletions

diff --git a/epan/dissectors/packet-mpeg-descriptor.c b/epan/dissectors/packet-mpeg-descriptor.c
index ba9b0353da..c708a51161 100644
--- a/epan/dissectors/packet-mpeg-descriptor.c
+++ b/epan/dissectors/packet-mpeg-descriptor.c
@@ -268,6 +268,195 @@ proto_mpeg_descriptor_dissect_audio_stream(tvbuff_t *tvb, guint offset, proto_tr
 }
 
 /* 0x05 Registration Descriptor */
+
+static const value_string mpeg_descr_registration_reg_form_vals[] = {
+    { 0x43554549u, "CUEI - Society of Cable Telecommunications Engineers" },
+    { 0x44444544u, "DDED - LGEUS" },
+    { 0x44495343u, "DISC - DISCOVERY COMMUNICATIONS, LLC." },
+    { 0x44495348u, "DISH - EchoStar Communications Corporation" },
+    { 0x646d6174u, "dmat - Dolby Laboratories, Inc." },
+    { 0x44524131u, "DRA1 - Digital Rise" },
+    { 0x64726163u, "drac - British Broadcasting Corporation" },
+    { 0x44544731u, "DTG1 - Digital TV Group" },
+    { 0x44545331u, "DTS1 - DTS Inc." },
+    { 0x44545332u, "DTS2 - DTS Inc." },
+    { 0x44545333u, "DTS3 - DTS Inc." },
+    { 0x44545649u, "DTVI - DTV Innovations" },
+    { 0x44564446u, "DVDF - DVD Format/Logo Licensing Corporation" },
+    { 0x45414333u, "EAC3 - Dolby Laboratories, Inc." },
+    { 0x45425030u, "EBP0 - Cable Television Laboratories, Inc." },
+    { 0x45425031u, "EBP1 - Cable Television Laboratories, Inc." },
+    { 0x45425032u, "EBP2 - Cable Television Laboratories, Inc." },
+    { 0x45425033u, "EBP3 - Cable Television Laboratories, Inc." },
+    { 0x45425034u, "EBP4 - Cable Television Laboratories, Inc." },
+    { 0x45425035u, "EBP5 - Cable Television Laboratories, Inc." },
+    { 0x45425036u, "EBP6 - Cable Television Laboratories, Inc." },
+    { 0x45425037u, "EBP7 - Cable Television Laboratories, Inc." },
+    { 0x45425038u, "EBP8 - Cable Television Laboratories, Inc." },
+    { 0x45425039u, "EBP9 - Cable Television Laboratories, Inc." },
+    { 0x45545631u, "ETV1 - Cable Television Laboratories, Inc." },
+    { 0x464f5843u, "FOXC - FOX Corporation" },
+    { 0x47413934u, "GA94 - Advanced Television Systems Committee" },
+    { 0x47574b53u, "GWKS - GuideWorks" },
+    { 0x48444d56u, "HDMV - Sony Corporation" },
+    { 0x48444d58u, "HDMX - Matsushita Electric Industrial Co. Ltd" },
+    { 0x48445052u, "HDPR - Network Business Group" },
+    { 0x484c4954u, "HLIT - Harmonic Inc." },
+    { 0x49443320u, "ID3  - Organization Apple, Inc." },
+    { 0x4b4c5641u, "KLVA - Society of Motion Picture and Television Engineers" },
+    { 0x4c41534cu, "LASL - LaSalle Media LLC" },
+    { 0x4c495053u, "LIPS - Society of Motion Picture and Television Engineers" },
+    { 0x4c552d41u, "LU-A - Harris Corporation" },
+    { 0x6d6c7061u, "mlpa - Dolby Laboratories, Inc." },
+    { 0x4d54524du, "MTRM - Victor Company of Japan, Limited" },
+    { 0x4e424355u, "NBCU - NBC Universal" },
+    { 0x4e4d5231u, "NMR1 - Nielsen Media Research" },
+    { 0x4e504f31u, "NPO1 - Nederlandse Publieke Omroep (NPO, Dutch Public Broadcasting)" },
+    { 0x4e575456u, "NWTV - Digital TV Information Research Group" },
+    { 0x4f4d5643u, "OMVC - Open Mobile Video Coalition (OMVC)" },
+    { 0x4f707573u, "Opus - Mozilla" },
+    { 0x50415558u, "PAUX - Philips DVS" },
+    { 0x504d5346u, "PMSF - Sony Corporation" },
+    { 0x50524d43u, "PRMC - Philips DVS" },
+    { 0x50585341u, "PXSA - Proximus" },
+    { 0x52544c4eu, "RTLN - RTL Nederland" },
+    { 0x53425342u, "SBSB - SBS Broadcasting" },
+    { 0x53435445u, "SCTE - Society of Cable Telecommunications Engineers" },
+    { 0x53454e31u, "SEN1 - Sencore" },
+    { 0x53455346u, "SESF - Sony Corporation" },
+    { 0x534f5049u, "SOPI - Sony Corporation" },
+    { 0x53504c43u, "SPLC - Society of Motion Picture and Television Engineers" },
+    { 0x53564d44u, "SVMD - Society of Motion Picture and Television Engineers" },
+    { 0x53594e43u, "SYNC - Syncbak, Inc." },
+    { 0x535a4d49u, "SZMI - Building B, Inc" },
+    { 0x54524956u, "TRIV - Triveni Digital" },
+    { 0x54534256u, "TSBV - Toshiba Corporation Digital Media Network Company" },
+    { 0x54534856u, "TSHV - Sony Corporation" },
+    { 0x54534d56u, "TSMV - Sony Corporation" },
+    { 0x54544130u, "TTA0 - Telecommunication Technology Association(TTA)" },
+    { 0x54564731u, "TVG1 - Rovi Corporation" },
+    { 0x54564732u, "TVG2 - Rovi Corporation" },
+    { 0x54564733u, "TVG3 - Rovi Corporation" },
+    { 0x554c4531u, "ULE1 - University of Aberdeen (on behalf of the Internet Engineering Task Force, IETF)" },
+    { 0x554c4930u, "ULI0 - Update Logic, Inc." },
+    { 0x56432d31u, "VC-1 - Society of Motion Picture and Television Engineers" },
+    { 0x56432d34u, "VC-4 - Society of Motion Picture and Television Engineers" },
+    { 0x564d4e55u, "VMNU - Viacom" },
+    { 0x584d505fu, "XMP_ - Adobe Systems" },
+
+    { 0x55533030u, "US00 - US Government Registration 00" },
+    { 0x55533031u, "US01 - US Government Registration 01" },
+    { 0x55533032u, "US02 - US Government Registration 02" },
+    { 0x55533033u, "US03 - US Government Registration 03" },
+    { 0x55533034u, "US04 - US Government Registration 04" },
+    { 0x55533035u, "US05 - US Government Registration 05" },
+    { 0x55533036u, "US06 - US Government Registration 06" },
+    { 0x55533037u, "US07 - US Government Registration 07" },
+    { 0x55533038u, "US08 - US Government Registration 08" },
+    { 0x55533039u, "US09 - US Government Registration 09" },
+
+    { 0x55533130u, "US10 - US Government Registration 10" },
+    { 0x55533131u, "US11 - US Government Registration 11" },
+    { 0x55533132u, "US12 - US Government Registration 12" },
+    { 0x55533133u, "US13 - US Government Registration 13" },
+    { 0x55533134u, "US14 - US Government Registration 14" },
+    { 0x55533135u, "US15 - US Government Registration 15" },
+    { 0x55533136u, "US16 - US Government Registration 16" },
+    { 0x55533137u, "US17 - US Government Registration 17" },
+    { 0x55533138u, "US18 - US Government Registration 18" },
+    { 0x55533139u, "US19 - US Government Registration 19" },
+
+    { 0x55533230u, "US20 - US Government Registration 20" },
+    { 0x55533231u, "US21 - US Government Registration 21" },
+    { 0x55533232u, "US22 - US Government Registration 22" },
+    { 0x55533233u, "US23 - US Government Registration 23" },
+    { 0x55533234u, "US24 - US Government Registration 24" },
+    { 0x55533235u, "US25 - US Government Registration 25" },
+    { 0x55533236u, "US26 - US Government Registration 26" },
+    { 0x55533237u, "US27 - US Government Registration 27" },
+    { 0x55533238u, "US28 - US Government Registration 28" },
+    { 0x55533239u, "US29 - US Government Registration 29" },
+
+    { 0x55533330u, "US30 - US Government Registration 30" },
+    { 0x55533331u, "US31 - US Government Registration 31" },
+    { 0x55533332u, "US32 - US Government Registration 32" },
+    { 0x55533333u, "US33 - US Government Registration 33" },
+    { 0x55533334u, "US34 - US Government Registration 34" },
+    { 0x55533335u, "US35 - US Government Registration 35" },
+    { 0x55533336u, "US36 - US Government Registration 36" },
+    { 0x55533337u, "US37 - US Government Registration 37" },
+    { 0x55533338u, "US38 - US Government Registration 38" },
+    { 0x55533339u, "US39 - US Government Registration 39" },
+
+    { 0x55533430u, "US40 - US Government Registration 40" },
+    { 0x55533431u, "US41 - US Government Registration 41" },
+    { 0x55533432u, "US42 - US Government Registration 42" },
+    { 0x55533433u, "US43 - US Government Registration 43" },
+    { 0x55533434u, "US44 - US Government Registration 44" },
+    { 0x55533435u, "US45 - US Government Registration 45" },
+    { 0x55533436u, "US46 - US Government Registration 46" },
+    { 0x55533437u, "US47 - US Government Registration 47" },
+    { 0x55533438u, "US48 - US Government Registration 48" },
+    { 0x55533439u, "US49 - US Government Registration 49" },
+
+    { 0x55533530u, "US50 - US Government Registration 50" },
+    { 0x55533531u, "US51 - US Government Registration 51" },
+    { 0x55533532u, "US52 - US Government Registration 52" },
+    { 0x55533533u, "US53 - US Government Registration 53" },
+    { 0x55533534u, "US54 - US Government Registration 54" },
+    { 0x55533535u, "US55 - US Government Registration 55" },
+    { 0x55533536u, "US56 - US Government Registration 56" },
+    { 0x55533537u, "US57 - US Government Registration 57" },
+    { 0x55533538u, "US58 - US Government Registration 58" },
+    { 0x55533539u, "US59 - US Government Registration 59" },
+
+    { 0x55533630u, "US60 - US Government Registration 60" },
+    { 0x55533631u, "US61 - US Government Registration 61" },
+    { 0x55533632u, "US62 - US Government Registration 62" },
+    { 0x55533633u, "US63 - US Government Registration 63" },
+    { 0x55533634u, "US64 - US Government Registration 64" },
+    { 0x55533635u, "US65 - US Government Registration 65" },
+    { 0x55533636u, "US66 - US Government Registration 66" },
+    { 0x55533637u, "US67 - US Government Registration 67" },
+    { 0x55533638u, "US68 - US Government Registration 68" },
+    { 0x55533639u, "US69 - US Government Registration 69" },
+
+    { 0x55533730u, "US70 - US Government Registration 70" },
+    { 0x55533731u, "US71 - US Government Registration 71" },
+    { 0x55533732u, "US72 - US Government Registration 72" },
+    { 0x55533733u, "US73 - US Government Registration 73" },
+    { 0x55533734u, "US74 - US Government Registration 74" },
+    { 0x55533735u, "US75 - US Government Registration 75" },
+    { 0x55533736u, "US76 - US Government Registration 76" },
+    { 0x55533737u, "US77 - US Government Registration 77" },
+    { 0x55533738u, "US78 - US Government Registration 78" },
+    { 0x55533739u, "US79 - US Government Registration 79" },
+
+    { 0x55533830u, "US80 - US Government Registration 80" },
+    { 0x55533831u, "US81 - US Government Registration 81" },
+    { 0x55533832u, "US82 - US Government Registration 82" },
+    { 0x55533833u, "US83 - US Government Registration 83" },
+    { 0x55533834u, "US84 - US Government Registration 84" },
+    { 0x55533835u, "US85 - US Government Registration 85" },
+    { 0x55533836u, "US86 - US Government Registration 86" },
+    { 0x55533837u, "US87 - US Government Registration 87" },
+    { 0x55533838u, "US88 - US Government Registration 88" },
+    { 0x55533839u, "US89 - US Government Registration 89" },
+
+    { 0x55533930u, "US90 - US Government Registration 90" },
+    { 0x55533931u, "US91 - US Government Registration 91" },
+    { 0x55533932u, "US92 - US Government Registration 92" },
+    { 0x55533933u, "US93 - US Government Registration 93" },
+    { 0x55533934u, "US94 - US Government Registration 94" },
+    { 0x55533935u, "US95 - US Government Registration 95" },
+    { 0x55533936u, "US96 - US Government Registration 96" },
+    { 0x55533937u, "US97 - US Government Registration 97" },
+    { 0x55533938u, "US98 - US Government Registration 98" },
+    { 0x55533939u, "US99 - US Government Registration 99" },
+
+    { 0x00, NULL }
+};
+
 static int hf_mpeg_descr_reg_form_id = -1;
 static int hf_mpeg_descr_reg_add_id_inf = -1;
 
@@ -3388,7 +3577,7 @@ proto_register_mpeg_descriptor(void)
         /* 0x05 Registration Descriptor */
         { &hf_mpeg_descr_reg_form_id, {
             "Format identifier", "mpeg_descr.registration.format_identifier",
-            FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL
+            FT_UINT32, BASE_HEX, VALS(mpeg_descr_registration_reg_form_vals), 0, NULL, HFILL
         } },
 
         { &hf_mpeg_descr_reg_add_id_inf, {