From patchwork Wed Sep 21 11:29:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitrii Ovchinnikov X-Patchwork-Id: 38131 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp2549014pzh; Wed, 21 Sep 2022 04:29:48 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6sqi81ZiCV8oQU4BO/E8EB3gS1STVfJUFvT9NaMZ5zVJZWf4yaIXTlDK9wuFpUKxRulw8x X-Received: by 2002:a17:907:1b1c:b0:72f:9aac:ee41 with SMTP id mp28-20020a1709071b1c00b0072f9aacee41mr20322850ejc.56.1663759787998; Wed, 21 Sep 2022 04:29:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663759787; cv=none; d=google.com; s=arc-20160816; b=WmpaVWELJZ2Tn0ns3mITMw32D4uwyJ0GP60onryQ8lz1jF5b0yTBtzidoShRBkSuCT 30/I+tdHkdDNBXdGjFyQFJCKEFrROiBt3QuDXcCabxaesXJyqBxk6ZpJZlVczn7ymB0w 3c1yRibeKsR7FsqA0kDVUlL6XhTjOOlKGokHJaihEQWzvn5f0mmcMYkz4ontUd3i50hx YSryi5EwDPMfjkK2XD2/xmuUaOxST92+ji9MjzfHjT9drYD9rxS35EVC7+nS3BhOx5mO t31phMvNVgzyJluVuVNl9/zJLWiYQtAd9ImxNqapcLvftaiyRVuoRUMIm3cvj6J6mpLV hv4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=uLlANns7DdHzj2PstekeiDxNR9cVYP8dFzCtbuUQmL4=; b=XDZd3AD9+PKJHVf90S44BxzjNRqnrhsG5YuGJ8vmAzCnAQ/dT6/FnYWo6irF2Gk2Ld Qz3LTFVaNJmGGLcT9gK2eVLmrhZUPgTFpr7hUS5CpMTb4miqPYwf8Wj0K+1RPmwk4fDV /3wqqqY3Pa/z/YcbWH/7HRyv3et+3HqEwHn0DSMvjj57PuEY4QQdrMN3Q4nOxl4LNbzU xCL34XezCInhuBvzVuYETPe/DLvKF2V5H6UTMExQHH8E3M0yIjgmyhiAAX0VW9Vcz74U VbqRIJNBjujlJvgJS5cq9ytM2bCmElj10zET9DD3EgydKdmSDWwoqXVXhwAQowfg+cLY Ujnw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b="G+D94U/Z"; 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 r12-20020a170906350c00b00741c0bd705dsi1836713eja.631.2022.09.21.04.29.35; Wed, 21 Sep 2022 04:29:47 -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=20210112 header.b="G+D94U/Z"; 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 640CF68BB8A; Wed, 21 Sep 2022 14:29:32 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1D7D268BB15 for ; Wed, 21 Sep 2022 14:29:25 +0300 (EEST) Received: by mail-wr1-f50.google.com with SMTP id s14so7373977wro.0 for ; Wed, 21 Sep 2022 04:29:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date; bh=ZNyNrqvS0wSihIp80e3IFAzxdttqkRxZHuEZGf3uoIg=; b=G+D94U/ZSTcsJTWWKb0IaLbvxpWUOpUUkwdH10f9vpdfc1S6OcTfgUGJaGRblQGNIL 3wycxmYykbTGd8plXjdU9XdLaOSAO2PKxWrsj5G67AYVZeuMoS9GsdG8IFSpwLamT+tl Yu/pVfpNybpNP92mh3ytiWxHDfISqiMg5bDY9N0WcwwbtGMwYqcQU4sbH37DGJJ9f+bh yn3VzKDE9xA/NIfzZk8uPkhcAuESWybh1jN4QWJajoalFSrTZeyMFNFzkhbwBERXA3+y 8gqaldRcmYd8MC9xmjEgk3bjjx8iijFAnO7QT0KB9oxQfJmgaYP81L8a71Fmil4JfZ6p YpFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date; bh=ZNyNrqvS0wSihIp80e3IFAzxdttqkRxZHuEZGf3uoIg=; b=oUOYzzQfV8gn5qmT5+FPeRwr3CJsZHsJKFY/IRKQJ/URkzjQHOkq8coou8u7py99pz j6uaNOmec5PW2AIfZVZY1MkWYyKxbhM9GmBFOEQ2e5v4LaDRj83ZtddGkA9u4Yvro4hx gQOQGPkQAskL1idrcyeMmccFJeGVLJRJEszxQaK1EYG9ssavUbBzdrLU2eJvVbGZYahA XclxQogjhoAD/kTOLRIh4B4OAgUEvO860yjdMBx4sDBWu3qWI+oM5XmhMmDPIQhEzDYz yjrvJj2Kped/rQVFhbTnR2cdygU1tYmb/Ue0XhX5LnnKgwksG4UJKcUFwPjd69FdMGYS F4hA== X-Gm-Message-State: ACrzQf1mO9uzkJdlghakuW/T9dZ5MPXi1lgKE6CCJDRtqzXPdBZClNMt NoVrueEd3+NYkroJmQ9ppcydLv7yIAmdoe2Xm3M= X-Received: by 2002:a5d:6d46:0:b0:21f:8b7:4c1d with SMTP id k6-20020a5d6d46000000b0021f08b74c1dmr17029138wri.455.1663759763953; Wed, 21 Sep 2022 04:29:23 -0700 (PDT) Received: from localhost.localdomain (178-222-23-217.dynamic.isp.telekom.rs. [178.222.23.217]) by smtp.gmail.com with ESMTPSA id v2-20020a5d6b02000000b00229e0def760sm2250540wrw.88.2022.09.21.04.29.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Sep 2022 04:29:23 -0700 (PDT) From: OvchinnikovDmitrii To: ffmpeg-devel@ffmpeg.org Date: Wed, 21 Sep 2022 13:29:05 +0200 Message-Id: <20220921112905.1753-1-ovchinnikov.dmitrii@gmail.com> X-Mailer: git-send-email 2.30.0.windows.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] libavformat\matroskadec.c: crop support for matroska demuxer. 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 Cc: OvchinnikovDmitrii Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: eVu8CqJn70f6 In webm specification, it supports cropping information. (https://www.webmproject.org/docs/container/) In ffmpeg, the implementation of webm is a subset of matroska. In matroskadec.c, those cropping related four fields are forced to 0. for the sample file with crop (crop_bottom =8, crop_top=crop_left=crop_right=0.) ffmpeg.exe -i test_with_container_crop.webm -pix_fmt yuv420p -y output.yuv original ffmpeg code - the output.yuv resolution is 1920x1088 changed code - the output.yuv resolution is 1920x1080" --- libavcodec/avcodec.h | 8 ++++++++ libavcodec/codec_par.c | 8 ++++++++ libavcodec/codec_par.h | 8 ++++++++ libavcodec/decode.c | 9 +++++++++ libavformat/matroskadec.c | 17 +++++++++++++---- 5 files changed, 46 insertions(+), 4 deletions(-) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 7db5d1b1c5..4420cfa0c9 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -585,6 +585,14 @@ typedef struct AVCodecContext { */ int coded_width, coded_height; + /** + * The dimensions of the crop, usually from container. + */ + int crop_top; + int crop_left; + int crop_bottom; + int crop_right; + /** * the number of pictures in a group of pictures, or 0 for intra_only * - encoding: Set by user. diff --git a/libavcodec/codec_par.c b/libavcodec/codec_par.c index abda649aa8..f74964a817 100644 --- a/libavcodec/codec_par.c +++ b/libavcodec/codec_par.c @@ -118,6 +118,10 @@ int avcodec_parameters_from_context(AVCodecParameters *par, par->format = codec->pix_fmt; par->width = codec->width; par->height = codec->height; + par->crop_top = codec->crop_top; + par->crop_left = codec->crop_left; + par->crop_bottom = codec->crop_bottom; + par->crop_right = codec->crop_right; par->field_order = codec->field_order; par->color_range = codec->color_range; par->color_primaries = codec->color_primaries; @@ -199,6 +203,10 @@ int avcodec_parameters_to_context(AVCodecContext *codec, codec->pix_fmt = par->format; codec->width = par->width; codec->height = par->height; + codec->crop_top = par->crop_top; + codec->crop_left = par->crop_left; + codec->crop_bottom = par->crop_bottom; + codec->crop_right = par->crop_right; codec->field_order = par->field_order; codec->color_range = par->color_range; codec->color_primaries = par->color_primaries; diff --git a/libavcodec/codec_par.h b/libavcodec/codec_par.h index 7660791a12..6671f1810b 100644 --- a/libavcodec/codec_par.h +++ b/libavcodec/codec_par.h @@ -127,6 +127,14 @@ typedef struct AVCodecParameters { int width; int height; + /** + * The dimensions of the crop, usually from container. + */ + int crop_top; + int crop_left; + int crop_bottom; + int crop_right; + /** * Video only. The aspect ratio (width / height) which a single pixel * should have when displayed. diff --git a/libavcodec/decode.c b/libavcodec/decode.c index 2961705c9d..905eb8401e 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -324,6 +324,15 @@ static inline int decode_simple_internal(AVCodecContext *avctx, AVFrame *frame, emms_c(); actual_got_frame = got_frame; + if (avctx->codec->type == AVMEDIA_TYPE_VIDEO) { + if (avctx->crop_top != 0 || avctx->crop_left != 0 || avctx->crop_right != 0 || avctx->crop_bottom != 0){ + frame->crop_top = avctx->crop_top; + frame->crop_left = avctx->crop_left; + frame->crop_right = avctx->crop_right; + frame->crop_bottom = avctx->crop_bottom; + } + } + if (avctx->codec->type == AVMEDIA_TYPE_VIDEO) { if (frame->flags & AV_FRAME_FLAG_DISCARD) got_frame = 0; diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 16a3e93611..6e05b36e58 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -209,6 +209,10 @@ typedef struct MatroskaTrackVideo { uint64_t pixel_width; uint64_t pixel_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; @@ -516,10 +520,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_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_VIDEOPIXELCROPB, EBML_UINT, 0, 0, offsetof(MatroskaTrackVideo, pixel_cropb), {.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 } }, @@ -2878,6 +2882,11 @@ static int matroska_parse_tracks(AVFormatContext *s) st->codecpar->width = track->video.pixel_width; st->codecpar->height = track->video.pixel_height; + st->codecpar->crop_top = track->video.pixel_cropt; + st->codecpar->crop_left = track->video.pixel_cropl; + st->codecpar->crop_bottom= track->video.pixel_cropb; + st->codecpar->crop_right = track->video.pixel_cropr; + if (track->video.interlaced == MATROSKA_VIDEO_INTERLACE_FLAG_INTERLACED) st->codecpar->field_order = mkv_field_order(matroska, track->video.field_order); else if (track->video.interlaced == MATROSKA_VIDEO_INTERLACE_FLAG_PROGRESSIVE)