Message ID | 20220630024558.1444-2-tong1.wu@intel.com |
---|---|
State | New |
Headers | show |
Series | [FFmpeg-devel,v2,1/3] avutil/hwcontext: add a function to get the AVHWDeviceType | expand |
Context | Check | Description |
---|---|---|
yinshiyou/make_loongarch64 | success | Make finished |
yinshiyou/make_fate_loongarch64 | success | Make fate finished |
andriy/make_x86 | success | Make finished |
andriy/make_fate_x86 | success | Make fate finished |
On Thu, Jun 30, 2022 at 4:47 AM Tong Wu <tong1.wu-at-intel.com@ffmpeg.org> wrote: > When a derive_device_type is not specified, the hwmap filter should be > able to retrieve AVHWDeviceType from outlink->format and create > corresponding hwdevice context. > > Signed-off-by: Tong Wu <tong1.wu@intel.com> > --- > libavfilter/vf_hwmap.c | 17 +++++++++++++---- > 1 file changed, 13 insertions(+), 4 deletions(-) > > diff --git a/libavfilter/vf_hwmap.c b/libavfilter/vf_hwmap.c > index 2e03dfc1fe..136980c982 100644 > --- a/libavfilter/vf_hwmap.c > +++ b/libavfilter/vf_hwmap.c > @@ -70,23 +70,32 @@ static int hwmap_config_output(AVFilterLink *outlink) > device_is_derived = 0; > > if (inlink->hw_frames_ctx) { > + enum AVHWDeviceType type; > hwfc = (AVHWFramesContext*)inlink->hw_frames_ctx->data; > > if (ctx->derive_device_type) { > - enum AVHWDeviceType type; > - > type = av_hwdevice_find_type_by_name(ctx->derive_device_type); > if (type == AV_HWDEVICE_TYPE_NONE) { > av_log(avctx, AV_LOG_ERROR, "Invalid device type.\n"); > err = AVERROR(EINVAL); > goto fail; > } > + } else { > + type = av_hwdevice_get_type_by_pix_fmt(outlink->format); > + if (type == AV_HWDEVICE_TYPE_NONE) { > + av_log(avctx, AV_LOG_ERROR, "Could not get device type > from " > + "format %s.\n", > av_get_pix_fmt_name(outlink->format)); > + err = AVERROR(EINVAL); > + goto fail; > + } > + } > > + if (!device || ctx->derive_device_type) { > err = av_hwdevice_ctx_create_derived(&device, type, > - hwfc->device_ref, 0); > + hwfc->device_ref, 0); > if (err < 0) { > av_log(avctx, AV_LOG_ERROR, "Failed to created derived " > - "device context: %d.\n", err); > + "device context: %d.\n", err); > Looks like mixed re-indentation and functional changes in same commit. > goto fail; > } > device_is_derived = 1; > -- > 2.35.1.windows.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". >
On Thu, Jun 30, 2022 at 4:47 AM Tong Wu <tong1.wu-at-intel.com@ffmpeg.org<mailto:tong1.wu-at-intel.com@ffmpeg.org>> wrote:
When a derive_device_type is not specified, the hwmap filter should be
able to retrieve AVHWDeviceType from outlink->format and create
corresponding hwdevice context.
Signed-off-by: Tong Wu <tong1.wu@intel.com<mailto:tong1.wu@intel.com>>
---
libavfilter/vf_hwmap.c | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git a/libavfilter/vf_hwmap.c b/libavfilter/vf_hwmap.c
index 2e03dfc1fe..136980c982 100644
--- a/libavfilter/vf_hwmap.c
+++ b/libavfilter/vf_hwmap.c
@@ -70,23 +70,32 @@ static int hwmap_config_output(AVFilterLink *outlink)
device_is_derived = 0;
if (inlink->hw_frames_ctx) {
+ enum AVHWDeviceType type;
hwfc = (AVHWFramesContext*)inlink->hw_frames_ctx->data;
if (ctx->derive_device_type) {
- enum AVHWDeviceType type;
-
type = av_hwdevice_find_type_by_name(ctx->derive_device_type);
if (type == AV_HWDEVICE_TYPE_NONE) {
av_log(avctx, AV_LOG_ERROR, "Invalid device type.\n");
err = AVERROR(EINVAL);
goto fail;
}
+ } else {
+ type = av_hwdevice_get_type_by_pix_fmt(outlink->format);
+ if (type == AV_HWDEVICE_TYPE_NONE) {
+ av_log(avctx, AV_LOG_ERROR, "Could not get device type from "
+ "format %s.\n", av_get_pix_fmt_name(outlink->format));
+ err = AVERROR(EINVAL);
+ goto fail;
+ }
+ }
+ if (!device || ctx->derive_device_type) {
err = av_hwdevice_ctx_create_derived(&device, type,
- hwfc->device_ref, 0);
+ hwfc->device_ref, 0);
if (err < 0) {
av_log(avctx, AV_LOG_ERROR, "Failed to created derived "
- "device context: %d.\n", err);
+ "device context: %d.\n", err);
Looks like mixed re-indentation and functional changes in same commit.
Yes this should not be re-indented, will update later.
Thanks,
Tong
goto fail;
}
device_is_derived = 1;
--
2.35.1.windows.2
diff --git a/libavfilter/vf_hwmap.c b/libavfilter/vf_hwmap.c index 2e03dfc1fe..136980c982 100644 --- a/libavfilter/vf_hwmap.c +++ b/libavfilter/vf_hwmap.c @@ -70,23 +70,32 @@ static int hwmap_config_output(AVFilterLink *outlink) device_is_derived = 0; if (inlink->hw_frames_ctx) { + enum AVHWDeviceType type; hwfc = (AVHWFramesContext*)inlink->hw_frames_ctx->data; if (ctx->derive_device_type) { - enum AVHWDeviceType type; - type = av_hwdevice_find_type_by_name(ctx->derive_device_type); if (type == AV_HWDEVICE_TYPE_NONE) { av_log(avctx, AV_LOG_ERROR, "Invalid device type.\n"); err = AVERROR(EINVAL); goto fail; } + } else { + type = av_hwdevice_get_type_by_pix_fmt(outlink->format); + if (type == AV_HWDEVICE_TYPE_NONE) { + av_log(avctx, AV_LOG_ERROR, "Could not get device type from " + "format %s.\n", av_get_pix_fmt_name(outlink->format)); + err = AVERROR(EINVAL); + goto fail; + } + } + if (!device || ctx->derive_device_type) { err = av_hwdevice_ctx_create_derived(&device, type, - hwfc->device_ref, 0); + hwfc->device_ref, 0); if (err < 0) { av_log(avctx, AV_LOG_ERROR, "Failed to created derived " - "device context: %d.\n", err); + "device context: %d.\n", err); goto fail; } device_is_derived = 1;
When a derive_device_type is not specified, the hwmap filter should be able to retrieve AVHWDeviceType from outlink->format and create corresponding hwdevice context. Signed-off-by: Tong Wu <tong1.wu@intel.com> --- libavfilter/vf_hwmap.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-)