From patchwork Sat Oct 1 06:13:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitrii Ovchinnikov X-Patchwork-Id: 38489 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp99204pzh; Fri, 30 Sep 2022 23:14:29 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4873yIET6ci9t0lzTdvMOICmQ/DAxvfA9GQkdvM+CQhNASdrvwRy1cGxKhTa8y2h2Chse0 X-Received: by 2002:a17:906:cc15:b0:788:4c5:808c with SMTP id ml21-20020a170906cc1500b0078804c5808cmr4418066ejb.699.1664604869221; Fri, 30 Sep 2022 23:14:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664604869; cv=none; d=google.com; s=arc-20160816; b=ArSUSpmbq+NvrqZ67fV2XIfJkQZrtxqgSpCdJCpH1us8utkm85MMv4neEJpcx959ng b5oBO/WZ+Fj5/KqCAy8S7YOS/b0oWcs1NpvG4Gg5lFulHTP7AqnG5hjaL8RIy5g+O9q6 zZUpw+rcQdjJaz+mJ4jpdU+r6JPY0+nXrUn+TWNZQG6y8rPjYlfQ537nx7UDoU5AI0Da YeL5RAV2LzlWGyJY9JAkpsXHiK6JPaLYLg6LuzQ6XFBFj8Z/a9Jxpo+KK3g5wc19njDE W5Gjdizx1vnVE0kvvkO8ercAwuS9OwgUI4VdOd72rGe+DcxYEw4xo3NdOMbMIM3CktfP ItcA== 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:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=njfwGhHtwNB8PJ/vEsbFoM/hFKWIyVAqcfumnmfjqGI=; b=rXCS1SY0tuQBMK5qsH2klS2Z43GbT4gqT96sFgoqdvffZGfvJgn0vV1hW1DMYIi4AF FJzoyMIGuOenZ8xN2dJI14bd1y81BdhBANTZz+KygXSHjo9LmpUxrIA6N+qVDrTXj1Yz VbkNDJuvx5RAdxrnbxycR0G8l8Q2UPFRxLPrsVezIbUHnSP6xPMOrUwd13oonEXK8TQD xVomnLIOVjtd/GT58ytDFA6POtYkBpqQlAdHLedLAjf7KqafF/42bmPPFGgv9ugQO8P3 sxPGuUZbTzoavMonjK9Oc7193+VY/RN5GnPTLBcPrDpCJj8XicLQjVjJimYao5c391Ex VrqQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=aZkpRZgH; 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 n12-20020a50934c000000b00448d387c327si3285407eda.181.2022.09.30.23.14.28; Fri, 30 Sep 2022 23:14: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=20210112 header.b=aZkpRZgH; 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 B582D68B3FD; Sat, 1 Oct 2022 09:14:07 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1920C68BAB2 for ; Sat, 1 Oct 2022 09:14:00 +0300 (EEST) Received: by mail-wm1-f49.google.com with SMTP id t4so4088073wmj.5 for ; Fri, 30 Sep 2022 23:14:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=nwcp989pQgRD3YcPcWPZQA6e6MrlT9pQS50uM75oqPg=; b=aZkpRZgH5uJi2ACbim8F9s8A5TCtWW/m/dePYiay7eXv2+NUcFD6Q/lH3FFErZh0+2 zbhyHN/xgh+IRXjAeO3mVp2cfzA+dqmnjaV52vfL2NzuKVGNu7jfRIUrGpzZj3srZLS3 a0c2xGVa3qD7HLaKWzpoXHkt5L6EBxucCHimdxYqGugVbeeExcwHPE9rcTAIyV2Az/aU CXjp9hZBp/AC46hEKG3K4V/79qsWY9czqoW57ppNbZz6y6DkAmP3agRFQNsuK+IydcB7 m4n8lU6uSJLEOJeD0rFZDOqQ05JJODMj9D9+kte6mpqKU/olCpFN3HmImUwPGzgDo0fQ kyyg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=nwcp989pQgRD3YcPcWPZQA6e6MrlT9pQS50uM75oqPg=; b=NHlSY6nHFTb8MYYg69Qufa3T2GIDXOQVIPp0Qq9Ri9DjyLQPaOZExkZrDQbVQOW3YU JepgzXhu1TJfKNDyA+b6NdgGwaDpBk3MJdfjCQJ1Cy5NlJ44kZeavKgAsNtkKiyK9cYd kQ8aacT8Vf4H+TneLHtZlOc3O4DbSjfgqqJujVwZVFNNej0zT2TQvFXD85p5dOIujDXZ LgH2T2GMylS/OLR8Ta2VExid0aE76dgSe1HnFaZXcMKp90TYgdCtbv6WLWNwPMpzdFOO mGt22t0bKH3ipQiC37l6VZtSuBcxC17rH30mCxRMViH4vHJTI4beBixLMMbixG1hKfIH QiZw== X-Gm-Message-State: ACrzQf0RsSXoXmOUfH9qZoMlMGIMOUutzcwTqqtzpVDZAByJ06hh8GMQ oDViTXocR0ufet1qpZkCv3Q3LKN6sP5Uzg== X-Received: by 2002:a05:600c:35d2:b0:3b4:a897:d48 with SMTP id r18-20020a05600c35d200b003b4a8970d48mr851547wmq.48.1664604839033; Fri, 30 Sep 2022 23:13:59 -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 bv14-20020a0560001f0e00b0022ae8b862a7sm4171739wrb.35.2022.09.30.23.13.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Sep 2022 23:13:58 -0700 (PDT) From: OvchinnikovDmitrii To: ffmpeg-devel@ffmpeg.org Date: Sat, 1 Oct 2022 08:13:41 +0200 Message-Id: <20221001061341.662-3-ovchinnikov.dmitrii@gmail.com> X-Mailer: git-send-email 2.30.0.windows.2 In-Reply-To: <20221001061341.662-1-ovchinnikov.dmitrii@gmail.com> References: <20221001061341.662-1-ovchinnikov.dmitrii@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [crop support for matroska demuxer 3/3] 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: IWNc2WXIbjFD 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" --- libavformat/matroskadec.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index d582f566a2..e7b00cdbe6 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -210,6 +210,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; @@ -517,10 +521,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 } }, @@ -2879,6 +2883,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)