Skip to content

Commit 54b1241

Browse files
Add software h265 codecs
1 parent 55ac785 commit 54b1241

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

src/zm_ffmpeg.cpp

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,13 @@ static CodecData dec_codecs[] = {
5858
{ AV_CODEC_ID_H264, "h264", "h264", AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV420P, AV_HWDEVICE_TYPE_NONE, nullptr, nullptr },
5959
{ AV_CODEC_ID_H264, "h264", "h264_v4l2m2m", AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV420P, AV_HWDEVICE_TYPE_NONE, nullptr, nullptr },
6060
{ AV_CODEC_ID_H264, "h264", "h264_qsv", AV_PIX_FMT_YUV420P, AV_PIX_FMT_QSV, AV_HWDEVICE_TYPE_QSV, nullptr, nullptr },
61+
62+
{ AV_CODEC_ID_H265, "h265", "hevc", AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV420P, AV_HWDEVICE_TYPE_NONE, nullptr, nullptr },
63+
{ AV_CODEC_ID_H265, "h265", "hevc_v4l2m2m", AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV420P, AV_HWDEVICE_TYPE_NONE, nullptr, nullptr },
64+
{ AV_CODEC_ID_H265, "h265", "hevc_vaapi", AV_PIX_FMT_NV12, AV_PIX_FMT_VAAPI, AV_HWDEVICE_TYPE_VAAPI, nullptr, nullptr },
65+
{ AV_CODEC_ID_H265, "h265", "hevc_qsv", AV_PIX_FMT_YUV420P, AV_PIX_FMT_QSV, AV_HWDEVICE_TYPE_QSV, nullptr, nullptr },
66+
{ AV_CODEC_ID_H265, "h265", "hevc_cuvid", AV_PIX_FMT_NV12, AV_PIX_FMT_NV12, AV_HWDEVICE_TYPE_NONE, nullptr, nullptr },
67+
{ AV_CODEC_ID_H265, "h265", "libx265", AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV420P, AV_HWDEVICE_TYPE_NONE, nullptr, nullptr },
6168
};
6269

6370
static CodecData enc_codecs[] = {
@@ -146,7 +153,7 @@ std::list<const CodecData*> get_decoder_data(int wanted_codec, const std::string
146153
}
147154
}
148155
if (wanted_codec and (chosen_codec_data->codec_id != wanted_codec)) {
149-
Debug(1, "Not the right codec id %d %s != %d %s for %s",
156+
Debug(1, "Not the right codec id %d %s != wanted %d %s for %s",
150157
chosen_codec_data->codec_id,
151158
avcodec_get_name(chosen_codec_data->codec_id),
152159
wanted_codec,

0 commit comments

Comments
 (0)