From patchwork Tue Sep 21 04:32:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 30392 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp2071991iob; Mon, 20 Sep 2021 21:32:21 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyNZaFKtEU8S62gY998hMYs1fa9q2T86NYNhWVdImksVUCBhBmQi1feIa4CVV1n6qjrf61M X-Received: by 2002:a17:906:1c89:: with SMTP id g9mr33446606ejh.565.1632198741533; Mon, 20 Sep 2021 21:32:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632198741; cv=none; d=google.com; s=arc-20160816; b=s5qcc/6GUmN97uNiyfh5rPpM12q/OtqKWlL8nB2vIDOFwVlAU27PowzqEWfHQMLK2P mZQnGxPyu+c6ZGCE0y/qXM7kHGJTH5SFRne63wyF1eBk+h1oJiUkbO6J7oDnW4HNJt6Y TK25aC/r3jz61WsG6/hMu7jZoSaU6t25Q4wREBYRg9JrFkcjfyIw21f9uu2Etjz20Xrs kXLb06bO+c3qkwUsTqJQHds1bKQDAl1mf8RgSSwT1DqE46NpFb9t1lsT/wk/7HtqJ+Pz trBzExIsesjUIX1ttUIiaAhdLaGx7HHtnerTZkGODC70d5x5rTqmq3eRI8FatJENzh46 s6Fg== 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:message-id:date:to:from:dkim-signature :delivered-to; bh=FDKXtBteBfqn6e8gg7CDxtuShfQVDCOqnYVlgbkJu64=; b=BFKR9Fhfk1iWRMNhulgUZ6cSt/Zne70fUvNEuAFqdRZiqjvenKEbsCWv98KQi2C/xk Xhqng4pLDxfCgxRGB9CQ2AojG3xZMMv8uYhF/4ZK2ge4+rGzbdt95cmlxYV+jMsZCMpu RhhPsVL/D1Ni0+BK0FKAo5FUUyYKx5fynIXkPBAIN5rOyAMShKkcxsvcWL1q5QRFSoH7 QvZ6AMShTmPcsROGZhzZkx0k/7nqbrd8aTgz0BI1Kc5Z+yB3k2boO9OubUiVKJrP0jYm fgNM6qZWz2eQ/oauGjv0yo73AyDxhP/8FwwSVrhvBMwW2B+8aVwfy2EDbxwvZvZg3aZh kVcA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=JMYhYBbI; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id s4si17412951edy.486.2021.09.20.21.32.21; Mon, 20 Sep 2021 21:32:21 -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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=JMYhYBbI; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E24C168ADAB; Tue, 21 Sep 2021 07:32:17 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f178.google.com (mail-pf1-f178.google.com [209.85.210.178]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 87A6E68AC57 for ; Tue, 21 Sep 2021 07:32:11 +0300 (EEST) Received: by mail-pf1-f178.google.com with SMTP id c1so15349620pfp.10 for ; Mon, 20 Sep 2021 21:32:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id; bh=af+ZeHG4BvtOT8HNKAYKPiq8dWCra6KOxGKEsq9gpwM=; b=JMYhYBbIVg0ZKlUVT+FGWf7faZlNeuC1H+Ff2A1KcfAldI/bgRYCOSiy08xprHp2h1 QvoZFFvlQK0TI8HgezOvHEJllNC3bZ9Wti3ZPGkvtAdyMqnfk/89Z/SpFIMR28pHKN50 p+Bs4BJV55q4JYMKnh5lGXWX72pfbL7yVF4PeKg525vovGxmZmC/tBvSyU2fQ0RAHXhY eb0rhguC2Y6pjBzBp1FhKDv+4DLrWlv4OQUH+Gy+s3rPNGyfpfpDpMr+m3LNY7VtpxzH 9IbzwKC1tgYEMIB/8fLd+B/8OwhxxqLmC4s7mMTz01Zg1O7EzsjZkO6pYyiRKWLuwfLf Zfkg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=af+ZeHG4BvtOT8HNKAYKPiq8dWCra6KOxGKEsq9gpwM=; b=18ac9NiKUk835DyeNTRzzHYr/Na3qlB/fyv1uWPPfDRIPFvNWDLQc1tZq4/fevHIby HMEvenjPhe+zyJM5cIkjgFRJQGhwl+oujdqSeMmJShmdr34OhkDF2R4wWx6fBu8wug1O j9ceVgZ7Zg3tQhZ3T2pchw8nUEV0Y1iXv40hEo4nqgStAx5MELSL8kZmmqyCkJrL51w5 ka+vNsHXYNFOFN081MRWuT7RmRshulQfyo4HxTUJw+Y9aaEc5RyD+HjIxkjQb91GdvUs DVXqORxdDGfi4J0LA4LJTZCbRBzj1hk9q3R8S1cXAjlTUYMxuobSGpdVSEQWqpTGzfXt WneQ== X-Gm-Message-State: AOAM531fY+hyGap5wDx57i6nTkInW+DvMz6iuVocRe8k0jzeFGwlxMY6 zF6RYjqaM6TvNxGtYq0h+5OrmI9CYmE= X-Received: by 2002:aa7:8887:0:b0:43c:83fe:2c56 with SMTP id z7-20020aa78887000000b0043c83fe2c56mr28292755pfe.82.1632198729666; Mon, 20 Sep 2021 21:32:09 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id x24sm6670850pge.85.2021.09.20.21.32.08 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 20 Sep 2021 21:32:09 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Tue, 21 Sep 2021 12:32:01 +0800 Message-Id: <1632198725-19424-1-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 Subject: [FFmpeg-devel] [PATCH 1/5] avcodec: remove the unused low_delay X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: NZmzqpaqXTDI From: Limin Wang Signed-off-by: Limin Wang --- libavcodec/h264dec.c | 1 - libavcodec/mpegutils.c | 1 - libavcodec/mpegutils.h | 1 - libavcodec/mpegvideo.c | 2 +- 4 files changed, 1 insertion(+), 4 deletions(-) diff --git a/libavcodec/h264dec.c b/libavcodec/h264dec.c index 5ca41cc..6a5bf51 100644 --- a/libavcodec/h264dec.c +++ b/libavcodec/h264dec.c @@ -944,7 +944,6 @@ static int finalize_frame(H264Context *h, AVFrame *dst, H264Picture *out, int *g out->mb_type, out->qscale_table, out->motion_val, - NULL, out->mb_width, out->mb_height, out->mb_stride, 1); } } diff --git a/libavcodec/mpegutils.c b/libavcodec/mpegutils.c index e5105ec..4cbc474 100644 --- a/libavcodec/mpegutils.c +++ b/libavcodec/mpegutils.c @@ -102,7 +102,6 @@ void ff_draw_horiz_band(AVCodecContext *avctx, void ff_print_debug_info2(AVCodecContext *avctx, AVFrame *pict, uint8_t *mbskip_table, uint32_t *mbtype_table, int8_t *qscale_table, int16_t (*motion_val[2])[2], - int *low_delay, int mb_width, int mb_height, int mb_stride, int quarter_sample) { if ((avctx->export_side_data & AV_CODEC_EXPORT_DATA_MVS) && mbtype_table && motion_val[0]) { diff --git a/libavcodec/mpegutils.h b/libavcodec/mpegutils.h index 5aeff47..0770585 100644 --- a/libavcodec/mpegutils.h +++ b/libavcodec/mpegutils.h @@ -142,7 +142,6 @@ void ff_draw_horiz_band(AVCodecContext *avctx, AVFrame *cur, AVFrame *last, */ void ff_print_debug_info2(AVCodecContext *avctx, AVFrame *pict, uint8_t *mbskip_table, uint32_t *mbtype_table, int8_t *qscale_table, int16_t (*motion_val[2])[2], - int *low_delay, int mb_width, int mb_height, int mb_stride, int quarter_sample); #endif /* AVCODEC_MPEGUTILS_H */ diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 5383f9d..ba5b519 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -1417,7 +1417,7 @@ void ff_mpv_frame_end(MpegEncContext *s) void ff_print_debug_info(MpegEncContext *s, Picture *p, AVFrame *pict) { ff_print_debug_info2(s->avctx, pict, s->mbskip_table, p->mb_type, - p->qscale_table, p->motion_val, &s->low_delay, + p->qscale_table, p->motion_val, s->mb_width, s->mb_height, s->mb_stride, s->quarter_sample); } From patchwork Tue Sep 21 04:32:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 30395 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp2072074iob; Mon, 20 Sep 2021 21:32:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyNP7JDwRxgKFfEJDhCY7XAX9z9FtkbLK/Y+fsNxspaKXVac7wa8a6gXuxFQO16BQcP9vxL X-Received: by 2002:a17:906:a195:: with SMTP id s21mr31653579ejy.181.1632198751894; Mon, 20 Sep 2021 21:32:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632198751; cv=none; d=google.com; s=arc-20160816; b=W36yG5RjxlbThaIWRWkcRYIqxayKmQm5aVkp4VB17o0Gc9FkCJUPHn8NCzFhZyEBol taZF3jAFW4ZXJ4nIDvwzCmdI3OmNgShG1DhzvPmyMI4uLlFXz22IkN9odKkIu4HUTSJs dvRR0wT1pWjSBoY3y3Wbfah/xmjQWJgnHxlI/xaJpxKeApDmS0s52VQtcnxKp+y9W2Q3 Ubm/KADZRcUGZqoqNWXLaPW4/4nSMtWyLeYFu2LI8gRLRUOuykBo7Yq3K48+4C5tNdqn 8nB+QnTdnSartV2x3dalSpcUvKku93d0O+dYzwqMPwHJwiENGcwr3gRYDrmuNO3VlaOu uwDw== 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:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=94QAvC9degcL56we7bSthCUR7utU4bz+EHlvFLzg2xI=; b=ocDC1iv3Y8ZLAs1Pz1Wx3nMjPA1deuUDbAYO4ofXfP7OAM87ovgxFHIsS22m0xBfUS 5DiAF2PojpB+XkA2GMIEI2PefwL83n7XQwqlPV/l041oqrJWxf2hwo4cv/10O5ssF6n6 axQ1S96hc4siSyBhoICpT0QgwxEduFF9hJ8581BanSiaKxhWoA2kcVtn+1MuhrkSI0w9 8glAlVadER2eKn5xrigFDanDTda6addBuw8cuBKcKOYExUHagT0CJlEeEPVZIHLDhkk+ yxuUOkfNs9sm8OaUUjM9oARYKH+4UG4kO5n59AYlRjlJx4tW/DAPHMec9IUnOeMUEcPX YDbg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=LuPcO1sz; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id b7si1343828edm.76.2021.09.20.21.32.30; Mon, 20 Sep 2021 21:32:31 -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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=LuPcO1sz; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C030D68ABD7; Tue, 21 Sep 2021 07:32:20 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f48.google.com (mail-pj1-f48.google.com [209.85.216.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9C13D68ADAB for ; Tue, 21 Sep 2021 07:32:12 +0300 (EEST) Received: by mail-pj1-f48.google.com with SMTP id k23-20020a17090a591700b001976d2db364so1598400pji.2 for ; Mon, 20 Sep 2021 21:32:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=nvSYGQ3BTknwWTfWPNzmR7Ldnwawnrev+dX44AIvlos=; b=LuPcO1sz1qnAnzqg2WDqGHEJ+6sY77WtNLchIL5ckE/BBJOcj1b5KDw673zQf/CJ6v rJYL7vSc125movwikFOxviUVCO4ZqKQ5+Kh7tQEKjDpbLMVqL/Dr6oX+uxCx8iExF9ar PyaeoF6/B6X9gH97Qu8E8UvEmh/KNYLGzcK7ylZ/qqhqfW5hhY4gkHKcCyc2q9k7+ke6 1fzyezDseRMdl4/ujCLtQ4/EraS5KYWn7zOsKQ+yfbEoo+cElSOv2m2XDhmZZ08dWA80 rqu7Z9f25Gb8mJLhulXdBh0v5E0RiuTKSdveOSdcoJkVdmw4Zg61AALpT9MCKPPzqrTC Xyhw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=nvSYGQ3BTknwWTfWPNzmR7Ldnwawnrev+dX44AIvlos=; b=dJ1ZPohhc9+d3abahkl62eKmXtiXkc0e/upXqyV6J2/8FEMTA1eWdMgcw+0Yfn4Ul9 qGRgaDrEDme2Gt+jPvty0vsD5YTwDI8NmIYifFVEwcuMxKOqbatUFYu06Pl4FnYYtBWZ YetNlOZ/ELQQaFPYYosRf7i849kHhaKWg5p7Tu0iGxZOrr8JfRcy52UucScoPRvakF2F RYJRiBrWnC4vNgDASU/M+hqoY0zsXAl4rdsn311nQ3AHIRABkPTUwnA0k/D2GphCPpHv ui17wWEpANxpGBC71tFk1ZEAxSEpOqXQ/fRkeFTBOiPmplmJb/OI8dvrFjGiSHHqwVx3 vyCw== X-Gm-Message-State: AOAM530EKoPg1Q1DBdtFqtxE6b+5NmviiwYaYzN7haIJRzjf4UxLxMsr CxQWswC9qem3S3+8eLYCt8FQKSFWlJc= X-Received: by 2002:a17:902:7d95:b0:13d:a304:1b55 with SMTP id a21-20020a1709027d9500b0013da3041b55mr12204181plm.51.1632198730885; Mon, 20 Sep 2021 21:32:10 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id x24sm6670850pge.85.2021.09.20.21.32.09 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 20 Sep 2021 21:32:10 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Tue, 21 Sep 2021 12:32:02 +0800 Message-Id: <1632198725-19424-2-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1632198725-19424-1-git-send-email-lance.lmwang@gmail.com> References: <1632198725-19424-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/5] avfilter/vf_codecview: added new options for block X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: HJilbm/DxHcW From: Limin Wang Signed-off-by: Limin Wang --- doc/filters.texi | 3 +++ libavfilter/version.h | 2 +- libavfilter/vf_codecview.c | 35 +++++++++++++++++++++++++++++++++++ 3 files changed, 39 insertions(+), 1 deletion(-) diff --git a/doc/filters.texi b/doc/filters.texi index 9416100..9caaf4d 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -8152,6 +8152,9 @@ means. For example, some MPEG based codecs export motion vectors through the The filter accepts the following option: @table @option +@item block +Display block partition structure using the luma plane. + @item mv Set motion vectors to visualize. diff --git a/libavfilter/version.h b/libavfilter/version.h index 24b59ac..2688679 100644 --- a/libavfilter/version.h +++ b/libavfilter/version.h @@ -31,7 +31,7 @@ #define LIBAVFILTER_VERSION_MAJOR 8 #define LIBAVFILTER_VERSION_MINOR 9 -#define LIBAVFILTER_VERSION_MICRO 100 +#define LIBAVFILTER_VERSION_MICRO 101 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ diff --git a/libavfilter/vf_codecview.c b/libavfilter/vf_codecview.c index dc3d3ac..4a2766a 100644 --- a/libavfilter/vf_codecview.c +++ b/libavfilter/vf_codecview.c @@ -32,6 +32,7 @@ #include "libavutil/imgutils.h" #include "libavutil/motion_vector.h" #include "libavutil/opt.h" +#include "libavutil/video_enc_params.h" #include "avfilter.h" #include "qp_table.h" #include "internal.h" @@ -52,6 +53,7 @@ typedef struct CodecViewContext { unsigned mv_type; int hsub, vsub; int qp; + int block; } CodecViewContext; #define OFFSET(x) offsetof(CodecViewContext, x) @@ -73,6 +75,7 @@ static const AVOption codecview_options[] = { CONST("if", "I-frames", FRAME_TYPE_I, "frame_type"), CONST("pf", "P-frames", FRAME_TYPE_P, "frame_type"), CONST("bf", "B-frames", FRAME_TYPE_B, "frame_type"), + { "block", "set block partitioning structure to visualize", OFFSET(block), AV_OPT_TYPE_BOOL, {.i64=0}, 0, 1, FLAGS }, { NULL } }; @@ -210,6 +213,21 @@ static void draw_arrow(uint8_t *buf, int sx, int sy, int ex, draw_line(buf, sx, sy, ex, ey, w, h, stride, color); } +static void draw_block_rectangle(uint8_t *buf, int sx, int sy, int w, int h, int stride, int color) +{ + for (int x = sx; x < sx + w; x++) + buf[x] = color; + + for (int y = sy; y < sy + h; y++) { + buf[sx] = color; + buf[sx + w - 1] = color; + buf += stride; + } + + for (int x = sx; x < sx + w; x++) + buf[x] = color; +} + static int filter_frame(AVFilterLink *inlink, AVFrame *frame) { AVFilterContext *ctx = inlink->dst; @@ -247,6 +265,23 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) av_freep(&qp_table); } + if (s->block) { + AVFrameSideData *sd = av_frame_get_side_data(frame, AV_FRAME_DATA_VIDEO_ENC_PARAMS); + if (sd) { + AVVideoEncParams *par = (AVVideoEncParams*)sd->data; + const int stride = frame->linesize[0]; + + if (par->nb_blocks) { + for (int block_idx = 0; block_idx < par->nb_blocks; block_idx++) { + AVVideoBlockParams *b = av_video_enc_params_block(par, block_idx); + uint8_t *buf = frame->data[0] + b->src_y * stride; + + draw_block_rectangle(buf, b->src_x, b->src_y, b->w, b->h, stride, 100); + } + } + } + } + if (s->mv || s->mv_type) { AVFrameSideData *sd = av_frame_get_side_data(frame, AV_FRAME_DATA_MOTION_VECTORS); if (sd) { From patchwork Tue Sep 21 04:32:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 30394 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp2072146iob; Mon, 20 Sep 2021 21:32:40 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxOKNQwHOmwqgpueFAw5Dfc5udxojWO3qvDz5KRKHnNQhw0lvkq0PEAVEDwe/7b1F5c5JfJ X-Received: by 2002:a17:906:8a41:: with SMTP id gx1mr34156838ejc.507.1632198760748; Mon, 20 Sep 2021 21:32:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632198760; cv=none; d=google.com; s=arc-20160816; b=iCy/h464RauU5eMCb7QO85+kYDzsJk8UkpiTdOlKfTzSV3qLR5tVzfiC0XDrYZXsVL vQNIjWt9IHmy/TmiIhn+rWO+w+clMaltHJDWPpNGYREZOEBfVTzreGydTxGMfw768PIm WwJAlEsUlBmknrFP21rmEMwdq/5Lijea/VCCo2xmBQwmPMDuCbY8fZudGVhvqdvP+7V6 oaH2evsAcTCPMV4AthUWQw7Zpoq8v2+wBEaSTDus43PT0loZYBfO3ThggY8zCLVzFebH LYn47pd5KGdLh+5AUNDVzZujBHY6mPO0GMB+aBgIpFgVmYKCvF8jMleIazTEfLN2LwZW pi7Q== 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:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=+gNhCWg8hQzVHNOGDZF0RNaC0ZKzlE9oeDJXH9763yU=; b=R//KfqJHAXykcPgcCPj+uqKIukPq5VoaCHJAjis9O0kRXJsQVpzPV1qCmaXU3O2xA9 F0R2lr7CGxh7JB15r8Rmx/tFnDrrNQvkaNe2jklBCdfWjSECL4OhcmelsfzyNShFpi6e SH1sBS8ps+0Z1AgsNhTN7ZecZmq1VtSTsJRvuoneL8lLNw7lMdXPFsNnHGPgeZHULZXi XR2rg1FIBqRyZUcWOLcwzwZi15YadWUt6KXL7KOdw3vyWCJcKvGb74CUIYwTyLw7Yyd5 nFfj4Z0/TlQsYbCLLz/P9flRwzNSxHKYPJf330+0m9bLUid3O2whC6o5xoUwMf0UD+5t yioQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b="VL/xpwVr"; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id i8si11890283ejo.354.2021.09.20.21.32.40; Mon, 20 Sep 2021 21:32:40 -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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b="VL/xpwVr"; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9740C68AED8; Tue, 21 Sep 2021 07:32:21 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 110B968ABD7 for ; Tue, 21 Sep 2021 07:32:14 +0300 (EEST) Received: by mail-pl1-f178.google.com with SMTP id y1so5585564plk.10 for ; Mon, 20 Sep 2021 21:32:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=fLbrnFwkf6rqnNypNa93NmldfsmUim8K5uTb+3UmWNs=; b=VL/xpwVrx7EBnHYGus7chfYrMXX58+qwv23TLfGV8WUFkkpVsIWkfn8kToVtWGK8Jz jvyRKbZHJ7gS3Th4BRFa6QA/shkC3xaHBTOQcfw4srSq/dpg4T6AG7x+2RyRgSWiDVIW oyOwBIX1AE22bb8aT4zqflvDh7CQPFisoMn1zFm3Dzz/425EfmE4hGnCYWBkshgZeVKm 6641/s2X/HOdT+3g9rmhMeA5ZDLvOAsL2f/FekHr8gue4kttNKEFVqis0f54uuvxzIt9 cpMt8XjZdM7gIDgoy3fF9pKJ1bAnH+VFmz5Pa7YRiWXyCJwxYh8mPh2obPifOT5qbz6P Z23g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=fLbrnFwkf6rqnNypNa93NmldfsmUim8K5uTb+3UmWNs=; b=xyLTuPDY6LTqPOM12eYOOFYuHKMM2vH13uHj8JYUHkqUatH4onVjB5VJxKbp/ltBud Oh+Mznqveg7FqV0iM4KHfc9qhNKOiBuZrVig944UiftiPVcOapxRpsJmVtZ/zxqf0oyz ahdjBOpHxK9hO8XZxVPSwMGUtRU+tLQ67yGADDlL1m4PtG1ll/qOB8C0jxlU9SeSsgDb w70YKuh9te0r/MjTUF7p8PqBksPyTjr+FT9/F8C/0Aq9O/qMTOT0WPILVi2zhhFZ/Q+B gg0fcbdJwS+5ndtZhon7GqG3mTYNSiFCssKteXmO0GNgnlhx9pb0tEq+mmU8fdX3VCh2 jrNQ== X-Gm-Message-State: AOAM533LtQ/mJ7NpZHJsAlphs2DOjqUv6RAV10kmhEBOKtvCqA32YlVN mFJY87gNWP5WVy1+ImHr8MgQp8ZlAD4= X-Received: by 2002:a17:902:7b84:b0:13b:90a7:e270 with SMTP id w4-20020a1709027b8400b0013b90a7e270mr25696479pll.21.1632198732160; Mon, 20 Sep 2021 21:32:12 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id x24sm6670850pge.85.2021.09.20.21.32.11 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 20 Sep 2021 21:32:11 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Tue, 21 Sep 2021 12:32:03 +0800 Message-Id: <1632198725-19424-3-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1632198725-19424-1-git-send-email-lance.lmwang@gmail.com> References: <1632198725-19424-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH 3/5] avfilter/vf_guided: Fix indention X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: T3v8c/5jesFF From: Limin Wang Signed-off-by: Limin Wang --- libavfilter/vf_guided.c | 77 ++++++++++++++++++++++++------------------------- 1 file changed, 38 insertions(+), 39 deletions(-) diff --git a/libavfilter/vf_guided.c b/libavfilter/vf_guided.c index f808ba1..066a00d 100644 --- a/libavfilter/vf_guided.c +++ b/libavfilter/vf_guided.c @@ -110,19 +110,19 @@ static int box_slice(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs) w = (radius << 1) + 1; numPix = w * w; for (int i = slice_start;i < slice_end;i++) { - for (int j = 0;j < width;j++) { - float temp = 0.0; - for (int row = -radius;row <= radius;row++) { - for (int col = -radius;col <= radius;col++) { - int x = i + row; - int y = j + col; - x = (x < 0) ? 0 : (x >= height ? height - 1 : x); - y = (y < 0) ? 0 : (y >= width ? width - 1 : y); - temp += src[x * src_stride + y]; - } + for (int j = 0;j < width;j++) { + float temp = 0.0; + for (int row = -radius;row <= radius;row++) { + for (int col = -radius;col <= radius;col++) { + int x = i + row; + int y = j + col; + x = (x < 0) ? 0 : (x >= height ? height - 1 : x); + y = (y < 0) ? 0 : (y >= width ? width - 1 : y); + temp += src[x * src_stride + y]; + } + } + dst[i * dst_stride + j] = temp / numPix; } - dst[i * dst_stride + j] = temp / numPix; - } } return 0; } @@ -161,8 +161,7 @@ static int config_input(AVFilterLink *inlink) if (s->mode == BASIC) { s->sub = 1; - } - else if (s->mode == FAST) { + } else if (s->mode == FAST) { if (s->radius >= s->sub) s->radius = s->radius / s->sub; else { @@ -235,13 +234,13 @@ static int guided_##name(AVFilterContext *ctx, GuidedContext *s, goto end; \ } \ for (int i = 0;i < h;i++) { \ - for (int j = 0;j < w;j++) { \ - int x = i * w + j; \ - I[x] = src[(i * src_stride + j) * sub] / maxval; \ - II[x] = I[x] * I[x]; \ - P[x] = srcRef[(i * src_ref_stride + j) * sub] / maxval; \ - IP[x] = I[x] * P[x]; \ - } \ + for (int j = 0;j < w;j++) { \ + int x = i * w + j; \ + I[x] = src[(i * src_stride + j) * sub] / maxval; \ + II[x] = I[x] * I[x]; \ + P[x] = srcRef[(i * src_ref_stride + j) * sub] / maxval; \ + IP[x] = I[x] * P[x]; \ + } \ } \ \ t.width = w; \ @@ -262,13 +261,13 @@ static int guided_##name(AVFilterContext *ctx, GuidedContext *s, ff_filter_execute(ctx, s->box_slice, &t, NULL, FFMIN(h, nb_threads)); \ \ for (int i = 0;i < h;i++) { \ - for (int j = 0;j < w;j++) { \ - int x = i * w + j; \ - float varI = meanII[x] - (meanI[x] * meanI[x]); \ - float covIP = meanIP[x] - (meanI[x] * meanP[x]); \ - A[x] = covIP / (varI + eps); \ - B[x] = meanP[x] - A[x] * meanI[x]; \ - } \ + for (int j = 0;j < w;j++) { \ + int x = i * w + j; \ + float varI = meanII[x] - (meanI[x] * meanI[x]); \ + float covIP = meanIP[x] - (meanI[x] * meanP[x]); \ + A[x] = covIP / (varI + eps); \ + B[x] = meanP[x] - A[x] * meanI[x]; \ + } \ } \ \ t.src = A; \ @@ -279,11 +278,11 @@ static int guided_##name(AVFilterContext *ctx, GuidedContext *s, ff_filter_execute(ctx, s->box_slice, &t, NULL, FFMIN(h, nb_threads)); \ \ for (int i = 0;i < height;i++) { \ - for (int j = 0;j < width;j++) { \ - int x = i / sub * w + j / sub; \ - dst[i * dst_stride + j] = meanA[x] * src[i * src_stride + j] + \ - meanB[x] * maxval; \ - } \ + for (int j = 0;j < width;j++) { \ + int x = i / sub * w + j / sub; \ + dst[i * dst_stride + j] = meanA[x] * src[i * src_stride + j] + \ + meanB[x] * maxval; \ + } \ } \ end: \ av_freep(&I); \ @@ -321,13 +320,13 @@ static int filter_frame(AVFilterContext *ctx, AVFrame **out, AVFrame *in, AVFram continue; } if (s->depth <= 8) - guided_byte(ctx, s, in->data[plane], ref->data[plane], (*out)->data[plane], s->radius, s->eps, - s->planewidth[plane], s->planeheight[plane], - in->linesize[plane], ref->linesize[plane], (*out)->linesize[plane], (1 << s->depth) - 1.f); + guided_byte(ctx, s, in->data[plane], ref->data[plane], (*out)->data[plane], s->radius, s->eps, + s->planewidth[plane], s->planeheight[plane], + in->linesize[plane], ref->linesize[plane], (*out)->linesize[plane], (1 << s->depth) - 1.f); else - guided_word(ctx, s, in->data[plane], ref->data[plane], (*out)->data[plane], s->radius, s->eps, - s->planewidth[plane], s->planeheight[plane], - in->linesize[plane] / 2, ref->linesize[plane] / 2, (*out)->linesize[plane] / 2, (1 << s->depth) - 1.f); + guided_word(ctx, s, in->data[plane], ref->data[plane], (*out)->data[plane], s->radius, s->eps, + s->planewidth[plane], s->planeheight[plane], + in->linesize[plane] / 2, ref->linesize[plane] / 2, (*out)->linesize[plane] / 2, (1 << s->depth) - 1.f); } return 0; From patchwork Tue Sep 21 04:32:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 30393 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp2072255iob; Mon, 20 Sep 2021 21:32:51 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw6TjIryekgWFoniJOBhIRQjvquiCvgoW+eNT3hmrehln1AhH2BT+BLExKLPUZeNRXyZe7c X-Received: by 2002:a17:906:a08d:: with SMTP id q13mr32368589ejy.465.1632198770830; Mon, 20 Sep 2021 21:32:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632198770; cv=none; d=google.com; s=arc-20160816; b=MVwug7xr9Nhis5m8v9x7tPLE3Cykj4+Apa8J1Zw4yrAPePrQP7vZMhE8dFVxur4dCV 1F+oJHD25F+sZV/AqMTfplB9NtfR2FenL1YA4uak/KXJ+D/8K6psEQ9MNclcS/H2T6SS MBPM0PP3rj7HLOrudbbVdKKiUPMUy06BDOLk91UYAqfjX7/arWOWmLuYogafvO9loe0u 5lHVMV5zkamqcY0U4cudAUqcu5AjcPCDoWkLH8QbS82PtKbl8GkPBMqvvTf6IBK4F/Sj r1p06mHeUSer+EahheE7XgVjp3AaLd5rTteJAZwhuq6At7CP8gyrYrt1KyliuZ2yRwMb kfCA== 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:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=2ECrT17dcbeiXKkuSMcI36cRN8npS+N9ydWPjj8EgSE=; b=Rs4omgVIzgBURfMNxa9RnY4ZFORyOiuxzHygdiKMmD5bdmRz/6FivdHxqluSTb6i0J U4MhrqTsC6+7KJc/loYwGWX1Bsu4DEdIy9yUv18TLVswsF2noQ/fea0XUcBSuVKSejRN lBYyyaa0iCNH88sd3B2mon3OEYDwHM4pF+H6PZwRnpsEtc876SYhbi5swcpN4gD1D2TN hyxvp3CgS+yXH5Wbl1s65oB6+ItvH9PqbyG5laef/mYKlzjIMGl/53BJ1MAUH0z4guUw o0N5NjX4ALA71wfhCyHLUJcbZoPZi0Mv1RLfcENUK2jthwL3dRcURtLPENceVfUcX/bs 6F1Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=QmG0ON6Y; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id x13si14634416edl.539.2021.09.20.21.32.50; Mon, 20 Sep 2021 21:32:50 -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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=QmG0ON6Y; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 98A0F68AF48; Tue, 21 Sep 2021 07:32:22 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f41.google.com (mail-pj1-f41.google.com [209.85.216.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 497AC68AC57 for ; Tue, 21 Sep 2021 07:32:15 +0300 (EEST) Received: by mail-pj1-f41.google.com with SMTP id il14-20020a17090b164e00b0019c7a7c362dso1209444pjb.0 for ; Mon, 20 Sep 2021 21:32:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=hPEApF3Kz+ZxZCnGcOfep/dzf0/MwklnPNo+YX6MEU0=; b=QmG0ON6YMHd8i1u0ftql284vy3ER7rXKiyuuraqL+CuhjtlRYyaS4ONj+o8SV14LVH 318l2hT3GKte+NOOY9GdawBaEZAJB4oa1xDTGZjKQ3SWsG97YBRP6yNSlOVP3c6iKTY6 TvN0e64aFvUxtBxSB59Y2iWQBJfwME3MeXhwbG5eQSvIGBYyBURFEtFBggQkiSXSkluC ADKMawP6FF7x4ad6lfddT9o9C4UmiDM6BLFYnPSaEVsl8PnU57HPAs5owpJD+88/30M9 x7Azj7tguUrjZGiT5WFIzZp7y0nyp7JDSDnWRhNDGPon9DobMr3YqUq5yCo31AZ1ZUd/ 1aWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=hPEApF3Kz+ZxZCnGcOfep/dzf0/MwklnPNo+YX6MEU0=; b=io8btxUJdQFoF3Ozal0vJ0qAHL6fFlOJgAebFZyDTAhakpYNTwb27oaFyXazNCanT4 CQPnFiF+KzycQA4tquIEa7CzWPDHF06DZmZGouGUDDpZq+DyvVHEZnyPFORHOEKlvVcU tuwjqwnKXxtKa1PSgM0H2NGCz/l/DoKET+KFA8A6G8RPnjSTRhmtYtQv6WNxD5nzAn/C Qmm7YKVt9jnulST6ZIbmFmddcpbbjhFAp9Fy12bG53oIta3a/mYkAYc2kFA9EG03bNDH vBBSmytB3EUeViC5Ye9WaAxRgHalxl6oPIrobTFbWwQW9Q4Y+90UOpkM4ysiwiv8qE4c A0pQ== X-Gm-Message-State: AOAM530rHKKNUApc7WM52mkn8nMF3fINZIptYDfS2lSzxlVIrPkqQDYB ZQP3YOrOWebPB1iczqiLKwmzfciPE04= X-Received: by 2002:a17:902:8543:b029:12d:461f:a6a8 with SMTP id d3-20020a1709028543b029012d461fa6a8mr25732176plo.1.1632198733379; Mon, 20 Sep 2021 21:32:13 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id x24sm6670850pge.85.2021.09.20.21.32.12 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 20 Sep 2021 21:32:13 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Tue, 21 Sep 2021 12:32:04 +0800 Message-Id: <1632198725-19424-4-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1632198725-19424-1-git-send-email-lance.lmwang@gmail.com> References: <1632198725-19424-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH 4/5] avformat/utils: add const for argument passed to ff_is_http_proto() X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: WPgQ8OHh4gYH From: Limin Wang Signed-off-by: Limin Wang --- libavformat/internal.h | 2 +- libavformat/utils.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/internal.h b/libavformat/internal.h index cc8c8f4..6f1f1c0 100644 --- a/libavformat/internal.h +++ b/libavformat/internal.h @@ -907,7 +907,7 @@ void ff_format_io_close(AVFormatContext *s, AVIOContext **pb); * @param s AVFormatContext * @param filename URL or file name to open for writing */ -int ff_is_http_proto(char *filename); +int ff_is_http_proto(const char *filename); /** * Parse creation_time in AVFormatContext metadata if exists and warn if the diff --git a/libavformat/utils.c b/libavformat/utils.c index 2157f93..509c0ec 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -1802,7 +1802,7 @@ void ff_format_io_close(AVFormatContext *s, AVIOContext **pb) *pb = NULL; } -int ff_is_http_proto(char *filename) { +int ff_is_http_proto(const char *filename) { const char *proto = avio_find_protocol_name(filename); return proto ? (!av_strcasecmp(proto, "http") || !av_strcasecmp(proto, "https")) : 0; } From patchwork Tue Sep 21 04:32:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 30391 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp2072377iob; Mon, 20 Sep 2021 21:33:01 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyR4NXIhHsSWEEgwaZcjlwrR3xOVSg0cKgfRq8CHiB9X7ZYKGUUSxbHn6PvVRNrLgygCKBF X-Received: by 2002:a17:906:6b93:: with SMTP id l19mr33143911ejr.26.1632198781057; Mon, 20 Sep 2021 21:33:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632198781; cv=none; d=google.com; s=arc-20160816; b=yan7n0+naNuKUMZ5oTpY6XyK0u5838LRxrNyTJcJ3DC+k2g+n0ItLcii4JPIF8W+mk 5fRbgOzRxiDC8MuNutlwA+gMpxLuMZ6f7oE6fnOs2qjHuDUp2zXSywkfGkiFqKhizj2a xaSIgMQXQvO3XprbSf5vfFXm+chTr52egUbDeUNnUaFpFjG3AW8joBTDQws37XT711gT e91Oixt8PAVJ3R3AJ8syUIr1/ddECEYECTvZstxVrJjCQlRUVTZCELsIZiIRZpqnKLZR +m2LPgT+jkP549rnSwQjOYWYVD5ldh2RqG0u3UVMhi9dqAay3/r9UzYsaUZ9KUp3mnzY Mi7Q== 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:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=l/0QpY7Qdbl2WERQDqEOrC7Wx/sacDa5SQc3RVr1B5Q=; b=REHBTHr2fIevebBpywf32NhrE7RCcVs2VtqMPMqzfV0HWee5Azg2fZJrIKDqOG/o0F gyr/2cYzswvNBHTwsJObW7/oc1+upnWkC5s1XSxtDudBwfV/iBNinOCWdMpa4zVldF8E D/Ao+wFadDzvzSDL/BJdZtPaXq3A68kxkWjc5dtFqdobTTcKYoknea+Dwjtzyd0qC5Tw ovq7HneBaD6P2e1hY7LY+Pr4SJm4m8Tyh2NnIgVOSyOZ0FW6S1YYK/Y2f3+pXHtfmlZL lSLB+/E2myCxl+NVDZ423gXe177v7ejryMupnxthTOE4w1ebhJj2Pv9RMjvsI7FFwIYK 66RQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=FUirnzDg; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id hy9si18686793ejc.37.2021.09.20.21.33.00; Mon, 20 Sep 2021 21:33:01 -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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=FUirnzDg; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9B9E768AD93; Tue, 21 Sep 2021 07:32:23 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f50.google.com (mail-pj1-f50.google.com [209.85.216.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4FC2568AEA7 for ; Tue, 21 Sep 2021 07:32:16 +0300 (EEST) Received: by mail-pj1-f50.google.com with SMTP id k23-20020a17090a591700b001976d2db364so1598465pji.2 for ; Mon, 20 Sep 2021 21:32:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=OaS5Y5nvACA7Nrju9AWQBoFrNA9YEpxdw6Y0yzt3zmQ=; b=FUirnzDgZCm7Z86NjETwHLGhjkwG76jhC3BcRTODb3teqLZhI8qoZb7vDxNs3z9ZjX mMn4i1Qj18ehg950xSEck/74PHi8ITzBJjFoAaBQvx18hTfu8HQnfQd9bY8bbmxYDt5W 7KrOrkKPjAhE4y3E4zzNSf6o3hCc78SEdGXkGgXe8LaDReHinodFfl7OAtggx5+KCfYo Z6f7MzTiP0XAOk8a0GWSNVz9+Xu89RRLSh6TnnRmV3SpGvTtCcPvkmAt3qUHC/9QB0ZQ FKxqOy3c4Gz6VHn9mjdLl7UG6Jc+kVBflY6m0GqMzrWHdg1njhkGgmRdxEzSh3fMjgrI lZrA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=OaS5Y5nvACA7Nrju9AWQBoFrNA9YEpxdw6Y0yzt3zmQ=; b=MIwO7irTrshTpxzdx5AZOi1sKNHToWMxxgyxCdX9R3X+1TkcTdHyrYS4af0v6CBlMw LtGSWBV+8lmunGd1mO2pKcPSjx0tkRFCXjDmJkdRzJPph238uOczf8IdRHjeBpEQmsiu 1vz4xAuvmQGu66PBnOwaINYCYqhdtkT24TkbrxVnwzTj7EFvv/9rYJjdAoc2w5qpZjlJ HoaUsJM2XRIr/CndvdsciMzTD8d3PzW728KcSXDb6ZH+lTn7U1tnnmCJT+OhW38gMNuk pDTTSxe+DdvsHdP4bVJj9bOUGPzMMV9xqLKSjddzaJ+QjCyiviA9I8rDS1OEaSc7g6Aw pKMw== X-Gm-Message-State: AOAM533HgbC1I5EoBWDNsPKGIkLibHiLlciLS0Bfuczz8LrzOvoUYAtt BK3cQqGySKRe0T0cHyjnShMl8VZWKl4= X-Received: by 2002:a17:902:ead4:b0:13d:a0a5:9588 with SMTP id p20-20020a170902ead400b0013da0a59588mr12886165pld.86.1632198734558; Mon, 20 Sep 2021 21:32:14 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id x24sm6670850pge.85.2021.09.20.21.32.13 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 20 Sep 2021 21:32:14 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Tue, 21 Sep 2021 12:32:05 +0800 Message-Id: <1632198725-19424-5-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1632198725-19424-1-git-send-email-lance.lmwang@gmail.com> References: <1632198725-19424-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH 5/5] avformat/hlsenc: add const for filename argument X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 3XDB84Z3gPfZ From: Limin Wang Signed-off-by: Limin Wang --- libavformat/hlsenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index 7c37bc5..98608a8 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -281,7 +281,7 @@ static int strftime_expand(const char *fmt, char **dest) return r; } -static int hlsenc_io_open(AVFormatContext *s, AVIOContext **pb, char *filename, +static int hlsenc_io_open(AVFormatContext *s, AVIOContext **pb, const char *filename, AVDictionary **options) { HLSContext *hls = s->priv_data;