Public/koboldcpp
1
0
Fork 0
mirror of https://github.com/LostRuins/koboldcpp.git synced 2026-09-19 09:15:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'upstream' into concedo_experimental

Browse Source 
# Conflicts:
#	.github/workflows/build-webgpu.yml
#	CMakeLists.txt
#	common/CMakeLists.txt
#	docs/development/HOWTO-add-model.md
#	ggml/src/ggml-opencl/ggml-opencl.cpp
#	ggml/src/ggml-sycl/CMakeLists.txt
#	tests/test-arg-parser.cpp
#	tests/test-jinja.cpp
#	tests/test-llama-archs.cpp
#	tests/test-save-load-state.cpp
#	tools/cli/README.md
#	tools/completion/README.md
#	tools/llama-bench/llama-bench.cpp
#	tools/mtmd/CMakeLists.txt
#	tools/server/README.md
This commit is contained in:
Concedo
2026-07-27 22:28:38 +08:00
parent 90510f2b27 0324696b8e
commit fee0bf446c
74 changed files with 2516 additions and 361 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/mtmd/mtmd-helper.cpp
+13
View File
@@ -641,6 +641,7 @@ bool mtmd_helper_support_video(mtmd_context * ctx) {
#ifdef MTMD_VIDEO
return mtmd_support_vision(ctx);
#else
GGML_UNUSED(ctx);
return false;
#endif
}
@@ -1008,6 +1009,9 @@ mtmd_helper_video * mtmd_helper_video_init(
return ctx;
#else
GGML_UNUSED(mctx);
GGML_UNUSED(path);
GGML_UNUSED(params);
LOG_ERR("%s: video is not supported in this build (MTMD_VIDEO is set to OFF)\n", __func__);
return nullptr;
#endif
@@ -1040,6 +1044,10 @@ mtmd_helper_video * mtmd_helper_video_init_from_buf(
return ctx;
#else
GGML_UNUSED(mctx);
GGML_UNUSED(buf);
GGML_UNUSED(len);
GGML_UNUSED(params);
LOG_ERR("%s: video is not supported in this build (MTMD_VIDEO is set to OFF)\n", __func__);
return nullptr;
#endif
@@ -1051,6 +1059,7 @@ void mtmd_helper_video_free(mtmd_helper_video * ctx) {
ctx->stop_ffmpeg();
delete ctx;
#else
GGML_UNUSED(ctx);
LOG_ERR("%s: video is not supported in this build (MTMD_VIDEO is set to OFF)\n", __func__);
#endif
}
@@ -1059,6 +1068,7 @@ mtmd_helper_video_info mtmd_helper_video_get_info(const mtmd_helper_video * ctx)
#ifdef MTMD_VIDEO
return ctx->info;
#else
GGML_UNUSED(ctx);
GGML_ASSERT(false && "video is not supported in this build (MTMD_VIDEO is set to OFF)");
#endif
}
@@ -1069,6 +1079,9 @@ int32_t mtmd_helper_video_read_next(mtmd_helper_video * ctx,
if (!ctx) return -2;
return ctx->read_next(out_bitmap, out_text);
#else
GGML_UNUSED(ctx);
GGML_UNUSED(out_bitmap);
GGML_UNUSED(out_text);
GGML_ASSERT(false && "video is not supported in this build (MTMD_VIDEO is set to OFF)");
#endif
}