Michael Niedermayer
29d147c94d
Merge commit '059a934806d61f7af9ab3fd9f74994b838ea5eba'
...
* commit '059a934806d61f7af9ab3fd9f74994b838ea5eba':
lavc: Consistently prefix input buffer defines
Conflicts:
doc/examples/decoding_encoding.c
libavcodec/4xm.c
libavcodec/aac_adtstoasc_bsf.c
libavcodec/aacdec.c
libavcodec/aacenc.c
libavcodec/ac3dec.h
libavcodec/asvenc.c
libavcodec/avcodec.h
libavcodec/avpacket.c
libavcodec/dvdec.c
libavcodec/ffv1enc.c
libavcodec/g2meet.c
libavcodec/gif.c
libavcodec/h264.c
libavcodec/h264_mp4toannexb_bsf.c
libavcodec/huffyuvdec.c
libavcodec/huffyuvenc.c
libavcodec/jpeglsenc.c
libavcodec/libxvid.c
libavcodec/mdec.c
libavcodec/motionpixels.c
libavcodec/mpeg4videodec.c
libavcodec/mpegvideo.c
libavcodec/noise_bsf.c
libavcodec/nuv.c
libavcodec/nvenc.c
libavcodec/options.c
libavcodec/parser.c
libavcodec/pngenc.c
libavcodec/proresenc_kostya.c
libavcodec/qsvdec.c
libavcodec/svq1enc.c
libavcodec/tiffenc.c
libavcodec/truemotion2.c
libavcodec/utils.c
libavcodec/utvideoenc.c
libavcodec/vc1dec.c
libavcodec/wmalosslessdec.c
libavformat/adxdec.c
libavformat/aiffdec.c
libavformat/apc.c
libavformat/apetag.c
libavformat/avidec.c
libavformat/bink.c
libavformat/cafdec.c
libavformat/flvdec.c
libavformat/id3v2.c
libavformat/isom.c
libavformat/matroskadec.c
libavformat/mov.c
libavformat/mpc.c
libavformat/mpc8.c
libavformat/mpegts.c
libavformat/mvi.c
libavformat/mxfdec.c
libavformat/mxg.c
libavformat/nutdec.c
libavformat/oggdec.c
libavformat/oggparsecelt.c
libavformat/oggparseflac.c
libavformat/oggparseopus.c
libavformat/oggparsespeex.c
libavformat/omadec.c
libavformat/rawdec.c
libavformat/riffdec.c
libavformat/rl2.c
libavformat/rmdec.c
libavformat/rtpdec_latm.c
libavformat/rtpdec_mpeg4.c
libavformat/rtpdec_qdm2.c
libavformat/rtpdec_svq3.c
libavformat/sierravmd.c
libavformat/smacker.c
libavformat/smush.c
libavformat/spdifenc.c
libavformat/takdec.c
libavformat/tta.c
libavformat/utils.c
libavformat/vqf.c
libavformat/westwood_vqa.c
libavformat/xmv.c
libavformat/xwma.c
libavformat/yop.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-27 23:15:19 +02:00
Michael Niedermayer
444e9874a7
Merge commit 'def97856de6021965db86c25a732d78689bd6bb0'
...
* commit 'def97856de6021965db86c25a732d78689bd6bb0':
lavc: AV-prefix all codec capabilities
Conflicts:
cmdutils.c
ffmpeg.c
ffplay.c
libavcodec/8svx.c
libavcodec/aacenc.c
libavcodec/ac3dec.c
libavcodec/adpcm.c
libavcodec/alac.c
libavcodec/atrac3plusdec.c
libavcodec/bink.c
libavcodec/dnxhddec.c
libavcodec/dvdec.c
libavcodec/dvenc.c
libavcodec/ffv1dec.c
libavcodec/ffv1enc.c
libavcodec/fic.c
libavcodec/flacdec.c
libavcodec/flacenc.c
libavcodec/flvdec.c
libavcodec/fraps.c
libavcodec/frwu.c
libavcodec/gifdec.c
libavcodec/h261dec.c
libavcodec/hevc.c
libavcodec/iff.c
libavcodec/imc.c
libavcodec/libopenjpegdec.c
libavcodec/libvo-aacenc.c
libavcodec/libvorbisenc.c
libavcodec/libvpxdec.c
libavcodec/libvpxenc.c
libavcodec/libx264.c
libavcodec/mjpegbdec.c
libavcodec/mjpegdec.c
libavcodec/mpegaudiodec_float.c
libavcodec/msmpeg4dec.c
libavcodec/mxpegdec.c
libavcodec/nvenc_h264.c
libavcodec/nvenc_hevc.c
libavcodec/pngdec.c
libavcodec/qpeg.c
libavcodec/ra288.c
libavcodec/rv10.c
libavcodec/s302m.c
libavcodec/sp5xdec.c
libavcodec/takdec.c
libavcodec/tiff.c
libavcodec/tta.c
libavcodec/utils.c
libavcodec/v210dec.c
libavcodec/vp6.c
libavcodec/vp9.c
libavcodec/wavpack.c
libavcodec/yop.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-27 22:50:18 +02:00
Michael Niedermayer
94d68a41fa
Merge commit '7c6eb0a1b7bf1aac7f033a7ec6d8cacc3b5c2615'
...
* commit '7c6eb0a1b7bf1aac7f033a7ec6d8cacc3b5c2615':
lavc: AV-prefix all codec flags
Conflicts:
doc/examples/muxing.c
ffmpeg.c
ffmpeg_opt.c
ffplay.c
libavcodec/aacdec.c
libavcodec/aacenc.c
libavcodec/ac3dec.c
libavcodec/ac3enc_float.c
libavcodec/atrac1.c
libavcodec/atrac3.c
libavcodec/atrac3plusdec.c
libavcodec/dcadec.c
libavcodec/ffv1enc.c
libavcodec/h264.c
libavcodec/h264_loopfilter.c
libavcodec/h264_mb.c
libavcodec/imc.c
libavcodec/libmp3lame.c
libavcodec/libtheoraenc.c
libavcodec/libtwolame.c
libavcodec/libvpxenc.c
libavcodec/libxavs.c
libavcodec/libxvid.c
libavcodec/mpeg12dec.c
libavcodec/mpeg12enc.c
libavcodec/mpegaudiodec_template.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo_enc.c
libavcodec/mpegvideo_motion.c
libavcodec/nellymoserdec.c
libavcodec/nellymoserenc.c
libavcodec/nvenc.c
libavcodec/on2avc.c
libavcodec/options_table.h
libavcodec/opus_celt.c
libavcodec/pngenc.c
libavcodec/ra288.c
libavcodec/ratecontrol.c
libavcodec/twinvq.c
libavcodec/vc1_block.c
libavcodec/vc1_loopfilter.c
libavcodec/vc1_mc.c
libavcodec/vc1dec.c
libavcodec/vorbisdec.c
libavcodec/vp3.c
libavcodec/wma.c
libavcodec/wmaprodec.c
libavcodec/x86/hpeldsp_init.c
libavcodec/x86/me_cmp_init.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-27 22:10:35 +02:00
John Högberg
b7040e67ec
h264: fix AVDISCARD_NONKEY for some interlaced content
...
When skip_frame is set to _NONKEY the decoder skips everything except intra
slices, which breaks frames that consist of an intra field together with any
other field type; half the frame becomes garbage. This patch fixes the issue by
letting non-intra slices through if they're part of a keyframe.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2015-07-27 18:11:00 +02:00
Anton Khirnov
db21dde3f7
qsvdec_mpeg2: drop an incorrect comment
...
It got copypasted from the h264 decoder, but it does not apply to mpeg2.
2015-07-27 18:09:30 +02:00
Vittorio Giovara
aaf937ee35
hap: Add utility functions file
...
Missing from the push of 3ee217853a
.
2015-07-27 16:21:14 +01:00
Tom Butterworth
3ee217853a
Support the Hap chunked frame format
...
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-07-27 16:00:22 +01:00
Tom Butterworth
43dd004747
hap: Move some per-stream setup into decoder init rather than per-frame
...
This change will reject frames with a texture type which does not match
the stream description.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-07-27 15:53:03 +01:00
Vittorio Giovara
b94ec30428
lavc: Update version and APIchanges
...
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-07-27 15:26:57 +01:00
Vittorio Giovara
059a934806
lavc: Consistently prefix input buffer defines
...
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-07-27 15:24:59 +01:00
Vittorio Giovara
def97856de
lavc: AV-prefix all codec capabilities
...
Express bitfields more simply.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-07-27 15:24:58 +01:00
Vittorio Giovara
7c6eb0a1b7
lavc: AV-prefix all codec flags
...
Convert doxygen to multiline and express bitfields more simply.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-07-27 15:24:58 +01:00
Vittorio Giovara
4b6b1082a7
lavc: Deprecate avctx.me_method
...
This option is extremely codec specific and only a few codecs employ it.
Move it to codec private options instead: mpegenc family supports only 3
values, xavs and x264 use 5, and xvid has a different metric entirely.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-07-27 15:24:56 +01:00
Vittorio Giovara
03eb557414
wmv2enc: Check memory allocation
2015-07-27 14:44:07 +01:00
Vittorio Giovara
a67b67944a
ac3enc_template: Use the correct context field
...
For audio encoders, delay has no effect, use the appropriate one,
initial_padding (see 2df0c32
).
2015-07-27 14:44:07 +01:00
Anton Khirnov
f3bd3810d2
qsvdec_*: add missing CODEC_CAP_DR1
2015-07-27 07:44:34 +02:00
Michael Niedermayer
0b6f092ed3
Merge commit '4b6b1082a73907c7c3de2646c6398bc61320f2c6'
...
* commit '4b6b1082a73907c7c3de2646c6398bc61320f2c6':
lavc: Deprecate avctx.me_method
Conflicts:
doc/encoders.texi
libavcodec/avcodec.h
libavcodec/libx264.c
libavcodec/motion_est.c
libavcodec/options_table.h
libavcodec/version.h
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-27 21:03:20 +02:00
Michael Niedermayer
59b009411f
Merge commit '03eb55741427c6608f63972c105e565ca0ba4f15'
...
* commit '03eb55741427c6608f63972c105e565ca0ba4f15':
wmv2enc: Check memory allocation
Conflicts:
libavcodec/wmv2enc.c
See: 6e8fe44815
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-27 20:43:25 +02:00
Michael Niedermayer
af5f707e46
avcodec/v410enc: do not use internal->byte_buffer
...
it is not optimal when the buffer size is well known at allocation time
This avoids a memcpy()
about 1% faster
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-27 20:03:02 +02:00
Michael Niedermayer
9fe873bec8
avcodec/utils: do not use internal->byte_buffer when little downsizing is expected
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-27 20:03:02 +02:00
Michael Niedermayer
0dbfb5386f
avcodec/internal: Deprecate ff_alloc_packet() in favor of ff_alloc_packet2()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-27 19:58:36 +02:00
Michael Niedermayer
e36db49b7b
avcodec: Add a min size parameter to ff_alloc_packet2()
...
This parameter can be used to inform the allocation code about how much
downsizing might occur, and can be used to optimize how to allocate the
packet
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-27 19:57:52 +02:00
Claudio Freire
59216e0525
AAC Encoder: clipping avoidance
...
Avoid clipping due to quantization noise to produce audible
artifacts, by detecting near-clipping signals and both attenuating
them a little and encoding escape-encoded bands (usually the
loudest) rounding towards zero instead of nearest, which tends to
decrease overall energy and thus clipping.
Currently fate tests measure numerical error so this change makes
tests using asynth (which are near clipping) report higher error
not less, because of window attenuation. Yet, they sound better,
not worse (albeit subtle, other samples aren't subtle at all).
Only measuring psychoacoustically weighted error would make for
a representative test, so that will be left for a future patch.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-27 19:13:48 +02:00
Shivraj Patil
71aede3ced
avcodec/mips: MSA (MIPS-SIMD-Arch) optimizations for VP9 bilinear 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-27 17:13:24 +02:00
Michael Niedermayer
d12be9ed70
Merge commit 'f3bd3810d274a7f51b5925fc3d2fc33e8043a5d4'
...
* commit 'f3bd3810d274a7f51b5925fc3d2fc33e8043a5d4':
qsvdec_*: add missing CODEC_CAP_DR1
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-27 11:50:17 +02:00
Michael Niedermayer
d41dceb14e
avcodec/dvbsubdec: Add option to select when to computer clut (always/never/"if needed")
...
Reviewed-by: Anshul <anshul.ffmpeg@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-27 00:02:48 +02:00
Michael Niedermayer
508c815d4d
Merge commit '9b4b96c0dee90d260891ec765b28f6ca15594340'
...
* commit '9b4b96c0dee90d260891ec765b28f6ca15594340':
force WINAPI_FAMILY to WINAPI_FAMILY_DESKTOP_APP to be able to use dxva.h
Conflicts:
libavcodec/dxva2_internal.h
See: c5327df838
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-26 22:41:18 +02:00
Steve Lhomme
c5327df838
force WINAPI_FAMILY to WINAPI_FAMILY_DESKTOP_APP to use DVXA
...
The struct definitions in dxva.h, which are necessary in order to
actually use d3d11va, are hidden when WINAPI_FAMILY targets Windows Phone
or WindowsRT.
Building with WINAPI_FAMILY=WINAPI_FAMILY_DESKTOP_APP is disallowed
when targeting ARM. ("Compiling Desktop applications for the ARM
platform is not supported.") So we set _CRT_BUILD_DESKTOP_APP to 0
to tell the runtime not to detect some issues with this mismatching.
The same tweaks to detect if the API is available is done in dxva2_internal.h
when compiling each DXVA2/D3D11VA decoders.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-26 22:02:20 +02:00
Steve Lhomme
9b4b96c0de
force WINAPI_FAMILY to WINAPI_FAMILY_DESKTOP_APP to be able to use dxva.h
...
The struct definitions in dxva.h, which are necessary in order to
actually use d3d11va, are hidden when WINAPI_FAMILY targets Windows Phone
or WindowsRT.
Building with WINAPI_FAMILY=WINAPI_FAMILY_DESKTOP_APP is disallowed
when targeting ARM. ("Compiling Desktop applications for the ARM
platform is not supported.") So we set _CRT_BUILD_DESKTOP_APP to 0
to tell the runtime not to detect some issues with this mismatching.
The same tweaks to detect if the API is available is done in dxva2_internal.h
when compiling each DXVA2/D3D11VA decoders.
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-07-26 20:18:03 +03:00
Niklesh
f21fcf60ec
movtextdec.c: Add support for fontsize
...
Add support for fontsize in style records. The patch uses reset to
directly change back to default style instead of using closing tags,
since we are not handling the default styles right now.
Signed-off-by: Niklesh <niklesh.lalwani@iitb.ac.in>
2015-07-26 09:35:20 -07:00
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 977105407c
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 6b2b26e7af
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
Michael Niedermayer
157fa73992
Merge commit 'ebe8b5d947c41449c684f17c6826fe6bc46c0360'
...
* commit 'ebe8b5d947c41449c684f17c6826fe6bc46c0360':
dds: Fix the slice size computation
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-23 12:20:53 +02:00
Ivan Uskov
1acb19d12b
libavcodec/qsvdec_h264.c: SPS parsing is now performed by MFXVideoDECODE_DecodeHeader() in libavcodec/qsvdec.c
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-23 03:48:00 +02:00
Jovan Zelincevic
9e3135f49e
Edit documentation and versioning for the fixed point AAC decoder
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-22 23:25:33 +02:00
Nedeljko Babic
a9d986c2ce
avcodec: Minor macro polishing
...
Use macros from aac_defines.h for adding suffixes
instead of local macros.
Signed-off-by: Nedeljko Babic <nedeljko.babic@imgtec.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-22 23:23:29 +02:00
Djordje Pesut
5fd81cf6f0
avcodec: Implementation of AAC_fixed_decoder (PS-module)
...
Add fixed point implementation.
Signed-off-by: Nedeljko Babic <nedeljko.babic@imgtec.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-22 21:51:28 +02:00
Jovan Zelincevic
631496e057
avcodec: Table creation for AAC_fixed_decoder (PS-module)
...
Add fixed point implementation of functions for generating tables.
Signed-off-by: Nedeljko Babic <nedeljko.babic@imgtec.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-22 21:51:22 +02:00
Michael Niedermayer
5362df2ee3
avcodec: remove unused sd variables
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-22 21:04:17 +02:00
Michael Niedermayer
975257ffe6
avcodec/libx264: Export choosen pict_type
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-22 20:49:01 +02:00
Michael Niedermayer
caba19a5be
avcodec/dnxhdenc: Set pict type for AV_PKT_DATA_QUALITY_STATS correctly
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-22 20:46:52 +02:00
Michael Niedermayer
557e011bf1
avcodec/libxavs: Export pict_type in side data
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-22 19:52:04 +02:00
Michael Niedermayer
c40ecffd31
Replace AV_PKT_DATA_QUALITY_FACTOR by AV_PKT_DATA_QUALITY_STATS
...
The stats are a superset of the quality factor, also allowing the picture type and encoder "PSNR" stats to be exported
This also replaces the native by fixed little endian order for the affected side data
AV_PKT_DATA_QUALITY_FACTOR is left as a synonym of AV_PKT_DATA_QUALITY_STATS
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-22 19:31:52 +02:00
Donny Yang
a906e86a8d
apng: Fix decoding images with the PREVIOUS dispose op
2015-07-22 16:42:24 +00:00
Michael Niedermayer
1d7fa1ac89
Merge commit '21c90d86d27c2143354c7d782050a779b0986eb1'
...
* commit '21c90d86d27c2143354c7d782050a779b0986eb1':
mpegvideo: Add missing include
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-22 18:08:07 +02:00
Michael Niedermayer
eaf15bba03
Merge commit 'ea4d46e72945cba37feb7aa154eb970732f513e4'
...
* commit 'ea4d46e72945cba37feb7aa154eb970732f513e4':
dds: Fix enum declaration
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-22 17:14:24 +02:00
Michael Niedermayer
fbdbe7a5d2
Merge commit 'ecee1148af4989e1f9e16f0cdc9f98ad2045538c'
...
* commit 'ecee1148af4989e1f9e16f0cdc9f98ad2045538c':
qsvenc_hevc: use the correct HW plugin UID
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-22 16:46:25 +02:00
Tom Butterworth
c7e6443441
Support the Hap chunked frame format
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-22 16:15:53 +02:00
Vittorio Giovara
21c90d86d2
mpegvideo: Add missing include
2015-07-22 13:35:44 +01:00
Michael Niedermayer
d08d8b61aa
dds: Fix 32bpp bitmaps decoding
...
Found-By: ami_stuff
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-07-22 13:35:44 +01:00
Vittorio Giovara
57214b2f7f
dds: Fix palette decoding
...
Red and blue channels were decoded in the wrong order.
Found-By: ami_stuff
2015-07-22 13:35:44 +01:00
Vittorio Giovara
ea4d46e729
dds: Fix enum declaration
...
Drop the global variables with anonymous enum type.
2015-07-22 13:35:43 +01:00
Anton Khirnov
ecee1148af
qsvenc_hevc: use the correct HW plugin UID
2015-07-22 12:11:46 +02:00
周晓勇
3e35f8efa1
avcodec: loongson optimize pixblockdsp with mmi
...
Signed-off-by: ZhouXiaoyong <zhouxiaoyong@loongson.cn>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-22 12:11:31 +02:00
Niklesh
d373b508b5
movtextenc.c: Add support for text highlighting
...
This patch takes care of the secondary color changes in ASS through highlight and hilightcolor boxes.
Signed-off-by: Niklesh <niklesh.lalwani@iitb.ac.in>
2015-07-21 20:13:40 -07:00
Niklesh
93e80a343b
movtextenc.c: Reorganize the code for easier maintenance
...
This patch reorganizes the code to make it easier to add support for different text modifier boxes and other styles in the future.
Signed-off-by: Niklesh <niklesh.lalwani@iitb.ac.in>
2015-07-21 20:13:40 -07:00
Michael Niedermayer
8fe00dd18a
Merge commit '6b2b26e7af3ede0abfb46eb5725c26d1083f50bc'
...
* commit '6b2b26e7af3ede0abfb46eb5725c26d1083f50bc':
dds: Decode using optimal slices sizes
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-21 20:35:59 +02:00
Michael Niedermayer
2de5737ee2
Merge commit '977105407cae55876041dddbf4ce0934cdd4cd6c'
...
* commit '977105407cae55876041dddbf4ce0934cdd4cd6c':
hap: Decode using optimal slices sizes
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-21 20:21:54 +02:00
James Almer
d32547a24a
avcodec/utils: silence some deprecation warnings
...
And prevent eventual compilation failures once the relevant functions
and fields are removed.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
2015-07-21 13:03:29 -03:00
James Almer
3e46c7dbbe
avcodec/options-test: don't alloc avctx->coded_frame
...
It's done automatically by avcodec_open2() now.
Fixes memleaks in fate-libavcodec-options.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
2015-07-21 13:03:25 -03:00
周晓勇
c303ad85a9
avcodec: loongson optimize blockdsp with mmi
...
Signed-off-by: ZhouXiaoyong <zhouxiaoyong@loongson.cn>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-21 17:50:19 +02:00
Tom Butterworth
5d0616ce0e
avcodec/hapdec: log reason for failure when texture type doesn't match stream
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-21 14:54:25 +02:00
周晓勇
b50910e9a9
avcodec: loongson optimize xvid idct with mmi
...
Signed-off-by: ZhouXiaoyong <zhouxiaoyong@loongson.cn>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-21 14:48:23 +02:00
周晓勇
21e2f030bf
avcodec: loongson move simple idct functions to a separate file
...
Signed-off-by: ZhouXiaoyong <zhouxiaoyong@loongson.cn>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-21 14:48:18 +02:00
Rostislav Pehlivanov
331c1e7494
aacenc: move the generation of ff_aac_pow34sf_tab[]
...
This commit moves the generation of ff_aac_pow34sf_tab[] out of the
encoder and into the table generator. The original commit log for
this table in 2011 actually mentions that it should be moved outside
but this never happened.
This is the first commit which cleans up the encoder a little.
Reviewed-by: Claudio Freire <klaussfreire@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-21 13:53:04 +02:00
Luca Barbato
6b2b26e7af
dds: Decode using optimal slices sizes
...
Enjoy some cache locality and use less threads.
About the same speedup provided to HAP.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2015-07-21 12:14:25 +02:00
Luca Barbato
977105407c
hap: Decode using optimal slices sizes
...
Enjoy some cache locality and use less threads.
About 5x speedup (from 60ms to 12ms to decode a 4k frame).
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2015-07-21 12:14:25 +02:00
Tom Butterworth
6b96c70f2d
avcodec/hapdec: don't log texture format every frame, do it once per decode session
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-21 03:25:01 +02:00
Tom Butterworth
440c26e9c4
libavcodec/hap: remove unused struct member
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-21 03:15:04 +02:00
Tom Butterworth
d8488090e5
libavcodec/hap: Name enums
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-21 03:14:53 +02:00
James Almer
651448a8a7
avcodec/aacsbr: fix compilation with hardcoded tables
...
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
2015-07-20 21:01:19 -03:00
Michael Niedermayer
5d5f8b29b4
Merge commit 'f56d8d8dd72b1ab52aa814c5a0fccabf8040ef68'
...
* commit 'f56d8d8dd72b1ab52aa814c5a0fccabf8040ef68':
h264: aarch64: intra prediction optimisations
Conflicts:
libavcodec/h264pred.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-21 01:39:30 +02:00
Michael Niedermayer
495eee0123
Merge commit '40cf1bbacc6220a0aa6bed5c331871d43f9ce370'
...
* commit '40cf1bbacc6220a0aa6bed5c331871d43f9ce370':
Deprecate avctx.coded_frame
Conflicts:
ffmpeg.c
libavcodec/a64multienc.c
libavcodec/asvenc.c
libavcodec/cljrenc.c
libavcodec/dpxenc.c
libavcodec/gif.c
libavcodec/mpegvideo_enc.c
libavcodec/nvenc.c
libavcodec/proresenc_kostya.c
libavcodec/pthread_frame.c
libavcodec/rawenc.c
libavcodec/sunrastenc.c
libavcodec/tiffenc.c
libavcodec/version.h
libavcodec/xbmenc.c
libavcodec/xwdenc.c
libavdevice/v4l2.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-21 01:17:15 +02:00
Michael Niedermayer
809780ca42
avcodec/utils: Do not merge side data for encoders
...
With side data now being added to every MPEG*/H26* video encoder
in the form of a quality scalar, software which simply stores
the pkt->data to get an ES stream would break.
This also as a side-effect makes the code faster
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-21 00:54:59 +02:00
Michael Niedermayer
e5bae39f46
Merge commit '5d3addb937946eca5391e40b5e6308e74ac6f77b'
...
* commit '5d3addb937946eca5391e40b5e6308e74ac6f77b':
Add a quality factor packet side data
Conflicts:
doc/APIchanges
ffmpeg.c
libavcodec/avcodec.h
libavcodec/mpegvideo_enc.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-21 00:54:42 +02:00
Michael Niedermayer
b1fad7ac20
Merge commit 'd6604b29ef544793479d7fb4e05ef6622bb3e534'
...
* commit 'd6604b29ef544793479d7fb4e05ef6622bb3e534':
Gather all coded_frame allocations and free functions to a single place
Conflicts:
libavcodec/a64multienc.c
libavcodec/asvenc.c
libavcodec/cljrenc.c
libavcodec/dpxenc.c
libavcodec/dvenc.c
libavcodec/gif.c
libavcodec/huffyuvenc.c
libavcodec/jpeglsenc.c
libavcodec/libopenjpegenc.c
libavcodec/libtheoraenc.c
libavcodec/libvpxenc.c
libavcodec/mpegvideo_enc.c
libavcodec/nvenc.c
libavcodec/pngenc.c
libavcodec/proresenc_kostya.c
libavcodec/sunrastenc.c
libavcodec/tiffenc.c
libavcodec/utils.c
libavcodec/utvideoenc.c
libavcodec/v210enc.c
libavcodec/v410enc.c
libavcodec/xbmenc.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-20 23:43:05 +02:00
Janne Grunau
9ed6f9a17c
arm: use a local label instead of the function symbol in ff_prefetch_arm
...
Avoids a relocation which might end out of range for thumb2.
Reported-By: Ludovic Fauvet <etix@videolan.org>
Bug-Id: https://bugs.webkit.org/show_bug.cgi?id=137022
CC: libav-stable@libav.org
2015-07-20 23:10:29 +02:00
Janne Grunau
f56d8d8dd7
h264: aarch64: intra prediction optimisations
2015-07-20 23:10:29 +02:00
Michael Niedermayer
439c9760b0
Merge commit '91f9b6579ac684c4b51c4cd0dbaed0a4f8295edf'
...
* commit '91f9b6579ac684c4b51c4cd0dbaed0a4f8295edf':
flashsvenc: Keep coded_frame.key_frame a write-only variable
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-20 22:36:22 +02:00
Michael Niedermayer
b97e3e11a9
Merge commit '10a9149de242c7bbc4e130d3d7c593b89e20f80e'
...
* commit '10a9149de242c7bbc4e130d3d7c593b89e20f80e':
ffv1enc: Keep coded_frame.key_frame a write-only variable
Conflicts:
libavcodec/ffv1.h
libavcodec/ffv1enc.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-20 22:25:53 +02:00
Michael Niedermayer
256430cf38
Merge commit 'efc618aff9d68d2ddc323a5c5f892ac71951f162'
...
* commit 'efc618aff9d68d2ddc323a5c5f892ac71951f162':
qtrleenc: Keep coded_frame.key_frame a write-only variable
Conflicts:
libavcodec/qtrleenc.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-20 22:14:29 +02:00
Michael Niedermayer
bde7f5b135
Merge commit 'f3b4a92241a33d444f7f6018ebc12e2e3a2d335f'
...
* commit 'f3b4a92241a33d444f7f6018ebc12e2e3a2d335f':
libtheoraenc: Keep coded_frame.key_frame a write-only variable
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-20 22:13:42 +02:00
Michael Niedermayer
96504b3f72
Merge commit 'd6006dd9f0d4d01023359230212f1f9fa4800e5b'
...
* commit 'd6006dd9f0d4d01023359230212f1f9fa4800e5b':
libvpxenc: Do not entangle coded_frame
Conflicts:
libavcodec/libvpxenc.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-20 22:05:27 +02:00
Michael Niedermayer
70c648db89
Merge commit '7fc8d8a1b3da1666176b3d92e989ee74f3ef014e'
...
* commit '7fc8d8a1b3da1666176b3d92e989ee74f3ef014e':
libxvid: Do not entangle coded_frame
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-20 22:01:44 +02:00
Michael Niedermayer
033144c0d1
Merge commit '56672aeaee19216d2fd8eeb9964b1f71f0af2919'
...
* commit '56672aeaee19216d2fd8eeb9964b1f71f0af2919':
svq1enc: Do not entangle coded_frame
Conflicts:
libavcodec/svq1enc.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-20 21:53:09 +02:00
Michael Niedermayer
f2a581e2ee
Merge commit '05fb4c9aaf84b59f8ab1ce8d4c0f49dd12113024'
...
* commit '05fb4c9aaf84b59f8ab1ce8d4c0f49dd12113024':
proresenc: Do not entangle coded_frame
Conflicts:
libavcodec/proresenc_kostya.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-20 21:44:53 +02:00
Michael Niedermayer
a99f0ad194
Merge commit '91767360d86ac786571593ab11c7291010ab3829'
...
* commit '91767360d86ac786571593ab11c7291010ab3829':
a64multienc: Do not entangle coded_frame
Conflicts:
libavcodec/a64multienc.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-20 21:40:34 +02:00
Michael Niedermayer
6497aab022
Merge commit '95e2317ed85502dd8d96bcd9b12084dbfb8f9e8e'
...
* commit '95e2317ed85502dd8d96bcd9b12084dbfb8f9e8e':
roqvideoenc: Drop unneeded initialization
Conflicts:
libavcodec/roqvideoenc.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-20 21:31:42 +02:00
Michael Niedermayer
16b68bd2ee
Merge commit '1f171de8cae9d0c527c5f0bae2a597dbd65fd3a4'
...
* commit '1f171de8cae9d0c527c5f0bae2a597dbd65fd3a4':
mpegvideo_enc: Drop unnneded initialization
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-20 21:20:51 +02:00
Ivan Uskov
264ba3d847
libavcodec/qsvdec.c: missed MFXVideoDECODE_Close() call
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-20 19:57:57 +02:00
Djordje Pesut
f85bc147fb
avcodec: Implementation of AAC_fixed_decoder (SBR-module)
...
Add fixed poind code.
Signed-off-by: Nedeljko Babic <nedeljko.babic@imgtec.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-20 17:20:16 +02:00
Jovan Zelincevic
b0414da90d
avcodec: Table creation for AAC_fixed_decoder (SBR-module)
...
Create tables for fixed point code.
Signed-off-by: Nedeljko Babic <nedeljko.babic@imgtec.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-20 17:20:16 +02:00
Djordje Pesut
5499467d5d
avcodec: Template creation for AAC decoder (SBR-module)
...
Move the existing code to a new template file.
Signed-off-by: Nedeljko Babic <nedeljko.babic@imgtec.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-20 17:20:16 +02:00
Niklesh
a927aacbe6
movtextdec.c: Correct the highlight tags
...
Signed-off-by: Niklesh <niklesh.lalwani@iitb.ac.in>
2015-07-20 08:16:19 -07:00
Vittorio Giovara
40cf1bbacc
Deprecate avctx.coded_frame
...
The rationale is that coded_frame was only used to communicate key_frame,
pict_type and quality to the caller, as well as a few other random fields,
in a non predictable, let alone consistent way.
There was agreement that there was no use case for coded_frame, as it is
a full-sized AVFrame container used for just 2-3 int-sized properties,
which shouldn't even belong into the AVCodecContext in the first place.
The appropriate AVPacket flag can be used instead of key_frame, while
quality is exported with the new AVPacketSideData quality factor.
There is no replacement for the other fields as they were unreliable,
mishandled or just not used at all.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-07-20 15:06:50 +01:00
Vittorio Giovara
5d3addb937
Add a quality factor packet side data
...
This is necessary to preserve the quality information currently exported
with coded_frame. Add the new side data to every encoder that needs it,
and use it in avconv.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-07-20 15:06:47 +01:00
Donny Yang
0030613d69
avcodec/apngdec: Fix typos in decoder causing incorrect results
...
Signed-off-by: Donny Yang <work@kota.moe>
2015-07-20 13:46:50 +00:00
Vittorio Giovara
d6604b29ef
Gather all coded_frame allocations and free functions to a single place
...
Allocating coded_frame is what most encoders do anyway, so it makes
sense to always allocate and free it in a single place. Moreover a lot
of encoders freed the frame with av_freep() instead of the correct API
av_frame_free().
This bring uniformity to encoder behaviour and prevents applications
from erroneusly accessing this field when not allocated. Additionally
this helps isolating encoders that export information with coded_frame,
and heavily simplifies its deprecation.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-07-20 14:16:15 +01:00
Vittorio Giovara
91f9b6579a
flashsvenc: Keep coded_frame.key_frame a write-only variable
2015-07-20 14:13:42 +01:00
Vittorio Giovara
10a9149de2
ffv1enc: Keep coded_frame.key_frame a write-only variable
2015-07-20 14:13:42 +01:00
Vittorio Giovara
efc618aff9
qtrleenc: Keep coded_frame.key_frame a write-only variable
2015-07-20 14:13:42 +01:00
Vittorio Giovara
f3b4a92241
libtheoraenc: Keep coded_frame.key_frame a write-only variable
2015-07-20 14:13:42 +01:00
Vittorio Giovara
d6006dd9f0
libvpxenc: Do not entangle coded_frame
...
Keep coded_frame.key_frame a write-only variable.
2015-07-20 14:13:42 +01:00
Vittorio Giovara
7fc8d8a1b3
libxvid: Do not entangle coded_frame
2015-07-20 14:13:42 +01:00
Vittorio Giovara
56672aeaee
svq1enc: Do not entangle coded_frame
2015-07-20 14:13:42 +01:00
Vittorio Giovara
05fb4c9aaf
proresenc: Do not entangle coded_frame
2015-07-20 14:13:42 +01:00
Vittorio Giovara
75c1ed2e4c
ffv1enc: Use input frame to set SAR and interlacing
2015-07-20 14:13:42 +01:00
Vittorio Giovara
91767360d8
a64multienc: Do not entangle coded_frame
...
This change (and the following ones of the same kind) is mainly to
simplify wrapping this section with an #if FF_API block later on.
No functional changes are applied, the fields of the context coded_frame
fields are directly initialized, instead of keeping a reference to the
coded_frame itself.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-07-20 14:12:48 +01:00
Vittorio Giovara
95e2317ed8
roqvideoenc: Drop unneeded initialization
...
Its fields are never initialized to begin with.
2015-07-20 13:57:25 +01:00
Vittorio Giovara
1f171de8ca
mpegvideo_enc: Drop unnneded initialization
...
coded_frame is already initialized where needed.
2015-07-20 13:57:18 +01:00
周晓勇
fdac5ff682
avcodec: loongson relocate constants of idctdsp and h264pred
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-20 14:29:22 +02:00
周晓勇
4bd6193397
avcodec: loongson constants redefined with macros
...
Signed-off-by: ZhouXiaoyong <zhouxiaoyong@loongson.cn>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-20 14:29:22 +02:00
Michael Niedermayer
749f85496c
avcodec/ffv1enc: fix assertion failure with unset bits per raw sample
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-20 02:11:48 +02:00
Carl Eugen Hoyos
c239fcb948
lavc/jpeg2000: Signal lossless / bit-exact video stream.
2015-07-20 00:28:13 +02:00
Carl Eugen Hoyos
d8d2f934bd
lavc: Improve documentation for rc_max_rate and bit_rate.
...
Both may be set by user (libavformat) on decoding.
2015-07-20 00:27:51 +02:00
Michael Niedermayer
5c583b1419
avcodec/dds: Flip more R<->B cases
...
Fixes Ticket4665
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-20 00:03:11 +02:00
Michael Niedermayer
36a87c2dc7
avcodec/dds: fix paletted files
...
Fixes Ticket4664
The changed fate tests lack red/blue shades and thus look correct
either way
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-19 23:26:59 +02:00
Michael Niedermayer
ea8785ceda
avcodec/utils: Check that channel count is valid in avcodec_open2();
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-19 18:17:45 +02:00
Michael Niedermayer
9c943e077b
Merge commit '69b92f1b99f3f210be19ee6ec06f6c0de1733031'
...
* commit '69b92f1b99f3f210be19ee6ec06f6c0de1733031':
qsvenc: properly handle asynchronous encoding
Conflicts:
libavcodec/qsvenc.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-19 16:34:12 +02:00
Michael Niedermayer
f929081f2e
Merge commit 'f5c4d38c78347b09478e21a661befff4b2d44643'
...
* commit 'f5c4d38c78347b09478e21a661befff4b2d44643':
qsvdec: properly handle asynchronous decoding
Conflicts:
libavcodec/qsvdec.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-19 16:13:35 +02:00
Anton Khirnov
69b92f1b99
qsvenc: properly handle asynchronous encoding
...
Wait for async_depth frames before syncing.
2015-07-19 10:06:53 +02:00
Anton Khirnov
f5c4d38c78
qsvdec: properly handle asynchronous decoding
...
Wait for async_depth frames before syncing.
2015-07-19 09:47:45 +02:00
Michael Niedermayer
54882156dd
avcodec/hevc_parser: Treat extradata parsing differently, as it should not contain an AU
...
Fixes ticket4718
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-19 03:24:25 +02:00
Michael Niedermayer
599d746e07
avcodec/vp8: Check buffer size in vp8_decode_frame_header()
...
avoids null pointer dereference
Fixes: signal_sigsegv_d5de40_964_vp80-00-comprehensive-010.ivf with memlimit of 1048576
Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-18 19:37:04 +02:00
Michael Niedermayer
a84f0e8d8f
avcodec/vp8: Fix null pointer dereference in ff_vp8_decode_free()
...
Fixes: signal_sigsegv_d5de23_967_vp80_00_comprehensive_010.ivf with memlimit 524288
Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-18 19:03:23 +02:00
Michael Niedermayer
1c5b712c0a
avcodec/diracdec: Check for hpel_base allocation failure
...
Fixes null pointer dereference
Fixes: signal_sigsegv_b02a96_280_RL_420p_ffdirac.drc with memlimit of 67108864
Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-18 18:05:41 +02:00
Michael Niedermayer
3197c0aa87
avcodec/rv34: Clear pointers in ff_rv34_decode_init_thread_copy()
...
Avoids leaving stale pointers
Fixes: signal_sigabrt_7ffff70eccc9_819_sabtriple.rm with memlimit 536870912
Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-18 11:28:17 +02:00
Michael Niedermayer
f8e4d37983
avcodec/hevc_ps: Also print depth in failure path of map_pixel_format()
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-18 05:12:00 +02:00
Michael Niedermayer
c0894e6288
Merge commit '256ef19844892c6cf8e0386e3287bae970ec6320'
...
* commit '256ef19844892c6cf8e0386e3287bae970ec6320':
h264: arm: use intra pred8x8 functions only for chroma_format_idc <= 1
Conflicts:
libavcodec/arm/h264pred_init_arm.c
See: 565cabf5c8
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-18 02:13:22 +02:00
Janne Grunau
256ef19844
h264: arm: use intra pred8x8 functions only for chroma_format_idc <= 1
2015-07-18 00:28:49 +02:00
Michael Niedermayer
52b6d96268
Merge commit 'a344e5d094ebcf9a23acf3a27c56cbbbc829db42'
...
* commit 'a344e5d094ebcf9a23acf3a27c56cbbbc829db42':
x86: bswapdsp: Don't treat 32-bit integers as 64-bit
Conflicts:
libavcodec/x86/bswapdsp.asm
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-17 23:20:14 +02:00
Michael Niedermayer
c7c33ab721
Merge commit 'f5ee23004d1177ca6dd99b92cb4ff4b94b2eae09'
...
* commit 'f5ee23004d1177ca6dd99b92cb4ff4b94b2eae09':
configure: Factor out g722dsp module
Conflicts:
configure
libavcodec/arm/Makefile
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-17 23:04:47 +02:00
Michael Niedermayer
65b0f7ce08
Merge commit 'a623aa0069dff586241ad2ffedcd45ed840e2553'
...
* commit 'a623aa0069dff586241ad2ffedcd45ed840e2553':
configure: Factor out wmv2dsp module
Conflicts:
libavcodec/Makefile
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-17 22:56:00 +02:00
Michael Niedermayer
115a9b5091
Merge commit 'd42191c78befc1983f23b1899b2dda513b72f1ed'
...
* commit 'd42191c78befc1983f23b1899b2dda513b72f1ed':
configure: Factor out vp8dsp module
Conflicts:
configure
libavcodec/Makefile
libavcodec/x86/Makefile
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-17 22:45:34 +02:00
Michael Niedermayer
3500eccb8e
Merge commit 'd4aea1aa4060fb5ba7f5f426823b697d2a5af08b'
...
* commit 'd4aea1aa4060fb5ba7f5f426823b697d2a5af08b':
configure: Factor out vp56dsp module
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-17 22:31:45 +02:00
Michael Niedermayer
fd29dd432c
Merge commit '5cb4bdb2a03c3643f8f1e7d21d7094e61e0a4418'
...
* commit '5cb4bdb2a03c3643f8f1e7d21d7094e61e0a4418':
configure: Factor out rv34dsp module
Conflicts:
libavcodec/Makefile
libavcodec/x86/Makefile
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-17 22:21:36 +02:00
Michael Niedermayer
189f2ed902
avcodec/libx264: fix MPEG2 support
...
Found-by: rcombs
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-17 22:14:00 +02:00
Michael Niedermayer
77cd5193a5
Merge commit '575ec60e542114b2ef5b2f88b28eeb72389dda45'
...
* commit '575ec60e542114b2ef5b2f88b28eeb72389dda45':
configure: Factor out mss34dsp module
Conflicts:
libavcodec/Makefile
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-17 21:59:45 +02:00
Michael Niedermayer
ccd3edf81f
Merge commit '2edc77dc7be5f4a006c6295f4c827e5471f85262'
...
* commit '2edc77dc7be5f4a006c6295f4c827e5471f85262':
configure: Factor out ividsp module
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-17 21:51:19 +02:00
Michael Niedermayer
948a15195c
Merge commit 'b075869bc1e1aadea0a8dc819ebfb758adb9e3d0'
...
* commit 'b075869bc1e1aadea0a8dc819ebfb758adb9e3d0':
configure: Factor out flacdsp module
Conflicts:
configure
libavcodec/Makefile
libavcodec/arm/Makefile
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-17 21:42:14 +02:00
Michael Niedermayer
e56f14659f
Merge commit 'e1319aa1c1be9b64117c19170344fb78841dd67c'
...
* commit 'e1319aa1c1be9b64117c19170344fb78841dd67c':
libx264: Add support for the MPEG2 encoder
Conflicts:
configure
libavcodec/Makefile
libavcodec/libx264.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-17 21:21:03 +02:00
Henrik Gramner
a344e5d094
x86: bswapdsp: Don't treat 32-bit integers as 64-bit
...
The upper halves are not guaranteed to be zero in x86-64.
Also use `test` instead of `and` when the result isn't used for anything other
than as a branch condition, this allows some register moves to be eliminated.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2015-07-17 20:02:28 +02:00
Vittorio Giovara
f5ee23004d
configure: Factor out g722dsp module
2015-07-17 18:46:24 +01:00
Vittorio Giovara
a623aa0069
configure: Factor out wmv2dsp module
2015-07-17 18:46:24 +01:00
Vittorio Giovara
d42191c78b
configure: Factor out vp8dsp module
2015-07-17 18:46:24 +01:00
Vittorio Giovara
d4aea1aa40
configure: Factor out vp56dsp module
2015-07-17 18:46:24 +01:00
Vittorio Giovara
5cb4bdb2a0
configure: Factor out rv34dsp module
2015-07-17 18:46:24 +01:00
Vittorio Giovara
575ec60e54
configure: Factor out mss34dsp module
2015-07-17 18:46:24 +01:00
Vittorio Giovara
2edc77dc7b
configure: Factor out ividsp module
2015-07-17 18:46:24 +01:00
Vittorio Giovara
b075869bc1
configure: Factor out flacdsp module
2015-07-17 18:46:23 +01:00
Michael Niedermayer
1cdfae0b3e
Merge commit '0cf5588d69922aa3e063bac6304c09c543a9ef52'
...
* commit '0cf5588d69922aa3e063bac6304c09c543a9ef52':
hq_hqa: Fix decoding when INFO section is absent
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-17 14:59:18 +02:00
Michael Niedermayer
441d5a7084
Merge commit 'b0017579b6e8de3d0d13dcfe0a4dd848dc6baa37'
...
* commit 'b0017579b6e8de3d0d13dcfe0a4dd848dc6baa37':
h264: Add support for Closed Caption export
Conflicts:
libavcodec/h264.c
libavcodec/h264_sei.c
See: 8234f0e3b4
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-17 14:13:19 +02:00
Luca Barbato
e1319aa1c1
libx264: Add support for the MPEG2 encoder
2015-07-17 10:47:48 +02:00
Vittorio Giovara
0cf5588d69
hq_hqa: Fix decoding when INFO section is absent
2015-07-17 01:49:42 +01:00
Kieran Kunhya
b0017579b6
h264: Add support for Closed Caption export
...
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-07-17 01:44:22 +01:00
Carl Eugen Hoyos
7f0d540188
lavc: Allow 64 channels internally.
2015-07-17 00:16:45 +02:00
Ivan Uskov
6e127990fa
Refactoring to move common QSV-related code part into libavcodec/qsvdec.c
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-16 21:30:45 +02:00
Tom Butterworth
17ee24af7e
avcodec/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.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-16 20:41:07 +02:00
Tom Butterworth
6074956fa1
avcodec/hap: move some per-stream setup into decoder init rather than per-frame
...
This change will reject frames with a texture type which doesn't match the stream description.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-16 16:04:06 +02:00
Shivraj Patil
012ba786e6
avcodec/mips: MSA (MIPS-SIMD-Arch) optimizations for VP9 MC functions
...
This patch adds MSA (MIPS-SIMD-Arch) optimizations for VP9 MC functions in new file vp9_mc_msa.c
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-16 15:03:02 +02:00
周晓勇
0bfa176c64
avcodec: loongson optimized idctdsp with mmi
...
Signed-off-by: ZhouXiaoyong <zhouxiaoyong@loongson.cn>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-16 14:27:53 +02:00
周晓勇
dcd14db806
avcodec: loongson add constant definition
...
Signed-off-by: ZhouXiaoyong <zhouxiaoyong@loongson.cn>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-16 14:27:49 +02:00
Michael Niedermayer
f1a38264f2
avcodec/pthread_frame: clear priv_data, avoid stale pointer in error case
...
Fixes: b4b47bc2b3fb7ca710bfffe5aa969e37_signal_sigabrt_7ffff70eccc9_744_nc_sample2.avi with memlimit of 4194304
Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-16 12:18:30 +02:00
Carl Eugen Hoyos
8dad213143
lavc: Add properties field to AVCodecContext.
...
The new field can hold information about losslessness and closed captions for now.
2015-07-16 12:18:30 +02:00
Luca Barbato
c88c5eef53
hevc: Split the struct setup from the pps parsing
2015-07-15 19:39:44 +02:00
Michael Niedermayer
4e160ecdbc
Merge commit 'c88c5eef53ff1619724ba47b722da64ec0593dab'
...
* commit 'c88c5eef53ff1619724ba47b722da64ec0593dab':
hevc: Split the struct setup from the pps parsing
Conflicts:
libavcodec/hevc_ps.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-15 21:21:40 +02:00
Michael Niedermayer
269a71b68a
avcodec/mpeg4videodec: Clarify the mpeg4_unpack_bframes reference.
...
This should avoid misunderstandings like in Ticket4618
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-15 21:05:24 +02:00
Michael Niedermayer
4a6b8289e6
avcodec/mips/mpegvideo_mmi: Use av_assert2()
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-15 17:25:42 +02:00
ZhouXiaoyong
95418634b1
avcodec: loongson optimized mpegvideo dct unquantize with mmi
...
Signed-off-by: ZhouXiaoyong <zhouxiaoyong@loongson.cn>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-15 15:51:07 +02:00
周晓勇
a0ad6c85ac
avcodec: loongson optimized h264pred with mmi
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-15 15:51:02 +02:00
Michael Niedermayer
dffae122d0
avcodec/mjpegdec: Fix DC overflow in decode_block()
...
Fixes Ticket4683
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-15 05:05:25 +02:00
Michael Niedermayer
bfd17046c1
avcodec/mpeg12dec: Fix decoding of faulty interlaced mpeg2
...
Fixes Ticket4721
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-15 00:09:15 +02:00
Timo Rothenpieler
550e872bcd
avcodec/nvenc: Fix build with older gcc versions
...
Aparently anonymous structs weren't always supported, not even sure if
they are standard conformant.
2015-07-14 23:00:44 +02:00
Arttu Ylä-Outinen
b90b6af710
avcodec: add libkvazaar HECV encoder
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-14 18:00:36 +02:00
Ivan Uskov
ce91bab70f
libavcodec/qsv.c: Issue fixed: QSV engine does not release display handler under linux platform.
...
Reviewed-by: Gwenole Beauchesne <gb.devel@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-14 02:02:55 +02:00
Michael Niedermayer
3edc6d1cd9
Merge commit '32c8d89c036b0e75ece74aea638df587099def0b'
...
* commit '32c8d89c036b0e75ece74aea638df587099def0b':
hevc: Print the non-supported chroma_format_idc
Conflicts:
libavcodec/hevc_ps.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-14 01:33:58 +02:00
Michael Niedermayer
e17a459af0
Merge commit '8e373fe048812a25b238ea60a7052b8c07639a42'
...
* commit '8e373fe048812a25b238ea60a7052b8c07639a42':
hevc: Factor out the pixel format mapping from the sps parser
Conflicts:
libavcodec/hevc_ps.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-14 01:23:39 +02:00
Michael Niedermayer
4bde1a4a37
avcodec/mpegvideo: Fix null pointer dereference of picture array
...
Fixes: 0d0a2bace067d09c08f0fa5340496c23_signal_sigsegv_7ffff713351a_342_WobblyWindowsIntro.avi with memlimit of 67108864
Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-14 00:31:57 +02:00
Michael Niedermayer
85b7456efe
avcodec/hevc_parser: Fix memleaks in parser mix
...
Found-by: jamrial
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-13 22:26:53 +02:00
Michael Niedermayer
5d346feafa
avcodec/pthread_frame: check avctx on deallocation
...
Fixes null pointer dereferences
Fixes: af1a5a33e67e479f439239097bd0d4fd_signal_sigsegv_7ffff713351a_152_Dolby_Rain_Logo.pmp with memlimit of 8388608
Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-13 22:09:50 +02:00
Luca Barbato
32c8d89c03
hevc: Print the non-supported chroma_format_idc
...
And drop the spurious newline.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2015-07-13 21:59:53 +02:00
Luca Barbato
8e373fe048
hevc: Factor out the pixel format mapping from the sps parser
...
The function will grow larger as more formats are supported.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2015-07-13 21:59:53 +02:00
James Almer
84e847c7c8
avcodec/hevc_parser: use the old parser only when hevc decoder is available
...
If it's not, then the new dependence-free parser will be used instead
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
2015-07-13 14:57:54 -03:00
Michael Niedermayer
cc0380222a
avcodec/mpegvideo: Check for NULL in ff_mpv_common_end()
...
Fixes: af94b3a3d26586c08f557cafe8246251_signal_sigsegv_7ffff713351a_343_XFMode.ASF with 1048576 alloc limit
Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-13 19:26:37 +02:00
Michael Niedermayer
697160366f
avcodec/vp3: check current_frame before accessing it
...
Fixes null pointer dereference
Fixes: b15eb06e0111e94bc59123c86db7aff9_signal_sigsegv_a0500f_45_320vp3.nsv with allocation limit 536870912
Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-13 19:11:56 +02:00
Michael Niedermayer
5be07d0206
Merge commit 'a062a55d37720abc8c704aa0e8682efd3cdc9c9b'
...
* commit 'a062a55d37720abc8c704aa0e8682efd3cdc9c9b':
hevc_parser: fix standalone build with the hevc decoder disabled
Conflicts:
libavcodec/Makefile
libavcodec/hevc.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-13 17:04:13 +02:00
Michael Niedermayer
afa97144cf
Merge commit '077b55943330150db0eafd36bbee614697cabd98'
...
* commit '077b55943330150db0eafd36bbee614697cabd98':
hevc: handle a NULL sps in set_sps() properly
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-13 16:41:09 +02:00
Michael Niedermayer
d13fc98247
Merge commit '18156b53f9b642b71c182c5c9818175a61572d2b'
...
* commit '18156b53f9b642b71c182c5c9818175a61572d2b':
hevc: do not pass an entire HEVCContext into export_stream_params()
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-13 16:31:10 +02:00
Michael Niedermayer
39bbdebb1e
avcodec/sanm: Reset sizes in destroy_buffers()
...
Fixes crash in 1288a2fe8e9ae6b00ca40e089d08ca65_signal_sigsegv_7ffff71426a7_354_accident.san with allocation limit 65536
Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-13 16:06:37 +02:00
Michael Niedermayer
f7068bf277
avcodec/alac: Clear pointers in allocate_buffers()
...
Fixes: 06a4edb39ad8a9883175f9bd428334a2_signal_sigsegv_7ffff713351a_706_mov__alac__ALAC_6ch.mov
Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-13 15:47:49 +02:00
James Almer
1b9a8e5f1d
dxva2_hevc: unbreak compilation after recent sps/pps changes
...
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2015-07-13 09:00:37 +02:00
Anton Khirnov
a062a55d37
hevc_parser: fix standalone build with the hevc decoder disabled
...
The parser depends on hevc_ps, which in turn needs some data tables.
Found-by: James Almer <jamrial@gmail.com>
2015-07-13 08:58:21 +02:00
Anton Khirnov
b9f76d19d8
hevc_ps: make sure failing to decode an SPS always returns an error
...
Some of the goto err clauses do not set the error code. It seems better
to fall back on INVALIDDATA instead of adding it everywhere explicitly.
2015-07-13 07:49:03 +02:00
James Almer
1aab5d8ab1
avcodec/dxva2_hevc: unbreak compilation after recent sps/pps changes
...
Signed-off-by: James Almer <jamrial@gmail.com>
2015-07-13 00:06:02 -03:00
Philip Langdale
b11c3fce38
avcodec/vdpau_hevc: unbreak compilation after sps/pps changes
...
There was some reorganisation in the HEVC headers so the sps and pps
now live in a different place.
2015-07-12 19:56:54 -07:00
Michael Niedermayer
10d7d0880c
avcodec/utils: Check that the sample rate is not negative when opening an encoder
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-13 03:51:33 +02:00
Michael Niedermayer
d6ff68ad85
Factor duplicated ff_fast_malloc() out into mem_internal.h
...
internal.h is difficult to use due to circular dependancies
mem.h is a public header ff_* is not public
Alternative solutions probably are possible too
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-13 02:41:43 +02:00
Michael Niedermayer
4496ccc724
avcodec/hevc_parser: Reenable the old parser under ADVANCED_PARSER define
...
Feel free to use either, they both work but the old one provides
more information but needs the hevc decoder
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-13 02:14:58 +02:00
Michael Niedermayer
9e810a98a2
Merge commit '650060dfb665552442ec11b456660e3e9a9d9016'
...
* commit '650060dfb665552442ec11b456660e3e9a9d9016':
hevc_parser: parse and export some stream parameters
Conflicts:
configure
libavcodec/hevc_parser.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-13 01:28:57 +02:00
Michael Niedermayer
99558270ed
avcodec/hevc: Simplify skipped_bytes_pos code further
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-13 01:09:21 +02:00
Michael Niedermayer
ad92410d90
avcodec/hevc: Move skipped_bytes_pos_nal to HEVCNAL, simplify code
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-13 00:43:25 +02:00
Michael Niedermayer
bcc6c7bb65
avcodec/hevc: Move skipped_bytes_pos_size_nal into HAVCNAL
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-13 00:38:15 +02:00