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 CBEA044532 for ; Wed, 14 Sep 2022 17:20:37 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B561B68BB53; Wed, 14 Sep 2022 20:20:34 +0300 (EEST) 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 77A4568B971 for ; Wed, 14 Sep 2022 20:20:28 +0300 (EEST) Received: by mail-pl1-f182.google.com with SMTP id p18so15788065plr.8 for ; Wed, 14 Sep 2022 10:20:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sandflow-com.20210112.gappssmtp.com; s=20210112; h=to:subject:message-id:date:from:in-reply-to:references:mime-version :from:to:cc:subject:date; bh=S1bK6tqYMP+ICqNvHQJgC7f34lszFrAeYOqe/hP2y8o=; b=6PQwdRHq4p5J4rf6c+ucG8ky8ozFooHc7UvdLq+bQlgvhNlu3zVlg4Riap2J6LDcyK 8v2aMueDaLIAzHcidNLRNhGMVRTV0R3tW2vTjPGFOvMwnqJwCoqt7ElesRxuB6kjtFB+ p1RQj6JZ2cwIzv3tw69GeZK7hU8hHDUdQmPuBDRoqq3TcPcGZS7vPD/surywa28WuDhp oX3gpObs3gjohbn7aa7E/KOsuaPNSHlzwF2U1oc1Vy0e77O4KhOfUZMRYfDXmv6/sH+g Kt8Ky/WNpphXyh0l5JBlXj13JA6GdccGRxoRs8NE4uHludqf4Ivr5X9uN4Gv/ZZZFhJy /r3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=to:subject:message-id:date:from:in-reply-to:references:mime-version :x-gm-message-state:from:to:cc:subject:date; bh=S1bK6tqYMP+ICqNvHQJgC7f34lszFrAeYOqe/hP2y8o=; b=b7CMFK1sPcumHj8IC/95CjsLBnR6ozMegX5jTiH7txCdMs/hpWFobC54dDX3vB3fuc cZfhdrJiHFRiq6/LvB93hc5G4nnQSpQr1Rb+a3O9230IwZhPLsTC70LR0WZomvaLqSEG QZr9Gxhy7qIz2ET604zjrqeylGGSbVHlZ2lajBHbB5cT3Xyl7meqRkwHJfokajgQY3uz Y6GjbRO7oiYpqKVbTE2tL90nf27yD7JT2m0zKkO6NoR4Db8W21pEoyaqeZp+Uzg93RL5 96e20sQQglXZSi2sjA3i2DjZyNq/ILx3jBsPGBDp3YUfx+M2Iu+UB1zjs6Y4t5WrBIQD tLlw== X-Gm-Message-State: ACrzQf0hxNP4o4NpO9ST1nl2nLp1eDwSYUWemJeoGlPnkBOlHjqpqn9T YWrQ2JwhQ3aDG2IulfJBwJIsgnL6L+uZmw== X-Google-Smtp-Source: AMsMyM4IgnfxDB82rehR572mNHFcH5VbYkeHg5DLZqAPzEDOIIahF0P77Bzle2HWfQhGorn4qg33wg== X-Received: by 2002:a17:902:b184:b0:172:766e:7f35 with SMTP id s4-20020a170902b18400b00172766e7f35mr31297plr.174.1663176026203; Wed, 14 Sep 2022 10:20:26 -0700 (PDT) Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com. [209.85.214.169]) by smtp.gmail.com with ESMTPSA id r4-20020a17090a438400b002008d0df002sm9392940pjg.50.2022.09.14.10.20.25 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 14 Sep 2022 10:20:25 -0700 (PDT) Received: by mail-pl1-f169.google.com with SMTP id c2so15806275plo.3 for ; Wed, 14 Sep 2022 10:20:25 -0700 (PDT) X-Received: by 2002:a17:902:f541:b0:176:e8f1:cd57 with SMTP id h1-20020a170902f54100b00176e8f1cd57mr65105plf.8.1663176024582; Wed, 14 Sep 2022 10:20:24 -0700 (PDT) MIME-Version: 1.0 References: <20220906215145.6607-1-pal@sandflow.com> In-Reply-To: <20220906215145.6607-1-pal@sandflow.com> From: Pierre-Anthony Lemieux Date: Wed, 14 Sep 2022 10:20:14 -0700 X-Gmail-Original-Message-ID: Message-ID: To: ffmpeg-devel@ffmpeg.org Subject: Re: [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 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: Ping. All outstanding feedback has been addressed AFAIK. This patchset addresses https://trac.ffmpeg.org/ticket/9856 On Tue, Sep 6, 2022 at 2:51 PM wrote: > > 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; > -- > 2.25.1 > _______________________________________________ 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".