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

2018-06-22 Thread Michael Niedermayer
On Thu, Jun 21, 2018 at 12:01:09PM -0700, Jacob Trimble wrote: > On Thu, Jun 21, 2018 at 9:48 AM Michael Niedermayer > wrote: > > > > > +if (UINT32_MAX == init_info_count || > > > +UINT32_MAX - *side_data_size < FF_ENCRYPTION_INIT_INFO_EXTRA > > > || > > > +UINT32_

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

2018-06-21 Thread Jacob Trimble
On Thu, Jun 21, 2018 at 9:48 AM Michael Niedermayer wrote: > > > +if (UINT32_MAX == init_info_count || > > +UINT32_MAX - *side_data_size < FF_ENCRYPTION_INIT_INFO_EXTRA || > > +UINT32_MAX - *side_data_size - FF_ENCRYPTION_INIT_INFO_EXTRA < > > info->system_id_size

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

2018-06-21 Thread Michael Niedermayer
On Thu, Jun 07, 2018 at 11:51:30AM -0700, 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-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: > > > > > > > > On Fri, May 25, 2018 at 6:13 PM Michael Nie

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: > > > > > > > > [...] > > > > > > > > > Added f

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 issue found by Chrome's ClusterFuzz > > > > (http://crbug.com/846662

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). > > > > this belongs in a seperate patch unless its a bug specific to t

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

2018-05-31 Thread Jacob Trimble
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). > > this belongs in a seperate patch unless its a bug specific to the code added > with this patch > Ok. Now this patch depends on http://ffmpeg

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

2018-05-25 Thread Michael Niedermayer
On Fri, May 25, 2018 at 02:16:47PM -0700, Jacob Trimble wrote: > 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, Ja

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 Mon, May 7, 2018 at 3:18 PM, Michael Niedermay

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: >>> > On Mon, Apr 23, 2018 at 11:03:57AM -0700

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: >> >> While integrating my encryption in

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

2018-05-08 Thread Michael Niedermayer
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: > >> While integrating my encryption info changes, I noticed a problem with > >> the init info structs.

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. >> But this means there ca

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

2018-05-07 Thread Michael Niedermayer
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. > But this means there can only be one per stream. However, there can > be multiple 'pssh

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 structs. I implemented them as si

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 means there can only be o

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 multiple 'pssh' atoms

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

2018-04-23 Thread Jacob Trimble
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 multiple 'pssh' atoms in a single stream (e.g. for key rotation or multiple key syste