[FFmpeg-devel] [PATCH] libavformat/mov: Fix inserting frames before current_frame.

2017-07-27 Thread Jacob Trimble
When using streaming input, it may be possible to see frames that appear before the current_frame. When these frames are inserted into the index, the current_frame needs to be updated so it is still pointing at the same frame. Signed-off-by: Jacob Trimble <modma...@google.com> --- libav

[FFmpeg-devel] [PATCH] libavformat/mov: Fix inserting frames before current_frame

2017-07-26 Thread Jacob Trimble
When using streaming input, it may be possible to see frames that appear before the current_frame. When these frames are inserted into the index, the current_frame needs to be updated so it is still pointing at the same frame. Signed-off-by: Jacob Trimble <modma...@google.com> --- libav

[FFmpeg-devel] Reading Frames in File Order

2017-07-20 Thread Jacob Trimble
I am writing a program that will use libavformat to demux media segments. I will need to parse media segments that may appear in any order and produce playable regions of content. For example, think YouTube streaming; there are regions of buffered content and seeking can produce media segments

Re: [FFmpeg-devel] [PATCH] libavformat/mov: Fix inserting frames before current_frame.

2017-08-07 Thread Jacob Trimble
Ping On Thu, Jul 27, 2017 at 10:34 AM, Jacob Trimble <modma...@google.com> wrote: > When using streaming input, it may be possible to see frames that appear > before the current_frame. When these frames are inserted into the > index, the current_frame needs to be updated so it is

Re: [FFmpeg-devel] [PATCH] libavformat/mov: Fix inserting frames before current_frame.

2017-08-17 Thread Jacob Trimble
On Mon, Aug 7, 2017 at 9:24 AM, Jacob Trimble <modma...@google.com> wrote: > Ping > > On Thu, Jul 27, 2017 at 10:34 AM, Jacob Trimble <modma...@google.com> wrote: >> When using streaming input, it may be possible to see frames that appear >> before the

[FFmpeg-devel] [PATCH] configure: quote compiler paths

2017-09-19 Thread Jacob Trimble
Signed-off-by: Jacob Trimble <modma...@google.com> --- configure | 16 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/configure b/configure index 2de20a02a4..16aa09be05 100755 --- a/configure +++ b/configure @@ -920,14 +920,14 @@ check_cc(){ log ch

Re: [FFmpeg-devel] [PATCH] configure: quote compiler paths

2017-09-21 Thread Jacob Trimble
On Thu, Sep 21, 2017 at 10:03 AM, Nicolas George <geo...@nsup.org> wrote: > Le jour de la Récompense, an CCXXV, Jacob Trimble a écrit : >> But without this, you can't have a compiler path that has a space in >> it. Plus, AFAIK, there is no way to escape the space throu

Re: [FFmpeg-devel] [PATCH] configure: quote compiler paths

2017-09-21 Thread Jacob Trimble
On Wed, Sep 20, 2017 at 4:29 PM, Michael Niedermayer <mich...@niedermayer.cc> wrote: > > On Tue, Sep 19, 2017 at 04:54:16PM -0700, Jacob Trimble wrote: > > Signed-off-by: Jacob Trimble <modma...@google.com> > > --- > > configure | 16 >

[FFmpeg-devel] [PATCH] avcodec/nvdec: Fix capability check with old drivers.

2017-11-30 Thread Jacob Trimble
Copied the check from cuviddec.c (*_cuvid decoders) to allow the capability check to be optional for older drivers. Signed-off-by: Jacob Trimble <modma...@google.com> --- libavcodec/nvdec.c | 12 1 file changed, 12 insertions(+) diff --git a/libavcodec/nvdec.c b/libavcodec/n

[FFmpeg-devel] [PATCH] configure: Fix dependencies of aac_at decoder.

2017-11-30 Thread Jacob Trimble
Signed-off-by: Jacob Trimble <modma...@google.com> --- configure | 1 + 1 file changed, 1 insertion(+) diff --git a/configure b/configure index 1fa16e9dba..d05388638d 100755 --- a/configure +++ b/configure @@ -2890,6 +2890,7 @@ trace_headers_bsf_select="cbs_h264 cbs_h265 cbs_mpeg2&quo

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

2017-12-14 Thread Jacob Trimble
On Fri, Dec 8, 2017 at 10:06 AM, Jacob Trimble <modma...@google.com> wrote: > On Tue, Dec 5, 2017 at 5:22 PM, Derek Buitenhuis > <derek.buitenh...@gmail.com> wrote: >> On 12/6/2017 12:36 AM, Jacob Trimble wrote: >>> Would a 0-length array work? Otherwise I would

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. >> + */ >> +

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 >

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

[FFmpeg-devel] [PATCH] avformat/mov: Propagate errors in mov_switch_root.

2017-11-20 Thread Jacob Trimble
Signed-off-by: Jacob Trimble <modma...@google.com> --- libavformat/mov.c | 7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index 0b8f8ad24b..b6cdf3a52a 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -6753,6 +

[FFmpeg-devel] [PATCH] avformat/mov: Propagate errors in mov_switch_root.

2017-11-16 Thread Jacob Trimble
Signed-off-by: Jacob Trimble <modma...@google.com> --- libavformat/mov.c | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index d49d820d2b..c5f07595df 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -6747,6 +6747,7 @@

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

2017-12-08 Thread Jacob Trimble
On Tue, Dec 5, 2017 at 5:22 PM, Derek Buitenhuis <derek.buitenh...@gmail.com> wrote: > On 12/6/2017 12:36 AM, Jacob Trimble wrote: >> Would a 0-length array work? Otherwise I would need to have it be a >> 1-length array and have to account for that when calculating th

Re: [FFmpeg-devel] [PATCH] avcodec/Makefile: Fix opus parser dependency.

2017-12-08 Thread Jacob Trimble
On Fri, Dec 8, 2017 at 10:39 AM, Michael Niedermayer <mich...@niedermayer.cc> wrote: > On Thu, Dec 07, 2017 at 11:30:13AM -0800, Jacob Trimble wrote: >> The opus.c file uses variables that are defined in opustab.c. The >> opus parser needs to include that file to avo

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

2017-12-05 Thread Jacob Trimble
Mon Sep 17 00:00:00 2001 From: Jacob Trimble <modma...@google.com> Date: Tue, 5 Dec 2017 14:52:22 -0800 Subject: [PATCH] avpacket: Add encryption info side data. Signed-off-by: Jacob Trimble <modma...@google.com> --- libavcodec/avcodec.h | 65 +++

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

2017-12-05 Thread Jacob Trimble
On Tue, Dec 5, 2017 at 3:25 PM, Derek Buitenhuis <derek.buitenh...@gmail.com> wrote: > On 12/5/2017 11:00 PM, Jacob Trimble wrote: >> Also, can I use the flexible array member feature, it was introduced >> in C99? Would a 0-length array be better? > > No, I don't th

[FFmpeg-devel] [PATCH] avcodec/Makefile: Fix opus parser dependency.

2017-12-07 Thread Jacob Trimble
The opus.c file uses variables that are defined in opustab.c. The opus parser needs to include that file to avoid linker errors when not including the opus encoder/decoder. Signed-off-by: Jacob Trimble <modma...@google.com> --- libavcodec/Makefile | 2 +- 1 file changed, 1 insertion

Re: [FFmpeg-devel] [PATCH] avcodec/nvdec: Fix capability check with old drivers.

2017-12-07 Thread Jacob Trimble
On Thu, Nov 30, 2017 at 12:35 PM, Jacob Trimble <modma...@google.com> wrote: > Copied the check from cuviddec.c (*_cuvid decoders) to allow the > capability check to be optional for older drivers. > > Signed-off-by: Jacob Trimble <modma...@google.com> > ---

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 <mich...@niedermayer.cc> 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 >> <mich...@niedermayer.cc> wrote: >> > On Mon, Apr

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 <mich...@niedermayer.cc> 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 si

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 <modma...@google.com> 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. How

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 <modma...@google.com> wrote: > On Mon, Apr 23, 2018 at 11:03 AM, Jacob Trimble <modma...@google.com> wrote: >> While integrating my encryption info changes, I noticed a problem with >> the init info structs. I im

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 <modma...@google.com> wrote: > On Fri, Apr 27, 2018 at 10:33 AM, Jacob Trimble <modma...@google.com> wrote: >> On Mon, Apr 23, 2018 at 11:03 AM, Jacob Trimble <modma...@google.com> wrote: >>> While integrating m

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-21 Thread Jacob Trimble
On Mon, May 14, 2018 at 4:49 PM, Jacob Trimble <modma...@google.com> wrote: > On Tue, May 8, 2018 at 3:47 PM, Michael Niedermayer > <mich...@niedermayer.cc> wrote: >> On Mon, May 07, 2018 at 04:59:33PM -0700, Jacob Trimble wrote: >>> On Mon, May 7, 2018 at 3:18

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 <modma...@google.com> wrote: > On Mon, May 14, 2018 at 4:49 PM, Jacob Trimble <modma...@google.com> wrote: >> On Tue, May 8, 2018 at 3:47 PM, Michael Niedermayer >> <mich...@niedermayer.cc> wrote: >>> On Mo

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

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 trivial and will cat

[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/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/mov.c

[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 +++ b

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:

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] libavuti

[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 +++ b

[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] [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] 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). > > > > t

[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] [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

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 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/encryption_in

[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

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

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>: > > >

[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] 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] [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] 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] [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 <modma...@google.com> wrote: > On Wed, Dec 20, 2017 at 4:31 PM, wm4 <nfx...@googlemail.com> wrote: >> On Wed, 20 Dec 2017 15:10:43 -0800 >> Jacob Trimble <modmaker-at-google@ffmpeg.org> wrote: >> >>&g

[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 <modma...@google.com> --- libavformat/mov.

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

2018-01-05 Thread Jacob Trimble
. A follow-up change will add correct support for those. Signed-off-by: Jacob Trimble <modma...@google.com> --- libavformat/isom.h | 20 +- libavformat/mov.c | 404 + libavutil/aes_ctr.c| 11 +- lib

[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 <modma...@google.com> --- libavformat/isom.h | 6 ++ libavformat/mov.c | 174 + 2 files changed, 180 insertions(+) diff --git a/libavformat/is

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 <ceffm...@gmail.com> wrote: > 2018-01-05 20:49 GMT+01:00 Jacob Trimble <modmaker-at-google@ffmpeg.org>: > >> +AV_WB32(side_data, size); >> +AV_WL32(side_data + 4, MKTAG('p','s','s','h')); > > I didn'

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 <ceffm...@gmail.com> wrote: > 2018-01-05 22:29 GMT+01:00 Jacob Trimble <modmaker-at-google@ffmpeg.org>: >> On Fri, Jan 5, 2018 at 12:41 PM, Carl Eugen Hoyos <ceffm...@gmail.com> wrote: >>> 2018-01-05 20:49 GM

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 <modma...@google.com> 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

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 <ceffm...@gmail.com> wrote: > 2018-01-05 20:49 GMT+01:00 Jacob Trimble <modmaker-at-google@ffmpeg.org>: > >> +entry_count = avio_rb32(pb); >> +encryption_index->auxiliary_offsets = av_malloc_arra

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 <ceffm...@gmail.com> wrote: > 2018-01-08 23:16 GMT+01:00 Jacob Trimble <modmaker-at-google@ffmpeg.org>: >>> You can't remove API just like that without a deprecation period. >>> Add a new av_aes_ctr_set_ful

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 <ceffm...@gmail.com> wrote: > 2018-01-08 23:34 GMT+01:00 Jacob Trimble <modmaker-at-google@ffmpeg.org>: >> On Fri, Jan 5, 2018 at 3:41 PM, Carl Eugen Hoyos <ceffm...@gmail.com> wrote: >>> 2018-01-05 23:58 GM

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 <ceffm...@gmail.com> wrote: > 2018-01-09 0:22 GMT+01:00 Jacob Trimble <modmaker-at-google@ffmpeg.org>: > >> Updated with the new design for the side data and applied the realloc >> fix to avoid large alloca

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 <modma...@google.com> wrote: > On Fri, Jan 5, 2018 at 12:43 PM, Carl Eugen Hoyos <ceffm...@gmail.com> wrote: >> 2018-01-05 20:49 GMT+01:00 Jacob Trimble <modmaker-at-google@ffmpeg.org>: >> >>> +

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

2018-01-08 Thread Jacob Trimble
20f951fc4db77a83f9dc60f75e84717b4fd0 Mon Sep 17 00:00:00 2001 From: Jacob Trimble <modma...@google.com> 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 ap

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 <ceffm...@gmail.com> wrote: > 2018-01-05 20:49 GMT+01:00 Jacob

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 <ceffm...@gmail.com> wrote: > 2018-01-05 23:58 GMT+01:00 Jacob Trimble <modmaker-at-google@ffmpeg.org>: >> On Fri, Jan 5, 2018 at 2:01 PM, Carl Eugen Hoyos <ceffm...@gmail.com> wrote: >>> 2018-01-05 22:29 GM

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

2018-01-08 Thread Jacob Trimble
Signed-off-by: Jacob Trimble <modma...@google.com> --- 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

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

2018-01-10 Thread Jacob Trimble
t; > ___ > 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 <modma...@google.com> Date

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 <modma...@google.com> 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

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

2018-01-24 Thread Jacob Trimble
(or squashed) since the first breaks 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 <modma...@google.com> >> --- >> libavformat/isom.h

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 <mich...@niedermayer.cc> 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 >> <mich...@niedermayer.cc> wrote >> > [...] >> &

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 <modma...@google.com> wrote: > On Wed, Jan 24, 2018 at 5:46 PM, Michael Niedermayer > <mich...@niedermayer.cc> wrote: >> On Wed, Jan 24, 2018 at 11:43:26AM -0800, Jacob Trimble wrote: >>> On Mon, Jan 22, 2018 at 7:38

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 <nfx...@googlemail.com> wrote: > On Tue, 19 Dec 2017 14:20:38 -0800 > Jacob Trimble <modmaker-at-google@ffmpeg.org> wrote: > >> > I don't think this is sane. So far, side data could simply be copied >> > with memcpy,

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 <nfx...@googlemail.com> wrote: > On Wed, 20 Dec 2017 12:07:09 -0800 > Jacob Trimble <modmaker-at-google@ffmpeg.org> wrote: > >> On Tue, Dec 19, 2017 at 3:05 PM, wm4 <nfx...@googlemail.com> wrote: >> > On Tue, 19

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 <nfx...@googlemail.com> wrote: > On Wed, 20 Dec 2017 15:10:43 -0800 > Jacob Trimble <modmaker-at-google@ffmpeg.org> wrote: > >> From 1508d19e9f7acf43d76010ce54d59ff204613601 Mon Sep 17 00:00:00 2001 >> From: Jacob Trimble &

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.

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 > >

[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] 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] 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 --- libavformat/mov.c | 28

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://crbug.com/873

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

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

[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

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/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

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

2018-08-28 Thread Jacob Trimble
-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 "liba

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

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/

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/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/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-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 > >> without

[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

  1   2   >