probably like this? also, for some reason ffmpeg 4.4 testsrc does not work in rgba-float ....
On Sun, Nov 19, 2023 at 1:45 AM Andrew Randrianasulu <[email protected]> wrote: > > > > ср, 15 нояб. 2023 г., 20:30 Phyllis Smith <[email protected]>: >> >> FFmpeg 6.1 has been checked into GIT. I tested a few files by >> loading/playing and rendered some too. Also, tested bluray and DVD creation >> which I know is used very little BUT I USE IT, so it is the most important >> to me! >> >> The only thing I would like to test but do not know how is the nvenc/cuda, >> but I did look at ffmpeg-6.1 patch10 and tried to compare with that in 5.1. >> Not too sure about it. > > > > Oh, I think you reverted part keeping 4.4 support in place > > > https://git.cinelerra-gg.org/git/?p=goodguy/cinelerra.git;a=blobdiff;f=cinelerra-5.1/cinelerra/pluginfclient.C;h=2aac1af334f42f65718a95e54a8ac5283c6ed723;hp=b335628a2e2226ac4f19d8728da50b498c98d38e;hb=21f715f2d24d38bd7a0eccb22d64cdf18f0e3df9;hpb=def7a2e3e4f053af598be006210a4cd29d984305 > > > please restore :) > > >> >> On Sun, Nov 12, 2023 at 8:36 AM Andrew Randrianasulu >> <[email protected]> wrote: >>> >>> this ffmpeg patch allowed me to build cingg with ffmpeg-6.1 YET I >>> haven't tested real hw decoding/encoding yet (need reboot for this) >>> >>> On Sun, Nov 12, 2023 at 3:54 AM Andrew Randrianasulu >>> <[email protected]> wrote: >>> > >>> > >>> > >>> > вс, 12 нояб. 2023 г., 03:44 Phyllis Smith <[email protected]>: >>> >> >>> >> OK, got your last 2 suggestions and will work on that. But getting too >>> >> tired to do much anymore today! >>> > >>> > >>> > >>> > >>> > Sleep well! I found my lcms2 patch but it need to be updated slightly. >>> > Will try to make it applicable to current and send it to you next morning >>> > (+14 hours or so from now). >>> >> >>> >> >>> >> On Sat, Nov 11, 2023 at 5:42 PM Andrew Randrianasulu >>> >> <[email protected]> wrote: >>> >>> >>> >>> >>> >>> >>> >>> вс, 12 нояб. 2023 г., 03:21 Andrew Randrianasulu >>> >>> <[email protected]>: >>> >>>> >>> >>>> >>> >>>> >>> >>>> вс, 12 нояб. 2023 г., 02:59 Phyllis Smith <[email protected]>: >>> >>>>> >>> >>>>> Downloaded it today and now am re-doing the patches so that there are >>> >>>>> no "Hunk #1 succeeded at xxx (offset xxx lines)" warning messages. >>> >>>>> Seems like just about all of them are off so it will take me some >>> >>>>> time. Did not include patch10 and getting errors that are stopping >>> >>>>> the compile as shown below. This patch10 is more than I know how to >>> >>>>> fix. >>> >>>>> >>> >>>>>> In file included from libavutil/hwcontext_cuda.c:27: >>> >>>>>> libavutil/hwcontext_cuda.c: In function ‘cuda_context_init’: >>> >>>>>> libavutil/hwcontext_cuda.c:365:28: error: ‘CudaFunctions’ has no >>> >>>>>> member named ‘cuCtxGetCurrent’; did you mean ‘cuCtxPopCurrent’? >>> >>>>>> 365 | ret = >>> >>>>>> CHECK_CU(cu->cuCtxGetCurrent(&hwctx->cuda_ctx)); >>> >>>>>> | ^~~~~~~~~~~~~~~ >>> >>>>>> libavutil/cuda_check.h:65:114: note: in definition of macro >>> >>>>>> ‘FF_CUDA_CHECK_DL’ >>> >>>>>> 65 | #define FF_CUDA_CHECK_DL(avclass, cudl, x) >>> >>>>>> ff_cuda_check(avclass, cudl->cuGetErrorName, cudl->cuGetErrorString, >>> >>>>>> (x), #x) >>> >>>>>> | >>> >>>>>> ^ >>> >>>>>> libavutil/hwcontext_cuda.c:365:15: note: in expansion of macro >>> >>>>>> ‘CHECK_CU’ >>> >>>>>> 365 | ret = >>> >>>>>> CHECK_CU(cu->cuCtxGetCurrent(&hwctx->cuda_ctx)); >>> >>>>>> | ^~~~~~~~ >>> >>>>>> make[3]: *** [ffbuild/common.mak:81: libavutil/hwcontext_cuda.o] >>> >>>>>> Error 1 >>> >>>> >>> >>>> >>> >>>> may be first revert those two? >>> >>>> >>> >>>> >>> >>>> https://git.ffmpeg.org/gitweb/ffmpeg.git/commit/f904e60c32a87f4124c3b94598a3b0141cd8b1b9 >>> >>>> >>> >>>> https://git.ffmpeg.org/gitweb/ffmpeg.git/commit/05f8b2ca0f7e28775837a572c65ce9218f534ee2 >>> >>>> >>> >>>> >>> >>>> or update ffnvheaders (not sure if it will work for legacy proprietary >>> >>>> driver , something to find out) >>> >>>> >>> >>>> https://github.com/FFmpeg/nv-codec-headers/releases >>> >>>> >>> >>>> >>> >>>> not sure that exactly version? we seems to have 10.x and only updated >>> >>>> ones there (so the potentially include fix for this cudaCurrent >>> >>>> change) are 11.x and 12.x ..... >>> >>> >>> >>> >>> >>> Also,ffmpeg 6.1 removed libopenjpeg *decoder* but encoder apparently >>> >>> still in place: >>> >>> >>> >>> https://git.ffmpeg.org/gitweb/ffmpeg.git/commit/60ccb3fe787be3bb10fc4545b3593cd1e0b769ed >>> >>> >>> >>> I also hope to add lcms2 (for icc profile support via ffmpeg) but not >>> >>> sure if that pach was finished. >>> >>> >>> >>> >>> >>> >>> >>>> >>> >>>> >>> >>>> >>> >>>>> >>> >>>>> On Sat, Nov 11, 2023 at 7:14 AM Andrew Randrianasulu >>> >>>>> <[email protected]> wrote: >>> >>>>>> >>> >>>>>> http://ffmpeg.org/download.html#release_6.1 >>> >>>>>> >>> >>>>>> ====== >>> >>>>>> >>> >>>>>> November 10th, 2023, FFmpeg 6.1 "Heaviside" >>> >>>>>> >>> >>>>>> FFmpeg 6.1 "Heaviside", a new major release, is now available! Some >>> >>>>>> of the highlights: >>> >>>>>> >>> >>>>>> libaribcaption decoder >>> >>>>>> Playdate video decoder and demuxer >>> >>>>>> Extend VAAPI support for libva-win32 on Windows >>> >>>>>> afireqsrc audio source filter >>> >>>>>> arls filter >>> >>>>>> ffmpeg CLI new option: -readrate_initial_burst >>> >>>>>> zoneplate video source filter >>> >>>>>> command support in the setpts and asetpts filters >>> >>>>>> Vulkan decode hwaccel, supporting H264, HEVC and AV1 >>> >>>>>> color_vulkan filter >>> >>>>>> bwdif_vulkan filter >>> >>>>>> nlmeans_vulkan filter >>> >>>>>> RivaTuner video decoder >>> >>>>>> xfade_vulkan filter >>> >>>>>> vMix video decoder >>> >>>>>> Essential Video Coding parser, muxer and demuxer >>> >>>>>> Essential Video Coding frame merge bsf >>> >>>>>> bwdif_cuda filter >>> >>>>>> Microsoft RLE video encoder >>> >>>>>> Raw AC-4 muxer and demuxer >>> >>>>>> Raw VVC bitstream parser, muxer and demuxer >>> >>>>>> Bitstream filter for editing metadata in VVC streams >>> >>>>>> Bitstream filter for converting VVC from MP4 to Annex B >>> >>>>>> scale_vt filter for videotoolbox >>> >>>>>> transpose_vt filter for videotoolbox >>> >>>>>> support for the P_SKIP hinting to speed up libx264 encoding >>> >>>>>> Support HEVC,VP9,AV1 codec in enhanced flv format >>> >>>>>> apsnr and asisdr audio filters >>> >>>>>> OSQ demuxer and decoder >>> >>>>>> Support HEVC,VP9,AV1 codec fourcclist in enhanced rtmp protocol >>> >>>>>> CRI USM demuxer >>> >>>>>> ffmpeg CLI '-top' option deprecated in favor of the setfield filter >>> >>>>>> VAAPI AV1 encoder >>> >>>>>> ffprobe XML output schema changed to account for multiple >>> >>>>>> variable-fields elements within the same parent element >>> >>>>>> ffprobe -output_format option added as an alias of -of >>> >>>>>> >>> >>>>>> This release had been overdue for at least half a year, but due to >>> >>>>>> constant activity in the repository, had to be delayed, and we were >>> >>>>>> finally able to branch off the release recently, before some of the >>> >>>>>> large changes scheduled for 7.0 were merged. >>> >>>>>> >>> >>>>>> Internally, we have had a number of changes too. The FFT, MDCT, DCT >>> >>>>>> and DST implementation used for codecs and filters has been fully >>> >>>>>> replaced with the faster libavutil/tx (full article about it coming >>> >>>>>> soon). >>> >>>>>> This also led to a reduction in the the size of the compiled binary, >>> >>>>>> which can be noticeable in small builds. >>> >>>>>> There was a very large reduction in the total amount of allocations >>> >>>>>> being done on each frame throughout video decoders, reducing >>> >>>>>> overhead. >>> >>>>>> RISC-V optimizations for many parts of our DSP code have been >>> >>>>>> merged, with mainly the large decoders being left. >>> >>>>>> There was an effort to improve the correctness of timestamps and >>> >>>>>> frame durations of each packet, increasing the accurracy of variable >>> >>>>>> frame rate video. >>> >>>>>> >>> >>>>>> Next major release will be version 7.0, scheduled to be released in >>> >>>>>> February. We will attempt to better stick to the new release >>> >>>>>> schedule we announced at the start of this year. >>> >>>>>> >>> >>>>>> We strongly recommend users, distributors, and system integrators to >>> >>>>>> upgrade unless they use current git master. >>> >>>>>> >>> >>>>>> >>> >>>>>> >>> >>>>>> ===== >>> >>>>>> >>> >>>>>> >>> >>>>>> on last line here .. yeah, "we break API, deal with it" in small >>> >>>>>> invisible text ...... Well, actually THIS TIME it was not broken >>> >>>>>> too badly, but with upcoming 7.x ...... who knows! Previous history >>> >>>>>> tells me it more likely than not.
From 4a1aecf307f1111ce21d18056b4fe67544938c38 Mon Sep 17 00:00:00 2001 From: Andrew Randrianasulu <[email protected]> Date: Sun, 19 Nov 2023 10:16:15 +0300 Subject: [PATCH 3/4] fix pluginfclient for ffmpeg 4.4 --- cinelerra-5.1/cinelerra/pluginfclient.C | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cinelerra-5.1/cinelerra/pluginfclient.C b/cinelerra-5.1/cinelerra/pluginfclient.C index 2aac1af3..2d57743c 100644 --- a/cinelerra-5.1/cinelerra/pluginfclient.C +++ b/cinelerra-5.1/cinelerra/pluginfclient.C @@ -664,7 +664,7 @@ PluginFClient::~PluginFClient() bool PluginFClient::is_audio(const AVFilter *fp) { if( !fp->outputs ) return 0; -#if LIBAVFILTER_VERSION_MINOR > 2 +#if LIBAVFILTER_VERSION_MINOR > 2 && LIBAVFILTER_VERSION_MAJOR > 7 if( avfilter_filter_pad_count(fp, 1) > 1 ) return 0; #else if( avfilter_pad_count(fp->outputs) > 1 ) return 0; @@ -672,7 +672,7 @@ bool PluginFClient::is_audio(const AVFilter *fp) if( !avfilter_pad_get_name(fp->outputs, 0) ) return 0; if( avfilter_pad_get_type(fp->outputs, 0) != AVMEDIA_TYPE_AUDIO ) return 0; if( !fp->inputs ) return 1; -#if LIBAVFILTER_VERSION_MINOR > 2 +#if LIBAVFILTER_VERSION_MINOR > 2 && LIBAVFILTER_VERSION_MAJOR > 7 if( avfilter_filter_pad_count(fp, 0) > 1 ) return 0; #else if( avfilter_pad_count(fp->inputs) > 1 ) return 0; @@ -684,7 +684,7 @@ bool PluginFClient::is_audio(const AVFilter *fp) bool PluginFClient::is_video(const AVFilter *fp) { if( !fp->outputs ) return 0; -#if LIBAVFILTER_VERSION_MINOR > 2 +#if LIBAVFILTER_VERSION_MINOR > 2 && LIBAVFILTER_VERSION_MAJOR > 7 if( avfilter_filter_pad_count(fp, 1) > 1 ) return 0; #else if( avfilter_pad_count(fp->outputs) > 1 ) return 0; @@ -692,7 +692,7 @@ bool PluginFClient::is_video(const AVFilter *fp) if( !avfilter_pad_get_name(fp->outputs, 0) ) return 0; if( avfilter_pad_get_type(fp->outputs, 0) != AVMEDIA_TYPE_VIDEO ) return 0; if( !fp->inputs ) return 1; -#if LIBAVFILTER_VERSION_MINOR > 2 +#if LIBAVFILTER_VERSION_MINOR > 2 && LIBAVFILTER_VERSION_MAJOR > 7 if( avfilter_filter_pad_count(fp, 0) > 1 ) return 0; #else if( avfilter_pad_count(fp->inputs) > 1 ) return 0; -- 2.35.7
-- Cin mailing list [email protected] https://lists.cinelerra-gg.org/mailman/listinfo/cin
