Merge remote-tracking branch 'origin/master'

Author: qencode-dev

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2019 Qencode, Corp
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

examples/start_encode2.php

@@ -12,7 +12,7 @@
 use Qencode\QencodeApiClient;
 
 // Replace this with your API key
-$apiKey = 'abcdefgh';
+$apiKey = '12345678';
 $video_url = 'https://qa.qencode.com/static/1.mp4';
 
 $q = new QencodeApiClient($apiKey);

examples/start_encode2_json.php

@@ -0,0 +1,65 @@
+<?php
+require_once __DIR__ . '/../autoload.php';
+
+use Qencode\Exceptions\QencodeApiException;
+use Qencode\Exceptions\QencodeClientException;
+use Qencode\Exceptions\QencodeException;
+use Qencode\Classes\CustomTranscodingParams;
+use Qencode\Classes\Format;
+use Qencode\Classes\Stream;
+use Qencode\Classes\Destination;
+use Qencode\Classes\Libx264_VideoCodecParameters;
+use Qencode\QencodeApiClient;
+
+// Replace this with your API key
+$apiKey = '12345678';
+$params = '
+{"query": {
+  "source": "https://qa.qencode.com/static/timer.mp4",
+  "format": [
+    {
+      "output": "mp4",
+      "size": "320x240",
+      "video_codec": "libx264"
+    }
+  ]
+  }
+}';
+
+$q = new QencodeApiClient($apiKey);
+
+try {
+
+    $task = $q->createTask();
+    log_message("Created task: ".$task->getTaskToken());
+
+    $task->startCustom($params);
+
+    do {
+        sleep(5);
+        $response = $task->getStatus();
+        if (is_array($response) and array_key_exists('percent', $response)) {
+            log_message("Completed: {$response['percent']}%");
+        }
+    } while ($response['status'] != 'completed');
+
+    foreach ($response['videos'] as $video) {
+        log_message($video['user_tag'] . ': ' . $video['url']);
+    }
+    echo "DONE!";
+
+} catch (QencodeClientException $e) {
+    // We got some inconsistent state in client application (e.g. task_token not found when requesting status)
+    log_message('Qencode Client Exception: ' . $e->getCode() . ' ' . $e->getMessage());
+} catch (QencodeApiException $e) {
+    // API response status code was not successful
+    log_message('Qencode API Exception: ' . $e->getCode() . ' ' . $e->getMessage());
+} catch (QencodeException $e) {
+    // API call failed
+    log_message('Qencode Exception: ' . $e->getMessage());
+    var_export($q->getLastResponseRaw());
+}
+
+function log_message($msg) {
+    echo $msg."\n";
+}

src/Classes/TranscodingTask.php

@@ -124,13 +124,24 @@ public function start($transcodingProfiles, $uri = null, $transferMethod = null,
      * @return array start_encode API method response
      */
     public function startCustom($task_params, $payload = null) {
-        if (is_array($this->stitchVideoItems)) {
-            $task_params->stitch = $this->stitchVideoItems;
+
+        switch (gettype($task_params)) {
+            case 'object':
+                if (is_array($this->stitchVideoItems)) {
+                    $task_params->stitch = $this->stitchVideoItems;
+                }
+                $query = array ('query' => $task_params);
+                $query_json = json_encode($query);
+                break;
+            case 'string':
+                $query_json = $task_params;
+                break;
+            default:
+                $query_json = '';
         }
-        $query = array ('query' => $task_params);
-        $query_json = json_encode($query);
+
         $query_json = preg_replace('/,\s*"[^"]+":null|"[^"]+":null,?/', '', $query_json);
-        //echo $query_json."\n\n";
+//        echo $query_json."\n\n";
         $params = array(
             'task_token' => $this->taskToken,
             'query' => $query_json