5 months agoconfigure: Use test_pkg_config() for the SDL check
James Almer [Sat, 30 Sep 2017 01:56:09 +0000 (22:56 -0300)]
configure: Use test_pkg_config() for the SDL check

Removes the extra code to preserve global CFLAGS.

Signed-off-by: James Almer <>
Signed-off-by: Diego Biurrun <>
5 months agoconfigure: Add test_pkg_config()
James Almer [Sat, 30 Sep 2017 01:56:08 +0000 (22:56 -0300)]
configure: Add test_pkg_config()

This helper is split off check_pkg_config(), setting only the pkg CFLAGS
and extralibs. This is useful for checks that do not require or do not
benefit from setting global CFLAGS.

Signed-off-by: James Almer <>
Signed-off-by: Diego Biurrun <>
5 months agocinepakenc: Move declaration out of for initialisation statement
Mark Thompson [Wed, 27 Sep 2017 00:48:37 +0000 (01:48 +0100)]
cinepakenc: Move declaration out of for initialisation statement

5 months agohapdec: Delete include for nonexistent file
Mark Thompson [Wed, 27 Sep 2017 00:47:24 +0000 (01:47 +0100)]
hapdec: Delete include for nonexistent file

It exists as an alias for string.h in most C libraries, so usually this
line is harmless.

5 months agohevc: Fix aligned array declarations
Mark Thompson [Wed, 27 Sep 2017 00:44:21 +0000 (01:44 +0100)]
hevc: Fix aligned array declarations

5 months agoqsv: Join the derived session to the parent
Luca Barbato [Sun, 24 Sep 2017 13:54:28 +0000 (13:54 +0000)]
qsv: Join the derived session to the parent

Should improve the performance on multiple transcoding from a single

5 months agoqsv: Make sure the session is set with the latest version
Luca Barbato [Mon, 25 Sep 2017 09:57:30 +0000 (09:57 +0000)]
qsv: Make sure the session is set with the latest version

It is needed to have the calls to MFXJoinSession succeed.

5 months agocheckasm: Test more h264 idct variants
Martin Storsjö [Tue, 29 Aug 2017 20:23:12 +0000 (23:23 +0300)]
checkasm: Test more h264 idct variants

Signed-off-by: Martin Storsjö <>
5 months agocbs: Add some read/write tests
Mark Thompson [Tue, 15 Aug 2017 17:14:32 +0000 (18:14 +0100)]
cbs: Add some read/write tests

Use the appropriate metadata filter for each codec - in the absence of any
options to modify the stream, the output bitstream should be identical to
the input (though the output file may differ in padding).

All tests use conformance bitstreams, the MPEG-2 streams are newly added
from the conformance test streams

5 months agohttp: Reset compressed header flag when starting to read a request
Jacek Jendrzej [Thu, 20 Jul 2017 11:46:46 +0000 (13:46 +0200)]
http: Reset compressed header flag when starting to read a request

This fixes redirects, where the original redirect response indicated
support for compression, while the actual redirected content didn't.

Signed-off-by: Martin Storsjö <>
5 months agocbs_h264: Fix writing streams with auxiliary pictures
Mark Thompson [Sat, 23 Sep 2017 15:46:11 +0000 (16:46 +0100)]
cbs_h264: Fix writing streams with auxiliary pictures

Tested with the alphaconformanceG sample.

5 months agosmacker: fix integer overflow with pts_inc
Michael Niedermayer [Sun, 24 Sep 2017 10:58:42 +0000 (12:58 +0200)]
smacker: fix integer overflow with pts_inc

Bug-Id: 1073

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Sean McGovern <>
5 months agosmacker: return meaningful error codes on failure
Sean McGovern [Sun, 24 Sep 2017 10:57:54 +0000 (12:57 +0200)]
smacker: return meaningful error codes on failure

6 months agopixdesc: Add API to map color property names to enum values
Vittorio Giovara [Thu, 21 Sep 2017 11:23:21 +0000 (13:23 +0200)]
pixdesc: Add API to map color property names to enum values

Signed-off-by: Vittorio Giovara <>
6 months agolibavfilter/overlay_qsv: Add QSV overlay vpp filter
Huang, Zhengxu [Fri, 18 Aug 2017 01:40:47 +0000 (09:40 +0800)]
libavfilter/overlay_qsv: Add QSV overlay vpp filter

The filter supports two inputs and (implicitly) scaling the second input
during composition, unlike the software overlay.

The code has been separated into common interface and qsv overlay
implementation. The common part mainly creates the qsv session and
manages the surface which is nearly the same for all qsv filters.
So the qsvvpp.c/qsvvpp.h API can be used by other QSV vpp filters
to reduce code redundancy.

 -hwaccel qsv -c:v mpeg2_qsv -r 25 -i in.m2v -hwaccel qsv -c:v h264_qsv
 -i in.h264 -filter_complex
 "overlay_qsv=eof_action=repeat:x=(W-w)/2:y=(H-h)/2"  -b 2M -maxrate 3M
 -c:v h264_qsv -y out.h264

Two inputs should have different sizes otherwise one will be completely
covered or you need to scale the second input as follows:
  -hwaccel qsv -c:v mpeg2_qsv -r 25 -i in.m2v -hwaccel qsv -c:v h264_qsv
  -i in.h264 -filter_complex
  "overlay_qsv=w=720:h=576:x=(W-w)/2:y=(H-h)/2" -b 2M -maxrate 3M -c:v
  h264_qsv -y out.h264

Signed-off-by: ChaoX A Liu <>
Signed-off-by: Zhengxu Huang <>
Signed-off-by: Andrew Zhang <>
  Change-Id: I5c381febb0af6e2f9622c54ba00490ab99d48297
Signed-off-by: Maxym Dmytrychenko <>
6 months agolibavfilter/vf_vpp: Add common filters of the qsv vpp
Huang, Zhengxu [Thu, 24 Aug 2017 02:16:28 +0000 (10:16 +0800)]
libavfilter/vf_vpp: Add common filters of the qsv vpp

Add common filters of the qsv vpp features including scale,denosie,
deinterlace,frc,crop and procAmp.

Performance will be significantly reduced in the test if using cascade
mode just like qsv framerate + qsv scale + qsv deinterlace + qsv denoise in
separated way no matter in system or video memmory cases.
And the code is so redundant because so much the same just as session and
surface's creation and management.
So we add a common qsv filter.

-hwaccel qsv -c:v h264_qsv -r 25 -i in -vf
-b 2M -maxrate 3M -c:v h264_qsv -y out.h264

Signed-off-by: ChaoX A Liu <>
Signed-off-by: Zhengxu Huang <>
Signed-off-by: Andrew Zhang <>
Change-Id: I130392ce722138c209ab658c5f03f0009b6e8024
Signed-off-by: Maxym Dmytrychenko <>
6 months agoavio: update avio_alloc_context() doxy
James Almer [Fri, 1 Sep 2017 15:32:45 +0000 (12:32 -0300)]
avio: update avio_alloc_context() doxy

It must be freed using avio_context_free() starting with commit

Signed-off-by: James Almer <>
Signed-off-by: Luca Barbato <>
6 months agovaapi_mpeg2: Convert to use coded bitstream infrastructure
Mark Thompson [Fri, 23 Jun 2017 23:29:32 +0000 (00:29 +0100)]
vaapi_mpeg2: Convert to use coded bitstream infrastructure

6 months agompeg12: Move finding the best frame rate to common code
Mark Thompson [Tue, 12 Sep 2017 21:11:56 +0000 (22:11 +0100)]
mpeg12: Move finding the best frame rate to common code

Previously in the mpeg2_metadata filter.  Also adds a test.

6 months agocbs_mpeg2: Add support for picture display extension
Mark Thompson [Sat, 9 Sep 2017 22:30:32 +0000 (23:30 +0100)]
cbs_mpeg2: Add support for picture display extension

6 months agocbs_h265: Fix ranges of prediction weight offsets
Mark Thompson [Mon, 28 Aug 2017 16:07:01 +0000 (17:07 +0100)]
cbs_h265: Fix ranges of prediction weight offsets

The bracketing was wrong - '-' binds before '<<'.  This would
previously incorrectly reject the streams in the WP_A and WP_B
conformance tests.

6 months agocbs_h265: Fix reading of unknown parameter set extension data
Mark Thompson [Mon, 28 Aug 2017 16:06:14 +0000 (17:06 +0100)]
cbs_h265: Fix reading of unknown parameter set extension data

6 months agovaapi_h264: Fix CPB/DPB delays
Mark Thompson [Sat, 9 Sep 2017 21:49:14 +0000 (22:49 +0100)]
vaapi_h264: Fix CPB/DPB delays

This should be ticks, not time_scale steps - it was wrong for all
framerates not a multiple of 1/2.

6 months agoRevert "vaapi_h265: Reduce the amount of padding in the stream"
Mark Thompson [Tue, 12 Sep 2017 21:11:52 +0000 (22:11 +0100)]
Revert "vaapi_h265: Reduce the amount of padding in the stream"

This reverts commit a14a12ca137bf1526452b97bedfc9f7b301d4e04.

The CTU size is always 32x32; the surface size is what actually sets
the desired property, and it is already correct.

6 months agoh264_metadata: Fix double-free
Mark Thompson [Sun, 20 Aug 2017 21:46:17 +0000 (22:46 +0100)]
h264_metadata: Fix double-free

Whether the udu string should be freed depends on whether the SEI it
gets added to was created internally by cbs or externally by the bsf.
The current code frees it twice in the former case.

6 months agocbs: Add buffer padding when splitting fragments
Mark Thompson [Tue, 12 Sep 2017 21:11:47 +0000 (22:11 +0100)]
cbs: Add buffer padding when splitting fragments

Remove any trailing zeroes from H.26[45] NAL units at the same time.

6 months agocbs: Always check for bitstream end before reading
Mark Thompson [Tue, 12 Sep 2017 21:11:41 +0000 (22:11 +0100)]
cbs: Always check for bitstream end before reading

6 months agoqsv: Load the hw hevc plugin by default on Linux
Luca Barbato [Wed, 6 Sep 2017 13:07:40 +0000 (13:07 +0000)]
qsv: Load the hw hevc plugin by default on Linux

Only on Windows the software plugin is available.

Signed-off-by: Luca Barbato <>
6 months agoaviocat: Check for output write errors
Martin Storsjö [Sat, 2 Sep 2017 21:02:54 +0000 (00:02 +0300)]
aviocat: Check for output write errors

Signed-off-by: Martin Storsjö <>
6 months agoflvdec: Check the avio_seek return value after reading a metadata packet
Martin Storsjö [Sat, 2 Sep 2017 20:20:26 +0000 (23:20 +0300)]
flvdec: Check the avio_seek return value after reading a metadata packet

If the metadata packet is corrupted, flv_read_metabody can accidentally
read past the start of the next packet. If the start of the next packet
had been flushed out of the IO buffer, we would be unable to seek to
the right position (on a nonseekable stream).

Prefer to clearly error out instead of silently trying to read from a
desynced stream which will only be interpreted as garbage.

Signed-off-by: Martin Storsjö <>
6 months agoRevert "checkasm: Test more h264 idct variants"
Martin Storsjö [Sat, 2 Sep 2017 19:22:59 +0000 (22:22 +0300)]
Revert "checkasm: Test more h264 idct variants"

This reverts commit 547db1eaecd597031165a2bf637acaaacde52788.

This commit wasn't supposed to be pushed (yet) since it hasn't
been reviewed.

Signed-off-by: Martin Storsjö <>
6 months agoarm: Fix SIGBUS on ARM when compiled with binutils 2.29
Martin Storsjö [Thu, 31 Aug 2017 09:06:44 +0000 (12:06 +0300)]
arm: Fix SIGBUS on ARM when compiled with binutils 2.29

In binutils 2.29, the behavior of the ADR instruction changed so that 1 is
added to the address of a Thumb function (previously nothing was added). This
allows the loaded address to be passed to a BLX instruction and the correct
mode change will occur.


By using adr with a label that isn't annotated as a thumb function,
we avoid the new behaviour in binutils 2.29 and get the same behaviour
as in prior releases, and as in other assemblers (ms armasm.exe,
clang's built in assembler) - an idea that Janne Grunau came up with.

Signed-off-by: Martin Storsjö <>
6 months agocheckasm: Test more h264 idct variants
Martin Storsjö [Tue, 29 Aug 2017 20:23:12 +0000 (23:23 +0300)]
checkasm: Test more h264 idct variants

6 months agoRevert "fate: Skip the checkasm test if CONFIG_STATIC is disabled"
Martin Storsjö [Fri, 25 Aug 2017 06:42:15 +0000 (09:42 +0300)]
Revert "fate: Skip the checkasm test if CONFIG_STATIC is disabled"

When we use dllexport properly for shared libraries on windows,
there's no longer any issue with linking the object files for
e.g. libavcodec statically into checkasm. (It's still not possible
to link the built object files for e.g. libavformat statically to
libavcodec though, since libavformat exepcts to load av_export_*
symbols from a DLL.)

This reverts commit 4e62b57ee03928c12a3119dcaf78ffa1f4d6985f.

Signed-off-by: Martin Storsjö <>
6 months agoconfigure: Use dllexport/dllimport for data symbols across DLLs with mingw
Martin Storsjö [Thu, 24 Aug 2017 20:27:16 +0000 (23:27 +0300)]
configure: Use dllexport/dllimport for data symbols across DLLs with mingw

This avoids having to use pseudo relocations.

The version script used for exporting functions is skipped as soon
as the set of object files contains symbols marked with dllexport,
therefore we need to use makedef to produce the full list of symbols
to be exported.

Signed-off-by: Martin Storsjö <>
6 months agomakedef: Extend the script for use with mingw tools as well
Martin Storsjö [Thu, 24 Aug 2017 20:05:21 +0000 (23:05 +0300)]
makedef: Extend the script for use with mingw tools as well

This is invoked by setting the NM and AR variables to the names of
those specific tools. The ARCH variable also needs to be provided,
to choose the symbol prefix (nm doesn't provide any option that
dumps the architecture easily).

Signed-off-by: Martin Storsjö <>
6 months agomakedef: Fold as much text transformations as possible into the initial dump
Martin Storsjö [Thu, 24 Aug 2017 20:04:38 +0000 (23:04 +0300)]
makedef: Fold as much text transformations as possible into the initial dump

This avoids redoing them for each expression in the list.

Signed-off-by: Martin Storsjö <>
6 months agomsvc: Properly specify dllexport for data symbols shared across dll boundaries
Martin Storsjö [Thu, 24 Aug 2017 19:07:04 +0000 (22:07 +0300)]
msvc: Properly specify dllexport for data symbols shared across dll boundaries

We currently only have exported data symbols within libavcodec, but
the concept is easy to extend to other libraries if necessary.
The attribute declaration needs to be in a private header though,
since we can't use CONFIG_SHARED in public installed headers.

Signed-off-by: Martin Storsjö <>
6 months agoRemove support for building for mingw32ce (Windows CE)
Martin Storsjö [Wed, 30 Aug 2017 19:04:30 +0000 (22:04 +0300)]
Remove support for building for mingw32ce (Windows CE)

The toolchain for this target is unmaintained since many years.

While it has been continuously build tested on fate, it hasn't
actually been tested at runtime since many, many years (and back
then, only a few codecs in libavcodec were tested).

So far, keeping support for it has been mostly effortless, but
the compiler does seem to have issues with dllimported data symbols,
ending up as internal compiler errors in some cases. Instead of
jumping through further hoops to work around that, just remove the

Signed-off-by: Martin Storsjö <>
6 months agolavf: make avio_read_partial() public
wm4 [Thu, 17 Aug 2017 13:01:44 +0000 (15:01 +0200)]
lavf: make avio_read_partial() public

Main use-case is proxying avio through a foreign I/O layer and a custom
AVIO context, without losing latency and performance characteristics.

Signed-off-by: Luca Barbato <>
6 months agoswscale: Do not expand a macro with 'defined' in it
Derek Buitenhuis [Thu, 24 Aug 2017 20:04:13 +0000 (21:04 +0100)]
swscale: Do not expand a macro with 'defined' in it


    libswscale/utils.c:1632:5: warning: macro expansion producing 'defined' has undefined behavior [-Wexpansion-to-defined]
    #if USE_MMAP
    libswscale/utils.c:1577:49: note: expanded from macro 'USE_MMAP'
Signed-off-by: Derek Buitenhuis <>
Signed-off-by: Luca Barbato <>
6 months agoconfigure: Include d3d11va_extralibs in libavutil
Martin Storsjö [Thu, 24 Aug 2017 19:17:16 +0000 (22:17 +0300)]
configure: Include d3d11va_extralibs in libavutil

This fixes shared WinRT/UWP builds with d3d11va enabled.

Signed-off-by: Martin Storsjö <>
7 months agoyadif: Account for the buffer alignment while processing the frame edges
Michael Niedermayer [Mon, 21 Aug 2017 07:55:48 +0000 (09:55 +0200)]
yadif: Account for the buffer alignment while processing the frame edges

Avoid out of bound reads.

Bug-Id: 1031
Signed-off-by: Luca Barbato <>
7 months agoaarch64: Fix negative movrel offsets for windows
Martin Storsjö [Sun, 9 Jul 2017 20:52:10 +0000 (23:52 +0300)]
aarch64: Fix negative movrel offsets for windows

On windows, the offset for the relocation doesn't get stored in
the relocation itself, but as an unsigned immediate in the opcode.
Therefore, negative offsets has to be handled via a separate sub
instruction, just as on MachO.

Signed-off-by: Martin Storsjö <>
7 months agopng: Support RGBA64 pixel format
Luca Barbato [Sun, 16 Jul 2017 12:35:40 +0000 (14:35 +0200)]
png: Support RGBA64 pixel format

7 months agopng: Report more details regarding unsupported pixel formats
Luca Barbato [Sun, 16 Jul 2017 11:46:16 +0000 (13:46 +0200)]
png: Report more details regarding unsupported pixel formats

7 months agompeg2enc: Don't mark all streams as component video
Mark Thompson [Sat, 12 Aug 2017 21:16:13 +0000 (22:16 +0100)]
mpeg2enc: Don't mark all streams as component video

Since there is no information about the source format, "unspecified"
is the correct value to write here.

All tests using the MPEG-2 encoder are updated, as this changes the
header on all outputs.

7 months agolavc: Add mpeg2_metadata bitstream filter
Mark Thompson [Tue, 1 Aug 2017 14:35:14 +0000 (15:35 +0100)]
lavc: Add mpeg2_metadata bitstream filter

7 months agolavc: Add coded bitstream read/write support for MPEG-2
Mark Thompson [Thu, 4 May 2017 22:03:03 +0000 (23:03 +0100)]
lavc: Add coded bitstream read/write support for MPEG-2

Also enable MPEG-2 support in the trace_headers filter.

7 months agocbs_h2645: Return error if writing fails
Mark Thompson [Mon, 14 Aug 2017 15:46:32 +0000 (16:46 +0100)]
cbs_h2645: Return error if writing fails

7 months agoh264dec: use a large enough field for reference list modification values
Anton Khirnov [Thu, 17 Aug 2017 10:15:58 +0000 (12:15 +0200)]
h264dec: use a large enough field for reference list modification values

pic_num can be at most 17-bit, so uint8_t is not sufficient.

Found-By: Bradley Sepos <>
7 months agoxwddec: support 8bpp grayscale
Piotr Bandurski [Sun, 24 Jun 2012 11:34:02 +0000 (11:34 +0000)]
xwddec: support 8bpp grayscale

(cherry picked from commit b9c94e826e7551027754ecfa60e3e487e0c28fcb)
Signed-off-by: Diego Biurrun <>
7 months agodfa: Disallow odd width/height and add proper bounds check for DDS1 chunks
Diego Biurrun [Fri, 11 Aug 2017 17:15:20 +0000 (19:15 +0200)]
dfa: Disallow odd width/height and add proper bounds check for DDS1 chunks

DDS1 chunks are decoded in 2x2 blocks, odd chunk width or height is not
allowed in that case. Also ensure that the decode buffer is big enough
for all blocks being processed.

Bug-Id: CVE-2017-9992
7 months agovaapi_h265: Reduce the amount of padding in the stream
Mark Thompson [Sat, 12 Aug 2017 20:32:29 +0000 (21:32 +0100)]
vaapi_h265: Reduce the amount of padding in the stream

It is not necessary to pad to the CTU size.  The CB size of 8x8 should be
sufficient, but due to constraints in the Intel driver (the one usable
implementation of this) it has to be padded to 16x16 like in H.264.

7 months agovaapi_h265: Add support for AUD NAL units
Mark Thompson [Sun, 23 Jul 2017 22:22:54 +0000 (23:22 +0100)]
vaapi_h265: Add support for AUD NAL units

Matching the H.264 encoder.

7 months agovaapi_h265: Convert to use coded bitstream infrastructure
Mark Thompson [Sun, 14 May 2017 20:36:24 +0000 (21:36 +0100)]
vaapi_h265: Convert to use coded bitstream infrastructure

Also improves the metadata and generally makes the configuration
a bit cleaner.

7 months agovaapi_h264: Add support for SEI recovery points
Mark Thompson [Sun, 7 May 2017 22:02:09 +0000 (23:02 +0100)]
vaapi_h264: Add support for SEI recovery points

Included by default with non-IDR intra frames.

7 months agovaapi_h264: Add support for AUD NAL units
Mark Thompson [Sun, 7 May 2017 21:58:56 +0000 (22:58 +0100)]
vaapi_h264: Add support for AUD NAL units

Adds a new private option to enable them (off by default).

7 months agovaapi_h264: Convert to use coded bitstream infrastructure
Mark Thompson [Sun, 7 May 2017 14:01:42 +0000 (15:01 +0100)]
vaapi_h264: Convert to use coded bitstream infrastructure

7 months agolavc: Add hevc_metadata bitstream filter
Mark Thompson [Sun, 23 Jul 2017 15:23:51 +0000 (16:23 +0100)]
lavc: Add hevc_metadata bitstream filter

This is able to modify some header metadata found in the VPS/SPS/VUI,
and can also add/remove AUDs.

7 months agolavc: Add h264_redundant_pps bitstream filter
Mark Thompson [Thu, 4 May 2017 22:10:19 +0000 (23:10 +0100)]
lavc: Add h264_redundant_pps bitstream filter

This applies a specific fixup to some Bluray streams which contain
redundant PPSs modifying irrelevant parameters of the stream which
confuse other transformations which require correct extradata.

A new single global PPS is created, and all of the redundant PPSs
within the stream are removed.

7 months agolavc: Add h264_metadata bitstream filter
Mark Thompson [Thu, 4 May 2017 22:09:02 +0000 (23:09 +0100)]
lavc: Add h264_metadata bitstream filter

This is able to modify some header metadata found in the SPS/VUI,
and can also add/remove AUDs and insert user data in SEI NAL units.

7 months agolavc: Add trace_headers bitstream filter
Mark Thompson [Thu, 4 May 2017 22:06:20 +0000 (23:06 +0100)]
lavc: Add trace_headers bitstream filter

Supports all streams that the coded bitstream infrastructure does
(currently H.264 and H.265).

7 months agolavc: Add coded bitstream read/write support for H.265
Mark Thompson [Sun, 14 May 2017 15:32:00 +0000 (16:32 +0100)]
lavc: Add coded bitstream read/write support for H.265

7 months agolavc: Add coded bitstream read/write support for H.264
Mark Thompson [Sun, 14 May 2017 15:18:25 +0000 (16:18 +0100)]
lavc: Add coded bitstream read/write support for H.264

7 months agolavc: Add coded bitstream read/write API
Mark Thompson [Thu, 4 May 2017 22:01:51 +0000 (23:01 +0100)]
lavc: Add coded bitstream read/write API

7 months agopixfmt: Support chroma-derived and ictcp color matrices
Vittorio Giovara [Tue, 8 Aug 2017 14:30:32 +0000 (16:30 +0200)]
pixfmt: Support chroma-derived and ictcp color matrices

Signed-off-by: Vittorio Giovara <>
7 months agoh264: Add support for alternative transfer characterics SEI
Vittorio Giovara [Tue, 8 Aug 2017 14:06:29 +0000 (16:06 +0200)]
h264: Add support for alternative transfer characterics SEI

The use of this SEI is for backward compatibility in HLG HDR systems:
older devices that cannot interpret the "arib-std-b67" transfer will
get the compatible transfer (usually bt709 or bt2020) from the VUI,
while newer devices that can interpret HDR will read the SEI and use
its value instead.

Signed-off-by: Vittorio Giovara <>
7 months agovaapi_encode: Move quality option to common code
Mark Thompson [Sun, 30 Apr 2017 18:27:54 +0000 (19:27 +0100)]
vaapi_encode: Move quality option to common code

Use AVCodecContext.compression_level rather than a private option,
replacing the H.264-specific quality option (which stays only for

This now works with the H.265 encoder in the i965 driver, as well as
the existing cases with the H.264 encoder.

7 months agohevc: Validate the number of long term reference pictures
Mark Thompson [Fri, 23 Jun 2017 23:29:14 +0000 (00:29 +0100)]
hevc: Validate the number of long term reference pictures

This would overflow if the stream contained a value greater than the
maximum allowed by the standard (32).

7 months agohevc: Improve stream constraint values in common header
Mark Thompson [Fri, 23 Jun 2017 23:29:02 +0000 (00:29 +0100)]
hevc: Improve stream constraint values in common header

Add comments to describe the sources of the constraint values expressed here,
and add some more related values which will be used in following patches.

Fix the incorrect values for SPS and PPS count (they are not the same as those
used for H.264), and remove HEVC_MAX_CU_SIZE because it is not used anywhere.

7 months agoh264: Add stream constraint values to the common header
Mark Thompson [Fri, 23 Jun 2017 23:30:20 +0000 (00:30 +0100)]
h264: Add stream constraint values to the common header

With comments describing the derivation of each value.

7 months agomov: move stsd finalization to an appropriate place
Sean McGovern [Sat, 29 Jul 2017 23:17:16 +0000 (19:17 -0400)]
mov: move stsd finalization to an appropriate place

mov_finalize_stsd_codec() parses stream information from the ALAC extradata,
so run it after the extradata processing is completed in mov_read_stsd().

Fixes playback of 96kHz ALAC streams muxed by qaac or the reference alac encoder.

Adapted from an FFmpeg patch by Hendrik Leppkes <>

Bug-Id: 1072

7 months agomov: Do not set stsd_count if mov_read_stsd() fails
Sean McGovern [Fri, 28 Jul 2017 20:29:35 +0000 (16:29 -0400)]
mov: Do not set stsd_count if mov_read_stsd() fails

Based on an FFmpeg patch by Michael Niedermayer <>

7 months agomov: log and return early on non-positive stsd entry counts
Sean McGovern [Fri, 28 Jul 2017 20:17:33 +0000 (16:17 -0400)]
mov: log and return early on non-positive stsd entry counts

Based on an FFmpeg patch by Michael Niedermayer <>

7 months agohevcdec: add a CUVID hwaccel
Anton Khirnov [Sat, 11 Feb 2017 15:49:34 +0000 (16:49 +0100)]
hevcdec: add a CUVID hwaccel

7 months agofate/hevc: specify output pixel format explicitly
Anton Khirnov [Mon, 24 Jul 2017 09:42:09 +0000 (11:42 +0200)]
fate/hevc: specify output pixel format explicitly

This allows running those tests with hwaccel.

7 months agohevcdec: set the active SPS before calling get_format()
Anton Khirnov [Mon, 24 Jul 2017 09:41:31 +0000 (11:41 +0200)]
hevcdec: set the active SPS before calling get_format()

This way the SPS is available to the hwaccel init code.

7 months agoavconv: when using -loop option bail out if seek to start fails
Peter Große [Fri, 30 Jun 2017 15:28:53 +0000 (17:28 +0200)]
avconv: when using -loop option bail out if seek to start fails

Fixes an infinite loop when a demuxer fails to seek to the start of the input.

Signed-off-by: Peter Große <>
Signed-off-by: Anton Khirnov <>
7 months agocuvid: add cuvid.h to SKIPHEADERS
Anton Khirnov [Thu, 27 Jul 2017 10:42:03 +0000 (12:42 +0200)]
cuvid: add cuvid.h to SKIPHEADERS

7 months agoh264dec: add a CUVID hwaccel
Anton Khirnov [Sat, 11 Feb 2017 15:49:34 +0000 (16:49 +0100)]
h264dec: add a CUVID hwaccel

Some parts of the code are based on a patch by
Timo Rothenpieler <>

7 months agodecode: add a per-frame private data for hwaccel use
Anton Khirnov [Sat, 1 Jul 2017 10:09:58 +0000 (12:09 +0200)]
decode: add a per-frame private data for hwaccel use

This will be useful in the CUVID hwaccel. It should also eventually
replace current decoder-specific mechanisms used by various other

7 months agodecode: add a mechanism for performing delayed processing on the decoded frames
Anton Khirnov [Sat, 1 Jul 2017 10:09:58 +0000 (12:09 +0200)]
decode: add a mechanism for performing delayed processing on the decoded frames

This will be useful in the CUVID hwaccel.

7 months agodecode: add a method for attaching lavc-internal data to frames
Anton Khirnov [Sat, 1 Jul 2017 09:12:44 +0000 (11:12 +0200)]
decode: add a method for attaching lavc-internal data to frames

Use the AVFrame.opaque_ref field. The original user's opaque_ref is
wrapped in the lavc struct and then unwrapped before the frame is
returned to the caller.

This new struct will be useful in the following commits.

7 months agodecode: avoid leaks on failure in ff_get_buffer()
Anton Khirnov [Sat, 1 Jul 2017 09:32:56 +0000 (11:32 +0200)]
decode: avoid leaks on failure in ff_get_buffer()

If the get_buffer() call fails, the frame might have some side data
already set. Make sure it gets freed.

7 months agoh264dec: Fix mix of lossless and lossy MBs decoding
Anton Mitrofanov [Thu, 15 Jun 2017 22:56:16 +0000 (18:56 -0400)]
h264dec: Fix mix of lossless and lossy MBs decoding

Signed-off-by: Anton Khirnov <>
7 months agoh264_cabac: Fix CABAC+8x8dct in 4:4:4
Anton Mitrofanov [Thu, 15 Jun 2017 22:56:14 +0000 (18:56 -0400)]
h264_cabac: Fix CABAC+8x8dct in 4:4:4

Use the correct ctxIdxInc calculation for coded_block_flag.
Keep old behavior for old versions of x264 for backward compatibility.

Signed-off-by: Anton Khirnov <>
7 months agoh264dec: fix Lossless Decoding (Profile 244) for 8x8 Intra Prediction
Yogender Kumar Gupta [Thu, 15 Jun 2017 22:56:13 +0000 (18:56 -0400)]
h264dec: fix Lossless Decoding (Profile 244) for 8x8 Intra Prediction

Signed-off-by: Anton Khirnov <>
7 months agoh264dec: track the last seen value of x264_build
Anton Khirnov [Sat, 22 Jul 2017 12:52:27 +0000 (14:52 +0200)]
h264dec: track the last seen value of x264_build

Do not use the one in the SEI directly as that is reset at certain

Inspired by patches from Michael Niedermayer <> and
Anton Mitrofanov <>.

7 months agoimgutils: add function to clear an image to black
wm4 [Sat, 22 Jul 2017 21:05:14 +0000 (23:05 +0200)]
imgutils: add function to clear an image to black

Black isn't always just memset(ptr, 0, size). Limited YUV in particular
requires relatively non-obvious values, and filling a frame with
repeating 0 bytes is disallowed in some contexts. With component sizes
larger than 8 or packed YUV, this can become relatively complicated. So
having a generic function for this seems helpful.

In order to handle the complex cases in a generic way without destroying
performance, this code attempts to compute a black pixel, and then uses
that value to clear the image data quickly by using a function like

Common cases like yuv410p10 or rgba can't be handled with a simple
memset, so there is some code to fill memory with 2/4/8 byte patterns.
For the remaining cases, a generic slow fallback is used.

Signed-off-by: Anton Khirnov <>
7 months agolavc, lavu: move frame cropping to a convenience function
wm4 [Sat, 22 Jul 2017 21:05:13 +0000 (23:05 +0200)]
lavc, lavu: move frame cropping to a convenience function

Signed-off-by: Anton Khirnov <>
7 months agormdec: add missing brackets to compound statement
Sean McGovern [Tue, 25 Jul 2017 22:04:32 +0000 (18:04 -0400)]
rmdec: add missing brackets to compound statement

Accidentally left out of 95ce02b35d3d1bb16111031df1d82a6e4d894d36.

7 months agolavf/vf_deinterlace_qsv: Enable the qsv deinterlace vpp
Huang, Zhengxu [Thu, 20 Jul 2017 08:16:44 +0000 (16:16 +0800)]
lavf/vf_deinterlace_qsv: Enable the qsv deinterlace vpp

The current qsv deinterlace module does not work at all because MSDK needs user to pass
extra parameters to enable hint functions,such as denoise,deinterlace,composition and so on.

Usage:-hwaccel qsv -r 25 -c:v h264_qsv -i in -vf deinterlace_qsv=bob -b 2M
      -maxrate 3M -c:v h264_qsv -y out.h264

Signed-off-by: ChaoX A Liu <>
Signed-off-by: Zhengxu Huang <>
Signed-off-by: Andrew Zhang <>
Change-Id: I9e7ddcf884f2788c2820f6c98affacfb9d8f3287
Signed-off-by: Maxym Dmytrychenko <>
7 months agolibavcodec/mjpeg_qsv: Add QSV MJPEG encoder
Huang, Zhengxu [Fri, 21 Jul 2017 04:12:44 +0000 (12:12 +0800)]
libavcodec/mjpeg_qsv: Add QSV MJPEG encoder

-hwaccel qsv -c:v h264_qsv -i in -c:v mjpeg_qsv -global_quality 80 -f
mjpeg out

Signed-off-by: ChaoX A Liu <>
Signed-off-by: Zhengxu Huang <>
Signed-off-by: Andrew Zhang <
Signed-off-by: Maxym Dmytrychenko <>
8 months agolavf: allow avformat_close_input() with NULL
wm4 [Sun, 16 Jul 2017 10:43:09 +0000 (12:43 +0200)]
lavf: allow avformat_close_input() with NULL

This is consistent with how other destructors behave.

Signed-off-by: Anton Khirnov <>
8 months agodxva: DXVA2_ModeHEVC_VLD_Main10 does not support Main
wm4 [Mon, 10 Jul 2017 13:59:38 +0000 (15:59 +0200)]
dxva: DXVA2_ModeHEVC_VLD_Main10 does not support Main

This mode apparently does not support decoding of HEVC Main (8 bit).
With D3D11 and Intel drivers on Windows 10 I get green corruption, while
using DXVA2_ModeHEVC_VLD_Main works.

Signed-off-by: Anton Khirnov <>
8 months agocaf: add an Opus tag
Anton Khirnov [Sat, 1 Jul 2017 08:49:58 +0000 (10:49 +0200)]
caf: add an Opus tag

8 months agohevc: Make sure to update the current frame transfer characteristic
Vittorio Giovara [Thu, 20 Jul 2017 12:43:53 +0000 (14:43 +0200)]
hevc: Make sure to update the current frame transfer characteristic

Otherwise the first decoded frame will still be tagged with the
original transfer instead of the alternative one.

Signed-off-by: Vittorio Giovara <>
8 months agormdec: don't ignore the return value of av_get_packet()
Sean McGovern [Wed, 12 Jul 2017 23:45:46 +0000 (19:45 -0400)]
rmdec: don't ignore the return value of av_get_packet()

8 months agobuild: Add feature test macros for glibc 2.19+
Diego Biurrun [Sat, 8 Jul 2017 11:18:39 +0000 (13:18 +0200)]
build: Add feature test macros for glibc 2.19+

glibc introduced _DEFAULT_SOURCE in version 2.19 to replace _BSD_SOURCE and
_SVID_SOURCE, which were deprecated in version 2.20. Add _DEFAULT_SOURCE
where the latter two are used to be forwards-compatible and avoid warnings
about the use of deprecated definitions.