vaapi_encode: Add flag to mark encoders supporting only constant-quality

And set it for MJPEG.

Mark Thompson committed 8 years ago

Commit fef21621 parent a7eda763 files · +6 −1Browse files

Unified · Split

3 files

         ctx->va_rc_mode = VA_RC_CQP;
         return 0;
     }
-    if (avctx->flags & AV_CODEC_FLAG_QSCALE ||
+    if (ctx->codec->flags & FLAG_CONSTANT_QUALITY_ONLY ||
+        avctx->flags & AV_CODEC_FLAG_QSCALE ||
         avctx->bit_rate <= 0) {
         if (rc_attr.value & VA_RC_CQP) {
             av_log(avctx, AV_LOG_VERBOSE, "Using constant-quality mode.\n");

@@ -251,6 +251,8 @@ typedef struct VAAPIEncodeContext { · 250 unmodified lines
251	enum {	251	enum {
252	// Codec supports controlling the subdivision of pictures into slices.	252	// Codec supports controlling the subdivision of pictures into slices.
253	FLAG_SLICE_CONTROL = 1 << 0,	253	FLAG_SLICE_CONTROL = 1 << 0,
		254	// Codec only supports constant quality (no rate control).
		255	FLAG_CONSTANT_QUALITY_ONLY = 1 << 1,
254	};	256	};
255		257
256	typedef struct VAAPIEncodeType {	258	typedef struct VAAPIEncodeType {

@@ -476,6 +476,8 @@ static const VAAPIEncodeProfile vaapi_encode_mjpeg_profiles[] = { · 475 unmodified lines
476	static const VAAPIEncodeType vaapi_encode_type_mjpeg = {	476	static const VAAPIEncodeType vaapi_encode_type_mjpeg = {
477	.profiles = vaapi_encode_mjpeg_profiles,	477	.profiles = vaapi_encode_mjpeg_profiles,
478		478
		479	.flags = FLAG_CONSTANT_QUALITY_ONLY,
		480
479	.configure = &vaapi_encode_mjpeg_configure,	481	.configure = &vaapi_encode_mjpeg_configure,
480		482
481	.picture_params_size = sizeof(VAEncPictureParameterBufferJPEG),	483	.picture_params_size = sizeof(VAEncPictureParameterBufferJPEG),

Keyboard shortcuts