82 commits

Author	SHA1	Message	Date
Jakub Trllo	d9afc17576	Merged in feature/better_burnin_error (pull request #515) ... feature/better burnin error Approved-by: Milan Kolar <milan@orbi.tools>	2020-02-27 16:55:07 +00:00
Milan Kolar	3e87fb0dfe	bugfix: farm rendering wasn't accepting project overrides	2020-02-27 16:24:24 +01:00
iLLiCiTiT	4bb9eef688	raise our TypeError when value for burnins is dictionary, list or tuple	2020-02-27 15:32:40 +01:00
iLLiCiTiT	b0a1b1a503	fix missing import after merge	2020-02-22 01:22:47 +01:00
iLLiCiTiT	1fd4861d6d	Merge branch 'develop' into draft/ffmpeg_with_multiple_paths	2020-02-22 01:22:14 +01:00
iLLiCiTiT	4435eb8c14	current frame now works correctly and has correct position	2020-02-21 17:36:17 +01:00
iLLiCiTiT	71c71057ec	Merge branch 'develop' into draft/ffmpeg_with_multiple_paths	2020-02-17 17:33:57 +01:00
iLLiCiTiT	3922529058	escape colon and comma in texts	2020-02-17 15:54:44 +01:00
iLLiCiTiT	957ca8ecd2	fix current frame key	2020-02-17 14:02:59 +01:00
iLLiCiTiT	6efb1b0a74	use new functions in code	2020-02-15 11:08:39 +01:00
iLLiCiTiT	feb2037c02	excahnge timecode and text keys in arguments	2020-02-14 18:09:42 +01:00
iLLiCiTiT	5290f6dd58	fix arguments appending	2020-02-14 18:09:03 +01:00
iLLiCiTiT	62b3f852f1	use get_path_to_ffmpeg which checks if any of filled ffmpeg paths in FFMPEG_PATH exists	2020-02-11 14:01:56 +01:00
iLLiCiTiT	a2d07a89a9	removed deprecated method usage in example	2020-02-06 11:06:31 +01:00
iLLiCiTiT	6be774b1f8	removed imports from __main__	2020-02-06 11:04:43 +01:00
iLLiCiTiT	f19235f91e	added forgotten import	2020-02-06 11:04:08 +01:00
iLLiCiTiT	1033f779d1	codec moved to optional args because is optional	2020-02-06 11:03:58 +01:00
iLLiCiTiT	9a8c3b56a2	changed data processing to not use functions but only text	2020-02-06 11:02:59 +01:00
iLLiCiTiT	39e785aefb	doctstring changes	2020-02-06 11:02:14 +01:00
iLLiCiTiT	ca2279e710	_drawtext must count text sizes with timecode text	2020-02-06 11:02:01 +01:00
iLLiCiTiT	defe60e556	add burnin do not use expression but only text	2020-02-06 11:01:37 +01:00
iLLiCiTiT	96d3e51d92	add timecode allows to add text and use custom TIMECODE ffmpeg string	2020-02-06 11:00:29 +01:00
iLLiCiTiT	5d5d3eec92	add_text use custom DRAWTEXT ffmpeg string	2020-02-06 10:57:11 +01:00
iLLiCiTiT	ca19b5d679	add_text can accept frame_start argument	2020-02-06 10:56:51 +01:00
iLLiCiTiT	be088579be	alignment checks lowered string (it is available to use top_left in presets	2020-02-06 10:52:26 +01:00
iLLiCiTiT	d263cc3bfd	data variable in __main___ was renamed to in_data to not be overriden during processing	2020-02-06 10:51:37 +01:00
iLLiCiTiT	b73fcc6730	modified docstring	2020-02-06 10:51:09 +01:00
iLLiCiTiT	4f862acfb8	added constants for easier handling or entered keys	2020-02-06 10:50:51 +01:00
iLLiCiTiT	8e86f6e37a	implemented custom drawtext and timecode constants	2020-02-06 10:50:18 +01:00
iLLiCiTiT	8c75c74cde	print command before run	2020-02-06 10:49:59 +01:00
iLLiCiTiT	75b603d845	removed add datetime and add frame numbers	2020-02-06 10:46:03 +01:00
Milan Kolar	8ece466d9f	Merge branch 'develop' into feature/PYPE-657-extract-review-sequence-support	2020-01-31 22:59:20 +01:00
Jakub Jezek	153dcba79c	feat(scripts): otio_burnin is able to render image sequence	2020-01-29 13:53:36 +01:00
Ondrej Samohel	e186fcd388	Merge remote-tracking branch 'origin/develop' into feature/PYPE-634-pype-render-wrapper	2020-01-21 10:20:01 +01:00
iLLiCiTiT	8891f9e360	Merge branch 'develop' into feature/dict_indentation	2020-01-20 17:25:00 +01:00
Ondrej Samohel	408c220df8	remapping handling pushed to pype publish command	2020-01-15 15:30:00 +01:00
Ondrej Samohel	1a6462d358	submitting jobs with limited env, pype location determination	2020-01-14 16:16:19 +01:00
Milan Kolar	301b011c2b	Merge branch 'master' into feature/PYPE-638_res_and_fps_in_burnins	2020-01-10 16:05:11 +01:00
Jakub Jezek	26f2f882e2	fix(otio): burnin right side didnt format properly	2020-01-07 13:12:29 +01:00
iLLiCiTiT	f84f1537de	formatting changes	2020-01-06 18:30:24 +01:00
iLLiCiTiT	3dac4c1b69	data from frobe are stored to data not to options	2020-01-06 18:30:17 +01:00
iLLiCiTiT	6f4d50d41d	get_fps moved from Burnin class	2020-01-06 18:25:07 +01:00
iLLiCiTiT	bb86c94c18	width, height and fps values from ffprobe are added to options data	2020-01-06 18:10:19 +01:00
iLLiCiTiT	3d33f8fd4a	added get_fps method to burnins class which calculate fps from r_frame_rate	2020-01-06 18:09:46 +01:00
Milan Kolar	cd2f17bdbf	Merge branch 'hotfix/ffmpeg_path_burnin_fix'	2020-01-06 12:33:41 +01:00
Milan Kolar	733ee06e9d	Merge branch 'hotfix/ffmpeg_path_burnin_fix' into develop	2020-01-06 12:33:40 +01:00
Milan Kolar	0841d91eef	fix which import	2019-12-16 14:13:31 +01:00
iLLiCiTiT	978e05b536	get streams before super init in Burnin class is called	2019-12-12 11:27:47 +01:00
iLLiCiTiT	fdf4182155	replace FFMPEG string in command method	2019-12-12 11:27:22 +01:00
iLLiCiTiT	54c76b3b7f	copied _streams method from otio adapter to be able to use ffprobe full path	2019-12-12 11:26:55 +01:00