vaapi_encode: Clean up the packed header configuration

Add a larger warning more clearly explaining the consequences of missing packed header support in the driver. Also only write the extradata if the user actually requests it via the GLOBAL_HEADER flag.

Mark Thompson committed 8 years ago

Commit 851a63c1 parent bf726c28 files · +80 −68Browse files

Unified · Split

8 files

libavcodec/vaapi_encode.c +63 −56
libavcodec/vaapi_encode.h +4 −3
libavcodec/vaapi_encode_h264.c +1 −1
libavcodec/vaapi_encode_h265.c +1 −1
libavcodec/vaapi_encode_mjpeg.c +1 −1
libavcodec/vaapi_encode_mpeg2.c +2 −2
libavcodec/vaapi_encode_vp8.c +4 −2
libavcodec/vaapi_encode_vp9.c +4 −2

libavcodec/vaapi_encode.c+63−56

     return err;
 }
-static av_cold int vaapi_encode_config_attributes(AVCodecContext *avctx)
-{
-    VAAPIEncodeContext *ctx = avctx->priv_data;
-    VAStatus vas;
-    int i;
-    VAConfigAttrib attr[] = {
-        { VAConfigAttribEncPackedHeaders },
-    };
-    vas = vaGetConfigAttributes(ctx->hwctx->display,
-                                ctx->va_profile, ctx->va_entrypoint,
-                                attr, FF_ARRAY_ELEMS(attr));
-    if (vas != VA_STATUS_SUCCESS) {
-        av_log(avctx, AV_LOG_ERROR, "Failed to fetch config "
-               "attributes: %d (%s).\n", vas, vaErrorStr(vas));
-        return AVERROR(EINVAL);
-    }
-    for (i = 0; i < FF_ARRAY_ELEMS(attr); i++) {
-        if (attr[i].value == VA_ATTRIB_NOT_SUPPORTED) {
-            // Unfortunately we have to treat this as "don't know" and hope
-            // for the best, because the Intel MJPEG encoder returns this
-            // for all the interesting attributes.
-            av_log(avctx, AV_LOG_DEBUG, "Attribute (%d) is not supported.\n",
-                   attr[i].type);
-            continue;
-        }
-        switch (attr[i].type) {
-        case VAConfigAttribEncPackedHeaders:
-            if (ctx->va_packed_headers & ~attr[i].value) {
-                // This isn't fatal, but packed headers are always
-                // preferable because they are under our control.
-                // When absent, the driver is generating them and some
-                // features may not work (e.g. VUI or SEI in H.264).
-                av_log(avctx, AV_LOG_WARNING, "Warning: some packed "
-                       "headers are not supported (want %#x, got %#x).\n",
-                       ctx->va_packed_headers, attr[i].value);
-                ctx->va_packed_headers &= attr[i].value;
-            }
-            ctx->config_attributes[ctx->nb_config_attributes++] =
-                (VAConfigAttrib) {
-                .type  = VAConfigAttribEncPackedHeaders,
-                .value = ctx->va_packed_headers,
-            };
-            break;
-        default:
-            av_assert0(0 && "Unexpected config attribute.");
-        }
-    }
-    return 0;
-}
 static av_cold int vaapi_encode_init_rate_control(AVCodecContext *avctx)
 {
     VAAPIEncodeContext *ctx = avctx->priv_data;
     return 0;
 }
+static av_cold int vaapi_encode_init_packed_headers(AVCodecContext *avctx)
+{
+    VAAPIEncodeContext *ctx = avctx->priv_data;
+    VAStatus vas;
+    VAConfigAttrib attr = { VAConfigAttribEncPackedHeaders };
+    vas = vaGetConfigAttributes(ctx->hwctx->display,
+                                ctx->va_profile,
+                                ctx->va_entrypoint,
+                                &attr, 1);
+    if (vas != VA_STATUS_SUCCESS) {
+        av_log(avctx, AV_LOG_ERROR, "Failed to query packed headers "
+               "attribute: %d (%s).\n", vas, vaErrorStr(vas));
+        return AVERROR_EXTERNAL;
+    }
+    if (attr.value == VA_ATTRIB_NOT_SUPPORTED) {
+        if (ctx->desired_packed_headers) {
+            av_log(avctx, AV_LOG_WARNING, "Driver does not support any "
+                   "packed headers (wanted %#x).\n",
+                   ctx->desired_packed_headers);
+        } else {
+            av_log(avctx, AV_LOG_VERBOSE, "Driver does not support any "
+                   "packed headers (none wanted).\n");
+        }
+        ctx->va_packed_headers = 0;
+    } else {
+        if (ctx->desired_packed_headers & ~attr.value) {
+            av_log(avctx, AV_LOG_WARNING, "Driver does not support some "
+                   "wanted packed headers (wanted %#x, found %#x).\n",
+                   ctx->desired_packed_headers, attr.value);
+        } else {
+            av_log(avctx, AV_LOG_VERBOSE, "All wanted packed headers "
+                   "available (wanted %#x, found %#x).\n",
+                   ctx->desired_packed_headers, attr.value);
+        }
+        ctx->va_packed_headers = ctx->desired_packed_headers & attr.value;
+    }
+    if (ctx->va_packed_headers) {
+        ctx->config_attributes[ctx->nb_config_attributes++] =
+            (VAConfigAttrib) {
+            .type  = VAConfigAttribEncPackedHeaders,
+            .value = ctx->va_packed_headers,
+        };
+    }
+    if ( (ctx->desired_packed_headers & VA_ENC_PACKED_HEADER_SEQUENCE) &&
+        !(ctx->va_packed_headers      & VA_ENC_PACKED_HEADER_SEQUENCE) &&
+         (avctx->flags & AV_CODEC_FLAG_GLOBAL_HEADER)) {
+        av_log(avctx, AV_LOG_WARNING, "Driver does not support packed "
+               "sequence headers, but a global header is requested.\n");
+        av_log(avctx, AV_LOG_WARNING, "No global header will be written: "
+               "this may result in a stream which is not usable for some "
+               "purposes (e.g. not muxable to some containers).\n");
+    }
+    return 0;
+}
 static av_cold int vaapi_encode_init_quality(AVCodecContext *avctx)
 {
 #if VA_CHECK_VERSION(0, 36, 0)
     if (err < 0)
         goto fail;
-    err = vaapi_encode_config_attributes(avctx);
+    err = vaapi_encode_init_packed_headers(avctx);
     if (err < 0)
         goto fail;
     ctx->issue_mode = ISSUE_MODE_MAXIMISE_THROUGHPUT;
     if (ctx->va_packed_headers & VA_ENC_PACKED_HEADER_SEQUENCE &&
-        ctx->codec->write_sequence_header) {
+        ctx->codec->write_sequence_header &&
+        avctx->flags & AV_CODEC_FLAG_GLOBAL_HEADER) {
         char data[MAX_PARAM_BUFFER_SIZE];
         size_t bit_len = 8 * sizeof(data);

libavcodec/vaapi_encode.h+4−3

     // Use low power encoding mode.
     int             low_power;
-    // Supported packed headers (initially the desired set, modified
+    // Desired packed headers.
-    // later to what is actually supported).
+    unsigned int    desired_packed_headers;
-    unsigned int    va_packed_headers;
     // The required size of surfaces.  This is probably the input
     // size (AVCodecContext.width|height) aligned up to whatever
     unsigned int    va_rc_mode;
     // Bitrate for codec-specific encoder parameters.
     unsigned int    va_bit_rate;
+    // Packed headers which will actually be sent.
+    unsigned int    va_packed_headers;
     // Configuration attributes to use when creating va_config.
     VAConfigAttrib  config_attributes[MAX_CONFIG_ATTRIBUTES];

libavcodec/vaapi_encode_h264.c+1−1

@@ -930,7 +930,7 @@ static av_cold int vaapi_encode_h264_init(AVCodecContext *avctx) · 929 unmodified lines
930	return AVERROR_PATCHWELCOME;	930	return AVERROR_PATCHWELCOME;
931	}	931	}
932		932
933	ctx->va_packed_headers =	933	ctx->desired_packed_headers =
934	VA_ENC_PACKED_HEADER_SEQUENCE \| // SPS and PPS.	934	VA_ENC_PACKED_HEADER_SEQUENCE \| // SPS and PPS.
935	VA_ENC_PACKED_HEADER_SLICE \| // Slice headers.	935	VA_ENC_PACKED_HEADER_SLICE \| // Slice headers.
936	VA_ENC_PACKED_HEADER_MISC; // SEI.	936	VA_ENC_PACKED_HEADER_MISC; // SEI.

libavcodec/vaapi_encode_h265.c+1−1

@@ -1064,7 +1064,7 @@ static av_cold int vaapi_encode_h265_init(AVCodecContext *avctx) · 1063 unmodified lines
1064	if (avctx->level == FF_LEVEL_UNKNOWN)	1064	if (avctx->level == FF_LEVEL_UNKNOWN)
1065	avctx->level = priv->level;	1065	avctx->level = priv->level;
1066		1066
1067	ctx->va_packed_headers =	1067	ctx->desired_packed_headers =
1068	VA_ENC_PACKED_HEADER_SEQUENCE \| // VPS, SPS and PPS.	1068	VA_ENC_PACKED_HEADER_SEQUENCE \| // VPS, SPS and PPS.
1069	VA_ENC_PACKED_HEADER_SLICE \| // Slice headers.	1069	VA_ENC_PACKED_HEADER_SLICE \| // Slice headers.
1070	VA_ENC_PACKED_HEADER_MISC; // SEI	1070	VA_ENC_PACKED_HEADER_MISC; // SEI

libavcodec/vaapi_encode_mjpeg.c+1−1

@@ -389,7 +389,7 @@ static av_cold int vaapi_encode_mjpeg_init(AVCodecContext *avctx) · 388 unmodified lines
389	ctx->codec = &vaapi_encode_type_mjpeg;	389	ctx->codec = &vaapi_encode_type_mjpeg;
390		390
391	// The JPEG image header - see note above.	391	// The JPEG image header - see note above.
392	ctx->va_packed_headers =	392	ctx->desired_packed_headers =
393	VA_ENC_PACKED_HEADER_RAW_DATA;	393	VA_ENC_PACKED_HEADER_RAW_DATA;
394		394
395	ctx->surface_width = FFALIGN(avctx->width, 8);	395	ctx->surface_width = FFALIGN(avctx->width, 8);

libavcodec/vaapi_encode_mpeg2.c+2−2

@@ -615,8 +615,8 @@ static av_cold int vaapi_encode_mpeg2_init(AVCodecContext *avctx) · 614 unmodified lines
615	return AVERROR(EINVAL);	615	return AVERROR(EINVAL);
616	}	616	}
617		617
618	ctx->va_packed_headers = VA_ENC_PACKED_HEADER_SEQUENCE \|	618	ctx->desired_packed_headers = VA_ENC_PACKED_HEADER_SEQUENCE \|
619	VA_ENC_PACKED_HEADER_PICTURE;	619	VA_ENC_PACKED_HEADER_PICTURE;
620		620
621	ctx->surface_width = FFALIGN(avctx->width, 16);	621	ctx->surface_width = FFALIGN(avctx->width, 16);
622	ctx->surface_height = FFALIGN(avctx->height, 16);	622	ctx->surface_height = FFALIGN(avctx->height, 16);

libavcodec/vaapi_encode_vp8.c+4−2

@@ -200,8 +200,10 @@ static av_cold int vaapi_encode_vp8_init(AVCodecContext *avctx) · 199 unmodified lines
200		200
201	ctx->codec = &vaapi_encode_type_vp8;	201	ctx->codec = &vaapi_encode_type_vp8;
202		202
203	// Packed headers are not currently supported.	203	// No packed headers are currently desired. VP8 has no metadata
204	ctx->va_packed_headers = 0;	204	// which would be useful to write, and no existing driver supports
		205	// adding them anyway.
		206	ctx->desired_packed_headers = 0;
205		207
206	ctx->surface_width = FFALIGN(avctx->width, 16);	208	ctx->surface_width = FFALIGN(avctx->width, 16);
207	ctx->surface_height = FFALIGN(avctx->height, 16);	209	ctx->surface_height = FFALIGN(avctx->height, 16);

libavcodec/vaapi_encode_vp9.c+4−2

@@ -228,8 +228,10 @@ static av_cold int vaapi_encode_vp9_init(AVCodecContext *avctx) · 227 unmodified lines
228		228
229	ctx->codec = &vaapi_encode_type_vp9;	229	ctx->codec = &vaapi_encode_type_vp9;
230		230
231	// Packed headers are not currently supported.	231	// No packed headers are currently desired. They could be written,
232	ctx->va_packed_headers = 0;	232	// but there isn't any reason to do so - the one usable driver (i965)
		233	// can write its own headers and there is no metadata to include.
		234	ctx->desired_packed_headers = 0;
233		235
234	// Surfaces must be aligned to superblock boundaries.	236	// Surfaces must be aligned to superblock boundaries.
235	ctx->surface_width = FFALIGN(avctx->width, 64);	237	ctx->surface_width = FFALIGN(avctx->width, 64);

vaapi_encode: Clean up the packed header configuration

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code