From 42996d5ff574e5390c11a8096968df871fed68ef Mon Sep 17 00:00:00 2001 From: rsanchez Date: Mon, 22 Jul 2024 14:39:24 +0200 Subject: [PATCH] fixup! Resolve comments --- scripts/gen_jct_vc.py | 13 ++----------- scripts/gen_jvet.py | 10 +--------- scripts/gen_jvt.py | 2 +- 3 files changed, 4 insertions(+), 21 deletions(-) diff --git a/scripts/gen_jct_vc.py b/scripts/gen_jct_vc.py index 9022114..a297fd7 100644 --- a/scripts/gen_jct_vc.py +++ b/scripts/gen_jct_vc.py @@ -1,9 +1,10 @@ #!/usr/bin/env python3 # Fluster - testing framework for decoders conformance -# Copyright (C) 2020, Fluendo, S.A. +# Copyright (C) 2020-2024, Fluendo, S.A. # Author: Pablo Marcos Oltra , Fluendo, S.A. # Author: Andoni Morales Alastruey , Fluendo, S.A. +# Author: Ruben Sanchez Sanchez , Fluendo, S.A. # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public License @@ -35,7 +36,6 @@ # pylint: enable=wrong-import-position BASE_URL = "https://www.itu.int/" -H266_URL = BASE_URL + "wftp3/av-arch/jvet-site/bitstream_exchange/VVC/draft_conformance/" H265_URL = BASE_URL + "wftp3/av-arch/jctvc-site/bitstream_exchange/draft_conformance/" BITSTREAM_EXTS = ( ".bin", @@ -287,12 +287,3 @@ def _fill_checksum_h265(self, test_vector, dest_dir): True ) generator.generate(not args.skip_download, args.jobs) - - generator = JCTVCGenerator( - 'draft6', - 'JVET-VVC_draft6', - Codec.H266, - 'JVET VVC draft6', - H266_URL - ) - generator.generate(not args.skip_download, args.jobs) diff --git a/scripts/gen_jvet.py b/scripts/gen_jvet.py index b011eca..69dd170 100644 --- a/scripts/gen_jvet.py +++ b/scripts/gen_jvet.py @@ -101,12 +101,6 @@ def generate(self, download, jobs): hparser.feed(data) for url in hparser.links[1:]: - # The first item in the AVCv1 list is a readme file - if "00readme_H" in url: - continue - elif "replaced" in url: - # This is in HEVC-SHVC, we don't want that. - continue file_url = os.path.basename(url) name = os.path.splitext(file_url)[0] file_input = f"{name}.bin" @@ -139,9 +133,7 @@ def generate(self, download, jobs): if not test_vector.input_file: raise Exception(f"Bitstream file not found in {dest_dir}") test_vector.source_checksum = utils.file_checksum(dest_path) - if "main10" in test_vector.name.lower(): - test_vector.output_format = OutputFormat.YUV420P10LE - elif self.use_ffprobe: + if self.use_ffprobe: ffprobe = utils.normalize_binary_cmd('ffprobe') command = [ffprobe, '-v', 'error', '-select_streams', 'v:0', '-show_entries', 'stream=pix_fmt', '-of', diff --git a/scripts/gen_jvt.py b/scripts/gen_jvt.py index 27783fb..6efd861 100755 --- a/scripts/gen_jvt.py +++ b/scripts/gen_jvt.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 # Fluster - testing framework for decoders conformance -# Copyright (C) 2024, Fluendo, S.A. +# Copyright (C) 2020-2024, Fluendo, S.A. # Author: Ruben Sanchez Sanchez , Fluendo, S.A. # # This library is free software; you can redistribute it and/or