dcpomatic/src/lib/player.h, branch laszlo DCP-o-matic DCP tools https://git.carlh.net/cgit/dcpomatic/atom?h=laszlo 2020-02-21T00:16:51Z Missing #include. 2020-02-21T00:16:51Z Carl Hetherington cth@carlh.net 2020-02-21T00:16:51Z urn:sha1:ba285a1b873149f5b5d630ab7b136240cc27c8e2 Fix deadlock during content examination. 2020-02-16T20:23:42Z Carl Hetherington cth@carlh.net 2020-01-28T22:23:47Z urn:sha1:4b38c8f429407ec09609236fc7b2349459536571 Before this fix, the following situation could happen in threads A and B: A: Some DONE signal happens; this triggers setup_pieces which takes a lock on the player mutex. B: FFmpegContent::examine takes a lock on the content mutex. B: FFmpegContent::examine adds a stream B: That causes STREAMS PENDING to be emitted. B: This tries to take a lock on the player mutex so it can update _suspended A: setup_pieces tries to access some content information, hence tries to take a lock on the content mutex. Now B is holding the CL and awaiting the PL and A is holding the PL and awaiting the CL. It feels like the root cause of this is that while setup_pieces is happening another change (which would itself cause setup_pieces) is announced, and this isn't dealt with properly. There are two steps here; _suspended is protected with an atomic rather than using _mutex, and also it can cope with being updated recursively. Backported from df48c75c38dd788835a93540aea243a2dac4bb10 in v2.15.x Fix assumption of 48kHz DCP audio in AudioRingBuffers consistency check (#1436). 2018-12-22T23:32:59Z Carl Hetherington cth@carlh.net 2018-12-22T23:32:59Z urn:sha1:b73576594b252e033539bec964d72403d3775585 Build Empty objects from the presence or absence of decoders in 2018-09-03T23:39:39Z Carl Hetherington cth@carlh.net 2018-09-03T23:39:39Z urn:sha1:1938b1b08d38fc199717d1875a61ef05e5b965de Pieces, rather than the presence or absence of content. This seems better because of cases like encrypted DCPs without a a KDM: here we may have content but no decoder. Remove unnecessary subtitle scale (I think). 2018-09-02T02:12:43Z Carl Hetherington cth@carlh.net 2018-09-02T02:12:43Z urn:sha1:63a1ada934c258dfa60a92f7a406b084531856d9 Basics of splitting CCAP streams into different assets. 2018-08-29T10:58:06Z Carl Hetherington cth@carlh.net 2018-08-28T22:34:56Z urn:sha1:1db0293ad36605da9ca8daa8736ef581f4f6a34e Remove TextType from various places as (I believe) it can be inferred from the content. 2018-08-23T10:19:06Z Carl Hetherington cth@carlh.net 2018-08-23T10:19:06Z urn:sha1:7962e6cfd5fbd97e1e44aebe3fc190c62da027e9 Similar pending/done for Film::Change. 2018-08-19T12:55:46Z Carl Hetherington cth@carlh.net 2018-08-19T12:55:46Z urn:sha1:4408e6eea87ce9630e71e4a7d40e2dade091b0ee Replace May/Done/NotDone signal sets with one signal and extend 2018-08-19T00:29:04Z Carl Hetherington cth@carlh.net 2018-08-19T00:04:59Z urn:sha1:6c7489e5d778d3e71065d88a094a7383ba2c117d this treatment to anything that caused Player::setup_pieces. This should fix out-of-sequence Player emissions caused by setup_pieces being called by one thread while the butler is calling pass(). Suspend butler on player may-change as otherwise there's a window 2018-08-19T00:29:04Z Carl Hetherington cth@carlh.net 2018-08-18T21:49:46Z urn:sha1:9a27d60ea7888d300a5a2414a477091428589b82 between Player::_suspended being set to false and the the butler requesting a seek, during which the butler may call pass().