From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 71AC84B134 for ; Wed, 29 May 2024 21:47:18 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5B90668D4ED; Thu, 30 May 2024 00:47:02 +0300 (EEST) Received: from mail-pg1-f179.google.com (mail-pg1-f179.google.com [209.85.215.179]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9A6B568BED2 for ; Thu, 30 May 2024 00:46:53 +0300 (EEST) Received: by mail-pg1-f179.google.com with SMTP id 41be03b00d2f7-6bd8b845116so207325a12.0 for ; Wed, 29 May 2024 14:46:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1717019211; x=1717624011; 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=5bIEHMt7A+trt6+3e6O6GyytI8wV4caRppaAjXmXj9I=; b=YgDko0THFd73VYmq1waDHqHmKZY/TC1+LfcPkDndloCS5TQ3AfP+D5Zirw9///pNt1 ovbWa8qz2hs0lh4lotsNW09REEEDT+E2Uing8BFXjMzf2dOHZDHf425dMc7ZXy04dI6K 4O0Atmx8odXWywK0PnenNOgGv0ozdv71Y7dw64uV4ZZGBkgpwBkzno9XKpomi5bUnp2A uK6cpSfUCIVimso65KUiy1hWsC09SAHPBZEPuQtyf3ASIR1eI45ydoscRK7EWyLFvVla 6wRqx4Wo1TPsbjK41SyUsizxsqaqxQ/NEMySUlBRsDVgVr1Bk5NkF8qRBeAfO+WkCAOB svPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717019211; x=1717624011; 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=5bIEHMt7A+trt6+3e6O6GyytI8wV4caRppaAjXmXj9I=; b=LgL/aJ1O9GROFljDTRjBW+JHLhts38MepUeT+OWepjWeDf6i2U2scEN8OF4LpYGHTj Kw8jyR9K6hkKuLurFArzM49GiU4qZDtZM3Uk5imwbmQaCNwQHmIQRkP52cJ5H3ViQSGr iLu44VHj+8ECTcYzgclyq9AKvGlOidAVBa9cmURqT+5S0gCUUxpWUmSA1DbqsZHUrEhq w0F/1ayckh8wnsTtkaE+m4oyWXnhzhde4r1eAoa8vI/7r5bhx5gUY413seAxNWRGq7HI Uca4gdRVoomCtYRXfEX1UTshtP94WM7ruQ4YIEvPDFeY4o+Zd/z5Fo25NohctJvsxAYR LeLQ== X-Gm-Message-State: AOJu0YxjEDsilF09X/twyU26sMyDJpML+x7f8vDaP2z3Wo2hBNDyONV+ HBAj9CEcMqJ1nuQ3yfC22vCc8+DTMmOmlPvj8AG8ykvtUFnX+FY1lmhAtw== X-Google-Smtp-Source: AGHT+IFVELRRlnN5ODovBD3biyUo7lX8O8y3jSZGaDQuhxXfH4D4sIg21QWysujlck3osrclqUlrIA== X-Received: by 2002:a17:90b:d94:b0:2bd:eb21:a72d with SMTP id 98e67ed59e1d1-2c1ab9f9dc5mr397640a91.23.1717019211464; Wed, 29 May 2024 14:46:51 -0700 (PDT) Received: from localhost.localdomain ([190.194.167.233]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2c1a77bab2fsm288094a91.51.2024.05.29.14.46.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 May 2024 14:46:51 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 29 May 2024 18:46:29 -0300 Message-ID: <20240529214632.9843-3-jamrial@gmail.com> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240529214632.9843-1-jamrial@gmail.com> References: <20240529214632.9843-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/6] 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: 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 2f07e11d87..a30bac786b 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -213,7 +213,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; @@ -527,10 +533,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 } }, @@ -2963,14 +2969,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; @@ -3136,10 +3158,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; -- 2.45.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".