jordan/camera-streamer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Store Range: header

Browse Source
This commit is contained in:
Kamil Trzcinski 2022-04-12 11:56:35 +02:00
parent 70b9a513ad
commit 6d0492e35a
3 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ffmpeg/remuxer.c
View File

@ -114,6 +114,8 @@ int ffmpeg_remuxer_open(ffmpeg_remuxer_t *remuxer)
int ffmpeg_remuxer_close(ffmpeg_remuxer_t *remuxer) int ffmpeg_remuxer_close(ffmpeg_remuxer_t *remuxer)
{ {
if (remuxer->output_context)
av_write_trailer(remuxer->output_context);
ffmpeg_remuxer_close_avcontext(&remuxer->input_context); ffmpeg_remuxer_close_avcontext(&remuxer->input_context);
ffmpeg_remuxer_close_avcontext(&remuxer->output_context); ffmpeg_remuxer_close_avcontext(&remuxer->output_context);
av_packet_free(&remuxer->packet); av_packet_free(&remuxer->packet);

11
http/http.c
View File

@ -1,6 +1,9 @@
#define _GNU_SOURCE
#include <unistd.h> #include <unistd.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <netinet/in.h> #include <netinet/in.h>
@ -13,8 +16,6 @@
#include "http/http.h" #include "http/http.h"
#include "opts/log.h" #include "opts/log.h"
#define BUFSIZE 256
static int http_listen(int port, int maxcons) static int http_listen(int port, int maxcons)
{ {
struct sockaddr_in server = {0}; struct sockaddr_in server = {0};
@ -58,6 +59,8 @@ static void http_process(http_worker_t *worker, FILE *stream)
return; return;
} }
worker->range_header[0] = 0;
// Consume headers // Consume headers
for(int i = 0; i < 50; i++) { for(int i = 0; i < 50; i++) {
char line[BUFSIZE]; char line[BUFSIZE];
@ -65,6 +68,10 @@ static void http_process(http_worker_t *worker, FILE *stream)
return; return;
if (line[0] == '\r' && line[1] == '\n') if (line[0] == '\r' && line[1] == '\n')
break; break;
if (strcasestr(line, "Range:") == line) {
strcpy(worker->range_header, line);
}
} }
worker->current_method = NULL; worker->current_method = NULL;

5
http/http.h
View File

@ -11,6 +11,8 @@ typedef struct http_worker_s http_worker_t;
typedef void (*http_method_fn)(struct http_worker_s *worker, FILE *stream); typedef void (*http_method_fn)(struct http_worker_s *worker, FILE *stream);
#define BUFSIZE 256
typedef struct http_method_s { typedef struct http_method_s {
const char *name; const char *name;
http_method_fn func; http_method_fn func;
@ -29,7 +31,8 @@ typedef struct http_worker_s {
int client_fd; int client_fd;
struct sockaddr_in client_addr; struct sockaddr_in client_addr;
char *client_host; char *client_host;
char client_method[256]; char client_method[BUFSIZE];
char range_header[BUFSIZE];
http_method_t *current_method; http_method_t *current_method;
} http_worker_t; } http_worker_t;