@scrypted/libav 1.0.172 → 1.0.173

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scrypted/libav",
-  "version": "1.0.172",
+  "version": "1.0.173",
   "dependencies": {
     "detect-libc": "^2.0.3",
     "follow-redirects": "^1.15.9",

package/.vscode/launch.json

@@ -1,23 +0,0 @@
-{
-    // Use IntelliSense to learn about possible attributes.
-    // Hover to view descriptions of existing attributes.
-    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
-    "version": "0.2.0",
-    "configurations": [
-        {
-            "name": "ts-node",
-            "type": "node",
-            "request": "launch",
-            "args": [
-                "${workspaceRoot}/test/read-receive-send-receive.ts"
-            ],
-            "preLaunchTask": "npm: build",
-            "runtimeArgs": [
-                "-r",
-                "ts-node/register"
-            ],
-            "cwd": "${workspaceRoot}",
-            "internalConsoleOptions": "openOnSessionStart"
-        }
-    ]
-}

package/.vscode/settings.json

@@ -1,32 +0,0 @@
-{
-    "files.associations": {
-        "*.yml": "yaml",
-        "locale": "cpp",
-        "regex": "cpp",
-        "string": "cpp",
-        "__locale": "cpp",
-        "stdexcept": "cpp",
-        "__config": "c",
-        "string_view": "cpp",
-        "typeinfo": "cpp",
-        "variant": "cpp",
-        "ios": "c",
-        "avfilter.h": "c",
-        "any": "cpp",
-        "vector": "cpp",
-        "array": "cpp",
-        "__hash_table": "c",
-        "atomic": "c",
-        "bitset": "c",
-        "iterator": "c",
-        "memory": "c",
-        "sstream": "c",
-        "queue": "cpp",
-        "stack": "cpp",
-        "scale_eval.h": "c",
-        "filters.h": "c",
-        "ratio": "cpp",
-        "unordered_map": "cpp",
-        "__bit_reference": "cpp"
-    }
-}

package/darwin.md

@@ -1,24 +0,0 @@
-Mimimum macOS configuration for RTSP, h264, h265, jpg, and videotoolbox.
-
-```sh
-./configure \
-    --disable-everything \
-    --enable-hwaccels \
-    --enable-videotoolbox \
-    --enable-decoder=h264 \
-    --enable-decoder=hevc \
-    --enable-demuxer=rtsp \
-    --enable-muxer=mjpeg \
-    --enable-encoder=mjpeg \
-    --enable-parser=mjpeg \
-    --enable-protocol=tcp \
-    --enable-protocol=udp \
-    --enable-filter=crop \
-    --enable-filter=scale \
-    --enable-filter=scale_vt \
-    --enable-filter=format \
-    --enable-filter=hwdownload \
-    --enable-filter=hwupload \
-    --enable-parser=h264 \
-    --enable-parser=hevc
-```

package/src/bsf.cpp

@@ -1,213 +0,0 @@
-#include "bsf.h"
-#include "packet.h"
-#include "formatcontext.h"
-
-Napi::FunctionReference AVBitstreamFilter::constructor;
-
-Napi::Object AVBitstreamFilter::Init(Napi::Env env, Napi::Object exports)
-{
-    Napi::HandleScope scope(env);
-
-    Napi::Function func = DefineClass(env, "AVBitstreamFilter", {
-
-                                                                      InstanceMethod(Napi::Symbol::WellKnown(env, "dispose"), &AVBitstreamFilter::Destroy),
-
-                                                                      InstanceMethod("destroy", &AVBitstreamFilter::Destroy),
-
-                                                                      InstanceMethod("setOption", &AVBitstreamFilter::SetOption),
-
-                                                                      InstanceMethod("sendPacket", &AVBitstreamFilter::SendPacket),
-
-                                                                      InstanceMethod("copyParameters", &AVBitstreamFilter::CopyParameters),
-
-                                                                      InstanceMethod("receivePacket", &AVBitstreamFilter::ReceivePacket)});
-
-    constructor = Napi::Persistent(func);
-    constructor.SuppressDestruct();
-
-    exports.Set("AVBitstreamFilter", func);
-
-    return exports;
-}
-
-AVBitstreamFilter::AVBitstreamFilter(const Napi::CallbackInfo &info)
-    : Napi::ObjectWrap<AVBitstreamFilter>(info), bsfContext(nullptr)
-{
-    bsfContext = nullptr;
-
-    Napi::Env env = info.Env();
-
-    if (info.Length() < 1 || !info[0].IsString())
-    {
-        Napi::TypeError::New(env, "String expected for argument 0: filter name").ThrowAsJavaScriptException();
-        return;
-    }
-
-    std::string filterName = info[0].As<Napi::String>().Utf8Value();
-
-    const AVBitStreamFilter *filter = av_bsf_get_by_name(filterName.c_str());
-    if (!filter)
-    {
-        Napi::Error::New(env, "Bitstream filter not found").ThrowAsJavaScriptException();
-        return;
-    }
-
-    int ret = av_bsf_alloc(filter, &bsfContext);
-    if (ret < 0)
-    {
-        Napi::Error::New(env, AVErrorString(ret)).ThrowAsJavaScriptException();
-        return;
-    }
-}
-
-AVBitstreamFilter::~AVBitstreamFilter()
-{
-}
-
-Napi::Object AVBitstreamFilter::NewInstance(Napi::Env env, AVBSFContext *bsfContext)
-{
-    Napi::EscapableHandleScope scope(env);
-    Napi::Object obj = constructor.New({});
-    AVBitstreamFilter *instance = Napi::ObjectWrap<AVBitstreamFilter>::Unwrap(obj);
-    instance->bsfContext = bsfContext;
-    return scope.Escape(napi_value(obj)).ToObject();
-}
-
-Napi::Value AVBitstreamFilter::SendPacket(const Napi::CallbackInfo &info)
-{
-    if (info.Length() < 1 || !info[0].IsObject())
-    {
-        Napi::TypeError::New(info.Env(), "Packet object expected").ThrowAsJavaScriptException();
-        return info.Env().Undefined();
-    }
-
-    AVPacketObject *packetObject = Napi::ObjectWrap<AVPacketObject>::Unwrap(info[0].As<Napi::Object>());
-
-    int ret = av_bsf_send_packet(bsfContext, packetObject->packet);
-    if (ret < 0)
-    {
-        Napi::Error::New(info.Env(), AVErrorString(ret)).ThrowAsJavaScriptException();
-        return info.Env().Undefined();
-    }
-
-    return info.Env().Undefined();
-}
-
-Napi::Value AVBitstreamFilter::ReceivePacket(const Napi::CallbackInfo &info)
-{
-    AVPacket *packet = av_packet_alloc();
-    if (!packet)
-    {
-        Napi::Error::New(info.Env(), "Could not allocate packet").ThrowAsJavaScriptException();
-        return info.Env().Undefined();
-    }
-
-    int ret = av_bsf_receive_packet(bsfContext, packet);
-    if (ret == AVERROR(EAGAIN))
-    {
-        av_packet_free(&packet);
-        return info.Env().Undefined();
-    }
-    if (ret < 0)
-    {
-        av_packet_free(&packet);
-        Napi::Error::New(info.Env(), AVErrorString(ret)).ThrowAsJavaScriptException();
-        return info.Env().Undefined();
-    }
-
-    Napi::Object packetObject = AVPacketObject::NewInstance(info.Env(), packet);
-    return packetObject;
-}
-
-Napi::Value AVBitstreamFilter::SetOption(const Napi::CallbackInfo &info)
-{
-    if (!bsfContext)
-    {
-        Napi::TypeError::New(info.Env(), "Bitstream Filter object is null").ThrowAsJavaScriptException();
-        return info.Env().Undefined();
-    }
-
-    Napi::Env env = info.Env();
-
-    if (info.Length() < 1 || !info[0].IsObject())
-    {
-        Napi::TypeError::New(env, "Object expected for argument 0: options").ThrowAsJavaScriptException();
-        return info.Env().Undefined();
-    }
-
-    Napi::Object options = info[0].As<Napi::Object>();
-
-    // convert this options to a AVDictionary
-    AVDictionary *optionsDict = nullptr;
-
-    Napi::Array keys = options.GetPropertyNames();
-    for (unsigned int i = 0; i < keys.Length(); i++)
-    {
-        Napi::Value key = keys.Get(i);
-        Napi::Value value = options.Get(key.ToString());
-
-        if (value.IsString())
-        {
-            std::string keyStr = key.ToString();
-            std::string valueStr = value.ToString();
-
-            av_dict_set(&optionsDict, keyStr.c_str(), valueStr.c_str(), 0);
-        }
-    }
-
-    int ret = av_opt_set_dict2(bsfContext, &optionsDict, AV_OPT_SEARCH_CHILDREN);
-    if (ret < 0)
-    {
-        Napi::Error::New(env, AVErrorString(ret)).ThrowAsJavaScriptException();
-        return info.Env().Undefined();
-    }
-
-    return info.Env().Undefined();
-}
-
-Napi::Value AVBitstreamFilter::Destroy(const Napi::CallbackInfo &info)
-{
-    if (bsfContext)
-    {
-        av_bsf_free(&bsfContext);
-        bsfContext = nullptr;
-    }
-    return info.Env().Undefined();
-}
-
-Napi::Value AVBitstreamFilter::CopyParameters(const Napi::CallbackInfo &info)
-{
-    if (!bsfContext)
-    {
-        Napi::TypeError::New(info.Env(), "Bitstream Filter object is null").ThrowAsJavaScriptException();
-        return info.Env().Undefined();
-    }
-
-    // get the AVFormatContext object and stream index
-    if (info.Length() < 2 || !info[0].IsObject() || !info[1].IsNumber())
-    {
-        Napi::TypeError::New(info.Env(), "Object expected for argument 0: formatContext and Number expected for argument 1: streamIndex").ThrowAsJavaScriptException();
-        return info.Env().Undefined();
-    }
-
-    AVFormatContextObject *formatContextObject = Napi::ObjectWrap<AVFormatContextObject>::Unwrap(info[0].As<Napi::Object>());
-    int streamIndex = info[1].As<Napi::Number>().Int32Value();
-
-    AVStream *stream = formatContextObject->fmt_ctx_->streams[streamIndex];
-
-    int ret = avcodec_parameters_copy(bsfContext->par_in, stream->codecpar);
-    if (ret < 0)
-    {
-        Napi::Error::New(info.Env(), AVErrorString(ret)).ThrowAsJavaScriptException();
-        return info.Env().Undefined();
-    }
-
-    ret = av_bsf_init(bsfContext);
-    if (ret < 0)
-    {
-        Napi::Error::New(info.Env(), AVErrorString(ret)).ThrowAsJavaScriptException();
-        return info.Env().Undefined();
-    }
-
-    return info.Env().Undefined();
-}

package/src/bsf.h

@@ -1,35 +0,0 @@
-#pragma once
-
-#include <napi.h>
-
-extern "C"
-{
-#include <libavfilter/avfilter.h>
-#include <libavfilter/buffersrc.h>
-#include <libavfilter/buffersink.h>
-#include <libavutil/opt.h>
-#include <libavcodec/bsf.h>
-}
-
-#include "error.h"
-
-class AVBitstreamFilter : public Napi::ObjectWrap<AVBitstreamFilter>
-{
-public:
-    static Napi::Object Init(Napi::Env env, Napi::Object exports);
-
-    AVBitstreamFilter(const Napi::CallbackInfo &info);
-    ~AVBitstreamFilter();
-
-    static Napi::Object NewInstance(Napi::Env env, AVBSFContext *bsfContext);
-    AVBSFContext *bsfContext;
-
-private:
-    static Napi::FunctionReference constructor;
-
-    Napi::Value Destroy(const Napi::CallbackInfo &info);
-    Napi::Value SetOption(const Napi::CallbackInfo &info);
-    Napi::Value SendPacket(const Napi::CallbackInfo &info);
-    Napi::Value ReceivePacket(const Napi::CallbackInfo &info);
-    Napi::Value CopyParameters(const Napi::CallbackInfo &info);
-};

package/src/build-ffmpeg-darwin.sh

@@ -1,13 +0,0 @@
-cd $(dirname $0)/../FFmpeg
-
-if [ ! -z "$FFMPEG_NO_REBUILD" ]
-then
-  if [ -f ffmpeg ]
-  then
-    echo "FFmpeg already built, skipping build."
-    exit 0
-  fi
-fi
-
-MACOSX_DEPLOYMENT_TARGET=12.0 ./configure --enable-libopus --disable-xlib --disable-sdl2 --disable-libxcb --enable-opencl --enable-videotoolbox --enable-neon --enable-pthreads --cc=clang && MACOSX_DEPLOYMENT_TARGET=12.0 make -j32
-exit $?

package/src/build-ffmpeg-linux.sh

@@ -1,52 +0,0 @@
-DEBIAN_FRONTEND=noninteractive
-cd $(dirname $0)/../FFmpeg
-
-function check_ffmpeg() {
-  if [ ! -z "$FFMPEG_NO_REBUILD" ]
-  then
-    if [ -f ffmpeg ]
-    then
-      echo "FFmpeg already built, skipping build."
-      exit 0
-    fi
-  fi
-}
-
-sudo apt -y update
-# yasm can be dropped
-sudo apt -y install libva-dev libdrm-dev yasm nasm cmake ocl-icd-opencl-dev
-
-ARCH=$(arch)
-if [ "$ARCH" = "x86_64" ]
-then
-    pushd ../libvpl
-    export VPL_INSTALL_DIR=`pwd`/../_vplinstall
-    cmake -B _build -DCMAKE_INSTALL_PREFIX=$VPL_INSTALL_DIR -DBUILD_SHARED_LIBS=OFF
-    cmake --build _build
-    cmake --install _build
-    export PKG_CONFIG_PATH=$PWD/../_vplinstall/lib/pkgconfig:$PKG_CONFIG_PATH
-    popd
-
-    pushd ../nv-codec-headers
-    make install PREFIX=../_nvinstall
-    export PKG_CONFIG_PATH=$PWD/../_nvinstall/lib/pkgconfig:$PKG_CONFIG_PATH
-    popd
-
-    check_ffmpeg
-
-    echo "Building with NVIDIA GPU and Vulkan support"
-    export PATH=/usr/local/cuda-12.4/bin:$PATH
-    ./configure --enable-libvpl --enable-vaapi --enable-opencl --enable-libglslang --enable-cuda-llvm --enable-nvdec --extra-cflags=-I/usr/local/cuda/include --extra-ldflags=-L/usr/local/cuda/lib64
-else
-    check_ffmpeg
-
-    ./configure --enable-vaapi --enable-opencl
-fi
-
-if [ "$?" != "0" ]
-then
-  exit 1
-fi
-
-make -j32
-exit $?

package/src/build-ffmpeg-msys.sh

@@ -1,41 +0,0 @@
-cd $(dirname $0)
-
-cd ../nv-codec-headers
-make install PREFIX=../_nvinstall
-
-cd ../libvpl
-export VPL_INSTALL_DIR=$PWD/../_vplinstall
-cmake -B _build -DCMAKE_INSTALL_PREFIX=$VPL_INSTALL_DIR -DBUILD_SHARED_LIBS=OFF -DUSE_MSVC_STATIC_RUNTIME=ON -DMINGW_LIBS="-ladvapi32 -lmsvcrt -lole32"
-cmake --build _build --config Release
-cmake --install _build --config Release
-
-cd ../opus
-export OPUS_INSTALL_DIR=$PWD/../_opusinstall
-cmake -B _build -DCMAKE_INSTALL_PREFIX=$OPUS_INSTALL_DIR -DBUILD_SHARED_LIBS=OFF -DUSE_MSVC_STATIC_RUNTIME=ON -DMINGW_LIBS="-ladvapi32 -lmsvcrt -lole32"
-cmake --build _build --config Release
-cmake --install _build --config Release
-
-cd ../FFmpeg
-
-if [ ! -z "$FFMPEG_NO_REBUILD" ]
-then
-  if [ -f ffmpeg.exe ]
-  then
-    echo "FFmpeg already built, skipping build."
-    exit 0
-  fi
-fi
-
-# yasm can be dropped
-pacman --noconfirm -S yasm nasm pkg-config clang diffutils make
-export PKG_CONFIG_PATH=$PWD/../_opusinstall/lib/pkgconfig:$PWD/../_vplinstall/lib/pkgconfig:$PWD/../_nvinstall/lib/pkgconfig:$PWD/../src/pkgconfig
-
-# the --enable-nvdec is necessary for build sanity checking, the build will configure
-# successfully if nvidia stuff is missing, even though it is required for --enable-cuda-llvm
-# no open cl yet, need to do this https://github.com/m-ab-s/media-autobuild_suite/issues/1301#issuecomment-627800902
-
-# this version is the last that has HLSL and OGLCompiler which are still required by ffmpeg for now
-# https://sdk.lunarg.com/sdk/download/1.3.268.0/windows/VulkanSDK-1.3.268.0-Installer.exe
-
-./configure --enable-libopus --enable-libvpl --enable-libglslang --enable-cuda-llvm --enable-nvdec --toolchain=msvc && make -j32
-exit $?

package/src/build-ffmpeg-windows.bat

@@ -1,8 +0,0 @@
-cd /d "%~dp0"
-
-call "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsall.bat" x64
-
-cd ..\src
-C:\msys64\msys2_shell.cmd -defterm -no-start -msys -use-full-path -here -c "bash build-ffmpeg-msys.sh"
-
-exit /b %ERRORLEVEL%