From patchwork Fri Nov 4 14:13:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitrii Ovchinnikov X-Patchwork-Id: 39161 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp445164pzb; Fri, 4 Nov 2022 07:14:10 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4uAqoksIWAd+/oUl+9HZOMp/L8lnangOtwctedq+g9CnNAVkGyay5P+zYZo4gOTILlewMN X-Received: by 2002:a17:906:7313:b0:78e:c2a:a3fa with SMTP id di19-20020a170906731300b0078e0c2aa3famr33350343ejc.581.1667571250512; Fri, 04 Nov 2022 07:14:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667571250; cv=none; d=google.com; s=arc-20160816; b=kpFykEcv+CxnJECz1qAtDijFrJutMYNW/Wp6ZhVoZteDUivhM+8+bmFdcIUgXXEGk4 7S1o8SAQG6jYBKEBcMRTHm+pxbIayzzOkj1z3Kas5Gy2pvUren7dd/BX9eX1HicjKWGv T/oIkFtNHlS+grYpC4qMApco6qJ2MV+KvZ6I36I9rOrQ6NGqlGiSIXqkLxpjjpzaaYbV J1gkjvBJ4dBRDrF7SfgJCgkpY7uCUOwyqM0bvgGk06MjX7NXEkRrHxKyon/AzPyN6cFv /gL1vn/PFBhKll2P35LpSKry53kJ5g44zuHoNuFWG/Nle/il0FDpWcX8K3OWPmuIW1hY Kt+A== 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=LOwPlAoLf9d8357ht/yXl5wk7XsYBYUOR+FtVwUJsxrkb4qlHRsnZE8NcZP5SZH2Pn aXK63iEwnQbwCGND6w18WaxtoQAxA6b3symxt1To+snNPIPV/4wrIV83MeD8T+6fUuKc 0SbmV2bHc9s3ayNSLx+glIre8s0cKzZfXeUvruEunA2ojNIjSaPKo4RpF3jRd8xtHX/T 5AWv0r1khY0BhNVZQp6rMj+03/WpTAqwK9r93u0vOoK4s3keC7YUEgiQEuRJgnZ9vmoQ +bOydJwDhByiwg7R9EN2Rj+z0DLKPY5/4E0GxVNL4pSLpaqLoWxUMjBeQU2eGLbEIw1A +twA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=Ao2tECJv; 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 f15-20020a0564021e8f00b004630d0c280esi6949689edf.539.2022.11.04.07.14.10; Fri, 04 Nov 2022 07:14:10 -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=Ao2tECJv; 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 6A84668B72B; Fri, 4 Nov 2022 16:13:54 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0BE0868B71B for ; Fri, 4 Nov 2022 16:13:46 +0200 (EET) Received: by mail-wr1-f52.google.com with SMTP id w14so7223986wru.8 for ; Fri, 04 Nov 2022 07:13:46 -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=Ao2tECJv6lyS+fQCefDVk2vdSNS6yLewxc9wJY/7XvteySVGsPZdZTIMdRV1dZPql5 WYb0RyVmoFIfNXcZUEKNVn4sj1crtOjFnWbPNOdl981sybaYLl1fb0nVr0wgphSwS3A2 ETWQcXybYeW4OMY9Gfurg5XyG5NlaOyQsvndeYNfxV1Szf+IJea/pptwrk7JopnwwBdU sLCyrD1bMVheXYNIxE2k+dQgaDvK3cJCLe3Wjgp0w5Afk+WEjOG3ce6qBvUhu4pIGpxm sU1pfPs119XaxxwExDP3q++kBD3LmujomQ51toUhRJuieD2FM/0+7hBC2uqg8bK3m8Lv UQbw== 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=NleSVMBFPo8j3HhXXwHO6q+YPAo90rWzARVkaT87Dy4BVWp6faUYW/Rh8SuNTUUUVO yHKFleVadpLcOXSVD2GsCe6NlXqlVUTa0+xEFFLveI2EgdNDXV46FAGBmxyi7e77xspz al2RAMTFnhFYI1EV6z7o0OhhBh6DJzQ0xEsGvGTQMmtxWFBI8eU5fRiBPPi4mLmVSN6b jHEIzEBV66ahLrKpCmCltl94p2L0ISDFmcyFvWcReCzDfzcKJ0OOkqsYxK2LQ9d9DcOo iYj8l2Hlh7z3sAHZrk+WAUvey6ZQ6vsfUdzr4F8q4bYoetHUxciF7qBdWQG8rpMiAVl/ 1vQQ== X-Gm-Message-State: ACrzQf1GyEFEAMrbF19CUDzqwYK8e80t1jkh1akqdHF24rZlzbqcxJpf OoHTF3KTSilM6yWKqhgMvu+QFJHzQQxDDA== X-Received: by 2002:a05:6000:15cd:b0:236:9701:7bad with SMTP id y13-20020a05600015cd00b0023697017badmr22284473wry.679.1667571224895; Fri, 04 Nov 2022 07:13:44 -0700 (PDT) Received: from dovchinn.amd.com (178-222-23-217.dynamic.isp.telekom.rs. [178.222.23.217]) by smtp.gmail.com with ESMTPSA id f10-20020a05600c154a00b003a2f2bb72d5sm4021436wmg.45.2022.11.04.07.13.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Nov 2022 07:13:44 -0700 (PDT) From: OvchinnikovDmitrii To: ffmpeg-devel@ffmpeg.org Date: Fri, 4 Nov 2022 15:13:36 +0100 Message-Id: <20221104141336.1812-3-ovchinnikov.dmitrii@gmail.com> X-Mailer: git-send-email 2.30.0.windows.2 In-Reply-To: <20221104141336.1812-1-ovchinnikov.dmitrii@gmail.com> References: <20221104141336.1812-1-ovchinnikov.dmitrii@gmail.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: OvchinnikovDmitrii Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: WjFbGYRh1xpr 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)