@theia/ffmpeg 1.48.0 → 1.48.1

package/lib/replace-ffmpeg.js

@@ -1,76 +1,76 @@
-"use strict";
-// *****************************************************************************
-// Copyright (C) 2019 Ericsson and others.
-//
-// This program and the accompanying materials are made available under the
-// terms of the Eclipse Public License v. 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0.
-//
-// This Source Code may also be made available under the following Secondary
-// Licenses when the conditions for such availability set forth in the Eclipse
-// Public License v. 2.0 are satisfied: GNU General Public License, version 2
-// with the GNU Classpath Exception which is available at
-// https://www.gnu.org/software/classpath/license.html.
-//
-// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
-// *****************************************************************************
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.readElectronVersion = exports.replaceFfmpeg = void 0;
-const electronGet = require("@electron/get");
-const fs = require("fs-extra");
-const os = require("os");
-const path = require("path");
-const unzipper = require("unzipper");
-const ffmpeg = require("./ffmpeg");
-const hash_1 = require("./hash");
-async function replaceFfmpeg(options = {}) {
-    let shouldDownload = true;
-    let shouldReplace = true;
-    const { name: ffmpegName, location: ffmpegLocation, } = ffmpeg.ffmpegNameAndLocation(options);
-    const { electronDist = path.resolve(require.resolve('electron/package.json'), '..', 'dist'), electronVersion = await readElectronVersion(electronDist), ffmpegPath = path.resolve(electronDist, ffmpegLocation, ffmpegName), } = options;
-    const ffmpegCachedPath = path.join(os.tmpdir(), `theia-cli/cache/electron-v${electronVersion}`, ffmpegName);
-    if (await fs.pathExists(ffmpegCachedPath)) {
-        shouldDownload = false; // If the file is already cached, do not download.
-        console.warn('Found cached ffmpeg library.');
-        const [cacheHash, distHash] = await Promise.all([
-            (0, hash_1.hashFile)(ffmpegCachedPath),
-            (0, hash_1.hashFile)(ffmpegPath),
-        ]);
-        if (cacheHash.equals(distHash)) {
-            shouldReplace = false; // If files are already the same, do not replace.
-            console.warn('Hashes are equal, not replacing the ffmpeg library.');
-        }
-    }
-    if (shouldDownload) {
-        const ffmpegZipPath = await electronGet.downloadArtifact({
-            version: electronVersion,
-            artifactName: 'ffmpeg'
-        });
-        const ffmpegZip = await unzipper.Open.file(ffmpegZipPath);
-        const file = ffmpegZip.files.find(f => f.path.endsWith(ffmpegName));
-        if (!file) {
-            throw new Error(`Archive did not contain "${ffmpegName}".`);
-        }
-        // Extract file to cache.
-        await fs.mkdirp(path.dirname(ffmpegCachedPath));
-        await new Promise((resolve, reject) => {
-            file.stream()
-                .pipe(fs.createWriteStream(ffmpegCachedPath))
-                .on('finish', resolve)
-                .on('error', reject);
-        });
-        console.warn(`Downloaded ffmpeg shared library { version: "${electronVersion}", dist: "${electronDist}" }.`);
-    }
-    if (shouldReplace) {
-        await fs.copy(ffmpegCachedPath, ffmpegPath);
-        console.warn(`Successfully replaced "${ffmpegPath}".`);
-    }
-}
-exports.replaceFfmpeg = replaceFfmpeg;
-async function readElectronVersion(electronDist) {
-    const electronVersionFilePath = path.resolve(electronDist, 'version');
-    const version = await fs.readFile(electronVersionFilePath, 'utf8');
-    return version.trim();
-}
-exports.readElectronVersion = readElectronVersion;
+"use strict";
+// *****************************************************************************
+// Copyright (C) 2019 Ericsson and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
+// *****************************************************************************
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.readElectronVersion = exports.replaceFfmpeg = void 0;
+const electronGet = require("@electron/get");
+const fs = require("fs-extra");
+const os = require("os");
+const path = require("path");
+const unzipper = require("unzipper");
+const ffmpeg = require("./ffmpeg");
+const hash_1 = require("./hash");
+async function replaceFfmpeg(options = {}) {
+    let shouldDownload = true;
+    let shouldReplace = true;
+    const { name: ffmpegName, location: ffmpegLocation, } = ffmpeg.ffmpegNameAndLocation(options);
+    const { electronDist = path.resolve(require.resolve('electron/package.json'), '..', 'dist'), electronVersion = await readElectronVersion(electronDist), ffmpegPath = path.resolve(electronDist, ffmpegLocation, ffmpegName), } = options;
+    const ffmpegCachedPath = path.join(os.tmpdir(), `theia-cli/cache/electron-v${electronVersion}`, ffmpegName);
+    if (await fs.pathExists(ffmpegCachedPath)) {
+        shouldDownload = false; // If the file is already cached, do not download.
+        console.warn('Found cached ffmpeg library.');
+        const [cacheHash, distHash] = await Promise.all([
+            (0, hash_1.hashFile)(ffmpegCachedPath),
+            (0, hash_1.hashFile)(ffmpegPath),
+        ]);
+        if (cacheHash.equals(distHash)) {
+            shouldReplace = false; // If files are already the same, do not replace.
+            console.warn('Hashes are equal, not replacing the ffmpeg library.');
+        }
+    }
+    if (shouldDownload) {
+        const ffmpegZipPath = await electronGet.downloadArtifact({
+            version: electronVersion,
+            artifactName: 'ffmpeg'
+        });
+        const ffmpegZip = await unzipper.Open.file(ffmpegZipPath);
+        const file = ffmpegZip.files.find(f => f.path.endsWith(ffmpegName));
+        if (!file) {
+            throw new Error(`Archive did not contain "${ffmpegName}".`);
+        }
+        // Extract file to cache.
+        await fs.mkdirp(path.dirname(ffmpegCachedPath));
+        await new Promise((resolve, reject) => {
+            file.stream()
+                .pipe(fs.createWriteStream(ffmpegCachedPath))
+                .on('finish', resolve)
+                .on('error', reject);
+        });
+        console.warn(`Downloaded ffmpeg shared library { version: "${electronVersion}", dist: "${electronDist}" }.`);
+    }
+    if (shouldReplace) {
+        await fs.copy(ffmpegCachedPath, ffmpegPath);
+        console.warn(`Successfully replaced "${ffmpegPath}".`);
+    }
+}
+exports.replaceFfmpeg = replaceFfmpeg;
+async function readElectronVersion(electronDist) {
+    const electronVersionFilePath = path.resolve(electronDist, 'version');
+    const version = await fs.readFile(electronVersionFilePath, 'utf8');
+    return version.trim();
+}
+exports.readElectronVersion = readElectronVersion;
 //# sourceMappingURL=replace-ffmpeg.js.map

package/native/ffmpeg.c

@@ -1,146 +1,146 @@
-// *****************************************************************************
-// Copyright (C) 2019 Ericsson and others.
-//
-// This program and the accompanying materials are made available under the
-// terms of the Eclipse Public License v. 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0.
-//
-// This Source Code may also be made available under the following Secondary
-// Licenses when the conditions for such availability set forth in the Eclipse
-// Public License v. 2.0 are satisfied: GNU General Public License, version 2
-// with the GNU Classpath Exception which is available at
-// https://www.gnu.org/software/classpath/license.html.
-//
-// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
-// *****************************************************************************
-
-/**
- * https://nodejs.org/docs/latest-v10.x/api/n-api.html#n_api_n_api
- */
-#include <node_api.h>
-
-#include <string.h>
-
-#include "ffmpeg.h"
-
-/**
- * Return the list of codecs registered in the FFMPEG library.
- */
-napi_value codecs(napi_env env, napi_callback_info info)
-{
-    // We will reuse this `status` for all napi calls.
-    napi_status status;
-    char *error = NULL;
-
-    // Get arguments.
-    size_t argc = 1;
-    napi_value argv[1];
-    status = napi_get_cb_info(env, info, &argc, argv, NULL, NULL);
-    if (status != napi_ok || argc < 1)
-    {
-        error = "invalid arguments";
-        goto error;
-    }
-
-    // Get first argument as string.
-    char path[2048];
-    status = napi_get_value_string_utf8(env, argv[0], path, 2048, NULL);
-    if (status != napi_ok)
-    {
-        error = "invalid string argument";
-        goto error;
-    }
-
-    // Load ffmpeg based on the provided path.
-    struct FFMPEG_Library ffmpeg = NULL_FFMPEG_LIBRARY;
-    char *load_error = load_ffmpeg_library(&ffmpeg, path);
-    if (load_error != NULL)
-    {
-        error = load_error;
-        goto error;
-    }
-
-    // Create the JavaScript list that will be returned.
-    napi_value codecs;
-    status = napi_create_array(env, &codecs);
-    if (status != napi_ok)
-    {
-        error = "napi_create_array fail";
-        goto error;
-    }
-
-    // Iterate over the codec descriptions.
-    // It includes descriptions for codecs that may not be present in the library.
-    struct AVCodecDescriptor *descriptor = ffmpeg.avcodec_descriptor_next(NULL);
-    while (descriptor != NULL)
-    {
-        // Try to fetch the codec being described, returns null on missing codecs.
-        struct AVCodec *decoder = ffmpeg.avcodec_find_decoder(descriptor->id);
-        if (decoder != NULL)
-        {
-            // Create the codec object and assign the properties.
-            napi_value object, value;
-            napi_create_object(env, &object);
-
-            // id: number
-            napi_create_int32(env, decoder->id, &value);
-            napi_set_named_property(env, object, "id", value);
-
-            // name: string
-            napi_create_string_utf8(env, decoder->name, strlen(decoder->name), &value);
-            napi_set_named_property(env, object, "name", value);
-
-            // longName: string
-            napi_create_string_utf8(env, decoder->long_name, strlen(decoder->long_name), &value);
-            napi_set_named_property(env, object, "longName", value);
-
-            // Pushing into a JS array requires calling the JS method for that.
-            napi_value push_fn;
-            napi_get_named_property(env, codecs, "push", &push_fn);
-            napi_call_function(env, codecs, push_fn, 1, (napi_value[]){object}, NULL);
-        }
-        descriptor = ffmpeg.avcodec_descriptor_next(descriptor);
-    }
-
-    // Free the ffmpeg library.
-    char *unload_error = unload_ffmpeg_library(&ffmpeg);
-    if (unload_error != NULL)
-    {
-        error = unload_error;
-        goto error;
-    }
-
-    return codecs;
-
-error:
-    if (error != NULL)
-    {
-        napi_throw_error(env, NULL, error);
-    }
-    return NULL;
-}
-
-/**
- * https://nodejs.org/docs/latest-v10.x/api/n-api.html#n_api_module_registration
- */
-napi_value initialize(napi_env env, napi_value exports)
-{
-    napi_status status;
-    napi_value function_codecs;
-
-    status = napi_create_function(env, NULL, 0, codecs, NULL, &function_codecs);
-    if (status != napi_ok)
-    {
-        return NULL;
-    }
-
-    status = napi_set_named_property(env, exports, "codecs", function_codecs);
-    if (status != napi_ok)
-    {
-        return NULL;
-    }
-
-    return exports;
-}
-
-NAPI_MODULE(NODE_GYP_MODULE_NAME, initialize);
+// *****************************************************************************
+// Copyright (C) 2019 Ericsson and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
+// *****************************************************************************
+
+/**
+ * https://nodejs.org/docs/latest-v10.x/api/n-api.html#n_api_n_api
+ */
+#include <node_api.h>
+
+#include <string.h>
+
+#include "ffmpeg.h"
+
+/**
+ * Return the list of codecs registered in the FFMPEG library.
+ */
+napi_value codecs(napi_env env, napi_callback_info info)
+{
+    // We will reuse this `status` for all napi calls.
+    napi_status status;
+    char *error = NULL;
+
+    // Get arguments.
+    size_t argc = 1;
+    napi_value argv[1];
+    status = napi_get_cb_info(env, info, &argc, argv, NULL, NULL);
+    if (status != napi_ok || argc < 1)
+    {
+        error = "invalid arguments";
+        goto error;
+    }
+
+    // Get first argument as string.
+    char path[2048];
+    status = napi_get_value_string_utf8(env, argv[0], path, 2048, NULL);
+    if (status != napi_ok)
+    {
+        error = "invalid string argument";
+        goto error;
+    }
+
+    // Load ffmpeg based on the provided path.
+    struct FFMPEG_Library ffmpeg = NULL_FFMPEG_LIBRARY;
+    char *load_error = load_ffmpeg_library(&ffmpeg, path);
+    if (load_error != NULL)
+    {
+        error = load_error;
+        goto error;
+    }
+
+    // Create the JavaScript list that will be returned.
+    napi_value codecs;
+    status = napi_create_array(env, &codecs);
+    if (status != napi_ok)
+    {
+        error = "napi_create_array fail";
+        goto error;
+    }
+
+    // Iterate over the codec descriptions.
+    // It includes descriptions for codecs that may not be present in the library.
+    struct AVCodecDescriptor *descriptor = ffmpeg.avcodec_descriptor_next(NULL);
+    while (descriptor != NULL)
+    {
+        // Try to fetch the codec being described, returns null on missing codecs.
+        struct AVCodec *decoder = ffmpeg.avcodec_find_decoder(descriptor->id);
+        if (decoder != NULL)
+        {
+            // Create the codec object and assign the properties.
+            napi_value object, value;
+            napi_create_object(env, &object);
+
+            // id: number
+            napi_create_int32(env, decoder->id, &value);
+            napi_set_named_property(env, object, "id", value);
+
+            // name: string
+            napi_create_string_utf8(env, decoder->name, strlen(decoder->name), &value);
+            napi_set_named_property(env, object, "name", value);
+
+            // longName: string
+            napi_create_string_utf8(env, decoder->long_name, strlen(decoder->long_name), &value);
+            napi_set_named_property(env, object, "longName", value);
+
+            // Pushing into a JS array requires calling the JS method for that.
+            napi_value push_fn;
+            napi_get_named_property(env, codecs, "push", &push_fn);
+            napi_call_function(env, codecs, push_fn, 1, (napi_value[]){object}, NULL);
+        }
+        descriptor = ffmpeg.avcodec_descriptor_next(descriptor);
+    }
+
+    // Free the ffmpeg library.
+    char *unload_error = unload_ffmpeg_library(&ffmpeg);
+    if (unload_error != NULL)
+    {
+        error = unload_error;
+        goto error;
+    }
+
+    return codecs;
+
+error:
+    if (error != NULL)
+    {
+        napi_throw_error(env, NULL, error);
+    }
+    return NULL;
+}
+
+/**
+ * https://nodejs.org/docs/latest-v10.x/api/n-api.html#n_api_module_registration
+ */
+napi_value initialize(napi_env env, napi_value exports)
+{
+    napi_status status;
+    napi_value function_codecs;
+
+    status = napi_create_function(env, NULL, 0, codecs, NULL, &function_codecs);
+    if (status != napi_ok)
+    {
+        return NULL;
+    }
+
+    status = napi_set_named_property(env, exports, "codecs", function_codecs);
+    if (status != napi_ok)
+    {
+        return NULL;
+    }
+
+    return exports;
+}
+
+NAPI_MODULE(NODE_GYP_MODULE_NAME, initialize);

package/native/ffmpeg.h

@@ -1,80 +1,80 @@
-#ifndef FFMPEG_H
-#define FFMPEG_H
-/**
- * THIS FILE REDEFINES DATA AS RETURNED BY THE FFMPEG LIBRARY.
- * HEADER FILES ARE NOT DISTRIBUTED IN OUR SETUP, HENCE THIS.
- */
-
-/**
- * https://github.com/FFmpeg/FFmpeg/blob/release/3.2/libavutil/avutil.h#L193-L201
- */
-enum AVMediaType
-{
-    _UNKNOWN_DATA_AVMediaType = -1,
-};
-
-/**
- * https://github.com/FFmpeg/FFmpeg/blob/release/3.2/libavcodec/avcodec.h#L191-L653
- */
-enum AVCodecID
-{
-    __UNKNOWN_DATA_AVCodecID = 0,
-};
-
-/**
- * https://github.com/FFmpeg/FFmpeg/blob/release/3.2/libavcodec/avcodec.h#L3611-L3721
- */
-struct AVCodec
-{
-    const char *name, *long_name;
-    enum AVMediaType type;
-    enum AVCodecID id;
-};
-
-/**
- * https://github.com/FFmpeg/FFmpeg/blob/release/3.2/libavcodec/avcodec.h#L660-L688
- */
-struct AVCodecDescriptor
-{
-    enum AVCodecID id;
-    enum AVMediaType type;
-    const char *name, *long_name;
-};
-
-/**
- * Wrapper around the ffmpeg library that must be loaded at runtime.
- */
-struct FFMPEG_Library
-{
-    void *handle;
-
-    /**
-     * https://github.com/FFmpeg/FFmpeg/blob/release/3.2/libavcodec/avcodec.h#L6228
-     *
-     * We use AVCodecDescriptor because it is the only structure that we can
-     * query on all platforms. Windows' ffmpeg.dll does not export a
-     * `av_codec_next` function, only `avcodec_descriptor_next`.
-     * Also it seems that this "descriptor" concept is the recommended API.
-     */
-    struct AVCodecDescriptor *(*avcodec_descriptor_next)(const struct AVCodecDescriptor *);
-
-    /**
-     * https://github.com/FFmpeg/FFmpeg/blob/release/3.2/libavcodec/avcodec.h#L4646
-     */
-    struct AVCodec *(*avcodec_find_decoder)(enum AVCodecID);
-};
-
-#define NULL_FFMPEG_LIBRARY \
-    (struct FFMPEG_Library) { NULL, NULL, NULL }
-
-/**
- * Loader that will inject the loaded functions into a FFMPEG_Library structure.
- */
-char *load_ffmpeg_library(struct FFMPEG_Library *library, char *library_path);
-
-/**
- * Free library.
- */
-char *unload_ffmpeg_library(struct FFMPEG_Library *library);
-
-#endif // FFMPEG_H guard
+#ifndef FFMPEG_H
+#define FFMPEG_H
+/**
+ * THIS FILE REDEFINES DATA AS RETURNED BY THE FFMPEG LIBRARY.
+ * HEADER FILES ARE NOT DISTRIBUTED IN OUR SETUP, HENCE THIS.
+ */
+
+/**
+ * https://github.com/FFmpeg/FFmpeg/blob/release/3.2/libavutil/avutil.h#L193-L201
+ */
+enum AVMediaType
+{
+    _UNKNOWN_DATA_AVMediaType = -1,
+};
+
+/**
+ * https://github.com/FFmpeg/FFmpeg/blob/release/3.2/libavcodec/avcodec.h#L191-L653
+ */
+enum AVCodecID
+{
+    __UNKNOWN_DATA_AVCodecID = 0,
+};
+
+/**
+ * https://github.com/FFmpeg/FFmpeg/blob/release/3.2/libavcodec/avcodec.h#L3611-L3721
+ */
+struct AVCodec
+{
+    const char *name, *long_name;
+    enum AVMediaType type;
+    enum AVCodecID id;
+};
+
+/**
+ * https://github.com/FFmpeg/FFmpeg/blob/release/3.2/libavcodec/avcodec.h#L660-L688
+ */
+struct AVCodecDescriptor
+{
+    enum AVCodecID id;
+    enum AVMediaType type;
+    const char *name, *long_name;
+};
+
+/**
+ * Wrapper around the ffmpeg library that must be loaded at runtime.
+ */
+struct FFMPEG_Library
+{
+    void *handle;
+
+    /**
+     * https://github.com/FFmpeg/FFmpeg/blob/release/3.2/libavcodec/avcodec.h#L6228
+     *
+     * We use AVCodecDescriptor because it is the only structure that we can
+     * query on all platforms. Windows' ffmpeg.dll does not export a
+     * `av_codec_next` function, only `avcodec_descriptor_next`.
+     * Also it seems that this "descriptor" concept is the recommended API.
+     */
+    struct AVCodecDescriptor *(*avcodec_descriptor_next)(const struct AVCodecDescriptor *);
+
+    /**
+     * https://github.com/FFmpeg/FFmpeg/blob/release/3.2/libavcodec/avcodec.h#L4646
+     */
+    struct AVCodec *(*avcodec_find_decoder)(enum AVCodecID);
+};
+
+#define NULL_FFMPEG_LIBRARY \
+    (struct FFMPEG_Library) { NULL, NULL, NULL }
+
+/**
+ * Loader that will inject the loaded functions into a FFMPEG_Library structure.
+ */
+char *load_ffmpeg_library(struct FFMPEG_Library *library, char *library_path);
+
+/**
+ * Free library.
+ */
+char *unload_ffmpeg_library(struct FFMPEG_Library *library);
+
+#endif // FFMPEG_H guard