Mercurial > libavcodec.hg
annotate utils.c @ 2420:842e5e7f3b7a libavcodec
fixing selftest
| author | michael |
|---|---|
| date | Tue, 11 Jan 2005 03:18:08 +0000 |
| parents | 82af834636c2 |
| children | 18b8b2dcc037 |
| rev | line source |
|---|---|
| 0 | 1 /* |
| 2 * utils for libavcodec | |
| 429 | 3 * Copyright (c) 2001 Fabrice Bellard. |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1588
diff
changeset
|
4 * Copyright (c) 2003 Michel Bardiaux for the av_log API |
|
1739
07a484280a82
copyright year update of the files i touched and remembered, things look annoyingly unmaintained otherwise
michael
parents:
1730
diff
changeset
|
5 * Copyright (c) 2002-2004 Michael Niedermayer <michaelni@gmx.at> |
| 0 | 6 * |
| 429 | 7 * This library is free software; you can redistribute it and/or |
| 8 * modify it under the terms of the GNU Lesser General Public | |
| 9 * License as published by the Free Software Foundation; either | |
| 10 * version 2 of the License, or (at your option) any later version. | |
| 0 | 11 * |
| 429 | 12 * This library is distributed in the hope that it will be useful, |
| 0 | 13 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 429 | 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
| 15 * Lesser General Public License for more details. | |
| 0 | 16 * |
| 429 | 17 * You should have received a copy of the GNU Lesser General Public |
| 18 * License along with this library; if not, write to the Free Software | |
| 19 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | |
| 0 | 20 */ |
| 1106 | 21 |
| 22 /** | |
| 23 * @file utils.c | |
| 24 * utils. | |
| 25 */ | |
| 26 | |
| 394 | 27 #include "avcodec.h" |
| 0 | 28 #include "dsputil.h" |
| 341 | 29 #include "mpegvideo.h" |
|
2002
b737b5e96ee0
use AVInteger in av_rescale() so it can finally do 64*64/64 instead of just 64*32/32
michael
parents:
1996
diff
changeset
|
30 #include "integer.h" |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1588
diff
changeset
|
31 #include <stdarg.h> |
|
2002
b737b5e96ee0
use AVInteger in av_rescale() so it can finally do 64*64/64 instead of just 64*32/32
michael
parents:
1996
diff
changeset
|
32 #include <limits.h> |
| 0 | 33 |
|
2398
582e635cfa08
common.c -> bitstream.c (and the single non bitstream func -> utils.c)
michael
parents:
2370
diff
changeset
|
34 const uint8_t ff_sqrt_tab[128]={ |
|
582e635cfa08
common.c -> bitstream.c (and the single non bitstream func -> utils.c)
michael
parents:
2370
diff
changeset
|
35 0, 1, 1, 1, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, |
|
582e635cfa08
common.c -> bitstream.c (and the single non bitstream func -> utils.c)
michael
parents:
2370
diff
changeset
|
36 5, 5, 5, 5, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, |
|
582e635cfa08
common.c -> bitstream.c (and the single non bitstream func -> utils.c)
michael
parents:
2370
diff
changeset
|
37 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, |
|
582e635cfa08
common.c -> bitstream.c (and the single non bitstream func -> utils.c)
michael
parents:
2370
diff
changeset
|
38 9, 9, 9, 9,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,11,11,11,11,11,11,11 |
|
582e635cfa08
common.c -> bitstream.c (and the single non bitstream func -> utils.c)
michael
parents:
2370
diff
changeset
|
39 }; |
|
582e635cfa08
common.c -> bitstream.c (and the single non bitstream func -> utils.c)
michael
parents:
2370
diff
changeset
|
40 |
|
582e635cfa08
common.c -> bitstream.c (and the single non bitstream func -> utils.c)
michael
parents:
2370
diff
changeset
|
41 const uint8_t ff_log2_tab[256]={ |
|
582e635cfa08
common.c -> bitstream.c (and the single non bitstream func -> utils.c)
michael
parents:
2370
diff
changeset
|
42 0,0,1,1,2,2,2,2,3,3,3,3,3,3,3,3,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4, |
|
582e635cfa08
common.c -> bitstream.c (and the single non bitstream func -> utils.c)
michael
parents:
2370
diff
changeset
|
43 5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5, |
|
582e635cfa08
common.c -> bitstream.c (and the single non bitstream func -> utils.c)
michael
parents:
2370
diff
changeset
|
44 6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6, |
|
582e635cfa08
common.c -> bitstream.c (and the single non bitstream func -> utils.c)
michael
parents:
2370
diff
changeset
|
45 6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6, |
|
582e635cfa08
common.c -> bitstream.c (and the single non bitstream func -> utils.c)
michael
parents:
2370
diff
changeset
|
46 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7, |
|
582e635cfa08
common.c -> bitstream.c (and the single non bitstream func -> utils.c)
michael
parents:
2370
diff
changeset
|
47 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7, |
|
582e635cfa08
common.c -> bitstream.c (and the single non bitstream func -> utils.c)
michael
parents:
2370
diff
changeset
|
48 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7, |
|
582e635cfa08
common.c -> bitstream.c (and the single non bitstream func -> utils.c)
michael
parents:
2370
diff
changeset
|
49 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7 |
|
582e635cfa08
common.c -> bitstream.c (and the single non bitstream func -> utils.c)
michael
parents:
2370
diff
changeset
|
50 }; |
|
582e635cfa08
common.c -> bitstream.c (and the single non bitstream func -> utils.c)
michael
parents:
2370
diff
changeset
|
51 |
| 2231 | 52 void avcodec_default_free_buffers(AVCodecContext *s); |
| 1994 | 53 |
| 862 | 54 void *av_mallocz(unsigned int size) |
| 394 | 55 { |
| 56 void *ptr; | |
| 908 | 57 |
| 394 | 58 ptr = av_malloc(size); |
| 59 if (!ptr) | |
| 60 return NULL; | |
| 61 memset(ptr, 0, size); | |
| 62 return ptr; | |
| 63 } | |
| 64 | |
|
1031
19de1445beb2
use av_malloc() functions - added av_strdup and av_realloc()
bellard
parents:
998
diff
changeset
|
65 char *av_strdup(const char *s) |
|
19de1445beb2
use av_malloc() functions - added av_strdup and av_realloc()
bellard
parents:
998
diff
changeset
|
66 { |
|
19de1445beb2
use av_malloc() functions - added av_strdup and av_realloc()
bellard
parents:
998
diff
changeset
|
67 char *ptr; |
|
19de1445beb2
use av_malloc() functions - added av_strdup and av_realloc()
bellard
parents:
998
diff
changeset
|
68 int len; |
|
19de1445beb2
use av_malloc() functions - added av_strdup and av_realloc()
bellard
parents:
998
diff
changeset
|
69 len = strlen(s) + 1; |
|
19de1445beb2
use av_malloc() functions - added av_strdup and av_realloc()
bellard
parents:
998
diff
changeset
|
70 ptr = av_malloc(len); |
|
19de1445beb2
use av_malloc() functions - added av_strdup and av_realloc()
bellard
parents:
998
diff
changeset
|
71 if (!ptr) |
|
19de1445beb2
use av_malloc() functions - added av_strdup and av_realloc()
bellard
parents:
998
diff
changeset
|
72 return NULL; |
|
19de1445beb2
use av_malloc() functions - added av_strdup and av_realloc()
bellard
parents:
998
diff
changeset
|
73 memcpy(ptr, s, len); |
|
19de1445beb2
use av_malloc() functions - added av_strdup and av_realloc()
bellard
parents:
998
diff
changeset
|
74 return ptr; |
|
19de1445beb2
use av_malloc() functions - added av_strdup and av_realloc()
bellard
parents:
998
diff
changeset
|
75 } |
|
19de1445beb2
use av_malloc() functions - added av_strdup and av_realloc()
bellard
parents:
998
diff
changeset
|
76 |
|
19de1445beb2
use av_malloc() functions - added av_strdup and av_realloc()
bellard
parents:
998
diff
changeset
|
77 /** |
|
19de1445beb2
use av_malloc() functions - added av_strdup and av_realloc()
bellard
parents:
998
diff
changeset
|
78 * realloc which does nothing if the block is large enough |
|
19de1445beb2
use av_malloc() functions - added av_strdup and av_realloc()
bellard
parents:
998
diff
changeset
|
79 */ |
| 1057 | 80 void *av_fast_realloc(void *ptr, unsigned int *size, unsigned int min_size) |
|
1031
19de1445beb2
use av_malloc() functions - added av_strdup and av_realloc()
bellard
parents:
998
diff
changeset
|
81 { |
|
19de1445beb2
use av_malloc() functions - added av_strdup and av_realloc()
bellard
parents:
998
diff
changeset
|
82 if(min_size < *size) |
|
19de1445beb2
use av_malloc() functions - added av_strdup and av_realloc()
bellard
parents:
998
diff
changeset
|
83 return ptr; |
|
19de1445beb2
use av_malloc() functions - added av_strdup and av_realloc()
bellard
parents:
998
diff
changeset
|
84 |
| 1901 | 85 *size= 17*min_size/16 + 32; |
|
1031
19de1445beb2
use av_malloc() functions - added av_strdup and av_realloc()
bellard
parents:
998
diff
changeset
|
86 |
|
19de1445beb2
use av_malloc() functions - added av_strdup and av_realloc()
bellard
parents:
998
diff
changeset
|
87 return av_realloc(ptr, *size); |
|
19de1445beb2
use av_malloc() functions - added av_strdup and av_realloc()
bellard
parents:
998
diff
changeset
|
88 } |
|
19de1445beb2
use av_malloc() functions - added av_strdup and av_realloc()
bellard
parents:
998
diff
changeset
|
89 |
|
19de1445beb2
use av_malloc() functions - added av_strdup and av_realloc()
bellard
parents:
998
diff
changeset
|
90 |
|
902
6acc8394960d
* two functions to handle allocation of static data more simple
kabi
parents:
862
diff
changeset
|
91 static unsigned int last_static = 0; |
|
1900
5cde80c5d929
static allocation rewrite (old code was plain a broken mess)
michael
parents:
1858
diff
changeset
|
92 static unsigned int allocated_static = 0; |
|
5cde80c5d929
static allocation rewrite (old code was plain a broken mess)
michael
parents:
1858
diff
changeset
|
93 static void** array_static = NULL; |
|
5cde80c5d929
static allocation rewrite (old code was plain a broken mess)
michael
parents:
1858
diff
changeset
|
94 |
|
5cde80c5d929
static allocation rewrite (old code was plain a broken mess)
michael
parents:
1858
diff
changeset
|
95 /** |
|
5cde80c5d929
static allocation rewrite (old code was plain a broken mess)
michael
parents:
1858
diff
changeset
|
96 * allocation of static arrays - do not use for normal allocation. |
|
5cde80c5d929
static allocation rewrite (old code was plain a broken mess)
michael
parents:
1858
diff
changeset
|
97 */ |
|
5cde80c5d929
static allocation rewrite (old code was plain a broken mess)
michael
parents:
1858
diff
changeset
|
98 void *av_mallocz_static(unsigned int size) |
|
902
6acc8394960d
* two functions to handle allocation of static data more simple
kabi
parents:
862
diff
changeset
|
99 { |
|
6acc8394960d
* two functions to handle allocation of static data more simple
kabi
parents:
862
diff
changeset
|
100 void *ptr = av_mallocz(size); |
|
6acc8394960d
* two functions to handle allocation of static data more simple
kabi
parents:
862
diff
changeset
|
101 |
|
1900
5cde80c5d929
static allocation rewrite (old code was plain a broken mess)
michael
parents:
1858
diff
changeset
|
102 if(ptr){ |
| 1901 | 103 array_static =av_fast_realloc(array_static, &allocated_static, sizeof(void*)*(last_static+1)); |
|
1900
5cde80c5d929
static allocation rewrite (old code was plain a broken mess)
michael
parents:
1858
diff
changeset
|
104 array_static[last_static++] = ptr; |
|
902
6acc8394960d
* two functions to handle allocation of static data more simple
kabi
parents:
862
diff
changeset
|
105 } |
|
1900
5cde80c5d929
static allocation rewrite (old code was plain a broken mess)
michael
parents:
1858
diff
changeset
|
106 |
|
902
6acc8394960d
* two functions to handle allocation of static data more simple
kabi
parents:
862
diff
changeset
|
107 return ptr; |
|
6acc8394960d
* two functions to handle allocation of static data more simple
kabi
parents:
862
diff
changeset
|
108 } |
|
1900
5cde80c5d929
static allocation rewrite (old code was plain a broken mess)
michael
parents:
1858
diff
changeset
|
109 |
|
5cde80c5d929
static allocation rewrite (old code was plain a broken mess)
michael
parents:
1858
diff
changeset
|
110 /** |
|
2370
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2362
diff
changeset
|
111 * same as above, but does realloc |
|
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2362
diff
changeset
|
112 */ |
|
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2362
diff
changeset
|
113 |
|
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2362
diff
changeset
|
114 void *av_realloc_static(void *ptr, unsigned int size) |
|
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2362
diff
changeset
|
115 { |
|
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2362
diff
changeset
|
116 int i; |
|
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2362
diff
changeset
|
117 if(!ptr) |
|
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2362
diff
changeset
|
118 return av_mallocz_static(size); |
|
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2362
diff
changeset
|
119 /* Look for the old ptr */ |
|
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2362
diff
changeset
|
120 for(i = 0; i < last_static; i++) { |
|
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2362
diff
changeset
|
121 if(array_static[i] == ptr) { |
|
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2362
diff
changeset
|
122 array_static[i] = av_realloc(array_static[i], size); |
|
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2362
diff
changeset
|
123 return array_static[i]; |
|
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2362
diff
changeset
|
124 } |
|
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2362
diff
changeset
|
125 } |
|
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2362
diff
changeset
|
126 return NULL; |
|
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2362
diff
changeset
|
127 |
|
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2362
diff
changeset
|
128 } |
|
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2362
diff
changeset
|
129 |
|
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2362
diff
changeset
|
130 /** |
|
1900
5cde80c5d929
static allocation rewrite (old code was plain a broken mess)
michael
parents:
1858
diff
changeset
|
131 * free all static arrays and reset pointers to 0. |
|
5cde80c5d929
static allocation rewrite (old code was plain a broken mess)
michael
parents:
1858
diff
changeset
|
132 */ |
| 1282 | 133 void av_free_static(void) |
|
902
6acc8394960d
* two functions to handle allocation of static data more simple
kabi
parents:
862
diff
changeset
|
134 { |
|
1900
5cde80c5d929
static allocation rewrite (old code was plain a broken mess)
michael
parents:
1858
diff
changeset
|
135 while(last_static){ |
|
5cde80c5d929
static allocation rewrite (old code was plain a broken mess)
michael
parents:
1858
diff
changeset
|
136 av_freep(&array_static[--last_static]); |
|
902
6acc8394960d
* two functions to handle allocation of static data more simple
kabi
parents:
862
diff
changeset
|
137 } |
|
1900
5cde80c5d929
static allocation rewrite (old code was plain a broken mess)
michael
parents:
1858
diff
changeset
|
138 av_freep(&array_static); |
|
902
6acc8394960d
* two functions to handle allocation of static data more simple
kabi
parents:
862
diff
changeset
|
139 } |
|
6acc8394960d
* two functions to handle allocation of static data more simple
kabi
parents:
862
diff
changeset
|
140 |
| 1854 | 141 /** |
| 142 * Frees memory and sets the pointer to NULL. | |
| 143 * @param arg pointer to the pointer which should be freed | |
| 144 */ | |
| 145 void av_freep(void *arg) | |
| 400 | 146 { |
| 1854 | 147 void **ptr= (void**)arg; |
| 400 | 148 av_free(*ptr); |
| 149 *ptr = NULL; | |
| 150 } | |
| 151 | |
| 0 | 152 /* encoder management */ |
|
2169
db8baace74d8
Minor Patch for shared libs on Mac OSX by (Bill May <wmay at cisco dot com>)
michael
parents:
2167
diff
changeset
|
153 AVCodec *first_avcodec = NULL; |
| 0 | 154 |
| 155 void register_avcodec(AVCodec *format) | |
| 156 { | |
| 157 AVCodec **p; | |
| 158 p = &first_avcodec; | |
| 159 while (*p != NULL) p = &(*p)->next; | |
| 160 *p = format; | |
| 161 format->next = NULL; | |
| 162 } | |
| 163 | |
| 2270 | 164 void avcodec_set_dimensions(AVCodecContext *s, int width, int height){ |
| 165 s->coded_width = width; | |
| 166 s->coded_height= height; | |
| 167 s->width = -((-width )>>s->lowres); | |
| 168 s->height= -((-height)>>s->lowres); | |
| 169 } | |
| 170 | |
| 1214 | 171 typedef struct InternalBuffer{ |
| 903 | 172 int last_pic_num; |
| 1214 | 173 uint8_t *base[4]; |
| 903 | 174 uint8_t *data[4]; |
|
1588
de5e2acd0f80
initalize various uninitalized variables and avoid coded_picture_number as its not always correct (later should be reversed after fixing the picture_number mess)
michael
parents:
1585
diff
changeset
|
175 int linesize[4]; |
| 1214 | 176 }InternalBuffer; |
| 177 | |
| 178 #define INTERNAL_BUFFER_SIZE 32 | |
| 903 | 179 |
| 1538 | 180 #define ALIGN(x, a) (((x)+(a)-1)&~((a)-1)) |
| 181 | |
| 182 void avcodec_align_dimensions(AVCodecContext *s, int *width, int *height){ | |
| 183 int w_align= 1; | |
| 184 int h_align= 1; | |
| 185 | |
| 186 switch(s->pix_fmt){ | |
| 187 case PIX_FMT_YUV420P: | |
| 188 case PIX_FMT_YUV422: | |
|
2137
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
2125
diff
changeset
|
189 case PIX_FMT_UYVY422: |
| 1538 | 190 case PIX_FMT_YUV422P: |
| 191 case PIX_FMT_YUV444P: | |
| 192 case PIX_FMT_GRAY8: | |
| 193 case PIX_FMT_YUVJ420P: | |
| 194 case PIX_FMT_YUVJ422P: | |
| 195 case PIX_FMT_YUVJ444P: | |
| 196 w_align= 16; //FIXME check for non mpeg style codecs and use less alignment | |
| 197 h_align= 16; | |
| 198 break; | |
| 199 case PIX_FMT_YUV411P: | |
| 2309 | 200 case PIX_FMT_UYVY411: |
| 1538 | 201 w_align=32; |
| 202 h_align=8; | |
| 203 break; | |
| 204 case PIX_FMT_YUV410P: | |
| 205 if(s->codec_id == CODEC_ID_SVQ1){ | |
| 206 w_align=64; | |
| 207 h_align=64; | |
| 208 } | |
| 2104 | 209 case PIX_FMT_RGB555: |
| 210 if(s->codec_id == CODEC_ID_RPZA){ | |
| 211 w_align=4; | |
| 212 h_align=4; | |
| 213 } | |
| 214 case PIX_FMT_PAL8: | |
| 215 if(s->codec_id == CODEC_ID_SMC){ | |
| 216 w_align=4; | |
| 217 h_align=4; | |
| 218 } | |
| 1538 | 219 break; |
|
2418
82af834636c2
Check pointers before writing to memory, fix possible integer overflows
rtognimp
parents:
2398
diff
changeset
|
220 case PIX_FMT_BGR24: |
|
82af834636c2
Check pointers before writing to memory, fix possible integer overflows
rtognimp
parents:
2398
diff
changeset
|
221 if((s->codec_id == CODEC_ID_MSZH) || (s->codec_id == CODEC_ID_ZLIB)){ |
|
82af834636c2
Check pointers before writing to memory, fix possible integer overflows
rtognimp
parents:
2398
diff
changeset
|
222 w_align=4; |
|
82af834636c2
Check pointers before writing to memory, fix possible integer overflows
rtognimp
parents:
2398
diff
changeset
|
223 h_align=4; |
|
82af834636c2
Check pointers before writing to memory, fix possible integer overflows
rtognimp
parents:
2398
diff
changeset
|
224 } |
|
82af834636c2
Check pointers before writing to memory, fix possible integer overflows
rtognimp
parents:
2398
diff
changeset
|
225 break; |
| 1538 | 226 default: |
| 227 w_align= 1; | |
| 228 h_align= 1; | |
| 229 break; | |
| 230 } | |
| 231 | |
| 232 *width = ALIGN(*width , w_align); | |
| 233 *height= ALIGN(*height, h_align); | |
| 234 } | |
| 235 | |
| 925 | 236 int avcodec_default_get_buffer(AVCodecContext *s, AVFrame *pic){ |
| 903 | 237 int i; |
| 1538 | 238 int w= s->width; |
| 239 int h= s->height; | |
| 1214 | 240 InternalBuffer *buf; |
|
1588
de5e2acd0f80
initalize various uninitalized variables and avoid coded_picture_number as its not always correct (later should be reversed after fixing the picture_number mess)
michael
parents:
1585
diff
changeset
|
241 int *picture_number; |
| 924 | 242 |
| 243 assert(pic->data[0]==NULL); | |
| 1214 | 244 assert(INTERNAL_BUFFER_SIZE > s->internal_buffer_count); |
| 903 | 245 |
| 1214 | 246 if(s->internal_buffer==NULL){ |
| 247 s->internal_buffer= av_mallocz(INTERNAL_BUFFER_SIZE*sizeof(InternalBuffer)); | |
| 248 } | |
| 249 #if 0 | |
| 250 s->internal_buffer= av_fast_realloc( | |
| 251 s->internal_buffer, | |
| 252 &s->internal_buffer_size, | |
| 253 sizeof(InternalBuffer)*FFMAX(99, s->internal_buffer_count+1)/*FIXME*/ | |
| 254 ); | |
| 255 #endif | |
| 256 | |
| 257 buf= &((InternalBuffer*)s->internal_buffer)[s->internal_buffer_count]; | |
|
1588
de5e2acd0f80
initalize various uninitalized variables and avoid coded_picture_number as its not always correct (later should be reversed after fixing the picture_number mess)
michael
parents:
1585
diff
changeset
|
258 picture_number= &(((InternalBuffer*)s->internal_buffer)[INTERNAL_BUFFER_SIZE-1]).last_pic_num; //FIXME ugly hack |
|
de5e2acd0f80
initalize various uninitalized variables and avoid coded_picture_number as its not always correct (later should be reversed after fixing the picture_number mess)
michael
parents:
1585
diff
changeset
|
259 (*picture_number)++; |
|
de5e2acd0f80
initalize various uninitalized variables and avoid coded_picture_number as its not always correct (later should be reversed after fixing the picture_number mess)
michael
parents:
1585
diff
changeset
|
260 |
| 1214 | 261 if(buf->base[0]){ |
|
1588
de5e2acd0f80
initalize various uninitalized variables and avoid coded_picture_number as its not always correct (later should be reversed after fixing the picture_number mess)
michael
parents:
1585
diff
changeset
|
262 pic->age= *picture_number - buf->last_pic_num; |
|
de5e2acd0f80
initalize various uninitalized variables and avoid coded_picture_number as its not always correct (later should be reversed after fixing the picture_number mess)
michael
parents:
1585
diff
changeset
|
263 buf->last_pic_num= *picture_number; |
| 903 | 264 }else{ |
| 1538 | 265 int h_chroma_shift, v_chroma_shift; |
| 2324 | 266 int pixel_size; |
| 903 | 267 |
| 268 avcodec_get_chroma_sub_sample(s->pix_fmt, &h_chroma_shift, &v_chroma_shift); | |
| 1538 | 269 |
| 903 | 270 switch(s->pix_fmt){ |
| 1291 | 271 case PIX_FMT_RGB555: |
| 272 case PIX_FMT_RGB565: | |
| 903 | 273 case PIX_FMT_YUV422: |
|
2137
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
2125
diff
changeset
|
274 case PIX_FMT_UYVY422: |
| 903 | 275 pixel_size=2; |
| 276 break; | |
| 277 case PIX_FMT_RGB24: | |
| 278 case PIX_FMT_BGR24: | |
| 279 pixel_size=3; | |
| 280 break; | |
| 281 case PIX_FMT_RGBA32: | |
| 282 pixel_size=4; | |
| 283 break; | |
| 284 default: | |
| 285 pixel_size=1; | |
| 286 } | |
| 1538 | 287 |
| 288 avcodec_align_dimensions(s, &w, &h); | |
| 289 | |
| 903 | 290 if(!(s->flags&CODEC_FLAG_EMU_EDGE)){ |
| 291 w+= EDGE_WIDTH*2; | |
| 292 h+= EDGE_WIDTH*2; | |
| 293 } | |
| 294 | |
| 1214 | 295 buf->last_pic_num= -256*256*256*64; |
| 903 | 296 |
| 297 for(i=0; i<3; i++){ | |
| 1165 | 298 const int h_shift= i==0 ? 0 : h_chroma_shift; |
| 299 const int v_shift= i==0 ? 0 : v_chroma_shift; | |
| 903 | 300 |
|
1798
a3da4b429984
ppc chroma mess workaround (real bug is that the motion compensation code assumes that 2*uvlinesize == linesize and fixing this would mean a slowdown)
michael
parents:
1776
diff
changeset
|
301 //FIXME next ensures that linesize= 2^x uvlinesize, thats needed because some MC code assumes it |
| 2324 | 302 buf->linesize[i]= ALIGN(pixel_size*w>>h_shift, STRIDE_ALIGN<<(h_chroma_shift-h_shift)); |
| 903 | 303 |
|
1588
de5e2acd0f80
initalize various uninitalized variables and avoid coded_picture_number as its not always correct (later should be reversed after fixing the picture_number mess)
michael
parents:
1585
diff
changeset
|
304 buf->base[i]= av_mallocz((buf->linesize[i]*h>>v_shift)+16); //FIXME 16 |
| 1214 | 305 if(buf->base[i]==NULL) return -1; |
|
1588
de5e2acd0f80
initalize various uninitalized variables and avoid coded_picture_number as its not always correct (later should be reversed after fixing the picture_number mess)
michael
parents:
1585
diff
changeset
|
306 memset(buf->base[i], 128, buf->linesize[i]*h>>v_shift); |
| 903 | 307 |
| 308 if(s->flags&CODEC_FLAG_EMU_EDGE) | |
| 1214 | 309 buf->data[i] = buf->base[i]; |
| 903 | 310 else |
| 2324 | 311 buf->data[i] = buf->base[i] + ALIGN((buf->linesize[i]*EDGE_WIDTH>>v_shift) + (EDGE_WIDTH>>h_shift), STRIDE_ALIGN); |
| 903 | 312 } |
| 313 pic->age= 256*256*256*64; | |
| 314 } | |
|
1588
de5e2acd0f80
initalize various uninitalized variables and avoid coded_picture_number as its not always correct (later should be reversed after fixing the picture_number mess)
michael
parents:
1585
diff
changeset
|
315 pic->type= FF_BUFFER_TYPE_INTERNAL; |
| 903 | 316 |
| 1214 | 317 for(i=0; i<4; i++){ |
| 318 pic->base[i]= buf->base[i]; | |
| 319 pic->data[i]= buf->data[i]; | |
|
1588
de5e2acd0f80
initalize various uninitalized variables and avoid coded_picture_number as its not always correct (later should be reversed after fixing the picture_number mess)
michael
parents:
1585
diff
changeset
|
320 pic->linesize[i]= buf->linesize[i]; |
| 1214 | 321 } |
| 322 s->internal_buffer_count++; | |
| 323 | |
| 903 | 324 return 0; |
| 325 } | |
| 326 | |
| 925 | 327 void avcodec_default_release_buffer(AVCodecContext *s, AVFrame *pic){ |
| 903 | 328 int i; |
| 1214 | 329 InternalBuffer *buf, *last, temp; |
| 330 | |
| 924 | 331 assert(pic->type==FF_BUFFER_TYPE_INTERNAL); |
| 1396 | 332 assert(s->internal_buffer_count); |
| 1214 | 333 |
| 1455 | 334 buf = NULL; /* avoids warning */ |
| 1214 | 335 for(i=0; i<s->internal_buffer_count; i++){ //just 3-5 checks so is not worth to optimize |
| 336 buf= &((InternalBuffer*)s->internal_buffer)[i]; | |
| 337 if(buf->data[0] == pic->data[0]) | |
| 338 break; | |
| 339 } | |
| 340 assert(i < s->internal_buffer_count); | |
| 341 s->internal_buffer_count--; | |
| 342 last = &((InternalBuffer*)s->internal_buffer)[s->internal_buffer_count]; | |
| 343 | |
| 344 temp= *buf; | |
| 345 *buf= *last; | |
| 346 *last= temp; | |
| 347 | |
| 348 for(i=0; i<3; i++){ | |
| 903 | 349 pic->data[i]=NULL; |
| 1214 | 350 // pic->base[i]=NULL; |
| 351 } | |
| 903 | 352 //printf("R%X\n", pic->opaque); |
| 353 } | |
| 354 | |
| 1630 | 355 int avcodec_default_reget_buffer(AVCodecContext *s, AVFrame *pic){ |
| 356 AVFrame temp_pic; | |
| 357 int i; | |
| 358 | |
| 359 /* If no picture return a new buffer */ | |
| 360 if(pic->data[0] == NULL) { | |
| 361 /* We will copy from buffer, so must be readable */ | |
| 362 pic->buffer_hints |= FF_BUFFER_HINTS_READABLE; | |
| 363 return s->get_buffer(s, pic); | |
| 364 } | |
| 365 | |
| 366 /* If internal buffer type return the same buffer */ | |
| 367 if(pic->type == FF_BUFFER_TYPE_INTERNAL) | |
| 368 return 0; | |
| 369 | |
| 370 /* | |
| 371 * Not internal type and reget_buffer not overridden, emulate cr buffer | |
| 372 */ | |
| 373 temp_pic = *pic; | |
| 374 for(i = 0; i < 4; i++) | |
| 375 pic->data[i] = pic->base[i] = NULL; | |
| 376 pic->opaque = NULL; | |
| 377 /* Allocate new frame */ | |
| 378 if (s->get_buffer(s, pic)) | |
| 379 return -1; | |
| 380 /* Copy image data from old buffer to new buffer */ | |
| 381 img_copy((AVPicture*)pic, (AVPicture*)&temp_pic, s->pix_fmt, s->width, | |
| 382 s->height); | |
| 383 s->release_buffer(s, &temp_pic); // Release old frame | |
| 384 return 0; | |
| 385 } | |
| 386 | |
| 1799 | 387 int avcodec_default_execute(AVCodecContext *c, int (*func)(AVCodecContext *c2, void *arg2),void **arg, int *ret, int count){ |
| 388 int i; | |
| 389 | |
| 390 for(i=0; i<count; i++){ | |
| 391 int r= func(c, arg[i]); | |
| 392 if(ret) ret[i]= r; | |
| 393 } | |
| 394 return 0; | |
| 395 } | |
| 396 | |
| 1858 | 397 enum PixelFormat avcodec_default_get_format(struct AVCodecContext *s, const enum PixelFormat * fmt){ |
| 998 | 398 return fmt[0]; |
| 399 } | |
| 400 | |
| 1856 | 401 static const char* context_to_name(void* ptr) { |
| 402 AVCodecContext *avc= ptr; | |
| 403 | |
| 404 if(avc && avc->codec && avc->codec->name) | |
| 405 return avc->codec->name; | |
| 406 else | |
| 407 return "NULL"; | |
| 408 } | |
| 409 | |
| 410 static AVClass av_codec_context_class = { "AVCodecContext", context_to_name }; | |
| 411 | |
| 681 | 412 void avcodec_get_context_defaults(AVCodecContext *s){ |
|
1831
cd2d7fcfab7a
use AVFrame.pts=AV_NOPTS_VALUE instead of AVFrame.pts=0
michael
parents:
1823
diff
changeset
|
413 memset(s, 0, sizeof(AVCodecContext)); |
|
cd2d7fcfab7a
use AVFrame.pts=AV_NOPTS_VALUE instead of AVFrame.pts=0
michael
parents:
1823
diff
changeset
|
414 |
| 1856 | 415 s->av_class= &av_codec_context_class; |
| 685 | 416 s->bit_rate= 800*1000; |
| 417 s->bit_rate_tolerance= s->bit_rate*10; | |
| 681 | 418 s->qmin= 2; |
| 419 s->qmax= 31; | |
| 932 | 420 s->mb_qmin= 2; |
| 421 s->mb_qmax= 31; | |
| 681 | 422 s->rc_eq= "tex^qComp"; |
| 423 s->qcompress= 0.5; | |
| 685 | 424 s->max_qdiff= 3; |
| 425 s->b_quant_factor=1.25; | |
| 426 s->b_quant_offset=1.25; | |
|
686
83d2c9d50d7d
fixing i_quant_factor, this should finally fix the bitrate bug with ffserver hopefully
michaelni
parents:
685
diff
changeset
|
427 s->i_quant_factor=-0.8; |
| 685 | 428 s->i_quant_offset=0.0; |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
742
diff
changeset
|
429 s->error_concealment= 3; |
| 762 | 430 s->error_resilience= 1; |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
742
diff
changeset
|
431 s->workaround_bugs= FF_BUG_AUTODETECT; |
|
1126
77ccf7fe3bd0
per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents:
1106
diff
changeset
|
432 s->frame_rate_base= 1; |
|
77ccf7fe3bd0
per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents:
1106
diff
changeset
|
433 s->frame_rate = 25; |
| 762 | 434 s->gop_size= 50; |
| 435 s->me_method= ME_EPZS; | |
| 903 | 436 s->get_buffer= avcodec_default_get_buffer; |
| 437 s->release_buffer= avcodec_default_release_buffer; | |
| 998 | 438 s->get_format= avcodec_default_get_format; |
| 1799 | 439 s->execute= avcodec_default_execute; |
| 440 s->thread_count=1; | |
| 954 | 441 s->me_subpel_quality=8; |
|
1505
010f76d07a27
use lagrange multipler instead of qp for ratecontrol, this may break some things, tell me ASAP if u notice anything broken
michaelni
parents:
1456
diff
changeset
|
442 s->lmin= FF_QP2LAMBDA * s->qmin; |
|
010f76d07a27
use lagrange multipler instead of qp for ratecontrol, this may break some things, tell me ASAP if u notice anything broken
michaelni
parents:
1456
diff
changeset
|
443 s->lmax= FF_QP2LAMBDA * s->qmax; |
| 1548 | 444 s->sample_aspect_ratio= (AVRational){0,1}; |
| 1730 | 445 s->ildct_cmp= FF_CMP_VSAD; |
| 2167 | 446 s->profile= FF_PROFILE_UNKNOWN; |
| 447 s->level= FF_LEVEL_UNKNOWN; | |
| 1150 | 448 |
| 449 s->intra_quant_bias= FF_DEFAULT_QUANT_BIAS; | |
| 450 s->inter_quant_bias= FF_DEFAULT_QUANT_BIAS; | |
|
1585
6b224ca24033
revised palette API, courtesy of Roberto Togni (rtogni at freemail.it)
melanson
parents:
1582
diff
changeset
|
451 s->palctrl = NULL; |
| 1630 | 452 s->reget_buffer= avcodec_default_reget_buffer; |
| 681 | 453 } |
| 454 | |
| 455 /** | |
| 456 * allocates a AVCodecContext and set it to defaults. | |
| 457 * this can be deallocated by simply calling free() | |
| 458 */ | |
| 703 | 459 AVCodecContext *avcodec_alloc_context(void){ |
|
1831
cd2d7fcfab7a
use AVFrame.pts=AV_NOPTS_VALUE instead of AVFrame.pts=0
michael
parents:
1823
diff
changeset
|
460 AVCodecContext *avctx= av_malloc(sizeof(AVCodecContext)); |
| 681 | 461 |
| 462 if(avctx==NULL) return NULL; | |
| 463 | |
| 464 avcodec_get_context_defaults(avctx); | |
| 465 | |
| 466 return avctx; | |
| 467 } | |
| 468 | |
|
1831
cd2d7fcfab7a
use AVFrame.pts=AV_NOPTS_VALUE instead of AVFrame.pts=0
michael
parents:
1823
diff
changeset
|
469 void avcodec_get_frame_defaults(AVFrame *pic){ |
|
cd2d7fcfab7a
use AVFrame.pts=AV_NOPTS_VALUE instead of AVFrame.pts=0
michael
parents:
1823
diff
changeset
|
470 memset(pic, 0, sizeof(AVFrame)); |
|
cd2d7fcfab7a
use AVFrame.pts=AV_NOPTS_VALUE instead of AVFrame.pts=0
michael
parents:
1823
diff
changeset
|
471 |
|
cd2d7fcfab7a
use AVFrame.pts=AV_NOPTS_VALUE instead of AVFrame.pts=0
michael
parents:
1823
diff
changeset
|
472 pic->pts= AV_NOPTS_VALUE; |
|
cd2d7fcfab7a
use AVFrame.pts=AV_NOPTS_VALUE instead of AVFrame.pts=0
michael
parents:
1823
diff
changeset
|
473 } |
|
cd2d7fcfab7a
use AVFrame.pts=AV_NOPTS_VALUE instead of AVFrame.pts=0
michael
parents:
1823
diff
changeset
|
474 |
| 903 | 475 /** |
| 925 | 476 * allocates a AVPFrame and set it to defaults. |
| 903 | 477 * this can be deallocated by simply calling free() |
| 478 */ | |
| 925 | 479 AVFrame *avcodec_alloc_frame(void){ |
|
1831
cd2d7fcfab7a
use AVFrame.pts=AV_NOPTS_VALUE instead of AVFrame.pts=0
michael
parents:
1823
diff
changeset
|
480 AVFrame *pic= av_malloc(sizeof(AVFrame)); |
|
cd2d7fcfab7a
use AVFrame.pts=AV_NOPTS_VALUE instead of AVFrame.pts=0
michael
parents:
1823
diff
changeset
|
481 |
|
cd2d7fcfab7a
use AVFrame.pts=AV_NOPTS_VALUE instead of AVFrame.pts=0
michael
parents:
1823
diff
changeset
|
482 if(pic==NULL) return NULL; |
|
cd2d7fcfab7a
use AVFrame.pts=AV_NOPTS_VALUE instead of AVFrame.pts=0
michael
parents:
1823
diff
changeset
|
483 |
|
cd2d7fcfab7a
use AVFrame.pts=AV_NOPTS_VALUE instead of AVFrame.pts=0
michael
parents:
1823
diff
changeset
|
484 avcodec_get_frame_defaults(pic); |
| 903 | 485 |
| 486 return pic; | |
| 487 } | |
| 488 | |
| 0 | 489 int avcodec_open(AVCodecContext *avctx, AVCodec *codec) |
| 490 { | |
| 491 int ret; | |
| 492 | |
|
1456
670fca257a69
detect avcodec_open() on an already opened AVCodecContext
michaelni
parents:
1455
diff
changeset
|
493 if(avctx->codec) |
|
670fca257a69
detect avcodec_open() on an already opened AVCodecContext
michaelni
parents:
1455
diff
changeset
|
494 return -1; |
|
670fca257a69
detect avcodec_open() on an already opened AVCodecContext
michaelni
parents:
1455
diff
changeset
|
495 |
| 0 | 496 avctx->codec = codec; |
| 927 | 497 avctx->codec_id = codec->id; |
| 0 | 498 avctx->frame_number = 0; |
|
374
02147e22f8c8
* Don't allocate 0 bytes of memory. It upsets electricFence!
philipjsg
parents:
362
diff
changeset
|
499 if (codec->priv_data_size > 0) { |
|
02147e22f8c8
* Don't allocate 0 bytes of memory. It upsets electricFence!
philipjsg
parents:
362
diff
changeset
|
500 avctx->priv_data = av_mallocz(codec->priv_data_size); |
|
02147e22f8c8
* Don't allocate 0 bytes of memory. It upsets electricFence!
philipjsg
parents:
362
diff
changeset
|
501 if (!avctx->priv_data) |
|
02147e22f8c8
* Don't allocate 0 bytes of memory. It upsets electricFence!
philipjsg
parents:
362
diff
changeset
|
502 return -ENOMEM; |
|
02147e22f8c8
* Don't allocate 0 bytes of memory. It upsets electricFence!
philipjsg
parents:
362
diff
changeset
|
503 } else { |
|
02147e22f8c8
* Don't allocate 0 bytes of memory. It upsets electricFence!
philipjsg
parents:
362
diff
changeset
|
504 avctx->priv_data = NULL; |
|
02147e22f8c8
* Don't allocate 0 bytes of memory. It upsets electricFence!
philipjsg
parents:
362
diff
changeset
|
505 } |
| 2270 | 506 |
| 507 if(avctx->coded_width && avctx->coded_height) | |
| 508 avcodec_set_dimensions(avctx, avctx->coded_width, avctx->coded_height); | |
| 509 else if(avctx->width && avctx->height) | |
| 510 avcodec_set_dimensions(avctx, avctx->width, avctx->height); | |
| 511 | |
| 0 | 512 ret = avctx->codec->init(avctx); |
| 513 if (ret < 0) { | |
| 394 | 514 av_freep(&avctx->priv_data); |
| 0 | 515 return ret; |
| 516 } | |
| 517 return 0; | |
| 518 } | |
| 519 | |
| 1064 | 520 int avcodec_encode_audio(AVCodecContext *avctx, uint8_t *buf, int buf_size, |
| 0 | 521 const short *samples) |
| 522 { | |
| 2091 | 523 if((avctx->codec->capabilities & CODEC_CAP_DELAY) || samples){ |
| 524 int ret = avctx->codec->encode(avctx, buf, buf_size, (void *)samples); | |
| 525 avctx->frame_number++; | |
| 526 return ret; | |
| 527 }else | |
| 528 return 0; | |
| 0 | 529 } |
| 530 | |
| 1064 | 531 int avcodec_encode_video(AVCodecContext *avctx, uint8_t *buf, int buf_size, |
| 925 | 532 const AVFrame *pict) |
| 0 | 533 { |
| 2091 | 534 if((avctx->codec->capabilities & CODEC_CAP_DELAY) || pict){ |
| 535 int ret = avctx->codec->encode(avctx, buf, buf_size, (void *)pict); | |
| 536 avctx->frame_number++; | |
| 537 emms_c(); //needed to avoid a emms_c() call before every return; | |
| 814 | 538 |
| 2091 | 539 return ret; |
| 540 }else | |
| 541 return 0; | |
| 0 | 542 } |
| 543 | |
| 1249 | 544 /** |
| 545 * decode a frame. | |
| 546 * @param buf bitstream buffer, must be FF_INPUT_BUFFER_PADDING_SIZE larger then the actual read bytes | |
| 547 * because some optimized bitstream readers read 32 or 64 bit at once and could read over the end | |
| 548 * @param buf_size the size of the buffer in bytes | |
| 549 * @param got_picture_ptr zero if no frame could be decompressed, Otherwise, it is non zero | |
| 550 * @return -1 if error, otherwise return the number of | |
| 551 * bytes used. | |
| 552 */ | |
| 925 | 553 int avcodec_decode_video(AVCodecContext *avctx, AVFrame *picture, |
| 0 | 554 int *got_picture_ptr, |
| 1064 | 555 uint8_t *buf, int buf_size) |
| 0 | 556 { |
| 557 int ret; | |
| 903 | 558 |
| 2028 | 559 *got_picture_ptr= 0; |
| 0 | 560 ret = avctx->codec->decode(avctx, picture, got_picture_ptr, |
| 561 buf, buf_size); | |
| 814 | 562 |
| 563 emms_c(); //needed to avoid a emms_c() call before every return; | |
| 903 | 564 |
|
267
e10840e4f773
- Bug fix MPEG-2 decoder to handle "repeat_first_field" (Telecine)
pulento
parents:
260
diff
changeset
|
565 if (*got_picture_ptr) |
|
e10840e4f773
- Bug fix MPEG-2 decoder to handle "repeat_first_field" (Telecine)
pulento
parents:
260
diff
changeset
|
566 avctx->frame_number++; |
| 0 | 567 return ret; |
| 568 } | |
| 569 | |
| 570 /* decode an audio frame. return -1 if error, otherwise return the | |
| 571 *number of bytes used. If no frame could be decompressed, | |
| 572 *frame_size_ptr is zero. Otherwise, it is the decompressed frame | |
| 573 *size in BYTES. */ | |
| 1064 | 574 int avcodec_decode_audio(AVCodecContext *avctx, int16_t *samples, |
| 0 | 575 int *frame_size_ptr, |
| 1064 | 576 uint8_t *buf, int buf_size) |
| 0 | 577 { |
| 578 int ret; | |
| 579 | |
| 2028 | 580 *frame_size_ptr= 0; |
| 0 | 581 ret = avctx->codec->decode(avctx, samples, frame_size_ptr, |
| 582 buf, buf_size); | |
| 583 avctx->frame_number++; | |
| 584 return ret; | |
| 585 } | |
| 586 | |
| 587 int avcodec_close(AVCodecContext *avctx) | |
| 588 { | |
| 589 if (avctx->codec->close) | |
| 590 avctx->codec->close(avctx); | |
| 1994 | 591 avcodec_default_free_buffers(avctx); |
| 394 | 592 av_freep(&avctx->priv_data); |
| 0 | 593 avctx->codec = NULL; |
| 594 return 0; | |
| 595 } | |
| 596 | |
| 597 AVCodec *avcodec_find_encoder(enum CodecID id) | |
| 598 { | |
| 599 AVCodec *p; | |
| 600 p = first_avcodec; | |
| 601 while (p) { | |
| 602 if (p->encode != NULL && p->id == id) | |
| 603 return p; | |
| 604 p = p->next; | |
| 605 } | |
| 606 return NULL; | |
| 607 } | |
| 608 | |
| 177 | 609 AVCodec *avcodec_find_encoder_by_name(const char *name) |
| 610 { | |
| 611 AVCodec *p; | |
| 612 p = first_avcodec; | |
| 613 while (p) { | |
| 614 if (p->encode != NULL && strcmp(name,p->name) == 0) | |
| 615 return p; | |
| 616 p = p->next; | |
| 617 } | |
| 618 return NULL; | |
| 619 } | |
| 620 | |
| 0 | 621 AVCodec *avcodec_find_decoder(enum CodecID id) |
| 622 { | |
| 623 AVCodec *p; | |
| 624 p = first_avcodec; | |
| 625 while (p) { | |
| 626 if (p->decode != NULL && p->id == id) | |
| 627 return p; | |
| 628 p = p->next; | |
| 629 } | |
| 630 return NULL; | |
| 631 } | |
| 632 | |
| 633 AVCodec *avcodec_find_decoder_by_name(const char *name) | |
| 634 { | |
| 635 AVCodec *p; | |
| 636 p = first_avcodec; | |
| 637 while (p) { | |
| 638 if (p->decode != NULL && strcmp(name,p->name) == 0) | |
| 639 return p; | |
| 640 p = p->next; | |
| 641 } | |
| 642 return NULL; | |
| 643 } | |
| 644 | |
|
2032
0817ee1f07e5
avcodec_find is in no header file, and appearently not used or very usefull so lets make it static ...
michael
parents:
2028
diff
changeset
|
645 static AVCodec *avcodec_find(enum CodecID id) |
| 0 | 646 { |
| 647 AVCodec *p; | |
| 648 p = first_avcodec; | |
| 649 while (p) { | |
| 650 if (p->id == id) | |
| 651 return p; | |
| 652 p = p->next; | |
| 653 } | |
| 654 return NULL; | |
| 655 } | |
| 656 | |
| 657 void avcodec_string(char *buf, int buf_size, AVCodecContext *enc, int encode) | |
| 658 { | |
| 659 const char *codec_name; | |
| 660 AVCodec *p; | |
| 661 char buf1[32]; | |
| 337 | 662 char channels_str[100]; |
| 92 | 663 int bitrate; |
| 0 | 664 |
| 665 if (encode) | |
| 666 p = avcodec_find_encoder(enc->codec_id); | |
| 667 else | |
| 668 p = avcodec_find_decoder(enc->codec_id); | |
| 669 | |
| 670 if (p) { | |
| 671 codec_name = p->name; | |
|
1449
7fbe89a76b73
update sub_id in mpegaudio decoding (might need same method as MPEG2VIDEO too ?)
bellard
parents:
1396
diff
changeset
|
672 if (!encode && enc->codec_id == CODEC_ID_MP3) { |
|
7fbe89a76b73
update sub_id in mpegaudio decoding (might need same method as MPEG2VIDEO too ?)
bellard
parents:
1396
diff
changeset
|
673 if (enc->sub_id == 2) |
|
7fbe89a76b73
update sub_id in mpegaudio decoding (might need same method as MPEG2VIDEO too ?)
bellard
parents:
1396
diff
changeset
|
674 codec_name = "mp2"; |
|
7fbe89a76b73
update sub_id in mpegaudio decoding (might need same method as MPEG2VIDEO too ?)
bellard
parents:
1396
diff
changeset
|
675 else if (enc->sub_id == 1) |
|
7fbe89a76b73
update sub_id in mpegaudio decoding (might need same method as MPEG2VIDEO too ?)
bellard
parents:
1396
diff
changeset
|
676 codec_name = "mp1"; |
|
7fbe89a76b73
update sub_id in mpegaudio decoding (might need same method as MPEG2VIDEO too ?)
bellard
parents:
1396
diff
changeset
|
677 } |
|
1582
ece0ad14a35d
added fake codec CODEC_ID_MPEG2TS of type CODEC_TYPE_DATA (needed for simpler handling of raw transport streams in ffserver and RTP - better solutions are welcomed)
bellard
parents:
1549
diff
changeset
|
678 } else if (enc->codec_id == CODEC_ID_MPEG2TS) { |
|
ece0ad14a35d
added fake codec CODEC_ID_MPEG2TS of type CODEC_TYPE_DATA (needed for simpler handling of raw transport streams in ffserver and RTP - better solutions are welcomed)
bellard
parents:
1549
diff
changeset
|
679 /* fake mpeg2 transport stream codec (currently not |
|
ece0ad14a35d
added fake codec CODEC_ID_MPEG2TS of type CODEC_TYPE_DATA (needed for simpler handling of raw transport streams in ffserver and RTP - better solutions are welcomed)
bellard
parents:
1549
diff
changeset
|
680 registered) */ |
|
ece0ad14a35d
added fake codec CODEC_ID_MPEG2TS of type CODEC_TYPE_DATA (needed for simpler handling of raw transport streams in ffserver and RTP - better solutions are welcomed)
bellard
parents:
1549
diff
changeset
|
681 codec_name = "mpeg2ts"; |
| 0 | 682 } else if (enc->codec_name[0] != '\0') { |
| 683 codec_name = enc->codec_name; | |
| 684 } else { | |
| 685 /* output avi tags */ | |
| 686 if (enc->codec_type == CODEC_TYPE_VIDEO) { | |
| 687 snprintf(buf1, sizeof(buf1), "%c%c%c%c", | |
| 688 enc->codec_tag & 0xff, | |
| 689 (enc->codec_tag >> 8) & 0xff, | |
| 690 (enc->codec_tag >> 16) & 0xff, | |
| 691 (enc->codec_tag >> 24) & 0xff); | |
| 692 } else { | |
| 693 snprintf(buf1, sizeof(buf1), "0x%04x", enc->codec_tag); | |
| 694 } | |
| 695 codec_name = buf1; | |
| 696 } | |
| 697 | |
| 698 switch(enc->codec_type) { | |
| 699 case CODEC_TYPE_VIDEO: | |
| 700 snprintf(buf, buf_size, | |
| 701 "Video: %s%s", | |
| 1389 | 702 codec_name, enc->mb_decision ? " (hq)" : ""); |
| 55 | 703 if (enc->codec_id == CODEC_ID_RAWVIDEO) { |
| 704 snprintf(buf + strlen(buf), buf_size - strlen(buf), | |
| 705 ", %s", | |
|
988
001b7d3045e5
moved avcodec_get_chroma_sub_sample() to imgconvert.c
bellard
parents:
963
diff
changeset
|
706 avcodec_get_pix_fmt_name(enc->pix_fmt)); |
| 55 | 707 } |
| 0 | 708 if (enc->width) { |
| 709 snprintf(buf + strlen(buf), buf_size - strlen(buf), | |
| 710 ", %dx%d, %0.2f fps", | |
| 711 enc->width, enc->height, | |
|
1126
77ccf7fe3bd0
per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents:
1106
diff
changeset
|
712 (float)enc->frame_rate / enc->frame_rate_base); |
| 0 | 713 } |
| 741 | 714 if (encode) { |
| 715 snprintf(buf + strlen(buf), buf_size - strlen(buf), | |
| 716 ", q=%d-%d", enc->qmin, enc->qmax); | |
| 717 } | |
| 92 | 718 bitrate = enc->bit_rate; |
| 0 | 719 break; |
| 720 case CODEC_TYPE_AUDIO: | |
| 721 snprintf(buf, buf_size, | |
| 722 "Audio: %s", | |
| 723 codec_name); | |
|
318
21697f35a9ca
- Fixed AC3 decoding for 5:1 AC3 streams. Now when calling av_audio_decode for
pulento
parents:
315
diff
changeset
|
724 switch (enc->channels) { |
|
21697f35a9ca
- Fixed AC3 decoding for 5:1 AC3 streams. Now when calling av_audio_decode for
pulento
parents:
315
diff
changeset
|
725 case 1: |
| 337 | 726 strcpy(channels_str, "mono"); |
|
318
21697f35a9ca
- Fixed AC3 decoding for 5:1 AC3 streams. Now when calling av_audio_decode for
pulento
parents:
315
diff
changeset
|
727 break; |
|
21697f35a9ca
- Fixed AC3 decoding for 5:1 AC3 streams. Now when calling av_audio_decode for
pulento
parents:
315
diff
changeset
|
728 case 2: |
| 337 | 729 strcpy(channels_str, "stereo"); |
|
318
21697f35a9ca
- Fixed AC3 decoding for 5:1 AC3 streams. Now when calling av_audio_decode for
pulento
parents:
315
diff
changeset
|
730 break; |
|
21697f35a9ca
- Fixed AC3 decoding for 5:1 AC3 streams. Now when calling av_audio_decode for
pulento
parents:
315
diff
changeset
|
731 case 6: |
| 337 | 732 strcpy(channels_str, "5:1"); |
|
318
21697f35a9ca
- Fixed AC3 decoding for 5:1 AC3 streams. Now when calling av_audio_decode for
pulento
parents:
315
diff
changeset
|
733 break; |
|
21697f35a9ca
- Fixed AC3 decoding for 5:1 AC3 streams. Now when calling av_audio_decode for
pulento
parents:
315
diff
changeset
|
734 default: |
|
21697f35a9ca
- Fixed AC3 decoding for 5:1 AC3 streams. Now when calling av_audio_decode for
pulento
parents:
315
diff
changeset
|
735 sprintf(channels_str, "%d channels", enc->channels); |
|
21697f35a9ca
- Fixed AC3 decoding for 5:1 AC3 streams. Now when calling av_audio_decode for
pulento
parents:
315
diff
changeset
|
736 break; |
|
21697f35a9ca
- Fixed AC3 decoding for 5:1 AC3 streams. Now when calling av_audio_decode for
pulento
parents:
315
diff
changeset
|
737 } |
| 0 | 738 if (enc->sample_rate) { |
| 739 snprintf(buf + strlen(buf), buf_size - strlen(buf), | |
| 740 ", %d Hz, %s", | |
| 741 enc->sample_rate, | |
|
318
21697f35a9ca
- Fixed AC3 decoding for 5:1 AC3 streams. Now when calling av_audio_decode for
pulento
parents:
315
diff
changeset
|
742 channels_str); |
| 0 | 743 } |
|
318
21697f35a9ca
- Fixed AC3 decoding for 5:1 AC3 streams. Now when calling av_audio_decode for
pulento
parents:
315
diff
changeset
|
744 |
| 92 | 745 /* for PCM codecs, compute bitrate directly */ |
| 746 switch(enc->codec_id) { | |
| 747 case CODEC_ID_PCM_S16LE: | |
| 748 case CODEC_ID_PCM_S16BE: | |
| 749 case CODEC_ID_PCM_U16LE: | |
| 750 case CODEC_ID_PCM_U16BE: | |
| 94 | 751 bitrate = enc->sample_rate * enc->channels * 16; |
| 92 | 752 break; |
| 753 case CODEC_ID_PCM_S8: | |
| 754 case CODEC_ID_PCM_U8: | |
| 755 case CODEC_ID_PCM_ALAW: | |
| 756 case CODEC_ID_PCM_MULAW: | |
| 94 | 757 bitrate = enc->sample_rate * enc->channels * 8; |
| 92 | 758 break; |
| 759 default: | |
| 760 bitrate = enc->bit_rate; | |
| 761 break; | |
| 762 } | |
| 0 | 763 break; |
|
1582
ece0ad14a35d
added fake codec CODEC_ID_MPEG2TS of type CODEC_TYPE_DATA (needed for simpler handling of raw transport streams in ffserver and RTP - better solutions are welcomed)
bellard
parents:
1549
diff
changeset
|
764 case CODEC_TYPE_DATA: |
|
ece0ad14a35d
added fake codec CODEC_ID_MPEG2TS of type CODEC_TYPE_DATA (needed for simpler handling of raw transport streams in ffserver and RTP - better solutions are welcomed)
bellard
parents:
1549
diff
changeset
|
765 snprintf(buf, buf_size, "Data: %s", codec_name); |
|
ece0ad14a35d
added fake codec CODEC_ID_MPEG2TS of type CODEC_TYPE_DATA (needed for simpler handling of raw transport streams in ffserver and RTP - better solutions are welcomed)
bellard
parents:
1549
diff
changeset
|
766 bitrate = enc->bit_rate; |
|
ece0ad14a35d
added fake codec CODEC_ID_MPEG2TS of type CODEC_TYPE_DATA (needed for simpler handling of raw transport streams in ffserver and RTP - better solutions are welcomed)
bellard
parents:
1549
diff
changeset
|
767 break; |
| 0 | 768 default: |
| 2281 | 769 snprintf(buf, buf_size, "Invalid Codec type %d", enc->codec_type); |
| 770 return; | |
| 0 | 771 } |
| 741 | 772 if (encode) { |
| 773 if (enc->flags & CODEC_FLAG_PASS1) | |
| 774 snprintf(buf + strlen(buf), buf_size - strlen(buf), | |
| 775 ", pass 1"); | |
| 776 if (enc->flags & CODEC_FLAG_PASS2) | |
| 777 snprintf(buf + strlen(buf), buf_size - strlen(buf), | |
| 778 ", pass 2"); | |
| 779 } | |
| 92 | 780 if (bitrate != 0) { |
| 0 | 781 snprintf(buf + strlen(buf), buf_size - strlen(buf), |
| 92 | 782 ", %d kb/s", bitrate / 1000); |
| 0 | 783 } |
| 784 } | |
| 785 | |
| 362 | 786 unsigned avcodec_version( void ) |
| 787 { | |
| 788 return LIBAVCODEC_VERSION_INT; | |
| 789 } | |
| 55 | 790 |
| 379 | 791 unsigned avcodec_build( void ) |
| 792 { | |
| 793 return LIBAVCODEC_BUILD; | |
| 794 } | |
| 795 | |
| 0 | 796 /* must be called before any other functions */ |
| 797 void avcodec_init(void) | |
| 798 { | |
|
303
9a931fd8d06c
multiple init bugfix (patch by Alex Beregszaszi <alex@naxine.org>)
michaelni
parents:
267
diff
changeset
|
799 static int inited = 0; |
|
9a931fd8d06c
multiple init bugfix (patch by Alex Beregszaszi <alex@naxine.org>)
michaelni
parents:
267
diff
changeset
|
800 |
|
9a931fd8d06c
multiple init bugfix (patch by Alex Beregszaszi <alex@naxine.org>)
michaelni
parents:
267
diff
changeset
|
801 if (inited != 0) |
|
9a931fd8d06c
multiple init bugfix (patch by Alex Beregszaszi <alex@naxine.org>)
michaelni
parents:
267
diff
changeset
|
802 return; |
|
9a931fd8d06c
multiple init bugfix (patch by Alex Beregszaszi <alex@naxine.org>)
michaelni
parents:
267
diff
changeset
|
803 inited = 1; |
|
9a931fd8d06c
multiple init bugfix (patch by Alex Beregszaszi <alex@naxine.org>)
michaelni
parents:
267
diff
changeset
|
804 |
| 1201 | 805 dsputil_static_init(); |
| 0 | 806 } |
| 807 | |
| 1368 | 808 /** |
| 809 * Flush buffers, should be called when seeking or when swicthing to a different stream. | |
| 810 */ | |
| 341 | 811 void avcodec_flush_buffers(AVCodecContext *avctx) |
| 812 { | |
| 1368 | 813 if(avctx->codec->flush) |
| 814 avctx->codec->flush(avctx); | |
| 341 | 815 } |
| 816 | |
| 2231 | 817 void avcodec_default_free_buffers(AVCodecContext *s){ |
| 1214 | 818 int i, j; |
| 819 | |
| 820 if(s->internal_buffer==NULL) return; | |
| 821 | |
| 822 for(i=0; i<INTERNAL_BUFFER_SIZE; i++){ | |
| 823 InternalBuffer *buf= &((InternalBuffer*)s->internal_buffer)[i]; | |
| 824 for(j=0; j<4; j++){ | |
| 825 av_freep(&buf->base[j]); | |
| 826 buf->data[j]= NULL; | |
| 827 } | |
| 828 } | |
| 829 av_freep(&s->internal_buffer); | |
| 830 | |
| 831 s->internal_buffer_count=0; | |
| 832 } | |
| 833 | |
| 1264 | 834 char av_get_pict_type_char(int pict_type){ |
| 835 switch(pict_type){ | |
| 836 case I_TYPE: return 'I'; | |
| 837 case P_TYPE: return 'P'; | |
| 838 case B_TYPE: return 'B'; | |
| 839 case S_TYPE: return 'S'; | |
| 840 case SI_TYPE:return 'i'; | |
| 841 case SP_TYPE:return 'p'; | |
| 842 default: return '?'; | |
| 843 } | |
| 844 } | |
| 845 | |
|
1126
77ccf7fe3bd0
per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents:
1106
diff
changeset
|
846 int av_reduce(int *dst_nom, int *dst_den, int64_t nom, int64_t den, int64_t max){ |
| 2125 | 847 AVRational a0={0,1}, a1={1,0}; |
| 848 int sign= (nom<0) ^ (den<0); | |
| 849 int64_t gcd= ff_gcd(ABS(nom), ABS(den)); | |
|
1126
77ccf7fe3bd0
per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents:
1106
diff
changeset
|
850 |
| 2125 | 851 nom = ABS(nom)/gcd; |
| 852 den = ABS(den)/gcd; | |
| 853 if(nom<=max && den<=max){ | |
| 854 a1= (AVRational){nom, den}; | |
| 855 den=0; | |
|
1126
77ccf7fe3bd0
per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents:
1106
diff
changeset
|
856 } |
|
77ccf7fe3bd0
per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents:
1106
diff
changeset
|
857 |
| 2125 | 858 while(den){ |
| 859 int64_t x = nom / den; | |
| 860 int64_t next_den= nom - den*x; | |
| 861 int64_t a2n= x*a1.num + a0.num; | |
| 862 int64_t a2d= x*a1.den + a0.den; | |
| 863 | |
| 864 if(a2n > max || a2d > max) break; | |
| 865 | |
| 866 a0= a1; | |
| 867 a1= (AVRational){a2n, a2d}; | |
| 868 nom= den; | |
| 869 den= next_den; | |
| 870 } | |
| 871 assert(ff_gcd(a1.num, a1.den) == 1); | |
|
1549
5e643dd7e889
use continued fractions to approximate a fraction if its numerator or denominator is too large
michael
parents:
1548
diff
changeset
|
872 |
| 2125 | 873 *dst_nom = sign ? -a1.num : a1.num; |
| 874 *dst_den = a1.den; | |
|
1126
77ccf7fe3bd0
per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents:
1106
diff
changeset
|
875 |
| 2125 | 876 return den==0; |
|
1126
77ccf7fe3bd0
per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents:
1106
diff
changeset
|
877 } |
|
77ccf7fe3bd0
per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents:
1106
diff
changeset
|
878 |
| 2242 | 879 int64_t av_rescale_rnd(int64_t a, int64_t b, int64_t c, enum AVRounding rnd){ |
| 880 AVInteger ai; | |
| 881 int64_t r=0; | |
|
1126
77ccf7fe3bd0
per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents:
1106
diff
changeset
|
882 assert(c > 0); |
|
77ccf7fe3bd0
per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents:
1106
diff
changeset
|
883 assert(b >=0); |
| 2242 | 884 assert(rnd >=0 && rnd<=5 && rnd!=4); |
|
1126
77ccf7fe3bd0
per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents:
1106
diff
changeset
|
885 |
| 2301 | 886 if(a<0 && a != INT64_MIN) return -av_rescale_rnd(-a, b, c, rnd ^ ((rnd>>1)&1)); |
|
1126
77ccf7fe3bd0
per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents:
1106
diff
changeset
|
887 |
| 2242 | 888 if(rnd==AV_ROUND_NEAR_INF) r= c/2; |
| 889 else if(rnd&1) r= c-1; | |
| 890 | |
|
2002
b737b5e96ee0
use AVInteger in av_rescale() so it can finally do 64*64/64 instead of just 64*32/32
michael
parents:
1996
diff
changeset
|
891 if(b<=INT_MAX && c<=INT_MAX){ |
|
b737b5e96ee0
use AVInteger in av_rescale() so it can finally do 64*64/64 instead of just 64*32/32
michael
parents:
1996
diff
changeset
|
892 if(a<=INT_MAX) |
| 2242 | 893 return (a * b + r)/c; |
|
2002
b737b5e96ee0
use AVInteger in av_rescale() so it can finally do 64*64/64 instead of just 64*32/32
michael
parents:
1996
diff
changeset
|
894 else |
| 2242 | 895 return a/c*b + (a%c*b + r)/c; |
|
2002
b737b5e96ee0
use AVInteger in av_rescale() so it can finally do 64*64/64 instead of just 64*32/32
michael
parents:
1996
diff
changeset
|
896 } |
|
1126
77ccf7fe3bd0
per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents:
1106
diff
changeset
|
897 |
|
2002
b737b5e96ee0
use AVInteger in av_rescale() so it can finally do 64*64/64 instead of just 64*32/32
michael
parents:
1996
diff
changeset
|
898 ai= av_mul_i(av_int2i(a), av_int2i(b)); |
| 2242 | 899 ai= av_add_i(ai, av_int2i(r)); |
|
2002
b737b5e96ee0
use AVInteger in av_rescale() so it can finally do 64*64/64 instead of just 64*32/32
michael
parents:
1996
diff
changeset
|
900 |
| 2242 | 901 return av_i2int(av_div_i(ai, av_int2i(c))); |
| 902 } | |
| 903 | |
| 904 int64_t av_rescale(int64_t a, int64_t b, int64_t c){ | |
| 905 return av_rescale_rnd(a, b, c, AV_ROUND_NEAR_INF); | |
|
1126
77ccf7fe3bd0
per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents:
1106
diff
changeset
|
906 } |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1588
diff
changeset
|
907 |
|
2398
582e635cfa08
common.c -> bitstream.c (and the single non bitstream func -> utils.c)
michael
parents:
2370
diff
changeset
|
908 int64_t ff_gcd(int64_t a, int64_t b){ |
|
582e635cfa08
common.c -> bitstream.c (and the single non bitstream func -> utils.c)
michael
parents:
2370
diff
changeset
|
909 if(b) return ff_gcd(b, a%b); |
|
582e635cfa08
common.c -> bitstream.c (and the single non bitstream func -> utils.c)
michael
parents:
2370
diff
changeset
|
910 else return a; |
|
582e635cfa08
common.c -> bitstream.c (and the single non bitstream func -> utils.c)
michael
parents:
2370
diff
changeset
|
911 } |
|
582e635cfa08
common.c -> bitstream.c (and the single non bitstream func -> utils.c)
michael
parents:
2370
diff
changeset
|
912 |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1588
diff
changeset
|
913 /* av_log API */ |
|
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1588
diff
changeset
|
914 |
|
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1588
diff
changeset
|
915 static int av_log_level = AV_LOG_DEBUG; |
|
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1588
diff
changeset
|
916 |
|
1855
bafde44145f9
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1854
diff
changeset
|
917 static void av_log_default_callback(void* ptr, int level, const char* fmt, va_list vl) |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1588
diff
changeset
|
918 { |
| 1600 | 919 static int print_prefix=1; |
| 1856 | 920 AVClass* avc= ptr ? *(AVClass**)ptr : NULL; |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1588
diff
changeset
|
921 if(level>av_log_level) |
|
1855
bafde44145f9
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1854
diff
changeset
|
922 return; |
|
1823
a660ef952580
(f)printf() is disallowed in libavcodec, compilation will fail now if its used, except that codecs which where added after the printf->av_log change which did ignore av_log() and used prinf are now silent and wont print anything, they should be changed to use av_log, i could do that, but its better if the orginal developer decides which AV_LOG level each message should get
michael
parents:
1799
diff
changeset
|
923 #undef fprintf |
| 1856 | 924 if(print_prefix && avc) { |
| 925 fprintf(stderr, "[%s @ %p]", avc->item_name(ptr), avc); | |
|
1855
bafde44145f9
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1854
diff
changeset
|
926 } |
|
1823
a660ef952580
(f)printf() is disallowed in libavcodec, compilation will fail now if its used, except that codecs which where added after the printf->av_log change which did ignore av_log() and used prinf are now silent and wont print anything, they should be changed to use av_log, i could do that, but its better if the orginal developer decides which AV_LOG level each message should get
michael
parents:
1799
diff
changeset
|
927 #define fprintf please_use_av_log |
| 1600 | 928 |
| 1776 | 929 print_prefix= strstr(fmt, "\n") != NULL; |
| 1600 | 930 |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1588
diff
changeset
|
931 vfprintf(stderr, fmt, vl); |
|
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1588
diff
changeset
|
932 } |
|
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1588
diff
changeset
|
933 |
|
1855
bafde44145f9
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1854
diff
changeset
|
934 static void (*av_log_callback)(void*, int, const char*, va_list) = av_log_default_callback; |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1588
diff
changeset
|
935 |
|
1855
bafde44145f9
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1854
diff
changeset
|
936 void av_log(void* avcl, int level, const char *fmt, ...) |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1588
diff
changeset
|
937 { |
|
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1588
diff
changeset
|
938 va_list vl; |
|
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1588
diff
changeset
|
939 va_start(vl, fmt); |
|
1855
bafde44145f9
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1854
diff
changeset
|
940 av_vlog(avcl, level, fmt, vl); |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1588
diff
changeset
|
941 va_end(vl); |
|
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1588
diff
changeset
|
942 } |
|
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1588
diff
changeset
|
943 |
|
1855
bafde44145f9
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1854
diff
changeset
|
944 void av_vlog(void* avcl, int level, const char *fmt, va_list vl) |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1588
diff
changeset
|
945 { |
|
1855
bafde44145f9
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1854
diff
changeset
|
946 av_log_callback(avcl, level, fmt, vl); |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1588
diff
changeset
|
947 } |
|
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1588
diff
changeset
|
948 |
|
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1588
diff
changeset
|
949 int av_log_get_level(void) |
|
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1588
diff
changeset
|
950 { |
|
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1588
diff
changeset
|
951 return av_log_level; |
|
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1588
diff
changeset
|
952 } |
|
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1588
diff
changeset
|
953 |
|
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1588
diff
changeset
|
954 void av_log_set_level(int level) |
|
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1588
diff
changeset
|
955 { |
|
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1588
diff
changeset
|
956 av_log_level = level; |
|
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1588
diff
changeset
|
957 } |
|
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1588
diff
changeset
|
958 |
|
1855
bafde44145f9
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1854
diff
changeset
|
959 void av_log_set_callback(void (*callback)(void*, int, const char*, va_list)) |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1588
diff
changeset
|
960 { |
|
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1588
diff
changeset
|
961 av_log_callback = callback; |
|
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1588
diff
changeset
|
962 } |
|
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1588
diff
changeset
|
963 |
|
2362
7a6ff8cc7c95
BeOS threading support. changed some "if FOO_THREAD||BAR_THREAD" to a more generic "if HAVE_THREADS"
mmu_man
parents:
2324
diff
changeset
|
964 #if !defined(HAVE_THREADS) |
|
2013
85e547a18d87
dummy avcodec_thread_init() to avoid linking issues
michael
parents:
2002
diff
changeset
|
965 int avcodec_thread_init(AVCodecContext *s, int thread_count){ |
|
85e547a18d87
dummy avcodec_thread_init() to avoid linking issues
michael
parents:
2002
diff
changeset
|
966 return -1; |
|
85e547a18d87
dummy avcodec_thread_init() to avoid linking issues
michael
parents:
2002
diff
changeset
|
967 } |
|
85e547a18d87
dummy avcodec_thread_init() to avoid linking issues
michael
parents:
2002
diff
changeset
|
968 #endif |
