Skip to content

Commit bde4e1d

Browse files
mimeTypeの追加。
1 parent be1c5f9 commit bde4e1d

2 files changed

Lines changed: 3 additions & 2 deletions

File tree

dConnectDevicePlugin/dConnectDeviceHost/dConnectDeviceHost/Classes/profile/DPHostMediaStreamRecording/DPHostMediaStreamRecordingProfile.m

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,7 @@ - (instancetype)init
175175
[recorder stopRecordingWithSuccessCompletion:^(DPHostStreamRecorder *recorder, NSString *fileName) {
176176
[response setResult:DConnectMessageResultTypeOk];
177177
[DConnectMediaStreamRecordingProfile setUri:fileName target:response];
178+
[DConnectMediaStreamRecordingProfile setMIMEType:recorder.mimeType target:response];
178179
[weakSelf sendOnRecordingChangeEventWithStatus:DConnectMediaStreamRecordingProfileRecordingStateStop
179180
path:fileName mimeType:recorder.mimeType errorMessage:nil];
180181
[[DConnectManager sharedManager] sendResponse:response];

dConnectSDK/dConnectBrowserForIOS9/dConnectBrowserForIOS9/demo/js/resource.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ var main = (function(parent, global) {
33
function init() {
44
var mimeType = decodeURIComponent(util.getMimeType());
55
var uri = util.getResourceUri();
6-
if (mimeType.indexOf('image') != -1 && uri.indexOf('mp4') == -1) {
6+
if (mimeType.indexOf('image') != -1) {
77
var elem;
88
if (uri.indexOf(':4035/') != -1) {
99
elem = document.getElementById('image');
@@ -18,7 +18,7 @@ var main = (function(parent, global) {
1818
elem.onload = function() {
1919
console.log("onload: " + decodeURIComponent(util.getResourceUri()));
2020
}
21-
} else if (mimeType.indexOf('image') != -1 && uri.indexOf('mp4') != -1) {
21+
} else if (mimeType.indexOf('video') != -1) {
2222
var mediaId = uri.replace("http://localhost:4035/gotapi/files?uri=", "");
2323
util.doMediaPlayerMediaPut(util.getServiceId(), util.getAccessTokenQuery(), decodeURIComponent(mediaId),null);
2424
} else {

0 commit comments

Comments
 (0)