virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

lavc/videotoolboxenc: add require_sw option to force software encoding.

Browse Source 
Signed-off-by: Rick Kern <kernrj@gmail.com>
This commit is contained in:
Rick Kern 2019-05-12 16:01:50 -04:00 committed by Rick Kern
parent bd6942b4c0
commit 247bda442f
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavcodec/videotoolboxenc.c
View File

@ -210,6 +210,7 @@ typedef struct VTEncContext {
int64_t frames_after; int64_t frames_after;
int64_t allow_sw; int64_t allow_sw;
int64_t require_sw;
bool flushing; bool flushing;
bool has_b_frames; bool has_b_frames;
@ -1314,7 +1315,11 @@ static int vtenc_configure_encoder(AVCodecContext *avctx)
if (!enc_info) return AVERROR(ENOMEM); if (!enc_info) return AVERROR(ENOMEM);
#if !TARGET_OS_IPHONE #if !TARGET_OS_IPHONE
if (!vtctx->allow_sw) { if(vtctx->require_sw) {
CFDictionarySetValue(enc_info,
compat_keys.kVTVideoEncoderSpecification_EnableHardwareAcceleratedVideoEncoder,
kCFBooleanFalse);
} else if (!vtctx->allow_sw) {
CFDictionarySetValue(enc_info, CFDictionarySetValue(enc_info,
compat_keys.kVTVideoEncoderSpecification_RequireHardwareAcceleratedVideoEncoder, compat_keys.kVTVideoEncoderSpecification_RequireHardwareAcceleratedVideoEncoder,
kCFBooleanTrue); kCFBooleanTrue);
@ -2543,6 +2548,8 @@ static const enum AVPixelFormat pix_fmts[] = {
#define COMMON_OPTIONS \ #define COMMON_OPTIONS \
{ "allow_sw", "Allow software encoding", OFFSET(allow_sw), AV_OPT_TYPE_BOOL, \ { "allow_sw", "Allow software encoding", OFFSET(allow_sw), AV_OPT_TYPE_BOOL, \
{ .i64 = 0 }, 0, 1, VE }, \ { .i64 = 0 }, 0, 1, VE }, \
{ "require_sw", "Require software encoding", OFFSET(require_sw), AV_OPT_TYPE_BOOL, \
{ .i64 = 0 }, 0, 1, VE }, \
{ "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.", \ { "frames_before", "Other frames will come before the frames in this session. This helps smooth concatenation issues.", \