Hendrik Leppkes
bc249bd673
mpegvideo: re-indent buffer clearing code
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-25 13:47:16 +01:00
Hendrik Leppkes
fa84231ee8
mpegvideo: fix overwriting hwaccel surface objects
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-25 13:47:10 +01:00
Michael Niedermayer
42361bdf51
avcodec/mpegvideo: fix buffer clear code so it should work with negative linesizes
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-23 18:14:59 +01:00
Michael Niedermayer
fbafd64acc
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
mpeg: Drop unused parameters from ff_draw_horiz_band()
Conflicts:
libavcodec/mpegvideo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-29 17:05:51 +01:00
Diego Biurrun
54b2ce7418
mpeg: Drop unused parameters from ff_draw_horiz_band()
2014-01-29 16:37:23 +01:00
Michael Niedermayer
965fa6b0d9
Merge commit ' fb0c9d41d6'
...
* commit 'fb0c9d41d6
2014-01-26 01:54:55 +01:00
Janne Grunau
fb0c9d41d6
avutil: remove timer.h include from internal.h
...
Added libavutil/timer.h include to all files with {START,STOP}_TIMER.
2014-01-25 21:50:20 +01:00
Michael Niedermayer
d83707c641
Merge commit ' 024db24912'
...
* commit '024db24912
2014-01-20 17:09:35 +01:00
Anton Khirnov
024db24912
mpegvideo: allocate edges when encoding.
...
Allocating edges will be removed from generic code, so the encoder must
handle this explicitly.
2014-01-20 12:50:14 +01:00
Michael Niedermayer
2830f287e2
Merge commit ' ebfe622bb1'
...
* commit 'ebfe622bb18fc52a5ef93969b4b861
2014-01-09 14:19: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
Michael Niedermayer
adc09a353c
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
mpegvideo: remove disabled bfin asm
Conflicts:
libavcodec/bfin/mpegvideo_bfin.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-04 03:13:54 +01:00
Michael Niedermayer
9b9f64fe31
Merge commit ' a4d0c6e050'
...
* commit 'a4d0c6e050
2014-01-04 03:03:02 +01:00
Michael Niedermayer
fb17f03dad
Merge commit ' aec25b1c46'
...
* commit 'aec25b1c46
2014-01-04 02:56:29 +01:00
Michael Niedermayer
532b93b516
Merge commit ' feded990e3'
...
* commit 'feded990e3
2014-01-04 00:16:58 +01:00
Michael Niedermayer
950fb8acb4
avcodec/mpegvideo: fix ac/dc_val and coded_block table sizes
...
With interlaced vc1 it was possible that accesses could happen outside these
tables before this.
Regression since 017e234c20
2014-01-03 20:35:55 +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
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
Ivan Kalvachev
1c63aed232
Convert XvMC to hwaccel v3
...
Signed-off-by: Ivan Kalvachev <ikalvachev@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-22 22:03:47 +01:00
Michael Niedermayer
34fe125f4b
avcodec/mpegvideo_enc: fix frame skipping with intra only codecs
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-20 15:04:40 +01:00
Michael Niedermayer
3b2b07397c
Merge commit ' 2d1f4288dd'
...
* commit '2d1f4288dd
2013-12-12 00:08:08 +01:00
Michael Niedermayer
efb5ebe832
Merge commit ' b06c8bce02'
...
* commit 'b06c8bce02
2013-12-11 23:55:51 +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
Michael Niedermayer
52b69fa142
Merge commit ' 282c6a1a0e'
...
* commit '282c6a1a0e
2013-12-06 03:46:47 +01:00
Michael Niedermayer
f1db3f5f59
Merge commit ' c99307caee'
...
* commit 'c99307caee
2013-12-06 03:29:33 +01:00
Michael Niedermayer
08667c2678
Merge commit ' 0b0a7a751d'
...
* commit '0b0a7a751d
2013-12-06 03:12:10 +01:00
Michael Niedermayer
e3b7f0e184
Merge commit ' d0d111d059'
...
* commit 'd0d111d059
2013-12-06 02:54:45 +01:00
Michael Niedermayer
26c2e3bf1a
Merge commit ' 381a722562'
...
* commit '381a722562
2013-12-06 02:48:09 +01:00
Michael Niedermayer
d5050bae80
Merge commit ' b7254288d2'
...
* commit 'b7254288d2
2013-12-06 02:18:50 +01:00
Michael Niedermayer
20b28fc7b0
Merge commit ' 1f8eb69079'
...
* commit '1f8eb69079
2013-12-06 02:12:59 +01:00
Michael Niedermayer
2951b7fb1d
Merge commit ' bedf952bb8'
...
* commit 'bedf952bb8
2013-12-06 01:58:55 +01:00
Michael Niedermayer
16338b4fb9
Merge commit ' 2cab011f0f'
...
* commit '2cab011f0f
2013-12-06 01:52:53 +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
Michael Niedermayer
e2f63be012
Merge commit ' e62a43f6b1'
...
* commit 'e62a43f6b1
2013-11-29 22:45:05 +01:00
Michael Niedermayer
ad13b8ca9b
Merge commit ' ee8af2dd99'
...
* commit 'ee8af2dd99
2013-11-29 22:35:52 +01:00
Anton Khirnov
e62a43f6b1
mpeg4videodec: move MpegEncContext.time_increment_bits to Mpeg4DecContext
...
The field remains in MpegEncContext for use in the encoder.
2013-11-29 14:19:47 +01:00
Anton Khirnov
ee8af2dd99
mpeg4videodec: move MpegEncContext.shape to Mpeg4DecContext
2013-11-29 14:19:47 +01:00
Michael Niedermayer
56e122787e
Merge commit ' a553c6a347'
...
* commit 'a553c6a347
2013-11-19 03:56:53 +01:00
Kostya Shishkov
16e7b189c5
mpegvideo: Fix swapping of UV planes for VCR2
2013-11-19 02:05:51 +01:00
