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

[Zixing Liu]

This merge proposal fixes FTBFS with FFmpeg 7 for zoneminder by backporting a patch from the upstream.

[Vladimir Petko (vpa1977)]

- Needs PPA build
- Please run quilt refresh.
- Please add ftbfs bug and reference it in the changelog/patch

review: Needs Fixing

[Zixing Liu (liushuyu-011)]

PPA build: https://launchpad.net/~liushuyu-011/+archive/ubuntu/misc/+sourcepub/16495126/+listing-archive-extra

[Vladimir Petko (vpa1977)]

Please mark as rejected, the issue was fixed in https://launchpad.net/ubuntu/+source/zoneminder/1.36.33+dfsg1-1ubuntu1

Unmerged commits

96290ec... by Zixing Liu on 2024-09-18

changelog

290a5ef... by Zixing Liu on 2024-09-18

d/p/0010-ffmpeg-7.patch: add a patch to fix FTBFS with FFmpeg 7

diff --git a/debian/changelog b/debian/changelog
index bcb8caf..3388259 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+zoneminder (1.36.33+dfsg1-1ubuntu1) oracular; urgency=medium
+
+  * d/p/0010-ffmpeg-7.patch: add a patch to fix FTBFS with FFmpeg 7
+    (LP: #2080271, #2080395).
+
+ -- Zixing Liu <[e-mail]>  Wed, 18 Sep 2024 13:16:07 -0600
+
 zoneminder (1.36.33+dfsg1-1build5) oracular; urgency=medium
 
   * Rebuild against new libavcodec61.
diff --git a/debian/patches/0010-ffmpeg-7.patch b/debian/patches/0010-ffmpeg-7.patch
new file mode 100644
index 0000000..f45c320
--- /dev/null
+++ b/debian/patches/0010-ffmpeg-7.patch
@@ -0,0 +1,309 @@
+Description: Fix FTBFS with FFmpeg 7
+Author: Isaac Connor <[e-mail]>
+Origin: backport, https://github.com/ZoneMinder/zoneminder/commit/62789a83ab41da2c4829ad8bb22b584b67f6b3f6
+Forwarded: not-needed
+Last-Update: 2024-09-17
+---
+Index: zoneminder/src/zm_camera.h
+===================================================================
+--- zoneminder.orig/src/zm_camera.h
++++ zoneminder/src/zm_camera.h
+@@ -108,7 +108,7 @@ public:
+   }
+   int getChannels() {
+ #if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
+-    return mAudioStream ? mAudioStream->codecpar->channels : -1;
++    return mAudioStream ? mAudioStream->codecpar->ch_layout.nb_channels : -1;
+ #else
+     return mAudioStream ? mAudioStream->codec->channels : -1;
+ #endif
+Index: zoneminder/src/zm_ffmpeg.h
+===================================================================
+--- zoneminder.orig/src/zm_ffmpeg.h
++++ zoneminder/src/zm_ffmpeg.h
+@@ -307,6 +307,18 @@ void zm_dump_codec(const AVCodecContext
+ #if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
+ void zm_dump_codecpar(const AVCodecParameters *par);
+ #endif
++#if LIBAVUTIL_VERSION_CHECK(57, 28, 100, 28, 0)
++#define zm_dump_frame(frame, text) Debug(1, "%s: format %d %s sample_rate %" PRIu32 " nb_samples %d" \
++      " layout %" PRIu64 " pts %" PRId64, \
++      text, \
++      frame->format, \
++      av_get_sample_fmt_name((AVSampleFormat)frame->format), \
++      frame->sample_rate, \
++      frame->nb_samples, \
++      frame->ch_layout.u.mask, \
++      frame->pts \
++      );
++#else
+ #define zm_dump_frame(frame, text) Debug(1, "%s: format %d %s sample_rate %" PRIu32 " nb_samples %d" \
+       " layout %" PRIu64 " pts %" PRId64, \
+       text, \
+@@ -317,6 +329,7 @@ void zm_dump_codecpar(const AVCodecParam
+       frame->channel_layout, \
+       frame->pts \
+       );
++#endif
+ 
+ #if LIBAVUTIL_VERSION_CHECK(54, 4, 0, 74, 100)
+ #define zm_dump_video_frame(frame, text) Debug(1, "%s: format %d %s %dx%d linesize:%dx%d pts: %" PRId64 " keyframe: %d", \
+Index: zoneminder/src/zm_videostore.cpp
+===================================================================
+--- zoneminder.orig/src/zm_videostore.cpp
++++ zoneminder/src/zm_videostore.cpp
+@@ -470,12 +470,16 @@ bool VideoStore::open() {
+       audio_out_ctx->codec_tag = 0;
+ #endif
+ 
++#if LIBAVUTIL_VERSION_CHECK(57, 28, 100, 28, 0)
++      /* Seems like technically we could have multple channels, so let's not implement this for ffmpeg 5 */
++#else
+       if (audio_out_ctx->channels > 1) {
+         Warning("Audio isn't mono, changing it.");
+         audio_out_ctx->channels = 1;
+       } else {
+         Debug(3, "Audio is mono");
+       }
++#endif
+     } // end if is AAC
+ 
+     if (oc->oformat->flags & AVFMT_GLOBALHEADER) {
+@@ -802,17 +806,23 @@ bool VideoStore::setup_resampler() {
+ 
+   Debug(2, "Got something other than AAC (%s)", audio_in_codec->name);
+ 
++#if LIBAVUTIL_VERSION_CHECK(57, 28, 100, 28, 0)
++#else
+   // Some formats (i.e. WAV) do not produce the proper channel layout
+   if (audio_in_ctx->channel_layout == 0) {
+     Debug(2, "Setting input channel layout to mono");
+     // Perhaps we should not be modifying the audio_in_ctx....
+     audio_in_ctx->channel_layout = av_get_channel_layout("mono");
+   }
++#endif
+ 
+   /* put sample parameters */
+   audio_out_ctx->bit_rate = audio_in_ctx->bit_rate <= 32768 ? audio_in_ctx->bit_rate : 32768;
+   audio_out_ctx->sample_rate = audio_in_ctx->sample_rate;
+   audio_out_ctx->sample_fmt = audio_in_ctx->sample_fmt;
++#if LIBAVUTIL_VERSION_CHECK(57, 28, 100, 28, 0)
++  av_channel_layout_copy(&audio_out_ctx->ch_layout, &audio_in_ctx->ch_layout);
++#else
+   audio_out_ctx->channels = audio_in_ctx->channels;
+   audio_out_ctx->channel_layout = audio_in_ctx->channel_layout;
+   audio_out_ctx->sample_fmt = audio_in_ctx->sample_fmt;
+@@ -842,6 +852,7 @@ bool VideoStore::setup_resampler() {
+             audio_out_codec->supported_samplerates[0]);
+     }
+   }
++#endif
+ 
+   /* check that the encoder supports s16 pcm in */
+   if (!check_sample_fmt(audio_out_codec, audio_out_ctx->sample_fmt)) {
+@@ -890,22 +901,22 @@ bool VideoStore::setup_resampler() {
+         audio_out_ctx->time_base.num, audio_out_ctx->time_base.den);
+ 
+   Debug(1,
+-        "Audio in bit_rate (%" AV_PACKET_DURATION_FMT ") sample_rate(%d) channels(%d) fmt(%d) layout(%" PRIi64 ") frame_size(%d)",
++        "Audio in bit_rate (%" AV_PACKET_DURATION_FMT ") sample_rate(%d) channels(%d) fmt(%d) frame_size(%d)",
+         audio_in_ctx->bit_rate, audio_in_ctx->sample_rate,
+-        audio_in_ctx->channels, audio_in_ctx->sample_fmt,
+-        audio_in_ctx->channel_layout, audio_in_ctx->frame_size);
++        audio_in_ctx->ch_layout.nb_channels, audio_in_ctx->sample_fmt,
++        audio_in_ctx->frame_size);
+   Debug(1,
+-        "Audio out context bit_rate (%" AV_PACKET_DURATION_FMT ") sample_rate(%d) channels(%d) fmt(%d) layout(% " PRIi64 ") frame_size(%d)",
++        "Audio out context bit_rate (%" AV_PACKET_DURATION_FMT ") sample_rate(%d) channels(%d) fmt(%d) frame_size(%d)",
+         audio_out_ctx->bit_rate, audio_out_ctx->sample_rate,
+-        audio_out_ctx->channels, audio_out_ctx->sample_fmt,
+-        audio_out_ctx->channel_layout, audio_out_ctx->frame_size);
++        audio_out_ctx->ch_layout.nb_channels, audio_out_ctx->sample_fmt,
++        audio_out_ctx->frame_size);
+ 
+ #if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
+   Debug(1,
+-        "Audio out stream bit_rate (%" PRIi64 ") sample_rate(%d) channels(%d) fmt(%d) layout(%" PRIi64 ") frame_size(%d)",
++        "Audio out stream bit_rate (%" PRIi64 ") sample_rate(%d) channels(%d) fmt(%d) frame_size(%d)",
+         audio_out_stream->codecpar->bit_rate, audio_out_stream->codecpar->sample_rate,
+-        audio_out_stream->codecpar->channels, audio_out_stream->codecpar->format,
+-        audio_out_stream->codecpar->channel_layout, audio_out_stream->codecpar->frame_size);
++        audio_out_stream->codecpar->ch_layout.nb_channels, audio_out_stream->codecpar->format,
++        audio_out_stream->codecpar->frame_size);
+ #else
+   Debug(1,
+       "Audio out bit_rate (%d) sample_rate(%d) channels(%d) fmt(%d) "
+@@ -933,11 +944,24 @@ bool VideoStore::setup_resampler() {
+ 
+   if (!(fifo = av_audio_fifo_alloc(
+           audio_out_ctx->sample_fmt,
+-          audio_out_ctx->channels, 1))) {
++          audio_out_ctx->ch_layout.nb_channels, 1))) {
+     Error("Could not allocate FIFO");
+     return false;
+   }
+ #if defined(HAVE_LIBSWRESAMPLE)
++#if LIBAVUTIL_VERSION_CHECK(57, 28, 100, 28, 0)
++  if ((ret = swr_alloc_set_opts2(&resample_ctx,
++      &audio_out_ctx->ch_layout,
++      audio_out_ctx->sample_fmt,
++      audio_out_ctx->sample_rate,
++      &audio_in_ctx->ch_layout,
++      audio_in_ctx->sample_fmt,
++      audio_in_ctx->sample_rate,
++      0, nullptr)) < 0) {
++    Error("Could not allocate resample context");
++    return false;
++  }
++#else
+   resample_ctx = swr_alloc_set_opts(nullptr,
+       audio_out_ctx->channel_layout,
+       audio_out_ctx->sample_fmt,
+@@ -952,6 +976,7 @@ bool VideoStore::setup_resampler() {
+     av_frame_free(&out_frame);
+     return false;
+   }
++#endif
+   if ((ret = swr_init(resample_ctx)) < 0) {
+     Error("Could not open resampler");
+     av_frame_free(&in_frame);
+@@ -1000,16 +1025,23 @@ bool VideoStore::setup_resampler() {
+ 
+   out_frame->nb_samples = audio_out_ctx->frame_size;
+   out_frame->format = audio_out_ctx->sample_fmt;
+-#if LIBAVCODEC_VERSION_CHECK(56, 8, 0, 60, 100)
++#if LIBAVUTIL_VERSION_CHECK(57, 28, 100, 28, 0)
++  out_frame->ch_layout = audio_out_ctx->ch_layout;
++#else
+   out_frame->channels = audio_out_ctx->channels;
+-#endif
+   out_frame->channel_layout = audio_out_ctx->channel_layout;
++#endif
+   out_frame->sample_rate = audio_out_ctx->sample_rate;
+ 
+   // The codec gives us the frame size, in samples, we calculate the size of the
+   // samples buffer in bytes
+   unsigned int audioSampleBuffer_size = av_samples_get_buffer_size(
+-      nullptr, audio_out_ctx->channels,
++      nullptr,
++#if LIBAVUTIL_VERSION_CHECK(57, 28, 100, 28, 0)
++      audio_out_ctx->ch_layout.nb_channels,
++#else
++      audio_out_ctx->channels,
++#endif
+       audio_out_ctx->frame_size,
+       audio_out_ctx->sample_fmt, 0);
+   converted_in_samples = reinterpret_cast<uint8_t *>(av_malloc(audioSampleBuffer_size));
+@@ -1023,7 +1055,12 @@ bool VideoStore::setup_resampler() {
+ 
+   // Setup the data pointers in the AVFrame
+   if (avcodec_fill_audio_frame(
+-        out_frame, audio_out_ctx->channels,
++        out_frame,
++#if LIBAVUTIL_VERSION_CHECK(57, 28, 100, 28, 0)
++        audio_out_ctx->ch_layout.nb_channels,
++#else
++        audio_out_ctx->channels,
++#endif
+         audio_out_ctx->sample_fmt,
+         (const uint8_t *)converted_in_samples,
+         audioSampleBuffer_size, 0) < 0) {
+@@ -1183,7 +1220,7 @@ int VideoStore::writeVideoFramePacket(co
+     //zm_packet->out_frame->pict_type = AV_PICTURE_TYPE_NONE;
+     //zm_packet->out_frame->key_frame = zm_packet->keyframe;
+ #if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
+-    frame->pkt_duration = 0;
++    //frame->pkt_duration = 0;
+ #endif
+ 
+     int64_t in_pts = zm_packet->timestamp.tv_sec * (uint64_t)1000000 + zm_packet->timestamp.tv_usec;
+@@ -1235,14 +1272,28 @@ int VideoStore::writeVideoFramePacket(co
+ 
+     int64_t duration = 0;
+     if (zm_packet->in_frame) {
+-      if (zm_packet->in_frame->pkt_duration) {
++
++      if (
++#if LIBAVCODEC_VERSION_CHECK(60, 3, 0, 3, 0)
++          zm_packet->in_frame->duration
++#else
++          zm_packet->in_frame->pkt_duration
++#endif
++         ) {
+         duration = av_rescale_q(
++#if LIBAVCODEC_VERSION_CHECK(60, 3, 0, 3, 0)
++            zm_packet->in_frame->duration,
++#else
+             zm_packet->in_frame->pkt_duration,
++#endif
+             video_in_stream->time_base,
+             video_out_stream->time_base);
+-        Debug(1, "duration from ipkt: pts(%" PRId64 ") = pkt_duration(%" PRId64 ") => (%" PRId64 ") (%d/%d) (%d/%d)",
+-            zm_packet->in_frame->pts,
++        Debug(1, "duration from ipkt: = duration(%" PRId64 ") => (%" PRId64 ") (%d/%d) (%d/%d)",
++#if LIBAVCODEC_VERSION_CHECK(60, 3, 0, 3, 0)
++            zm_packet->in_frame->duration,
++#else
+             zm_packet->in_frame->pkt_duration,
++#endif
+             duration,
+             video_in_stream->time_base.num,
+             video_in_stream->time_base.den,
+@@ -1261,9 +1312,15 @@ int VideoStore::writeVideoFramePacket(co
+             duration
+             );
+         if (duration <= 0) {
++#if LIBAVCODEC_VERSION_CHECK(60, 3, 0, 3, 0)
++          duration = zm_packet->in_frame->duration ?
++            zm_packet->in_frame->duration :
++            av_rescale_q(1, video_in_stream->time_base, video_out_stream->time_base);
++#else
+           duration = zm_packet->in_frame->pkt_duration ?
+             zm_packet->in_frame->pkt_duration :
+             av_rescale_q(1, video_in_stream->time_base, video_out_stream->time_base);
++#endif
+         }
+       }  // end if in_frmae->pkt_duration
+       video_last_pts = zm_packet->in_frame->pts;
+--- zoneminder-1.36.33+dfsg1.orig/src/zm_ffmpeg.cpp
++++ zoneminder-1.36.33+dfsg1/src/zm_ffmpeg.cpp
+@@ -335,7 +335,7 @@ void zm_dump_stream_format(AVFormatConte
+       zm_log_fps(1 / av_q2d(st->time_base), "stream tb numerator");
+   } else if (codec->codec_type == AVMEDIA_TYPE_AUDIO) {
+     Debug(1, "profile %d channels %d sample_rate %d",
+-        codec->profile, codec->channels, codec->sample_rate);
++        codec->profile, codec->ch_layout.nb_channels, codec->sample_rate);
+   }
+ 
+   if (st->disposition & AV_DISPOSITION_DEFAULT)
+--- zoneminder-1.36.33+dfsg1.orig/src/zm_ffmpeg_input.cpp
++++ zoneminder-1.36.33+dfsg1/src/zm_ffmpeg_input.cpp
+@@ -300,7 +300,7 @@ AVFrame *FFmpeg_Input::get_frame(int str
+ 	last_seek_request = seek_target;
+ 
+   // Normally it is likely just the next packet. Need a heuristic for seeking, something like duration * keyframe interval
+-  if (frame->pts + 10*frame->pkt_duration < seek_target) {
++  if (frame->pts + 10*frame->duration < seek_target) {
+     Debug(1, "Jumping ahead");
+     if (( ret = av_seek_frame(input_format_context, stream_id, seek_target,
+             AVSEEK_FLAG_FRAME
+@@ -313,7 +313,7 @@ AVFrame *FFmpeg_Input::get_frame(int str
+   }
+   // Seeking seems to typically seek to a keyframe, so then we have to decode until we get the frame we want.
+   if (frame->pts <= seek_target) {
+-    while (frame && (frame->pts + frame->pkt_duration < seek_target)) {
++    while (frame && (frame->pts + frame->duration < seek_target)) {
+       if (is_video_stream(input_format_context->streams[stream_id])) {
+         zm_dump_video_frame(frame, "pts <= seek_target");
+       } else {
+--- zoneminder-1.36.33+dfsg1.orig/src/zm_mpeg.cpp
++++ zoneminder-1.36.33+dfsg1/src/zm_mpeg.cpp
+@@ -629,7 +629,7 @@ double VideoStream::ActuallyEncodeFrame(
+     pkt->size = buffer_size;
+     got_packet = 1;
+ 	} else {
+-		opicture_ptr->pts = codec_context->frame_number;
++		opicture_ptr->pts = codec_context->frame_num;
+ 		opicture_ptr->quality = codec_context->global_quality;
+ 
+ #if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
diff --git a/debian/patches/series b/debian/patches/series
index 928749b..738c358 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
 0007-Default-to-not-checking-for-updated-versions-of-Zone.patch
 0008-Unlink-installation-docs.patch
 0009-Allow-generation-of-random-seeds-on-install-time-not.patch
+0010-ffmpeg-7.patch