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

608 #411

Closed
wants to merge 24 commits into from
Closed

608 #411

wants to merge 24 commits into from

Conversation

jlacivita
Copy link
Contributor

This has been tested by myself and other members of the community. It's far superior to the last version I worked on, and is ready for a merge into master.

I just merged the latest master into my tree, and did a quick sanity check on captions. all looks good.

jlacivita and others added 22 commits January 27, 2016 14:39
And implemented VTT cues in timeline-controller.js
sample duration is the DTS delta between consecutive samples (sorted by DTS)
ensure that sample duration is constant accross a whole fragment, and also that composition time offset (pts-dts) is a multiple of sample duration, to please Safari and avoid intrafragment micro-holes

related to #9
related to #9
related to #9
# Conflicts:
#	bower.json
#	dist/hls.js
#	dist/hls.js.map
#	dist/hls.min.js
#	package.json
#	src/remux/mp4-remuxer.js
# Conflicts:
#	dist/hls.js
#	dist/hls.js.map
#	dist/hls.min.js
@mangui
Copy link
Member

mangui commented Apr 28, 2016

great ! nice job @jlacivita
would you mind removing dist/* from the PR ?
it would also be good to have a couple of lines describing CEA-608 design in design.md

@jlacivita
Copy link
Contributor Author

@mangui done. I copied the /dist/ files from master and added design.md details. There's still some weird message about "file mode changed" on the dist files, but I don't know how to handle that.

@mangui
Copy link
Member

mangui commented May 4, 2016

thanks @jlacivita I will try to squash everything next week, as the commit history is not clean

@mangui mangui mentioned this pull request May 4, 2016
@jlacivita
Copy link
Contributor Author

Thanks, @mangui. Let me know what bad git habits I have. I can try and be cleaner next time.

@mangui
Copy link
Member

mangui commented May 10, 2016

Hi @jlacivita everything has been merged into master now
thanks again for this nice contribution !
regarding git, best practice is to rebase your branch against master (instead of merging master into your tree)
apart from this, plz don't commit dist/* at all, and avoid using tabs

@mangui
Copy link
Member

mangui commented May 10, 2016

closing as merged

@jhumbug
Copy link

jhumbug commented Jun 14, 2016

@mangui I know it's checked into master, but any idea when you'll be releasing a tagged version of hls.js with this 608 interpreter?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants