From patchwork Wed Jul 19 22:20:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 42852 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:b813:b0:130:ccc6:6c4b with SMTP id fi19csp1498368pzb; Wed, 19 Jul 2023 15:21:27 -0700 (PDT) X-Google-Smtp-Source: APBJJlH9RGpHZ1UH6QViAc22WFwbnVniBb47TnMBBzQVLfyzU8Rse5i3g72FYEB3YNFdcOmgPnP9 X-Received: by 2002:a05:6402:2048:b0:51e:677:603f with SMTP id bc8-20020a056402204800b0051e0677603fmr514274edb.38.1689805287441; Wed, 19 Jul 2023 15:21:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689805287; cv=none; d=google.com; s=arc-20160816; b=WZo9JPhg+f7vPf+cYGqJo2qwOC/Jz94lqR4wr0gEhYP1vSg+zzSPCTHIW1bRSJ9fAw pJMVw+mMfc9NgBouWm1p+4hrdzZMKiC8kse9WC0EmMqvvU0UEjy/wn/DfcBlnLDtmCHD wIEjP9LarH1b4GCE/PWn5+MuSK8bbjTjMbqupkI/b4G8Wola6Jhu0/MQTnG8jNknCw71 XiSAETZ0zWzJiOg1Yw2j3WR8rznrtBYQz+ZbMizhH7/XMe6lCOk3sk1mQzqm7Qu+nbG3 gvMn07JH3hOc2vOFUgwocLGl/Ns8nHix3v8vRygw9CnnqXYbu4Hl11hDuOSg2rAcUpiv TUsg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding: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=bBvDvb7E6IluCS8HQFqraWw+ypeP4XaaN6bOo3mwNp0=; fh=J3zlMo7rVW2t2IQYogliBcMNuBh6YQg7NRChcrschf4=; b=AcddAeWerFR1CpfxyidUdJaijA74KgafnqzX4DMIOkRA4yNaqJixpF5BHLplCQsvjz YPcS96n59jN5UkIEn6ZiYZ4IE9eD6pkgWb2pJfn8GTziVL1R1fySwKapVPvaCT7SCfRT xRQDYYqyXZ8px/1VyADpe/Tez5UsnFsm1buBqWv0G8nwZKl8iMsdMZr9+FaFfXcJzHMR ZNElPMWj9ccQd1Rmg+8o/Am8KjAJuhUzPP60goko3Aeej1GNCseaHCmPQ77I1qdFPink aI7LjLPL+BTtgBZngs4ICGMXyglaNRteV5MvWp3WOEsG95w4L3vCNKiZPfjgkPmgZdsn sPHQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=jXz6PGTC; 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 r26-20020aa7da1a000000b0051e0ea53eafsi3750203eds.558.2023.07.19.15.21.26; Wed, 19 Jul 2023 15:21: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=20221208 header.b=jXz6PGTC; 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 B614068C5D2; Thu, 20 Jul 2023 01:21:06 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oa1-f54.google.com (mail-oa1-f54.google.com [209.85.160.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2A2C068C5C9 for ; Thu, 20 Jul 2023 01:20:57 +0300 (EEST) Received: by mail-oa1-f54.google.com with SMTP id 586e51a60fabf-1ba4460f0a4so135777fac.0 for ; Wed, 19 Jul 2023 15:20:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1689805255; x=1690410055; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=Y3EDguPmmOaNx1rFROz3/9kDkyWC0iIpfw35cp0enV4=; b=jXz6PGTCsfJZyjwEkKWpEtlW3mDAStISVoOY550D204eo+9Lyo9AmAWi51UsblPq1x w6mzCnc+qiMvOzE4sommfsYPfpEE4GZz1Q7rw2km0oQf9EXoE4jZIetUwvR9QEbPyc4D IseCpjCYNt1cXFl8bQEljt/c32wT5s0QpX9BFfgC/S2hlfqg93dcSmOwu5LFRVGGO9gq mzw6N+eOcOIrpOBhKxi2Mt4d6u42J20am4cImL22j/ayYqzi0z8IpD55wKMPfpYJm9Qv VndMsc4mjOcXs31igSwIyT23GiUdpBoBxur0lQO1VdzLz4JtmrpXAL29xXTGfLMNoMRi TZVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689805255; x=1690410055; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Y3EDguPmmOaNx1rFROz3/9kDkyWC0iIpfw35cp0enV4=; b=Hdy13sLwSjSPnrdSQljCZX90EgkEYCeYxbGsB8fmc4TH0zpR+WrfdtaYfJxUL3DUKq ILkvzeIL3cSVypgZc8rQ/jvZqx05Fay/+GW4RAn8W+MZwt8v3Imjrr3jIap2dRf5yXu4 NebCHwQ7tYlGQybV7VWu4NrdxB82kS8wQQv4lqZM5VLexzOWRmbDY8tnoPqw23hilAZS dnOgHzo3avs/AV6KmN7qH4Se5zJ29TOagQ76QK6eVK7Zyio8IVhlxc1pBQ5z6X7PX/x8 xVTGY4dF3ZEympC4DudKnQeKQFJrhARxEQeNqNm1cK6tz3MZEUi6xRNjFKslSxtdWMFN /acA== X-Gm-Message-State: ABy/qLZI8An0Wm70M9o5AoM3xbU61VYepolFltKaNMYYmqoj1lvwPsU2 LmVJtL8G8sU1Qhsy/yY06+xh0k+bq48= X-Received: by 2002:a05:6870:5b99:b0:1b0:649f:e68a with SMTP id em25-20020a0568705b9900b001b0649fe68amr3909937oab.25.1689805255420; Wed, 19 Jul 2023 15:20:55 -0700 (PDT) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id k2-20020a056870350200b001b36c56e6a7sm2371370oah.44.2023.07.19.15.20.54 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Jul 2023 15:20:55 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 19 Jul 2023 19:20:41 -0300 Message-ID: <20230719222043.59743-3-jamrial@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230719222043.59743-1-jamrial@gmail.com> References: <20230719222043.59743-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/5] avformat/matroskadec: export cropping values 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: s8E0LOLgLa3z Signed-off-by: James Almer --- libavformat/matroskadec.c | 49 +++++++++++++++++++++++++++++++-------- 1 file changed, 39 insertions(+), 10 deletions(-) diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 49950956b6..46459b3dc8 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -211,7 +211,13 @@ typedef struct MatroskaTrackVideo { uint64_t display_height; uint64_t pixel_width; uint64_t pixel_height; + uint64_t cropped_width; + uint64_t cropped_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; @@ -525,10 +531,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_VIDEOPIXELCROPB, EBML_UINT, 0, 0, offsetof(MatroskaTrackVideo, pixel_cropb), {.u = 0 } }, + { 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_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 } }, @@ -2527,10 +2533,21 @@ static int matroska_parse_tracks(AVFormatContext *s) track->default_duration = default_duration; } } + track->video.cropped_width = track->video.pixel_width; + track->video.cropped_height = track->video.pixel_height; + if (track->video.display_unit == 0) { + if (track->video.pixel_cropl >= INT_MAX - track->video.pixel_cropr || + track->video.pixel_cropt >= INT_MAX - track->video.pixel_cropb || + (track->video.pixel_cropl + track->video.pixel_cropr) >= track->video.pixel_width || + (track->video.pixel_cropt + track->video.pixel_cropb) >= track->video.pixel_height) + return AVERROR_INVALIDDATA; + track->video.cropped_width -= track->video.pixel_cropl + track->video.pixel_cropr; + track->video.cropped_height -= track->video.pixel_cropt + track->video.pixel_cropb; + } if (track->video.display_width == -1) - track->video.display_width = track->video.pixel_width; + track->video.display_width = track->video.cropped_width; if (track->video.display_height == -1) - track->video.display_height = track->video.pixel_height; + track->video.display_height = track->video.cropped_height; if (track->video.color_space.size == 4) fourcc = AV_RL32(track->video.color_space.data); } else if (track->type == MATROSKA_TRACK_TYPE_AUDIO) { @@ -2955,14 +2972,26 @@ static int matroska_parse_tracks(AVFormatContext *s) if (track->video.display_unit < MATROSKA_VIDEO_DISPLAYUNIT_UNKNOWN) { if (track->video.display_width && track->video.display_height && - st->codecpar->height < INT64_MAX / track->video.display_width / display_width_mul && - st->codecpar->width < INT64_MAX / track->video.display_height / display_height_mul) + track->video.cropped_height < INT64_MAX / track->video.display_width / display_width_mul && + track->video.cropped_width < INT64_MAX / track->video.display_height / display_height_mul) av_reduce(&st->sample_aspect_ratio.num, &st->sample_aspect_ratio.den, - st->codecpar->height * track->video.display_width * display_width_mul, - st->codecpar->width * track->video.display_height * display_height_mul, + track->video.cropped_height * track->video.display_width * display_width_mul, + track->video.cropped_width * track->video.display_height * display_height_mul, INT_MAX); } + if (track->video.cropped_width != track->video.pixel_width || + track->video.cropped_height != track->video.pixel_height) { + uint8_t *cropping = av_stream_new_side_data(st, AV_PKT_DATA_FRAME_CROPPING, sizeof(uint32_t) * 4); + if (!cropping) + return AVERROR(ENOMEM); + + bytestream_put_le32(&cropping, track->video.pixel_cropt); + bytestream_put_le32(&cropping, track->video.pixel_cropb); + bytestream_put_le32(&cropping, track->video.pixel_cropl); + bytestream_put_le32(&cropping, track->video.pixel_cropr); + } + if (st->codecpar->codec_id != AV_CODEC_ID_HEVC) sti->need_parsing = AVSTREAM_PARSE_HEADERS;