From patchwork Tue Dec 20 15:37:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitrii Ovchinnikov X-Patchwork-Id: 39735 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bc95:b0:ad:ade2:bfd2 with SMTP id fx21csp5059089pzb; Tue, 20 Dec 2022 07:37:30 -0800 (PST) X-Google-Smtp-Source: AA0mqf5W7U4cdl+8pNDiU3M0Uciz1YA2An2Tor4F+6Ib6FeNxo4ZSxFnstUjDlg1h6mlEVy8QdLl X-Received: by 2002:a17:906:81d3:b0:7c1:515:a0ec with SMTP id e19-20020a17090681d300b007c10515a0ecmr31393110ejx.63.1671550650418; Tue, 20 Dec 2022 07:37:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671550650; cv=none; d=google.com; s=arc-20160816; b=LZv62C5DTnIP9XpQX+YVdwJk7Xwd1Jqfqaydq0Mlz2e6vyFf1PQuvYu7ikzRg0PnyP 9bE6TnHCLVbru8lUqzDy9bddxyuSuj4VBeCgjZW6vr1JBuzSwxs1KLtm5AMv3lFcQsfM SDgIZuE8Bciv2SoDg0b6/htKgCgjd/i3hZ6ItEazmsPggrhhiPI3ZqDHKA/j+Wt5G+LZ UTvWgRQkrQJsctjL58HeFba3VyWSr1WRE5EHEeEx2BtGrGMtABIbvToOqNk2LVGW67F3 9AUk3V7PF+OuTEP6GN6Uq1DWCFmZfsbif+lrl86WV7sCSNGRuGFtj3OhS+sSLqCuEymW 3dYA== 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=OdKCDWAdHijcC6/ENmFXZvfNX/rpozVX7kVfpv7H8sg=; b=mKlo2yZ0qZmQzWSNY3/WaMlcbpCexz/HDetHZHyCBNcJYeuD7DJrMhX9i5Tisp9MCe PvgdO6k1OzlKXas1PYx2hsvZoCREirDt4IMGfZpHlMSeo9TkpL9D+7U0K1gML+S9A+5w JI8LqZcLa4y6tKRjX9qjNM6gHheOYKzsIp/PHwYgujxwfGhLwbT7sNAbgHzNt4RUBn7R I+p3wMi60GjSLRQHte+AvYDXtlNuV0OxJLWxr3tPnExJty6H087mfGXSy3QkY8L6Wqck CR9p4sSOU7f5iTypVuEyqzPE/fEIvNon2fF5Ci50k4xIM1ZCujBUBy00bttMLdCky979 0mig== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=UlnU3yaN; 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 du15-20020a17090772cf00b008173e855731si7048366ejc.624.2022.12.20.07.37.29; Tue, 20 Dec 2022 07:37:30 -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=UlnU3yaN; 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 B435768B9CA; Tue, 20 Dec 2022 17:37:26 +0200 (EET) 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 2E88668B1F1 for ; Tue, 20 Dec 2022 17:37:20 +0200 (EET) Received: by mail-wr1-f51.google.com with SMTP id y16so12130942wrm.2 for ; Tue, 20 Dec 2022 07:37:20 -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=vm0FT5EN5QkxYkTK2NySaKVLbde+JZdPpigd+ndmP0s=; b=UlnU3yaNGWmR5pc4s2ztvIR8qKSwOCupQ32+tE9ypPUJ/2WOwWoh5E4c59hGoC/yvZ NiRdQjBlw/Y1rIkCJoMbVVcmj4H14IyCJ0/UptSkFwj2qwi7zXtgl6d5HPAOTsJa9UvT 1j+cSiyE9hl9Qgwn+3BpRuGli0f2BFwdLlizW/VYdvLq+hHwAl3xaiO1BPeDRl4h5OwW 6fDnAAgCnK3jVG1q2VInx1Q4dNV23GiIQurH6l0aB0qPNWV7rMA0aJjQi8OflW5bQZBV OWvGIGTSv6ziiI+UIbulveGgH8YNsyuqB1KCs6LjpC6BEGGfcHVEdjhVGvjPrKmmXo4c g30Q== 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=vm0FT5EN5QkxYkTK2NySaKVLbde+JZdPpigd+ndmP0s=; b=wEDmrR0gBdE/uRTgWnhrOlBJkxh9S1g3cqmJAs9YHB1Oa/iKyYEyOvUNS+nvk7ceM6 ehtF7yZcVZ4t3060l9xLRUucItIuZYLtgzvh5wOPuzaj/sxHClYulkXWy94ekUR2hU6Z +gvjE5319U4YxwbY++DIUF7tW4iZIC1j/FRQSKBnel9Kd0wbJc7oajiDLBA/59mX3D8v tYHrxtQT6t9ZHk1HzYhSM8vUvjk5+Hmo4V8bKiEeqCl2BSzNLEvuSJD5mOBRzV1sOnN9 LJ/yHPRYzJekVg2uWo+qf5sdeKyQS8GiJSIH1THceNVJZObXVcdRnby/x6KTPfzP9Qdy AYDA== X-Gm-Message-State: ANoB5pl8Hg8MkvDBWLM4P5p0YkOITBwuyWkI57iZinEJTzNtFllCjDF0 2t62pjO+q0PbEfVZ7BJ3ZgM4xHvQnGk= X-Received: by 2002:a05:6000:10cf:b0:242:5ba8:d025 with SMTP id b15-20020a05600010cf00b002425ba8d025mr29542381wrx.39.1671550639076; Tue, 20 Dec 2022 07:37:19 -0800 (PST) Received: from dovchinn.amd.com (109-93-70-158.dynamic.isp.telekom.rs. [109.93.70.158]) by smtp.gmail.com with ESMTPSA id y1-20020adfd081000000b002421a8f4fa6sm13167716wrh.92.2022.12.20.07.37.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Dec 2022 07:37:18 -0800 (PST) From: Dmitrii Ovchinnikov X-Google-Original-From: Dmitrii Ovchinnikov To: ffmpeg-devel@ffmpeg.org Date: Tue, 20 Dec 2022 16:37:09 +0100 Message-Id: <20221220153711.1831-1-Dmitriy.Ovchinnikov@amd.com> X-Mailer: git-send-email 2.38.1.windows.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [crop support for matroska demuxer, V4 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: Dmitrii Ovchinnikov Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: Hg4r6rdlIDxT From: Dmitrii Ovchinnikov --- 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 3edd8e2636..57b340c24d 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 f51d27c590..cc0695689c 100644 --- a/libavcodec/codec_par.h +++ b/libavcodec/codec_par.h @@ -211,6 +211,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}, }; From patchwork Tue Dec 20 15:37:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitrii Ovchinnikov X-Patchwork-Id: 39736 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bc95:b0:ad:ade2:bfd2 with SMTP id fx21csp5059176pzb; Tue, 20 Dec 2022 07:37:39 -0800 (PST) X-Google-Smtp-Source: AA0mqf5RIZkt6T2DN83OyzdQKICwWWcHhQ/lUI9oUqwIjn8CnTPKVaJzIiJ8DIOIcGzYYZ80AHNO X-Received: by 2002:a17:906:3008:b0:7b5:73aa:9984 with SMTP id 8-20020a170906300800b007b573aa9984mr40634995ejz.14.1671550659637; Tue, 20 Dec 2022 07:37:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671550659; cv=none; d=google.com; s=arc-20160816; b=crNvCbkB/Kp1zl5I8d5arIqoffw2lbMXI1cGPJxwMudmUknJHCrh2po95QtKsqZmHN 4tj7LsqJVTyTVVVSXI3CJi1Hwx/x3Q8QIXdVCLxh+IssI0PZTHoCNyvRlKFsx+QLWebh u7fhtCwHULYleg7JVjCZZGERq+P4rtvTZ0ZeYKew23ev6Nd8s8+uirdHx0PPKPTZyF3W sW6EADhtlHZbReO5EQ1NOjp/fyg2a6DSQgeBK06ribLJ67S/Gb1d0P7HJzmaO9znsnwu MHlhYA00XA289SQnRP5HDx99RftwqHEEZpQ7kwyfCVUbDlVGf/ITpdDluIKA9yCv1fUn x4Kg== 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:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=5EGZ+q0BP8clLuG4qvQlgHV7pNfC6M5DHqzDNKK+k2o=; b=Zc6hehwNw7IgNLWkvS0Z++HymlyFstCTwL2mDy8wgb9fQC+3vAprQJbBXb0hYPY+km Sv9GFbLtmnabGEJeh1S1bwUBQ+Tr7/MPvh1PgBh3ZUAXRLI1YM5hu1Zo9H8jOLK2BFwL WsUzoA/4EPq6uBkXL7sk8ePq4Br/zgzj+A5eWFBDr6A3T0uETRLtxKB5QLnPTblL/zhp WcUr1gRDKWlu9fdcDq1G/5mClyvOEWnq1YtEnu3WJVVEdWBUYtXaYuz8kayD8BSdlcID dfzxy9aQJBGYF2SPBMMy2iFxUuALNYCmTkjKZvvzQYedEKn9n5cJpFi4hRroQgPr3qDJ xbnA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=PEq93SNv; 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 jl7-20020a17090775c700b007aa1aa8ca57si346973ejc.859.2022.12.20.07.37.39; Tue, 20 Dec 2022 07:37:39 -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=PEq93SNv; 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 C302268BA97; Tue, 20 Dec 2022 17:37:27 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D58F9680305 for ; Tue, 20 Dec 2022 17:37:20 +0200 (EET) Received: by mail-wr1-f41.google.com with SMTP id bx10so12159703wrb.0 for ; Tue, 20 Dec 2022 07:37:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=LwMkKzNv8tO1FOx4JOqUFLi+vYw7HszstG18w+CFIys=; b=PEq93SNv4Clmz6DZMTWnKv5wtiDlTWMzDvJiJcHrtEPrCSOqs4bOHQZ+4LRuuYkfIG T/uaMDg5mNQG/21ijM0nU04gVvvhWG7r4kyXRutEY7scF3cPft2tdhkxgLhxhTeCeX6a gjlqHXzZFW36MF8YJx1NeXYAkOoIlFruripW0fIg3PEbR5twTYcB6nhXV9x2jO8UJFtO Ii0kTn44wkAgjPH9yp5ZlgRa4tPu/R+vAXs/+WeTZ4DWSshhBlXlUnM0ggz5LaS971dx mempnvlCtrK3hSmZDcFWADcsPvDbL9J0xo45hCeF9xw2e0gmEguM1gk0CQm/D9eyvdrT r4dA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=LwMkKzNv8tO1FOx4JOqUFLi+vYw7HszstG18w+CFIys=; b=Er+9/+XqqXf8b+fMaseZ+2fcuJV65U+DDgiZtvzym9/UAHaJSZCDkh98L3jDMJ+5zY w5Wyn0A3oHJ3+mBDbgM+kEyGH06DBWbg0nnANkFd3a311w3+XqVEp3GVVd7olhopu48d dKCx5Rxn1A9XZVEgknrD0QF692JR3i+cTA2sdmDY7hBA3A70lYH+/5xKtvI8zvb9HfTT io1A5k4LhrUbW0uQ0pzruhkGotVgygBUnM5NQIUWkddZNJbydzLj9GyHRVR5uIfGjY5p bdMPrggLMXxMbf2Am8AL3eN92Mt1qBaEbepsIHZxlQHkN+/4EUDS5ka4s+yo/Mfp7gMX jvxw== X-Gm-Message-State: AFqh2kr0aAkvvY5P7KEs9Z5r4aKUDmHBBwzv0n78bl6xvfmDn9NxcwgK zhpw+/LbMecixvbkPeEl0CPfFcUk4Ro= X-Received: by 2002:adf:e6c4:0:b0:255:96ed:950b with SMTP id y4-20020adfe6c4000000b0025596ed950bmr17296694wrm.60.1671550639978; Tue, 20 Dec 2022 07:37:19 -0800 (PST) Received: from dovchinn.amd.com (109-93-70-158.dynamic.isp.telekom.rs. [109.93.70.158]) by smtp.gmail.com with ESMTPSA id y1-20020adfd081000000b002421a8f4fa6sm13167716wrh.92.2022.12.20.07.37.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Dec 2022 07:37:19 -0800 (PST) From: Dmitrii Ovchinnikov X-Google-Original-From: Dmitrii Ovchinnikov To: ffmpeg-devel@ffmpeg.org Date: Tue, 20 Dec 2022 16:37:10 +0100 Message-Id: <20221220153711.1831-2-Dmitriy.Ovchinnikov@amd.com> X-Mailer: git-send-email 2.38.1.windows.1 In-Reply-To: <20221220153711.1831-1-Dmitriy.Ovchinnikov@amd.com> References: <20221220153711.1831-1-Dmitriy.Ovchinnikov@amd.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [crop support for matroska demuxer, V4 2/3] libavcodec: Public code to support container crop 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: Dmitrii Ovchinnikov Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 8gTUY2mrjifO From: Dmitrii Ovchinnikov Support both simple and receive_frame api The container crop information is applied additional to frame crop information --- libavcodec/codec_par.c | 30 ++++++++++++++--------- libavcodec/decode.c | 54 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 73 insertions(+), 11 deletions(-) diff --git a/libavcodec/codec_par.c b/libavcodec/codec_par.c index abda649aa8..9738402434 100644 --- a/libavcodec/codec_par.c +++ b/libavcodec/codec_par.c @@ -115,17 +115,21 @@ int avcodec_parameters_from_context(AVCodecParameters *par, switch (par->codec_type) { case AVMEDIA_TYPE_VIDEO: - par->format = codec->pix_fmt; - par->width = codec->width; - par->height = codec->height; - par->field_order = codec->field_order; - par->color_range = codec->color_range; - par->color_primaries = codec->color_primaries; - par->color_trc = codec->color_trc; - par->color_space = codec->colorspace; - par->chroma_location = codec->chroma_sample_location; - par->sample_aspect_ratio = codec->sample_aspect_ratio; - par->video_delay = codec->has_b_frames; + par->format = codec->pix_fmt; + par->width = codec->width; + par->height = codec->height; + par->container_crop_top = codec->container_crop_top; + par->container_crop_left = codec->container_crop_left; + par->container_crop_bottom = codec->container_crop_bottom; + par->container_crop_right = codec->container_crop_right; + par->field_order = codec->field_order; + par->color_range = codec->color_range; + par->color_primaries = codec->color_primaries; + par->color_trc = codec->color_trc; + par->color_space = codec->colorspace; + par->chroma_location = codec->chroma_sample_location; + par->sample_aspect_ratio = codec->sample_aspect_ratio; + par->video_delay = codec->has_b_frames; break; case AVMEDIA_TYPE_AUDIO: par->format = codec->sample_fmt; @@ -199,6 +203,10 @@ int avcodec_parameters_to_context(AVCodecContext *codec, codec->pix_fmt = par->format; codec->width = par->width; codec->height = par->height; + codec->container_crop_top = par->container_crop_top; + codec->container_crop_left = par->container_crop_left; + codec->container_crop_bottom = par->container_crop_bottom; + codec->container_crop_right = par->container_crop_right; codec->field_order = par->field_order; codec->color_range = par->color_range; codec->color_primaries = par->color_primaries; diff --git a/libavcodec/decode.c b/libavcodec/decode.c index 6be2d3d6ed..9e44fcb293 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -693,6 +693,60 @@ static int apply_cropping(AVCodecContext *avctx, AVFrame *frame) if (!avctx->apply_cropping) return 0; + if (avctx->container_apply_cropping == FF_CONTAINER_CROPPING_ADDITION) + { + /*check if container parameter and elementary streaming cropping parameters are saft for apploying */ + if (avctx->container_crop_left + frame->crop_left >= INT_MAX - (avctx->container_crop_right + frame->crop_right) || + avctx->container_crop_top + frame->crop_top >= INT_MAX - (avctx->container_crop_bottom + frame->crop_bottom) || + (avctx->container_crop_left + frame->crop_left + avctx->container_crop_right + frame->crop_right) >= frame->width || + (avctx->container_crop_top + frame->crop_top + avctx->container_crop_bottom + frame->crop_bottom) >= frame->height) { + av_log(avctx, AV_LOG_WARNING, + "Apply container and elementary stream corpping parametes error: " + "container cropping paramters " + "%d/%d/%d/%d " + "elementary stream croping paramters " + "%"SIZE_SPECIFIER"/%"SIZE_SPECIFIER"/%"SIZE_SPECIFIER"/%"SIZE_SPECIFIER" " + "(frame size %dx%d). This is a bug, please report it\n", + avctx->container_crop_left, avctx->container_crop_right, avctx->container_crop_top, avctx->container_crop_bottom, + frame->crop_left, frame->crop_right, frame->crop_top, frame->crop_bottom, + frame->width, frame->height); + frame->crop_left = 0; + frame->crop_right = 0; + frame->crop_top = 0; + frame->crop_bottom = 0; + return 0; + } + + frame->crop_top += (size_t)avctx->container_crop_top; + frame->crop_left += (size_t)avctx->container_crop_left; + frame->crop_bottom += (size_t)avctx->container_crop_bottom; + frame->crop_right += (size_t)avctx->container_crop_right; + }else if (avctx->container_apply_cropping == FF_CONTAINER_CROPPING_OVERWRITE) { + + /*check the croppping parameters from container are reasonable and correct*/ + if (avctx->container_crop_left >= INT_MAX - avctx->container_crop_right || + avctx->container_crop_top >= INT_MAX - avctx->container_crop_bottom || + (avctx->container_crop_left + avctx->container_crop_right) >= frame->width || + (avctx->container_crop_top + avctx->container_crop_bottom) >= frame->height) { + av_log(avctx, AV_LOG_WARNING, + "Invalid container cropping information set by a demuxer: " + "%d/%d/%d/%d " + "(frame size %dx%d). This is a bug, please report it\n", + avctx->container_crop_left, avctx->container_crop_right, avctx->container_crop_top, avctx->container_crop_bottom, + frame->width, frame->height); + frame->crop_left = 0; + frame->crop_right = 0; + frame->crop_top = 0; + frame->crop_bottom = 0; + return 0; + } + + frame->crop_top = (size_t)avctx->container_crop_top; + frame->crop_left = (size_t)avctx->container_crop_left; + frame->crop_bottom = (size_t)avctx->container_crop_bottom; + frame->crop_right = (size_t)avctx->container_crop_right; + } + return av_frame_apply_cropping(frame, avctx->flags & AV_CODEC_FLAG_UNALIGNED ? AV_FRAME_CROP_UNALIGNED : 0); } From patchwork Tue Dec 20 15:37:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitrii Ovchinnikov X-Patchwork-Id: 39737 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bc95:b0:ad:ade2:bfd2 with SMTP id fx21csp5059263pzb; Tue, 20 Dec 2022 07:37:48 -0800 (PST) X-Google-Smtp-Source: AMrXdXsKQAGb4q9rK8ZqwfsE3a+pz3VjTBpQe7k31WKKGnLPCF/XcQY4sXAt8dPyZDSXfPiPIgyV X-Received: by 2002:a17:906:22d2:b0:7fc:3787:243d with SMTP id q18-20020a17090622d200b007fc3787243dmr2182746eja.53.1671550668377; Tue, 20 Dec 2022 07:37:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671550668; cv=none; d=google.com; s=arc-20160816; b=cJ4QjPRVeqhiBd1p14xuIgKgJtfyfaBT38q/6Ti4qjHwcLyTyJc/eLbKpLRj7i75pb wkrCug7oO5xW4lrXfcNrNEQwtURYHH/CoW6VIxKDABHVgAZzQRBzDZOxDWN/m7pvd5/X NmB2tQwcWwJIxgS1yC3nUU68rKYDvS88FeQ7U5LNC5NbqXslQV9w6E25ROkqVkzOhq7R FaMBa6u8wgV8CcQD8h42EI09ZGGI2SI2JBGCyx5ZpjsTBY5d6BPEZDrRqoCjlU2kA2qo CoFVpx/+SDtlsChgxSJFxcSbdPbYT0N7vtAsG5j6LPIXPfEFXfkd8dcFqKPxzx9sb/6c dWqw== 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:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=rN7ucNsgKxNcWLv7FUssirHo4SiHW0y9SPzzlG6O0eo=; b=lBMOHCbtvtrUv37D1Ls9AMDkWgPJZ5DiY+9mu7dOgP5kLr7Uo1tU5ydQxP/WIhFDlw AfOj2c3f5a8bueJ8qwxellKyVatmDv0vyhvAn52LbidnaCJtYp/+52o8wRMTiUy2IPw1 z+lYaydsZM5H0Uh8LGxQ8wTLh3Mtsi7TiMLHnmgZJCHLSMaPwj5jYeCjxcPzFfeDwsOB yyd2g4NNxL+5k5v1dM3dCtHZJSZ/tSM4om9HHb1+qyHWQuQGiF/zJ5rWLke/B2pzfyH7 oNNN3ZpBP2xkkQtY2enXij3CxHt9zfYB28doFxB+7ZcxcbAQprE9jzt6OCx/jDEzjbov AuXg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b="cws/y75Z"; 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 nb26-20020a1709071c9a00b0082b45653622si3813425ejc.333.2022.12.20.07.37.47; Tue, 20 Dec 2022 07:37:48 -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="cws/y75Z"; 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 CD43168B455; Tue, 20 Dec 2022 17:37:29 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AD22568B263 for ; Tue, 20 Dec 2022 17:37:21 +0200 (EET) Received: by mail-wr1-f50.google.com with SMTP id i7so12093326wrv.8 for ; Tue, 20 Dec 2022 07:37:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=t9UHlVKWyVoDN0K0+6vW7n7WnPYQW8+a24fx1tJ1J/8=; b=cws/y75ZKbk43JjSPaf07Jcx5UuA5BTDwLwMO6dgSq2dXMM4Dvk9S+gVNx84CbTzJY Tk5ig2tgIDU3H0LmrUnzvbMN4LS6qO13k9NeH1Wd/io2ruI9lZ4I9Lpan1qNiNkRNie5 NJDJdhf7lIlfyJAM8rIxnZuwBXFsT+KFRzv04vpU2AMPPS9/4TGFASGNvWyeF/JjlzgB M3CIK3+0tiY/tjBaZiiIAnC5TqJ7eRelIk69pQtRPneFidQUyfedk2sosY9t4KFv9PnI ld6SZ2PGMKpnDQ+QTjK1b0iKw9t0Et6sov98nM3Ppmz+1KNZimk4I4cZaJznr6lwYPT1 sKCQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=t9UHlVKWyVoDN0K0+6vW7n7WnPYQW8+a24fx1tJ1J/8=; b=G7+AD0cICry4W+/5ofz+ett8XyIR3h1rQFHQRXA0mwLfEnQVVb+qpxsQHDwpV3CKz9 kTh1v5atbr0elzGV/FMK/eSZ6X22pI1jHI2a/og+wL/3Ao8ehQD10DmgG6uTIUd5yzbY sOkkVQp2GfAdmSiPK1qo15SRRl+u612L3N1Xo0MzPxtsy3iSrP+hOfhIoTunTpvszQ1R bF/q4n4VpCrEfXyElykxXzn1ITgFQNGRZ46RP7Cc2xfUHlebfNG+jJTAksqpdeYKQg+B S5F94W6QE+LNGPrQdAObM+8ZSSPHtT7OU1Dr918CPueOBp7AoSyavQZ6JdUnq/CUXy2o 0kyQ== X-Gm-Message-State: AFqh2kps8KN9nG8fIHrhfVT/JoYk6PqChUaOPnWT6OgH6tSjeinH4kEj V5VAoGxayPm2yPq9k3ambAXp1XsVpN8= X-Received: by 2002:a5d:40ce:0:b0:242:1fa4:332b with SMTP id b14-20020a5d40ce000000b002421fa4332bmr1694014wrq.38.1671550640785; Tue, 20 Dec 2022 07:37:20 -0800 (PST) Received: from dovchinn.amd.com (109-93-70-158.dynamic.isp.telekom.rs. [109.93.70.158]) by smtp.gmail.com with ESMTPSA id y1-20020adfd081000000b002421a8f4fa6sm13167716wrh.92.2022.12.20.07.37.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Dec 2022 07:37:20 -0800 (PST) From: Dmitrii Ovchinnikov X-Google-Original-From: Dmitrii Ovchinnikov To: ffmpeg-devel@ffmpeg.org Date: Tue, 20 Dec 2022 16:37:11 +0100 Message-Id: <20221220153711.1831-3-Dmitriy.Ovchinnikov@amd.com> X-Mailer: git-send-email 2.38.1.windows.1 In-Reply-To: <20221220153711.1831-1-Dmitriy.Ovchinnikov@amd.com> References: <20221220153711.1831-1-Dmitriy.Ovchinnikov@amd.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [crop support for matroska demuxer, V4 3/3] libavformat\matroskadec.c: crop support for matroska demuxer. 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: Dmitrii Ovchinnikov Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: Xhh5tBEJ28OE From: Dmitrii Ovchinnikov In webm specification, it supports cropping information. (https://www.webmproject.org/docs/container/) In ffmpeg, the implementation of webm is a subset of matroska. In matroskadec.c, those cropping related four fields are forced to 0. for the sample file with crop (crop_bottom =8, crop_top=crop_left=crop_right=0.) ffmpeg.exe -i test_with_container_crop.webm -pix_fmt yuv420p -y output.yuv original ffmpeg code - the output.yuv resolution is 1920x1088 changed code - the output.yuv resolution is 1920x1080 --- libavformat/matroskadec.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index d582f566a2..2023fd4977 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -210,6 +210,10 @@ typedef struct MatroskaTrackVideo { uint64_t pixel_width; uint64_t pixel_height; EbmlBin color_space; + uint64_t pixel_cropt; + uint64_t pixel_cropl; + uint64_t pixel_cropb; + uint64_t pixel_cropr; uint64_t display_unit; uint64_t interlaced; uint64_t field_order; @@ -517,10 +521,10 @@ static EbmlSyntax matroska_track_video[] = { { MATROSKA_ID_VIDEOALPHAMODE, EBML_UINT, 0, 0, offsetof(MatroskaTrackVideo, alpha_mode), { .u = 0 } }, { MATROSKA_ID_VIDEOCOLOR, EBML_NEST, 0, sizeof(MatroskaTrackVideoColor), offsetof(MatroskaTrackVideo, color), { .n = matroska_track_video_color } }, { MATROSKA_ID_VIDEOPROJECTION, EBML_NEST, 0, 0, offsetof(MatroskaTrackVideo, projection), { .n = matroska_track_video_projection } }, - { MATROSKA_ID_VIDEOPIXELCROPB, EBML_NONE }, - { MATROSKA_ID_VIDEOPIXELCROPT, EBML_NONE }, - { MATROSKA_ID_VIDEOPIXELCROPL, EBML_NONE }, - { MATROSKA_ID_VIDEOPIXELCROPR, EBML_NONE }, + { MATROSKA_ID_VIDEOPIXELCROPT, EBML_UINT, 0, 0, offsetof(MatroskaTrackVideo, pixel_cropt), {.u = 0 } }, + { MATROSKA_ID_VIDEOPIXELCROPL, EBML_UINT, 0, 0, offsetof(MatroskaTrackVideo, pixel_cropl), {.u = 0 } }, + { MATROSKA_ID_VIDEOPIXELCROPB, EBML_UINT, 0, 0, offsetof(MatroskaTrackVideo, pixel_cropb), {.u = 0 } }, + { MATROSKA_ID_VIDEOPIXELCROPR, EBML_UINT, 0, 0, offsetof(MatroskaTrackVideo, pixel_cropr), {.u = 0 } }, { MATROSKA_ID_VIDEODISPLAYUNIT, EBML_UINT, 0, 0, offsetof(MatroskaTrackVideo, display_unit), { .u= MATROSKA_VIDEO_DISPLAYUNIT_PIXELS } }, { MATROSKA_ID_VIDEOFLAGINTERLACED, EBML_UINT, 0, 0, offsetof(MatroskaTrackVideo, interlaced), { .u = MATROSKA_VIDEO_INTERLACE_FLAG_UNDETERMINED } }, { MATROSKA_ID_VIDEOFIELDORDER, EBML_UINT, 0, 0, offsetof(MatroskaTrackVideo, field_order), { .u = MATROSKA_VIDEO_FIELDORDER_UNDETERMINED } }, @@ -2879,6 +2883,11 @@ static int matroska_parse_tracks(AVFormatContext *s) st->codecpar->width = track->video.pixel_width; st->codecpar->height = track->video.pixel_height; + st->codecpar->container_crop_top = track->video.pixel_cropt; + st->codecpar->container_crop_left = track->video.pixel_cropl; + st->codecpar->container_crop_bottom = track->video.pixel_cropb; + st->codecpar->container_crop_right = track->video.pixel_cropr; + if (track->video.interlaced == MATROSKA_VIDEO_INTERLACE_FLAG_INTERLACED) st->codecpar->field_order = mkv_field_order(matroska, track->video.field_order); else if (track->video.interlaced == MATROSKA_VIDEO_INTERLACE_FLAG_PROGRESSIVE)