drop OpenCL

Author: ammen99

README.md

@@ -84,5 +84,3 @@ To use GPU encoding, use a VAAPI codec (for ex. `h264_vaapi`) and specify a GPU
 wf-recorder -f test-vaapi.mkv -c h264_vaapi -d /dev/dri/renderD128
 ```
 Some drivers report support for rgb0 data for vaapi input but really only support yuv planar formats. In this case, use the `-t` or `--force-yuv` option in addition to the vaapi options to convert the data to yuv planar data before sending it to the GPU.
-
-The `-e` option attempts to use OpenCL if wf-recorder was built with OpenCL support and `-t` or `--force-yuv` are specified, even without vaapi GPU encoding. Use `-e#` or `--opencl=#` to use a specific OpenCL device, where `#` is one of the devices listed.

manpage/wf-recorder.1

@@ -12,7 +12,6 @@
 .Op Fl c, -codec Ar output_codec
 .Op Fl d, -device Ar encoding_device
 .Op Fl D, -no-damage
-.Op Fl e, -opencl Op Ar opencl_device
 .Op Fl f Ar filename.ext
 .Op Fl F Ar filter_string
 .Op Fl g, -geometry Ar geometry
@@ -85,19 +84,6 @@ file, which however has a variable refresh rate. When this option is
 on, wf-recorder does not use this optimization and continuously
 records new frames, even if there are no updates on the screen.
 .Pp
-.It Fl e , -opencl Ar opencl_device
-Attempts to use OpenCL if
-.Nm
-was built with OpenCL support and
-.Fl t , -force-yuv
-are specified, even without vaapi GPU encoding.
-Use
-.Fl e , -opencl
-.Ar opencl_device
-to use a specific OpenCL device, where
-.Ar opencl_device
-is one of the devices listed.
-.Pp
 .It Fl f Ar filename.ext
 By using the
 .Fl f

meson.build

@@ -49,13 +49,6 @@ if pulse.found()
     project_sources += 'src/pulse.cpp'
 endif
 
-opencl = dependency('OpenCL', required : get_option('opencl'))
-
-if opencl.found()
-    conf_data.set('HAVE_OPENCL', true)
-    project_sources += 'src/opencl.cpp'
-endif
-
 libavutil = dependency('libavutil')
 libavcodec = dependency('libavcodec')
 libavformat = dependency('libavformat')
@@ -78,7 +71,7 @@ subdir('proto')
 dependencies = [
     wayland_client, wayland_protos,
     libavutil, libavcodec, libavformat, libavdevice, libavfilter,
-    wf_protos, threads, pulse, swr, opencl
+    wf_protos, threads, pulse, swr
 ]
 
 executable('wf-recorder', project_sources,

meson_options.txt

@@ -1,3 +1,2 @@
 option('default_codec', type: 'string', value: 'libx264', description: 'Codec that will be used by default')
 option('pulse', type: 'feature', value: 'auto', description: 'Enable Pulseaudio')
-option('opencl', type: 'feature', value: 'auto', description: 'Enable OpenCL')

src/frame-writer.cpp

@@ -472,39 +472,9 @@ FrameWriter::FrameWriter(const FrameWriterParams& _params) :
         std::exit(-1);
     }
 
-#ifndef HAVE_OPENCL
-    if (params.opencl)
-        std::cerr << "This version of wf-recorder was built without OpenCL support. Ignoring OpenCL option." << std::endl;
-#endif
-
     init_codecs();
 }
 
-void FrameWriter::convert_pixels_to_yuv(const uint8_t *pixels,
-    const uint8_t *formatted_pixels, int stride[])
-{
-    bool y_invert = (pixels != formatted_pixels);
-    bool converted_with_opencl = false;
-
-#ifdef HAVE_OPENCL
-    if (params.opencl && params.force_yuv)
-    {
-        int r = opencl->do_frame(pixels, encoder_frame,
-            get_input_format(), y_invert);
-
-        converted_with_opencl = (r == 0);
-    }
-#else
-    /* Silence compiler warning when opencl is disabled */
-    (void)(y_invert);
-#endif
-
-    if (!converted_with_opencl)
-    {
-        // TODO: remove
-    }
-}
-
 void FrameWriter::encode(AVCodecContext *enc_ctx, AVFrame *frame, AVPacket *pkt)
 {
     /* send the frame to the encoder */

src/frame-writer.hpp

@@ -32,12 +32,6 @@ extern "C"
 
 #include "config.h"
 
-#ifdef HAVE_OPENCL
-#include <memory>
-#include "opencl.hpp"
-class OpenCL;
-#endif
-
 enum InputFormat
 {
      INPUT_FORMAT_BGR0,
@@ -66,9 +60,7 @@ struct FrameWriterParams
     bool enable_audio;
     bool enable_ffmpeg_debug_output;
 
-    bool opencl;
     bool force_yuv;
-    int opencl_device;
     int bframes;
 
     std::atomic<bool>& write_aborted_flag;
@@ -100,16 +92,6 @@ class FrameWriter
     void init_video_filters(AVCodec *codec);
     void init_video_stream();
 
-    /**
-     * Convert the given pixels to YUV and store in encoder_frame.
-     * Calls OpenCL if it is enabled.
-     *
-     * @param formatted_pixels contains the same data as pixels but y-inverted
-     * if the input format requires y-inversion.
-     */
-    void convert_pixels_to_yuv(const uint8_t *pixels,
-        const uint8_t *formatted_pixels, int stride[]);
-
     void encode(AVCodecContext *enc_ctx, AVFrame *frame, AVPacket *pkt);
 
 #ifdef HAVE_PULSE
@@ -136,9 +118,6 @@ class FrameWriter
     void add_audio(const void* buffer);
     size_t get_audio_buffer_size();
 
-#endif
-#ifdef HAVE_OPENCL
-    std::unique_ptr<OpenCL> opencl;
 #endif
 
     ~FrameWriter();

src/main.cpp

@@ -24,10 +24,6 @@
 
 #include "config.h"
 
-#ifdef HAVE_OPENCL
-std::unique_ptr<OpenCL> opencl;
-#endif
-
 #ifdef HAVE_PULSE
 #include "pulse.hpp"
 PulseReaderParams pulseParams;
@@ -351,14 +347,6 @@ static void write_loop(FrameWriterParams params)
             params.stride = buffer.stride;
             frame_writer = std::unique_ptr<FrameWriter> (new FrameWriter(params));
 
-#ifdef HAVE_OPENCL
-            if (params.opencl && params.force_yuv)
-            {
-                frame_writer->opencl = std::move(opencl);
-                frame_writer->opencl->init(params.width, params.height);
-            }
-#endif
-
 #ifdef HAVE_PULSE
             if (params.enable_audio)
             {
@@ -590,15 +578,7 @@ Use Ctrl+C to stop.)");
   -o, --output              Specify the output where the video is to be recorded.
 
   -p, --codec-param         Change the codec parameters.
-                            -p <option_name>=<option_value>)");
-#ifdef HAVE_OPENCL
-    printf(R"(
-
-  -e, --opencl              Use the -e[#] or --opencl[=#] in conjunction with -t or --force-yuv option
-                            to use opencl for gpu accelerated conversion of data to yuv. # is one
-                            of the devices listed when running without specifying #.)");
-#endif
-    printf(R"(
+                            -p <option_name>=<option_value>
 
   -F, --filter              Specify the ffmpeg filter string to use. For example,
                             -F hwupload,scale_vaapi=format=nv12 is used for VAAPI.
@@ -679,8 +659,6 @@ int main(int argc, char *argv[])
     params.enable_ffmpeg_debug_output = false;
     params.enable_audio = false;
     params.force_yuv = false;
-    params.opencl = false;
-    params.opencl_device = -1;
     params.bframes = -1;
 
     constexpr const char* default_cmdline_output = "interactive";
@@ -700,7 +678,6 @@ int main(int argc, char *argv[])
         { "audio",           optional_argument, NULL, 'a' },
         { "help",            no_argument,       NULL, 'h' },
         { "force-yuv",       no_argument,       NULL, 't' },
-        { "opencl",          optional_argument, NULL, 'e' },
         { "bframes",         required_argument, NULL, 'b' },
         { "version",         no_argument,       NULL, 'v' },
         { "no-damage",       no_argument,       NULL, 'D' },
@@ -710,7 +687,7 @@ int main(int argc, char *argv[])
     int c, i;
     std::string param;
     size_t pos;
-    while((c = getopt_long(argc, argv, "o:f:m:x:g:c:p:d:b:la::te::hvDF:", opts, &i)) != -1)
+    while((c = getopt_long(argc, argv, "o:f:m:x:g:c:p:d:b:la::thvDF:", opts, &i)) != -1)
     {
         switch(c)
         {
@@ -772,11 +749,6 @@ int main(int argc, char *argv[])
                 help();
                 break;
 
-            case 'e':
-                params.opencl = true;
-                params.opencl_device = optarg ? atoi(optarg) : -1;
-                break;
-
             case 'p':
                 param = optarg;
                 pos = param.find("=");
@@ -881,11 +853,6 @@ int main(int argc, char *argv[])
 
     printf("selected region %d,%d %dx%d\n", selected_region.x, selected_region.y, selected_region.width, selected_region.height);
 
-#ifdef HAVE_OPENCL
-     if (params.opencl && params.force_yuv)
-         opencl = std::unique_ptr<OpenCL> (new OpenCL(params.opencl_device));
-#endif
-
     timespec first_frame;
     first_frame.tv_sec = -1;