New upstream version 0.16.2+dfsg1

plugins/obs-outputs/data/locale/ca-ES.ini

@@ -2,4 +2,5 @@ RTMPStream="Flux RTMP"
 RTMPStream.DropThreshold="Llindar d'abandonament (en mil·lisegons)"
 FLVOutput="Sortida del fitxer FLV"
 FLVOutput.FilePath="Camí del fitxer"
+Default="Per defecte"
 

plugins/obs-outputs/data/locale/cs-CZ.ini

@@ -2,4 +2,5 @@ RTMPStream="RTMP Stream"
 RTMPStream.DropThreshold="Práh ztrát (milisekundy)"
 FLVOutput="Výstup do FLV souboru"
 FLVOutput.FilePath="Cesta k souboru"
+Default="Výchozí"
 

plugins/obs-outputs/data/locale/de-DE.ini

@@ -2,4 +2,5 @@ RTMPStream="RTMP Stream"
 RTMPStream.DropThreshold="Drop Threshold (Millisekunden)"
 FLVOutput="FLV Dateiausgabe"
 FLVOutput.FilePath="Dateipfad"
+Default="Standard"
 

plugins/obs-outputs/data/locale/es-ES.ini

@@ -2,4 +2,5 @@ RTMPStream="Retransmisión RTMP"
 RTMPStream.DropThreshold="Umbral límite (milisegundos)"
 FLVOutput="Archivo de salida FLV"
 FLVOutput.FilePath="Ruta de archivo"
+Default="Por defecto"
 

plugins/obs-outputs/data/locale/eu-ES.ini

@@ -2,4 +2,5 @@ RTMPStream="RTMP Jarioa"
 RTMPStream.DropThreshold="Galera atalasea (milisegundoak)"
 FLVOutput="FLV irteera fitxategia"
 FLVOutput.FilePath="Fitxategiaren bidea"
+Default="Lehenetsia"
 

plugins/obs-outputs/data/locale/fi-FI.ini

@@ -2,4 +2,5 @@ RTMPStream="RTMP-virtaus"
 RTMPStream.DropThreshold="Pudotuskynnys (millisekuntia)"
 FLVOutput="FLV-tiedosto ulostulo"
 FLVOutput.FilePath="Tiedostopolku"
+Default="Oletusarvo"
 

plugins/obs-outputs/data/locale/fr-FR.ini

@@ -2,4 +2,5 @@ RTMPStream="Flux RTMP"
 RTMPStream.DropThreshold="Seuil de baisse (en millisecondes)"
 FLVOutput="Fichier FLV sortant"
 FLVOutput.FilePath="Chemin du fichier"
+Default="Interface par défaut"
 

plugins/obs-outputs/data/locale/hr-HR.ini

@@ -2,4 +2,5 @@ RTMPStream="RTMP strim"
 RTMPStream.DropThreshold="Tolerancija ispuštanja (milisekunde)"
 FLVOutput="Izlaz u FLV datoteku"
 FLVOutput.FilePath="Putanja datoteke"
+Default="Podrazumevani"
 

plugins/obs-outputs/data/locale/hu-HU.ini

@@ -2,4 +2,5 @@ RTMPStream="RTMP stream"
 RTMPStream.DropThreshold="Ejtési küszöb (ezredmásodperc)"
 FLVOutput="FLV kimeneti fájl"
 FLVOutput.FilePath="Fájl elérési útja"
+Default="Alapértelmezett"
 

plugins/obs-outputs/data/locale/it-IT.ini

@@ -2,4 +2,5 @@ RTMPStream="Stream RTMP"
 RTMPStream.DropThreshold="Abbassa il limite (millisecondi)"
 FLVOutput="Uscita file FLV"
 FLVOutput.FilePath="Destinazione file"
+Default="Predefinito"
 

plugins/obs-outputs/data/locale/ja-JP.ini

@@ -2,4 +2,5 @@ RTMPStream="RTMP ストリーム"
 RTMPStream.DropThreshold="ドロップしきい値 (ミリ秒)"
 FLVOutput="FLV ファイル出力"
 FLVOutput.FilePath="ファイルのパス"
+Default="既定"
 

plugins/obs-outputs/data/locale/ko-KR.ini

@@ -2,4 +2,5 @@ RTMPStream="RTMP 스트림"
 RTMPStream.DropThreshold="드롭 역치값 (밀리세컨드)"
 FLVOutput="FLV 파일 출력"
 FLVOutput.FilePath="파일 경로"
+Default="기본값"
 

plugins/obs-outputs/data/locale/nl-NL.ini

@@ -2,4 +2,5 @@ RTMPStream="RTMP Stream"
 RTMPStream.DropThreshold="Uitvaldrempel (milliseconden)"
 FLVOutput="FLV Bestandsuitvoer"
 FLVOutput.FilePath="Bestandspad"
+Default="Standaard"
 

plugins/obs-outputs/data/locale/pl-PL.ini

@@ -2,4 +2,5 @@ RTMPStream="Strumień RTMP"
 RTMPStream.DropThreshold="Próg odrzucania (w milisekundach)"
 FLVOutput="Wyjście do pliku FLV"
 FLVOutput.FilePath="Scieżka do pliku"
+Default="Domyślne"
 

plugins/obs-outputs/data/locale/pt-BR.ini

@@ -2,4 +2,5 @@ RTMPStream="Stream RTMP"
 RTMPStream.DropThreshold="Limiar de Corte (milissegundos)"
 FLVOutput="Arquivo de Saída FLV"
 FLVOutput.FilePath="Caminho do Arquivo"
+Default="Padrão"
 

plugins/obs-outputs/data/locale/ru-RU.ini

@@ -2,4 +2,5 @@ RTMPStream="Поток RTMP"
 RTMPStream.DropThreshold="Нижний порог (мс)"
 FLVOutput="Выходной файл FLV"
 FLVOutput.FilePath="Путь к файлу"
+Default="По умолчанию"
 

plugins/obs-outputs/data/locale/sr-CS.ini

@@ -2,4 +2,5 @@ RTMPStream="RTMP strim"
 RTMPStream.DropThreshold="Tolerancija ispuštanja (milisekunde)"
 FLVOutput="Izlaz u FLV datoteku"
 FLVOutput.FilePath="Putanja datoteke"
+Default="Podrazumevani"
 

plugins/obs-outputs/data/locale/sr-SP.ini

@@ -2,4 +2,5 @@ RTMPStream="RTMP стрим"
 RTMPStream.DropThreshold="Толеранција испуштања (milisekunde)"
 FLVOutput="Излаз у FLV датотеку"
 FLVOutput.FilePath="Путања датотеке"
+Default="Подразумевана"
 

plugins/obs-outputs/data/locale/sv-SE.ini

@@ -2,4 +2,5 @@ RTMPStream="RTMP-ström"
 RTMPStream.DropThreshold="Tappgräns (ms)"
 FLVOutput="FLV-filutmatning"
 FLVOutput.FilePath="Sökväg"
+Default="Standard"
 

plugins/obs-outputs/data/locale/uk-UA.ini

@@ -1,2 +1,6 @@
 RTMPStream="RTMP потік"
+RTMPStream.DropThreshold="Поріг втрат (мілісекунд)"
+FLVOutput="Вивід FLV файлу"
+FLVOutput.FilePath="Шлях до файлу"
+Default="За замовчанням"
 

plugins/obs-outputs/data/locale/zh-CN.ini

@@ -2,4 +2,5 @@ RTMPStream="RTMP 流"
 RTMPStream.DropThreshold="Drop阈值(毫秒)"
 FLVOutput="FLV 文件输出"
 FLVOutput.FilePath="文件路径"
+Default="默认"
 

plugins/obs-outputs/data/locale/zh-TW.ini

@@ -2,4 +2,5 @@ RTMPStream="RTMP 串流"
 RTMPStream.DropThreshold="丟棄閾值 (毫秒)"
 FLVOutput="FLV 檔案輸出"
 FLVOutput.FilePath="檔案路徑"
+Default="預設"
 

plugins/obs-outputs/librtmp/rtmp.c

@@ -695,10 +695,10 @@ add_addr_info(struct sockaddr_storage *service, socklen_t *addrlen, AVal *host,
         goto finish;
     }
 
-    // they should come back in OS preferred order
+    // prefer ipv4 results, since lots of ISPs have broken ipv6 connectivity
     for (ptr = result; ptr != NULL; ptr = ptr->ai_next)
     {
-        if (ptr->ai_family == AF_INET || ptr->ai_family == AF_INET6)
+        if (ptr->ai_family == AF_INET)
         {
             memcpy(service, ptr->ai_addr, ptr->ai_addrlen);
             *addrlen = (socklen_t)ptr->ai_addrlen;
@@ -706,6 +706,19 @@ add_addr_info(struct sockaddr_storage *service, socklen_t *addrlen, AVal *host,
         }
     }
 
+	if (!*addrlen)
+	{
+		for (ptr = result; ptr != NULL; ptr = ptr->ai_next)
+		{
+			if (ptr->ai_family == AF_INET6)
+			{
+				memcpy(service, ptr->ai_addr, ptr->ai_addrlen);
+				*addrlen = (socklen_t)ptr->ai_addrlen;
+				break;
+			}
+		}
+	}
+
     freeaddrinfo(result);
 
     if (service->ss_family == AF_UNSPEC || *addrlen == 0)
@@ -3091,7 +3104,10 @@ HandleInvoke(RTMP *r, const char *body, unsigned int nBodySize)
     {
         RTMP_Log(RTMP_LOGERROR, "rtmp server requested close");
         RTMP_Close(r);
-#if defined(CRYPTO) || defined(USE_ONLY_MD5)
+
+        // disabled this for now, if the server sends an rtmp close message librtmp
+        // will enter an infinite loop here until stack is exhausted.
+#if 0 && (defined(CRYPTO) || defined(USE_ONLY_MD5))
         if ((r->Link.protocol & RTMP_FEATURE_WRITE) &&
                 !(r->Link.pFlags & RTMP_PUB_CLEAN) &&
                 (  !(r->Link.pFlags & RTMP_PUB_NAME) ||

plugins/obs-outputs/rtmp-stream.c

@@ -42,11 +42,23 @@
 #define debug(format, ...) do_log(LOG_DEBUG,   format, ##__VA_ARGS__)
 
 #define OPT_DROP_THRESHOLD "drop_threshold_ms"
+#define OPT_PFRAME_DROP_THRESHOLD "pframe_drop_threshold_ms"
 #define OPT_MAX_SHUTDOWN_TIME_SEC "max_shutdown_time_sec"
 #define OPT_BIND_IP "bind_ip"
 
 //#define TEST_FRAMEDROPS
 
+#ifdef TEST_FRAMEDROPS
+
+#define DROPTEST_MAX_KBPS 3000
+#define DROPTEST_MAX_BYTES (DROPTEST_MAX_KBPS * 1000 / 8)
+
+struct droptest_info {
+	uint64_t ts;
+	size_t size;
+};
+#endif
+
 struct rtmp_stream {
 	obs_output_t     *output;
 
@@ -66,6 +78,7 @@ struct rtmp_stream {
 	os_sem_t         *send_sem;
 	os_event_t       *stop_event;
 	uint64_t         stop_ts;
+	uint64_t         shutdown_timeout_ts;
 
 	struct dstr      path, key;
 	struct dstr      username, password;
@@ -75,6 +88,8 @@ struct rtmp_stream {
 	/* frame drop variables */
 	int64_t          drop_threshold_usec;
 	int64_t          min_drop_dts_usec;
+	int64_t          pframe_drop_threshold_usec;
+	int64_t          pframe_min_drop_dts_usec;
 	int              min_priority;
 
 	int64_t          last_dts_usec;
@@ -82,6 +97,11 @@ struct rtmp_stream {
 	uint64_t         total_bytes_sent;
 	int              dropped_frames;
 
+#ifdef TEST_FRAMEDROPS
+	struct circlebuf droptest_info;
+	size_t           droptest_size;
+#endif
+
 	RTMP             rtmp;
 };
 
@@ -172,6 +192,9 @@ static void rtmp_stream_destroy(void *data)
 		os_sem_destroy(stream->send_sem);
 		pthread_mutex_destroy(&stream->packets_mutex);
 		circlebuf_free(&stream->packets);
+#ifdef TEST_FRAMEDROPS
+		circlebuf_free(&stream->droptest_info);
+#endif
 		bfree(stream);
 	}
 }
@@ -203,7 +226,7 @@ static void rtmp_stream_stop(void *data, uint64_t ts)
 {
 	struct rtmp_stream *stream = data;
 
-	if (stopping(stream))
+	if (stopping(stream) && ts != 0)
 		return;
 
 	if (connecting(stream))
@@ -212,6 +235,10 @@ static void rtmp_stream_stop(void *data, uint64_t ts)
 	stream->stop_ts = ts / 1000ULL;
 	os_event_signal(stream->stop_event);
 
+	if (ts)
+		stream->shutdown_timeout_ts = ts +
+			(uint64_t)stream->max_shutdown_time_sec * 1000000000ULL;
+
 	if (active(stream)) {
 		if (stream->stop_ts == 0)
 			os_sem_post(stream->send_sem);
@@ -285,6 +312,40 @@ static bool discard_recv_data(struct rtmp_stream *stream, size_t size)
 	return true;
 }
 
+#ifdef TEST_FRAMEDROPS
+static void droptest_cap_data_rate(struct rtmp_stream *stream, size_t size)
+{
+	uint64_t ts = os_gettime_ns();
+	struct droptest_info info;
+
+	info.ts = ts;
+	info.size = size;
+
+	circlebuf_push_back(&stream->droptest_info, &info, sizeof(info));
+	stream->droptest_size += size;
+
+	if (stream->droptest_info.size) {
+		circlebuf_peek_front(&stream->droptest_info,
+				&info, sizeof(info));
+
+		if (stream->droptest_size > DROPTEST_MAX_BYTES) {
+			uint64_t elapsed = ts - info.ts;
+
+			if (elapsed < 1000000000ULL) {
+				elapsed = 1000000000ULL - elapsed;
+				os_sleepto_ns(ts + elapsed);
+			}
+
+			while (stream->droptest_size > DROPTEST_MAX_BYTES) {
+				circlebuf_pop_front(&stream->droptest_info,
+						&info, sizeof(info));
+				stream->droptest_size -= info.size;
+			}
+		}
+	}
+}
+#endif
+
 static int send_packet(struct rtmp_stream *stream,
 		struct encoder_packet *packet, bool is_header, size_t idx)
 {
@@ -306,9 +367,11 @@ static int send_packet(struct rtmp_stream *stream,
 	}
 
 	flv_packet_mux(packet, &data, &size, is_header);
+
 #ifdef TEST_FRAMEDROPS
-	os_sleep_ms(rand() % 40);
+	droptest_cap_data_rate(stream, size);
 #endif
+
 	ret = RTMP_Write(&stream->rtmp, (char*)data, (int)size, (int)idx);
 	bfree(data);
 
@@ -320,6 +383,19 @@ static int send_packet(struct rtmp_stream *stream,
 
 static inline bool send_headers(struct rtmp_stream *stream);
 
+static inline bool can_shutdown_stream(struct rtmp_stream *stream,
+		struct encoder_packet *packet)
+{
+	uint64_t cur_time = os_gettime_ns();
+	bool timeout = cur_time >= stream->shutdown_timeout_ts;
+
+	if (timeout)
+		info("Stream shutdown timeout reached (%d second(s))",
+				stream->max_shutdown_time_sec);
+
+	return timeout || packet->sys_dts_usec >= (int64_t)stream->stop_ts;
+}
+
 static void *send_thread(void *data)
 {
 	struct rtmp_stream *stream = data;
@@ -337,7 +413,7 @@ static void *send_thread(void *data)
 			continue;
 
 		if (stopping(stream)) {
-			if (packet.sys_dts_usec >= (int64_t)stream->stop_ts) {
+			if (can_shutdown_stream(stream, &packet)) {
 				obs_free_encoder_packet(&packet);
 				break;
 			}
@@ -586,18 +662,7 @@ static int try_connect(struct rtmp_stream *stream)
 
 	RTMP_EnableWrite(&stream->rtmp);
 
-	dstr_copy(&stream->encoder_name, "FMLE/3.0 (compatible; obs-studio/");
-
-#ifdef HAVE_OBSCONFIG_H
-	dstr_cat(&stream->encoder_name, OBS_VERSION);
-#else
-	dstr_catf(&stream->encoder_name, "%d.%d.%d",
-			LIBOBS_API_MAJOR_VER,
-			LIBOBS_API_MINOR_VER,
-			LIBOBS_API_PATCH_VER);
-#endif
-
-	dstr_cat(&stream->encoder_name, "; FMSc/1.0)");
+	dstr_copy(&stream->encoder_name, "FMLE/3.0 (compatible; FMSc/1.0)");
 
 	set_rtmp_dstr(&stream->rtmp.Link.pubUser,   &stream->username);
 	set_rtmp_dstr(&stream->rtmp.Link.pubPasswd, &stream->password);
@@ -652,6 +717,8 @@ static bool init_connect(struct rtmp_stream *stream)
 	obs_service_t *service;
 	obs_data_t *settings;
 	const char *bind_ip;
+	int64_t drop_p;
+	int64_t drop_b;
 
 	if (stopping(stream))
 		pthread_join(stream->send_thread, NULL);
@@ -675,11 +742,17 @@ static bool init_connect(struct rtmp_stream *stream)
 	dstr_copy(&stream->password, obs_service_get_password(service));
 	dstr_depad(&stream->path);
 	dstr_depad(&stream->key);
-	stream->drop_threshold_usec =
-		(int64_t)obs_data_get_int(settings, OPT_DROP_THRESHOLD) * 1000;
+	drop_b = (int64_t)obs_data_get_int(settings, OPT_DROP_THRESHOLD);
+	drop_p = (int64_t)obs_data_get_int(settings, OPT_PFRAME_DROP_THRESHOLD);
 	stream->max_shutdown_time_sec =
 		(int)obs_data_get_int(settings, OPT_MAX_SHUTDOWN_TIME_SEC);
 
+	if (drop_p < (drop_b + 200))
+		drop_p = drop_b + 200;
+
+	stream->drop_threshold_usec = 1000 * drop_b;
+	stream->pframe_drop_threshold_usec = 1000 * drop_p;
+
 	bind_ip = obs_data_get_string(settings, OPT_BIND_IP);
 	dstr_copy(&stream->bind_ip, bind_ip);
 
@@ -741,14 +814,18 @@ static inline size_t num_buffered_packets(struct rtmp_stream *stream)
 	return stream->packets.size / sizeof(struct encoder_packet);
 }
 
-static void drop_frames(struct rtmp_stream *stream)
+static void drop_frames(struct rtmp_stream *stream, const char *name,
+		int highest_priority, int64_t *p_min_dts_usec)
 {
 	struct circlebuf new_buf            = {0};
-	int              drop_priority      = 0;
 	uint64_t         last_drop_dts_usec = 0;
 	int              num_frames_dropped = 0;
 
-	debug("Previous packet count: %d", (int)num_buffered_packets(stream));
+#ifdef _DEBUG
+	int start_packets = (int)num_buffered_packets(stream);
+#else
+	UNUSED_PARAMETER(name);
+#endif
 
 	circlebuf_reserve(&new_buf, sizeof(struct encoder_packet) * 8);
 
@@ -760,56 +837,71 @@ static void drop_frames(struct rtmp_stream *stream)
 
 		/* do not drop audio data or video keyframes */
 		if (packet.type          == OBS_ENCODER_AUDIO ||
-		    packet.drop_priority == OBS_NAL_PRIORITY_HIGHEST) {
+		    packet.drop_priority >= highest_priority) {
 			circlebuf_push_back(&new_buf, &packet, sizeof(packet));
 
 		} else {
-			if (drop_priority < packet.drop_priority)
-				drop_priority = packet.drop_priority;
-
 			num_frames_dropped++;
 			obs_free_encoder_packet(&packet);
 		}
 	}
 
 	circlebuf_free(&stream->packets);
-	stream->packets           = new_buf;
-	stream->min_priority      = drop_priority;
-	stream->min_drop_dts_usec = last_drop_dts_usec;
+	stream->packets = new_buf;
+
+	if (stream->min_priority < highest_priority)
+		stream->min_priority = highest_priority;
+
+	*p_min_dts_usec = last_drop_dts_usec;
 
 	stream->dropped_frames += num_frames_dropped;
-	debug("New packet count: %d", (int)num_buffered_packets(stream));
+#ifdef _DEBUG
+	debug("Dropped %s, prev packet count: %d, new packet count: %d",
+			name,
+			start_packets,
+			(int)num_buffered_packets(stream));
+#endif
 }
 
-static void check_to_drop_frames(struct rtmp_stream *stream)
+static void check_to_drop_frames(struct rtmp_stream *stream, bool pframes)
 {
 	struct encoder_packet first;
 	int64_t buffer_duration_usec;
+	size_t num_packets = num_buffered_packets(stream);
+	const char *name = pframes ? "p-frames" : "b-frames";
+	int priority = pframes ?
+		OBS_NAL_PRIORITY_HIGHEST : OBS_NAL_PRIORITY_HIGH;
+	int64_t *p_min_dts_usec = pframes ?
+		&stream->pframe_min_drop_dts_usec :
+		&stream->min_drop_dts_usec;
+	int64_t drop_threshold = pframes ?
+		stream->pframe_drop_threshold_usec :
+		stream->drop_threshold_usec;
 
-	if (num_buffered_packets(stream) < 5)
+	if (num_packets < 5)
 		return;
 
 	circlebuf_peek_front(&stream->packets, &first, sizeof(first));
 
 	/* do not drop frames if frames were just dropped within this time */
-	if (first.dts_usec < stream->min_drop_dts_usec)
+	if (first.dts_usec < *p_min_dts_usec)
 		return;
 
 	/* if the amount of time stored in the buffered packets waiting to be
 	 * sent is higher than threshold, drop frames */
 	buffer_duration_usec = stream->last_dts_usec - first.dts_usec;
 
-	if (buffer_duration_usec > stream->drop_threshold_usec) {
-		drop_frames(stream);
-		debug("dropping %" PRId64 " worth of frames",
-				buffer_duration_usec);
+	if (buffer_duration_usec > drop_threshold) {
+		debug("buffer_duration_usec: %lld", buffer_duration_usec);
+		drop_frames(stream, name, priority, p_min_dts_usec);
 	}
 }
 
 static bool add_video_packet(struct rtmp_stream *stream,
 		struct encoder_packet *packet)
 {
-	check_to_drop_frames(stream);
+	check_to_drop_frames(stream, false);
+	check_to_drop_frames(stream, true);
 
 	/* if currently dropping frames, drop packets until it reaches the
 	 * desired priority */
@@ -855,8 +947,9 @@ static void rtmp_stream_data(void *data, struct encoder_packet *packet)
 
 static void rtmp_stream_defaults(obs_data_t *defaults)
 {
-	obs_data_set_default_int(defaults, OPT_DROP_THRESHOLD, 600);
-	obs_data_set_default_int(defaults, OPT_MAX_SHUTDOWN_TIME_SEC, 5);
+	obs_data_set_default_int(defaults, OPT_DROP_THRESHOLD, 500);
+	obs_data_set_default_int(defaults, OPT_PFRAME_DROP_THRESHOLD, 800);
+	obs_data_set_default_int(defaults, OPT_MAX_SHUTDOWN_TIME_SEC, 30);
 	obs_data_set_default_string(defaults, OPT_BIND_IP, "default");
 }