Signed-off-by: Stephan Holljes
---
test.sh | 86 +
test_config.lua | 10 +++
2 files changed, 96 insertions(+)
create mode 100644 test.sh
create mode 100644 test_config.lua
diff --git a/test.sh b/test.sh
new file mode 100644
On Sat, Aug 11, 2018 at 3:58 AM, Michael Niedermayer
wrote:
> On Thu, Aug 09, 2018 at 02:46:59PM +0200, Stephan Holljes wrote:
>> On Thu, Aug 2, 2018 at 1:00 AM, Stephan Holljes
>> wrote:
>> > After fighting for a bit too long, I am finally submitting this patch
&g
This patch adds a simple test to ffserver. For the time being it only properly
works with mkv. For HLS the timestamps appear to be incorrect (segments that
should be 2 seconds long are 180 seconds in the m3u8) and DASH appears to
not work at all (mpv and ffmpeg report invalid data).
I'll
On Thu, Aug 2, 2018 at 1:00 AM, Stephan Holljes
wrote:
> After fighting for a bit too long, I am finally submitting this patch series
> that adds the more mature libmicrohttpd library. Client disconnect detection
> is not really taken care of as of now, clients will be disconne
Signed-off-by: Stephan Holljes
---
Makefile | 8 +-
ffserver.c | 2 +-
httpd.h| 1 +
lmhttpd.c | 310 +
4 files changed, 318 insertions(+), 3 deletions(-)
create mode 100644 lmhttpd.c
diff --git a/Makefile b/Makefile
Signed-off-by: Stephan Holljes
---
ffserver.c | 5 +
1 file changed, 5 insertions(+)
diff --git a/ffserver.c b/ffserver.c
index 3b3451e..087963a 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -578,6 +578,11 @@ void *accept_thread(void *arg)
continue
Signed-off-by: Stephan Holljes
---
ffserver.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ffserver.c b/ffserver.c
index de96c7b..bda7d33 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -45,7 +45,7 @@
#include "httpd.h"
#include "configreader.h"
-#d
Signed-off-by: Stephan Holljes
---
fileserver.c | 1 -
fileserver.h | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/fileserver.c b/fileserver.c
index a3460e3..d2f8c7f 100644
--- a/fileserver.c
+++ b/fileserver.c
@@ -49,7 +49,6 @@ void fileserver_schedule(struct
Signed-off-by: Stephan Holljes
---
Documentation.txt | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/Documentation.txt b/Documentation.txt
index 3eb52b8..6295e4c 100644
--- a/Documentation.txt
+++ b/Documentation.txt
@@ -54,7 +54,8 @@ HTTPD-API
To be independent
Signed-off-by: Stephan Holljes
---
ffserver.c | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/ffserver.c b/ffserver.c
index 9cc501c..59c1b4d 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -490,11 +490,11 @@ void *accept_thread(void *arg)
for (i = 0; i
Signed-off-by: Stephan Holljes
---
ffserver.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/ffserver.c b/ffserver.c
index 087963a..9cc501c 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -724,7 +724,6 @@ void *fileserver_thread(void *arg)
struct FileserverClient *c
After fighting for a bit too long, I am finally submitting this patch series
that adds the more mature libmicrohttpd library. Client disconnect detection
is not really taken care of as of now, clients will be disconnected once
av_interleaved_write_frame() fails. This may be worth looking into more
On Sun, Jul 8, 2018 at 11:21 PM, Michael Niedermayer
wrote:
> On Thu, Jun 28, 2018 at 02:51:00AM +0200, Stephan Holljes wrote:
>> This patchset took embarrassingly long to produce. I first took a few wrong
>> turns, but I think I'm now at a point where I reached the limits of the
&
On Thu, Jun 28, 2018 at 2:51 AM, Stephan Holljes
wrote:
> This patchset took embarrassingly long to produce. I first took a few wrong
> turns, but I think I'm now at a point where I reached the limits of the
> public server API in libavformat. The main problem is that I cannot set
Signed-off-by: Stephan Holljes
---
Makefile | 7 ++-
ffserver.c | 150 +++
fileserver.c | 97 +
fileserver.h | 63 ++
4 files changed, 282 insertions(+), 35 deletions(-)
create mode
Signed-off-by: Stephan Holljes
---
Documentation.txt | 18 --
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/Documentation.txt b/Documentation.txt
index c8fef11..3eb52b8 100644
--- a/Documentation.txt
+++ b/Documentation.txt
@@ -12,13 +12,18 @@ the server
Signed-off-by: Stephan Holljes
---
ffserver.c | 70 +++---
1 file changed, 45 insertions(+), 25 deletions(-)
diff --git a/ffserver.c b/ffserver.c
index 38f10b7..3b3451e 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -51,7 +51,9 @@
struct ReadInfo
Signed-off-by: Stephan Holljes
---
publisher.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/publisher.c b/publisher.c
index 56d1e24..fc3d804 100644
--- a/publisher.c
+++ b/publisher.c
@@ -101,7 +101,7 @@ void publisher_init(struct PublisherContext **pub, char
*stream_name
Signed-off-by: Stephan Holljes
---
configreader.c | 8 ++--
configreader.h | 1 +
httpd.h| 9 +
3 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/configreader.c b/configreader.c
index 3f5b896..966dc84 100644
--- a/configreader.c
+++ b/configreader.c
@@ -27,7
Signed-off-by: Stephan Holljes
---
segment.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/segment.c b/segment.c
index 2dba287..8b76510 100644
--- a/segment.c
+++ b/segment.c
@@ -113,7 +113,7 @@ void segment_init(struct Segment **seg_p, AVFormatContext
*fmt)
int ret
Signed-off-by: Stephan Holljes
---
publisher.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/publisher.h b/publisher.h
index e25c33d..e07cb10 100644
--- a/publisher.h
+++ b/publisher.h
@@ -115,7 +115,7 @@ void publisher_init(struct PublisherContext **pub, char
*stream_name
Signed-off-by: Stephan Holljes
---
httpd.h | 9 +
publisher.h | 9 -
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/httpd.h b/httpd.h
index a988916..1b2566e 100644
--- a/httpd.h
+++ b/httpd.h
@@ -72,6 +72,15 @@ struct HTTPDInterface {
void (*shutdown
Signed-off-by: Stephan Holljes
---
ffserver.c | 37 +
1 file changed, 17 insertions(+), 20 deletions(-)
diff --git a/ffserver.c b/ffserver.c
index 91ad29a..38f10b7 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -86,7 +86,7 @@ void *read_thread(void *arg
Signed-off-by: Stephan Holljes
---
ffserver.c | 248 +
1 file changed, 210 insertions(+), 38 deletions(-)
diff --git a/ffserver.c b/ffserver.c
index f128b55..4f42f74 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -27,6 +27,9 @@
#include
Signed-off-by: Stephan Holljes
---
lavfhttpd.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/lavfhttpd.c b/lavfhttpd.c
index 3f29ec4..7c95001 100644
--- a/lavfhttpd.c
+++ b/lavfhttpd.c
@@ -21,6 +21,7 @@
#include "httpd.h"
#include
+#include
Signed-off-by: Stephan Holljes
---
segment.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/segment.c b/segment.c
index 8b76510..9ec144f 100644
--- a/segment.c
+++ b/segment.c
@@ -114,9 +114,9 @@ void segment_init(struct Segment **seg_p, AVFormatContext
*fmt)
int i
Signed-off-by: Stephan Holljes
---
configreader.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/configreader.c b/configreader.c
index 88bba26..3f5b896 100644
--- a/configreader.c
+++ b/configreader.c
@@ -76,7 +76,7 @@ int configs_parse(lua_State *L
Signed-off-by: Stephan Holljes
---
lavfhttpd.c | 18 +-
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/lavfhttpd.c b/lavfhttpd.c
index bc856af..3f29ec4 100644
--- a/lavfhttpd.c
+++ b/lavfhttpd.c
@@ -15,7 +15,7 @@
* License along with FFmpeg; if not, write
Signed-off-by: Stephan Holljes
---
ffserver.c | 10 +-
1 file changed, 1 insertion(+), 9 deletions(-)
diff --git a/ffserver.c b/ffserver.c
index cc7dc6c..f128b55 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -646,18 +646,10 @@ end:
}
av_free(winfos_p[stream_index
Signed-off-by: Stephan Holljes
---
ffserver.c | 64 +++---
1 file changed, 32 insertions(+), 32 deletions(-)
diff --git a/ffserver.c b/ffserver.c
index 0278bc8..cc7dc6c 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -86,12 +86,12 @@ void *read_thread
Signed-off-by: Stephan Holljes
---
segment.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/segment.c b/segment.c
index 6c74b72..2dba287 100644
--- a/segment.c
+++ b/segment.c
@@ -28,7 +28,7 @@ void segment_save(struct Segment *seg, const char *filename
This patchset took embarrassingly long to produce. I first took a few wrong
turns, but I think I'm now at a point where I reached the limits of the
public server API in libavformat. The main problem is that I cannot set
options on clients that are accepted through http_accept(), for example
a
On Fri, Jun 1, 2018 at 9:24 PM, Michael Niedermayer
wrote:
> On Fri, Jun 01, 2018 at 12:23:53AM +0200, Stephan Holljes wrote:
>> This patch series got a bit larger than I hoped, but there were quite
>> some more things to fix. Also a number of these commits are of cosmetic
>
Signed-off-by: Stephan Holljes
---
ffserver.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ffserver.c b/ffserver.c
index 44306b1..b80a7f8 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -45,7 +45,7 @@
struct ReadInfo {
struct PublisherContext *pub;
AVFormatContext
Signed-off-by: Stephan Holljes
---
configreader.c | 230 +
configreader.h | 47
2 files changed, 277 insertions(+)
create mode 100644 configreader.c
create mode 100644 configreader.h
diff --git a/configreader.c b
Signed-off-by: Stephan Holljes
---
publisher.c | 3 ++-
publisher.h | 4 +++-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/publisher.c b/publisher.c
index 1123056..2e96f2f 100644
--- a/publisher.c
+++ b/publisher.c
@@ -93,11 +93,12 @@ void client_push_segment(struct Client *c
Signed-off-by: Stephan Holljes
---
ffserver.c | 248 ++---
1 file changed, 172 insertions(+), 76 deletions(-)
diff --git a/ffserver.c b/ffserver.c
index b80a7f8..1363cdc 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -38,6 +38,7 @@
#include
Signed-off-by: Stephan Holljes
---
Change from previous patch: More natural way to check if
AUDIO_ONLY_SEGMENT_SECONDS has elapsed since last cut.
ffserver.c | 16 +---
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/ffserver.c b/ffserver.c
index 288f8a1..0278bc8
Signed-off-by: Stephan Holljes
---
Documentation.txt | 17 -
sample_config.lua | 28
2 files changed, 36 insertions(+), 9 deletions(-)
create mode 100644 sample_config.lua
diff --git a/Documentation.txt b/Documentation.txt
index 9a7f0bf..c8fef11
Signed-off-by: Stephan Holljes
---
ffserver.c | 16 ++--
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/ffserver.c b/ffserver.c
index 39e1c32..44306b1 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -79,9 +79,7 @@ void *read_thread(void *arg)
struct Segment *seg
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 onl
Signed-off-by: Stephan Holljes
---
segment.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/segment.c b/segment.c
index 72c4663..6c74b72 100644
--- a/segment.c
+++ b/segment.c
@@ -81,7 +81,7 @@ int segment_write(void *opaque, unsigned char *buf, int
buf_size
Signed-off-by: Stephan Holljes
---
httpd.h | 7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/httpd.h b/httpd.h
index fb1337d..83535e0 100644
--- a/httpd.h
+++ b/httpd.h
@@ -52,11 +52,12 @@ struct HTTPDConfig {
/** HTTPClient struct, this information is shared between
Signed-off-by: Stephan Holljes
---
ffserver.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ffserver.c b/ffserver.c
index 8a24397..288f8a1 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -59,7 +59,7 @@ struct AcceptInfo {
struct HTTPDInterface *httpd;
AVFormatContext
This patchset includes minor fixes mentioned in the last review round.
- remove unneeded null-checks before calling av_free()
- use av_freep() where useful
- simplify AVRational assignment
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
Signed-off-by: Stephan Holljes
---
publisher.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/publisher.c b/publisher.c
index 9374c41..56d1e24 100644
--- a/publisher.c
+++ b/publisher.c
@@ -271,7 +271,7 @@ void publish(struct PublisherContext *pub)
for (i = 0; i
Signed-off-by: Stephan Holljes
---
lavfhttpd.c | 12
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/lavfhttpd.c b/lavfhttpd.c
index 9f56620..bc856af 100644
--- a/lavfhttpd.c
+++ b/lavfhttpd.c
@@ -95,10 +95,8 @@ int lavfhttpd_accept(void *server, struct HTTPClient
Signed-off-by: Stephan Holljes
---
lavfhttpd.c | 6 ++
1 file changed, 6 insertions(+)
diff --git a/lavfhttpd.c b/lavfhttpd.c
index b1e8819..9f56620 100644
--- a/lavfhttpd.c
+++ b/lavfhttpd.c
@@ -120,8 +120,14 @@ int lavfhttpd_accept(void *server, struct HTTPClient
**client, int reply_code
Signed-off-by: Stephan Holljes
---
ffserver.c | 36 +++-
1 file changed, 15 insertions(+), 21 deletions(-)
diff --git a/ffserver.c b/ffserver.c
index 6f76c3e..fd8cadd 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -534,13 +534,12 @@ void *run_server(void *arg
Signed-off-by: Stephan Holljes
---
ffserver.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ffserver.c b/ffserver.c
index fd8cadd..8a24397 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -222,7 +222,7 @@ void write_segment(struct Client *c)
return
Signed-off-by: Stephan Holljes
---
ffserver.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/ffserver.c b/ffserver.c
index 50d61e5..c6e8516 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -210,7 +210,7 @@ void write_segment(struct Client *c)
struct SegmentReadInfo
Signed-off-by: Stephan Holljes
---
ffserver.c | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/ffserver.c b/ffserver.c
index c6e8516..6f76c3e 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -224,14 +224,14 @@ void write_segment(struct Client *c
Signed-off-by: Stephan Holljes
---
lavfhttpd.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lavfhttpd.c b/lavfhttpd.c
index d094d65..b1e8819 100644
--- a/lavfhttpd.c
+++ b/lavfhttpd.c
@@ -76,7 +76,7 @@ int lavfhttpd_accept(void *server, struct HTTPClient
**client, int
Signed-off-by: Stephan Holljes
---
ffserver.c | 4
segment.c | 1 +
2 files changed, 5 insertions(+)
diff --git a/ffserver.c b/ffserver.c
index 3abf5f8..50d61e5 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -151,6 +151,10 @@ void *read_thread(void *arg)
av_log(NULL
Signed-off-by: Stephan Holljes
---
httpd.h | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/httpd.h b/httpd.h
index 25cbe11..fb1337d 100644
--- a/httpd.h
+++ b/httpd.h
@@ -26,13 +26,13 @@
#include "publisher.h"
-/* Supported stream formats, fo
Signed-off-by: Stephan Holljes
---
lavfhttpd.c | 4
1 file changed, 4 insertions(+)
diff --git a/lavfhttpd.c b/lavfhttpd.c
index 3cf9958..5488e14 100644
--- a/lavfhttpd.c
+++ b/lavfhttpd.c
@@ -74,6 +74,10 @@ int lavfhttpd_accept(void *server, struct HTTPClient
**client, int reply_code
Signed-off-by: Stephan Holljes
---
ffserver.c | 6 +-
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/ffserver.c b/ffserver.c
index ddb3e6f..3abf5f8 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -84,8 +84,6 @@ void *read_thread(void *arg)
AVStream *in_stream;
AVRational
Signed-off-by: Stephan Holljes
---
ffserver.c | 87 +-
1 file changed, 81 insertions(+), 6 deletions(-)
diff --git a/ffserver.c b/ffserver.c
index fe84b2e..ddb3e6f 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -223,12 +223,25 @@ void
Signed-off-by: Stephan Holljes
---
ffserver.c | 7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/ffserver.c b/ffserver.c
index 9b28fdc..fe84b2e 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -152,7 +152,7 @@ void *read_thread(void *arg
Signed-off-by: Stephan Holljes
---
segment.c | 26 ++
1 file changed, 26 insertions(+)
diff --git a/segment.c b/segment.c
index c40d1ad..986aeb5 100644
--- a/segment.c
+++ b/segment.c
@@ -82,6 +82,10 @@ int segment_write(void *opaque, unsigned char *buf, int
buf_size
Signed-off-by: Stephan Holljes
---
lavfhttpd.c | 7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/lavfhttpd.c b/lavfhttpd.c
index 5488e14..d094d65 100644
--- a/lavfhttpd.c
+++ b/lavfhttpd.c
@@ -66,10 +66,13 @@ int lavfhttpd_accept(void *server, struct HTTPClient
**client
Signed-off-by: Stephan Holljes
---
publisher.c | 20
1 file changed, 20 insertions(+)
diff --git a/publisher.c b/publisher.c
index 2e96f2f..9374c41 100644
--- a/publisher.c
+++ b/publisher.c
@@ -97,17 +97,37 @@ void publisher_init(struct PublisherContext **pub, char
Signed-off-by: Stephan Holljes
---
ffserver.c | 34 ++
1 file changed, 26 insertions(+), 8 deletions(-)
diff --git a/ffserver.c b/ffserver.c
index 116c399..9b28fdc 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -554,21 +554,35 @@ void *run_server(void *arg
Signed-off-by: Stephan Holljes
---
ffserver.c | 18 +-
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/ffserver.c b/ffserver.c
index 1363cdc..116c399 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -505,8 +505,8 @@ void *run_server(void *arg) {
pthread_t *r_threads
This patch series got a bit larger than I hoped, but there were quite
some more things to fix. Also a number of these commits are of cosmetic
nature.
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Signed-off-by: Stephan Holljes
---
Makefile | 7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index fbecdeb..83bc4e0 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,11 @@
all: ffserver
LAV_FLAGS = $(shell pkg-config --libs --cflags libavformat
On Mon, May 28, 2018 at 11:45 PM, Michael Niedermayer
wrote:
> On Mon, May 28, 2018 at 08:27:07PM +0200, Stephan Holljes wrote:
>> Signed-off-by: Stephan Holljes
>> ---
>> segment.c | 26 ++
>> 1 file changed, 26 insertions(+)
>>
>
Signed-off-by: Stephan Holljes
---
ffserver.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ffserver.c b/ffserver.c
index 4bbf254..66bf7ac 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -154,7 +154,7 @@ void *read_thread(void *arg)
publisher_push_segment(info
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 onl
This is an updated version of the previous patchset.
The most notable changes are:
- timestamp fix reworked to work with mp4
- the lua file reader is much safer by using lua's protected
environment
While the matroska muxer still spams the output about creating new
clusters because of
Signed-off-by: Stephan Holljes
---
Makefile | 7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index fbecdeb..83bc4e0 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,11 @@
all: ffserver
LAV_FLAGS = $(shell pkg-config --libs --cflags libavformat
Signed-off-by: Stephan Holljes
---
configreader.c | 235 +
configreader.h | 47
2 files changed, 282 insertions(+)
create mode 100644 configreader.c
create mode 100644 configreader.h
diff --git a/configreader.c b
Signed-off-by: Stephan Holljes
---
ffserver.c | 34 ++
1 file changed, 26 insertions(+), 8 deletions(-)
diff --git a/ffserver.c b/ffserver.c
index 5fc7c44..4bbf254 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -558,21 +558,35 @@ void *run_server(void *arg
This patchset refactors av_*alloc* with av_*alloc*_array where useful,
adds allocation checks to a lot of unchecked allocations,
pthread-creation checks and simplification and simple bugfixes.
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
Signed-off-by: Stephan Holljes
---
ffserver.c | 248 ++---
1 file changed, 172 insertions(+), 76 deletions(-)
diff --git a/ffserver.c b/ffserver.c
index 402e710..12c257f 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -38,6 +38,7 @@
#include
Signed-off-by: Stephan Holljes
---
ffserver.c | 14 +++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/ffserver.c b/ffserver.c
index 39e1c32..fc2a1a4 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -133,7 +133,7 @@ void *read_thread(void *arg)
pkt.pos = -1
Signed-off-by: Stephan Holljes
---
ffserver.c | 18 +-
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/ffserver.c b/ffserver.c
index 12c257f..5fc7c44 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -509,8 +509,8 @@ void *run_server(void *arg) {
pthread_t *r_threads
Signed-off-by: Stephan Holljes
---
ffserver.c | 87 +-
1 file changed, 81 insertions(+), 6 deletions(-)
diff --git a/ffserver.c b/ffserver.c
index 66bf7ac..171da51 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -227,12 +227,25 @@ void
Signed-off-by: Stephan Holljes
---
publisher.c | 20
1 file changed, 20 insertions(+)
diff --git a/publisher.c b/publisher.c
index 2e96f2f..9374c41 100644
--- a/publisher.c
+++ b/publisher.c
@@ -97,17 +97,37 @@ void publisher_init(struct PublisherContext **pub, char
Signed-off-by: Stephan Holljes
---
ffserver.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/ffserver.c b/ffserver.c
index 65b12da..cdcc064 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -350,8 +350,9 @@ void *accept_thread(void *arg)
ifmt_ctx = NULL
Signed-off-by: Stephan Holljes
---
segment.c | 26 ++
1 file changed, 26 insertions(+)
diff --git a/segment.c b/segment.c
index c40d1ad..986aeb5 100644
--- a/segment.c
+++ b/segment.c
@@ -82,6 +82,10 @@ int segment_write(void *opaque, unsigned char *buf, int
buf_size
Signed-off-by: Stephan Holljes
---
lavfhttpd.c | 4
1 file changed, 4 insertions(+)
diff --git a/lavfhttpd.c b/lavfhttpd.c
index 3cf9958..5488e14 100644
--- a/lavfhttpd.c
+++ b/lavfhttpd.c
@@ -74,6 +74,10 @@ int lavfhttpd_accept(void *server, struct HTTPClient
**client, int reply_code
Signed-off-by: Stephan Holljes
---
ffserver.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ffserver.c b/ffserver.c
index fc2a1a4..402e710 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -45,7 +45,7 @@
struct ReadInfo {
struct PublisherContext *pub;
AVFormatContext
Signed-off-by: Stephan Holljes
---
Documentation.txt | 17 -
sample_config.lua | 28
2 files changed, 36 insertions(+), 9 deletions(-)
create mode 100644 sample_config.lua
diff --git a/Documentation.txt b/Documentation.txt
index 9a7f0bf..c8fef11
Signed-off-by: Stephan Holljes
---
lavfhttpd.c | 7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/lavfhttpd.c b/lavfhttpd.c
index 5488e14..d094d65 100644
--- a/lavfhttpd.c
+++ b/lavfhttpd.c
@@ -66,10 +66,13 @@ int lavfhttpd_accept(void *server, struct HTTPClient
**client
Signed-off-by: Stephan Holljes
---
publisher.c | 3 ++-
publisher.h | 4 +++-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/publisher.c b/publisher.c
index 1123056..2e96f2f 100644
--- a/publisher.c
+++ b/publisher.c
@@ -93,11 +93,12 @@ void client_push_segment(struct Client *c
Signed-off-by: Stephan Holljes
---
ffserver.c | 16 +---
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/ffserver.c b/ffserver.c
index cdcc064..b0db64b 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -42,6 +42,7 @@
#define BUFFER_SECS 30
#define LISTEN_TIMEOUT_MSEC 1000
Signed-off-by: Stephan Holljes
---
ffserver.c | 6 +-
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/ffserver.c b/ffserver.c
index 171da51..65b12da 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -86,8 +86,6 @@ void *read_thread(void *arg)
tb.num = 1;
tb.den
On Mon, May 21, 2018 at 3:04 PM, James Darnley <james.darn...@gmail.com> wrote:
> On 2018-05-20 20:53, Stephan Holljes wrote:
>> +#include
>> +#include
>> +#include
>
> That's not portable. Lua headers are not in a subdirectory.
Yes, artifact from early testin
Signed-off-by: Stephan Holljes <klaxa1...@googlemail.com>
---
configreader.c | 211 +
configreader.h | 46 +
2 files changed, 257 insertions(+)
create mode 100644 configreader.c
create mode 100644 configreader.h
diff
Signed-off-by: Stephan Holljes <klaxa1...@googlemail.com>
---
Documentation.txt | 17 -
sample_config.lua | 28
2 files changed, 36 insertions(+), 9 deletions(-)
create mode 100644 sample_config.lua
diff --git a/Documentation.txt b/Documentati
Signed-off-by: Stephan Holljes <klaxa1...@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"
+/* Supporte
Signed-off-by: Stephan Holljes <klaxa1...@googlemail.com>
---
ffserver.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ffserver.c b/ffserver.c
index bd7c694..44fc263 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -45,7 +45,7 @@
struct ReadInfo {
struct PublisherC
Signed-off-by: Stephan Holljes <klaxa1...@googlemail.com>
---
Makefile | 7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index fbecdeb..83bc4e0 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,11 @@
all: ffserver
LAV_FLAGS = $(shell pkg-config
Signed-off-by: Stephan Holljes <klaxa1...@googlemail.com>
---
ffserver.c | 248 ++---
1 file changed, 172 insertions(+), 76 deletions(-)
diff --git a/ffserver.c b/ffserver.c
index 44fc263..3d842d8 100644
--- a/ffserver.c
+++ b/ffse
Signed-off-by: Stephan Holljes <klaxa1...@googlemail.com>
---
ffserver.c | 19 ---
1 file changed, 12 insertions(+), 7 deletions(-)
diff --git a/ffserver.c b/ffserver.c
index 39e1c32..bd7c694 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -127,13 +127,13 @@ void *read_threa
Signed-off-by: Stephan Holljes <klaxa1...@googlemail.com>
---
publisher.c | 3 ++-
publisher.h | 4 +++-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/publisher.c b/publisher.c
index 1123056..2e96f2f 100644
--- a/publisher.c
+++ b/publisher.c
@@ -93,11 +93,12 @
This patch set builds upon the previous set that implemented ffserver
with a more flexible httpd interface.
It includes a fix for timestamp handling, which sadly still does not
properly fix the issue.
The majority of this patch set adds the ability to read lua-config
files. After reading up on
Signed-off-by: Stephan Holljes <klaxa1...@googlemail.com>
---
httpd.h | 58 +++
lavfhttpd.c | 153
2 files changed, 211 insertions(+)
create mode 100644 httpd.h
create mode 100644 lavfhttpd.c
diff
Signed-off-by: Stephan Holljes <klaxa1...@googlemail.com>
---
Documentation.txt | 89 +++
1 file changed, 89 insertions(+)
create mode 100644 Documentation.txt
diff --git a/Documentation.txt b/Documentation.txt
new file mode 100644
1 - 100 of 266 matches
Mail list logo