From patchwork Tue Sep 6 21:51:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre-Anthony Lemieux X-Patchwork-Id: 37735 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:139a:b0:8f:1db5:eae2 with SMTP id w26csp3527544pzh; Tue, 6 Sep 2022 14:52:02 -0700 (PDT) X-Google-Smtp-Source: AA6agR6gs+yuvg8qVaZ3Zl0cw7PzmC5mKszDojfMPsURf/SMLJFNIqvw0oKnIEerJWcFCN63iQan X-Received: by 2002:a17:907:a0c6:b0:73d:bb3c:328b with SMTP id hw6-20020a170907a0c600b0073dbb3c328bmr330279ejc.354.1662501122184; Tue, 06 Sep 2022 14:52:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1662501122; cv=none; d=google.com; s=arc-20160816; b=DhxHWpsdygz/qBfVGZ3z0fvvO1pbWN0Aik+MCQWHoBFeF7EG4QUc6mxHHVBylFq2+H tijYY2SIhtlY05NrY39KNDfXciKqoQBGstzj8UKRNdQHTLu+D6VahJe6lhFXU5HzLhbz Y1VlxNUFaPhD+u55fhE8RACyUAM7/gsykERDBk/evtzLhYXkWY+s+YGRCsIhqoY8S/Dd XvBkYvHv6GzYzQoUsUQlhFEpBstd+DbYKP+HzNnxxGGgWPND5mbpbt42KTbKA/mUTQLB YS7qfkKebGO5OT5QEV94Fd0VqXUDH+GNJLe2g/1Gdf9FHDLSpFAX1fDJtJjacm16NyO9 WcAA== 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 :delivered-to; bh=pFlRqXzX9ZqFveASLTm4duRb9ZDa77yS2GAYGt87l8I=; b=b6Py9W9vpSi1MXq/gacJRYfmAluVmV3K9c4P0KUaEivXbRJxEH9LFukFbMMNJC2MW9 4BHHfThd9q7zGcrPVk0GzXO/tsCkoqBdhuwa8XMzLQXdzWhjhsL5c8Xnrs+P6Bl0EPy3 vNPLZi8dWajZFgwf6DYb05qvak7lI5+BnkeUhu3DatAO6KgzciufgKgbI433myAsrsB1 wMfP2/VMNJpd88PErDoyy8ZvLPVd4RS193tS63sKLDZrL6/SKzNp80JOS58yz3Ww0QJb Dm5uNnzFjS9K6EHb6pRP6HgpW4gMtnjEZW3va03s7JQeh+EHKzYJoUi2Rn29oM+N/FUV R7fQ== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id dd5-20020a1709069b8500b0076fb816dae6si1863025ejc.592.2022.09.06.14.52.01; Tue, 06 Sep 2022 14:52:02 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 45ED468BB51; Wed, 7 Sep 2022 00:51:59 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E508168BA44 for ; Wed, 7 Sep 2022 00:51:52 +0300 (EEST) Received: by mail-pl1-f182.google.com with SMTP id u22so12556233plq.12 for ; Tue, 06 Sep 2022 14:51:52 -0700 (PDT) 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=Lrw5R/hNXKERm8GnKiYZEcShdcR708bJGSMLoP3u28s=; b=FDjhccAPecB092yTLOqMtoAkE2W0QVY1hShcWqCTGQGPu+LPxNip01oDGsED3zvpbV adcr8t+w5o/KMXuZc4jdtpNGoC+X6nf3KwN1ETmljAl9xweArcMBpLOd47wGe13EIVqv bISZTvFuHybFZbZBz1od5YiFGNG3xLwWgex34HwpF0qZ3/kjlsCv6nxk/vNoy181nczO SSfvyDOgDd40EkHB4/iqLtZLMYuniY25bzq3ImJdd+nVi17t/PU4hFezcK/xOYryUZ2G SV0xQBp/OtunhlhJBbswJ1jbodaAzqL6jqc9PI5RiZsxx6A89HM3N/CVc0I0dkPaoF3+ LC4w== X-Gm-Message-State: ACgBeo24v7UjmS5hRV7OKIYwXg30Ub5dBV2J3q9CWlJQJpuTx0qw5F4N j3oZGA5173Cny0Ida5Vu7yVvLBOH/gs= X-Received: by 2002:a17:902:694a:b0:172:bd15:3ece with SMTP id k10-20020a170902694a00b00172bd153ecemr548870plt.116.1662501110661; Tue, 06 Sep 2022 14:51:50 -0700 (PDT) Received: from localhost (76-14-89-2.sf-cable.astound.net. [76.14.89.2]) by smtp.gmail.com with ESMTPSA id o22-20020a63f156000000b00434acf7a05fsm1967722pgk.45.2022.09.06.14.51.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Sep 2022 14:51:50 -0700 (PDT) Received: by localhost (sSMTP sendmail emulation); Tue, 06 Sep 2022 14:51:46 -0700 From: pal@sandflow.com To: ffmpeg-devel@ffmpeg.org Date: Tue, 6 Sep 2022 14:51:44 -0700 Message-Id: <20220906215145.6607-1-pal@sandflow.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 1/2] avformat/mxf: set stream frame rates for ST 422 essence containers 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: Pierre-Anthony Lemieux Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: JAp+k/p3Pw8C From: Pierre-Anthony Lemieux The MXF demuxer does not currently set AVStream::avg_frame_rate and ::r_frame_rate when J2K essence is wrapped according to SMPTE ST 422. --- libavformat/mxfdec.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c index feebff67aa..043e2e06ec 100644 --- a/libavformat/mxfdec.c +++ b/libavformat/mxfdec.c @@ -2140,6 +2140,13 @@ finish_decoding_index: return ret; } +static int mxf_is_st_422(const UID *essence_container_ul) { + static const uint8_t st_422_essence_container_ul[] = { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x07,0x0d,0x01,0x03,0x01,0x02,0x0c }; + + return essence_container_ul && mxf_match_uid(*essence_container_ul, st_422_essence_container_ul, + sizeof(st_422_essence_container_ul)); +} + static int mxf_is_intra_only(MXFDescriptor *descriptor) { return mxf_get_codec_ul(mxf_intra_only_essence_container_uls, @@ -2892,6 +2899,24 @@ static int mxf_parse_structural_metadata(MXFContext *mxf) av_log(mxf->fc, AV_LOG_INFO, "Unknown frame layout type: %d\n", descriptor->frame_layout); } + if (mxf_is_st_422(essence_container_ul)) { + switch ((*essence_container_ul)[14]) { + case 2: /* Cn: Clip- wrapped Picture Element */ + case 3: /* I1: Interlaced Frame, 1 field/KLV */ + case 4: /* I2: Interlaced Frame, 2 fields/KLV */ + case 6: /* P1: Frame- wrapped Picture Element */ + st->avg_frame_rate = source_track->edit_rate; + st->r_frame_rate = st->avg_frame_rate; + break; + case 5: /* F1: Field-wrapped Picture Element */ + st->avg_frame_rate = av_mul_q(av_make_q(2, 1), source_track->edit_rate); + st->r_frame_rate = st->avg_frame_rate; + break; + default: + break; + } + } + if (st->codecpar->codec_id == AV_CODEC_ID_PRORES) { switch (descriptor->essence_codec_ul[14]) { case 1: st->codecpar->codec_tag = MKTAG('a','p','c','o'); break; From patchwork Tue Sep 6 21:51:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre-Anthony Lemieux X-Patchwork-Id: 37736 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:139a:b0:8f:1db5:eae2 with SMTP id w26csp3527616pzh; Tue, 6 Sep 2022 14:52:10 -0700 (PDT) X-Google-Smtp-Source: AA6agR7wf0TzjdJL8WxmwTxhNq91tiHr/sfJeRqQj58qp+MmaMisWormc/bqUCIMHJE1wmlJQy7e X-Received: by 2002:a17:906:cc5d:b0:73d:c534:1aaa with SMTP id mm29-20020a170906cc5d00b0073dc5341aaamr329982ejb.626.1662501129944; Tue, 06 Sep 2022 14:52:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1662501129; cv=none; d=google.com; s=arc-20160816; b=ADJB6mjbaxbFI4F+7f8toJ7DE5+xpmI/YXda1T06IExSjcPP2tx3Wbzg4KxEJTZPqr EGGq673DmJVU5JQCpnGGzVzf0cLzXpeUxEUbf7iKBfQYzQLizIN1dPTpChd9pWV1AdAg 6CNcBtHjvVJdEKztRp0AMWpDPCWEzrAOJ5cQejNCfx7XfVT3dEYcqcCj4u34SYuoYkHJ kFSlewFOyHZYmNHgobCEqFUUqH4BheVhCUTSlJwYZ20xL89qzDZiovEoHiFt6OM5RGK3 BA6wcj3cRofZYFBLzU8j6AMpk+7BVRsRlo5jjd2JbnbRZlwBTAZEKsIQnCjwMQqHtYdI tjNA== 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:delivered-to; bh=hKFvK2W3FczBzHYp0Gf1AOF3QNbnMtf0p9fxX936sXg=; b=0xSVhw9Y37vfwqu9Yn7OARIA5etzk4deOntKcp9anulYENROspg+QoGcBS/1RjI+CF 3bNmAxKFYaMKpdotnPjOm0CE5DBvj74zLUXm4tmPM2bfxQPHvv6Qpw1inZrYTmIqMniK GdJUKoLtR2frg/7EaJLUoML8KkcdAJocwiTaphWizT6SRoSVnEB57RFC18akSuf/Xlvx F679l3ZYrpIYubR4m4HIXgSI5o1zcd06G+OSBSlVhYOZThYoE1++8MTgM3Tl/i5P8jza WMW8XhEaB5/McNGtZYbq1heA3TLQJmDVLnFuNZ6B5oSMVQBRuQU2Fd1OBSBL/308tEJG vmWQ== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id hv11-20020a17090760cb00b00734be0ce32esi11741427ejc.688.2022.09.06.14.52.09; Tue, 06 Sep 2022 14:52:09 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5E27968BB59; Wed, 7 Sep 2022 00:52:03 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f179.google.com (mail-pf1-f179.google.com [209.85.210.179]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B44F468BA62 for ; Wed, 7 Sep 2022 00:51:56 +0300 (EEST) Received: by mail-pf1-f179.google.com with SMTP id 123so3316964pfy.2 for ; Tue, 06 Sep 2022 14:51:56 -0700 (PDT) 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=M4vb87vAV0kYbTQ2/I0P2cA5tzn9YJ6gl/P43EQrdwM=; b=XHjgm0lxmIXgNxXYVyAbF1kQfruqcfVrdO3gCTK36kdnmJyCNkjzHEgyUR1BAWFhDu 5ZkHANl/I/oVMCoWSpVO1sxafWbOzHSzGpEbElPyQ350C5+JmgqJPclQ+EDNEKP5Q4Wx HsgpOKpcGznCT3OFwaUvcgVUwi5PTYby0euTJ/YDbhvlQx0lZQtS9lXPwMcmacdE5GbN p4OGY5Q9UAZz4WmE0sI7TYo3qCphNEuVXfa6jxlTK8rWGmQpscU3idRrTBU6UkbZ4BYq NsuwNb1ZrWsglNjxF7QZHQ0nkTaqWtRzdH8KjbMF2GFT5fFVr/0T0aXbzIGXBxrML8AU p97A== X-Gm-Message-State: ACgBeo07K5QgtANg+F45Eercr0w4h9MAdXqIST96FHfckbbRqo/uJKjP Ea9KRxmVFqWXRAVW4rbBzfjspUTIiDQ= X-Received: by 2002:a63:a4f:0:b0:42c:3692:c9bf with SMTP id z15-20020a630a4f000000b0042c3692c9bfmr603788pgk.35.1662501114486; Tue, 06 Sep 2022 14:51:54 -0700 (PDT) Received: from localhost (76-14-89-2.sf-cable.astound.net. [76.14.89.2]) by smtp.gmail.com with ESMTPSA id jc3-20020a17090325c300b00174abcb02d6sm6025962plb.235.2022.09.06.14.51.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Sep 2022 14:51:54 -0700 (PDT) Received: by localhost (sSMTP sendmail emulation); Tue, 06 Sep 2022 14:51:50 -0700 From: pal@sandflow.com To: ffmpeg-devel@ffmpeg.org Date: Tue, 6 Sep 2022 14:51:45 -0700 Message-Id: <20220906215145.6607-2-pal@sandflow.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220906215145.6607-1-pal@sandflow.com> References: <20220906215145.6607-1-pal@sandflow.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 2/2] fate/mxf: add JPEG 2000 test 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: Pierre-Anthony Lemieux Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: +waXa6tbmy2B From: Pierre-Anthony Lemieux --- tests/fate/mxf.mak | 4 ++ tests/ref/fate/mxf-probe-j2k | 78 ++++++++++++++++++++++++++++++++++++ 2 files changed, 82 insertions(+) create mode 100644 tests/ref/fate/mxf-probe-j2k diff --git a/tests/fate/mxf.mak b/tests/fate/mxf.mak index 3ab936b5de..b2e86b49a8 100644 --- a/tests/fate/mxf.mak +++ b/tests/fate/mxf.mak @@ -29,6 +29,10 @@ FATE_MXF_PROBE-$(call ENCDEC, DNXHD, MXF) += fate-mxf-probe-dnxhd fate-mxf-probe-dnxhd: SRC = $(TARGET_SAMPLES)/mxf/multiple_components.mxf fate-mxf-probe-dnxhd: CMD = run $(PROBE_FORMAT_STREAMS_COMMAND) -i "$(SRC)" +FATE_MXF_PROBE-$(call DEMDEC, MXF, JPEG2000) += fate-mxf-probe-j2k +fate-mxf-probe-j2k: SRC = $(TARGET_SAMPLES)/imf/countdown/countdown-small.mxf +fate-mxf-probe-j2k: CMD = run $(PROBE_FORMAT_STREAMS_COMMAND) -i "$(SRC)" + FATE_MXF_PROBE-$(call ENCDEC2, DVVIDEO, PCM_S16LE, MXF) += fate-mxf-probe-dv25 fate-mxf-probe-dv25: SRC = $(TARGET_SAMPLES)/mxf/Avid-00005.mxf fate-mxf-probe-dv25: CMD = run $(PROBE_FORMAT_STREAMS_COMMAND) -i "$(SRC)" diff --git a/tests/ref/fate/mxf-probe-j2k b/tests/ref/fate/mxf-probe-j2k new file mode 100644 index 0000000000..2dbf2ac37d --- /dev/null +++ b/tests/ref/fate/mxf-probe-j2k @@ -0,0 +1,78 @@ +[STREAM] +index=0 +codec_name=jpeg2000 +profile=1798 +codec_type=video +codec_tag_string=[0][0][0][0] +codec_tag=0x0000 +width=640 +height=360 +coded_width=640 +coded_height=360 +closed_captions=0 +film_grain=0 +has_b_frames=0 +sample_aspect_ratio=1:1 +display_aspect_ratio=16:9 +pix_fmt=rgb48le +level=-99 +color_range=unknown +color_space=unknown +color_transfer=bt709 +color_primaries=bt709 +chroma_location=unspecified +field_order=progressive +refs=1 +id=N/A +r_frame_rate=24/1 +avg_frame_rate=24/1 +time_base=1/24 +start_pts=0 +start_time=0.000000 +duration_ts=24 +duration=1.000000 +bit_rate=N/A +max_bit_rate=N/A +bits_per_raw_sample=16 +nb_frames=N/A +nb_read_frames=N/A +nb_read_packets=N/A +DISPOSITION:default=0 +DISPOSITION:dub=0 +DISPOSITION:original=0 +DISPOSITION:comment=0 +DISPOSITION:lyrics=0 +DISPOSITION:karaoke=0 +DISPOSITION:forced=0 +DISPOSITION:hearing_impaired=0 +DISPOSITION:visual_impaired=0 +DISPOSITION:clean_effects=0 +DISPOSITION:attached_pic=0 +DISPOSITION:timed_thumbnails=0 +DISPOSITION:captions=0 +DISPOSITION:descriptions=0 +DISPOSITION:metadata=0 +DISPOSITION:dependent=0 +DISPOSITION:still_image=0 +TAG:file_package_umid=0x060A2B340101010501010F201300000035E05073878E4B2FB69D2369F25ADFC9 +TAG:file_package_name=File Package: SMPTE ST 422 / ST 2067-5 frame wrapping of JPEG 2000 codestreams +TAG:track_name=Image Track +[/STREAM] +[FORMAT] +format_name=mxf +duration=1.000000 +bit_rate=577792 +TAG:operational_pattern_ul=060e2b34.04010101.0d010201.01010100 +TAG:uid=f1994e51-a844-49e4-9459-1ddd622eb65d +TAG:generation_uid=1be151ac-cc95-4314-b09f-7420eda9932b +TAG:company_name=Sandflow Consulting LLC +TAG:product_name=dcdm2imf +TAG:product_version_num=0.0.0.0.0 +TAG:product_version=1.0-beta1 +TAG:product_uid=927fc4d1-89a3-4f88-88bb-d363ed33084a +TAG:modification_date=2022-01-07T22:05:01.000000Z +TAG:toolkit_version_num=2.10.38.27240.1 +TAG:application_platform=win32 +TAG:material_package_umid=0x060A2B340101010501010F201300000072BAF0557DA749308C14738BCD4FA116 +TAG:material_package_name=Material Package +[/FORMAT]