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 117F843A7B for ; Mon, 5 Sep 2022 18:06:33 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 06DD068B515; Mon, 5 Sep 2022 21:06:31 +0300 (EEST) Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4979968B021 for ; Mon, 5 Sep 2022 21:06:24 +0300 (EEST) Received: by mail-pl1-f181.google.com with SMTP id p18so9102188plr.8 for ; Mon, 05 Sep 2022 11:06:24 -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=E0UDxC9QdrUVECmHvZjUwzumClB9nyHVhuGWAzHMcRc=; b=2cE+DjbxJ9xBn5IFQ3VKxKacFgmCZY6gnqd5G/i2JjIIl2O1nwmdxW4PVJHl9rQwAH eIT6wfbiNw5hWvMZSNm5CK1p2xcX47xP3nLDLxu9N0JTNeQNtMw9YSVidniavdEqshSX 8nEMCVCBwwtwPMyLfFdchBbMj5tV0iqqmtTVqtEiYfxsdtMOMEZca2sH8PAwkHR4cSxM 3LVwjsVPckpGI2ACdVO74SR9Euh+l/GPBfQer89c1id0zegju/Y6m4ibxRRTat+IQb9o /MRo27SLKYir8swumc0uwKNKLAK9x6s8Dg15iRtlLhtJ1fGn5NS/i/nLcBUBcPv9sa0n KhWA== 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=E0UDxC9QdrUVECmHvZjUwzumClB9nyHVhuGWAzHMcRc=; b=vtoE9IaYLrz/UPVbLLvBkI/Y09E70o0APuv1wKnxYBBBeeVcVjHQb7Qe2dBoght+hk hT9VRxLfaMr0uKNFlxgZon1jVrNC8roETQ0KivX2Vuffh1aHA3aFBReY0nJwkDpjUouA KceFPQks0Ho1WHjRa8HbicZCRw7F22gG3hYTgTrNUWHO0ZjmY8OAtM/plSjqND6Khkae FBE7cDvG2hnh5DYD5xZ2l47gzSGZzf/Lrzbn9HcWEK+mq0f1vJOmAogJUg7DXED8EVdU rXSsh6uSMKarTP2tiaND8J143SI0aOlj7D+li1XC6jalLbedaBdR4NCHOkdraCt+1cNi JO3g== X-Gm-Message-State: ACgBeo07p15Zmoohtm+yDFWIpXN3bKBHw5Mm57JGbCq1uvKcWkmcXT11 eX/M3Hu7o9mJXhn8J2Ej8h+WBCGUAZh7cg== X-Google-Smtp-Source: AA6agR6L5Ylaf61xe6bLbj1sspDzsvMPsHOwxkFZdIzwAq6/7sEgfq8Y1EgrbhLuKTK4ZE1zsjleIw== X-Received: by 2002:a17:902:ce11:b0:172:6f2c:a910 with SMTP id k17-20020a170902ce1100b001726f2ca910mr51153052plg.156.1662401181339; Mon, 05 Sep 2022 11:06:21 -0700 (PDT) Received: from mail-pf1-f172.google.com (mail-pf1-f172.google.com. [209.85.210.172]) by smtp.gmail.com with ESMTPSA id bf10-20020a170902b90a00b00172ff99d0afsm7880299plb.140.2022.09.05.11.06.20 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 05 Sep 2022 11:06:20 -0700 (PDT) Received: by mail-pf1-f172.google.com with SMTP id q15so9163853pfn.11 for ; Mon, 05 Sep 2022 11:06:20 -0700 (PDT) X-Received: by 2002:a63:ce17:0:b0:42a:bfb6:f218 with SMTP id y23-20020a63ce17000000b0042abfb6f218mr41774640pgf.484.1662401179728; Mon, 05 Sep 2022 11:06:19 -0700 (PDT) MIME-Version: 1.0 References: <20220823051050.3515-1-pal@sandflow.com> In-Reply-To: <20220823051050.3515-1-pal@sandflow.com> From: Pierre-Anthony Lemieux Date: Mon, 5 Sep 2022 11:06:07 -0700 X-Gmail-Original-Message-ID: Message-ID: To: ffmpeg-devel@ffmpeg.org Subject: Re: [FFmpeg-devel] [PATCH v1 1/2] avformat/imfdec: use CPL start timecode if available 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: Just a quick ping. Looking forward to feedback. This patchset is intended to address https://trac.ffmpeg.org/ticket/9842. On Mon, Aug 22, 2022 at 10:11 PM wrote: > > From: Pierre-Anthony Lemieux > > The IMF CPL contains an optional timecode start address. This patch reads the > latter, if present, into the context's timecode metadata parameter. > This addresses https://trac.ffmpeg.org/ticket/9842. > > --- > libavformat/imf.h | 2 + > libavformat/imf_cpl.c | 109 ++++++++++++++++++++++++++++++++++++++++++ > libavformat/imfdec.c | 11 +++++ > 3 files changed, 122 insertions(+) > > diff --git a/libavformat/imf.h b/libavformat/imf.h > index 4271cd9582..70ed007312 100644 > --- a/libavformat/imf.h > +++ b/libavformat/imf.h > @@ -59,6 +59,7 @@ > #include "libavformat/avio.h" > #include "libavutil/rational.h" > #include "libavutil/uuid.h" > +#include "libavutil/timecode.h" > #include > > /** > @@ -130,6 +131,7 @@ typedef struct FFIMFCPL { > AVUUID id_uuid; /**< CompositionPlaylist/Id element */ > xmlChar *content_title_utf8; /**< CompositionPlaylist/ContentTitle element */ > AVRational edit_rate; /**< CompositionPlaylist/EditRate element */ > + AVTimecode *tc; /**< CompositionPlaylist/CompositionTimecode element */ > FFIMFMarkerVirtualTrack *main_markers_track; /**< Main Marker Virtual Track */ > FFIMFTrackFileVirtualTrack *main_image_2d_track; /**< Main Image Virtual Track */ > uint32_t main_audio_track_count; /**< Number of Main Audio Virtual Tracks */ > diff --git a/libavformat/imf_cpl.c b/libavformat/imf_cpl.c > index 4acc20feee..1868d7db45 100644 > --- a/libavformat/imf_cpl.c > +++ b/libavformat/imf_cpl.c > @@ -116,6 +116,25 @@ int ff_imf_xml_read_uint32(xmlNodePtr element, uint32_t *number) > return ret; > } > > +static int ff_imf_xml_read_boolean(xmlNodePtr element, int *value) > +{ > + xmlChar *element_text = NULL; > + int ret = 0; > + > + element_text = xmlNodeListGetString(element->doc, element->xmlChildrenNode, 1); > + > + if (xmlStrcmp(element_text, "true") == 0 || xmlStrcmp(element_text, "1") == 0) > + *value = 1; > + else if (xmlStrcmp(element_text, "false") == 0 || xmlStrcmp(element_text, "0") == 0) > + *value = 0; > + else > + ret = 1; > + > + xmlFree(element_text); > + > + return ret; > +} > + > static void imf_base_virtual_track_init(FFIMFBaseVirtualTrack *track) > { > memset(track->id_uuid, 0, sizeof(track->id_uuid)); > @@ -179,6 +198,90 @@ static int fill_content_title(xmlNodePtr cpl_element, FFIMFCPL *cpl) > return 0; > } > > +static int digit_to_int(char digit) > +{ > + if (digit >= '0' && digit <= '9') > + return digit - '0'; > + return -1; > +} > + > +/** > + * Parses a string that conform to the TimecodeType used in IMF CPL and defined > + * in SMPTE ST 2067-3. > + * @param[in] s string to parse > + * @param[out] tc_comps pointer to an array of 4 integers where the parsed HH, > + * MM, SS and FF fields of the timecode are returned. > + * @return 0 on success, < 0 AVERROR code on error. > + */ > +static int parse_cpl_tc_type(const char *s, int *tc_comps) > +{ > + if (av_strnlen(s, 11) != 11) > + return AVERROR(EINVAL); > + > + for (int i = 0; i < 4; i++) { > + int hi; > + int lo; > + > + hi = digit_to_int(s[i * 3]); > + lo = digit_to_int(s[i * 3 + 1]); > + > + if (hi == -1 || lo == -1) > + return AVERROR(EINVAL); > + > + tc_comps[i] = 10 * hi + lo; > + } > + > + return 0; > +} > + > +static int fill_timecode(xmlNodePtr cpl_element, FFIMFCPL *cpl) > +{ > + xmlNodePtr tc_element = NULL; > + xmlNodePtr element = NULL; > + xmlChar *tc_str = NULL; > + int df = 0; > + int comps[4]; > + int ret = 0; > + > + tc_element = ff_imf_xml_get_child_element_by_name(cpl_element, "CompositionTimecode"); > + if (!tc_element) > + return 0; > + > + element = ff_imf_xml_get_child_element_by_name(tc_element, "TimecodeDropFrame"); > + if (!element) { > + av_log(NULL, AV_LOG_ERROR, "CompositionTimecode element is missing\ > + a TimecodeDropFrame child element\n"); > + return AVERROR_INVALIDDATA; > + } > + > + if (ff_imf_xml_read_boolean(element, &df)) { > + av_log(NULL, AV_LOG_ERROR, "TimecodeDropFrame element is invalid\n"); > + return AVERROR_INVALIDDATA; > + } > + element = ff_imf_xml_get_child_element_by_name(tc_element, "TimecodeStartAddress"); > + if (!element) { > + av_log(NULL, AV_LOG_ERROR, "CompositionTimecode element is missing\ > + a TimecodeStartAddress child element\n"); > + return AVERROR_INVALIDDATA; > + } > + > + tc_str = xmlNodeListGetString(element->doc, element->xmlChildrenNode, 1); > + ret = parse_cpl_tc_type(tc_str, comps); > + xmlFree(tc_str); > + if (ret) > + return ret; > + > + cpl->tc = av_malloc(sizeof(AVTimecode)); > + if (!cpl->tc) > + return AVERROR(ENOMEM); > + ret = av_timecode_init_from_components(cpl->tc, cpl->edit_rate, > + df ? AV_TIMECODE_FLAG_DROPFRAME : 0, > + comps[0], comps[1], comps[2], comps[3], > + NULL); > + > + return ret; > +} > + > static int fill_edit_rate(xmlNodePtr cpl_element, FFIMFCPL *cpl) > { > xmlNodePtr element = NULL; > @@ -682,6 +785,8 @@ int ff_imf_parse_cpl_from_xml_dom(xmlDocPtr doc, FFIMFCPL **cpl) > goto cleanup; > if ((ret = fill_edit_rate(cpl_element, *cpl))) > goto cleanup; > + if ((ret = fill_timecode(cpl_element, *cpl))) > + goto cleanup; > if ((ret = fill_virtual_tracks(cpl_element, *cpl))) > goto cleanup; > > @@ -731,6 +836,7 @@ static void imf_cpl_init(FFIMFCPL *cpl) > av_uuid_nil(cpl->id_uuid); > cpl->content_title_utf8 = NULL; > cpl->edit_rate = av_make_q(0, 1); > + cpl->tc = NULL; > cpl->main_markers_track = NULL; > cpl->main_image_2d_track = NULL; > cpl->main_audio_track_count = 0; > @@ -753,6 +859,9 @@ void ff_imf_cpl_free(FFIMFCPL *cpl) > if (!cpl) > return; > > + if (cpl->tc) > + av_freep(&cpl->tc); > + > xmlFree(cpl->content_title_utf8); > > imf_marker_virtual_track_free(cpl->main_markers_track); > diff --git a/libavformat/imfdec.c b/libavformat/imfdec.c > index 5bbe7a53f8..fdf9a4e87c 100644 > --- a/libavformat/imfdec.c > +++ b/libavformat/imfdec.c > @@ -622,6 +622,8 @@ static int imf_read_header(AVFormatContext *s) > IMFContext *c = s->priv_data; > char *asset_map_path; > char *tmp_str; > + AVDictionaryEntry* tcr; > + char tc_buf[AV_TIMECODE_STR_SIZE]; > int ret = 0; > > c->interrupt_callback = &s->interrupt_callback; > @@ -641,6 +643,15 @@ static int imf_read_header(AVFormatContext *s) > if ((ret = ff_imf_parse_cpl(s->pb, &c->cpl)) < 0) > return ret; > > + tcr = av_dict_get(s->metadata, "timecode", NULL, 0); > + if (!tcr && c->cpl->tc) { > + ret = av_dict_set(&s->metadata, "timecode", > + av_timecode_make_string(c->cpl->tc, tc_buf, 0), 0); > + if (ret) > + return ret; > + av_log(s, AV_LOG_INFO, "Setting timecode to IMF CPL timecode %s\n", tc_buf); > + } > + > av_log(s, > AV_LOG_DEBUG, > "parsed IMF CPL: " AV_PRI_URN_UUID "\n", > -- > 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".