virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-04-14 00:58:38 +02:00
Code Issues Releases Activity

avcodec/nvenc: Rename nvenc_h265 to nvenc_hevc

Browse Source 
For the sake of compatibility, and because pretty much everything else in the
codebase calls it HEVC.

Signed-off-by: Philip Langdale <philipl@overt.org>
This commit is contained in:
Philip Langdale 2015-06-06 11:00:45 -07:00
parent c10e6bcb43
commit e79c40fe72
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Changelog
View File

@ -8,7 +8,7 @@ version <next>:
- showwavespic filter - showwavespic filter
- DTS decoding through libdcadec - DTS decoding through libdcadec
- Drop support for nvenc API before 5.0 - Drop support for nvenc API before 5.0
- nvenc H265 encoder - nvenc HEVC encoder
- Detelecine filter - Detelecine filter
- Intel QSV-accelerated H.264 encoding - Intel QSV-accelerated H.264 encoding
- MMAL-accelerated H.264 decoding - MMAL-accelerated H.264 decoding

2
configure vendored
View File

@ -2485,7 +2485,7 @@ libutvideo_decoder_deps="libutvideo"
libutvideo_encoder_deps="libutvideo" libutvideo_encoder_deps="libutvideo"
libzvbi_teletext_decoder_deps="libzvbi" libzvbi_teletext_decoder_deps="libzvbi"
nvenc_encoder_deps="nvenc" nvenc_encoder_deps="nvenc"
nvenc_h265_encoder_deps="nvenc" nvenc_hevc_encoder_deps="nvenc"
# demuxers / muxers # demuxers / muxers
ac3_demuxer_select="ac3_parser" ac3_demuxer_select="ac3_parser"

2
libavcodec/allcodecs.c
View File

@ -236,7 +236,7 @@ void avcodec_register_all(void)
REGISTER_DECODER(MXPEG, mxpeg); REGISTER_DECODER(MXPEG, mxpeg);
REGISTER_DECODER(NUV, nuv); REGISTER_DECODER(NUV, nuv);
REGISTER_ENCODER(NVENC, nvenc); REGISTER_ENCODER(NVENC, nvenc);
REGISTER_ENCODER(NVENC_H265, nvenc_h265); REGISTER_ENCODER(NVENC_HEVC, nvenc_hevc);
REGISTER_DECODER(PAF_VIDEO, paf_video); REGISTER_DECODER(PAF_VIDEO, paf_video);
REGISTER_ENCDEC (PAM, pam); REGISTER_ENCDEC (PAM, pam);
REGISTER_ENCDEC (PBM, pbm); REGISTER_ENCDEC (PBM, pbm);

18
libavcodec/nvenc.c
View File

@ -192,7 +192,7 @@ static const NvencValuePair nvenc_h264_level_pairs[] = {
{ NULL } { NULL }
}; };
static const NvencValuePair nvenc_h265_level_pairs[] = { static const NvencValuePair nvenc_hevc_level_pairs[] = {
{ "auto", NV_ENC_LEVEL_AUTOSELECT }, { "auto", NV_ENC_LEVEL_AUTOSELECT },
{ "1" , NV_ENC_LEVEL_HEVC_1 }, { "1" , NV_ENC_LEVEL_HEVC_1 },
{ "1.0" , NV_ENC_LEVEL_HEVC_1 }, { "1.0" , NV_ENC_LEVEL_HEVC_1 },
@ -870,7 +870,7 @@ static av_cold int nvenc_encode_init(AVCodecContext *avctx)
avctx->profile = FF_PROFILE_HEVC_MAIN; avctx->profile = FF_PROFILE_HEVC_MAIN;
if (ctx->level) { if (ctx->level) {
res = input_string_to_uint32(avctx, nvenc_h265_level_pairs, ctx->level, &ctx->encode_config.encodeCodecConfig.hevcConfig.level); res = input_string_to_uint32(avctx, nvenc_hevc_level_pairs, ctx->level, &ctx->encode_config.encodeCodecConfig.hevcConfig.level);
if (res) { if (res) {
av_log(avctx, AV_LOG_FATAL, "Level \"%s\" is unknown! Supported levels: auto, 1, 2, 2.1, 3, 3.1, 4, 4.1, 5, 5.1, 5.2, 6, 6.1, 6.2\n", ctx->level); av_log(avctx, AV_LOG_FATAL, "Level \"%s\" is unknown! Supported levels: auto, 1, 2, 2.1, 3, 3.1, 4, 4.1, 5, 5.1, 5.2, 6, 6.1, 6.2\n", ctx->level);
@ -1427,17 +1427,17 @@ AVCodec ff_nvenc_encoder = {
}; };
#endif #endif
#if CONFIG_NVENC_H265_ENCODER #if CONFIG_NVENC_HEVC_ENCODER
static const AVClass nvenc_h265_class = { static const AVClass nvenc_hevc_class = {
.class_name = "nvenc_h265", .class_name = "nvenc_hevc",
.item_name = av_default_item_name, .item_name = av_default_item_name,
.option = options, .option = options,
.version = LIBAVUTIL_VERSION_INT, .version = LIBAVUTIL_VERSION_INT,
}; };
AVCodec ff_nvenc_h265_encoder = { AVCodec ff_nvenc_hevc_encoder = {
.name = "nvenc_h265", .name = "nvenc_hevc",
.long_name = NULL_IF_CONFIG_SMALL("Nvidia NVENC h265 encoder"), .long_name = NULL_IF_CONFIG_SMALL("Nvidia NVENC hevc encoder"),
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_H265, .id = AV_CODEC_ID_H265,
.priv_data_size = sizeof(NvencContext), .priv_data_size = sizeof(NvencContext),
@ -1445,7 +1445,7 @@ AVCodec ff_nvenc_h265_encoder = {
.encode2 = nvenc_encode_frame, .encode2 = nvenc_encode_frame,
.close = nvenc_encode_close, .close = nvenc_encode_close,
.capabilities = CODEC_CAP_DELAY, .capabilities = CODEC_CAP_DELAY,
.priv_class = &nvenc_h265_class, .priv_class = &nvenc_hevc_class,
.defaults = nvenc_defaults, .defaults = nvenc_defaults,
.pix_fmts = pix_fmts_nvenc, .pix_fmts = pix_fmts_nvenc,
}; };