Janne Grunau
fd095539d1
latmdec: fix audio specific config parsing
...
Pass the correct size in bits to mpeg4audio_get_config and add a flag
to disable parsing of the sync extension when the size is not known.
Latm with AudioMuxVersion 0 does not specify the size of the audio
specific config. Data after the audio specific config can be
misinterpreted as sync extension resulting in random and wrong configs.
2011-12-03 00:42:48 +01:00
Justin Ruggles
0eea212943
Add avcodec_decode_audio4().
...
Deprecate avcodec_decode_audio3().
Implement audio support in avcodec_default_get_buffer().
Implement the new audio decoder API in all audio decoders.
2011-12-02 17:40:40 -05:00
Justin Ruggles
560f773c7d
avcodec: change number of plane pointers from 4 to 8 at next major bump.
...
Add AV_NUM_DATA_POINTERS to simplify the bump transition.
This will allow for supporting more planar audio channels without having to
allocate separate pointer arrays.
2011-12-02 17:40:40 -05:00
Mans Rullgard
51a16077da
svq1dec: avoid undefined get_bits(0) call
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-12-02 21:52:09 +00:00
Mans Rullgard
59807fee6d
ARM: h264dsp_neon cosmetics
...
- Replace 'ip' with 'r12'.
- Use correct size designators for vld1/vst1.
- Whitespace fixes.
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-12-02 19:59:18 +00:00
Janne Grunau
a760f530bb
ARM: make some NEON macros reusable
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-12-02 19:59:18 +00:00
Aaron Colwell
e02dec25ab
vp8: flush buffers on size changes.
2011-12-02 07:21:08 -08:00
Peter Ross
1fd6924320
pictordec: support uncompressed images
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-02 14:41:10 +01:00
Mashiat Sarker Shakkhar
460bec6800
Fix lms_update()
2011-12-02 16:24:50 +06:00
Nathan Adil Maxson
d0fd6fc201
Cleaned up alacenc.c
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-12-01 20:14:21 -08:00
Carl Eugen Hoyos
bba8975a9c
Be less verbose when skipping RBSP data in H264 PPS.
...
Fixes ticket #693 .
2011-12-02 03:29:24 +01:00
Carl Eugen Hoyos
fab5973fa5
Be less verbose when skipping MPEG-4 ASP frames.
...
Fixes ticket #560 .
2011-12-02 03:27:14 +01:00
Carl Eugen Hoyos
40c36196d5
Support yuva420p encoding via libopenjpeg.
2011-12-02 03:26:21 +01:00
Carl Eugen Hoyos
d7fc100694
Support tiff RGBA encoding.
2011-12-02 03:23:07 +01:00
Paul B Mahol
7bd8b70f19
escape130: fix colors
2011-12-02 01:19:42 +00:00
Michael Niedermayer
7b0b10ce41
Merge remote-tracking branch 'qatar/master'
...
* qatar/master: (25 commits)
rtpenc: Add support for G726 audio
rtpdec: Interpret the different G726 names as bits_per_coded_sample
rtpenc: Change rtp_send_samples to handle sample sizes other than even bytes
rtpenc: Cast a rescaling parameter to int64_t
h264: cap max has_b_frames at MAX_DELAYED_PIC_COUNT - 1.
ARM: fix indentation in ff_dsputil_init_neon()
ARM: NEON put/avg_pixels8/16 cosmetics
ARM: add remaining NEON avg_pixels8/16 functions
ARM: clean up NEON put/avg_pixels macros
fate: split acodec-pcm into individual tests
swscale: #include "libavutil/mathematics.h"
pmpdec: don't use deprecated av_set_pts_info.
rv34: align temporary block of "dct" coefs
Add PlayStation Portable PMP format demuxer
proto: Realign struct initializers
proto: Use .priv_data_size to allocate the private context
mmsh: Properly clean up if the second ffurl_alloc failed
rtmp: Clean up properly if the handshake failed
md5proto: Remove the get_file_handle function
applehttpproto: Use the close function if the open function fails
...
Conflicts:
libavcodec/vble.c
libavformat/mmsh.c
libavformat/pmpdec.c
libavformat/udp.c
tests/ref/acodec/pcm
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-02 00:51:11 +01:00
Carl Eugen Hoyos
8b08f81949
Support transparency in 32bit bmp files.
2011-12-02 00:21:24 +01:00
Derek Buitenhuis
69035f3ec7
Revert "libutvideodec: Make buf_size local"
...
This change was dependent on a different patch that
never actually made it into FFmpeg, and it actually
ended up breaking builds.
This reverts commit 70cf7bb958
.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-01 23:35:54 +01:00
Mashiat Sarker Shakkhar
075ebdf735
Move num_lms reading out of a loop
2011-12-02 03:11:59 +06:00
Mashiat Sarker Shakkhar
29c2fcb677
Use correct value for range
...
The current range value causes an underflow
when negated and pushes anything less than zero
to the minimum.
2011-12-02 03:11:21 +06:00
Mashiat Sarker Shakkhar
768261e50d
Fix some int / int16_t / int32_t confusion
...
For now force everything to int16_t, except
for variables used as index
2011-12-02 03:09:19 +06:00
Ronald S. Bultje
2574f08d4c
h264: cap max has_b_frames at MAX_DELAYED_PIC_COUNT - 1.
...
This prevents frame allocation overflows, and fixed
fate-h264-conformance-mr3_tandberg_b with 2 threads.
2011-12-01 12:46:28 -08:00
Michael Niedermayer
dd974c1bc1
libx264: Implement rgb24 support through a seperate AVCodec.
...
This avoids people mistakely encoding in a way that many players dont support.
Fixes Ticket658
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-01 21:02:57 +01:00
Mans Rullgard
3adba2de3d
ARM: fix indentation in ff_dsputil_init_neon()
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-12-01 19:41:36 +00:00
Mans Rullgard
96fef6cf31
ARM: NEON put/avg_pixels8/16 cosmetics
...
This makes whitespace and register names consistent with
the style used in more recent code.
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-12-01 19:41:36 +00:00
Mans Rullgard
716f1705e9
ARM: add remaining NEON avg_pixels8/16 functions
2011-12-01 19:41:36 +00:00
Mans Rullgard
94267ddfb2
ARM: clean up NEON put/avg_pixels macros
...
Although this adds a few lines, the macro calls are less convoluted.
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-12-01 19:41:35 +00:00
Michael Niedermayer
4a8e3324fb
libx264: fix generic boolean support
...
Fixes Ticket660
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-01 20:38:14 +01:00
Michael Niedermayer
b50be4e38d
vc1_parser: fix NULL pointer dereference
...
Fixes Ticket456
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-01 18:46:22 +01:00
Michael Niedermayer
3e1951e8f4
h264: More restrictive more_rbsp_data_in_pps()
...
Fixes Ticket697
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-01 17:28:46 +01:00
Paul B Mahol
1e8f77324e
escape130: remove trailing whitespace
2011-12-01 15:32:21 +00:00
Paul B Mahol
06029fbb7f
escape130: minimal effort to make it compile without warnings
2011-12-01 15:32:20 +00:00
Eli Friedman
7d64391441
Escape 130 (RPL) decoder
2011-12-01 15:32:20 +00:00
Mans Rullgard
37fed0e635
rv34: align temporary block of "dct" coefs
...
This is needed for optimised transforms.
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-12-01 14:29:29 +00:00
Peter Ross
f3f488423a
pictordec: prevent segfault when reading corrupted files
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-01 14:35:46 +01:00
Peter Ross
43a2a8b4a3
pictordec: use correct context for another av_log
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-01 14:34:46 +01:00
Michael Niedermayer
adfdcf87b1
vble: use dsp.add_hfyu_median_prediction() this allows asm optimizations to be used.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-11-30 21:06:32 -08:00
Michael Niedermayer
317ea97bff
vble: remove flags copy, its not used in any speed relevant code.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-11-30 21:06:15 -08:00
Derek Buitenhuis
e46abbcf77
vble: merge len and val arrays
...
There's no reason to use two arrays for this.
Based off commit 2fea60c600
to FFmpeg by Michael Niedermayer.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-11-30 21:05:55 -08:00
Michael Niedermayer
0dd704dbd4
vble: remove unused variable len.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-11-30 21:05:31 -08:00
Michael Niedermayer
9d76cf0b18
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
rtpdec: Templatize the code for different g726 bitrate variants
rv40: move loop filter to rv34dsp context
lavf: make av_set_pts_info private.
rtpdec: Add support for G726 audio
rtpdec: Add an init function that can do custom codec context initialization
avconv: make copy_tb on by default.
matroskadec: don't set codec timebase.
rmdec: don't set codec timebase.
avconv: compute next_pts from input packet duration when possible.
lavf: estimate frame duration from r_frame_rate.
avconv: update InputStream.pts in the streamcopy case.
Conflicts:
avconv.c
libavdevice/alsa-audio-dec.c
libavdevice/bktr.c
libavdevice/fbdev.c
libavdevice/libdc1394.c
libavdevice/oss_audio.c
libavdevice/v4l.c
libavdevice/v4l2.c
libavdevice/vfwcap.c
libavdevice/x11grab.c
libavformat/au.c
libavformat/eacdata.c
libavformat/flvdec.c
libavformat/mpegts.c
libavformat/mxfenc.c
libavformat/rtpdec_g726.c
libavformat/wtv.c
libavformat/xmv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-01 02:54:24 +01:00
Michael Bradshaw
0275b75a7e
BPP fix, YUVP9, 10, 16 support, make RGB24 default
2011-11-30 16:48:03 -07:00
Carl Eugen Hoyos
9dcd8b86f9
Use correct context for av_log.
...
Fixes ticket #695 .
2011-12-01 00:28:46 +01:00
Janne Grunau
bb8a6e03cc
rv40: move loop filter to rv34dsp context
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-11-30 20:54:59 +00:00
Michael Niedermayer
77af2672b4
lavc: Fix side data handling for audio decoders.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-30 21:19:23 +01:00
Michael Niedermayer
11828b8885
nellymoserdec: Use sidedata to support mid stream sample rate changes.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-30 21:17:57 +01:00
Michael Niedermayer
fd3e75d2d4
lavc: horizontal align for IFF
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-30 18:45:33 +01:00
Mashiat Sarker Shakkhar
8aa831c07b
Implement revert_mclms() and associated functions
2011-11-30 22:44:59 +06:00
Mashiat Sarker Shakkhar
bf8715719a
Fix two more int16_t vs. int confusion
...
If everything works fine for 16-bit streams,
the current code could be extended to do 24-bit.
2011-11-30 22:44:45 +06:00
Michael Niedermayer
dd32a305bd
wmall: fix return type of dump_int_buffer()
...
Found-by: Dominique Leuenberger
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-30 15:23:39 +01:00
Michael Niedermayer
dae7ff0416
wmall: remove tabs that leaked in from a merge and seem to have
...
managed to silently bypass the push checks.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-30 15:21:46 +01:00
Michael Niedermayer
c40a35f8a7
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
indeo3: check per-plane data buffer against input buffer bounds.
avconv: Handle audio sync for non-S16 sample formats.
pthread: don't increment index on zero-sized packets.
Conflicts:
libavcodec/indeo3.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-30 02:34:35 +01:00
Mashiat Sarker Shakkhar
be8a0d26db
Init s->cdlms[][].recent to order - 1
...
Not sure if this is correct. But looks like
it was giving us off-by-one's when used to index
buffers.
2011-11-30 02:17:44 +06:00
Mashiat Sarker Shakkhar
6dd19c97c4
Add a size argument to dump_int_buffer()
2011-11-30 02:16:48 +06:00
Mashiat Sarker Shakkhar
81a3c67169
Get rid of logging that are not required anymore
...
(Resolves some conflicts)
2011-11-30 02:15:08 +06:00
Mashiat Sarker Shakkhar
e6c66fcf68
Fix some int vs. int16_t confusion
...
Size should be determined from bits per sample.
The current code only accepts 16-bit streams.
2011-11-30 02:06:12 +06:00
Reimar Döffinger
7076967786
Consistently use %ifdef ARCH_X86_64
...
One out of 3 places used ifndef, which is needlessly confusing.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2011-11-29 19:55:38 +01:00
Aneesh Dogra
464ccb0144
indeo3: check per-plane data buffer against input buffer bounds.
...
Fixes : http://bugzilla.libav.org/show_bug.cgi?id=102
Signed-off-by: Alex Converse <alex.converse@gmail.com>
2011-11-29 09:58:05 -08:00
Michael Niedermayer
4b4a02b847
lavc: dont call set_dimensions() on h264 codec init.
...
This fixes ffprobe showing an incorrect width with
http://panda-test-harness-videos.s3.amazonaws.com/panda.mp4
Idea-by: Joakim Plate <elupus@ecce.se>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-29 17:33:35 +01:00
Michael Niedermayer
6ffdc262b0
ac3enc: clenaup project name in one comment
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-29 16:09:56 +01:00
Aaron Colwell
39a7a5b8ab
pthread: don't increment index on zero-sized packets.
...
The next call to decode() will update from an invalid index, which will
either lead to a memcpy() where dest==src (2 threads), or lead to a
crash (>2 threads).
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-11-28 20:30:30 -08:00
Michael Niedermayer
4dcd1a3145
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
adtsenc: Check frame size.
txd: Fix order of operations.
APIchanges: fill in some blanks
timer: fix misspelling of "decicycles"
Eliminate pointless 0/NULL initializers in AVCodec and similar declarations.
indeo3: cosmetics
md5proto: Fix order of operations.
dca: Replace oversized unused get_bits() with skip_bits_long().
Conflicts:
doc/APIchanges
libavformat/mmsh.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-29 00:20:29 +01:00
Alex Converse
a27805189b
txd: Fix order of operations.
2011-11-28 11:22:36 -08:00
Michael Niedermayer
4b03d96022
ffv1dec: use PIX_FMT_0RGB32 when there is no transparency plane
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-28 17:41:27 +01:00
Michael Niedermayer
2027d073ae
ffv1dec: transparency plane support.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-28 17:40:39 +01:00
Michael Niedermayer
492aab8589
ffv1enc: PIX_FMT_0RGB32 support
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-28 17:39:25 +01:00
Michael Niedermayer
f7b160e829
ffv1enc: Store transparency plane.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-28 17:38:04 +01:00
Michael Niedermayer
ae5873f13b
huffyuvenc: switch from alphaless rgb32 to rgb24
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-28 15:14:41 +01:00
Clément Bœsch
b1ca5634fd
mpeg12: raise timecode to codec context.
2011-11-28 14:06:02 +01:00
Diego Biurrun
c88ebdb42c
Eliminate pointless 0/NULL initializers in AVCodec and similar declarations.
2011-11-28 10:01:50 +01:00
Kostya Shishkov
1469f943ad
indeo3: cosmetics
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2011-11-28 10:01:49 +01:00
Michael Niedermayer
d3fc335bac
huffyuvenc: support alphaless rgb32
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-28 04:29:42 +01:00
Michael Niedermayer
0af7d7082f
huffyuvenc: store alpha for bgr32
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-28 04:14:22 +01:00
Michael Niedermayer
1e19927f12
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
vc1: use an enum for Frame Coding Mode
doc: cleanup filter section
indeo3: error out if no motion vector is set.
x86inc: Flag shufps as an floating-point instruction for the AVX emulation code.
mpegaudio: do not use init_static_data() for initializing tables.
musepack: fix signed shift overflow in mpc_read_packet()
mov: Make format string match variable type.
wmavoice: Make format string match variable type.
vc1: select interlaced scan table by FCM element
Generalize RIFF INFO tag support; support reading INFO tag in wav
pthread: track thread existence in a separate variable.
Conflicts:
doc/filters.texi
libavcodec/pthread.c
libavformat/avi.c
libavformat/riff.c
libavformat/riff.h
libavformat/wav.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-28 01:07:11 +01:00
Alex Converse
999e7ebd23
dca: Replace oversized unused get_bits() with skip_bits_long().
2011-11-27 15:57:38 -08:00
Luca Barbato
1f948745c3
vc1: use an enum for Frame Coding Mode
...
Document it a little and possibly fix a bug in dxva2_vc1.
2011-11-28 00:40:22 +01:00
Aneesh Dogra
97980db487
indeo3: error out if no motion vector is set.
...
This fixes a crash on a corrupt bitstream (bugzilla #93 ).
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-11-27 13:30:00 -08:00
Michael Niedermayer
e64edeed3c
aacenc: make the aac coder user choosable.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-27 21:19:30 +01:00
Michael Niedermayer
1b1223872d
aacenc: add AAC_CODER_NB
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-27 21:19:07 +01:00
Justin Ruggles
0df5e869cb
mpegaudio: do not use init_static_data() for initializing tables.
...
It is called once for each mpegaudio codec that is registered, which adds
significant overhead.
2011-11-27 13:59:34 -05:00
Michael Niedermayer
47044625ba
pthread: check pthread_create() return value.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-27 06:17:03 +01:00
Michael Niedermayer
2bb79b23fe
pthread: next try on freeing threads without crashing.
...
This should fix mingw
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-27 05:55:20 +01:00
Alex Converse
f11b0e9543
wmavoice: Make format string match variable type.
2011-11-26 19:40:34 -08:00
Kostya Shishkov
498605b4ad
vc1: select interlaced scan table by FCM element
...
Interlaced videos can contain progressive frames too and now wrong scantable
is selected for them.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-11-26 18:14:07 -08:00
Peter Ross
3d977edb04
HAM6/HAM8 support for IFF ACBM decoder
...
Based on patch by ami_stuff
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-27 03:11:08 +01:00
Peter Ross
b488679510
iff: fix invalid reads (ticket 689)
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-27 03:11:08 +01:00
Cheng Sun
3f5aa7dfa6
pthread: track thread existence in a separate variable.
...
This fixes a compile error on mingw32 when using p->thread
directly (as if it were a pointer) to track thread existence,
because the type is opaque and may be a non-pointer.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-11-26 17:14:13 -08:00
Kostya Shishkov
801393bc96
vc1: select interlaced scan table by FCM element
...
Interlaced videos can contain progressive frames too and now wrong scantable
is selected for them.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-27 02:03:25 +01:00
Michael Niedermayer
5c15b78e4a
Merge remote-tracking branch 'qatar/master'
...
* qatar/master: (42 commits)
swscale: fix signed overflow in yuv2mono_X_c_template
snow: fix integer overflows
svq1enc: remove stale altivec-related hack
snow: fix signed overflow in byte to 32-bit replication
adx: rename ff_adx_decode_header() to avpriv_adx_decode_header()
avformat: add CRI ADX format demuxer
adx: add an ADX parser.
adx: move header decoding to ADX common code
adx: calculate the number of blocks in a packet
adx: define and use 2 new macro constants BLOCK_SIZE and BLOCK_SAMPLES
adx: check for unsupported ADX formats
adx: simplify encoding by using put_sbits()
adx: calculate correct LPC coeffs
adx: use 12-bit coefficients instead of 14-bit to avoid integer overflow
adx: simplify adx_decode() by using get_sbits() to read residual samples
adx: fix the data offset parsing in adx_decode_header()
adx: remove unneeded post-decode channel interleaving
adx: validate header values
adx: cosmetics: general pretty-printing and comment clean-up
adx: remove useless comments
...
Conflicts:
Changelog
libavcodec/cook.c
libavcodec/fraps.c
libavcodec/nuv.c
libavcodec/pthread.c
libavcodec/version.h
libavformat/Makefile
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-27 00:30:13 +01:00
Mans Rullgard
8540dcfd7a
snow: fix integer overflows
...
The way these values are used, they should have an unsigned type.
A similar change was made for mpegvideo in cb66847
.
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-11-26 22:53:47 +00:00
Mans Rullgard
0e55edcb57
svq1enc: remove stale altivec-related hack
...
altivec.h is no longer (indirectly) included, so this hack is not
needed.
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-11-26 22:53:47 +00:00
Mans Rullgard
ff6d9cc558
snow: fix signed overflow in byte to 32-bit replication
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-11-26 22:53:46 +00:00
Michael Niedermayer
4fd5e7639b
vc1: Fix pic_header_flag=0 (SA10143.vc1)
...
Bug introduced in:
commit 4509be3d2f
Author: Michael Niedermayer <michaelni@gmx.at>
Date: Tue Oct 11 11:56:42 2011 +0200
vc1: reset interlaced variables, prevent another bunch of crashes.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-26 23:13:50 +01:00
Justin Ruggles
9d2dd356c2
adx: rename ff_adx_decode_header() to avpriv_adx_decode_header()
...
It is used by the ADX decoder, and therefore needs to be exported in order to
work with shared libs.
2011-11-26 17:00:00 -05:00
Justin Ruggles
a17c3c7d15
avformat: add CRI ADX format demuxer
2011-11-26 16:25:07 -05:00
Justin Ruggles
27360ccc5e
adx: add an ADX parser.
...
This simplifies the decoder so it doesn't have to process an in-packet header
or handle arbitrary-sized packets. It also fixes decoding of files with large
headers.
2011-11-26 16:25:07 -05:00
Justin Ruggles
d8cec2d7fc
adx: move header decoding to ADX common code
2011-11-26 16:25:07 -05:00
Justin Ruggles
7ff55d9bdb
adx: calculate the number of blocks in a packet
2011-11-26 16:25:07 -05:00
Justin Ruggles
05c1f11b56
adx: define and use 2 new macro constants BLOCK_SIZE and BLOCK_SAMPLES
2011-11-26 16:25:07 -05:00
Justin Ruggles
d1745619db
adx: check for unsupported ADX formats
2011-11-26 16:25:07 -05:00
Justin Ruggles
994238536a
adx: simplify encoding by using put_sbits()
2011-11-26 16:25:07 -05:00
Justin Ruggles
b237248e29
adx: calculate correct LPC coeffs
...
Instead of using fixed coefficients, the correct way is to calculate the
coefficients using the highpass cutoff frequency from the ADX stream header
and the sample rate.
2011-11-26 16:25:06 -05:00
Justin Ruggles
954d94dd5e
adx: use 12-bit coefficients instead of 14-bit to avoid integer overflow
2011-11-26 16:25:06 -05:00
Justin Ruggles
c52ddc6024
adx: simplify adx_decode() by using get_sbits() to read residual samples
2011-11-26 16:25:06 -05:00
Justin Ruggles
ca9e4727ba
adx: fix the data offset parsing in adx_decode_header()
...
first 2 bytes are 0x80, 0x00. offset is only 16-bit.
this is according to format descriptions on multimedia wiki and wikipedia.
2011-11-26 16:25:06 -05:00
Justin Ruggles
837bbd19eb
adx: remove unneeded post-decode channel interleaving
...
instead interleave channels while decoding
2011-11-26 16:25:06 -05:00
Justin Ruggles
e2d1eace00
adx: validate header values
2011-11-26 16:25:06 -05:00
Justin Ruggles
8db67610c0
adx: cosmetics: general pretty-printing and comment clean-up
2011-11-26 16:25:06 -05:00
Justin Ruggles
fbc79a9101
adx: remove useless comments
2011-11-26 16:25:06 -05:00
Justin Ruggles
e0722d7fb7
adx: change short to int16_t
2011-11-26 16:25:06 -05:00
Justin Ruggles
dd1b9f7cd9
adx: rename struct PREV to ADXChannelState
2011-11-26 16:25:06 -05:00
Mans Rullgard
3a83b2461e
dnxhdenc: fix signed overflows
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-11-26 20:52:10 +00:00
Mans Rullgard
b6ae086682
dv: simplify bitstream splicing in dv_decode_ac()
...
This is simpler and fixes some overflow checker warnings.
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-11-26 20:52:09 +00:00
Mans Rullgard
b02aa3a8ea
s3tc: fix shift overflow by using unsigned constant
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-11-26 18:50:42 +00:00
Mans Rullgard
f7f892e4d5
svq1enc: fix signed multiplication overflow
...
This multiplication can overflow the signed range but not the
unsigned. After right-shifting it will thus fit in the signed
range again.
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-11-26 18:50:27 +00:00
Mans Rullgard
e4faa31a0a
svq1dec: use sign_extend()
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-11-26 18:50:02 +00:00
Mans Rullgard
171ec81223
rv34: fix signed multiplication overflow
...
Multiply by unsigned 0x01010101 to replicate bytes into 32-bit
word.
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-11-26 18:49:51 +00:00
Cheng Sun
e524eadbf8
[PATCH] Fix crash when initializing multi-threaded decoding for corrupted file.
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-11-26 10:46:08 -08:00
Michael Niedermayer
61c2cec957
pthreads: fix segfault due to the thread beimg killed before it has been allocated
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-26 17:55:01 +01:00
kaptnole
cb8db6423a
aacdec: Fix Sound fragments after seeking
...
Fixes Ticket420
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-26 14:37:39 +01:00
Mans Rullgard
b7581b5c83
cook: use a table for xor key rotation
...
This is simpler and avoids an invalid shift by 32 in the
aligned case.
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-11-26 11:38:41 +00:00
Mans Rullgard
644bff6c9b
apedec: fix signed integer overflows
...
This bit manipulation is equivalent but avoids undefined
shifts and overflows.
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-11-26 11:38:41 +00:00
Mans Rullgard
93c286e54f
qtrle: simplify 32-bit decode using intreadwrite macros
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-11-26 11:38:41 +00:00
Mans Rullgard
3bd1162a52
gif: fix invalid signed shifts
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-11-26 11:38:40 +00:00
Reimar Döffinger
7fb55e0b02
rtjpeg: simplify get_block() by using get_bits_left.
...
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-11-26 08:40:51 +01:00
Reimar Döffinger
7a62ddb689
rtjpeg: check get_block return value for error.
...
This avoids crashes due to reading out-of-bounds.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-11-26 08:39:58 +01:00
Reimar Döffinger
f6afacdb3b
nuv: check per-frame header for validity.
...
Since it contains dimensions parsing an invalid one has rather
annoying effects.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-11-26 08:38:59 +01:00
Reimar Döffinger
785baa738a
nuv: use FFALIGN.
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-11-26 08:38:14 +01:00
Carl Eugen Hoyos
1484b5dec5
flicvideo: check extradata_size before accessing extradata.
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-11-26 08:36:16 +01:00
Michael Niedermayer
5ace144fe0
fraps: check for overread.
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-11-26 08:35:57 +01:00
K.Y.H
51f316a997
cook: fix apparent typo in extradata parsing
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-11-26 08:33:31 +01:00
Anton Khirnov
488eec1044
lavc: update doxy to use nondeprecated API.
2011-11-26 08:26:24 +01:00
Michael Niedermayer
022f8d27dd
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
swscale: Readd #define _SVID_SOURCE
Fix av_get_channel_layout_string() for positions >31
configure: Store vda lib flags in extralibs instead of ldflags
Make channel layout masks unsigned
dca: ARMv6 optimised decode_blockcode()
nullenc: drop AVFMT_RAWPICTURE from the flags
frame-mt: return consumed packet size in ff_thread_decode_frame
aacdec: add more fate tests covering SBR and PS
MK(BE)TAG: avoid undefined shifts
Conflicts:
configure
libavcodec/arm/dca.h
libavcodec/dca.c
libavcodec/mlp_parser.c
libavcodec/version.h
libavfilter/asrc_anullsrc.c
libavfilter/avfilter.c
libavfilter/avfilter.h
libavfilter/defaults.c
libavutil/audioconvert.c
libavutil/avutil.h
libswscale/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-26 01:12:08 +01:00
Michael Niedermayer
fc75e6f168
vc1dec: fix scantable for advanced P frames
...
Fixes: vc1 file from Ticket606
Fixes: vc1+vc1+++artifacts*.vc1
Fixes: mpeg+vc1+++salxxos.evo
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-25 23:44:39 +01:00
Michael Niedermayer
a3b3562b47
vc1dec: fix 10l typo
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-25 22:46:17 +01:00
Michael Niedermayer
9e794d103c
vc1dec: drop damaged B frames
...
Fixes: vc1_error_spilt.avi of Ticket606
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-25 20:55:25 +01:00
Michael Niedermayer
7d52f46db7
vc1dec: fix used ER flags in vc1_decode_b_blocks()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-25 20:54:57 +01:00
Michael Niedermayer
1afe49b062
indeo3: out of array read checks for decode_plane()
...
Fixes: avi+indeo3+++1-dog.avi
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-25 18:04:17 +01:00
Michael Niedermayer
e9e642cbfb
indeo3: Check remaining bits in parse_bintree()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-25 17:55:23 +01:00
Anatoly Nenashev
a7cfef2994
H264: Check if more RBSP data in PPS provided by current profile due to Annex A.
...
This patch also fix issue https://ffmpeg.org/trac/ffmpeg/ticket/685 .
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-25 17:10:47 +01:00
Mans Rullgard
cc276c85d1
Make channel layout masks unsigned
...
It makes more sense for a bit mask to use an unsigned type.
The change should be source and binary compatible on all
supported systems, hence micro version bump.
Fixes a few invalid shifts.
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-11-25 13:19:54 +00:00
Mans Rullgard
00a856e3f9
dca: ARMv6 optimised decode_blockcode()
...
This is a hand-tuned version of the code with impossible parts of
the FASTDIV function ommitted.
2-5% faster overall on Cortex-A8.
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-11-25 13:19:53 +00:00
Janne Grunau
117e2a30f2
frame-mt: return consumed packet size in ff_thread_decode_frame
...
This is required to fulfill avcodec_decode_video2() promise to return
the number of consumed bytes on success.
2011-11-25 08:25:12 +01:00
Michael Niedermayer
92afb43162
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
snow: split snow in snowdec and snowenc
tiffenc: deprecate using compression_level
swscale: fix failing fate tests.
swscale: add support for planar RGB input.
h264: add support for decoding planar RGB images.
Clean up swscale pixfmt macros using av_pix_fmt_descriptors[].
pixfmt: add planar RGB formats.
Conflicts:
libavcodec/h264.c
libavcodec/snow.c
libavcodec/utils.c
libavutil/avutil.h
libavutil/pixdesc.c
libavutil/pixfmt.h
libswscale/swscale.c
libswscale/swscale_internal.h
libswscale/swscale_unscaled.c
libswscale/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-25 04:34:44 +01:00
Michael Niedermayer
e421b79d01
indeo3: fix null pointer dereference in vulnerable.mov
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-24 22:39:23 +01:00
Alex Zhukov
eb511ef636
yuv pixel formats support in openjpeg decoder + 10bit support
...
Signed-off-by: Alex Zhukov <zhukov.alex@gmail.com>
Reviewed-by: Jean First <jeanfirst@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-24 21:51:15 +01:00
Luca Barbato
7f1b427018
snow: split snow in snowdec and snowenc
...
The common non inlined code goes in snow.c, the common inlined code in
snow.h, tables move in snowdata.h (included only by snow.c)
2011-11-24 21:35:47 +01:00
Anton Khirnov
8b7412fe4e
tiffenc: deprecate using compression_level
2011-11-24 21:31:36 +01:00
Ronald S. Bultje
db431f7efe
h264: add support for decoding planar RGB images.
2011-11-24 08:25:36 -08:00
Michael Niedermayer
2bf09826c1
loco: Fix error handling.
...
Fixes null pointer dereference / http://www.google-melange.com/gci/task/view/google/gci2011/7120335
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-24 15:39:41 +01:00