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

Merge commit 'deefca02c275ce4bc5ccbee690463ffef81a18b8' 

* commit 'deefca02c275ce4bc5ccbee690463ffef81a18b8':
  qsvenc: add the Access Unit Delimiter NAL Unit support

Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2018-03-29 20:34:43 -03:00
parent 20608261f7 deefca02c2
commit b065c71e9d
3 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libavcodec/qsvenc.c
View File

@ -595,6 +595,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
if (q->recovery_point_sei >= 0)
q->extco.RecoveryPointSEI = q->recovery_point_sei ? MFX_CODINGOPTION_ON : MFX_CODINGOPTION_OFF;
q->extco.MaxDecFrameBuffering = q->max_dec_frame_buffering;
q->extco.AUDelimiter = q->aud ? MFX_CODINGOPTION_ON : MFX_CODINGOPTION_OFF;
}
q->extparam_internal[q->nb_extparam_internal++] = (mfxExtBuffer *)&q->extco;

2
libavcodec/qsvenc.h
View File

@ -138,6 +138,8 @@ typedef struct QSVEncContext {
int max_frame_size;
int max_slice_size;
int aud;
int single_sei_nal_unit;
int max_dec_frame_buffering;
int trellis;

3
libavcodec/qsvenc_h264.c
View File

@ -142,6 +142,9 @@ static const AVOption options[] = {
{ "high" , NULL, 0, AV_OPT_TYPE_CONST, { .i64 = MFX_PROFILE_AVC_HIGH }, INT_MIN, INT_MAX, VE, "profile" },
{ "a53cc" , "Use A53 Closed Captions (if available)", OFFSET(qsv.a53_cc), AV_OPT_TYPE_INT, {.i64 = 1}, 0, 1, VE},
{ "aud", "Insert the Access Unit Delimiter NAL", OFFSET(qsv.aud), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, VE},
{ NULL },
};