From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id AAAA14432A for ; Fri, 7 Oct 2022 15:00:15 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 48D7568BB75; Fri, 7 Oct 2022 18:00:03 +0300 (EEST) 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-Google-Smtp-Source: AMsMyM5jcuWMeLK6ohFwRoHtWCwJ5PrikFWI4v/uJvHbG4SUqXIUjXko3pk46NibvxHuUc57+OW7OA== 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: 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); } -- 2.30.0.windows.2 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".