virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-20 07:48:15 +02:00
Code Issues Releases Activity
74,131 Commits 37 Branches 400 Tags
Commit Graph

33113 Commits

Author SHA1 Message Date
WereCatf
7106dfd945 avcodec/nvenc: 2-pass mode works even with non-low latency presets now 
Github: Closes #140

Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org>
 2015-07-26 17:40:56 +02:00
Michael Niedermayer
e0031ca29a avcodec/avrndec: Fix cropping 
This also switches to using a separate AVCodecContext for the inner mjpeg decoder
which is cleaner and avoids fields from being overwritten with wrong values

Fixes Ticket162

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-26 17:18:35 +02:00
Michael Niedermayer
4b90dcb849 avcodec/dvbsubdec: Compute default CLUT based on bitmap analysis 
Fixes displaying subtitles before any CLUT has been received
Fixes Ticket153

This will of course not display these initial subtitles in the correct
color (as that is not known at that point) but they should look clean
and not corrupted

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-26 14:39:55 +02:00
James Almer
844bef578e avcodec/x86: add missing colon to labels 
Silences warnings with Nasm

Signed-off-by: James Almer <jamrial@gmail.com>
 2015-07-26 02:50:14 -03:00
James Almer
ec7f04c13a avcodec/texturedsp: fix undefined shift 
Silences warnings when using -Wshift-overflow (GCC 6+)

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
 2015-07-26 00:40:17 -03:00
Ivan Uskov
684b703843 libavcodec/qsvdec_h264.c: using "private_spspps_buf" argument for av_bitstream_filter_filter() to avoid failure after decoder re-initialization. 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-26 02:04:41 +02:00
Ivan Uskov
1defff85cb libavcodec/h264_mp4toannexb_bsf.c: Optional argument "private_spspps_buf" to avoid extradata modification. 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-26 01:44:41 +02:00
Michael Niedermayer
508b79e6c1 Merge commit '41d47ea85fb4ad9cfb5c2dc808a46bc1d57f3986' 
* commit '41d47ea85fb4ad9cfb5c2dc808a46bc1d57f3986':
  lavc: add Intel libmfx-based HEVC decoder.

Conflicts:
	Changelog
	configure
	libavcodec/Makefile
	libavcodec/allcodecs.c
	libavcodec/qsvdec.c
	libavcodec/qsvdec_h2645.c
	libavcodec/version.h

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-26 01:20:46 +02:00
Michael Niedermayer
bb619f41be Merge commit 'bf52f773913cf74bdf0d2c8c2cb4473fa1b7801e' 
* commit 'bf52f773913cf74bdf0d2c8c2cb4473fa1b7801e':
  lavc: add Intel libmfx-based MPEG2 decoder.

Conflicts:
	configure
	libavcodec/qsvdec_mpeg2.c

Some cosmetics merged, rest is related to the removed parser code and
thus not merged

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-26 00:59:57 +02:00
Timo Rothenpieler
9f4bff834c avcodec/nvenc: Delay frame output to increase encoding speed 2015-07-26 00:52:15 +02:00
Michael Niedermayer
15bcbc9d3b Merge commit 'f89f78c1c563d98f10ee1d7e1ed67c9f9e03b741' 
* commit 'f89f78c1c563d98f10ee1d7e1ed67c9f9e03b741':
  lavc: add a HEVC mp4->annex B bitstream filter

Conflicts:
	Changelog

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-26 00:34:27 +02:00
Michael Niedermayer
af08d8bfbb Merge commit 'fa85fcf2b7d1ab822a59245077b8bb855406d3e9' 
* commit 'fa85fcf2b7d1ab822a59245077b8bb855406d3e9':
  qsvenc_hevc: fix enum declaration

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-25 23:47:54 +02:00
Timo Rothenpieler
15cd2f8ea9 avcodec/nvenc: Remove unused parameter 2015-07-25 23:43:16 +02:00
Michael Niedermayer
c3413a712a Merge commit '22522d9c2c69624fe4d81d61ee65a56610f22f1d' 
* commit '22522d9c2c69624fe4d81d61ee65a56610f22f1d':
  qsvdec: fix a memleak of async_fifo

Conflicts:
	libavcodec/qsvdec.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-25 23:28:39 +02:00
Michael Niedermayer
ef2a85ac53 Merge commit 'aa9d15d89bb4ee8a31607d3db1b8c5334eb88d2d' 
* commit 'aa9d15d89bb4ee8a31607d3db1b8c5334eb88d2d':
  qsvdec: avoid an infinite loop with no consumed data and no output

Conflicts:
	libavcodec/qsvdec.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-25 23:10:14 +02:00
Michael Niedermayer
c105e0f077 avcodec/aacps_fixed_tablegen: change f_center to 64bit to avoid overflow 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-25 22:07:41 +02:00
Ivan Uskov
fb57bc6c34 avcodec: Add QSV VC-1 video decoder. 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-25 19:32:22 +02:00
Anton Khirnov
41d47ea85f lavc: add Intel libmfx-based HEVC decoder. 2015-07-25 17:37:01 +02:00
Anton Khirnov
bf52f77391 lavc: add Intel libmfx-based MPEG2 decoder. 2015-07-25 17:36:59 +02:00
Ivan Uskov
6d0123f40e avcodec: Add QSV MPEG-2 video decoder. 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-25 17:31:18 +02:00
Anton Khirnov
f89f78c1c5 lavc: add a HEVC mp4->annex B bitstream filter 2015-07-25 17:26:53 +02:00
Anton Khirnov
96dca089b1 qsvdec: move qsv_process_data() from qsvdec_h264 to the common code 
It will be shared with the upcoming mpeg2 and hevc decoders.
 2015-07-25 17:24:25 +02:00
Anton Khirnov
fa85fcf2b7 qsvenc_hevc: fix enum declaration 
Declare a named enum, not a variable with anonymous enum type.
 2015-07-25 17:24:03 +02:00
Anton Khirnov
22522d9c2c qsvdec: fix a memleak of async_fifo 
init() is called whenever format changes, so current code would leak the
fifo in this case.
 2015-07-25 17:23:46 +02:00
Anton Khirnov
aa9d15d89b qsvdec: avoid an infinite loop with no consumed data and no output 
This is triggerable with the HEVC decoder. It is unclear yet whether the
bug is in the calling code or the MSDK, but it seems better to check for
this in any case.
 2015-07-25 17:23:29 +02:00
Michael Niedermayer
38490e0724 avcodec/dvdec: only attempt to conceal errors based on STA inconsistencies when error_concealment is set 
This allows the user to disable it in the hypothetical case that STA values are wrong

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-25 15:27:44 +02:00
Michael Niedermayer
bbad3811cc avcodec/aacps: Fix ;; 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-25 14:07:55 +02:00
Michael Niedermayer
f267d553f7 avcodec/aactab: Add ff_aac_eld_window_480_fixed 
Fixes pointer type mismatch

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-25 13:59:53 +02:00
Michael Niedermayer
17cc35c76b avcodec/aactab: Fix rounding of elements in ff_aac_eld_window_512_fixed 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-25 13:19:06 +02:00
Michael Niedermayer
dee551bbd2 avcodec/dvdec: skip 3rd stage ac decoding when the headers indicates that the data is inconsistent 
Fixes Ticket1589

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-25 00:27:38 +02:00
Shivraj Patil
e21b090bfb avcodec/mips: MSA (MIPS-SIMD-Arch) optimizations for VP9 intra functions 
Signed-off-by: Shivraj Patil <shivraj.patil@imgtec.com>
Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-24 22:51:34 +02:00
James Almer
ede590c84d avcodec/aacsbr: add missing header include 
Fixes make checkheaders

Signed-off-by: James Almer <jamrial@gmail.com>
 2015-07-24 16:27:52 -03:00
Michael Niedermayer
daf6bce71b avcodec/dvdec: Retry decoding seemingly damaged MBs while skiping likely damaged parts 
Improves decoding of Ticket1589

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-24 17:36:00 +02:00
Ivan Uskov
0b159e3b65 libavcodec/qsvdec_h264.c: packet buffering has been removed since qsvdec.c does maintain own data buffering now. 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-24 13:03:42 +02:00
Ivan Uskov
c90dbc67ed libavcodec/qsvdec.c: The ff_qsv_decode() now guarantees the consumption of whole packet. 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-24 12:46:55 +02:00
Michael Niedermayer
5da90d7ec3 avcodec/hapdec: Check that there is sufficient input data 
Fixes Ticket4729

Found-by: ami_stuff
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-24 04:40:15 +02:00
Tom Butterworth
64539e1213 avcodec/hap: (trivial) rename enum values and document their meaning 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-23 20:59:57 +02:00
Tom Butterworth
26e8247c1c avcodec/hap: (trivial) clarify comment 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-23 20:57:52 +02:00
Martin Storsjö
44f7df0c98 dds: Write the palette in the native endian form 
This fixes the palette on big endian, broken (or, differing from
little endian) since 57214b2f7.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2015-07-23 19:07:43 +03:00
Tom Butterworth
11f3d5c69b hap: Name enums, remove unused struct member 2015-07-23 13:35:16 +01:00
Tom Butterworth
083cbc930d snappy: Refactor so ff_snappy_uncompress() uses an existing buffer 
Some uses of Snappy require uncompressing to positions within
an existing buffer. Also adds a function to get the uncompressed
length of Snappy data.
 2015-07-23 13:35:16 +01:00
Tom Butterworth
ae5a8dca67 hap: Fix slice size computation 
A bug was introduced in 977105407cae55876041dddbf4ce0934cdd4cd6c whereby when
frame height wasn't divisible by the number of threads, pixels would be omitted
from the bottom rows during decode.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2015-07-23 10:46:19 +02:00
Tom Butterworth
ebe8b5d947 dds: Fix the slice size computation 
A bug was introduced in 6b2b26e7af3ede0abfb46eb5725c26d1083f50bc whereby when
frame height wasn't divisible by the number of threads, pixels would be omitted
from the bottom rows during decode.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2015-07-23 10:45:40 +02:00
Michael Niedermayer
8eff61fd45 avcodec/mips/vp9_idct_msa: Replace __volatile__ by volatile 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-23 17:38:01 +02:00
Shivraj Patil
c03800d592 avcodec/mips: MSA (MIPS-SIMD-Arch) optimizations for VP9 idct functions 
Signed-off-by: Shivraj Patil <shivraj.patil@imgtec.com>
Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-23 17:29:55 +02:00
Ivan Uskov
d50ab820da libavcodec/qsvdec_h264.c: refactoring: functionality of qsv_process_data() has been moved into qsvdec.c 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-23 17:10:39 +02:00
Shivraj Patil
fd7eadd25c avcodec/mips: MSA (MIPS-SIMD-Arch) optimizations for VP9 lpf functions 
Signed-off-by: Shivraj Patil <shivraj.patil@imgtec.com>
Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-23 16:52:18 +02:00
Nicolas George
52c75d486e lavc/hevc: rudimentary support for skip_loop_filter. 
+~9% speed on Core i5 on test sample.

All frames are treated as ref frames, skipping only applies
at level "all". The following mail contains information on
how to improve that:
http://ffmpeg.org/pipermail/ffmpeg-devel/2015-July/176116.html
 2015-07-23 16:26:14 +02:00
Michael Niedermayer
744051a57a avcodec/hevc_parse: Print the name of the NAL units in addition to the numerical nal_unit_type in the debug output 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-23 16:05:20 +02:00
Michael Niedermayer
b04b021005 Merge commit 'ae5a8dca675ee544178225256893e679b750cb63' 
* commit 'ae5a8dca675ee544178225256893e679b750cb63':
  hap: Fix slice size computation

Conflicts:
	libavcodec/hapdec.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-23 12:35:10 +02:00