From patchwork Mon Sep 24 03:35:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Steven X-Patchwork-Id: 10466 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:1286:0:0:0:0:0 with SMTP id 6-v6csp2040762jap; Sun, 23 Sep 2018 20:35:52 -0700 (PDT) X-Google-Smtp-Source: ACcGV61KOuGEEpkTU50hsZlI2fPzD5ewT6puRI3k8BjPFN+5AR+V7boIoB37MRuo82xQqqlkrE/D X-Received: by 2002:adf:ed04:: with SMTP id a4-v6mr6938325wro.262.1537760152024; Sun, 23 Sep 2018 20:35:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537760151; cv=none; d=google.com; s=arc-20160816; b=z1Z7ivYlCDZdhxDNcqYctI//39DH5WYG2N+wInZuXWaqqB9WYOHXycfL/skXVbgSLk lXTc5qDBXeMUkMC+nN5zXXbRpfFdvTT4p1DNlIH7Gx50PiCfmOdo91OjBDhRGAn72xOo Ry+9eJjtZDoXrHYmPPxozlckG8hoaTPkuY9u9cncmvY0wg4BertZbZ8XLF3BH0nISgYH OPZhD4Y5+YfNMAwOH22pixrXkOX7lKTIzz2o+Eyb0PxUHJUScwiCA0+vjtaLicEJJj/h sxzXz0tE0NUmfrExOtsLKSedUVdo36rYz0LPX9mLzu9OEpo7XLCNacCIhp15ruAm2yD4 JZJw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:feedback-id:message-id:date:to:from :delivered-to; bh=+77qoqQklAMbZLtPcuKU/VF4dvEwQJfDqdXeElS/++w=; b=M3aypVrRIibGGSEo5j8fLis2+K7oC/RLmLclJcrdgkbRK8ymaYyYHKIO5kNXvEbWAs nGkd9ZWtJZhQt2VsqHoSQ7B13uUxlFC5ypViaQQlhqoufLDzt/gR/Pn+X2Q1YXEBDaSP A38d0N8irhnhbzBDxVIyX1gYKwhuTadecs2Lz55bBkEkEOUABWSBGi1nbEpMjOTjKB/y HsyRfgENHtjh6zNtjn5ylkLW0ICTKkkhqQsF0ZtwGKi0r209FFMez2efvhLgHyx1MEQT Y/0oJZrcetfhmEcQP2KMBXOWbzgM2QQWcsqV6KMznHvHaHshp0SWpJCtwSssa8u0+L8I RKEw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id s1-v6si2647787wmd.103.2018.09.23.20.35.51; Sun, 23 Sep 2018 20:35:51 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 163F268A1F2; Mon, 24 Sep 2018 06:35:34 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from smtpproxy19.qq.com (smtpproxy19.qq.com [184.105.206.84]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8F61B68A0ED for ; Mon, 24 Sep 2018 06:35:25 +0300 (EEST) X-QQ-mid: bizesmtp12t1537760131t640yyrg Received: from localhost (unknown [47.90.47.25]) by esmtp6.qq.com (ESMTP) with id ; Mon, 24 Sep 2018 11:35:30 +0800 (CST) X-QQ-SSF: 01100000004000F0FMF1B00A0000000 X-QQ-FEAT: nSUdqPGu3tttfgNu70TmG64ychLKAHoCgFBhsTQ7bIp2tPyCI0CFIFkLk419n eSAlQHCOSqT3oz2yR68cNg/Lt/SORlkzTr9LpW3HwSM9W7jIKHt3BqSsQoEIdFCXWlRW9iU Neg4ldRtOe2q3WMr6CNnfGK58Lr1iJZuZgLvklk4zWSDlNHDzEmrl6YXTYatE3MrJgD+x8b 9s6+reFCrRFF4qEMWKjQ7oeN5dnOpRy0wubvqVPUqyngA/ESREjRsAy3kGKUV1Gso3kQeK/ OEOdiJ6res4LwT1d7ow0aFc2AON/z8r4hGMQ== X-QQ-GoodBg: 0 From: Steven Liu To: ffmpeg-devel@ffmpeg.org Date: Mon, 24 Sep 2018 11:35:28 +0800 Message-Id: <20180924033528.28815-1-lq@chinaffmpeg.org> X-Mailer: git-send-email 2.10.1.382.ga23ca1b.dirty X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:chinaffmpeg.org:qybgforeign:qybgforeign1 X-QQ-Bgrelay: 1 Subject: [FFmpeg-devel] [PATCH] avfilter/sr: process and output message when load_model is NULL X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Steven Liu MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" fix ticket: 7455 Signed-off-by: Steven Liu --- libavfilter/dnn_interface.c | 4 ++++ libavfilter/vf_sr.c | 7 ++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/libavfilter/dnn_interface.c b/libavfilter/dnn_interface.c index 78d7c5cf22..792c280c53 100644 --- a/libavfilter/dnn_interface.c +++ b/libavfilter/dnn_interface.c @@ -52,6 +52,10 @@ DNNModule *ff_get_dnn_module(DNNBackendType backend_type) av_freep(&dnn_module); return NULL; #endif + default: + av_log(NULL, AV_LOG_ERROR, "Module backend_type is not native or tensorflow\n"); + av_freep(&dnn_module); + return NULL; } return dnn_module; diff --git a/libavfilter/vf_sr.c b/libavfilter/vf_sr.c index 077ccc799c..6423d2ea11 100644 --- a/libavfilter/vf_sr.c +++ b/libavfilter/vf_sr.c @@ -75,7 +75,12 @@ static av_cold int init(AVFilterContext *context) return AVERROR(EIO); } else{ - sr_context->model = (sr_context->dnn_module->load_model)(sr_context->model_filename); + if (!sr_context->dnn_module->load_model) { + av_log(context, AV_LOG_ERROR, "load_model for network was not specified\n"); + return AVERROR(EIO); + } else { + sr_context->model = (sr_context->dnn_module->load_model)(sr_context->model_filename); + } } if (!sr_context->model){ av_log(context, AV_LOG_ERROR, "could not load DNN model\n");