highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lavc/videotoolboxenc: Fix AVCodecContext.has_b_frames usage.

Browse Source 
Now set by the encoder, not used as an input parameter.

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

15
libavcodec/videotoolboxenc.c
View File

@ -598,6 +598,7 @@ static av_cold int vtenc_init(AVCodecContext *avctx)
CFStringRef profile_level; CFStringRef profile_level;
SInt32 bit_rate = avctx->bit_rate; SInt32 bit_rate = avctx->bit_rate;
CFNumberRef bit_rate_num; CFNumberRef bit_rate_num;
CFBooleanRef has_b_frames_cfbool;
int status; int status;
codec_type = get_cm_codec_type(avctx->codec_id); codec_type = get_cm_codec_type(avctx->codec_id);
@ -606,7 +607,7 @@ static av_cold int vtenc_init(AVCodecContext *avctx)
return AVERROR(EINVAL); return AVERROR(EINVAL);
} }
vtctx->has_b_frames = avctx->has_b_frames || avctx->max_b_frames > 0; vtctx->has_b_frames = avctx->max_b_frames > 0;
if(vtctx->has_b_frames && vtctx->profile == H264_PROF_BASELINE){ if(vtctx->has_b_frames && vtctx->profile == H264_PROF_BASELINE){
av_log(avctx, AV_LOG_WARNING, "Cannot use B-frames with baseline profile. Output will not contain B-frames.\n"); av_log(avctx, AV_LOG_WARNING, "Cannot use B-frames with baseline profile. Output will not contain B-frames.\n");
vtctx->has_b_frames = false; vtctx->has_b_frames = false;
@ -751,6 +752,18 @@ static av_cold int vtenc_init(AVCodecContext *avctx)
pthread_cond_init(&vtctx->cv_sample_sent, NULL); pthread_cond_init(&vtctx->cv_sample_sent, NULL);
vtctx->dts_delta = vtctx->has_b_frames ? -1 : 0; vtctx->dts_delta = vtctx->has_b_frames ? -1 : 0;
status = VTSessionCopyProperty(vtctx->session,
kVTCompressionPropertyKey_AllowFrameReordering,
kCFAllocatorDefault,
&has_b_frames_cfbool);
if (!status) {
//Some devices don't output B-frames for main profile, even if requested.
vtctx->has_b_frames = CFBooleanGetValue(has_b_frames_cfbool);
CFRelease(has_b_frames_cfbool);
}
avctx->has_b_frames = vtctx->has_b_frames;
return 0; return 0;
} }