Loading scripts/ivas_conformance/runConformance.py +19 −12 Original line number Diff line number Diff line Loading @@ -192,9 +192,13 @@ class MLDConformance: else: refEncOutput = self.getOutputFile(command) refEncOutput = refEncOutput.replace( "$CUT_PATH/dut/param_file/enc/", "$CUT_PATH/ref/param_file/enc/", f"{self.testvecDir}/testv/ref/param_file/enc/", ) refEncOutput = refEncOutput.replace( "$CUT_PATH/ref/sba_bs/pkt/", f"{self.testvecDir}/testv/ref/sba_bs/pkt/", ) # Run reference Encoder encCommandIdx = self.Commands["ENC"].index(command) Loading Loading @@ -233,10 +237,10 @@ class MLDConformance: refInputFile = command.split()[-2].replace( "$REF_PATH/ref", f"{self.testvDir}/ref" ) refInputFile = refInputFile.replace("_cut.192.fer", ".192") #refInputFile = refInputFile.replace("_cut.192.fer", ".192") # refInputFile = refInputFile.replace(".fer.192", ".192").replace(".192.fer", ".192").replace("_cut.192.fer", ".192").replace("_cut.192", ".192") refDecOutput = self.getOutputFile(command).replace( "$CUT_PATH/dut", f"{self.testvDir}/ref" "$CUT_PATH/ref", f"{self.testvDir}/ref" ) command = self.reformatCommand(command=command, ref=False) # command = command.replace("-VOIP", "") Loading @@ -247,6 +251,9 @@ class MLDConformance: + [refInputFile, dutDecOutputFile] ) self.process(command=" ".join(dutDecCmd)) ##### skip MLD verification for files with only 1 frame as MLD does not run with such files. Possible solution: append 0s and then compare ##### if refInputFile.find("_cut.192.fer") == -1: self.mld("DEC", dutPytestTag, refFile=refDecOutput, dutFile=dutDecOutputFile) def getRendOutputFile(self, command: str): Loading Loading @@ -302,10 +309,10 @@ class MLDConformance: if ref: command = command.replace( "$CUT_PATH/dut/param_file/enc/", f"{self.outputDir}/ref/enc/" "$CUT_PATH/ref/param_file/enc/", f"{self.outputDir}/ref/enc/" ) command = command.replace( "$CUT_PATH/dut/param_file/dec/", f"{self.outputDir}/ref/dec/" "$CUT_PATH/ref/param_file/dec/", f"{self.outputDir}/ref/dec/" ) command = command.replace( "$CUT_PATH/renderer/cut/", f"{self.outputDir}/ref/renderer/" Loading @@ -315,17 +322,17 @@ class MLDConformance: f"{self.outputDir}/ref/split_rendering/", ) command = command.replace( "$CUT_PATH/dut/sba_bs/pkt/", f"{self.outputDir}/ref/enc/" "$CUT_PATH/ref/sba_bs/pkt/", f"{self.outputDir}/ref/enc/" ) command = command.replace( "$CUT_PATH/dut/sba_bs/raw/", f"{self.outputDir}/ref/dec/" "$CUT_PATH/ref/sba_bs/raw/", f"{self.outputDir}/ref/dec/" ) else: command = command.replace( "$CUT_PATH/dut/param_file/enc/", f"{self.outputDir}/dut/enc/" "$CUT_PATH/ref/param_file/enc/", f"{self.outputDir}/dut/enc/" ) command = command.replace( "$CUT_PATH/dut/param_file/dec/", f"{self.outputDir}/dut/dec/" "$CUT_PATH/ref/param_file/dec/", f"{self.outputDir}/dut/dec/" ) command = command.replace( "$CUT_PATH/renderer/cut/", f"{self.outputDir}/dut/renderer/" Loading @@ -335,10 +342,10 @@ class MLDConformance: f"{self.outputDir}/dut/split_rendering/", ) command = command.replace( "$CUT_PATH/dut/sba_bs/pkt/", f"{self.outputDir}/dut/enc/" "$CUT_PATH/ref/sba_bs/pkt/", f"{self.outputDir}/dut/enc/" ) command = command.replace( "$CUT_PATH/dut/sba_bs/raw/", f"{self.outputDir}/dut/dec/" "$CUT_PATH/ref/sba_bs/raw/", f"{self.outputDir}/dut/dec/" ) return command Loading Loading
scripts/ivas_conformance/runConformance.py +19 −12 Original line number Diff line number Diff line Loading @@ -192,9 +192,13 @@ class MLDConformance: else: refEncOutput = self.getOutputFile(command) refEncOutput = refEncOutput.replace( "$CUT_PATH/dut/param_file/enc/", "$CUT_PATH/ref/param_file/enc/", f"{self.testvecDir}/testv/ref/param_file/enc/", ) refEncOutput = refEncOutput.replace( "$CUT_PATH/ref/sba_bs/pkt/", f"{self.testvecDir}/testv/ref/sba_bs/pkt/", ) # Run reference Encoder encCommandIdx = self.Commands["ENC"].index(command) Loading Loading @@ -233,10 +237,10 @@ class MLDConformance: refInputFile = command.split()[-2].replace( "$REF_PATH/ref", f"{self.testvDir}/ref" ) refInputFile = refInputFile.replace("_cut.192.fer", ".192") #refInputFile = refInputFile.replace("_cut.192.fer", ".192") # refInputFile = refInputFile.replace(".fer.192", ".192").replace(".192.fer", ".192").replace("_cut.192.fer", ".192").replace("_cut.192", ".192") refDecOutput = self.getOutputFile(command).replace( "$CUT_PATH/dut", f"{self.testvDir}/ref" "$CUT_PATH/ref", f"{self.testvDir}/ref" ) command = self.reformatCommand(command=command, ref=False) # command = command.replace("-VOIP", "") Loading @@ -247,6 +251,9 @@ class MLDConformance: + [refInputFile, dutDecOutputFile] ) self.process(command=" ".join(dutDecCmd)) ##### skip MLD verification for files with only 1 frame as MLD does not run with such files. Possible solution: append 0s and then compare ##### if refInputFile.find("_cut.192.fer") == -1: self.mld("DEC", dutPytestTag, refFile=refDecOutput, dutFile=dutDecOutputFile) def getRendOutputFile(self, command: str): Loading Loading @@ -302,10 +309,10 @@ class MLDConformance: if ref: command = command.replace( "$CUT_PATH/dut/param_file/enc/", f"{self.outputDir}/ref/enc/" "$CUT_PATH/ref/param_file/enc/", f"{self.outputDir}/ref/enc/" ) command = command.replace( "$CUT_PATH/dut/param_file/dec/", f"{self.outputDir}/ref/dec/" "$CUT_PATH/ref/param_file/dec/", f"{self.outputDir}/ref/dec/" ) command = command.replace( "$CUT_PATH/renderer/cut/", f"{self.outputDir}/ref/renderer/" Loading @@ -315,17 +322,17 @@ class MLDConformance: f"{self.outputDir}/ref/split_rendering/", ) command = command.replace( "$CUT_PATH/dut/sba_bs/pkt/", f"{self.outputDir}/ref/enc/" "$CUT_PATH/ref/sba_bs/pkt/", f"{self.outputDir}/ref/enc/" ) command = command.replace( "$CUT_PATH/dut/sba_bs/raw/", f"{self.outputDir}/ref/dec/" "$CUT_PATH/ref/sba_bs/raw/", f"{self.outputDir}/ref/dec/" ) else: command = command.replace( "$CUT_PATH/dut/param_file/enc/", f"{self.outputDir}/dut/enc/" "$CUT_PATH/ref/param_file/enc/", f"{self.outputDir}/dut/enc/" ) command = command.replace( "$CUT_PATH/dut/param_file/dec/", f"{self.outputDir}/dut/dec/" "$CUT_PATH/ref/param_file/dec/", f"{self.outputDir}/dut/dec/" ) command = command.replace( "$CUT_PATH/renderer/cut/", f"{self.outputDir}/dut/renderer/" Loading @@ -335,10 +342,10 @@ class MLDConformance: f"{self.outputDir}/dut/split_rendering/", ) command = command.replace( "$CUT_PATH/dut/sba_bs/pkt/", f"{self.outputDir}/dut/enc/" "$CUT_PATH/ref/sba_bs/pkt/", f"{self.outputDir}/dut/enc/" ) command = command.replace( "$CUT_PATH/dut/sba_bs/raw/", f"{self.outputDir}/dut/dec/" "$CUT_PATH/ref/sba_bs/raw/", f"{self.outputDir}/dut/dec/" ) return command Loading