ffmpeg.git
4 years agoMerge commit '0232ba62a28527579e34d44700b48017cc727e5f'
Michael Niedermayer [Wed, 11 Feb 2015 00:31:52 +0000 (01:31 +0100)]
Merge commit '0232ba62a28527579e34d44700b48017cc727e5f'

* commit '0232ba62a28527579e34d44700b48017cc727e5f':
  frame: clarify buf documentation

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agodoc/ffmpeg: Document frame_drop_threshold
Michael Niedermayer [Tue, 10 Feb 2015 13:10:23 +0000 (14:10 +0100)]
doc/ffmpeg: Document frame_drop_threshold

4 years agoMerge remote-tracking branch 'cus/stable'
Michael Niedermayer [Tue, 10 Feb 2015 22:45:54 +0000 (23:45 +0100)]
Merge remote-tracking branch 'cus/stable'

* cus/stable:
  ffplay: factorize thread starting and stopping code into decoder
  ffplay: make eof part of videostate and signal it when opening a stream
  ffplay: update frame timer based on last updated clock time when toggling pause

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavutil/error: list most common error code in error_entries when strerror_r() is unava...
Michael Niedermayer [Tue, 10 Feb 2015 21:51:17 +0000 (22:51 +0100)]
avutil/error: list most common error code in error_entries when strerror_r() is unavailable

Fixes Ticket4267

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agotests: drop bc dependency
Clément Bœsch [Mon, 19 Jan 2015 21:56:59 +0000 (22:56 +0100)]
tests: drop bc dependency

We already have a dependency on awk and bc is sometimes not found in the
base system.

4 years agoffplay: factorize thread starting and stopping code into decoder
Marton Balint [Sun, 26 Oct 2014 18:19:31 +0000 (19:19 +0100)]
ffplay: factorize thread starting and stopping code into decoder

Signed-off-by: Marton Balint <cus@passwd.hu>
4 years agoffplay: make eof part of videostate and signal it when opening a stream
Marton Balint [Tue, 6 Jan 2015 00:17:56 +0000 (01:17 +0100)]
ffplay: make eof part of videostate and signal it when opening a stream

Otherwise we may not flush a decoder when a new stream is opened during an
already eof condition.

Signed-off-by: Marton Balint <cus@passwd.hu>
4 years agoffplay: update frame timer based on last updated clock time when toggling pause
Marton Balint [Sun, 1 Feb 2015 22:57:49 +0000 (23:57 +0100)]
ffplay: update frame timer based on last updated clock time when toggling pause

It is better than using simply video clock, because video clock may be NAN.

Signed-off-by: Marton Balint <cus@passwd.hu>
4 years agoavfilter: Add repeatfields filter (Port of mp=softpulldown)
Paul B Mahol [Wed, 28 Jan 2015 15:13:27 +0000 (15:13 +0000)]
avfilter: Add repeatfields filter (Port of mp=softpulldown)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolibavutil: camellia: remove unwanted memory loads
Supraja Meedinti [Tue, 10 Feb 2015 15:54:07 +0000 (21:24 +0530)]
libavutil: camellia: remove unwanted memory loads

lavu       CAMELLIA     size: 1048576  runs:   1024  time:   21.549 +- 0.17

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolibavformat: DNxHD in .mov, switch unspecified color_range to mpeg
Kevin Wheatley [Tue, 10 Feb 2015 11:37:00 +0000 (11:37 +0000)]
libavformat: DNxHD in .mov, switch unspecified color_range to mpeg

Avid prefers mpeg range [16-235] by default this change brings
ffmpeg into line with that. To obtain the old behaviour use
'-color_range jpeg' on the command line prior to the ouput
filename.

Signed-off-by: Kevin Wheatley <kevin.j.wheatley@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agopixdesc: clarify AV_PIX_FMT_FLAG_ALPHA doxygen
wm4 [Tue, 10 Feb 2015 11:18:13 +0000 (12:18 +0100)]
pixdesc: clarify AV_PIX_FMT_FLAG_ALPHA doxygen

Also make clear that PAL8 can have alpha.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavutil: check pixdescs in a different place
wm4 [Tue, 10 Feb 2015 12:27:03 +0000 (13:27 +0100)]
avutil: check pixdescs in a different place

Doing this check in avutil_version() is not appropriate. Also, this code
is by default disabled (--assert-level is by default 0). A FATE run with
defaults will never execute the checks.

Move it to the pixelutils test program. Whatever reason there was in
avutil_version() not to run this test by default, it should be fine in
this test program. This means FATE will run the test by default. (Yes,
pixelutils is not strictly the best place for it either, but it's
better.)

(pixdesc.c also has a small test program, but it's never run by FATE.)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavutil: move internal function out of public header
wm4 [Tue, 10 Feb 2015 12:27:02 +0000 (13:27 +0100)]
avutil: move internal function out of public header

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec: fix clobbered ff_get_buffer()
Paul B Mahol [Tue, 10 Feb 2015 14:20:32 +0000 (14:20 +0000)]
avcodec: fix clobbered ff_get_buffer()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agotest/fate: added mxf_opatom regression tests
Mark Reid [Tue, 10 Feb 2015 03:19:08 +0000 (19:19 -0800)]
test/fate: added mxf_opatom regression tests

Reviewed-by: tomas.hardin@codemill.se
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/mss4: use av_malloc_array()
Paul B Mahol [Mon, 9 Feb 2015 13:33:11 +0000 (13:33 +0000)]
avcodec/mss4: use av_malloc_array()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agoavcodec/huffman: check if map was allocated too
Paul B Mahol [Mon, 9 Feb 2015 13:18:24 +0000 (13:18 +0000)]
avcodec/huffman: check if map was allocated too

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agoavcodec/hevc_parser: check for av_mallocz() failure
Paul B Mahol [Mon, 9 Feb 2015 13:14:45 +0000 (13:14 +0000)]
avcodec/hevc_parser: check for av_mallocz() failure

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agoexamples/demuxing_decoding: abort decoding when width, height or pix_fmt change
Andreas Cadhalpun [Sat, 31 Jan 2015 19:36:07 +0000 (20:36 +0100)]
examples/demuxing_decoding: abort decoding when width, height or pix_fmt change

This is necessary, because avcodec_decode_video2 can change
width, height and/or pixel format of the AVCodecContext. Since
video_dst_data and video_dst_linesize are not updated by calling
av_image_alloc again, av_image_copy[_plane] asserts, because the
destination buffer is too small.

In this case, creating a useable rawvideo is not possible anyway, since
it has fixed width/height/pix_fmt.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agox86/hevc_sao: make sao_band_filter work on x86_32
James Almer [Mon, 9 Feb 2015 23:38:20 +0000 (20:38 -0300)]
x86/hevc_sao: make sao_band_filter work on x86_32

Reviewed-by: Christophe Gisquet <christophe.gisquet@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
4 years agoavutil/camellia: Remove redundant casts
Michael Niedermayer [Mon, 9 Feb 2015 21:45:01 +0000 (22:45 +0100)]
avutil/camellia: Remove redundant casts

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavutil/camellia: Fix indention & whitespace
Michael Niedermayer [Mon, 9 Feb 2015 21:44:14 +0000 (22:44 +0100)]
avutil/camellia: Fix indention & whitespace

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolibavutil: optimize camellia cipher
Supraja Meedinti [Mon, 9 Feb 2015 18:46:55 +0000 (00:16 +0530)]
libavutil: optimize camellia cipher

Before the changes :
lavu       CAMELLIA     size: 1048576  runs:   1024  time:   32.541 +- 0.044

After the changes:
lavu       CAMELLIA     size: 1048576  runs:   1024  time:   24.589 +- 0.066

Tested with crypto_bench on a Linux x86_64 OS with Intel Core i5-3210M CPU.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agomatroska: don't complain about unknown elements
wm4 [Mon, 9 Feb 2015 19:38:58 +0000 (20:38 +0100)]
matroska: don't complain about unknown elements

Matroska is an extensible format - unknown elements must be expected. It
shouldn't complain about such elements to the user either; it'll just
generate noise. The "error_recognition & AV_EF_EXPLODE" is completely,
wrong why would it explode on valid files?

It's still useful for debugging, so the message is left in place with a
higher log level.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/utils: Fix division by 0
Michael Niedermayer [Mon, 9 Feb 2015 20:14:22 +0000 (21:14 +0100)]
avformat/utils: Fix division by 0

Fixes: signal_sigsegv_14999ef_1188_cov_2888512890_SVA_CL1_E.264

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/sgienc: return meaningful error code
Paul B Mahol [Mon, 9 Feb 2015 14:05:13 +0000 (14:05 +0000)]
avcodec/sgienc: return meaningful error code

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agoavformat/mov: Check dimensions before setting aspect
Michael Niedermayer [Mon, 9 Feb 2015 13:51:03 +0000 (14:51 +0100)]
avformat/mov: Check dimensions before setting aspect

Fixes division by 0
Fixes: asan_heap-uaf_143f420_728_cov_1441472032_HDV_0113.MP4

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoswresample/x86/rematrix_init: Check av_malloc* return codes, forward errors
Michael Niedermayer [Mon, 9 Feb 2015 09:12:45 +0000 (10:12 +0100)]
swresample/x86/rematrix_init: Check av_malloc* return codes, forward errors

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoswresample/x86/rematrix_init: Use av_mallocz_array()
Michael Niedermayer [Mon, 9 Feb 2015 09:05:30 +0000 (10:05 +0100)]
swresample/x86/rematrix_init: Use av_mallocz_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/vb: Check for av_mallocz() failure
Michael Niedermayer [Mon, 9 Feb 2015 08:27:16 +0000 (09:27 +0100)]
avcodec/vb: Check for av_mallocz() failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavfilter/f_sendcmd: consider it an error if there are no commands
Michael Niedermayer [Thu, 15 Jan 2015 23:08:36 +0000 (00:08 +0100)]
avfilter/f_sendcmd: consider it an error if there are no commands

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agodoc/indevs: Docs for Blackmagic high bit depth video/audio
Georg Lippitsch [Sun, 18 Jan 2015 19:44:35 +0000 (20:44 +0100)]
doc/indevs: Docs for Blackmagic high bit depth video/audio

Reviewed-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agohevcdsp: ARM NEON optimized transforms
Seppo Tomperi [Thu, 5 Feb 2015 06:49:32 +0000 (06:49 +0000)]
hevcdsp: ARM NEON optimized transforms

cherry picked from commit b153f55935969c794de4640f8d34e01c58e027ae

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agox86: hevc_mc: remove lea in EPEL_LOAD
Christophe Gisquet [Sat, 7 Feb 2015 18:49:37 +0000 (18:49 +0000)]
x86: hevc_mc: remove lea in EPEL_LOAD

The second parameter to the macro is always an immediate address,
so no lea is needed.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agox86: hevc_mc: fewer gpr autoloads for _v filters
Christophe Gisquet [Sat, 7 Feb 2015 18:49:36 +0000 (18:49 +0000)]
x86: hevc_mc: fewer gpr autoloads for _v filters

In that case, it's just to load my, but mx/r3src is not used.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoframe: clarify buf documentation
Anton Khirnov [Fri, 14 Nov 2014 10:41:15 +0000 (11:41 +0100)]
frame: clarify buf documentation

Mention explicitly that the array must be filled contiguously.

4 years agodoc/APIchanges: updated Data stream changes in APIChange
Anshul Maheshwari [Sun, 8 Feb 2015 17:07:07 +0000 (22:37 +0530)]
doc/APIchanges: updated Data stream changes in APIChange

Signed-off-by: Anshul Maheshwari <er.anshul.maheshwari@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge remote-tracking branch 'cehoyos/master'
Michael Niedermayer [Sun, 8 Feb 2015 16:31:27 +0000 (17:31 +0100)]
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Fix standalone compilation of the mov muxer with --disable-optimizations.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavfilter/hqdn3d: an invalid bit depth means a bug, not invalid read data
Clément Bœsch [Sun, 8 Feb 2015 16:16:21 +0000 (17:16 +0100)]
avfilter/hqdn3d: an invalid bit depth means a bug, not invalid read data

This code looks clumsy, and an assert would probably be more welcome.

4 years agoavformat/internal: fix av_interleaved_write_frame typo reference
Clément Bœsch [Sun, 8 Feb 2015 16:09:01 +0000 (17:09 +0100)]
avformat/internal: fix av_interleaved_write_frame typo reference

4 years agoFix standalone compilation of the mov muxer with --disable-optimizations.
Carl Eugen Hoyos [Sun, 8 Feb 2015 14:48:26 +0000 (15:48 +0100)]
Fix standalone compilation of the mov muxer with --disable-optimizations.

Reported-by: Bernhard Döbler
4 years agoavfilter/dctdnoiz: fix slice_h computation
Clément Bœsch [Sun, 8 Feb 2015 13:27:51 +0000 (14:27 +0100)]
avfilter/dctdnoiz: fix slice_h computation

ceilf() can only work if the reminder of the division is not 0.

This fixes memory errors with for instance:
  ffmpeg -f lavfi -i testsrc=s=800x500 -threads 3 -vf dctdnoiz -frames:v 1 -f null -

4 years agoavformat/mxfenc: Remove unused variables
Michael Niedermayer [Sun, 8 Feb 2015 11:38:14 +0000 (12:38 +0100)]
avformat/mxfenc: Remove unused variables

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolavfi/subtitles: add force_style option
Eejya Singh [Wed, 28 Jan 2015 12:11:42 +0000 (17:41 +0530)]
lavfi/subtitles: add force_style option

Signed-off-by: Eejya Singh <singh.eejya@gmail.com>
Signed-off-by: Clément Bœsch <u@pkh.me>
4 years agoavdevice/decklink_common: Use defined(__APPLE__) instead of __APPLE__
Michael Niedermayer [Sun, 8 Feb 2015 03:46:50 +0000 (04:46 +0100)]
avdevice/decklink_common: Use defined(__APPLE__) instead of __APPLE__

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agox86/vp9dsp: fix clobbering of xmm6 on IDCT sse2 functions
James Almer [Sun, 8 Feb 2015 01:30:04 +0000 (22:30 -0300)]
x86/vp9dsp: fix clobbering of xmm6 on IDCT sse2 functions

Reviewed-by: Ronald S. Bultje <rsbultje@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
4 years agoavdevice/decklink_common: Fix Decklink for Mac
Georg Lippitsch [Sun, 11 Jan 2015 14:38:46 +0000 (15:38 +0100)]
avdevice/decklink_common: Fix Decklink for Mac

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavdevice/decklink: 10 Bit support for Decklink input device
Georg Lippitsch [Sun, 18 Jan 2015 19:44:33 +0000 (20:44 +0100)]
avdevice/decklink: 10 Bit support for Decklink input device

Example to capture video clip at 1080i50 10 bit:
ffmpeg -bm_v210 1 -f decklink -i 'UltraStudio Mini Recorder@11' -acodec copy -vcodec copy output.avi

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolibavformat/mxfenc.c: added mxf opatom muxer
Mark Reid [Thu, 29 Jan 2015 03:44:21 +0000 (19:44 -0800)]
libavformat/mxfenc.c: added mxf opatom muxer

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge remote-tracking branch 'cehoyos/master'
Michael Niedermayer [Sun, 8 Feb 2015 01:36:19 +0000 (02:36 +0100)]
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Support decoding yuv dpx images.
  Do not use -mdynamic-no-pic on OSX x86_64.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/utils: Assert that dst->progress is clear before ff_thread_ref_frame()
Michael Niedermayer [Sun, 8 Feb 2015 01:03:39 +0000 (02:03 +0100)]
avcodec/utils: Assert that dst->progress is clear before ff_thread_ref_frame()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/h264: Setup decoder to have matching reference to the EC code
Michael Niedermayer [Sun, 8 Feb 2015 00:59:16 +0000 (01:59 +0100)]
avcodec/h264: Setup decoder to have matching reference to the EC code

Also move EC ref initialization to where the EC code is called.
Fixes out of array read
Fixes: asan_heap-uaf_143f420_142_20110805_112659_ch0.mkv

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/h264: Move COPY_PICTURE() to h264.h so it can be used from other parts of...
Michael Niedermayer [Sun, 8 Feb 2015 01:13:48 +0000 (02:13 +0100)]
avcodec/h264: Move COPY_PICTURE() to h264.h so it can be used from other parts of the h264 decoder

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoSupport decoding yuv dpx images.
Carl Eugen Hoyos [Sat, 7 Feb 2015 23:12:46 +0000 (00:12 +0100)]
Support decoding yuv dpx images.

4 years agoDo not use -mdynamic-no-pic on OSX x86_64.
Carl Eugen Hoyos [Sat, 7 Feb 2015 23:11:13 +0000 (00:11 +0100)]
Do not use -mdynamic-no-pic on OSX x86_64.

Fixes default compilation with icc.

4 years agoavformat/omadec: Subtract headersize in timestamp calculation
Michael Niedermayer [Sat, 7 Feb 2015 20:16:20 +0000 (21:16 +0100)]
avformat/omadec: Subtract headersize in timestamp calculation

Fixes pts/dts

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/omadec: only compute timestamps based on bitrate if its set
Michael Niedermayer [Sat, 7 Feb 2015 20:12:56 +0000 (21:12 +0100)]
avformat/omadec: only compute timestamps based on bitrate if its set

Fixes division by zero

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'e352520e3ed7f08f19e63cd60e95da6bb6f037c1'
Michael Niedermayer [Sat, 7 Feb 2015 20:00:19 +0000 (21:00 +0100)]
Merge commit 'e352520e3ed7f08f19e63cd60e95da6bb6f037c1'

* commit 'e352520e3ed7f08f19e63cd60e95da6bb6f037c1':
  oma: Report a timestamp

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '8029af586fd5a5f2a0803001f9eff386e5545fe2'
Michael Niedermayer [Sat, 7 Feb 2015 19:53:30 +0000 (20:53 +0100)]
Merge commit '8029af586fd5a5f2a0803001f9eff386e5545fe2'

* commit '8029af586fd5a5f2a0803001f9eff386e5545fe2':
  dxva2_hevc: properly fill the scaling list structure

See: b11994593ae4c3856db735800f24d38293838759
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agox86: lavc/hevc_mc: fix comments
Christophe Gisquet [Sat, 7 Feb 2015 12:19:58 +0000 (13:19 +0100)]
x86: lavc/hevc_mc: fix comments

The width parameter is now completely at the back, and actually
never used. This helps understanding the actual parameter list.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/faxcompr: use init_get_bits8()
Paul B Mahol [Sat, 7 Feb 2015 17:16:14 +0000 (17:16 +0000)]
avcodec/faxcompr: use init_get_bits8()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agohevc/sao: do in-place band filtering when possible
Christophe Gisquet [Tue, 3 Feb 2015 13:06:39 +0000 (14:06 +0100)]
hevc/sao: do in-place band filtering when possible

The copies are only needed when data must be restored, so skip them
when it must not be.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agox86: lavc: share more constant through defines
Christophe Gisquet [Wed, 4 Feb 2015 10:41:45 +0000 (11:41 +0100)]
x86: lavc: share more constant through defines

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolavf/mlv: Only add streams that are supposed to contain frames.
Carl Eugen Hoyos [Sat, 7 Feb 2015 15:18:02 +0000 (16:18 +0100)]
lavf/mlv: Only add streams that are supposed to contain frames.

Fixes ticket #4296.

Reviewed-by: Peter Ross
4 years agoavcodec/twinvqdec: use init_get_bits8()
Paul B Mahol [Sat, 7 Feb 2015 14:26:54 +0000 (14:26 +0000)]
avcodec/twinvqdec: use init_get_bits8()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agooma: Report a timestamp
Luca Barbato [Thu, 29 Jan 2015 00:17:43 +0000 (01:17 +0100)]
oma: Report a timestamp

Reported-By: jb@videolan.org
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
4 years agolavc/lossless_audiodsp: revert various commits
Christophe Gisquet [Sat, 7 Feb 2015 09:20:10 +0000 (09:20 +0000)]
lavc/lossless_audiodsp: revert various commits

Their intent was to make the DSP work with wmalossless pro.
The later was fixed to work with the DSP.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agowmalossless: reset lms_update
Christophe Gisquet [Sat, 7 Feb 2015 09:20:09 +0000 (09:20 +0000)]
wmalossless: reset lms_update

It may contain garbage at the end, and zeroing allows using DSP
with longer loops.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agodxva2_hevc: properly fill the scaling list structure
Hendrik Leppkes [Tue, 3 Feb 2015 21:39:45 +0000 (22:39 +0100)]
dxva2_hevc: properly fill the scaling list structure

The scaling list can be specified in either the SPS or PPS.
Additionally, compensate for the diagonal scan permutation applied
in the decoder.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
4 years agopixdesc: Include more functions in FF_DISABLE_DEPRECATION_WARNINGS
Timothy Gu [Sat, 7 Feb 2015 04:16:10 +0000 (20:16 -0800)]
pixdesc: Include more functions in FF_DISABLE_DEPRECATION_WARNINGS

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavutil/pixfmt: Clarify meaning of the A/X bit in RGB555 / remove wording about signif...
Michael Niedermayer [Sat, 7 Feb 2015 12:46:04 +0000 (13:46 +0100)]
avutil/pixfmt: Clarify meaning of the A/X bit in RGB555 / remove wording about significant bit

Found-by:wm4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavutil/pixfmt: Clarify the meaning of the alpha bits in rgb444 and similar formats
Michael Niedermayer [Fri, 6 Feb 2015 19:57:00 +0000 (20:57 +0100)]
avutil/pixfmt: Clarify the meaning of the alpha bits in rgb444 and similar formats

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavutil/pixfmt: Clarify the meaning of the "alpha" bit in rgb555/bgr555
Michael Niedermayer [Fri, 6 Feb 2015 19:56:08 +0000 (20:56 +0100)]
avutil/pixfmt: Clarify the meaning of the "alpha" bit in rgb555/bgr555

Found-by: wm4
Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavutil/pixfmt: Clarify the meaning of the alpha byte in RGB0 and similar formats
Michael Niedermayer [Fri, 6 Feb 2015 19:54:11 +0000 (20:54 +0100)]
avutil/pixfmt: Clarify the meaning of the alpha byte in RGB0 and similar formats

Found-by: wm4
Reviewed-by: wm4 <nfxjfg@googlemail.com>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Reviewed-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/ccaption_dec: Added Debug logs
Anshul Maheshwari [Fri, 6 Feb 2015 14:42:40 +0000 (20:12 +0530)]
avcodec/ccaption_dec: Added Debug logs

Signed-off-by: Anshul Maheshwari <er.anshul.maheshwari@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/ccaption_dec: handle error from ass_sub api
Anshul Maheshwari [Fri, 6 Feb 2015 14:42:13 +0000 (20:12 +0530)]
avcodec/ccaption_dec: handle error from ass_sub api

Signed-off-by: Anshul Maheshwari <er.anshul.maheshwari@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/ccaption_dec: Added Roll up functionality
Anshul Maheshwari [Fri, 6 Feb 2015 14:40:11 +0000 (20:10 +0530)]
avcodec/ccaption_dec: Added Roll up functionality

Signed-off-by: Anshul Maheshwari <er.anshul.maheshwari@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '9295d10ea9d138462b7f67d16bf95ae9ca76aca6'
Michael Niedermayer [Sat, 7 Feb 2015 03:54:32 +0000 (04:54 +0100)]
Merge commit '9295d10ea9d138462b7f67d16bf95ae9ca76aca6'

* commit '9295d10ea9d138462b7f67d16bf95ae9ca76aca6':
  fate: Add a test for AAC ELD480.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/h264_slice: assert that reinit does not occur after the first slice
Michael Niedermayer [Sat, 7 Feb 2015 02:45:14 +0000 (03:45 +0100)]
avcodec/h264_slice: assert that reinit does not occur after the first slice

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/h264_slice: ignore SAR changes in slices after the first
Michael Niedermayer [Sat, 7 Feb 2015 02:34:48 +0000 (03:34 +0100)]
avcodec/h264_slice: ignore SAR changes in slices after the first

Fixes race condition and null pointer dereference
Fixes: signal_sigsegv_1472ac3_468_cov_2915641226_CABACI3_Sony_B.jsv

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/h264_slice: Check picture structure before setting the related fields
Michael Niedermayer [Sat, 7 Feb 2015 01:22:44 +0000 (02:22 +0100)]
avcodec/h264_slice: Check picture structure before setting the related fields

This might fix a hypothetical race condition

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agofate: Add a test for AAC ELD480.
Alex Converse [Wed, 28 Jan 2015 01:54:03 +0000 (17:54 -0800)]
fate: Add a test for AAC ELD480.

The source is er_eld_2100np_48_ep0.mp4 from the official test set.

4 years agoavcodec/h264_slice: Do not change frame_num after the first slice
Michael Niedermayer [Sat, 7 Feb 2015 01:06:20 +0000 (02:06 +0100)]
avcodec/h264_slice: Do not change frame_num after the first slice

Fixes potential race condition
Fixes: signal_sigsegv_1472ac3_468_cov_2915641226_CABACI3_Sony_B.jsv

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agox86: lavc: share more constants
Christophe Gisquet [Thu, 5 Feb 2015 19:20:43 +0000 (19:20 +0000)]
x86: lavc: share more constants

Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge remote-tracking branch 'cehoyos/master'
Michael Niedermayer [Fri, 6 Feb 2015 21:31:29 +0000 (22:31 +0100)]
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  lavc/tscc: Make 32bit output opaque.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavutil/opt: Fix type used to access AV_OPT_TYPE_SAMPLE_FMT
Michael Niedermayer [Fri, 6 Feb 2015 21:16:08 +0000 (22:16 +0100)]
avutil/opt: Fix type used to access AV_OPT_TYPE_SAMPLE_FMT

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavutil/opt: Fix types used to access AV_OPT_TYPE_PIXEL_FMT
Michael Niedermayer [Fri, 6 Feb 2015 21:14:15 +0000 (22:14 +0100)]
avutil/opt: Fix types used to access AV_OPT_TYPE_PIXEL_FMT

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agox86/hevc_mc: use aligned loads
Mickaël Raulet [Thu, 5 Feb 2015 19:20:42 +0000 (19:20 +0000)]
x86/hevc_mc: use aligned loads

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agox86/lossless_audiodsp: fix compilation with --disable-yasm
James Almer [Fri, 6 Feb 2015 06:46:43 +0000 (03:46 -0300)]
x86/lossless_audiodsp: fix compilation with --disable-yasm

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
4 years agolavc/tscc: Make 32bit output opaque.
Carl Eugen Hoyos [Fri, 6 Feb 2015 20:02:08 +0000 (21:02 +0100)]
lavc/tscc: Make 32bit output opaque.

Found-by: wm4
4 years agonutdec: Remove unused variables
Timothy Gu [Fri, 6 Feb 2015 07:06:44 +0000 (23:06 -0800)]
nutdec: Remove unused variables

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoimg2dec: Remove dead code
Timothy Gu [Fri, 6 Feb 2015 07:06:40 +0000 (23:06 -0800)]
img2dec: Remove dead code

Reviewed-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Reviewed-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/avfft: Add simple self test
Michael Niedermayer [Fri, 6 Feb 2015 17:48:12 +0000 (18:48 +0100)]
avcodec/avfft: Add simple self test

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agogenerate_wave_table: Add include for AVSampleFormat
Timothy Gu [Fri, 6 Feb 2015 07:27:35 +0000 (23:27 -0800)]
generate_wave_table: Add include for AVSampleFormat

Fixes warning in `make checkheaders`.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoaudioconvert: Add missing include for FF_API_AUDIO_CONVERT
Timothy Gu [Fri, 6 Feb 2015 07:27:34 +0000 (23:27 -0800)]
audioconvert: Add missing include for FF_API_AUDIO_CONVERT

Fixes warning in `make checkheaders`.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agox86/hevc_sao: fix loading of RIP address
James Almer [Fri, 6 Feb 2015 16:17:19 +0000 (13:17 -0300)]
x86/hevc_sao: fix loading of RIP address

pb_eo must be handled as a rip relative address for MSVC64, so an
intermediate register is needed. Should fix link failures.

Suggested by Hendrik Leppkes and Christophe Gisquet.

Tested-By: Hendrik Leppkes <h.leppkes@gmail.com>
Reviewed-by: Christophe Gisquet <christophe.gisquet@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
4 years agox86/hevc: use CLIPW macro when possible
Mickaël Raulet [Thu, 5 Feb 2015 19:20:41 +0000 (19:20 +0000)]
x86/hevc: use CLIPW macro when possible

Conflicts:
libavcodec/x86/hevc_mc.asm

Reviewed-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agox86: hevc_mc: use epel_hv 16-wide function
Christophe Gisquet [Thu, 5 Feb 2015 19:20:40 +0000 (19:20 +0000)]
x86: hevc_mc: use epel_hv 16-wide function

The epel_hv functions were still relying on only epel_hv 8-wide
being the maximum width instanciated.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agox86: hevc_mc: add AVX2 optimizations
Pierre Edouard Lepere [Thu, 5 Feb 2015 19:20:39 +0000 (19:20 +0000)]
x86: hevc_mc: add AVX2 optimizations

before
33304 decicycles in luma_bi_1, 523066 runs, 1222 skips
38138 decicycles in luma_bi_2, 523427 runs, 861 skips
13490 decicycles in luma_uni, 516138 runs, 8150 skips
after
20185 decicycles in luma_bi_1, 519970 runs, 4318 skips
24620 decicycles in luma_bi_2, 521024 runs, 3264 skips
10397 decicycles in luma_uni, 515715 runs, 8573 skips

Conflicts:
libavcodec/x86/hevc_mc.asm
libavcodec/x86/hevcdsp_init.c

Reviewed-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>