Michael Niedermayer
d39fa69dfc
Merge commit ' 6996fd204a'
...
* commit '6996fd204a
2015-01-29 14:13:25 +01:00
Martin Storsjö
6996fd204a
libopenh264: Log debug messages to a non-null context
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-01-29 09:16:35 +02:00
Carl Eugen Hoyos
3ea97767e4
Add an ARES atom to extradata when encoding avui.
...
Allows playback with QuickTime and the original codec.
Tested by Olaf Matthes, olaf matthes gmx de
2015-01-29 01:07:08 +01:00
Michael Niedermayer
72db3c79df
Merge commit ' 61928b68dc'
...
* commit '61928b68dcecbf838c7d
2015-01-28 22:44:09 +01:00
Michael Niedermayer
61928b68dc
h264: Do not share rbsp_buffer across threads
...
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
CC: libav-stable@libav.org
2015-01-28 16:28:58 +01:00
Michael Niedermayer
ccaa5dcb31
avcodec/h264_parser: Rename close()
...
This avoids a potential conflict with the equally named function for closing files
It also could reduce confusion in debugger backtraces
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-28 13:11:03 +01:00
Timo Rothenpieler
fb34c580bb
avcodec/nvenc: Handle non-square pixel aspect ratios
...
Reviewed-by: Philip Langdale <philipl@overt.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-28 06:10:40 +01:00
Reimar Döffinger
d96090e7b6
Support BMP files that do not properly align lines.
...
Quite a few programs missed that detail of the spec
(including old versions of FFmpeg I believe) and when
we would otherwise fail anyway it seems worth a try
to use a simple byte-aligned stride instead.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2015-01-27 21:29:42 +01:00
Michael Niedermayer
c5b6b711b2
Merge commit ' 607ad990d3'
...
* commit '607ad990d3
2015-01-27 20:25:40 +01:00
Michael Niedermayer
4ce67c961c
Merge commit ' a536a4e4bc'
...
* commit 'a536a4e4bc
2015-01-27 18:50:47 +01:00
Michael Niedermayer
62a82c66cd
Merge commit ' 728685f37a'
...
* commit '728685f37a
2015-01-27 18:03:43 +01:00
Michael Niedermayer
3c831fba08
Merge commit ' e44b58924f'
...
* commit 'e44b58924f
2015-01-27 17:08:40 +01:00
Michael Niedermayer
a764402394
avcodec/h263dec: Try to use codec_tag instead of the stream_codec_tag
...
If this causes problems then the stream_codec_tag should be enabled again
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-27 17:03:42 +01:00
Vittorio Giovara
607ad990d3
dvbsubdec: check memory allocations and propagate errors
2015-01-27 15:26:37 +00:00
Michael Niedermayer
be023405a7
Merge commit ' f771b3ab5d'
...
* commit 'f771b3ab5d
2015-01-27 16:17:42 +01:00
Michael Niedermayer
392080cbe5
Merge commit ' 167e004e1a'
...
* commit '167e004e1a
2015-01-27 16:03:23 +01:00
Michael Niedermayer
ad3412d028
Merge commit ' ecab21ac47'
...
* commit 'ecab21ac47
2015-01-27 15:15:18 +01:00
Michael Niedermayer
6e57d2da90
Merge commit ' 9404a47a2d'
...
* commit '9404a47a2d
2015-01-27 15:08:17 +01:00
Michael Niedermayer
3d04117078
Merge commit ' cf1e0786ed'
...
* commit 'cf1e0786ed
2015-01-27 14:56:52 +01:00
Michael Niedermayer
a7fa1b9aa1
Merge commit ' 443b71928b'
...
* commit '443b71928b
2015-01-27 13:15:06 +01:00
Michael Niedermayer
74e5a5a849
Merge commit ' 1dd021929f'
...
* commit '1dd021929f
2015-01-27 13:02:36 +01:00
Michael Niedermayer
ed8de1570d
Merge commit ' f9f883af4f'
...
* commit 'f9f883af4f
2015-01-27 12:55:21 +01:00
Hendrik Leppkes
36962ad233
Add DXVA2 HEVC HWAccel
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-27 12:37:34 +01:00
Hendrik Leppkes
f8ecffa9b7
hevc: reindent after previous commit
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-27 12:37:34 +01:00
Hendrik Leppkes
b2e9b0f5d4
hevc: add hwaccel hooks
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-27 12:37:34 +01:00
Hendrik Leppkes
06894f1a04
hevc: store the short term rps flag and size in the context
...
For future use by hardware accelerators.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-27 12:37:34 +01:00
Hendrik Leppkes
2af82a1ad9
hevc: store the escaped/raw bitstream in HEVCNAL
...
Hardware Accelerators require access to the escaped bitstream.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-27 12:37:34 +01:00
Anton Khirnov
a536a4e4bc
lavc: support extracting audio service type from side data
2015-01-27 09:22:33 +01:00
Anton Khirnov
728685f37a
Add a side data type for audio service type.
...
Currently, audio service type is a field in AVCodecContext. However,
side data is more appropriate for this kind of information.
2015-01-27 09:17:48 +01:00
Anton Khirnov
e44b58924f
lavc: deprecate unused AVCodecContext.stream_codec_tag
2015-01-27 09:14:39 +01:00
Anton Khirnov
f771b3ab5d
avidec: do not export stream_codec_tag
...
Handle its only existing use case internally.
2015-01-27 09:13:45 +01:00
Anton Khirnov
167e004e1a
h264: drop any pretense of support for data partitioning
...
It does not work correctly and apparently never did. There is no
indication that this (mis)feature is ever used in the wild or even that
any software other than the reference supports it.
Since the code that attempts to support it adds some nontrivial
complexity and has resulted in several bugs in the past, it is better to
just drop it.
2015-01-27 09:10:12 +01:00
Anton Khirnov
58ae8d5957
h264_parser: restore a comment lost in 0268a54
2015-01-27 09:09:56 +01:00
Anton Khirnov
ecab21ac47
h264: do not reset the ref lists in flush_change()
...
They are always constructed anew when needed, so there is no need to
reset them explicitly.
2015-01-27 09:09:29 +01:00
Anton Khirnov
9404a47a2d
h264: move parser-only variables to their own context
2015-01-27 09:08:31 +01:00
Anton Khirnov
cf1e0786ed
error_resilience: move the MECmpContext initialization into ER code
...
Currently, it needs to be initialized by the ER caller (which is
currently either a mpegvideo decoder or h264dec). However, since none of
those decoders use MECmpContext for anything except ER, it makes more
sense to handle it purely inside ER.
2015-01-27 09:07:59 +01:00
Hendrik Leppkes
7e850fa67e
Add DXVA2 HEVC HWAccel
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2015-01-27 09:05:31 +01:00
Hendrik Leppkes
b82722df9b
hevc: reindent after previous commit
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2015-01-27 09:05:25 +01:00
Hendrik Leppkes
e72e8c5a1d
hevc: add hwaccel hooks
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2015-01-27 09:05:08 +01:00
Hendrik Leppkes
4b95e95dba
hevc: store the short term rps flag and size in the context
...
For future use by hardware accelerators.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2015-01-27 09:04:59 +01:00
Hendrik Leppkes
36779a8405
hevc: store the escaped/raw bitstream in HEVCNAL
...
Hardware Accelerators require access to the escaped bitstream.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2015-01-27 09:04:44 +01:00
Hendrik Leppkes
b0593a4bca
hevc: pass the full HEVCNAL struct to decode_nal_unit
...
This enables decode_nal_unit to access additional fields added in
subsequent commits.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2015-01-27 09:04:29 +01:00
Anton Khirnov
443b71928b
hevc: unref the current frame if frame_start() fails
...
Prevents DPB from filling up with damaged input.
2015-01-27 08:34:56 +01:00
Anton Khirnov
1dd021929f
hevc: clear unused refs on failure
2015-01-27 08:34:46 +01:00
Anton Khirnov
f9f883af4f
h264: simplify code in flush_dpb()
...
There is no point in clearing reference explicitly, since that will be
done as a part of ff_h264_unref_picture() right below.
2015-01-27 08:34:24 +01:00
Timo Rothenpieler
914fd42b8a
avcodec/nvenc: Fix b-frame parameter handling
...
This should behave similar to x264 and other encoders, as it handles a
gop_size of 0 as Intra-Only, while it's still possible to control how
many B-Frames it inserts.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-26 15:39:01 +01:00
Christophe Gisquet
7aeafacfd0
x86/sbrdsp: Use different mem moves
...
Before
2843 decicycles in ff_sbr_autocorrelate_sse3, 262086 runs, 58 skips
After
2693 decicycles in ff_sbr_autocorrelate_sse3, 262117 runs, 27 skips
Signed-off-by: James Almer <jamrial@gmail.com>
2015-01-25 18:20:43 -03:00
James Almer
449b21bfab
x86/sbrdsp: add ff_sbr_autocorrelate_{sse,sse3}
...
2 to 2.5 times faster.
Signed-off-by: James Almer <jamrial@gmail.com>
2015-01-25 18:20:39 -03:00
Philip Langdale
ff0c559329
nvenc: Propagate desired number of reference frames.
...
Reviewed-by: Timo Rothenpieler <timo@rothenpieler.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-24 22:59:54 +01:00
Hendrik Leppkes
77140279d3
hevc: pass the full HEVCNAL struct to decode_nal_unit
...
This enables decode_nal_unit to access additional fields added in
subsequent commits.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-24 17:49:27 +01:00
