Skip to content

Commit

Permalink
Merge pull request #93 from TheOneric/cleanup-minor
Browse files Browse the repository at this point in the history
Minor and Cosmetic Improvements
  • Loading branch information
TFSThiagoBR98 authored May 8, 2021
2 parents f15f369 + ec287de commit 8309002
Show file tree
Hide file tree
Showing 8 changed files with 16 additions and 12 deletions.
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
SOFTWARE.
11 changes: 7 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,21 +1,24 @@
[![Actions Status](https://github.com/libass/JavascriptSubtitlesOctopus/workflows/Emscripten/badge.svg)](https://github.com/libass/JavascriptSubtitlesOctopus/actions)

SubtitlesOctopus displays subtitles in .ass format and easily integrates with HTML5 videos. It supports all SSA/ASS features and fully compatible with [libass](https://github.com/libass/libass).
SubtitlesOctopus displays subtitles in .ass format and easily integrates with HTML5 videos.
Since it uses [libass](https://github.com/libass/libass), SubtitlesOctopus supports most SSA/ASS features
and enables you to get consistent results in authoring and web-playback, provided libass is also used locally.

[ONLINE DEMO](https://libass.github.io/JavascriptSubtitlesOctopus/videojs.html) / [other examples with demo](https://libass.github.io/JavascriptSubtitlesOctopus/)

## Features

- Supports all SSA/ASS features
- Supports any fonts (including woff2 fonts)
- Supports most SSA/ASS features (everything libass supports)
- Supports all OpenType- and TrueType-fonts (including woff2 fonts)
- Works fast (because uses WebAssembly with fallback to asm.js if it's not available)
- Uses Web Workers thus video and interface doesn't lag even on "heavy" subtitles (working in background)
- Doesn't use DOM manipulations and render subtitles on single canvas
- Fully compatible with [libass](https://github.com/libass/libass)
- Fully compatible with [libass'](https://github.com/libass/libass) extensions (but beware of compatability to other ASS-renderers when using them)
- Easy to use - just connect it to video element

## Included Libraries

* libass
* expat
* fontconfig
* freetype
Expand Down
5 changes: 3 additions & 2 deletions run-docker-build.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#! /bin/bash
#! /bin/sh
set -e
cd "$(dirname "$0")"
docker build -t libass/javascriptsubtitlesoctopus .
docker run -it --rm -v ${PWD}:/code libass/javascriptsubtitlesoctopus:latest
docker run -it --rm -v "${PWD}":/code libass/javascriptsubtitlesoctopus:latest
2 changes: 1 addition & 1 deletion src/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ AM_LDFLAGS = -r
EXEEXT = .bc

noinst_PROGRAMS = subtitlesoctopus
subtitlesoctopus_SOURCES = SubtitleOctopus.cpp
subtitlesoctopus_SOURCES = SubtitleOctopus.cpp
2 changes: 1 addition & 1 deletion src/SubtitleOctopus.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -342,4 +342,4 @@ class SubtitleOctopus {

int main(int argc, char *argv[]) { return 0; }

#include "./SubOctpInterface.cpp"
#include "./SubOctpInterface.cpp"
2 changes: 1 addition & 1 deletion src/SubtitleOctopus.idl
Original file line number Diff line number Diff line change
Expand Up @@ -191,4 +191,4 @@ interface SubtitleOctopus {
void removeAllEvents();
void setMemoryLimits(long glyph_limit, long bitmap_cache_limit);
RenderBlendResult renderBlend(double tm, long force);
};
};
2 changes: 1 addition & 1 deletion src/configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ pkg_requires="libass >= 0.9.1"
AC_SUBST([LIBASS_CXXFLAGS])
AC_SUBST([LIBASS_LIBS])

AC_OUTPUT
AC_OUTPUT
2 changes: 1 addition & 1 deletion src/libass.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -126,4 +126,4 @@ class libass {
static long long oct_step_sub(ASS_Track *track, long long now, int movement) {
return ass_step_sub(track, now, movement);
}
};
};

0 comments on commit 8309002

Please sign in to comment.