-
Notifications
You must be signed in to change notification settings - Fork 1.3k
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
improve TTML rendering #1962
improve TTML rendering #1962
Conversation
Thanks for your pull request. It looks like this may be your first contribution to a Google open source project (if not, look below for help). Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA). 📝 Please visit https://cla.developers.google.com/ to sign. Once you've signed (or fixed any issues), please reply here (e.g. What to do if you already signed the CLAIndividual signers
Corporate signers
ℹ️ Googlers: Go here for more info. |
I signed it! |
We found a Contributor License Agreement for you (the sender of this pull request), but were unable to find agreements for all the commit author(s) or Co-authors. If you authored these, maybe you used a different email address in the git commits than was used to sign the CLA (login here to double check)? If these were authored by someone else, then they will need to sign a CLA as well, and confirm that they're okay with these being contributed to Google. ℹ️ Googlers: Go here for more info. |
94f4512
to
a0bcd11
Compare
CLAs look good, thanks! ℹ️ Googlers: Go here for more info. |
Hi @valotvince, thanks for the PR! |
Hi @ismena, sorry for the wait, I am on vacation :) Lets suggest we have the following TTML extract:
As of today, Shaka won't read styles in each span of paragraphs, but will merge the spans in one and only cue: That PR is makes Shaka read each span within paragraphs. The spans are read as independent cues with their own region/begin/end attributes (based on the closest ancestor who possesses them), so two cues will be printed out (with their own style definitions based on the text displayer in use): The counter-part of doing so, is that the paragraph style section won't be used in the span styles... But as I've seen in issues on Github, the text displayers and TTML parser would need a little refactoring to be able to meet the TTML specs. Hope I was clear enough :) Best, |
No worries, hope you had a great vacation :) Ah, gotcha. Let's get to it! I left a few questions on the CL, here's another one: do you have content you're testing with? I'd love to cherry-pick your change and try it. |
Hi @ismena, I have some private streams that I can't share but I was also testing alongside the streams found in that article: https://subtitling.irt.de |
457bf65
to
684dc25
Compare
So there's good news and bad news. 👍 The good news is that everyone that needs to sign a CLA (the pull request submitter and all commit authors) have done so. Everything is all good there. 😕 The bad news is that it appears that one or more commits were authored or co-authored by someone other than the pull request submitter. We need to confirm that all authors are ok with their commits being contributed to this project. Please have them confirm that here in the pull request. Note to project maintainer: This is a terminal state, meaning the ℹ️ Googlers: Go here for more info. |
CLAs look good, thanks! ℹ️ Googlers: Go here for more info. |
d717dd1
to
1e06dc4
Compare
|
||
/* Set the captions at the bottom by default. */ | ||
align-items: flex-end; | ||
align-items: center; | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I've changed the flex-direction for the cues to display on a column so I had to change the flex rules on the container.
That was mainly because I've tested prior to the support of span of p, I'll revert this to see if it still works ok !
Thanks for replying to my comments! I'll try your changes on the content you provided and will get back to you early next week. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I tried the changes out - looks good! The (hopefully) last round of nitpicks, mostly style.
1e06dc4
to
c353f87
Compare
@ismena Hi :) Just a ping to let you know I've taken account of you review in the last commit :) |
@valotvince Awesome and thank for pinging. |
c353f87
to
f979d10
Compare
@ismena Done :) |
Test Failure:
|
Looks like there are some linter problems. Please run build/all.py locally to see what needs resolving. |
f979d10
to
a8e8e2a
Compare
@ismena Sorry, forgot to run it after the rebase 💯 Should be okay now ! |
a8e8e2a
to
2d9161a
Compare
All tests passed! |
@valotvince Cool! Thanks for contributing :) |
@ismena after this PR, CE608 and SMPTE-TT subtitles are broken. Please review it! (Asset: Live sim TTML Image Subtitles embedded (VoD) ) |
The issue is related with the next if: c670b55#diff-226b4f50d0392c977a71a42816ecdad1R246 |
Hello @avelad, |
Ah, damn it! We should look into adding unit tests for this so it doesn't happen again. Thanks for spotting, @avelad and @valotvince for the fix. I'll get right on to reviewing it. |
Hi there ✋Any idea when that diff will be released ? Thanks ! |
We should've released this in 2.5.5 that just went out :( @joeyparrish @TheModMaker can we include this in the next minor release? |
I'll delegate this to @TheModMaker. If it makes sense to cherry-pick it, please cherry-pick to v2.5.x now, and it will show up in the next release, v2.5.6. |
Change-Id: Ifed3539e90649d259707a91fbd644fc58ba79b94
I've cherry-picked these commits to |
This PR adds:
How to test:
TODO