X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Futil.h;h=70bf495c682c42332ea22bf5294497c243ad5276;hb=4a74ca2cb973585122e84c21ff48ff4ff1ebd488;hp=5d93456df6c043d2bac41d6b070b81e6f83ebcc6;hpb=c5b3d91fab31fde4c21e1cc5bb5adb1d6d26fcca;p=dcpomatic.git diff --git a/src/lib/util.h b/src/lib/util.h index 5d93456df..70bf495c6 100644 --- a/src/lib/util.h +++ b/src/lib/util.h @@ -73,40 +73,6 @@ extern boost::shared_ptr make_signer (); extern libdcp::Size fit_ratio_within (float ratio, libdcp::Size); extern std::string entities_to_text (std::string e); extern std::map split_get_request (std::string url); - -struct FrameRateConversion -{ - FrameRateConversion (float, int); - - /** @return factor by which to multiply a source frame rate - to get the effective rate after any skip or repeat has happened. - */ - float factor () const { - if (skip) { - return 0.5; - } - - return repeat; - } - - /** true to skip every other frame */ - bool skip; - /** number of times to use each frame (e.g. 1 is normal, 2 means repeat each frame once, and so on) */ - int repeat; - /** true if this DCP will run its video faster or slower than the source - * without taking into account `repeat' nor `skip'. - * (e.g. change_speed will be true if - * source is 29.97fps, DCP is 30fps - * source is 14.50fps, DCP is 30fps - * but not if - * source is 15.00fps, DCP is 30fps - * source is 12.50fps, DCP is 25fps) - */ - bool change_speed; - - std::string description; -}; - extern int dcp_audio_frame_rate (int); extern int stride_round_up (int, int const *, int); extern std::multimap read_key_value (std::istream& s);