Revert "Update opus to 1.3.1 and opusfile to 0.11"

This reverts commit e00426c512a7905f5f925d382c443bab7a0ca693.

The way we handle platform-specific intrinsics is not good, so the
current state will not compile on armv8. This commit also requires
SSE4.1 support, which is likely not a good idea for portable binaries.

We'll have to redo this with more caution after 3.2 is released, or
we might simply drop opus as we're only using it as dependency for
theora right now.

Fixes #33606.

1 files changed, 11 insertions, 11 deletions

diff --git a/thirdparty/opus/silk/check_control_input.c b/thirdparty/opus/silk/check_control_input.c
index 739fb01f1e..b5de9ce48d 100644
--- a/thirdparty/opus/silk/check_control_input.c
+++ b/thirdparty/opus/silk/check_control_input.c
@@ -38,7 +38,7 @@ opus_int check_control_input(
     silk_EncControlStruct        *encControl                    /* I    Control structure                           */
 )
 {
-    celt_assert( encControl != NULL );
+    silk_assert( encControl != NULL );
 
     if( ( ( encControl->API_sampleRate            !=  8000 ) &&
           ( encControl->API_sampleRate            != 12000 ) &&
@@ -59,46 +59,46 @@ opus_int check_control_input(
           ( encControl->minInternalSampleRate > encControl->desiredInternalSampleRate ) ||
           ( encControl->maxInternalSampleRate < encControl->desiredInternalSampleRate ) ||
           ( encControl->minInternalSampleRate > encControl->maxInternalSampleRate ) ) {
-        celt_assert( 0 );
+        silk_assert( 0 );
         return SILK_ENC_FS_NOT_SUPPORTED;
     }
     if( encControl->payloadSize_ms != 10 &&
         encControl->payloadSize_ms != 20 &&
         encControl->payloadSize_ms != 40 &&
         encControl->payloadSize_ms != 60 ) {
-        celt_assert( 0 );
+        silk_assert( 0 );
         return SILK_ENC_PACKET_SIZE_NOT_SUPPORTED;
     }
     if( encControl->packetLossPercentage < 0 || encControl->packetLossPercentage > 100 ) {
-        celt_assert( 0 );
+        silk_assert( 0 );
         return SILK_ENC_INVALID_LOSS_RATE;
     }
     if( encControl->useDTX < 0 || encControl->useDTX > 1 ) {
-        celt_assert( 0 );
+        silk_assert( 0 );
         return SILK_ENC_INVALID_DTX_SETTING;
     }
     if( encControl->useCBR < 0 || encControl->useCBR > 1 ) {
-        celt_assert( 0 );
+        silk_assert( 0 );
         return SILK_ENC_INVALID_CBR_SETTING;
     }
     if( encControl->useInBandFEC < 0 || encControl->useInBandFEC > 1 ) {
-        celt_assert( 0 );
+        silk_assert( 0 );
         return SILK_ENC_INVALID_INBAND_FEC_SETTING;
     }
     if( encControl->nChannelsAPI < 1 || encControl->nChannelsAPI > ENCODER_NUM_CHANNELS ) {
-        celt_assert( 0 );
+        silk_assert( 0 );
         return SILK_ENC_INVALID_NUMBER_OF_CHANNELS_ERROR;
     }
     if( encControl->nChannelsInternal < 1 || encControl->nChannelsInternal > ENCODER_NUM_CHANNELS ) {
-        celt_assert( 0 );
+        silk_assert( 0 );
         return SILK_ENC_INVALID_NUMBER_OF_CHANNELS_ERROR;
     }
     if( encControl->nChannelsInternal > encControl->nChannelsAPI ) {
-        celt_assert( 0 );
+        silk_assert( 0 );
         return SILK_ENC_INVALID_NUMBER_OF_CHANNELS_ERROR;
     }
     if( encControl->complexity < 0 || encControl->complexity > 10 ) {
-        celt_assert( 0 );
+        silk_assert( 0 );
         return SILK_ENC_INVALID_COMPLEXITY_SETTING;
     }