From: Anton Khirnov <anton@khirnov.net>
To: ffmpeg-devel@ffmpeg.org
Subject: [FFmpeg-devel] [PATCH 01/15] fftools/ffmpeg_hw: move hw_device_setup_for_decode() to ffmpeg_dec
Date: Tue, 23 May 2023 15:58:28 +0200
Message-ID: <20230523135842.20388-1-anton@khirnov.net> (raw)
This function is entangled with decoder setup, so it is more decoding
code rather than ffmpeg_hw code. This will allow making more decoder
state private in the future.
---
fftools/ffmpeg.h | 5 +-
fftools/ffmpeg_dec.c | 145 ++++++++++++++++++++++++++++++++++++++++
fftools/ffmpeg_hw.c | 153 ++-----------------------------------------
3 files changed, 153 insertions(+), 150 deletions(-)
diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h
index 45be3b1823..895edbd6d6 100644
--- a/fftools/ffmpeg.h
+++ b/fftools/ffmpeg.h
@@ -795,10 +795,13 @@ void enc_stats_write(OutputStream *ost, EncStats *es,
uint64_t frame_num);
HWDevice *hw_device_get_by_name(const char *name);
+HWDevice *hw_device_get_by_type(enum AVHWDeviceType type);
int hw_device_init_from_string(const char *arg, HWDevice **dev);
+int hw_device_init_from_type(enum AVHWDeviceType type,
+ const char *device,
+ HWDevice **dev_out);
void hw_device_free_all(void);
-int hw_device_setup_for_decode(InputStream *ist);
int hw_device_setup_for_encode(OutputStream *ost);
/**
* Get a hardware device to be used with this filtergraph.
diff --git a/fftools/ffmpeg_dec.c b/fftools/ffmpeg_dec.c
index e06747d9c4..0a470c4854 100644
--- a/fftools/ffmpeg_dec.c
+++ b/fftools/ffmpeg_dec.c
@@ -528,6 +528,151 @@ static enum AVPixelFormat get_format(AVCodecContext *s, const enum AVPixelFormat
return *p;
}
+static HWDevice *hw_device_match_by_codec(const AVCodec *codec)
+{
+ const AVCodecHWConfig *config;
+ HWDevice *dev;
+ int i;
+ for (i = 0;; i++) {
+ config = avcodec_get_hw_config(codec, i);
+ if (!config)
+ return NULL;
+ if (!(config->methods & AV_CODEC_HW_CONFIG_METHOD_HW_DEVICE_CTX))
+ continue;
+ dev = hw_device_get_by_type(config->device_type);
+ if (dev)
+ return dev;
+ }
+}
+
+static int hw_device_setup_for_decode(InputStream *ist)
+{
+ const AVCodecHWConfig *config;
+ enum AVHWDeviceType type;
+ HWDevice *dev = NULL;
+ int err, auto_device = 0;
+
+ if (ist->hwaccel_device) {
+ dev = hw_device_get_by_name(ist->hwaccel_device);
+ if (!dev) {
+ if (ist->hwaccel_id == HWACCEL_AUTO) {
+ auto_device = 1;
+ } else if (ist->hwaccel_id == HWACCEL_GENERIC) {
+ type = ist->hwaccel_device_type;
+ err = hw_device_init_from_type(type, ist->hwaccel_device,
+ &dev);
+ } else {
+ // This will be dealt with by API-specific initialisation
+ // (using hwaccel_device), so nothing further needed here.
+ return 0;
+ }
+ } else {
+ if (ist->hwaccel_id == HWACCEL_AUTO) {
+ ist->hwaccel_device_type = dev->type;
+ } else if (ist->hwaccel_device_type != dev->type) {
+ av_log(NULL, AV_LOG_ERROR, "Invalid hwaccel device "
+ "specified for decoder: device %s of type %s is not "
+ "usable with hwaccel %s.\n", dev->name,
+ av_hwdevice_get_type_name(dev->type),
+ av_hwdevice_get_type_name(ist->hwaccel_device_type));
+ return AVERROR(EINVAL);
+ }
+ }
+ } else {
+ if (ist->hwaccel_id == HWACCEL_AUTO) {
+ auto_device = 1;
+ } else if (ist->hwaccel_id == HWACCEL_GENERIC) {
+ type = ist->hwaccel_device_type;
+ dev = hw_device_get_by_type(type);
+
+ // When "-qsv_device device" is used, an internal QSV device named
+ // as "__qsv_device" is created. Another QSV device is created too
+ // if "-init_hw_device qsv=name:device" is used. There are 2 QSV devices
+ // if both "-qsv_device device" and "-init_hw_device qsv=name:device"
+ // are used, hw_device_get_by_type(AV_HWDEVICE_TYPE_QSV) returns NULL.
+ // To keep back-compatibility with the removed ad-hoc libmfx setup code,
+ // call hw_device_get_by_name("__qsv_device") to select the internal QSV
+ // device.
+ if (!dev && type == AV_HWDEVICE_TYPE_QSV)
+ dev = hw_device_get_by_name("__qsv_device");
+
+ if (!dev)
+ err = hw_device_init_from_type(type, NULL, &dev);
+ } else {
+ dev = hw_device_match_by_codec(ist->dec);
+ if (!dev) {
+ // No device for this codec, but not using generic hwaccel
+ // and therefore may well not need one - ignore.
+ return 0;
+ }
+ }
+ }
+
+ if (auto_device) {
+ int i;
+ if (!avcodec_get_hw_config(ist->dec, 0)) {
+ // Decoder does not support any hardware devices.
+ return 0;
+ }
+ for (i = 0; !dev; i++) {
+ config = avcodec_get_hw_config(ist->dec, i);
+ if (!config)
+ break;
+ type = config->device_type;
+ dev = hw_device_get_by_type(type);
+ if (dev) {
+ av_log(NULL, AV_LOG_INFO, "Using auto "
+ "hwaccel type %s with existing device %s.\n",
+ av_hwdevice_get_type_name(type), dev->name);
+ }
+ }
+ for (i = 0; !dev; i++) {
+ config = avcodec_get_hw_config(ist->dec, i);
+ if (!config)
+ break;
+ type = config->device_type;
+ // Try to make a new device of this type.
+ err = hw_device_init_from_type(type, ist->hwaccel_device,
+ &dev);
+ if (err < 0) {
+ // Can't make a device of this type.
+ continue;
+ }
+ if (ist->hwaccel_device) {
+ av_log(NULL, AV_LOG_INFO, "Using auto "
+ "hwaccel type %s with new device created "
+ "from %s.\n", av_hwdevice_get_type_name(type),
+ ist->hwaccel_device);
+ } else {
+ av_log(NULL, AV_LOG_INFO, "Using auto "
+ "hwaccel type %s with new default device.\n",
+ av_hwdevice_get_type_name(type));
+ }
+ }
+ if (dev) {
+ ist->hwaccel_device_type = type;
+ } else {
+ av_log(NULL, AV_LOG_INFO, "Auto hwaccel "
+ "disabled: no device found.\n");
+ ist->hwaccel_id = HWACCEL_NONE;
+ return 0;
+ }
+ }
+
+ if (!dev) {
+ av_log(NULL, AV_LOG_ERROR, "No device available "
+ "for decoder: device type %s needed for codec %s.\n",
+ av_hwdevice_get_type_name(type), ist->dec->name);
+ return err;
+ }
+
+ ist->dec_ctx->hw_device_ctx = av_buffer_ref(dev->device_ref);
+ if (!ist->dec_ctx->hw_device_ctx)
+ return AVERROR(ENOMEM);
+
+ return 0;
+}
+
int dec_open(InputStream *ist)
{
const AVCodec *codec = ist->dec;
diff --git a/fftools/ffmpeg_hw.c b/fftools/ffmpeg_hw.c
index e67145211c..d28257a1d6 100644
--- a/fftools/ffmpeg_hw.c
+++ b/fftools/ffmpeg_hw.c
@@ -27,7 +27,7 @@
static int nb_hw_devices;
static HWDevice **hw_devices;
-static HWDevice *hw_device_get_by_type(enum AVHWDeviceType type)
+HWDevice *hw_device_get_by_type(enum AVHWDeviceType type)
{
HWDevice *found = NULL;
int i;
@@ -242,9 +242,9 @@ fail:
goto done;
}
-static int hw_device_init_from_type(enum AVHWDeviceType type,
- const char *device,
- HWDevice **dev_out)
+int hw_device_init_from_type(enum AVHWDeviceType type,
+ const char *device,
+ HWDevice **dev_out)
{
AVBufferRef *device_ref = NULL;
HWDevice *dev;
@@ -297,151 +297,6 @@ void hw_device_free_all(void)
nb_hw_devices = 0;
}
-static HWDevice *hw_device_match_by_codec(const AVCodec *codec)
-{
- const AVCodecHWConfig *config;
- HWDevice *dev;
- int i;
- for (i = 0;; i++) {
- config = avcodec_get_hw_config(codec, i);
- if (!config)
- return NULL;
- if (!(config->methods & AV_CODEC_HW_CONFIG_METHOD_HW_DEVICE_CTX))
- continue;
- dev = hw_device_get_by_type(config->device_type);
- if (dev)
- return dev;
- }
-}
-
-int hw_device_setup_for_decode(InputStream *ist)
-{
- const AVCodecHWConfig *config;
- enum AVHWDeviceType type;
- HWDevice *dev = NULL;
- int err, auto_device = 0;
-
- if (ist->hwaccel_device) {
- dev = hw_device_get_by_name(ist->hwaccel_device);
- if (!dev) {
- if (ist->hwaccel_id == HWACCEL_AUTO) {
- auto_device = 1;
- } else if (ist->hwaccel_id == HWACCEL_GENERIC) {
- type = ist->hwaccel_device_type;
- err = hw_device_init_from_type(type, ist->hwaccel_device,
- &dev);
- } else {
- // This will be dealt with by API-specific initialisation
- // (using hwaccel_device), so nothing further needed here.
- return 0;
- }
- } else {
- if (ist->hwaccel_id == HWACCEL_AUTO) {
- ist->hwaccel_device_type = dev->type;
- } else if (ist->hwaccel_device_type != dev->type) {
- av_log(NULL, AV_LOG_ERROR, "Invalid hwaccel device "
- "specified for decoder: device %s of type %s is not "
- "usable with hwaccel %s.\n", dev->name,
- av_hwdevice_get_type_name(dev->type),
- av_hwdevice_get_type_name(ist->hwaccel_device_type));
- return AVERROR(EINVAL);
- }
- }
- } else {
- if (ist->hwaccel_id == HWACCEL_AUTO) {
- auto_device = 1;
- } else if (ist->hwaccel_id == HWACCEL_GENERIC) {
- type = ist->hwaccel_device_type;
- dev = hw_device_get_by_type(type);
-
- // When "-qsv_device device" is used, an internal QSV device named
- // as "__qsv_device" is created. Another QSV device is created too
- // if "-init_hw_device qsv=name:device" is used. There are 2 QSV devices
- // if both "-qsv_device device" and "-init_hw_device qsv=name:device"
- // are used, hw_device_get_by_type(AV_HWDEVICE_TYPE_QSV) returns NULL.
- // To keep back-compatibility with the removed ad-hoc libmfx setup code,
- // call hw_device_get_by_name("__qsv_device") to select the internal QSV
- // device.
- if (!dev && type == AV_HWDEVICE_TYPE_QSV)
- dev = hw_device_get_by_name("__qsv_device");
-
- if (!dev)
- err = hw_device_init_from_type(type, NULL, &dev);
- } else {
- dev = hw_device_match_by_codec(ist->dec);
- if (!dev) {
- // No device for this codec, but not using generic hwaccel
- // and therefore may well not need one - ignore.
- return 0;
- }
- }
- }
-
- if (auto_device) {
- int i;
- if (!avcodec_get_hw_config(ist->dec, 0)) {
- // Decoder does not support any hardware devices.
- return 0;
- }
- for (i = 0; !dev; i++) {
- config = avcodec_get_hw_config(ist->dec, i);
- if (!config)
- break;
- type = config->device_type;
- dev = hw_device_get_by_type(type);
- if (dev) {
- av_log(NULL, AV_LOG_INFO, "Using auto "
- "hwaccel type %s with existing device %s.\n",
- av_hwdevice_get_type_name(type), dev->name);
- }
- }
- for (i = 0; !dev; i++) {
- config = avcodec_get_hw_config(ist->dec, i);
- if (!config)
- break;
- type = config->device_type;
- // Try to make a new device of this type.
- err = hw_device_init_from_type(type, ist->hwaccel_device,
- &dev);
- if (err < 0) {
- // Can't make a device of this type.
- continue;
- }
- if (ist->hwaccel_device) {
- av_log(NULL, AV_LOG_INFO, "Using auto "
- "hwaccel type %s with new device created "
- "from %s.\n", av_hwdevice_get_type_name(type),
- ist->hwaccel_device);
- } else {
- av_log(NULL, AV_LOG_INFO, "Using auto "
- "hwaccel type %s with new default device.\n",
- av_hwdevice_get_type_name(type));
- }
- }
- if (dev) {
- ist->hwaccel_device_type = type;
- } else {
- av_log(NULL, AV_LOG_INFO, "Auto hwaccel "
- "disabled: no device found.\n");
- ist->hwaccel_id = HWACCEL_NONE;
- return 0;
- }
- }
-
- if (!dev) {
- av_log(NULL, AV_LOG_ERROR, "No device available "
- "for decoder: device type %s needed for codec %s.\n",
- av_hwdevice_get_type_name(type), ist->dec->name);
- return err;
- }
-
- ist->dec_ctx->hw_device_ctx = av_buffer_ref(dev->device_ref);
- if (!ist->dec_ctx->hw_device_ctx)
- return AVERROR(ENOMEM);
-
- return 0;
-}
-
int hw_device_setup_for_encode(OutputStream *ost)
{
const AVCodecHWConfig *config;
--
2.39.2
_______________________________________________
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".
next reply other threads:[~2023-05-23 13:59 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-23 13:58 Anton Khirnov [this message]
2023-05-23 13:58 ` [FFmpeg-devel] [PATCH 02/15] fftools/ffmpeg_hw: move hw_device_setup_for_encode() to ffmpeg_enc Anton Khirnov
2023-05-23 13:58 ` [FFmpeg-devel] [PATCH 03/15] fftools/ffmpeg_enc: use AVFrame.hw_frames_ctx for encoder hw setup Anton Khirnov
2023-05-23 13:58 ` [FFmpeg-devel] [PATCH 04/15] fftools/ffmpeg: fail earlier on text/bitmap subtitles mismatch Anton Khirnov
2023-05-23 13:58 ` [FFmpeg-devel] [PATCH 05/15] fftools/ffmpeg: drop outdated comments Anton Khirnov
2023-05-23 13:58 ` [FFmpeg-devel] [PATCH 06/15] fftools/ffmpeg_demux: only print demuxing stats if demuxing actually started Anton Khirnov
2023-05-23 13:58 ` [FFmpeg-devel] [PATCH 07/15] fftools/ffmpeg_demux: initialize nb_streams_warn Anton Khirnov
2023-05-23 13:58 ` [FFmpeg-devel] [PATCH 08/15] fftools/ffmpeg_demux: skip unused/attachment streams in final stats Anton Khirnov
2023-05-23 13:58 ` [FFmpeg-devel] [PATCH 09/15] fftools/ffmpeg_dec: add decoder private data Anton Khirnov
2023-05-23 13:58 ` [FFmpeg-devel] [PATCH 10/15] fftools/ffmpeg_dec: move InputStream.pkt to Decoder Anton Khirnov
2023-05-23 13:58 ` [FFmpeg-devel] [PATCH 11/15] fftools/ffmpeg_dec: move timestamp estimation state " Anton Khirnov
2023-05-23 13:58 ` [FFmpeg-devel] [PATCH 12/15] fftools/ffmpeg: add InputStream.index Anton Khirnov
2023-05-23 13:58 ` [FFmpeg-devel] [PATCH 13/15] fftools/ffmpeg_demux: log discontinuity warnings to stream context Anton Khirnov
2023-05-23 13:58 ` [FFmpeg-devel] [PATCH 14/15] fftools/sync_queue: add debug logging Anton Khirnov
2023-05-23 13:58 ` [FFmpeg-devel] [PATCH 15/15] fftools/sync_queue: make sure non-limiting streams are not used as queue head Anton Khirnov
2023-05-24 12:01 ` James Almer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230523135842.20388-1-anton@khirnov.net \
--to=anton@khirnov.net \
--cc=ffmpeg-devel@ffmpeg.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git