History

Merge remote-tracking branch 'qatar/master'

* qatar/master: build: fix standalone compilation of OMA muxer build: fix standalone compilation of Microsoft XMV demuxer build: fix standalone compilation of Core Audio Format demuxer kvmc: fix invalid reads 4xm: Add a check in decode_i_frame to prevent buffer overreads adpcm: fix IMA SMJPEG decoding options: set minimum for "threads" to zero bsd: use number of logical CPUs as automatic thread count windows: use number of CPUs as automatic thread count linux: use number of CPUs as automatic thread count pthreads: reset active_thread_type when slice thread_init returrns early v410dec: include correct headers Drop ALT_ prefix from BITSTREAM_READER_LE name. lavfi: always build vsrc_buffer. ra144enc: zero the reflection coeffs if the filter is unstable sws: readd PAL8 to isPacked() mov: Don't stick the QuickTime field ordering atom in extradata. truespeech: fix invalid reads in truespeech_apply_twopoint_filter() Conflicts: configure libavcodec/4xm.c libavcodec/avcodec.h libavfilter/Makefile libavfilter/allfilters.c libavformat/Makefile libswscale/swscale_internal.h

Michael Niedermayer committed 14 years ago

Commit d1c28e32 parents 9f50daf 4e8d62148 files · +291 −84Browse files

Unified · Split

48 files
  1. avconv.c +1 −0
  2. configure +7 −2
  3. ffmpeg.c +1 −0
  4. libavcodec/4xm.c +7 −4
  5. libavcodec/adpcm.c +9 −5
  6. libavcodec/apedec.c +1 −1
  7. libavcodec/avcodec.h +15 −0
  8. libavcodec/bink.c +1 −1
  9. libavcodec/binkaudio.c +1 −1
  10. libavcodec/eatgq.c +1 −1
  11. libavcodec/eatgv.c +1 −1
  12. libavcodec/escape124.c +1 −1
  13. libavcodec/escape130.c +1 −1
  14. libavcodec/g723_1.c +1 −1
  15. libavcodec/get_bits.h +4 −4
  16. libavcodec/indeo2.c +3 −3
  17. libavcodec/indeo2data.h +1 −1
  18. libavcodec/indeo5.c +1 −1
  19. libavcodec/interplayvideo.c +1 −1
  20. libavcodec/ivi_common.c +1 −1
  21. libavcodec/kmvc.c +66 −16
  22. libavcodec/mjpegdec.c +3 −6
  23. libavcodec/msgsmdec.c +1 −1
  24. libavcodec/nellymoser.c +1 −1
  25. libavcodec/nellymoserdec.c +1 −1
  26. libavcodec/options.c +2 −1
  27. libavcodec/pthread.c +62 −1
  28. libavcodec/qdm2.c +1 −1
  29. libavcodec/ra144enc.c +4 −1
  30. libavcodec/ra288.c +1 −1
  31. libavcodec/sipr.c +1 −1
  32. libavcodec/smacker.c +1 −1
  33. libavcodec/tiertexseqv.c +1 −1
  34. libavcodec/truespeech.c +1 −0
  35. libavcodec/tta.c +1 −1
  36. libavcodec/v410dec.c +1 −1
  37. libavcodec/vble.c +1 −1
  38. libavcodec/vorbis.c +1 −1
  39. libavcodec/vorbisdec.c +1 −1
  40. libavcodec/wavpack.c +1 −1
  41. libavcodec/xan.c +1 −1
  42. libavcodec/xxan.c +1 −1
  43. libavfilter/Makefile +1 −1
  44. libavfilter/allfilters.c +6 −1
  45. libavformat/Makefile +4 −3
  46. libavformat/mov.c +43 −5
  47. libavformat/movenc.c +20 −1
  48. libswscale/swscale_internal.h +4 −2
avconv.c+1−0
@@ -2139,6 +2139,7 @@ static int transcode_init(OutputFile *output_files, · 2138 unmodified lines
2139 codec->bit_rate = icodec->bit_rate;2139 codec->bit_rate = icodec->bit_rate;
2140 codec->rc_max_rate = icodec->rc_max_rate;2140 codec->rc_max_rate = icodec->rc_max_rate;
2141 codec->rc_buffer_size = icodec->rc_buffer_size;2141 codec->rc_buffer_size = icodec->rc_buffer_size;
2142 codec->field_order = icodec->field_order;
2142 codec->extradata = av_mallocz(extra_size);2143 codec->extradata = av_mallocz(extra_size);
2143 if (!codec->extradata) {2144 if (!codec->extradata) {
2144 return AVERROR(ENOMEM);2145 return AVERROR(ENOMEM);
configure+7−2
@@ -1174,6 +1174,7 @@ HAVE_LIST=" · 1173 unmodified lines
1174 gethrtime1174 gethrtime
1175 GetProcessMemoryInfo1175 GetProcessMemoryInfo
1176 GetProcessTimes1176 GetProcessTimes
1177 GetSystemInfo
1177 getrusage1178 getrusage
1178 gnu_as1179 gnu_as
1179 ibm_asm1180 ibm_asm
@@ -1206,6 +1207,7 @@ HAVE_LIST=" · 26 unmodified lines
1206 posix_memalign1207 posix_memalign
1207 round1208 round
1208 roundf1209 roundf
1210 sched_getaffinity
1209 sdl1211 sdl
1210 sdl_video_size1212 sdl_video_size
1211 setmode1213 setmode
@@ -1224,6 +1226,7 @@ HAVE_LIST=" · 12 unmodified lines
1224 symver1226 symver
1225 symver_asm_label1227 symver_asm_label
1226 symver_gnu_asm1228 symver_gnu_asm
1229 sysctl
1227 sys_mman_h1230 sys_mman_h
1228 sys_resource_h1231 sys_resource_h
1229 sys_select_h1232 sys_select_h
@@ -1654,14 +1657,13 @@ postproc_deps="gpl" · 424 unmodified lines
1654 1657
1655# programs1658# programs
1656avconv_deps="avcodec avformat swscale"1659avconv_deps="avcodec avformat swscale"
1657avconv_select="buffer_filter"
1658ffplay_deps="avcodec avformat swscale sdl"1660ffplay_deps="avcodec avformat swscale sdl"
1659ffplay_select="buffersink_filter rdft"1661ffplay_select="buffersink_filter rdft"
1660ffprobe_deps="avcodec avformat"1662ffprobe_deps="avcodec avformat"
1661ffserver_deps="avformat ffm_muxer fork rtp_protocol rtsp_demuxer"1663ffserver_deps="avformat ffm_muxer fork rtp_protocol rtsp_demuxer"
1662ffserver_extralibs='$ldl'1664ffserver_extralibs='$ldl'
1663ffmpeg_deps="avcodec avformat swscale swresample"1665ffmpeg_deps="avcodec avformat swscale swresample"
1664ffmpeg_select="buffer_filter buffersink_filter"1666ffmpeg_select="buffersink_filter"
1665 1667
1666doc_deps="texi2html"1668doc_deps="texi2html"
1667 1669
@@ -3000,12 +3002,15 @@ check_func ${malloc_prefix}posix_memalign && enable posix_memalign · 1332 unmodified lines
3000check_func setrlimit3002check_func setrlimit
3001check_func strerror_r3003check_func strerror_r
3002check_func strptime3004check_func strptime
3005check_func sched_getaffinity
3006check_func sysctl
3003check_func_headers conio.h kbhit3007check_func_headers conio.h kbhit
3004check_func_headers windows.h PeekNamedPipe3008check_func_headers windows.h PeekNamedPipe
3005check_func_headers io.h setmode3009check_func_headers io.h setmode
3006check_func_headers lzo/lzo1x.h lzo1x_999_compress3010check_func_headers lzo/lzo1x.h lzo1x_999_compress
3007check_lib2 "windows.h psapi.h" GetProcessMemoryInfo -lpsapi3011check_lib2 "windows.h psapi.h" GetProcessMemoryInfo -lpsapi
3008check_func_headers windows.h GetProcessTimes3012check_func_headers windows.h GetProcessTimes
3013check_func_headers windows.h GetSystemInfo
3009check_func_headers windows.h MapViewOfFile3014check_func_headers windows.h MapViewOfFile
3010check_func_headers windows.h VirtualAlloc3015check_func_headers windows.h VirtualAlloc
3011 3016
ffmpeg.c+1−0
@@ -2213,6 +2213,7 @@ static int transcode_init(OutputFile *output_files, int nb_output_files, · 2212 unmodified lines
2213 codec->bit_rate = icodec->bit_rate;2213 codec->bit_rate = icodec->bit_rate;
2214 codec->rc_max_rate = icodec->rc_max_rate;2214 codec->rc_max_rate = icodec->rc_max_rate;
2215 codec->rc_buffer_size = icodec->rc_buffer_size;2215 codec->rc_buffer_size = icodec->rc_buffer_size;
2216 codec->field_order = icodec->field_order;
2216 codec->extradata = av_mallocz(extra_size);2217 codec->extradata = av_mallocz(extra_size);
2217 if (!codec->extradata) {2218 if (!codec->extradata) {
2218 return AVERROR(ENOMEM);2219 return AVERROR(ENOMEM);
libavcodec/4xm.c+7−4
@@ -688,10 +688,13 @@ static int decode_i_frame(FourXContext *f, const uint8_t *buf, int length){ · 687 unmodified lines
688 unsigned int prestream_size;688 unsigned int prestream_size;
689 const uint8_t *prestream;689 const uint8_t *prestream;
690 690
691 if (bitstream_size > (1<<26) || length < bitstream_size + 12)691 if (bitstream_size > (1<<26) || length < bitstream_size + 12) {
692 return -1;692 av_log(f->avctx, AV_LOG_ERROR, "packet size too small\n");
693 prestream_size = 4*AV_RL32(buf + bitstream_size + 4);693 return AVERROR_INVALIDDATA;
694 prestream = buf + bitstream_size + 12;694 }
695
696 prestream_size = 4 * AV_RL32(buf + bitstream_size + 4);
697 prestream = buf + bitstream_size + 12;
695 698
696 if (prestream_size > (1<<26) ||699 if (prestream_size > (1<<26) ||
697 prestream_size != length - (bitstream_size + 12)){700 prestream_size != length - (bitstream_size + 12)){
libavcodec/adpcm.c+9−5
@@ -1007,11 +1007,15 @@ static int adpcm_decode_frame(AVCodecContext *avctx, void *data, · 1006 unmodified lines
1007 break;1007 break;
1008 case CODEC_ID_ADPCM_IMA_AMV:1008 case CODEC_ID_ADPCM_IMA_AMV:
1009 case CODEC_ID_ADPCM_IMA_SMJPEG:1009 case CODEC_ID_ADPCM_IMA_SMJPEG:
1010 c->status[0].predictor = (int16_t)bytestream_get_le16(&src);1010 if (avctx->codec->id == CODEC_ID_ADPCM_IMA_AMV) {
1011 c->status[0].step_index = bytestream_get_le16(&src);1011 c->status[0].predictor = sign_extend(bytestream_get_le16(&src), 16);
1012 1012 c->status[0].step_index = bytestream_get_le16(&src);
1013 if (avctx->codec->id == CODEC_ID_ADPCM_IMA_AMV)1013 src += 4;
1014 src+=4;1014 } else {
1015 c->status[0].predictor = sign_extend(bytestream_get_be16(&src), 16);
1016 c->status[0].step_index = bytestream_get_byte(&src);
1017 src += 1;
1018 }
1015 1019
1016 for (n = nb_samples >> (1 - st); n > 0; n--, src++) {1020 for (n = nb_samples >> (1 - st); n > 0; n--, src++) {
1017 char hi, lo;1021 char hi, lo;
libavcodec/apedec.c+1−1
@@ -20,7 +20,7 @@ · 19 unmodified lines
20 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA20 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21 */21 */
22 22
23#define ALT_BITSTREAM_READER_LE23#define BITSTREAM_READER_LE
24#include "avcodec.h"24#include "avcodec.h"
25#include "dsputil.h"25#include "dsputil.h"
26#include "get_bits.h"26#include "get_bits.h"
libavcodec/avcodec.h+15−0
@@ -1335,6 +1335,15 @@ typedef struct AVFrame { · 1334 unmodified lines
1335 1335
1336struct AVCodecInternal;1336struct AVCodecInternal;
1337 1337
1338enum AVFieldOrder {
1339 AV_FIELD_UNKNOWN,
1340 AV_FIELD_PROGRESSIVE,
1341 AV_FIELD_TT, //< Top coded_first, top displayed first
1342 AV_FIELD_BB, //< Bottom coded first, bottom displayed first
1343 AV_FIELD_TB, //< Top coded first, bottom displayed first
1344 AV_FIELD_BT, //< Bottom coded first, top displayed first
1345};
1346
1338/**1347/**
1339 * main external API structure.1348 * main external API structure.
1340 * New fields can be added to the end with minor version bumps.1349 * New fields can be added to the end with minor version bumps.
@@ -3191,6 +3200,12 @@ typedef struct AVCodecContext { · 1850 unmodified lines
3191 */3200 */
3192 struct AVCodecInternal *internal;3201 struct AVCodecInternal *internal;
3193 3202
3203 /** Field order
3204 * - encoding: set by libavcodec
3205 * - decoding: Set by libavcodec
3206 */
3207 enum AVFieldOrder field_order;
3208
3194 /**3209 /**
3195 * Current statistics for PTS correction.3210 * Current statistics for PTS correction.
3196 * - decoding: maintained and used by libavcodec, not intended to be used by user apps3211 * - decoding: maintained and used by libavcodec, not intended to be used by user apps
libavcodec/bink.c+1−1
@@ -27,7 +27,7 @@ · 26 unmodified lines
27#include "binkdsp.h"27#include "binkdsp.h"
28#include "mathops.h"28#include "mathops.h"
29 29
30#define ALT_BITSTREAM_READER_LE30#define BITSTREAM_READER_LE
31#include "get_bits.h"31#include "get_bits.h"
32 32
33#define BINK_FLAG_ALPHA 0x0010000033#define BINK_FLAG_ALPHA 0x00100000
libavcodec/binkaudio.c+1−1
@@ -29,7 +29,7 @@ · 28 unmodified lines
29 */29 */
30 30
31#include "avcodec.h"31#include "avcodec.h"
32#define ALT_BITSTREAM_READER_LE32#define BITSTREAM_READER_LE
33#include "get_bits.h"33#include "get_bits.h"
34#include "dsputil.h"34#include "dsputil.h"
35#include "dct.h"35#include "dct.h"
libavcodec/eatgq.c+1−1
@@ -29,7 +29,7 @@ · 28 unmodified lines
29 */29 */
30 30
31#include "avcodec.h"31#include "avcodec.h"
32#define ALT_BITSTREAM_READER_LE32#define BITSTREAM_READER_LE
33#include "get_bits.h"33#include "get_bits.h"
34#include "bytestream.h"34#include "bytestream.h"
35#include "dsputil.h"35#include "dsputil.h"
libavcodec/eatgv.c+1−1
@@ -29,7 +29,7 @@ · 28 unmodified lines
29 */29 */
30 30
31#include "avcodec.h"31#include "avcodec.h"
32#define ALT_BITSTREAM_READER_LE32#define BITSTREAM_READER_LE
33#include "get_bits.h"33#include "get_bits.h"
34#include "libavutil/lzo.h"34#include "libavutil/lzo.h"
35#include "libavutil/imgutils.h"35#include "libavutil/imgutils.h"
libavcodec/escape124.c+1−1
@@ -21,7 +21,7 @@ · 20 unmodified lines
21 21
22#include "avcodec.h"22#include "avcodec.h"
23 23
24#define ALT_BITSTREAM_READER_LE24#define BITSTREAM_READER_LE
25#include "get_bits.h"25#include "get_bits.h"
26 26
27typedef union MacroBlock {27typedef union MacroBlock {
libavcodec/escape130.c+1−1
@@ -21,7 +21,7 @@ · 20 unmodified lines
21 21
22#include "avcodec.h"22#include "avcodec.h"
23 23
24#define ALT_BITSTREAM_READER_LE24#define BITSTREAM_READER_LE
25#include "get_bits.h"25#include "get_bits.h"
26 26
27typedef struct Escape130Context {27typedef struct Escape130Context {
libavcodec/g723_1.c+1−1
@@ -26,7 +26,7 @@ · 25 unmodified lines
26 */26 */
27 27
28#include "avcodec.h"28#include "avcodec.h"
29#define ALT_BITSTREAM_READER_LE29#define BITSTREAM_READER_LE
30#include "get_bits.h"30#include "get_bits.h"
31#include "acelp_vectors.h"31#include "acelp_vectors.h"
32#include "celp_filters.h"32#include "celp_filters.h"
libavcodec/get_bits.h+4−4
@@ -124,7 +124,7 @@ for examples see get_bits, show_bits, skip_bits, get_vlc · 123 unmodified lines
124 124
125#define CLOSE_READER(name, gb) (gb)->index = name##_index125#define CLOSE_READER(name, gb) (gb)->index = name##_index
126 126
127#ifdef ALT_BITSTREAM_READER_LE127#ifdef BITSTREAM_READER_LE
128 128
129# ifdef LONG_BITSTREAM_READER129# ifdef LONG_BITSTREAM_READER
130# define UPDATE_CACHE(name, gb) name##_cache = \130# define UPDATE_CACHE(name, gb) name##_cache = \
@@ -164,7 +164,7 @@ for examples see get_bits, show_bits, skip_bits, get_vlc · 33 unmodified lines
164 164
165#define LAST_SKIP_BITS(name, gb, num) SKIP_COUNTER(name, gb, num)165#define LAST_SKIP_BITS(name, gb, num) SKIP_COUNTER(name, gb, num)
166 166
167#ifdef ALT_BITSTREAM_READER_LE167#ifdef BITSTREAM_READER_LE
168# define SHOW_UBITS(name, gb, num) zero_extend(name##_cache, num)168# define SHOW_UBITS(name, gb, num) zero_extend(name##_cache, num)
169# define SHOW_SBITS(name, gb, num) sign_extend(name##_cache, num)169# define SHOW_SBITS(name, gb, num) sign_extend(name##_cache, num)
170#else170#else
@@ -254,7 +254,7 @@ static inline unsigned int get_bits1(GetBitContext *s) · 83 unmodified lines
254{254{
255 unsigned int index = s->index;255 unsigned int index = s->index;
256 uint8_t result = s->buffer[index>>3];256 uint8_t result = s->buffer[index>>3];
257#ifdef ALT_BITSTREAM_READER_LE257#ifdef BITSTREAM_READER_LE
258 result >>= index & 7;258 result >>= index & 7;
259 result &= 1;259 result &= 1;
260#else260#else
@@ -288,7 +288,7 @@ static inline unsigned int get_bits_long(GetBitContext *s, int n) · 27 unmodified lines
288 if (n <= MIN_CACHE_BITS)288 if (n <= MIN_CACHE_BITS)
289 return get_bits(s, n);289 return get_bits(s, n);
290 else {290 else {
291#ifdef ALT_BITSTREAM_READER_LE291#ifdef BITSTREAM_READER_LE
292 int ret = get_bits(s, 16);292 int ret = get_bits(s, 16);
293 return ret | (get_bits(s, n-16) << 16);293 return ret | (get_bits(s, n-16) << 16);
294#else294#else
libavcodec/indeo2.c+3−3
@@ -23,7 +23,7 @@ · 22 unmodified lines
23 * @file23 * @file
24 * Intel Indeo 2 decoder.24 * Intel Indeo 2 decoder.
25 */25 */
26#define ALT_BITSTREAM_READER_LE26#define BITSTREAM_READER_LE
27#include "avcodec.h"27#include "avcodec.h"
28#include "get_bits.h"28#include "get_bits.h"
29#include "indeo2data.h"29#include "indeo2data.h"
@@ -163,7 +163,7 @@ static int ir2_decode_frame(AVCodecContext *avctx, · 133 unmodified lines
163 s->decode_delta = buf[18];163 s->decode_delta = buf[18];
164 164
165 /* decide whether frame uses deltas or not */165 /* decide whether frame uses deltas or not */
166#ifndef ALT_BITSTREAM_READER_LE166#ifndef BITSTREAM_READER_LE
167 for (i = 0; i < buf_size; i++)167 for (i = 0; i < buf_size; i++)
168 buf[i] = av_reverse[buf[i]];168 buf[i] = av_reverse[buf[i]];
169#endif169#endif
@@ -205,7 +205,7 @@ static av_cold int ir2_decode_init(AVCodecContext *avctx){ · 35 unmodified lines
205 205
206 ir2_vlc.table = vlc_tables;206 ir2_vlc.table = vlc_tables;
207 ir2_vlc.table_allocated = 1 << CODE_VLC_BITS;207 ir2_vlc.table_allocated = 1 << CODE_VLC_BITS;
208#ifdef ALT_BITSTREAM_READER_LE208#ifdef BITSTREAM_READER_LE
209 init_vlc(&ir2_vlc, CODE_VLC_BITS, IR2_CODES,209 init_vlc(&ir2_vlc, CODE_VLC_BITS, IR2_CODES,
210 &ir2_codes[0][1], 4, 2,210 &ir2_codes[0][1], 4, 2,
211 &ir2_codes[0][0], 4, 2, INIT_VLC_USE_NEW_STATIC | INIT_VLC_LE);211 &ir2_codes[0][0], 4, 2, INIT_VLC_USE_NEW_STATIC | INIT_VLC_LE);
libavcodec/indeo2data.h+1−1
@@ -26,7 +26,7 @@ · 25 unmodified lines
26 26
27#define IR2_CODES 14327#define IR2_CODES 143
28static const uint16_t ir2_codes[IR2_CODES][2] = {28static const uint16_t ir2_codes[IR2_CODES][2] = {
29#ifdef ALT_BITSTREAM_READER_LE29#ifdef BITSTREAM_READER_LE
30{0x0000, 3}, {0x0004, 3}, {0x0006, 3}, {0x0001, 5},30{0x0000, 3}, {0x0004, 3}, {0x0006, 3}, {0x0001, 5},
31{0x0009, 5}, {0x0019, 5}, {0x000D, 5}, {0x001D, 5},31{0x0009, 5}, {0x0019, 5}, {0x000D, 5}, {0x001D, 5},
32{0x0023, 6}, {0x0013, 6}, {0x0033, 6}, {0x000B, 6},32{0x0023, 6}, {0x0013, 6}, {0x0033, 6}, {0x000B, 6},
libavcodec/indeo5.c+1−1
@@ -27,7 +27,7 @@ · 26 unmodified lines
27 * Known FOURCCs: 'IV50'27 * Known FOURCCs: 'IV50'
28 */28 */
29 29
30#define ALT_BITSTREAM_READER_LE30#define BITSTREAM_READER_LE
31#include "avcodec.h"31#include "avcodec.h"
32#include "get_bits.h"32#include "get_bits.h"
33#include "dsputil.h"33#include "dsputil.h"
libavcodec/interplayvideo.c+1−1
@@ -41,7 +41,7 @@ · 40 unmodified lines
41#include "avcodec.h"41#include "avcodec.h"
42#include "bytestream.h"42#include "bytestream.h"
43#include "dsputil.h"43#include "dsputil.h"
44#define ALT_BITSTREAM_READER_LE44#define BITSTREAM_READER_LE
45#include "get_bits.h"45#include "get_bits.h"
46 46
47#define PALETTE_COUNT 25647#define PALETTE_COUNT 256
libavcodec/ivi_common.c+1−1
@@ -26,7 +26,7 @@ · 25 unmodified lines
26 * Indeo5 decoders.26 * Indeo5 decoders.
27 */27 */
28 28
29#define ALT_BITSTREAM_READER_LE29#define BITSTREAM_READER_LE
30#include "avcodec.h"30#include "avcodec.h"
31#include "get_bits.h"31#include "get_bits.h"
32#include "ivi_common.h"32#include "ivi_common.h"
libavcodec/kmvc.c+66−16
@@ -57,17 +57,21 @@ typedef struct BitBuf { · 56 unmodified lines
57 57
58#define kmvc_init_getbits(bb, src) bb.bits = 7; bb.bitbuf = *src++;58#define kmvc_init_getbits(bb, src) bb.bits = 7; bb.bitbuf = *src++;
59 59
60#define kmvc_getbit(bb, src, res) {\60#define kmvc_getbit(bb, src, src_end, res) {\
61 res = 0; \61 res = 0; \
62 if (bb.bitbuf & (1 << bb.bits)) res = 1; \62 if (bb.bitbuf & (1 << bb.bits)) res = 1; \
63 bb.bits--; \63 bb.bits--; \
64 if(bb.bits == -1) { \64 if(bb.bits == -1) { \
65 if (src >= src_end) { \
66 av_log(ctx->avctx, AV_LOG_ERROR, "Data overrun\n"); \
67 return AVERROR_INVALIDDATA; \
68 } \
65 bb.bitbuf = *src++; \69 bb.bitbuf = *src++; \
66 bb.bits = 7; \70 bb.bits = 7; \
67 } \71 } \
68}72}
69 73
70static void kmvc_decode_intra_8x8(KmvcContext * ctx, const uint8_t * src, int w, int h)74static int kmvc_decode_intra_8x8(KmvcContext * ctx, const uint8_t * src, int src_size, int w, int h)
71{75{
72 BitBuf bb;76 BitBuf bb;
73 int res, val;77 int res, val;
@@ -75,13 +79,18 @@ static void kmvc_decode_intra_8x8(KmvcContext * ctx, const uint8_t * src, int w, · 1 unmodified line
75 int bx, by;79 int bx, by;
76 int l0x, l1x, l0y, l1y;80 int l0x, l1x, l0y, l1y;
77 int mx, my;81 int mx, my;
82 const uint8_t *src_end = src + src_size;
78 83
79 kmvc_init_getbits(bb, src);84 kmvc_init_getbits(bb, src);
80 85
81 for (by = 0; by < h; by += 8)86 for (by = 0; by < h; by += 8)
82 for (bx = 0; bx < w; bx += 8) {87 for (bx = 0; bx < w; bx += 8) {
83 kmvc_getbit(bb, src, res);88 kmvc_getbit(bb, src, src_end, res);
84 if (!res) { // fill whole 8x8 block89 if (!res) { // fill whole 8x8 block
90 if (src >= src_end) {
91 av_log(ctx->avctx, AV_LOG_ERROR, "Data overrun\n");
92 return AVERROR_INVALIDDATA;
93 }
85 val = *src++;94 val = *src++;
86 for (i = 0; i < 64; i++)95 for (i = 0; i < 64; i++)
87 BLK(ctx->cur, bx + (i & 0x7), by + (i >> 3)) = val;96 BLK(ctx->cur, bx + (i & 0x7), by + (i >> 3)) = val;
@@ -89,14 +98,22 @@ static void kmvc_decode_intra_8x8(KmvcContext * ctx, const uint8_t * src, int w, · 1 unmodified line
89 for (i = 0; i < 4; i++) {98 for (i = 0; i < 4; i++) {
90 l0x = bx + (i & 1) * 4;99 l0x = bx + (i & 1) * 4;
91 l0y = by + (i & 2) * 2;100 l0y = by + (i & 2) * 2;
92 kmvc_getbit(bb, src, res);101 kmvc_getbit(bb, src, src_end, res);
93 if (!res) {102 if (!res) {
94 kmvc_getbit(bb, src, res);103 kmvc_getbit(bb, src, src_end, res);
95 if (!res) { // fill whole 4x4 block104 if (!res) { // fill whole 4x4 block
105 if (src >= src_end) {
106 av_log(ctx->avctx, AV_LOG_ERROR, "Data overrun\n");
107 return AVERROR_INVALIDDATA;
108 }
96 val = *src++;109 val = *src++;
97 for (j = 0; j < 16; j++)110 for (j = 0; j < 16; j++)
98 BLK(ctx->cur, l0x + (j & 3), l0y + (j >> 2)) = val;111 BLK(ctx->cur, l0x + (j & 3), l0y + (j >> 2)) = val;
99 } else { // copy block from already decoded place112 } else { // copy block from already decoded place
113 if (src >= src_end) {
114 av_log(ctx->avctx, AV_LOG_ERROR, "Data overrun\n");
115 return AVERROR_INVALIDDATA;
116 }
100 val = *src++;117 val = *src++;
101 mx = val & 0xF;118 mx = val & 0xF;
102 my = val >> 4;119 my = val >> 4;
@@ -108,16 +125,24 @@ static void kmvc_decode_intra_8x8(KmvcContext * ctx, const uint8_t * src, int w, · 5 unmodified lines
108 for (j = 0; j < 4; j++) {125 for (j = 0; j < 4; j++) {
109 l1x = l0x + (j & 1) * 2;126 l1x = l0x + (j & 1) * 2;
110 l1y = l0y + (j & 2);127 l1y = l0y + (j & 2);
111 kmvc_getbit(bb, src, res);128 kmvc_getbit(bb, src, src_end, res);
112 if (!res) {129 if (!res) {
113 kmvc_getbit(bb, src, res);130 kmvc_getbit(bb, src, src_end, res);
114 if (!res) { // fill whole 2x2 block131 if (!res) { // fill whole 2x2 block
132 if (src >= src_end) {
133 av_log(ctx->avctx, AV_LOG_ERROR, "Data overrun\n");
134 return AVERROR_INVALIDDATA;
135 }
115 val = *src++;136 val = *src++;
116 BLK(ctx->cur, l1x, l1y) = val;137 BLK(ctx->cur, l1x, l1y) = val;
117 BLK(ctx->cur, l1x + 1, l1y) = val;138 BLK(ctx->cur, l1x + 1, l1y) = val;
118 BLK(ctx->cur, l1x, l1y + 1) = val;139 BLK(ctx->cur, l1x, l1y + 1) = val;
119 BLK(ctx->cur, l1x + 1, l1y + 1) = val;140 BLK(ctx->cur, l1x + 1, l1y + 1) = val;
120 } else { // copy block from already decoded place141 } else { // copy block from already decoded place
142 if (src >= src_end) {
143 av_log(ctx->avctx, AV_LOG_ERROR, "Data overrun\n");
144 return AVERROR_INVALIDDATA;
145 }
121 val = *src++;146 val = *src++;
122 mx = val & 0xF;147 mx = val & 0xF;
123 my = val >> 4;148 my = val >> 4;
@@ -140,9 +165,11 @@ static void kmvc_decode_intra_8x8(KmvcContext * ctx, const uint8_t * src, int w, · 16 unmodified lines
140 }165 }
141 }166 }
142 }167 }
168
169 return 0;
143}170}
144 171
145static void kmvc_decode_inter_8x8(KmvcContext * ctx, const uint8_t * src, int w, int h)172static int kmvc_decode_inter_8x8(KmvcContext * ctx, const uint8_t * src, int src_size, int w, int h)
146{173{
147 BitBuf bb;174 BitBuf bb;
148 int res, val;175 int res, val;
@@ -150,15 +177,20 @@ static void kmvc_decode_inter_8x8(KmvcContext * ctx, const uint8_t * src, int w, · 1 unmodified line
150 int bx, by;177 int bx, by;
151 int l0x, l1x, l0y, l1y;178 int l0x, l1x, l0y, l1y;
152 int mx, my;179 int mx, my;
180 const uint8_t *src_end = src + src_size;
153 181
154 kmvc_init_getbits(bb, src);182 kmvc_init_getbits(bb, src);
155 183
156 for (by = 0; by < h; by += 8)184 for (by = 0; by < h; by += 8)
157 for (bx = 0; bx < w; bx += 8) {185 for (bx = 0; bx < w; bx += 8) {
158 kmvc_getbit(bb, src, res);186 kmvc_getbit(bb, src, src_end, res);
159 if (!res) {187 if (!res) {
160 kmvc_getbit(bb, src, res);188 kmvc_getbit(bb, src, src_end, res);
161 if (!res) { // fill whole 8x8 block189 if (!res) { // fill whole 8x8 block
190 if (src >= src_end) {
191 av_log(ctx->avctx, AV_LOG_ERROR, "Data overrun\n");
192 return AVERROR_INVALIDDATA;
193 }
162 val = *src++;194 val = *src++;
163 for (i = 0; i < 64; i++)195 for (i = 0; i < 64; i++)
164 BLK(ctx->cur, bx + (i & 0x7), by + (i >> 3)) = val;196 BLK(ctx->cur, bx + (i & 0x7), by + (i >> 3)) = val;
@@ -171,14 +203,22 @@ static void kmvc_decode_inter_8x8(KmvcContext * ctx, const uint8_t * src, int w, · 6 unmodified lines
171 for (i = 0; i < 4; i++) {203 for (i = 0; i < 4; i++) {
172 l0x = bx + (i & 1) * 4;204 l0x = bx + (i & 1) * 4;
173 l0y = by + (i & 2) * 2;205 l0y = by + (i & 2) * 2;
174 kmvc_getbit(bb, src, res);206 kmvc_getbit(bb, src, src_end, res);
175 if (!res) {207 if (!res) {
176 kmvc_getbit(bb, src, res);208 kmvc_getbit(bb, src, src_end, res);
177 if (!res) { // fill whole 4x4 block209 if (!res) { // fill whole 4x4 block
210 if (src >= src_end) {
211 av_log(ctx->avctx, AV_LOG_ERROR, "Data overrun\n");
212 return AVERROR_INVALIDDATA;
213 }
178 val = *src++;214 val = *src++;
179 for (j = 0; j < 16; j++)215 for (j = 0; j < 16; j++)
180 BLK(ctx->cur, l0x + (j & 3), l0y + (j >> 2)) = val;216 BLK(ctx->cur, l0x + (j & 3), l0y + (j >> 2)) = val;
181 } else { // copy block217 } else { // copy block
218 if (src >= src_end) {
219 av_log(ctx->avctx, AV_LOG_ERROR, "Data overrun\n");
220 return AVERROR_INVALIDDATA;
221 }
182 val = *src++;222 val = *src++;
183 mx = (val & 0xF) - 8;223 mx = (val & 0xF) - 8;
184 my = (val >> 4) - 8;224 my = (val >> 4) - 8;
@@ -190,16 +230,24 @@ static void kmvc_decode_inter_8x8(KmvcContext * ctx, const uint8_t * src, int w, · 5 unmodified lines
190 for (j = 0; j < 4; j++) {230 for (j = 0; j < 4; j++) {
191 l1x = l0x + (j & 1) * 2;231 l1x = l0x + (j & 1) * 2;
192 l1y = l0y + (j & 2);232 l1y = l0y + (j & 2);
193 kmvc_getbit(bb, src, res);233 kmvc_getbit(bb, src, src_end, res);
194 if (!res) {234 if (!res) {
195 kmvc_getbit(bb, src, res);235 kmvc_getbit(bb, src, src_end, res);
196 if (!res) { // fill whole 2x2 block236 if (!res) { // fill whole 2x2 block
237 if (src >= src_end) {
238 av_log(ctx->avctx, AV_LOG_ERROR, "Data overrun\n");
239 return AVERROR_INVALIDDATA;
240 }
197 val = *src++;241 val = *src++;
198 BLK(ctx->cur, l1x, l1y) = val;242 BLK(ctx->cur, l1x, l1y) = val;
199 BLK(ctx->cur, l1x + 1, l1y) = val;243 BLK(ctx->cur, l1x + 1, l1y) = val;
200 BLK(ctx->cur, l1x, l1y + 1) = val;244 BLK(ctx->cur, l1x, l1y + 1) = val;
201 BLK(ctx->cur, l1x + 1, l1y + 1) = val;245 BLK(ctx->cur, l1x + 1, l1y + 1) = val;
202 } else { // copy block246 } else { // copy block
247 if (src >= src_end) {
248 av_log(ctx->avctx, AV_LOG_ERROR, "Data overrun\n");
249 return AVERROR_INVALIDDATA;
250 }
203 val = *src++;251 val = *src++;
204 mx = (val & 0xF) - 8;252 mx = (val & 0xF) - 8;
205 my = (val >> 4) - 8;253 my = (val >> 4) - 8;
@@ -222,6 +270,8 @@ static void kmvc_decode_inter_8x8(KmvcContext * ctx, const uint8_t * src, int w, · 16 unmodified lines
222 }270 }
223 }271 }
224 }272 }
273
274 return 0;
225}275}
226 276
227static int decode_frame(AVCodecContext * avctx, void *data, int *data_size, AVPacket *avpkt)277static int decode_frame(AVCodecContext * avctx, void *data, int *data_size, AVPacket *avpkt)
@@ -299,10 +349,10 @@ static int decode_frame(AVCodecContext * avctx, void *data, int *data_size, AVPa · 71 unmodified lines
299 memcpy(ctx->cur, ctx->prev, 320 * 200);349 memcpy(ctx->cur, ctx->prev, 320 * 200);
300 break;350 break;
301 case 3:351 case 3:
302 kmvc_decode_intra_8x8(ctx, buf, avctx->width, avctx->height);352 kmvc_decode_intra_8x8(ctx, buf, buf_size, avctx->width, avctx->height);
303 break;353 break;
304 case 4:354 case 4:
305 kmvc_decode_inter_8x8(ctx, buf, avctx->width, avctx->height);355 kmvc_decode_inter_8x8(ctx, buf, buf_size, avctx->width, avctx->height);
306 break;356 break;
307 default:357 default:
308 av_log(avctx, AV_LOG_ERROR, "Unknown compression method %i\n", header & KMVC_METHOD);358 av_log(avctx, AV_LOG_ERROR, "Unknown compression method %i\n", header & KMVC_METHOD);
libavcodec/mjpegdec.c+3−6
@@ -112,12 +112,9 @@ av_cold int ff_mjpeg_decode_init(AVCodecContext *avctx) · 111 unmodified lines
112 build_basic_mjpeg_vlc(s);112 build_basic_mjpeg_vlc(s);
113 }113 }
114 }114 }
115 if (avctx->extradata_size > 9 &&115 if (avctx->field_order == AV_FIELD_BB) { /* quicktime icefloe 019 */
116 AV_RL32(avctx->extradata + 4) == MKTAG('f','i','e','l')) {116 s->interlace_polarity = 1; /* bottom field first */
117 if (avctx->extradata[9] == 6) { /* quicktime icefloe 019 */117 av_log(avctx, AV_LOG_DEBUG, "mjpeg bottom field first\n");
118 s->interlace_polarity = 1; /* bottom field first */
119 av_log(avctx, AV_LOG_DEBUG, "mjpeg bottom field first\n");
120 }
121 }118 }
122 if (avctx->codec->id == CODEC_ID_AMV)119 if (avctx->codec->id == CODEC_ID_AMV)
123 s->flipped = 1;120 s->flipped = 1;
libavcodec/msgsmdec.c+1−1
@@ -19,7 +19,7 @@ · 18 unmodified lines
19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20 */20 */
21 21
22#define ALT_BITSTREAM_READER_LE22#define BITSTREAM_READER_LE
23#include "avcodec.h"23#include "avcodec.h"
24#include "msgsmdec.h"24#include "msgsmdec.h"
25#include "gsmdec_template.c"25#include "gsmdec_template.c"
libavcodec/nellymoser.c+1−1
@@ -35,7 +35,7 @@ · 34 unmodified lines
35#include "avcodec.h"35#include "avcodec.h"
36#include "dsputil.h"36#include "dsputil.h"
37 37
38#define ALT_BITSTREAM_READER_LE38#define BITSTREAM_READER_LE
39#include "get_bits.h"39#include "get_bits.h"
40 40
41const float ff_nelly_dequantization_table[127] = {41const float ff_nelly_dequantization_table[127] = {
libavcodec/nellymoserdec.c+1−1
@@ -41,7 +41,7 @@ · 40 unmodified lines
41#include "fmtconvert.h"41#include "fmtconvert.h"
42#include "sinewin.h"42#include "sinewin.h"
43 43
44#define ALT_BITSTREAM_READER_LE44#define BITSTREAM_READER_LE
45#include "get_bits.h"45#include "get_bits.h"
46 46
47 47
libavcodec/options.c+2−1
@@ -371,7 +371,8 @@ static const AVOption options[]={ · 370 unmodified lines
371{"float", NULL, 0, AV_OPT_TYPE_CONST, {.dbl = FF_AA_FLOAT }, INT_MIN, INT_MAX, V|D, "aa"},371{"float", NULL, 0, AV_OPT_TYPE_CONST, {.dbl = FF_AA_FLOAT }, INT_MIN, INT_MAX, V|D, "aa"},
372#endif372#endif
373{"qns", "quantizer noise shaping", OFFSET(quantizer_noise_shaping), AV_OPT_TYPE_INT, {.dbl = DEFAULT }, INT_MIN, INT_MAX, V|E},373{"qns", "quantizer noise shaping", OFFSET(quantizer_noise_shaping), AV_OPT_TYPE_INT, {.dbl = DEFAULT }, INT_MIN, INT_MAX, V|E},
374{"threads", NULL, OFFSET(thread_count), AV_OPT_TYPE_INT, {.dbl = 1 }, INT_MIN, INT_MAX, V|E|D},374{"threads", NULL, OFFSET(thread_count), AV_OPT_TYPE_INT, {.dbl = 1 }, 0, INT_MAX, V|E|D, "threads"},
375{"auto", "detect a good number of threads", 0, AV_OPT_TYPE_CONST, {.dbl = 0 }, INT_MIN, INT_MAX, V|E|D, "threads"},
375{"me_threshold", "motion estimaton threshold", OFFSET(me_threshold), AV_OPT_TYPE_INT, {.dbl = DEFAULT }, INT_MIN, INT_MAX, V|E},376{"me_threshold", "motion estimaton threshold", OFFSET(me_threshold), AV_OPT_TYPE_INT, {.dbl = DEFAULT }, INT_MIN, INT_MAX, V|E},
376{"mb_threshold", "macroblock threshold", OFFSET(mb_threshold), AV_OPT_TYPE_INT, {.dbl = DEFAULT }, INT_MIN, INT_MAX, V|E},377{"mb_threshold", "macroblock threshold", OFFSET(mb_threshold), AV_OPT_TYPE_INT, {.dbl = DEFAULT }, INT_MIN, INT_MAX, V|E},
377{"dc", "intra_dc_precision", OFFSET(intra_dc_precision), AV_OPT_TYPE_INT, {.dbl = 0 }, INT_MIN, INT_MAX, V|E},378{"dc", "intra_dc_precision", OFFSET(intra_dc_precision), AV_OPT_TYPE_INT, {.dbl = 0 }, INT_MIN, INT_MAX, V|E},
libavcodec/pthread.c+62−1
@@ -30,6 +30,17 @@ · 29 unmodified lines
30 */30 */
31 31
32#include "config.h"32#include "config.h"
33
34#if HAVE_SCHED_GETAFFINITY
35#define _GNU_SOURCE
36#include <sched.h>
37#elif HAVE_GETSYSTEMINFO
38#include <windows.h>
39#elif HAVE_SYSCTL
40#include <sys/sysctl.h>
41#include <sys/types.h>
42#endif
43
33#include "avcodec.h"44#include "avcodec.h"
34#include "internal.h"45#include "internal.h"
35#include "thread.h"46#include "thread.h"
@@ -135,6 +146,40 @@ typedef struct FrameThreadContext { · 99 unmodified lines
135 int die; ///< Set when threads should exit.146 int die; ///< Set when threads should exit.
136} FrameThreadContext;147} FrameThreadContext;
137 148
149
150/* H264 slice threading seems to be buggy with more than 16 threads,
151 * limit the number of threads to 16 for automatic detection */
152#define MAX_AUTO_THREADS 16
153
154static int get_logical_cpus(AVCodecContext *avctx)
155{
156 int ret, nb_cpus = 1;
157#if HAVE_SCHED_GETAFFINITY
158 cpu_set_t cpuset;
159
160 CPU_ZERO(&cpuset);
161
162 ret = sched_getaffinity(0, sizeof(cpuset), &cpuset);
163 if (!ret) {
164 nb_cpus = CPU_COUNT(&cpuset);
165 }
166#elif HAVE_GETSYSTEMINFO
167 SYSTEM_INFO sysinfo;
168 GetSystemInfo(&sysinfo);
169 nb_cpus = sysinfo.dwNumberOfProcessors;
170#elif HAVE_SYSCTL
171 int mib[2] = { CTL_HW, HW_NCPU };
172 size_t len = sizeof(nb_cpus);
173
174 ret = sysctl(mib, 2, &nb_cpus, &len, NULL, 0);
175 if (ret == -1)
176 nb_cpus = 0;
177#endif
178 av_log(avctx, AV_LOG_DEBUG, "detected %d logical cores\n", nb_cpus);
179 return FFMIN(nb_cpus, MAX_AUTO_THREADS);
180}
181
182
138static void* attribute_align_arg worker(void *v)183static void* attribute_align_arg worker(void *v)
139{184{
140 AVCodecContext *avctx = v;185 AVCodecContext *avctx = v;
@@ -239,8 +284,17 @@ static int thread_init(AVCodecContext *avctx) · 98 unmodified lines
239 ThreadContext *c;284 ThreadContext *c;
240 int thread_count = avctx->thread_count;285 int thread_count = avctx->thread_count;
241 286
242 if (thread_count <= 1)287 if (!thread_count) {
288 int nb_cpus = get_logical_cpus(avctx);
289 // use number of cores + 1 as thread count if there is motre than one
290 if (nb_cpus > 1)
291 thread_count = avctx->thread_count = nb_cpus + 1;
292 }
293
294 if (thread_count <= 1) {
295 avctx->active_thread_type = 0;
243 return 0;296 return 0;
297 }
244 298
245 c = av_mallocz(sizeof(ThreadContext));299 c = av_mallocz(sizeof(ThreadContext));
246 if (!c)300 if (!c)
@@ -704,6 +758,13 @@ static int frame_thread_init(AVCodecContext *avctx) · 457 unmodified lines
704 FrameThreadContext *fctx;758 FrameThreadContext *fctx;
705 int i, err = 0;759 int i, err = 0;
706 760
761 if (!thread_count) {
762 int nb_cpus = get_logical_cpus(avctx);
763 // use number of cores + 1 as thread count if there is motre than one
764 if (nb_cpus > 1)
765 thread_count = avctx->thread_count = nb_cpus + 1;
766 }
767
707 if (thread_count <= 1) {768 if (thread_count <= 1) {
708 avctx->active_thread_type = 0;769 avctx->active_thread_type = 0;
709 return 0;770 return 0;
libavcodec/qdm2.c+1−1
@@ -35,7 +35,7 @@ · 34 unmodified lines
35#include <stddef.h>35#include <stddef.h>
36#include <stdio.h>36#include <stdio.h>
37 37
38#define ALT_BITSTREAM_READER_LE38#define BITSTREAM_READER_LE
39#include "avcodec.h"39#include "avcodec.h"
40#include "get_bits.h"40#include "get_bits.h"
41#include "dsputil.h"41#include "dsputil.h"
libavcodec/ra144enc.c+4−1
@@ -477,7 +477,10 @@ static int ra144_encode_frame(AVCodecContext *avctx, uint8_t *frame, · 476 unmodified lines
477 * The filter is unstable: use the coefficients of the previous frame.477 * The filter is unstable: use the coefficients of the previous frame.
478 */478 */
479 ff_int_to_int16(block_coefs[NBLOCKS - 1], ractx->lpc_coef[1]);479 ff_int_to_int16(block_coefs[NBLOCKS - 1], ractx->lpc_coef[1]);
480 ff_eval_refl(lpc_refl, block_coefs[NBLOCKS - 1], avctx);480 if (ff_eval_refl(lpc_refl, block_coefs[NBLOCKS - 1], avctx)) {
481 /* the filter is still unstable. set reflection coeffs to zero. */
482 memset(lpc_refl, 0, sizeof(lpc_refl));
483 }
481 }484 }
482 init_put_bits(&pb, frame, buf_size);485 init_put_bits(&pb, frame, buf_size);
483 for (i = 0; i < LPC_ORDER; i++) {486 for (i = 0; i < LPC_ORDER; i++) {
libavcodec/ra288.c+1−1
@@ -20,7 +20,7 @@ · 19 unmodified lines
20 */20 */
21 21
22#include "avcodec.h"22#include "avcodec.h"
23#define ALT_BITSTREAM_READER_LE23#define BITSTREAM_READER_LE
24#include "get_bits.h"24#include "get_bits.h"
25#include "ra288.h"25#include "ra288.h"
26#include "lpc.h"26#include "lpc.h"
libavcodec/sipr.c+1−1
@@ -27,7 +27,7 @@ · 26 unmodified lines
27 27
28#include "libavutil/mathematics.h"28#include "libavutil/mathematics.h"
29#include "avcodec.h"29#include "avcodec.h"
30#define ALT_BITSTREAM_READER_LE30#define BITSTREAM_READER_LE
31#include "get_bits.h"31#include "get_bits.h"
32#include "dsputil.h"32#include "dsputil.h"
33 33
libavcodec/smacker.c+1−1
@@ -35,7 +35,7 @@ · 34 unmodified lines
35#include "libavutil/audioconvert.h"35#include "libavutil/audioconvert.h"
36#include "mathops.h"36#include "mathops.h"
37 37
38#define ALT_BITSTREAM_READER_LE38#define BITSTREAM_READER_LE
39#include "get_bits.h"39#include "get_bits.h"
40#include "bytestream.h"40#include "bytestream.h"
41 41
libavcodec/tiertexseqv.c+1−1
@@ -25,7 +25,7 @@ · 24 unmodified lines
25 */25 */
26 26
27#include "avcodec.h"27#include "avcodec.h"
28#define ALT_BITSTREAM_READER_LE28#define BITSTREAM_READER_LE
29#include "get_bits.h"29#include "get_bits.h"
30 30
31 31
libavcodec/truespeech.c+1−0
@@ -179,6 +179,7 @@ static void truespeech_apply_twopoint_filter(TSContext *dec, int quart) · 178 unmodified lines
179 for(i = 0; i < 146; i++)179 for(i = 0; i < 146; i++)
180 tmp[i] = dec->filtbuf[i];180 tmp[i] = dec->filtbuf[i];
181 off = (t / 25) + dec->offset1[quart >> 1] + 18;181 off = (t / 25) + dec->offset1[quart >> 1] + 18;
182 off = av_clip(off, 0, 145);
182 ptr0 = tmp + 145 - off;183 ptr0 = tmp + 145 - off;
183 ptr1 = tmp + 146;184 ptr1 = tmp + 146;
184 filter = (const int16_t*)ts_order2_coeffs + (t % 25) * 2;185 filter = (const int16_t*)ts_order2_coeffs + (t % 25) * 2;
libavcodec/tta.c+1−1
@@ -27,7 +27,7 @@ · 26 unmodified lines
27 * @author Alex Beregszaszi27 * @author Alex Beregszaszi
28 */28 */
29 29
30#define ALT_BITSTREAM_READER_LE30#define BITSTREAM_READER_LE
31//#define DEBUG31//#define DEBUG
32#include <limits.h>32#include <limits.h>
33#include "avcodec.h"33#include "avcodec.h"
libavcodec/v410dec.c+1−1
@@ -20,8 +20,8 @@ · 19 unmodified lines
20 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA20 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21 */21 */
22 22
23#include "libavutil/intreadwrite.h"
23#include "avcodec.h"24#include "avcodec.h"
24#include "get_bits.h"
25 25
26static av_cold int v410_decode_init(AVCodecContext *avctx)26static av_cold int v410_decode_init(AVCodecContext *avctx)
27{27{
libavcodec/vble.c+1−1
@@ -24,7 +24,7 @@ · 23 unmodified lines
24 * VBLE Decoder24 * VBLE Decoder
25 */25 */
26 26
27#define ALT_BITSTREAM_READER_LE27#define BITSTREAM_READER_LE
28 28
29#include "avcodec.h"29#include "avcodec.h"
30#include "dsputil.h"30#include "dsputil.h"
libavcodec/vorbis.c+1−1
@@ -26,7 +26,7 @@ · 25 unmodified lines
26 * @author Denes Balatoni ( dbalatoni programozo hu )26 * @author Denes Balatoni ( dbalatoni programozo hu )
27 */27 */
28 28
29#define ALT_BITSTREAM_READER_LE29#define BITSTREAM_READER_LE
30#include "avcodec.h"30#include "avcodec.h"
31#include "get_bits.h"31#include "get_bits.h"
32 32
libavcodec/vorbisdec.c+1−1
@@ -29,7 +29,7 @@ · 28 unmodified lines
29#include <inttypes.h>29#include <inttypes.h>
30#include <math.h>30#include <math.h>
31 31
32#define ALT_BITSTREAM_READER_LE32#define BITSTREAM_READER_LE
33#include "avcodec.h"33#include "avcodec.h"
34#include "get_bits.h"34#include "get_bits.h"
35#include "dsputil.h"35#include "dsputil.h"
libavcodec/wavpack.c+1−1
@@ -18,7 +18,7 @@ · 17 unmodified lines
18 * License along with FFmpeg; if not, write to the Free Software18 * License along with FFmpeg; if not, write to the Free Software
19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20 */20 */
21#define ALT_BITSTREAM_READER_LE21#define BITSTREAM_READER_LE
22#include "avcodec.h"22#include "avcodec.h"
23#include "get_bits.h"23#include "get_bits.h"
24#include "unary.h"24#include "unary.h"
libavcodec/xan.c+1−1
@@ -35,7 +35,7 @@ · 34 unmodified lines
35#include "libavutil/intreadwrite.h"35#include "libavutil/intreadwrite.h"
36#include "avcodec.h"36#include "avcodec.h"
37#include "bytestream.h"37#include "bytestream.h"
38#define ALT_BITSTREAM_READER_LE38#define BITSTREAM_READER_LE
39#include "get_bits.h"39#include "get_bits.h"
40// for av_memcpy_backptr40// for av_memcpy_backptr
41#include "libavutil/lzo.h"41#include "libavutil/lzo.h"
libavcodec/xxan.c+1−1
@@ -23,7 +23,7 @@ · 22 unmodified lines
23#include "avcodec.h"23#include "avcodec.h"
24#include "libavutil/intreadwrite.h"24#include "libavutil/intreadwrite.h"
25#include "bytestream.h"25#include "bytestream.h"
26#define ALT_BITSTREAM_READER_LE26#define BITSTREAM_READER_LE
27#include "get_bits.h"27#include "get_bits.h"
28// for av_memcpy_backptr28// for av_memcpy_backptr
29#include "libavutil/lzo.h"29#include "libavutil/lzo.h"
libavfilter/Makefile+1−1
@@ -20,6 +20,7 @@ OBJS = allfilters.o \ · 19 unmodified lines
20 formats.o \20 formats.o \
21 graphparser.o \21 graphparser.o \
22 transform.o \22 transform.o \
23 vsrc_buffer.o
23 24
24OBJS-$(CONFIG_AVCODEC) += avcodec.o25OBJS-$(CONFIG_AVCODEC) += avcodec.o
25 26
@@ -83,7 +84,6 @@ OBJS-$(CONFIG_UNSHARP_FILTER) += vf_unsharp.o · 57 unmodified lines
83OBJS-$(CONFIG_VFLIP_FILTER) += vf_vflip.o84OBJS-$(CONFIG_VFLIP_FILTER) += vf_vflip.o
84OBJS-$(CONFIG_YADIF_FILTER) += vf_yadif.o85OBJS-$(CONFIG_YADIF_FILTER) += vf_yadif.o
85 86
86OBJS-$(CONFIG_BUFFER_FILTER) += vsrc_buffer.o
87OBJS-$(CONFIG_CELLAUTO_FILTER) += vsrc_cellauto.o87OBJS-$(CONFIG_CELLAUTO_FILTER) += vsrc_cellauto.o
88OBJS-$(CONFIG_COLOR_FILTER) += vsrc_color.o88OBJS-$(CONFIG_COLOR_FILTER) += vsrc_color.o
89OBJS-$(CONFIG_FREI0R_SRC_FILTER) += vf_frei0r.o89OBJS-$(CONFIG_FREI0R_SRC_FILTER) += vf_frei0r.o
libavfilter/allfilters.c+6−1
@@ -94,7 +94,6 @@ void avfilter_register_all(void) · 93 unmodified lines
94 REGISTER_FILTER (VFLIP, vflip, vf);94 REGISTER_FILTER (VFLIP, vflip, vf);
95 REGISTER_FILTER (YADIF, yadif, vf);95 REGISTER_FILTER (YADIF, yadif, vf);
96 96
97 REGISTER_FILTER (BUFFER, buffer, vsrc);
98 REGISTER_FILTER (CELLAUTO, cellauto, vsrc);97 REGISTER_FILTER (CELLAUTO, cellauto, vsrc);
99 REGISTER_FILTER (COLOR, color, vsrc);98 REGISTER_FILTER (COLOR, color, vsrc);
100 REGISTER_FILTER (FREI0R, frei0r_src, vsrc);99 REGISTER_FILTER (FREI0R, frei0r_src, vsrc);
@@ -108,4 +107,10 @@ void avfilter_register_all(void) · 7 unmodified lines
108 107
109 REGISTER_FILTER (BUFFERSINK, buffersink, vsink);108 REGISTER_FILTER (BUFFERSINK, buffersink, vsink);
110 REGISTER_FILTER (NULLSINK, nullsink, vsink);109 REGISTER_FILTER (NULLSINK, nullsink, vsink);
110
111 /* vsrc_buffer is a part of public API => registered unconditionally */
112 {
113 extern avfilter_vsrc_buffer;
114 avfilter_register(&avfilter_vsrc_buffer);
115 }
111}116}
libavformat/Makefile+4−3
@@ -56,7 +56,8 @@ OBJS-$(CONFIG_BIT_DEMUXER) += bit.o · 55 unmodified lines
56OBJS-$(CONFIG_BIT_MUXER) += bit.o56OBJS-$(CONFIG_BIT_MUXER) += bit.o
57OBJS-$(CONFIG_BMV_DEMUXER) += bmv.o57OBJS-$(CONFIG_BMV_DEMUXER) += bmv.o
58OBJS-$(CONFIG_C93_DEMUXER) += c93.o vocdec.o voc.o58OBJS-$(CONFIG_C93_DEMUXER) += c93.o vocdec.o voc.o
59OBJS-$(CONFIG_CAF_DEMUXER) += cafdec.o caf.o mov.o riff.o isom.o59OBJS-$(CONFIG_CAF_DEMUXER) += cafdec.o caf.o mov.o mov_chan.o \
60 riff.o isom.o
60OBJS-$(CONFIG_CAF_MUXER) += cafenc.o caf.o riff.o isom.o61OBJS-$(CONFIG_CAF_MUXER) += cafenc.o caf.o riff.o isom.o
61OBJS-$(CONFIG_CAVSVIDEO_DEMUXER) += cavsvideodec.o rawdec.o62OBJS-$(CONFIG_CAVSVIDEO_DEMUXER) += cavsvideodec.o rawdec.o
62OBJS-$(CONFIG_CAVSVIDEO_MUXER) += rawenc.o63OBJS-$(CONFIG_CAVSVIDEO_MUXER) += rawenc.o
@@ -195,7 +196,7 @@ OBJS-$(CONFIG_OGG_DEMUXER) += oggdec.o \ · 132 unmodified lines
195OBJS-$(CONFIG_OGG_MUXER) += oggenc.o \196OBJS-$(CONFIG_OGG_MUXER) += oggenc.o \
196 vorbiscomment.o197 vorbiscomment.o
197OBJS-$(CONFIG_OMA_DEMUXER) += omadec.o pcm.o oma.o198OBJS-$(CONFIG_OMA_DEMUXER) += omadec.o pcm.o oma.o
198OBJS-$(CONFIG_OMA_MUXER) += omaenc.o rawenc.o oma.o199OBJS-$(CONFIG_OMA_MUXER) += omaenc.o rawenc.o oma.o id3v2enc.o
199OBJS-$(CONFIG_PCM_ALAW_DEMUXER) += pcmdec.o pcm.o rawdec.o200OBJS-$(CONFIG_PCM_ALAW_DEMUXER) += pcmdec.o pcm.o rawdec.o
200OBJS-$(CONFIG_PCM_ALAW_MUXER) += pcmenc.o rawenc.o201OBJS-$(CONFIG_PCM_ALAW_MUXER) += pcmenc.o rawenc.o
201OBJS-$(CONFIG_PCM_F32BE_DEMUXER) += pcmdec.o pcm.o rawdec.o202OBJS-$(CONFIG_PCM_F32BE_DEMUXER) += pcmdec.o pcm.o rawdec.o
@@ -331,7 +332,7 @@ OBJS-$(CONFIG_WTV_MUXER) += wtvenc.o wtv.o asf.o asfenc.o riff.o · 129 unmodified lines
331OBJS-$(CONFIG_WV_DEMUXER) += wv.o apetag.o332OBJS-$(CONFIG_WV_DEMUXER) += wv.o apetag.o
332OBJS-$(CONFIG_XA_DEMUXER) += xa.o333OBJS-$(CONFIG_XA_DEMUXER) += xa.o
333OBJS-$(CONFIG_XBIN_DEMUXER) += bintext.o sauce.o334OBJS-$(CONFIG_XBIN_DEMUXER) += bintext.o sauce.o
334OBJS-$(CONFIG_XMV_DEMUXER) += xmv.o335OBJS-$(CONFIG_XMV_DEMUXER) += xmv.o riff.o
335OBJS-$(CONFIG_XWMA_DEMUXER) += xwma.o riff.o336OBJS-$(CONFIG_XWMA_DEMUXER) += xwma.o riff.o
336OBJS-$(CONFIG_YOP_DEMUXER) += yop.o337OBJS-$(CONFIG_YOP_DEMUXER) += yop.o
337OBJS-$(CONFIG_YUV4MPEGPIPE_MUXER) += yuv4mpeg.o338OBJS-$(CONFIG_YUV4MPEGPIPE_MUXER) += yuv4mpeg.o
libavformat/mov.c+43−5
@@ -857,6 +857,40 @@ static int mov_read_enda(MOVContext *c, AVIOContext *pb, MOVAtom atom) · 856 unmodified lines
857 return 0;857 return 0;
858}858}
859 859
860static int mov_read_fiel(MOVContext *c, AVIOContext *pb, MOVAtom atom)
861{
862 AVStream *st;
863 unsigned mov_field_order;
864 enum AVFieldOrder decoded_field_order = AV_FIELD_UNKNOWN;
865
866 if (c->fc->nb_streams < 1) // will happen with jp2 files
867 return 0;
868 st = c->fc->streams[c->fc->nb_streams-1];
869 if (atom.size < 2)
870 return AVERROR_INVALIDDATA;
871 mov_field_order = avio_rb16(pb);
872 if ((mov_field_order & 0xFF00) == 0x0100)
873 decoded_field_order = AV_FIELD_PROGRESSIVE;
874 else if ((mov_field_order & 0xFF00) == 0x0200) {
875 switch (mov_field_order & 0xFF) {
876 case 0x01: decoded_field_order = AV_FIELD_TT;
877 break;
878 case 0x06: decoded_field_order = AV_FIELD_BB;
879 break;
880 case 0x09: decoded_field_order = AV_FIELD_TB;
881 break;
882 case 0x0E: decoded_field_order = AV_FIELD_BT;
883 break;
884 }
885 }
886 if (decoded_field_order == AV_FIELD_UNKNOWN && mov_field_order) {
887 av_log(NULL, AV_LOG_ERROR, "Unknown MOV field order 0x%04x\n", mov_field_order);
888 }
889 st->codec->field_order = decoded_field_order;
890
891 return 0;
892}
893
860/* FIXME modify qdm2/svq3/h264 decoders to take full atom as extradata */894/* FIXME modify qdm2/svq3/h264 decoders to take full atom as extradata */
861static int mov_read_extradata(MOVContext *c, AVIOContext *pb, MOVAtom atom,895static int mov_read_extradata(MOVContext *c, AVIOContext *pb, MOVAtom atom,
862 enum CodecID codec_id)896 enum CodecID codec_id)
@@ -898,11 +932,6 @@ static int mov_read_avss(MOVContext *c, AVIOContext *pb, MOVAtom atom) · 35 unmodified lines
898 return mov_read_extradata(c, pb, atom, CODEC_ID_AVS);932 return mov_read_extradata(c, pb, atom, CODEC_ID_AVS);
899}933}
900 934
901static int mov_read_fiel(MOVContext *c, AVIOContext *pb, MOVAtom atom)
902{
903 return mov_read_extradata(c, pb, atom, CODEC_ID_MJPEG);
904}
905
906static int mov_read_jp2h(MOVContext *c, AVIOContext *pb, MOVAtom atom)935static int mov_read_jp2h(MOVContext *c, AVIOContext *pb, MOVAtom atom)
907{936{
908 return mov_read_extradata(c, pb, atom, CODEC_ID_JPEG2000);937 return mov_read_extradata(c, pb, atom, CODEC_ID_JPEG2000);
@@ -950,6 +979,15 @@ static int mov_read_glbl(MOVContext *c, AVIOContext *pb, MOVAtom atom) · 41 unmodified lines
950 if ((uint64_t)atom.size > (1<<30))979 if ((uint64_t)atom.size > (1<<30))
951 return -1;980 return -1;
952 981
982 if (atom.size >= 10) {
983 // Broken files created by legacy versions of Libav and FFmpeg will
984 // wrap a whole fiel atom inside of a glbl atom.
985 unsigned size = avio_rb32(pb);
986 unsigned type = avio_rl32(pb);
987 avio_seek(pb, -8, SEEK_CUR);
988 if (type == MKTAG('f','i','e','l') && size == atom.size)
989 return mov_read_default(c, pb, atom);
990 }
953 av_free(st->codec->extradata);991 av_free(st->codec->extradata);
954 st->codec->extradata = av_mallocz(atom.size + FF_INPUT_BUFFER_PADDING_SIZE);992 st->codec->extradata = av_mallocz(atom.size + FF_INPUT_BUFFER_PADDING_SIZE);
955 if (!st->codec->extradata)993 if (!st->codec->extradata)
libavformat/movenc.c+20−1
@@ -799,6 +799,23 @@ static int mov_write_uuid_tag_ipod(AVIOContext *pb) · 798 unmodified lines
799 return 28;799 return 28;
800}800}
801 801
802static const uint16_t fiel_data[] = {
803 0x0000, 0x0100, 0x0201, 0x0206, 0x0209, 0x020e
804};
805
806static int mov_write_fiel_tag(AVIOContext *pb, MOVTrack *track)
807{
808 unsigned mov_field_order = 0;
809 if (track->enc->field_order < FF_ARRAY_ELEMS(fiel_data))
810 mov_field_order = fiel_data[track->enc->field_order];
811 else
812 return 0;
813 avio_wb32(pb, 10);
814 ffio_wfourcc(pb, "fiel");
815 avio_wb16(pb, mov_field_order);
816 return 10;
817}
818
802static int mov_write_subtitle_tag(AVIOContext *pb, MOVTrack *track)819static int mov_write_subtitle_tag(AVIOContext *pb, MOVTrack *track)
803{820{
804 int64_t pos = avio_tell(pb);821 int64_t pos = avio_tell(pb);
@@ -885,7 +902,9 @@ static int mov_write_video_tag(AVIOContext *pb, MOVTrack *track) · 80 unmodified lines
885 mov_write_avcc_tag(pb, track);902 mov_write_avcc_tag(pb, track);
886 if(track->mode == MODE_IPOD)903 if(track->mode == MODE_IPOD)
887 mov_write_uuid_tag_ipod(pb);904 mov_write_uuid_tag_ipod(pb);
888 } else if(track->vosLen > 0)905 } else if (track->enc->field_order != AV_FIELD_UNKNOWN)
906 mov_write_fiel_tag(pb, track);
907 else if(track->vosLen > 0)
889 mov_write_glbl_tag(pb, track);908 mov_write_glbl_tag(pb, track);
890 909
891 if (track->enc->sample_aspect_ratio.den && track->enc->sample_aspect_ratio.num &&910 if (track->enc->sample_aspect_ratio.den && track->enc->sample_aspect_ratio.num &&
libswscale/swscale_internal.h+4−2
@@ -655,9 +655,11 @@ const char *sws_format_name(enum PixelFormat format); · 654 unmodified lines
655 || isBGRinInt(x) \655 || isBGRinInt(x) \
656 )656 )
657#else657#else
658#define isPacked(x) \658#define isPacked(x) (\
659 (av_pix_fmt_descriptors[x].nb_components >= 2 && \659 (av_pix_fmt_descriptors[x].nb_components >= 2 && \
660 !(av_pix_fmt_descriptors[x].flags & PIX_FMT_PLANAR))660 !(av_pix_fmt_descriptors[x].flags & PIX_FMT_PLANAR)) || \
661 (x) == PIX_FMT_PAL8\
662 )
661 663
662#endif664#endif
663#define isPlanar(x) \665#define isPlanar(x) \

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t