@theia/ffmpeg 1.48.0 → 1.48.1

package/native/linux-ffmpeg.c

@@ -1,68 +1,68 @@
-// *****************************************************************************
-// 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
-// *****************************************************************************
-
-#ifndef LINUX_FFMPEG
-#define LINUX_FFMPEG
-
-#include <stdlib.h>
-#include <dlfcn.h>
-
-#include "ffmpeg.h"
-
-char *load_ffmpeg_library(struct FFMPEG_Library *library, char *library_path)
-{
-    void *handle = dlopen(library_path, RTLD_NOW);
-    char *error = dlerror();
-    if (error != NULL)
-    {
-        goto error;
-    }
-
-    struct AVCodecDescriptor *(*avcodec_descriptor_next)(const struct AVCodecDescriptor *) = dlsym(handle, "avcodec_descriptor_next");
-    error = dlerror();
-    if (error != NULL)
-    {
-        goto error;
-    }
-
-    struct AVCodec *(*avcodec_find_decoder)(enum AVCodecID) = dlsym(handle, "avcodec_find_decoder");
-    error = dlerror();
-    if (error != NULL)
-    {
-        goto error;
-    }
-
-    library->handle = handle;
-    library->avcodec_descriptor_next = avcodec_descriptor_next;
-    library->avcodec_find_decoder = avcodec_find_decoder;
-    return NULL;
-
-error:
-    if (handle != NULL)
-    {
-        dlclose(handle);
-    }
-    return error;
-}
-
-char *unload_ffmpeg_library(struct FFMPEG_Library *library)
-{
-    dlclose(library->handle);
-    *library = NULL_FFMPEG_LIBRARY;
-    return dlerror();
-}
-
-#endif // LINUX_FFMPEG guard
+// *****************************************************************************
+// 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
+// *****************************************************************************
+
+#ifndef LINUX_FFMPEG
+#define LINUX_FFMPEG
+
+#include <stdlib.h>
+#include <dlfcn.h>
+
+#include "ffmpeg.h"
+
+char *load_ffmpeg_library(struct FFMPEG_Library *library, char *library_path)
+{
+    void *handle = dlopen(library_path, RTLD_NOW);
+    char *error = dlerror();
+    if (error != NULL)
+    {
+        goto error;
+    }
+
+    struct AVCodecDescriptor *(*avcodec_descriptor_next)(const struct AVCodecDescriptor *) = dlsym(handle, "avcodec_descriptor_next");
+    error = dlerror();
+    if (error != NULL)
+    {
+        goto error;
+    }
+
+    struct AVCodec *(*avcodec_find_decoder)(enum AVCodecID) = dlsym(handle, "avcodec_find_decoder");
+    error = dlerror();
+    if (error != NULL)
+    {
+        goto error;
+    }
+
+    library->handle = handle;
+    library->avcodec_descriptor_next = avcodec_descriptor_next;
+    library->avcodec_find_decoder = avcodec_find_decoder;
+    return NULL;
+
+error:
+    if (handle != NULL)
+    {
+        dlclose(handle);
+    }
+    return error;
+}
+
+char *unload_ffmpeg_library(struct FFMPEG_Library *library)
+{
+    dlclose(library->handle);
+    *library = NULL_FFMPEG_LIBRARY;
+    return dlerror();
+}
+
+#endif // LINUX_FFMPEG guard

package/native/mac-ffmpeg.c

@@ -1,26 +1,26 @@
-// *****************************************************************************
-// 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
-// *****************************************************************************
-
-#ifndef MAC_FFMPEG
-#define MAC_FFMPEG
-
-/**
- * Mac seems to use the same libraries as Linux.
- * Difference is that the compiler doesn't need to be told to use `-ldl`.
- */
-#include "./linux-ffmpeg.c"
-
-#endif // MAC_FFMPEG guard
+// *****************************************************************************
+// 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
+// *****************************************************************************
+
+#ifndef MAC_FFMPEG
+#define MAC_FFMPEG
+
+/**
+ * Mac seems to use the same libraries as Linux.
+ * Difference is that the compiler doesn't need to be told to use `-ldl`.
+ */
+#include "./linux-ffmpeg.c"
+
+#endif // MAC_FFMPEG guard

package/native/win-ffmpeg.c

@@ -1,77 +1,77 @@
-// *****************************************************************************
-// 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
-// *****************************************************************************
-#ifndef WIN_FFMPEG
-#define WIN_FFMPEG
-
-#include <windows.h>
-
-#include "ffmpeg.h"
-
-static char *error_library_not_found = "shared library not found";
-static char *error_function_not_found = "function not found in shared library";
-static char *error_cannot_free_library = "cannot free shared library";
-
-char *load_ffmpeg_library(struct FFMPEG_Library *library, char *library_path)
-{
-    char *error = NULL;
-
-    HMODULE handle = LoadLibrary(library_path);
-    if (!handle)
-    {
-        error = error_library_not_found;
-        goto error;
-    }
-
-    struct AVCodecDescriptor *(*av_codec_next)(const struct AVCodecDescriptor *) = (struct AVCodecDescriptor * (*)(const struct AVCodecDescriptor *))
-        GetProcAddress(handle, "avcodec_descriptor_next");
-    if (!av_codec_next)
-    {
-        error = error_function_not_found;
-        goto error;
-    }
-
-    struct AVCodec *(*avcodec_find_decoder)(enum AVCodecID) = (struct AVCodec * (*)(enum AVCodecID))
-        GetProcAddress(handle, "avcodec_find_decoder");
-    if (!avcodec_find_decoder)
-    {
-        error = error_function_not_found;
-        goto error;
-    }
-
-    library->handle = handle;
-    library->avcodec_descriptor_next = av_codec_next;
-    library->avcodec_find_decoder = avcodec_find_decoder;
-    return NULL;
-
-error:
-    if (handle)
-    {
-        FreeLibrary(handle);
-    }
-    return error;
-}
-
-char *unload_ffmpeg_library(struct FFMPEG_Library *library)
-{
-    if (library->handle && FreeLibrary(library->handle))
-    {
-        *library = NULL_FFMPEG_LIBRARY;
-        return NULL;
-    }
-    return error_cannot_free_library;
-}
-
-#endif // WIN_FFMPEG guard
+// *****************************************************************************
+// 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
+// *****************************************************************************
+#ifndef WIN_FFMPEG
+#define WIN_FFMPEG
+
+#include <windows.h>
+
+#include "ffmpeg.h"
+
+static char *error_library_not_found = "shared library not found";
+static char *error_function_not_found = "function not found in shared library";
+static char *error_cannot_free_library = "cannot free shared library";
+
+char *load_ffmpeg_library(struct FFMPEG_Library *library, char *library_path)
+{
+    char *error = NULL;
+
+    HMODULE handle = LoadLibrary(library_path);
+    if (!handle)
+    {
+        error = error_library_not_found;
+        goto error;
+    }
+
+    struct AVCodecDescriptor *(*av_codec_next)(const struct AVCodecDescriptor *) = (struct AVCodecDescriptor * (*)(const struct AVCodecDescriptor *))
+        GetProcAddress(handle, "avcodec_descriptor_next");
+    if (!av_codec_next)
+    {
+        error = error_function_not_found;
+        goto error;
+    }
+
+    struct AVCodec *(*avcodec_find_decoder)(enum AVCodecID) = (struct AVCodec * (*)(enum AVCodecID))
+        GetProcAddress(handle, "avcodec_find_decoder");
+    if (!avcodec_find_decoder)
+    {
+        error = error_function_not_found;
+        goto error;
+    }
+
+    library->handle = handle;
+    library->avcodec_descriptor_next = av_codec_next;
+    library->avcodec_find_decoder = avcodec_find_decoder;
+    return NULL;
+
+error:
+    if (handle)
+    {
+        FreeLibrary(handle);
+    }
+    return error;
+}
+
+char *unload_ffmpeg_library(struct FFMPEG_Library *library)
+{
+    if (library->handle && FreeLibrary(library->handle))
+    {
+        *library = NULL_FFMPEG_LIBRARY;
+        return NULL;
+    }
+    return error_cannot_free_library;
+}
+
+#endif // WIN_FFMPEG guard

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@theia/ffmpeg",
-  "version": "1.48.0",
+  "version": "1.48.1",
   "description": "Theia FFMPEG reader utility.",
   "publishConfig": {
     "access": "public"
@@ -35,5 +35,5 @@
   "devDependencies": {
     "@types/unzipper": "^0.9.2"
   },
-  "gitHead": "ffae6a0739f7924a7cacafeb5ceb1140d93fe010"
+  "gitHead": "04c631933dfd14f58d1df5b9b28dd5596c84ec04"
 }

package/src/check-ffmpeg.ts

@@ -1,56 +1,56 @@
-// *****************************************************************************
-// 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
-// *****************************************************************************
-
-import * as ffmpeg from './ffmpeg';
-
-export interface CheckFfmpegOptions extends ffmpeg.FfmpegOptions {
-    json?: boolean
-}
-
-export interface CheckFfmpegResult {
-    free: ffmpeg.Codec[],
-    proprietary: ffmpeg.Codec[],
-}
-
-export const KNOWN_PROPRIETARY_CODECS = new Set(['h264', 'aac']);
-
-export async function checkFfmpeg(options: CheckFfmpegOptions = {}): Promise<void> {
-    const {
-        ffmpegPath = ffmpeg.ffmpegAbsolutePath(options),
-        json = false,
-    } = options;
-    const codecs = ffmpeg.getFfmpegCodecs(ffmpegPath);
-    const free = [];
-    const proprietary = [];
-    for (const codec of codecs) {
-        if (KNOWN_PROPRIETARY_CODECS.has(codec.name.toLowerCase())) {
-            proprietary.push(codec);
-        } else {
-            free.push(codec);
-        }
-    }
-    if (json) {
-        // Pretty format JSON on stdout.
-        const result: CheckFfmpegResult = { free, proprietary };
-        console.log(JSON.stringify(result, undefined, 2));
-    }
-    if (proprietary.length > 0) {
-        // Should be displayed on stderr to not pollute the JSON on stdout.
-        throw new Error(`${proprietary.length} proprietary codecs found\n${proprietary.map(codec => `> ${codec.name} detected (${codec.longName})`).join('\n')}`);
-    }
-    // Print to stderr to not pollute the JSON on stdout.
-    console.warn(`"${ffmpegPath}" does not contain proprietary codecs (${codecs.length} found).`);
-}
+// *****************************************************************************
+// 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
+// *****************************************************************************
+
+import * as ffmpeg from './ffmpeg';
+
+export interface CheckFfmpegOptions extends ffmpeg.FfmpegOptions {
+    json?: boolean
+}
+
+export interface CheckFfmpegResult {
+    free: ffmpeg.Codec[],
+    proprietary: ffmpeg.Codec[],
+}
+
+export const KNOWN_PROPRIETARY_CODECS = new Set(['h264', 'aac']);
+
+export async function checkFfmpeg(options: CheckFfmpegOptions = {}): Promise<void> {
+    const {
+        ffmpegPath = ffmpeg.ffmpegAbsolutePath(options),
+        json = false,
+    } = options;
+    const codecs = ffmpeg.getFfmpegCodecs(ffmpegPath);
+    const free = [];
+    const proprietary = [];
+    for (const codec of codecs) {
+        if (KNOWN_PROPRIETARY_CODECS.has(codec.name.toLowerCase())) {
+            proprietary.push(codec);
+        } else {
+            free.push(codec);
+        }
+    }
+    if (json) {
+        // Pretty format JSON on stdout.
+        const result: CheckFfmpegResult = { free, proprietary };
+        console.log(JSON.stringify(result, undefined, 2));
+    }
+    if (proprietary.length > 0) {
+        // Should be displayed on stderr to not pollute the JSON on stdout.
+        throw new Error(`${proprietary.length} proprietary codecs found\n${proprietary.map(codec => `> ${codec.name} detected (${codec.longName})`).join('\n')}`);
+    }
+    // Print to stderr to not pollute the JSON on stdout.
+    console.warn(`"${ffmpegPath}" does not contain proprietary codecs (${codecs.length} found).`);
+}