virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2026-06-19 19:03:00 +02:00
Code Issues Releases Activity
38,997 Commits 39 Branches 425 Tags
a246af86e47044dec243db2f708cc125d608ea78
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Anton Khirnov a246af86e4 FATE: add MSS2 tests 2014-01-09 09:44:48 +01:00
Anton Khirnov ca96e33716 vp9: drop support for real (non-emulated) edges 
They are not measurably faster on x86, they might be somewhat faster on
other platforms due to missing emu edge SIMD, but the gain is not large
enough to justify the added complexity.
 2014-01-09 09:43:59 +01:00
Anton Khirnov ef8c93e2f1 vp8: drop support for real (non-emulated) edges 
They are not measurably faster on x86, they might be somewhat faster on
other platforms due to missing emu edge SIMD, but the gain is not large
enough to justify the added complexity.
 2014-01-09 09:41:24 +01:00
Anton Khirnov ebfe622bb1 mpegvideo: drop support for real (non-emulated) edges 
Several decoders disable those anyway and they are not measurably faster
on x86. They might be somewhat faster on other platforms due to missing
emu edge SIMD, but the gain is not large enough (and those decoders
relevant enough) to justify the added complexity.
 2014-01-09 09:41:19 +01:00
Anton Khirnov 6892d145a0 segafilm: fix leaks if reading the header fails 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org
 2014-01-06 08:26:09 +01:00
Anton Khirnov 9cbf2d78f0 pthread_frame: unref decoded frames on failure 
This is similar to what the non-threaded code already does.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org
 2014-01-06 08:25:55 +01:00
Anton Khirnov a03a642d5c h264: do not use 422 functions for monochrome 
Fixes invalid memory access.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org
 2014-01-06 08:25:36 +01:00
Anton Khirnov 9eef9eb301 h264: check that execute_decode_slices() is not called too many times 
Fixes invalid reads.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org
 2014-01-06 08:25:25 +01:00
Anton Khirnov bfd26b7ce6 h264: reject mismatching luma/chroma bit depths during sps parsing 
There is no point in delaying the check and it avoids bugs with a
half-initialized context.

Fixes invalid reads.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org
 2014-01-06 08:23:45 +01:00
Anton Khirnov 9a026c7298 h264: rebuild the default ref list if the reference count changes 
Fixes possible access to freed memory.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org
 2014-01-06 08:23:17 +01:00
Anton Khirnov 4736d003fa cavsdec: check ff_get_buffer() return value 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org
 2014-01-06 08:22:48 +01:00
Anton Khirnov 50079a6aa9 lavc: do not leak the internal frame if opening the codec fails 2014-01-06 08:21:58 +01:00
Anton Khirnov 3867f3718b lavf: remove a pointless check 
AVStream.codec is always non-NULL
 2014-01-06 08:21:53 +01:00
Anton Khirnov 75647dea6f oggparseogm: check timing variables 
Fixes a potential divide by zero.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org
 2014-01-06 08:21:38 +01:00
Anton Khirnov 8058284ce0 lavc: add 422/444 YUV with alpha to align_dimensions() 
Aligns frame dimensions to 16, which fixes potential invalid writes.
 2014-01-06 08:20:56 +01:00
Anton Khirnov f4a8a00805 sgidec: fix buffer size check in expand_rle_row() 
Right now it will spuriously fail if the linesize is exactly equal to
the data width.

CC:libav-stable@libav.org
 2014-01-06 08:18:45 +01:00
Anton Khirnov adb199d1bc kgv1dec: replace forcing EMU_EDGE by a copy 
The decoder currently sets CODEC_FLAG_EMU_EDGE and relies on
get_buffer2() to always provide buffers with linesize == 2 * width.
This is wrong, since we place no such restriction on get_buffer2()
implementations.

Fix this by decoding into internal buffers and copying them to output
frames. Since this is a very obscure decoder, the performance hit should
not be an issue.
 2014-01-06 08:15:36 +01:00
Anton Khirnov fe80fa53bc 4xm: replace forcing EMU_EDGE by a copy 
The decoder currently sets CODEC_FLAG_EMU_EDGE and relies on
get_buffer2() to always provide buffers with linesize == 2 * width.
This is wrong, since we place no such restriction on get_buffer2()
implementations.

Fix this by decoding into internal buffers and copying them to output
frames. Since this is a very obscure decoder, the performance hit should
not be an issue.
 2014-01-06 08:14:14 +01:00
Anton Khirnov fffca3d278 4xm: return a proper error code. 2014-01-06 08:13:50 +01:00
Anton Khirnov a3a55645f0 mpegvideo: remove disabled bfin asm 
It has been disabled as 'broken' over 3 years ago in b716a792
 2014-01-03 16:54:24 +01:00
Anton Khirnov a4d0c6e050 mpegvideo: move dct_unquantize functions up to avoid forward declarations 2014-01-03 16:54:00 +01:00
Anton Khirnov aec25b1c46 mpegvideo: split the encoding-only parts of frame_start() into a separate function 
This introduces some code duplication. However, much of it should go
away once the decoders stop using MpegEncContext.
 2014-01-03 16:52:49 +01:00
Anton Khirnov b318106fae FATE: add a test for the lavr mixing case fixed in fc6a3ef40d 2014-01-03 16:44:03 +01:00
Anton Khirnov a8cc88b1a2 tests/Makefile: allow FILTER* to be called with lists of filter names 2014-01-03 16:43:41 +01:00
Anton Khirnov cc976a75df audio_mix: print (SKIP) instead of 0.0 for matrix columns removed along with output zeroing 2014-01-03 16:43:25 +01:00
Anton Khirnov fc6a3ef40d audio_mix: fix zeroing output channels in certain cases 
Specifically, when the corresponding input channel exists and its matrix
column is all-zero (which is necessary for zeroing the output), the
matrix column must be removed from the matrix.

This is not done currently, so the mixing code would end up using
uninitialized pointers from stack.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
 2014-01-03 16:42:46 +01:00
Anton Khirnov 3d95d27376 audio_mix: initialize the data pointers to NULL 
This should make it easier to catch problems where some of those
pointers are used uninitialized, since reading from NULL should always
crash, while random numbers from stack can turn out to be valid
pointers, so random memory may be silently overwritten.
 2014-01-03 16:42:23 +01:00
Anton Khirnov 58312b2472 h264: reset data_partitioning if decoding the slice header for NAL_DPA fails 
If it was set before then we can end up trying to decode a slice without
a valid slice header, which can lead to invalid memory access.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org
 2014-01-03 16:42:02 +01:00
Anton Khirnov e89aa4bf56 lzw: switch to bytestream2 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org
 2014-01-03 16:40:43 +01:00
Anton Khirnov 1b5d065ca7 pmpdec: check that there is at least one audio packet. 
The code cannot handle there being none, but that should not happen for
valid files.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org
 2014-01-03 16:40:22 +01:00
Anton Khirnov 94a417acc0 mathematics: remove asserts from av_rescale_rnd() 
It is a public function, it must not assert on its parameters.
 2014-01-03 16:39:30 +01:00
Anton Khirnov 24057c8320 eacmv: check the framerate before setting it. 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org
 2014-01-03 16:39:09 +01:00
Anton Khirnov 5569146d48 adx: check that the offset is not negative 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org
 2014-01-03 16:38:36 +01:00
Anton Khirnov a6a2282c25 rv30: fix extradata size check. 
It has been checking the number of bits in the offset instead of the
actual offset.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org
 2014-01-03 16:38:33 +01:00
Anton Khirnov feded990e3 mpegvideo: set reference/pict_type on generated reference frames 
Otherwise the generic code will unref them, which can then result in
last_picture_ptr == current_picture_ptr, which causes deadlocks at least
in rv40.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org
 2014-01-03 16:36:43 +01:00
Anton Khirnov 58f0d164de Makefile: add html template files to the doxygen deps 2014-01-01 13:07:57 +01:00
Anton KhirnovandDiego Biurrun dfc50ac85e x86: mpegvideo: move denoise_dct asm to mpegvideoenc 
This function is encoding-only.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2013-12-20 17:16:11 +01:00
Anton KhirnovandReinhard Tartler fe533ffdcf Prepare release notes for Libav 10 "Eks" 
Additional editing by Diego Biurrun
 2013-12-18 09:18:42 -05:00
Anton Khirnov d7b3ee9a3a lavc: deprecate avcodec_get_frame_defaults(). 
Also bump libavcodec micro and add an APIchanges entry saying that
av_frame_* should now be used instead of the lavc AVFrame functions.
 2013-12-11 20:39:55 +01:00
Anton Khirnov 598ce4ab4f h264: call av_frame_unref() instead of avcodec_get_frame_defaults(). 
This is a temporary workaround to allow deprecating
avcodec_get_frame_defaults(). The proper solution will be using a
properly allocated AVFrame in Picture.
 2013-12-11 20:39:55 +01:00
Anton Khirnov 48d17ee6dc api-example: remove an unneeded call to avcodec_get_frame_defaults(). 
avcodec_decode_audio4() resets the frame itself.
 2013-12-11 20:39:55 +01:00
Anton Khirnov 281a40e18f lavf: remove an unneeded call to avcodec_get_frame_defaults(). 
avcodec_decode_*() resets the frame itself.
 2013-12-11 20:39:55 +01:00
Anton Khirnov 2d1f4288dd mpegvideo: call av_frame_unref() instead of avcodec_get_frame_defaults(). 
This is a temporary workaround to allow deprecating
avcodec_get_frame_defaults(). The proper solution will be using a
properly allocated AVFrame in Picture.
 2013-12-11 20:39:55 +01:00
Anton Khirnov b06c8bce02 mpegvideo: remove an unneeded call to avcodec_get_frame_defaults(). 
ff_mpeg_unref_picture() already resets the frame.
 2013-12-11 20:39:55 +01:00
Anton Khirnov 84f131921f avplay: do not call avcodec_get_frame_defaults(). 
avcodec_decode_audio4() will reset the frame itself.
 2013-12-11 20:39:55 +01:00
Anton Khirnov 95a8a5aca6 lavc: call av_frame_unref() instead of avcodec_get_frame_defaults(). 
avcodec_get_frame_defaults() will be deprecated.
 2013-12-11 20:39:55 +01:00
Anton Khirnov 674fa49110 avconv: do not call avcodec_get_frame_defaults() 
Strictly speaking it is not correct to call it on refcounted frames, in
any case it is unnecessary, since filtered_frame is always unreferenced
after poll_filter() returns.
 2013-12-11 20:39:54 +01:00
Anton Khirnov 9431356218 lavc: deprecate avcodec_free_frame() 
av_frame_free() should be used instead.
 2013-12-11 20:39:54 +01:00
Anton Khirnov eb891b3114 Replace all uses of avcodec_free_frame with av_frame_free(). 2013-12-11 20:39:54 +01:00
Anton Khirnov d4f1188d1a dv: use AVFrame API properly 2013-12-09 09:10:14 +01:00
Anton Khirnov 37a749012a lavc: rework handling of refcounted_frames=0 
Use only proper AVFrame API (no assigning of whole frames, since that
hardcodes sizeof(AVFrame) into lavc).

Make a copy of the side data, so the caller can use av_frame_unref/free
on non-refcounted frames, eliminating the need for
avcodec_get_frame_defaults()/avcodec_free_frame().
 2013-12-09 08:54:29 +01:00
Anton Khirnov df7aba52b5 frame: cosmetics, reindent 2013-12-09 08:45:08 +01:00
Anton Khirnov c342132fa8 frame: copy flags in av_frame_copy_props() 
Flags can be considered metadata (at least those that are defined now).
 2013-12-09 08:45:01 +01:00
Anton Khirnov a1ee164869 lavc/decode_video(): always unref the frame if there is no output in decode_video 
Not just on failure. This is the same thing that is done in the audio
path and should prevent leaks in decoders that allocate a frame, but
then end up not writing into it.
 2013-12-09 08:44:34 +01:00
Anton Khirnov 85f947aefb lavc: remove a pointless check in decode_audio4() 
av_frame_unref() works fine on unallocated frames.
 2013-12-09 08:44:24 +01:00
Anton Khirnov d4f0f2d1e8 lavc: use buf[0] instead of data[0] as the indicator of an allocated frame 
data[0] may be NULL for valid frames with hwaccel pixel formats.
 2013-12-09 08:44:11 +01:00
Anton Khirnov e5419709f5 lavc: remove the extended_data workarounds. 
All decoders should now handle it properly.
 2013-12-09 08:42:52 +01:00
Anton Khirnov d351ef47d0 pthread_frame: use the AVFrame API properly. 
Remove the extended_data workaround, all decoders should now handle this
properly.
 2013-12-09 08:42:25 +01:00
Anton Khirnov b605b123ef mxpegdec: use the AVFrame API properly. 2013-12-09 08:41:57 +01:00
Anton Khirnov afa21a12bf p*menc: use the AVFrame API properly. 2013-12-09 08:41:20 +01:00
Anton Khirnov e2274aa555 mjpegdec: use the AVFrame API properly. 2013-12-09 08:40:29 +01:00
Anton Khirnov b73a8922d8 ljpegenc: split yuv encoding into a separate function 2013-12-05 13:38:07 +01:00
Anton Khirnov fa4476815d ljpegenc: split bgr encoding into a separate function 2013-12-05 13:37:56 +01:00
Anton Khirnov daffed3b17 ljpegenc: accept bgr24 instead of bgra 
The alpha plane is not encoded.
 2013-12-05 13:37:41 +01:00
Anton Khirnov 0cdbc4d393 ljpegenc: rename the encoding function. 
The new name is more consistent with the rest of Libav.
 2013-12-05 13:37:32 +01:00
Anton Khirnov 72c0b8f724 ljpeg: remove a commented-out line 2013-12-05 13:37:09 +01:00
Anton Khirnov 24abd806ea ljpegenc: deMpegEncContextize 
The encoder uses almost none of the mpegvideo infrastructure, only some
fields from MpegEncContext.

The FATE results change because now an all-zero quant matrix is written
into the file. Since it is not used for anything for ljpeg, this should
not be a problem.
 2013-12-05 13:35:55 +01:00
Anton Khirnov 86eb2eaac6 mjpegenc: do not pass MpegEncContext to ff_mjpeg_encode_dc() 
This will allow deMpegEncContextizing the LJPEG encoder.
 2013-12-05 13:35:30 +01:00
Anton Khirnov 3360ad9955 mjpegenc: do not pass MpegEncContext to ff_mjpeg_encode_picture_trailer() 
This will allow deMpegEncContextizing the LJPEG encoder.
 2013-12-05 13:35:15 +01:00
Anton Khirnov 058d5f2feb mjpegenc: do not pass MpegEncContext to ff_mjpeg_encode_picture_header() 
This will allow deMpegEncContextizing the LJPEG encoder.
 2013-12-05 13:34:26 +01:00
Anton Khirnov 6d70639c7d mjpegenc: do not pass MpegEncContext to jpeg_table_header() 
Pass the three needed fields from it directly.
This will allow to deMpegEncContextize the LJPEG encoder.
 2013-12-05 13:34:13 +01:00
Anton Khirnov e1eaaec765 mjpegenc: remove commented out never-to-be-finished WIP cruft 2013-12-05 13:34:01 +01:00
Anton Khirnov ff506c75b7 mjpegenc: do not pass MpegEncContext to put_huffman_table() 
It only needs PutBitContext from it, so pass that directly.
 2013-12-05 13:33:40 +01:00
Anton Khirnov a1ba1f20b3 mjpegenc: cosmetics, reformat jpeg_put_comments() 2013-12-05 13:33:29 +01:00
Anton Khirnov 0812f5a40a mjpegenc: write the JFIF header if the sample aspect ratio is set 
MpegEncContext.aspect_ratio_info is never set for mjpeg, so this was
never written before.
 2013-12-05 13:28:32 +01:00
Anton Khirnov 66499f34b5 mpegvideo: do not set current_picture_ptr in decoders 
This code was originally added in
5f1948111a to h263 to set decoded frame
pts to some random numbers (removed in
a1c5cc429d) and then cargo culted to other
decoders.

The code is left in h263dec for now, since some part of the decoder
(apparently OBMC) relies on the specific previous frame to be reused.
 2013-12-05 13:28:05 +01:00
Anton Khirnov 58a868968d FATE: drop the last partial frame in the wmv8-drm test 
This has already been done in eb066a4ce9,
but the number of frames produced from that file changed due to
timestamps changes since then.
 2013-12-05 13:27:52 +01:00
Anton Khirnov ac1fc92ea4 vc1dec: move setting repeat_pict after frame_start() has been called. 
This will allow removing the hacks where each decoder sets
current_picture_ptr on its own.
 2013-12-05 13:27:24 +01:00
Anton Khirnov 282c6a1a0e mpegvideo: make ff_release_unused_pictures() static 
It is only called from one place in mpegvideo.c now. Also remove the
remove_current parameter, which is always 1.
 2013-12-05 13:26:50 +01:00
Anton Khirnov c99307caee mpegvideo: make frame_size_alloc() static. 
It is not called from outside of mpegvideo.c anymore.
 2013-12-05 13:25:46 +01:00
Anton Khirnov 0b0a7a751d mpegvideo: move encode-only parts of common_end() to encode_end() 2013-12-05 13:25:26 +01:00
Anton Khirnov d0d111d059 mpegvideo: remove commented out cruft from ff_MPV_frame_end() 2013-12-05 13:25:15 +01:00
Anton Khirnov 381a722562 mpegvideo: split the encoding-only parts of ff_MPV_frame_end() into a separate function 2013-12-05 13:23:55 +01:00
Anton Khirnov b7254288d2 mpegvideo: do not update last_non_b_pict_type in update_thread_context() 
It is used for encoding only.
 2013-12-05 13:23:33 +01:00
Anton Khirnov 1f8eb69079 mpegvideo: move encoding-only initialization from common_init() to encode_init() 2013-12-05 13:23:03 +01:00
Anton Khirnov bedf952bb8 mpegvideo: move setting encoding-only vars from common_defaults() to encode_defaults() 2013-12-05 13:22:55 +01:00
Anton Khirnov 2cab011f0f mpegvideo: don't copy input_picture_number in update_thread_context() 
It is encoding-only, frame threading is not used for encoding.
 2013-12-05 13:22:46 +01:00
Anton Khirnov ff7ffe4809 mpeg4videodec: move showed_packed_warning from MpegEncContext to Mpeg4DecContext 2013-12-05 13:22:37 +01:00
Anton Khirnov f7d228676c mpeg4videodec: move intra_dc_threshold from MpegEncContext to Mpeg4DecContext 2013-12-05 13:22:18 +01:00
Anton Khirnov a097f0049b mpeg12dec: move first_slice from MpegEncContext to Mpeg1Context 2013-12-05 13:22:03 +01:00
Anton Khirnov ff300e435e mpegvideo: remove an unused variable 2013-12-05 13:21:57 +01:00
Anton Khirnov e41ff4210a mpeg4videodec: move use_intra_dc_vlc from MpegEncContext to Mpeg4DecContext 2013-12-05 13:19:22 +01:00
Anton Khirnov c255f0b001 avconv: initialize hwaccel_pix_fmt 
Fixes an assertion failure in vdpau_get_buffer() when -hwaccel auto is
used, but hwaccel init fails.
 2013-12-03 18:11:27 +01:00
Anton Khirnov 089fac77a6 alsa-audio-dec: explicitly cast the delay to a signed int64 
Otherwise the expression will be evaluated as unsigned, which will break
when the result should be negative.
CC:libav-stable@libav.org
 2013-12-03 12:04:26 +01:00
Anton Khirnov e026ee0446 mpeg4videodec: move sprite_{shift,traj} from MpegEncContext to Mpeg4DecContext 2013-11-29 17:37:16 +01:00
Anton Khirnov 513d849bb6 mpeg4videodec: move num_sprite_warping_points from MpegEncContext to Mpeg4DecContext 2013-11-29 17:36:57 +01:00
Anton Khirnov 9ba3fc3e3d mpeg4videodec: move sprite_brightness_change from MpegEncContext to Mpeg4DecContext 2013-11-29 17:36:43 +01:00
Anton Khirnov 58c120a929 mpeg4videodec: move scalability from MpegEncContext to Mpeg4DecContext 2013-11-29 17:36:28 +01:00
Anton Khirnov 6e81597d5a mpeg4videodec: move enhancement_type from MpegEncContext to Mpeg4DecContext 2013-11-29 17:36:05 +01:00
Anton Khirnov 2992afda83 mpeg4videodec: remove a write-only variable from MpegEncContext 2013-11-29 17:35:57 +01:00