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 C3D1F46B2F for ; Sat, 1 Jun 2024 11:24:52 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6281768D5FA; Sat, 1 Jun 2024 14:24:50 +0300 (EEST) Received: from mail-oa1-f50.google.com (mail-oa1-f50.google.com [209.85.160.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C992B68D46E for ; Sat, 1 Jun 2024 14:24:43 +0300 (EEST) Received: by mail-oa1-f50.google.com with SMTP id 586e51a60fabf-24c9f628e71so1460397fac.1 for ; Sat, 01 Jun 2024 04:24:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1717241081; x=1717845881; darn=ffmpeg.org; h=to:subject:message-id:date:from:in-reply-to:references:mime-version :from:to:cc:subject:date:message-id:reply-to; bh=wvTBxuaRY9Wb4HEeY8AoyM6aS+xCKRw59MvX32vrRVQ=; b=ITukHe2uVK+DpZjw7hral2fzLMt4VtyErWRF6ZCMTL4GMkHVWxzQkZkcUzvzMpY5MZ AHvTWY6HFU07FehRJ4LCZZgwgSMWMJDB9CK+24qyPF/LOLoY0yoxW/oQsSqh+uxVf26e 6MSlIJ/selJ1duAamoT0ggXcF5Y5Xl74fJ3ssdGF/CKnAvuNGtX/sS2vDKwh8dgXNRhD N3iB1h7p40aS7+FT9SzPMrxZWwGScWm2Uq54mauSlPblrzBO2B7ghGexZo2RiCHtc3mt /wa0w6ZbD8MGoM3jb8dPQj4nJ63qq5oeERx6S753t4jMu/KeMiOu+y48CY9VlBXAcUvR rnmQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717241081; x=1717845881; h=to:subject:message-id:date:from:in-reply-to:references:mime-version :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=wvTBxuaRY9Wb4HEeY8AoyM6aS+xCKRw59MvX32vrRVQ=; b=JIdbD3Lgyv+prmjryD6SzTuuThWUB4+260SqdWues/bdGHWclXY89zYcaaBQL1idxc fnxjHj4Ya/UubYS1V3TWr/HxoaWfgn6M5oce7ajARdhTqPJnrpyiMwZ9QiMVykGluKyD 4ptI1JPPXICPjfmbFsUp+O5POpwmpxOGV2vA3fuPICJjhX9TVD4lSFCNZqQMuNOScJPR mFcU28Mg17h4B94myL3QQYaP5ISIUvtTyNsd+sNjyFjgPOHylj92VoI3GluDCgW5OHWS ac6opIUls/0CKOp2yaqehXvJ92n843UosEg22Cqx48ZbwFuEY0+pVZOxJTr0zTKB6Fwl xnfA== X-Gm-Message-State: AOJu0YyeCkH7WWBzrGlp+yq7CZNVDv0Swvs87NZWU4vrczAKCqFb/eg2 SJa66oQ5dfJXEZFBOJ1GZPVSozAWxtmfeXpOeg4lZzZhX/7Zkq5/Qg14t2x/r8CHp4TiSdRRnnl ryI4XU9RfufaLDyNRc45C0fZivEqIxPdj X-Google-Smtp-Source: AGHT+IGrO8z6F8nZqJgf1GNG5hAHUinI9GZEEPOZrXPgfwRR2kdk8XT/dA+XaFp0Dq4FcmNcLE5hQnHXrzvmxL0jQdQ= X-Received: by 2002:a05:6870:55ce:b0:24c:b963:4a2f with SMTP id 586e51a60fabf-2508b9efa52mr4911204fac.32.1717241080626; Sat, 01 Jun 2024 04:24:40 -0700 (PDT) MIME-Version: 1.0 References: <20240529214632.9843-1-jamrial@gmail.com> <20240529214632.9843-3-jamrial@gmail.com> In-Reply-To: <20240529214632.9843-3-jamrial@gmail.com> From: Kacper Michajlow Date: Sat, 1 Jun 2024 13:24:30 +0200 Message-ID: To: FFmpeg development discussions and patches Subject: Re: [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: On Wed, 29 May 2024 at 23:47, James Almer wrote: > > 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 Have you seen the discussion over the MKVToolNix issue tracker? https://gitlab.com/mbunkus/mkvtoolnix/-/issues/2389 I think it is the reason it wasn't implemented in ffmpeg sooner. The issue summarizes the problem and current status quo, quite well I think. I think the main problem is that vast majority of Matroska files doesn't are not following the standard with regards to DisplayWidth/Height. - Kacper _______________________________________________ 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".