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

libopenh264enc: Simplify init by setting FF_CODEC_CAP_INIT_CLEANUP 

Also set FF_CODEC_CAP_INIT_THREADSAFE while adding internal capabilities.

Signed-off-by: Martin Storsjö <martin@martin.st>
This commit is contained in:
Martin Storsjö 2016-07-14 22:24:55 +03:00
parent 2d097c16b8
commit 7a76371437
1 changed files with 8 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
libavcodec/libopenh264enc.c
View File

@ -100,8 +100,6 @@ static av_cold int svc_encode_init(AVCodecContext *avctx)
if ((err = ff_libopenh264_check_version(avctx)) < 0) if ((err = ff_libopenh264_check_version(avctx)) < 0)
return err; return err;
// Use a default error for multiple error paths below
err = AVERROR_UNKNOWN;
if (WelsCreateSVCEncoder(&s->encoder)) { if (WelsCreateSVCEncoder(&s->encoder)) {
av_log(avctx, AV_LOG_ERROR, "Unable to create encoder\n"); av_log(avctx, AV_LOG_ERROR, "Unable to create encoder\n");
@ -167,8 +165,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
av_log(avctx, AV_LOG_ERROR, av_log(avctx, AV_LOG_ERROR,
"Invalid combination -slices %d and -max_nal_size %d.\n", "Invalid combination -slices %d and -max_nal_size %d.\n",
avctx->slices, s->max_nal_size); avctx->slices, s->max_nal_size);
err = AVERROR(EINVAL); return AVERROR(EINVAL);
goto fail;
} }
if (avctx->slices > 1) if (avctx->slices > 1)
@ -196,14 +193,13 @@ FF_ENABLE_DEPRECATION_WARNINGS
} else { } else {
av_log(avctx, AV_LOG_ERROR, "Invalid -max_nal_size, " av_log(avctx, AV_LOG_ERROR, "Invalid -max_nal_size, "
"specify a valid max_nal_size to use -slice_mode dyn\n"); "specify a valid max_nal_size to use -slice_mode dyn\n");
err = AVERROR(EINVAL); return AVERROR(EINVAL);
goto fail;
} }
} }
if ((*s->encoder)->InitializeExt(s->encoder, &param) != cmResultSuccess) { if ((*s->encoder)->InitializeExt(s->encoder, &param) != cmResultSuccess) {
av_log(avctx, AV_LOG_ERROR, "Initialize failed\n"); av_log(avctx, AV_LOG_ERROR, "Initialize failed\n");
goto fail; return AVERROR_UNKNOWN;
} }
if (avctx->flags & AV_CODEC_FLAG_GLOBAL_HEADER) { if (avctx->flags & AV_CODEC_FLAG_GLOBAL_HEADER) {
@ -213,27 +209,19 @@ FF_ENABLE_DEPRECATION_WARNINGS
for (i = 0; i < fbi.sLayerInfo[0].iNalCount; i++) for (i = 0; i < fbi.sLayerInfo[0].iNalCount; i++)
size += fbi.sLayerInfo[0].pNalLengthInByte[i]; size += fbi.sLayerInfo[0].pNalLengthInByte[i];
avctx->extradata = av_mallocz(size + AV_INPUT_BUFFER_PADDING_SIZE); avctx->extradata = av_mallocz(size + AV_INPUT_BUFFER_PADDING_SIZE);
if (!avctx->extradata) { if (!avctx->extradata)
err = AVERROR(ENOMEM); return AVERROR(ENOMEM);
goto fail;
}
avctx->extradata_size = size; avctx->extradata_size = size;
memcpy(avctx->extradata, fbi.sLayerInfo[0].pBsBuf, size); memcpy(avctx->extradata, fbi.sLayerInfo[0].pBsBuf, size);
} }
props = ff_add_cpb_side_data(avctx); props = ff_add_cpb_side_data(avctx);
if (!props) { if (!props)
err = AVERROR(ENOMEM); return AVERROR(ENOMEM);
goto fail;
}
props->max_bitrate = param.iMaxBitrate; props->max_bitrate = param.iMaxBitrate;
props->avg_bitrate = param.iTargetBitrate; props->avg_bitrate = param.iTargetBitrate;
return 0; return 0;
fail:
svc_encode_close(avctx);
return err;
} }
static int svc_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, static int svc_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
@ -306,6 +294,7 @@ AVCodec ff_libopenh264_encoder = {
.encode2 = svc_encode_frame, .encode2 = svc_encode_frame,
.close = svc_encode_close, .close = svc_encode_close,
.capabilities = AV_CODEC_CAP_AUTO_THREADS, .capabilities = AV_CODEC_CAP_AUTO_THREADS,
.caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP,
.pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV420P, .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV420P,
AV_PIX_FMT_NONE }, AV_PIX_FMT_NONE },
.priv_class = &class, .priv_class = &class,