dav1d: use more than 1 thread (#13)

HomeOfAviSynthPlusEvolution · Mar 10, 2024 · c426c9f · c426c9f
1 parent 8927ea9
commit c426c9f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/common/decode.c b/common/decode.c
@@ -137,8 +137,8 @@ int open_decoder
                                          * For instance, when stream is encoded as AC-3,
                                          * AVCodecContext.codec_id might have been set to AV_CODEC_ID_EAC3
                                          * while AVCodec.id is set to AV_CODEC_ID_AC3. */
-    if( !strcmp( codec->name, "libdav1d" )
-     && (ret = av_opt_set_int( c->priv_data, "framethreads", 1, 0 )) < 0 )
+    if (!strcmp(codec->name, "libdav1d")
+        && (ret = av_opt_set_int(c->priv_data, "max_frame_delay", 2, 0)) < 0)
         goto fail;
     else if( !strcmp( codec->name, "vp9" )
           && thread_count != 1

diff --git a/common/decode.h b/common/decode.h
@@ -25,7 +25,10 @@ static inline uint32_t get_decoder_delay
     AVCodecContext *ctx
 )
 {
-    return ctx->has_b_frames + ((ctx->active_thread_type & FF_THREAD_FRAME) ? ctx->thread_count - 1 : 0);
+    if (!strcmp(ctx->codec->name, "libdav1d"))
+        return ctx->delay;
+    else
+        return ctx->has_b_frames + ((ctx->active_thread_type & FF_THREAD_FRAME) ? ctx->thread_count - 1 : 0);
 }
 
 const AVCodec *find_decoder