Commit 0825524d authored by emerit's avatar emerit
Browse files

Merge branch 'main' into orange/fixpoint_crend_hrtf_file_format

parents 390dd242 532bc112

.gitlab-ci.yml

+29 −7
Original line number Diff line number Diff line
@@ -513,7 +513,6 @@ build-codec-windows-msbuild: 
  script:

    - *print-common-info-windows

    - *activate-WX-windows

    - python .\scripts\strip_split_rendering.py

    - MSBuild.exe -maxcpucount .\Workspace_msvc\Workspace_msvc.sln /property:Configuration=Debug



# ---------------------------------------------------------------
@@ -1380,7 +1379,6 @@ ivas-conformance: 
      - 123

  script:

    - *print-common-info-windows    

    - python .\scripts\strip_split_rendering.py

    - MSBuild.exe -maxcpucount .\Workspace_msvc\Workspace_msvc.sln /property:Configuration=Debug    

    - cp -force IVAS_cod.exe IVAS_cod_ref.exe

    - cp -force IVAS_dec.exe IVAS_dec_ref.exe
@@ -1389,11 +1387,12 @@ ivas-conformance: 
    # Reference creation

    - python tests/create_short_testvectors.py

    - python scripts/prepare_combined_format_inputs.py

    - python -m pytest tests/codec_be_on_mr_nonselection tests/renderer/test_renderer.py -v -n auto --update_ref 1 -m create_ref --create_ref --keep_files

    - python -m pytest tests/codec_be_on_mr_nonselection tests/renderer/test_renderer.py -v -n auto --update_ref 1 -m create_ref_part2 --keep_files

    - $TEST_SET = "tests/codec_be_on_mr_nonselection", "tests/renderer/test_renderer.py", "tests/split_rendering/test_split_rendering.py"

    - python -m pytest $TEST_SET -v -n auto --update_ref 1 -m create_ref --create_ref --keep_files

    - python -m pytest $TEST_SET -v -n auto --update_ref 1 -m create_ref_part2 --keep_files



    # Output creation

    - python -m pytest tests/codec_be_on_mr_nonselection tests/renderer/test_renderer.py -v -n auto --keep_files --create_cut --html=report_cmd.html --self-contained-html

    - python -m pytest $TEST_SET -v -n auto --keep_files --create_cut --html=report_cmd.html --self-contained-html

    - python scripts/parse_commands.py report_cmd.html Readme_IVAS.txt

    

    # Copy input data and output ref data
@@ -1402,10 +1401,13 @@ ivas-conformance: 
    - if (Test-Path TMP_ENC) {rm -r -force TMP_ENC}    

    - if (Test-Path TMP_JBM) {rm -r -force TMP_JBM}

    - if (Test-Path TMP_REND) {rm -r -force TMP_REND}

    - if (Test-Path TMP_ISAR_POST_REND) {rm -r -force TMP_ISAR_POST_REND}    

    - if (Test-Path TMP_DEC_ISAR) {rm -r -force TMP_DEC_ISAR}    

    - mkdir testvec

    - mkdir testvec/binauralRenderer_interface

    - mkdir testvec/testv

    - mkdir testvec/testv/renderer

    - mkdir testvec/testv/split_rendering        

    - mkdir testvec/bin    

    - cp    -force -ErrorAction Ignore scripts/testv/* testvec/testv

    - cp -r -force -ErrorAction Ignore scripts/ls_layouts testvec
@@ -1415,6 +1417,9 @@ ivas-conformance: 
    - cp -r -force -ErrorAction Ignore tests/ref testvec/testv/ref

    - cp -r -force -ErrorAction Ignore tests/dut/* testvec/testv/ref

    - cp -r -force -ErrorAction Ignore tests/renderer/cut testvec/testv/renderer/ref

    - cp -r -force -ErrorAction Ignore tests/split_rendering/cut testvec/testv/split_rendering/ref 

    - cp -r -force -ErrorAction Ignore tests/split_rendering/renderer_configs testvec/testv/split_rendering/renderer_configs 

    - cp -r -force -ErrorAction Ignore tests/split_rendering/error_patterns testvec/testv/split_rendering/error_patterns 

    

    # Remove redundant files 

    - python scripts/cleanup_26252.py
@@ -1425,9 +1430,12 @@ ivas-conformance: 
    - cp Readme_IVAS_enc.txt testvec 

    - cp Readme_IVAS_rend.txt testvec

    - cp Readme_IVAS_JBM_dec.txt testvec

    - cp Readme_IVAS_ISAR_dec.txt testvec 

    - cp Readme_IVAS_ISAR_post_rend.txt testvec   

    - cp IVAS_cod.exe testvec/bin

    - cp IVAS_dec.exe testvec/bin

    - cp IVAS_rend.exe testvec/bin

    - cp ISAR_post_rend.exe testvec/bin    

    

    

    # Test run generated scripts in testvec
@@ -1447,6 +1455,8 @@ ivas-conformance: 
      - Readme_IVAS_enc.txt  

      - Readme_IVAS_rend.txt

      - Readme_IVAS_JBM_dec.txt

      - Readme_IVAS_ISAR_dec.txt 

      - Readme_IVAS_ISAR_post_rend.txt    

    expose_as: "Draft IVAS conformance"

    reports:

      junit: report-junit.xml
@@ -1471,7 +1481,7 @@ ivas-conformance-linux: 
    # Reference creation

    - python3 tests/create_short_testvectors.py

    - python3 scripts/prepare_combined_format_inputs.py

    - TEST_SET="tests/codec_be_on_mr_nonselection tests/renderer/test_renderer.py"

    - TEST_SET="tests/codec_be_on_mr_nonselection tests/renderer/test_renderer.py tests/split_rendering/test_split_rendering.py"

    - python3 -m pytest $TEST_SET -v -n auto --update_ref 1 -m create_ref --create_ref --keep_files

    - python3 -m pytest $TEST_SET -v -n auto --update_ref 1 -m create_ref_part2 --keep_files
@@ -1485,6 +1495,7 @@ ivas-conformance-linux: 
    - mkdir testvec/binauralRenderer_interface

    - mkdir testvec/testv

    - mkdir testvec/testv/renderer

    - mkdir testvec/testv/split_rendering    

    - mkdir testvec/bin    

    - cp -r scripts/testv/* testvec/testv

    - cp -r scripts/ls_layouts testvec
@@ -1494,6 +1505,9 @@ ivas-conformance-linux: 
    - cp -r tests/ref testvec/testv/ref

    - cp -r tests/dut/* testvec/testv/ref

    - cp -r tests/renderer/cut testvec/testv/renderer/ref

    - cp -r tests/split_rendering/cut testvec/testv/split_rendering/ref  

    - cp -r tests/split_rendering/renderer_configs testvec/testv/split_rendering/renderer_configs 

    - cp -r tests/split_rendering/error_patterns testvec/testv/split_rendering/error_patterns    

    

    # Remove redundant files 

    - python3 scripts/cleanup_26252.py
@@ -1504,6 +1518,8 @@ ivas-conformance-linux: 
    - cp Readme_IVAS_enc.txt testvec 

    - cp Readme_IVAS_rend.txt testvec

    - cp Readme_IVAS_JBM_dec.txt testvec

    - cp Readme_IVAS_ISAR_dec.txt testvec 

    - cp Readme_IVAS_ISAR_post_rend.txt testvec    

    

    # Create GCOV execs for coverage analysis

    - make clean
@@ -1512,6 +1528,7 @@ ivas-conformance-linux: 
    - cp IVAS_cod testvec/bin

    - cp IVAS_dec testvec/bin

    - cp IVAS_rend testvec/bin

    - cp ISAR_post_rend testvec/bin    

        

    # Test run generated scripts in testvec

    - cd testvec
@@ -1528,6 +1545,9 @@ ivas-conformance-linux: 
    - commit_sha=$(git rev-parse HEAD)

    - genhtml coverage.info -o coverage -t "Coverage on main @ $commit_sha"



    # Check for failures

    - if [ $exit_code -eq 1 ]; then echo "Test failures encountered"; exit $EXIT_CODE_FAIL; fi

    

  artifacts:

    name: "ivas-conformance-linux-$CI_COMMIT_SHORT_SHA"

    expire_in: 1 week
@@ -1540,6 +1560,8 @@ ivas-conformance-linux: 
      - Readme_IVAS_enc.txt  

      - Readme_IVAS_rend.txt

      - Readme_IVAS_JBM_dec.txt

      - Readme_IVAS_ISAR_dec.txt 

      - Readme_IVAS_ISAR_post_rend.txt    

      - coverage.info

      - coverage

    expose_as: "Draft IVAS conformance -- Linux"

lib_com/options.h

+8 −0
Original line number Diff line number Diff line
@@ -155,8 +155,11 @@ 


/*#define FIX_I4_OL_PITCH*/                             /* fix open-loop pitch used for EVS core switching */

#define SPLIT_REND_WITH_HEAD_ROT                        /* Dlb,FhG: Split Rendering contributions 21 and 35 */

#ifdef SPLIT_REND_WITH_HEAD_ROT

#define ISAR_BITSTREAM_UPDATE_LC3PLUS                   /* FhG: Multiple improvements to the ISAR bitstream when LC3plus is used. See MR 1456 for details. */

#define SPLIT_REND_POSE_CORRECTION_UNUSED_BITS

#define FIX_1081_BINAURAL_SPLIT_PCM_SANITY_CHECK        /* VA: issue 1081: correct error print-out when BINAURAL_SPLIT_PCM is requested */

#endif



#define FIX_CREND_FIX_POINT_HRTF_FILE_FORMAT            /* Orange issue 1031 : fix point hrtf binary file format */

#define FIX_TDREND_HRTF_FILE_FORMAT                     /* Eri: fix point hrtf binary file format for TDREND */
@@ -165,6 +168,9 @@ 
#define FIX_1082_INSTRUM_FAILED_LC3PLUS                 /* VoiceAge: issue 1082: fix ambiguous syntax in LC3Plus code leading to fails of instrumented builds */

#define FIX_1052_EXT_OUTPUT                             /* VA: issue 1052: define EXT decoder output configuration for stereo and MC formats */ 



#define FIX_989_TD_REND_ROM                             /* Eri: Clean-up for TD renderer and completion of ROM generation tool */



#define FIX_1068_ASAN_IN_MC_2_BINAURAL_ROOM_IR          /* issue 1068 : Memory leak in MC to BINAURAL_ROOM decoding with bitrate switching*/



#define FIX_989_TD_REND_ROM                             /* Eri: Clean-up for TD renderer and completion of ROM generation tool */
@@ -178,7 +184,9 @@ 
#define NONBE_FIX_1070_USAN_SEGFAULT_MC_TO_BIN_BTSW_HEADROT   /* fix 1070 USAN: nullptr-with-offset and Segfaults in 7_1_4 to BINAURAL and BINAURAL_ROOM_REVERB decoding with bitrate switching and head rotation*/ 

#define NONBE_FIX_MC_LFE_LPF                            /* Dlb: Adding the LFE LPF filter back for MC content. */

#define NONBE_FIX_1052_SBA_EXT                          /* Dlb: SBA external output support */

#define NONBE_FIX_1087_OOB_SBA_DTX_RS                   /* VA: issue 1087: Extend the length of the buffer for MCT decoding to avoid out-of-bound writing in SBA SID bitrate switching decoding */



#define NONBE_FIX_1074_NOBJ_SIGNAL_OMASA_LBR            /* Nok: issue 1074 fixing number of objects signaling in OMASA low rate */

/* ##################### End NON-BE switches ########################### */



/* ################## End DEVELOPMENT switches ######################### */

lib_dec/ivas_binRenderer_internal.c

+14 −14
Original line number Diff line number Diff line
@@ -1677,14 +1677,14 @@ void ivas_binaural_cldfb( 
                    idx_in++;

                }



                if ( st_ivas->hSplitBinRend.hCldfbDataOut != NULL )

                if ( st_ivas->hSplitBinRend->hCldfbDataOut != NULL )

                {

                    for ( ch = 0; ch < ( st_ivas->hIntSetup.nchan_out_woLFE + st_ivas->hIntSetup.num_lfe ); ch++ )

                    {

                        mvr2r( Cldfb_RealBuffer[ch][slot_idx], st_ivas->hSplitBinRend.hCldfbDataOut->Cldfb_RealBuffer[ch][( subframeIdx * JBM_CLDFB_SLOTS_IN_SUBFRAME ) + slot_idx], maxBand );

                        mvr2r( Cldfb_ImagBuffer[ch][slot_idx], st_ivas->hSplitBinRend.hCldfbDataOut->Cldfb_ImagBuffer[ch][( subframeIdx * JBM_CLDFB_SLOTS_IN_SUBFRAME ) + slot_idx], maxBand );

                        mvr2r( Cldfb_RealBuffer[ch][slot_idx], st_ivas->hSplitBinRend->hCldfbDataOut->Cldfb_RealBuffer[ch][( subframeIdx * JBM_CLDFB_SLOTS_IN_SUBFRAME ) + slot_idx], maxBand );

                        mvr2r( Cldfb_ImagBuffer[ch][slot_idx], st_ivas->hSplitBinRend->hCldfbDataOut->Cldfb_ImagBuffer[ch][( subframeIdx * JBM_CLDFB_SLOTS_IN_SUBFRAME ) + slot_idx], maxBand );

                    }

                    st_ivas->hSplitBinRend.hCldfbDataOut->config = st_ivas->hIntSetup.output_config;

                    st_ivas->hSplitBinRend->hCldfbDataOut->config = st_ivas->hIntSetup.output_config;

                }

            }

#endif
@@ -1694,7 +1694,7 @@ void ivas_binaural_cldfb( 
        ivas_binRenderer(

            st_ivas->hBinRenderer,

#ifdef SPLIT_REND_WITH_HEAD_ROT

            &st_ivas->hSplitBinRend.splitrend.multiBinPoseData,

            &st_ivas->hSplitBinRend->splitrend.multiBinPoseData,

#endif

            st_ivas->hCombinedOrientationData,

            JBM_CLDFB_SLOTS_IN_SUBFRAME,
@@ -1736,8 +1736,8 @@ void ivas_binaural_cldfb( 
                                   maxBand );

                        }



                        mvr2r( Cldfb_RealBuffer_Binaural[pos_idx][ch][slot_idx], st_ivas->hSplitBinRend.hMultiBinCldfbData->Cldfb_RealBuffer_Binaural[( pos_idx * BINAURAL_CHANNELS ) + ch][( subframeIdx * JBM_CLDFB_SLOTS_IN_SUBFRAME ) + slot_idx], maxBand );

                        mvr2r( Cldfb_ImagBuffer_Binaural[pos_idx][ch][slot_idx], st_ivas->hSplitBinRend.hMultiBinCldfbData->Cldfb_ImagBuffer_Binaural[( pos_idx * BINAURAL_CHANNELS ) + ch][( subframeIdx * JBM_CLDFB_SLOTS_IN_SUBFRAME ) + slot_idx], maxBand );

                        mvr2r( Cldfb_RealBuffer_Binaural[pos_idx][ch][slot_idx], st_ivas->hSplitBinRend->hMultiBinCldfbData->Cldfb_RealBuffer_Binaural[( pos_idx * BINAURAL_CHANNELS ) + ch][( subframeIdx * JBM_CLDFB_SLOTS_IN_SUBFRAME ) + slot_idx], maxBand );

                        mvr2r( Cldfb_ImagBuffer_Binaural[pos_idx][ch][slot_idx], st_ivas->hSplitBinRend->hMultiBinCldfbData->Cldfb_ImagBuffer_Binaural[( pos_idx * BINAURAL_CHANNELS ) + ch][( subframeIdx * JBM_CLDFB_SLOTS_IN_SUBFRAME ) + slot_idx], maxBand );

                    }

                }

            }
@@ -1855,14 +1855,14 @@ void ivas_binaural_cldfb_sf( 
                }



#ifdef SPLIT_REND_WITH_HEAD_ROT

                if ( st_ivas->hSplitBinRend.hCldfbDataOut != NULL )

                if ( st_ivas->hSplitBinRend->hCldfbDataOut != NULL )

                {

                    for ( ch = 0; ch < ( st_ivas->hIntSetup.nchan_out_woLFE + st_ivas->hIntSetup.num_lfe ); ch++ )

                    {

                        mvr2r( Cldfb_RealBuffer[ch][slot_idx], st_ivas->hSplitBinRend.hCldfbDataOut->Cldfb_RealBuffer[ch][slot_index_start + slot_idx], maxBand );

                        mvr2r( Cldfb_ImagBuffer[ch][slot_idx], st_ivas->hSplitBinRend.hCldfbDataOut->Cldfb_ImagBuffer[ch][slot_index_start + slot_idx], maxBand );

                        mvr2r( Cldfb_RealBuffer[ch][slot_idx], st_ivas->hSplitBinRend->hCldfbDataOut->Cldfb_RealBuffer[ch][slot_index_start + slot_idx], maxBand );

                        mvr2r( Cldfb_ImagBuffer[ch][slot_idx], st_ivas->hSplitBinRend->hCldfbDataOut->Cldfb_ImagBuffer[ch][slot_index_start + slot_idx], maxBand );

                    }

                    st_ivas->hSplitBinRend.hCldfbDataOut->config = st_ivas->hIntSetup.output_config;

                    st_ivas->hSplitBinRend->hCldfbDataOut->config = st_ivas->hIntSetup.output_config;

                }

#endif

            }
@@ -1873,7 +1873,7 @@ void ivas_binaural_cldfb_sf( 
        ivas_binRenderer(

            st_ivas->hBinRenderer,

#ifdef SPLIT_REND_WITH_HEAD_ROT

            &st_ivas->hSplitBinRend.splitrend.multiBinPoseData,

            &st_ivas->hSplitBinRend->splitrend.multiBinPoseData,

#endif

            st_ivas->hCombinedOrientationData,

            st_ivas->hTcBuffer->subframe_nbslots[subframeIdx],
@@ -1895,8 +1895,8 @@ void ivas_binaural_cldfb_sf( 
                {

                    for ( ch = 0; ch < st_ivas->hDecoderConfig->nchan_out; ch++ )

                    {

                        mvr2r( Cldfb_RealBuffer_Binaural[pos_idx][ch][slot_idx], st_ivas->hSplitBinRend.hMultiBinCldfbData->Cldfb_RealBuffer_Binaural[( pos_idx * BINAURAL_CHANNELS ) + ch][slot_index_start + slot_idx], maxBand );

                        mvr2r( Cldfb_ImagBuffer_Binaural[pos_idx][ch][slot_idx], st_ivas->hSplitBinRend.hMultiBinCldfbData->Cldfb_ImagBuffer_Binaural[( pos_idx * BINAURAL_CHANNELS ) + ch][slot_index_start + slot_idx], maxBand );

                        mvr2r( Cldfb_RealBuffer_Binaural[pos_idx][ch][slot_idx], st_ivas->hSplitBinRend->hMultiBinCldfbData->Cldfb_RealBuffer_Binaural[( pos_idx * BINAURAL_CHANNELS ) + ch][slot_index_start + slot_idx], maxBand );

                        mvr2r( Cldfb_ImagBuffer_Binaural[pos_idx][ch][slot_idx], st_ivas->hSplitBinRend->hMultiBinCldfbData->Cldfb_ImagBuffer_Binaural[( pos_idx * BINAURAL_CHANNELS ) + ch][slot_index_start + slot_idx], maxBand );

                    }

                }

            }

lib_dec/ivas_init_dec.c

+18 −0
Original line number Diff line number Diff line
@@ -399,12 +399,30 @@ ivas_error ivas_dec_setup( 


            if ( st_ivas->nchan_ism > 0 )

            {

#ifdef NONBE_FIX_1074_NOBJ_SIGNAL_OMASA_LBR

                /* the input_ivas_format should be MASA_ISM_FORMAT, but we cannot initialize it now */

                /* info about the number of objects:

                          '00' - MASA format at the encoder

                          '01' - MASA_ISM_FORMAT at the encoder, with 4 objects

                          '10' - MASA_ISM_FORMAT at the encoder, with 3 objects

                          '11' - MASA_ISM_FORMAT at the encoder, with 1 or 2 objects

                          reading if 1 or 2 objects is performed later

                */

                st_ivas->nchan_ism = 5 - st_ivas->nchan_ism;

                if ( st_ivas->nchan_transport == 1 && st_ivas->nchan_ism == 2 )

                {

                    st_ivas->nchan_ism = 1;

                }

                /* for MASA_ISM_FORMAT at input the number of MASA transport channels is always 2 and the corresponding bit is not used here*/

#else

                /* the input_ivas_format should be MASA_ISM_FORMAT, but we cannot initialize it now */

                if ( st_ivas->nchan_transport == 2 && st_ivas->nchan_ism == 3 )

                {

                    st_ivas->nchan_ism = 4;

                }



                /* for MASA_ISM_FORMAT at input the number of MASA transport channels is always 2 */

#endif

                st_ivas->nchan_transport = 2;

                element_mode_flag = 1;

            }

lib_dec/ivas_masa_dec.c

+126 −76
Original line number Diff line number Diff line
@@ -151,6 +151,52 @@ ivas_error ivas_masa_decode( 
    {

        if ( !( ivas_format == MC_FORMAT && st_ivas->mc_mode == MC_MODE_MCMASA ) )

        {

#ifdef NONBE_FIX_1074_NOBJ_SIGNAL_OMASA_LBR

            if ( ivas_format == MASA_FORMAT )

            {

                /* re-read the number of objects, needed in case of bad frame  */

                st_ivas->nchan_ism = 5 - ( st_ivas->bit_stream[( ivas_total_brate / FRAMES_PER_SEC ) - 3] + 2 * st_ivas->bit_stream[( ivas_total_brate / FRAMES_PER_SEC ) - 2] );

            }

            if ( ivas_format == MASA_FORMAT && st_ivas->nchan_ism != 5 )

            {

                /* there was OMASA in the input */

                hMasa->config.input_ivas_format = MASA_ISM_FORMAT;

                if ( st_ivas->nchan_ism < 3 )

                {

                    /* was read in ivas_init_dec() to distinguish between 1 and 2 objects */

                    if ( st_ivas->bit_stream[( ivas_total_brate / FRAMES_PER_SEC ) - 1] == 0 )

                    {

                        st_ivas->nchan_ism = 1;

                    }

                    st->next_bit_pos -= MASA_TRANSP_BITS;

                    *nb_bits_read += MASA_TRANSP_BITS;



                    /* the two reserved bits were already read in ivas_init_dec()*/

                    byteBuffer = st->bit_stream[( st->next_bit_pos )--];

                    byteBuffer = st->bit_stream[( st->next_bit_pos )--];

                    *nb_bits_read += MASA_HEADER_BITS;

                    /* read number of directions */

                    byteBuffer = st->bit_stream[( st->next_bit_pos )--];

                    ( *nb_bits_read )++;

                    hMasa->config.numberOfDirections = (uint8_t) ( byteBuffer + 1 );

                }

                else

                {

                    /* if there are 3 or 4 objects the number of transport channels bit is given to MASA format

                    and used to read number of directions*/

                    byteBuffer = st->bit_stream[( st->next_bit_pos )--];

                    ( *nb_bits_read )++;

                    hMasa->config.numberOfDirections = (uint8_t) ( byteBuffer + 1 );



                    /* the two reserved bits were already read in ivas_init_dec()*/

                    byteBuffer = st->bit_stream[( st->next_bit_pos )--];

                    byteBuffer = st->bit_stream[( st->next_bit_pos )--];

                    *nb_bits_read += MASA_HEADER_BITS;

                }

            }

            else

            {

#endif

                if ( ivas_format != MASA_ISM_FORMAT )

                {

                    /* number of transport channels is always 2 for MASA_ISM format */
@@ -249,13 +295,14 @@ ivas_error ivas_masa_decode( 
                    }

                }



#ifndef NONBE_FIX_1074_NOBJ_SIGNAL_OMASA_LBR

                /* read 2 bits:

                          '00' - MASA format at the encoder

                          '01' - MASA_ISM_FORMAT at the encoder, with 1 object

                          '10' - MASA_ISM_FORMAT at the encoder, with 2 objects

                          '11' - MASA_ISM_FORMAT at the encoder, with 3 or 4 objects

                          reading if 3 or 4 object is performed later

                          '11' - MASA_ISM_FORMAT at the encoder, with 3 or 4 objects; reading if 3 or 4 object is performed later

                */

#endif

                byteBuffer = st->bit_stream[( st->next_bit_pos )--];

                byteBuffer = byteBuffer + 2 * st->bit_stream[( st->next_bit_pos )--];
@@ -273,6 +320,9 @@ ivas_error ivas_masa_decode( 
                byteBuffer = st->bit_stream[( st->next_bit_pos )--];

                ( *nb_bits_read )++;

                hMasa->config.numberOfDirections = (uint8_t) ( byteBuffer + 1 );

#ifdef NONBE_FIX_1074_NOBJ_SIGNAL_OMASA_LBR

            }

#endif

        }

        else

        {