Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/Mediatek-Cloud/mcs-resources
Browse files Browse the repository at this point in the history
  • Loading branch information
@anchi1216
anchi1216 committed Feb 4, 2016
2 parents d0edcbf + 0e18d28 commit 34ecd0d
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 12 deletions.
4 changes: 2 additions & 2 deletions content/en/api_references/data_channel_format.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -358,12 +358,12 @@ Here are the video specifications that MCS currently supports:
* URL of MCS video relay server:

```
http://stream.mcs.mediatek.com:80/:deviceId/:deviceKey/:dataChnId/:width/:height
http://stream-mcs.mediatek.com/:deviceId/:deviceKey/:dataChnId/:width/:height
```
Please replace the deviceId, deviceKey, dataChnID, width and height with the real values. The width and height represent the display resolution of your video.

* Recommended video converter on LinkIt Smart 7688: FFmpeg

```
ffmpeg -s 176x144 -f video4linux2 -r 30 -i /dev/video0 -f mpeg1video -r 30 -b 800k http://stream.mcs.mediatek.com:80/:deviceId/:deviceKey/:dataChnId/176/144
ffmpeg -s 176x144 -f video4linux2 -r 30 -i /dev/video0 -f mpeg1video -r 30 -b 800k http://stream-mcs.mediatek.com/:deviceId/:deviceKey/:dataChnId/176/144
```
4 changes: 2 additions & 2 deletions content/en/tutorial/7688_videostream_tutorial.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ npm install mcsjs
5. Test if FFmpeg can send streaming content to MCS successfully.

```
ffmpeg -s 176x144 -f video4linux2 -r 30 -i /dev/video0 -f mpeg1video -r 30 -b 800k http://stream.mcs.mediatek.com/:deviceId/:deviceKey/:dataChnId/176/144
ffmpeg -s 176x144 -f video4linux2 -r 30 -i /dev/video0 -f mpeg1video -r 30 -b 800k http://stream-mcs.mediatek.com/:deviceId/:deviceKey/:dataChnId/176/144
```
The deviceId, deviceKey and dataChnId need to be replaced with the real value you just obtained. You also need to specify the video resolution in the URL. In this example, the resolution is 176x144.
You can view on either MCS web console or App to make sure the video stream works.
Expand Down Expand Up @@ -135,7 +135,7 @@ var myApp = mcs.register({
deviceId: deviceId,
deviceKey: deviceKey,
});
exec('ffmpeg -s ' + width + 'x' + height + ' -f video4linux2 -r 30 -i /dev/video0 -f mpeg1video -r 30 -b 800k http://stream.mcs.mediatek.com/' + deviceId + '/' +deviceKey + '/' + dataChnId + '/' + width + '/' + height, function(error, stdout, stderr) {
exec('ffmpeg -s ' + width + 'x' + height + ' -f video4linux2 -r 30 -i /dev/video0 -f mpeg1video -r 30 -b 800k http://stream-mcs.mediatek.com/' + deviceId + '/' +deviceKey + '/' + dataChnId + '/' + width + '/' + height, function(error, stdout, stderr) {
console.log('stdout: ' + stdout);
console.log('stderr: ' + stderr);
if (error !== null) {
Expand Down
4 changes: 2 additions & 2 deletions content/zh-CN/api_references/data_channel_format.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -355,12 +355,12 @@ dataChnId,timestamp,{image file base64 encoding string value}
* MCS 视频流服务器：

```
http://stream.mcs.mediatek.com:80/:deviceId/:deviceKey/:dataChnId/:width/:height
http://stream-mcs.mediatek.com/:deviceId/:deviceKey/:dataChnId/:width/:height
```
请将其中的 deviceId, deviceKey, dataChnId, width 和 height 更换成您设备上实际的数据。其中 width 与 height 是上载视频流时所设定的解析度大小。

* 在 LinkIt Smart 7688 上建议的视频转换器套件：FFmpeg

```
ffmpeg -s 176x144 -f video4linux2 -r 30 -i /dev/video0 -f mpeg1video -r 30 -b 800k http://stream.mcs.mediatek.com:80/:deviceId/:deviceKey/:dataChnId/176/144
ffmpeg -s 176x144 -f video4linux2 -r 30 -i /dev/video0 -f mpeg1video -r 30 -b 800k http://stream-mcs.mediatek.com/:deviceId/:deviceKey/:dataChnId/176/144
```
4 changes: 2 additions & 2 deletions content/zh-CN/tutorial/7688_videostream_tutorial.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ npm install mcsjs
5. Test if FFmpeg can send streaming content to MCS successfully.

```
ffmpeg -s 176x144 -f video4linux2 -r 30 -i /dev/video0 -f mpeg1video -r 30 -b 800k http://stream.mcs.mediatek.com/:deviceId/:deviceKey/:dataChnId/176/144
ffmpeg -s 176x144 -f video4linux2 -r 30 -i /dev/video0 -f mpeg1video -r 30 -b 800k http://stream-mcs.mediatek.com/:deviceId/:deviceKey/:dataChnId/176/144
```
The deviceId, deviceKey and dataChnId need to be replaced with the real value you just obtained. You also need to specify the video resolution in the URL. In this example, the resolution is 176x144.
You can view on either MCS web console or App to make sure the video stream works.
Expand Down Expand Up @@ -135,7 +135,7 @@ var myApp = mcs.register({
deviceId: deviceId,
deviceKey: deviceKey,
});
exec('ffmpeg -s ' + width + 'x' + height + ' -f video4linux2 -r 30 -i /dev/video0 -f mpeg1video -r 30 -b 800k http://stream.mcs.mediatek.com/' + deviceId + '/' +deviceKey + '/' + dataChnId + '/' + width + '/' + height, function(error, stdout, stderr) {
exec('ffmpeg -s ' + width + 'x' + height + ' -f video4linux2 -r 30 -i /dev/video0 -f mpeg1video -r 30 -b 800k http://stream-mcs.mediatek.com/' + deviceId + '/' +deviceKey + '/' + dataChnId + '/' + width + '/' + height, function(error, stdout, stderr) {
console.log('stdout: ' + stdout);
console.log('stderr: ' + stderr);
if (error !== null) {
Expand Down
4 changes: 2 additions & 2 deletions content/zh-TW/api_references/data_channel_format.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -353,13 +353,13 @@ dataChnId,timestamp,{image file base64 encoding string value}
* MCS 影像串流服務器：

```
http://stream.mcs.mediatek.com:80/:deviceId/:deviceKey/:dataChnId/:width/:height
http://stream-mcs.mediatek.com/:deviceId/:deviceKey/:dataChnId/:width/:height
```
請將其中的 deviceId, deviceKey, dataChnId, width 和 height 更換成您設備上實際的數據。其中 width 與 height 是上傳影像串流時所設定的解析度大小。

* 在 LinkIt Smart 7688 上建議的視頻轉換器套件：FFmpeg

```
ffmpeg -s 176x144 -f video4linux2 -r 30 -i /dev/video0 -f mpeg1video -r 30 -b 800k http://stream.mcs.mediatek.com:80/:deviceId/:deviceKey/:dataChnId/176/144
ffmpeg -s 176x144 -f video4linux2 -r 30 -i /dev/video0 -f mpeg1video -r 30 -b 800k http://stream-mcs.mediatek.com/:deviceId/:deviceKey/:dataChnId/176/144
```

4 changes: 2 additions & 2 deletions content/zh-TW/tutorial/7688_videostream_tutorial.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ npm install mcsjs
5. Test if FFmpeg can send streaming content to MCS successfully.

```
ffmpeg -s 176x144 -f video4linux2 -r 30 -i /dev/video0 -f mpeg1video -r 30 -b 800k http://stream.mcs.mediatek.com/:deviceId/:deviceKey/:dataChnId/176/144
ffmpeg -s 176x144 -f video4linux2 -r 30 -i /dev/video0 -f mpeg1video -r 30 -b 800k http://stream-mcs.mediatek.com/:deviceId/:deviceKey/:dataChnId/176/144
```
The deviceId, deviceKey and dataChnId need to be replaced with the real value you just obtained. You also need to specify the video resolution in the URL. In this example, the resolution is 176x144.
You can view on either MCS web console or App to make sure the video stream works.
Expand Down Expand Up @@ -135,7 +135,7 @@ var myApp = mcs.register({
deviceId: deviceId,
deviceKey: deviceKey,
});
exec('ffmpeg -s ' + width + 'x' + height + ' -f video4linux2 -r 30 -i /dev/video0 -f mpeg1video -r 30 -b 800k http://stream.mcs.mediatek.com/' + deviceId + '/' +deviceKey + '/' + dataChnId + '/' + width + '/' + height, function(error, stdout, stderr) {
exec('ffmpeg -s ' + width + 'x' + height + ' -f video4linux2 -r 30 -i /dev/video0 -f mpeg1video -r 30 -b 800k http://stream-mcs.mediatek.com/' + deviceId + '/' +deviceKey + '/' + dataChnId + '/' + width + '/' + height, function(error, stdout, stderr) {
console.log('stdout: ' + stdout);
console.log('stderr: ' + stderr);
if (error !== null) {
Expand Down

0 comments on commit 34ecd0d

Please sign in to comment.