From patchwork Fri Oct 7 14:59:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitrii Ovchinnikov X-Patchwork-Id: 38605 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:789c:b0:9c:c2cd:5584 with SMTP id bf28csp71083pzc; Fri, 7 Oct 2022 08:00:27 -0700 (PDT) X-Google-Smtp-Source: AMsMyM55dW0NevnPFlrAp0tHQhZL6iwVN93URP+BCBOZymOHtvv9uj/6MPcvm9uLHZydou+RPzPN X-Received: by 2002:a17:907:3f85:b0:733:3f0e:2f28 with SMTP id hr5-20020a1709073f8500b007333f0e2f28mr4434553ejc.376.1665154827720; Fri, 07 Oct 2022 08:00:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665154827; cv=none; d=google.com; s=arc-20160816; b=rtYc3L9OYg1Iw0E6KyP8obhSTIaPw+wp0m2sDqXditoW4QG2ySSh6wTvHec+DATwM7 mx82mqDtq5ED1nu1xTUoZBtbNbazKRpecCFDwGm7ZxPXOfJbijEhJ1jUgutPx/Wbs8SA rfwsZIS6/8bMetusXYqI34Bi/233KHMTxyRl6GDBzvMLx1oawVmf3yrxNpwQubIHTz4d iMnTYX0TexSm0CQABt/nJAGSzgYJ4o65NBN5jOHPow8p7ouFu12oqdNuOCt/NAMEIp+W BRAHnD1IHJr2GTQkb9lG+/M0T1sl5xykegL9HfD6Q80kEu3zALZ9y3CVcMpOvxJAs1zJ ZUeQ== 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=57MIS0ABsmnzJZtXTSbk36JPc03FAXikwD/K2cJqnSY=; b=MJWfrZrWm0hIjBDR4bYHN7o4cyqk0qjAfPAiZzkaOU0lbMAO3ayCqQLIITKOlYMeW8 YkFV6sUX0b1YHYXUGytSdRt0ETBgIpcmlOB8dKvEGEYy/EDRRmliszZJ81HPDBz4qSs6 13vSVO9+gPNKTCZBSmw2y97bA9muex69lJOOAPR3Dgfso7e1NXeHMM3eSaqCPEzNR3pP GAWDFgcCuD5S3MPoSem+ZA+fpxF3LsAUDVxJgWyDf1FpkjEHeKKmMJJ1C55+2cDvE/lM +v5ZQ60M+D1F+28TEverSy6LCUtbmaz+XLsjZR0/iF1NfRtKJKYaBG8WoMB03WFF9lNA GsOw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=Jdzcl9nw; 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 nb13-20020a1709071c8d00b00781c9c3b6f5si2829095ejc.474.2022.10.07.08.00.27; Fri, 07 Oct 2022 08:00:27 -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=Jdzcl9nw; 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 B2A3268BB97; Fri, 7 Oct 2022 18:00:04 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7004868BA1B for ; Fri, 7 Oct 2022 17:59:57 +0300 (EEST) Received: by mail-wm1-f43.google.com with SMTP id p26-20020a7bcc9a000000b003c384e59047so785196wma.4 for ; Fri, 07 Oct 2022 07:59:57 -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=EMKN36PBkgiECH2gzWDbrsJ24HfA3V9ZKSlVvR2a6Ew=; b=Jdzcl9nwE4P8E6XYhbt6d8OPj1gr3Lo+fjMotBPQVfpDVnlqCN3ONkZ1llBOAz3CDZ TqV5lAMZkgNMSeAAnszt9AYMe4imeJ4P8cT9fX5sEtwQW7z597CHDu/kZO2dIYgOCljx xkehQz0UDxWetF2ITHsJMAL3K+x7WLlW71onU9l63851zPe0UacLLcUHfkOxLEJFN+uG RfzzU1Fn9iDBEMThcvdV9CUGyGydEWY0d9uteOElJCTFU8tth+DkD8/cvxYT4YuK4c/T tmx2t7b992q107ZZ8+/yo+WnQ6ujF8ib4ubsmDT4BpkL6L3TP2NKB7Vke9kjzmQFI2Wn vzbg== 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=EMKN36PBkgiECH2gzWDbrsJ24HfA3V9ZKSlVvR2a6Ew=; b=Ha7p6ag0qO8/eLt+by6bvEzs0Vtm0upL1dLjIlyqJ8kcbtYkbdaz/mtLVhISfVqo+l r1BNMJv2S+bhQIELGiUO81DeT0enPcXScSAAcw2k3Bkgwp7w7j9SjiMEY9exSq4ocsCq OxVIc5QhawoUSdCwgbyjuJwVB7/kMadOygdGvGLXMU7ButP2M6IpXmJ7ObngqNvd6a2X kkVm0chd3WfEMId9znPWy7Hlk6GmL/cWLHVFuCeHTnks0K/PCy9//WM+ZUFk5MUJhQej 6vPM69XaDJ8L8yU1vwNOdURO1ro3X5/g8tSy3LvhsDQ5deHjCkSbTDqsZwsegQ5IsUnh 0NQA== X-Gm-Message-State: ACrzQf0UOvP3Zuz6svCr7eYZRLbRuCum+LOS405/1kCueAZpNiJGCBPm Pd87j6FBrMZfSPO76t7VeDX5QEc7yMPB1Wpw X-Received: by 2002:a05:600c:3d0c:b0:3b4:c481:c63b with SMTP id bh12-20020a05600c3d0c00b003b4c481c63bmr10204214wmb.147.1665154796439; Fri, 07 Oct 2022 07:59: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 o5-20020adfe805000000b00228cd9f6349sm2245302wrm.106.2022.10.07.07.59.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Oct 2022 07:59:55 -0700 (PDT) From: OvchinnikovDmitrii To: ffmpeg-devel@ffmpeg.org Date: Fri, 7 Oct 2022 16:59:42 +0200 Message-Id: <20221007145942.880-3-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 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: t/a4S67LgQiQ 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 Previous discussion :https://patchwork.ffmpeg.org/project/ffmpeg/list/?series=7668 --- 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)