From patchwork Mon May 24 09:24:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Valerii Zapodovnikov X-Patchwork-Id: 27934 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp2790931iof; Mon, 24 May 2021 02:25:02 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw2mi/yiwC22wyzp4sZKJBcepya722de8UKzRrmADfVDlTn0d4LJAg6PbcHuGeQVz8DjF0I X-Received: by 2002:aa7:c04e:: with SMTP id k14mr23789358edo.157.1621848302678; Mon, 24 May 2021 02:25:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621848302; cv=none; d=google.com; s=arc-20160816; b=a9UgxN7dhB2E8YQEzApxXMNrF6q9SCI3Nbx7XqoaknJzMmfLphxfhwKdSwRYPYYTAd /9BouzrsrvThnG3sSYJTqHIWJuWJNmRVxQi/ivbR0fvAycqY9jOsf26BjuK8aVVIv0M2 cBEQfFi+Cs11lNSaOVtO/PLVK2E3LpeVsNwmiSKyAVJoW65sqlM6p8s6NEhEypHtCXYl r98sEhzq4odw6wgKnWCISiQogjBlMmnVn5Q+4SAkHQu2H51CkaiQtC8pHXyUfOQWXmNi GdYIvEHELoiK1JR0i+qJmBSaeA/mGCU7czRrf42QSeMFM3/c9b/G5b7lY6weDsL05E12 ndww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding: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=SOxhiryDRHJxNAJL0l5WYqkoCmrmTs3WeqFi6lQohwY=; b=izh26Tzim6oJd8OIgOp26fgotz3OAPNcQUc8NP1ij28tJ873Lfy3d2xUPKZfbikz2B 5v0dxy7YA0nfKq4OQ9IzyDcwQ52BYXkoGOfudNZfUApPcLP9L94X5qlldYp4Fsc1FLdC iIWllVlio30ZoboN7dGwagf+ad3VrVnF8lqqeNPnwSJmfHaCaeYGwRfiing0vNg07oBt bvTbqH8uP7lzDmXrhniLz3uUOaG6Vt/zwG9memSOGKRb1MBuz4sgefZ6V6Nei1Nv3emd f5f9E2ka+Ro4w37YczVTO3J9xTVW3xEEJErb8AhLNa4ENPJQjt29MxWyXwF8GNtXQiP/ 2SFw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=QdRXd9vi; 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 b10si6686601ejq.460.2021.05.24.02.25.02; Mon, 24 May 2021 02:25:02 -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=20161025 header.b=QdRXd9vi; 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 407D5680577; Mon, 24 May 2021 12:24:58 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f178.google.com (mail-lj1-f178.google.com [209.85.208.178]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 18E16680A3D for ; Mon, 24 May 2021 12:24:52 +0300 (EEST) Received: by mail-lj1-f178.google.com with SMTP id v5so32639736ljg.12 for ; Mon, 24 May 2021 02:24:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=egRhP1JmSIOehEu8TK3kRD5tozoPmCAsiAMKYw+v7CM=; b=QdRXd9vi98xxVWadSOxgwNMYxUZKDDoLo5R8Jxasm3bHLz/zH8d+azAXIVqnD5qOzJ k8JP1hIIhQW3Be9s1RlaBsinsqXX8F79EvrpOWi3FOJVGFvrXJ/yboX/I/yt63LXkV0n duqShxqZLSSVbnbzzgPtApGUDfd0vf2fg4Uz0fbhtU3PqJsc0v3VhIICI3tcZvqiCIJB PDPXdz16tA9gcYYG1Xk0jFckQNuqHjtqsD9/RKyd3xCrCS7tiqRkdet1RWMI6NCQUmaj jBjmTPpDGdN52pK6DFLqacxcxPwqAmj0eRQ5GBsVpP/OHh03RAoSoCSURd426nWMC4q0 P71w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=egRhP1JmSIOehEu8TK3kRD5tozoPmCAsiAMKYw+v7CM=; b=T1b6uI0TeLTbUpn+0HNuBAl+MLjDaPn5dHQ3zcb/ZGqSGVFRI1Xz152mqdHE2jRfzC pVF4VVdeMcR7VM09J4K+aTCSJNiI5hXbriorDEACay5FHV3Rb9i+vRrzlxBTXE25F9k6 IHCkoHa6rNk6AuyEohoP2fzc20CdJZFM/e9JvOWqpUtk6lY2LXMVlqGk33+HgVs36HjQ Znpwm9pxkzETihhW1Gd/QuFfAu8gjPJf46ZbaxCDHA4ZBbJc1yKIxIdX5pCtLbXSdNoc fol7NrlbIzIvdohzyKy5G8FFH3fxPHX+SY2QXJmcoEzn3qdOh8Gpc2hyrww/tkCcOhis 1V8w== X-Gm-Message-State: AOAM532VxffSM3J3BWLRLf8TvV5gOIOegIoo2jY+RGJt1DEs/7njsuWl iUiqTvY8SvdX4LoGU1I/H5N8zvnviuqUmQ== X-Received: by 2002:a2e:b8c9:: with SMTP id s9mr16344410ljp.422.1621848290898; Mon, 24 May 2021 02:24:50 -0700 (PDT) Received: from localhost ([2a00:1370:812d:8d4d:b965:d206:5235:139e]) by smtp.gmail.com with ESMTPSA id m12sm1376611lfb.72.2021.05.24.02.24.49 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 24 May 2021 02:24:50 -0700 (PDT) From: Valerii Zapodovnikov To: ffmpeg-devel@ffmpeg.org Date: Mon, 24 May 2021 12:24:49 +0300 Message-Id: <20210524092449.11623-1-val.zapod.vz@gmail.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2] avcodec/j2kenc: fixed help for jpeg2000 dwt53 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: LxVjyWWL1pjx Now with cosmetics and two new defines. --- libavcodec/j2kenc.c | 16 ++++++++-------- libavcodec/jpeg2000.h | 4 ++++ 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/libavcodec/j2kenc.c b/libavcodec/j2kenc.c index 82ad3284b5..4d5022db26 100644 --- a/libavcodec/j2kenc.c +++ b/libavcodec/j2kenc.c @@ -1812,16 +1812,16 @@ static const AVOption options[] = { { "tile_width", "Tile Width", OFFSET(tile_width), AV_OPT_TYPE_INT, { .i64 = 256 }, 1, 1<<30, VE, }, { "tile_height", "Tile Height", OFFSET(tile_height), AV_OPT_TYPE_INT, { .i64 = 256 }, 1, 1<<30, VE, }, { "pred", "DWT Type", OFFSET(pred), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, VE, "pred" }, - { "dwt97int", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = 0 }, INT_MIN, INT_MAX, VE, "pred" }, - { "dwt53", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = 0 }, INT_MIN, INT_MAX, VE, "pred" }, + { "dwt97int", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = JPEG2000_DWT97INT}, INT_MIN, INT_MAX, VE, "pred" }, + { "dwt53", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = JPEG2000_DWT53 }, INT_MIN, INT_MAX, VE, "pred" }, { "sop", "SOP marker", OFFSET(sop), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, VE, }, { "eph", "EPH marker", OFFSET(eph), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, VE, }, - { "prog", "Progression Order", OFFSET(prog), AV_OPT_TYPE_INT, { .i64 = 0 }, JPEG2000_PGOD_LRCP, JPEG2000_PGOD_CPRL, VE, "prog" }, - { "lrcp", NULL, OFFSET(prog), AV_OPT_TYPE_CONST, { .i64 = JPEG2000_PGOD_LRCP }, 0, 0, VE, "prog" }, - { "rlcp", NULL, OFFSET(prog), AV_OPT_TYPE_CONST, { .i64 = JPEG2000_PGOD_RLCP }, 0, 0, VE, "prog" }, - { "rpcl", NULL, OFFSET(prog), AV_OPT_TYPE_CONST, { .i64 = JPEG2000_PGOD_RPCL }, 0, 0, VE, "prog" }, - { "pcrl", NULL, OFFSET(prog), AV_OPT_TYPE_CONST, { .i64 = JPEG2000_PGOD_PCRL }, 0, 0, VE, "prog" }, - { "cprl", NULL, OFFSET(prog), AV_OPT_TYPE_CONST, { .i64 = JPEG2000_PGOD_CPRL }, 0, 0, VE, "prog" }, + { "prog", "Progression Order", OFFSET(prog), AV_OPT_TYPE_INT, { .i64 = 0 }, JPEG2000_PGOD_LRCP, JPEG2000_PGOD_CPRL, VE, "prog" }, + { "lrcp", NULL, OFFSET(prog), AV_OPT_TYPE_CONST, { .i64 = JPEG2000_PGOD_LRCP}, 0, 0, VE, "prog" }, + { "rlcp", NULL, OFFSET(prog), AV_OPT_TYPE_CONST, { .i64 = JPEG2000_PGOD_RLCP}, 0, 0, VE, "prog" }, + { "rpcl", NULL, OFFSET(prog), AV_OPT_TYPE_CONST, { .i64 = JPEG2000_PGOD_RPCL}, 0, 0, VE, "prog" }, + { "pcrl", NULL, OFFSET(prog), AV_OPT_TYPE_CONST, { .i64 = JPEG2000_PGOD_PCRL}, 0, 0, VE, "prog" }, + { "cprl", NULL, OFFSET(prog), AV_OPT_TYPE_CONST, { .i64 = JPEG2000_PGOD_CPRL}, 0, 0, VE, "prog" }, { "layer_rates", "Layer Rates", OFFSET(lr_str), AV_OPT_TYPE_STRING, { .str = NULL }, 0, 0, VE }, { NULL } }; diff --git a/libavcodec/jpeg2000.h b/libavcodec/jpeg2000.h index 612832c872..1a37f0bbbe 100644 --- a/libavcodec/jpeg2000.h +++ b/libavcodec/jpeg2000.h @@ -111,6 +111,10 @@ enum Jpeg2000Quantsty { // quantization style #define JPEG2000_CSTY_SOP 0x02 // SOP marker present #define JPEG2000_CSTY_EPH 0x04 // EPH marker present +// Lossy and lossless DWTs +#define JPEG2000_DWT97INT 0x00 // lossy DWT +#define JPEG2000_DWT53 0x01 // lossless DWT + // Progression orders #define JPEG2000_PGOD_LRCP 0x00 // Layer-resolution level-component-position progression #define JPEG2000_PGOD_RLCP 0x01 // Resolution level-layer-component-position progression