Commit 214142cd authored by Vladimir Malenovsky's avatar Vladimir Malenovsky
Browse files

Merge branch 'main' into... 

Merge branch 'main' into float-1550-wrong-render-frame-size-reported-when-decoding-to-split-rendering-configurations
parents 8f7a0864 6a45c557

Workspace_msvc/lib_dec.vcxproj

+0 −2
Original line number Diff line number Diff line
@@ -270,7 +270,6 @@ 
    <ClCompile Include="..\lib_dec\jbm_jb4_inputbuffer.c" />

    <ClCompile Include="..\lib_dec\jbm_jb4_jmf.c" />

    <ClCompile Include="..\lib_dec\jbm_pcmdsp_apa.c" />

    <ClCompile Include="..\lib_dec\jbm_pcmdsp_fifo.c" />

    <ClCompile Include="..\lib_dec\jbm_pcmdsp_similarityestimation.c" />

    <ClCompile Include="..\lib_dec\jbm_pcmdsp_window.c" />

    <ClCompile Include="..\lib_dec\LD_music_post_filter.c" />
@@ -318,7 +317,6 @@ 
    <ClInclude Include="..\lib_dec\jbm_jb4_inputbuffer.h" />

    <ClInclude Include="..\lib_dec\jbm_jb4_jmf.h" />

    <ClInclude Include="..\lib_dec\jbm_pcmdsp_apa.h" />

    <ClInclude Include="..\lib_dec\jbm_pcmdsp_fifo.h" />

    <ClInclude Include="..\lib_dec\jbm_pcmdsp_similarityestimation.h" />

    <ClInclude Include="..\lib_dec\jbm_pcmdsp_window.h" />

    <ClInclude Include="..\lib_dec\lib_dec.h" />

Workspace_msvc/lib_dec.vcxproj.filters

+0 −6
Original line number Diff line number Diff line
@@ -415,9 +415,6 @@ 
    <ClCompile Include="..\lib_dec\jbm_pcmdsp_apa.c">

      <Filter>decoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_dec\jbm_pcmdsp_fifo.c">

      <Filter>decoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_dec\jbm_pcmdsp_similarityestimation.c">

      <Filter>decoder_all_c</Filter>

    </ClCompile>
@@ -532,9 +529,6 @@ 
    <ClInclude Include="..\lib_dec\jbm_jb4sb.h">

      <Filter>decoder_h</Filter>

    </ClInclude>

    <ClInclude Include="..\lib_dec\jbm_pcmdsp_fifo.h">

      <Filter>decoder_h</Filter>

    </ClInclude>

    <ClInclude Include="..\lib_dec\jbm_pcmdsp_apa.h">

      <Filter>decoder_h</Filter>

    </ClInclude>

ci/check_update_copyright.sh

0 → 100755
+63 −0
Original line number Diff line number Diff line 
#!/bin/bash



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



if [[ $# -ne 1 ]]; then

    echo "USAGE: $0 <PATCH_FILE_NAME>"

    exit -1

fi



PATCH_FILE_NAME=$1

curr_year=$(date +'%Y')

changes=0



lfs_files=$(git lfs ls-files -n)

sed_list=$(mktemp)



# iterate through tracked files

for file in $(git ls-files); do

    # skip LFS files

    if [[ "$lfs_files" == *"$file"* ]]; then

        continue

    fi



    # process only text files

    if file "$file" | grep -q 'text'; then

        echo $file >>$sed_list

    fi

done



xargs -n 1 -P 8 sed -i -E "s/\(C\)\s+202[0-9]-202[0-9]/(C) 2022-$curr_year/g" <$sed_list



if [[ $(git status --porcelain --untracked-files=no) ]]; then

    changes=1

    git diff >"$PATCH_FILE_NAME"

fi



exit $changes

lib_com/ivas_prot.h

+2 −0
Original line number Diff line number Diff line
@@ -2950,7 +2950,9 @@ ivas_error stereo_memory_enc( 
    CPE_ENC_HANDLE hCPE,                                        /* i  : CPE encoder structure                   */

    const int32_t input_Fs,                                     /* i  : input sampling rate                     */

    const int16_t max_bwidth,                                   /* i  : maximum audio bandwidth                 */

#ifndef FIX_1594_TDM_LAST_RATIO

    float *tdm_last_ratio,                                      /* o  : TD stereo last ratio                    */

#endif

    const IVAS_FORMAT ivas_format,                              /* i  : IVAS format                             */

    const int16_t nchan_transport                               /* i  : number transport chans                  */

);

lib_com/options.h

+3 −1
Original line number Diff line number Diff line
@@ -164,7 +164,9 @@ 
#define FIX_FLOAT_1539_G192_FORMAT_SWITCH               /* Nokia: reintroduce format switching for g192 bitstreams */

#define FIX_2095_REMOVE_UNUSED_ISAR_TABLES              /* Dolby: remove unused ISAR */

#define FIX_FLOAT_1582_STEREO_DFT_QUANTIZE_ITD          /* FhG: float issue 1582: Remove unncessary statement from stereo_dft_quantize_itd() */

#define FIX_1585_ASAN_FORMAT_SW_ALT                     /* VA: float issue 1585: alternative fix memory leaks with format switching */

#define FIX_1585_ASAN_FORMAT_SW_ALT                     /* VA,FhG: float issues 1585,1593: alternative fix memory leaks with format switching */

#define FIX_2570_BUF_OVFL                               /* Orange: basop issue 2570: global-buffer-overflow in lib_rend/ivas_objectRenderer_sources_fx.c */

#define FIX_1594_TDM_LAST_RATIO                         /* VA: float issue 1594: remove obsolete argument 'tdm_last_ratio' from stereo_memory_enc () */

#define FIX_1550_WRONG_RENDER_FRAMESIZE_PRINTOUT        /* Dolby: float issue 1550: Wrong render framesize printout */



/* #################### End BE switches ################################## */