From 6c5a1a88da2911b0d89abf70e3e9650397a54581 Mon Sep 17 00:00:00 2001 From: Pierre Lespagnol <pierre.lespagnol@savoirfairelinux.com> Date: Mon, 10 Feb 2020 17:18:18 -0500 Subject: [PATCH] Revert "media/codec: disable temporarily HEVC/H265" This reverts commit ebd77cf1fbd62d01a3f188a420f1c906d4813d9b. Change-Id: Id37a7263cb3b1a2c307e08cd20b9043ee7bf4a15 --- src/media/system_codec_container.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/media/system_codec_container.cpp b/src/media/system_codec_container.cpp index 34ec9c6c55..fbd46db196 100644 --- a/src/media/system_codec_container.cpp +++ b/src/media/system_codec_container.cpp @@ -61,12 +61,12 @@ SystemCodecContainer::initCodecConfig() availableCodecList_ = { #ifdef ENABLE_VIDEO /* Define supported video codec*/ - // std::make_shared<SystemVideoCodecInfo>(AV_CODEC_ID_HEVC, AV_CODEC_ID_HEVC, - // "H265", "", - // CODEC_ENCODER_DECODER, - // defaultBitrate, - // minH265, - // maxH265), + std::make_shared<SystemVideoCodecInfo>(AV_CODEC_ID_HEVC, AV_CODEC_ID_HEVC, + "H265", "", + CODEC_ENCODER_DECODER, + defaultBitrate, + minH265, + maxH265), std::make_shared<SystemVideoCodecInfo>(AV_CODEC_ID_H264, AV_CODEC_ID_H264, "H264", "libx264", @@ -131,7 +131,7 @@ SystemCodecContainer::initCodecConfig() CODEC_ENCODER_DECODER, 64, 8000, 1, 0), }; - // setActiveH265(); + setActiveH265(); checkInstalledCodecs(); } -- GitLab