X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=nageru%2Fffmpeg_capture.cpp;h=5cf1d8c9ec75f35a6932a6bd7a282914c3017d92;hb=cb1dcf409cde897b011e9d9d3cd3cf2974956190;hp=863f4fba4feaecc40b14d07b4662a04740c1894c;hpb=3fb867fa45d24d5f67ee1b070533f46c1f1f5462;p=nageru

diff --git a/nageru/ffmpeg_capture.cpp b/nageru/ffmpeg_capture.cpp
index 863f4fb..5cf1d8c 100644
--- a/nageru/ffmpeg_capture.cpp
+++ b/nageru/ffmpeg_capture.cpp
@@ -479,6 +479,11 @@ AVPixelFormat get_hw_format(AVCodecContext *ctx, const AVPixelFormat *fmt)
 			if (config->pix_fmt == *fmt_ptr) {
 				fprintf(stderr, "Initialized '%s' hardware decoding for codec '%s'.\n",
 					av_hwdevice_get_type_name(type), ctx->codec->name);
+				if (ctx->profile == FF_PROFILE_H264_BASELINE) {
+					fprintf(stderr, "WARNING: Stream claims to be H.264 Baseline, which is generally poorly supported in hardware decoders.\n");
+					fprintf(stderr, "         Consider encoding it as Constrained Baseline, Main or High instead.\n");
+					fprintf(stderr, "         Decoding might fail and fall back to software.\n");
+				}
 				return config->pix_fmt;
 			}
 		}
@@ -498,7 +503,15 @@ AVPixelFormat get_hw_format(AVCodecContext *ctx, const AVPixelFormat *fmt)
 		fprintf(stderr, "Decoder '%s' does not support device type '%s'.\n", ctx->codec->name, av_hwdevice_get_type_name(type));
 	}
 
-	// We found no VA-API formats, so take the best software format.
+	// We found no VA-API formats, so take the first software format.
+	for (const AVPixelFormat *fmt_ptr = fmt; *fmt_ptr != -1; ++fmt_ptr) {
+		if ((av_pix_fmt_desc_get(*fmt_ptr)->flags & AV_PIX_FMT_FLAG_HWACCEL) == 0) {
+			fprintf(stderr, "Falling back to software format %s.\n", av_get_pix_fmt_name(*fmt_ptr));
+			return *fmt_ptr;
+		}
+	}
+
+	// Fallback: Just return anything. (Should never really happen.)
 	return fmt[0];
 }