virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-04-14 00:58:38 +02:00
Code Issues Releases Activity

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

Browse Source 
And set it for MJPEG.
This commit is contained in:
Mark Thompson 2018-09-23 22:53:00 +01:00
parent a7eda762dc
commit fef2162b6e
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/vaapi_encode.c
View File

@ -1277,7 +1277,8 @@ static av_cold int vaapi_encode_init_rate_control(AVCodecContext *avctx)
ctx->va_rc_mode = VA_RC_CQP; ctx->va_rc_mode = VA_RC_CQP;
return 0; 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) { avctx->bit_rate <= 0) {
if (rc_attr.value & VA_RC_CQP) { if (rc_attr.value & VA_RC_CQP) {
av_log(avctx, AV_LOG_VERBOSE, "Using constant-quality mode.\n"); av_log(avctx, AV_LOG_VERBOSE, "Using constant-quality mode.\n");

2
libavcodec/vaapi_encode.h
View File

@ -251,6 +251,8 @@ typedef struct VAAPIEncodeContext {
enum { enum {
// Codec supports controlling the subdivision of pictures into slices. // Codec supports controlling the subdivision of pictures into slices.
FLAG_SLICE_CONTROL = 1 << 0, FLAG_SLICE_CONTROL = 1 << 0,
// Codec only supports constant quality (no rate control).
FLAG_CONSTANT_QUALITY_ONLY = 1 << 1,
}; };
typedef struct VAAPIEncodeType { typedef struct VAAPIEncodeType {

2
libavcodec/vaapi_encode_mjpeg.c
View File

@ -476,6 +476,8 @@ static const VAAPIEncodeProfile vaapi_encode_mjpeg_profiles[] = {
static const VAAPIEncodeType vaapi_encode_type_mjpeg = { static const VAAPIEncodeType vaapi_encode_type_mjpeg = {
.profiles = vaapi_encode_mjpeg_profiles, .profiles = vaapi_encode_mjpeg_profiles,
.flags = FLAG_CONSTANT_QUALITY_ONLY,
.configure = &vaapi_encode_mjpeg_configure, .configure = &vaapi_encode_mjpeg_configure,
.picture_params_size = sizeof(VAEncPictureParameterBufferJPEG), .picture_params_size = sizeof(VAEncPictureParameterBufferJPEG),