Skip to content

Commit

Permalink
ffmpeg: Add an option "qsv_device" to choose proper node for QSV chil…
Browse files Browse the repository at this point in the history
…d device (vaapi or dxva2)

Reason: For some cases, such as 2 or more graphics cards existing, the
default command line may fail because ffmpeg does not open the correct
device node:
    ffmpeg -hwaccel qsv -c:v h264_qsv -i test.264 -c:v h264_qsv out.264
Let user choose the proper one by running like below:
    ffmpeg -hwaccel qsv -qsv_device /dev/dri/renderD128 -c:v h264_qsv \
-i test.264 -c:v h264_qsv out.264

Signed-off-by: ChaoX A Liu <chaox.a.liu@gmail.com>
Signed-off-by: Huang, Zhengxu <zhengxu.maxwell@gmail.com>
Signed-off-by: Andrew, Zhang <huazh407@gmail.com>
Signed-off-by: Mark Thompson <sw@jkqxz.net>
  • Loading branch information
maxwell-zhengxu authored and fhvwy committed Jan 11, 2017
1 parent f55da22 commit 1a79b8f
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 3 deletions.
3 changes: 3 additions & 0 deletions ffmpeg.h
Expand Up @@ -602,6 +602,9 @@ extern const OptionDef options[];
extern const HWAccel hwaccels[];
extern int hwaccel_lax_profile_check;
extern AVBufferRef *hw_device_ctx;
#if CONFIG_QSV
extern char *qsv_device;
#endif


void term_init(void);
Expand Down
5 changes: 5 additions & 0 deletions ffmpeg_opt.c
Expand Up @@ -3679,5 +3679,10 @@ const OptionDef options[] = {
"set VAAPI hardware device (DRM path or X11 display name)", "device" },
#endif

#if CONFIG_QSV
{ "qsv_device", HAS_ARG | OPT_STRING | OPT_EXPERT, { &qsv_device },
"set QSV hardware device (DirectX adapter index, DRM path or X11 display name)", "device"},
#endif

{ NULL, },
};
19 changes: 16 additions & 3 deletions ffmpeg_qsv.c
Expand Up @@ -28,6 +28,8 @@

#include "ffmpeg.h"

char *qsv_device = NULL;

static int qsv_get_buffer(AVCodecContext *s, AVFrame *frame, int flags)
{
InputStream *ist = s->opaque;
Expand All @@ -44,15 +46,26 @@ static void qsv_uninit(AVCodecContext *s)
static int qsv_device_init(InputStream *ist)
{
int err;
AVDictionary *dict = NULL;

if (qsv_device) {
err = av_dict_set(&dict, "child_device", qsv_device, 0);
if (err < 0)
return err;
}

err = av_hwdevice_ctx_create(&hw_device_ctx, AV_HWDEVICE_TYPE_QSV,
ist->hwaccel_device, NULL, 0);
ist->hwaccel_device, dict, 0);
if (err < 0) {
av_log(NULL, AV_LOG_ERROR, "Error creating a QSV device\n");
return err;
goto err_out;
}

return 0;
err_out:
if (dict)
av_dict_free(&dict);

return err;
}

int qsv_init(AVCodecContext *s)
Expand Down

0 comments on commit 1a79b8f

Please sign in to comment.