Control: tags 1078287 + pending Dear maintainer,
I've prepared an NMU for libtgowt (versioned as 0~git20230615.a45d8b8+dfsg-2.1) and uploaded it to unstable. Regards. -- WBR, wRAR
diff -Nru libtgowt-0~git20230615.a45d8b8+dfsg/debian/changelog libtgowt-0~git20230615.a45d8b8+dfsg/debian/changelog --- libtgowt-0~git20230615.a45d8b8+dfsg/debian/changelog 2023-06-24 19:21:00.000000000 +0500 +++ libtgowt-0~git20230615.a45d8b8+dfsg/debian/changelog 2024-09-11 15:50:50.000000000 +0500 @@ -1,3 +1,10 @@ +libtgowt (0~git20230615.a45d8b8+dfsg-2.1) unstable; urgency=medium + + * Non-maintainer upload. + * Fix building with new ffmpeg (Closes: #1078287). + + -- Andrey Rakhmatullin <w...@debian.org> Wed, 11 Sep 2024 15:50:50 +0500 + libtgowt (0~git20230615.a45d8b8+dfsg-2) unstable; urgency=medium * New Unbundle-libyuv.patch and libyuv-dev build dependency. diff -Nru libtgowt-0~git20230615.a45d8b8+dfsg/debian/patches/Remove-usage-of-AVCodecContext-reordered_opaque.patch libtgowt-0~git20230615.a45d8b8+dfsg/debian/patches/Remove-usage-of-AVCodecContext-reordered_opaque.patch --- libtgowt-0~git20230615.a45d8b8+dfsg/debian/patches/Remove-usage-of-AVCodecContext-reordered_opaque.patch 1970-01-01 05:00:00.000000000 +0500 +++ libtgowt-0~git20230615.a45d8b8+dfsg/debian/patches/Remove-usage-of-AVCodecContext-reordered_opaque.patch 2024-09-11 14:37:17.000000000 +0500 @@ -0,0 +1,53 @@ +From: Ted Meyer <tmathme...@chromium.org> +Date: Wed, 20 Mar 2024 15:32:19 -0700 +Subject: [PATCH] Remove usage of AVCodecContext::reordered_opaque + +FFmpeg has removed this field and usage of it in chromium must be +removed before the ffmpeg dependency is updated. The chromium media +change can be found here: +https://chromium-review.googlesource.com/c/chromium/src/+/5384308 + +The usage of the field in webrtc seems only to be for sanity checking, +so it should be just safe to remove entirely, since webrtc does not +expect re-ordering at all. + +Bug: chromium:330573128 +Change-Id: I9c5854ec82c3ad2d55374ea4eaa0c571437f8267 +Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/343840 +Reviewed-by: Erik Språng <spr...@webrtc.org> +Commit-Queue: Ted (Chromium) Meyer <tmathme...@chromium.org> +Cr-Commit-Position: refs/heads/main@{#41935} +--- + modules/video_coding/codecs/h264/h264_decoder_impl.cc | 7 ------- + 1 file changed, 7 deletions(-) + +--- a/src/modules/video_coding/codecs/h264/h264_decoder_impl.cc ++++ b/src/modules/video_coding/codecs/h264/h264_decoder_impl.cc +@@ -233,7 +233,6 @@ int H264DecoderImpl::AVGetBuffer2(AVCodecContext* context, + int total_size = y_size + 2 * uv_size; + + av_frame->format = context->pix_fmt; +- av_frame->reordered_opaque = context->reordered_opaque; + + // Create a VideoFrame object, to keep a reference to the buffer. + // TODO(nisse): The VideoFrame's timestamp and rotation info is not used. +@@ -381,8 +380,6 @@ int32_t H264DecoderImpl::Decode(const EncodedImage& input_image, + return WEBRTC_VIDEO_CODEC_ERROR; + } + packet->size = static_cast<int>(input_image.size()); +- int64_t frame_timestamp_us = input_image.ntp_time_ms_ * 1000; // ms -> μs +- av_context_->reordered_opaque = frame_timestamp_us; + + int result = avcodec_send_packet(av_context_.get(), packet.get()); + +@@ -399,10 +396,6 @@ int32_t H264DecoderImpl::Decode(const EncodedImage& input_image, + return WEBRTC_VIDEO_CODEC_ERROR; + } + +- // We don't expect reordering. Decoded frame timestamp should match +- // the input one. +- RTC_DCHECK_EQ(av_frame_->reordered_opaque, frame_timestamp_us); +- + // TODO(sakal): Maybe it is possible to get QP directly from FFmpeg. + h264_bitstream_parser_.ParseBitstream(input_image); + absl::optional<int> qp = h264_bitstream_parser_.GetLastSliceQp(); diff -Nru libtgowt-0~git20230615.a45d8b8+dfsg/debian/patches/series libtgowt-0~git20230615.a45d8b8+dfsg/debian/patches/series --- libtgowt-0~git20230615.a45d8b8+dfsg/debian/patches/series 2023-06-24 13:56:41.000000000 +0500 +++ libtgowt-0~git20230615.a45d8b8+dfsg/debian/patches/series 2024-09-11 14:36:40.000000000 +0500 @@ -6,3 +6,4 @@ Unbundle-libSRTP.patch Unbundle-libyuv.patch Backport-to-stable-libvpx.patch +Remove-usage-of-AVCodecContext-reordered_opaque.patch
signature.asc
Description: PGP signature
