diff mbox

[FFmpeg-devel,4/8] httpd.h: Adapt structs to config file

Message ID 20180528181859.12182-5-klaxa1337@googlemail.com
State Superseded
Headers show

Commit Message

Stephan Holljes May 28, 2018, 6:18 p.m. UTC 
Signed-off-by: Stephan Holljes <klaxa1337@googlemail.com>
---
 httpd.h | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

Comments

Michael Niedermayer May 28, 2018, 9:58 p.m. UTC | #1 
On Mon, May 28, 2018 at 08:18:55PM +0200, Stephan Holljes wrote:
> Signed-off-by: Stephan Holljes <klaxa1337@googlemail.com>
> ---
>  httpd.h | 17 +++++++++++++++++
>  1 file changed, 17 insertions(+)
> 
> diff --git a/httpd.h b/httpd.h
> index 6fb91bd..25cbe11 100644
> --- a/httpd.h
> +++ b/httpd.h
> @@ -26,11 +26,28 @@
>  
>  #include "publisher.h"
>  
> +/* Supported stream formats, for now only matroska */

writing this as /** ...
should make it show up in doxygen docs

[...]
diff mbox

Patch

diff --git a/httpd.h b/httpd.h
index 6fb91bd..25cbe11 100644
--- a/httpd.h
+++ b/httpd.h
@@ -26,11 +26,28 @@ 
 
 #include "publisher.h"
 
+/* Supported stream formats, for now only matroska */
+enum StreamFormat {
+    FMT_MATROSKA = 0,
+    FMT_NB,
+};
+
+/* Stream Config struct */
+struct StreamConfig {
+    char *stream_name;
+    char *input_uri;
+    enum StreamFormat *formats;
+    int nb_formats;
+};
+
 /* HTTPD Config struct */
 struct HTTPDConfig {
+    char *server_name;
     char *bind_address;
     int port;
     int accept_timeout;
+    struct StreamConfig *streams;
+    int nb_streams;
 };
 
 /* HTTPClient struct, this information is shared between ffserver and the httpd implementation */