From edea3e484990d4b58fbb34b0ccaa2d5f8811982b Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Thu, 4 Sep 2025 14:27:02 +0200 Subject: [PATCH 1/4] python script for MD5 hash generation - should be cross-platform - prints the whole relative path into the file, not just the filename. This is needed for characterization P800 tests with the three different levels to avoid name collisions --- other/get_md5.py | 68 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) create mode 100644 other/get_md5.py diff --git a/other/get_md5.py b/other/get_md5.py new file mode 100644 index 00000000..5ff2f915 --- /dev/null +++ b/other/get_md5.py @@ -0,0 +1,68 @@ +# (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, +# Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., +# Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, +# Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other +# contributors to this repository. All Rights Reserved. + +# This software is protected by copyright law and by international treaties. +# The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB, +# Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., +# Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, +# Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other +# contributors to this repository retain full ownership rights in their respective contributions in +# the software. This notice grants no license of any kind, including but not limited to patent +# license, nor is any license granted by implication, estoppel or otherwise. + +# Contributors are required to enter into the IVAS codec Public Collaboration agreement before making +# contributions. + +# This software is provided "AS IS", without any express or implied warranties. The software is in the +# development stage. It is intended exclusively for experts who have experience with such software and +# solely for the purpose of inspection. All implied warranties of non-infringement, merchantability +# and fitness for a particular purpose are hereby disclaimed and excluded. + +# Any dispute, controversy or claim arising under or in relation to providing this software shall be +# submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in +# accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and +# the United Nations Convention on Contracts on the International Sales of Goods. + +import argparse +from pathlib import Path +from hashlib import md5 + + +def get_hash_line_for_file(file: Path, experiment_dir: Path): + with open(file, "b") as f: + hash = md5(f.read()).hexdigest() + + filepath = file.relative_to(experiment_dir) + hashline = f"{str(filepath)} {hash}" + + return hashline + + +def main(experiment_dir, out_file): + wav_files = experiment_dir.glob("proc_output*/**/*c??.wav") + + hashlines = [get_hash_line_for_file(f, experiment_dir) for f in wav_files] + + with open(out_file) as f: + f.writelines(hashlines) + + +if __name__ == "__main__": + parser = argparse.ArgumentParser( + description="Cross-platform script for generating MD5 hashes of output files for the characterization testing experiments." + ) + parser.add_argument( + "experiment_dir", + type=Path, + help="Directory of the respective experiment (e.g. experiments/characterization/P800-12", + ) + parser.add_argument( + "out_file", type=Path, help="Output text file with filenames and Hashes" + ) + + args = parser.parse_args() + + main(args.experiment_dir, args.out_file) -- GitLab From 39d0f2e033800b8763a373f33df8d81f216d161d Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Thu, 4 Sep 2025 14:29:30 +0200 Subject: [PATCH 2/4] sort file paths found for reproducibility --- other/get_md5.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/other/get_md5.py b/other/get_md5.py index 5ff2f915..996c8f19 100644 --- a/other/get_md5.py +++ b/other/get_md5.py @@ -42,7 +42,7 @@ def get_hash_line_for_file(file: Path, experiment_dir: Path): def main(experiment_dir, out_file): - wav_files = experiment_dir.glob("proc_output*/**/*c??.wav") + wav_files = sorted(experiment_dir.glob("proc_output*/**/*c??.wav")) hashlines = [get_hash_line_for_file(f, experiment_dir) for f in wav_files] -- GitLab From 3aa64120406443d2fe9a79e1936498c2538beb7d Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Thu, 4 Sep 2025 15:17:49 +0200 Subject: [PATCH 3/4] fix file modes and default to posix path prints for diff-compat --- other/get_md5.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/other/get_md5.py b/other/get_md5.py index 996c8f19..53817562 100644 --- a/other/get_md5.py +++ b/other/get_md5.py @@ -32,11 +32,12 @@ from hashlib import md5 def get_hash_line_for_file(file: Path, experiment_dir: Path): - with open(file, "b") as f: + with open(file, "rb") as f: hash = md5(f.read()).hexdigest() filepath = file.relative_to(experiment_dir) - hashline = f"{str(filepath)} {hash}" + # always print forward slashes even on windows to be able to diff the result files + hashline = f"{str(filepath.as_posix())} {hash}\n" return hashline @@ -46,7 +47,7 @@ def main(experiment_dir, out_file): hashlines = [get_hash_line_for_file(f, experiment_dir) for f in wav_files] - with open(out_file) as f: + with open(out_file, "w") as f: f.writelines(hashlines) -- GitLab From a225d2c3abe214870c122ae1eda7d94e50ba64a8 Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Thu, 4 Sep 2025 15:31:06 +0200 Subject: [PATCH 4/4] add shebang and remove other scripts --- other/get_md5.ps1 | 42 ------------------------------------ other/get_md5.py | 1 + other/get_md5.sh | 54 ----------------------------------------------- 3 files changed, 1 insertion(+), 96 deletions(-) delete mode 100644 other/get_md5.ps1 delete mode 100755 other/get_md5.sh diff --git a/other/get_md5.ps1 b/other/get_md5.ps1 deleted file mode 100644 index 1dd72ce3..00000000 --- a/other/get_md5.ps1 +++ /dev/null @@ -1,42 +0,0 @@ -# (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, -# Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., -# Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, -# Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other -# contributors to this repository. All Rights Reserved. - -# This software is protected by copyright law and by international treaties. -# The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB, -# Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., -# Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, -# Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other -# contributors to this repository retain full ownership rights in their respective contributions in -# the software. This notice grants no license of any kind, including but not limited to patent -# license, nor is any license granted by implication, estoppel or otherwise. - -# Contributors are required to enter into the IVAS codec Public Collaboration agreement before making -# contributions. - -# This software is provided "AS IS", without any express or implied warranties. The software is in the -# development stage. It is intended exclusively for experts who have experience with such software and -# solely for the purpose of inspection. All implied warranties of non-infringement, merchantability -# and fitness for a particular purpose are hereby disclaimed and excluded. - -# Any dispute, controversy or claim arising under or in relation to providing this software shall be -# submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in -# accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and -# the United Nations Convention on Contracts on the International Sales of Goods. - -param( - [Parameter(Mandatory)] - [String]$proc_output_dir, - [Parameter(Mandatory)] - [String]$out_file -) - -(Get-ChildItem $proc_output_dir -Recurse | Where-Object { $_.Name -like '*c??.wav' }) | -ForEach-Object { - $name = $_.Name - $hash = (Get-FileHash $_.FullName -Algorithm MD5).Hash - - "$name $hash" >> $out_file -} \ No newline at end of file diff --git a/other/get_md5.py b/other/get_md5.py index 53817562..557c8a50 100644 --- a/other/get_md5.py +++ b/other/get_md5.py @@ -1,3 +1,4 @@ +#! /usr/bin/env python3 # (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, # Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., # Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, diff --git a/other/get_md5.sh b/other/get_md5.sh deleted file mode 100755 index feca7db7..00000000 --- a/other/get_md5.sh +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/sh - -# (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, -# Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., -# Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, -# Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other -# contributors to this repository. All Rights Reserved. - -# This software is protected by copyright law and by international treaties. -# The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB, -# Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., -# Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, -# Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other -# contributors to this repository retain full ownership rights in their respective contributions in -# the software. This notice grants no license of any kind, including but not limited to patent -# license, nor is any license granted by implication, estoppel or otherwise. - -# Contributors are required to enter into the IVAS codec Public Collaboration agreement before making -# contributions. - -# This software is provided "AS IS", without any express or implied warranties. The software is in the -# development stage. It is intended exclusively for experts who have experience with such software and -# solely for the purpose of inspection. All implied warranties of non-infringement, merchantability -# and fitness for a particular purpose are hereby disclaimed and excluded. - -# Any dispute, controversy or claim arising under or in relation to providing this software shall be -# submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in -# accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and -# the United Nations Convention on Contracts on the International Sales of Goods. - -# simple script to create MD5 files as if produced by Microsoft Powershell -# run from within proc_output_x folder - -if [ $# -lt 2 ]; then - echo "Usage: $0 proc_output_dir testname.md5" - echo "Requires: md5sum (Linux) or md5 (macOS)" - exit 1 -fi - -system=$(uname -s) - -if [ "$system" = "Darwin" ]; then - md5="md5 -r" -else - md5=md5sum -fi - -tmpfile=`mktemp` -echo "" > $tmpfile -for f in $(find $1 -name "*c??.wav"); do - echo ${f##*/} $($md5 $f | awk '{ print toupper($1) }') >> $tmpfile -done -cat $tmpfile | sort > $2 -rm -f $tmpfile -- GitLab