diff options
| author | Carl Hetherington <cth@carlh.net> | 2022-09-27 00:56:15 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2022-09-27 13:46:16 +0200 |
| commit | 607b1b4d8061237e3c90368c73c58a172a69c950 (patch) | |
| tree | bc1b4861f587828480886989a90d41fecbd344c6 /src | |
| parent | 592fa9ba3913a37676260bd581398a6b49496677 (diff) | |
Use EnumIndexedVector in J2KEncoder.
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/j2k_encoder.cc | 4 | ||||
| -rw-r--r-- | src/lib/j2k_encoder.h | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/lib/j2k_encoder.cc b/src/lib/j2k_encoder.cc index e6dab5828..daba87c59 100644 --- a/src/lib/j2k_encoder.cc +++ b/src/lib/j2k_encoder.cc @@ -229,7 +229,7 @@ J2KEncoder::encode (shared_ptr<PlayerVideo> pv, DCPTime time) /* This frame already has J2K data, so just write it */ _writer->write (pv->j2k(), position, pv->eyes ()); frame_done (); - } else if (_last_player_video[static_cast<int>(pv->eyes())] && _writer->can_repeat(position) && pv->same (_last_player_video[static_cast<int>(pv->eyes())])) { + } else if (_last_player_video[pv->eyes()] && _writer->can_repeat(position) && pv->same(_last_player_video[pv->eyes()])) { LOG_DEBUG_ENCODE("Frame @ %1 REPEAT", to_string(time)); _writer->repeat (position, pv->eyes ()); } else { @@ -250,7 +250,7 @@ J2KEncoder::encode (shared_ptr<PlayerVideo> pv, DCPTime time) _empty_condition.notify_all (); } - _last_player_video[static_cast<int>(pv->eyes())] = pv; + _last_player_video[pv->eyes()] = pv; _last_player_video_time = time; } diff --git a/src/lib/j2k_encoder.h b/src/lib/j2k_encoder.h index a52cf0d1f..4bdedb060 100644 --- a/src/lib/j2k_encoder.h +++ b/src/lib/j2k_encoder.h @@ -29,6 +29,7 @@ #include "cross.h" +#include "enum_indexed_vector.h" #include "event_history.h" #include "exception_store.h" #include "util.h" @@ -105,7 +106,7 @@ private: std::shared_ptr<Writer> _writer; Waker _waker; - std::shared_ptr<PlayerVideo> _last_player_video[static_cast<int>(Eyes::COUNT)]; + EnumIndexedVector<std::shared_ptr<PlayerVideo>, Eyes> _last_player_video; boost::optional<dcpomatic::DCPTime> _last_player_video_time; boost::signals2::scoped_connection _server_found_connection; |