Fix C++11 build
Use make_tuple instead of copy-list-initialization to prevent this error:
av1/reference_manager.cc:254:10:
error: chosen constructor is explicit in copy-initialization
return { abs(cur_frame.layer_depth - ref_frame.layer_depth),
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/usr/lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple:479:19:
note: explicit constructor declared here
constexpr tuple(_UElements&&... __elements)
Change-Id: I083cd0bd6ed251f25e8e3d47d9f6bec48d7ad969
diff --git a/av1/reference_manager.cc b/av1/reference_manager.cc
index 0ed524a..74f0747 100644
--- a/av1/reference_manager.cc
+++ b/av1/reference_manager.cc
@@ -251,13 +251,13 @@
// be used to pick the primary reference frame for probability model
static PrimaryRefKey get_primary_ref_key(const GopFrame &cur_frame,
const GopFrame &ref_frame) {
- return { abs(cur_frame.layer_depth - ref_frame.layer_depth),
- cur_frame.is_key_frame != ref_frame.is_key_frame,
- cur_frame.is_golden_frame != ref_frame.is_golden_frame,
- cur_frame.is_arf_frame != ref_frame.is_arf_frame,
- cur_frame.is_show_frame != ref_frame.is_show_frame,
- cur_frame.encode_ref_mode != ref_frame.encode_ref_mode,
- abs(cur_frame.order_idx - ref_frame.order_idx) };
+ return std::make_tuple(abs(cur_frame.layer_depth - ref_frame.layer_depth),
+ cur_frame.is_key_frame != ref_frame.is_key_frame,
+ cur_frame.is_golden_frame != ref_frame.is_golden_frame,
+ cur_frame.is_arf_frame != ref_frame.is_arf_frame,
+ cur_frame.is_show_frame != ref_frame.is_show_frame,
+ cur_frame.encode_ref_mode != ref_frame.encode_ref_mode,
+ abs(cur_frame.order_idx - ref_frame.order_idx));
}
// Pick primary_ref_idx for probability model.
