Skip to content

Commit 2f27b59

Browse files
committed
Reenable test for opus
1 parent 2f33e1e commit 2f27b59

File tree

5 files changed

+13
-14
lines changed

5 files changed

+13
-14
lines changed

tests/yup_audio_formats/yup_OpusAudioFormat.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ TEST_F (OpusAudioFormatFileTests, TestOpusFilesHaveValidData)
237237
}
238238
}
239239

240-
TEST_F (OpusAudioFormatFileTests, DISABLED_TestWriteAndReadRoundTrip)
240+
TEST_F (OpusAudioFormatFileTests, TestWriteAndReadRoundTrip)
241241
{
242242
File tempFile = File::createTempFile (".opus");
243243
auto deleteTempFileAtExit = ScopeGuard { [&]

thirdparty/opus_library/opus_library.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,13 @@
1919
==============================================================================
2020
*/
2121

22+
#define OPUS_BUILD 1
23+
#define USE_ALLOCA 1
24+
25+
#if ! NDEBUG
26+
#define OPUS_WILL_BE_SLOW 1
27+
#endif
28+
2229
#include "opus_library.h"
2330

2431
#if defined(__clang__)
@@ -29,13 +36,6 @@
2936
#pragma clang diagnostic ignored "-Wshorten-64-to-32"
3037
#endif
3138

32-
#define OPUS_BUILD 1
33-
#define USE_ALLOCA 1
34-
35-
#if YUP_DEBUG
36-
#define OPUS_WILL_BE_SLOW 1
37-
#endif
38-
3939
#include "src/opus.c"
4040
#include "src/opus_decoder.c"
4141
#include "src/opus_encoder.c"

thirdparty/opus_library/opus_library.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
sha256: b7637334527201fdfd6dd6a02e67aceffb0e5e60155bbd89175647a80301c92c
3535
license: BSD
3636
37-
defines:
3837
searchpaths: include celt silk silk/float silk/fixed dnn
3938
4039
END_YUP_MODULE_DECLARATION

thirdparty/opus_library/opus_library_celt.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,16 @@
1919
==============================================================================
2020
*/
2121

22+
#define OPUS_BUILD 1
23+
#define USE_ALLOCA 1
24+
2225
#include "opus_library.h"
2326

2427
#if defined(__clang__)
2528
#pragma clang diagnostic push
2629
#pragma clang diagnostic ignored "-Wtautological-pointer-compare"
2730
#endif
2831

29-
#define OPUS_BUILD 1
30-
#define USE_ALLOCA 1
31-
3232
#define CELT_ENCODER_C 1
3333
#define CELT_DECODER_C 1
3434
#include "opus_custom.h"

thirdparty/opus_library/opus_library_silk.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@
1919
==============================================================================
2020
*/
2121

22-
#include "opus_library.h"
23-
2422
#define OPUS_BUILD 1
2523
#define USE_ALLOCA 1
2624

25+
#include "opus_library.h"
26+
2727
#include "silk/CNG.c"
2828
#include "silk/code_signs.c"
2929
#include "silk/init_decoder.c"

0 commit comments

Comments
 (0)