Getting rid of dead code

wberube · wberube · commit 73efc38d21ba · 2026-02-05T04:38:58.000Z
diff --git a/src/hal/tools.c b/src/hal/tools.c
@@ -10,7 +10,7 @@ int base64_decode(char *decoded, const char *string, int maxLen) {
     while (*string && *string != '=' && i < maxLen) {
         const char *p = strchr(base64_table, *string++);
         if (!p) continue;
-        
+
         v = p - base64_table;
         switch (buflen) {
             case 0:
@@ -86,34 +86,34 @@ int color_parse(const char *str) {
     char *remain = NULL;
     int len = strlen(str);
     int result = 0;
-    
+
     // Ignore leading spaces
     while (*str == ' ' || *str == '\t') str++;
-    
+
     // 4-bit hex format "#RGB"
     if (str[0] == '#' && len == 4) {
         int r = hex_to_int(str[1]);
         int g = hex_to_int(str[2]);
         int b = hex_to_int(str[3]);
-        
+
         if (r >= 0 && g >= 0 && b >= 0)
             return (1 << 16) | (r << 11) | (g << 6) | (b << 1);
     }
-    
+
     // 8-bit hex format "#RRGGBB"
     else if (str[0] == '#') {
         result = strtol(str + 1, &remain, 16);
         if (remain != str + 1 && *remain == '\0')
             return color_convert555(result);
     }
-    
+
     // C standard format "0xRRGGBB"
     else if (str[0] == '0' && (str[1] == 'x' || str[1] == 'X')) {
         result = strtol(str, &remain, 0);
         if (remain != str && *remain == '\0')
             return color_convert555(result);
     }
-    
+
     // No prefix format "RRGGBB"
     else if (len >= 6) {
         result = strtol(str, &remain, 16);
@@ -143,10 +143,10 @@ int compile_regex(regex_t *r, const char *regex_text) {
 int escape_url(char *dst, const char *src, size_t maxlen) {
     static const char hex[] = "0123456789ABCDEF";
     int len = 0;
-    
+
     if (!dst || !src || !maxlen)
         return 0;
-        
+
     while (*src && len < maxlen - 1) {
         unsigned char c = *src;
 
@@ -156,16 +156,16 @@ int escape_url(char *dst, const char *src, size_t maxlen) {
         } else {
             if (len + 3 > maxlen - 1)
                 break;
-                
+
             *dst++ = '%';
             *dst++ = hex[c >> 4];
             *dst++ = hex[c & 0xF];
             len += 3;
         }
-        
+
         src++;
     }
-    
+
     *dst = '\0';
     return len;
 }
@@ -301,7 +301,7 @@ int hex_to_int(char value) {
 unsigned int ip_to_int(const char *ip) {
     struct in_addr addr;
 
-    if (!inet_aton(ip, &addr)) 
+    if (!inet_aton(ip, &addr))
         return 0;
 
     return ntohl(addr.s_addr);
@@ -390,7 +390,7 @@ static void sha1_transform(unsigned int state[5], const unsigned char buffer[64]
     e = state[4];
 
     for (i = 0; i < 20; i++) {
-        unsigned int temp = ((a << 5) | (a >> 27)) + 
+        unsigned int temp = ((a << 5) | (a >> 27)) +
             ((b & c) | ((~b) & d)) + e + w[i] + 0x5A827999;
         e = d;
         d = c;
@@ -482,18 +482,6 @@ char *split(char **input, char *sep) {
     return (curr);
 }
 
-uint32_t time_get_ms(void) {
-    struct timeval tv;
-    gettimeofday(&tv, NULL);
-    return (uint32_t)(tv.tv_sec * 1000 + tv.tv_usec / 1000);
-}
-
-unsigned long long time_get_us(void) {
-    struct timeval tv;
-    gettimeofday(&tv, NULL);
-    return (unsigned long long)tv.tv_sec * 1000000 + tv.tv_usec;
-}
-
 void unescape_uri(char *uri) {
     char *src = uri;
     char *dst = uri;
@@ -525,4 +513,4 @@ void uuid_generate(char *uuid) {
         }
     }
     uuid[36] = '\0';
-}
+}
diff --git a/src/hal/tools.h b/src/hal/tools.h
@@ -31,7 +31,7 @@ typedef struct {
 void *mmap64(void *start, size_t len, int prot, int flags, int fd, off_t off);
 
 static inline int alt_isspace(int c) {
-    return (c == ' ' || c == '\f' || c == '\n' || 
+    return (c == ' ' || c == '\f' || c == '\n' ||
             c == '\r' || c == '\t' || c == '\v');
 }
 
@@ -83,10 +83,6 @@ void sha1_final(unsigned char digest[20], sha1_context *context);
 
 char *split(char **input, char *sep);
 
-uint32_t time_get_ms(void);
-
-unsigned long long time_get_us(void);
-
 void unescape_uri(char *uri);
 
-void uuid_generate(char *uuid);
+void uuid_generate(char *uuid);
diff --git a/src/rtmp.c b/src/rtmp.c
@@ -25,8 +25,8 @@ static int queue_count;
 static size_t queue_total_bytes;
 
 static uint32_t get_rtmp_timestamp() {
-    if (start_timestamp == 0) start_timestamp = time_get_ms();
-    return time_get_ms() - start_timestamp;
+    if (start_timestamp == 0) start_timestamp = millis();
+    return millis() - start_timestamp;
 }
 
 static int send_data(const void *buf, size_t len) {
@@ -142,13 +142,13 @@ static int rtmp_send_packet(int message_type, int stream_id, const void *data, i
 
 static void queue_push(int type, int stream_id, int timestamp, const void *data, size_t len, bool force) {
     pthread_mutex_lock(&queue_mutex);
-    
+
     if (!force && queue_total_bytes + len > MAX_QUEUE_BYTES) {
         HAL_WARNING("rtmp", "Queue full (%zu/%zu bytes), dropping packet!\n", queue_total_bytes, MAX_QUEUE_BYTES);
         pthread_mutex_unlock(&queue_mutex);
         return;
     }
-    
+
     RtmpPacket *pkt = malloc(sizeof(RtmpPacket));
     if (!pkt) {
         pthread_mutex_unlock(&queue_mutex);
@@ -185,7 +185,7 @@ static void *send_thread(void *arg) {
         while (queue_head == NULL && keepRunning && is_connected) {
             pthread_cond_wait(&queue_cond, &queue_mutex);
         }
-        
+
         if (!keepRunning || !is_connected) {
             pthread_mutex_unlock(&queue_mutex);
             break;
@@ -199,7 +199,7 @@ static void *send_thread(void *arg) {
         pthread_mutex_unlock(&queue_mutex);
 
         rtmp_send_packet(pkt->type, pkt->stream_id, pkt->data, pkt->len, pkt->timestamp);
-        
+
         free(pkt->data);
         free(pkt);
     }
@@ -261,29 +261,29 @@ static int rtmp_start_sequence(const char *url) {
     char *p = (char *)url;
     if (strncmp(p, "rtmp://", 7) != 0) return -1;
     p += 7;
-    
+
     char *slash = strchr(p, '/');
     if (!slash) return -1;
-    
+
     int host_len = slash - p;
     strncpy(host, p, host_len);
     host[host_len] = '\0';
-    
+
     char *curr_host = host;
     char *colon = strchr(host, ':');
     if (colon) {
         *colon = '\0';
         port = atoi(colon + 1);
     }
-    
+
     p = slash + 1;
     slash = strchr(p, '/');
     if (!slash) return -1;
-    
+
     int app_len = slash - p;
     strncpy(app, p, app_len);
     app[app_len] = '\0';
-    
+
     strcpy(stream, slash + 1);
 
     struct hostent *he = gethostbyname(curr_host);
@@ -312,7 +312,7 @@ static int rtmp_start_sequence(const char *url) {
 
     char tcurl[512];
     snprintf(tcurl, sizeof(tcurl), "rtmp://%s:%d/%s", curr_host, port, app);
-    
+
     if (rtmp_connect(app, tcurl) < 0) return -1;
     if (rtmp_create_stream() < 0) return -1;
     if (rtmp_publish(stream) < 0) return -1;
@@ -340,14 +340,14 @@ static void *recv_thread(void *arg) {
  */
 int rtmp_init(const char *url) {
     if (is_connected) rtmp_close();
-    
+
     pthread_mutex_lock(&rtmp_mutex);
     memset(&flv_state, 0, sizeof(flv_state));
     seq_header_sent = false;
     metadata_sent = false;
     int ret = rtmp_start_sequence(url);
     if (ret == 0) {
-        start_timestamp = time_get_ms();
+        start_timestamp = millis();
         is_connected = true;
 
         if (pthread_create(&recvPid, NULL, recv_thread, NULL)) {
@@ -396,7 +396,7 @@ void rtmp_close(void) {
         pthread_join(recvPid, NULL);
         pthread_join(sndPid, NULL);
     }
-    
+
     pthread_mutex_lock(&queue_mutex);
     while (queue_head) {
         RtmpPacket *pkt = queue_head;
@@ -408,7 +408,7 @@ void rtmp_close(void) {
     queue_count = 0;
     queue_total_bytes = 0;
     pthread_mutex_unlock(&queue_mutex);
-    
+
     pthread_mutex_unlock(&rtmp_mutex);
     HAL_INFO("rtmp", "RTMP has closed!\n");
 }
@@ -422,30 +422,30 @@ void rtmp_close(void) {
 int rtmp_ingest_video(hal_vidpack *packet, int is_h265) {
     if (!is_connected) return EXIT_FAILURE;
     if (!packet || !packet->data) return EXIT_FAILURE;
-    
+
     pthread_mutex_lock(&rtmp_mutex);
-    
+
     uint32_t now = get_rtmp_timestamp();
     flv_state.timestamp_ms = now;
     flv_state.audio_timestamp_ms = now;
 
     int count = packet->naluCnt;
     if (count > 8) count = 8;
-    
+
     for (int i = 0; i < count; i++) {
         hal_vidnalu *nalu = &packet->nalu[i];
         if (nalu->length == 0) continue;
 
         if (nalu->offset + nalu->length > packet->length) {
-            HAL_WARNING("rtmp", "NAL offset is out of bounds (off=%u len=%u total=%u)\n", 
+            HAL_WARNING("rtmp", "NAL offset is out of bounds (off=%u len=%u total=%u)\n",
                 nalu->offset, nalu->length, packet->length);
             continue;
         }
 
         uint8_t *nal_start = packet->data + nalu->offset;
         uint32_t nal_len = nalu->length;
         int type = nalu->type;
-        
+
         bool is_slice = false;
         bool is_idr = false;
 
@@ -473,7 +473,7 @@ int rtmp_ingest_video(hal_vidpack *packet, int is_h265) {
                  meta.buf = meta_buf;
                  meta.size = sizeof(meta_buf);
                  meta.offset = 0;
-                 
+
                 if (flv_get_metadata(&meta) == BUF_OK && meta.offset > 0) {
                      queue_push(RTMP_MSG_AMF_META, 1, 0, meta.buf, meta.offset, true);
                      metadata_sent = true;
@@ -482,16 +482,16 @@ int rtmp_ingest_video(hal_vidpack *packet, int is_h265) {
             }
 
             if (!seq_header_sent) {
-                if (!is_idr) continue; 
-                
+                if (!is_idr) continue;
+
                 struct BitBuf header;
                 if (flv_get_header(&header) == BUF_OK && header.offset > 11) {
                     queue_push(RTMP_MSG_VIDEO, 1, 0, header.buf + 11, header.offset - 15, true);
                     seq_header_sent = true;
                     HAL_INFO("rtmp", "Sent video sequence header (size=%d)\n", header.offset - 15);
                 } else {
                      HAL_WARNING("rtmp", "Waiting for header generation...\n");
-                     continue; 
+                     continue;
                 }
             }
 
@@ -502,17 +502,17 @@ int rtmp_ingest_video(hal_vidpack *packet, int is_h265) {
                      if (flv_get_tags(&tags) == BUF_OK && tags.offset > 15) {
                          queue_push(RTMP_MSG_VIDEO, 1, flv_state.timestamp_ms, tags.buf + 11, tags.offset - 15, false);
                      }
-                     
+
                      if (flv_get_audio_tags(&tags) == BUF_OK && tags.offset > 15) {
                          flv_set_state(&flv_state);
-                         
+
                          queue_push(RTMP_MSG_AUDIO, 1, flv_state.audio_timestamp_ms, tags.buf + 11, tags.offset - 15, false);
                      }
                  }
             }
         }
     }
-    
+
     pthread_mutex_unlock(&rtmp_mutex);
     return EXIT_SUCCESS;
 }
@@ -525,16 +525,16 @@ int rtmp_ingest_video(hal_vidpack *packet, int is_h265) {
  */
 int rtmp_ingest_audio(void *data, int len) {
     if (!is_connected) return EXIT_FAILURE;
-    
+
     if (!seq_header_sent) return EXIT_SUCCESS;
 
     pthread_mutex_lock(&rtmp_mutex);
-    
+
     if (flv_ingest_audio((char*)data, len) != BUF_OK) {
         pthread_mutex_unlock(&rtmp_mutex);
         return EXIT_FAILURE;
     }
 
     pthread_mutex_unlock(&rtmp_mutex);
     return EXIT_SUCCESS;
-}
+}
