Re: [FFmpeg-devel] [PATCH 5/6] libavformat/mxf: add dnxhr codec ul

[Mark Reid]

On Aug 7, 2016 11:14 AM, "Michael Niedermayer" 
wrote:
>
> On Sun, Aug 07, 2016 at 03:49:34PM +0200, Tomas Härdin wrote:
> > On Mon, 2016-07-04 at 18:07 -0700, Mark Reid wrote:
> > > diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c
> > > index 0affca9..8f2f10a 100644
> > > --- a/libavformat/mxfdec.c
> > > +++ b/libavformat/mxfdec.c
> > > @@ -1098,6 +1098,10 @@ static int mxf_match_uid(const UID key, const
UID uid, int len)
> > >  static const MXFCodecUL *mxf_get_codec_ul(const MXFCodecUL *uls, UID
*uid)
> > >  {
> > >  while (uls->uid[0]) {
> > > +/* match version byte for dnxhr */
> > > +if (uls->id == AV_CODEC_ID_DNXHR && !memcmp(uls->uid, *uid,
uls->matching_len))
> > > +break;
> > > +
> >
> > Looks OK
> >
> > I wonder if other codecs need this kind of special treatment. The
> > version byte isn't supposed to matter.. If any more pop up then we
> > could generalize this - for now this is good enough I suppose
>
> the patch adding AV_CODEC_ID_DNXHR (which this one depends upon)
> has been superseded and it uses the normal DNXHD codec id unless
> iam mixing something up here
>

You are correct. This patch series old and should be considered dropped. A
Dnxhr codec ID was abandoned in favor of using a profile and this patch is
not needed for mxf demuxing.

> [...]
> --
> Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB
>
> When you are offended at any man's fault, turn to yourself and study your
> own failings. Then you will forget your anger. -- Epictetus
>
> ___
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

Re: [FFmpeg-devel] [PATCH 5/6] libavformat/mxf: add dnxhr codec ul

[Michael Niedermayer]

On Sun, Aug 07, 2016 at 03:49:34PM +0200, Tomas Härdin wrote:
> On Mon, 2016-07-04 at 18:07 -0700, Mark Reid wrote:
> > diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c
> > index 0affca9..8f2f10a 100644
> > --- a/libavformat/mxfdec.c
> > +++ b/libavformat/mxfdec.c
> > @@ -1098,6 +1098,10 @@ static int mxf_match_uid(const UID key, const UID 
> > uid, int len)
> >  static const MXFCodecUL *mxf_get_codec_ul(const MXFCodecUL *uls, UID *uid)
> >  {
> >  while (uls->uid[0]) {
> > +/* match version byte for dnxhr */
> > +if (uls->id == AV_CODEC_ID_DNXHR && !memcmp(uls->uid, *uid, 
> > uls->matching_len))
> > +break;
> > +
> 
> Looks OK
> 
> I wonder if other codecs need this kind of special treatment. The
> version byte isn't supposed to matter.. If any more pop up then we
> could generalize this - for now this is good enough I suppose

the patch adding AV_CODEC_ID_DNXHR (which this one depends upon)
has been superseded and it uses the normal DNXHD codec id unless
iam mixing something up here

[...]
-- 
Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

When you are offended at any man's fault, turn to yourself and study your
own failings. Then you will forget your anger. -- Epictetus


signature.asc
Description: Digital signature
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

Re: [FFmpeg-devel] [PATCH 5/6] libavformat/mxf: add dnxhr codec ul

[Tomas Härdin]

On Mon, 2016-07-04 at 18:07 -0700, Mark Reid wrote:
> diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c
> index 0affca9..8f2f10a 100644
> --- a/libavformat/mxfdec.c
> +++ b/libavformat/mxfdec.c
> @@ -1098,6 +1098,10 @@ static int mxf_match_uid(const UID key, const UID uid, 
> int len)
>  static const MXFCodecUL *mxf_get_codec_ul(const MXFCodecUL *uls, UID *uid)
>  {
>  while (uls->uid[0]) {
> +/* match version byte for dnxhr */
> +if (uls->id == AV_CODEC_ID_DNXHR && !memcmp(uls->uid, *uid, 
> uls->matching_len))
> +break;
> +

Looks OK

I wonder if other codecs need this kind of special treatment. The
version byte isn't supposed to matter.. If any more pop up then we
could generalize this - for now this is good enough I suppose

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

[FFmpeg-devel] [PATCH 5/6] libavformat/mxf: add dnxhr codec ul

[Mark Reid]

---
 libavformat/mxf.c| 1 +
 libavformat/mxfdec.c | 4 
 2 files changed, 5 insertions(+)

diff --git a/libavformat/mxf.c b/libavformat/mxf.c
index e9c48e8..db6ce7b 100644
--- a/libavformat/mxf.c
+++ b/libavformat/mxf.c
@@ -54,6 +54,7 @@ const MXFCodecUL ff_mxf_codec_uls[] = {
 { { 
0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x0A,0x04,0x01,0x02,0x02,0x04,0x0A,0x00,0x00 
}, 14,AV_CODEC_ID_VC1 }, /* VC1 AP@L4 */
 { { 
0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x01,0x7F,0x00,0x00,0x00 
}, 13,   AV_CODEC_ID_RAWVIDEO }, /* uncompressed */
 { { 
0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0A,0x04,0x01,0x02,0x01,0x01,0x02,0x01,0x00 
}, 15,   AV_CODEC_ID_RAWVIDEO }, /* uncompressed 422 8-bit */
+{ { 
0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0D,0x04,0x01,0x02,0x02,0x71,0x00,0x00,0x00 
}, 13,  AV_CODEC_ID_DNXHR }, /* DNxHR */
 { { 
0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x71,0x00,0x00,0x00 
}, 13,  AV_CODEC_ID_DNXHD }, /* SMPTE VC-3/DNxHD */
 { { 
0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x03,0x02,0x00,0x00 
}, 14,  AV_CODEC_ID_DNXHD }, /* SMPTE VC-3/DNxHD */
 { { 
0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0E,0x04,0x02,0x01,0x02,0x04,0x01,0x00 
}, 16,  AV_CODEC_ID_DNXHD }, /* SMPTE VC-3/DNxHD Legacy Avid Media Composer 
MXF */
diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c
index 0affca9..8f2f10a 100644
--- a/libavformat/mxfdec.c
+++ b/libavformat/mxfdec.c
@@ -1098,6 +1098,10 @@ static int mxf_match_uid(const UID key, const UID uid, 
int len)
 static const MXFCodecUL *mxf_get_codec_ul(const MXFCodecUL *uls, UID *uid)
 {
 while (uls->uid[0]) {
+/* match version byte for dnxhr */
+if (uls->id == AV_CODEC_ID_DNXHR && !memcmp(uls->uid, *uid, 
uls->matching_len))
+break;
+
 if(mxf_match_uid(uls->uid, *uid, uls->matching_len))
 break;
 uls++;
-- 
2.7.3

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