projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
10b4bf7
)
A few small fixes.
author
Carl Hetherington
<cth@carlh.net>
Thu, 5 Jun 2014 10:44:13 +0000
(11:44 +0100)
committer
Carl Hetherington
<cth@carlh.net>
Thu, 5 Jun 2014 10:44:13 +0000
(11:44 +0100)
hacks/analog.py
patch
|
blob
|
history
diff --git
a/hacks/analog.py
b/hacks/analog.py
index 473913de987872988185a000705edd3f62ff7dd9..cac57d8035100f23cd2cb2624416a8be6a6feef0 100644
(file)
--- a/
hacks/analog.py
+++ b/
hacks/analog.py
@@
-92,10
+92,12
@@
while True:
add_encoder_thread_event(thread, T, 'wake')
elif message.startswith('encoder thread begins local encode'):
add_encoder_thread_event(thread, T, 'begin_encode')
add_encoder_thread_event(thread, T, 'wake')
elif message.startswith('encoder thread begins local encode'):
add_encoder_thread_event(thread, T, 'begin_encode')
- elif message.startswith('MagickImageProxy begins read and decode'):
+ elif message.startswith('MagickImageProxy begins
decode and convert') or message.startswith('MagickImageProxy begins
read and decode'):
add_encoder_thread_event(thread, T, 'magick_begin_decode')
add_encoder_thread_event(thread, T, 'magick_begin_decode')
- elif message.startswith('MagickImageProxy
completes read and decode
'):
+ elif message.startswith('MagickImageProxy
decode finished
'):
add_encoder_thread_event(thread, T, 'magick_end_decode')
add_encoder_thread_event(thread, T, 'magick_end_decode')
+ elif message.startswith('MagickImageProxy completes decode and convert'):
+ add_encoder_thread_event(thread, T, 'magick_end_unpack')
elif message.startswith('encoder thread finishes local encode'):
add_encoder_thread_event(thread, T, 'end_encode')
elif message.startswith('encoder thread finishes local encode'):
add_encoder_thread_event(thread, T, 'end_encode')
@@
-143,7
+145,6
@@
elif args.encoder_threads:
plt.plot(x, y)
n += 1
plt.plot(x, y)
n += 1
- break
plt.show()
elif args.plot_first_encoder:
plt.show()
elif args.plot_first_encoder: