subject:"\[FFmpeg\-devel\] \[PATCH v2 1\/3\] avfilter\/vsrc_mptestsrc\: add options to set the maximum number of frames"

Re: [FFmpeg-devel] [PATCH v2 1/3] avfilter/vsrc_mptestsrc: add options to set the maximum number of frames

2019-08-17 Thread Limin Wang



ping, please help to merge the code if it's OK.

On Mon, Aug 12, 2019 at 11:39:51PM +0800, lance.lmw...@gmail.com wrote:
> From: Limin Wang 
> 
> Signed-off-by: Limin Wang 
> ---
>  doc/filters.texi |  3 +++
>  libavfilter/vsrc_mptestsrc.c | 29 +
>  2 files changed, 20 insertions(+), 12 deletions(-)
> 
> diff --git a/doc/filters.texi b/doc/filters.texi
> index e081cdc..902e5bf 100644
> --- a/doc/filters.texi
> +++ b/doc/filters.texi
> @@ -20246,6 +20246,9 @@ Set the number or the name of the test to perform. 
> Supported tests are:
>  @item ring2
>  @item all
>  
> +@item max_frames, m
> +Set the maximum number of frames generated for each test, default value is 
> 30.
> +
>  @end table
>  
>  Default value is "all", which will cycle through the list of all tests.
> diff --git a/libavfilter/vsrc_mptestsrc.c b/libavfilter/vsrc_mptestsrc.c
> index c5fdea7..4a2db18 100644
> --- a/libavfilter/vsrc_mptestsrc.c
> +++ b/libavfilter/vsrc_mptestsrc.c
> @@ -54,6 +54,7 @@ typedef struct MPTestContext {
>  const AVClass *class;
>  AVRational frame_rate;
>  int64_t pts, max_pts, duration;
> +int64_t max_frames;
>  int hsub, vsub;
>  int test;   ///< test_type
>  } MPTestContext;
> @@ -79,6 +80,10 @@ static const AVOption mptestsrc_options[]= {
>  { "ring1",   "", 0, AV_OPT_TYPE_CONST, {.i64=TEST_RING1},   
> INT_MIN, INT_MAX, FLAGS, "test" },
>  { "ring2",   "", 0, AV_OPT_TYPE_CONST, {.i64=TEST_RING2},   
> INT_MIN, INT_MAX, FLAGS, "test" },
>  { "all", "", 0, AV_OPT_TYPE_CONST, {.i64=TEST_ALL}, 
> INT_MIN, INT_MAX, FLAGS, "test" },
> +{ "max_frames", "Set the maximum number of frames generated for each 
> test", OFFSET(max_frames),
> +AV_OPT_TYPE_INT, {.i64 = 30}, 1, INT64_MAX, FLAGS },
> +{ "m",  "Set the maximum number of frames generated for each 
> test", OFFSET(max_frames),
> +AV_OPT_TYPE_INT, {.i64 = 30}, 1, INT64_MAX, FLAGS },
>  { NULL }
>  };
>  
> @@ -322,20 +327,20 @@ static int request_frame(AVFilterLink *outlink)
>  memset(picref->data[2] + i*picref->linesize[2], 128, cw);
>  }
>  
> -if (tt == TEST_ALL && frame%30) /* draw a black frame at the beginning 
> of each test */
> -tt = (frame/30)%(TEST_NB-1);
> +if (tt == TEST_ALL && frame%test->max_frames) /* draw a black frame at 
> the beginning of each test */
> +tt = (frame/test->max_frames)%(TEST_NB-1);
>  
>  switch (tt) {
> -case TEST_DC_LUMA:   dc_test(picref->data[0], picref->linesize[0], 
> 256, 256, frame%30); break;
> -case TEST_DC_CHROMA: dc_test(picref->data[1], picref->linesize[1], 
> 256, 256, frame%30); break;
> -case TEST_FREQ_LUMA:   freq_test(picref->data[0], picref->linesize[0], 
> frame%30); break;
> -case TEST_FREQ_CHROMA: freq_test(picref->data[1], picref->linesize[1], 
> frame%30); break;
> -case TEST_AMP_LUMA: amp_test(picref->data[0], picref->linesize[0], 
> frame%30); break;
> -case TEST_AMP_CHROMA:   amp_test(picref->data[1], picref->linesize[1], 
> frame%30); break;
> -case TEST_CBP:  cbp_test(picref->data   , picref->linesize   , 
> frame%30); break;
> -case TEST_MV:mv_test(picref->data[0], picref->linesize[0], 
> frame%30); break;
> -case TEST_RING1:  ring1_test(picref->data[0], picref->linesize[0], 
> frame%30); break;
> -case TEST_RING2:  ring2_test(picref->data[0], picref->linesize[0], 
> frame%30); break;
> +case TEST_DC_LUMA:   dc_test(picref->data[0], picref->linesize[0], 
> 256, 256, frame%test->max_frames); break;
> +case TEST_DC_CHROMA: dc_test(picref->data[1], picref->linesize[1], 
> 256, 256, frame%test->max_frames); break;
> +case TEST_FREQ_LUMA:   freq_test(picref->data[0], picref->linesize[0], 
> frame%test->max_frames); break;
> +case TEST_FREQ_CHROMA: freq_test(picref->data[1], picref->linesize[1], 
> frame%test->max_frames); break;
> +case TEST_AMP_LUMA: amp_test(picref->data[0], picref->linesize[0], 
> frame%test->max_frames); break;
> +case TEST_AMP_CHROMA:   amp_test(picref->data[1], picref->linesize[1], 
> frame%test->max_frames); break;
> +case TEST_CBP:  cbp_test(picref->data   , picref->linesize   , 
> frame%test->max_frames); break;
> +case TEST_MV:mv_test(picref->data[0], picref->linesize[0], 
> frame%test->max_frames); break;
> +case TEST_RING1:  ring1_test(picref->data[0], picref->linesize[0], 
> frame%test->max_frames); break;
> +case TEST_RING2:  ring2_test(picref->data[0], picref->linesize[0], 
> frame%test->max_frames); break;
>  }
>  
>  return ff_filter_frame(outlink, picref);
> -- 
> 2.6.4
> 
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject

[FFmpeg-devel] [PATCH v2 1/3] avfilter/vsrc_mptestsrc: add options to set the maximum number of frames

2019-08-12 Thread lance . lmwang

From: Limin Wang 

Signed-off-by: Limin Wang 
---
 doc/filters.texi |  3 +++
 libavfilter/vsrc_mptestsrc.c | 29 +
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/doc/filters.texi b/doc/filters.texi
index e081cdc..902e5bf 100644
--- a/doc/filters.texi
+++ b/doc/filters.texi
@@ -20246,6 +20246,9 @@ Set the number or the name of the test to perform. 
Supported tests are:
 @item ring2
 @item all
 
+@item max_frames, m
+Set the maximum number of frames generated for each test, default value is 30.
+
 @end table
 
 Default value is "all", which will cycle through the list of all tests.
diff --git a/libavfilter/vsrc_mptestsrc.c b/libavfilter/vsrc_mptestsrc.c
index c5fdea7..4a2db18 100644
--- a/libavfilter/vsrc_mptestsrc.c
+++ b/libavfilter/vsrc_mptestsrc.c
@@ -54,6 +54,7 @@ typedef struct MPTestContext {
 const AVClass *class;
 AVRational frame_rate;
 int64_t pts, max_pts, duration;
+int64_t max_frames;
 int hsub, vsub;
 int test;   ///< test_type
 } MPTestContext;
@@ -79,6 +80,10 @@ static const AVOption mptestsrc_options[]= {
 { "ring1",   "", 0, AV_OPT_TYPE_CONST, {.i64=TEST_RING1},   
INT_MIN, INT_MAX, FLAGS, "test" },
 { "ring2",   "", 0, AV_OPT_TYPE_CONST, {.i64=TEST_RING2},   
INT_MIN, INT_MAX, FLAGS, "test" },
 { "all", "", 0, AV_OPT_TYPE_CONST, {.i64=TEST_ALL}, 
INT_MIN, INT_MAX, FLAGS, "test" },
+{ "max_frames", "Set the maximum number of frames generated for each 
test", OFFSET(max_frames),
+AV_OPT_TYPE_INT, {.i64 = 30}, 1, INT64_MAX, FLAGS },
+{ "m",  "Set the maximum number of frames generated for each 
test", OFFSET(max_frames),
+AV_OPT_TYPE_INT, {.i64 = 30}, 1, INT64_MAX, FLAGS },
 { NULL }
 };
 
@@ -322,20 +327,20 @@ static int request_frame(AVFilterLink *outlink)
 memset(picref->data[2] + i*picref->linesize[2], 128, cw);
 }
 
-if (tt == TEST_ALL && frame%30) /* draw a black frame at the beginning of 
each test */
-tt = (frame/30)%(TEST_NB-1);
+if (tt == TEST_ALL && frame%test->max_frames) /* draw a black frame at the 
beginning of each test */
+tt = (frame/test->max_frames)%(TEST_NB-1);
 
 switch (tt) {
-case TEST_DC_LUMA:   dc_test(picref->data[0], picref->linesize[0], 
256, 256, frame%30); break;
-case TEST_DC_CHROMA: dc_test(picref->data[1], picref->linesize[1], 
256, 256, frame%30); break;
-case TEST_FREQ_LUMA:   freq_test(picref->data[0], picref->linesize[0], 
frame%30); break;
-case TEST_FREQ_CHROMA: freq_test(picref->data[1], picref->linesize[1], 
frame%30); break;
-case TEST_AMP_LUMA: amp_test(picref->data[0], picref->linesize[0], 
frame%30); break;
-case TEST_AMP_CHROMA:   amp_test(picref->data[1], picref->linesize[1], 
frame%30); break;
-case TEST_CBP:  cbp_test(picref->data   , picref->linesize   , 
frame%30); break;
-case TEST_MV:mv_test(picref->data[0], picref->linesize[0], 
frame%30); break;
-case TEST_RING1:  ring1_test(picref->data[0], picref->linesize[0], 
frame%30); break;
-case TEST_RING2:  ring2_test(picref->data[0], picref->linesize[0], 
frame%30); break;
+case TEST_DC_LUMA:   dc_test(picref->data[0], picref->linesize[0], 
256, 256, frame%test->max_frames); break;
+case TEST_DC_CHROMA: dc_test(picref->data[1], picref->linesize[1], 
256, 256, frame%test->max_frames); break;
+case TEST_FREQ_LUMA:   freq_test(picref->data[0], picref->linesize[0], 
frame%test->max_frames); break;
+case TEST_FREQ_CHROMA: freq_test(picref->data[1], picref->linesize[1], 
frame%test->max_frames); break;
+case TEST_AMP_LUMA: amp_test(picref->data[0], picref->linesize[0], 
frame%test->max_frames); break;
+case TEST_AMP_CHROMA:   amp_test(picref->data[1], picref->linesize[1], 
frame%test->max_frames); break;
+case TEST_CBP:  cbp_test(picref->data   , picref->linesize   , 
frame%test->max_frames); break;
+case TEST_MV:mv_test(picref->data[0], picref->linesize[0], 
frame%test->max_frames); break;
+case TEST_RING1:  ring1_test(picref->data[0], picref->linesize[0], 
frame%test->max_frames); break;
+case TEST_RING2:  ring2_test(picref->data[0], picref->linesize[0], 
frame%test->max_frames); break;
 }
 
 return ff_filter_frame(outlink, picref);
-- 
2.6.4

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

To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".

Re: [FFmpeg-devel] [PATCH v2 1/3] avfilter/vsrc_mptestsrc: add options to set the maximum number of frames

[FFmpeg-devel] [PATCH v2 1/3] avfilter/vsrc_mptestsrc: add options to set the maximum number of frames

2 matches

Site Navigation

Mail list logo

Footer information