Re: [FFmpeg-devel] [PATCH] avformat/mxfenc: simplify dnxhd handling and add more flavors

2018-10-24 Thread Baptiste Coudurier 
On Wed, Oct 24, 2018 at 6:56 AM Tomas Härdin  wrote:

> tis 2018-10-23 klockan 14:04 -0700 skrev Baptiste Coudurier:
> > Hey Tomas,
> >
> > On Mon, Oct 22, 2018 at 12:52 PM Tomas Härdin 
> > wrote:
> >
> > > mån 2018-10-22 klockan 11:37 -0700 skrev Baptiste Coudurier:
> > > > ---
> > > >  libavformat/mxfenc.c | 215 -
> > > > --
> > > >  1 file changed, 61 insertions(+), 154 deletions(-)
> > > >
> > > > diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c
> > > > index f6acf80d36..71a9b97bed 100644
> > > > --- a/libavformat/mxfenc.c
> > > > +++ b/libavformat/mxfenc.c
> > > > +sc->codec_ul = NULL;
> > > > +cid = AV_RB32(pkt->data + 0x28);
> > > > +for (i = 0; i < FF_ARRAY_ELEMS(mxf_dnxhd_codec_uls); i++)
> > > > +if (cid == mxf_dnxhd_codec_uls[i].cid) {
> > > > +sc->codec_ul = _dnxhd_codec_uls[i].codec_ul;
> > > > +break;
> > > > +}
> > >
> > > Maybe put braces around the for
> > >
> > > Nice work!
> > >
> >
> > Ok, I will put the braces. I should be applying this later today.
>
> Sounds fine to me
>

Ty! Applied.

-- 
Baptiste Coudurier
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

Re: [FFmpeg-devel] [PATCH] avformat/mxfenc: simplify dnxhd handling and add more flavors

2018-10-24 Thread Tomas Härdin 
tis 2018-10-23 klockan 14:04 -0700 skrev Baptiste Coudurier:
> Hey Tomas,
> 
> On Mon, Oct 22, 2018 at 12:52 PM Tomas Härdin 
> wrote:
> 
> > mån 2018-10-22 klockan 11:37 -0700 skrev Baptiste Coudurier:
> > > ---
> > >  libavformat/mxfenc.c | 215 -
> > > --
> > >  1 file changed, 61 insertions(+), 154 deletions(-)
> > > 
> > > diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c
> > > index f6acf80d36..71a9b97bed 100644
> > > --- a/libavformat/mxfenc.c
> > > +++ b/libavformat/mxfenc.c
> > > +sc->codec_ul = NULL;
> > > +cid = AV_RB32(pkt->data + 0x28);
> > > +for (i = 0; i < FF_ARRAY_ELEMS(mxf_dnxhd_codec_uls); i++)
> > > +if (cid == mxf_dnxhd_codec_uls[i].cid) {
> > > +sc->codec_ul = _dnxhd_codec_uls[i].codec_ul;
> > > +break;
> > > +}
> > 
> > Maybe put braces around the for
> > 
> > Nice work!
> > 
> 
> Ok, I will put the braces. I should be applying this later today.

Sounds fine to me

/Tomas
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

Re: [FFmpeg-devel] [PATCH] avformat/mxfenc: simplify dnxhd handling and add more flavors

2018-10-23 Thread Baptiste Coudurier 
Hey Tomas,

On Mon, Oct 22, 2018 at 12:52 PM Tomas Härdin  wrote:

> mån 2018-10-22 klockan 11:37 -0700 skrev Baptiste Coudurier:
> > ---
> >  libavformat/mxfenc.c | 215 ---
> >  1 file changed, 61 insertions(+), 154 deletions(-)
> >
> > diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c
> > index f6acf80d36..71a9b97bed 100644
> > --- a/libavformat/mxfenc.c
> > +++ b/libavformat/mxfenc.c
>
> > +sc->codec_ul = NULL;
> > +cid = AV_RB32(pkt->data + 0x28);
> > +for (i = 0; i < FF_ARRAY_ELEMS(mxf_dnxhd_codec_uls); i++)
> > +if (cid == mxf_dnxhd_codec_uls[i].cid) {
> > +sc->codec_ul = _dnxhd_codec_uls[i].codec_ul;
> > +break;
> > +}
>
> Maybe put braces around the for
>
> Nice work!
>

Ok, I will put the braces. I should be applying this later today.

-- 
Baptiste Coudurier
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

Re: [FFmpeg-devel] [PATCH] avformat/mxfenc: simplify dnxhd handling and add more flavors

2018-10-22 Thread Tomas Härdin 
mån 2018-10-22 klockan 11:37 -0700 skrev Baptiste Coudurier:
> ---
>  libavformat/mxfenc.c | 215 ---
>  1 file changed, 61 insertions(+), 154 deletions(-)
> 
> diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c
> index f6acf80d36..71a9b97bed 100644
> --- a/libavformat/mxfenc.c
> +++ b/libavformat/mxfenc.c

> +sc->codec_ul = NULL;
> +cid = AV_RB32(pkt->data + 0x28);
> +for (i = 0; i < FF_ARRAY_ELEMS(mxf_dnxhd_codec_uls); i++)
> +if (cid == mxf_dnxhd_codec_uls[i].cid) {
> +sc->codec_ul = _dnxhd_codec_uls[i].codec_ul;
> +break;
> +}

Maybe put braces around the for

Nice work!

/Tomas
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

[FFmpeg-devel] [PATCH] avformat/mxfenc: simplify dnxhd handling and add more flavors

2018-10-22 Thread Baptiste Coudurier 
---
 libavformat/mxfenc.c | 215 ---
 1 file changed, 61 insertions(+), 154 deletions(-)

diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c
index f6acf80d36..71a9b97bed 100644
--- a/libavformat/mxfenc.c
+++ b/libavformat/mxfenc.c
@@ -142,23 +142,10 @@ enum ULIndex {
 INDEX_DV100_1080_50,
 INDEX_DV100_720_60,
 INDEX_DV100_720_50,
-INDEX_DNXHD_1080p_10bit_HIGH,
-INDEX_DNXHD_1080p_8bit_MEDIUM,
-INDEX_DNXHD_1080p_8bit_HIGH,
-INDEX_DNXHD_1080i_10bit_HIGH,
-INDEX_DNXHD_1080i_8bit_MEDIUM,
-INDEX_DNXHD_1080i_8bit_HIGH,
-INDEX_DNXHD_720p_10bit,
-INDEX_DNXHD_720p_8bit_HIGH,
-INDEX_DNXHD_720p_8bit_MEDIUM,
-INDEX_DNXHD_720p_8bit_LOW,
-INDEX_DNXHR_LB,
-INDEX_DNXHR_SQ,
-INDEX_DNXHR_HQ,
-INDEX_DNXHR_HQX,
-INDEX_DNXHR_444,
+INDEX_DNXHD,
 INDEX_JPEG2000,
 INDEX_H264,
+INDEX_S436M,
 };
 
 static const struct {
@@ -169,7 +156,7 @@ static const struct {
 { AV_CODEC_ID_PCM_S24LE,  INDEX_AES3 },
 { AV_CODEC_ID_PCM_S16LE,  INDEX_AES3 },
 { AV_CODEC_ID_DVVIDEO,INDEX_DV },
-{ AV_CODEC_ID_DNXHD,  INDEX_DNXHD_1080p_10bit_HIGH },
+{ AV_CODEC_ID_DNXHD,  INDEX_DNXHD },
 { AV_CODEC_ID_JPEG2000,   INDEX_JPEG2000 },
 { AV_CODEC_ID_H264,   INDEX_H264 },
 { AV_CODEC_ID_NONE }
@@ -307,81 +294,11 @@ static const MXFContainerEssenceEntry 
mxf_essence_container_uls[] = {
   { 
0x06,0x0E,0x2B,0x34,0x01,0x02,0x01,0x01,0x0D,0x01,0x03,0x01,0x18,0x01,0x01,0x00 
},
   { 
0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x02,0x02,0x08,0x00 
},
   mxf_write_cdci_desc },
-// DNxHD 1080p 10bit high
+// DNxHD
 { { 
0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0D,0x01,0x03,0x01,0x02,0x11,0x01,0x00 
},
   { 
0x06,0x0E,0x2B,0x34,0x01,0x02,0x01,0x01,0x0D,0x01,0x03,0x01,0x15,0x01,0x05,0x00 
},
   { 
0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0A,0x04,0x01,0x02,0x02,0x71,0x01,0x00,0x00 
},
   mxf_write_cdci_desc },
-// DNxHD 1080p 8bit medium
-{ { 
0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0D,0x01,0x03,0x01,0x02,0x11,0x01,0x00 
},
-  { 
0x06,0x0E,0x2B,0x34,0x01,0x02,0x01,0x01,0x0D,0x01,0x03,0x01,0x15,0x01,0x05,0x00 
},
-  { 
0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0A,0x04,0x01,0x02,0x02,0x71,0x03,0x00,0x00 
},
-  mxf_write_cdci_desc },
-// DNxHD 1080p 8bit high
-{ { 
0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0D,0x01,0x03,0x01,0x02,0x11,0x01,0x00 
},
-  { 
0x06,0x0E,0x2B,0x34,0x01,0x02,0x01,0x01,0x0D,0x01,0x03,0x01,0x15,0x01,0x05,0x00 
},
-  { 
0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0A,0x04,0x01,0x02,0x02,0x71,0x04,0x00,0x00 
},
-  mxf_write_cdci_desc },
-// DNxHD 1080i 10bit high
-{ { 
0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0D,0x01,0x03,0x01,0x02,0x11,0x01,0x00 
},
-  { 
0x06,0x0E,0x2B,0x34,0x01,0x02,0x01,0x01,0x0D,0x01,0x03,0x01,0x15,0x01,0x05,0x00 
},
-  { 
0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0A,0x04,0x01,0x02,0x02,0x71,0x07,0x00,0x00 
},
-  mxf_write_cdci_desc },
-// DNxHD 1080i 8bit medium
-{ { 
0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0D,0x01,0x03,0x01,0x02,0x11,0x01,0x00 
},
-  { 
0x06,0x0E,0x2B,0x34,0x01,0x02,0x01,0x01,0x0D,0x01,0x03,0x01,0x15,0x01,0x05,0x00 
},
-  { 
0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0A,0x04,0x01,0x02,0x02,0x71,0x08,0x00,0x00 
},
-  mxf_write_cdci_desc },
-// DNxHD 1080i 8bit high
-{ { 
0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0D,0x01,0x03,0x01,0x02,0x11,0x01,0x00 
},
-  { 
0x06,0x0E,0x2B,0x34,0x01,0x02,0x01,0x01,0x0D,0x01,0x03,0x01,0x15,0x01,0x05,0x00 
},
-  { 
0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0A,0x04,0x01,0x02,0x02,0x71,0x09,0x00,0x00 
},
-  mxf_write_cdci_desc },
-// DNxHD 720p 10bit
-{ { 
0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x01,0x0d,0x01,0x03,0x01,0x02,0x11,0x01,0x00 
},
-  { 
0x06,0x0e,0x2b,0x34,0x01,0x02,0x01,0x01,0x0d,0x01,0x03,0x01,0x15,0x01,0x05,0x00 
},
-  { 
0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x0A,0x04,0x01,0x02,0x02,0x71,0x10,0x00,0x00 
},
-  mxf_write_cdci_desc },
-// DNxHD 720p 8bit high
-{ { 
0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x01,0x0d,0x01,0x03,0x01,0x02,0x11,0x01,0x00 
},
-  { 
0x06,0x0e,0x2b,0x34,0x01,0x02,0x01,0x01,0x0d,0x01,0x03,0x01,0x15,0x01,0x05,0x00 
},
-  { 
0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x0A,0x04,0x01,0x02,0x02,0x71,0x11,0x00,0x00 
},
-  mxf_write_cdci_desc },
-// DNxHD 720p 8bit medium
-{ { 
0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x01,0x0d,0x01,0x03,0x01,0x02,0x11,0x01,0x00 
},
-  { 
0x06,0x0e,0x2b,0x34,0x01,0x02,0x01,0x01,0x0d,0x01,0x03,0x01,0x15,0x01,0x05,0x00 
},
-  { 
0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x0A,0x04,0x01,0x02,0x02,0x71,0x12,0x00,0x00 
},
-  mxf_write_cdci_desc },
-// DNxHD 720p 8bit low
-{ { 
0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x01,0x0d,0x01,0x03,0x01,0x02,0x11,0x01,0x00 
},
-  { 
0x06,0x0e,0x2b,0x34,0x01,0x02,0x01,0x01,0x0d,0x01,0x03,0x01,0x15,0x01,0x05,0x00 
},
-  {