Fix a crash with SVT-AV1.

[nageru] / nageru / av1_encoder.cpp

diff --git a/nageru/av1_encoder.cpp b/nageru/av1_encoder.cpp
index 371eb0d82232afff7096f7c5d29d1362697b0aed..ca9f7c3d4f34480727a238bfe2ad65dc7ebab7be 100644 (file)
--- a/nageru/av1_encoder.cpp
+++ b/nageru/av1_encoder.cpp
@@ -132,6 +132,14 @@ void AV1Encoder::add_frame(int64_t pts, int64_t duration, YCbCrLumaCoefficients
 void AV1Encoder::init_av1()
 {
        EbSvtAv1EncConfiguration config;
+
+       // svt_av1_enc_init_handle() is defined to fill config with the defaults;
+       // yet, seemingly, not everything is written, and some of it can cause
+       // Valgrind warnings and/or crashes. It should never hurt to put it
+       // into a known state beforehand, and it seems to fix the crashes,
+       // so we do that.
+       memset(&config, 0, sizeof(config));
+
        EbErrorType ret = svt_av1_enc_init_handle(&encoder, nullptr, &config);
        if (ret != EB_ErrorNone) {
                fprintf(stderr, "Error initializing SVT-AV1 handle (error %08x)\n", ret);
@@ -158,9 +166,7 @@ void AV1Encoder::init_av1()
                config.matrix_coefficients = EB_CICP_MC_BT_601;
        }
        config.color_range = EB_CR_STUDIO_RANGE;
-#if SVT_AV1_CHECK_VERSION(1, 0, 0)
        config.chroma_sample_position = EB_CSP_VERTICAL;
-#endif
 
        const vector<string> &extra_param = global_flags.av1_extra_param;
        for (const string &str : extra_param) {
@@ -292,8 +298,8 @@ void AV1Encoder::encode_frame(AV1Encoder::QueuedFrame qf)
                pic.cr_stride = global_flags.width / 2;  // Likewise.
                pic.width = global_flags.width;
                pic.height = global_flags.height;
-               pic.origin_x = 0;
-               pic.origin_y = 0;
+               pic.org_x = 0;
+               pic.org_y = 0;
                pic.color_fmt = EB_YUV420;
                pic.bit_depth = global_flags.bit_depth > 8 ? EB_TEN_BIT : EB_EIGHT_BIT;