Skip to content

Improved Caption Effect #899

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

Merged
merged 7 commits into from
Feb 15, 2023
Merged

Improved Caption Effect #899

merged 7 commits into from
Feb 15, 2023

Conversation

jonoomph
Copy link
Member

@jonoomph jonoomph commented Feb 14, 2023

  • Improved Caption Effect (updated Regex which no longer requires a blank line between captions, fixed long word wrapping, fixed word-wrapping for languages which don't use a space character, captions can now start with a number)
  • Added unit tests for Caption effect (windows and non-windows tests - since fonts render differently in windows)
  • Allow audio files to generate "Waveform" image before effects are processed - which allows for Caption effect on top of animated waveforms (more interesting, especially for audio-only transcriptions)
  • When generating audio animated waveforms, use the entire Timeline frame size - instead of 720x480.
  • Fixed bug on Clip initialization, to detect file paths containing a % to use a FFmpegReader

…following fixes:

- improved regex, which now detects lines without blank lines separating them, and detects captions that start with numbers
- line wrapping fixed for languages that don't use spaces
- forced line wrapping of long strings of characters
…. Also, allow the Caption effect to add image data (i.e. waveform graphic) and allow Clip to detect that image to output it correctly. The result of all this: audio-only files now support the Caption effect, on top of the generated waveform image. Lastly, generated waveforms should use the entire Timeline size - and not a pre-determined 720x480 size.
… by default (i.e. image sequences)

- FFmpegReader info struct should not be initialized during Open() after it is initially populated - so our SetJson() method can properly override it's values
- FrameMapper Json() method should include it's mapped Reader JSON - even though it is not yet possible to read it back in yet
- New unit tests for Timeline ApplyJsonDiff, and verification that we can override FFmpegReader info struct (i.e. updating FPS, time bases, etc...)
- Some whitespace fixes
…values for Windows and Linux unit tests, since fonts are rendering using different systems... and are not equal.
* Experimental test for unit tests without display

* Ignore unit tests running on an invalid QT Platform (i.e. offscreen - running as a test on GitHub)

* Fix whitespace on Caption effect

* Check for env variable for QT_QPA_PLATFORM == offscreen, and ignore Caption unit tests (for GitHub checks)
@codecov
Copy link

codecov bot commented Feb 14, 2023

Codecov Report

Merging #899 (450af52) into develop (70e86ef) will decrease coverage by 0.10%.
The diff coverage is 48.21%.

@@             Coverage Diff             @@
##           develop     #899      +/-   ##
===========================================
- Coverage    52.79%   52.70%   -0.10%     
===========================================
  Files          189      190       +1     
  Lines        16605    16771     +166     
===========================================
+ Hits          8767     8839      +72     
- Misses        7838     7932      +94     
Impacted Files Coverage Δ
src/Clip.h 60.00% <ø> (ø)
src/effects/Caption.cpp 0.35% <0.00%> (-0.01%) ⬇️
tests/Caption.cpp 7.29% <7.29%> (ø)
src/Clip.cpp 58.93% <16.66%> (-0.17%) ⬇️
src/FFmpegReader.cpp 73.57% <72.72%> (+0.54%) ⬆️
src/FrameMapper.cpp 92.57% <100.00%> (+0.04%) ⬆️
tests/Timeline.cpp 100.00% <100.00%> (ø)
src/ReaderBase.cpp 100.00% <0.00%> (+0.52%) ⬆️

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

@jonoomph
Copy link
Member Author

@jonoomph
Copy link
Member Author

@jonoomph jonoomph merged commit 8f92bac into develop Feb 15, 2023
@jonoomph jonoomph deleted the improved-captions branch February 15, 2023 19:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant