From patchwork Fri Oct 7 14:59:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitrii Ovchinnikov X-Patchwork-Id: 38604 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:789c:b0:9c:c2cd:5584 with SMTP id bf28csp71016pzc; Fri, 7 Oct 2022 08:00:18 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7kuv1toFCN+ZSxENWxgnWH1qUZeYnZvsQeICOTlemV3SddNNY8HA+R6wIWy9DWvJ4lNhkq X-Received: by 2002:a17:906:db02:b0:780:24e:cf9 with SMTP id xj2-20020a170906db0200b00780024e0cf9mr4407001ejb.460.1665154818557; Fri, 07 Oct 2022 08:00:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665154818; cv=none; d=google.com; s=arc-20160816; b=oUr7/F9UHES38egFRrXckl46QAQDGtjP5JNLVG+aJOkXq/wiN3aiTEXKsDoBOFozGU veI2xPymT7CSDrEEn9eLhaXZaLB2V6ttaT+VJZPeulmFJIKLgbZYs9qHNnpwR6a37CKA IYZpOYpDEwbyuiNHNCGVyzNZW36rgIrV0O5yq0IDbJTNOO0m3ZlhzvcK33Wrfvbf9Gkm 4APXTIELFRaz3b7c+DOJ8xcgJoMNQ8y3/5siS20bfdtvSzvsE1Xc66PhLiWrNNX6O68n 5Ma4Tlqb9LFh2BYtZv9xlFOJMj1GAqkzu/e+3G8tsNUe988StVr3cj4FUYgM2AnNiXhG amKA== 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=i44F9nwveiqm4Zt1eouEB2KTwe/qRL6QJdN1mnOIXhE=; b=L+5yDOgyW517tOUCR50LCDtZbrOGvDYeirWtuCZ6ozXu7HH+fK/LhyxCRgN8uOT2AA aydCVkXKCQYjMg0DLZPXQenHmlS+AgPeHi7Qg21duqGKAMi+yWsZtNdpA4BaLIHphu5M G5WSxDpLkXeVawlb7GivCTwbfHI6O5yZuaI+XEIki28ymsK7MStHHhDlyOYyp8cPX4vy 7/+WCEUcDo5OaC2Hf/I0X7E+qICvGNF5eiyu8f20l/WQATxDdsQtQEBopbn9qqo+cwiZ 50EEGQuGTMy/4qIi0m5MIyPXHItweJu7Fi1O3NAupuEB6kdkCJjkPgdLX/Vv2QqQVsv9 g/xA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=qeq5wyaW; 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 ho38-20020a1709070ea600b0078d484e0e79si2737058ejc.481.2022.10.07.08.00.17; Fri, 07 Oct 2022 08:00:18 -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=qeq5wyaW; 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 8A3A368BB7F; Fri, 7 Oct 2022 18:00:03 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8F9B168BB25 for ; Fri, 7 Oct 2022 17:59:56 +0300 (EEST) Received: by mail-wr1-f45.google.com with SMTP id f11so7702754wrm.6 for ; Fri, 07 Oct 2022 07:59:56 -0700 (PDT) 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=cp4HKm3i/MEDB8tsBKi+8J/E10PJQxFka0dewqn8HVw=; b=qeq5wyaW8897HZhi+8dMJINngG9ayiDWQS1gRtjsGOyDWjcKR2jjrUco/UZ9UUuM/y 2WdrgyZHxHIOmfWGRQLCbTJeDPT9hjS8N7JnevSKXGF9vaJ2s0JNmtGAIek+wGawXHrT 8ECwHgJDdLV8uNneZuM5RUTrtgcNwZykBfJeoYvq1Va7EO8n5NwMoehX/Wi9V7tRe+ql Z4aFfvnB4VFxP7xi+0CpYq9kWz/DGRcotsgcRp1q5JTSuT6IBX1HkLSNLFEa3zSlnAQ+ wQfDUYhGz/seJIB/betQVNAzKuJlgT2S0uQY8YEOgd9HkiCG1uaMxyZqx9f6FTMov900 fjTQ== 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=cp4HKm3i/MEDB8tsBKi+8J/E10PJQxFka0dewqn8HVw=; b=xnxDoZb+1rofG84/Xlq78bgI0JW0bAiv31Xavo9IIXMoX3dtnX4bFRFAu/vAmBtmOw ZIMTOExYDwL9UIeInoNWLnqMZt808hqww5IxBs6iOQr87UHMESVk6VVTeA9VUL12p9Ab GWuIFyio718tWQhsXzu37bI01xy9Hl0CabhneXOkpb1j5mwsiC6LzGcSJfZTnRxrs0R9 9LxP+Hxp5hyOqAx/V6hU/X8BDOI2sj1E41QQ53xZzZuQjQuPQLzFSEYdakLZNBEUIXZZ U5xAY7CLoV4RklC5tPHqlxcLpd59la0G/NLQlXjLZwS+OvbveoVpW7GsDRy9EigJtWuy p2iA== X-Gm-Message-State: ACrzQf2Lxg0TzJGb6OD8WOQBjYaX0hm0/uaHBMYCgF11aYaNTBSTpQjR 18PdrmOT/KsIDdqi+WS9UDhMRWvGw4n33P4e X-Received: by 2002:a5d:6c62:0:b0:22a:2f59:cb7d with SMTP id r2-20020a5d6c62000000b0022a2f59cb7dmr3554460wrz.405.1665154795546; Fri, 07 Oct 2022 07:59:55 -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.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Oct 2022 07:59:54 -0700 (PDT) From: OvchinnikovDmitrii To: ffmpeg-devel@ffmpeg.org Date: Fri, 7 Oct 2022 16:59:41 +0200 Message-Id: <20221007145942.880-2-ovchinnikov.dmitrii@gmail.com> X-Mailer: git-send-email 2.30.0.windows.2 In-Reply-To: <20221007145942.880-1-ovchinnikov.dmitrii@gmail.com> References: <20221007145942.880-1-ovchinnikov.dmitrii@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [crop support for matroska demuxer, V3 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: OvchinnikovDmitrii Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: VinP+hBzEa2d 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 | 14 ++++++++++++++ 2 files changed, 33 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..412c7cc2f4 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -693,6 +693,20 @@ static int apply_cropping(AVCodecContext *avctx, AVFrame *frame) if (!avctx->apply_cropping) return 0; + if (avctx->container_apply_cropping == FF_CONTAINER_CROPPING_ADDITION) + { + frame->crop_top += avctx->container_crop_top; + frame->crop_left += avctx->container_crop_left; + frame->crop_bottom += avctx->container_crop_bottom; + frame->crop_right += avctx->container_crop_right; + } + else if (avctx->container_apply_cropping == FF_CONTAINER_CROPPING_OVERWRITE) { + frame->crop_top = avctx->container_crop_top; + frame->crop_left = avctx->container_crop_left; + frame->crop_bottom = avctx->container_crop_bottom; + frame->crop_right = avctx->container_crop_right; + } + return av_frame_apply_cropping(frame, avctx->flags & AV_CODEC_FLAG_UNALIGNED ? AV_FRAME_CROP_UNALIGNED : 0); }