Skip to content
Snippets Groups Projects
Commit 6c5a1a88 authored by Pierre Lespagnol's avatar Pierre Lespagnol
Browse files

Revert "media/codec: disable temporarily HEVC/H265"

This reverts commit ebd77cf1.

Change-Id: Id37a7263cb3b1a2c307e08cd20b9043ee7bf4a15
parent 5f884851
Branches
Tags
No related merge requests found
...@@ -61,12 +61,12 @@ SystemCodecContainer::initCodecConfig() ...@@ -61,12 +61,12 @@ SystemCodecContainer::initCodecConfig()
availableCodecList_ = { availableCodecList_ = {
#ifdef ENABLE_VIDEO #ifdef ENABLE_VIDEO
/* Define supported video codec*/ /* Define supported video codec*/
// std::make_shared<SystemVideoCodecInfo>(AV_CODEC_ID_HEVC, AV_CODEC_ID_HEVC, std::make_shared<SystemVideoCodecInfo>(AV_CODEC_ID_HEVC, AV_CODEC_ID_HEVC,
// "H265", "", "H265", "",
// CODEC_ENCODER_DECODER, CODEC_ENCODER_DECODER,
// defaultBitrate, defaultBitrate,
// minH265, minH265,
// maxH265), maxH265),
std::make_shared<SystemVideoCodecInfo>(AV_CODEC_ID_H264, AV_CODEC_ID_H264, std::make_shared<SystemVideoCodecInfo>(AV_CODEC_ID_H264, AV_CODEC_ID_H264,
"H264", "libx264", "H264", "libx264",
...@@ -131,7 +131,7 @@ SystemCodecContainer::initCodecConfig() ...@@ -131,7 +131,7 @@ SystemCodecContainer::initCodecConfig()
CODEC_ENCODER_DECODER, CODEC_ENCODER_DECODER,
64, 8000, 1, 0), 64, 8000, 1, 0),
}; };
// setActiveH265(); setActiveH265();
checkInstalledCodecs(); checkInstalledCodecs();
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment