From patchwork Mon Jan 16 01:03:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Sabatini X-Patchwork-Id: 40027 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1d43:b0:b8:6755:f97e with SMTP id cs3csp678867pzb; Sun, 15 Jan 2023 17:03:49 -0800 (PST) X-Google-Smtp-Source: AMrXdXslmLE1uV2qfyRyP9rY1Qf7fw2qJ8BvBRnELnjoU9gSrvspi2dneTw9UUx91oZnluKcYaB2 X-Received: by 2002:a05:6402:3222:b0:49e:1d53:5e20 with SMTP id g34-20020a056402322200b0049e1d535e20mr261053eda.23.1673831029535; Sun, 15 Jan 2023 17:03:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673831029; cv=none; d=google.com; s=arc-20160816; b=CXOR+RNvEVVU3+VPydeOjr9b1V5D4aNNGSrn1M3CUi043SsanovIe6+zYp5/75m2Pv VQkI5AGVzEixxPHD+9QGcZfzrQOZ32xVWAK1A8SDcgohJ91TWjVDp2tAMM/mKHfGBfd9 bvP1pWUBnpxwbaaPXEoUyfUXDrgoIXPBrqJlYKungeob/fLAmcmq5qJaJOaf06NR4Sn8 uq7cthVxETssXVboQYENFVtjH8JDrIpqp9LYhHeGpsEn+87Ft0N/iKIbeotFdMbkxsiD l+F0pXUgzzmB0JJd37aCa4x/D3NaFf9/9jaW8BkPzCg3Vi1pwkNfGvf+lSSE/TMvfE5D H8Iw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=IRTAbADdljd7oYtQmSLSyRsIT8sFlvVLI+pO41EGBbc=; b=xvlErY0PBJB7ekHljndzpkZhuU6CJNdHfr95obAcQG6gY1UYdvpHFvn77NhOrXwDGb egOb/KfOnaYl9Ot/S1DZbMkwy3Wn1lT6E51GfK4uuxVjV728DZL0A5oPyRQoIfjl1Ow9 6HyrV4YOYVbDeQC+KjNn+uhP1GmfKHFtCD9C7NlkR+cn4h5T5g9hciBFUJSb8gN24kud +vcQs1+mrHZwS0ZSC8akLk6g/L7ep46xtesaJ2EtvcqPIrcS4ifjMGTrCFfTqmgrNw2T 5/Sot9jTcJ3BM6s21R7Smlxfx6urq7pNcbW3wGYc50YS7oZQr+gqc0GhMxYztFPPmeFy wH+w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=prxP5Nik; 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 nd8-20020a170907628800b007807e1f3d9dsi29623897ejc.842.2023.01.15.17.03.49; Sun, 15 Jan 2023 17:03:49 -0800 (PST) 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=prxP5Nik; 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 B915768BD25; Mon, 16 Jan 2023 03:03:37 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f50.google.com (mail-ej1-f50.google.com [209.85.218.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0AE0C6801DD for ; Mon, 16 Jan 2023 03:03:29 +0200 (EET) Received: by mail-ej1-f50.google.com with SMTP id ss4so57347506ejb.11 for ; Sun, 15 Jan 2023 17:03:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=1SjA4KT4+g3wB8g8I5VUUlbxTzgMDoyUiLrt93pH70Y=; b=prxP5NikcXWwiix0vsb6TB4fpWFKlS5wrxnbCLQy5pke3Em5KmsTGTQfcQ6S6gM/ZK p6mZrFOf0yAoq21OAl0+G/TQTZgGVwRXYAiE0ZEHnsoQqViXSngQ6jTiAgZqDswcFuSI HEaiRYedC2E2w7bfLqcnuy07xhKMH+ypbdqzPZ+o3gSCC0S7SLTRYcIYMaV3yvpd2bLc tR5Xt2wrqKT6UWm4X6fMzzqXfcdv6HE7Kai8PbF40lzoDVlOhog2Otsu7jibOVZoCpcM GYv0bvOp64U/Ys43tdQeFGtHNclf3a8yh+SdM8xoB4mlrIV0h3w4bDYdUMjkNOpL1wia rX9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=1SjA4KT4+g3wB8g8I5VUUlbxTzgMDoyUiLrt93pH70Y=; b=zMSTXksM0lnMicFGSqDgWbtfNmHf7PNfwD4y3YzuVg/s0wDLSJUiVri3ziLMB7azir tLAW8p5obmVFIsHv6m1l9G/g/aMQIWhP0vxWHESDftOzipUfvGirs1+vAp16/H+51/EJ khzTrRYLpANjqwkay+2TeJuJR4dGuztMXZIYIIn6E9Rkc9d4ptf+cigjGxUQYQfst5Fa 6eNB/XLgvpDoPO0xdQk6ippI1+AOh/ts/mkqT04YFIDFfpPuFIz/MrP/vIS0ulAd1Rxa twz72ntSHh6cH1hCtwNoBmqFGPmG3+Pf1liQSsa1lwWivV3DH/JlN5DUMh/4OdyUqd9w bX0A== X-Gm-Message-State: AFqh2kr7RceNN7GrZe7Ugp4FgwU5Q6AEbgZyAdW6LUE2xbNw8wSSr9jF CCS7f7tPOVwLWaVnKUiy0GMTzUcztSw= X-Received: by 2002:a17:907:628d:b0:86a:316:d107 with SMTP id nd13-20020a170907628d00b0086a0316d107mr16467551ejc.72.1673831007719; Sun, 15 Jan 2023 17:03:27 -0800 (PST) Received: from mariano ([82.84.225.92]) by smtp.gmail.com with ESMTPSA id q1-20020a17090676c100b007c0d4d3a0c1sm11253850ejn.32.2023.01.15.17.03.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Jan 2023 17:03:26 -0800 (PST) Received: by mariano (Postfix, from userid 1000) id 58A34BFB73; Mon, 16 Jan 2023 02:03:25 +0100 (CET) From: Stefano Sabatini To: FFmpeg development discussions and patches Date: Mon, 16 Jan 2023 02:03:24 +0100 Message-Id: <20230116010325.614034-1-stefasab@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] lavfi/astats: sort measures keys by name 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: Stefano Sabatini Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: bNjMjAWu+lWF --- libavfilter/af_astats.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/libavfilter/af_astats.c b/libavfilter/af_astats.c index 8755ab8752..f3f2bd743b 100644 --- a/libavfilter/af_astats.c +++ b/libavfilter/af_astats.c @@ -119,31 +119,31 @@ static const AVOption astats_options[] = { { "measure_perchannel", "Select the parameters which are measured per channel", OFFSET(measure_perchannel), AV_OPT_TYPE_FLAGS, {.i64=MEASURE_ALL}, 0, UINT_MAX, FLAGS, "measure" }, { "none" , "", 0, AV_OPT_TYPE_CONST, {.i64=MEASURE_NONE }, 0, 0, FLAGS, "measure" }, { "all" , "", 0, AV_OPT_TYPE_CONST, {.i64=MEASURE_ALL }, 0, 0, FLAGS, "measure" }, + { "Bit_depth" , "", 0, AV_OPT_TYPE_CONST, {.i64=MEASURE_BIT_DEPTH }, 0, 0, FLAGS, "measure" }, + { "Crest_factor" , "", 0, AV_OPT_TYPE_CONST, {.i64=MEASURE_CREST_FACTOR }, 0, 0, FLAGS, "measure" }, { "DC_offset" , "", 0, AV_OPT_TYPE_CONST, {.i64=MEASURE_DC_OFFSET }, 0, 0, FLAGS, "measure" }, - { "Min_level" , "", 0, AV_OPT_TYPE_CONST, {.i64=MEASURE_MIN_LEVEL }, 0, 0, FLAGS, "measure" }, - { "Max_level" , "", 0, AV_OPT_TYPE_CONST, {.i64=MEASURE_MAX_LEVEL }, 0, 0, FLAGS, "measure" }, - { "Min_difference" , "", 0, AV_OPT_TYPE_CONST, {.i64=MEASURE_MIN_DIFFERENCE }, 0, 0, FLAGS, "measure" }, + { "Dynamic_range" , "", 0, AV_OPT_TYPE_CONST, {.i64=MEASURE_DYNAMIC_RANGE }, 0, 0, FLAGS, "measure" }, + { "Entropy" , "", 0, AV_OPT_TYPE_CONST, {.i64=MEASURE_ENTROPY }, 0, 0, FLAGS, "measure" }, + { "Flat_factor" , "", 0, AV_OPT_TYPE_CONST, {.i64=MEASURE_FLAT_FACTOR }, 0, 0, FLAGS, "measure" }, { "Max_difference" , "", 0, AV_OPT_TYPE_CONST, {.i64=MEASURE_MAX_DIFFERENCE }, 0, 0, FLAGS, "measure" }, + { "Max_level" , "", 0, AV_OPT_TYPE_CONST, {.i64=MEASURE_MAX_LEVEL }, 0, 0, FLAGS, "measure" }, { "Mean_difference" , "", 0, AV_OPT_TYPE_CONST, {.i64=MEASURE_MEAN_DIFFERENCE }, 0, 0, FLAGS, "measure" }, - { "RMS_difference" , "", 0, AV_OPT_TYPE_CONST, {.i64=MEASURE_RMS_DIFFERENCE }, 0, 0, FLAGS, "measure" }, + { "Min_difference" , "", 0, AV_OPT_TYPE_CONST, {.i64=MEASURE_MIN_DIFFERENCE }, 0, 0, FLAGS, "measure" }, + { "Min_level" , "", 0, AV_OPT_TYPE_CONST, {.i64=MEASURE_MIN_LEVEL }, 0, 0, FLAGS, "measure" }, + { "Noise_floor" , "", 0, AV_OPT_TYPE_CONST, {.i64=MEASURE_NOISE_FLOOR }, 0, 0, FLAGS, "measure" }, + { "Noise_floor_count" , "", 0, AV_OPT_TYPE_CONST, {.i64=MEASURE_NOISE_FLOOR_COUNT }, 0, 0, FLAGS, "measure" }, + { "Number_of_Infs" , "", 0, AV_OPT_TYPE_CONST, {.i64=MEASURE_NUMBER_OF_INFS }, 0, 0, FLAGS, "measure" }, + { "Number_of_NaNs" , "", 0, AV_OPT_TYPE_CONST, {.i64=MEASURE_NUMBER_OF_NANS }, 0, 0, FLAGS, "measure" }, + { "Number_of_denormals" , "", 0, AV_OPT_TYPE_CONST, {.i64=MEASURE_NUMBER_OF_DENORMALS }, 0, 0, FLAGS, "measure" }, + { "Number_of_samples" , "", 0, AV_OPT_TYPE_CONST, {.i64=MEASURE_NUMBER_OF_SAMPLES }, 0, 0, FLAGS, "measure" }, + { "Peak_count" , "", 0, AV_OPT_TYPE_CONST, {.i64=MEASURE_PEAK_COUNT }, 0, 0, FLAGS, "measure" }, { "Peak_level" , "", 0, AV_OPT_TYPE_CONST, {.i64=MEASURE_PEAK_LEVEL }, 0, 0, FLAGS, "measure" }, + { "RMS_difference" , "", 0, AV_OPT_TYPE_CONST, {.i64=MEASURE_RMS_DIFFERENCE }, 0, 0, FLAGS, "measure" }, { "RMS_level" , "", 0, AV_OPT_TYPE_CONST, {.i64=MEASURE_RMS_LEVEL }, 0, 0, FLAGS, "measure" }, { "RMS_peak" , "", 0, AV_OPT_TYPE_CONST, {.i64=MEASURE_RMS_PEAK }, 0, 0, FLAGS, "measure" }, { "RMS_trough" , "", 0, AV_OPT_TYPE_CONST, {.i64=MEASURE_RMS_TROUGH }, 0, 0, FLAGS, "measure" }, - { "Crest_factor" , "", 0, AV_OPT_TYPE_CONST, {.i64=MEASURE_CREST_FACTOR }, 0, 0, FLAGS, "measure" }, - { "Flat_factor" , "", 0, AV_OPT_TYPE_CONST, {.i64=MEASURE_FLAT_FACTOR }, 0, 0, FLAGS, "measure" }, - { "Peak_count" , "", 0, AV_OPT_TYPE_CONST, {.i64=MEASURE_PEAK_COUNT }, 0, 0, FLAGS, "measure" }, - { "Bit_depth" , "", 0, AV_OPT_TYPE_CONST, {.i64=MEASURE_BIT_DEPTH }, 0, 0, FLAGS, "measure" }, - { "Dynamic_range" , "", 0, AV_OPT_TYPE_CONST, {.i64=MEASURE_DYNAMIC_RANGE }, 0, 0, FLAGS, "measure" }, { "Zero_crossings" , "", 0, AV_OPT_TYPE_CONST, {.i64=MEASURE_ZERO_CROSSINGS }, 0, 0, FLAGS, "measure" }, { "Zero_crossings_rate" , "", 0, AV_OPT_TYPE_CONST, {.i64=MEASURE_ZERO_CROSSINGS_RATE }, 0, 0, FLAGS, "measure" }, - { "Noise_floor" , "", 0, AV_OPT_TYPE_CONST, {.i64=MEASURE_NOISE_FLOOR }, 0, 0, FLAGS, "measure" }, - { "Noise_floor_count" , "", 0, AV_OPT_TYPE_CONST, {.i64=MEASURE_NOISE_FLOOR_COUNT }, 0, 0, FLAGS, "measure" }, - { "Entropy" , "", 0, AV_OPT_TYPE_CONST, {.i64=MEASURE_ENTROPY }, 0, 0, FLAGS, "measure" }, - { "Number_of_samples" , "", 0, AV_OPT_TYPE_CONST, {.i64=MEASURE_NUMBER_OF_SAMPLES }, 0, 0, FLAGS, "measure" }, - { "Number_of_NaNs" , "", 0, AV_OPT_TYPE_CONST, {.i64=MEASURE_NUMBER_OF_NANS }, 0, 0, FLAGS, "measure" }, - { "Number_of_Infs" , "", 0, AV_OPT_TYPE_CONST, {.i64=MEASURE_NUMBER_OF_INFS }, 0, 0, FLAGS, "measure" }, - { "Number_of_denormals" , "", 0, AV_OPT_TYPE_CONST, {.i64=MEASURE_NUMBER_OF_DENORMALS }, 0, 0, FLAGS, "measure" }, { "measure_overall", "Select the parameters which are measured overall", OFFSET(measure_overall), AV_OPT_TYPE_FLAGS, {.i64=MEASURE_ALL}, 0, UINT_MAX, FLAGS, "measure" }, { NULL } };