From patchwork Wed Dec 9 09:53:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 24450 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 4F36744A93C for ; Wed, 9 Dec 2020 11:53:41 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2696B68A107; Wed, 9 Dec 2020 11:53:41 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F1424689FB2 for ; Wed, 9 Dec 2020 11:53:34 +0200 (EET) Received: by mail-wm1-f68.google.com with SMTP id y23so980028wmi.1 for ; Wed, 09 Dec 2020 01:53:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=ZisKO8vkb5x1btZe9Vfu5gVT30fVkG/WXZPFviS4ehc=; b=sa/sRL0zZqOFLzkh5/5XwUf1ytwSZEhf+qnnZktrVpxNmGXEr7b1j2di/DK8Sx0BNu 6wkJhGf6f5gOpHxDCL7TXNnz+JutF31PU3D00MlAsrPmOePoQXY9RD14ThCLhH2YPPs3 SPjnz8QbgryYJ52rtZueoRi//OwoF1TIyt9IyDjrUpA2FnDbXmo6VgITmWHOoRe3T5aJ xFEgrcA4cTGyWJnyzVgJjpY3x1VolqyTDNkWvRqfiaEhtCD4uGohZQLTr7x6V4qQPdk/ dbRDzpQJI0d/Da4cKDZ+XH3/Re86t3rNUmwNbJEK/cEVyg/7FMn2ABFPulg06jojbFgk yw2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=ZisKO8vkb5x1btZe9Vfu5gVT30fVkG/WXZPFviS4ehc=; b=AUz/rUIjdLUBPYwKt8PH0ug1/gYD5EVoQiQ6ytg4HFV7KBRhgGkENwr4843+58mzlr oLin7kqn+7t2kjRKzxvS9sl7XOxiNwW+yTKdvLFrrrMSpkS98ptRUHw0EKZqUKF/Dc87 /tqICGuZ8ei506KbqRyV1oQsPvveH7rdfIsei3lLsmiwWkF3H9dWuu3Yil6Tj+do0T7M 1kVOlkvsK9x73DR4FkLhIEK6Vyumjyxtnw12u7i70OtFFJ4YiQ/7dQMLh8HZbWuy8dsi Jpehzw3jD2ANFkwOBl0A1CkzuWSfDmKk9aJUPV3ctQT9Ht11qeA9rcyIFOY5l+DdIn0c HRGw== X-Gm-Message-State: AOAM532MWh+Hzhn3og7TwSM1WzEFUMox1NjD+TvHS/MsxP0Zn66MaCM2 c3CGBjdUnI6n0qlvpUtiNJClCozM6Lks+A== X-Google-Smtp-Source: ABdhPJwHDiAfj+rvyq8/OHxrWcFWXbdFQfo67bo+QzvZ+Wy1iO5UnrHke70//hfok//GijN2gxN2zw== X-Received: by 2002:a1c:7909:: with SMTP id l9mr1822350wme.120.1607507614286; Wed, 09 Dec 2020 01:53:34 -0800 (PST) Received: from localhost.localdomain ([49.51.162.193]) by smtp.gmail.com with ESMTPSA id g184sm2319725wma.16.2020.12.09.01.53.33 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 09 Dec 2020 01:53:33 -0800 (PST) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Wed, 9 Dec 2020 17:53:08 +0800 Message-Id: <1607507590-19938-1-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 2.7.4 Subject: [FFmpeg-devel] [PATCH 1/3] tests/audiomatch: add free to make static analysis tools happy 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: Jun Zhao MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Jun Zhao Signed-off-by: Jun Zhao --- tests/audiomatch.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/tests/audiomatch.c b/tests/audiomatch.c index bb9deca..56a60bd 100644 --- a/tests/audiomatch.c +++ b/tests/audiomatch.c @@ -82,9 +82,9 @@ int main(int argc, char **argv) { signal = malloc(siglen * sizeof(*signal)); if (fread(data , 1, datlen, f[0]) != datlen) - return 1; + goto read_fail; if (fread(signal, 1, siglen, f[1]) != siglen) - return 1; + goto read_fail; datlen /= 2; siglen /= 2; @@ -111,5 +111,12 @@ int main(int argc, char **argv) { } printf("presig: %d postsig:%d c:%7.4f lenerr:%d\n", bestpos, datlen - siglen - bestpos, bestc / sigamp, datlen - siglen); + free(data); + free(signal); return 0; + +read_fail: + free(data); + free(signal); + return 1; } From patchwork Wed Dec 9 09:53:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 24451 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 986BC44A93C for ; Wed, 9 Dec 2020 11:53:42 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7716768A276; Wed, 9 Dec 2020 11:53:42 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A062C689FB5 for ; Wed, 9 Dec 2020 11:53:35 +0200 (EET) Received: by mail-wm1-f67.google.com with SMTP id y23so980068wmi.1 for ; Wed, 09 Dec 2020 01:53:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=H52HuLPncRvOcMXjRGAmuJBSkXjhbKFEWTmLJD7SUyI=; b=WR/+xu098iagqJDiL1GnK0RrCtO1boN2MsgBePIIBk3riiD7JT7hkRfKb3yqG/P6CU vmcBvQ5Z0ZKaiLoRByfQ7IK/nZO0kn4sY6CFinYivLbsXOb6U2lMAiOjIHXMRk9URa1E aoi/VKfMfrWHAQgtYyBwcpbYVZDHJoT6dXdP8NlniWrWKrFF9Wh4kGj/OtSjmCSRakZp gv5T6YRjNsn9H0jyGIsCjZRHLSS6Nh+vPyjDNrxmbUBvueZ1MDvjstwY07zNwEOTnlY4 Sgr+N8v92JiSwnerpYJTjVP5MRj9E9WfNxPDmRuvZnQjhpc6IsqkPXAx4zhVlJsaSauf 76vg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=H52HuLPncRvOcMXjRGAmuJBSkXjhbKFEWTmLJD7SUyI=; b=TIo7UhEGBWu4eeWfLkZA836ONOim9ZcaV8ygA/wvXpl00zeAcqeni3DixgiCR/V4ZI iDYlPO5/XUQwk94Gpqf73miOL0TTZIXUfTDGz2UrTcIkQdvQJV172/EJ5l6AFcK47tZN kNexPW3cfymIIuwbLCHhFHIO2Z77RMKejNUgceJB+izenkbd1Wp7p/y0kEc9TIfOd2KW ciQxGhbHKeS+G8kY58HvLyiuHVeBpEBY42c9LhbWAcEF/kMDd+Or89m57dZC/V3MvhBW nPJP5OHaUEllLCBpxNTuHqjcMEnYwRLNmLO/LtgE3NYCGeXQS+cucSyh96zKT+QSfMcz M35g== X-Gm-Message-State: AOAM532e2dMw4A/EVieg1dgfIRl8D0/Dw2jS+8fEh0tmOGVMoyWs/+Ju XUY9aD0kZ/gBpnIgVHTlm9NAhrCEUSMz6g== X-Google-Smtp-Source: ABdhPJw095aZ9HMPJhCVjJi+ye7+9Hl24v0TrrVlF8sy3i2ZWgffDCaDKrhWfWqYZg/fGWWWo4dfPg== X-Received: by 2002:a1c:7c19:: with SMTP id x25mr1880582wmc.94.1607507614943; Wed, 09 Dec 2020 01:53:34 -0800 (PST) Received: from localhost.localdomain ([49.51.162.193]) by smtp.gmail.com with ESMTPSA id g184sm2319725wma.16.2020.12.09.01.53.34 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 09 Dec 2020 01:53:34 -0800 (PST) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Wed, 9 Dec 2020 17:53:09 +0800 Message-Id: <1607507590-19938-2-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1607507590-19938-1-git-send-email-mypopydev@gmail.com> References: <1607507590-19938-1-git-send-email-mypopydev@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/3] lavfi/dnn: used the format name in debug message 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: Jun Zhao MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Jun Zhao Used the format name in debug message. Signed-off-by: Jun Zhao --- libavfilter/dnn/dnn_io_proc.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libavfilter/dnn/dnn_io_proc.c b/libavfilter/dnn/dnn_io_proc.c index 8ce1959..db13d7f 100644 --- a/libavfilter/dnn/dnn_io_proc.c +++ b/libavfilter/dnn/dnn_io_proc.c @@ -70,7 +70,8 @@ DNNReturnType proc_from_dnn_to_frame(AVFrame *frame, DNNData *output, void *log_ sws_freeContext(sws_ctx); return DNN_SUCCESS; default: - av_log(log_ctx, AV_LOG_ERROR, "do not support frame format %d\n", frame->format); + av_log(log_ctx, AV_LOG_ERROR, "do not support frame format %s\n", + av_get_pix_fmt_name(frame->format)); return DNN_ERROR; } @@ -127,7 +128,8 @@ DNNReturnType proc_from_frame_to_dnn(AVFrame *frame, DNNData *input, void *log_c sws_freeContext(sws_ctx); break; default: - av_log(log_ctx, AV_LOG_ERROR, "do not support frame format %d\n", frame->format); + av_log(log_ctx, AV_LOG_ERROR, "do not support frame format %s\n", + av_get_pix_fmt_name(frame->format)); return DNN_ERROR; } From patchwork Wed Dec 9 09:53:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 24452 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id A66B744A93C for ; Wed, 9 Dec 2020 11:53:45 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 90D1B68A0EA; Wed, 9 Dec 2020 11:53:45 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 78FA3689FB2 for ; Wed, 9 Dec 2020 11:53:36 +0200 (EET) Received: by mail-wr1-f68.google.com with SMTP id k14so1038443wrn.1 for ; Wed, 09 Dec 2020 01:53:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=okdtJVZcQIL+fT/ZfQ7T7MUZJIIu9Z6wKgN2KdfXn+4=; b=G6Ld2/RlFcEWZOvTqnDBumbe6XTIscaus2KtMpGEy+b4nT24Z0Yr+b84tfRFcaOb/g ZsyvKWNHu8GxiZLWcAJ40LmEXMpKxx9WovMlGFkb1IvyPcs819MuDHRxh246D2vp4FHb nomW5OPx/DOtWNHAfRG8dCFa6RjYttGKPp1cZvk7vLIBLJ0I7V+A2c1HqJmAzTtHj8Td 3izfdogAUlTsBR/ojm73WwsxDqEzjvsNM8BteMFGAwwaOcJ2DR1/y5dRA9o1jd086eHO 0enqm6WdFgv35iT8fVLDtKWfh8fgPjfDYqaVQQYyA5hV/62X6G/GBpfiWZpI/mxuoDbp m7Xg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=okdtJVZcQIL+fT/ZfQ7T7MUZJIIu9Z6wKgN2KdfXn+4=; b=kHNfqVXFh4DyClirMzrqd7nvTUFLdmG6xY6P69/SS8DnFcVKWuIY5aXPITT4Ab8Sx2 ylLRG/vmXTn+/VaS41PLYt5LndIWbr3Z7v8BxhhPKDy0nm7pP2qCUI154qStPGIU38ey tq/rckkndAgtcQOlA304PQNbb8ScO3wTtN1rRtCWXxRAfzBli00oCopnYDBLsh/LHZ1+ ThxIYqy4k3n5Ldc18n8iPJ3WAD9v7d5VqFOsLkD4D6ot/mXrSE6b69mUFJ9Jo2RJt2ao On8qYQWRV2ScHTqyNRW8k3mRtzWiLSK0UoqBbxvlDro2NU1wzh/PgXcxcyF1lBnKpkQk zSow== X-Gm-Message-State: AOAM532V9RF4GMwLVkROcAWWeV+vvu3RAArBTDdwX3xLx5WYAh9aqZrx RebL6VfUDUmrQfWRoCecr0psQP7dfmvjRQ== X-Google-Smtp-Source: ABdhPJwCEdrK45cDLGrIyfWFmUE+8o304OQFbRfYdCRHy4swXlnA+G1VyX2mBb3Rpl1YnSHFfJ6Wjg== X-Received: by 2002:a5d:44cf:: with SMTP id z15mr1696767wrr.205.1607507615733; Wed, 09 Dec 2020 01:53:35 -0800 (PST) Received: from localhost.localdomain ([49.51.162.193]) by smtp.gmail.com with ESMTPSA id g184sm2319725wma.16.2020.12.09.01.53.34 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 09 Dec 2020 01:53:35 -0800 (PST) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Wed, 9 Dec 2020 17:53:10 +0800 Message-Id: <1607507590-19938-3-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1607507590-19938-1-git-send-email-mypopydev@gmail.com> References: <1607507590-19938-1-git-send-email-mypopydev@gmail.com> Subject: [FFmpeg-devel] [PATCH 3/3] lavfi/dnn: check the return value from sws_getContext 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: Jun Zhao MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Jun Zhao sws_getContext may be return NULL, and it's will be dereferenced, so add the check. Signed-off-by: Jun Zhao --- libavfilter/dnn/dnn_io_proc.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/libavfilter/dnn/dnn_io_proc.c b/libavfilter/dnn/dnn_io_proc.c index db13d7f..c9b49be 100644 --- a/libavfilter/dnn/dnn_io_proc.c +++ b/libavfilter/dnn/dnn_io_proc.c @@ -41,6 +41,13 @@ DNNReturnType proc_from_dnn_to_frame(AVFrame *frame, DNNData *output, void *log_ frame->height, AV_PIX_FMT_GRAY8, 0, NULL, NULL, NULL); + if (!sws_ctx) { + av_log(log_ctx, AV_LOG_ERROR, "Impossible to create scale context for the conversion " + "fmt:%s s:%dx%d -> fmt:%s s:%dx%d\n", + av_get_pix_fmt_name(AV_PIX_FMT_GRAYF32), frame->width * 3, frame->height, + av_get_pix_fmt_name(AV_PIX_FMT_GRAY8), frame->width * 3, frame->height); + return DNN_ERROR; + } sws_scale(sws_ctx, (const uint8_t *[4]){(const uint8_t *)output->data, 0, 0, 0}, (const int[4]){frame->width * 3 * sizeof(float), 0, 0, 0}, 0, frame->height, (uint8_t * const*)frame->data, frame->linesize); @@ -64,6 +71,13 @@ DNNReturnType proc_from_dnn_to_frame(AVFrame *frame, DNNData *output, void *log_ frame->height, AV_PIX_FMT_GRAY8, 0, NULL, NULL, NULL); + if (!sws_ctx) { + av_log(log_ctx, AV_LOG_ERROR, "Impossible to create scale context for the conversion " + "fmt:%s s:%dx%d -> fmt:%s s:%dx%d\n", + av_get_pix_fmt_name(AV_PIX_FMT_GRAYF32), frame->width, frame->height, + av_get_pix_fmt_name(AV_PIX_FMT_GRAY8), frame->width, frame->height); + return DNN_ERROR; + } sws_scale(sws_ctx, (const uint8_t *[4]){(const uint8_t *)output->data, 0, 0, 0}, (const int[4]){frame->width * sizeof(float), 0, 0, 0}, 0, frame->height, (uint8_t * const*)frame->data, frame->linesize); @@ -97,6 +111,13 @@ DNNReturnType proc_from_frame_to_dnn(AVFrame *frame, DNNData *input, void *log_c frame->height, AV_PIX_FMT_GRAYF32, 0, NULL, NULL, NULL); + if (!sws_ctx) { + av_log(log_ctx, AV_LOG_ERROR, "Impossible to create scale context for the conversion " + "fmt:%s s:%dx%d -> fmt:%s s:%dx%d\n", + av_get_pix_fmt_name(AV_PIX_FMT_GRAY8), frame->width * 3, frame->height, + av_get_pix_fmt_name(AV_PIX_FMT_GRAYF32),frame->width * 3, frame->height); + return DNN_ERROR; + } sws_scale(sws_ctx, (const uint8_t **)frame->data, frame->linesize, 0, frame->height, (uint8_t * const*)(&input->data), @@ -121,6 +142,13 @@ DNNReturnType proc_from_frame_to_dnn(AVFrame *frame, DNNData *input, void *log_c frame->height, AV_PIX_FMT_GRAYF32, 0, NULL, NULL, NULL); + if (!sws_ctx) { + av_log(log_ctx, AV_LOG_ERROR, "Impossible to create scale context for the conversion " + "fmt:%s s:%dx%d -> fmt:%s s:%dx%d\n", + av_get_pix_fmt_name(AV_PIX_FMT_GRAY8), frame->width, frame->height, + av_get_pix_fmt_name(AV_PIX_FMT_GRAYF32),frame->width, frame->height); + return DNN_ERROR; + } sws_scale(sws_ctx, (const uint8_t **)frame->data, frame->linesize, 0, frame->height, (uint8_t * const*)(&input->data),