-
Notifications
You must be signed in to change notification settings - Fork 10
/
Copy path0004-ffmpeg7.patch
745 lines (681 loc) · 30.2 KB
/
0004-ffmpeg7.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
From 5f731d1c62ebee57c0a545fe255c53b8018ca754 Mon Sep 17 00:00:00 2001
From: Stephan Sundermann <[email protected]>
Date: Thu, 11 Apr 2024 17:11:32 +0200
Subject: [PATCH 1/7] [ffmpeg] Update to 7.0
---
cmake/modules/FindFFMPEG.cmake | 16 +--
tools/buildsteps/windows/ffmpeg_options.txt | 1 -
tools/depends/target/ffmpeg/CMakeLists.txt | 6 +-
tools/depends/target/ffmpeg/FFMPEG-VERSION | 4 +-
xbmc/cdrip/EncoderFFmpeg.cpp | 2 +-
xbmc/cdrip/EncoderFFmpeg.h | 2 +-
.../ActiveAE/ActiveAEResampleFFMPEG.cpp | 110 +++++++++---------
.../DVDDemuxers/DVDDemuxFFmpeg.cpp | 71 +----------
8 files changed, 69 insertions(+), 143 deletions(-)
diff --git a/cmake/modules/FindFFMPEG.cmake b/cmake/modules/FindFFMPEG.cmake
index 6c6bf973de..6bd05e9f3d 100644
--- a/cmake/modules/FindFFMPEG.cmake
+++ b/cmake/modules/FindFFMPEG.cmake
@@ -163,14 +163,14 @@ if(WITH_FFMPEG)
set(REQUIRED_FFMPEG_VERSION undef)
else()
# required ffmpeg library versions
- set(REQUIRED_FFMPEG_VERSION 6.0.0)
- set(_avcodec_ver ">=60.2.100")
- set(_avfilter_ver ">=9.3.100")
- set(_avformat_ver ">=60.3.100")
- set(_avutil_ver ">=58.2.100")
- set(_postproc_ver ">=57.1.100")
- set(_swresample_ver ">=4.10.100")
- set(_swscale_ver ">=7.1.100")
+ set(REQUIRED_FFMPEG_VERSION 7.0.0)
+ set(_avcodec_ver ">=61.3.100")
+ set(_avfilter_ver ">=10.1.100")
+ set(_avformat_ver ">=61.1.100")
+ set(_avutil_ver ">=59.8.100")
+ set(_postproc_ver ">=58.1.100")
+ set(_swresample_ver ">=5.1.100")
+ set(_swscale_ver ">=8.1.100")
endif()
# Allows building with external ffmpeg not found in system paths,
diff --git a/tools/buildsteps/windows/ffmpeg_options.txt b/tools/buildsteps/windows/ffmpeg_options.txt
index 5034ff26c4..776c0b4b35 100644
--- a/tools/buildsteps/windows/ffmpeg_options.txt
+++ b/tools/buildsteps/windows/ffmpeg_options.txt
@@ -1,5 +1,4 @@
--disable-avdevice
---disable-crystalhd
--disable-cuda
--disable-cuvid
--disable-devices
diff --git a/tools/depends/target/ffmpeg/FFMPEG-VERSION b/tools/depends/target/ffmpeg/FFMPEG-VERSION
index f2ba09402e..60b8887de3 100644
--- a/tools/depends/target/ffmpeg/FFMPEG-VERSION
+++ b/tools/depends/target/ffmpeg/FFMPEG-VERSION
@@ -1,5 +1,5 @@
LIBNAME=ffmpeg
-VERSION=6.0.1
+VERSION=7.0.1
ARCHIVE=$(LIBNAME)-$(VERSION).tar.gz
-SHA512=945e34840092dc0fd3824eb1af2be79868af2afb4fe13159b19a9bcfc464cc4d53243c13ff065199290e9393ddbf4b1c5c8abccf83a31a31d6c7490e499fd1fc
+SHA512=43b639b0bc0597e95dea2dce3e925f4b71ca8c4d9eadaef614941053e287f2d5c2e78d95413f0f7142da0f6ea1dbf443457e4fa1c2296cd8cf4081c185ed9c04
diff --git a/xbmc/cdrip/EncoderFFmpeg.cpp b/xbmc/cdrip/EncoderFFmpeg.cpp
index 85f5fa412e..907d2591dd 100644
--- a/xbmc/cdrip/EncoderFFmpeg.cpp
+++ b/xbmc/cdrip/EncoderFFmpeg.cpp
@@ -235,7 +235,7 @@ void CEncoderFFmpeg::SetTag(const std::string& tag, const std::string& value)
av_dict_set(&m_formatCtx->metadata, tag.c_str(), value.c_str(), 0);
}
-int CEncoderFFmpeg::avio_write_callback(void* opaque, uint8_t* buf, int buf_size)
+int CEncoderFFmpeg::avio_write_callback(void* opaque, const uint8_t* buf, int buf_size)
{
CEncoderFFmpeg* enc = static_cast<CEncoderFFmpeg*>(opaque);
if (enc->Write(buf, buf_size) != buf_size)
diff --git a/xbmc/cdrip/EncoderFFmpeg.h b/xbmc/cdrip/EncoderFFmpeg.h
index 48471a4b10..4e9f0f5bbb 100644
--- a/xbmc/cdrip/EncoderFFmpeg.h
+++ b/xbmc/cdrip/EncoderFFmpeg.h
@@ -33,7 +33,7 @@ public:
bool Close() override;
private:
- static int avio_write_callback(void* opaque, uint8_t* buf, int buf_size);
+ static int avio_write_callback(void* opaque, const uint8_t* buf, int buf_size);
static int64_t avio_seek_callback(void* opaque, int64_t offset, int whence);
void SetTag(const std::string& tag, const std::string& value);
diff --git a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEResampleFFMPEG.cpp b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEResampleFFMPEG.cpp
index e897cbd3ea..6fce0af981 100644
--- a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEResampleFFMPEG.cpp
+++ b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEResampleFFMPEG.cpp
@@ -66,51 +66,7 @@ bool CActiveAEResampleFFMPEG::Init(SampleConfig dstConfig, SampleConfig srcConfi
AVChannelLayout dstChLayout = {};
AVChannelLayout srcChLayout = {};
- av_channel_layout_from_mask(&dstChLayout, m_dst_chan_layout);
- av_channel_layout_from_mask(&srcChLayout, m_src_chan_layout);
-
- int ret = swr_alloc_set_opts2(&m_pContext, &dstChLayout, m_dst_fmt, m_dst_rate, &srcChLayout,
- m_src_fmt, m_src_rate, 0, NULL);
-
- if (ret)
- {
- CLog::Log(LOGERROR, "CActiveAEResampleFFMPEG::Init - create context failed");
- return false;
- }
-
- if(quality == AE_QUALITY_HIGH)
- {
- av_opt_set_double(m_pContext, "cutoff", 1.0, 0);
- av_opt_set_int(m_pContext,"filter_size", 256, 0);
- }
- else if(quality == AE_QUALITY_MID)
- {
- // 0.97 is default cutoff so use (1.0 - 0.97) / 2.0 + 0.97
- av_opt_set_double(m_pContext, "cutoff", 0.985, 0);
- av_opt_set_int(m_pContext,"filter_size", 64, 0);
- }
- else if(quality == AE_QUALITY_LOW)
- {
- av_opt_set_double(m_pContext, "cutoff", 0.97, 0);
- av_opt_set_int(m_pContext,"filter_size", 32, 0);
- }
-
- if (m_dst_fmt == AV_SAMPLE_FMT_S32 || m_dst_fmt == AV_SAMPLE_FMT_S32P)
- {
- av_opt_set_int(m_pContext, "output_sample_bits", m_dst_bits, 0);
- }
-
- // tell resampler to clamp float values
- // not required for sink stage (remapLayout == true)
- if ((m_dst_fmt == AV_SAMPLE_FMT_FLT || m_dst_fmt == AV_SAMPLE_FMT_FLTP) &&
- (m_src_fmt == AV_SAMPLE_FMT_FLT || m_src_fmt == AV_SAMPLE_FMT_FLTP) &&
- !remapLayout && normalize)
- {
- av_opt_set_double(m_pContext, "rematrix_maxval", 1.0, 0);
- }
-
- av_opt_set_double(m_pContext, "center_mix_level", centerMix, 0);
-
+ bool hasMatrix = false;
if (remapLayout)
{
// one-to-one mapping of channels
@@ -120,28 +76,19 @@ bool CActiveAEResampleFFMPEG::Init(SampleConfig dstConfig, SampleConfig srcConfi
m_dst_chan_layout = 0;
for (unsigned int out=0; out<remapLayout->Count(); out++)
{
- m_dst_chan_layout += ((uint64_t)1) << out;
+ m_dst_chan_layout += static_cast<uint64_t>(1) << out;
int idx = CAEUtil::GetAVChannelIndex((*remapLayout)[out], m_src_chan_layout);
if (idx >= 0)
{
m_rematrix[out][idx] = 1.0;
}
}
-
- av_opt_set_int(m_pContext, "out_channel_count", m_dst_channels, 0);
- av_opt_set_int(m_pContext, "out_channel_layout", m_dst_chan_layout, 0);
-
- if (swr_set_matrix(m_pContext, (const double*)m_rematrix, AE_CH_MAX) < 0)
- {
- CLog::Log(LOGERROR, "CActiveAEResampleFFMPEG::Init - setting channel matrix failed");
- return false;
- }
+ hasMatrix = true;
}
// stereo upmix
else if (upmix && m_src_channels == 2 && m_dst_channels > 2)
{
memset(m_rematrix, 0, sizeof(m_rematrix));
- av_channel_layout_uninit(&dstChLayout);
av_channel_layout_from_mask(&dstChLayout, m_dst_chan_layout);
for (int out=0; out<m_dst_channels; out++)
{
@@ -171,15 +118,64 @@ bool CActiveAEResampleFFMPEG::Init(SampleConfig dstConfig, SampleConfig srcConfi
}
}
+ hasMatrix = true;
av_channel_layout_uninit(&dstChLayout);
+ }
+
+ av_channel_layout_from_mask(&dstChLayout, m_dst_chan_layout);
+ av_channel_layout_from_mask(&srcChLayout, m_src_chan_layout);
+
+ int ret = swr_alloc_set_opts2(&m_pContext, &dstChLayout, m_dst_fmt, m_dst_rate, &srcChLayout,
+ m_src_fmt, m_src_rate, 0, NULL);
+
+ if (ret)
+ {
+ CLog::Log(LOGERROR, "CActiveAEResampleFFMPEG::Init - create context failed");
+ return false;
+ }
- if (swr_set_matrix(m_pContext, (const double*)m_rematrix, AE_CH_MAX) < 0)
+ if (hasMatrix)
+ {
+ if (swr_set_matrix(m_pContext, reinterpret_cast<const double*>(m_rematrix), AE_CH_MAX) < 0)
{
CLog::Log(LOGERROR, "CActiveAEResampleFFMPEG::Init - setting channel matrix failed");
return false;
}
}
+ if (quality == AE_QUALITY_HIGH)
+ {
+ av_opt_set_double(m_pContext, "cutoff", 1.0, 0);
+ av_opt_set_int(m_pContext, "filter_size", 256, 0);
+ }
+ else if (quality == AE_QUALITY_MID)
+ {
+ // 0.97 is default cutoff so use (1.0 - 0.97) / 2.0 + 0.97
+ av_opt_set_double(m_pContext, "cutoff", 0.985, 0);
+ av_opt_set_int(m_pContext, "filter_size", 64, 0);
+ }
+ else if (quality == AE_QUALITY_LOW)
+ {
+ av_opt_set_double(m_pContext, "cutoff", 0.97, 0);
+ av_opt_set_int(m_pContext, "filter_size", 32, 0);
+ }
+
+ if (m_dst_fmt == AV_SAMPLE_FMT_S32 || m_dst_fmt == AV_SAMPLE_FMT_S32P)
+ {
+ av_opt_set_int(m_pContext, "output_sample_bits", m_dst_bits, 0);
+ }
+
+ // tell resampler to clamp float values
+ // not required for sink stage (remapLayout == true)
+ if ((m_dst_fmt == AV_SAMPLE_FMT_FLT || m_dst_fmt == AV_SAMPLE_FMT_FLTP) &&
+ (m_src_fmt == AV_SAMPLE_FMT_FLT || m_src_fmt == AV_SAMPLE_FMT_FLTP) && !remapLayout &&
+ normalize)
+ {
+ av_opt_set_double(m_pContext, "rematrix_maxval", 1.0, 0);
+ }
+
+ av_opt_set_double(m_pContext, "center_mix_level", centerMix, 0);
+
if(swr_init(m_pContext) < 0)
{
CLog::Log(LOGERROR, "CActiveAEResampleFFMPEG::Init - init resampler failed");
diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
index 1aebc3dcbc..174df53f16 100644
--- a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
+++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
@@ -376,74 +376,7 @@ bool CDVDDemuxFFmpeg::Open(const std::shared_ptr<CDVDInputStream>& pInput, bool
if (iformat == nullptr)
{
// let ffmpeg decide which demuxer we have to open
- bool trySPDIFonly = (m_pInput->GetContent() == "audio/x-spdif-compressed");
-
- if (!trySPDIFonly)
- av_probe_input_buffer(m_ioContext, &iformat, strFile.c_str(), NULL, 0, 0);
-
- // Use the more low-level code in case we have been built against an old
- // FFmpeg without the above av_probe_input_buffer(), or in case we only
- // want to probe for spdif (DTS or IEC 61937) compressed audio
- // specifically, or in case the file is a wav which may contain DTS or
- // IEC 61937 (e.g. ac3-in-wav) and we want to check for those formats.
- if (trySPDIFonly || (iformat && strcmp(iformat->name, "wav") == 0))
- {
- AVProbeData pd;
- int probeBufferSize = 32768;
- std::unique_ptr<uint8_t[]> probe_buffer (new uint8_t[probeBufferSize + AVPROBE_PADDING_SIZE]);
-
- // init probe data
- pd.buf = probe_buffer.get();
- pd.filename = strFile.c_str();
-
- // read data using avformat's buffers
- pd.buf_size = avio_read(m_ioContext, pd.buf, probeBufferSize);
- if (pd.buf_size <= 0)
- {
- CLog::Log(LOGERROR, "{} - error reading from input stream, {}", __FUNCTION__,
- CURL::GetRedacted(strFile));
- return false;
- }
- memset(pd.buf + pd.buf_size, 0, AVPROBE_PADDING_SIZE);
-
- // restore position again
- avio_seek(m_ioContext , 0, SEEK_SET);
-
- // the advancedsetting is for allowing the user to force outputting the
- // 44.1 kHz DTS wav file as PCM, so that an A/V receiver can decode
- // it (this is temporary until we handle 44.1 kHz passthrough properly)
- if (trySPDIFonly || (iformat && strcmp(iformat->name, "wav") == 0 && !CServiceBroker::GetSettingsComponent()->GetAdvancedSettings()->m_VideoPlayerIgnoreDTSinWAV))
- {
- // check for spdif and dts
- // This is used with wav files and audio CDs that may contain
- // a DTS or AC3 track padded for S/PDIF playback. If neither of those
- // is present, we assume it is PCM audio.
- // AC3 is always wrapped in iec61937 (ffmpeg "spdif"), while DTS
- // may be just padded.
- const AVInputFormat* iformat2 = av_find_input_format("spdif");
- if (iformat2 && iformat2->read_probe(&pd) > AVPROBE_SCORE_MAX / 4)
- {
- iformat = iformat2;
- }
- else
- {
- // not spdif or no spdif demuxer, try dts
- iformat2 = av_find_input_format("dts");
-
- if (iformat2 && iformat2->read_probe(&pd) > AVPROBE_SCORE_MAX / 4)
- {
- iformat = iformat2;
- }
- else if (trySPDIFonly)
- {
- // not dts either, return false in case we were explicitly
- // requested to only check for S/PDIF padded compressed audio
- CLog::Log(LOGDEBUG, "{} - not spdif or dts file, falling back", __FUNCTION__);
- return false;
- }
- }
- }
- }
+ av_probe_input_buffer(m_ioContext, &iformat, strFile.c_str(), NULL, 0, 0);
if (!iformat)
{
@@ -1353,7 +1286,7 @@ bool CDVDDemuxFFmpeg::SeekTime(double time, bool backwards, double* startpts)
if (ret >= 0)
{
- if (m_pFormatContext->iformat->read_seek)
+ if (!(m_pFormatContext->iformat->flags & AVFMT_NOTIMESTAMPS))
m_seekToKeyFrame = true;
m_currentPts = DVD_NOPTS_VALUE;
}
--
2.43.0
From 17ce23505f171235ac6bfff7fbaa3a5b4bc9a8bf Mon Sep 17 00:00:00 2001
From: Stephan Sundermann <[email protected]>
Date: Thu, 11 Apr 2024 17:13:36 +0200
Subject: [PATCH 2/7] [ffmpeg] Remove deprecated use of FF_API_INTERLACED_FRAME
---
.../DVDCodecs/Video/DVDVideoCodecDRMPRIME.cpp | 5 +++--
.../VideoPlayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp | 9 +++++----
xbmc/cores/VideoPlayer/DVDCodecs/Video/VAAPI.cpp | 6 ++++--
xbmc/cores/VideoPlayer/DVDCodecs/Video/VTB.cpp | 2 +-
4 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecDRMPRIME.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecDRMPRIME.cpp
index eb2943bb8c..4da0722d5c 100644
--- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecDRMPRIME.cpp
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecDRMPRIME.cpp
@@ -582,8 +582,9 @@ void CDVDVideoCodecDRMPRIME::SetPictureParams(VideoPicture* pVideoPicture)
pVideoPicture->iRepeatPicture = 0;
pVideoPicture->iFlags = 0;
- pVideoPicture->iFlags |= m_pFrame->interlaced_frame ? DVP_FLAG_INTERLACED : 0;
- pVideoPicture->iFlags |= m_pFrame->top_field_first ? DVP_FLAG_TOP_FIELD_FIRST : 0;
+ pVideoPicture->iFlags |= m_pFrame->flags & AV_FRAME_FLAG_INTERLACED ? DVP_FLAG_INTERLACED : 0;
+ pVideoPicture->iFlags |=
+ m_pFrame->flags & AV_FRAME_FLAG_TOP_FIELD_FIRST ? DVP_FLAG_TOP_FIELD_FIRST : 0;
pVideoPicture->iFlags |= m_pFrame->data[0] ? 0 : DVP_FLAG_DROPPED;
if (m_codecControlFlags & DVD_CODEC_CTRL_DROP)
diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp
index d66378fa07..9586d211e9 100644
--- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp
@@ -792,12 +792,12 @@ CDVDVideoCodec::VCReturn CDVDVideoCodecFFmpeg::GetPicture(VideoPicture* pVideoPi
}
m_dropCtrl.Process(framePTS, m_pCodecContext->skip_frame > AVDISCARD_DEFAULT);
- if (m_pDecodedFrame->key_frame)
+ if (m_pDecodedFrame->flags & AV_FRAME_FLAG_KEY)
{
m_started = true;
m_iLastKeyframe = m_pCodecContext->has_b_frames + 2;
}
- if (m_pDecodedFrame->interlaced_frame)
+ if (m_pDecodedFrame->flags & AV_FRAME_FLAG_INTERLACED)
m_interlaced = true;
else
m_interlaced = false;
@@ -1013,8 +1013,9 @@ bool CDVDVideoCodecFFmpeg::GetPictureCommon(VideoPicture* pVideoPicture)
pVideoPicture->iRepeatPicture = 0.5 * m_pFrame->repeat_pict;
pVideoPicture->iFlags = 0;
- pVideoPicture->iFlags |= m_pFrame->interlaced_frame ? DVP_FLAG_INTERLACED : 0;
- pVideoPicture->iFlags |= m_pFrame->top_field_first ? DVP_FLAG_TOP_FIELD_FIRST: 0;
+ pVideoPicture->iFlags |= m_pFrame->flags & AV_FRAME_FLAG_INTERLACED ? DVP_FLAG_INTERLACED : 0;
+ pVideoPicture->iFlags |=
+ m_pFrame->flags & AV_FRAME_FLAG_TOP_FIELD_FIRST ? DVP_FLAG_TOP_FIELD_FIRST : 0;
if (m_codecControlFlags & DVD_CODEC_CTRL_DROP)
{
diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/VAAPI.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/VAAPI.cpp
index fb7606e0d0..a62fa6273d 100644
--- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/VAAPI.cpp
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/VAAPI.cpp
@@ -3068,8 +3068,10 @@ bool CFFmpegPostproc::AddPicture(CVaapiDecodedPicture &inPic)
m_pFilterFrameIn->height = m_config.vidHeight;
m_pFilterFrameIn->linesize[0] = image.pitches[0];
m_pFilterFrameIn->linesize[1] = image.pitches[1];
- m_pFilterFrameIn->interlaced_frame = (inPic.DVDPic.iFlags & DVP_FLAG_INTERLACED) ? 1 : 0;
- m_pFilterFrameIn->top_field_first = (inPic.DVDPic.iFlags & DVP_FLAG_TOP_FIELD_FIRST) ? 1 : 0;
+ if (inPic.DVDPic.iFlags & DVP_FLAG_INTERLACED)
+ m_pFilterFrameIn->flags |= AV_FRAME_FLAG_INTERLACED;
+ if (inPic.DVDPic.iFlags & DVP_FLAG_TOP_FIELD_FIRST)
+ m_pFilterFrameIn->flags |= AV_FRAME_FLAG_TOP_FIELD_FIRST;
if (inPic.DVDPic.pts == DVD_NOPTS_VALUE)
m_pFilterFrameIn->pts = AV_NOPTS_VALUE;
diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/VTB.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/VTB.cpp
index 1f71f643d2..567d63559d 100644
--- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/VTB.cpp
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/VTB.cpp
@@ -196,7 +196,7 @@ CDVDVideoCodec::VCReturn CDecoder::Decode(AVCodecContext* avctx, AVFrame* frame)
if(frame)
{
- if (frame->interlaced_frame)
+ if (frame->flags & AV_FRAME_FLAG_INTERLACED)
return CDVDVideoCodec::VC_FATAL;
if (m_renderBuffer)
--
2.43.0
From 01aa01d5c096ff7554c79493eab65dd41b00402f Mon Sep 17 00:00:00 2001
From: Stephan Sundermann <[email protected]>
Date: Thu, 11 Apr 2024 17:14:48 +0200
Subject: [PATCH 3/7] [ffmpeg] Remove deprecated use of avcodec_close
---
xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxClient.cpp | 1 -
1 file changed, 1 deletion(-)
diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxClient.cpp b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxClient.cpp
index 0cdf8c3864..477a2e82ec 100644
--- a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxClient.cpp
+++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxClient.cpp
@@ -188,7 +188,6 @@ bool CDVDDemuxClient::ParsePacket(DemuxPacket* pkt)
if (!avcodec_open2(stream->m_context, stream->m_context->codec, nullptr))
{
avcodec_send_packet(stream->m_context, avpkt);
- avcodec_close(stream->m_context);
}
}
av_packet_free(&avpkt);
--
2.43.0
From b509d439c18bebcf35cc80d18a0997caf6eda8a6 Mon Sep 17 00:00:00 2001
From: Stephan Sundermann <[email protected]>
Date: Thu, 11 Apr 2024 17:15:16 +0200
Subject: [PATCH 4/7] [ffmpeg] Remove deprecated use av_stream_get_side_data
---
.../DVDDemuxers/DVDDemuxFFmpeg.cpp | 53 +++++++++++--------
1 file changed, 32 insertions(+), 21 deletions(-)
diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
index 174df53f16..f917bf719f 100644
--- a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
+++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
@@ -1630,42 +1630,49 @@ CDemuxStream* CDVDDemuxFFmpeg::AddStream(int streamIdx)
st->colorRange = pStream->codecpar->color_range;
st->hdr_type = DetermineHdrType(pStream);
- // https://github.com/FFmpeg/FFmpeg/blob/release/5.0/doc/APIchanges
- size_t size = 0;
- uint8_t* side_data = nullptr;
+ // https://github.com/FFmpeg/FFmpeg/blob/release/7.0/doc/APIchanges
+ const AVPacketSideData* sideData = nullptr;
if (st->hdr_type == StreamHdrType::HDR_TYPE_DOLBYVISION)
{
- side_data = av_stream_get_side_data(pStream, AV_PKT_DATA_DOVI_CONF, &size);
- if (side_data && size)
+
+ sideData =
+ av_packet_side_data_get(pStream->codecpar->coded_side_data,
+ pStream->codecpar->nb_coded_side_data, AV_PKT_DATA_DOVI_CONF);
+ if (sideData && sideData->size)
{
- st->dovi = *reinterpret_cast<AVDOVIDecoderConfigurationRecord*>(side_data);
+ st->dovi = *reinterpret_cast<const AVDOVIDecoderConfigurationRecord*>(sideData->data);
}
}
- side_data = av_stream_get_side_data(pStream, AV_PKT_DATA_MASTERING_DISPLAY_METADATA, &size);
- if (side_data && size)
+ sideData = av_packet_side_data_get(pStream->codecpar->coded_side_data,
+ pStream->codecpar->nb_coded_side_data,
+ AV_PKT_DATA_MASTERING_DISPLAY_METADATA);
+ if (sideData && sideData->size)
{
st->masteringMetaData = std::make_shared<AVMasteringDisplayMetadata>(
- *reinterpret_cast<AVMasteringDisplayMetadata*>(side_data));
+ *reinterpret_cast<const AVMasteringDisplayMetadata*>(sideData->data));
}
- side_data = av_stream_get_side_data(pStream, AV_PKT_DATA_CONTENT_LIGHT_LEVEL, &size);
- if (side_data && size)
+ sideData = av_packet_side_data_get(pStream->codecpar->coded_side_data,
+ pStream->codecpar->nb_coded_side_data,
+ AV_PKT_DATA_CONTENT_LIGHT_LEVEL);
+ if (sideData && sideData->size)
{
st->contentLightMetaData = std::make_shared<AVContentLightMetadata>(
- *reinterpret_cast<AVContentLightMetadata*>(side_data));
+ *reinterpret_cast<const AVContentLightMetadata*>(sideData->data));
}
- uint8_t* displayMatrixSideData =
- av_stream_get_side_data(pStream, AV_PKT_DATA_DISPLAYMATRIX, nullptr);
- if (displayMatrixSideData)
+ sideData = av_packet_side_data_get(pStream->codecpar->coded_side_data,
+ pStream->codecpar->nb_coded_side_data,
+ AV_PKT_DATA_DISPLAYMATRIX);
+ if (sideData)
{
- const double tetha =
- av_display_rotation_get(reinterpret_cast<int32_t*>(displayMatrixSideData));
- if (!std::isnan(tetha))
+ const double theta =
+ av_display_rotation_get(reinterpret_cast<const int32_t*>(sideData->data));
+ if (!std::isnan(theta))
{
- st->iOrientation = ((static_cast<int>(-tetha) % 360) + 360) % 360;
+ st->iOrientation = ((static_cast<int>(-theta) % 360) + 360) % 360;
}
}
@@ -2488,7 +2495,9 @@ StreamHdrType CDVDDemuxFFmpeg::DetermineHdrType(AVStream* pStream)
{
StreamHdrType hdrType = StreamHdrType::HDR_TYPE_NONE;
- if (av_stream_get_side_data(pStream, AV_PKT_DATA_DOVI_CONF, nullptr)) // DoVi
+ if (av_packet_side_data_get(pStream->codecpar->coded_side_data,
+ pStream->codecpar->nb_coded_side_data,
+ AV_PKT_DATA_DOVI_CONF)) // DoVi
hdrType = StreamHdrType::HDR_TYPE_DOLBYVISION;
else if (pStream->codecpar->color_trc == AVCOL_TRC_SMPTE2084) // HDR10
hdrType = StreamHdrType::HDR_TYPE_HDR10;
@@ -2496,7 +2505,9 @@ StreamHdrType CDVDDemuxFFmpeg::DetermineHdrType(AVStream* pStream)
hdrType = StreamHdrType::HDR_TYPE_HLG;
// file could be SMPTE2086 which FFmpeg currently returns as unknown
// so use the presence of static metadata to detect it
- else if (av_stream_get_side_data(pStream, AV_PKT_DATA_MASTERING_DISPLAY_METADATA, nullptr))
+ else if (av_packet_side_data_get(pStream->codecpar->coded_side_data,
+ pStream->codecpar->nb_coded_side_data,
+ AV_PKT_DATA_MASTERING_DISPLAY_METADATA))
hdrType = StreamHdrType::HDR_TYPE_HDR10;
return hdrType;
--
2.43.0
From 5e7609bfee5e0559d6c29b01fbc4294d27168921 Mon Sep 17 00:00:00 2001
From: Stephan Sundermann <[email protected]>
Date: Thu, 11 Apr 2024 17:15:43 +0200
Subject: [PATCH 5/7] [ffmpeg] Remove CrystalHD hw acceleration strings
---
addons/resource.language.en_gb/resources/strings.po | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
diff --git a/addons/resource.language.en_gb/resources/strings.po b/addons/resource.language.en_gb/resources/strings.po
index 056b1747a0..292aae4a1b 100644
--- a/addons/resource.language.en_gb/resources/strings.po
+++ b/addons/resource.language.en_gb/resources/strings.po
@@ -7342,10 +7342,7 @@ msgctxt "#13427"
msgid "Allow hardware acceleration - DXVA2"
msgstr ""
-#: system/settings/settings.xml
-msgctxt "#13428"
-msgid "Allow hardware acceleration - CrystalHD"
-msgstr ""
+#empty string with id 13428
#: system/settings/settings.xml
msgctxt "#13429"
@@ -19502,11 +19499,7 @@ msgctxt "#36158"
msgid "Enable DXVA2 hardware decoding of video files."
msgstr ""
-#. Description of setting with label #13428 "Allow hardware acceleration (CrystalHD)"
-#: system/settings/settings.xml
-msgctxt "#36159"
-msgid "Enable CrystalHD decoding of video files."
-msgstr ""
+#empty string with id 36159
#. Description of setting with label #13429 "Allow hardware acceleration (VDADecoder)"
#: system/settings/settings.xml
--
2.43.0
From 813a40bb30285b1b32a7ab6e63953eb3665f051a Mon Sep 17 00:00:00 2001
From: Stephan Sundermann <[email protected]>
Date: Sat, 13 Apr 2024 10:31:36 +0200
Subject: [PATCH 6/7] [settings] Remove VideoPlayerignoredtsinwav advanced
setting
---
xbmc/settings/AdvancedSettings.cpp | 2 --
xbmc/settings/AdvancedSettings.h | 1 -
2 files changed, 3 deletions(-)
diff --git a/xbmc/settings/AdvancedSettings.cpp b/xbmc/settings/AdvancedSettings.cpp
index cc06244799..4e2d6badd6 100644
--- a/xbmc/settings/AdvancedSettings.cpp
+++ b/xbmc/settings/AdvancedSettings.cpp
@@ -129,7 +129,6 @@ void CAdvancedSettings::Initialize()
return;
m_audioApplyDrc = -1.0f;
- m_VideoPlayerIgnoreDTSinWAV = false;
//default hold time of 25 ms, this allows a 20 hertz sine to pass undistorted
m_limiterHold = 0.025f;
@@ -579,7 +578,6 @@ void CAdvancedSettings::ParseSettingsFile(const std::string &file)
GetCustomRegexps(pAudioExcludes, m_audioExcludeFromScanRegExps);
XMLUtils::GetFloat(pElement, "applydrc", m_audioApplyDrc);
- XMLUtils::GetBoolean(pElement, "VideoPlayerignoredtsinwav", m_VideoPlayerIgnoreDTSinWAV);
XMLUtils::GetFloat(pElement, "limiterhold", m_limiterHold, 0.0f, 100.0f);
XMLUtils::GetFloat(pElement, "limiterrelease", m_limiterRelease, 0.001f, 100.0f);
diff --git a/xbmc/settings/AdvancedSettings.h b/xbmc/settings/AdvancedSettings.h
index 3351caff55..8eabfe8240 100644
--- a/xbmc/settings/AdvancedSettings.h
+++ b/xbmc/settings/AdvancedSettings.h
@@ -120,7 +120,6 @@ class CAdvancedSettings : public ISettingCallback, public ISettingsHandler
std::string m_audioDefaultPlayer;
float m_audioPlayCountMinimumPercent;
- bool m_VideoPlayerIgnoreDTSinWAV;
float m_limiterHold;
float m_limiterRelease;
--
2.43.0
From 03449b80c2e00a56912b9612afc11f3d53dd4a05 Mon Sep 17 00:00:00 2001
From: Stephan Sundermann <[email protected]>
Date: Sat, 13 Apr 2024 13:07:58 +0200
Subject: [PATCH 7/7] [ffmpeg] Use new audio DTS and ATMOS profiles
---
.../VideoPlayer/DVDDemuxers/DVDDemux.cpp | 20 +++++++++++++------
.../DVDInputStreams/InputStreamAddon.cpp | 9 +++------
2 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemux.cpp b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemux.cpp
index 63fb9264a8..e9aa468dd0 100644
--- a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemux.cpp
+++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemux.cpp
@@ -15,15 +15,15 @@ std::string CDemuxStreamAudio::GetStreamType()
std::string strInfo;
switch (codec)
{
- //! @todo: With ffmpeg >= 6.1 add new AC4 codec
case AV_CODEC_ID_AC3:
strInfo = "AC3 ";
break;
+ case AV_CODEC_ID_AC4:
+ strInfo = "AC4 ";
+ break;
case AV_CODEC_ID_EAC3:
{
- //! @todo: With ffmpeg >= 6.1 add new atmos profile case
- // "JOC" its EAC3 Atmos underlying profile, there is no standard codec name string
- if (StringUtils::Contains(codecName, "JOC"))
+ if (profile == FF_PROFILE_EAC3_DDP_ATMOS)
strInfo = "DD+ ATMOS ";
else
strInfo = "DD+ ";
@@ -31,7 +31,6 @@ std::string CDemuxStreamAudio::GetStreamType()
}
case AV_CODEC_ID_DTS:
{
- //! @todo: With ffmpeg >= 6.1 add new DTSX profile cases
switch (profile)
{
case FF_PROFILE_DTS_96_24:
@@ -49,6 +48,12 @@ std::string CDemuxStreamAudio::GetStreamType()
case FF_PROFILE_DTS_HD_HRA:
strInfo = "DTS-HD HRA ";
break;
+ case FF_PROFILE_DTS_HD_MA_X:
+ strInfo = "DTS-HD MA X ";
+ break;
+ case FF_PROFILE_DTS_HD_MA_X_IMAX:
+ strInfo = "DTS-HD MA X (IMAX) ";
+ break;
default:
strInfo = "DTS ";
break;
@@ -62,7 +67,10 @@ std::string CDemuxStreamAudio::GetStreamType()
strInfo = "MP3 ";
break;
case AV_CODEC_ID_TRUEHD:
- strInfo = "TrueHD ";
+ if (profile == FF_PROFILE_TRUEHD_ATMOS)
+ strInfo = "TrueHD ATMOS ";
+ else
+ strInfo = "TrueHD ";
break;
case AV_CODEC_ID_AAC:
{
diff --git a/xbmc/cores/VideoPlayer/DVDInputStreams/InputStreamAddon.cpp b/xbmc/cores/VideoPlayer/DVDInputStreams/InputStreamAddon.cpp
index daf66ce0cd..902f38ade2 100644
--- a/xbmc/cores/VideoPlayer/DVDInputStreams/InputStreamAddon.cpp
+++ b/xbmc/cores/VideoPlayer/DVDInputStreams/InputStreamAddon.cpp
@@ -762,14 +762,11 @@ int CInputStreamAddon::ConvertAudioCodecProfile(STREAMCODEC_PROFILE profile)
case DTSCodecProfileHDExpress:
return FF_PROFILE_DTS_EXPRESS;
case DTSCodecProfileHDMAX:
- //! @todo: with ffmpeg >= 6.1 set the appropriate profile
- return FF_PROFILE_UNKNOWN; // FF_PROFILE_DTS_HD_MA_X
+ return FF_PROFILE_DTS_HD_MA_X;
case DTSCodecProfileHDMAIMAX:
- //! @todo: with ffmpeg >= 6.1 set the appropriate profile
- return FF_PROFILE_UNKNOWN; // FF_PROFILE_DTS_HD_MA_X_IMAX
+ return FF_PROFILE_DTS_HD_MA_X_IMAX;
case DDPlusCodecProfileAtmos:
- //! @todo: with ffmpeg >= 6.1 set the appropriate profile
- return FF_PROFILE_UNKNOWN; // FF_PROFILE_EAC3_DDP_ATMOS
+ return FF_PROFILE_EAC3_DDP_ATMOS;
default:
return FF_PROFILE_UNKNOWN;
}
--
2.43.0