Re: [FFmpeg-devel] [PATCH 10/13] avformat/mxfenc: Set color siting to 0 for D10-MXF
On Tue, May 08, 2018 at 07:41:33PM +0200, Michael Niedermayer wrote: > On Tue, May 08, 2018 at 12:55:18PM +0200, Tomas Härdin wrote: > > mån 2018-05-07 klockan 12:38 +0200 skrev Michael Niedermayer: > > > > Signed-off-by: Michael Niedermayer> > > --- > > > libavformat/mxfenc.c | 1 + > > > .../ref/fate/concat-demuxer-extended-lavf-mxf | 2 +- > > > .../fate/concat-demuxer-extended-lavf-mxf_d10 | 2 +- > > > .../ref/fate/concat-demuxer-simple1-lavf-mxf | 242 +- > > > .../fate/concat-demuxer-simple1-lavf-mxf_d10 | 140 +- > > > tests/ref/seek/lavf-mxf | 44 ++-- > > > tests/ref/seek/lavf-mxf_d10 | 54 ++-- > > > tests/ref/seek/lavf-mxf_dv25 | 54 ++-- > > > tests/ref/seek/lavf-mxf_dvcpro50 | 54 ++-- > > > tests/ref/seek/lavf-mxf_opatom| 54 ++-- > > > tests/ref/seek/lavf-mxf_opatom_audio | 54 ++-- > > > 11 files changed, 351 insertions(+), 350 deletions(-) > > > > > > diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c > > > index f2be76cc86..adf5527534 100644 > > > --- a/libavformat/mxfenc.c > > > +++ b/libavformat/mxfenc.c > > > @@ -2361,6 +2361,7 @@ static int mxf_write_header(AVFormatContext *s) > > > mxf->edit_unit_byte_count += > > > klv_fill_size(mxf->edit_unit_byte_count); > > > > > > sc->signal_standard = 1; > > > +sc->color_siting = 0; > > > } > > > > Can't find anything in my documents that says anything about this. I > > don't remember what D-10 is actually specified in... > > SMPTE 386M (D-10) lists 4 as value to be used > SMPTE 377-1-2009 says > "The definitions of 00h (coSiting) and 04h (Rec 601) are equivalent. The > value of 04h is deprecated. New > MXF encoders shall use the value of 00h instead." > > I will add this to the commit message will apply [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB Let us carefully observe those good qualities wherein our enemies excel us and endeavor to excel them, by avoiding what is faulty, and imitating what is excellent in them. -- Plutarch signature.asc Description: PGP signature ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH 10/13] avformat/mxfenc: Set color siting to 0 for D10-MXF
On Tue, May 08, 2018 at 12:55:18PM +0200, Tomas Härdin wrote: > mån 2018-05-07 klockan 12:38 +0200 skrev Michael Niedermayer: > > > Signed-off-by: Michael Niedermayer> > --- > > libavformat/mxfenc.c | 1 + > > .../ref/fate/concat-demuxer-extended-lavf-mxf | 2 +- > > .../fate/concat-demuxer-extended-lavf-mxf_d10 | 2 +- > > .../ref/fate/concat-demuxer-simple1-lavf-mxf | 242 +- > > .../fate/concat-demuxer-simple1-lavf-mxf_d10 | 140 +- > > tests/ref/seek/lavf-mxf | 44 ++-- > > tests/ref/seek/lavf-mxf_d10 | 54 ++-- > > tests/ref/seek/lavf-mxf_dv25 | 54 ++-- > > tests/ref/seek/lavf-mxf_dvcpro50 | 54 ++-- > > tests/ref/seek/lavf-mxf_opatom| 54 ++-- > > tests/ref/seek/lavf-mxf_opatom_audio | 54 ++-- > > 11 files changed, 351 insertions(+), 350 deletions(-) > > > > diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c > > index f2be76cc86..adf5527534 100644 > > --- a/libavformat/mxfenc.c > > +++ b/libavformat/mxfenc.c > > @@ -2361,6 +2361,7 @@ static int mxf_write_header(AVFormatContext *s) > > mxf->edit_unit_byte_count += > > klv_fill_size(mxf->edit_unit_byte_count); > > > > sc->signal_standard = 1; > > +sc->color_siting = 0; > > } > > Can't find anything in my documents that says anything about this. I > don't remember what D-10 is actually specified in... SMPTE 386M (D-10) lists 4 as value to be used SMPTE 377-1-2009 says "The definitions of 00h (coSiting) and 04h (Rec 601) are equivalent. The value of 04h is deprecated. New MXF encoders shall use the value of 00h instead." I will add this to the commit message [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB The bravest are surely those who have the clearest vision of what is before them, glory and danger alike, and yet notwithstanding go out to meet it. -- Thucydides signature.asc Description: PGP signature ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH 10/13] avformat/mxfenc: Set color siting to 0 for D10-MXF
mån 2018-05-07 klockan 12:38 +0200 skrev Michael Niedermayer: > > Signed-off-by: Michael Niedermayer> --- > libavformat/mxfenc.c | 1 + > .../ref/fate/concat-demuxer-extended-lavf-mxf | 2 +- > .../fate/concat-demuxer-extended-lavf-mxf_d10 | 2 +- > .../ref/fate/concat-demuxer-simple1-lavf-mxf | 242 +- > .../fate/concat-demuxer-simple1-lavf-mxf_d10 | 140 +- > tests/ref/seek/lavf-mxf | 44 ++-- > tests/ref/seek/lavf-mxf_d10 | 54 ++-- > tests/ref/seek/lavf-mxf_dv25 | 54 ++-- > tests/ref/seek/lavf-mxf_dvcpro50 | 54 ++-- > tests/ref/seek/lavf-mxf_opatom| 54 ++-- > tests/ref/seek/lavf-mxf_opatom_audio | 54 ++-- > 11 files changed, 351 insertions(+), 350 deletions(-) > > diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c > index f2be76cc86..adf5527534 100644 > --- a/libavformat/mxfenc.c > +++ b/libavformat/mxfenc.c > @@ -2361,6 +2361,7 @@ static int mxf_write_header(AVFormatContext *s) > mxf->edit_unit_byte_count += > klv_fill_size(mxf->edit_unit_byte_count); > > sc->signal_standard = 1; > +sc->color_siting = 0; > } Can't find anything in my documents that says anything about this. I don't remember what D-10 is actually specified in... /Tomas ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
[FFmpeg-devel] [PATCH 10/13] avformat/mxfenc: Set color siting to 0 for D10-MXF
Signed-off-by: Michael Niedermayer--- libavformat/mxfenc.c | 1 + .../ref/fate/concat-demuxer-extended-lavf-mxf | 2 +- .../fate/concat-demuxer-extended-lavf-mxf_d10 | 2 +- .../ref/fate/concat-demuxer-simple1-lavf-mxf | 242 +- .../fate/concat-demuxer-simple1-lavf-mxf_d10 | 140 +- tests/ref/seek/lavf-mxf | 44 ++-- tests/ref/seek/lavf-mxf_d10 | 54 ++-- tests/ref/seek/lavf-mxf_dv25 | 54 ++-- tests/ref/seek/lavf-mxf_dvcpro50 | 54 ++-- tests/ref/seek/lavf-mxf_opatom| 54 ++-- tests/ref/seek/lavf-mxf_opatom_audio | 54 ++-- 11 files changed, 351 insertions(+), 350 deletions(-) diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c index f2be76cc86..adf5527534 100644 --- a/libavformat/mxfenc.c +++ b/libavformat/mxfenc.c @@ -2361,6 +2361,7 @@ static int mxf_write_header(AVFormatContext *s) mxf->edit_unit_byte_count += klv_fill_size(mxf->edit_unit_byte_count); sc->signal_standard = 1; +sc->color_siting = 0; } if (mxf->signal_standard >= 0) sc->signal_standard = mxf->signal_standard; diff --git a/tests/ref/fate/concat-demuxer-extended-lavf-mxf b/tests/ref/fate/concat-demuxer-extended-lavf-mxf index 13170c6eaf..2fb5fce4b1 100644 --- a/tests/ref/fate/concat-demuxer-extended-lavf-mxf +++ b/tests/ref/fate/concat-demuxer-extended-lavf-mxf @@ -1 +1 @@ -7c8c500ea386b41e9025487fb4380f5c *tests/data/fate/concat-demuxer-extended-lavf-mxf.ffprobe +a6fb9c37dc71cb43eb9664a8ae9f1c66 *tests/data/fate/concat-demuxer-extended-lavf-mxf.ffprobe diff --git a/tests/ref/fate/concat-demuxer-extended-lavf-mxf_d10 b/tests/ref/fate/concat-demuxer-extended-lavf-mxf_d10 index c3c8591c93..60d729b3da 100644 --- a/tests/ref/fate/concat-demuxer-extended-lavf-mxf_d10 +++ b/tests/ref/fate/concat-demuxer-extended-lavf-mxf_d10 @@ -1 +1 @@ -d87c3a2394c60046636e43848fa8b4f6 *tests/data/fate/concat-demuxer-extended-lavf-mxf_d10.ffprobe +cb7c8eac6f8917e39658e1fa4a250da8 *tests/data/fate/concat-demuxer-extended-lavf-mxf_d10.ffprobe diff --git a/tests/ref/fate/concat-demuxer-simple1-lavf-mxf b/tests/ref/fate/concat-demuxer-simple1-lavf-mxf index 4f1d12fe26..d18e35b7ba 100644 --- a/tests/ref/fate/concat-demuxer-simple1-lavf-mxf +++ b/tests/ref/fate/concat-demuxer-simple1-lavf-mxf @@ -1,124 +1,124 @@ -video|0|0|0.00|-1|-0.04|1|0.04|N/A|N/A|24801|6656|K_ -audio|1|0|0.00|0|0.00|1920|0.04|N/A|N/A|3840|31744|K_ -video|0|3|0.12|0|0.00|1|0.04|N/A|N/A|16743|36352|__ -audio|1|1920|0.04|1920|0.04|1920|0.04|N/A|N/A|3840|53248|K_ -video|0|1|0.04|1|0.04|1|0.04|N/A|N/A|13812|57856|__ -audio|1|3840|0.08|3840|0.08|1920|0.04|N/A|N/A|3840|72192|K_ -video|0|2|0.08|2|0.08|1|0.04|N/A|N/A|13607|76800|__ -audio|1|5760|0.12|5760|0.12|1920|0.04|N/A|N/A|3840|90624|K_ -video|0|6|0.24|3|0.12|1|0.04|N/A|N/A|16158|95232|__ -audio|1|7680|0.16|7680|0.16|1920|0.04|N/A|N/A|3840|111616|K_ -video|0|4|0.16|4|0.16|1|0.04|N/A|N/A|13943|116224|__ -audio|1|9600|0.20|9600|0.20|1920|0.04|N/A|N/A|3840|130560|K_ -video|0|5|0.20|5|0.20|1|0.04|N/A|N/A|11223|135168|__ -audio|1|11520|0.24|11520|0.24|1920|0.04|N/A|N/A|3840|146432|K_ -video|0|9|0.36|6|0.24|1|0.04|N/A|N/A|20298|151040|__ -audio|1|13440|0.28|13440|0.28|1920|0.04|N/A|N/A|3840|171520|K_ -video|0|7|0.28|7|0.28|1|0.04|N/A|N/A|13341|176128|__ -audio|1|15360|0.32|15360|0.32|1920|0.04|N/A|N/A|3840|189952|K_ -video|0|8|0.32|8|0.32|1|0.04|N/A|N/A|12362|194560|__ -audio|1|17280|0.36|17280|0.36|1920|0.04|N/A|N/A|3840|207360|K_ -video|0|12|0.48|9|0.36|1|0.04|N/A|N/A|24786|211968|K_ -audio|1|19200|0.40|19200|0.40|1920|0.04|N/A|N/A|3840|237056|K_ -video|0|10|0.40|10|0.40|1|0.04|N/A|N/A|13377|241664|__ -audio|1|21120|0.44|21120|0.44|1920|0.04|N/A|N/A|3840|255488|K_ -video|0|11|0.44|11|0.44|1|0.04|N/A|N/A|15624|260096|__ -audio|1|23040|0.48|23040|0.48|1920|0.04|N/A|N/A|3840|275968|K_ -video|0|15|0.60|12|0.48|1|0.04|N/A|N/A|22597|280576|__ -audio|1|24960|0.52|24960|0.52|1920|0.04|N/A|N/A|3840|303616|K_ -video|0|13|0.52|13|0.52|1|0.04|N/A|N/A|15028|308224|__ -audio|1|26880|0.56|26880|0.56|1920|0.04|N/A|N/A|3840|323584|K_ -video|0|14|0.56|14|0.56|1|0.04|N/A|N/A|14014|328192|__ -audio|1|28800|0.60|28800|0.60|1920|0.04|N/A|N/A|3840|342528|K_ -video|0|18|0.72|15|0.60|1|0.04|N/A|N/A|20731|347136|__ -audio|1|30720|0.64|30720|0.64|1920|0.04|N/A|N/A|3840|368128|K_ -video|0|16|0.64|16|0.64|1|0.04|N/A|N/A|11946|372736|__