Modify output resolution to even due to encoder only support even

resolution.
And fixed core dump issue when running on some input odd resolutions.

Signed-off-by: Xiaoxia Liang <[email protected]>

Author: xiaoxial

ffmpeg/vf_raisr.c

@@ -211,6 +211,9 @@ static int config_props_output(AVFilterLink *outlink)
 
     outlink->w = inlink0->w * raisr->ratio;
     outlink->h = inlink0->h * raisr->ratio;
+    // resolution of output needs to be even due to encoder support only even resolution
+    outlink->w = outlink->w % 2 == 0 ? outlink->w : outlink->w - 1 ;
+    outlink->h = outlink->h % 2 == 0 ? outlink->h : outlink->h - 1;
 
     return 0;
 }
@@ -224,6 +227,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
     RNLERRORTYPE ret;
     VideoDataType vdt_in[3] = { 0 };
     VideoDataType vdt_out[3] = { 0 };
+    const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(outlink->format);
 
     av_log(ctx, AV_LOG_VERBOSE, "Frame\n");
 
@@ -263,10 +267,15 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
         vdt_in[p].height = plane->height;
         vdt_in[p].step = in->linesize[p];
 
+        // Get horziontal and vertical power of 2 factors
+        int vsub = p ? desc->log2_chroma_h : 0;
+        int hsub = p ? desc->log2_chroma_w : 0;
+
         // fill in the output video data type structure
         vdt_out[p].pData = out->data[p];
-        vdt_out[p].width = plane->width * raisr->ratio;
-        vdt_out[p].height = plane->height * raisr->ratio;
+        // Determine the width and height of this plane/channel
+        vdt_out[p].width = AV_CEIL_RSHIFT(out->width, hsub);
+        vdt_out[p].height = AV_CEIL_RSHIFT(out->height, vsub);
         vdt_out[p].step = out->linesize[p];
     }
     if (raisr->framecount == 0)

ffmpeg/vf_raisr_opencl.c

@@ -25,6 +25,7 @@
 #include "internal.h"
 #include "opencl.h"
 #include "libavutil/pixdesc.h"
+#include "video.h"
 
 #define MIN_RATIO 1
 #define MAX_RATIO 2
@@ -109,8 +110,8 @@ static int raisr_opencl_filter_frame(AVFilterLink *inlink, AVFrame *input)
         vdt_in[p].bitShift = desc->comp[p].shift;
         // fill in the output video data type structure
         vdt_out[p].pData = output->data[p];
-        vdt_out[p].width = input->width * ctx->ratio / wsub;
-        vdt_out[p].height = input->height * ctx->ratio / hsub;
+        vdt_out[p].width = output->width / wsub;
+        vdt_out[p].height = output->height / hsub;
         vdt_out[p].step = output->linesize[p];
         vdt_out[p].bitShift = desc->comp[p].shift;
     }
@@ -195,6 +196,9 @@ static int raisr_opencl_config_output(AVFilterLink *outlink)
 
     ctx->ocf.output_width = inlink->w * ctx->ratio;
     ctx->ocf.output_height = inlink->h * ctx->ratio;
+    // resolution of output needs to be even due to encoder support only even resolution
+    ctx->ocf.output_width = ctx->ocf.output_width % 2 == 0 ? ctx->ocf.output_width : ctx->ocf.output_width - 1;
+    ctx->ocf.output_height = ctx->ocf.output_height % 2 == 0 ? ctx->ocf.output_height : ctx->ocf.output_height - 1;
 
     err = ff_opencl_filter_config_output(outlink);
     if (err < 0)