From patchwork Wed May 29 21:46:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 49366 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:8f0d:0:b0:460:55fa:d5ed with SMTP id i13csp940626vqu; Wed, 29 May 2024 14:47:29 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUjNgcqHJSahA7RC41iSJDgZMNFU03VZWe4pxylaMfRz6OQ0f9YtFyExL7Jk2dyghQeyjrnkgoAqKy5zzR7a8rwT6t7P3JE5mVZaw== X-Google-Smtp-Source: AGHT+IFaJjCH67CL8Q4oABfYBb0Jvmw2SwdtGrWWv6vjht3Y7ItBTZ1qFZNHJJz6VNQSL8YKKIbV X-Received: by 2002:a2e:80cd:0:b0:2de:74b1:6007 with SMTP id 38308e7fff4ca-2ea848287a9mr737741fa.36.1717019249185; Wed, 29 May 2024 14:47:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1717019249; cv=none; d=google.com; s=arc-20160816; b=COQMrwUhpTAABjuQc4+SgjMaYIOTjrajOdKThstNJDwpHyrdH3mnxLet6cyuop/agA o1a4VasyuMzmkvTbvIm34wfymiOkecuj0qCfTCr4ZKalpQE+d5Wr4AQmruywJcogI3Ne 57Q/sFBc7/QQRf7VpFljuZ93JP9IA8XL+IFJ/lx4spCL+lCfD2suD/JklGEC6vJvJsLV ceONw/oN7AbbupNMRXrePl7S+MlgmGzR5YXUAQC4fom45tnYvVc20bvDJhamIEqe+tOj LgJFWil7HqWBTPbsZISr4Y6R3XA44m1jCpk1YLm1d2RTWiM25U94ypfW307STJz/4N5w 7A6Q== 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=C3yoqxlOZhtEBh2zq6lbrRYUHSDY1rbHgpu/wgp4omY=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=Jlx8cGeoi1hi/rwAzwrl/oKiGR1+bmzziDDiMUFsQdkv/ADinmAF7eI3Eoecvoksm1 ZqYNO4iYk+qfuuf0w2xWx1fQAAbZTjxFQ/+f8ns1ZLg+SBYsDsPTwqYmVqoqb21Z29Pl 9vYzG+KJ22c9flkHxi6a3UGXAHfH/5+Ow6dOg3OEwKwCQfoaJtDSd20im9FYvvjBYf22 Ktc+AsHhCIC2C3qQQ/xCoRmDUmpz0Pf/vA173lthfDg2RjuDS17bgzCl18I5YM/wfAg3 nuZNVQZLPXNsDcvHmty00uEny4JiOb13M2ybIU0e1iQ6kBmrnFRJLBeZwlLkU2sffkW0 TdLQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=mV7ul648; 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 4fb4d7f45d1cf-579c1bee43dsi5154342a12.317.2024.05.29.14.47.28; Wed, 29 May 2024 14:47:29 -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=mV7ul648; 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 B790068D521; Thu, 30 May 2024 00:47:03 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f178.google.com (mail-pg1-f178.google.com [209.85.215.178]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C133768D441 for ; Thu, 30 May 2024 00:46:55 +0300 (EEST) Received: by mail-pg1-f178.google.com with SMTP id 41be03b00d2f7-6bec8c86b48so229022a12.0 for ; Wed, 29 May 2024 14:46:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1717019213; x=1717624013; 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=CqWm4OC1MMacugM1XBQ8SktsyDBLyfW804nWjKEOt0E=; b=mV7ul64887XTGIOtNoo0WriA6FMOryJlO+oTwQCok0tuG4J1bRQWxMgqd61bLvMlND ZDP3WsAX6y2X8jehtWn3KNLGJUGyY98ScCJZm+xgveCqxva6ML7j7/r4zPREw6MtXW7E y0IjR9zc0tYE2kg1GI5pLIIKFohXf7PVY4aixuXAkFLopFDtTYd+fXBru9tbzpLkWWYD MWBbwlXR5caXWYAAFuVb5Nnq0untoXgwsmBuG2v/5CUlUYp/421IvMXBjUmpPG/2PWz6 r3IbiTON1GctV8g+OPU5batCXTqJJc/yPDg7x+MZc3HcpwXM+nyPyTEaZ/ARSmB2na8d 5Qbg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717019213; x=1717624013; 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=CqWm4OC1MMacugM1XBQ8SktsyDBLyfW804nWjKEOt0E=; b=mqsLfY+wx8JpYT7giJ/lr+zgXVfTjSuZWsxIna2BdvxW1riUK+wbLkhQd3LMI18NbQ RQ16+J+ceHAVDlbKajZ/QNhNcwFVFd2IPFwpfG0PA9NOW3x/YMtUrcNhzjBcYMsqELoc iVkWkkTQes7pQFeCvfgzQ1mpDD01rxBb+muIuSzHRuAck7lP6uzsI03b6FfEQVVXuxZo 5V5Ns/uTQjJ1+JP78stwhl45xJ9Mg3b4GrRqUJNYVt3T9PjL+3kNV9g8rKR6Y49xSSGm Kl1Nq62WY+bt3CnrrY/CBCSzmWprgXCqHYISrxfb5HBk21fi2N/akvOcI/pDBBKK7XVt qwag== X-Gm-Message-State: AOJu0YybY6JuXgbgCMa04hvp8+n+dx6WST+gzGuGvsV4N9l81xTlWBOX aM/we7X4ylfc5Ke7mni8Su1bI9s45CcdmFVDtncP3cr56/UeK5oJpOixbw== X-Received: by 2002:a17:90a:9af:b0:2bf:5f75:9c2b with SMTP id 98e67ed59e1d1-2c1abc3c310mr424903a91.32.1717019213082; Wed, 29 May 2024 14:46:53 -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.51 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 May 2024 14:46:52 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 29 May 2024 18:46:30 -0300 Message-ID: <20240529214632.9843-4-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 4/6] 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: PTK4XIXWEVHS Signed-off-by: James Almer --- libavformat/matroskaenc.c | 44 ++++++++++++++++++++++++++++++++------- 1 file changed, 37 insertions(+), 7 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 76c542d50b..37a6a5b4f8 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -1755,8 +1755,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); @@ -1779,25 +1781,53 @@ 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 && sd->size == sizeof(uint32_t) * 4) { + uint32_t top, bottom, left, right; + + top = AV_RL32(sd->data + 0); + bottom = AV_RL32(sd->data + 4); + left = AV_RL32(sd->data + 8); + right = AV_RL32(sd->data + 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); @@ -1809,9 +1839,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);