From b8f4687ca1a4015ab5ed906ef8d45674a5e69994 Mon Sep 17 00:00:00 2001 From: Daria Chen Date: Thu, 4 Feb 2016 14:16:05 +0800 Subject: [PATCH 1/2] MCS-2947 Change video stream URL in 7688 tutorial --- content/en/tutorial/7688_videostream_tutorial.md | 4 ++-- content/zh-CN/tutorial/7688_videostream_tutorial.md | 4 ++-- content/zh-TW/tutorial/7688_videostream_tutorial.md | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/content/en/tutorial/7688_videostream_tutorial.md b/content/en/tutorial/7688_videostream_tutorial.md index 46becd6..4441ba9 100644 --- a/content/en/tutorial/7688_videostream_tutorial.md +++ b/content/en/tutorial/7688_videostream_tutorial.md @@ -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. @@ -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) { diff --git a/content/zh-CN/tutorial/7688_videostream_tutorial.md b/content/zh-CN/tutorial/7688_videostream_tutorial.md index 1c8e8bb..9331288 100644 --- a/content/zh-CN/tutorial/7688_videostream_tutorial.md +++ b/content/zh-CN/tutorial/7688_videostream_tutorial.md @@ -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. @@ -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) { diff --git a/content/zh-TW/tutorial/7688_videostream_tutorial.md b/content/zh-TW/tutorial/7688_videostream_tutorial.md index 46becd6..4441ba9 100644 --- a/content/zh-TW/tutorial/7688_videostream_tutorial.md +++ b/content/zh-TW/tutorial/7688_videostream_tutorial.md @@ -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. @@ -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) { From 0f62b85e186ec18945423f0051568fd3c4750935 Mon Sep 17 00:00:00 2001 From: Daria Chen Date: Thu, 4 Feb 2016 15:20:40 +0800 Subject: [PATCH 2/2] MCS-2947-Modify the video stream URL in api reference/data_channel_format --- content/en/api_references/data_channel_format.md | 4 ++-- content/zh-CN/api_references/data_channel_format.md | 4 ++-- content/zh-TW/api_references/data_channel_format.md | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/content/en/api_references/data_channel_format.md b/content/en/api_references/data_channel_format.md index 4ac0ee8..07ca643 100755 --- a/content/en/api_references/data_channel_format.md +++ b/content/en/api_references/data_channel_format.md @@ -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 ``` diff --git a/content/zh-CN/api_references/data_channel_format.md b/content/zh-CN/api_references/data_channel_format.md index 09629ea..447e164 100755 --- a/content/zh-CN/api_references/data_channel_format.md +++ b/content/zh-CN/api_references/data_channel_format.md @@ -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 ``` diff --git a/content/zh-TW/api_references/data_channel_format.md b/content/zh-TW/api_references/data_channel_format.md index a6a273b..9f233be 100755 --- a/content/zh-TW/api_references/data_channel_format.md +++ b/content/zh-TW/api_references/data_channel_format.md @@ -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 ```