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
|
From: =?utf-8?q?Bernhard_Rosenkr=C3=A4nzer?= <bero@lindev.ch>
Date: Sun, 16 Jan 2022 02:40:04 +0100
Subject: Fix build with ffmpeg 5.0
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
Adapt to ffmpeg 5.0 requiring more const-ness for AVCodec.
Signed-off-by: Bernhard Rosenkränzer <bero@lindev.ch>
---
src/AV/Output/AudioEncoder.cpp | 6 +++---
src/AV/Output/AudioEncoder.h | 4 ++--
src/AV/Output/BaseEncoder.cpp | 4 ++--
src/AV/Output/BaseEncoder.h | 4 ++--
src/AV/Output/Muxer.cpp | 12 ++++++------
src/AV/Output/Muxer.h | 4 ++--
src/AV/Output/VideoEncoder.cpp | 6 +++---
src/AV/Output/VideoEncoder.h | 4 ++--
8 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/src/AV/Output/AudioEncoder.cpp b/src/AV/Output/AudioEncoder.cpp
index 34d015c..cefc2e0 100644
--- a/src/AV/Output/AudioEncoder.cpp
+++ b/src/AV/Output/AudioEncoder.cpp
@@ -34,7 +34,7 @@ const std::vector<AudioEncoder::SampleFormatData> AudioEncoder::SUPPORTED_SAMPLE
const unsigned int AudioEncoder::DEFAULT_FRAME_SAMPLES = 1024;
-AudioEncoder::AudioEncoder(Muxer* muxer, AVStream* stream, AVCodecContext *codec_context, AVCodec* codec, AVDictionary** options)
+AudioEncoder::AudioEncoder(Muxer* muxer, AVStream* stream, AVCodecContext *codec_context, const AVCodec* codec, AVDictionary** options)
: BaseEncoder(muxer, stream, codec_context, codec, options) {
#if !SSR_USE_AVCODEC_ENCODE_AUDIO2
@@ -77,7 +77,7 @@ unsigned int AudioEncoder::GetSampleRate() {
}
bool AudioEncoder::AVCodecIsSupported(const QString& codec_name) {
- AVCodec *codec = avcodec_find_encoder_by_name(codec_name.toUtf8().constData());
+ const AVCodec *codec = avcodec_find_encoder_by_name(codec_name.toUtf8().constData());
if(codec == NULL)
return false;
if(!av_codec_is_encoder(codec))
@@ -93,7 +93,7 @@ bool AudioEncoder::AVCodecIsSupported(const QString& codec_name) {
return false;
}
-void AudioEncoder::PrepareStream(AVStream* stream, AVCodecContext* codec_context, AVCodec* codec, AVDictionary** options, const std::vector<std::pair<QString, QString> >& codec_options,
+void AudioEncoder::PrepareStream(AVStream* stream, AVCodecContext* codec_context, const AVCodec* codec, AVDictionary** options, const std::vector<std::pair<QString, QString> >& codec_options,
unsigned int bit_rate, unsigned int channels, unsigned int sample_rate) {
if(channels == 0) {
diff --git a/src/AV/Output/AudioEncoder.h b/src/AV/Output/AudioEncoder.h
index c93278c..ae9c82e 100644
--- a/src/AV/Output/AudioEncoder.h
+++ b/src/AV/Output/AudioEncoder.h
@@ -40,7 +40,7 @@ private:
#endif
public:
- AudioEncoder(Muxer* muxer, AVStream* stream, AVCodecContext* codec_context, AVCodec* codec, AVDictionary** options);
+ AudioEncoder(Muxer* muxer, AVStream* stream, AVCodecContext* codec_context, const AVCodec* codec, AVDictionary** options);
~AudioEncoder();
// Returns the required frame size, i.e. the number of samples (for each channel).
@@ -57,7 +57,7 @@ public:
public:
static bool AVCodecIsSupported(const QString& codec_name);
- static void PrepareStream(AVStream* stream, AVCodecContext* codec_context, AVCodec* codec, AVDictionary** options, const std::vector<std::pair<QString, QString> >& codec_options,
+ static void PrepareStream(AVStream* stream, AVCodecContext* codec_context, const AVCodec* codec, AVDictionary** options, const std::vector<std::pair<QString, QString> >& codec_options,
unsigned int bit_rate, unsigned int channels, unsigned int sample_rate);
private:
diff --git a/src/AV/Output/BaseEncoder.cpp b/src/AV/Output/BaseEncoder.cpp
index 7c01ef3..4780aaf 100644
--- a/src/AV/Output/BaseEncoder.cpp
+++ b/src/AV/Output/BaseEncoder.cpp
@@ -42,7 +42,7 @@ double ParseCodecOptionDouble(const QString& key, const QString& value, double m
return clamp(value_double, min, max) * multiply;
}
-BaseEncoder::BaseEncoder(Muxer* muxer, AVStream* stream, AVCodecContext* codec_context, AVCodec* codec, AVDictionary** options) {
+BaseEncoder::BaseEncoder(Muxer* muxer, AVStream* stream, AVCodecContext* codec_context, const AVCodec* codec, AVDictionary** options) {
m_muxer = muxer;
m_stream = stream;
@@ -157,7 +157,7 @@ void BaseEncoder::IncrementPacketCounter() {
++lock->m_total_packets;
}
-void BaseEncoder::Init(AVCodec* codec, AVDictionary** options) {
+void BaseEncoder::Init(const AVCodec* codec, AVDictionary** options) {
// open codec
if(avcodec_open2(m_codec_context, codec, options) < 0) {
diff --git a/src/AV/Output/BaseEncoder.h b/src/AV/Output/BaseEncoder.h
index 3d92f29..7f02bbd 100644
--- a/src/AV/Output/BaseEncoder.h
+++ b/src/AV/Output/BaseEncoder.h
@@ -51,7 +51,7 @@ private:
std::atomic<bool> m_should_stop, m_should_finish, m_is_done, m_error_occurred;
protected:
- BaseEncoder(Muxer* muxer, AVStream* stream, AVCodecContext* codec_context, AVCodec* codec, AVDictionary** options);
+ BaseEncoder(Muxer* muxer, AVStream* stream, AVCodecContext* codec_context, const AVCodec* codec, AVDictionary** options);
public:
virtual ~BaseEncoder(); // encoders will be deleted by Muxer, don't delete them yourself!
@@ -117,7 +117,7 @@ protected:
void IncrementPacketCounter();
private:
- void Init(AVCodec* codec, AVDictionary** options);
+ void Init(const AVCodec* codec, AVDictionary** options);
void Free();
void EncoderThread();
diff --git a/src/AV/Output/Muxer.cpp b/src/AV/Output/Muxer.cpp
index ad58380..1094dcc 100644
--- a/src/AV/Output/Muxer.cpp
+++ b/src/AV/Output/Muxer.cpp
@@ -87,7 +87,7 @@ Muxer::~Muxer() {
VideoEncoder* Muxer::AddVideoEncoder(const QString& codec_name, const std::vector<std::pair<QString, QString> >& codec_options,
unsigned int bit_rate, unsigned int width, unsigned int height, unsigned int frame_rate) {
- AVCodec *codec = FindCodec(codec_name);
+ const AVCodec *codec = FindCodec(codec_name);
AVCodecContext *codec_context = NULL;
AVStream *stream = AddStream(codec, &codec_context);
VideoEncoder *encoder;
@@ -111,7 +111,7 @@ VideoEncoder* Muxer::AddVideoEncoder(const QString& codec_name, const std::vecto
AudioEncoder* Muxer::AddAudioEncoder(const QString& codec_name, const std::vector<std::pair<QString, QString> >& codec_options,
unsigned int bit_rate, unsigned int channels, unsigned int sample_rate) {
- AVCodec *codec = FindCodec(codec_name);
+ const AVCodec *codec = FindCodec(codec_name);
AVCodecContext *codec_context = NULL;
AVStream *stream = AddStream(codec, &codec_context);
AudioEncoder *encoder;
@@ -194,7 +194,7 @@ unsigned int Muxer::GetQueuedPacketCount(unsigned int stream_index) {
void Muxer::Init() {
// get the format we want (this is just a pointer, we don't have to free this)
- AVOutputFormat *format = av_guess_format(m_container_name.toUtf8().constData(), NULL, NULL);
+ auto format = av_guess_format(m_container_name.toUtf8().constData(), NULL, NULL);
if(format == NULL) {
Logger::LogError("[Muxer::Init] " + Logger::tr("Error: Can't find chosen output format!"));
throw LibavException();
@@ -261,8 +261,8 @@ void Muxer::Free() {
}
}
-AVCodec* Muxer::FindCodec(const QString& codec_name) {
- AVCodec *codec = avcodec_find_encoder_by_name(codec_name.toUtf8().constData());
+const AVCodec* Muxer::FindCodec(const QString& codec_name) {
+ const AVCodec *codec = avcodec_find_encoder_by_name(codec_name.toUtf8().constData());
if(codec == NULL) {
Logger::LogError("[Muxer::FindCodec] " + Logger::tr("Error: Can't find codec!"));
throw LibavException();
@@ -270,7 +270,7 @@ AVCodec* Muxer::FindCodec(const QString& codec_name) {
return codec;
}
-AVStream* Muxer::AddStream(AVCodec* codec, AVCodecContext** codec_context) {
+AVStream* Muxer::AddStream(const AVCodec* codec, AVCodecContext** codec_context) {
assert(!m_started);
assert(m_format_context->nb_streams < MUXER_MAX_STREAMS);
diff --git a/src/AV/Output/Muxer.h b/src/AV/Output/Muxer.h
index d72347d..b104bcb 100644
--- a/src/AV/Output/Muxer.h
+++ b/src/AV/Output/Muxer.h
@@ -114,8 +114,8 @@ private:
void Init();
void Free();
- AVCodec* FindCodec(const QString& codec_name);
- AVStream* AddStream(AVCodec* codec, AVCodecContext** codec_context);
+ const AVCodec* FindCodec(const QString& codec_name);
+ AVStream* AddStream(const AVCodec* codec, AVCodecContext** codec_context);
void MuxerThread();
diff --git a/src/AV/Output/VideoEncoder.cpp b/src/AV/Output/VideoEncoder.cpp
index 8087e8e..fc8b5d1 100644
--- a/src/AV/Output/VideoEncoder.cpp
+++ b/src/AV/Output/VideoEncoder.cpp
@@ -34,7 +34,7 @@ const std::vector<VideoEncoder::PixelFormatData> VideoEncoder::SUPPORTED_PIXEL_F
{"rgb", AV_PIX_FMT_RGB24, false},
};
-VideoEncoder::VideoEncoder(Muxer* muxer, AVStream* stream, AVCodecContext* codec_context, AVCodec* codec, AVDictionary** options)
+VideoEncoder::VideoEncoder(Muxer* muxer, AVStream* stream, AVCodecContext* codec_context, const AVCodec* codec, AVDictionary** options)
: BaseEncoder(muxer, stream, codec_context, codec, options) {
#if !SSR_USE_AVCODEC_ENCODE_VIDEO2
@@ -95,7 +95,7 @@ unsigned int VideoEncoder::GetFrameRate() {
}
bool VideoEncoder::AVCodecIsSupported(const QString& codec_name) {
- AVCodec *codec = avcodec_find_encoder_by_name(codec_name.toUtf8().constData());
+ const AVCodec *codec = avcodec_find_encoder_by_name(codec_name.toUtf8().constData());
if(codec == NULL)
return false;
if(!av_codec_is_encoder(codec))
@@ -111,7 +111,7 @@ bool VideoEncoder::AVCodecIsSupported(const QString& codec_name) {
return false;
}
-void VideoEncoder::PrepareStream(AVStream* stream, AVCodecContext* codec_context, AVCodec* codec, AVDictionary** options, const std::vector<std::pair<QString, QString> >& codec_options,
+void VideoEncoder::PrepareStream(AVStream* stream, AVCodecContext* codec_context, const AVCodec* codec, AVDictionary** options, const std::vector<std::pair<QString, QString> >& codec_options,
unsigned int bit_rate, unsigned int width, unsigned int height, unsigned int frame_rate) {
if(width == 0 || height == 0) {
diff --git a/src/AV/Output/VideoEncoder.h b/src/AV/Output/VideoEncoder.h
index cb7ca27..68d872e 100644
--- a/src/AV/Output/VideoEncoder.h
+++ b/src/AV/Output/VideoEncoder.h
@@ -40,7 +40,7 @@ private:
#endif
public:
- VideoEncoder(Muxer* muxer, AVStream* stream, AVCodecContext* codec_context, AVCodec* codec, AVDictionary** options);
+ VideoEncoder(Muxer* muxer, AVStream* stream, AVCodecContext* codec_context, const AVCodec* codec, AVDictionary** options);
~VideoEncoder();
// Returns the required pixel format.
@@ -55,7 +55,7 @@ public:
public:
static bool AVCodecIsSupported(const QString& codec_name);
- static void PrepareStream(AVStream* stream, AVCodecContext* codec_context, AVCodec* codec, AVDictionary** options, const std::vector<std::pair<QString, QString> >& codec_options,
+ static void PrepareStream(AVStream* stream, AVCodecContext* codec_context, const AVCodec* codec, AVDictionary** options, const std::vector<std::pair<QString, QString> >& codec_options,
unsigned int bit_rate, unsigned int width, unsigned int height, unsigned int frame_rate);
private:
|
