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
|
h263-1998.cxx:237:22: error: use of undeclared identifier 'CODEC_FLAG_TRUNCATED'
m_context->flags = CODEC_FLAG_TRUNCATED // Possible missing packets
^
h263-1998.cxx:346:27: error: use of undeclared identifier 'CODEC_FLAG_AC_PRED'
m_context->flags |= CODEC_FLAG_AC_PRED;
^
h263-1998.cxx:348:28: error: use of undeclared identifier 'CODEC_FLAG_AC_PRED'
m_context->flags &= ~CODEC_FLAG_AC_PRED;
^
h263-1998.cxx:356:27: error: use of undeclared identifier 'CODEC_FLAG_LOOP_FILTER'
m_context->flags |= CODEC_FLAG_LOOP_FILTER;
^
h263-1998.cxx:358:28: error: use of undeclared identifier 'CODEC_FLAG_LOOP_FILTER'
m_context->flags &= ~CODEC_FLAG_LOOP_FILTER;
^
h263-1998.cxx:422:14: error: no member named 'lmin' in 'AVCodecContext'; did you mean 'qmin'?
m_context->lmin = m_context->qmin * FF_QP2LAMBDA;
^~~~
qmin
/usr/local/include/libavcodec/avcodec.h:2355:9: note: 'qmin' declared here
int qmin;
^
h263-1998.cxx:423:14: error: no member named 'lmax' in 'AVCodecContext'; did you mean 'qmax'?
m_context->lmax = m_context->qmax * FF_QP2LAMBDA;
^~~~
qmax
/usr/local/include/libavcodec/avcodec.h:2362:9: note: 'qmax' declared here
int qmax;
^
h263-1998.cxx:598:24: error: use of undeclared identifier 'CODEC_FLAG_4MV'
m_context->flags &= ~CODEC_FLAG_4MV;
^
rfc2429.cxx:289:55: error: use of undeclared identifier 'FF_INPUT_BUFFER_PADDING_SIZE'
memset (m_encodedFrame.ptr + m_encodedFrame.pos,0 , FF_INPUT_BUFFER_PADDING_SIZE);
^
rfc2429.cxx:343:79: error: use of undeclared identifier 'FF_INPUT_BUFFER_PADDING_SIZE'
if ((m_encodedFrame.pos + (headerP ? 2 : 0) + remBytes) > (m_maxFrameSize - FF_INPUT_BUFFER_PADDING_SIZE)) {
^
rfc2429.cxx:346:80: error: use of undeclared identifier 'FF_INPUT_BUFFER_PADDING_SIZE'
<< " bytes while maximum frame size is " << m_maxFrameSize << "-" << FF_INPUT_BUFFER_PADDING_SIZ...
^
h264-x264.cxx:1079:27: error: use of undeclared identifier 'CODEC_FLAG2_DROP_FRAME_TIMECODE'
m_context->flags2 = CODEC_FLAG2_DROP_FRAME_TIMECODE |
^
h264-x264.cxx:1081:27: error: use of undeclared identifier 'CODEC_FLAG2_CHUNKS'
CODEC_FLAG2_CHUNKS;
^
mpeg4.cxx:551:18: error: no member named 'rc_eq' in 'AVCodecContext'
m_avcontext->rc_eq = (char*) "1";
~~~~~~~~~~~ ^
mpeg4.cxx:556:18: error: no member named 'rc_initial_cplx' in 'AVCodecContext'
m_avcontext->rc_initial_cplx = 0.0f;
~~~~~~~~~~~ ^
mpeg4.cxx:563:18: error: no member named 'rc_buffer_aggressivity' in 'AVCodecContext'
m_avcontext->rc_buffer_aggressivity = 1.0f;
~~~~~~~~~~~ ^
mpeg4.cxx:597:25: error: use of undeclared identifier 'CODEC_FLAG_AC_PRED'
m_avcontext->flags|=CODEC_FLAG_AC_PRED;
^
mpeg4.cxx:600:25: error: use of undeclared identifier 'CODEC_FLAG_4MV'
m_avcontext->flags|=CODEC_FLAG_4MV;
^
mpeg4.cxx:601:25: error: use of undeclared identifier 'CODEC_FLAG_LOOP_FILTER'
m_avcontext->flags|=CODEC_FLAG_LOOP_FILTER;
^
mpeg4.cxx:639:18: error: no member named 'lmin' in 'AVCodecContext'; did you mean 'qmin'?
m_avcontext->lmin = m_avcontext->qmin * FF_QP2LAMBDA;
^~~~
qmin
/usr/local/include/libavcodec/avcodec.h:2355:9: note: 'qmin' declared here
int qmin;
^
mpeg4.cxx:640:18: error: no member named 'lmax' in 'AVCodecContext'; did you mean 'qmax'?
m_avcontext->lmax = m_avcontext->qmax * FF_QP2LAMBDA;
^~~~
qmax
/usr/local/include/libavcodec/avcodec.h:2362:9: note: 'qmax' declared here
int qmax;
^
mpeg4.cxx:668:49: error: use of undeclared identifier 'FF_INPUT_BUFFER_PADDING_SIZE'
m_rawFrameBuffer = new BYTE[m_rawFrameLen + FF_INPUT_BUFFER_PADDING_SIZE];
^
mpeg4.cxx:678:49: error: use of undeclared identifier 'FF_INPUT_BUFFER_PADDING_SIZE'
memset(m_rawFrameBuffer + m_rawFrameLen, 0, FF_INPUT_BUFFER_PADDING_SIZE);
^
mpeg4.cxx:1329:27: error: use of undeclared identifier 'CODEC_FLAG_4MV'
m_avcontext->flags |= CODEC_FLAG_4MV;
^
--- plugins/video/H.263-1998/h263-1998.cxx.orig
+++ plugins/video/H.263-1998/h263-1998.cxx
@@ -234,7 +234,7 @@ bool H263_Base_EncoderContext::Init(AVCodecID codecId)
m_context->opaque = this;
- m_context->flags = CODEC_FLAG_TRUNCATED // Possible missing packets
+ m_context->flags = AV_CODEC_FLAG_TRUNCATED // Possible missing packets
;
m_context->pix_fmt = AV_PIX_FMT_YUV420P;
@@ -343,9 +343,9 @@ void H263_Base_EncoderContext::SetOption(const char *
// Level 3+
// works with eyeBeam
if (atoi(value) == 1)
- m_context->flags |= CODEC_FLAG_AC_PRED;
+ m_context->flags |= AV_CODEC_FLAG_AC_PRED;
else
- m_context->flags &= ~CODEC_FLAG_AC_PRED;
+ m_context->flags &= ~AV_CODEC_FLAG_AC_PRED;
return;
}
@@ -353,9 +353,9 @@ void H263_Base_EncoderContext::SetOption(const char *
// Annex J: Deblocking Filter
// works with eyeBeam
if (atoi(value) == 1)
- m_context->flags |= CODEC_FLAG_LOOP_FILTER;
+ m_context->flags |= AV_CODEC_FLAG_LOOP_FILTER;
else
- m_context->flags &= ~CODEC_FLAG_LOOP_FILTER;
+ m_context->flags &= ~AV_CODEC_FLAG_LOOP_FILTER;
return;
}
@@ -419,8 +419,8 @@ bool H263_Base_EncoderContext::OpenCodec()
m_context->qcompress = 0.5; // qscale factor between easy & hard scenes (0.0-1.0)
// Lagrange multipliers - this is how the context defaults do it:
- m_context->lmin = m_context->qmin * FF_QP2LAMBDA;
- m_context->lmax = m_context->qmax * FF_QP2LAMBDA;
+ av_opt_set_int(m_context->priv_data, "lmin", m_context->qmin * FF_QP2LAMBDA, 0);
+ av_opt_set_int(m_context->priv_data, "lmax", m_context->qmax * FF_QP2LAMBDA, 0);
// YUV420P input
m_inputFrame->linesize[0] = m_context->width;
@@ -595,7 +595,7 @@ bool H263_RFC2190_EncoderContext::Init()
m_context->opaque = this; // used to separate out packets from different encode threads
av_opt_set_int(m_context->priv_data, "umv", 0, 0);
- m_context->flags &= ~CODEC_FLAG_4MV;
+ m_context->flags &= ~AV_CODEC_FLAG_4MV;
#if LIBAVCODEC_RTP_MODE
m_context->flags &= ~CODEC_FLAG_H263P_AIC;
#endif
--- plugins/video/H.263-1998/rfc2429.cxx.orig
+++ plugins/video/H.263-1998/rfc2429.cxx
@@ -286,7 +286,7 @@ bool RFC2429Frame::GetPacket(RTPFrame & frame, unsigne
unsigned char * RFC2429Frame::GetBuffer()
{
- memset (m_encodedFrame.ptr + m_encodedFrame.pos,0 , FF_INPUT_BUFFER_PADDING_SIZE);
+ memset (m_encodedFrame.ptr + m_encodedFrame.pos,0 , AV_INPUT_BUFFER_PADDING_SIZE);
return (m_encodedFrame.ptr);
}
@@ -340,10 +340,10 @@ bool RFC2429Frame::AddPacket(const RTPFrame & packet)
unsigned remBytes = packet.GetPayloadSize() - headerPLEN - (headerV ? 3 : 2);
- if ((m_encodedFrame.pos + (headerP ? 2 : 0) + remBytes) > (m_maxFrameSize - FF_INPUT_BUFFER_PADDING_SIZE)) {
+ if ((m_encodedFrame.pos + (headerP ? 2 : 0) + remBytes) > (m_maxFrameSize - AV_INPUT_BUFFER_PADDING_SIZE)) {
PTRACE(2, "H.263-RFC2429", "Trying to add " << remBytes
<< " bytes to frame at position " << m_encodedFrame.pos + (headerP ? 2 : 0)
- << " bytes while maximum frame size is " << m_maxFrameSize << "-" << FF_INPUT_BUFFER_PADDING_SIZE << " bytes");
+ << " bytes while maximum frame size is " << m_maxFrameSize << "-" << AV_INPUT_BUFFER_PADDING_SIZE << " bytes");
return false;
}
--- plugins/video/H.264/h264-x264.cxx.orig
+++ plugins/video/H.264/h264-x264.cxx
@@ -1076,9 +1076,9 @@ class MyDecoder : public PluginCodec<MY_CODEC>
m_context->workaround_bugs = FF_BUG_AUTODETECT;
m_context->idct_algo = FF_IDCT_H264;
m_context->error_concealment = FF_EC_GUESS_MVS | FF_EC_DEBLOCK;
- m_context->flags2 = CODEC_FLAG2_DROP_FRAME_TIMECODE |
+ m_context->flags2 = AV_CODEC_FLAG2_DROP_FRAME_TIMECODE |
CODEC_FLAG2_SKIP_RD |
- CODEC_FLAG2_CHUNKS;
+ AV_CODEC_FLAG2_CHUNKS;
if ((m_picture = FFMPEGLibraryInstance.AvcodecAllocFrame()) == NULL)
return false;
--- plugins/video/MPEG4-ffmpeg/mpeg4.cxx.orig
+++ plugins/video/MPEG4-ffmpeg/mpeg4.cxx
@@ -548,19 +548,19 @@ void MPEG4EncoderContext::SetStaticEncodingParams(){
// Reduce the difference in quantization between frames.
m_avcontext->qblur = 0.3f;
// default is tex^qComp; 1 is constant bitrate
- m_avcontext->rc_eq = (char*) "1";
- //avcontext->rc_eq = "tex^qComp";
+ av_opt_set(m_avcontext->priv_data, "rc_eq", (char*) "1", 0);
+ //av_opt_set(m_avcontext->priv_data, "rc_eq", "tex^qComp", 0);
// These ones technically could be dynamic, I think
m_avcontext->rc_min_rate = 0;
// This is set to 0 in ffmpeg.c, the command-line utility.
- m_avcontext->rc_initial_cplx = 0.0f;
+ av_opt_set_double(m_avcontext->priv_data, "rc_init_cplx", 0.0f, 0);
// And this is set to 1.
// It seems to affect how aggressively the library will raise and lower
// quantization to keep bandwidth constant. Except it's in reference to
// the "vbv buffer", not bits per second, so nobody really knows how
// it works.
- m_avcontext->rc_buffer_aggressivity = 1.0f;
+ av_opt_set_double(m_avcontext->priv_data, "rc_buf_aggressivity", 1.0f, 0);
// Ratecontrol buffer size, in bits. Usually 0.5-1 second worth.
// 224 kbyte is what VLC uses, and it seems to fix the quantization pulse (at Level 5)
@@ -594,11 +594,11 @@ void MPEG4EncoderContext::SetStaticEncodingParams(){
m_avcontext->flags |= CODEC_FLAG_4MV; // 4 motion vectors
#else
m_avcontext->max_b_frames=0; /*don't use b frames*/
- m_avcontext->flags|=CODEC_FLAG_AC_PRED;
+ m_avcontext->flags|=AV_CODEC_FLAG_AC_PRED;
av_opt_set_int(m_avcontext->priv_data, "umv", 1, 0);
/*c->flags|=CODEC_FLAG_QPEL;*/ /*don't enable this one: this forces profile_level to advanced simple profile */
- m_avcontext->flags|=CODEC_FLAG_4MV;
- m_avcontext->flags|=CODEC_FLAG_LOOP_FILTER;
+ m_avcontext->flags|=AV_CODEC_FLAG_4MV;
+ m_avcontext->flags|=AV_CODEC_FLAG_LOOP_FILTER;
av_opt_set_int(m_avcontext->priv_data, "structured_slices", 1, 0);
#endif
m_avcontext->opaque = this; // for use in RTP callback
@@ -636,8 +636,8 @@ void MPEG4EncoderContext::SetDynamicEncodingParams(boo
m_avcontext->qmax = std::min( m_avcontext->qmax, 31);
// Lagrange multipliers - this is how the context defaults do it:
- m_avcontext->lmin = m_avcontext->qmin * FF_QP2LAMBDA;
- m_avcontext->lmax = m_avcontext->qmax * FF_QP2LAMBDA;
+ av_opt_set_int(m_avcontext->priv_data, "lmin", m_avcontext->qmin * FF_QP2LAMBDA, 0);
+ av_opt_set_int(m_avcontext->priv_data, "lmax", m_avcontext->qmax * FF_QP2LAMBDA, 0);
// If framesize has changed or is not yet initialized, fix it up
if((unsigned)m_avcontext->width != m_frameWidth || (unsigned)m_avcontext->height != m_frameHeight) {
@@ -665,7 +665,7 @@ void MPEG4EncoderContext::ResizeEncodingFrame(bool res
{
delete[] m_rawFrameBuffer;
}
- m_rawFrameBuffer = new BYTE[m_rawFrameLen + FF_INPUT_BUFFER_PADDING_SIZE];
+ m_rawFrameBuffer = new BYTE[m_rawFrameLen + AV_INPUT_BUFFER_PADDING_SIZE];
if (m_encFrameBuffer)
{
@@ -675,7 +675,7 @@ void MPEG4EncoderContext::ResizeEncodingFrame(bool res
m_encFrameBuffer = new BYTE[m_encFrameLen];
// Clear the back padding
- memset(m_rawFrameBuffer + m_rawFrameLen, 0, FF_INPUT_BUFFER_PADDING_SIZE);
+ memset(m_rawFrameBuffer + m_rawFrameLen, 0, AV_INPUT_BUFFER_PADDING_SIZE);
const unsigned fsz = m_frameWidth * m_frameHeight;
m_avpicture->data[0] = m_rawFrameBuffer; // luminance
m_avpicture->data[1] = m_rawFrameBuffer + fsz; // first chroma channel
@@ -1326,7 +1326,7 @@ void MPEG4DecoderContext::SetFrameHeight(int height) {
//
void MPEG4DecoderContext::SetStaticDecodingParams() {
- m_avcontext->flags |= CODEC_FLAG_4MV;
+ m_avcontext->flags |= AV_CODEC_FLAG_4MV;
av_opt_set_int(m_avcontext->priv_data, "data_partitionin", 1, 0);
m_avcontext->workaround_bugs = 0; // no workaround for buggy implementations
}
|
