ffmpeg.git
3 years agoavcodec/mips: MSA (MIPS-SIMD-Arch) optimizations for qpel functions
Shivraj Patil [Sun, 14 Jun 2015 17:56:23 +0000 (23:26 +0530)]
avcodec/mips: MSA (MIPS-SIMD-Arch) optimizations for qpel functions

This patch adds MSA (MIPS-SIMD-Arch) optimizations for qpel functions in new file qpeldsp_msa.c
Adds new generic macros (needed for this patch) in libavutil/mips/generic_macros_msa.h

Signed-off-by: Shivraj Patil <shivraj.patil@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
3 years agoffmpeg: Free last_frame instead of just unref
Michael Niedermayer [Thu, 18 Jun 2015 03:27:08 +0000 (05:27 +0200)]
ffmpeg: Free last_frame instead of just unref

Fixes Ticket4611

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
3 years agoavcodec/jpeg2000dec: Continue decoding reslevels even when empty ones are encountered
Michael Niedermayer [Thu, 18 Jun 2015 00:22:45 +0000 (02:22 +0200)]
avcodec/jpeg2000dec: Continue decoding reslevels even when empty ones are encountered

Fixes Ticket4635

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
3 years agoavcodec/ffv1enc: fix bps for >8bit yuv when not explicitly set
Michael Niedermayer [Wed, 17 Jun 2015 22:34:59 +0000 (00:34 +0200)]
avcodec/ffv1enc: fix bps for >8bit yuv when not explicitly set

Fixes Ticket4636

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
3 years agoavcodec/flacenc: Regression test for ticket #4628
George Boyle [Wed, 17 Jun 2015 13:51:16 +0000 (14:51 +0100)]
avcodec/flacenc: Regression test for ticket #4628

Corresponding commit: 2469ed32c81ebf2347e6883091c566724b286167

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
3 years agoMerge commit '1e79d5c6e73ad131f9395f337b58a2b59ee04c1b'
Michael Niedermayer [Wed, 17 Jun 2015 18:59:59 +0000 (20:59 +0200)]
Merge commit '1e79d5c6e73ad131f9395f337b58a2b59ee04c1b'

* commit '1e79d5c6e73ad131f9395f337b58a2b59ee04c1b':
  libwebpenc: use WebPMemoryWriterClear()

See: 7997d78643797d6d26babc4eabbda71049457169
Merged-by: Michael Niedermayer <michaelni@gmx.at>
3 years agoMerge commit 'd8d124eebcf2ec1f6a1936b12a4f00a48f08e85c'
Michael Niedermayer [Wed, 17 Jun 2015 18:53:06 +0000 (20:53 +0200)]
Merge commit 'd8d124eebcf2ec1f6a1936b12a4f00a48f08e85c'

* commit 'd8d124eebcf2ec1f6a1936b12a4f00a48f08e85c':
  aic: Improve error reporting

Merged-by: Michael Niedermayer <michaelni@gmx.at>
3 years agoavcodec/j2kenc: Properly flush the end of the truncated AC stream
Michael Niedermayer [Wed, 17 Jun 2015 18:13:05 +0000 (20:13 +0200)]
avcodec/j2kenc: Properly flush the end of the truncated AC stream

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
3 years agoavcodec/mqcenc: Add ff_mqc_flush_to()
Michael Niedermayer [Wed, 17 Jun 2015 18:11:43 +0000 (20:11 +0200)]
avcodec/mqcenc: Add ff_mqc_flush_to()

This is needed to separate the end padding from the bitstream, allowing
to end it multiple times without disturbing it.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
3 years agoavcodec/jpeg2000dec: Drop unneeded rlevel variable
Michael Niedermayer [Wed, 17 Jun 2015 13:48:12 +0000 (15:48 +0200)]
avcodec/jpeg2000dec: Drop unneeded rlevel variable

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
3 years agoavcodec/jpeg2000dwt: Support 9/7 singularity cases on the encoder side
Michael Niedermayer [Wed, 17 Jun 2015 13:24:14 +0000 (15:24 +0200)]
avcodec/jpeg2000dwt: Support 9/7 singularity cases on the encoder side

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
3 years agolibwebpenc: use WebPMemoryWriterClear()
James Almer [Tue, 16 Jun 2015 16:27:20 +0000 (17:27 +0100)]
libwebpenc: use WebPMemoryWriterClear()

WebPMemoryWriterClear() must be used instead of free() when
libwebp ABI version is > 0x0203.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
3 years agoavcodec/jpeg2000dwt: More special cases to handle singularities in 9/7 decode
Michael Niedermayer [Wed, 17 Jun 2015 12:45:15 +0000 (14:45 +0200)]
avcodec/jpeg2000dwt: More special cases to handle singularities in 9/7 decode

Fixes Ticket4634

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
3 years agoaic: Improve error reporting
Vittorio Giovara [Mon, 15 Jun 2015 17:27:53 +0000 (18:27 +0100)]
aic: Improve error reporting

4 years agoavcodec/mips: MSA (MIPS-SIMD-Arch) optimizations for H263 lpf functions
Shivraj Patil [Sun, 14 Jun 2015 17:56:22 +0000 (23:26 +0530)]
avcodec/mips: MSA (MIPS-SIMD-Arch) optimizations for H263 lpf functions

This patch adds MSA (MIPS-SIMD-Arch) optimizations for H263 lpf functions in new file h263dsp_msa.c

Signed-off-by: Shivraj Patil <shivraj.patil@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolavf/brstm: add support for BFSTM files
Rodger Combs [Wed, 17 Jun 2015 08:09:52 +0000 (03:09 -0500)]
lavf/brstm: add support for BFSTM files

Previous version reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavio: fix potential crashes when combining ffio_ensure_seekback + crc
wm4 [Tue, 16 Jun 2015 22:21:02 +0000 (00:21 +0200)]
avio: fix potential crashes when combining ffio_ensure_seekback + crc

Calling ffio_ensure_seekback() if ffio_init_checksum() has been called
on the same context can lead to out of bounds memory accesses and
crashes. The reason is that ffio_ensure_seekback() does not update
checksum_ptr after reallocating the buffer, resulting in a dangling
pointer.

This effectively fixes potential crashes when opening mp3 files.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoswscale/output: Add rgba64/rgb48/bgra64/bgr48 output functions with full chroma inter...
Michael Niedermayer [Tue, 16 Jun 2015 22:01:47 +0000 (00:01 +0200)]
swscale/output: Add rgba64/rgb48/bgra64/bgr48 output functions with full chroma interpolation

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoswscale/output: Factorize rgb48 and 64bit code
Michael Niedermayer [Tue, 16 Jun 2015 21:35:23 +0000 (23:35 +0200)]
swscale/output: Factorize rgb48 and 64bit code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/jpeg2000dwt: assert that mod == 0 for encoding
Michael Niedermayer [Tue, 16 Jun 2015 19:22:40 +0000 (21:22 +0200)]
avcodec/jpeg2000dwt: assert that mod == 0 for encoding

We are missing the handling of some special cases for this.
These cases should be unused and there should be no reason
to ever use them unless some spec dictates their use

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agodoc: avoid incorrect phrase 'allows to'
Andreas Cadhalpun [Sun, 14 Jun 2015 18:28:28 +0000 (20:28 +0200)]
doc: avoid incorrect phrase 'allows to'

Also fix typo found by Lou Logan:
Sacrifying -> Sacrificing

Reviewed-by: Lou Logan <lou@lrcd.com>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
4 years agoconfigure: make makeinfo_html check more robust
Andreas Cadhalpun [Sat, 13 Jun 2015 18:24:27 +0000 (20:24 +0200)]
configure: make makeinfo_html check more robust

The current check is too strict for newer makeinfo versions.
Existing version strings are:
makeinfo (GNU texinfo) 4.13
makeinfo (GNU texinfo) 5.2
texi2any (GNU texinfo) 5.9.93

Probably version 6 will come in the not too far future.

Reviewed-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
4 years agomatroskadec: validate audio channels and bitdepth
Andreas Cadhalpun [Mon, 15 Jun 2015 19:06:51 +0000 (21:06 +0200)]
matroskadec: validate audio channels and bitdepth

In the TTA extradata re-construction the values are written with
avio_wl16 and if they don't fit into uint16_t, this triggers an
av_assert2 in avio_w8.

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
4 years agomatroskadec: check audio sample rate
Andreas Cadhalpun [Mon, 15 Jun 2015 18:59:22 +0000 (20:59 +0200)]
matroskadec: check audio sample rate

And default to 8000 if it is invalid.

An invalid sample rate can trigger av_assert2 in av_rescale_rnd.

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
4 years agoavcodec/codec_desc: rename smv video codec name to smvjpeg to match decoder name
Paul B Mahol [Tue, 16 Jun 2015 13:28:34 +0000 (13:28 +0000)]
avcodec/codec_desc: rename smv video codec name to smvjpeg to match decoder name

Also fixes clash with smv audio codec.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agoavcodec/jpeg2000dwt: Fix 9/7 IDWT for small sizes
Michael Niedermayer [Tue, 16 Jun 2015 18:33:54 +0000 (20:33 +0200)]
avcodec/jpeg2000dwt: Fix 9/7 IDWT for small sizes

Fixes Ticket4631

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/jpeg2000dwt: add special cases for handling length 1 in 5/3 decode
Michael Niedermayer [Tue, 16 Jun 2015 18:00:39 +0000 (20:00 +0200)]
avcodec/jpeg2000dwt: add special cases for handling length 1 in 5/3 decode

Fixes Ticket4630

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/jpeg2000dec: Improve end check
Michael Niedermayer [Tue, 16 Jun 2015 16:34:20 +0000 (18:34 +0200)]
avcodec/jpeg2000dec: Improve end check

Fixes spurious end mismatch warnings

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/jpeg2000dec: Fix term_cnt check
Michael Niedermayer [Tue, 16 Jun 2015 16:31:59 +0000 (18:31 +0200)]
avcodec/jpeg2000dec: Fix term_cnt check

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMAINTAINERS: add myself as hls encryption maintainer
Christian Suloway [Tue, 16 Jun 2015 14:15:57 +0000 (09:15 -0500)]
MAINTAINERS: add myself as hls encryption maintainer

Signed-off-by: Christian Suloway <csuloway@globaleagleent.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/hlsenc: removed empty/unused print_encryption_tag function
Christian Suloway [Tue, 16 Jun 2015 14:15:56 +0000 (09:15 -0500)]
avformat/hlsenc: removed empty/unused print_encryption_tag function

Signed-off-by: Christian Suloway <csuloway@globaleagleent.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/mxfdec: Change version byte for JPEG2000 to match mxf.c and RP224v12
Michael Niedermayer [Mon, 15 Jun 2015 12:13:22 +0000 (14:13 +0200)]
avformat/mxfdec: Change version byte for JPEG2000 to match mxf.c and RP224v12

This should make no difference as the byte is ignored

Found-by: tim nicholson <nichot20@yahoo.com>
Reviewed-by: tim nicholson <nichot20@yahoo.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/flacenc: Fix Invalid Rice order
George Boyle [Tue, 16 Jun 2015 07:25:01 +0000 (08:25 +0100)]
avcodec/flacenc: Fix Invalid Rice order

Fixes ticket #4628.

The problem arose, in the sample file at least, in the last block where the
minimum and maximum Rice partition orders were both 0. In that case, and any
other where pmax == pmin, the original UINT32_MAX placeholder value for
bits[opt_porder] was getting overwritten before the comparison to check if the
current partition order is a new optimal, so the correct partition order and
RiceContext params were not being set.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agodoc/muxers.texi: properly insert {}s in example
James Zern [Tue, 16 Jun 2015 06:04:45 +0000 (23:04 -0700)]
doc/muxers.texi: properly insert {}s in example

use '@{' / '@}', fixes compile errors:
*** '{' without macro. Before: 1:-'.'}
*** '}' without opening '{' before:

since:
907ac20 avformat/hlsenc: added HLS encryption

Signed-off-by: James Zern <jzern@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/hlsenc: added HLS encryption
Christian Suloway [Mon, 15 Jun 2015 18:58:07 +0000 (10:58 -0800)]
avformat/hlsenc: added HLS encryption

Added HLS encryption with -hls_key_info_file <key_info_file> option. The
first line of key_info_file specifies the key URI written to the
playlist. The key URL is used to access the encryption key during
playback. The second line specifies the path to the key file used to
obtain the key during the encryption process. The key file is read as a
single packed array of 16 octets in binary format. The optional third
line specifies the initialization vector (IV) as a hexadecimal string to
be used instead of the segment sequence number (default) for encryption.
Changes to key_info_file will result in segment encryption with the new
key/IV and an entry in the playlist for the new key URI/IV.

Key info file format:
<key URI>
<key file path>
<IV> (optional)

Example key URIs:
http://server/file.key
/path/to/file.key
file.key

Example key file paths:
file.key
/path/to/file.key

Example IV:
0123456789ABCDEF0123456789ABCDEF

Example:
ffmpeg -f lavfi -i testsrc -c:v h264 -hls_key_info_file file.keyinfo
foo.m3u8

file.keyinfo:
http://server/file.key
/path/to/file.key
0123456789ABCDEF0123456789ABCDEF

Example shell script:
BASE_URL=${1:-'.'}
openssl rand 16 > file.key
echo $BASE_URL/file.key > file.keyinfo
echo file.key >> file.keyinfo
echo $(openssl rand -hex 16) >> file.keyinfo
ffmpeg -f lavfi -re -i testsrc -c:v h264 -hls_flags delete_segments \
  -hls_key_info_file file.keyinfo out.m3u8
--

Signed-off-by: Christian Suloway <csuloway@globaleagleent.com>
Signed-off-by: Dan Dennedy <dan@dennedy.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/jpeg2000dec: increase tile part limit to 32
Michael Niedermayer [Mon, 15 Jun 2015 20:45:25 +0000 (22:45 +0200)]
avcodec/jpeg2000dec: increase tile part limit to 32

Fixes Ticket4629

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavfilter/af_afade: add couple of more curves
Paul B Mahol [Sun, 14 Jun 2015 20:24:18 +0000 (20:24 +0000)]
avfilter/af_afade: add couple of more curves

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agoMerge commit 'a4fbd55d6e03eabdbecc3b7892ec09eb8062d066'
Michael Niedermayer [Mon, 15 Jun 2015 20:29:47 +0000 (22:29 +0200)]
Merge commit 'a4fbd55d6e03eabdbecc3b7892ec09eb8062d066'

* commit 'a4fbd55d6e03eabdbecc3b7892ec09eb8062d066':
  h264: er: Copy from the previous reference only if compatible

See: fdc64a104410f5fcc7f35b62287b0ae502b7061a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '9af7e8045e3e63ab39adedae9a7c11b1c410af26'
Michael Niedermayer [Mon, 15 Jun 2015 20:11:43 +0000 (22:11 +0200)]
Merge commit '9af7e8045e3e63ab39adedae9a7c11b1c410af26'

* commit '9af7e8045e3e63ab39adedae9a7c11b1c410af26':
  lavc: Clarify the behaviour of dimension and format context fields

Conflicts:
libavcodec/avcodec.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '03ca6d70df192125a772dadd01acfe3905aa653f'
Michael Niedermayer [Mon, 15 Jun 2015 19:56:26 +0000 (21:56 +0200)]
Merge commit '03ca6d70df192125a772dadd01acfe3905aa653f'

* commit '03ca6d70df192125a772dadd01acfe3905aa653f':
  x264: Factor out the reconfiguration code

Conflicts:
libavcodec/libx264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '24ad3ac6a3e20350214e6c3f7a931635f264ae07'
Michael Niedermayer [Mon, 15 Jun 2015 19:31:09 +0000 (21:31 +0200)]
Merge commit '24ad3ac6a3e20350214e6c3f7a931635f264ae07'

* commit '24ad3ac6a3e20350214e6c3f7a931635f264ae07':
  nut: Drop doxygen markers

Conflicts:
libavformat/nut.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolibvpxenc: remove stray '\'s
James Zern [Sat, 13 Jun 2015 17:12:20 +0000 (10:12 -0700)]
libvpxenc: remove stray '\'s

Signed-off-by: James Zern <jzern@google.com>
4 years agolibvpxenc: cosmetics: reindent after 2c70436
James Zern [Sat, 13 Jun 2015 17:10:54 +0000 (10:10 -0700)]
libvpxenc: cosmetics: reindent after 2c70436

Signed-off-by: James Zern <jzern@google.com>
4 years agoMerge commit '07b2db81d06e1cd6b1718d3e2dd7a42e8bccf8c0'
Michael Niedermayer [Mon, 15 Jun 2015 19:09:33 +0000 (21:09 +0200)]
Merge commit '07b2db81d06e1cd6b1718d3e2dd7a42e8bccf8c0'

* commit '07b2db81d06e1cd6b1718d3e2dd7a42e8bccf8c0':
  riff: Add MNM4 FourCC as mpeg4

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoencoders.texi: update libvpx documentation
James Zern [Wed, 10 Jun 2015 03:36:33 +0000 (20:36 -0700)]
encoders.texi: update libvpx documentation

modeled after the libx264 section.

Reviewed-by: Lou Logan <lou@lrcd.com>
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: James Zern <jzern@google.com>
4 years agoavcodec/jpeg2000dec: Omit mqc reinit after the last pass
Michael Niedermayer [Mon, 15 Jun 2015 18:29:32 +0000 (20:29 +0200)]
avcodec/jpeg2000dec: Omit mqc reinit after the last pass

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agodoc/filters: add one more compand example found in the wild
Paul B Mahol [Mon, 15 Jun 2015 17:20:23 +0000 (17:20 +0000)]
doc/filters: add one more compand example found in the wild

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agoexamples/demuxing_decoding: use properties from frame instead of video_dec_ctx
Andreas Cadhalpun [Sun, 14 Jun 2015 18:34:16 +0000 (20:34 +0200)]
examples/demuxing_decoding: use properties from frame instead of video_dec_ctx

This is more robust.

And only check if there is actually a frame returned.

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
4 years agoh264: er: Copy from the previous reference only if compatible
Andreas Cadhalpun [Sun, 14 Jun 2015 10:40:18 +0000 (12:40 +0200)]
h264: er: Copy from the previous reference only if compatible

Also use the frame pixel format instead of the one from the codec
context, which is more robust.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
4 years agoavcodec/jpeg2000dec: Fix Vertically causal context formation
Michael Niedermayer [Mon, 15 Jun 2015 16:00:19 +0000 (18:00 +0200)]
avcodec/jpeg2000dec: Fix Vertically causal context formation

Fixes Ticket4626

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/mqcdec: set raw flag at the begin of ff_mqc_initdec()
Michael Niedermayer [Mon, 15 Jun 2015 15:11:01 +0000 (17:11 +0200)]
avcodec/mqcdec: set raw flag at the begin of ff_mqc_initdec()

This way it is available to any functions called from ff_mqc_initdec()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoh264: er: Copy from the previous reference only if compatible
Andreas Cadhalpun [Sun, 14 Jun 2015 10:40:18 +0000 (12:40 +0200)]
h264: er: Copy from the previous reference only if compatible

Also use the frame pixel format instead of the one from the codec
context, which is more robust.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
4 years agolavc: Clarify the behaviour of dimension and format context fields
Luca Barbato [Sun, 14 Jun 2015 09:45:54 +0000 (11:45 +0200)]
lavc: Clarify the behaviour of dimension and format context fields

The AVCodecContext width, height, coded_width, coded_height and format
are used mainly as decoding hints and they get internally overwritten
during the data parsing stage.

Do not assume they match the last AVFrame provided by
avcodec_decode_video2 and assimilated functions since multi-threading
and other frame reordering might make those values to refer to frames
that will be outputted in the future.

CC: libav-stable@libav.org
4 years agox264: Factor out the reconfiguration code
Luca Barbato [Thu, 11 Jun 2015 22:08:49 +0000 (00:08 +0200)]
x264: Factor out the reconfiguration code

4 years agonut: Drop doxygen markers
Luca Barbato [Thu, 11 Jun 2015 00:40:34 +0000 (02:40 +0200)]
nut: Drop doxygen markers

4 years agoavcodec/jpeg2000dec: Improve readability of SOP check
Michael Niedermayer [Mon, 15 Jun 2015 02:21:40 +0000 (04:21 +0200)]
avcodec/jpeg2000dec: Improve readability of SOP check

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoriff: Add MNM4 FourCC as mpeg4
Vittorio Giovara [Fri, 12 Jun 2015 18:12:05 +0000 (19:12 +0100)]
riff: Add MNM4 FourCC as mpeg4

4 years agoavcodec/jpeg2000dec: Remove redundant check
Michael Niedermayer [Mon, 15 Jun 2015 01:11:58 +0000 (03:11 +0200)]
avcodec/jpeg2000dec: Remove redundant check

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/jpeg2000dec: Check reslevelno in RPCL
Michael Niedermayer [Mon, 15 Jun 2015 01:00:53 +0000 (03:00 +0200)]
avcodec/jpeg2000dec: Check reslevelno in RPCL

Fixes out of array read
Fixes Ticket4627

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/jpeg2000dec: Skip SOP
Michael Niedermayer [Mon, 15 Jun 2015 00:32:45 +0000 (02:32 +0200)]
avcodec/jpeg2000dec: Skip SOP

Fixes Ticket4625

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/jpeg2000dec: Use <0 instead of != 0 for error checking
Michael Niedermayer [Mon, 15 Jun 2015 00:19:48 +0000 (02:19 +0200)]
avcodec/jpeg2000dec: Use <0 instead of != 0 for error checking

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/jpeg2000dec: Also include remaining length in "Block length" error message
Michael Niedermayer [Sun, 14 Jun 2015 22:32:01 +0000 (00:32 +0200)]
avcodec/jpeg2000dec: Also include remaining length in "Block length" error message

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '74ea1167d91ccb2e1f2943efa030f2c278b598be'
Michael Niedermayer [Sun, 14 Jun 2015 23:30:36 +0000 (01:30 +0200)]
Merge commit '74ea1167d91ccb2e1f2943efa030f2c278b598be'

* commit '74ea1167d91ccb2e1f2943efa030f2c278b598be':
  tls_gnutls: fix hang on disconnection

See: 2222f419da99ef85d49ab04e7e15b76612f4d054
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/jpeg2000: Fix regression with multiple tiles
Michael Niedermayer [Sun, 14 Jun 2015 19:05:38 +0000 (21:05 +0200)]
avcodec/jpeg2000: Fix regression with multiple tiles

Fixes Ticket 4624

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/jpeg2000: Change codeblock coords to same origin as bands
Michael Niedermayer [Sun, 14 Jun 2015 18:02:06 +0000 (20:02 +0200)]
avcodec/jpeg2000: Change codeblock coords to same origin as bands

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/jpeg2000: Change precinct coords to same origin as bands
Michael Niedermayer [Sun, 14 Jun 2015 17:53:39 +0000 (19:53 +0200)]
avcodec/jpeg2000: Change precinct coords to same origin as bands

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/jpeg2000: Fix band coords
Michael Niedermayer [Sun, 14 Jun 2015 17:43:08 +0000 (19:43 +0200)]
avcodec/jpeg2000: Fix band coords

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/jpeg2000dec: Print warning if the mqc pointer mismatches at the end
Michael Niedermayer [Sun, 14 Jun 2015 19:19:40 +0000 (21:19 +0200)]
avcodec/jpeg2000dec: Print warning if the mqc pointer mismatches at the end

If this occurs on valid and correctly decoded files it should be reduced to debug
level

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agotls_gnutls: fix hang on disconnection
wm4 [Sat, 13 Jun 2015 21:55:21 +0000 (23:55 +0200)]
tls_gnutls: fix hang on disconnection

GNUTLS_SHUT_RDWR means GnuTLS will keep waiting for the server's
termination reply. But since we don't shutdown the TCP connection at
this point yet, GnuTLS will just keep skipping actual data from the
server, which basically is perceived as hang.

Use GNUTLS_SHUT_WR instead, which doesn't have this problem.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/jpeg2000dec: Show the progression order at debug level for all variants
Michael Niedermayer [Sun, 14 Jun 2015 17:43:38 +0000 (19:43 +0200)]
avcodec/jpeg2000dec: Show the progression order at debug level for all variants

It was previously shown just for some, this makes it consistent

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavfilter/af_afade: use av_clipd() instead of nested FFMAX & FFMIN
Paul B Mahol [Sun, 14 Jun 2015 17:08:43 +0000 (17:08 +0000)]
avfilter/af_afade: use av_clipd() instead of nested FFMAX & FFMIN

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agotls_gnutls: fix hang on disconnection
wm4 [Sun, 14 Jun 2015 15:12:53 +0000 (17:12 +0200)]
tls_gnutls: fix hang on disconnection

GNUTLS_SHUT_RDWR means GnuTLS will keep waiting for the server's
termination reply. But since we don't shutdown the TCP connection at
this point yet, GnuTLS will just keep skipping actual data from the
server, which basically is perceived as hang.

Use GNUTLS_SHUT_WR instead, which doesn't have this problem.

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agoavcodec/jpeg2000dec: Print error messages for more error conditions
Michael Niedermayer [Sun, 14 Jun 2015 13:00:45 +0000 (15:00 +0200)]
avcodec/jpeg2000dec: Print error messages for more error conditions

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agodoc: fix spelling errors
Andreas Cadhalpun [Sat, 13 Jun 2015 19:34:40 +0000 (21:34 +0200)]
doc: fix spelling errors

Neccessary -> Necessary
formated   -> formatted
thee       -> the
eventhough -> even though
seperately -> separately

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
4 years agoavcodec/jpeg2000dec: Handle format that has planes matching YUVA420P structure but...
Michael Niedermayer [Sun, 14 Jun 2015 02:45:02 +0000 (04:45 +0200)]
avcodec/jpeg2000dec: Handle format that has planes matching YUVA420P structure but seems not to be that

Outputs something for p0_05.j2k

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/jpeg2000dec: Print all cdx/cdy values not just the 2nd and 3rd
Michael Niedermayer [Sun, 14 Jun 2015 02:44:33 +0000 (04:44 +0200)]
avcodec/jpeg2000dec: Print all cdx/cdy values not just the 2nd and 3rd

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavfilter: bump minor after colorkey addition
Clément Bœsch [Sun, 14 Jun 2015 09:20:42 +0000 (11:20 +0200)]
avfilter: bump minor after colorkey addition

4 years agoavcodec/hevc: Track long and short term RPS size for VDPAU
Philip Langdale [Sat, 13 Jun 2015 16:34:43 +0000 (09:34 -0700)]
avcodec/hevc: Track long and short term RPS size for VDPAU

Today, we track the short term RPS size for DXVA, but only if the
SliceHeader RPS is being used. Otherwise it's left uninitialized.

NVIDIA's VDPAU implementation requires that the size be accurately
tracked even if an SPS RPS is being used. In this case, it's really
counting the size of the RPS idx information, but you end up with
mangled output if the value is not accurate.

VDPAU also needs the size of the long term RPS.

Signed-off-by: Philip Langdale <philipl@overt.org>
4 years agoavcodec/nvenc: Enable YV12 input format
Philip Langdale [Sun, 7 Jun 2015 03:28:22 +0000 (20:28 -0700)]
avcodec/nvenc: Enable YV12 input format

This has been enabled by recent nvidia driver releases.

Signed-off-by: Philip Langdale <philipl@overt.org>
4 years agoavcodec/jpeg2000dec: Implement "Reset context probabilities on coding pass boundaries"
Michael Niedermayer [Sun, 14 Jun 2015 01:28:07 +0000 (03:28 +0200)]
avcodec/jpeg2000dec: Implement "Reset context probabilities on coding pass boundaries"

No testcase with just this feature known

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agosoftfloat: make av_div_sf() inline
James Almer [Sat, 13 Jun 2015 03:20:37 +0000 (00:20 -0300)]
softfloat: make av_div_sf() inline

Removes a defined but not used warning on files including softfloat.h

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
4 years agoavcodec/jpeg2000dec: Support RPCL
Michael Niedermayer [Sun, 14 Jun 2015 00:41:53 +0000 (02:41 +0200)]
avcodec/jpeg2000dec: Support RPCL

Fixes Ticket 2792

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavfilter/vf_colorkey: Add colorkey video filter
Timo Rothenpieler [Sat, 13 Jun 2015 13:09:07 +0000 (15:09 +0200)]
avfilter/vf_colorkey: Add colorkey video filter

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/singlejpeg: fix standalone compilation
James Almer [Sat, 13 Jun 2015 20:47:13 +0000 (17:47 -0300)]
avformat/singlejpeg: fix standalone compilation

4 years agoavcodec/jpeg200dsp: add ff_rct_int_{sse2,avx2}
James Almer [Sat, 13 Jun 2015 16:13:10 +0000 (13:13 -0300)]
avcodec/jpeg200dsp: add ff_rct_int_{sse2,avx2}

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
4 years agoavcodec/jpeg200dsp: add ff_ict_float_{sse,avx}
James Almer [Sat, 13 Jun 2015 16:11:51 +0000 (13:11 -0300)]
avcodec/jpeg200dsp: add ff_ict_float_{sse,avx}

Original intrinsics version by Nicolas Bertrand.

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
4 years agoavfilter/drawutils: Assert av_pix_fmt_desc_get() return value in ff_fill_line_with_co...
Michael Niedermayer [Fri, 12 Jun 2015 21:40:09 +0000 (23:40 +0200)]
avfilter/drawutils: Assert av_pix_fmt_desc_get() return value in ff_fill_line_with_color()

Theres currently no case where this could be triggered

Found-by: Daemon404
Reviewed-by: Nicolas George <george@nsup.org>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavfilter/lut3d: assert on pixel format descriptor
Clément Bœsch [Sat, 13 Jun 2015 18:49:42 +0000 (20:49 +0200)]
avfilter/lut3d: assert on pixel format descriptor

inlink->format is supposed to be set to a valid format controlled by query_formats().

4 years agoavfilter/geq: assert on pixel format descriptor
Clément Bœsch [Sat, 13 Jun 2015 18:49:32 +0000 (20:49 +0200)]
avfilter/geq: assert on pixel format descriptor

inlink->format is supposed to be set to a valid format controlled by query_formats().

4 years agoconfigure: only disable VSX for !ppc64el
Andreas Cadhalpun [Sat, 13 Jun 2015 11:09:21 +0000 (13:09 +0200)]
configure: only disable VSX for !ppc64el

This reverts commit 04f0002, which made it impossible to enable VSX with
a generic cpu.

This changes the behavior back to what it was before commit b0af404.

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
4 years agoavcodec/ass_split: check ASSSplitContext alloc
Clément Bœsch [Sat, 13 Jun 2015 18:39:57 +0000 (20:39 +0200)]
avcodec/ass_split: check ASSSplitContext alloc

4 years agoavcodec/jpeg2000dec: Support PCRL
Michael Niedermayer [Sat, 13 Jun 2015 11:56:23 +0000 (13:56 +0200)]
avcodec/jpeg2000dec: Support PCRL

Fixes Ticket4603

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/jpeg2000dec: Try to fix remaining DCinema hardcoded TODOs in CPRL
Michael Niedermayer [Sat, 13 Jun 2015 11:22:05 +0000 (13:22 +0200)]
avcodec/jpeg2000dec: Try to fix remaining DCinema hardcoded TODOs in CPRL

Again, no testcase

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/jpeg2000dec: try to correct tile location in CPRL code
Michael Niedermayer [Sat, 13 Jun 2015 10:58:45 +0000 (12:58 +0200)]
avcodec/jpeg2000dec: try to correct tile location in CPRL code

No testcase

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/jpeg2000dec: Factorize component out of CPRL loop
Michael Niedermayer [Sat, 13 Jun 2015 10:38:49 +0000 (12:38 +0200)]
avcodec/jpeg2000dec: Factorize component out of CPRL loop

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/jpeg2000dec: Fix x/y step TODO for CPRL
Michael Niedermayer [Sat, 13 Jun 2015 10:19:22 +0000 (12:19 +0200)]
avcodec/jpeg2000dec: Fix x/y step TODO for CPRL

No testcase known

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoRemove a few occurences of "long long" from the libraries.
Carl Eugen Hoyos [Sat, 13 Jun 2015 07:28:41 +0000 (09:28 +0200)]
Remove a few occurences of "long long" from the libraries.

4 years agoavcodec/mips: MSA (MIPS-SIMD-Arch) optimizations for AVC qpel functions
Shivraj Patil [Thu, 11 Jun 2015 06:01:12 +0000 (11:31 +0530)]
avcodec/mips: MSA (MIPS-SIMD-Arch) optimizations for AVC qpel functions

This patch adds MSA (MIPS-SIMD-Arch) optimizations for AVC qpel functions in new file h264qpel_msa.c
Adds new generic macros (needed for this patch) in libavutil/mips/generic_macros_msa.h

Added const to local static array.

Signed-off-by: Shivraj Patil <shivraj.patil@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoexamples/decoding_encoding: Use the AVFrame width/height for processing images after...
Michael Niedermayer [Wed, 10 Jun 2015 20:00:30 +0000 (22:00 +0200)]
examples/decoding_encoding: Use the AVFrame width/height for processing images after decoding

This is what FFmpeg / FFplay do and it is more robust

Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoffprobe: check av_asprintf() for failure
Michael Niedermayer [Fri, 12 Jun 2015 23:08:16 +0000 (01:08 +0200)]
ffprobe: check av_asprintf() for failure

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