Commit 10372244 authored by sekine's avatar sekine
Browse files
Merge branch 'main' of https://forge.3gpp.org/rep/ivas-codec-pc/ivas-codec into NTT/ROM_and_ITD_202208
parents 9c1913e2 abea63b8
Loading
Loading
Loading
Loading
Loading
+19 −0
Original line number Diff line number Diff line
### Basic info

- Commit SHA: 
- Platform: 

### Bug description


### Ways to reproduce

(Clear steps or refer to a failing automated test, e.g. with a pipeline link)



<!--- Below are labels that will be added but are not shown in description. This is a template to help fill them.
      Add further information to the first row and remove and add labels as necessary.  -->

/label ~Priority:: ~Company: ~Subpart:
/label ~Type:Bug ~Status::ToDo
+7 −0
Original line number Diff line number Diff line
(Generic issue template)

<!--- Below are labels that will be added but are not shown in description. This is a template to help fill them.
      Add further information to the first row and remove and add labels as necessary.  -->

/label ~Priority:: ~Company: ~Subpart: ~Type:
/label ~Status::ToDo
+12 −0
Original line number Diff line number Diff line
<!--- Basic information that is useful -->
- Related issues:
- Requested reviewers: 

### Description


<!--- Labels that are added. Fill as necessary. -->
/label ~Priority:: ~Company: ~Subpart: ~Type: ~Status::

<!--- Alternatively to labels, you can use "/copy_metadata #number" to get labels from an issue -->
+9 −0
Original line number Diff line number Diff line
- Requested reviewers: 

### Description


<!--- Labels that are added. Fill as necessary. -->
/label ~Maintenance:
/label ~Status::
/label ~Type:
+18 −0
Original line number Diff line number Diff line
@@ -1975,11 +1975,29 @@ ivas_error preview_indices(
        }
        else if ( st_ivas->ivas_format == SBA_FORMAT )
        {

            /* Read SBA planar flag and SBA order */
            st_ivas->sba_planar = ( bit_stream[IVAS_FORMAT_SIGNALING_NBITS_SBA] == 1 );
#ifndef SBA_ORDER_BITSTREAM
            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 );
#else
            st_ivas->hDecoderConfig->sba_order = ( bit_stream[IVAS_FORMAT_SIGNALING_NBITS_SBA + 2] == 1 );
            st_ivas->hDecoderConfig->sba_order += 2 * ( bit_stream[IVAS_FORMAT_SIGNALING_NBITS_SBA + 1] == 1 );
            st_ivas->sba_analysis_order = st_ivas->hDecoderConfig->sba_order;
#endif
#ifdef SBA_ORDER_BITSTREAM
            /*Hard coding the the sba_oder as 1 as higher not supported below 256k bitrate*/
            if ( total_brate < IVAS_256k )
            {
                st_ivas->sba_analysis_order = 1;
            }
#endif
#ifdef SBA_ORDER_BITSTREAM
            ivas_sba_config( total_brate, st_ivas->sba_analysis_order, -1, &( st_ivas->nchan_transport ), st_ivas->sba_planar, &( st_ivas->nSCE ), &( st_ivas->nCPE ), &( st_ivas->element_mode_init ), st_ivas->sba_mode );
#else
            ivas_sba_config( total_brate, st_ivas->sba_order, -1, &( st_ivas->nchan_transport ), st_ivas->sba_planar, &( st_ivas->nSCE ), &( st_ivas->nCPE ), &( st_ivas->element_mode_init ), st_ivas->sba_mode );
#endif
        }
    }

Loading