-
Notifications
You must be signed in to change notification settings - Fork 76
Permalink
Choose a base ref
{{ refName }}
default
Choose a head ref
{{ refName }}
default
Checking mergeability…
Don’t worry, you can still create the pull request.
Comparing changes
Choose two branches to see what’s changed or to start a new pull request.
If you need to, you can also or
learn more about diff comparisons.
Open a pull request
Create a new pull request by comparing changes across two branches. If you need to, you can also .
Learn more about diff comparisons here.
base repository: Streampunk/beamcoder
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Could not load branches
Nothing to show
Loading
Could not load tags
Nothing to show
{{ refName }}
default
Loading
...
head repository: descriptinc/beamcoder
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Could not load branches
Nothing to show
Loading
Could not load tags
Nothing to show
{{ refName }}
default
Loading
- 2 commits
- 15 files changed
- 8 contributors
Commits on Nov 10, 2021
-
Merge pull request #8 from Streampunk/master
Merge in latest beamcoder v0.6.15 GPL-3.0-or-later
Configuration menu - View commit details
-
Copy full SHA for ffb4b56 - Browse repository at this point
Copy the full SHA ffb4b56View commit details
Commits on May 30, 2023
-
* experimental prebuild * skip preinstall, install native deps on linux * npm run lint * run install_ffmpeg, prebuild differently? * try to fix mac (update homebrew) and windows builds (gh token) * maybe fix macos build, add electron builds * update deps, files list, install script * update package version * include dll files in build, remove electron ones (doesn't seem like we need them with napi) * try to get build working on windows, cleanup github action script * try another approach to prebuilding * copy mac libraries in * try caret escape * let's go windows * come onnnnn * if this doesn't work… * update copy_mac_libs to recurse * change logging in copy_mac_libs * do not try to rebuild with prebuild version * set -id in copy_mac_libs * better log output in copy_mac_libs * disable copy_mac_libs to test * use loader_path instead of rpath (to search for library relative to the .node file) * fix stream.metadata type definition * try arm64 build * 0.6.10-rc.8 * Use custom shared libraries from ffmpeg-build-scripts fork instead of homebrew (#2) * use custom shared libraries from ffmpeg-build-scripts fork instead of homebrew * add ffmpegPath and ffprobePath on main module * include dirs * skip arm64 build * rc10 * handle symlinks when unzipping * Update package.json * skip prebuild install when trying to build the prebuilds :-) * Update package.json * Update package.json * Update package.json * patch-package is dev dep * dev patch-packages * paths entry point * path types * Update package.json * fixes * version bump * don't patch-package for normal install * Update package.json * console error if --enable-small * try to include ffmpeg/ffprobe from ffmpeg-ffprobe-static for linux/windows builds * try regex again * windows escaping courtesy of https://octopus.com/blog/powershell-pipe-escaping * bash?? * rc4 -- should have a better way to update that * Update package.json * cleanup * Update paths.js * Update paths.d.ts * Update package.json * Update .github/workflows/prebuild.yml Co-authored-by: Marcello Bastéa-Forte <marcello@descript.com> * Update .github/workflows/prebuild.yml Co-authored-by: Marcello Bastéa-Forte <marcello@descript.com> * PR feedback * Create .node-version Co-authored-by: Marcello Bastéa-Forte <marcello@descript.com> * Attempt to fix types for paths * ... * treat warnings as errors * fix config error * bump version number * do not add .exe to beamcoder.node on windows * bump versions (#5) * ffmpeg-ffprobe-static update (#6) * Update to latest ffmpeg-ffprobe-static * use ubuntu 18.04 (ffmpeg ppa not available for 20.04) * Cvanwink/arm 3 (#9) * Fix definition for metadata property * Remove unneeded import * Stop input and output links sorting by name * Ensure decoder is created from codec_id if available * v0.6.11 * build with debug symbols (temporary) * chore: upgrade dependencies to FFmpeg 4.4 - fixes broken build * chore: version bump for publish * Improved handling of FFmpeg minor version changes * Remove redundant setter leading to channel layout warning message * Bump path-parse from 1.0.6 to 1.0.7 Bumps [path-parse](https://github.com/jbgutierrez/path-parse) from 1.0.6 to 1.0.7. - [Release notes](https://github.com/jbgutierrez/path-parse/releases) - [Commits](https://github.com/jbgutierrez/path-parse/commits/v1.0.7) --- updated-dependencies: - dependency-name: path-parse dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> * Add support for hardware accelerated decoding * Fix zero size frame, update version * Update CircleCI test image * Update cache tag * Build info for CircleCI test image * Simplify decoder hwaccel flag * better stab at versioning * bump version * one more version * hack for missing definitions in latest ffmpeg? * Download proper build of ffmpeg from our repo for arm64 * Add arm64 paths for building beamcoder * update node version to run as a native arm64 process when building beamcoder https://descript-inc.slack.com/archives/C01G891V16Z/p1637013049098700 * fix const vs let usage * Bump package version to pick up new arm64 build of ffmpeg * Fix getting ffmpeg build on x86_64 vs x64 * Add new package-lock * Build release for both x86_64 and arm64 * Build beamcoder based off of target_arch and not host_arch * Try to get both ffmpeg versions downloaded on macOS * Try to clean build directory in-between x64 and arm64 * Try verbose output to see why CI can't build arm64 * fix position of --verbose flag * bump node version to 17.0.1 so it can maybe cross-compile * Try CI node version 16.13.0 since that matches what is on the GitHub OS image * Don't clean build directory * Fix node packaging for x64 on macOS * Update to latest FFmpeg build * Fix version string to not have extra 'v' * Update Beamcoder to 1.33rc3 * v0.6.10-rc.41 * Update Windows ffmpeg to 4.4 * v0.6.10-rc.42 * Revert "Update Windows ffmpeg to 4.4" This reverts commit 1073fb2. * fix bad merge * Fix another merge error * Fix ffmpeg extraction on windows * add verbose tag for windows * try prebuild on windows without bash * v0.6.15-rc.2 * Revert "try prebuild on windows without bash" This reverts commit d5784ae. * try git-bash instead of bash * try specific bash * quote the temp path * no quote and no escape for temp path * go back to using bash on windows * temporarily comment out ffprobe which doesn't seem to be available * restore ffmpeg copies * Fix regex on windows * v0.6.15-rc.3 * 0.6.15-rc.4 * Try using FFmpeg shared instead of static on Windows * Revert "Try using FFmpeg shared instead of static on Windows" This reverts commit 721001f. * Update ffmpeg-ffprobe-static to 4.4.0-rc.11 * v0.6.15-rc.6 * #85 Add arm64 to supported linux platforms * add linux arm64 prebuild --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Simon Rogers <scriptorian@streampunk.media> Co-authored-by: Steve Rubin <nerdforlife@gmail.com> Co-authored-by: Richard Cartwright <spark@streampunk.media> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Simon Rogers <scriptorian@users.noreply.github.com> * update package lock * Update package-lock.json * try including libzimg and checking deps * Update prebuild.yml * Update install_ffmpeg.js * Update install_ffmpeg.js * force latest node-gyp to fix incompat between python 3.11 and node-gyp 6 * try statically linking libstdc++ * Update package.json * Update binding.gyp * Update package.json * build on ubuntu 20 * i don't think these were doing anything --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Steve Rubin <nerdforlife@gmail.com> Co-authored-by: Charles Van Winkle <1332142+cvanwinkle@users.noreply.github.com> Co-authored-by: Simon Rogers <scriptorian@streampunk.media> Co-authored-by: Richard Cartwright <spark@streampunk.media> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Simon Rogers <scriptorian@users.noreply.github.com>
Configuration menu - View commit details
-
Copy full SHA for 06b843d - Browse repository at this point
Copy the full SHA 06b843dView commit details
Loading
This comparison is taking too long to generate.
Unfortunately it looks like we can’t render this comparison for you right now. It might be too big, or there might be something weird with your repository.
You can try running this command locally to see the comparison on your machine:
git diff master...master