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

[Stephan Holljes]

Signed-off-by: Stephan Holljes 
---
 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 */
+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 */
-- 
2.16.2

___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

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

[Stephan Holljes]

Signed-off-by: Stephan Holljes 
---
 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 */
+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 */
-- 
2.16.2

___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

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

[Stephan Holljes]

Signed-off-by: Stephan Holljes 
---
 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 */
+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 */
-- 
2.16.2

___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

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

[Michael Niedermayer]

On Mon, May 28, 2018 at 08:18:55PM +0200, Stephan Holljes wrote:
> Signed-off-by: Stephan Holljes 
> ---
>  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

[...]
-- 
Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

Those who are best at talking, realize last or never when they are wrong.


signature.asc
Description: PGP signature
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel