From patchwork Sat Oct 1 06:13:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitrii Ovchinnikov X-Patchwork-Id: 38487 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp99084pzh; Fri, 30 Sep 2022 23:14:09 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7OreQPD9VhGEfv3sx97AkT02zRgmDRgSEf00HFcSUy7VHIn0jTgPOOQSjgXtzZLf+ylcgg X-Received: by 2002:a50:ef13:0:b0:458:7ad2:cb8 with SMTP id m19-20020a50ef13000000b004587ad20cb8mr5883881eds.229.1664604849092; Fri, 30 Sep 2022 23:14:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664604849; cv=none; d=google.com; s=arc-20160816; b=bX3r49K8NpjrkFut/OhXAZHwfaxdt6Pt/+4+jH4sua4RqLO9ZxeoSB0sk/y53SKAXy GadVU6DKe5BOXdGScpccMoRnh+H7JHBHwm1KOBC31nB8JJuSR1DU4eqwdklAmdGZORVF E81i26gWvn0ZP8znO//ADpgcRByjzfqR3RvSq9oPPQccnbU3Gn8JBEqfSlM229ah+x/n f7fmPS0+x+jtqVwOU7KsWUnzW1PIzAauOJqR2Tkl74j0JuD4kLJcqmKyrdTQdoiJTjwf OE1n3C1VNR/tRSUGNQDpEubfIgN6EbCyoQIKCcuogsNsBz1ygG3IjmorXT3xtDMc17qQ bWyg== 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=q37UAJ6gsphroYxpsUWfRpRtw3HFV1ZsJefsvgDOvTw=; b=prgK6TTwiY6lHZpMtW05GxZ0GQJ/uafo7AiA3ypGb0dhWuZwpVW6dKosrrww6WUoXj ICTrf1ws1Zj4ug621Y9W9SVRAmuEpDuf8+ynGEoXQzX55sreDor87uoJX+AjY2NJRi2k T8tpL43Qe3zain2UISDMjwOMz3O5Zadr/oSSUUrQbLVZouwNj5Gzeb/SKgCmzL9oamtf ZKWS8nvbhNrEGf+2XiSkskV1+qjEfddecm1D8NdKyaQg5xkN+d0x2N6pmbTBhvhd951l FROCi/0Yq/4akodoeTW4/0cOAuOVD/FaJWBYr2jd8CM9khlTCPl2XW2I/UXaeb2izPrJ 8KEQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=dKjeYsqe; 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 f14-20020a056402150e00b00445f3dd3861si3240880edw.313.2022.09.30.23.14.08; Fri, 30 Sep 2022 23:14:09 -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=dKjeYsqe; 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 9ABED68BA90; Sat, 1 Oct 2022 09:14:04 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9753D68B3FD for ; Sat, 1 Oct 2022 09:13:57 +0300 (EEST) Received: by mail-wr1-f47.google.com with SMTP id s14so9779737wro.0 for ; Fri, 30 Sep 2022 23:13:57 -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; bh=H+3ei9ArsW2y5Zt1OyxWyiVFotUkmo5SCkz8BIfpx3E=; b=dKjeYsqehVIa1rGv8DO9ok8WBBA5M/WEFWfAhSbr89X9kZhXAch+aidBN/33rr/2dA DjA9eonFBeKDPgDBFUmT9z5GRuiE8WdzznEdOc0X75avXGKT52Fyvgbbh8NF/zJOce06 wvhdoCxmRnrCJrlntRY9/M4jHvRZuueHDdlZntpa0uqMZ0WGZFMv6d9nzKqKZOKOkQ3q TAxEynjnGhtnkRKxlF95RTfzH5+bqWkO41c4kyOuD0kK28vNLxV3182BUjuUpLjhI5zL RKFu5cX/nJ6QV8T2qLXe0p0Jd62zS/Y/HYgaZn9RSfylREzc3jPnA8IlhGi4+USJ530R PSeQ== 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; bh=H+3ei9ArsW2y5Zt1OyxWyiVFotUkmo5SCkz8BIfpx3E=; b=JXjCgqJg8hIFfSWXyuIKy5gkhSWn/DH+zHJjq1kFXwOnRq1JdIIIhtTzeMR+AqHqmJ ayjxNlyTLaiStSopYKPrTK9ppDu9wmIT+f/4DuWLgbIqw4eP55djg7d/rd0t23cASWuc /5N7EZtZ/DZGPtGE86vWtWBdHCzTS9R2TMTggNrUM6QVqygw0cpMU0J2PBjIh40S6tMz azsWgkzbcFwnUmsZOmbI9tq+WimoWDKYDyzr3XCYORf1vcv0tkVxyXvy5DEvwLs0qz8k JO/lO2Zz+Ci3Es1y7Ub27jCXmgMgvqTP5/y7wdCLpaoAatHaTTJ5zGN2HfExQRV8K5yk ZUfg== X-Gm-Message-State: ACrzQf2jGLZUmSklUqbysmw5vubsr2kOil0PF3KR1w1g+6j9gmNxCBKg GuBwOMf59LYkY4hW1K39UOLen7V3Wbmang== X-Received: by 2002:adf:fb10:0:b0:22c:caa4:da2d with SMTP id c16-20020adffb10000000b0022ccaa4da2dmr7813448wrr.139.1664604836425; Fri, 30 Sep 2022 23:13:56 -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 bv14-20020a0560001f0e00b0022ae8b862a7sm4171739wrb.35.2022.09.30.23.13.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Sep 2022 23:13:55 -0700 (PDT) From: OvchinnikovDmitrii To: ffmpeg-devel@ffmpeg.org Date: Sat, 1 Oct 2022 08:13:39 +0200 Message-Id: <20221001061341.662-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 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: E3ROnuX0pGSQ --- libavcodec/avcodec.h | 8 ++++++++ libavcodec/codec_par.h | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 7365eb5cc0..66df571afc 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -585,6 +585,14 @@ typedef struct AVCodecContext { */ int coded_width, coded_height; + /** + * The dimensions of the crop, usually from container. + */ + int crop_top; + int crop_left; + int crop_bottom; + int crop_right; + /** * the number of pictures in a group of pictures, or 0 for intra_only * - encoding: Set by user. diff --git a/libavcodec/codec_par.h b/libavcodec/codec_par.h index 7660791a12..c730a79957 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 dimensions of the crop, usually from container. + */ + int crop_top; + int crop_left; + int crop_bottom; + int crop_right; } AVCodecParameters; /** From patchwork Sat Oct 1 06:13: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: 38488 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp99147pzh; Fri, 30 Sep 2022 23:14:19 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5WVCdtoTEDH9Q+4Z1j+h2JFGgZlHBepyEOewG/DHPdoQrxXNio2ve8hu+mQG6RPvipk8Cg X-Received: by 2002:a17:907:2c77:b0:77b:4445:a852 with SMTP id ib23-20020a1709072c7700b0077b4445a852mr8864112ejc.582.1664604859712; Fri, 30 Sep 2022 23:14:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664604859; cv=none; d=google.com; s=arc-20160816; b=0mLRLaEbigoPsmyOx6irAlpYZZw3PQlNac5gMT0K8PuD4C6SmxLkWxdTyuZd6KpsAL iMfbIyeiR2ivCLkYN4Pb+iqQlRMdoCzGr2Zj7riTuq5Y1Wq0FM2LMIVdN44MoIJBRZjx 0iNbf/Ip0qDKSN4RzUUFZ985qOXMd8fJsB/RGS7mWLhblHPrWjCwiBqMP+67RfqEimRT wEWQSKhBE+Ieuk/3asMjeRM4dM8DJSmNUQNjvylXubnnLE9uaKaq3Vd6s9enC97z+XSB O1ktrQLkyAWSYlpR085jBxKKqjn8zjoD4cGTffUYFoVf3nSxiJj5UmTuoyCiwba6UegQ hLOw== 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=JwBHGtoaMWt27IUfUeiZ9qtYLRA6K44VttZIskLwYys=; b=MHk2jPR+lpv6b9pwfBbyREAF2Ds9CY7o2pV/md7tS7JYQ2icoFlCteUxUCM5no0FWT WHr49pEEMyvyEyGjYQqbnWxnVrTI6fb2fBbvgibqrxKjvwdhtY20GntvWZ3sFdd4Yp74 naLbgAMaJ9iyoP7GY6KOZVr759h/Y0cPj7BDn2vm4nrscVRNngPzbLFncum9copguEfr r5yS1f/750kTga1W8rhVB9vy+cw3kaoivyZZ2WDGeAJBwKbdRW/g2sY/Y/a2i2EUfQNa IUO3NoMGeV9Huk84oj7cfKXCHvX7WNNqpyXoT3/kC1xmYSuFpfyPi3pNP3iZdGSEY6m/ nDRg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=qZKfAPX7; 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 ju14-20020a17090798ae00b00741a1203f93si2582649ejc.1009.2022.09.30.23.14.19; Fri, 30 Sep 2022 23:14:19 -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=qZKfAPX7; 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 A76A668BAD2; Sat, 1 Oct 2022 09:14:06 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 90B3968BA8D for ; Sat, 1 Oct 2022 09:13:59 +0300 (EEST) Received: by mail-wm1-f42.google.com with SMTP id z13-20020a7bc7cd000000b003b5054c6f9bso6159184wmk.2 for ; Fri, 30 Sep 2022 23:13:59 -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; bh=H8LE0iXY563yY2OPdkcT8TgOCfWi9f6JlAWAWqGIC20=; b=qZKfAPX7FWGMGIoJ4eOJWJUVjnJQtR8paS2Z7gbDLQYgIUgGBdUmO8Lgkx/Y/eTiOO ixmwuf3ErR+XGtzYkEyQnSEeYGHLkbeJ1Xaf0r3A8g7lib0RIVkWTGyOLhsUAxuvpdNy /hspo2wImeBVBEkUPUs148JZL14pgMANY5ypXLQIGyi19rqOWZ81ZRaT16rqzVdRRjSV JZb7bMmyalAg4OHv3xgZLyV8gd5O0diMIgZ8KAm+JGwEI9oFZiqUNlB1Jtklkcgx5YZb cnc1+rYJAMttuOF/HWaAxh9zibuA+oP3z//B8VhxXrz4yeJr7qYS1gBnQoGm0FnW7yEI 9Iig== 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; bh=H8LE0iXY563yY2OPdkcT8TgOCfWi9f6JlAWAWqGIC20=; b=Vni6Jx/K8VsG7YxtfEc3YYXfkWNAGxvVsLYF9MTOBOxq3yoNLoxZNg7iw+OEXVeSuw 2cjjR9m2d7DT4wDU5mI2RfGtqg0cUw7AYUUia1LPq2TxZ8WDuzsLXbIa4HK8O9fxnrSA N4m6hK/rqBoAHexQeOy67RuTk76Jl6B+rgfwmeA6FFfuhBzeLO2X85kca2OkK4Onsvep 6PTNA46tYFO5FSfr+xnVdsOSI7Z0Q+WsVRd0a5UZ9g0zLXMv61hKYzEALgveLCbSViWY YUvTR3YScpxzhzVtjihl66uANlhh7EWUfSFefbyCwRrUrwKFwnoFZLRRF0SXQK9K5hyL aBlg== X-Gm-Message-State: ACrzQf2/R/z7pKn+pjFKya11YifdadyHMIpj6qPTSi/pG5cYxc5y+kjC 1MbZ4S4oL3K0DT0YZyHsEtzrXRjwtmgvYA== X-Received: by 2002:a7b:cb91:0:b0:3b4:75b9:5a4b with SMTP id m17-20020a7bcb91000000b003b475b95a4bmr799425wmi.33.1664604837903; Fri, 30 Sep 2022 23:13:57 -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 bv14-20020a0560001f0e00b0022ae8b862a7sm4171739wrb.35.2022.09.30.23.13.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Sep 2022 23:13:56 -0700 (PDT) From: OvchinnikovDmitrii To: ffmpeg-devel@ffmpeg.org Date: Sat, 1 Oct 2022 08:13:40 +0200 Message-Id: <20221001061341.662-2-ovchinnikov.dmitrii@gmail.com> X-Mailer: git-send-email 2.30.0.windows.2 In-Reply-To: <20221001061341.662-1-ovchinnikov.dmitrii@gmail.com> References: <20221001061341.662-1-ovchinnikov.dmitrii@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [crop support for matroska demuxer 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: LZ3+yPh+aQTS Support both simple and receive_frame api The container crop information is applied additional to frame crop information --- libavcodec/codec_par.c | 8 ++++++++ libavcodec/decode.c | 20 ++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/libavcodec/codec_par.c b/libavcodec/codec_par.c index abda649aa8..f74964a817 100644 --- a/libavcodec/codec_par.c +++ b/libavcodec/codec_par.c @@ -118,6 +118,10 @@ int avcodec_parameters_from_context(AVCodecParameters *par, par->format = codec->pix_fmt; par->width = codec->width; par->height = codec->height; + par->crop_top = codec->crop_top; + par->crop_left = codec->crop_left; + par->crop_bottom = codec->crop_bottom; + par->crop_right = codec->crop_right; par->field_order = codec->field_order; par->color_range = codec->color_range; par->color_primaries = codec->color_primaries; @@ -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->crop_top = par->crop_top; + codec->crop_left = par->crop_left; + codec->crop_bottom = par->crop_bottom; + codec->crop_right = par->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..548225c904 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -324,6 +324,16 @@ static inline int decode_simple_internal(AVCodecContext *avctx, AVFrame *frame, emms_c(); actual_got_frame = got_frame; + /* crop for simple api mode. apply additional container crop info to frame */ + if (avctx->codec->type == AVMEDIA_TYPE_VIDEO) { + if (avctx->crop_top != 0 || avctx->crop_left != 0 || avctx->crop_right != 0 || avctx->crop_bottom != 0){ + frame->crop_top += avctx->crop_top; + frame->crop_left += avctx->crop_left; + frame->crop_right += avctx->crop_right; + frame->crop_bottom += avctx->crop_bottom; + } + } + if (avctx->codec->type == AVMEDIA_TYPE_VIDEO) { if (frame->flags & AV_FRAME_FLAG_DISCARD) got_frame = 0; @@ -707,6 +717,16 @@ int ff_decode_receive_frame(AVCodecContext *avctx, AVFrame *frame) if (avci->buffer_frame->buf[0]) { av_frame_move_ref(frame, avci->buffer_frame); + + /* crop for receive_frame api mode. apply additional container crop info to frame */ + if (avctx->codec->type == AVMEDIA_TYPE_VIDEO) { + if (avctx->crop_top != 0 || avctx->crop_left != 0 || avctx->crop_right != 0 || avctx->crop_bottom != 0){ + frame->crop_top += avctx->crop_top; + frame->crop_left += avctx->crop_left; + frame->crop_right += avctx->crop_right; + frame->crop_bottom += avctx->crop_bottom; + } + } } else { ret = decode_receive_frame_internal(avctx, frame); if (ret < 0) From patchwork Sat Oct 1 06:13: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: 38489 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp99204pzh; Fri, 30 Sep 2022 23:14:29 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4873yIET6ci9t0lzTdvMOICmQ/DAxvfA9GQkdvM+CQhNASdrvwRy1cGxKhTa8y2h2Chse0 X-Received: by 2002:a17:906:cc15:b0:788:4c5:808c with SMTP id ml21-20020a170906cc1500b0078804c5808cmr4418066ejb.699.1664604869221; Fri, 30 Sep 2022 23:14:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664604869; cv=none; d=google.com; s=arc-20160816; b=ArSUSpmbq+NvrqZ67fV2XIfJkQZrtxqgSpCdJCpH1us8utkm85MMv4neEJpcx959ng b5oBO/WZ+Fj5/KqCAy8S7YOS/b0oWcs1NpvG4Gg5lFulHTP7AqnG5hjaL8RIy5g+O9q6 zZUpw+rcQdjJaz+mJ4jpdU+r6JPY0+nXrUn+TWNZQG6y8rPjYlfQ537nx7UDoU5AI0Da YeL5RAV2LzlWGyJY9JAkpsXHiK6JPaLYLg6LuzQ6XFBFj8Z/a9Jxpo+KK3g5wc19njDE W5Gjdizx1vnVE0kvvkO8ercAwuS9OwgUI4VdOd72rGe+DcxYEw4xo3NdOMbMIM3CktfP ItcA== 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=njfwGhHtwNB8PJ/vEsbFoM/hFKWIyVAqcfumnmfjqGI=; b=rXCS1SY0tuQBMK5qsH2klS2Z43GbT4gqT96sFgoqdvffZGfvJgn0vV1hW1DMYIi4AF FJzoyMIGuOenZ8xN2dJI14bd1y81BdhBANTZz+KygXSHjo9LmpUxrIA6N+qVDrTXj1Yz VbkNDJuvx5RAdxrnbxycR0G8l8Q2UPFRxLPrsVezIbUHnSP6xPMOrUwd13oonEXK8TQD xVomnLIOVjtd/GT58ytDFA6POtYkBpqQlAdHLedLAjf7KqafF/42bmPPFGgv9ugQO8P3 sxPGuUZbTzoavMonjK9Oc7193+VY/RN5GnPTLBcPrDpCJj8XicLQjVjJimYao5c391Ex VrqQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=aZkpRZgH; 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 n12-20020a50934c000000b00448d387c327si3285407eda.181.2022.09.30.23.14.28; Fri, 30 Sep 2022 23:14:29 -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=aZkpRZgH; 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 B582D68B3FD; Sat, 1 Oct 2022 09:14:07 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1920C68BAB2 for ; Sat, 1 Oct 2022 09:14:00 +0300 (EEST) Received: by mail-wm1-f49.google.com with SMTP id t4so4088073wmj.5 for ; Fri, 30 Sep 2022 23:14:00 -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; bh=nwcp989pQgRD3YcPcWPZQA6e6MrlT9pQS50uM75oqPg=; b=aZkpRZgH5uJi2ACbim8F9s8A5TCtWW/m/dePYiay7eXv2+NUcFD6Q/lH3FFErZh0+2 zbhyHN/xgh+IRXjAeO3mVp2cfzA+dqmnjaV52vfL2NzuKVGNu7jfRIUrGpzZj3srZLS3 a0c2xGVa3qD7HLaKWzpoXHkt5L6EBxucCHimdxYqGugVbeeExcwHPE9rcTAIyV2Az/aU CXjp9hZBp/AC46hEKG3K4V/79qsWY9czqoW57ppNbZz6y6DkAmP3agRFQNsuK+IydcB7 m4n8lU6uSJLEOJeD0rFZDOqQ05JJODMj9D9+kte6mpqKU/olCpFN3HmImUwPGzgDo0fQ kyyg== 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; bh=nwcp989pQgRD3YcPcWPZQA6e6MrlT9pQS50uM75oqPg=; b=NHlSY6nHFTb8MYYg69Qufa3T2GIDXOQVIPp0Qq9Ri9DjyLQPaOZExkZrDQbVQOW3YU JepgzXhu1TJfKNDyA+b6NdgGwaDpBk3MJdfjCQJ1Cy5NlJ44kZeavKgAsNtkKiyK9cYd kQ8aacT8Vf4H+TneLHtZlOc3O4DbSjfgqqJujVwZVFNNej0zT2TQvFXD85p5dOIujDXZ LgH2T2GMylS/OLR8Ta2VExid0aE76dgSe1HnFaZXcMKp90TYgdCtbv6WLWNwPMpzdFOO mGt22t0bKH3ipQiC37l6VZtSuBcxC17rH30mCxRMViH4vHJTI4beBixLMMbixG1hKfIH QiZw== X-Gm-Message-State: ACrzQf0RsSXoXmOUfH9qZoMlMGIMOUutzcwTqqtzpVDZAByJ06hh8GMQ oDViTXocR0ufet1qpZkCv3Q3LKN6sP5Uzg== X-Received: by 2002:a05:600c:35d2:b0:3b4:a897:d48 with SMTP id r18-20020a05600c35d200b003b4a8970d48mr851547wmq.48.1664604839033; Fri, 30 Sep 2022 23:13:59 -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 bv14-20020a0560001f0e00b0022ae8b862a7sm4171739wrb.35.2022.09.30.23.13.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Sep 2022 23:13:58 -0700 (PDT) From: OvchinnikovDmitrii To: ffmpeg-devel@ffmpeg.org Date: Sat, 1 Oct 2022 08:13:41 +0200 Message-Id: <20221001061341.662-3-ovchinnikov.dmitrii@gmail.com> X-Mailer: git-send-email 2.30.0.windows.2 In-Reply-To: <20221001061341.662-1-ovchinnikov.dmitrii@gmail.com> References: <20221001061341.662-1-ovchinnikov.dmitrii@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [crop support for matroska demuxer 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: OvchinnikovDmitrii Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: IWNc2WXIbjFD 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..e7b00cdbe6 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->crop_top = track->video.pixel_cropt; + st->codecpar->crop_left = track->video.pixel_cropl; + st->codecpar->crop_bottom= track->video.pixel_cropb; + st->codecpar->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)