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

lavc/videotoolboxenc: add concatentation properties

Browse Source 
Add frames_before and frames_after as hints that there will be frames before
or after the frames produced in this session. This may help with
concatenation issues like bit rate spikes.

Signed-off-by: Rick Kern <kernrj@gmail.com>
This commit is contained in:
Rick Kern 2016-04-27 10:53:12 -04:00 committed by wm4
parent ca429e7253
commit 4b806081b2
1 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
libavcodec/videotoolboxenc.c
View File

@ -77,6 +77,8 @@ typedef struct VTEncContext {
int64_t level; int64_t level;
int64_t entropy; int64_t entropy;
int64_t realtime; int64_t realtime;
int64_t frames_before;
int64_t frames_after;
int64_t allow_sw; int64_t allow_sw;
@ -722,6 +724,30 @@ static av_cold int vtenc_init(AVCodecContext *avctx)
} }
} }
if (vtctx->frames_before) {
status = VTSessionSetProperty(vtctx->session,
kVTCompressionPropertyKey_MoreFramesBeforeStart,
kCFBooleanTrue);
if (status == kVTPropertyNotSupportedErr) {
av_log(avctx, AV_LOG_WARNING, "frames_before property is not supported on this device. Ignoring.\n");
} else if (status) {
av_log(avctx, AV_LOG_ERROR, "Error setting frames_before property: %d\n", status);
}
}
if (vtctx->frames_after) {
status = VTSessionSetProperty(vtctx->session,
kVTCompressionPropertyKey_MoreFramesAfterEnd,
kCFBooleanTrue);
if (status == kVTPropertyNotSupportedErr) {
av_log(avctx, AV_LOG_WARNING, "frames_after property is not supported on this device. Ignoring.\n");
} else if (status) {
av_log(avctx, AV_LOG_ERROR, "Error setting frames_after property: %d\n", status);
}
}
if (!vtctx->has_b_frames) { if (!vtctx->has_b_frames) {
status = VTSessionSetProperty(vtctx->session, status = VTSessionSetProperty(vtctx->session,
kVTCompressionPropertyKey_AllowFrameReordering, kVTCompressionPropertyKey_AllowFrameReordering,
@ -1534,6 +1560,11 @@ static const AVOption options[] = {
{ "realtime", "Hint that encoding should happen in real-time if not faster (e.g. capturing from camera).", { "realtime", "Hint that encoding should happen in real-time if not faster (e.g. capturing from camera).",
OFFSET(realtime), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE }, OFFSET(realtime), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE },
{ "frames_before", "Other frames will come before the frames in this session. This helps smooth concatenation issues.",
OFFSET(frames_before), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE },
{ "frames_after", "Other frames will come after the frames in this session. This helps smooth concatenation issues.",
OFFSET(frames_after), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE },
{ NULL }, { NULL },
}; };