RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '19d7667a81499d4357ec8e0851701e17c238e584' 

* commit '19d7667a81499d4357ec8e0851701e17c238e584':
  vaapi_encode: Add support for writing arbitrary additional packed headers

Merged-by: Clément Bœsch <clement@stupeflix.com>
This commit is contained in:
Clément Bœsch 2016-06-29 12:03:20 +02:00
parent 3e71e34333 19d7667a81
commit 19fe328f12
2 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
libavcodec/vaapi_encode.c
View File

@ -293,6 +293,27 @@ static int vaapi_encode_issue(AVCodecContext *avctx,
} }
} }
if (ctx->codec->write_extra_header) {
for (i = 0;; i++) {
int type;
bit_len = 8 * sizeof(data);
err = ctx->codec->write_extra_header(avctx, pic, i, &type,
data, &bit_len);
if (err == AVERROR_EOF)
break;
if (err < 0) {
av_log(avctx, AV_LOG_ERROR, "Failed to write extra "
"header %d: %d.\n", i, err);
goto fail;
}
err = vaapi_encode_make_packed_header(avctx, pic, type,
data, bit_len);
if (err < 0)
goto fail;
}
}
av_assert0(pic->nb_slices <= MAX_PICTURE_SLICES); av_assert0(pic->nb_slices <= MAX_PICTURE_SLICES);
for (i = 0; i < pic->nb_slices; i++) { for (i = 0; i < pic->nb_slices; i++) {
slice = av_mallocz(sizeof(*slice)); slice = av_mallocz(sizeof(*slice));

4
libavcodec/vaapi_encode.h
View File

@ -215,6 +215,10 @@ typedef struct VAAPIEncodeType {
VAAPIEncodePicture *pic, VAAPIEncodePicture *pic,
int index, int *type, int index, int *type,
char *data, size_t *data_len); char *data, size_t *data_len);
int (*write_extra_header)(AVCodecContext *avctx,
VAAPIEncodePicture *pic,
int index, int *type,
char *data, size_t *data_len);
} VAAPIEncodeType; } VAAPIEncodeType;