-
Notifications
You must be signed in to change notification settings - Fork 1
/
ffmpeg-0.6.1.patch
453 lines (412 loc) · 12.4 KB
/
ffmpeg-0.6.1.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
diff -c -r -N ../ffmpeg-0.6.1/libavcodec/allcodecs.c jni/ffmpeg/libavcodec/allcodecs.c
*** ../ffmpeg-0.6.1/libavcodec/allcodecs.c 2010-06-03 23:36:38.000000000 +0200
--- jni/ffmpeg/libavcodec/allcodecs.c 2011-02-09 17:40:32.000000000 +0100
***************
*** 25,30 ****
--- 25,31 ----
*/
#include "avcodec.h"
+ #include "config.h"
#define REGISTER_HWACCEL(X,x) { \
extern AVHWAccel x##_hwaccel; \
diff -c -r -N ../ffmpeg-0.6.1/libavcodec/dsputil.c jni/ffmpeg/libavcodec/dsputil.c
*** ../ffmpeg-0.6.1/libavcodec/dsputil.c 2010-04-20 16:45:34.000000000 +0200
--- jni/ffmpeg/libavcodec/dsputil.c 2011-02-09 17:40:32.000000000 +0100
***************
*** 328,333 ****
--- 328,334 ----
return s;
}
+ #if HAVE_VIDEO
/* draw the edges of width 'w' of an image of size width, height */
//FIXME check that this is ok for mpeg4 interlaced
static void draw_edges_c(uint8_t *buf, int wrap, int width, int height, int w)
***************
*** 3797,3802 ****
--- 3798,3805 ----
WRAPPER8_16_SQ(rd8x8_c, rd16_c)
WRAPPER8_16_SQ(bit8x8_c, bit16_c)
+ #endif
+
static void vector_fmul_c(float *dst, const float *src, int len){
int i;
for(i=0; i<len; i++)
***************
*** 4007,4012 ****
--- 4010,4016 ----
return res;
}
+ #if HAVE_VIDEO
#define W0 2048
#define W1 2841 /* 2048*sqrt (2)*cos (1*pi/16) */
#define W2 2676 /* 2048*sqrt (2)*cos (2*pi/16) */
***************
*** 4136,4141 ****
--- 4140,4146 ----
dest[0] = cm[dest[0] + ((block[0] + 4)>>3)];
}
+ #endif
static void just_return(void *mem av_unused, int stride av_unused, int h av_unused) { return; }
***************
*** 4183,4188 ****
--- 4188,4194 ----
ff_check_alignment();
+ #if HAVE_VIDEO
#if CONFIG_ENCODERS
if(avctx->dct_algo==FF_DCT_FASTINT) {
c->fdct = fdct_ifast;
***************
*** 4477,4482 ****
--- 4483,4489 ----
c->try_8x8basis= try_8x8basis_c;
c->add_8x8basis= add_8x8basis_c;
+ #endif
#if CONFIG_VORBIS_DECODER
c->vorbis_inverse_coupling = vorbis_inverse_coupling;
***************
*** 4507,4512 ****
--- 4514,4520 ----
c->sv_fmul_scalar[0] = sv_fmul_scalar_2_c;
c->sv_fmul_scalar[1] = sv_fmul_scalar_4_c;
+ #if HAVE_VIDEO
c->shrink[0]= ff_img_copy_plane;
c->shrink[1]= ff_shrink22;
c->shrink[2]= ff_shrink44;
***************
*** 4562,4566 ****
--- 4570,4575 ----
default:
av_log(avctx, AV_LOG_ERROR, "Internal error, IDCT permutation not set\n");
}
+ #endif
}
diff -c -r -N ../ffmpeg-0.6.1/libavcodec/options.c jni/ffmpeg/libavcodec/options.c
*** ../ffmpeg-0.6.1/libavcodec/options.c 2010-06-26 16:24:14.000000000 +0200
--- jni/ffmpeg/libavcodec/options.c 2011-06-09 17:02:32.000000000 +0200
***************
*** 439,444 ****
--- 439,445 ----
av_opt_set_defaults2(s, flags, flags);
s->time_base= (AVRational){0,1};
+ #if HAVE_VIDEO
s->get_buffer= avcodec_default_get_buffer;
s->release_buffer= avcodec_default_release_buffer;
s->get_format= avcodec_default_get_format;
***************
*** 451,456 ****
--- 452,458 ----
s->palctrl = NULL;
s->reget_buffer= avcodec_default_reget_buffer;
s->reordered_opaque= AV_NOPTS_VALUE;
+ #endif
}
AVCodecContext *avcodec_alloc_context2(enum AVMediaType codec_type){
diff -c -r -N ../ffmpeg-0.6.1/libavcodec/utils.c jni/ffmpeg/libavcodec/utils.c
*** ../ffmpeg-0.6.1/libavcodec/utils.c 2010-05-29 16:33:02.000000000 +0200
--- jni/ffmpeg/libavcodec/utils.c 2011-02-09 17:40:32.000000000 +0100
***************
*** 207,212 ****
--- 207,213 ----
#endif
}
+ #if HAVE_VIDEO
void avcodec_align_dimensions(AVCodecContext *s, int *width, int *height){
int chroma_shift = av_pix_fmt_descriptors[s->pix_fmt].log2_chroma_w;
int linesize_align[4];
***************
*** 415,420 ****
--- 416,422 ----
s->release_buffer(s, &temp_pic); // Release old frame
return 0;
}
+ #endif
int avcodec_default_execute(AVCodecContext *c, int (*func)(AVCodecContext *c2, void *arg2),void *arg, int *ret, int count, int size){
int i;
***************
*** 436,441 ****
--- 438,444 ----
return 0;
}
+ #if HAVE_VIDEO
enum PixelFormat avcodec_default_get_format(struct AVCodecContext *s, const enum PixelFormat *fmt){
while (*fmt != PIX_FMT_NONE && ff_is_hwaccel_pix_fmt(*fmt))
++fmt;
***************
*** 458,463 ****
--- 461,467 ----
return pic;
}
+ #endif
int attribute_align_arg avcodec_open(AVCodecContext *avctx, AVCodec *codec)
{
***************
*** 488,493 ****
--- 492,498 ----
avctx->priv_data = NULL;
}
+ #if HAVE_VIDEO
if(avctx->coded_width && avctx->coded_height)
avcodec_set_dimensions(avctx, avctx->coded_width, avctx->coded_height);
else if(avctx->width && avctx->height)
***************
*** 500,505 ****
--- 505,511 ----
ret = AVERROR(EINVAL);
goto free_and_end;
}
+ #endif
avctx->codec = codec;
if ((avctx->codec_type == AVMEDIA_TYPE_UNKNOWN || avctx->codec_type == codec->type) &&
***************
*** 548,553 ****
--- 554,560 ----
return 0;
}
+ #if HAVE_VIDEO
int attribute_align_arg avcodec_encode_video(AVCodecContext *avctx, uint8_t *buf, int buf_size,
const AVFrame *pict)
{
***************
*** 620,625 ****
--- 627,633 ----
return ret;
}
+ #endif
#if LIBAVCODEC_VERSION_MAJOR < 53
int attribute_align_arg avcodec_decode_audio2(AVCodecContext *avctx, int16_t *samples,
***************
*** 662,667 ****
--- 670,676 ----
return ret;
}
+ #if HAVE_VIDEO
#if LIBAVCODEC_VERSION_MAJOR < 53
int avcodec_decode_subtitle(AVCodecContext *avctx, AVSubtitle *sub,
int *got_sub_ptr,
***************
*** 688,693 ****
--- 697,703 ----
avctx->frame_number++;
return ret;
}
+ #endif
av_cold int avcodec_close(AVCodecContext *avctx)
{
***************
*** 839,844 ****
--- 849,855 ----
}
switch(enc->codec_type) {
+ #if HAVE_VIDEO
case AVMEDIA_TYPE_VIDEO:
snprintf(buf, buf_size,
"Video: %s%s",
***************
*** 874,879 ****
--- 885,891 ----
", q=%d-%d", enc->qmin, enc->qmax);
}
break;
+ #endif
case AVMEDIA_TYPE_AUDIO:
snprintf(buf, buf_size,
"Audio: %s",
***************
*** 1161,1166 ****
--- 1173,1179 ----
{ "ntsc-film", 24000, 1001 },
};
+ #if HAVE_VIDEO
int av_parse_video_frame_size(int *width_ptr, int *height_ptr, const char *str)
{
int i;
***************
*** 1226,1231 ****
--- 1239,1245 ----
else
return 0;
}
+ #endif
int ff_match_2uint16(const uint16_t (*tab)[2], int size, int a, int b){
int i;
diff -c -r -N ../ffmpeg-0.6.1/libavformat/allformats.c jni/ffmpeg/libavformat/allformats.c
*** ../ffmpeg-0.6.1/libavformat/allformats.c 2010-06-09 17:54:27.000000000 +0200
--- jni/ffmpeg/libavformat/allformats.c 2011-02-09 17:40:32.000000000 +0100
***************
*** 21,26 ****
--- 21,27 ----
#include "avformat.h"
#include "rtp.h"
#include "rdt.h"
+ #include "config.h"
#define REGISTER_MUXER(X,x) { \
extern AVOutputFormat x##_muxer; \
diff -c -r -N ../ffmpeg-0.6.1/libavformat/utils.c jni/ffmpeg/libavformat/utils.c
*** ../ffmpeg-0.6.1/libavformat/utils.c 2010-06-15 15:31:27.000000000 +0200
--- jni/ffmpeg/libavformat/utils.c 2011-06-10 23:26:38.000000000 +0200
***************
*** 32,37 ****
--- 32,38 ----
#if CONFIG_NETWORK
#include "network.h"
#endif
+ #include "config.h"
#undef NDEBUG
#include <assert.h>
***************
*** 2031,2041 ****
--- 2033,2045 ----
if(!has_codec_parameters(st->codec)){
switch(st->codec->codec_type) {
+ #if HAVE_VIDEO
case AVMEDIA_TYPE_VIDEO:
avcodec_get_frame_defaults(&picture);
ret = avcodec_decode_video2(st->codec, &picture,
&got_picture, avpkt);
break;
+ #endif
case AVMEDIA_TYPE_AUDIO:
data_size = FFMAX(avpkt->size, AVCODEC_MAX_AUDIO_FRAME_SIZE);
samples = av_malloc(data_size);
***************
*** 2332,2337 ****
--- 2336,2342 ----
av_reduce(&st->avg_frame_rate.num, &st->avg_frame_rate.den,
(st->codec_info_nb_frames-2)*(int64_t)st->time_base.den,
codec_info_duration[i] *(int64_t)st->time_base.num, 60000);
+ #if HAVE_VIDEO
if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO) {
if(st->codec->codec_id == CODEC_ID_RAWVIDEO && !st->codec->codec_tag && !st->codec->bits_per_coded_sample)
st->codec->codec_tag= avcodec_pix_fmt_to_codec_tag(st->codec->pix_fmt);
***************
*** 2373,2379 ****
st->r_frame_rate.den = st->time_base.num;
}
}
! }else if(st->codec->codec_type == AVMEDIA_TYPE_AUDIO) {
if(!st->codec->bits_per_coded_sample)
st->codec->bits_per_coded_sample= av_get_bits_per_sample(st->codec->codec_id);
}
--- 2378,2387 ----
st->r_frame_rate.den = st->time_base.num;
}
}
! }
! else
! #endif
! if(st->codec->codec_type == AVMEDIA_TYPE_AUDIO) {
if(!st->codec->bits_per_coded_sample)
st->codec->bits_per_coded_sample= av_get_bits_per_sample(st->codec->codec_id);
}
***************
*** 3132,3137 ****
--- 3140,3146 ----
}
#if LIBAVFORMAT_VERSION_MAJOR < 53
+ #if HAVE_VIDEO
int parse_image_size(int *width_ptr, int *height_ptr, const char *str)
{
return av_parse_video_frame_size(width_ptr, height_ptr, str);
***************
*** 3146,3151 ****
--- 3155,3161 ----
return ret;
}
#endif
+ #endif
int64_t av_gettime(void)
{
diff -c -r -N ../ffmpeg-0.6.1/libavutil/avconfig.h jni/ffmpeg/libavutil/avconfig.h
*** ../ffmpeg-0.6.1/libavutil/avconfig.h 1970-01-01 01:00:00.000000000 +0100
--- jni/ffmpeg/libavutil/avconfig.h 2011-02-09 17:40:32.000000000 +0100
***************
*** 0 ****
--- 1,5 ----
+ /* Generated by ffconf */
+ #ifndef AVUTIL_AVCONFIG_H
+ #define AVUTIL_AVCONFIG_H
+ #define AV_HAVE_BIGENDIAN 0
+ #endif /* AVUTIL_AVCONFIG_H */
diff -c -r -N ../ffmpeg-0.6.1/libavutil/intreadwrite.h jni/ffmpeg/libavutil/intreadwrite.h
*** ../ffmpeg-0.6.1/libavutil/intreadwrite.h 2010-03-02 04:16:24.000000000 +0100
--- jni/ffmpeg/libavutil/intreadwrite.h 2011-02-09 17:40:32.000000000 +0100
***************
*** 23,28 ****
--- 23,29 ----
#include "config.h"
#include "bswap.h"
#include "common.h"
+ #include "internal.h"
typedef union {
uint64_t u64;
diff -c -r -N ../ffmpeg-0.6.1/libavutil/log.c jni/ffmpeg/libavutil/log.c
*** ../ffmpeg-0.6.1/libavutil/log.c 2010-04-23 23:27:26.000000000 +0200
--- jni/ffmpeg/libavutil/log.c 2011-06-10 21:16:31.000000000 +0200
***************
*** 28,33 ****
--- 28,38 ----
#include <stdlib.h>
#include "avutil.h"
#include "log.h"
+ #include "config.h"
+
+ #if OS_ANDROID
+ #include <android/log.h>
+ #endif
#if LIBAVUTIL_VERSION_MAJOR > 50
static
***************
*** 36,41 ****
--- 41,58 ----
static int use_ansi_color=-1;
+ #if OS_ANDROID
+ static int android_levels[7] = {
+ ANDROID_LOG_FATAL,
+ ANDROID_LOG_FATAL,
+ ANDROID_LOG_ERROR,
+ ANDROID_LOG_WARN,
+ ANDROID_LOG_INFO,
+ ANDROID_LOG_VERBOSE,
+ ANDROID_LOG_DEBUG
+ };
+ #endif
+
#undef fprintf
static void colored_fputs(int color, const char *str){
if(use_ansi_color<0){
***************
*** 60,67 ****
--- 77,88 ----
static int print_prefix=1;
static int count;
static char line[1024], prev[1024];
+ #if OS_ANDROID
+ static int prev_android_level;
+ #endif
static const uint8_t color[]={0x41,0x41,0x11,0x03,9,9,9};
AVClass* avc= ptr ? *(AVClass**)ptr : NULL;
+
if(level>av_log_level)
return;
#undef fprintf
***************
*** 78,87 ****
--- 99,117 ----
return;
}
if(count>0){
+ #if OS_ANDROID
+ __android_log_print( prev_android_level, "FF-MPEG", " Last message repeated %d times\n", count);
+ #else
fprintf(stderr, " Last message repeated %d times\n", count);
+ #endif
count=0;
}
+ #if OS_ANDROID
+ prev_android_level = android_levels[av_clip(level>>3,0,6)];
+ __android_log_print( prev_android_level, "FF-MPEG", line);
+ #else
colored_fputs(color[av_clip(level>>3, 0, 6)], line);
+ #endif
strcpy(prev, line);
}