RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-16 12:24:52 +00:00
Code Issues Projects Releases Wiki Activity

Merge commit '02fa1ad9266f9b1ea11565ac2f93f45853e351e8'

Browse Source 
* commit '02fa1ad9266f9b1ea11565ac2f93f45853e351e8':
  vaapi_h264: Add source version identifier as unregistered SEI

Merged-by: Clément Bœsch <clement@stupeflix.com>
This commit is contained in:
Clément Bœsch 2016-06-29 12:03:40 +02:00
commit 4b90413cb2
1 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
libavcodec/vaapi_encode_h264.c
View File

@ -606,6 +606,30 @@ static void vaapi_encode_h264_write_pic_timing(PutBitContext *pbc,
} }
} }
static void vaapi_encode_h264_write_identifier(PutBitContext *pbc,
VAAPIEncodeContext *ctx,
VAAPIEncodePicture *pic)
{
const char *lavc = LIBAVCODEC_IDENT;
const char *vaapi = VA_VERSION_S;
const char *driver = vaQueryVendorString(ctx->hwctx->display);
char tmp[256];
int i;
// Random (version 4) ISO 11578 UUID.
uint8_t uuid[16] = {
0x59, 0x94, 0x8b, 0x28, 0x11, 0xec, 0x45, 0xaf,
0x96, 0x75, 0x19, 0xd4, 0x1f, 0xea, 0xa9, 0x4d,
};
for (i = 0; i < 16; i++)
u(8, uuid[i], uuid_iso_iec_11578);
snprintf(tmp, sizeof(tmp), "%s / VAAPI %s / %s", lavc, vaapi, driver);
for (i = 0; i < sizeof(tmp) && tmp[i]; i++)
u(8, tmp[i], user_data_payload_byte);
}
static void vaapi_encode_h264_write_sei(PutBitContext *pbc, static void vaapi_encode_h264_write_sei(PutBitContext *pbc,
VAAPIEncodeContext *ctx, VAAPIEncodeContext *ctx,
VAAPIEncodePicture *pic) VAAPIEncodePicture *pic)
@ -633,6 +657,11 @@ static void vaapi_encode_h264_write_sei(PutBitContext *pbc,
continue; continue;
write_payload = &vaapi_encode_h264_write_pic_timing; write_payload = &vaapi_encode_h264_write_pic_timing;
break; break;
case SEI_TYPE_USER_DATA_UNREGISTERED:
if (pic->encode_order != 0)
continue;
write_payload = &vaapi_encode_h264_write_identifier;
break;
default: default:
continue; continue;
} }