Commit 08a3f96f authored by Johannes Sauer's avatar Johannes Sauer

fixed macro for emt flag in block statistics

parent f291ade5
......@@ -62,7 +62,7 @@ enum class BlockStatistic {
QP,
SplitSeries,
TransQuantBypassFlag,
#if JVET_K1000_SIMPLIFIED_EMT
#if JEM_TOOLS || JVET_K1000_SIMPLIFIED_EMT
EMTFlag,
#endif
TransformSkipFlag_Y,
......@@ -137,7 +137,7 @@ enum class BlockStatistic {
QP_Chroma,
SplitSeries_Chroma,
TransQuantBypassFlag_Chroma,
#if JEM_TOOLS
#if JEM_TOOLS || JVET_K1000_SIMPLIFIED_EMT
EMTFlag_Chroma, // this is called flag, though the type is UChar ?!
#endif
......@@ -209,7 +209,7 @@ static const std::map<BlockStatistic, std::tuple<std::string, BlockStatisticType
{ BlockStatistic::AffineType, std::tuple<std::string, BlockStatisticType, std::string>{"AffineType", BlockStatisticType::Flag, ""} },
#endif
#endif
#if JVET_K1000_SIMPLIFIED_EMT
#if JEM_TOOLS || JVET_K1000_SIMPLIFIED_EMT
{ BlockStatistic::EMTFlag, std::tuple<std::string, BlockStatisticType, std::string>{"EMTFlag", BlockStatisticType::Flag, ""}},
#endif
#if JEM_TOOLS
......@@ -240,7 +240,7 @@ static const std::map<BlockStatistic, std::tuple<std::string, BlockStatisticType
{ BlockStatistic::QP_Chroma, std::tuple<std::string, BlockStatisticType, std::string>{"QP_Chroma", BlockStatisticType::Integer, "[0, 51]"}},
{ BlockStatistic::SplitSeries_Chroma, std::tuple<std::string, BlockStatisticType, std::string>{"SplitSeries_Chroma", BlockStatisticType::Integer, "[0, " + std::to_string(std::numeric_limits<SplitSeries>::max()) + "]"}},
{ BlockStatistic::TransQuantBypassFlag_Chroma, std::tuple<std::string, BlockStatisticType, std::string>{"TransQuantBypassFlag_Chroma", BlockStatisticType::Flag, ""}},
#if JEM_TOOLS
#if JEM_TOOLS || JVET_K1000_SIMPLIFIED_EMT
{ BlockStatistic::EMTFlag_Chroma, std::tuple<std::string, BlockStatisticType, std::string>{"EMTFlag_Chroma", BlockStatisticType::Integer, "[0, 10]"}}, // todo: actual limits?
#endif
{ BlockStatistic::IPCM_Chroma, std::tuple<std::string, BlockStatisticType, std::string>{"IPCM_Chroma", BlockStatisticType::Flag, ""}},
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment