[FFmpeg-devel] [PATCH 1/2] avformat/hlsenc: removed empty/unused print_encryption_tag function

2015-06-16 Thread Christian Suloway
Signed-off-by: Christian Suloway --- libavformat/hlsenc.c | 4 1 file changed, 4 deletions(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index 68c6479..cf29f4f 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -310,10 +310,6 @@ static void hls_free_segments

[FFmpeg-devel] [PATCH 2/2] MAINTAINERS: add myself as hls encryption maintainer

2015-06-16 Thread Christian Suloway
Signed-off-by: Christian Suloway --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index 7b239a1..fa9e966 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -416,6 +416,7 @@ Muxers/Demuxers: gxf.c Reimar Doeffinger

Re: [FFmpeg-devel] [PATCH] avformat/hlsenc: added HLS encryption

2015-02-11 Thread Christian Suloway
bumping this thread On 2/3/15, 9:54 AM, "Christian Suloway" wrote: >Updated patch is attached. > >On 1/10/15, 3:06 PM, "Michael Niedermayer" wrote: >> >>i got it working after a few tries but >>please provide an example that works and docu

Re: [FFmpeg-devel] [PATCH] avformat/hlsenc: added HLS encryption

2015-02-03 Thread Christian Suloway
Updated patch is attached. On 1/10/15, 3:06 PM, "Michael Niedermayer" wrote: > >i got it working after a few tries but >please provide an example that works and documentation that describes >the feature in a way sufficient to use it without reading the code >ideally add a example to the documenta

Re: [FFmpeg-devel] [PATCH] avformat/hlsenc: added HLS encryption

2015-01-09 Thread Christian Suloway
Resending attachment. From: ffmpeg-devel-boun...@ffmpeg.org on behalf of Christian Suloway Sent: Friday, January 9, 2015 5:02 PM To: FFmpeg development discussions and patches Subject: Re: [FFmpeg-devel] [PATCH] avformat/hlsenc: added HLS encryption

Re: [FFmpeg-devel] [PATCH] avformat/hlsenc: added HLS encryption

2015-01-09 Thread Christian Suloway
New version of the patch attached to address your comments. Thanks, Christian On Jan 7, 2015, at 2:17 PM, Michael Niedermayer wrote: > Please add a testcase/example to either the documentation or > commit message Example added to the commit message. >> +ff_get_line(pb, hls->key_uri, sizeof

[FFmpeg-devel] [PATCH] avformat/hlsenc: added HLS encryption

2015-01-07 Thread Christian Suloway
key_info_file will be reflected in segment encryption along with an entry in the playlist for the new key URI and IV. Signed-off-by: Christian Suloway --- doc/muxers.texi | 9 libavformat/hlsenc.c | 130 +-- 2 files changed, 136 insertions

[FFmpeg-devel] [PATCH] avformat/hlsenc: added HLS encryption

2014-12-30 Thread Christian Suloway
key_info_file will be reflected in segment encryption along with an entry in the playlist for the new key URI and IV. Signed-off-by: Christian Suloway --- doc/muxers.texi | 9 libavformat/hlsenc.c | 130 +-- 2 files changed, 136 insertions

[FFmpeg-devel] [PATCH] avformat/hlsenc: added HLS encryption

2014-12-23 Thread Christian Suloway
key_info_file will be reflected in segment encryption along with an entry in the playlist for the new key URI and IV. Signed-off-by: Christian Suloway --- doc/muxers.texi | 9 ++ libavformat/hlsenc.c | 242 +-- 2 files changed, 245 insertions(+), 6

Re: [FFmpeg-devel] [PATCH] avformat/hlsenc: added HLS encryption

2014-12-23 Thread Christian Suloway
On Dec 22, 2014, at 6:36 PM, Michael Niedermayer wrote: > this looks a bit odd, > see ff_get_line(), it probably allows to simplify this a lot Resubmitting using ff_get_line(). Thanks, Christian ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org htt

[FFmpeg-devel] [PATCH] avformat/hlsenc: added HLS encryption

2014-12-22 Thread Christian Suloway
key_info_file will be reflected in segment encryption along with an entry in the playlist for the new key URI and IV. Signed-off-by: Christian Suloway --- doc/muxers.texi | 9 ++ libavformat/hlsenc.c | 235 +-- 2 files changed, 238 insertions(+), 6

Re: [FFmpeg-devel] [PATCH 1/2] avformat/hlsenc: fix hls_write_trailer() on hls_start() failure

2014-12-16 Thread Christian Suloway
On 12/16/14, 3:23 AM, "Carl Eugen Hoyos" wrote: >Christian Suloway row44.com> writes: > >> Close segment I/O context and append segment in >> hls_write_trailer() only when segment I/O context >> is allocated. > >Was this a regression since 25ccf5df

[FFmpeg-devel] [PATCH 1/2] avformat/hlsenc: fix hls_write_trailer() on hls_start() failure

2014-12-15 Thread Christian Suloway
Close segment I/O context and append segment in hls_write_trailer() only when segment I/O context is allocated. Signed-off-by: Christian Suloway --- libavformat/hlsenc.c | 10 ++ 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c

[FFmpeg-devel] [PATCH 2/2] avformat/hlsenc: added HLS encryption

2014-12-15 Thread Christian Suloway
key_info_file will be reflected in segment encryption along with an entry in the playlist for the new key URI and IV. Signed-off-by: Christian Suloway --- doc/muxers.texi | 9 ++ libavformat/hlsenc.c | 235 +-- 2 files changed, 238 insertions(+), 6

Re: [FFmpeg-devel] [PATCH] avformat/hlsenc: added HLS encryption

2014-12-15 Thread Christian Suloway
On 12/12/14, 9:57 PM, "Michael Niedermayer" wrote: >combining the random seed with a LFG seems a bit odd >i would out of principle use something stronger, though i dont know >what the exact scenarios are this is intended to prevent, so maybe >its fine Yes, this is a good point. I will resubmit th

[FFmpeg-devel] [PATCH] avformat/hlsenc: added HLS encryption

2014-12-11 Thread Christian Suloway
the playlist for the new key URI. Also added -hls_flags random_iv option flag to use a random IV for encryption instead of the segment number. Signed-off-by: Christian Suloway --- doc/muxers.texi | 11 +++ libavformat/hlsenc.c | 257 +-- 2

Re: [FFmpeg-devel] [PATCH] avformat/hlsenc: added segment file deletion

2014-12-10 Thread Christian Suloway
On 12/9/14, 7:44 PM, "Michael Niedermayer" wrote: >On Mon, Dec 08, 2014 at 10:25:05AM -0600, Christian Suloway wrote: >> This option flag deletes segment files removed from the playlist after a >> period of time equal to the duration of the segment plus the duration o

[FFmpeg-devel] [PATCH] avformat/hlsenc: added segment file deletion

2014-12-08 Thread Christian Suloway
This option flag deletes segment files removed from the playlist after a period of time equal to the duration of the segment plus the duration of the playlist. Signed-off-by: Christian Suloway --- doc/muxers.texi | 4 +++ libavformat/hlsenc.c | 90

Re: [FFmpeg-devel] [PATCH] avformat/hlsenc: added segment filename option

2014-12-05 Thread Christian Suloway
Updating from previous message. From: Christian Suloway Sent: Friday, December 5, 2014 3:17 PM To: ffmpeg-devel@ffmpeg.org Cc: Christian Suloway Subject: [PATCH] avformat/hlsenc: added segment filename option This option allows segment filenames to be

[FFmpeg-devel] [PATCH] avformat/hlsenc: added segment filename option

2014-12-05 Thread Christian Suloway
This option allows segment filenames to be specified. Unless -hls_flags single_file is set the filename is used as a string format with the segment number. Example: ffmpeg -f lavfi -i testsrc -c:v h264 -map 0 -hls_segment_filename bar%03d.ts foo.m3u8 Signed-off-by: Christian Suloway --- doc

[FFmpeg-devel] [PATCH] avformat/hlsenc: added segment filename option

2014-12-05 Thread Christian Suloway
This option allows segment filenames to be specified. Unless -hls_flags single_file is set the filename is used as a string format with the segment number. Example: ffmpeg -f lavfi -i testsrc -c:v h264 -map 0 -hls_segment_filename bar%03d.ts foo.m3u8 Signed-off-by: Christian Suloway --- doc

[FFmpeg-devel] [PATCH] avformat/hlsenc: added segment filename option

2014-12-05 Thread Christian Suloway
This option allows segment filenames to be specified. Unless -hls_flags single_file is enabled the filename is used as a string format with the segment number. Example: ffmpeg -f lavfi -i testsrc -c:v h264 -map 0 -hls_segment_filename bar%03d.ts foo.m3u8 Signed-off-by: Christian Suloway

[FFmpeg-devel] [PATCH 2/3] avformat/hlsenc: added segment file deletion

2014-12-04 Thread Christian Suloway
Option removes segments no longer in playlist when older than playlist + segment duration Signed-off-by: Christian Suloway --- libavformat/hlsenc.c | 72 1 file changed, 67 insertions(+), 5 deletions(-) diff --git a/libavformat/hlsenc.c b

[FFmpeg-devel] [PATCH 3/3] avformat/hlsenc: added HLS encryption

2014-12-04 Thread Christian Suloway
HLS encryption with key URL & key containing file specified with -hls_key_info_file (key info updates when modified). Option for IV from segment number or random generation (-hls_random_iv). Signed-off-by: Christian Suloway --- libavformat/hlsenc.c |

[FFmpeg-devel] [PATCH 1/3] avformat/hlsenc: added segment filename template

2014-12-04 Thread Christian Suloway
Signed-off-by: Christian Suloway --- libavformat/hlsenc.c | 87 +--- 1 file changed, 69 insertions(+), 18 deletions(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index e13f438..0a48919 100644 --- a/libavformat/hlsenc.c +++ b

[FFmpeg-devel] [PATCH 4/4] avformat/hlsenc: added HLS encryption

2014-12-01 Thread Christian Suloway
HLS encryption with key URL & key containing file specified with -hls_key_info_file (key info updates when modified). Option for IV from segment number or random generation (-hls_random_iv). Signed-off-by: Christian Suloway --- libavformat/hlsenc.c |

[FFmpeg-devel] [PATCH 1/4] avformat/crypto: added encryption

2014-12-01 Thread Christian Suloway
Signed-off-by: Christian Suloway --- libavformat/crypto.c | 166 --- 1 file changed, 146 insertions(+), 20 deletions(-) diff --git a/libavformat/crypto.c b/libavformat/crypto.c index a9b6e47..f3a85c7 100644 --- a/libavformat/crypto.c +++ b

[FFmpeg-devel] [PATCH 3/4] avformat/hlsenc: added segment file deletion

2014-12-01 Thread Christian Suloway
Option removes segments no longer in playlist when older than playlist + segment duration Signed-off-by: Christian Suloway --- libavformat/hlsenc.c | 72 1 file changed, 67 insertions(+), 5 deletions(-) diff --git a/libavformat/hlsenc.c b

[FFmpeg-devel] [PATCH 2/4] avformat/hlsenc: added segment filename template

2014-12-01 Thread Christian Suloway
Signed-off-by: Christian Suloway --- libavformat/hlsenc.c | 87 +--- 1 file changed, 69 insertions(+), 18 deletions(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index e13f438..0a48919 100644 --- a/libavformat/hlsenc.c +++ b

[FFmpeg-devel] [PATCH] avformat/hlsenc: added HLS encryption

2014-11-26 Thread Christian Suloway
Signed-off-by: Christian Suloway --- libavformat/crypto.c | 233 --- libavformat/hlsenc.c | 387 ++- 2 files changed, 567 insertions(+), 53 deletions(-) diff --git a/libavformat/crypto.c b/libavformat/crypto.c index