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 B89D840F4A for ; Sat, 7 Oct 2023 16:25:53 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7A1D568CB64; Sat, 7 Oct 2023 19:25:14 +0300 (EEST) Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 78ED168CB0E for ; Sat, 7 Oct 2023 19:25:07 +0300 (EEST) Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-1c60778a3bfso26294425ad.1 for ; Sat, 07 Oct 2023 09:25:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696695905; x=1697300705; 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=y3ayIDNvUy8nJH8imrZAeypp6DYn+Q34aqHOBX3k0vI=; b=VuHwRzcX2vnBHzTMHd0hwrP9zZHKiefgZCOHUvtbt8aFWDp/OjKJ4hebYE9nfnOQ2j P5vl0y8YXdRzHMICfz9zlNjPU0UkdK5Ra9lvxu2RPlICk0NuCynTAqJ+Iog7JmeWUOtj 1Rac9FEDaB2YDKA5Fg9PXJDibiWAwLSxNxUYmlQ5JkahR0iYL5gM8dROreMgfcU7ZKxy +YmcY1gGHG6pw6mcEDixYx0NVlnE4AiXU+MmVM241VwMiH0RuvFYGX6pdaKkyNuNIE9c wQ8HghE53vGyuNUu1lADU8RnCvm5AaUu/ydlYlySczE48Jae6ARe9jwq4sjNY1g2Cf6l 5SoQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696695905; x=1697300705; 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=y3ayIDNvUy8nJH8imrZAeypp6DYn+Q34aqHOBX3k0vI=; b=ZygQdgTbYksrEWSoTw5wln9Wb8a3ZINpMdJJEJPuG8d/KJZBZv5E8k2EZ2NUcU+00k Q8GYejYLrIb5n3h6w7/pV/KqF8eK0pLBcQgjCfnSeFbuiAaGHMIlJnhSCMrQapxnz2Bo r6GqxkwaUIkYX7c5IOSidwslxlpSsh8y71KAsx1F3D8KiFXwLmEC0BMxGOFVTwg//WHK taf3m/t9c5vinWe3o90nMpdfQ8REKanhYUub4KYRXzW/CH4sswMnzGDBK/Dk/WReEuK9 o9ZSe1tFI2l+pHtqQOjF2sQWL4jw7sFsZxyuoCmEyAecmEmiBfiu34VYF03e9iaL+6aA O5HA== X-Gm-Message-State: AOJu0Yy9s7ZBfpnSA/IKld6DasxNJNxvRDwdomVSPNwuk75btPYx8PxO vDIxYOsbmIjEIbO62WMcUyYXnvMosrc= X-Google-Smtp-Source: AGHT+IEel9jPSfMJx7O1E7DfKXXex/aOOkcWB+apWzd3pijsJ86woqPuWHeGDaM0mciR3tog34SfQQ== X-Received: by 2002:a17:90b:1047:b0:262:f06d:c0fc with SMTP id gq7-20020a17090b104700b00262f06dc0fcmr10814528pjb.7.1696695904916; Sat, 07 Oct 2023 09:25:04 -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.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 07 Oct 2023 09:25:04 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sat, 7 Oct 2023 13:25:01 -0300 Message-ID: <20231007162503.1057-6-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 5/7] avformat/matroskaenc: support writing 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/matroskaenc.c | 59 ++++++++++++++++++++++++++++++--------- 1 file changed, 46 insertions(+), 13 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 1457a6890c..9005237a83 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -1751,8 +1751,10 @@ static int mkv_write_track_video(AVFormatContext *s, MatroskaMuxContext *mkv, const AVDictionaryEntry *tag; int display_width_div = 1, display_height_div = 1; uint8_t color_space[4], projection_private[20]; + const AVPacketSideData *sd; EBML_WRITER(MAX_FIELD_ORDER_ELEMS + MAX_STEREO_MODE_ELEMS + MAX_VIDEO_COLOR_ELEMS + MAX_VIDEO_PROJECTION_ELEMS + 8); + int cropped_width = par->width, cropped_height = par->height; int ret; ebml_writer_open_master(&writer, MATROSKA_ID_TRACKVIDEO); @@ -1775,25 +1777,58 @@ static int mkv_write_track_video(AVFormatContext *s, MatroskaMuxContext *mkv, (tag = av_dict_get( s->metadata, "alpha_mode", NULL, 0))) && strtol(tag->value, NULL, 0)) ebml_writer_add_uint(&writer, MATROSKA_ID_VIDEOALPHAMODE, 1); + sd = av_packet_side_data_get(st->codecpar->coded_side_data, + st->codecpar->nb_coded_side_data, + AV_PKT_DATA_FRAME_CROPPING); + if (sd) { + const uint8_t *cropping = sd->data; + size_t cropped_size = sd->size; + uint32_t top, bottom, left, right; + + if (cropped_size != sizeof(uint32_t) * 4) + return AVERROR_INVALIDDATA; + + top = AV_RL32(cropping + 0); + bottom = AV_RL32(cropping + 4); + left = AV_RL32(cropping + 8); + right = AV_RL32(cropping + 12); + + if (left >= INT_MAX - right || + top >= INT_MAX - bottom || + (left + right) >= par->width || + (top + bottom) >= par->height) { + av_log(s, AV_LOG_ERROR, "Invalid cropping dimensions in stream side data\n"); + return AVERROR(EINVAL); + } + + ebml_writer_add_uint(&writer, MATROSKA_ID_VIDEOPIXELCROPB, bottom); + ebml_writer_add_uint(&writer, MATROSKA_ID_VIDEOPIXELCROPT, top); + ebml_writer_add_uint(&writer, MATROSKA_ID_VIDEOPIXELCROPL, left); + ebml_writer_add_uint(&writer, MATROSKA_ID_VIDEOPIXELCROPR, right); + + cropped_width -= left + right; + cropped_height -= top + bottom; + } + // write DisplayWidth and DisplayHeight, they contain the size of // a single source view and/or the display aspect ratio if (st->sample_aspect_ratio.num) { - int64_t d_width = av_rescale(par->width, st->sample_aspect_ratio.num, st->sample_aspect_ratio.den); + int64_t d_width = av_rescale(cropped_width, st->sample_aspect_ratio.num, st->sample_aspect_ratio.den); if (d_width > INT_MAX) { av_log(s, AV_LOG_ERROR, "Overflow in display width\n"); return AVERROR(EINVAL); } - if (d_width != par->width || display_width_div != 1 || display_height_div != 1) { + if (d_width != cropped_width || display_width_div != 1 || display_height_div != 1) { if (IS_WEBM(mkv) || display_width_div != 1 || display_height_div != 1) { ebml_writer_add_uint(&writer, MATROSKA_ID_VIDEODISPLAYWIDTH, d_width / display_width_div); ebml_writer_add_uint(&writer, MATROSKA_ID_VIDEODISPLAYHEIGHT, - par->height / display_height_div); + cropped_height / display_height_div); } else { AVRational display_aspect_ratio; av_reduce(&display_aspect_ratio.num, &display_aspect_ratio.den, - par->width * (int64_t)st->sample_aspect_ratio.num, - par->height * (int64_t)st->sample_aspect_ratio.den, + cropped_width * (int64_t)st->sample_aspect_ratio.num, + cropped_height * (int64_t)st->sample_aspect_ratio.den, 1024 * 1024); ebml_writer_add_uint(&writer, MATROSKA_ID_VIDEODISPLAYWIDTH, display_aspect_ratio.num); @@ -1805,9 +1840,9 @@ static int mkv_write_track_video(AVFormatContext *s, MatroskaMuxContext *mkv, } } else if (display_width_div != 1 || display_height_div != 1) { ebml_writer_add_uint(&writer, MATROSKA_ID_VIDEODISPLAYWIDTH, - par->width / display_width_div); + cropped_width / display_width_div); ebml_writer_add_uint(&writer, MATROSKA_ID_VIDEODISPLAYHEIGHT, - par->height / display_height_div); + cropped_height / display_height_div); } else if (!IS_WEBM(mkv)) ebml_writer_add_uint(&writer, MATROSKA_ID_VIDEODISPLAYUNIT, MATROSKA_VIDEO_DISPLAYUNIT_UNKNOWN); @@ -3555,10 +3590,9 @@ const FFOutputFormat ff_matroska_muxer = { .write_trailer = mkv_write_trailer, .p.flags = AVFMT_GLOBALHEADER | AVFMT_VARIABLE_FPS | #if FF_API_ALLOW_FLUSH - AVFMT_TS_NONSTRICT | AVFMT_ALLOW_FLUSH, -#else - AVFMT_TS_NONSTRICT, + AVFMT_ALLOW_FLUSH | #endif + AVFMT_TS_NONSTRICT | AVFMT_CROPPING, .p.codec_tag = (const AVCodecTag* const []){ ff_codec_bmp_tags, ff_codec_wav_tags, additional_audio_tags, additional_subtitle_tags, 0 @@ -3599,10 +3633,9 @@ const FFOutputFormat ff_webm_muxer = { .check_bitstream = mkv_check_bitstream, .p.flags = AVFMT_GLOBALHEADER | AVFMT_VARIABLE_FPS | #if FF_API_ALLOW_FLUSH - AVFMT_TS_NONSTRICT | AVFMT_ALLOW_FLUSH, -#else - AVFMT_TS_NONSTRICT, + AVFMT_ALLOW_FLUSH | #endif + AVFMT_TS_NONSTRICT | AVFMT_CROPPING, .p.priv_class = &matroska_webm_class, .flags_internal = FF_FMT_ALLOW_FLUSH, }; -- 2.42.0 _______________________________________________ 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".