[FFmpeg-devel] [PATCH] libavformat/mov: Fix NULL-dereference read for some encrypted content.

2018-12-19 Thread Jacob Trimble
When reading frames, we need to use the fragment for the correct stream. Sometimes the "current" fragment is not the same as the one the frame is for. Found by Chromium's ClusterFuzz: https://crbug.com/906392 and https://crbug.com/915524 Signed-off-by: Jacob Trimble --- libavf

Re: [FFmpeg-devel] [PATCH] avformat/utils: Don't parse encrypted packets.

2018-10-23 Thread Jacob Trimble
On Mon, Oct 1, 2018 at 11:30 AM Jacob Trimble wrote: > > On Mon, Sep 17, 2018 at 2:35 PM Jacob Trimble wrote: > > > > On Wed, Sep 12, 2018 at 11:50 AM Michael Niedermayer > > wrote: > > > > > > On Tue, Sep 11, 2018 at 03:50:57PM -0700, Jacob Trimble w

Re: [FFmpeg-devel] [PATCH] avformat/utils: Don't parse encrypted packets.

2018-10-01 Thread Jacob Trimble
On Mon, Sep 17, 2018 at 2:35 PM Jacob Trimble wrote: > > On Wed, Sep 12, 2018 at 11:50 AM Michael Niedermayer > wrote: > > > > On Tue, Sep 11, 2018 at 03:50:57PM -0700, Jacob Trimble wrote: > > > [...] > > > > > > So how about, when we see an e

Re: [FFmpeg-devel] [PATCH] avformat/utils: Don't parse encrypted packets.

2018-09-17 Thread Jacob Trimble
On Wed, Sep 12, 2018 at 11:50 AM Michael Niedermayer wrote: > > On Tue, Sep 11, 2018 at 03:50:57PM -0700, Jacob Trimble wrote: > > [...] > > > > So how about, when we see an encrypted frame, we flush the parser > > before skipping the frame? Can we just flush th

Re: [FFmpeg-devel] [PATCH] avformat/utils: Don't parse encrypted packets.

2018-09-11 Thread Jacob Trimble
On Tue, Sep 11, 2018 at 1:48 PM Michael Niedermayer wrote: > > On Thu, Aug 30, 2018 at 08:43:25AM -0700, Jacob Trimble wrote: > > On Wed, Aug 29, 2018 at 4:37 PM Michael Niedermayer > > wrote: > > > > > > On Wed, Aug 29, 2018 at 03:30:39PM -0700, Jacob Trimble

Re: [FFmpeg-devel] [PATCH] avformat/utils: Don't parse encrypted packets.

2018-09-11 Thread Jacob Trimble
On Thu, Aug 30, 2018 at 8:43 AM Jacob Trimble wrote: > > On Wed, Aug 29, 2018 at 4:37 PM Michael Niedermayer > wrote: > > > > On Wed, Aug 29, 2018 at 03:30:39PM -0700, Jacob Trimble wrote: > > > On Wed, Aug 29, 2018 at 3:20 PM James Almer wrote: > > >

Re: [FFmpeg-devel] [PATCH] avformat/matroskadec: Parse encryption init info from streams.

2018-09-06 Thread Jacob Trimble
On Tue, Aug 28, 2018 at 12:56 PM Jacob Trimble wrote: > > On Mon, Aug 20, 2018 at 11:39 AM Jacob Trimble wrote: > > > > On Thu, Aug 9, 2018 at 9:14 AM Jacob Trimble wrote: > > > > > > On Wed, Aug 1, 2018 at 1:46 PM Jacob Trimble wrote: > > > &g

Re: [FFmpeg-devel] [PATCH] avformat/utils: Don't parse encrypted packets.

2018-08-30 Thread Jacob Trimble
On Wed, Aug 29, 2018 at 4:37 PM Michael Niedermayer wrote: > > On Wed, Aug 29, 2018 at 03:30:39PM -0700, Jacob Trimble wrote: > > On Wed, Aug 29, 2018 at 3:20 PM James Almer wrote: > > > > > > On 8/29/2018 7:07 PM, Michael Niedermayer wrote: > > > >

Re: [FFmpeg-devel] [PATCH] avformat/utils: Don't parse encrypted packets.

2018-08-29 Thread Jacob Trimble
On Wed, Aug 29, 2018 at 3:20 PM James Almer wrote: > > On 8/29/2018 7:07 PM, Michael Niedermayer wrote: > > On Tue, Aug 28, 2018 at 10:58:43AM -0700, Jacob Trimble wrote: > >> If a packet is full-sample encrypted, then packet data can't be parsed > >> withou

Re: [FFmpeg-devel] [PATCH] avformat/matroskadec: Parse encryption init info from streams.

2018-08-28 Thread Jacob Trimble
On Mon, Aug 20, 2018 at 11:39 AM Jacob Trimble wrote: > > On Thu, Aug 9, 2018 at 9:14 AM Jacob Trimble wrote: > > > > On Wed, Aug 1, 2018 at 1:46 PM Jacob Trimble wrote: > > > > > > On Mon, Jul 23, 2018 at 2:01 PM Jacob Trimble wrote: > > > &g

[FFmpeg-devel] [PATCH] avformat/utils: Don't parse encrypted packets.

2018-08-28 Thread Jacob Trimble
ff-by: Jacob Trimble --- libavformat/utils.c | 21 - 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/libavformat/utils.c b/libavformat/utils.c index b0b5e164a6..1107787eae 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -27,6 +27,7 @@ #include "

[FFmpeg-devel] [PATCH] avcodec/opus_parser: Handle complete frames flag.

2018-08-20 Thread Jacob Trimble
00:00:00 2001 From: Jacob Trimble Date: Mon, 20 Aug 2018 11:25:27 -0700 Subject: [PATCH] avcodec/opus_parser: Handle complete frames flag. Signed-off-by: Jacob Trimble --- libavcodec/opus_parser.c | 29 + 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a

Re: [FFmpeg-devel] [PATCH] avformat/avformat.h: Add av_stream_remove_side_data.

2018-08-20 Thread Jacob Trimble
On Mon, Jul 9, 2018 at 9:57 AM Jacob Trimble wrote: > > On Tue, Jul 3, 2018 at 5:59 PM Michael Niedermayer > wrote: > > > > On Tue, Jul 03, 2018 at 12:14:19PM -0700, Jacob Trimble wrote: > > > On Mon, Jul 2, 2018 at 6:07 PM Michael Niedermayer > > > wrot

Re: [FFmpeg-devel] [PATCH] avformat/matroskadec: Parse encryption init info from streams.

2018-08-20 Thread Jacob Trimble
On Thu, Aug 9, 2018 at 9:14 AM Jacob Trimble wrote: > > On Wed, Aug 1, 2018 at 1:46 PM Jacob Trimble wrote: > > > > On Mon, Jul 23, 2018 at 2:01 PM Jacob Trimble wrote: > > > > > > On Thu, Jul 12, 2018 at 5:05 PM Jacob Trimble wrote: > >

Re: [FFmpeg-devel] [PATCH] avformat/matroska: Parse generic encryption info from packets.

2018-08-20 Thread Jacob Trimble
On Mon, Aug 13, 2018 at 9:01 PM James Almer wrote: > > On 8/14/2018 12:50 AM, James Almer wrote: > > On 7/12/2018 8:45 PM, Jacob Trimble wrote: > >> I am currently seeing a problem with this when using Opus audio. In > >> read_frame_internal, it will try to pa

Re: [FFmpeg-devel] [PATCH] avformat/mov: Allow saio/saiz in clear content.

2018-08-20 Thread Jacob Trimble
0aca517f64257eb28342a656867d90307a7 Mon Sep 17 00:00:00 2001 > > From: Jacob Trimble > > Date: Tue, 14 Aug 2018 10:18:55 -0700 > > Subject: [PATCH] avformat/mov: Allow saio/saiz in clear content. > > This code is used in saio/saiz/senc. The message only mentions the first

Re: [FFmpeg-devel] [PATCH] avformat/mov: Allow saio/saiz in clear content.

2018-08-14 Thread Jacob Trimble
On Tue, Aug 14, 2018 at 10:39 AM Jacob Trimble wrote: > > If there is a saio/saiz in clear content, we shouldn't create the > encryption index if we don't already have one. Otherwise it will > confuse the cenc_filter. > > Found by Chromium's ClusterFuzz: https:

[FFmpeg-devel] [PATCH] avformat/mov: Allow saio/saiz in clear content.

2018-08-14 Thread Jacob Trimble
If there is a saio/saiz in clear content, we shouldn't create the encryption index if we don't already have one. Otherwise it will confuse the cenc_filter. Found by Chromium's ClusterFuzz: https://crbug.com/873432 Signed-off-by: Jacob Trimble --- libavfo

Re: [FFmpeg-devel] [PATCH] avutil/encryption_info: Fix size calculation.

2018-08-13 Thread Jacob Trimble
On Mon, Aug 13, 2018 at 3:31 PM Carl Eugen Hoyos wrote: > > 2018-08-14 0:22 GMT+02:00, Jacob Trimble : > > Fixes: 873693 > > This does not look helpful. Changed. > > Carl Eugen > ___ > ffmpeg-devel mailing list &g

[FFmpeg-devel] [PATCH] avutil/encryption_info: Fix size calculation.

2018-08-13 Thread Jacob Trimble
Fixes: 873693 Signed-off-by: Jacob Trimble --- libavutil/encryption_info.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavutil/encryption_info.c b/libavutil/encryption_info.c index c3916b42c8..b399e07e66 100644 --- a/libavutil/encryption_info.c +++ b/libavutil

Re: [FFmpeg-devel] [PATCH] avformat/matroskadec: Parse encryption init info from streams.

2018-08-09 Thread Jacob Trimble
On Wed, Aug 1, 2018 at 1:46 PM Jacob Trimble wrote: > > On Mon, Jul 23, 2018 at 2:01 PM Jacob Trimble wrote: > > > > On Thu, Jul 12, 2018 at 5:05 PM Jacob Trimble wrote: > > > > > > Signed-off-by: Jacob Trimble > > &

Re: [FFmpeg-devel] [PATCH] avformat/matroska: Parse generic encryption info from packets.

2018-08-09 Thread Jacob Trimble
On Wed, Aug 1, 2018 at 1:45 PM Jacob Trimble wrote: > > On Mon, Jul 23, 2018 at 1:59 PM Jacob Trimble wrote: > > > > On Thu, Jul 12, 2018 at 4:45 PM Jacob Trimble wrote: > > > > > > The attached patch adds parsing for WebM encryption info into the &g

Re: [FFmpeg-devel] [PATCH] avformat/matroskadec: Parse encryption init info from streams.

2018-08-01 Thread Jacob Trimble
On Mon, Jul 23, 2018 at 2:01 PM Jacob Trimble wrote: > > On Thu, Jul 12, 2018 at 5:05 PM Jacob Trimble wrote: > > > > Signed-off-by: Jacob Trimble > > --- > > libavformat/matroskadec.c | 43 +-- > > 1 file cha

Re: [FFmpeg-devel] [PATCH] avformat/matroska: Parse generic encryption info from packets.

2018-08-01 Thread Jacob Trimble
On Mon, Jul 23, 2018 at 1:59 PM Jacob Trimble wrote: > > On Thu, Jul 12, 2018 at 4:45 PM Jacob Trimble wrote: > > > > The attached patch adds parsing for WebM encryption info into the > > AVEncryptionInfo side-data. The AVEncryptionInitInfo will be handled > >

Re: [FFmpeg-devel] [PATCH] avformat/matroskadec: Parse encryption init info from streams.

2018-07-23 Thread Jacob Trimble
On Thu, Jul 12, 2018 at 5:05 PM Jacob Trimble wrote: > > Signed-off-by: Jacob Trimble > --- > libavformat/matroskadec.c | 43 +-- > 1 file changed, 32 insertions(+), 11 deletions(-) > > diff --git a/libavformat/matroskadec.c b/liba

Re: [FFmpeg-devel] [PATCH] avformat/matroska: Parse generic encryption info from packets.

2018-07-23 Thread Jacob Trimble
On Thu, Jul 12, 2018 at 4:45 PM Jacob Trimble wrote: > > The attached patch adds parsing for WebM encryption info into the > AVEncryptionInfo side-data. The AVEncryptionInitInfo will be handled > in another patch. > > Spec: https://www.webmproject.org/docs/webm-encryption/

[FFmpeg-devel] [PATCH] avformat/matroskadec: Parse encryption init info from streams.

2018-07-12 Thread Jacob Trimble
Signed-off-by: Jacob Trimble --- libavformat/matroskadec.c | 43 +-- 1 file changed, 32 insertions(+), 11 deletions(-) diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 1ded431b80..bfef329e59 100644 --- a/libavformat/matroskadec.c +++ b

[FFmpeg-devel] [PATCH] avformat/matroska: Parse generic encryption info from packets.

2018-07-12 Thread Jacob Trimble
when using subsample encryption. Does anyone have any other ideas to work around this? Is there a way to allow parsing but ignore errors? From 48cabb86f030bfcf1d163db2c361ab8ce743d8b3 Mon Sep 17 00:00:00 2001 From: Jacob Trimble Date: Wed, 11 Jul 2018 11:08:18 -0700 Subject: [PATCH] avformat/mat

Re: [FFmpeg-devel] [PATCH] avformat/avformat.h: Add av_stream_remove_side_data.

2018-07-09 Thread Jacob Trimble
On Tue, Jul 3, 2018 at 5:59 PM Michael Niedermayer wrote: > > On Tue, Jul 03, 2018 at 12:14:19PM -0700, Jacob Trimble wrote: > > On Mon, Jul 2, 2018 at 6:07 PM Michael Niedermayer > > wrote: > > > > > > On Mon, Jun 25, 2018 at 04:03:32PM -0700, Jacob Trimble

Re: [FFmpeg-devel] [PATCH] avformat/avformat.h: Add av_stream_remove_side_data.

2018-07-03 Thread Jacob Trimble
On Mon, Jul 2, 2018 at 6:07 PM Michael Niedermayer wrote: > > On Mon, Jun 25, 2018 at 04:03:32PM -0700, Jacob Trimble wrote: > > Signed-off-by: Jacob Trimble > > --- > > libavformat/avformat.h | 8 > > libavformat/utils.c| 11 +++ >

Re: [FFmpeg-devel] [PATCH] avformat/avformat.h: Add av_stream_remove_side_data.

2018-07-02 Thread Jacob Trimble
On Mon, Jun 25, 2018 at 4:04 PM Jacob Trimble wrote: > > Signed-off-by: Jacob Trimble > --- > libavformat/avformat.h | 8 > libavformat/utils.c| 11 +++ > 2 files changed, 19 insertions(+) > > diff --git a/libavformat/avformat.h b/libavformat/avfor

Re: [FFmpeg-devel] [PATCH 3/3] avformat/mov: Expose encryption info to the app.

2018-07-02 Thread Jacob Trimble
On Mon, Jun 25, 2018 at 10:59 AM Jacob Trimble wrote: > > Rebased and updated to handle multiple PSSH atoms. PTAL. > > On Tue, Jan 9, 2018 at 10:28 AM Jacob Trimble wrote: >> >> On Mon, Jan 8, 2018 at 5:23 PM, Carl Eugen Hoyos wrote: >> > 2018-0

Re: [FFmpeg-devel] [PATCH] libavutil/encryption_info: Add unit tests.

2018-06-26 Thread Jacob Trimble
On Mon, Jun 25, 2018 at 5:30 PM Michael Niedermayer wrote: > > On Fri, Jun 01, 2018 at 12:51:48PM -0700, Jacob Trimble wrote: > > Signed-off-by: Jacob Trimble > > --- > > libavutil/Makefile| 1 + > > libavutil/encryption_info.h | 2 +- &

[FFmpeg-devel] [PATCH] avutil/gitignore: Ignore integer test binary.

2018-06-26 Thread Jacob Trimble
Signed-off-by: Jacob Trimble --- libavutil/tests/.gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/libavutil/tests/.gitignore b/libavutil/tests/.gitignore index 71f75a8ee9..bf07c57b75 100644 --- a/libavutil/tests/.gitignore +++ b/libavutil/tests/.gitignore @@ -24,6 +24,7 @@ /hmac

[FFmpeg-devel] [PATCH] avutil/encryption_info: Fix documentation problem.

2018-06-26 Thread Jacob Trimble
Signed-off-by: Jacob Trimble --- libavutil/encryption_info.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavutil/encryption_info.h b/libavutil/encryption_info.h index 9140968fde..8fe7ebfe43 100644 --- a/libavutil/encryption_info.h +++ b/libavutil/encryption_info.h

[FFmpeg-devel] [PATCH] avformat/avformat.h: Add av_stream_remove_side_data.

2018-06-25 Thread Jacob Trimble
Signed-off-by: Jacob Trimble --- libavformat/avformat.h | 8 libavformat/utils.c| 11 +++ 2 files changed, 19 insertions(+) diff --git a/libavformat/avformat.h b/libavformat/avformat.h index fdaffa5bf4..434c88837e 100644 --- a/libavformat/avformat.h +++ b/libavformat

Re: [FFmpeg-devel] [PATCH] libavutil/encryption_info: Add unit tests.

2018-06-25 Thread Jacob Trimble
Now that the patches have been merged this doesn't depend on anything. On Fri, Jun 1, 2018 at 12:54 PM Jacob Trimble wrote: > On Fri, Jun 1, 2018 at 12:52 PM Jacob Trimble wrote: > > > > Signed-off-by: Jacob Trimble > > --- > > libavutil/Makefile

Re: [FFmpeg-devel] [PATCH 3/3] avformat/mov: Expose encryption info to the app.

2018-06-25 Thread Jacob Trimble
Rebased and updated to handle multiple PSSH atoms. PTAL. On Tue, Jan 9, 2018 at 10:28 AM Jacob Trimble wrote: > On Mon, Jan 8, 2018 at 5:23 PM, Carl Eugen Hoyos > wrote: > > 2018-01-09 0:22 GMT+01:00 Jacob Trimble < > modmaker-at-google@ffmpeg.org>: > > >

Re: [FFmpeg-devel] libavutil/encryption_info: Allow multiple init info.

2018-06-21 Thread Jacob Trimble
; Done From f440fe2be172672c439fa8b216b08a8d0895f76f Mon Sep 17 00:00:00 2001 From: Jacob Trimble Date: Mon, 23 Apr 2018 10:33:58 -0700 Subject: [PATCH] libavutil/encryption_info: Allow multiple init info. It is possible for there to be multiple encryption init info structure. For

Re: [FFmpeg-devel] libavutil/encryption_info: Allow multiple init info.

2018-06-20 Thread Jacob Trimble
On Thu, Jun 14, 2018 at 9:44 AM Jacob Trimble wrote: > > On Thu, Jun 7, 2018 at 11:51 AM Jacob Trimble wrote: > > > > On Thu, May 31, 2018 at 5:50 PM Jacob Trimble wrote: > > > > > > On Thu, May 31, 2018 at 9:40 AM Jacob Trimble wrote: > > > >

Re: [FFmpeg-devel] libavutil/encryption_info: Allow multiple init info.

2018-06-14 Thread Jacob Trimble
On Thu, Jun 7, 2018 at 11:51 AM Jacob Trimble wrote: > > On Thu, May 31, 2018 at 5:50 PM Jacob Trimble wrote: > > > > On Thu, May 31, 2018 at 9:40 AM Jacob Trimble wrote: > > > > > > On Fri, May 25, 2018 at 6:13 PM Michael Niedermayer > > > wrote:

[FFmpeg-devel] [PATCH] avformat/mov: Add check for per-sample IV size.

2018-06-12 Thread Jacob Trimble
Found by Chrome's ClusterFuzz: http://crbug.com/849062. Signed-off-by: Jacob Trimble --- libavformat/mov.c | 9 +++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index 2fca025889..5d9ffa69a3 100644 --- a/libavformat/mov.c

Re: [FFmpeg-devel] [PATCH] avformat/mov: Fix reading saio/saiz for clear content.

2018-06-07 Thread Jacob Trimble
On Thu, Jun 7, 2018 at 10:38 AM Jacob Trimble wrote: > > Found by Chrome's ClusterFuzz: http://crbug.com/850389 > > Signed-off-by: Jacob Trimble > --- > libavformat/mov.c | 10 ++ > 1 file changed, 10 insertions(+) > > diff --git a/libavformat/m

Re: [FFmpeg-devel] libavutil/encryption_info: Allow multiple init info.

2018-06-07 Thread Jacob Trimble
On Thu, May 31, 2018 at 5:50 PM Jacob Trimble wrote: > > On Thu, May 31, 2018 at 9:40 AM Jacob Trimble wrote: > > > > On Fri, May 25, 2018 at 6:13 PM Michael Niedermayer > > wrote: > > > > > > [...] > > > > > > > Added fix for

[FFmpeg-devel] [PATCH] avformat/mov: Fix reading saio/saiz for clear content.

2018-06-07 Thread Jacob Trimble
Found by Chrome's ClusterFuzz: http://crbug.com/850389 Signed-off-by: Jacob Trimble --- libavformat/mov.c | 10 ++ 1 file changed, 10 insertions(+) diff --git a/libavformat/mov.c b/libavformat/mov.c index 4ad19122b3..d07171b3f4 100644 --- a/libavformat/mov.c +++ b/libavformat/

Re: [FFmpeg-devel] [PATCH] libavutil/encryption_info: Add NULL checks.

2018-06-07 Thread Jacob Trimble
On Tue, Jun 5, 2018 at 1:06 PM Mark Thompson wrote: > > On 05/06/18 17:30, Jacob Trimble wrote: > > Just because I can't check whether my food has salmonella doesn't mean > > I shouldn't check the temperature when I cook it. Adding a NULL check > > is trivi

Re: [FFmpeg-devel] [PATCH] libavutil/encryption_info: Add NULL checks.

2018-06-05 Thread Jacob Trimble
On Mon, Jun 4, 2018 at 2:24 PM Carl Eugen Hoyos wrote: > > 2018-06-04 23:07 GMT+02:00, Jacob Trimble : > > On Mon, Jun 4, 2018 at 10:46 AM Carl Eugen Hoyos wrote: > >> > >> 2018-06-04 18:59 GMT+02:00, Jacob Trimble > >> : > >> > On Fri, Jun 1

Re: [FFmpeg-devel] [PATCH] libavutil/encryption_info: Add NULL checks.

2018-06-04 Thread Jacob Trimble
On Mon, Jun 4, 2018 at 10:46 AM Carl Eugen Hoyos wrote: > > 2018-06-04 18:59 GMT+02:00, Jacob Trimble : > > On Fri, Jun 1, 2018 at 5:03 PM Michael Niedermayer > > wrote: > >> > >> On Thu, May 31, 2018 at 09:33:36AM -0700, Jacob Trimble wrote: > &

Re: [FFmpeg-devel] [PATCH] libavutil/encryption_info: Add NULL checks.

2018-06-04 Thread Jacob Trimble
On Fri, Jun 1, 2018 at 5:03 PM Michael Niedermayer wrote: > > On Thu, May 31, 2018 at 09:33:36AM -0700, Jacob Trimble wrote: > > Found by Chrome's ClusterFuzz: http://crbug.com/846662. > > > > Signed-off-by: Jacob Trimble > > --- > > libavutil/encrypti

Re: [FFmpeg-devel] [PATCH] libavutil/encryption_info: Add unit tests.

2018-06-01 Thread Jacob Trimble
On Fri, Jun 1, 2018 at 12:52 PM Jacob Trimble wrote: > > Signed-off-by: Jacob Trimble > --- > libavutil/Makefile| 1 + > libavutil/encryption_info.h | 2 +- > libavutil/tests/.gitignore| 2 + > libavutil/tests/en

[FFmpeg-devel] [PATCH] libavutil/encryption_info: Add unit tests.

2018-06-01 Thread Jacob Trimble
Signed-off-by: Jacob Trimble --- libavutil/Makefile| 1 + libavutil/encryption_info.h | 2 +- libavutil/tests/.gitignore| 2 + libavutil/tests/encryption_info.c | 176 ++ tests/fate/libavutil.mak | 4 + tests/ref/fate

Re: [FFmpeg-devel] libavutil/encryption_info: Allow multiple init info.

2018-05-31 Thread Jacob Trimble
On Thu, May 31, 2018 at 9:40 AM Jacob Trimble wrote: > > On Fri, May 25, 2018 at 6:13 PM Michael Niedermayer > wrote: > > > > [...] > > > > > Added fix for issue found by Chrome's ClusterFuzz > > > (http://crbug.com/846662). > > > >

[FFmpeg-devel] [PATCH] libavformat/mov: Fix heap buffer overflow.

2018-05-31 Thread Jacob Trimble
Found by Chrome's ClusterFuzz: https://crbug.com/847060 Signed-off-by: Jacob Trimble --- libavformat/mov.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index f2a540ad50..08cc382a68 100644 --- a/libavformat/mov.c

Re: [FFmpeg-devel] libavutil/encryption_info: Allow multiple init info.

2018-05-31 Thread Jacob Trimble
_ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > http://ffmpeg.org/mailman/listinfo/ffmpeg-devel From 468958a26c1df8f599925038518ca4dae90de0f7 Mon Sep 17 00:00:00 2001 From: Jacob Trimble Date: Mon, 23 Apr 2018 10:33:58 -0700 Subject: [PATCH] libavut

[FFmpeg-devel] [PATCH] libavutil/encryption_info: Add NULL checks.

2018-05-31 Thread Jacob Trimble
Found by Chrome's ClusterFuzz: http://crbug.com/846662. Signed-off-by: Jacob Trimble --- libavutil/encryption_info.c | 7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libavutil/encryption_info.c b/libavutil/encryption_info.c index 20a752d6b4..a48ded922c 100644

Re: [FFmpeg-devel] libavutil/encryption_info: Allow multiple init info.

2018-05-25 Thread Jacob Trimble
On Mon, May 21, 2018 at 9:25 AM, Jacob Trimble wrote: > On Mon, May 14, 2018 at 4:49 PM, Jacob Trimble wrote: >> On Tue, May 8, 2018 at 3:47 PM, Michael Niedermayer >> wrote: >>> On Mon, May 07, 2018 at 04:59:33PM -0700, Jacob Trimble wrote: >>>> On

Re: [FFmpeg-devel] libavutil/encryption_info: Allow multiple init info.

2018-05-21 Thread Jacob Trimble
On Mon, May 14, 2018 at 4:49 PM, Jacob Trimble wrote: > On Tue, May 8, 2018 at 3:47 PM, Michael Niedermayer > wrote: >> On Mon, May 07, 2018 at 04:59:33PM -0700, Jacob Trimble wrote: >>> On Mon, May 7, 2018 at 3:18 PM, Michael Niedermayer >>> wrote: >>&g

Re: [FFmpeg-devel] [PATCH] add support for parsing pssh box

2018-05-17 Thread Jacob Trimble
On Wed, May 16, 2018 at 11:32 PM, Zewu Chen wrote: > Use structure AVEncryptionInitInfo to provide CENC initialization information > for the application. > > Signed-off-by: Chen Zewu > --- > libavformat/isom.h | 1 + > libavformat/mov.c | 64 > +

Re: [FFmpeg-devel] libavutil/encryption_info: Allow multiple init info.

2018-05-14 Thread Jacob Trimble
On Tue, May 8, 2018 at 3:47 PM, Michael Niedermayer wrote: > On Mon, May 07, 2018 at 04:59:33PM -0700, Jacob Trimble wrote: >> On Mon, May 7, 2018 at 3:18 PM, Michael Niedermayer >> wrote: >> > On Mon, Apr 23, 2018 at 11:03:57AM -0700, Jacob Trimble wrote: >> >

Re: [FFmpeg-devel] libavutil/encryption_info: Allow multiple init info.

2018-05-07 Thread Jacob Trimble
On Mon, May 7, 2018 at 3:18 PM, Michael Niedermayer wrote: > On Mon, Apr 23, 2018 at 11:03:57AM -0700, Jacob Trimble wrote: >> While integrating my encryption info changes, I noticed a problem with >> the init info structs. I implemented them as side-data on the Stream. >>

Re: [FFmpeg-devel] libavutil/encryption_info: Allow multiple init info.

2018-05-07 Thread Jacob Trimble
On Fri, Apr 27, 2018 at 5:30 PM, Jacob Trimble wrote: > On Fri, Apr 27, 2018 at 10:33 AM, Jacob Trimble wrote: >> On Mon, Apr 23, 2018 at 11:03 AM, Jacob Trimble wrote: >>> While integrating my encryption info changes, I noticed a problem with >>> the init info stru

Re: [FFmpeg-devel] libavutil/encryption_info: Allow multiple init info.

2018-04-27 Thread Jacob Trimble
On Fri, Apr 27, 2018 at 10:33 AM, Jacob Trimble wrote: > On Mon, Apr 23, 2018 at 11:03 AM, Jacob Trimble wrote: >> While integrating my encryption info changes, I noticed a problem with >> the init info structs. I implemented them as side-data on the Stream. >> But this me

Re: [FFmpeg-devel] libavutil/encryption_info: Allow multiple init info.

2018-04-27 Thread Jacob Trimble
On Mon, Apr 23, 2018 at 11:03 AM, Jacob Trimble wrote: > While integrating my encryption info changes, I noticed a problem with > the init info structs. I implemented them as side-data on the Stream. > But this means there can only be one per stream. However, there can > be mu

[FFmpeg-devel] libavutil/encryption_info: Allow multiple init info.

2018-04-23 Thread Jacob Trimble
ld do that instead if that is preferable. From bb941a77e882e93629d63d63059d0063b9519e29 Mon Sep 17 00:00:00 2001 From: Jacob Trimble Date: Mon, 23 Apr 2018 10:33:58 -0700 Subject: [PATCH] libavutil/encryption_info: Allow multiple init info. It is possible for there to be multiple encryption init info

Re: [FFmpeg-devel] [PATCH 2/3] avformat/mov: Fix parsing of saio/siaz atoms in encrypted content.

2018-04-19 Thread Jacob Trimble
On Thu, Apr 19, 2018 at 2:07 AM, Michael Niedermayer wrote: > On Tue, Jan 09, 2018 at 10:27:28AM -0800, Jacob Trimble wrote: >> On Mon, Jan 8, 2018 at 5:39 PM, Carl Eugen Hoyos wrote: >> > 2018-01-08 23:34 GMT+01:00 Jacob Trimble >> > : >> >> On Fri, J

Re: [FFmpeg-devel] [PATCH 1/3] avformat/mov: Increase support for common encryption.

2018-04-19 Thread Jacob Trimble
On Thu, Apr 19, 2018 at 7:01 AM, James Almer wrote: > On 4/18/2018 9:42 PM, Michael Niedermayer wrote: >> On Wed, Apr 18, 2018 at 09:47:17AM -0700, Jacob Trimble wrote: >>> On Tue, Apr 17, 2018 at 7:11 PM, Michael Niedermayer >>> wrote: >>>> On Tue,

[FFmpeg-devel] [PATCH] avformat/mov: Fix memory leak in encryption info.

2018-04-19 Thread Jacob Trimble
Signed-off-by: Jacob Trimble --- libavformat/mov.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavformat/mov.c b/libavformat/mov.c index fc512b8d72..4eda48d617 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -5833,6 +5833,7 @@ static int mov_read_sample_encryption_info

Re: [FFmpeg-devel] [PATCH 1/3] avformat/mov: Increase support for common encryption.

2018-04-18 Thread Jacob Trimble
On Tue, Apr 17, 2018 at 7:11 PM, Michael Niedermayer wrote: > On Tue, Apr 03, 2018 at 04:08:51PM -0700, Jacob Trimble wrote: >> >> >> >> Ping again. I know this is low priority, but I would like to get >> >> these merged soon. >> > >> >

[FFmpeg-devel] [PATCH] avformat/mov: Fix parsing of tfdt when using sample descriptors.

2018-04-04 Thread Jacob Trimble
Signed-off-by: Jacob Trimble --- libavformat/mov.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index e7c32e6148..97b1462aab 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -4601,7 +4601,7 @@ static int mov_read_tfdt

Re: [FFmpeg-devel] [PATCH 1/3] avformat/mov: Increase support for common encryption.

2018-04-03 Thread Jacob Trimble
eep pinging this until someone merges this or tells me why not). Day after tomorrow this will be in review for 4 months!!! Also noticed a bug when integrating this, so here is an updated patch. From 282effab6026341c49a52950cf8ba11afc9dc6aa Mon Sep 17 00:00:00 2001 From: Jacob Trimble Date: Wed, 6 D

Re: [FFmpeg-devel] [PATCH 1/3] avformat/mov: Increase support for common encryption.

2018-03-22 Thread Jacob Trimble
On Mon, Mar 5, 2018 at 12:22 PM, Jacob Trimble wrote: > On Mon, Feb 12, 2018 at 9:35 AM, Jacob Trimble wrote: >> On Tue, Jan 30, 2018 at 11:27 AM, Jacob Trimble wrote: >>> On Wed, Jan 24, 2018 at 5:46 PM, Michael Niedermayer >>> wrote: >>>> On Wed,

Re: [FFmpeg-devel] [PATCH 1/3] avformat/mov: Increase support for common encryption.

2018-03-05 Thread Jacob Trimble
On Mon, Feb 12, 2018 at 9:35 AM, Jacob Trimble wrote: > On Tue, Jan 30, 2018 at 11:27 AM, Jacob Trimble wrote: >> On Wed, Jan 24, 2018 at 5:46 PM, Michael Niedermayer >> wrote: >>> On Wed, Jan 24, 2018 at 11:43:26AM -0800, Jacob Trimble wrote: >>>> On M

Re: [FFmpeg-devel] [PATCH 1/3] avformat/mov: Increase support for common encryption.

2018-02-12 Thread Jacob Trimble
On Tue, Jan 30, 2018 at 11:27 AM, Jacob Trimble wrote: > On Wed, Jan 24, 2018 at 5:46 PM, Michael Niedermayer > wrote: >> On Wed, Jan 24, 2018 at 11:43:26AM -0800, Jacob Trimble wrote: >>> On Mon, Jan 22, 2018 at 7:38 PM, Michael Niedermayer >>> wrote >>>

Re: [FFmpeg-devel] [PATCH 1/3] avformat/mov: Increase support for common encryption.

2018-01-30 Thread Jacob Trimble
On Wed, Jan 24, 2018 at 5:46 PM, Michael Niedermayer wrote: > On Wed, Jan 24, 2018 at 11:43:26AM -0800, Jacob Trimble wrote: >> On Mon, Jan 22, 2018 at 7:38 PM, Michael Niedermayer >> wrote >> > [...] >> >> This removes support for saio/saiz atoms, but it was

Re: [FFmpeg-devel] [PATCH 1/3] avformat/mov: Increase support for common encryption.

2018-01-24 Thread Jacob Trimble
eaks encrypted content. But I can squash them again if it is preferable to not have a commit that intentionally breaks things. > >> >> Signed-off-by: Jacob Trimble >> --- >> libavformat/isom.h | 20 +- >> libavformat/mov.c

Re: [FFmpeg-devel] [PATCH 1/3] avformat/mov: Increase support for common encryption.

2018-01-22 Thread Jacob Trimble
On Wed, Jan 10, 2018 at 5:08 PM, Jacob Trimble wrote: > > On Wed, Jan 10, 2018 at 1:51 PM, Michael Niedermayer > wrote: > > [...] > > > > This causes a crash: > > > > = > > ==4012==ERR

Re: [FFmpeg-devel] [PATCH 1/3] avformat/mov: Increase support for common encryption.

2018-01-10 Thread Jacob Trimble
__ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > http://ffmpeg.org/mailman/listinfo/ffmpeg-devel > From 5f6411a92569d13524485627fa68e62e8fd63e50 Mon Sep 17 00:00:00 2001 From: Jacob Trimble Date: Wed, 6 Dec 2017 16:17:54 -0800 Subject: [PATCH] avformat

Re: [FFmpeg-devel] [PATCH 3/3] avformat/mov: Expose encryption info to the app.

2018-01-09 Thread Jacob Trimble
On Mon, Jan 8, 2018 at 5:23 PM, Carl Eugen Hoyos wrote: > 2018-01-09 0:22 GMT+01:00 Jacob Trimble : > >> Updated with the new design for the side data and applied the realloc >> fix to avoid large allocations. > >> +kid_count = avio_rb32(pb); > > Missing

Re: [FFmpeg-devel] [PATCH 2/3] avformat/mov: Fix parsing of saio/siaz atoms in encrypted content.

2018-01-09 Thread Jacob Trimble
On Mon, Jan 8, 2018 at 5:39 PM, Carl Eugen Hoyos wrote: > 2018-01-08 23:34 GMT+01:00 Jacob Trimble : >> On Fri, Jan 5, 2018 at 3:41 PM, Carl Eugen Hoyos wrote: >>> 2018-01-05 23:58 GMT+01:00 Jacob Trimble >>> : >>>> On Fri, Jan 5, 2018 at 2:01 PM, Carl Eug

Re: [FFmpeg-devel] [PATCH 1/3] avformat/mov: Increase support for common encryption.

2018-01-09 Thread Jacob Trimble
On Mon, Jan 8, 2018 at 5:19 PM, Carl Eugen Hoyos wrote: > 2018-01-08 23:16 GMT+01:00 Jacob Trimble : >>> You can't remove API just like that without a deprecation period. >>> Add a new av_aes_ctr_set_full_iv() function, and either leave >>> av_aes_ctr_s

Re: [FFmpeg-devel] [RFC] avcodec/avcodec.h: Add encryption info side data

2018-01-08 Thread Jacob Trimble
On Mon, Jan 8, 2018 at 11:40 AM, Jacob Trimble wrote: >> I'd assume we'd wait with applying this until the mp4 patch that uses >> it is reviewed. I'm fine with this patch and I think it can be pushed >> as it is, although I just noticed an APIchanges entry and

Re: [FFmpeg-devel] [PATCH 3/3] avformat/mov: Expose encryption info to the app.

2018-01-08 Thread Jacob Trimble
On Fri, Jan 5, 2018 at 12:55 PM, Jacob Trimble wrote: > On Fri, Jan 5, 2018 at 12:43 PM, Carl Eugen Hoyos wrote: >> 2018-01-05 20:49 GMT+01:00 Jacob Trimble : >> >>> +AV_WB32(side_data, size); >>> +AV_WL32(side_data + 4, MKTAG('p','s&#

Re: [FFmpeg-devel] [PATCH 2/3] avformat/mov: Fix parsing of saio/siaz atoms in encrypted content.

2018-01-08 Thread Jacob Trimble
On Fri, Jan 5, 2018 at 3:41 PM, Carl Eugen Hoyos wrote: > 2018-01-05 23:58 GMT+01:00 Jacob Trimble : >> On Fri, Jan 5, 2018 at 2:01 PM, Carl Eugen Hoyos wrote: >>> 2018-01-05 22:29 GMT+01:00 Jacob Trimble >>> : >>>> On Fri, Jan 5, 2018 at 12:41 PM, Carl

Re: [FFmpeg-devel] [PATCH 1/3] avformat/mov: Increase support for common encryption.

2018-01-08 Thread Jacob Trimble
from > this patch into the one that actually introduces the entire feature. Whoops, I thought that was internal-only. Done and split into its own change. On Sat, Jan 6, 2018 at 7:30 AM, Carl Eugen Hoyos wrote: > 2018-01-05 20:49 GMT+01:00 Jacob Trimble : > >>

[FFmpeg-devel] [PATCH] avutil/aes_ctr: Add method to set 16-byte IV.

2018-01-08 Thread Jacob Trimble
Signed-off-by: Jacob Trimble --- doc/APIchanges| 3 +++ libavutil/aes_ctr.c | 6 ++ libavutil/aes_ctr.h | 7 ++- libavutil/tests/aes_ctr.c | 2 +- libavutil/version.h | 2 +- 5 files changed, 17 insertions(+), 3 deletions(-) diff --git a/doc/APIchanges b

Re: [FFmpeg-devel] [RFC] avcodec/avcodec.h: Add encryption info side data

2018-01-08 Thread Jacob Trimble
951fc4db77a83f9dc60f75e84717b4fd0 Mon Sep 17 00:00:00 2001 From: Jacob Trimble Date: Tue, 5 Dec 2017 14:52:22 -0800 Subject: [PATCH] avcodec/avcodec.h: Add encryption info side data. This new side-data will contain info on how a packet is encrypted. This allows the app to handle packet decryption.

Re: [FFmpeg-devel] [PATCH 2/3] avformat/mov: Fix parsing of saio/siaz atoms in encrypted content.

2018-01-05 Thread Jacob Trimble
On Fri, Jan 5, 2018 at 2:01 PM, Carl Eugen Hoyos wrote: > 2018-01-05 22:29 GMT+01:00 Jacob Trimble : >> On Fri, Jan 5, 2018 at 12:41 PM, Carl Eugen Hoyos wrote: >>> 2018-01-05 20:49 GMT+01:00 Jacob Trimble >>> : >>> >>>> +entry_c

Re: [FFmpeg-devel] [PATCH 2/3] avformat/mov: Fix parsing of saio/siaz atoms in encrypted content.

2018-01-05 Thread Jacob Trimble
On Fri, Jan 5, 2018 at 12:41 PM, Carl Eugen Hoyos wrote: > 2018-01-05 20:49 GMT+01:00 Jacob Trimble : > >> +entry_count = avio_rb32(pb); >> +encryption_index->auxiliary_offsets = av_malloc_array(sizeof(size_t), >> entry_count); > > (sizeof(variable

Re: [FFmpeg-devel] [PATCH 3/3] avformat/mov: Expose encryption info to the app.

2018-01-05 Thread Jacob Trimble
On Fri, Jan 5, 2018 at 12:43 PM, Carl Eugen Hoyos wrote: > 2018-01-05 20:49 GMT+01:00 Jacob Trimble : > >> +AV_WB32(side_data, size); >> +AV_WL32(side_data + 4, MKTAG('p','s','s','h')); > > I didn't check: > Is t

Re: [FFmpeg-devel] [PATCH 1/3] avformat/mov: Increase support for common encryption.

2018-01-05 Thread Jacob Trimble
On Fri, Jan 5, 2018 at 11:49 AM, Jacob Trimble wrote: >> [...] This adds two new fate tests that need to be uploaded by someone: https://storage.googleapis.com/shaka-demo-assets/_bugs/ffmpeg-fate-files/mov-frag-encrypted.mp4 https://storage.googleapis.com/shaka-demo-assets/_bugs/ffmpe

[FFmpeg-devel] [PATCH 2/3] avformat/mov: Fix parsing of saio/siaz atoms in encrypted content.

2018-01-05 Thread Jacob Trimble
This doesn't support saio atoms with more than one offset. Signed-off-by: Jacob Trimble --- libavformat/isom.h | 6 ++ libavformat/mov.c | 174 + 2 files changed, 180 insertions(+) diff --git a/libavformat/isom.h b/libavformat/isom.h

[FFmpeg-devel] [PATCH 3/3] avformat/mov: Expose encryption info to the app.

2018-01-05 Thread Jacob Trimble
This exposes encryption info from the container to the app. This includes key ID, IV, and subsample byte ranges. The info is passed using the new side-data AV_PKT_DATA_ENCRYPTION_INIT_DATA. Signed-off-by: Jacob Trimble --- libavformat/mov.c | 29 + 1 file changed

[FFmpeg-devel] [PATCH 1/3] avformat/mov: Increase support for common encryption.

2018-01-05 Thread Jacob Trimble
rrect before. A follow-up change will add correct support for those. Signed-off-by: Jacob Trimble --- libavformat/isom.h | 20 +- libavformat/mov.c | 404 + libavutil/aes_ctr.c| 11 +- liba

Re: [FFmpeg-devel] [RFC] avcodec/avcodec.h: Add encryption info side data

2018-01-05 Thread Jacob Trimble
On Tue, Jan 2, 2018 at 9:57 AM, Jacob Trimble wrote: > On Wed, Dec 20, 2017 at 4:31 PM, wm4 wrote: >> On Wed, 20 Dec 2017 15:10:43 -0800 >> Jacob Trimble wrote: >> >>> From 1508d19e9f7acf43d76010ce54d59ff204613601 Mon Sep 17 00:00:00 2001 >>> From: Jacob T

Re: [FFmpeg-devel] [RFC] avcodec/avcodec.h: Add encryption info side data

2018-01-02 Thread Jacob Trimble
On Wed, Dec 20, 2017 at 4:31 PM, wm4 wrote: > On Wed, 20 Dec 2017 15:10:43 -0800 > Jacob Trimble wrote: > >> From 1508d19e9f7acf43d76010ce54d59ff204613601 Mon Sep 17 00:00:00 2001 >> From: Jacob Trimble >> Date: Tue, 5 Dec 2017 14:52:22 -0800 >> Subjec

Re: [FFmpeg-devel] [RFC] avcodec/avcodec.h: Add encryption info side data

2017-12-20 Thread Jacob Trimble
On Wed, Dec 20, 2017 at 12:23 PM, wm4 wrote: > On Wed, 20 Dec 2017 12:07:09 -0800 > Jacob Trimble wrote: > >> On Tue, Dec 19, 2017 at 3:05 PM, wm4 wrote: >> > On Tue, 19 Dec 2017 14:20:38 -0800 >> > Jacob Trimble wrote: >> > >> >> > I do

Re: [FFmpeg-devel] [RFC] avcodec/avcodec.h: Add encryption info side data

2017-12-20 Thread Jacob Trimble
On Tue, Dec 19, 2017 at 3:05 PM, wm4 wrote: > On Tue, 19 Dec 2017 14:20:38 -0800 > Jacob Trimble wrote: > >> > I don't think this is sane. So far, side data could simply be copied >> > with memcpy, and having pointers to non-static data in side data would >&

Re: [FFmpeg-devel] [RFC] avcodec/avcodec.h: Add encryption info side data

2017-12-19 Thread Jacob Trimble
> You pretty much did. Side data is an ffmpeg internal concept, and if > your hypothetical streaming protocol needs special support for side > data, it's automatically relying on ffmpeg internals. I thought side data was public data? Doesn't it contain public info like display info and required d

Re: [FFmpeg-devel] [RFC] avcodec/avcodec.h: Add encryption info side data

2017-12-18 Thread Jacob Trimble
>> @@ -1327,6 +1384,19 @@ enum AVPacketSideDataType { >> */ >> AV_PKT_DATA_A53_CC, >> >> +/** >> + * This side data is encryption "initialization data". >> + * For MP4 this is the entire 'pssh' box. >> + * For WebM this is the key ID. >> + */ >> +AV_PKT_DATA_ENCRY

Re: [FFmpeg-devel] [RFC] avcodec/avcodec.h: Add encryption info side data

2017-12-15 Thread Jacob Trimble
ypted. > > >> +} AVPacketEncryptionInfo; > >> +#define FF_PACKET_ENCRYPTION_INFO_SIZE(a) (sizeof(AVPacketEncryptionInfo) + >> sizeof(unsigned int) * a * 2) > > This assumes things about the padding and alignment of fields that are not > guranteed by C i think >

  1   2   >