Recording & Sketchfab fixes (#50)

vimeo · Oct 25, 2018 · 7d78d91 · 7d78d91
1 parent b9628bc
commit 7d78d91
Show file tree

Hide file tree

Showing 13 changed files with 13 additions and 15 deletions.
diff --git a/Assets/Tests/Play/VimeoRecorderPlayTest.cs b/Assets/Tests/Play/VimeoRecorderPlayTest.cs
@@ -5,7 +5,7 @@
 using System.Text.RegularExpressions;
 using Vimeo;
 using Vimeo.Recorder;
-using SimpleJSON;
+using Vimeo.SimpleJSON;
 
 public class VimeoRecorderPlayTest : TestConfig
 {

diff --git a/Assets/Tests/Play/VimeoUploaderPlayTest.cs b/Assets/Tests/Play/VimeoUploaderPlayTest.cs
@@ -5,7 +5,7 @@
 using System.Text.RegularExpressions;
 using Vimeo;
 using Vimeo.Recorder;
-using SimpleJSON;
+using Vimeo.SimpleJSON;
 
 public class VimeoUploaderPlayTest : TestConfig
 {

diff --git a/Assets/Tests/Unit/VimeoVideoTest.cs b/Assets/Tests/Unit/VimeoVideoTest.cs
@@ -5,6 +5,8 @@
 using System.Collections;
 using System.Text.RegularExpressions;
 using Vimeo;
+using Vimeo.SimpleJSON;
+
 public class VimeoVideoTest : TestConfig 
 {
     VimeoVideo video;
@@ -13,7 +15,7 @@ public class VimeoVideoTest : TestConfig
     public void _Before()
     {
         string json = "{\"uri\":\"/videos/279300468\",\"name\":\"Video Test\",\"description\":\"Original 360 version https://vimeo.com/266948610\",\"duration\":306,\"width\":3456,\"height\":2160,\"play\":{\"progressive\":[{\"type\":\"video/mp4\",\"width\":2304,\"height\":1440,\"link_expiration_time\":\"2018-09-27T22:58:59+00:00\",\"link\":\"https://fpdl.vimeocdn.com/vimeo-prod-skyfire-std-us/01/860/11/279300468/1046140246.mp4?token=1538089139-0x9a526defb049337f2f4a2bf35f7b27b2cf3c8219\",\"created_time\":\"2018-07-10T16:17:06+00:00\",\"fps\":30,\"size\":432584522,\"md5\":\"af068c26beebc314e5a0074e144d299b\",\"log\":\"https://api.vimeo.com/videos/279300468:5ad7cb7854/log/1046140246/1538078339/dc9caec747a0eb1db906c280b50d9867b9f773c0\"},{\"type\":\"video/mp4\",\"width\":3456,\"height\":2160,\"link_expiration_time\":\"2018-09-27T22:58:59+00:00\",\"link\":\"https://fpdl.vimeocdn.com/vimeo-prod-skyfire-std-us/01/860/11/279300468/1046140239.mp4?token=1538089139-0x51b793ee8a26df3e5441dc2c98d107501cd354f1\",\"created_time\":\"2018-07-10T16:17:06+00:00\",\"fps\":30,\"size\":839989600,\"md5\":\"a58de4bbdab6e16794228d2907438eaf\",\"log\":\"https://api.vimeo.com/videos/279300468:5ad7cb7854/log/1046140239/1538078339/6f9a254433115037f0c748a8ab7ca7675b1bdb7f\"},{\"type\":\"video/mp4\",\"width\":864,\"height\":540,\"link_expiration_time\":\"2018-09-27T22:58:59+00:00\",\"link\":\"https://fpdl.vimeocdn.com/vimeo-prod-skyfire-std-us/01/860/11/279300468/1046140237.mp4?token=1538089139-0x6a94f2a69755cd7f3ba48a8ec047b1f8e05cafaf\",\"created_time\":\"2018-07-10T16:17:06+00:00\",\"fps\":30,\"size\":55626502,\"md5\":\"bdf87cbc8509efd44fd61979c5554813\",\"log\":\"https://api.vimeo.com/videos/279300468:5ad7cb7854/log/1046140237/1538078339/4994c74d313423eece5bf6aa018fa33b83da1c88\"},{\"type\":\"video/mp4\",\"width\":1728,\"height\":1080,\"link_expiration_time\":\"2018-09-27T22:58:59+00:00\",\"link\":\"https://fpdl.vimeocdn.com/vimeo-prod-skyfire-std-us/01/860/11/279300468/1046140236.mp4?token=1538089139-0x08bafb7ae0a43c6b7cc76c9f6693140908a81ec6\",\"created_time\":\"2018-07-10T16:17:06+00:00\",\"fps\":30,\"size\":190693968,\"md5\":\"392a27653f3c8f9849be84bb9269cb48\",\"log\":\"https://api.vimeo.com/videos/279300468:5ad7cb7854/log/1046140236/1538078339/606b1d862a599281112a61db03a1fe309366f80c\"},{\"type\":\"video/mp4\",\"width\":576,\"height\":400,\"link_expiration_time\":\"2018-09-27T22:58:59+00:00\",\"link\":\"https://fpdl.vimeocdn.com/vimeo-prod-skyfire-std-us/01/860/11/279300468/1046140235.mp4?token=1538089139-0x15438ac28abac2cd7c8636d21de7640c639d6cd9\",\"created_time\":\"2018-07-10T16:17:06+00:00\",\"fps\":30,\"size\":19100125,\"md5\":\"d3a0f86dcaa6f2d7b7ee79277dbbb29b\",\"log\":\"https://api.vimeo.com/videos/279300468:5ad7cb7854/log/1046140235/1538078339/7713097c65f01ab1ca7971625d132395e44e9a73\"},{\"type\":\"video/mp4\",\"width\":1152,\"height\":720,\"link_expiration_time\":\"2018-09-27T22:58:59+00:00\",\"link\":\"https://fpdl.vimeocdn.com/vimeo-prod-skyfire-std-us/01/860/11/279300468/1046140233.mp4?token=1538089139-0x1f1a8e206bdbe112e5ac1bc61b1cf716dd799816\",\"created_time\":\"2018-07-10T16:17:06+00:00\",\"fps\":30,\"size\":95464913,\"md5\":\"628bacb9124df721b0b0332fbf8f2b74\",\"log\":\"https://api.vimeo.com/videos/279300468:5ad7cb7854/log/1046140233/1538078339/74f68f53f41f291edc76087cad0f41c5e0d6a79f\"}],\"hls\":{\"link_expiration_time\":\"2018-09-27T21:58:59+00:00\",\"link\":\"https://player.vimeo.com/play/1046140246,1046140239,1046140237,1046140236,1046140235,1046140233/hls?s=279300468_1538085539_2e78157d9c236cc773328a5685b4dc65&context=Vimeo%5CController%5CApi%5CResources%5CVideoController.&logging=false\",\"log\":\"https://api.vimeo.com/videos/279300468:5ad7cb7854/log/hls/1538078339/ed60f756f0982358980263f34b3c0ed4acd85697\"},\"dash\":{\"link_expiration_time\":\"2018-09-27T21:58:59+00:00\",\"link\":\"https://player.vimeo.com/play/1046140246,1046140239,1046140237,1046140236,1046140235,1046140233/dash?s=279300468_1538085539_2e78157d9c236cc773328a5685b4dc65&context=Vimeo%5CController%5CApi%5CResources%5CVideoController.&logging=false\",\"log\":\"https://api.vimeo.com/videos/279300468:5ad7cb7854/log/dash/1538078339/df1645640bf16272a3f4c386b9eb8dcde3c31c95\"},\"status\":\"playable\"}}";
-        video = new VimeoVideo(SimpleJSON.JSON.Parse(json));
+        video = new VimeoVideo(JSON.Parse(json));
     }
 
     [Test]

diff --git a/Assets/Vimeo/Scripts/Config/VimeoVideo.cs b/Assets/Vimeo/Scripts/Config/VimeoVideo.cs
@@ -1,9 +1,9 @@
 using System; 
 using System.Text.RegularExpressions;
-using SimpleJSON;
 using System.Collections;
 using System.Collections.Generic;
 using Vimeo.Player;
+using Vimeo.SimpleJSON;
 using UnityEngine;
 
 namespace Vimeo

diff --git a/Assets/Vimeo/Scripts/Editor/BaseEditor.cs b/Assets/Vimeo/Scripts/Editor/BaseEditor.cs
@@ -4,7 +4,7 @@
 using UnityEditor;
 using Vimeo.Player;
 using Vimeo.Recorder;
-using SimpleJSON;
+using Vimeo.SimpleJSON;
 using System.Linq;
 
 namespace Vimeo

diff --git a/Assets/Vimeo/Scripts/Player/VideoController.cs b/Assets/Vimeo/Scripts/Player/VideoController.cs
@@ -4,7 +4,6 @@
 using UnityEngine;
 using UnityEngine.UI;
 using UnityEngine.Video;
-using SimpleJSON;
 
 namespace Vimeo.Player
 {

diff --git a/Assets/Vimeo/Scripts/Player/VimeoPlayer.cs b/Assets/Vimeo/Scripts/Player/VimeoPlayer.cs
@@ -2,9 +2,9 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using SimpleJSON;
 using System.Text.RegularExpressions;
 using Vimeo;
+using Vimeo.SimpleJSON;
 
 namespace Vimeo.Player
 {

diff --git a/Assets/Vimeo/Scripts/Recorder/EncoderManager.cs b/Assets/Vimeo/Scripts/Recorder/EncoderManager.cs
@@ -57,6 +57,8 @@ public void Init(VimeoRecorder r)
 
         public void BeginRecording()
         {
+            isRecording = true;
+
             if (_recorder.encoderType == EncoderType.MediaEncoder) {
 #if MEDIA_ENCODER_SUPPORT                                
                 _vimeoEncoder.BeginRecording();
@@ -70,8 +72,6 @@ public void BeginRecording()
 
         private void EncoderSetup()
         {
-            isRecording = true;
-
 #if VIMEO_LOOKING_GLASS_SUPPORT
             if (_recorder.captureLookingGlassRT) {
                 Quilt quilt = GetHoloPlayQuilt();

diff --git a/Assets/Vimeo/Scripts/Recorder/VimeoPublisher.cs b/Assets/Vimeo/Scripts/Recorder/VimeoPublisher.cs
@@ -3,7 +3,7 @@
 using UnityEngine;
 using UnityEngine.Networking;
 using Vimeo;
-using SimpleJSON;
+using Vimeo.SimpleJSON;
 
 namespace Vimeo.Recorder
 {

diff --git a/Assets/Vimeo/Scripts/Recorder/VimeoRecorder.cs b/Assets/Vimeo/Scripts/Recorder/VimeoRecorder.cs
@@ -2,7 +2,6 @@
 using UnityEngine.Networking;
 using System.IO;
 using Vimeo;
-using SimpleJSON;
 
 namespace Vimeo.Recorder
 {

diff --git a/Assets/Vimeo/Scripts/Services/VimeoApi.cs b/Assets/Vimeo/Scripts/Services/VimeoApi.cs
@@ -6,7 +6,6 @@
 using System.Text;
 using UnityEngine;
 using UnityEngine.Networking;
-using SimpleJSON;
 
 namespace Vimeo
 {

diff --git a/Assets/Vimeo/Scripts/Services/VimeoUploader.cs b/Assets/Vimeo/Scripts/Services/VimeoUploader.cs
@@ -4,8 +4,7 @@
 using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.Networking;
-using SimpleJSON;
-using Vimeo;
+using Vimeo.SimpleJSON;
 
 namespace Vimeo
 {

diff --git a/Assets/Vimeo/Scripts/Utils/SimpleJSON.cs b/Assets/Vimeo/Scripts/Utils/SimpleJSON.cs
@@ -52,7 +52,7 @@
 using System.Linq;
 using System.Text;
 
-namespace SimpleJSON
+namespace Vimeo.SimpleJSON
 {
     public enum JSONBinaryTag
     {