ffmpeg.git.patch4 is not needed anymore?
Hello, all! for my usual rebuild of CinGG with ffmpeg.git I found ffmpeg.git.patch4 is not applicable anymore, and ffmpeg log list this commit: https://git.ffmpeg.org/gitweb/ffmpeg.git/commit/a7bd37927628df3672488e07f718... avfilter/af_aformat: Add uninit function so, i just moved this patch away from buildsystem for now. sadly, bigger patch ffmpeg.git.patch2 (mpegts/blu-ray) also started to show at least one failure: (as of ffmpeg commit 649a6969f75f2378c65768deb9debd325eb2fc7f): root@slax:/dev/shm/tmp/cinelerra-goodguy-20200826/cinelerra-5.1/thirdparty/ffmpeg.git# cat ../src/_ffmpeg.git.patch2 | patch -p1 patching file libavformat/mpegtsenc.c Hunk #1 succeeded at 57 (offset 1 line). Hunk #2 succeeded at 78 (offset 1 line). Hunk #3 succeeded at 93 (offset 1 line). Hunk #4 succeeded at 109 (offset 1 line). Hunk #5 succeeded at 218 (offset 1 line). Hunk #6 succeeded at 238 (offset 1 line). Hunk #7 succeeded at 260 (offset 3 lines). Hunk #8 succeeded at 282 (offset 3 lines). Hunk #9 succeeded at 295 (offset 3 lines). Hunk #10 succeeded at 324 (offset 4 lines). Hunk #11 succeeded at 676 (offset 28 lines). Hunk #12 succeeded at 702 (offset 28 lines). Hunk #13 succeeded at 742 (offset 28 lines). Hunk #14 succeeded at 755 (offset 28 lines). Hunk #15 succeeded at 814 (offset 28 lines). Hunk #16 succeeded at 876 (offset 28 lines). Hunk #17 succeeded at 1077 (offset 28 lines). Hunk #18 succeeded at 1086 (offset 28 lines). Hunk #19 succeeded at 1104 (offset 28 lines). Hunk #20 succeeded at 1173 (offset 28 lines). Hunk #21 succeeded at 1233 (offset 28 lines). Hunk #22 succeeded at 1241 (offset 28 lines). Hunk #23 succeeded at 1315 (offset 28 lines). Hunk #24 succeeded at 1345 (offset 28 lines). Hunk #25 succeeded at 1363 (offset 28 lines). Hunk #26 succeeded at 1424 (offset 28 lines). Hunk #27 succeeded at 1522 (offset 28 lines). Hunk #28 succeeded at 1534 (offset 28 lines). Hunk #29 FAILED at 1585. Hunk #30 succeeded at 1644 (offset 28 lines). Hunk #31 succeeded at 1789 with fuzz 1 (offset 85 lines). Hunk #32 succeeded at 1843 (offset 85 lines). Hunk #33 succeeded at 1857 (offset 85 lines). Hunk #34 succeeded at 1925 (offset 86 lines). 1 out of 34 hunks FAILED -- saving rejects to file libavformat/mpegtsenc.c.rej cat libavformat/mpegtsenc.c.rej --- libavformat/mpegtsenc.c +++ libavformat/mpegtsenc.c @@ -1585,7 +1446,7 @@ static int mpegts_write_packet_internal(AVFormatContext *s, AVPacket *pkt) ret = avio_open_dyn_buf(&ts_st->amux->pb); if (ret < 0) - return ret; + return AVERROR(ENOMEM); ret = av_write_frame(ts_st->amux, &pkt2); if (ret < 0) { I tried to make new patch (by manually adding missed chunk), but not tested it yet (attached)
Hi Andrew! I don't understand nothing (really a little) of Linux and maybe I wrong to write here. I don't know if you (Andrew) or GG can see, but is it possible to have "minterpolate" option inside Cinelerra-gg? It is a filter of ffmpeg. Thank you! IgorBeg Il 26/08/2020 22:01, Andrew Randrianasulu via Cin ha scritto:
Hello, all!
for my usual rebuild of CinGG with ffmpeg.git I found ffmpeg.git.patch4 is not applicable anymore, and ffmpeg log list this commit:
https://git.ffmpeg.org/gitweb/ffmpeg.git/commit/a7bd37927628df3672488e07f718...
avfilter/af_aformat: Add uninit function
so, i just moved this patch away from buildsystem for now.
sadly, bigger patch ffmpeg.git.patch2 (mpegts/blu-ray) also started to show at least one failure:
(as of ffmpeg commit 649a6969f75f2378c65768deb9debd325eb2fc7f):
root@slax:/dev/shm/tmp/cinelerra-goodguy-20200826/cinelerra-5.1/thirdparty/ffmpeg.git# cat ../src/_ffmpeg.git.patch2 | patch -p1 patching file libavformat/mpegtsenc.c Hunk #1 succeeded at 57 (offset 1 line). Hunk #2 succeeded at 78 (offset 1 line). Hunk #3 succeeded at 93 (offset 1 line). Hunk #4 succeeded at 109 (offset 1 line). Hunk #5 succeeded at 218 (offset 1 line). Hunk #6 succeeded at 238 (offset 1 line). Hunk #7 succeeded at 260 (offset 3 lines). Hunk #8 succeeded at 282 (offset 3 lines). Hunk #9 succeeded at 295 (offset 3 lines). Hunk #10 succeeded at 324 (offset 4 lines). Hunk #11 succeeded at 676 (offset 28 lines). Hunk #12 succeeded at 702 (offset 28 lines). Hunk #13 succeeded at 742 (offset 28 lines). Hunk #14 succeeded at 755 (offset 28 lines). Hunk #15 succeeded at 814 (offset 28 lines). Hunk #16 succeeded at 876 (offset 28 lines). Hunk #17 succeeded at 1077 (offset 28 lines). Hunk #18 succeeded at 1086 (offset 28 lines). Hunk #19 succeeded at 1104 (offset 28 lines). Hunk #20 succeeded at 1173 (offset 28 lines). Hunk #21 succeeded at 1233 (offset 28 lines). Hunk #22 succeeded at 1241 (offset 28 lines). Hunk #23 succeeded at 1315 (offset 28 lines). Hunk #24 succeeded at 1345 (offset 28 lines). Hunk #25 succeeded at 1363 (offset 28 lines). Hunk #26 succeeded at 1424 (offset 28 lines). Hunk #27 succeeded at 1522 (offset 28 lines). Hunk #28 succeeded at 1534 (offset 28 lines). Hunk #29 FAILED at 1585. Hunk #30 succeeded at 1644 (offset 28 lines). Hunk #31 succeeded at 1789 with fuzz 1 (offset 85 lines). Hunk #32 succeeded at 1843 (offset 85 lines). Hunk #33 succeeded at 1857 (offset 85 lines). Hunk #34 succeeded at 1925 (offset 86 lines). 1 out of 34 hunks FAILED -- saving rejects to file libavformat/mpegtsenc.c.rej
cat libavformat/mpegtsenc.c.rej --- libavformat/mpegtsenc.c +++ libavformat/mpegtsenc.c @@ -1585,7 +1446,7 @@ static int mpegts_write_packet_internal(AVFormatContext *s, AVPacket *pkt)
ret = avio_open_dyn_buf(&ts_st->amux->pb); if (ret< 0) - return ret; + return AVERROR(ENOMEM);
ret = av_write_frame(ts_st->amux,&pkt2); if (ret< 0) {
I tried to make new patch (by manually adding missed chunk), but not tested it yet (attached)
В сообщении от Thursday 27 August 2020 10:54:38 Igor BEGHETTO via Cin написал(а):
Hi Andrew! I don't understand nothing (really a little) of Linux and maybe I wrong to write here. I don't know if you (Andrew) or GG can see, but is it possible to have "minterpolate" option inside Cinelerra-gg? It is a filter of ffmpeg. Thank you!
I uncommented it in /usr/share/cin/ffmpeg/plugin.opts and deleted rm ~/.bcast5/Cinelerra_plugins so plugin list was refreshed on next Cin start. but I got crash as fast as I tried to drag it over selected video region on timeline: DRI_PRIME=1 cin Cinelerra Infinity - built: Aug 27 2020 01:56:06 git://git.cinelerra-gg.org/goodguy/cinelerra.git (c) 2006-2019 Heroine Virtual Ltd. by Adam Williams 2007-2020 mods for Cinelerra-GG by W.P.Morrow aka goodguy Cinelerra is free software, covered by the GNU General Public License, and you are welcome to change it and/or distribute copies of it under certain conditions. There is absolutely no warranty for Cinelerra. RenderFarmClient::main_loop: client started FFMPEG::open_decoder: some stream times estimated: /home/guest/New_hdd/Swimming with orca in New Zealand-JQ3mDXF3bcE.mkv FFMPEG::open_decoder: some stream times estimated: /home/guest/New_hdd/Swimming with orca in New Zealand-JQ3mDXF3bcE.mkv FFMPEG::open_decoder: some stream times estimated: /home/guest/New_hdd/Swimming with orca in New Zealand-JQ3mDXF3bcE.mkv FFMPEG::open_decoder: some stream times estimated: /home/guest/New_hdd/Swimming with orca in New Zealand-JQ3mDXF3bcE.mkv FFMPEG::open_decoder: some stream times estimated: /home/guest/New_hdd/Swimming with orca in New Zealand-JQ3mDXF3bcE.mkv FFMPEG::open_decoder: some stream times estimated: /home/guest/New_hdd/Swimming with orca in New Zealand-JQ3mDXF3bcE.mkv FFMPEG::open_decoder: some stream times estimated: /home/guest/New_hdd/Swimming with orca in New Zealand-JQ3mDXF3bcE.mkv FFMPEG::open_decoder: some stream times estimated: /home/guest/New_hdd/Swimming with orca in New Zealand-JQ3mDXF3bcE.mkv signal_entry: got SIGFPE my pid=23403 execution table size=0: signal_entry: lock table size=27 0xe2ea530 VIconThread::draw_lock, VIconThread::run 0 0xed1ffb40 0xeb7c8d0 RecordSetChannel::change_channel, (null) 0xe5bfdb40 0xec88ff0 ChannelInfo::scan_lock, (null) 0xe53fcb40 0xec8bac0 SWindow::swin_lock, (null) 0xe4bfbb40 0xd9cc2b0 MWindow::run_lock, MWindow::run 0xf7b46dc0 * 0xecbccc0 MainIndexes::input_lock, MainIndexes::run 1 0xe33f8b40 0xeea24e0 BRenderThread::input_lock, BRenderThread::run 0xe1bf5b40 0xec8d5a0 BC_Repeater::pause_lock, BC_Repeater::run 0xe43fab40 0xf7b46dc0 0xd42ffa20 BC_Repeater::pause_lock, BC_Repeater::run 0xcbeffb40 0xeeb9fb40 0xcb59f310 BC_Repeater::pause_lock, BC_Repeater::run 0xcf565b40 0xeeb9fb40 0xe9b9950 PlaybackEngine::output_lock, PlaybackEngine::run 0xea7feb40 0xd993b70 BC_Synchronous::next_command, BC_Synchronous::run 0xdf3f0b40 0xea01cd0 ResourceThreadBase::draw_lock, ResourceThreadBase::run 0xe8dfeb40 0xea01ad0 ResourceThreadBase::draw_lock, ResourceThreadBase::run 0xe85fdb40 0xe8852d0 BC_WindowBase::event_condition, BC_WindowBase::get_event 0xec1fdb40 0xea01b80 BC_WindowBase::event_condition, BC_WindowBase::get_event 0xe75fbb40 0xd189dc90 BC_Xfer::Slicer::init, Slicer::run 0xd9be5b40 0xec8f160 BC_WindowBase::event_condition, BC_WindowBase::get_event 0xe03f2b40 0xe1b5ce0 BC_WindowBase::event_condition, BC_WindowBase::get_event 0xeeb9fb40 0xe71d650 BC_WindowBase::event_condition, BC_WindowBase::get_event 0xe13f4b40 0xed53b50 BC_WindowBase::event_condition, BC_WindowBase::get_event 0xdfbf1b40 0xe9bf3d4 Cinelerra, BC_WindowBase::dispatch_event 2 0xf7b46dc0 * lock_items: 22 lock_frees: 5 BC_Trace::delete_temps: deleting 1 temp files /tmp/cinelerra.cef7b377-a6bb-452b-9db9-116739130d42 SigHandler::signal_handler total files=0 Аварийный останов
IgorBeg
Il 26/08/2020 22:01, Andrew Randrianasulu via Cin ha scritto:
Hello, all!
for my usual rebuild of CinGG with ffmpeg.git I found ffmpeg.git.patch4 is not applicable anymore, and ffmpeg log list this commit:
https://git.ffmpeg.org/gitweb/ffmpeg.git/commit/a7bd37927628df3672488e07f718...
avfilter/af_aformat: Add uninit function
so, i just moved this patch away from buildsystem for now.
sadly, bigger patch ffmpeg.git.patch2 (mpegts/blu-ray) also started to show at least one failure:
(as of ffmpeg commit 649a6969f75f2378c65768deb9debd325eb2fc7f):
root@slax:/dev/shm/tmp/cinelerra-goodguy-20200826/cinelerra-5.1/thirdparty/ffmpeg.git# cat ../src/_ffmpeg.git.patch2 | patch -p1 patching file libavformat/mpegtsenc.c Hunk #1 succeeded at 57 (offset 1 line). Hunk #2 succeeded at 78 (offset 1 line). Hunk #3 succeeded at 93 (offset 1 line). Hunk #4 succeeded at 109 (offset 1 line). Hunk #5 succeeded at 218 (offset 1 line). Hunk #6 succeeded at 238 (offset 1 line). Hunk #7 succeeded at 260 (offset 3 lines). Hunk #8 succeeded at 282 (offset 3 lines). Hunk #9 succeeded at 295 (offset 3 lines). Hunk #10 succeeded at 324 (offset 4 lines). Hunk #11 succeeded at 676 (offset 28 lines). Hunk #12 succeeded at 702 (offset 28 lines). Hunk #13 succeeded at 742 (offset 28 lines). Hunk #14 succeeded at 755 (offset 28 lines). Hunk #15 succeeded at 814 (offset 28 lines). Hunk #16 succeeded at 876 (offset 28 lines). Hunk #17 succeeded at 1077 (offset 28 lines). Hunk #18 succeeded at 1086 (offset 28 lines). Hunk #19 succeeded at 1104 (offset 28 lines). Hunk #20 succeeded at 1173 (offset 28 lines). Hunk #21 succeeded at 1233 (offset 28 lines). Hunk #22 succeeded at 1241 (offset 28 lines). Hunk #23 succeeded at 1315 (offset 28 lines). Hunk #24 succeeded at 1345 (offset 28 lines). Hunk #25 succeeded at 1363 (offset 28 lines). Hunk #26 succeeded at 1424 (offset 28 lines). Hunk #27 succeeded at 1522 (offset 28 lines). Hunk #28 succeeded at 1534 (offset 28 lines). Hunk #29 FAILED at 1585. Hunk #30 succeeded at 1644 (offset 28 lines). Hunk #31 succeeded at 1789 with fuzz 1 (offset 85 lines). Hunk #32 succeeded at 1843 (offset 85 lines). Hunk #33 succeeded at 1857 (offset 85 lines). Hunk #34 succeeded at 1925 (offset 86 lines). 1 out of 34 hunks FAILED -- saving rejects to file libavformat/mpegtsenc.c.rej
cat libavformat/mpegtsenc.c.rej --- libavformat/mpegtsenc.c +++ libavformat/mpegtsenc.c @@ -1585,7 +1446,7 @@ static int mpegts_write_packet_internal(AVFormatContext *s, AVPacket *pkt)
ret = avio_open_dyn_buf(&ts_st->amux->pb); if (ret< 0) - return ret; + return AVERROR(ENOMEM);
ret = av_write_frame(ts_st->amux,&pkt2); if (ret< 0) {
I tried to make new patch (by manually adding missed chunk), but not tested it yet (attached)
Andrew, Thanks for the notice of ffmpeg patch4 no longer needed. GG will be very glad to get rid of this and will try to check it today yet. On Wed, Aug 26, 2020 at 2:11 PM Andrew Randrianasulu via Cin < [email protected]> wrote:
Hello, all!
for my usual rebuild of CinGG with ffmpeg.git I found ffmpeg.git.patch4 is not applicable anymore, and ffmpeg log list this commit:
https://git.ffmpeg.org/gitweb/ffmpeg.git/commit/a7bd37927628df3672488e07f718...
avfilter/af_aformat: Add uninit function
so, i just moved this patch away from buildsystem for now.
sadly, bigger patch ffmpeg.git.patch2 (mpegts/blu-ray) also started to show at least one failure:
(as of ffmpeg commit 649a6969f75f2378c65768deb9debd325eb2fc7f):
root@slax:/dev/shm/tmp/cinelerra-goodguy-20200826/cinelerra-5.1/thirdparty/ffmpeg.git# cat ../src/_ffmpeg.git.patch2 | patch -p1 patching file libavformat/mpegtsenc.c Hunk #1 succeeded at 57 (offset 1 line). Hunk #2 succeeded at 78 (offset 1 line). Hunk #3 succeeded at 93 (offset 1 line). Hunk #4 succeeded at 109 (offset 1 line). Hunk #5 succeeded at 218 (offset 1 line). Hunk #6 succeeded at 238 (offset 1 line). Hunk #7 succeeded at 260 (offset 3 lines). Hunk #8 succeeded at 282 (offset 3 lines). Hunk #9 succeeded at 295 (offset 3 lines). Hunk #10 succeeded at 324 (offset 4 lines). Hunk #11 succeeded at 676 (offset 28 lines). Hunk #12 succeeded at 702 (offset 28 lines). Hunk #13 succeeded at 742 (offset 28 lines). Hunk #14 succeeded at 755 (offset 28 lines). Hunk #15 succeeded at 814 (offset 28 lines). Hunk #16 succeeded at 876 (offset 28 lines). Hunk #17 succeeded at 1077 (offset 28 lines). Hunk #18 succeeded at 1086 (offset 28 lines). Hunk #19 succeeded at 1104 (offset 28 lines). Hunk #20 succeeded at 1173 (offset 28 lines). Hunk #21 succeeded at 1233 (offset 28 lines). Hunk #22 succeeded at 1241 (offset 28 lines). Hunk #23 succeeded at 1315 (offset 28 lines). Hunk #24 succeeded at 1345 (offset 28 lines). Hunk #25 succeeded at 1363 (offset 28 lines). Hunk #26 succeeded at 1424 (offset 28 lines). Hunk #27 succeeded at 1522 (offset 28 lines). Hunk #28 succeeded at 1534 (offset 28 lines). Hunk #29 FAILED at 1585. Hunk #30 succeeded at 1644 (offset 28 lines). Hunk #31 succeeded at 1789 with fuzz 1 (offset 85 lines). Hunk #32 succeeded at 1843 (offset 85 lines). Hunk #33 succeeded at 1857 (offset 85 lines). Hunk #34 succeeded at 1925 (offset 86 lines). 1 out of 34 hunks FAILED -- saving rejects to file libavformat/mpegtsenc.c.rej
cat libavformat/mpegtsenc.c.rej --- libavformat/mpegtsenc.c +++ libavformat/mpegtsenc.c @@ -1585,7 +1446,7 @@ static int mpegts_write_packet_internal(AVFormatContext *s, AVPacket *pkt)
ret = avio_open_dyn_buf(&ts_st->amux->pb); if (ret < 0) - return ret; + return AVERROR(ENOMEM);
ret = av_write_frame(ts_st->amux, &pkt2); if (ret < 0) {
I tried to make new patch (by manually adding missed chunk), but not tested it yet (attached) -- Cin mailing list [email protected] https://lists.cinelerra-gg.org/mailman/listinfo/cin
Andrew, FINALLY, gg got rid of Patch 4 as you notified us August 26 (GIT update). Thanks so much for the notify and sorry for the long delay. for my usual rebuild of CinGG with ffmpeg.git I found ffmpeg.git.patch4
is not applicable anymore, and ffmpeg log list this commit:
В сообщении от Friday 16 October 2020 04:13:48 Phyllis Smith via Cin написал(а):
Andrew, FINALLY, gg got rid of Patch 4 as you notified us August 26 (GIT update). Thanks so much for the notify and sorry for the long delay.
I see it was removed for ffmpeg 4.3, yet I don't think this patch hit ffmpeg tree before 4.3 was branched?
for my usual rebuild of CinGG with ffmpeg.git I found ffmpeg.git.patch4
is not applicable anymore, and ffmpeg log list this commit:
I agree, but when I was testing the rework for patch2, I was getting a segv in the patch4 free operation. So there must be at least one path where patch4 is not a good fix. Better to have a minor leak than a segv. This was only happening in the /path/cin5/3rdparty/ffmpeg/ffmpeg command line test. I use that code for testing, and I prefer the leak to the segv bug. gg On Fri, Oct 16, 2020 at 4:00 PM Andrew Randrianasulu via Cin < [email protected]> wrote:
В сообщении от Friday 16 October 2020 04:13:48 Phyllis Smith via Cin написал(а):
Andrew, FINALLY, gg got rid of Patch 4 as you notified us August 26 (GIT update). Thanks so much for the notify and sorry for the long delay.
I see it was removed for ffmpeg 4.3, yet I don't think this patch hit ffmpeg tree before 4.3 was branched?
for my usual rebuild of CinGG with ffmpeg.git I found ffmpeg.git.patch4
is not applicable anymore, and ffmpeg log list this commit:
-- Cin mailing list [email protected] https://lists.cinelerra-gg.org/mailman/listinfo/cin
participants (3)
-
Andrew Randrianasulu -
Igor BEGHETTO -
Phyllis Smith