From patchwork Fri Oct 7 14:59:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitrii Ovchinnikov X-Patchwork-Id: 38603 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:789c:b0:9c:c2cd:5584 with SMTP id bf28csp70921pzc; Fri, 7 Oct 2022 08:00:08 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4JXrCtmOynHPMZrHfAR9ytWZCZAokTAAMulQHyXTyy0NcCReOGh9tzSYnk2pcLPcxdEzXP X-Received: by 2002:a17:907:2e19:b0:78d:3e57:474a with SMTP id ig25-20020a1709072e1900b0078d3e57474amr4427536ejc.198.1665154807817; Fri, 07 Oct 2022 08:00:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665154807; cv=none; d=google.com; s=arc-20160816; b=emcrECKsN37lE0/vNR7hF+ysdqOtLcurv7JrxhL8QFjvHBYGHr9ZStMzM6n4lEtLAO 5qCFW0UEy87F87PGFGUTAUC+7W/2lS/l0kWZeqCf/BbkbNyacaMcIwKcohGMdrGQzWqq hX7vKE4JOc2LoXcvP80d5zACQxSuRf6j/R9tDsB91nSCGt9VvfSyfuNryy6GjSHxKl24 UZjOFRbLHPFfK3oGihdpnOdW3DC8/R+EpVBdBIFvTAyuRaS+GKnFz3Cf1cvTkiui3+0v VLGXTFjAvrKUvRbHiqcK2mfqEli5WHN16l/YTBfBvhhxhVp8I6mPDuUc2FvM5U1sj5cI 3mag== 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=eOOU9LPXcvIbSJ/oI/zLGxEPBw1RXTNvun7DX5AE2iY=; b=JDapIadQOK7CR25bKCC8spq/7C/m9k88b8wi0P1KS1nO7Z5P8Xd1+AGz1uXEgzf4Xh +xM0GxpCMOyeAHr71gYtCHZKLiW0bmW7sULB8zOcAAswytA4CeU87S1/MNFCDyKREI/y lNIXksBeFGyWRaKBoHGjP7LHGXctdxbaLwFFJsPd19WlM+sLBU87gx1ogZWikzKYPfkH +/WDBh78wayM+SgN9BrKRqc1zEwGfVAn4m9wg+RbCN14AcYqLU39U0p9f3BQvxnJy4L1 8vuM2Ala+ZU8n/d5LyO13GZhVky83Z/NgSjPwZ6fDCtwncwJPxlaUKxLIIH3y4J+2yc9 AseA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b="IKE/qRUM"; 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 k22-20020a170906681600b00770d9e664f8si2207354ejr.152.2022.10.07.08.00.06; Fri, 07 Oct 2022 08:00:07 -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="IKE/qRUM"; 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 5143768BB4E; Fri, 7 Oct 2022 18:00:02 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C29E068BAFA for ; Fri, 7 Oct 2022 17:59:55 +0300 (EEST) Received: by mail-wr1-f48.google.com with SMTP id bv10so4123603wrb.4 for ; Fri, 07 Oct 2022 07:59:55 -0700 (PDT) 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=4VZ+FIy9X3PRhSwkvoXa3XJKZkhzhK753KKs64vDtDI=; b=IKE/qRUM0DBT11HhAd/pxDy7lz09wnarTFuSTiTFbnsMEGd+2pOapYMK937JEQ1tAC v+Er4qtS25MGIqi8W1e+n+VnuDTo94ImDOkx4JBBq6BKDszNBzG4Q5nn4U7iB683ckCu GFkMCcZmFj0QxHSF5683k6Nm0a8M+e9/8H5d59uu1gFNnPLg2e2REMYuTeQrZbU8gzVD wkuFJZ1csa3uhfAKyr52ZixrCZddpO9AVyuupJHvTdfEfKFJVPOIkYFYKmJK0PowBHmH VelAqxzIIbqi5OyntIFybGMAw21SA6IKunZxZcxq6CNEYO/Q/rD/Ks/pkFO0c/hMMNLy m24A== 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=4VZ+FIy9X3PRhSwkvoXa3XJKZkhzhK753KKs64vDtDI=; b=k6dv5sgTchmCS8DbU2q9NFvW2LAoBxBGiDyU2R9/CpKyK8j/RqpIQK35zYlBhgitJV +9WHZl2HK+Gg89iKPDwQhMV7ShtDXoWAYeeKKsveoZElLrpG3Kk5LhtyKeeQVYEBY9oi qWQP6KijpzunYeZfYr/77PfvmGOh3KjPJCQva8d3hO96VJMrzCScL6t4TCj2isFL9fdw 5zmVTc1wFEwKaqmNzviBNBIfX3BQ6XionHW/EYNfpM42pN9UDECxGlQ3SzJ9Fbv9MJEq 9EtGXFNY5hlv2QFBoYMcyFa4yrXZoXyabPs8cQYaFi9VWoYlTbcUixkfoNbQKDcQ7Fuo kLPw== X-Gm-Message-State: ACrzQf1BvAdQ7i8s3Ay0YGCXskBl9g8qwg3e4+dpnptBeegurNjeqfcV 4IrQEOVQwOjHjrxRC/dLHbNsFmhm25b/wKaM X-Received: by 2002:a5d:452b:0:b0:22e:3d4a:2ea3 with SMTP id j11-20020a5d452b000000b0022e3d4a2ea3mr3425596wra.309.1665154794577; Fri, 07 Oct 2022 07:59:54 -0700 (PDT) Received: from localhost.localdomain (178-222-23-217.dynamic.isp.telekom.rs. [178.222.23.217]) by smtp.gmail.com with ESMTPSA id o5-20020adfe805000000b00228cd9f6349sm2245302wrm.106.2022.10.07.07.59.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Oct 2022 07:59:53 -0700 (PDT) From: OvchinnikovDmitrii To: ffmpeg-devel@ffmpeg.org Date: Fri, 7 Oct 2022 16:59:40 +0200 Message-Id: <20221007145942.880-1-ovchinnikov.dmitrii@gmail.com> X-Mailer: git-send-email 2.30.0.windows.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [crop support for matroska demuxer, V3 1/3] libavcodec: Add crop related fields to structure AVCodecContext and AVCodecParameters. 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: OvchinnikovDmitrii Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: p1GzarqXM4Dh --- libavcodec/avcodec.h | 35 +++++++++++++++++++++++++++++++++++ libavcodec/codec_par.h | 8 ++++++++ libavcodec/options_table.h | 4 ++++ 3 files changed, 47 insertions(+) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 7365eb5cc0..d28a7cc022 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -380,6 +380,19 @@ typedef struct RcOverride{ */ #define AV_GET_ENCODE_BUFFER_FLAG_REF (1 << 0) +/** +* Video decoding only. Certain container support cropping, meaning that +* only a sub-rectangle of the decoded frame is intended for display. +* Certain codec supports cropping as well.This option controls how +* cropping is handled by libavcodec when container cropping and +* codec cropping exist. +*/ +enum CONTAINER_CROPPING_POLICY_TYPE { + FF_CONTAINER_CROPPING_IGNORE = 0, + FF_CONTAINER_CROPPING_ADDITION, + FF_CONTAINER_CROPPING_OVERWRITE +}; + struct AVCodecInternal; /** @@ -2057,6 +2070,28 @@ typedef struct AVCodecContext { * The decoder can then override during decoding as needed. */ AVChannelLayout ch_layout; + + /* When set to 1 (the default), libavcodec will apply container cropping + * to codec cropping additionally. + * + * When set to 2, libavcodec will use container cropping to overwrite + * codec cropping (the final cropping uses container cropping parameters) + * + * When set to 0, libavcodec will ignore container cropping parameters + * (the final cropping uses codec cropping parameters) + * + * This field works with "apply_cropping". Only if apply_cropping is 1, this + * field works + */ + enum CONTAINER_CROPPING_POLICY_TYPE container_apply_cropping; + + /** + * The cropping parameters from container. + */ + int container_crop_top; + int container_crop_left; + int container_crop_bottom; + int container_crop_right; } AVCodecContext; /** diff --git a/libavcodec/codec_par.h b/libavcodec/codec_par.h index 7660791a12..12d8ceb521 100644 --- a/libavcodec/codec_par.h +++ b/libavcodec/codec_par.h @@ -210,6 +210,14 @@ typedef struct AVCodecParameters { * Audio only. The channel layout and number of channels. */ AVChannelLayout ch_layout; + + /** + * The cropping parameters from container. + */ + int container_crop_top; + int container_crop_left; + int container_crop_bottom; + int container_crop_right; } AVCodecParameters; /** diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h index cd02f5096f..fd1ef21f90 100644 --- a/libavcodec/options_table.h +++ b/libavcodec/options_table.h @@ -401,6 +401,10 @@ static const AVOption avcodec_options[] = { {"allow_profile_mismatch", "attempt to decode anyway if HW accelerated decoder's supported profiles do not exactly match the stream", 0, AV_OPT_TYPE_CONST, {.i64 = AV_HWACCEL_FLAG_ALLOW_PROFILE_MISMATCH }, INT_MIN, INT_MAX, V | D, "hwaccel_flags"}, {"extra_hw_frames", "Number of extra hardware frames to allocate for the user", OFFSET(extra_hw_frames), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, INT_MAX, V|D }, {"discard_damaged_percentage", "Percentage of damaged samples to discard a frame", OFFSET(discard_damaged_percentage), AV_OPT_TYPE_INT, {.i64 = 95 }, 0, 100, V|D }, +{ "container_apply_cropping", "ploicy using container cropping parameters", OFFSET(container_apply_cropping), AV_OPT_TYPE_INT64, {.i64 = FF_CONTAINER_CROPPING_ADDITION }, 0, 2, V | D, "container_apply_cropping" }, +{ "ignore", "ignore container cropping", 0, AV_OPT_TYPE_CONST, {.i64 = FF_CONTAINER_CROPPING_IGNORE }, 0, 0, V | D, "container_apply_cropping" }, +{ "addition", "apply container cropping additionally to elementary stream cropping", 0, AV_OPT_TYPE_CONST, {.i64 = FF_CONTAINER_CROPPING_ADDITION }, 0, 0, V | D, "container_apply_cropping" }, +{ "overwrite", "use container cropping to overwrite elementary stream cropping", 0, AV_OPT_TYPE_CONST, {.i64 = FF_CONTAINER_CROPPING_OVERWRITE }, 0, 0, V | D, "container_apply_cropping" }, {NULL}, };