aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorMark Thompson <sw@jkqxz.net>2016-10-02 08:48:34 +0100
committerMark Thompson <sw@jkqxz.net>2016-10-17 21:07:25 +0100
commit0cf86fabfa5820596cca2cfead63c6f8df76c3f2 (patch)
tree0790806aa81b546d2aa2b67c685e1faafed14abb /libavcodec
parentf9bb356e0eb38ab4df32df8276b71a0b2626538f (diff)
downloadffmpeg-0cf86fabfa5820596cca2cfead63c6f8df76c3f2.tar.gz
vaapi_encode: Write sequence header as extradata
Only works if packed headers are supported, where we can know the output before generating the first frame.
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/vaapi_encode.c22
-rw-r--r--libavcodec/vaapi_encode.h2
2 files changed, 24 insertions, 0 deletions
diff --git a/libavcodec/vaapi_encode.c b/libavcodec/vaapi_encode.c
index b600a00121..11e46eabe7 100644
--- a/libavcodec/vaapi_encode.c
+++ b/libavcodec/vaapi_encode.c
@@ -1399,6 +1399,28 @@ av_cold int ff_vaapi_encode_init(AVCodecContext *avctx)
// where it actually overlaps properly, though.)
ctx->issue_mode = ISSUE_MODE_MAXIMISE_THROUGHPUT;
+ if (ctx->va_packed_headers & VA_ENC_PACKED_HEADER_SEQUENCE &&
+ ctx->codec->write_sequence_header) {
+ char data[MAX_PARAM_BUFFER_SIZE];
+ size_t bit_len = 8 * sizeof(data);
+
+ err = ctx->codec->write_sequence_header(avctx, data, &bit_len);
+ if (err < 0) {
+ av_log(avctx, AV_LOG_ERROR, "Failed to write sequence header "
+ "for extradata: %d.\n", err);
+ goto fail;
+ } else {
+ avctx->extradata_size = (bit_len + 7) / 8;
+ avctx->extradata = av_mallocz(avctx->extradata_size +
+ AV_INPUT_BUFFER_PADDING_SIZE);
+ if (!avctx->extradata) {
+ err = AVERROR(ENOMEM);
+ goto fail;
+ }
+ memcpy(avctx->extradata, data, avctx->extradata_size);
+ }
+ }
+
return 0;
fail:
diff --git a/libavcodec/vaapi_encode.h b/libavcodec/vaapi_encode.h
index c47d979db2..a9ab527880 100644
--- a/libavcodec/vaapi_encode.h
+++ b/libavcodec/vaapi_encode.h
@@ -235,6 +235,8 @@ typedef struct VAAPIEncodeType {
int slice_header_type;
// Write the packed header data to the provided buffer.
+ // The sequence header is also used to fill the codec extradata
+ // when the encoder is starting.
int (*write_sequence_header)(AVCodecContext *avctx,
char *data, size_t *data_len);
int (*write_picture_header)(AVCodecContext *avctx,