Commit 984b632a authored by Tapani Pihlajakuja's avatar Tapani Pihlajakuja
Browse files

Minor changes for masaDiffTool.

parent a3f7f64d

scripts/ivas_conformance/masa-diff-tool/CMakeLists.txt

+1 −1
Original line number Diff line number Diff line 
#------------------------------------------------------------------------------------------------------------

# MASA conformance tools

# ----------------------------------

# (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,

# (C) 2022-2026 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

scripts/ivas_conformance/masa-diff-tool/README.md

+3 −15
Original line number Diff line number Diff line 
# MASA-diff-tool



Version: 0.2.1

Version: 0.2.2



## Usage



```

Usage: masaDiffTool [options] refMetaFile cutMetaFile

Options:

--report <report.txt>, produces frame-by-frame results in text format

--report <report.txt>, produces frame-by-frame results in text format, includes also details of descriptive metadata difference

--csv <report.csv>, produces most useful frame-by-frame results in csv format with header row and comma separation

--conformance, uses conformance tolerances instead of strict BE metadata comparison for final result

```



## Output data
@@ -35,9 +34,6 @@ compared metadata files are identical. The summary contains: 
  - Overall mean ABS diff in surround coherence ratio





(Not implemented yet) If option `--conformance` is used, then the return value will be 0 also when the differences are 

within conformance limits.



If a file contains format descriptor that is not `IVASMASA`, then the file is considered non-conformant and comparison

does not continue.
@@ -76,17 +72,9 @@ The program code is structured as follows 
- ivasParts.[c|h], parts of code from several common IVAS headers and source files needed by MASA metadata reader 







## Todo



- Set and check against conformance limits

- Test on different platforms







## Notice



(C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,

(C) 2022-2026 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

scripts/ivas_conformance/masa-diff-tool/ivasParts.c

+1 −1
Original line number Diff line number Diff line 
/******************************************************************************************************



   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,

   (C) 2022-2026 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

scripts/ivas_conformance/masa-diff-tool/ivasParts.h

+1 −1
Original line number Diff line number Diff line 
/******************************************************************************************************



   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,

   (C) 2022-2026 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

scripts/ivas_conformance/masa-diff-tool/masaDiffTool.c

+2 −2
Original line number Diff line number Diff line 
/******************************************************************************************************



   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,

   (C) 2022-2026 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
@@ -233,7 +233,7 @@ int main( int argc, char *argv[] ) 


        if (state.reportFilePtr != NULL)

        {

            fprintf( state.reportFilePtr, "Frame %d\n-----------\n", state.frame );

            fprintf( state.reportFilePtr, "Frame %ld\n-----------\n", state.frame );

        }



        MASA_METADATA_HANDLE refMetadata = MasaFileReader_getMetadataHandle( state.refReader );