Merge ~liushuyu-011/ubuntu/+source/dvbcut:ubuntu/devel into ubuntu/+source/dvbcut:ubuntu/devel

[Zixing Liu]

This merge proposal fixes FTBFS with dvbcut. Some patches are backported from the upstream; one of the patches that adapt to FFmpeg 7 is not from the upstream.

[Graham Inggs (ginggs)]

Looks good to me, thanks!

review: Approve

diff --git a/debian/changelog b/debian/changelog
index dd80f51..a75ac4b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+dvbcut (0.7.4-1ubuntu1) oracular; urgency=medium
+
+  * d/patches: backport upstream patches
+  * d/p/1000-ffmpeg-7-api.patch: fix FTBFS with FFMpeg 7
+
+ -- Zixing Liu <[e-mail]>  Mon, 16 Sep 2024 16:18:10 -0600
+
 dvbcut (0.7.4-1build4) noble; urgency=medium
 
   * No-change rebuild for CVE-2024-3094
diff --git a/debian/patches/0001-lavfmuxer-handle-invalid-audio-headers-at-the-beginn.patch b/debian/patches/0001-lavfmuxer-handle-invalid-audio-headers-at-the-beginn.patch
new file mode 100644
index 0000000..08c7e61
--- /dev/null
+++ b/debian/patches/0001-lavfmuxer-handle-invalid-audio-headers-at-the-beginn.patch
@@ -0,0 +1,70 @@
+From 3cfa00f8617e94ea41cd7c47bbc4733ab72838b7 Mon Sep 17 00:00:00 2001
+From: cypline <[e-mail]>
+Date: Mon, 6 Feb 2023 02:17:01 +0100
+Subject: [PATCH 1/2] lavfmuxer: handle invalid audio headers at the beginning
+
+This is to fix streams where the current code is not able to parse the stream and collect valid codec information as of invalid header. It tries to parse the stream until a valid packet is found and sample_rate is filled. Because if this is missing, the export crashes. If newer versions of ffmpeg are used the patch for codecpar will be needed.
+
+Closes: #18
+---
+ src/lavfmuxer.cpp | 26 +++++++++++++++++++++-----
+ 1 file changed, 21 insertions(+), 5 deletions(-)
+
+diff --git a/src/lavfmuxer.cpp b/src/lavfmuxer.cpp
+index 9e495c8..96b92fb 100644
+--- a/src/lavfmuxer.cpp
++++ b/src/lavfmuxer.cpp
+@@ -61,6 +61,8 @@ lavfmuxer::lavfmuxer(const char *format, uint32_t audiostreammask, mpgfile &mpg,
+   s->sample_aspect_ratio = codec->sample_aspect_ratio;
+   s->time_base = codec->time_base;
+ 
++  int avlogflags = av_log_get_flags();
++
+   for (int i=0;i<mpg.getaudiostreams();++i)
+     if (audiostreammask & (1u<<i)) {
+       int astr=audiostream(i);
+@@ -77,7 +79,8 @@ lavfmuxer::lavfmuxer(const char *format, uint32_t audiostreammask, mpgfile &mpg,
+       streamhandle sh(mpg.getinitialoffset());
+       streamdata *sd=sh.newstream(astr,mpg.getstreamtype(astr),mpg.istransportstream());
+ 
+-      while (sh.fileposition < mpg.getinitialoffset()+(4<<20)) {
++      int srerror = 0;
++      while (sh.fileposition < mpg.getinitialoffset()+(8<<20)) {
+ 	if (mpg.streamreader(sh)<=0)
+ 	  break;
+ 
+@@ -95,14 +98,27 @@ lavfmuxer::lavfmuxer(const char *format, uint32_t audiostreammask, mpgfile &mpg,
+ 
+             av_packet_free(&pkt);
+             av_frame_free(&frame);
+-	    avcodec_close(codec);
+-	  }
+-	  break;
+-	}
++            avcodec_close(codec);
++          }
++          if (codec->sample_rate == 0) {
++            ++srerror;
++            if (srerror == 1) {
++              fprintf(stderr,"Error, could not determine sample rate\n");
++              av_log_set_flags(AV_LOG_SKIP_REPEATED);
++            }
++            sd->pop();
++          }
++          else {
++            fprintf(stdout,"Sample rate found after %d errors\n", srerror);
++            break;
++          }
++        }
+       }
+       s->time_base = codec->time_base;
+     }
+ 
++  av_log_set_flags(avlogflags);
++
+   if (!(fmt->flags & AVFMT_NOFILE)&&(avio_open(&avfc->pb, filename, AVIO_FLAG_WRITE) < 0)) {
+     av_free(avfc);
+     avfc=0;
+-- 
+2.43.0
+
diff --git a/debian/patches/0002-lavfmuxer-support-codecpar-and-prevent-core-dumps-be.patch b/debian/patches/0002-lavfmuxer-support-codecpar-and-prevent-core-dumps-be.patch
new file mode 100644
index 0000000..d54d3e7
--- /dev/null
+++ b/debian/patches/0002-lavfmuxer-support-codecpar-and-prevent-core-dumps-be.patch
@@ -0,0 +1,69 @@
+From 963212a31eb147c43a42143025a8f6781a75f2d3 Mon Sep 17 00:00:00 2001
+From: cypline <[e-mail]>
+Date: Wed, 1 Feb 2023 23:34:16 +0100
+Subject: [PATCH 2/2] lavfmuxer: support codecpar and prevent core dumps
+ because of uninitialized parameters.
+
+Fix for dvbcut to support the new introduced codecpar as replacement of codec. Newer versions of ffmpeg now rely on them. If not provided export produces coredumps.
+
+Closes: #17
+---
+ src/lavfmuxer.cpp | 22 ++++++++++++++++++++--
+ 1 file changed, 20 insertions(+), 2 deletions(-)
+
+diff --git a/src/lavfmuxer.cpp b/src/lavfmuxer.cpp
+index 96b92fb..1be4344 100644
+--- a/src/lavfmuxer.cpp
++++ b/src/lavfmuxer.cpp
+@@ -63,6 +63,16 @@ lavfmuxer::lavfmuxer(const char *format, uint32_t audiostreammask, mpgfile &mpg,
+ 
+   int avlogflags = av_log_get_flags();
+ 
++  int ret = 0;
++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 14, 0)
++  // Use Parameters instead of Codec, necessary to get correct results, prevent crash and correct display of the output of av_dump
++  ret = avcodec_parameters_from_context(s->codecpar, codec);
++  if (ret < 0) {
++    av_log(NULL, AV_LOG_ERROR, "Failed to copy encoder parameters to output stream #%u\n", s->id);
++    return;
++  }
++#endif
++
+   for (int i=0;i<mpg.getaudiostreams();++i)
+     if (audiostreammask & (1u<<i)) {
+       int astr=audiostream(i);
+@@ -115,6 +125,14 @@ lavfmuxer::lavfmuxer(const char *format, uint32_t audiostreammask, mpgfile &mpg,
+         }
+       }
+       s->time_base = codec->time_base;
++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 14, 0)
++      // Use Parameters instead of Codec, necessary to get correct results, prevent crash and correct display of the output of av_dump
++      ret = avcodec_parameters_from_context(s->codecpar, codec);
++      if (ret < 0) {
++        av_log(NULL, AV_LOG_ERROR, "Failed to copy encoder parameters to output stream #%u\n", s->id);
++        return;
++      }
++#endif
+     }
+ 
+   av_log_set_flags(avlogflags);
+@@ -123,14 +141,14 @@ lavfmuxer::lavfmuxer(const char *format, uint32_t audiostreammask, mpgfile &mpg,
+     av_free(avfc);
+     avfc=0;
+     return;
+-    }
++  }
+ 
+   av_opt_set_int(avfc, "preload", (int)(.5 * AV_TIME_BASE), AV_OPT_SEARCH_CHILDREN);
+   av_opt_set_int(avfc, "muxrate", 10080000, AV_OPT_SEARCH_CHILDREN);
+   avfc->max_delay= (int)(.7*AV_TIME_BASE);
+ 
+   av_dump_format(avfc, 0, filename, 1);
+-  int ret = avformat_write_header(avfc, NULL);
++  ret = avformat_write_header(avfc, NULL);
+   if (ret < 0) {
+       fprintf(stderr, "avformat_write_header failed ret[%d]\n", ret);
+       return;
+-- 
+2.43.0
+
diff --git a/debian/patches/1000-ffmpeg-7-api.patch b/debian/patches/1000-ffmpeg-7-api.patch
new file mode 100644
index 0000000..ca3ba0e
--- /dev/null
+++ b/debian/patches/1000-ffmpeg-7-api.patch
@@ -0,0 +1,52 @@
+diff --git a/src/avframe.cpp b/src/avframe.cpp
+index 19e651d..d92ce77 100644
+--- a/src/avframe.cpp
++++ b/src/avframe.cpp
+@@ -61,8 +61,10 @@ avframe::avframe(AVFrame *src, AVCodecContext *ctx) : f(0),tobefreed(0)
+ 
+   f->pict_type              = src->pict_type;
+   f->quality                = src->quality;
++#if FF_API_FRAME_PICTURE_NUMBER
+   f->coded_picture_number   = src->coded_picture_number;
+   f->display_picture_number = src->display_picture_number;
++#endif
+   f->pts                    = src->pts;
+   f->interlaced_frame       = src->interlaced_frame;
+   f->top_field_first        = src->top_field_first;
+diff --git a/src/mpgfile.cpp b/src/mpgfile.cpp
+index 3412552..60b4d1a 100644
+--- a/src/mpgfile.cpp
++++ b/src/mpgfile.cpp
+@@ -165,8 +165,7 @@ void mpgfile::decodegop(int start, int stop, std::list<avframe*> &framelist)
+       while (avcodec_receive_frame(S->avcc, avf) == 0)
+       {
+         //fprintf(stderr, "* decoded frame %5d ilace:%d typ:%d pts=%f\n", pic, avf->interlaced_frame, avf->pict_type, (double)avf->pts/90000.0);
+-        if (last_cpn!=avf->coded_picture_number) {
+-          last_cpn=avf->coded_picture_number;
++        if (avf->flags & AV_FRAME_FLAG_KEY) {
+           if (pic>=start) {
+             framelist.push_back(new avframe(avf,S->avcc));
+           }
+@@ -191,9 +190,8 @@ void mpgfile::decodegop(int start, int stop, std::list<avframe*> &framelist)
+     avcodec_send_packet(S->avcc, pkt);
+     while (avcodec_receive_frame(S->avcc, avf) == 0)
+     {
+-      if (last_cpn!=avf->coded_picture_number)
++      if (avf->flags & AV_FRAME_FLAG_KEY)
+       {
+-        last_cpn=avf->coded_picture_number;
+         if (pic>=start)
+           framelist.push_back(new avframe(avf,S->avcc));
+       }
+@@ -748,9 +746,11 @@ void mpgfile::recodevideo(muxer &mux, int start, int stop, pts_t offset,int save
+       avframe &f=*framelist.front();
+ 
+       f->pts=idx[idx.indexnr(start+p)].getpts()-startpts;
++#if FF_API_FRAME_PICTURE_NUMBER
+       f->coded_picture_number=f->display_picture_number=p;
+       f->key_frame=(p==0)?1:0;
+       f->pict_type=(p==0)?AV_PICTURE_TYPE_I : AV_PICTURE_TYPE_P;
++#endif
+       avcodec_send_frame(avcc, f);
+ 
+       delete framelist.front();
diff --git a/debian/patches/series b/debian/patches/series
index e69de29..6955022 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1,3 @@
+0001-lavfmuxer-handle-invalid-audio-headers-at-the-beginn.patch
+0002-lavfmuxer-support-codecpar-and-prevent-core-dumps-be.patch
+1000-ffmpeg-7-api.patch