Display and control your Android device
Prefer a decoder supporting the hardware device
Romain Vimontd6e2ea5a2b8e
diff --git a/app/src/decoder.c b/app/src/decoder.cindex 83abde95..3cdfd1bf 100644--- a/app/src/decoder.c+++ b/app/src/decoder.c@@ -17,13 +17,26 @@ sc_decoder_open(struct sc_decoder *decoder, const AVCodecParameters *params,// A video stream must have a sessionassert(session || params->codec_type != AVMEDIA_TYPE_VIDEO);- const AVCodec *codec = avcodec_find_decoder(params->codec_id);+ const AVCodec *codec = NULL;++ if (decoder->hwdec && decoder->hwdec->hw_type != AV_HWDEVICE_TYPE_NONE) {+ // The default decoder may not support hardware decoding (for example,+ // libdav1d is preferred for AV1, but only the native av1 decoder+ // supports the hardware devices)+ codec = sc_hwdec_find_decoder(decoder->hwdec, params->codec_id);+ }+if (!codec) {- LOGE("Decoder '%s': no decoder for %s", decoder->name,- avcodec_get_name(params->codec_id));- return false;+ codec = avcodec_find_decoder(params->codec_id);+ if (!codec) {+ LOGE("Decoder '%s': no decoder for %s", decoder->name,+ avcodec_get_name(params->codec_id));+ return false;+ }}+ LOGD("Decoder '%s': %s", decoder->name, codec->name);+decoder->ctx = avcodec_alloc_context3(codec);if (!decoder->ctx) {LOG_OOM();diff --git a/app/src/hwdec.c b/app/src/hwdec.cindex 7f85e0ae..f34e92d9 100644--- a/app/src/hwdec.c+++ b/app/src/hwdec.c@@ -146,6 +146,22 @@ sc_hwdec_is_supported_by_codec(const AVCodec *codec,}}+const AVCodec *+sc_hwdec_find_decoder(struct sc_hwdec *hwdec, enum AVCodecID codec_id) {+ assert(hwdec->hw_type != AV_HWDEVICE_TYPE_NONE);++ void *iter = NULL;+ const AVCodec *codec;+ while ((codec = av_codec_iterate(&iter))) {+ if (codec->id == codec_id && av_codec_is_decoder(codec)+ && sc_hwdec_is_supported_by_codec(codec, hwdec->hw_type)) {+ return codec;+ }+ }++ return NULL;+}+static enum AVPixelFormatsc_hwdec_get_format_forced(AVCodecContext *ctx,const enum AVPixelFormat *formats) {diff --git a/app/src/hwdec.h b/app/src/hwdec.hindex 4c09ec05..692a58cd 100644--- a/app/src/hwdec.h+++ b/app/src/hwdec.h@@ -24,6 +24,9 @@ boolsc_hwdec_init(struct sc_hwdec *hwdec, enum AVHWDeviceType hw_type,bool hw_forced, SDL_Renderer *renderer);+const AVCodec *+sc_hwdec_find_decoder(struct sc_hwdec *hwdec, enum AVCodecID codec_id);+boolsc_hwdec_configure(struct sc_hwdec *hwdec, AVCodecContext *ctx);