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.

Sign up for GitHub

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

Jump to bottom

Minimal SSA/ASS Subtitle Support #2281

Merged
merged 18 commits into from
Jul 10, 2017
Merged

Minimal SSA/ASS Subtitle Support #2281

Show file tree
Hide file tree
Changes from 15 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
246a0dc
add SSA/ASS specific files from branch
jcable Jan 2, 2017
08e1d35
add changed files for SSA from branch
jcable Jan 2, 2017
1364e23
add test files for SSA.
jcable Jan 2, 2017
e99ad27
not needed
jcable Jan 2, 2017
b692d9f
tidy and make compatible with test.
jcable Jan 2, 2017
ef2d7c7
tests pass.
jcable Jan 2, 2017
ac98874
move header into track.output.format object and then use it in the de…
jcable Jan 9, 2017
8ae8ac7
move Matroska specific things to the MatroskaExtractor
jcable Jan 11, 2017
d71707f
Make constructor clearer
jcable Jan 11, 2017
ff64d2b
move Matroska specific code back to the Matroska extractor
jcable Jan 13, 2017
1214867
10* was an experiment, not wanted.
jcable Jan 13, 2017
94a3640
possible conflict resolution
jcable Jan 22, 2017
6ec840c
Merge remote-tracking branch 'upstream/dev-v2' into dev-v2
jcable Jan 22, 2017
141568a
better merge
jcable Jan 22, 2017
440aeea
working but still with stateful decoder. Sample subtitle <span> encod…
jcable Jan 22, 2017
b0c39a1
back out unneeded imports
jcable Feb 21, 2017
d8746c3
remove unneeded local variable
jcable Feb 21, 2017
402c985
Merge branch 'dev-v2' of https://github.com/google/ExoPlayer into dev-v2
jcable Feb 21, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.2.1'
classpath 'com.android.tools.build:gradle:2.2.3'
classpath 'com.novoda:bintray-release:0.3.4'
}
}
Expand Down
4 changes: 4 additions & 0 deletions demo/src/main/assets/media.exolist.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,6 +327,10 @@
{
"name": "Misc",
"samples": [
{
"name": "Watashi ga Motete Dousunda - 01 SSA",
"uri": "http://192.168.1.133:8080/Watashi ga Motete Dousunda - 01.mkv"
},
{
"name": "Dizzy",
"uri": "http://html5demos.com/assets/dizzy.mp4"
Expand Down
Binary file added library/src/androidTest/assets/mkv/ssasample.mkv
View file
Open in desktop
Binary file not shown.