Revert "avutils/hwcontext: When deriving a hwdevice, search for existing device in both directions"

This reverts commit a4289497755386435783774a4f520eb7fc23cbc9.
There were objections on ML (see
https://ffmpeg.org/pipermail/ffmpeg-devel/2021-December/290530.html)

Signed-off-by: Haihao Xiang <haihao.xiang@intel.com>

1 files changed, 3 insertions, 10 deletions

diff --git a/libavutil/hwcontext_qsv.c b/libavutil/hwcontext_qsv.c
index 91457c9c9e..853fb7f60d 100644
--- a/libavutil/hwcontext_qsv.c
+++ b/libavutil/hwcontext_qsv.c
@@ -274,7 +274,7 @@ static void qsv_frames_uninit(AVHWFramesContext *ctx)
     av_buffer_unref(&s->child_frames_ref);
 }
 
-static void qsv_release_dummy(void *opaque, uint8_t *data)
+static void qsv_pool_release_dummy(void *opaque, uint8_t *data)
 {
 }
 
@@ -287,7 +287,7 @@ static AVBufferRef *qsv_pool_alloc(void *opaque, size_t size)
     if (s->nb_surfaces_used < hwctx->nb_surfaces) {
         s->nb_surfaces_used++;
         return av_buffer_create((uint8_t*)(s->surfaces_internal + s->nb_surfaces_used - 1),
-                                sizeof(*hwctx->surfaces), qsv_release_dummy, NULL, 0);
+                                sizeof(*hwctx->surfaces), qsv_pool_release_dummy, NULL, 0);
     }
 
     return NULL;
@@ -1596,15 +1596,8 @@ static int qsv_device_create(AVHWDeviceContext *ctx, const char *device,
     child_device = (AVHWDeviceContext*)priv->child_device_ctx->data;
 
     impl = choose_implementation(device, child_device_type);
-    ret = qsv_device_derive_from_child(ctx, impl, child_device, 0);
-    if (ret >= 0) {
-        ctx->internal->source_device = av_buffer_ref(priv->child_device_ctx);
-        child_device->internal->derived_devices[ctx->type] = av_buffer_create((uint8_t*)ctx, sizeof(*ctx), qsv_release_dummy, ctx, 0);
-        if (!child_device->internal->derived_devices[ctx->type])
-            return AVERROR(ENOMEM);
-    }
 
-    return ret;
+    return qsv_device_derive_from_child(ctx, impl, child_device, 0);
 }
 
 const HWContextType ff_hwcontext_type_qsv = {