Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

tt3 to ttd conversion #41

Merged
merged 75 commits into from
Nov 11, 2019
Merged
Changes from 1 commit
Commits
Show all changes
75 commits
Select commit Hold shift + click to select a range
76e37aa
Switch to absolute imports and update PyXB command accordingly
PyvesB Jul 17, 2019
d8213a8
Replace usage of reserved async keyword
PyvesB Jul 17, 2019
be57ec4
Run 2to3 utility
PyvesB Jul 17, 2019
ded5257
Make ComparableMixin hashable
PyvesB Jul 17, 2019
8c6c966
Fix stop event name
PyvesB Jul 17, 2019
4b29396
Switch to special method name for /
PyvesB Jul 17, 2019
7b0dd23
Fix error message assertions
PyvesB Jul 17, 2019
039b0c6
Tweak file mode to accept str
PyvesB Jul 17, 2019
0ebc51b
Try instantiating interface to get TypeError
PyvesB Jul 17, 2019
25147c2
Fix str/byte inconsistencies
PyvesB Jul 17, 2019
39b12f3
Update Readme
PyvesB Jul 17, 2019
6f1cb0d
Fix or skip failing tests using xfail
nigelmegitt Aug 7, 2019
b29d9e2
Add standard conformance metadata to EBU-TT-D conversion
danielthepope Aug 7, 2019
8f5d910
Add tests (and fix implementation for) EBU-TT-D style conversion (#34)
danielthepope Sep 11, 2019
c297a6d
Add tests to verify conversion of colours to hex codes
danielthepope Sep 16, 2019
4af0028
Case-insensitive parsing of EBU-TT-3 files
danielthepope Sep 17, 2019
ed896b6
WIP line height test
PhoebeWheelerCode Sep 17, 2019
b282675
Add tests for origin and extent conversion. Both are failing.
danielthepope Sep 17, 2019
a4b6546
Rounding percentages to 2dp to make a test pass
PhoebeWheelerCode Sep 20, 2019
aa45fbb
Reject overlapping regions when converting to EBU-TT-D
mm326 Sep 23, 2019
d60d79f
Adding passing test for an error being thrown when no tts:extent pixe…
PhoebeWheelerCode Sep 23, 2019
5979539
Merge commit 'aa45fbb7306da37e173ed014cd938f518322740c' into ebuttd/M…
danielthepope Sep 23, 2019
db51ca8
Round converted percentage values to 2dp
danielthepope Sep 23, 2019
9534a1f
Move lengthType validation to another file
PhoebeWheelerCode Sep 23, 2019
954751c
Add more lineHeight permutations
nigelmegitt Sep 30, 2019
4425804
Check for a specific exception and no others
nigelmegitt Oct 1, 2019
d061abb
Add required root extent pixel size
nigelmegitt Oct 1, 2019
820a623
Make sure a root extent is specified when using px padding
nigelmegitt Oct 1, 2019
38cab0f
Throw an ExtentMissingError if pixel units are used but not root exte…
nigelmegitt Oct 1, 2019
cd9a12a
Address review comments
nigelmegitt Oct 1, 2019
140ba24
Merge pull request #37 from bbc/ebuttd/MSPA-448-unit-conversion
nigelmegitt Oct 1, 2019
9cbc921
Add test and implementation for p elements in div
mm326 Aug 20, 2019
c508fee
adding step defenitions
mm326 Aug 27, 2019
6e84e96
adding property for child elements to see parent div
mm326 Aug 28, 2019
1815de9
MSPA-458 WIP Making converter and tests
PhoebeWheelerCode Aug 28, 2019
c7138dc
MSPA-458-nested-styles WIP adding tests for denester
mm326 Aug 28, 2019
f35238f
Add test and impl to unnest divs and add test files
mm326 Aug 29, 2019
8f88955
Add test files for many divs
mm326 Aug 29, 2019
b298497
adding denester
mm326 Sep 3, 2019
3d7a976
MSPA-458 Adding code and tests for scenarios 3 and 4
PhoebeWheelerCode Sep 4, 2019
f12012a
MSPA-458 WIP Span tests and code
PhoebeWheelerCode Sep 5, 2019
5764173
MSPA-458 WIP Span tests and code
PhoebeWheelerCode Sep 6, 2019
a0da9bd
Unnest spans and add them to p element
mm326 Sep 9, 2019
9ca1f14
Adding None to style if merged styles is empty list
mm326 Sep 10, 2019
68d460e
merging begin and end times onto child divs
mm326 Sep 10, 2019
f87fbb9
adding tests and implementation for end time on unnested divs
mm326 Sep 11, 2019
5c1ff7b
Computing fontsize after denesting spans
mm326 Sep 13, 2019
a8d5b24
Renamed test_nested_elements to test_denester and moved it to the tes…
mm326 Sep 13, 2019
dfe5b8b
Adding new tests for new features (such as not creating functionally …
PhoebeWheelerCode Sep 30, 2019
ee8215f
Correcting some hex code mistakes and making capitalisation consistent
PhoebeWheelerCode Sep 30, 2019
fa0c29f
Remove unnecessary '.0' from some font size values
PhoebeWheelerCode Oct 1, 2019
09f2591
More tests for absolute fontsizes; px, c etc
PhoebeWheelerCode Oct 1, 2019
61c5469
Cause divs and spans to correctly inherit and calculate begin/end times
PhoebeWheelerCode Oct 4, 2019
9ad30e5
Adding tests for the timings of nested spans
PhoebeWheelerCode Oct 7, 2019
baf42b2
Splitting resolved timing on elements tests into two sets of tests (u…
PhoebeWheelerCode Oct 7, 2019
15c856c
Fix a bug where fractions of seconds were being interpreted as number…
nigelmegitt Oct 8, 2019
29a42b5
Test that as_timedelta works properly
nigelmegitt Oct 9, 2019
31c44d4
Address some but not all complex timing scenarios
nigelmegitt Oct 9, 2019
913c72b
Stuff that should have been in the previous commit
nigelmegitt Oct 9, 2019
c506b36
Cherry-pick travis build commits from the tt1-to-tt3-conversion branch
nigelmegitt Oct 9, 2019
a99c9be
Slightly dubious test change to allow div begin to float to match chi…
nigelmegitt Oct 9, 2019
e1707a8
Changed requested on the pull request
PhoebeWheelerCode Oct 15, 2019
8e6cfc9
Made adjustments to tests to allow greater reusability of pytest steps
PhoebeWheelerCode Oct 21, 2019
99f19ae
Splitting denesting and live-to-d conversion into separate test steps
PhoebeWheelerCode Oct 21, 2019
536db96
Removing unnecessary code
PhoebeWheelerCode Oct 21, 2019
0409b46
Remove code for handling facets/metadata
PhoebeWheelerCode Nov 4, 2019
3d05970
Refactoring Denester to make it into a node
PhoebeWheelerCode Nov 5, 2019
6a51fa7
Reindented functions within DenesterNode, modified references to acco…
PhoebeWheelerCode Nov 5, 2019
3aa8acf
Added additional comments to denester.py
PhoebeWheelerCode Nov 6, 2019
536633d
Include denesterin code documentation
nigelmegitt Nov 6, 2019
f637681
Minor tidying
nigelmegitt Nov 6, 2019
1a6cbd7
Add Denester node documentation
nigelmegitt Nov 6, 2019
287422e
Documentation changes
PhoebeWheelerCode Nov 8, 2019
a224a8a
Correcting documentation typo
PhoebeWheelerCode Nov 8, 2019
1312433
Merge pull request #38 from bbc/ebuttd/MSPA-458-nested-elements
PhoebeWheelerCode Nov 8, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Make ComparableMixin hashable
  • Loading branch information
PyvesB committed Jul 17, 2019

Unverified

No user is associated with the committer email.
commit ded525728ae547aedadf3ee3811c06e5204f719d
2 changes: 2 additions & 0 deletions ebu_tt_live/utils.py
Original file line number Diff line number Diff line change
@@ -62,6 +62,8 @@ def _cmp_checks(self, other):
"""
pass

def __hash__(self):
return object.__hash__(self)

class RingBufferWithCallback(collections.deque):
"""