From e15276685c9e3eafaa329ae41092074a0e8452b1 Mon Sep 17 00:00:00 2001 From: Good Guy Date: Thu, 31 Mar 2022 11:34:41 -0600 Subject: [PATCH] version update --- cinelerra-5.1/msg/txt | 6 ++ .../thirdparty/src/ffmpeg-4.4.patch_10 | 67 +++++++++++++++++++ 2 files changed, 73 insertions(+) create mode 100644 cinelerra-5.1/thirdparty/src/ffmpeg-4.4.patch_10 diff --git a/cinelerra-5.1/msg/txt b/cinelerra-5.1/msg/txt index 67038303..8fb1cbff 100644 --- a/cinelerra-5.1/msg/txt +++ b/cinelerra-5.1/msg/txt @@ -3,6 +3,12 @@ For usage help, refer to the following: https://cinelerra-gg.org/download/CinelerraGG_Manual.pdf http://g-raffa.eu/Cinelerra/HOWTO/basics.html . +2022 March changes of note: + A new script, bld_appimage.sh, includes rework of linuxdeploy + in order to create appimages for aarch64 and armhf + x86_64/i686. + Context Help for the Shuttle has been improved for reliability. + New lossless render format for vp9 was added. + BSD compiled CinGG for version 13.0 and 12.3 is available. 2022 February changes of note: Updated libraries: libvpx, libogg, tiff, and fftw to current. 2022 January changes of note: diff --git a/cinelerra-5.1/thirdparty/src/ffmpeg-4.4.patch_10 b/cinelerra-5.1/thirdparty/src/ffmpeg-4.4.patch_10 new file mode 100644 index 00000000..835c3b21 --- /dev/null +++ b/cinelerra-5.1/thirdparty/src/ffmpeg-4.4.patch_10 @@ -0,0 +1,67 @@ +--- ffmpeg-4.4/libavcodec/libdav1d.c 2021-04-09 00:28:39.000000000 +0300 ++++ ffmpeg-4.4/libavcodec/libdav1d.c 2022-03-27 15:54:53.212041349 +0300 +@@ -33,6 +33,9 @@ + #include "decode.h" + #include "internal.h" + ++#define FF_DAV1D_VERSION_AT_LEAST(x,y) \ ++ (DAV1D_API_VERSION_MAJOR > (x) || DAV1D_API_VERSION_MAJOR == (x) && DAV1D_API_VERSION_MINOR >= (y)) ++ + typedef struct Libdav1dContext { + AVClass *class; + Dav1dContext *c; +@@ -145,6 +148,15 @@ + if (dav1d->operating_point >= 0) + s.operating_point = dav1d->operating_point; + ++#if FF_DAV1D_VERSION_AT_LEAST(6,0) ++ if (dav1d->frame_threads || dav1d->tile_threads) ++ s.n_threads = FFMAX(dav1d->frame_threads, dav1d->tile_threads); ++ else ++ s.n_threads = FFMIN(threads, DAV1D_MAX_THREADS); ++ s.max_frame_delay = (c->flags & AV_CODEC_FLAG_LOW_DELAY) ? 1 : s.n_threads; ++ av_log(c, AV_LOG_DEBUG, "Using %d threads, %d max_frame_delay\n", ++ s.n_threads, s.max_frame_delay); ++#else + s.n_tile_threads = dav1d->tile_threads + ? dav1d->tile_threads + : FFMIN(floor(sqrt(threads)), DAV1D_MAX_TILE_THREADS); +@@ -153,6 +165,7 @@ + : FFMIN(ceil(threads / s.n_tile_threads), DAV1D_MAX_FRAME_THREADS); + av_log(c, AV_LOG_DEBUG, "Using %d frame threads, %d tile threads\n", + s.n_frame_threads, s.n_tile_threads); ++#endif + + res = dav1d_open(&dav1d->c, &s); + if (res < 0) +@@ -185,6 +198,9 @@ + Libdav1dContext *dav1d = c->priv_data; + Dav1dData *data = &dav1d->data; + Dav1dPicture pic = { 0 }, *p = &pic; ++#if FF_DAV1D_VERSION_AT_LEAST(5,1) ++ enum Dav1dEventFlags event_flags = 0; ++#endif + int res; + + if (!data->sz) { +@@ -456,11 +472,18 @@ + return 0; + } + ++#ifndef DAV1D_MAX_FRAME_THREADS ++#define DAV1D_MAX_FRAME_THREADS DAV1D_MAX_THREADS ++#endif ++#ifndef DAV1D_MAX_TILE_THREADS ++#define DAV1D_MAX_TILE_THREADS DAV1D_MAX_THREADS ++#endif ++ + #define OFFSET(x) offsetof(Libdav1dContext, x) + #define VD AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_DECODING_PARAM + static const AVOption libdav1d_options[] = { +- { "tilethreads", "Tile threads", OFFSET(tile_threads), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, DAV1D_MAX_TILE_THREADS, VD }, +- { "framethreads", "Frame threads", OFFSET(frame_threads), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, DAV1D_MAX_FRAME_THREADS, VD }, ++ { "tilethreads", "Tile threads", OFFSET(tile_threads), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, DAV1D_MAX_TILE_THREADS, VD | AV_OPT_FLAG_DEPRECATED }, ++ { "framethreads", "Frame threads", OFFSET(frame_threads), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, DAV1D_MAX_FRAME_THREADS, VD | AV_OPT_FLAG_DEPRECATED }, + { "filmgrain", "Apply Film Grain", OFFSET(apply_grain), AV_OPT_TYPE_BOOL, { .i64 = -1 }, -1, 1, VD | AV_OPT_FLAG_DEPRECATED }, + { "oppoint", "Select an operating point of the scalable bitstream", OFFSET(operating_point), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 31, VD }, + { "alllayers", "Output all spatial layers", OFFSET(all_layers), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VD }, -- 2.26.2