[FFmpeg-devel] [PATCH 1/3] api/api-band-test: Remove write-only variable

[FFmpeg-devel] [PATCH 1/3] api/api-band-test: Remove write-only variable

[Andreas Rheinhardt]

Besides being write only it had the wrong type:
An uint8_t is definitely not enough to store the size
of these buffers.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 tests/api/api-band-test.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/tests/api/api-band-test.c b/tests/api/api-band-test.c
index bbaa6edb58..d40e31b850 100644
--- a/tests/api/api-band-test.c
+++ b/tests/api/api-band-test.c
@@ -31,7 +31,6 @@
 #include "libavutil/imgutils.h"
 
 uint8_t *slice_byte_buffer;
-uint8_t slice_byte_buffer_size;
 int draw_horiz_band_called;
 
 static void draw_horiz_band(AVCodecContext *ctx, const AVFrame *fr, int offset[4],
@@ -158,7 +157,6 @@ static int video_decode(const char *input_filename)
         return AVERROR(ENOMEM);
     }
     memset(slice_byte_buffer, 0, byte_buffer_size);
-    slice_byte_buffer_size = byte_buffer_size;
 
     result = 0;
     while (result >= 0) {
-- 
2.40.1

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

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

[FFmpeg-devel] [PATCH 2/3] api/api-band-test: Perform codec admissibility check earlier

[Andreas Rheinhardt]

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 tests/api/api-band-test.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tests/api/api-band-test.c b/tests/api/api-band-test.c
index d40e31b850..e088d0854a 100644
--- a/tests/api/api-band-test.c
+++ b/tests/api/api-band-test.c
@@ -106,6 +106,11 @@ static int video_decode(const char *input_filename)
         return -1;
     }
 
+    if (strcmp(codec->name, "flv") && strcmp(codec->name, "mpeg4") && strcmp(codec->name, "huffyuv")) {
+        av_log(NULL, AV_LOG_ERROR, "Wrong codec\n");
+        return -1;
+    }
+
     ctx = avcodec_alloc_context3(codec);
     if (!ctx) {
         av_log(NULL, AV_LOG_ERROR, "Can't allocate decoder context\n");
@@ -139,11 +144,6 @@ static int video_decode(const char *input_filename)
         return AVERROR(ENOMEM);
     }
 
-    if (strcmp(codec->name, "flv") && strcmp(codec->name, "mpeg4") && strcmp(codec->name, "huffyuv")) {
-        av_log(NULL, AV_LOG_ERROR, "Wrong codec\n");
-        return -1;
-    }
-
     byte_buffer_size = av_image_get_buffer_size(ctx->pix_fmt, ctx->width, ctx->height, 32);
     byte_buffer = av_malloc(byte_buffer_size);
     if (!byte_buffer) {
-- 
2.40.1

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

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

[FFmpeg-devel] [PATCH 3/3] api/api-band-test: Query codec capabilities to decide admissibility

[Andreas Rheinhardt]

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 tests/api/api-band-test.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/api/api-band-test.c b/tests/api/api-band-test.c
index e088d0854a..c3612bedb9 100644
--- a/tests/api/api-band-test.c
+++ b/tests/api/api-band-test.c
@@ -106,8 +106,8 @@ static int video_decode(const char *input_filename)
         return -1;
     }
 
-    if (strcmp(codec->name, "flv") && strcmp(codec->name, "mpeg4") && strcmp(codec->name, "huffyuv")) {
-        av_log(NULL, AV_LOG_ERROR, "Wrong codec\n");
+    if (!(codec->capabilities & AV_CODEC_CAP_DRAW_HORIZ_BAND)) {
+        av_log(NULL, AV_LOG_ERROR, "Codec does not support draw_horiz_band\n");
         return -1;
     }
 
@@ -222,7 +222,7 @@ int main(int argc, char **argv)
 {
     if (argc < 2)
     {
-        av_log(NULL, AV_LOG_ERROR, "Incorrect input: expected %s <name of a video file>\nNote that test works only for huffyuv, flv and mpeg4 decoders\n", argv[0]);
+        av_log(NULL, AV_LOG_ERROR, "Incorrect input: expected %s <name of a video file>\n", argv[0]);
         return 1;
     }
 
-- 
2.40.1

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

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

Re: [FFmpeg-devel] [PATCH 1/3] api/api-band-test: Remove write-only variable

[Andreas Rheinhardt]

Andreas Rheinhardt:
> Besides being write only it had the wrong type:
> An uint8_t is definitely not enough to store the size
> of these buffers.
> 
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
> ---
>  tests/api/api-band-test.c | 2 --
>  1 file changed, 2 deletions(-)
> 
> diff --git a/tests/api/api-band-test.c b/tests/api/api-band-test.c
> index bbaa6edb58..d40e31b850 100644
> --- a/tests/api/api-band-test.c
> +++ b/tests/api/api-band-test.c
> @@ -31,7 +31,6 @@
>  #include "libavutil/imgutils.h"
>  
>  uint8_t *slice_byte_buffer;
> -uint8_t slice_byte_buffer_size;
>  int draw_horiz_band_called;
>  
>  static void draw_horiz_band(AVCodecContext *ctx, const AVFrame *fr, int offset[4],
> @@ -158,7 +157,6 @@ static int video_decode(const char *input_filename)
>          return AVERROR(ENOMEM);
>      }
>      memset(slice_byte_buffer, 0, byte_buffer_size);
> -    slice_byte_buffer_size = byte_buffer_size;
>  
>      result = 0;
>      while (result >= 0) {

Will apply this patchset tomorrow unless there are objections.

- Andreas

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

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