Keeping the reference to all globals, resetting the MP4 struct on a new

moof, adding a restart feature

Author: wberube

res/index.html

@@ -260,6 +260,21 @@
 			}
 		}
 
+		function restartApp() {
+			var req = new XMLHttpRequest();
+			req.onreadystatechange = function() {
+				if (this.readyState != 4 || this.status != 200) return;
+				var dec = JSON.parse(req.responseText);
+				for (var key in dec) {
+					if (!dec.hasOwnProperty(key)) continue;
+					if (key == 'code' && dec[key] !== 0)
+						return alert('Failed to restart streamer!');
+				}
+			}
+			req.open('GET', '/api/cmd?restart');
+			req.send();
+		}
+
 		function saveConfig() {
 			var req = new XMLHttpRequest();
 			req.onreadystatechange = function() {
@@ -413,6 +428,7 @@ <h2 class="unl">Live</h2>
 			<b><label for="media-modal" class="lbl-modal ph2 gray">Divinus</label></b>
 			<div class="col">
 				<a href="javascript:saveConfig()" class="ph2">Save</a>
+				<a href="javascript:restartApp()" class="ph2">Restart</a>
 				<label for="media-modal" class="btn primary close">Close</label>
 			</div>
 		</div>
@@ -655,6 +671,7 @@ <h2 class="unl">Media</h2>
 			<div class="col">
 				<a href="javascript:saveOsds()" class="ph2">Apply all</a>
 				<a href="javascript:saveConfig()" class="ph2">Save</a>
+				<a href="javascript:restartApp()" class="ph2">Restart</a>
 				<label for="osd-modal" class="btn primary close">Close</label>
 			</div>
 		</div>
@@ -711,6 +728,8 @@ <h2 class="unl">OSD</h2>
 		<div class="c bg-black menu pv2 row" tabindex="0">
 			<b><label for="system-modal" class="lbl-modal ph2 gray">Divinus</label></b>
 			<div class="col">
+			    <a href="javascript:saveConfig()" class="ph2">Save</a>
+			    <a href="javascript:restartApp()" class="ph2">Restart</a>
 				<label for="system-modal" class="btn primary close">Close</label>
 			</div>
 		</div>

src/fmt/moof.c

@@ -57,6 +57,12 @@ enum BufError write_moof(
     const uint32_t samples_aud_len) {
     enum BufError err;
     uint32_t start_atom = ptr->offset;
+
+    pos_sequence_number = 0;
+    pos_base_data_offset = 0;
+    pos_audio_media_decode_time = 0;
+    pos_video_media_decode_time = 0;
+
     err = put_u32_be(ptr, 0);
     chk_err;
     err = put_str4(ptr, "moof");

src/hal/globals.h

@@ -2,7 +2,8 @@
 
 #include "types.h"
 
-extern char audioOn, keepRunning;
+extern char graceful, keepRunning;
+extern char audioOn, recordOn;
 
 extern void *aud_thread;
 extern void *isp_thread;

src/http_post.h

@@ -10,10 +10,9 @@
 #include <time.h>
 #include <unistd.h>
 
+#include "hal/globals.h"
 #include "hal/macros.h"
 #include "jpeg.h"
 
-extern char keepRunning;
-
 void start_http_post_send();
-void stop_http_post_send();
+void stop_http_post_send();

src/main.c

@@ -35,7 +35,7 @@ void handle_exit(int signo) {
 int main(int argc, char *argv[]) {
     {
         char signal_error[] = {SIGABRT, SIGBUS, SIGFPE, SIGILL, SIGSEGV};
-        char signal_exit[] = {SIGINT, SIGQUIT, SIGTERM};
+        char signal_exit[] = {SIGHUP, SIGINT, SIGQUIT, SIGTERM};
         char signal_null[] = {EPIPE, SIGPIPE};
 
         for (char *s = signal_error; s < (&signal_error)[1]; s++)
@@ -133,6 +133,11 @@ int main(int argc, char *argv[]) {
     if (!graceful)
         restore_app_config();
 
+    if (graceful) {
+        fprintf(stderr, "Restarting...\n");
+        execvp(argv[0], argv);
+    }
+
     fprintf(stderr, "Main thread is shutting down...\n");
     return EXIT_SUCCESS;
-}
+}

src/region.h

@@ -9,6 +9,7 @@
 #include <time.h>
 
 #include "app_config.h"
+#include "hal/globals.h"
 #include "hal/support.h"
 #include "lib/spng.h"
 #include "text.h"
@@ -24,8 +25,6 @@
 #define DEF_TIMEFMT "%Y/%m/%d %H:%M:%S"
 #define MAX_OSD 10
 
-extern char keepRunning;
-
 typedef struct {
     unsigned int size;
     unsigned short reserved1;
@@ -75,4 +74,4 @@ extern osd osds[MAX_OSD];
 extern char timefmt[64];
 
 int start_region_handler();
-void stop_region_handler();
+void stop_region_handler();

src/rtmp.h

@@ -14,6 +14,7 @@
 #include "app_config.h"
 #include "fmt/flv.h"
 #include "fmt/nal.h"
+#include "hal/globals.h"
 #include "hal/macros.h"
 #include "hal/tools.h"
 #include "hal/types.h"
@@ -37,9 +38,7 @@
 #define RTMP_CS_AUDIO           4
 #define RTMP_CS_VIDEO           6
 
-extern char keepRunning;
-
 int rtmp_init(const char *url);
 void rtmp_close(void);
 int rtmp_ingest_video(hal_vidpack *packet, int is_h265);
-int rtmp_ingest_audio(void *data, int len);
+int rtmp_ingest_audio(void *data, int len);

src/server.c

@@ -878,6 +878,10 @@ void respond_request(http_request_t *req) {
                     else
                         HAL_WARNING("server", "Failed to save configuration!\n");
                     break;
+                } else if (EQUALS(key, "restart")) {
+                    kill(getpid(), SIGHUP);
+                    result = 0;
+                    break;
                 }
             }
         }

src/server.h

@@ -20,6 +20,7 @@
 #include "app_config.h"
 #include "fmt/mp4.h"
 #include "fmt/nal.h"
+#include "hal/globals.h"
 #include "hal/types.h"
 #include "jpeg.h"
 #include "media.h"
@@ -29,7 +30,6 @@
 #include "region.h"
 #include "watchdog.h"
 
-extern char graceful, keepRunning, recordOn;
 extern time_t recordStartTime;
 
 int start_server();