[FFmpeg-cvslog] doc/filters: correct psnr example
ffmpeg | branch: master | Gyan Doshi | Tue Nov 19 14:22:23
2019 +0530| [6e0461d8d446d07c77d780ffda4942db9f94b8c6] | committer: Gyan Doshi
doc/filters: correct psnr example
AVTB is 1/AV_TIME_BASE
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6e0461d8d446d07c77d780ffda4942db9f94b8c6
---
doc/filters.texi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/doc/filters.texi b/doc/filters.texi
index c04421b758..035094d8f8 100644
--- a/doc/filters.texi
+++ b/doc/filters.texi
@@ -15069,7 +15069,7 @@ is stored in @file{stats.log}.
@item
Another example with different containers:
@example
-ffmpeg -i main.mpg -i ref.mkv -lavfi
"[0:v]settb=1/AVTB,setpts=PTS-STARTPTS[main];[1:v]settb=1/AVTB,setpts=PTS-STARTPTS[ref];[main][ref]psnr"
-f null -
+ffmpeg -i main.mpg -i ref.mkv -lavfi
"[0:v]settb=AVTB,setpts=PTS-STARTPTS[main];[1:v]settb=AVTB,setpts=PTS-STARTPTS[ref];[main][ref]psnr"
-f null -
@end example
@end itemize
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] doc/filters: correct ssim example
ffmpeg | branch: master | Gyan Doshi | Tue Nov 19 14:26:39 2019 +0530| [f394d7b382aa038c4ba34d9f9be0bb0645fc64e3] | committer: Gyan Doshi doc/filters: correct ssim example AVTB is 1/AV_TIME_BASE > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f394d7b382aa038c4ba34d9f9be0bb0645fc64e3 --- doc/filters.texi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/filters.texi b/doc/filters.texi index 035094d8f8..22d4f9d9a8 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -17136,7 +17136,7 @@ ffmpeg -i main.mpg -i ref.mpg -lavfi "ssim;[0:v][1:v]psnr" -f null - @item Another example with different containers: @example -ffmpeg -i main.mpg -i ref.mkv -lavfi "[0:v]settb=1/AVTB,setpts=PTS-STARTPTS[main];[1:v]settb=1/AVTB,setpts=PTS-STARTPTS[ref];[main][ref]ssim" -f null - +ffmpeg -i main.mpg -i ref.mkv -lavfi "[0:v]settb=AVTB,setpts=PTS-STARTPTS[main];[1:v]settb=AVTB,setpts=PTS-STARTPTS[ref];[main][ref]ssim" -f null - @end example @end itemize ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] doc/filters: correct libvmaf example
ffmpeg | branch: master | Gyan Doshi | Tue Nov 19 14:27:43 2019 +0530| [0321bde0a2e4b76bac68e3296e0898b65da5889f] | committer: Gyan Doshi doc/filters: correct libvmaf example AVTB is 1/AV_TIME_BASE > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0321bde0a2e4b76bac68e3296e0898b65da5889f --- doc/filters.texi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/filters.texi b/doc/filters.texi index 22d4f9d9a8..6f26aeddc0 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -12448,7 +12448,7 @@ ffmpeg -i main.mpg -i ref.mpg -lavfi libvmaf="psnr=1:log_fmt=json" -f null - @item Example with options and different containers: @example -ffmpeg -i main.mpg -i ref.mkv -lavfi "[0:v]settb=1/AVTB,setpts=PTS-STARTPTS[main];[1:v]settb=1/AVTB,setpts=PTS-STARTPTS[ref];[main][ref]libvmaf=psnr=1:log_fmt=json" -f null - +ffmpeg -i main.mpg -i ref.mkv -lavfi "[0:v]settb=AVTB,setpts=PTS-STARTPTS[main];[1:v]settb=AVTB,setpts=PTS-STARTPTS[ref];[main][ref]libvmaf=psnr=1:log_fmt=json" -f null - @end example @end itemize ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] avfilter/Makefile: add missing dependency for lut3d
ffmpeg | branch: master | Gyan Doshi | Tue Nov 19 12:54:59 2019 +0530| [0cfda90b34844ee7e050978db09b529e0a0c] | committer: Gyan Doshi avfilter/Makefile: add missing dependency for lut3d lut3d requires framesync > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0cfda90b34844ee7e050978db09b529e0a0c --- libavfilter/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavfilter/Makefile b/libavfilter/Makefile index 56afb2a241..c92c19e281 100644 --- a/libavfilter/Makefile +++ b/libavfilter/Makefile @@ -289,7 +289,7 @@ OBJS-$(CONFIG_LUMAKEY_FILTER)+= vf_lumakey.o OBJS-$(CONFIG_LUT1D_FILTER) += vf_lut3d.o OBJS-$(CONFIG_LUT_FILTER)+= vf_lut.o OBJS-$(CONFIG_LUT2_FILTER) += vf_lut2.o framesync.o -OBJS-$(CONFIG_LUT3D_FILTER) += vf_lut3d.o +OBJS-$(CONFIG_LUT3D_FILTER) += vf_lut3d.o framesync.o OBJS-$(CONFIG_LUTRGB_FILTER) += vf_lut.o OBJS-$(CONFIG_LUTYUV_FILTER) += vf_lut.o OBJS-$(CONFIG_MASKEDCLAMP_FILTER)+= vf_maskedclamp.o framesync.o ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] avfilter/Makefile: add missing dependency for chromashift
ffmpeg | branch: master | Gyan Doshi | Tue Nov 19 12:53:35 2019 +0530| [ef479ee660e4dfbf2645fe3a50d8639fdc22ab1b] | committer: Gyan Doshi avfilter/Makefile: add missing dependency for chromashift chromashift requires framesync > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ef479ee660e4dfbf2645fe3a50d8639fdc22ab1b --- libavfilter/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavfilter/Makefile b/libavfilter/Makefile index 6838d5c986..56afb2a241 100644 --- a/libavfilter/Makefile +++ b/libavfilter/Makefile @@ -176,7 +176,7 @@ OBJS-$(CONFIG_BOXBLUR_OPENCL_FILTER) += vf_avgblur_opencl.o opencl.o \ OBJS-$(CONFIG_BWDIF_FILTER) += vf_bwdif.o yadif_common.o OBJS-$(CONFIG_CHROMAHOLD_FILTER) += vf_chromakey.o OBJS-$(CONFIG_CHROMAKEY_FILTER) += vf_chromakey.o -OBJS-$(CONFIG_CHROMASHIFT_FILTER)+= vf_chromashift.o +OBJS-$(CONFIG_CHROMASHIFT_FILTER)+= vf_chromashift.o framesync.o OBJS-$(CONFIG_CIESCOPE_FILTER) += vf_ciescope.o OBJS-$(CONFIG_CODECVIEW_FILTER) += vf_codecview.o OBJS-$(CONFIG_COLORBALANCE_FILTER) += vf_colorbalance.o ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] avfilter/vf_chromashift: remove unused header
ffmpeg | branch: master | Paul B Mahol | Tue Nov 19 10:37:12
2019 +0100| [c8f269f24f99158f64ff9aefaac72bc46294c526] | committer: Paul B Mahol
avfilter/vf_chromashift: remove unused header
Reverts ef479ee660e4dfbf2645fe3a50d8639fdc22ab1b.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c8f269f24f99158f64ff9aefaac72bc46294c526
---
libavfilter/Makefile | 2 +-
libavfilter/vf_chromashift.c | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/libavfilter/Makefile b/libavfilter/Makefile
index c92c19e281..8434983b7d 100644
--- a/libavfilter/Makefile
+++ b/libavfilter/Makefile
@@ -176,7 +176,7 @@ OBJS-$(CONFIG_BOXBLUR_OPENCL_FILTER) +=
vf_avgblur_opencl.o opencl.o \
OBJS-$(CONFIG_BWDIF_FILTER) += vf_bwdif.o yadif_common.o
OBJS-$(CONFIG_CHROMAHOLD_FILTER) += vf_chromakey.o
OBJS-$(CONFIG_CHROMAKEY_FILTER) += vf_chromakey.o
-OBJS-$(CONFIG_CHROMASHIFT_FILTER)+= vf_chromashift.o framesync.o
+OBJS-$(CONFIG_CHROMASHIFT_FILTER)+= vf_chromashift.o
OBJS-$(CONFIG_CIESCOPE_FILTER) += vf_ciescope.o
OBJS-$(CONFIG_CODECVIEW_FILTER) += vf_codecview.o
OBJS-$(CONFIG_COLORBALANCE_FILTER) += vf_colorbalance.o
diff --git a/libavfilter/vf_chromashift.c b/libavfilter/vf_chromashift.c
index e75b49ff81..4b4628a3ef 100644
--- a/libavfilter/vf_chromashift.c
+++ b/libavfilter/vf_chromashift.c
@@ -28,7 +28,6 @@
#include "avfilter.h"
#include "formats.h"
#include "internal.h"
-#include "framesync.h"
#include "video.h"
typedef struct ChromaShiftContext {
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] avfilter/vf_blend: cosmetics: reindent
ffmpeg | branch: master | Paul B Mahol | Tue Nov 19 12:14:36
2019 +0100| [5ed6b735ab8ba989b3c60884afee889b6c55aede] | committer: Paul B Mahol
avfilter/vf_blend: cosmetics: reindent
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5ed6b735ab8ba989b3c60884afee889b6c55aede
---
libavfilter/vf_blend.c | 76 +-
1 file changed, 38 insertions(+), 38 deletions(-)
diff --git a/libavfilter/vf_blend.c b/libavfilter/vf_blend.c
index 8b9c304ad4..116cc038a1 100644
--- a/libavfilter/vf_blend.c
+++ b/libavfilter/vf_blend.c
@@ -601,44 +601,44 @@ static av_cold void uninit(AVFilterContext *ctx)
av_expr_free(s->params[i].e);
}
-#define DEFINE_INIT_BLEND_FUNC(depth, nbits)
\
-static av_cold void init_blend_func_##depth##_##nbits##bit(FilterParams
*param) \
-{
\
-switch (param->mode) {
\
-case BLEND_ADDITION: param->blend = blend_addition_##depth##bit;
break; \
-case BLEND_GRAINMERGE: param->blend = blend_grainmerge_##depth##bit;
break; \
-case BLEND_AND:param->blend = blend_and_##depth##bit;
break; \
-case BLEND_AVERAGE:param->blend = blend_average_##depth##bit;
break; \
-case BLEND_BURN: param->blend = blend_burn_##depth##bit;
break; \
-case BLEND_DARKEN: param->blend = blend_darken_##depth##bit;
break; \
-case BLEND_DIFFERENCE: param->blend = blend_difference_##depth##bit;
break; \
-case BLEND_GRAINEXTRACT: param->blend =
blend_grainextract_##depth##bit; break; \
-case BLEND_DIVIDE: param->blend = blend_divide_##depth##bit;
break; \
-case BLEND_DODGE: param->blend = blend_dodge_##depth##bit;
break; \
-case BLEND_EXCLUSION: param->blend = blend_exclusion_##depth##bit;
break; \
-case BLEND_EXTREMITY: param->blend = blend_extremity_##depth##bit;
break; \
-case BLEND_FREEZE: param->blend = blend_freeze_##depth##bit;
break; \
-case BLEND_GLOW: param->blend = blend_glow_##depth##bit;
break; \
-case BLEND_HARDLIGHT: param->blend = blend_hardlight_##depth##bit;
break; \
-case BLEND_HARDMIX:param->blend = blend_hardmix_##depth##bit;
break; \
-case BLEND_HEAT: param->blend = blend_heat_##depth##bit;
break; \
-case BLEND_LIGHTEN:param->blend = blend_lighten_##depth##bit;
break; \
-case BLEND_LINEARLIGHT:param->blend =
blend_linearlight_##depth##bit;break; \
-case BLEND_MULTIPLY: param->blend = blend_multiply_##depth##bit;
break; \
-case BLEND_MULTIPLY128:param->blend =
blend_multiply128_##depth##bit;break; \
-case BLEND_NEGATION: param->blend = blend_negation_##depth##bit;
break; \
-case BLEND_NORMAL: param->blend = blend_normal_##nbits##bit;
break; \
-case BLEND_OR: param->blend = blend_or_##depth##bit;
break; \
-case BLEND_OVERLAY:param->blend = blend_overlay_##depth##bit;
break; \
-case BLEND_PHOENIX:param->blend = blend_phoenix_##depth##bit;
break; \
-case BLEND_PINLIGHT: param->blend = blend_pinlight_##depth##bit;
break; \
-case BLEND_REFLECT:param->blend = blend_reflect_##depth##bit;
break; \
-case BLEND_SCREEN: param->blend = blend_screen_##depth##bit;
break; \
-case BLEND_SOFTLIGHT: param->blend = blend_softlight_##depth##bit;
break; \
-case BLEND_SUBTRACT: param->blend = blend_subtract_##depth##bit;
break; \
-case BLEND_VIVIDLIGHT: param->blend = blend_vividlight_##depth##bit;
break; \
-case BLEND_XOR:param->blend = blend_xor_##depth##bit;
break; \
-}
\
+#define DEFINE_INIT_BLEND_FUNC(depth, nbits)
\
+static av_cold void init_blend_func_##depth##_##nbits##bit(FilterParams
*param) \
+{
\
+switch (param->mode) {
\
+case BLEND_ADDITION: param->blend = blend_addition_##depth##bit;
break; \
+case BLEND_GRAINMERGE: param->blend = blend_grainmerge_##depth##bit;
break; \
+case BLEND_AND: param->blend = blend_and_##depth##bit;
break; \
+case BLEND_AVERAGE: param->blend = blend_average_##depth##bit;
break; \
+case BLEN
[FFmpeg-cvslog] avfilter/vf_weave: pal and hwaccel formats are not supported
ffmpeg | branch: master | Paul B Mahol | Tue Nov 19 12:35:55
2019 +0100| [18d25ecede6a5c3e57bf08489ab3f696250a665a] | committer: Paul B Mahol
avfilter/vf_weave: pal and hwaccel formats are not supported
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=18d25ecede6a5c3e57bf08489ab3f696250a665a
---
libavfilter/vf_weave.c | 22 ++
1 file changed, 22 insertions(+)
diff --git a/libavfilter/vf_weave.c b/libavfilter/vf_weave.c
index 663d79f511..8951b09095 100644
--- a/libavfilter/vf_weave.c
+++ b/libavfilter/vf_weave.c
@@ -49,6 +49,26 @@ static const AVOption weave_options[] = {
AVFILTER_DEFINE_CLASS(weave);
+static int query_formats(AVFilterContext *ctx)
+{
+AVFilterFormats *formats = NULL;
+int ret;
+
+for (int fmt = 0; av_pix_fmt_desc_get(fmt); fmt++) {
+const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(fmt);
+
+if (!(desc->flags & AV_PIX_FMT_FLAG_PAL) &&
+!(desc->flags & AV_PIX_FMT_FLAG_HWACCEL)) {
+if ((ret = ff_add_format(&formats, fmt)) < 0) {
+ff_formats_unref(&formats);
+return ret;
+}
+}
+}
+
+return ff_set_common_formats(ctx, formats);
+}
+
static int config_props_output(AVFilterLink *outlink)
{
AVFilterContext *ctx = outlink->src;
@@ -156,6 +176,7 @@ AVFilter ff_vf_weave = {
.description = NULL_IF_CONFIG_SMALL("Weave input video fields into
frames."),
.priv_size = sizeof(WeaveContext),
.priv_class= &weave_class,
+.query_formats = query_formats,
.uninit= uninit,
.inputs= weave_inputs,
.outputs = weave_outputs,
@@ -179,6 +200,7 @@ AVFilter ff_vf_doubleweave = {
.description = NULL_IF_CONFIG_SMALL("Weave input video fields into
double number of frames."),
.priv_size = sizeof(WeaveContext),
.priv_class= &doubleweave_class,
+.query_formats = query_formats,
.init = init,
.uninit= uninit,
.inputs= weave_inputs,
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] avfilter/vf_deblock: add 12bit yuva formats
ffmpeg | branch: master | Paul B Mahol | Tue Nov 19 12:43:26 2019 +0100| [258f66998fa9efa576451f80a1bd74524a6f5f13] | committer: Paul B Mahol avfilter/vf_deblock: add 12bit yuva formats > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=258f66998fa9efa576451f80a1bd74524a6f5f13 --- libavfilter/vf_deblock.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavfilter/vf_deblock.c b/libavfilter/vf_deblock.c index 62e3248d46..77c681ecb8 100644 --- a/libavfilter/vf_deblock.c +++ b/libavfilter/vf_deblock.c @@ -76,6 +76,7 @@ static int query_formats(AVFilterContext *ctx) AV_PIX_FMT_YUV420P16, AV_PIX_FMT_YUV422P16, AV_PIX_FMT_YUV444P16, AV_PIX_FMT_YUVA420P9, AV_PIX_FMT_YUVA422P9, AV_PIX_FMT_YUVA444P9, AV_PIX_FMT_YUVA420P10, AV_PIX_FMT_YUVA422P10, AV_PIX_FMT_YUVA444P10, +AV_PIX_FMT_YUVA422P12, AV_PIX_FMT_YUVA444P12, AV_PIX_FMT_YUVA420P16, AV_PIX_FMT_YUVA422P16, AV_PIX_FMT_YUVA444P16, AV_PIX_FMT_GBRP, AV_PIX_FMT_GBRP9, AV_PIX_FMT_GBRP10, AV_PIX_FMT_GBRP12, AV_PIX_FMT_GBRP14, AV_PIX_FMT_GBRP16, ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] avfilter/vf_midequalizer: add 16bit formats
ffmpeg | branch: master | Paul B Mahol | Tue Nov 19 13:08:07 2019 +0100| [804fce8bc24ff3f2aa0ab5650c324823342fb56e] | committer: Paul B Mahol avfilter/vf_midequalizer: add 16bit formats > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=804fce8bc24ff3f2aa0ab5650c324823342fb56e --- libavfilter/vf_midequalizer.c | 4 1 file changed, 4 insertions(+) diff --git a/libavfilter/vf_midequalizer.c b/libavfilter/vf_midequalizer.c index a750affe8c..44c0bd751a 100644 --- a/libavfilter/vf_midequalizer.c +++ b/libavfilter/vf_midequalizer.c @@ -76,6 +76,10 @@ static int query_formats(AVFilterContext *ctx) AV_PIX_FMT_YUVA420P10, AV_PIX_FMT_YUVA422P10, AV_PIX_FMT_YUVA444P10, AV_PIX_FMT_YUVA422P12, AV_PIX_FMT_YUVA444P12, AV_PIX_FMT_GBRAP10, AV_PIX_FMT_GBRAP12, +AV_PIX_FMT_YUV420P16, AV_PIX_FMT_YUV422P16, AV_PIX_FMT_YUV444P16, +AV_PIX_FMT_YUVA420P16, AV_PIX_FMT_YUVA422P16, AV_PIX_FMT_YUVA444P16, +AV_PIX_FMT_GBRP16, AV_PIX_FMT_GBRAP16, +AV_PIX_FMT_GRAY16, AV_PIX_FMT_NONE }; ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] fate/cbs: add initial AV1 tests
ffmpeg | branch: master | James Almer | Sun Nov 17 23:07:27 2019 -0300| [f18a5efb5222ed8a48b4ba58ba59e2c7190f297a] | committer: James Almer fate/cbs: add initial AV1 tests Signed-off-by: James Almer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f18a5efb5222ed8a48b4ba58ba59e2c7190f297a --- tests/fate/cbs.mak | 26 +- tests/ref/fate/cbs-av1-av1-1-b10-23-film_grain-50 | 1 + tests/ref/fate/cbs-av1-av1-1-b8-02-allintra| 1 + tests/ref/fate/cbs-av1-av1-1-b8-03-sizedown| 1 + tests/ref/fate/cbs-av1-av1-1-b8-03-sizeup | 1 + tests/ref/fate/cbs-av1-av1-1-b8-04-cdfupdate | 1 + tests/ref/fate/cbs-av1-av1-1-b8-05-mv | 1 + tests/ref/fate/cbs-av1-av1-1-b8-06-mfmv| 1 + tests/ref/fate/cbs-av1-av1-1-b8-23-film_grain-50 | 1 + tests/ref/fate/cbs-av1-frames_refs_short_signaling | 1 + tests/ref/fate/cbs-av1-non_uniform_tiling | 1 + tests/ref/fate/cbs-av1-seq_hdr_op_param_info | 1 + 12 files changed, 36 insertions(+), 1 deletion(-) diff --git a/tests/fate/cbs.mak b/tests/fate/cbs.mak index f2ef04ceda..1f4d8aeebf 100644 --- a/tests/fate/cbs.mak +++ b/tests/fate/cbs.mak @@ -2,7 +2,7 @@ # arguments, it decomposes the stream fully and then recomposes it # without making any changes. -fate-cbs: fate-cbs-h264 fate-cbs-hevc fate-cbs-mpeg2 fate-cbs-vp9 +fate-cbs: fate-cbs-av1 fate-cbs-h264 fate-cbs-hevc fate-cbs-mpeg2 fate-cbs-vp9 FATE_CBS_DEPS = $(call ALLYES, $(1)_DEMUXER $(2)_PARSER $(3)_METADATA_BSF $(4)_DECODER $(5)_MUXER) @@ -12,6 +12,30 @@ FATE_CBS_$(1) += fate-cbs-$(1)-$(2) fate-cbs-$(1)-$(2): CMD = md5 -i $(TARGET_SAMPLES)/$(3) -c:v copy -y -bsf:v $(1)_metadata -f $(4) endef +# AV1 read/write + +FATE_CBS_AV1_CONFORMANCE_SAMPLES = \ +av1-1-b8-02-allintra.ivf \ +av1-1-b8-03-sizedown.ivf \ +av1-1-b8-03-sizeup.ivf \ +av1-1-b8-04-cdfupdate.ivf \ +av1-1-b8-05-mv.ivf \ +av1-1-b8-06-mfmv.ivf \ +av1-1-b8-23-film_grain-50.ivf \ +av1-1-b10-23-film_grain-50.ivf + +FATE_CBS_AV1_SAMPLES = \ +frames_refs_short_signaling.ivf \ +non_uniform_tiling.ivf \ +seq_hdr_op_param_info.ivf + +$(foreach N,$(FATE_CBS_AV1_CONFORMANCE_SAMPLES),$(eval $(call FATE_CBS_TEST,av1,$(basename $(N)),av1-test-vectors/$(N),ivf))) +$(foreach N,$(FATE_CBS_AV1_SAMPLES),$(eval $(call FATE_CBS_TEST,av1,$(basename $(N)),av1/$(N),ivf))) + +FATE_CBS_AV1-$(call ALLYES, IVF_DEMUXER AV1_PARSER AV1_METADATA_BSF IVF_MUXER) = $(FATE_CBS_av1) +FATE_SAMPLES_AVCONV += $(FATE_CBS_AV1-yes) +fate-cbs-av1: $(FATE_CBS_AV1-yes) + # H.264 read/write FATE_CBS_H264_CONFORMANCE_SAMPLES = \ diff --git a/tests/ref/fate/cbs-av1-av1-1-b10-23-film_grain-50 b/tests/ref/fate/cbs-av1-av1-1-b10-23-film_grain-50 new file mode 100644 index 00..832c682108 --- /dev/null +++ b/tests/ref/fate/cbs-av1-av1-1-b10-23-film_grain-50 @@ -0,0 +1 @@ +5fe6622ac6cb22dd10dfbe9e70e82d4e diff --git a/tests/ref/fate/cbs-av1-av1-1-b8-02-allintra b/tests/ref/fate/cbs-av1-av1-1-b8-02-allintra new file mode 100644 index 00..9a127ff90c --- /dev/null +++ b/tests/ref/fate/cbs-av1-av1-1-b8-02-allintra @@ -0,0 +1 @@ +b905c6f2bf68fddbf58a50f940c5f5a2 diff --git a/tests/ref/fate/cbs-av1-av1-1-b8-03-sizedown b/tests/ref/fate/cbs-av1-av1-1-b8-03-sizedown new file mode 100644 index 00..6d771a2331 --- /dev/null +++ b/tests/ref/fate/cbs-av1-av1-1-b8-03-sizedown @@ -0,0 +1 @@ +4db2f13b7028a2bb6a5a067badf1b0ad diff --git a/tests/ref/fate/cbs-av1-av1-1-b8-03-sizeup b/tests/ref/fate/cbs-av1-av1-1-b8-03-sizeup new file mode 100644 index 00..689934c2fb --- /dev/null +++ b/tests/ref/fate/cbs-av1-av1-1-b8-03-sizeup @@ -0,0 +1 @@ +964ea060d898a4358708b3f83ecda4b5 diff --git a/tests/ref/fate/cbs-av1-av1-1-b8-04-cdfupdate b/tests/ref/fate/cbs-av1-av1-1-b8-04-cdfupdate new file mode 100644 index 00..f0a2481f8a --- /dev/null +++ b/tests/ref/fate/cbs-av1-av1-1-b8-04-cdfupdate @@ -0,0 +1 @@ +e24ce6a099ce9389f06606b0a7653007 diff --git a/tests/ref/fate/cbs-av1-av1-1-b8-05-mv b/tests/ref/fate/cbs-av1-av1-1-b8-05-mv new file mode 100644 index 00..b3350a283b --- /dev/null +++ b/tests/ref/fate/cbs-av1-av1-1-b8-05-mv @@ -0,0 +1 @@ +b39c0edaf5695367ec07eeffce57303d diff --git a/tests/ref/fate/cbs-av1-av1-1-b8-06-mfmv b/tests/ref/fate/cbs-av1-av1-1-b8-06-mfmv new file mode 100644 index 00..929a2a4498 --- /dev/null +++ b/tests/ref/fate/cbs-av1-av1-1-b8-06-mfmv @@ -0,0 +1 @@ +95c1fcf60b4fc4530d38f0896c783e28 diff --git a/tests/ref/fate/cbs-av1-av1-1-b8-23-film_grain-50 b/tests/ref/fate/cbs-av1-av1-1-b8-23-film_grain-50 new file mode 100644 index 00..2a8fcfdfdf --- /dev/null +++ b/tests/ref/fate/cbs-av1-av1-1-b8-23-film_grain-50 @@ -0,0 +1 @@ +93e578da4b2bdb70ce0a92262da930ec diff --git a/tests/ref/fate/cbs-av1-frames_refs_short_signaling b/tests/ref/fate/cbs-av1-frames_refs_short_signaling new
[FFmpeg-cvslog] avcodec/amfnec: allocate packets using av_new_packet()
ffmpeg | branch: master | James Almer | Tue Nov 19 19:42:48
2019 -0300| [fdf46b4a6b36dd8551adc29c455326b1a13b4acb] | committer: James Almer
avcodec/amfnec: allocate packets using av_new_packet()
This ensures they will be reference counted, as required by the
AVCodec.receive_packet()
API.
Should fix ticket #8386.
Signed-off-by: James Almer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fdf46b4a6b36dd8551adc29c455326b1a13b4acb
---
libavcodec/amfenc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavcodec/amfenc.c b/libavcodec/amfenc.c
index f66b95645e..876fddd2b6 100644
--- a/libavcodec/amfenc.c
+++ b/libavcodec/amfenc.c
@@ -451,7 +451,7 @@ static int amf_copy_buffer(AVCodecContext *avctx, AVPacket
*pkt, AMFBuffer *buff
int64_t timestamp = AV_NOPTS_VALUE;
int64_t size = buffer->pVtbl->GetSize(buffer);
-if ((ret = ff_alloc_packet2(avctx, pkt, size, 0)) < 0) {
+if ((ret = av_new_packet(pkt, size)) < 0) {
return ret;
}
memcpy(pkt->data, buffer->pVtbl->GetNative(buffer), size);
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] avcodec/amfnec: allocate packets using av_new_packet()
ffmpeg | branch: release/4.2 | James Almer | Tue Nov 19
19:42:48 2019 -0300| [57365f67a0701473bf012c24fb1a7d045471a682] | committer:
James Almer
avcodec/amfnec: allocate packets using av_new_packet()
This ensures they will be reference counted, as required by the
AVCodec.receive_packet()
API.
Should fix ticket #8386.
Signed-off-by: James Almer
(cherry picked from commit fdf46b4a6b36dd8551adc29c455326b1a13b4acb)
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=57365f67a0701473bf012c24fb1a7d045471a682
---
libavcodec/amfenc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavcodec/amfenc.c b/libavcodec/amfenc.c
index 384d8efc92..5af1cd002f 100644
--- a/libavcodec/amfenc.c
+++ b/libavcodec/amfenc.c
@@ -438,7 +438,7 @@ static int amf_copy_buffer(AVCodecContext *avctx, AVPacket
*pkt, AMFBuffer *buff
int64_t timestamp = AV_NOPTS_VALUE;
int64_t size = buffer->pVtbl->GetSize(buffer);
-if ((ret = ff_alloc_packet2(avctx, pkt, size, 0)) < 0) {
+if ((ret = av_new_packet(pkt, size)) < 0) {
return ret;
}
memcpy(pkt->data, buffer->pVtbl->GetNative(buffer), size);
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] avcodec/amfnec: allocate packets using av_new_packet()
ffmpeg | branch: release/4.1 | James Almer | Tue Nov 19
19:42:48 2019 -0300| [08d3cc2f1dafe406b257d1daaae82ccae5d5378e] | committer:
James Almer
avcodec/amfnec: allocate packets using av_new_packet()
This ensures they will be reference counted, as required by the
AVCodec.receive_packet()
API.
Should fix ticket #8386.
Signed-off-by: James Almer
(cherry picked from commit fdf46b4a6b36dd8551adc29c455326b1a13b4acb)
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=08d3cc2f1dafe406b257d1daaae82ccae5d5378e
---
libavcodec/amfenc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavcodec/amfenc.c b/libavcodec/amfenc.c
index 384d8efc92..5af1cd002f 100644
--- a/libavcodec/amfenc.c
+++ b/libavcodec/amfenc.c
@@ -438,7 +438,7 @@ static int amf_copy_buffer(AVCodecContext *avctx, AVPacket
*pkt, AMFBuffer *buff
int64_t timestamp = AV_NOPTS_VALUE;
int64_t size = buffer->pVtbl->GetSize(buffer);
-if ((ret = ff_alloc_packet2(avctx, pkt, size, 0)) < 0) {
+if ((ret = av_new_packet(pkt, size)) < 0) {
return ret;
}
memcpy(pkt->data, buffer->pVtbl->GetNative(buffer), size);
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] avcodec/dvdec: Use av_clip_uint8 instead of ff_crop_tab
ffmpeg | branch: master | Michael Niedermayer | Sat
Nov 16 00:10:53 2019 +0100| [d73f06270600c37c74beeceac37f593838ced383] |
committer: Michael Niedermayer
avcodec/dvdec: Use av_clip_uint8 instead of ff_crop_tab
Fixes: out of array access
Fixes:
18788/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_DVVIDEO_fuzzer-6254863113781248
Found-by: continuous fuzzing process
https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Reviewed-by: Baptiste Coudurier
Signed-off-by: Michael Niedermayer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d73f06270600c37c74beeceac37f593838ced383
---
libavcodec/dvdec.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/libavcodec/dvdec.c b/libavcodec/dvdec.c
index 578d7f505f..c526091eb4 100644
--- a/libavcodec/dvdec.c
+++ b/libavcodec/dvdec.c
@@ -272,11 +272,10 @@ static inline void bit_copy(PutBitContext *pb,
GetBitContext *gb)
static av_always_inline void put_block_8x4(int16_t *block, uint8_t
*av_restrict p, int stride)
{
int i, j;
-const uint8_t *cm = ff_crop_tab + MAX_NEG_CROP;
for (i = 0; i < 4; i++) {
for (j = 0; j < 8; j++)
-p[j] = cm[block[j]];
+p[j] = av_clip_uint8(block[j]);
block += 8;
p += stride;
}
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] avcodec/cbs_av1: fix reading reference order hint in skip_mode_params()
ffmpeg | branch: release/4.2 | James Almer | Fri Nov 15
15:12:14 2019 -0300| [8da31e9eef6dac51f83ea916531917ee26802b12] | committer:
James Almer
avcodec/cbs_av1: fix reading reference order hint in skip_mode_params()
Reviewed-by: Ronald S. Bultje
Signed-off-by: James Almer
(cherry picked from commit 2703068110dce2c145a2d3a0f380f8e0de79b632)
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8da31e9eef6dac51f83ea916531917ee26802b12
---
libavcodec/cbs_av1_syntax_template.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/libavcodec/cbs_av1_syntax_template.c
b/libavcodec/cbs_av1_syntax_template.c
index 806b302de6..c843cfa02b 100644
--- a/libavcodec/cbs_av1_syntax_template.c
+++ b/libavcodec/cbs_av1_syntax_template.c
@@ -882,7 +882,7 @@ static int FUNC(skip_mode_params)(CodedBitstreamContext
*ctx, RWContext *rw,
forward_idx = -1;
backward_idx = -1;
for (i = 0; i < AV1_REFS_PER_FRAME; i++) {
-ref_hint = priv->ref[i].order_hint;
+ref_hint = priv->ref[current->ref_frame_idx[i]].order_hint;
dist = cbs_av1_get_relative_dist(seq, ref_hint,
current->order_hint);
if (dist < 0) {
@@ -913,7 +913,7 @@ static int FUNC(skip_mode_params)(CodedBitstreamContext
*ctx, RWContext *rw,
second_forward_idx = -1;
for (i = 0; i < AV1_REFS_PER_FRAME; i++) {
-ref_hint = priv->ref[i].order_hint;
+ref_hint = priv->ref[current->ref_frame_idx[i]].order_hint;
if (cbs_av1_get_relative_dist(seq, ref_hint,
forward_hint) < 0) {
if (second_forward_idx < 0 ||
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] avcodec/cbs_av1: keep separate reference frame state for reading and writing
ffmpeg | branch: release/4.2 | James Almer | Sun Nov 17
21:08:56 2019 -0300| [252ef2329a53230327ef57f69c9dc3fa7737e704] | committer:
James Almer
avcodec/cbs_av1: keep separate reference frame state for reading and writing
In scearios where a Temporal Unit is written right after reading it using the
same
CBS context (av1_metadata, av1_frame_merge, etc), the reference frame state used
by the writer must not be the state that's the result of the reader having
already
parsed the current frame in question.
This fixes writing Switch frames, and frames using short ref signaling.
Signed-off-by: James Almer
(cherry picked from commit 4e2bef6a82b356772a5919c51c9be1530268bd79)
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=252ef2329a53230327ef57f69c9dc3fa7737e704
---
libavcodec/cbs_av1.c | 4
libavcodec/cbs_av1.h | 4 +++-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/libavcodec/cbs_av1.c b/libavcodec/cbs_av1.c
index eb6b801790..533a4ffa16 100644
--- a/libavcodec/cbs_av1.c
+++ b/libavcodec/cbs_av1.c
@@ -940,6 +940,8 @@ static int cbs_av1_read_unit(CodedBitstreamContext *ctx,
priv->spatial_id = 0;
}
+priv->ref = (AV1ReferenceFrameState *)&priv->read_ref;
+
switch (obu->header.obu_type) {
case AV1_OBU_SEQUENCE_HEADER:
{
@@ -1082,6 +1084,8 @@ static int cbs_av1_write_obu(CodedBitstreamContext *ctx,
td = NULL;
start_pos = put_bits_count(pbc);
+priv->ref = (AV1ReferenceFrameState *)&priv->write_ref;
+
switch (obu->header.obu_type) {
case AV1_OBU_SEQUENCE_HEADER:
{
diff --git a/libavcodec/cbs_av1.h b/libavcodec/cbs_av1.h
index 1fb668ada4..675ed28f60 100644
--- a/libavcodec/cbs_av1.h
+++ b/libavcodec/cbs_av1.h
@@ -441,7 +441,9 @@ typedef struct CodedBitstreamAV1Context {
int tile_cols;
int tile_rows;
-AV1ReferenceFrameState ref[AV1_NUM_REF_FRAMES];
+AV1ReferenceFrameState *ref;
+AV1ReferenceFrameState read_ref[AV1_NUM_REF_FRAMES];
+AV1ReferenceFrameState write_ref[AV1_NUM_REF_FRAMES];
// Write buffer.
uint8_t *write_buffer;
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] cbs_h264: Fix missing inferred colour description fields
ffmpeg | branch: release/4.2 | Mark Thompson | Sun Jul 28
19:23:15 2019 +0100| [82a3a623f0129b6ee16d3b553051b5e4a6a2b95a] | committer:
James Almer
cbs_h264: Fix missing inferred colour description fields
With video_signal_type_present_flag set but colour_description_present_flag
unset the colour fields would not have had their correct values inferred.
(cherry picked from commit f9b8503639c0ff90846f07c92e2fe7836690dd0c)
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=82a3a623f0129b6ee16d3b553051b5e4a6a2b95a
---
libavcodec/cbs_h264_syntax_template.c | 4
1 file changed, 4 insertions(+)
diff --git a/libavcodec/cbs_h264_syntax_template.c
b/libavcodec/cbs_h264_syntax_template.c
index 26be6e590f..1671a15d33 100644
--- a/libavcodec/cbs_h264_syntax_template.c
+++ b/libavcodec/cbs_h264_syntax_template.c
@@ -137,6 +137,10 @@ static int FUNC(vui_parameters)(CodedBitstreamContext
*ctx, RWContext *rw,
ub(8, colour_primaries);
ub(8, transfer_characteristics);
ub(8, matrix_coefficients);
+} else {
+infer(colour_primaries, 2);
+infer(transfer_characteristics, 2);
+infer(matrix_coefficients, 2);
}
} else {
infer(video_format, 5);
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
