X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fbroadcast_info.cc;h=c19d898b80af6f17e59e2b6d0a3fd38e00c532c8;hb=fd23f89b357be720bd1cb4a2aeebb5bc017d5878;hp=78c6132f851cb90a42d801e65efe104322cef10d;hpb=0aac62e013e15e380001dafae39d554f8765a4a1;p=ardour.git

diff --git a/libs/ardour/broadcast_info.cc b/libs/ardour/broadcast_info.cc
index 78c6132f85..c19d898b80 100644
--- a/libs/ardour/broadcast_info.cc
+++ b/libs/ardour/broadcast_info.cc
@@ -22,6 +22,7 @@
 #include <iostream>
 #include <sstream>
 #include <iomanip>
+#include <vector>
 
 #include <glibmm.h>
 
@@ -37,15 +38,15 @@ namespace ARDOUR
 static void
 snprintf_bounded_null_filled (char* target, size_t target_size, char const * fmt, ...)
 {
-	char buf[target_size+1];
+	std::vector<char> buf(target_size+1);
 	va_list ap;
 
 	va_start (ap, fmt);
-	vsnprintf (buf, target_size+1, fmt, ap);
+	vsnprintf (&buf[0], target_size+1, fmt, ap);
 	va_end (ap);
 
 	memset (target, 0, target_size);
-	memcpy (target, buf, target_size);
+	memcpy (target, &buf[0], target_size);
 
 }
 
@@ -89,16 +90,40 @@ BroadcastInfo::set_originator_ref_from_session (Session const & /*session*/)
 	/* Serial number is 12 chars */
 
 	std::ostringstream serial_number;
-	serial_number << "ARDOUR" << "r" <<  std::setfill('0') << std::right << std::setw(5) << revision;
-
-	snprintf_bounded_null_filled (info->originator_reference, sizeof (info->originator_reference), "%2s%3s%12s%02d%02d%02d%9d",
-		  SessionMetadata::Metadata()->country().c_str(),
-		  SessionMetadata::Metadata()->organization().c_str(),
-		  serial_number.str().c_str(),
-		  _time.tm_hour,
-		  _time.tm_min,
-		  _time.tm_sec,
-		  random_code);
+	serial_number << PROGRAM_NAME << revision;
+
+	std::string country = SessionMetadata::Metadata()->country().substr (0, 2).c_str(); // ISO 3166-1 2 digits
+	if (country.empty ()) {
+		/* "ZZ" is reserved and may be user-assigned.
+		 * EBU Tech 3279 chapter 4.2.4 recommends "ZZ" for unregistered organizations
+		 */
+		country = "ZZ";
+	}
+
+	/* https://tech.ebu.ch/docs/tech/tech3279.pdf */
+	std::string organization = SessionMetadata::Metadata()->organization().substr (0, 3).c_str(); // EBU assigned Organisation code
+	if (organization.empty ()) {
+		organization = "---";
+	}
+
+	// TODO sanitize to allowed char set: tech3279.pdf chapter 1.6
+	// allowed: A-Z 0-9 <space> .,-()/=
+	// possible, but not recommended: !"%&*;<>
+
+	/* https://tech.ebu.ch/docs/r/r099.pdf
+	 * CC Country code: (2 characters) based on the ISO 3166-1 standard
+	 * OOO Organisation code: (3 characters) based on the EBU facility codes, Tech 3279
+	 * NNNNNNNNNNNN Serial number: (12 characters extracted from the recorder model and serial number) This should identify the machine’s type and serial number.
+	 * HHMMSS OriginationTime (6 characters,) from the <OriginationTime> field of the BWF.
+	 * RRRRRRRRR Random Number (9 characters 0-9) Generated locally by the recorder using some reasonably random algorithm.
+	 */
+	snprintf_bounded_null_filled (info->originator_reference, sizeof (info->originator_reference), "%2s%3s%12s%02d%02d%02d%09d",
+			country.c_str (), organization.c_str(),
+			serial_number.str().substr (0, 12).c_str(),
+			_time.tm_hour,
+			_time.tm_min,
+			_time.tm_sec,
+			random_code);
 
 }