Skip to content

Commit

Permalink
Merge branch 'ebu_master' into kozmaz87/timing_resolution
Browse files Browse the repository at this point in the history
  • Loading branch information
Zoltan Kozma committed Aug 19, 2016
2 parents 5e10a36 + a26a048 commit 8b3b1c5
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 3 deletions.
2 changes: 1 addition & 1 deletion docs/source/ebu_tt_live.carriage.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
carriage Package
==============
================

:mod:`filesystem` Module
------------------------
Expand Down
2 changes: 1 addition & 1 deletion docs/source/ebu_tt_live.scripts.rst
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ scripts Package


:mod:`ebu_user_input_consumer` Module
---------------------------------
-------------------------------------

.. automodule:: ebu_tt_live.scripts.ebu_user_input_consumer
:members:
Expand Down
6 changes: 6 additions & 0 deletions docs/source/user_input_producer.rst
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,12 @@ There are three ways of sending documents :

You can type subtitle's text in the `Subtitles text` box. Each time a new document is being sent it should be logged by the ``ebu-user-input-consumer`` script.

More demo scenario examples :
* Run `ebu-user-input-forwarder`. Open the `ui/user_input_producer/user_input_producer.html` page and connect it to the forwarder via websocket (click "connect" button). Open in a separate window the `test.html` page at the root of the project, connect on this page too. From the user input producer page create a new sequence, on the `test.html` window subscribe to the same sequence. Send documents from the user input producer page. View those pages being validated in the user input forwarder process output. Finally, view the documents arriving on the test.html page. You can even do this with 1x user input forwarder and `n` sequences, generated by `n` user input producer pages and viewed by `m` `test.html` pages.
* Run `ebu-user-input-forwarder --folder-export output`, this will write all the files you send from the user input producer interface (`ui/user_input_producer/user_input_producer.html`) to the output folder. Create a sequence `testSeq` for example and send one document, in a new terminal run `ebu-simple-consumer -m output/manifest_testSeq.txt -f`. You should see the documents you send from the user input producer interface being validated by the `ebu-user-input-forwarder` process output and then displayed by the `ebu-simple-consumer` script.

You can also try documents being generated on demand, at scheduled times or asynchronously by using the sending modes presented above.

.. _JQuery: https://jquery.com/
.. _nunjucks: https://mozilla.github.io/nunjucks/

Expand Down
2 changes: 1 addition & 1 deletion testing/SPEC-CONFORMANCE.md
Original file line number Diff line number Diff line change
Expand Up @@ -108,4 +108,4 @@ The conformance requirements for EBU-TT Part 3 derive from the specification its
|R97|4.8|`tts:linePadding` values SHALL be constrained to one non-negative decimal appended by "c" (cell)||
|R98|4.9|`tts:lineHeight` values SHALL be constrained to the string `normal` or a non-negative number appended by percentage “%”, c” (for cells) or “px” (for pixels).||
|R99|4.10|`origin` values SHALL be constrained to two non-negative numbers appended by percentage “%”, c” (for cells) or “px” (for pixels) delimited by a space.||
|R100|4.11|`tts:padding` values SHALL be constrained to one, two, three or four non-negative numbers appended by percentage “%”, c” (for cells) or “px” (for pixels), delimited by a space.||
|R100|4.11|`tts:padding` values SHALL be constrained to one, two, three or four decimal numbers (`xs:decimal`) appended by percentage “%”, c” (for cells) or “px” (for pixels), delimited by a space.||

0 comments on commit 8b3b1c5

Please sign in to comment.