From: pal@sandflow.com To: ffmpeg-devel@ffmpeg.org Cc: Pierre-Anthony Lemieux <pal@palemieux.com> Subject: [FFmpeg-devel] [PATCH 2/2] avformat/tests/imf: add invalid resource test Date: Wed, 26 Apr 2023 10:53:02 -0700 Message-ID: <20230426175302.946-2-pal@sandflow.com> (raw) In-Reply-To: <20230426175302.946-1-pal@sandflow.com> From: Pierre-Anthony Lemieux <pal@palemieux.com> --- libavformat/tests/imf.c | 65 +++++++++++++++++++++++++++++++++++++++++ tests/ref/fate/imf | 2 ++ 2 files changed, 67 insertions(+) diff --git a/libavformat/tests/imf.c b/libavformat/tests/imf.c index 2cacb43f47..cfd84fb8c8 100644 --- a/libavformat/tests/imf.c +++ b/libavformat/tests/imf.c @@ -218,6 +218,45 @@ const char *cpl_doc = "</SegmentList>" "</CompositionPlaylist>"; + const char *cpl_bad_resource_doc = + "<CompositionPlaylist xmlns=\"http://www.smpte-ra.org/schemas/2067-3/2016\"" + " xmlns:cc=\"http://www.smpte-ra.org/schemas/2067-2/2016\"" + " xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\">" + "<Id>urn:uuid:8713c020-2489-45f5-a9f7-87be539e20b5</Id>" + "<IssueDate>2021-07-13T17:06:22Z</IssueDate>" + "<Creator language=\"en\">FFMPEG</Creator>" + "<ContentTitle>FFMPEG sample content</ContentTitle>" + "<EssenceDescriptorList>" + " <EssenceDescriptor>" + " <Id>urn:uuid:8e097bb0-cff7-4969-a692-bad47bfb528f</Id>" + " </EssenceDescriptor>" + "</EssenceDescriptorList>" + "<CompositionTimecode>" + "<TimecodeDropFrame>false</TimecodeDropFrame>" + "<TimecodeRate>24</TimecodeRate>" + "<TimecodeStartAddress>02:10:01.23</TimecodeStartAddress>" + "</CompositionTimecode>" + "<EditRate>24000 1001</EditRate>" + "<SegmentList>" + "<Segment>" + "<Id>urn:uuid:81fed4e5-9722-400a-b9d1-7f2bd21df4b6</Id>" + "<SequenceList>" + "<cc:MainImageSequence>" + "<Id>urn:uuid:6ae100b0-92d1-41be-9321-85e0933dfc42</Id>" + "<TrackId>urn:uuid:e8ef9653-565c-479c-8039-82d4547973c5</TrackId>" + "<ResourceList>" + "<Resource xsi:type=\"TrackFileResourceType\">" + "<Id>urn:uuid:7d418acb-07a3-4e57-984c-b8ea2f7de4ec</Id>" + "<IntrinsicDuration>24</IntrinsicDuration>" + "<SourceEncoding>urn:uuid:f00e49a8-0dec-4e6c-95e7-078df988b751</SourceEncoding>" + "</Resource>" + "</ResourceList>" + "</cc:MainImageSequence>" + "</SequenceList>" + "</Segment>" + "</SegmentList>" + "</CompositionPlaylist>"; + const char *cpl_bad_doc = "<Composition></Composition>"; const char *asset_map_doc = @@ -366,6 +405,27 @@ static int test_bad_cpl_parsing(FFIMFCPL **cpl) return 0; } +static int test_bad_resource_cpl_parsing(FFIMFCPL **cpl) +{ + xmlDocPtr doc; + int ret; + + doc = xmlReadMemory(cpl_bad_resource_doc, strlen(cpl_bad_resource_doc), NULL, NULL, 0); + if (doc == NULL) { + printf("XML parsing failed.\n"); + return 1; + } + + ret = ff_imf_parse_cpl_from_xml_dom(doc, cpl); + xmlFreeDoc(doc); + if (ret) { + printf("CPL parsing failed.\n"); + return ret; + } + + return 0; +} + static int check_asset_locator_attributes(IMFAssetLocator *asset, IMFAssetLocator *expected_asset) { @@ -533,5 +593,10 @@ int main(int argc, char *argv[]) } printf("#### End failing test ####\n"); + printf("#### The following should emit errors ####\n"); + if (test_bad_resource_cpl_parsing(&cpl) != 0) + ret = 1; + printf("#### End emission of errors ####\n"); + return ret; } diff --git a/tests/ref/fate/imf b/tests/ref/fate/imf index 5093167bc7..fdfed8ac17 100644 --- a/tests/ref/fate/imf +++ b/tests/ref/fate/imf @@ -53,3 +53,5 @@ For asset: 4: #### The following should fail #### CPL parsing failed. #### End failing test #### +#### The following should emit errors #### +#### End emission of errors #### -- 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".
next prev parent reply other threads:[~2023-04-26 17:53 UTC|newest] Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top 2023-04-26 17:53 [FFmpeg-devel] [PATCH 1/2] avformat/imf: fix invalid resource handling pal 2023-04-26 17:53 ` pal [this message] 2023-04-27 7:51 ` Anton Khirnov
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20230426175302.946-2-pal@sandflow.com \ --to=pal@sandflow.com \ --cc=ffmpeg-devel@ffmpeg.org \ --cc=pal@palemieux.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel This inbox may be cloned and mirrored by anyone: git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \ ffmpegdev@gitmailbox.com public-inbox-index ffmpegdev Example config snippet for mirrors. AGPL code for this site: git clone https://public-inbox.org/public-inbox.git