ffmpeg.git
4 years agoavcodec/jpeg2000dec: Add 5/3 de-quantization special case for the lossless case
Michael Niedermayer [Wed, 24 Jun 2015 15:05:42 +0000 (17:05 +0200)]
avcodec/jpeg2000dec: Add 5/3 de-quantization special case for the lossless case

This avoids a multiplication and 64bits

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/jpeg2000dec: Use 32x32->64bit for 5/3 dequantization
Michael Niedermayer [Wed, 24 Jun 2015 15:00:58 +0000 (17:00 +0200)]
avcodec/jpeg2000dec: Use 32x32->64bit for 5/3 dequantization

This fixes overflows, using fewer bits would impact high bit depth quality

Fixes Ticket4654

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavfilter: add ssim filter
Paul B Mahol [Sun, 21 Jun 2015 11:27:55 +0000 (11:27 +0000)]
avfilter: add ssim filter

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agolavf: set is_connected flag so url can be properly closed
Mariusz Szczepańczyk [Tue, 23 Jun 2015 01:35:16 +0000 (03:35 +0200)]
lavf: set is_connected flag so url can be properly closed

Reviewed-by: Lukasz Marek <lukasz.m.luki2 at gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoffmpeg: Do not use the data/size of a bitstream filter after failure
Michael Niedermayer [Wed, 24 Jun 2015 11:27:39 +0000 (13:27 +0200)]
ffmpeg: Do not use the data/size of a bitstream filter after failure

Found-by: Rodger Combs
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '41740ef8be6ec409f7eff3932ddba9a9eeec27b1'
Michael Niedermayer [Wed, 24 Jun 2015 10:39:17 +0000 (12:39 +0200)]
Merge commit '41740ef8be6ec409f7eff3932ddba9a9eeec27b1'

* commit '41740ef8be6ec409f7eff3932ddba9a9eeec27b1':
  libvpx: fix test for VPX_IMAGE_ABI_VERSION

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'a88e21f5b78ef5e75b073ecbfd4e92921002a703'
Michael Niedermayer [Wed, 24 Jun 2015 10:22:18 +0000 (12:22 +0200)]
Merge commit 'a88e21f5b78ef5e75b073ecbfd4e92921002a703'

* commit 'a88e21f5b78ef5e75b073ecbfd4e92921002a703':
  Fix missing symbols when libvpx has only vp8 enabled

Not merged, the FFmpeg libvpx-vp8 encoder does not use anything from libvpx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'c2de2cf0d2927f3f584dab6d54276fbda92a0a71'
Michael Niedermayer [Wed, 24 Jun 2015 09:58:07 +0000 (11:58 +0200)]
Merge commit 'c2de2cf0d2927f3f584dab6d54276fbda92a0a71'

* commit 'c2de2cf0d2927f3f584dab6d54276fbda92a0a71':
  arm64: constify src in h264qpel dsp function definitions

See: e16b7338d8777618936ff6ab9133e19f4db9069c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolibvpx: fix test for VPX_IMAGE_ABI_VERSION
Janne Grunau [Wed, 24 Jun 2015 06:39:40 +0000 (08:39 +0200)]
libvpx: fix test for VPX_IMAGE_ABI_VERSION

4 years agoFix missing symbols when libvpx has only vp8 enabled
Mark Webster [Wed, 24 Jun 2015 05:14:50 +0000 (06:14 +0100)]
Fix missing symbols when libvpx has only vp8 enabled

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
4 years agoarm64: constify src in h264qpel dsp function definitions
Janne Grunau [Sun, 14 Jun 2015 18:53:56 +0000 (20:53 +0200)]
arm64: constify src in h264qpel dsp function definitions

4 years agoavformat/mp3dec: Remove the ID3v1 tag removial code
Michael Niedermayer [Wed, 24 Jun 2015 00:46:05 +0000 (02:46 +0200)]
avformat/mp3dec: Remove the ID3v1 tag removial code

The code is simply broken, the read packets are not aligned to
the mp3 frames, the file end or the id3 tag thus this simply
cannot reliably find the ID3v1 tag to remove it

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/mpegaudio_parser: Discard ID3v1 tag at the end
Michael Niedermayer [Wed, 24 Jun 2015 00:37:58 +0000 (02:37 +0200)]
avcodec/mpegaudio_parser: Discard ID3v1 tag at the end

Ideally this should be discarded by the demuxer but this is not
possible without fully parsing which would be then very similar
to this. The current ID3v1 discard code in the demuxer does not work
and will be removed in a subsequent commit

The discard code could be adjusted if needed to also discard tags at
other locations than the end or to limit this possibly to input
from the mp3 demuxer or even to move the discarding to the
decoder.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolavf/libssh: implement move and delete callbacks
Mariusz Szczepańczyk [Tue, 23 Jun 2015 01:04:21 +0000 (03:04 +0200)]
lavf/libssh: implement move and delete callbacks

Reviewed-by: Lukasz Marek <lukasz.m.luki2 at gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolavf/libssh: read empty path from url as /
Mariusz Szczepańczyk [Tue, 23 Jun 2015 01:04:20 +0000 (03:04 +0200)]
lavf/libssh: read empty path from url as /

Reviewed-by: Lukasz Marek <lukasz.m.luki2 at gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolavf/libssh: implement directory listing callbacks
Lukasz Marek [Tue, 23 Jun 2015 01:04:19 +0000 (03:04 +0200)]
lavf/libssh: implement directory listing callbacks

Signed-off-by: Lukasz Marek <lukasz.m.luki2 at gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolavf/libsmbclient: implement move and delete callbacks
Mariusz Szczepańczyk [Mon, 22 Jun 2015 02:58:00 +0000 (04:58 +0200)]
lavf/libsmbclient: implement move and delete callbacks

Reviewed-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolavf/brstm: add FATE tests for BFSTM and BCSTM files
Rodger Combs [Tue, 23 Jun 2015 17:35:36 +0000 (12:35 -0500)]
lavf/brstm: add FATE tests for BFSTM and BCSTM files

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/jpeg2000dwt: Replace /2 by >>1
Michael Niedermayer [Tue, 23 Jun 2015 16:47:18 +0000 (18:47 +0200)]
avcodec/jpeg2000dwt: Replace /2 by >>1

Divisions can be slow if the compiler fails to replace them by shifts

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoswscale/x86/rgb2rgb_template: fix signedness of v in shuffle_bytes_2103_{mmx,mmxext}
James Almer [Tue, 23 Jun 2015 04:15:07 +0000 (01:15 -0300)]
swscale/x86/rgb2rgb_template: fix signedness of v in shuffle_bytes_2103_{mmx,mmxext}

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
4 years agoswscale/x86/rgb2rgb_template: don't call emms on sse2/avx functions
James Almer [Tue, 23 Jun 2015 04:14:42 +0000 (01:14 -0300)]
swscale/x86/rgb2rgb_template: don't call emms on sse2/avx functions

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
4 years agoswscale/x86/rgb2rgb_template: add missing xmm clobbers
James Almer [Tue, 23 Jun 2015 04:14:16 +0000 (01:14 -0300)]
swscale/x86/rgb2rgb_template: add missing xmm clobbers

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
4 years agoavcodec/texturedspenc: Add () to protect macro / argument evaluation order
Michael Niedermayer [Tue, 23 Jun 2015 15:02:22 +0000 (17:02 +0200)]
avcodec/texturedspenc: Add () to protect macro / argument evaluation order

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agovaapi_h264: fix RefPicList[] field flags.
Gwenole Beauchesne [Tue, 23 Jun 2015 09:35:45 +0000 (11:35 +0200)]
vaapi_h264: fix RefPicList[] field flags.

Use new H264Ref.reference field to track field picture flags. The
H264Picture.reference flag in DPB is now irrelevant here.

This is a regression from git commit d8151a7, and that affected
multiple interlaced video streams.

Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
4 years agovda: unlock the pixel buffer base address.
Sebastien Zwickert [Sat, 20 Jun 2015 11:19:29 +0000 (13:19 +0200)]
vda: unlock the pixel buffer base address.

The pixel buffer base address is never unlocked this causes
a bug with some pixel format types that are produced natively
by the hardware decoder: the first buffer was always used.
Unlock the pixel buffer base address fixes the issue.

4 years agomovtextdec.c: Improve upon dynarrays and text_to_ass
Niklesh [Mon, 22 Jun 2015 14:17:06 +0000 (19:47 +0530)]
movtextdec.c: Improve upon dynarrays and text_to_ass

Signed-off-by: Niklesh <niklesh.lalwani@iitb.ac.in>
4 years agoswscale/rgb2rgb_template: Fix signedness of v in shuffle_bytes_2103_c()
Michael Niedermayer [Tue, 23 Jun 2015 03:09:11 +0000 (05:09 +0200)]
swscale/rgb2rgb_template: Fix signedness of v in shuffle_bytes_2103_c()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoswscale/rgb2rgb_template: Implement shuffle_bytes_0321_c and fix shuffle_bytes_2103_c...
Michael Niedermayer [Tue, 23 Jun 2015 02:36:02 +0000 (04:36 +0200)]
swscale/rgb2rgb_template: Implement shuffle_bytes_0321_c and fix shuffle_bytes_2103_c on BE

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/texturedsp: Add protective () to RGBA() macro
Michael Niedermayer [Tue, 23 Jun 2015 02:19:05 +0000 (04:19 +0200)]
avcodec/texturedsp: Add protective () to RGBA() macro

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/mpegts: Use STREAM_TYPE_PRIVATE_DATA instead of 6
Michael Niedermayer [Tue, 23 Jun 2015 01:42:12 +0000 (03:42 +0200)]
avformat/mpegts: Use STREAM_TYPE_PRIVATE_DATA instead of 6

Suggested-by: Wolfgang Lorenz <wl-chmw@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/electronicarts: Fixed ea_probe function to accept vp6a videos
Stephan Vedder [Mon, 22 Jun 2015 18:58:41 +0000 (20:58 +0200)]
avformat/electronicarts: Fixed ea_probe function to accept vp6a videos

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agotests/fate/image: also run fate-sgi for the fate-image target
Michael Niedermayer [Mon, 22 Jun 2015 23:46:13 +0000 (01:46 +0200)]
tests/fate/image: also run fate-sgi for the fate-image target

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoChangelog: Move HAP to the correct section
Michael Niedermayer [Mon, 22 Jun 2015 23:29:48 +0000 (01:29 +0200)]
Changelog: Move HAP to the correct section

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/dds: Fix palettes on big endian
Michael Niedermayer [Mon, 22 Jun 2015 21:59:28 +0000 (23:59 +0200)]
avcodec/dds: Fix palettes on big endian

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '5c018ee18895f88e9e1d2174059dcdd48bf872d2'
Michael Niedermayer [Mon, 22 Jun 2015 21:24:10 +0000 (23:24 +0200)]
Merge commit '5c018ee18895f88e9e1d2174059dcdd48bf872d2'

* commit '5c018ee18895f88e9e1d2174059dcdd48bf872d2':
  DirectDraw Surface image decoder

Conflicts:
Changelog
configure
doc/general.texi
libavcodec/Makefile
libavcodec/version.h
tests/fate/image.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/jpeg2000dwt: Move large arrays used in the test code away from the stack
Michael Niedermayer [Mon, 22 Jun 2015 21:10:31 +0000 (23:10 +0200)]
avcodec/jpeg2000dwt: Move large arrays used in the test code away from the stack

This should avoid problems on systems with little stack space and fix some crashes
in fate

crash found-by: jamrial
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/jpeg2000dwt: Print 1 digit less in the 9/7f DWT test
Michael Niedermayer [Mon, 22 Jun 2015 21:07:56 +0000 (23:07 +0200)]
avcodec/jpeg2000dwt: Print 1 digit less in the 9/7f DWT test

This avoids test failure due to differing rounding between 32 and 64bit x86

Found-by: jamrial
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/jpeg2000dwt: Use a tighter check threshold for the 9/7f DWT test
Michael Niedermayer [Mon, 22 Jun 2015 21:06:55 +0000 (23:06 +0200)]
avcodec/jpeg2000dwt: Use a tighter check threshold for the 9/7f DWT test

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '7ca3e5203f133eb41a0b5c3a1d753a7427ba72e7'
Michael Niedermayer [Mon, 22 Jun 2015 20:33:46 +0000 (22:33 +0200)]
Merge commit '7ca3e5203f133eb41a0b5c3a1d753a7427ba72e7'

* commit '7ca3e5203f133eb41a0b5c3a1d753a7427ba72e7':
  Hap decoder and encoder

Conflicts:
Changelog
configure
doc/general.texi
libavcodec/allcodecs.c
libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoswscale/rgb2rgb_template: Disable shuffle_bytes_2103_c on big endian
Michael Niedermayer [Mon, 22 Jun 2015 20:23:22 +0000 (22:23 +0200)]
swscale/rgb2rgb_template: Disable shuffle_bytes_2103_c on big endian

The function is specific to little endian

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'c0b105756f61d253bdabcc2bb49453a2557e7c3b'
Michael Niedermayer [Mon, 22 Jun 2015 19:15:50 +0000 (21:15 +0200)]
Merge commit 'c0b105756f61d253bdabcc2bb49453a2557e7c3b'

* commit 'c0b105756f61d253bdabcc2bb49453a2557e7c3b':
  txd: Use the TextureDSP module for decoding

Conflicts:
configure
libavcodec/s3tc.c
libavcodec/s3tc.h
libavcodec/txd.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '8337e0c57345f24cf6471220e5f8a0ea21b7c1d0'
Michael Niedermayer [Mon, 22 Jun 2015 18:56:18 +0000 (20:56 +0200)]
Merge commit '8337e0c57345f24cf6471220e5f8a0ea21b7c1d0'

* commit '8337e0c57345f24cf6471220e5f8a0ea21b7c1d0':
  Introduce a TextureDSP module

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '2ecfd451649c7a08cb633635df98e59f7c6e2140'
Michael Niedermayer [Mon, 22 Jun 2015 18:46:35 +0000 (20:46 +0200)]
Merge commit '2ecfd451649c7a08cb633635df98e59f7c6e2140'

* commit '2ecfd451649c7a08cb633635df98e59f7c6e2140':
  Implement Snappy decompression

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/mips: MSA (MIPS-SIMD-Arch) optimizations for block functions
Shivraj Patil [Sun, 14 Jun 2015 17:56:25 +0000 (23:26 +0530)]
avcodec/mips: MSA (MIPS-SIMD-Arch) optimizations for block functions

This patch adds MSA (MIPS-SIMD-Arch) optimizations for block functions in new file blockdsp_msa.c

Signed-off-by: Shivraj Patil <shivraj.patil@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agofate: add some tests for ffv1 level 3 with 8/10/16 bps
Tobias Rapp [Fri, 19 Jun 2015 12:30:27 +0000 (14:30 +0200)]
fate: add some tests for ffv1 level 3 with 8/10/16 bps

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoswr: Remember previously set int_sample_format from user
Michael Niedermayer [Mon, 22 Jun 2015 16:27:27 +0000 (18:27 +0200)]
swr: Remember previously set int_sample_format from user

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoswresample/swresample: Clear delayed_samples_fixup in clear_context()
Michael Niedermayer [Mon, 22 Jun 2015 16:23:44 +0000 (18:23 +0200)]
swresample/swresample: Clear delayed_samples_fixup in clear_context()

This probably makes no difference but its more proper

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoDirectDraw Surface image decoder
Vittorio Giovara [Tue, 26 May 2015 23:30:51 +0000 (00:30 +0100)]
DirectDraw Surface image decoder

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
4 years agoHap decoder and encoder
Vittorio Giovara [Sat, 25 Apr 2015 22:58:57 +0000 (23:58 +0100)]
Hap decoder and encoder

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
4 years agotxd: Use the TextureDSP module for decoding
Vittorio Giovara [Tue, 19 May 2015 22:54:16 +0000 (23:54 +0100)]
txd: Use the TextureDSP module for decoding

Using the internal DXTC routines brings support for non multiple of 4
textures. A new test is added to cover this feature. Hashes differ
since the decoding algorithm is different, though no visual changes
have been spotted.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
4 years agoIntroduce a TextureDSP module
Vittorio Giovara [Tue, 19 May 2015 23:01:37 +0000 (00:01 +0100)]
Introduce a TextureDSP module

This module implements generic texture decompression from different
families (DXTC, RGTC, BCn) and texture compression DXTC 1, 3, and 5.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
4 years agoImplement Snappy decompression
Luca Barbato [Sun, 24 May 2015 14:20:26 +0000 (16:20 +0200)]
Implement Snappy decompression

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
4 years agolavf/file: implement move and delete callbacks
Mariusz Szczepańczyk [Sat, 20 Jun 2015 12:52:49 +0000 (14:52 +0200)]
lavf/file: implement move and delete callbacks

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolavf/avio: Extend API with avio_move() and avio_delete()
Mariusz Szczepańczyk [Wed, 17 Jun 2015 18:12:00 +0000 (20:12 +0200)]
lavf/avio: Extend API with avio_move() and avio_delete()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '61dc9d647c6664e11674d9a10fdde29987d6acda'
Michael Niedermayer [Mon, 22 Jun 2015 10:37:29 +0000 (12:37 +0200)]
Merge commit '61dc9d647c6664e11674d9a10fdde29987d6acda'

* commit '61dc9d647c6664e11674d9a10fdde29987d6acda':
  udp: Fix local_port management

Conflicts:
libavformat/udp.c

See: 4f3f5ee1ac93797954eb66ef4d19e2256c0aaee7
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoudp: Fix local_port management
Luca Barbato [Sun, 29 Mar 2015 13:19:35 +0000 (15:19 +0200)]
udp: Fix local_port management

The default value for unset is -1, not 0.

Problem introduced in 66028b7ba6b411ba12ef553e9c8f1f4a4fe27710

4 years agoavcodec/jpeg2000: Move L band scaling from the 9/7f wavelet to quantization stage
Michael Niedermayer [Mon, 22 Jun 2015 00:46:35 +0000 (02:46 +0200)]
avcodec/jpeg2000: Move L band scaling from the 9/7f wavelet to quantization stage

This reduces the number of operations
Its not done for 9/7i as that would overflow thanks to JPEG2000 allowing
32 decomposition levels

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/jpeg2000dwt: use 32x32->64 multiplies in the 9/7i DWT
Michael Niedermayer [Mon, 22 Jun 2015 00:22:36 +0000 (02:22 +0200)]
avcodec/jpeg2000dwt: use 32x32->64 multiplies in the 9/7i DWT

This significantly improves the quality when the integer 9/7 transform
is used

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/jpeg2000: Move H band scaling from wavelet into quantization code
Michael Niedermayer [Sun, 21 Jun 2015 23:56:06 +0000 (01:56 +0200)]
avcodec/jpeg2000: Move H band scaling from wavelet into quantization code

This reduces the number of operations done and is equivalent except for
rounding

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/jpeg2000dwt: Move K/X constants to header
Michael Niedermayer [Sun, 21 Jun 2015 23:54:51 +0000 (01:54 +0200)]
avcodec/jpeg2000dwt: Move K/X constants to header

this makes them accessible by the rest of the jpeg2000 code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/jpeg2000: Move gainb handling into the quantization code
Michael Niedermayer [Sun, 21 Jun 2015 23:30:33 +0000 (01:30 +0200)]
avcodec/jpeg2000: Move gainb handling into the quantization code

thats how the specification defines it, this also improves numerical
accuracy of the integer wavelet implementation. It otherwise should
be equivalent, in case of overflows this can be reverted.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoffserver: drop unneeded else branching
Reynaldo H. Verdejo Pinochet [Sun, 21 Jun 2015 21:57:13 +0000 (18:57 -0300)]
ffserver: drop unneeded else branching

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
4 years agoffserver: drop unneeded else branching
Reynaldo H. Verdejo Pinochet [Sun, 21 Jun 2015 21:43:13 +0000 (18:43 -0300)]
ffserver: drop unneeded else branching

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
4 years agoffserver: drop unneeded else branching
Reynaldo H. Verdejo Pinochet [Sun, 21 Jun 2015 21:28:22 +0000 (18:28 -0300)]
ffserver: drop unneeded else branching

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
4 years agoffserver: formating
Reynaldo H. Verdejo Pinochet [Sun, 21 Jun 2015 21:19:09 +0000 (18:19 -0300)]
ffserver: formating

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
4 years agoswresample: soxr implementation for swr_get_out_samples()
Rob Sykes [Sun, 21 Jun 2015 19:45:50 +0000 (19:45 +0000)]
swresample: soxr implementation for swr_get_out_samples()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '8655c54160767de1a6b96f8bc310d6e4eaceff48'
Michael Niedermayer [Sun, 21 Jun 2015 19:48:44 +0000 (21:48 +0200)]
Merge commit '8655c54160767de1a6b96f8bc310d6e4eaceff48'

* commit '8655c54160767de1a6b96f8bc310d6e4eaceff48':
  libvpx: Support the vp9 extended profiles

Conflicts:
Changelog
configure
libavcodec/libvpx.c
libavcodec/libvpx.h
libavcodec/libvpxdec.c
libavcodec/libvpxenc.c
libavcodec/version.h

mostly not merged, as requested by jamrial

See: 01e59d48ed1a41b88107ed1d4d56ae0cbcd1a60e
See: 079b7f6eacc09bc2813fc1ddc230ab05022b69c2 and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '05bf3f54e6078716f6267df530bf1d474ca3d606'
Michael Niedermayer [Sun, 21 Jun 2015 19:07:10 +0000 (21:07 +0200)]
Merge commit '05bf3f54e6078716f6267df530bf1d474ca3d606'

* commit '05bf3f54e6078716f6267df530bf1d474ca3d606':
  libvpx: Do not set vp8 only parameters when encoding in vp9

Conflicts:
libavcodec/libvpxenc.c

See: 238ec505e263e7d0363798a05c1c28f494a6300a
See: ae330070ee8b985abb011835502b03baacfbb18c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'c060d046aa2f89c0e601a2dcfbce53f0e36cf498'
Michael Niedermayer [Sun, 21 Jun 2015 18:54:38 +0000 (20:54 +0200)]
Merge commit 'c060d046aa2f89c0e601a2dcfbce53f0e36cf498'

* commit 'c060d046aa2f89c0e601a2dcfbce53f0e36cf498':
  af_resample: Set the number of samples in the last frame

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '6ec688e1bc76dd93151cbca1c340162ae4b10d77'
Michael Niedermayer [Sun, 21 Jun 2015 17:41:40 +0000 (19:41 +0200)]
Merge commit '6ec688e1bc76dd93151cbca1c340162ae4b10d77'

* commit '6ec688e1bc76dd93151cbca1c340162ae4b10d77':
  mp3: enable packed main_data decoding in MP4

Conflicts:
libavcodec/mpegaudiodec_template.c

Only the parts needed to support the available sample are merged
the remaining error checks are left in place

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/jpeg2000dwt: Fix value of F_LFTG_X and I_LFTG_X
Michael Niedermayer [Sun, 21 Jun 2015 13:55:42 +0000 (15:55 +0200)]
avcodec/jpeg2000dwt: Fix value of F_LFTG_X and I_LFTG_X

Even if the jpeg2000 spec uses a wrong value this does not
make mathematics work this way, also this has been corrected in the 2004
version AFAIK

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoswresample/swresample: Print used int_sample_fmt
Michael Niedermayer [Sun, 21 Jun 2015 16:08:19 +0000 (18:08 +0200)]
swresample/swresample: Print used int_sample_fmt

Suggested-by: wm4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoswresample: Choose 16bit internally only if input and output is 16bit or less
Michael Niedermayer [Sun, 21 Jun 2015 14:29:09 +0000 (16:29 +0200)]
swresample: Choose 16bit internally only if input and output is 16bit or less

or if no rematrix and no resampling is performed and the input is 16bit
note reampling and rematrix itself always use more than 16bit internally
the "internal" sampling format is the format between these steps

Its unlikely the difference from this commit is audible in any case
unless there is some bug either before or after the change.
but multiple people prefer this and it slightly improves the precission
of computations.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/jpeg2000dwt: also test 9/7 float DWT
Michael Niedermayer [Sun, 21 Jun 2015 13:51:48 +0000 (15:51 +0200)]
avcodec/jpeg2000dwt: also test 9/7 float DWT

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolibvpx: Support the vp9 extended profiles
Luca Barbato [Thu, 11 Jun 2015 14:56:31 +0000 (16:56 +0200)]
libvpx: Support the vp9 extended profiles

Bump the minimum libvpx version to 1.3.0 and rework the configure logic
to fail only if no decoders and encoders are found.

Based on the original patch from Vittorio.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
4 years agoavcodec/jpeg2000dwt: List differences for DWT test
Michael Niedermayer [Sun, 21 Jun 2015 11:22:38 +0000 (13:22 +0200)]
avcodec/jpeg2000dwt: List differences for DWT test

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/jpeg2000dwt: increase the number of test iterations
Michael Niedermayer [Sun, 21 Jun 2015 11:13:00 +0000 (13:13 +0200)]
avcodec/jpeg2000dwt: increase the number of test iterations

the code had too little coverage

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/jpeg2000dwt: Also test 9/7 integer DWT
Michael Niedermayer [Sun, 21 Jun 2015 11:02:34 +0000 (13:02 +0200)]
avcodec/jpeg2000dwt: Also test 9/7 integer DWT

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/jpeg2000dwt: Allow testing with a maximum allowed difference
Michael Niedermayer [Sun, 21 Jun 2015 11:01:17 +0000 (13:01 +0200)]
avcodec/jpeg2000dwt: Allow testing with a maximum allowed difference

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/brstm: support little-endian s16 PCM
Paul B Mahol [Sun, 21 Jun 2015 10:21:20 +0000 (10:21 +0000)]
avformat/brstm: support little-endian s16 PCM

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agolavc/adpcm: THP: don't use the ADPC/SEEK table when not seeking
Rodger Combs [Sat, 20 Jun 2015 10:01:27 +0000 (05:01 -0500)]
lavc/adpcm: THP: don't use the ADPC/SEEK table when not seeking

This is almost certainly closer to how the actual Nintendo players work,
and fixes some output pops in files with blank ADPC/SEEK tables (like
those from brawlcustommusic).

4 years agolavf/brstm: handle a BFSTM endianness oddity
Rodger Combs [Sat, 20 Jun 2015 10:01:26 +0000 (05:01 -0500)]
lavf/brstm: handle a BFSTM endianness oddity

4 years agolavf/brstm: add support for seeking
Rodger Combs [Sat, 20 Jun 2015 10:01:21 +0000 (05:01 -0500)]
lavf/brstm: add support for seeking

4 years agolavf/brstm: cleanup; fix short-block demuxing
Rodger Combs [Sat, 20 Jun 2015 10:01:20 +0000 (05:01 -0500)]
lavf/brstm: cleanup; fix short-block demuxing

4 years agolavf/brstm: move bfstm var to a local
Rodger Combs [Sat, 20 Jun 2015 10:01:19 +0000 (05:01 -0500)]
lavf/brstm: move bfstm var to a local

4 years agoavformat/rawenc: Store sample number for ADX
Michael Niedermayer [Sat, 20 Jun 2015 22:32:09 +0000 (00:32 +0200)]
avformat/rawenc: Store sample number for ADX

Fixes Ticket4540

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoSupport demuxing 4gv codec stored in qcp files
Paul B Mahol [Fri, 12 Jun 2015 15:49:50 +0000 (15:49 +0000)]
Support demuxing 4gv codec stored in qcp files

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agoffmpeg_opt: Fix handling of creation_time now
Michael Niedermayer [Sun, 21 Jun 2015 02:52:08 +0000 (04:52 +0200)]
ffmpeg_opt: Fix handling of creation_time now

Fixes Ticket4495

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/movenc: Check return code of ff_iso8601_to_unix_time()
Michael Niedermayer [Sun, 21 Jun 2015 02:18:08 +0000 (04:18 +0200)]
avformat/movenc: Check return code of ff_iso8601_to_unix_time()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/mjpegdec: dont try to combine fields for decimated multiscope 2 material
Michael Niedermayer [Sun, 21 Jun 2015 00:39:38 +0000 (02:39 +0200)]
avcodec/mjpegdec: dont try to combine fields for decimated multiscope 2 material

Fixes Ticket4535

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolibvpxenc: support setting colorspace for vp9
James Zern [Sat, 13 Jun 2015 19:27:48 +0000 (12:27 -0700)]
libvpxenc: support setting colorspace for vp9

the vp9 bitstream supports 8 values:
unknown (default), bt601, bt709, smpte170, smpte240, bt2020, reserved
and sRGB.

Reviewed-by: Ronald S. Bultje <rsbultje@gmail.com>
Signed-off-by: James Zern <jzern@google.com>
4 years agolavc/adpcm: THP: fix indentation
Rodger Combs [Sat, 20 Jun 2015 10:01:18 +0000 (05:01 -0500)]
lavc/adpcm: THP: fix indentation

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/mqcenc: Remove unused variable
Michael Niedermayer [Sat, 20 Jun 2015 20:36:15 +0000 (22:36 +0200)]
avcodec/mqcenc: Remove unused variable

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolibavfilter/formats: Fix parsing of channel specifications with a trailing 'c'.
Simon Thelen [Sat, 20 Jun 2015 16:52:50 +0000 (18:52 +0200)]
libavfilter/formats: Fix parsing of channel specifications with a trailing 'c'.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolavc/adpcm: THP: allow channel counts up to 10
Rodger Combs [Sat, 20 Jun 2015 10:01:17 +0000 (05:01 -0500)]
lavc/adpcm: THP: allow channel counts up to 10

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolavf/brstm: allow larger block sizes
Rodger Combs [Sat, 20 Jun 2015 10:01:16 +0000 (05:01 -0500)]
lavf/brstm: allow larger block sizes

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolavf/brstm: support little-endian files (BCSTM; 3DS)
Rodger Combs [Sat, 20 Jun 2015 10:01:15 +0000 (05:01 -0500)]
lavf/brstm: support little-endian files (BCSTM; 3DS)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolavc/adpcm: THP: handle packets with sample counts not divisible by 14
Rodger Combs [Sat, 20 Jun 2015 10:01:13 +0000 (05:01 -0500)]
lavc/adpcm: THP: handle packets with sample counts not divisible by 14

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolavc: add little-endian ADPCM_THP decoder
Rodger Combs [Sat, 20 Jun 2015 10:01:14 +0000 (05:01 -0500)]
lavc: add little-endian ADPCM_THP decoder

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agofate: add avfilter/formats-test
Michael Niedermayer [Sat, 20 Jun 2015 12:07:44 +0000 (14:07 +0200)]
fate: add avfilter/formats-test

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>