From patchwork Mon Jun 1 11:32:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 20051 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 6030F44B5B3 for ; Mon, 1 Jun 2020 14:32:55 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3E72368819B; Mon, 1 Jun 2020 14:32:55 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A750C687F99 for ; Mon, 1 Jun 2020 14:32:48 +0300 (EEST) Received: by mail-wm1-f51.google.com with SMTP id r9so10350919wmh.2 for ; Mon, 01 Jun 2020 04:32:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=pBAle/Mw7xoHoGCYa9AsFqzVM2I6DPFvWRT2wDM4UYY=; b=uSEOVK7/1br8bqq8VHJ7oQjbE/rKwTXQfcTjfKkWPpybFMZwK0OcyKWLmnT+GipNgC 9hhjDsUfrPlNnK5oIvSsBmrwQ87nkk8ULOXaxQy+deo6SSHNhsdDKnW0va5Klx1JuiVD tc4nY3HdHumL00hwj+5R1pHhYBZ/PBV59eoS518F9fNWdR4NoEu8BH2QcoJR05MlRD/f RMDJcXdb+0ov/fNyFJugWM3PRRCSNInyPg8ErVfdK2n3ykvkE1nHxRWciw3xre/uMwE+ Xd51mNPdgsTp6sJIvERVzZzexSMNVasFlqjAUUtTjUlacShnBcX1Tf4hCZdCntYKc62X 2fXg== 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:mime-version :content-transfer-encoding; bh=pBAle/Mw7xoHoGCYa9AsFqzVM2I6DPFvWRT2wDM4UYY=; b=GN6pdH7i5tnf7qYefspVF/szjSGBk40BE04xkrtO12ID08119sgq2xlyN9CO82Js6O N+0MaxTe2AZqH2RKiSSYFALRR+zVMJtLjRwmIBUpHmxsBNNxhlDmVesE/vLdDx3A8fBf 96JvGsTMUmGIgEhxOnLfj8me+zF2w6hW4oltqi0Pc4CndV18OTCI7L/BnMV3Hh+ylK+M 7LlqRf+QaG1YGnbTHZcaYV+c3K+J2b3d5qxld6trJqyOq2ZowUqHrZTo9MlcEi18MKkc S84PvapPNl+DBalHIXg2JCzSvKk13wrf2tzxomtw+WfNM5hryJEuaK3mcRtdBVVcv8ct JILQ== X-Gm-Message-State: AOAM531tdRzzIx5yC23kZDFsln4EWI6yaUS8i2Xu1CZ+7BCOFCTs39gC 4+CipnEhDMosvfifqeLrDmxajxOL X-Google-Smtp-Source: ABdhPJyvm5XCMjgckdQib/QKnlmoyaWtekqm4TCqR/E57n1Sw3i1HsRvYE/amUNXz10s2S0ZLdr9ig== X-Received: by 2002:a05:600c:21c2:: with SMTP id x2mr21416916wmj.33.1591011167738; Mon, 01 Jun 2020 04:32:47 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id v19sm10278645wml.26.2020.06.01.04.32.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Jun 2020 04:32:47 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 1 Jun 2020 13:32:35 +0200 Message-Id: <20200601113237.15114-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/3] avcodec/encode: Remove ff_alloc_packet 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" It is no longer used anymore. Signed-off-by: Andreas Rheinhardt --- Strange that it has not already been removed earlier. Am I missing something? libavcodec/encode.c | 5 ----- libavcodec/internal.h | 2 -- 2 files changed, 7 deletions(-) diff --git a/libavcodec/encode.c b/libavcodec/encode.c index b850f86d0c..b1784ed050 100644 --- a/libavcodec/encode.c +++ b/libavcodec/encode.c @@ -70,11 +70,6 @@ int ff_alloc_packet2(AVCodecContext *avctx, AVPacket *avpkt, int64_t size, int64 } } -int ff_alloc_packet(AVPacket *avpkt, int size) -{ - return ff_alloc_packet2(NULL, avpkt, size, 0); -} - /** * Pad last frame with silence. */ diff --git a/libavcodec/internal.h b/libavcodec/internal.h index 0e3415d69b..d09c3167ed 100644 --- a/libavcodec/internal.h +++ b/libavcodec/internal.h @@ -250,8 +250,6 @@ void ff_color_frame(AVFrame *frame, const int color[4]); */ int ff_alloc_packet2(AVCodecContext *avctx, AVPacket *avpkt, int64_t size, int64_t min_size); -attribute_deprecated int ff_alloc_packet(AVPacket *avpkt, int size); - /** * Rescale from sample rate to AVCodecContext.time_base. */ From patchwork Mon Jun 1 11:32:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 20052 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 376F9449674 for ; Mon, 1 Jun 2020 14:33:15 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1B6FC689CDF; Mon, 1 Jun 2020 14:33:15 +0300 (EEST) 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 531C0687F99 for ; Mon, 1 Jun 2020 14:33:09 +0300 (EEST) Received: by mail-wr1-f68.google.com with SMTP id j10so11113460wrw.8 for ; Mon, 01 Jun 2020 04:33:09 -0700 (PDT) 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 :mime-version:content-transfer-encoding; bh=ja8DTp70EvKFH/NGK4gf2USvnYZWYQwuM+WckpkqczY=; b=oKs9+GBvSg/5E0KC/MJ1MvytJz2c5iYNWL/2cJmCHUlihHv/qAtzfT1fNdWIl3h4Mb nmn+/bOk2gWHEX5PALwQpvYmarEk+8x3EKkPVEfr2DgITv35yWc7j3vuuXhj1hehrZOO Pio2RLSmepEayxCQXasMmo03wKMjxsxFsBMZ+MkugGsRMVtKggiT0yjcBh4y4/QIKYxF pfuyjxgLejJBujP+ZbLkUug2oW279sgBCqzoboj6QC/kvYlpdbWgB52kQyvzLcv1CQOj gj8ep2oNlJRohMzbUJGcfdbfc8Z38eSXFNQOKZzEsm9eKP7VHIwMhICHMoZvxgsz8O0m cnRg== 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:mime-version:content-transfer-encoding; bh=ja8DTp70EvKFH/NGK4gf2USvnYZWYQwuM+WckpkqczY=; b=VogrL65y1cdu3EYGhF8Ci9bbXMWQYO862aFbKR6TkdQABurEWnJpPhNJVx00d7+To/ STVTnWHygO2W4YsIfLf2UWZgWVgyDXOWBwd7w0UIqHnk2uxZuJyhT/Oy31PnT4M5vV5T KnwVqYOM8yezU6wHWy6qBlajT+fX4oOIVUEwxwsGLB8ljIsHLq0vB1Z6AdmcxzfFmpVQ 2im+HRm5GTWKuUNwpuUxspQcL3gDDyoD42F3QySTcsvCCcVfPBJnmCkvQ8sVlcIu1gzR Qi6lNVWd75SdHKFN0SoKeQOHEzI3uhsVSl7x04prNIrOPeoYndVOwjzGaSe/clHZV2z+ WpgA== X-Gm-Message-State: AOAM530p4oufpv0aW6dqP601C5IaA6bzbskk9/NVMXcHbRafSpixAvbZ utkslMPszWdBWvEbVh6L1NGLv2It X-Google-Smtp-Source: ABdhPJygx1wF4LEhJGEArPSx5MC0LNlroUho5ZWPek7kydHjV9386SYoWKYPPM8H2yHjsWiEDqToog== X-Received: by 2002:a5d:61d0:: with SMTP id q16mr22487424wrv.182.1591011188488; Mon, 01 Jun 2020 04:33:08 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id v19sm10278645wml.26.2020.06.01.04.33.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Jun 2020 04:33:07 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 1 Jun 2020 13:32:36 +0200 Message-Id: <20200601113237.15114-2-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200601113237.15114-1-andreas.rheinhardt@gmail.com> References: <20200601113237.15114-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] avcodec/v4l2_m2m_enc: Avoid ;; 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Inside a function, the second ; in a double ;; is a null statement, but outside of functions a double ;; is simply invalid C that compilers happen to accept. v4l2_m2m_enc.c contained several ;; as a result of macro-expansion. So change the underlying macro so that it doesn't happen any longer. This fixes warnings when compiling with -pedantic: "ISO C does not allow extra ‘;’ outside of a function". Signed-off-by: Andreas Rheinhardt --- libavcodec/v4l2_m2m_enc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/v4l2_m2m_enc.c b/libavcodec/v4l2_m2m_enc.c index a21a7b6c65..32321f392f 100644 --- a/libavcodec/v4l2_m2m_enc.c +++ b/libavcodec/v4l2_m2m_enc.c @@ -417,7 +417,7 @@ static const AVCodecDefault v4l2_m2m_defaults[] = { .defaults = v4l2_m2m_defaults, \ .capabilities = AV_CODEC_CAP_HARDWARE | AV_CODEC_CAP_DELAY, \ .wrapper_name = "v4l2m2m", \ - }; + } M2MENC(mpeg4,"MPEG4", mpeg4_options, AV_CODEC_ID_MPEG4); M2MENC(h263, "H.263", options, AV_CODEC_ID_H263); From patchwork Mon Jun 1 11:32:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 20053 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 53BC9449674 for ; Mon, 1 Jun 2020 14:33:17 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 36BBC6881BA; Mon, 1 Jun 2020 14:33:17 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9FE9068A47E for ; Mon, 1 Jun 2020 14:33:10 +0300 (EEST) Received: by mail-wr1-f51.google.com with SMTP id y17so11098370wrn.11 for ; Mon, 01 Jun 2020 04:33:10 -0700 (PDT) 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 :mime-version:content-transfer-encoding; bh=nilDhe3Nui4BD7Cgs70rjnQ7ISHKeZBhNhDQaOgPAJc=; b=iQrmb0X5YI+o3waDzqw2vuhU5YdS67VCyy83hmXrVQR5RQ+BwyvqlfJdNtWhgdwCYg 4tRxWeEkxtCO+oOsceXyclXBMic9a94+9i0vLRnMrmlMsyXX+30KTd8GzNTC36o4N60g 3m7R3Ul04pY1Mg+1SRHohqxsTtYCH12Ypcox93fkGnT33fE32FE8jmzTdhw6K/5Sg2GT jKtupGpqDRpi4grPVcTABNNefN0G6bVDva7ZtO1GWfGlpssLtYr9c4CtqcTMSsrAE80P lAjwIH0VKqp/gBC+6QuXF5PVfGzYj/6LOFTacVIFd0I3WOym38iVsUxFagRa22WznfIR ilRg== 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:mime-version:content-transfer-encoding; bh=nilDhe3Nui4BD7Cgs70rjnQ7ISHKeZBhNhDQaOgPAJc=; b=OuKM4AxCDLT2RwIdKIfk/nXyVLVpa8zBkeStEnGSLVYO841VNCbn4JkD2km0meSlf0 djiktVDJ1MHywcQYbBl4YQ8Cmtvn56xS/iG3h1WeCvW0TyE0kGzrWbjUrbl5byX5yAGd TkBF8JMk5xDUGruJXNZg6h6Po8PaahC0U5DFDX9F64k06DtpagubrVubuyhGJKRFdg0l fjKyIKEW7Q6XziFhTTqQCiWXleixkwo4BgqFsh5jlEPjJMw7Us5t7Hn7lJynmgei2KfF 3tOLCnon8Ee+Szx/YLb2N+UncoDjGq8/4G/rzGa17seikLRNPYaHaTlTyUW0H4/g3xrq wckw== X-Gm-Message-State: AOAM533XeGPdz9giFn7p+aOfmfS7DwWVeb+018hlfkBSujKkakB19ba7 Ex0vzK8+oxlzoyfGNAvPxeRDlfAA X-Google-Smtp-Source: ABdhPJxHcJMU9uDCPKa+LVOd0sve1Mk6urApvqYreSW1GlEWfmPL8CbmWHPjmOllEoLdhUP0vKV8dg== X-Received: by 2002:adf:aad7:: with SMTP id i23mr13384792wrc.331.1591011189772; Mon, 01 Jun 2020 04:33:09 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id v19sm10278645wml.26.2020.06.01.04.33.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Jun 2020 04:33:09 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 1 Jun 2020 13:32:37 +0200 Message-Id: <20200601113237.15114-3-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200601113237.15114-1-andreas.rheinhardt@gmail.com> References: <20200601113237.15114-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/3] avfilter/vf_lut3d: Fix mixed declaration and code 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_lut3d.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libavfilter/vf_lut3d.c b/libavfilter/vf_lut3d.c index e5d9fcc068..6730a424ce 100644 --- a/libavfilter/vf_lut3d.c +++ b/libavfilter/vf_lut3d.c @@ -261,10 +261,11 @@ static inline float prelut_interp_1d_linear(const Lut3DPreLut *prelut, static inline struct rgbvec apply_prelut(const Lut3DPreLut *prelut, const struct rgbvec *s) { + struct rgbvec c; + if (prelut->size <= 0) return *s; - struct rgbvec c; c.r = prelut_interp_1d_linear(prelut, 0, s->r); c.g = prelut_interp_1d_linear(prelut, 1, s->g); c.b = prelut_interp_1d_linear(prelut, 2, s->b); @@ -975,17 +976,16 @@ static int parse_cinespace(AVFilterContext *ctx, FILE *f) for (int i = 0; i < lut3d->prelut.size; ++i) { float mix = (float) i / (float)(lut3d->prelut.size - 1); - float x = lerpf(in_min[c], in_max[c], mix); + float x = lerpf(in_min[c], in_max[c], mix), a, b; int idx = nearest_sample_index(in_prelut[c], x, 0, prelut_sizes[c]-1); av_assert0(idx + 1 < prelut_sizes[c]); - float a = out_prelut[c][idx + 0]; - float b = out_prelut[c][idx + 1]; + a = out_prelut[c][idx + 0]; + b = out_prelut[c][idx + 1]; mix = x - in_prelut[c][idx]; - float outval = lerpf(a, b, mix); - lut3d->prelut.lut[c][i] = sanitizef(outval); + lut3d->prelut.lut[c][i] = sanitizef(lerpf(a, b, mix)); } } lut3d->scale.r = 1.00f;