Commit 9548fa70 authored by vaclav's avatar vaclav
Browse files

accept FIX_847_OUTPUT_PCM_BUFFER

parent f58dfe48

apps/decoder.c

+0 −9
Original line number Diff line number Diff line
@@ -196,11 +196,7 @@ int main( 
    RotFileReader *refRotReader = NULL;

    Vector3PairFileReader *referenceVectorReader = NULL;

    RenderConfigReader *renderConfigReader = NULL;

#ifdef FIX_847_OUTPUT_PCM_BUFFER

    int16_t *pcmBuf = NULL;

#else

    int16_t pcmBuf[MAX_OUTPUT_PCM_BUFFER_SIZE];

#endif

#ifdef DEBUGGING

    int32_t noClipping;

    int32_t cnt_frames_limited;
@@ -743,7 +739,6 @@ int main( 
        }

    }



#ifdef FIX_847_OUTPUT_PCM_BUFFER

    /*------------------------------------------------------------------------------------------*

     * Allocate output data buffer

     *------------------------------------------------------------------------------------------*/
@@ -757,8 +752,6 @@ int main( 


    pcmBuf = malloc( pcmBufSize * sizeof( int16_t ) );



#endif



    /*-----------------------------------------------------------------*

     * Decoding

     *-----------------------------------------------------------------*/
@@ -812,9 +805,7 @@ int main( 


cleanup:



#ifdef FIX_847_OUTPUT_PCM_BUFFER

    free( pcmBuf );

#endif



#ifdef DEBUG_SBA_AUDIO_DUMP

    IVAS_DEC_GetSbaDebugParams( hIvasDec, &numOutChannels, &numTransportChannels, &pca_ingest_channels );

lib_com/ivas_error.h

+0 −4
Original line number Diff line number Diff line
@@ -65,9 +65,7 @@ typedef enum 
    IVAS_ERR_INVALID_FEC_CONFIG,

    IVAS_ERR_INVALID_FEC_OFFSET,

    IVAS_ERR_INVALID_INPUT_BUFFER_SIZE,

#ifdef FIX_847_OUTPUT_PCM_BUFFER

    IVAS_ERR_INVALID_OUTPUT_BUFFER_SIZE,

#endif

    IVAS_ERR_DTX_NOT_SUPPORTED,

    IVAS_ERR_UNEXPECTED_NULL_POINTER,

    IVAS_ERR_METADATA_NOT_EXPECTED,
@@ -217,10 +215,8 @@ static inline const char *ivas_error_to_string( ivas_error error_code ) 
            return "Invalid FEC offset";

        case IVAS_ERR_INVALID_INPUT_BUFFER_SIZE:

            return "Invalid input buffer size";

#ifdef FIX_847_OUTPUT_PCM_BUFFER

        case IVAS_ERR_INVALID_OUTPUT_BUFFER_SIZE:

            return "Invalid output buffer size";

#endif

        case IVAS_ERR_DTX_NOT_SUPPORTED:

            return "DTX is not supported in this IVAS format and element mode";

        case IVAS_ERR_UNEXPECTED_NULL_POINTER:

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ 
/*#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 */



#define FIX_847_OUTPUT_PCM_BUFFER                       /* VA: issue 847: Allocate decoder output PCM buffer dynamically */





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

lib_dec/lib_dec.c

+0 −2
Original line number Diff line number Diff line
@@ -1413,7 +1413,6 @@ ivas_error IVAS_DEC_GetFormat( 
}





#ifdef FIX_847_OUTPUT_PCM_BUFFER

/*---------------------------------------------------------------------*

 * getInputBufferSize()

 *
@@ -1476,7 +1475,6 @@ ivas_error IVAS_DEC_GetOutputBufferSize( 
        return IVAS_ERR_OK;

    }

}

#endif





/*---------------------------------------------------------------------*

lib_dec/lib_dec.h

+0 −2
Original line number Diff line number Diff line
@@ -360,13 +360,11 @@ ivas_error IVAS_DEC_GetFormat( 
    IVAS_DEC_BS_FORMAT *format                  /* o  : format detected from bitstream fed to the decoder                       */

);



#ifdef FIX_847_OUTPUT_PCM_BUFFER

/*! r: error code */

ivas_error IVAS_DEC_GetOutputBufferSize(

    const IVAS_DEC_HANDLE hIvasDec,             /* i  : IVAS decoder handle                                                     */

    int16_t *outputBufferSize                   /* o  : total number of samples expected in the output buffer for current decoder configuration */

);

#endif



/*! r: error code */

ivas_error IVAS_DEC_GetNumOutputChannels(