From patchwork Sat Oct 7 16:24:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 44200 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4e24:b0:15d:8365:d4b8 with SMTP id gk36csp510298pzb; Sat, 7 Oct 2023 09:25:38 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFX1UqkRoeGFOyjZbAQOgeUxW03gxJUDUXzmVtnWNNaF1/C5NH+1RF+nK4SsvLiKQI4aCIo X-Received: by 2002:a17:907:7749:b0:9b2:b9bd:a369 with SMTP id kx9-20020a170907774900b009b2b9bda369mr9261873ejc.45.1696695938601; Sat, 07 Oct 2023 09:25:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696695938; cv=none; d=google.com; s=arc-20160816; b=rifjA006VKmoKH6vTeXu59kb2itXna1IqZAzWUr/Ib/s8rkkldltJ++EA9ejsXhFfj qOaXGmT0E/0nVKNNbXnOi5qTkksltGdfl9CAm8CRb2sdROZH9Lae+zmqqRxOI1aYdT+4 PS9kXC721MmBbiAG3/qpi/AsX/N1hD0lw2wdNFvFuJIlxnxKoPcjzez6m2tHE7dovwdx BGKn7Y4Z5BQfyBOklBHdmmT7Y+2dW/KSrg2itGklc5Z4qsLA+g76nFZb5G99vjyCJFkT l17E8CW73tJWi2PJAo1RiOuhe3HEb1KMyWuw9347e/F7Jm71FKwtpZ2kdqcRbJmWRIvy 722g== 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=1mNJf7PKa2rribEfYy7TecEHmfmBKOIgmmJnU2VqjVE=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=gpxCpTOC3DF2TiI2YgEMuZjqd8zj+5cVMfNUliAjbqmirmWjbr+Wy8SEJCEkIw1qC/ Tzsu8YynN90bjWzpHV7/7ZrPV2EN2xqy+NvHcC19ylT28mpe7n9E54Ko2zkR2j3NeiIU 6B4mn99JVq4QVdWrR0FOPgomZEDQ1Jwxg7XFWK7PeMg7YXo/odDyipINk1RnF54+JsRI JRv5Znh5vcmkTqFooCaBEPPFhnGabs+XW//H9biSBtig5DKKP4yLlj0CDRLXRSPpmeA6 W8fdSeXfD24VCNplSohhzC2a8eG3VXzvFRj3WqV/6JCW3bRGHjMdozKHeMbGhNvQDfU6 Lurw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=Qmqv7tVD; 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 pv1-20020a170907208100b009b2ca767fc9si2604540ejb.988.2023.10.07.09.25.38; Sat, 07 Oct 2023 09:25:38 -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=20230601 header.b=Qmqv7tVD; 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 797EC68CB1B; Sat, 7 Oct 2023 19:25:12 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f49.google.com (mail-pj1-f49.google.com [209.85.216.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5F8AE68CAE4 for ; Sat, 7 Oct 2023 19:25:04 +0300 (EEST) Received: by mail-pj1-f49.google.com with SMTP id 98e67ed59e1d1-27b0d0c0ba0so2420171a91.1 for ; Sat, 07 Oct 2023 09:25:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696695902; x=1697300702; darn=ffmpeg.org; 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=tMwVw8fioFHjcBG7FKui/x3I1JGEijVZz10C+i4EOKs=; b=Qmqv7tVDBtRQ3j+7kgmLN6ptK6D+orqBCC4rwcgmtjL2Gx9BAa3RtHcTCEOrBhtz3V Yrfih1r1rEARAQnQXMFfT+8Cgzo8U95SUKPak7g7WdFsjvNdPPwBHWzIWbv+a7HWH2FT cc7ZJrGCpV5cN0oLhkeI+v271vX2EHAJkFGR+H7eSXdCxa59Hk35hRx+qi9Pe0A8pqT/ bb4yJ3ph3PoHLwria1ABocPck50TCtJjOv8HzxwGKnnmQGdkYJDKrlaBE6hdeHawPI1n g99w1tTgJ++F1pDqAGEjjZeYrT/hzmkMmGxqONbz6LpuxJONpcCM7+6fiFLc8Jo1r9NG 07GA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696695902; x=1697300702; 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=tMwVw8fioFHjcBG7FKui/x3I1JGEijVZz10C+i4EOKs=; b=E4IkoWNYvSHCT3kANCA/56D3UQL8DiJwFFufQwlABh+CmGPkkFxhgyTH6kVeo2R7oS f/ptSEiDo8gr+QyZU19DzF8XD4ORqCKhQwU666/+nBQEOvCvRdbO8NjtoIeUaSjLqTRi 1RnKg4tq61tcqAkqflkpV5lIOSGmQ+aTypR4znmKfsI2smwc9okRZUM2d2oWYwPblhio +XOxjW2Ncn8UWiuXTlfRVJKsMrw8rAMp8fJCh3pMDL8CpU3Nn4Ddd+V/cToOvfEyMFEx k5fS6rXdCgivLeDr2iSfJoTKd/GP0dyOuhpik8U7lSFnVo0ubbQAlhjwaP83+UjhKshm Zb2g== X-Gm-Message-State: AOJu0YyskDjtc9hcCAQSPCw6cDFQZwaZJb4hS0MamV/6jWxctYX1e7mx ShHoydFXTKJmhcPn/KuBnqcNpGptE/o= X-Received: by 2002:a17:90b:1989:b0:25f:20f:2f7d with SMTP id mv9-20020a17090b198900b0025f020f2f7dmr10682136pjb.2.1696695902213; Sat, 07 Oct 2023 09:25:02 -0700 (PDT) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id 30-20020a17090a191e00b002792b7182dcsm7883180pjg.49.2023.10.07.09.25.01 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 07 Oct 2023 09:25:01 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sat, 7 Oct 2023 13:24:59 -0300 Message-ID: <20231007162503.1057-4-jamrial@gmail.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231007162503.1057-1-jamrial@gmail.com> References: <20231007162503.1057-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/7] 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: lZVZn/OPLXHd Signed-off-by: James Almer --- libavformat/matroskadec.c | 53 +++++++++++++++++++++++++++++++-------- 1 file changed, 43 insertions(+), 10 deletions(-) diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index c8acf91970..0e98e97957 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 } }, @@ -2953,14 +2959,30 @@ static int mkv_parse_video(MatroskaTrack *track, AVStream *st, if (track->video.display_unit < MATROSKA_VIDEO_DISPLAYUNIT_UNKNOWN) { if (track->video.display_width && track->video.display_height && - par->height < INT64_MAX / track->video.display_width / display_width_mul && - par->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, - par->height * track->video.display_width * display_width_mul, - par->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; + AVPacketSideData *sd = av_packet_side_data_new(&st->codecpar->coded_side_data, + &st->codecpar->nb_coded_side_data, + AV_PKT_DATA_FRAME_CROPPING, + sizeof(uint32_t) * 4, 0); + if (!sd) + return AVERROR(ENOMEM); + + cropping = sd->data; + 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 (par->codec_id != AV_CODEC_ID_HEVC) sti->need_parsing = AVSTREAM_PARSE_HEADERS; @@ -3126,10 +3148,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; } else if (track->type == MATROSKA_TRACK_TYPE_AUDIO) { if (!track->audio.out_samplerate) track->audio.out_samplerate = track->audio.samplerate;