RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-25 16:52:31 +00:00
Code Issues Projects Releases Wiki Activity
38,403 Commits 37 Branches 400 Tags 244 MiB
79ae084e9b
Commit Graph

38403 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
79ae084e9b Merge remote-tracking branch 'qatar/master' 
* qatar/master: (58 commits)
  amrnbdec: check frame size before decoding.
  cscd: use negative error values to indicate decode_init() failures.
  h264: prevent overreads in intra PCM decoding.
  FATE: do not decode audio in the nuv test.
  dxa: set audio stream time base using the sample rate
  psx-str: do not allow seeking by bytes
  asfdec: Do not set AVCodecContext.frame_size
  vqf: set packet parameters after av_new_packet()
  mpegaudiodec: use DSPUtil.butterflies_float().
  FATE: add mp3 test for sample that exhibited false overreads
  fate: add cdxl test for bit line plane arrangement
  vmnc: return error on decode_init() failure.
  libvorbis: add/update error messages
  libvorbis: use AVFifoBuffer for output packet buffer
  libvorbis: remove unneeded e_o_s check
  libvorbis: check return values for functions that can return errors
  libvorbis: use float input instead of s16
  libvorbis: do not flush libvorbis analysis if dsp state was not initialized
  libvorbis: use VBR by default, with default quality of 3
  libvorbis: fix use of minrate/maxrate AVOptions
  ...

Conflicts:
	Changelog
	doc/APIchanges
	libavcodec/avcodec.h
	libavcodec/dpxenc.c
	libavcodec/libvorbis.c
	libavcodec/vmnc.c
	libavformat/asfdec.c
	libavformat/id3v2enc.c
	libavformat/internal.h
	libavformat/mp3enc.c
	libavformat/utils.c
	libavformat/version.h
	libswscale/utils.c
	tests/fate/video.mak
	tests/ref/fate/nuv
	tests/ref/fate/prores-alpha
	tests/ref/lavf/ffm
	tests/ref/vsynth1/prores
	tests/ref/vsynth2/prores

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-01 03:17:11 +01:00
Vitor Sessak
882abda5a2 amrnbdec: check frame size before decoding. 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2012-02-29 14:13:58 -08:00
Ronald S. Bultje
8a9faf33f2 cscd: use negative error values to indicate decode_init() failures. 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2012-02-29 14:04:23 -08:00
Ronald S. Bultje
d1604b3de9 h264: prevent overreads in intra PCM decoding. 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2012-02-29 13:17:34 -08:00
Justin Ruggles
f240df6a74 FATE: do not decode audio in the nuv test. 
We already have sufficient coverage for 16-bit pcm.
 2012-02-29 15:45:50 -05:00
Justin Ruggles
929dd8c108 dxa: set audio stream time base using the sample rate 2012-02-29 15:45:50 -05:00
Justin Ruggles
aa831c4093 psx-str: do not allow seeking by bytes 2012-02-29 15:45:50 -05:00
Justin Ruggles
bdbf1fa405 asfdec: Do not set AVCodecContext.frame_size 2012-02-29 15:45:50 -05:00
Justin Ruggles
4bf6775e9d vqf: set packet parameters after av_new_packet() 
Otherwise the values are overwritten.
 2012-02-29 15:45:50 -05:00
Michael Niedermayer
a77c8ade2e lavc: fix 10l oversight in realloc of avcodec_encode_video2. 
Packets are not guranteed to be allocated by av_malloc().

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-02-29 21:33:00 +01:00
Michael Niedermayer
d7bce4a274 dca: dont overread dca_default_coeffs. 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-02-29 21:18:54 +01:00
Michael Niedermayer
51db9a97e9 dca: Check scale_sum. 
Fixes a out of array read.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-02-29 21:18:54 +01:00
Michael Niedermayer
d6bc273bac dca: Check LFEScaleIndex. 
Its not clear from the spec what to do with values larger than 127
so iam opting for the safe side and ask for a sample.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-02-29 21:18:54 +01:00
Vitor Sessak
9b4cd58611 mpegaudiodec: use DSPUtil.butterflies_float(). 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2012-02-29 12:12:50 -08:00
Justin Ruggles
841c17177b FATE: add mp3 test for sample that exhibited false overreads 
related to b716542691
Error messages and audible artifacts were fixed in that commit.
 2012-02-29 15:12:18 -05:00
Paul B Mahol
31b132c094 fate: add cdxl test for bit line plane arrangement 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
 2012-02-29 15:11:05 -05:00
Ronald S. Bultje
07a180972f vmnc: return error on decode_init() failure. 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2012-02-29 11:58:27 -08:00
Justin Ruggles
a45a1ea521 libvorbis: add/update error messages 
also use AVERROR codes for some return values instead of -1
 2012-02-29 14:54:25 -05:00
Justin Ruggles
592c4dbc7e libvorbis: use AVFifoBuffer for output packet buffer 
simplifies the code and does less memmove()
 2012-02-29 14:54:24 -05:00
Justin Ruggles
1fe7c1be54 libvorbis: remove unneeded e_o_s check 
vorbis_bitrate_flushpacket() does not return any packets that should not be
output in the bitstream.
 2012-02-29 14:54:24 -05:00
Justin Ruggles
94025d8a99 libvorbis: check return values for functions that can return errors 2012-02-29 14:54:24 -05:00
Justin Ruggles
c5063e0348 libvorbis: use float input instead of s16 
libvorbis takes float input, so we can just deinterleave/reorder the input
as-is instead of also converting.
 2012-02-29 14:54:24 -05:00
Justin Ruggles
f15c4281dc libvorbis: do not flush libvorbis analysis if dsp state was not initialized 
Fixes a segfault if init() fails before initializing the dsp state
 2012-02-29 14:54:23 -05:00
Justin Ruggles
147ff24a0e libvorbis: use VBR by default, with default quality of 3 2012-02-29 14:54:20 -05:00
Justin Ruggles
182d4f1f38 libvorbis: fix use of minrate/maxrate AVOptions 
- enable the options for audio encoding
- properly check for user-set maxrate
- use correct calling order in vorbis_encode_setup_managed()
 2012-02-29 14:44:15 -05:00
Justin Ruggles
eb35ef2932 libvorbis: cosmetics: renaming/pretty-printing/comments/unused code 2012-02-29 14:44:15 -05:00
Justin Ruggles
4e99501f62 (e)ac3enc: select a default bit rate based on the channel layout 2012-02-29 14:36:00 -05:00
Justin Ruggles
6aeea1dfb2 ac3enc: choose the closest bit rate to the one requested instead of failing 2012-02-29 14:36:00 -05:00
Ronald S. Bultje
78e9852a2e rpza: error out on buffer overreads. 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2012-02-29 11:21:01 -08:00
Ronald S. Bultje
e54ae60e46 qtrle: return error on decode_init() failure. 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2012-02-29 11:20:29 -08:00
Ronald S. Bultje
791de61bbb swscale: fix another integer overflow. 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2012-02-29 11:19:03 -08:00
Martin Storsjö
85b221e4d3 dpxenc: Don't include the libavcodec ident if bitexact mode is enabled 
This avoids breaking fate every time the lavc version is bumped.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-02-29 20:08:09 +02:00
Nicolas George
33b9fe562a encode_video2: shrink packet after encoding. 
With the encode2 API, encoders allocate huge packets to be
sure they have enough room (a typical case is mpeg4, which
allocs ~10M for 1280x768 yuv420p) but only actually use a
very small part of the buffer.
 2012-02-29 17:00:26 +01:00
Martin Storsjö
07ec1f2140 rtpenc: Fix setting the max packet size 
This fixes cases where the user had specified one desired MTU
via an option, and the protocol indicates another one.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-02-29 16:48:01 +02:00
Anton Khirnov
322537478b Add a minor bump, changelog/APIchanges entry and some documentation for APIC support. 2012-02-29 14:44:22 +01:00
Anton Khirnov
2dfea12058 mp3enc: write attached pictures (APIC). 2012-02-29 14:37:00 +01:00
Anton Khirnov
c68148b1ea mp3enc: move mp3_write_xing() further up in the file. 
It will be need by new functions called from mp3_write_trailer().
 2012-02-29 14:36:45 +01:00
Anton Khirnov
ba445f5557 id3v2enc: add a function for writing attached pictures. 
Unused so far.
 2012-02-29 14:31:17 +01:00
Anton Khirnov
24fe1a3b16 id3v2enc: fix writing frame sizes for ID3v2.3 
Frame sizes in ID3v2.3 are not synchsafe, they are simply 32be numbers.

In practice this bug is not noticeable unless the frame size takes more
than 7 bits (which is almost never for text frames).
 2012-02-29 14:30:14 +01:00
Anton Khirnov
411225aabc id3v2enc: split ff_id3v2_write(). 
This will allow writing the tag in several steps, needed for writing
attached pictures.
 2012-02-29 14:26:14 +01:00
Anton Khirnov
c199817748 id3v2enc: make id3v2_put_size take only an AVIOContext. 
It has no need of full AVFormatContext.
 2012-02-29 14:25:33 +01:00
Anton Khirnov
393fd0d89e id3v2: remove unused ff_id3v2_read(). 
Rename ff_id3v2_read_all to ff_id3v2_read().
 2012-02-29 14:19:42 +01:00
Anton Khirnov
079ea6ca5f lavf: export id3v2 attached pictures as streams. 2012-02-29 14:16:32 +01:00
Anton Khirnov
dd2a4bcfd7 lavf: generic code for exporting attached pictures. 2012-02-29 14:16:25 +01:00
Anton Khirnov
a93b09cb45 id3v2: read attached pictures and export them in ID3v2ExtraMeta. 2012-02-29 14:14:48 +01:00
Anton Khirnov
b73ad74660 lavf: move CodecMime from matroska.h to internal.h 
it will be useful for attached pictures in ID3v2
 2012-02-29 13:57:59 +01:00
Anton Khirnov
eaea76d72c swfdec: do not set codec timebase. 
It is not supposed to be set outside of lavc.

Fixes a divide by zero when the stored framerate is 0.
 2012-02-29 13:52:55 +01:00
Kostya Shishkov
12b812d2e5 prores: store and retrieve extended colourspace information 
Based on the patch by Phil Barrett.
 2012-02-29 09:29:02 +01:00
Phil Barrett
c7084182e8 proresenc: correct edge emulation 
Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
 2012-02-29 09:28:45 +01:00
Kostya Shishkov
235d693286 prores: handle 444 chroma in right order 
ProRes codes chroma blocks in 444 mode in different order than luma blocks,
so make both decoder and encoder read/write chroma blocks in right order.

Reported by Phil Barrett
 2012-02-29 09:28:34 +01:00