diff options
Diffstat (limited to 'src/codec/ffmpeg')
| -rw-r--r-- | src/codec/ffmpeg/decoder.c | 9 | ||||
| -rw-r--r-- | src/codec/ffmpeg/meson.build | 4 |
2 files changed, 6 insertions, 7 deletions
diff --git a/src/codec/ffmpeg/decoder.c b/src/codec/ffmpeg/decoder.c index d24677a..95fb0bf 100644 --- a/src/codec/ffmpeg/decoder.c +++ b/src/codec/ffmpeg/decoder.c @@ -81,7 +81,7 @@ static s32 init_hwframe_context(struct camu_ff_decoder *av, AVCodecContext *cont static bool fallback_to_sw_codec(struct camu_ff_decoder *av, const AVCodec *codec) { - log_warn("Attempting software decoding fallback..."); + log_warn("Falling back to software decoding."); // Remake AVCodecContext as a software decoder. AVCodecParameters *codecpar = av->codecpar; av->errored_hw_context = av->codec_context; @@ -96,7 +96,7 @@ static bool fallback_to_sw_codec(struct camu_ff_decoder *av, const AVCodec *code return false; } log_codec_name(codec, NULL); - log_info("Using software fallback with %i threads for decoder.", av->thread_count); + log_debug("Using software fallback with %i threads for decoder.", av->thread_count); return true; } @@ -248,8 +248,7 @@ static bool ff_decoder_init(struct camu_decoder *dec, struct camu_renderer *rend } #ifdef CAMU_FF_DECODER_HWACCEL av->sw_codec = codec; - // @TODO: How do you correctly probe avcodec_get_hw_config() if find_decoder() - // always returns libdav1d first? + // @TODO: How to correctly probe avcodec_get_hw_config() if find_decoder() always returns libdav1d first? if (al_strscmp(codec->name, "libdav1d") == 0) { if (!(codec = avcodec_find_decoder_by_name("av1"))) { codec = av->sw_codec; @@ -333,7 +332,7 @@ static bool ff_decoder_init(struct camu_decoder *dec, struct camu_renderer *rend // - https://ffmpeg.org/ffmpeg-codecs.html#Codec-Options av->codec_context->thread_type = FF_THREAD_FRAME; av->codec_context->thread_count = av->thread_count; - log_info("Using %i threads for decoder.", av->thread_count); + log_debug("Using %i threads for decoder.", av->thread_count); #ifdef CAMU_FF_DECODER_HWACCEL } #endif diff --git a/src/codec/ffmpeg/meson.build b/src/codec/ffmpeg/meson.build index 1691c29..401c93a 100644 --- a/src/codec/ffmpeg/meson.build +++ b/src/codec/ffmpeg/meson.build @@ -64,13 +64,13 @@ if not ffmpeg_force_fallback ffmpeg_args += ['-DCAMU_TRY_HWACCEL'] endif elif ffmpeg_version_option == 'system' - error('System FFmpeg requested but not found. Add \'--force-fallback-for=ffmpeg\' or \'-Dcodec-ffmpeg-version=[8,7,6,...]\'.') + error('System FFmpeg requested but not found. Add \'--force-fallback-for=ffmpeg\' or \'-Dcodec-ffmpeg-version=[9,8,7,...]\'.') endif endif # Fallback if requested or necessary. if ffmpeg_force_fallback or not libavutil.found() if ffmpeg_version_option == 'system' - ffmpeg_version_option = '8' # Default to current latest. + ffmpeg_version_option = '9' # Default to current latest. endif subproject('ffmpeg' + ffmpeg_version_option) # Override libav dependencies. endif |