Skip to content

Commit

Permalink
Merge pull request video-dev#1035 from video-dev/from-dailymotion-to-…
Browse files Browse the repository at this point in the history
…beyond

Updates following hls.js transfer from dailymotion to video-dev organization
  • Loading branch information
dighan authored Mar 13, 2017
2 parents 4a7139a + 45b5fdd commit f05cc41
Show file tree
Hide file tree
Showing 11 changed files with 25 additions and 27 deletions.
6 changes: 3 additions & 3 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@

#### **Did you find a bug?**

* **Ensure the bug was not already reported** by searching on GitHub under [Issues](https://github.com/dailymotion/hls.js/issues).
* **Ensure the bug was not already reported** by searching on GitHub under [Issues](https://github.com/video-dev/hls.js/issues).

* If you're unable to find an open issue addressing the problem, [open a new one](https://github.com/dailymotion/hls.js/issues/new). Be sure to include a **title and clear description**, as much relevant information as possible, and a **code sample** or an **executable test case** demonstrating the expected behavior that is not occurring.
* If you're unable to find an open issue addressing the problem, [open a new one](https://github.com/video-dev/hls.js/issues/new). Be sure to include a **title and clear description**, as much relevant information as possible, and a **code sample** or an **executable test case** demonstrating the expected behavior that is not occurring.

#### **Did you write a patch that fixes a bug?**

- First, checkout the repository and install required dependencies

```sh
git clone https://github.com/dailymotion/hls.js.git
git clone https://github.com/video-dev/hls.js.git
# setup dev environement
cd hls.js
npm install
Expand Down
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
<!-- Replace [ ] with [x] to check off the list -->
- [ ] The stream has correct Access-Control-Allow-Origin headers (CORS)
- [ ] There are no network errors such as 404s in the browser console when trying to play the stream
- [ ] The issue observed is not already reported by searching on Github under https://github.com/dailymotion/hls.js/issues
- [ ] The issue occurs in the latest reference client on http://dailymotion.github.io/hls.js/demo and not just on my page
- [ ] The issue observed is not already reported by searching on Github under https://github.com/video-dev/hls.js/issues
- [ ] The issue occurs in the latest reference client on http://video-dev.github.io/hls.js/demo and not just on my page
* Link to playable M3U8 file:
* Hls.js version:
* Browser name/version:
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c) 2015 Dailymotion (http://www.dailymotion.com)
Copyright (c) 2017 Dailymotion (http://www.dailymotion.com)

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[![Build Status](https://travis-ci.org/dailymotion/hls.js.svg?branch=master)](https://travis-ci.org/dailymotion/hls.js)
[![npm][npm-image]][npm-url]

Join the discussion: [![Slack Status](https://hlsjs.herokuapp.com/badge.svg)](https://hlsjs.herokuapp.com/)
Join the discussion: [![Slack Status](http://video-dev.org/badge.svg)](http://video-dev.org/)

# ![hls.js](https://cloud.githubusercontent.com/assets/616833/19739063/e10be95a-9bb9-11e6-8100-2896f8500138.png)
hls.js is a JavaScript library which implements an [HTTP Live Streaming] client.
Expand All @@ -24,7 +24,7 @@ hls.js is written in [ECMAScript6], and transpiled in ECMAScript5 using [Babel].

## Demo

[http://dailymotion.github.io/hls.js/demo](http://dailymotion.github.io/hls.js/demo)
[http://video-dev.github.io/hls.js/demo](http://video-dev.github.io/hls.js/demo)

## Getting Started

Expand Down Expand Up @@ -196,7 +196,7 @@ Pull requests are welcome. Here is a quick guide on how to start.

- First, checkout the repository and install required dependencies
```sh
git clone https://github.com/dailymotion/hls.js.git
git clone https://github.com/video-dev/hls.js.git
# setup dev environement
cd hls.js
npm install
Expand Down
3 changes: 1 addition & 2 deletions bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,11 @@
"version": "0.7.3",
"license": "Apache-2.0",
"description": "Media Source Extension - HLS library, by/for Dailymotion",
"homepage": "https://github.com/dailymotion/hls.js",
"homepage": "https://github.com/video-dev/hls.js",
"authors": [
"Guillaume du Pontavice <[email protected]>"
],
"main": "dist/hls.js",
"private": false,
"ignore": [
"**/.*",
"node_modules",
Expand Down
4 changes: 2 additions & 2 deletions demo/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
<div class="header-container">
<header class="wrapper clearfix">
<h1>
<a target="_blank" href="https://github.com/dailymotion/hls.js">
<a target="_blank" href="https://github.com/video-dev/hls.js">
<img src="https://cloud.githubusercontent.com/assets/616833/19739063/e10be95a-9bb9-11e6-8100-2896f8500138.png"/>
</a>
</h1>
Expand Down Expand Up @@ -240,7 +240,7 @@ <h4> Stats Display </h4>
$('#levelCapping').val(levelCapping);
$('#defaultAudioCodec').val(defaultAudioCodec || "undefined");

$('h2').append(' <a target=_blank href=https://github.com/dailymotion/hls.js/releases/tag/v' + Hls.version + '>v' + Hls.version + '</a>');
$('h2').append(' <a target=_blank href=https://github.com/video-dev/hls.js/releases/tag/v' + Hls.version + '>v' + Hls.version + '</a>');

});

Expand Down
9 changes: 4 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,17 @@
"name": "hls.js",
"version": "0.7.3",
"license": "Apache-2.0",
"description": "Media Source Extension - HLS library, by/for Dailymotion",
"homepage": "https://github.com/dailymotion/hls.js",
"description": "JavaScript HLS client using MediaSourceExtension",
"homepage": "https://github.com/video-dev/hls.js",
"authors": "Guillaume du Pontavice <[email protected]>",
"repository": {
"type": "git",
"url": "https://github.com/dailymotion/hls.js"
"url": "https://github.com/video-dev/hls.js"
},
"bugs": {
"url": "https://github.com/dailymotion/hls.js/issues"
"url": "https://github.com/video-dev/hls.js/issues"
},
"main": "./dist/hls.js",
"private": false,
"scripts": {
"build": "npm run buildlib && rimraf dist/* && npm run builddist && npm run builddistlight",
"buildlib": "rimraf lib/* && babel src --out-dir lib",
Expand Down
2 changes: 1 addition & 1 deletion src/controller/audio-stream-controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -829,7 +829,7 @@ class AudioStreamController extends EventHandler {
this.state = State.IDLE;
} else {
// current position is not buffered, but browser is still complaining about buffer full error
// this happens on IE/Edge, refer to https://github.com/dailymotion/hls.js/pull/708
// this happens on IE/Edge, refer to https://github.com/video-dev/hls.js/pull/708
// in that case flush the whole audio buffer to recover
logger.warn('buffer full error also media.currentTime is not buffered, flush audio buffer');
this.fragCurrent = null;
Expand Down
4 changes: 2 additions & 2 deletions src/controller/buffer-controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ class BufferController extends EventHandler {
// is greater than 100ms (this is enough to handle seek for VOD or level change for LIVE videos). At the time of change we issue
// `SourceBuffer.abort()` and adjusting `SourceBuffer.timestampOffset` if `SourceBuffer.updating` is false or awaiting `updateend`
// event if SB is in updating state.
// More info here: https://github.com/dailymotion/hls.js/issues/332#issuecomment-257986486
// More info here: https://github.com/video-dev/hls.js/issues/332#issuecomment-257986486

if (type === 'audio' && audioTrack && audioTrack.container === 'audio/mpeg') { // Chrome audio mp3 track
let audioBuffer = this.sourceBuffer.audio;
Expand Down Expand Up @@ -357,7 +357,7 @@ class BufferController extends EventHandler {
this.updateMediaElementDuration();
}

// https://github.com/dailymotion/hls.js/issues/355
// https://github.com/video-dev/hls.js/issues/355
updateMediaElementDuration() {
let media = this.media,
mediaSource = this.mediaSource,
Expand Down
4 changes: 2 additions & 2 deletions src/controller/stream-controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ class StreamController extends EventHandler {
// if everything (almost) til the end is buffered, let's signal eos
// we don't compare exactly media.duration === bufferInfo.end as there could be some subtle media duration difference
// using half frag duration should help cope with these cases.
// also cope with almost zero last frag duration (max last frag duration with 200ms) refer to https://github.com/dailymotion/hls.js/pull/657
// also cope with almost zero last frag duration (max last frag duration with 200ms) refer to https://github.com/video-dev/hls.js/pull/657
if (media.duration - Math.max(bufferInfo.end,fragPrevious.start) <= Math.max(0.2,fragPrevious.duration/2)) {
// Finalize the media stream
let data = {};
Expand Down Expand Up @@ -1340,7 +1340,7 @@ class StreamController extends EventHandler {
this.state = State.IDLE;
} else {
// current position is not buffered, but browser is still complaining about buffer full error
// this happens on IE/Edge, refer to https://github.com/dailymotion/hls.js/pull/708
// this happens on IE/Edge, refer to https://github.com/video-dev/hls.js/pull/708
// in that case flush the whole buffer to recover
logger.warn('buffer full error also media.currentTime is not buffered, flush everything');
this.fragCurrent = null;
Expand Down
8 changes: 4 additions & 4 deletions src/loader/playlist-loader.js
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@ class PlaylistLoader extends EventHandler {
const duration = result[1];
if (duration) { // INF
frag.duration = parseFloat(duration);
// avoid sliced strings https://github.com/dailymotion/hls.js/issues/939
// avoid sliced strings https://github.com/video-dev/hls.js/issues/939
const title = (' ' + result[2]).slice(1);
frag.title = title ? title : null;
frag.tagList.push(title ? [ 'INF',duration,title ] : [ 'INF',duration ]);
Expand All @@ -317,7 +317,7 @@ class PlaylistLoader extends EventHandler {
frag.level = id;
frag.cc = cc;
frag.baseurl = baseurl;
// avoid sliced strings https://github.com/dailymotion/hls.js/issues/939
// avoid sliced strings https://github.com/video-dev/hls.js/issues/939
frag.relurl = (' ' + result[3]).slice(1);

level.fragments.push(frag);
Expand All @@ -335,7 +335,7 @@ class PlaylistLoader extends EventHandler {
}
}
} else if (result[5]) { // PROGRAM-DATE-TIME
// avoid sliced strings https://github.com/dailymotion/hls.js/issues/939
// avoid sliced strings https://github.com/video-dev/hls.js/issues/939
frag.rawProgramDateTime = (' ' + result[5]).slice(1);
frag.tagList.push(['PROGRAM-DATE-TIME', frag.rawProgramDateTime]);
} else {
Expand All @@ -346,7 +346,7 @@ class PlaylistLoader extends EventHandler {
}
}

// avoid sliced strings https://github.com/dailymotion/hls.js/issues/939
// avoid sliced strings https://github.com/video-dev/hls.js/issues/939
const value1 = (' ' + result[i+1]).slice(1);
const value2 = (' ' + result[i+2]).slice(1);

Expand Down

0 comments on commit f05cc41

Please sign in to comment.