From 1edc4726b006f7bb5573bd86b65bb4ab9e3f87b2 Mon Sep 17 00:00:00 2001 From: vaclav Date: Mon, 8 May 2023 13:22:51 +0200 Subject: [PATCH 1/2] Introduce a signaling bit for combined format coding; under COMBINED_FORMAT_SIGNALING --- lib_com/bitstream.c | 140 +++++++++++++++++++----------------- lib_com/ivas_cnst.h | 4 ++ lib_com/ivas_spar_com.c | 5 ++ lib_com/options.h | 4 ++ lib_dec/ivas_init_dec.c | 16 +++++ lib_enc/ivas_init_enc.c | 11 +++ lib_enc/ivas_ism_dtx_enc.c | 12 ++++ lib_enc/ivas_mct_core_enc.c | 8 +++ 8 files changed, 135 insertions(+), 65 deletions(-) diff --git a/lib_com/bitstream.c b/lib_com/bitstream.c index 0a206fcdb5..412f751b8b 100644 --- a/lib_com/bitstream.c +++ b/lib_com/bitstream.c @@ -1914,7 +1914,11 @@ ivas_error preview_indices( k = IVAS_FORMAT_SIGNALING_NBITS; if ( st_ivas->ivas_format == MASA_FORMAT ) { +#ifdef COMBINED_FORMAT_SIGNALING + k = IVAS_FORMAT_SIGNALING_NBITS_EXTENDED; +#else k = IVAS_FORMAT_SIGNALING_NBITS_SBA; +#endif } if ( total_brate < MIN_BRATE_MDCT_STEREO ) @@ -1954,9 +1958,15 @@ ivas_error preview_indices( else if ( st_ivas->ivas_format == SBA_FORMAT ) { /* Read SBA planar flag and SBA order */ +#ifdef COMBINED_FORMAT_SIGNALING + st_ivas->sba_planar = ( bit_stream[IVAS_FORMAT_SIGNALING_NBITS_EXTENDED] == 1 ); + st_ivas->sba_order = ( bit_stream[IVAS_FORMAT_SIGNALING_NBITS_EXTENDED + 2] == 1 ); + st_ivas->sba_order += 2 * ( bit_stream[IVAS_FORMAT_SIGNALING_NBITS_EXTENDED + 1] == 1 ); +#else st_ivas->sba_planar = ( bit_stream[IVAS_FORMAT_SIGNALING_NBITS_SBA] == 1 ); st_ivas->sba_order = ( bit_stream[IVAS_FORMAT_SIGNALING_NBITS_SBA + 2] == 1 ); st_ivas->sba_order += 2 * ( bit_stream[IVAS_FORMAT_SIGNALING_NBITS_SBA + 1] == 1 ); +#endif st_ivas->sba_analysis_order = ivas_sba_get_analysis_order( total_brate, st_ivas->sba_order ); @@ -1972,11 +1982,11 @@ ivas_error preview_indices( /*-------------------------------------------------------------------* - * read_indices() - * - * Read indices from an ITU-T G.192 bitstream to the buffer - * Simulate packet losses by inserting frame erasures - *-------------------------------------------------------------------*/ + * read_indices() + * + * Read indices from an ITU-T G.192 bitstream to the buffer + * Simulate packet losses by inserting frame erasures + *-------------------------------------------------------------------*/ /*! r: 1 = reading OK, 0 = problem */ ivas_error read_indices( @@ -2106,12 +2116,12 @@ ivas_error read_indices( } /* AMRWB 26.173 G.192 file reader (read_serial) does not declare/use SID_BAD ft, - it declares every bad synch marked frame initially as a lost_speech frame, - and then the RXDTX handler CNG state decides the decoding mode CNG/SPEECH. - While In the AMRWB ETSI/3GPP format eid a CRC error in a detected SID_UPDATE frames triggers SID_BAD. + it declares every bad synch marked frame initially as a lost_speech frame, + and then the RXDTX handler CNG state decides the decoding mode CNG/SPEECH. + While In the AMRWB ETSI/3GPP format eid a CRC error in a detected SID_UPDATE frames triggers SID_BAD. - Here we inhibit use of the SID-length info, even though it is available in the G.192 file format after STL/EID-XOR . - */ + Here we inhibit use of the SID-length info, even though it is available in the G.192 file format after STL/EID-XOR . + */ if ( sid_upd_bad ) { sid_upd_bad = 0; @@ -2123,10 +2133,10 @@ ivas_error read_indices( { g192_sid_first = 1; /* SID_FIRST detected for previous AMRWB/AMRWBIO active frames only */ /* It is not possible to perfectly simulate rate switching conditions EVS->AMRWBIO where: - the very first SID_FIRST detection is based on a past EVS active frame - and a good length 0 "SID_FIRST"(NO_DATA) frame is sent in AMRWBIO, - due to the one frame state memory in the AMRWB legacy G.192 SID_FIRST encoding - */ + the very first SID_FIRST detection is based on a past EVS active frame + and a good length 0 "SID_FIRST"(NO_DATA) frame is sent in AMRWBIO, + due to the one frame state memory in the AMRWB legacy G.192 SID_FIRST encoding + */ } speech_bad = 0; @@ -2142,7 +2152,7 @@ ivas_error read_indices( } /* Do not allow decoder to enter CNG-synthesis for any instantly received GOOD+LENGTH==0 frame - as this frame was never transmitted, one can not know it is good and has a a length of zero ) */ + as this frame was never transmitted, one can not know it is good and has a a length of zero ) */ if ( *CNG != 0 ) { /* We were in CNG synthesis */ @@ -2234,11 +2244,11 @@ ivas_error read_indices( } /*-------------------------------------------------------------------* - * read_indices_mime_handle_dtx() - * - * Handle DTX for MIME and RTP_DUMP decoding. - * Returns the actual total_brate. - *-------------------------------------------------------------------*/ + * read_indices_mime_handle_dtx() + * + * Handle DTX for MIME and RTP_DUMP decoding. + * Returns the actual total_brate. + *-------------------------------------------------------------------*/ static Word32 read_indices_mime_handle_dtx( Decoder_State *st, @@ -2340,7 +2350,7 @@ static Word32 read_indices_mime_handle_dtx( /* Now modify bfi flag for the decoder's SPEECH/CNG synthesis logic */ /* in SPEECH synthesis, make sure to activate speech PLC for a received NO_DATA frame, - no_data frames may be injected by the network or by the dejitter buffer */ + no_data frames may be injected by the network or by the dejitter buffer */ /* modify bfi_flag to stay/move into the correct decoder PLC section */ if ( ( *CNG == 0 ) && ( no_data != 0 ) ) { @@ -2360,10 +2370,10 @@ static Word32 read_indices_mime_handle_dtx( /* now bfi, total_brate are set by RX-DTX handler:: - bfi==0, total_brate!=0 CNG or speech pending bitrate - bfi==0, total_brate==0 CNG will continue or start(sid_first, sid_bad) - bfi==1, total_brate!=0 speech PLC - bfi==1, total_brate==0 , speech PLC */ + bfi==0, total_brate!=0 CNG or speech pending bitrate + bfi==0, total_brate==0 CNG will continue or start(sid_first, sid_bad) + bfi==1, total_brate!=0 speech PLC + bfi==1, total_brate==0 , speech PLC */ /* handle available AMRWB/AMRWBIO MIME header ToC rate-info at startup */ if ( ( st->bfi == 1 && st->ini_frame == 0 ) && ( ( amrwb_rfc4867_flag != 0 ) || ( amrwb_rfc4867_flag == 0 && isAMRWB_IOmode != 0 ) ) ) /*AMRWB ToC */ @@ -2388,10 +2398,10 @@ static Word32 read_indices_mime_handle_dtx( /*-------------------------------------------------------------------* - * read_indices_mime_handle_sti_and_all_zero_bits() - * - * Handle STI and frames with all zero bits for MIME and RTP_DUMP decoding. - *-------------------------------------------------------------------*/ + * read_indices_mime_handle_sti_and_all_zero_bits() + * + * Handle STI and frames with all zero bits for MIME and RTP_DUMP decoding. + *-------------------------------------------------------------------*/ static void read_indices_mime_handle_sti_and_all_zero_bits( Decoder_State *st, Word32 *total_brate, @@ -2425,10 +2435,10 @@ static void read_indices_mime_handle_sti_and_all_zero_bits( /*-------------------------------------------------------------------* - * get_rfFrameType() - * - * Extract the RF frame type - *-------------------------------------------------------------------*/ + * get_rfFrameType() + * + * Extract the RF frame type + *-------------------------------------------------------------------*/ static void get_rfFrameType( Decoder_State *st, /* i : decoder state structure */ @@ -2451,10 +2461,10 @@ static void get_rfFrameType( } /*-------------------------------------------------------------------* - * get_rfFlag() - * - * Check if RF flag is present in the bitstream - *-------------------------------------------------------------------*/ + * get_rfFlag() + * + * Check if RF flag is present in the bitstream + *-------------------------------------------------------------------*/ static void get_rfFlag( Decoder_State *st, /* i : decoder state structure */ @@ -2506,10 +2516,10 @@ static void get_rfFlag( } /*-------------------------------------------------------------------* - * get_rf_fec_offset() - * - * Extract the FEC offset - *-------------------------------------------------------------------*/ + * get_rf_fec_offset() + * + * Extract the FEC offset + *-------------------------------------------------------------------*/ static void get_rf_fec_offset( Decoder_State *st, /* i : decoder state structure */ @@ -2541,10 +2551,10 @@ static void get_rf_fec_offset( } /*-------------------------------------------------------------------* - * get_rfTargetBits() - * - * Return the number of RF target bits - *-------------------------------------------------------------------*/ + * get_rfTargetBits() + * + * Return the number of RF target bits + *-------------------------------------------------------------------*/ static void get_rfTargetBits( int16_t rf_frame_type, /* i : RF frame type */ @@ -2589,10 +2599,10 @@ static void get_rfTargetBits( } /*-------------------------------------------------------------------* - * berCheck() - * - * Check for bit errors in channel aware signaling. - *-------------------------------------------------------------------*/ + * berCheck() + * + * Check for bit errors in channel aware signaling. + *-------------------------------------------------------------------*/ static void berCheck( Decoder_State *st /* i/o: decoder state structure */ @@ -2616,10 +2626,10 @@ static void berCheck( } /*-------------------------------------------------------------------* - * getPartialCopyInfo() - * - * Check if the frame includes a partial copy for channel aware processing. - *-------------------------------------------------------------------*/ + * getPartialCopyInfo() + * + * Check if the frame includes a partial copy for channel aware processing. + *-------------------------------------------------------------------*/ void getPartialCopyInfo( Decoder_State *st, /* i/o: decoder state structure */ @@ -2675,10 +2685,10 @@ void getPartialCopyInfo( } /*-------------------------------------------------------------------* - * get_NextCoderType() - * - * Extract the coder type of next frame - *-------------------------------------------------------------------*/ + * get_NextCoderType() + * + * Extract the coder type of next frame + *-------------------------------------------------------------------*/ void get_NextCoderType( uint8_t *bitstream, /* i : bitstream */ @@ -2722,10 +2732,10 @@ void get_NextCoderType( /*-------------------------------------------------------------------* - * get_indice_preview() - * - * Indices preview to parse for the presence of partial copy - *-------------------------------------------------------------------*/ + * get_indice_preview() + * + * Indices preview to parse for the presence of partial copy + *-------------------------------------------------------------------*/ static uint16_t get_indice_preview( uint8_t *bitstream, @@ -2757,10 +2767,10 @@ static uint16_t get_indice_preview( /*-------------------------------------------------------------------* - * evs_dec_previewFrame() - * - * Signalling index preview for JBM - *-------------------------------------------------------------------*/ + * evs_dec_previewFrame() + * + * Signalling index preview for JBM + *-------------------------------------------------------------------*/ void evs_dec_previewFrame( uint8_t *bitstream, diff --git a/lib_com/ivas_cnst.h b/lib_com/ivas_cnst.h index 263c5992b0..c840fd3a83 100644 --- a/lib_com/ivas_cnst.h +++ b/lib_com/ivas_cnst.h @@ -78,7 +78,11 @@ typedef enum *----------------------------------------------------------------------------------*/ #define IVAS_FORMAT_SIGNALING_NBITS 2 /* number of bits for signaling the IVAS format */ +#ifdef COMBINED_FORMAT_SIGNALING +#define IVAS_FORMAT_SIGNALING_NBITS_EXTENDED ( IVAS_FORMAT_SIGNALING_NBITS + 1 ) +#else #define IVAS_FORMAT_SIGNALING_NBITS_SBA ( IVAS_FORMAT_SIGNALING_NBITS + 1 ) +#endif /*----------------------------------------------------------------------------------* diff --git a/lib_com/ivas_spar_com.c b/lib_com/ivas_spar_com.c index 481812d22d..6688edc041 100644 --- a/lib_com/ivas_spar_com.c +++ b/lib_com/ivas_spar_com.c @@ -2154,8 +2154,13 @@ void ivas_spar_set_bitrate_config( max_bits += (int16_t) ( ivas_spar_br_table_consts[table_idx].core_brs[i][1] / FRAMES_PER_SEC ); } +#ifdef COMBINED_FORMAT_SIGNALING + pSpar_md_cfg->tgt_bits_per_blk = (int16_t) ( ivas_total_brate / FRAMES_PER_SEC ) - IVAS_FORMAT_SIGNALING_NBITS_EXTENDED - SBA_PLANAR_BITS - SBA_ORDER_BITS - length - total_bits; + pSpar_md_cfg->max_bits_per_blk = (int16_t) ( ivas_total_brate / FRAMES_PER_SEC ) - IVAS_FORMAT_SIGNALING_NBITS_EXTENDED - SBA_PLANAR_BITS - SBA_ORDER_BITS - length - max_bits; +#else pSpar_md_cfg->tgt_bits_per_blk = (int16_t) ( ivas_total_brate / FRAMES_PER_SEC ) - IVAS_FORMAT_SIGNALING_NBITS_SBA - SBA_PLANAR_BITS - SBA_ORDER_BITS - length - total_bits; pSpar_md_cfg->max_bits_per_blk = (int16_t) ( ivas_total_brate / FRAMES_PER_SEC ) - IVAS_FORMAT_SIGNALING_NBITS_SBA - SBA_PLANAR_BITS - SBA_ORDER_BITS - length - max_bits; +#endif md_coding_bits_header = SPAR_NUM_CODING_STRAT_BITS + pSpar_md_cfg->quant_strat_bits; diff --git a/lib_com/options.h b/lib_com/options.h index 9fe797240d..43a4b52b07 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -177,6 +177,10 @@ #define FIX_435_ISM_MERGE_BUG /* Eri: Merge bug fix for ISM NULL metadata and tcx_only cases */ #define FIX_355_REFACTOR_PARAMBIN_TO_5MS /* Nokia: Fixes issue 355 by refactoring parametric binauralizer code to 5 ms mode */ +#define COMBINED_FORMAT_SIGNALING /* VA: Introduce a signaling bit for combined format coding */ + + + /* ################## End DEVELOPMENT switches ######################### */ /* clang-format on */ #endif diff --git a/lib_dec/ivas_init_dec.c b/lib_dec/ivas_init_dec.c index a193ac2823..a58220a9b7 100644 --- a/lib_dec/ivas_init_dec.c +++ b/lib_dec/ivas_init_dec.c @@ -369,8 +369,24 @@ static ivas_error ivas_read_format( st_ivas->ivas_format = MC_FORMAT; break; case 2: +#ifdef COMBINED_FORMAT_SIGNALING st_ivas->ivas_format = ISM_FORMAT; + if ( ivas_total_brate >= IVAS_24k4 ) + { + if ( st_ivas->bit_stream[*num_bits_read] ) + { + /* placeholder for combined format signaling */ + + ( *num_bits_read )++; + } + + ( *num_bits_read )++; + } +#else + st_ivas->ivas_format = ISM_FORMAT; +#endif + break; case 3: if ( st_ivas->bit_stream[*num_bits_read] ) diff --git a/lib_enc/ivas_init_enc.c b/lib_enc/ivas_init_enc.c index 36d476723c..d617727be4 100644 --- a/lib_enc/ivas_init_enc.c +++ b/lib_enc/ivas_init_enc.c @@ -57,7 +57,11 @@ void ivas_write_format( ind = 0; nBits = IVAS_FORMAT_SIGNALING_NBITS; +#ifdef COMBINED_FORMAT_SIGNALING + extra_bits = ( IVAS_FORMAT_SIGNALING_NBITS_EXTENDED - IVAS_FORMAT_SIGNALING_NBITS ); +#else extra_bits = ( IVAS_FORMAT_SIGNALING_NBITS_SBA - IVAS_FORMAT_SIGNALING_NBITS ); +#endif switch ( st_ivas->hEncoderConfig->ivas_format ) { @@ -66,6 +70,13 @@ void ivas_write_format( break; case ISM_FORMAT: ind = 2; +#ifdef COMBINED_FORMAT_SIGNALING + if ( st_ivas->hEncoderConfig->ivas_total_brate >= IVAS_24k4 ) + { + ind = 4; + nBits += extra_bits; + } +#endif break; case MC_FORMAT: ind = 1; diff --git a/lib_enc/ivas_ism_dtx_enc.c b/lib_enc/ivas_ism_dtx_enc.c index aff8b9a0b6..3a216b6164 100644 --- a/lib_enc/ivas_ism_dtx_enc.c +++ b/lib_enc/ivas_ism_dtx_enc.c @@ -250,8 +250,20 @@ int16_t ivas_ism_dtx_enc( /* IVAS format signaling was erased in dtx() */ if ( hSCE[0]->hCoreCoder[0]->hBstr->nb_bits_tot == 0 ) { +#ifdef COMBINED_FORMAT_SIGNALING /* replicate ivas_write_format() */ + int16_t ind = 2; + nBits = IVAS_FORMAT_SIGNALING_NBITS; + if ( ivas_total_brate >= IVAS_24k4 ) + { + ind = 4; + nBits = IVAS_FORMAT_SIGNALING_NBITS_EXTENDED; + } + + push_indice( hSCE[0]->hCoreCoder[0]->hBstr, IND_IVAS_FORMAT, ind, nBits ); +#else push_indice( hSCE[0]->hCoreCoder[0]->hBstr, IND_IVAS_FORMAT, 2 /* == ISM format */, IVAS_FORMAT_SIGNALING_NBITS ); +#endif } } else /* ism_dtx_flag == 1 */ diff --git a/lib_enc/ivas_mct_core_enc.c b/lib_enc/ivas_mct_core_enc.c index 900c5e1653..d1f47bcee3 100644 --- a/lib_enc/ivas_mct_core_enc.c +++ b/lib_enc/ivas_mct_core_enc.c @@ -476,7 +476,11 @@ void ivas_mct_core_enc( } else if ( ivas_format == SBA_FORMAT ) { +#ifdef COMBINED_FORMAT_SIGNALING + nAvailBits -= IVAS_FORMAT_SIGNALING_NBITS_EXTENDED; +#else nAvailBits -= IVAS_FORMAT_SIGNALING_NBITS_SBA; +#endif nAvailBits -= SBA_ORDER_BITS + SBA_PLANAR_BITS; } @@ -551,7 +555,11 @@ void ivas_mct_core_enc( } #ifdef DEBUGGING +#ifdef COMBINED_FORMAT_SIGNALING + format_bits = ( ivas_format == MC_FORMAT ? IVAS_FORMAT_SIGNALING_NBITS + MC_LS_SETUP_BITS : IVAS_FORMAT_SIGNALING_NBITS_EXTENDED + SBA_ORDER_BITS + SBA_PLANAR_BITS ); +#else format_bits = ( ivas_format == MC_FORMAT ? IVAS_FORMAT_SIGNALING_NBITS + MC_LS_SETUP_BITS : IVAS_FORMAT_SIGNALING_NBITS_SBA + SBA_ORDER_BITS + SBA_PLANAR_BITS ); +#endif mct_bits += hMCT->nBitsMCT + hMCT->nchan_out_woLFE; assert( ( total_brate + ( NBITS_BWIDTH + format_bits + mct_bits + sba_meta + lfe_bits ) * FRAMES_PER_SEC ) == ivas_total_brate ); #endif -- GitLab From 51914aadaf2f123347d2a6f36b376a171c556bc8 Mon Sep 17 00:00:00 2001 From: vaclav Date: Mon, 8 May 2023 13:32:39 +0200 Subject: [PATCH 2/2] clang-format --- lib_com/bitstream.c | 100 ++++++++++++++++++++++---------------------- 1 file changed, 50 insertions(+), 50 deletions(-) diff --git a/lib_com/bitstream.c b/lib_com/bitstream.c index 412f751b8b..886509b5ac 100644 --- a/lib_com/bitstream.c +++ b/lib_com/bitstream.c @@ -1982,11 +1982,11 @@ ivas_error preview_indices( /*-------------------------------------------------------------------* - * read_indices() - * - * Read indices from an ITU-T G.192 bitstream to the buffer - * Simulate packet losses by inserting frame erasures - *-------------------------------------------------------------------*/ + * read_indices() + * + * Read indices from an ITU-T G.192 bitstream to the buffer + * Simulate packet losses by inserting frame erasures + *-------------------------------------------------------------------*/ /*! r: 1 = reading OK, 0 = problem */ ivas_error read_indices( @@ -2244,11 +2244,11 @@ ivas_error read_indices( } /*-------------------------------------------------------------------* - * read_indices_mime_handle_dtx() - * - * Handle DTX for MIME and RTP_DUMP decoding. - * Returns the actual total_brate. - *-------------------------------------------------------------------*/ + * read_indices_mime_handle_dtx() + * + * Handle DTX for MIME and RTP_DUMP decoding. + * Returns the actual total_brate. + *-------------------------------------------------------------------*/ static Word32 read_indices_mime_handle_dtx( Decoder_State *st, @@ -2398,10 +2398,10 @@ static Word32 read_indices_mime_handle_dtx( /*-------------------------------------------------------------------* - * read_indices_mime_handle_sti_and_all_zero_bits() - * - * Handle STI and frames with all zero bits for MIME and RTP_DUMP decoding. - *-------------------------------------------------------------------*/ + * read_indices_mime_handle_sti_and_all_zero_bits() + * + * Handle STI and frames with all zero bits for MIME and RTP_DUMP decoding. + *-------------------------------------------------------------------*/ static void read_indices_mime_handle_sti_and_all_zero_bits( Decoder_State *st, Word32 *total_brate, @@ -2435,10 +2435,10 @@ static void read_indices_mime_handle_sti_and_all_zero_bits( /*-------------------------------------------------------------------* - * get_rfFrameType() - * - * Extract the RF frame type - *-------------------------------------------------------------------*/ + * get_rfFrameType() + * + * Extract the RF frame type + *-------------------------------------------------------------------*/ static void get_rfFrameType( Decoder_State *st, /* i : decoder state structure */ @@ -2461,10 +2461,10 @@ static void get_rfFrameType( } /*-------------------------------------------------------------------* - * get_rfFlag() - * - * Check if RF flag is present in the bitstream - *-------------------------------------------------------------------*/ + * get_rfFlag() + * + * Check if RF flag is present in the bitstream + *-------------------------------------------------------------------*/ static void get_rfFlag( Decoder_State *st, /* i : decoder state structure */ @@ -2516,10 +2516,10 @@ static void get_rfFlag( } /*-------------------------------------------------------------------* - * get_rf_fec_offset() - * - * Extract the FEC offset - *-------------------------------------------------------------------*/ + * get_rf_fec_offset() + * + * Extract the FEC offset + *-------------------------------------------------------------------*/ static void get_rf_fec_offset( Decoder_State *st, /* i : decoder state structure */ @@ -2551,10 +2551,10 @@ static void get_rf_fec_offset( } /*-------------------------------------------------------------------* - * get_rfTargetBits() - * - * Return the number of RF target bits - *-------------------------------------------------------------------*/ + * get_rfTargetBits() + * + * Return the number of RF target bits + *-------------------------------------------------------------------*/ static void get_rfTargetBits( int16_t rf_frame_type, /* i : RF frame type */ @@ -2599,10 +2599,10 @@ static void get_rfTargetBits( } /*-------------------------------------------------------------------* - * berCheck() - * - * Check for bit errors in channel aware signaling. - *-------------------------------------------------------------------*/ + * berCheck() + * + * Check for bit errors in channel aware signaling. + *-------------------------------------------------------------------*/ static void berCheck( Decoder_State *st /* i/o: decoder state structure */ @@ -2626,10 +2626,10 @@ static void berCheck( } /*-------------------------------------------------------------------* - * getPartialCopyInfo() - * - * Check if the frame includes a partial copy for channel aware processing. - *-------------------------------------------------------------------*/ + * getPartialCopyInfo() + * + * Check if the frame includes a partial copy for channel aware processing. + *-------------------------------------------------------------------*/ void getPartialCopyInfo( Decoder_State *st, /* i/o: decoder state structure */ @@ -2685,10 +2685,10 @@ void getPartialCopyInfo( } /*-------------------------------------------------------------------* - * get_NextCoderType() - * - * Extract the coder type of next frame - *-------------------------------------------------------------------*/ + * get_NextCoderType() + * + * Extract the coder type of next frame + *-------------------------------------------------------------------*/ void get_NextCoderType( uint8_t *bitstream, /* i : bitstream */ @@ -2732,10 +2732,10 @@ void get_NextCoderType( /*-------------------------------------------------------------------* - * get_indice_preview() - * - * Indices preview to parse for the presence of partial copy - *-------------------------------------------------------------------*/ + * get_indice_preview() + * + * Indices preview to parse for the presence of partial copy + *-------------------------------------------------------------------*/ static uint16_t get_indice_preview( uint8_t *bitstream, @@ -2767,10 +2767,10 @@ static uint16_t get_indice_preview( /*-------------------------------------------------------------------* - * evs_dec_previewFrame() - * - * Signalling index preview for JBM - *-------------------------------------------------------------------*/ + * evs_dec_previewFrame() + * + * Signalling index preview for JBM + *-------------------------------------------------------------------*/ void evs_dec_previewFrame( uint8_t *bitstream, -- GitLab