OSDN Git Service

android-x86/external-ffmpeg.git
8 years agoDon't use expressions with side effects in macro parameters
Martin Storsjö [Thu, 28 Jul 2016 10:10:22 +0000 (13:10 +0300)]
Don't use expressions with side effects in macro parameters

AV_WB32 can be implemented as a macro that expands its parameters
multiple times (in case AV_HAVE_FAST_UNALIGNED isn't set and the
compiler doesn't support GCC attributes); make sure not to read
multiple times from the source in this case.

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agodxv: Check to make sure we don't overrun buffers on corrupt inputs
Martin Storsjö [Thu, 28 Jul 2016 10:45:24 +0000 (13:45 +0300)]
dxv: Check to make sure we don't overrun buffers on corrupt inputs

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agoqsvdec: only access hwaccel_context is the pixel format is QSV
Anton Khirnov [Sat, 30 Jul 2016 14:38:51 +0000 (16:38 +0200)]
qsvdec: only access hwaccel_context is the pixel format is QSV

We do not strictly specify that hwaccel_context must be cleared if no
hwaccel is used.

Reported-By: wm4 <nfxjfg@googlemail.com>
8 years agoflac demuxer: improve probing
Anton Khirnov [Sat, 30 Jul 2016 13:14:26 +0000 (15:14 +0200)]
flac demuxer: improve probing

Extend the probe function to validate the STREAMINFO block that must
follow the fLaC ID tag.

8 years agoFix instances of broken indentation found by gcc 6
Anton Khirnov [Fri, 29 Jul 2016 14:18:25 +0000 (16:18 +0200)]
Fix instances of broken indentation found by gcc 6

8 years agox11grab: Rename internal component to "xcbgrab"
Diego Biurrun [Wed, 27 Jul 2016 09:31:49 +0000 (11:31 +0200)]
x11grab: Rename internal component to "xcbgrab"

8 years agoRemove the legacy X11 screen grabber
Diego Biurrun [Wed, 27 Jul 2016 09:25:19 +0000 (11:25 +0200)]
Remove the legacy X11 screen grabber

The XCB screen grabber is a drop-in replacement and not under GPL.

8 years agoac3dec: Add some inline hints
Luca Barbato [Mon, 18 Jul 2016 17:50:34 +0000 (19:50 +0200)]
ac3dec: Add some inline hints

Signed-off-by: Diego Biurrun <diego@biurrun.de>
8 years agoac3dec: Simplify skipping
Luca Barbato [Mon, 18 Jul 2016 17:50:35 +0000 (19:50 +0200)]
ac3dec: Simplify skipping

skip_bits_long() can skip up to 32-bit ranges.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
8 years agoac3dec: Split coupling-specific code from decode_audio_block()
Luca Barbato [Mon, 18 Jul 2016 17:50:33 +0000 (19:50 +0200)]
ac3dec: Split coupling-specific code from decode_audio_block()

Signed-off-by: Diego Biurrun <diego@biurrun.de>
8 years agoac3dec: Split spx-specific code from decode_audio_block()
Luca Barbato [Mon, 18 Jul 2016 17:50:32 +0000 (19:50 +0200)]
ac3dec: Split spx-specific code from decode_audio_block()

Signed-off-by: Diego Biurrun <diego@biurrun.de>
8 years agomov: Validate the ID number
Luca Barbato [Tue, 26 Jul 2016 09:42:11 +0000 (11:42 +0200)]
mov: Validate the ID number

IDs in MOV start from 1.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
8 years agomimic: do not release the newly obsolete reference at the end of decoding
Anton Khirnov [Mon, 25 Jul 2016 11:52:59 +0000 (13:52 +0200)]
mimic: do not release the newly obsolete reference at the end of decoding

The reference frames are used in update_thread_context(), so modifying
them after finish_setup() is a race. The frame in question will be
released during the next decode call.

CC: libav-stable@libav.org
8 years agoconfigure: Simplify license incompatibility check
Diego Biurrun [Mon, 25 Jul 2016 13:07:58 +0000 (15:07 +0200)]
configure: Simplify license incompatibility check

8 years agoavconv: Check that muxing_queue exists before reading from it
Diego Biurrun [Mon, 25 Jul 2016 13:04:02 +0000 (15:04 +0200)]
avconv: Check that muxing_queue exists before reading from it

This avoids a segfault on nonexisting codec names.

8 years agoconfigure: Allow detecting and using LLVM lld-link as linker for windows
Martin Storsjö [Fri, 22 Jul 2016 07:19:52 +0000 (10:19 +0300)]
configure: Allow detecting and using LLVM lld-link as linker for windows

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agoconfigure: Move defines for controlling MSVCRT headers to the CRT detection section
Martin Storsjö [Wed, 20 Jul 2016 21:04:35 +0000 (00:04 +0300)]
configure: Move defines for controlling MSVCRT headers to the CRT detection section

This allows these flags to be automatically enabled for clang,
when using MSVCRT headers.

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agoconfigure: Check for strtoll and redirect to _strtoi64 in the msvcrt block
Martin Storsjö [Wed, 20 Jul 2016 20:39:20 +0000 (23:39 +0300)]
configure: Check for strtoll and redirect to _strtoi64 in the msvcrt block

This allows doing this redirection, if building with clang against
old enough MSVC headers that lack strtoll (2012 and older).

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agohpeldsp: Explain why put_no_rnd_pixels_tab is larger than necessary
Diego Biurrun [Tue, 19 Jan 2016 16:57:03 +0000 (17:57 +0100)]
hpeldsp: Explain why put_no_rnd_pixels_tab is larger than necessary

8 years agocheckasm: Cast unsigned to signed
Luca Barbato [Tue, 19 Jul 2016 03:26:33 +0000 (05:26 +0200)]
checkasm: Cast unsigned to signed

Avoid a warning for passing an unsigned value to abs(), some compilers
might optimize away abs().

8 years agovpx: Support color range
Luca Barbato [Fri, 22 Jul 2016 07:33:04 +0000 (09:33 +0200)]
vpx: Support color range

The range field has been introduced in version 1.6.0

8 years agolavfi: add a QSV deinterlacing filter
Anton Khirnov [Sat, 2 Jul 2016 10:12:36 +0000 (12:12 +0200)]
lavfi: add a QSV deinterlacing filter

8 years agoqsvenc: print warnings from encode/init
Anton Khirnov [Thu, 14 Jul 2016 10:56:35 +0000 (12:56 +0200)]
qsvenc: print warnings from encode/init

8 years agoqsvenc: do not re-execute encoding on all positive status codes
Anton Khirnov [Thu, 14 Jul 2016 10:52:20 +0000 (12:52 +0200)]
qsvenc: do not re-execute encoding on all positive status codes

It should only be done for DEVICE_BUSY/IN_EXECUTION

8 years agoqsv: print more complete error messages
Anton Khirnov [Sat, 25 Jun 2016 19:38:10 +0000 (21:38 +0200)]
qsv: print more complete error messages

Include the libmfx error code and its description

8 years agoqsvenc: take only the allocated dimensions from the frames context
Anton Khirnov [Thu, 14 Jul 2016 10:05:58 +0000 (12:05 +0200)]
qsvenc: take only the allocated dimensions from the frames context

Other parameters, like the display size, should still be taken from the
codec context.

8 years agoqsvenc: add support for p010
Anton Khirnov [Wed, 22 Jun 2016 17:57:28 +0000 (19:57 +0200)]
qsvenc: add support for p010

8 years agoqsv: handle the semi-packed formats in map_fourcc as well
Anton Khirnov [Thu, 14 Jul 2016 10:31:47 +0000 (12:31 +0200)]
qsv: handle the semi-packed formats in map_fourcc as well

This will allow using this function for encoding as well, where the
input format is already the semi-packed version.

8 years agolavc: set sw_pix_fmt for hwaccel encoding
Anton Khirnov [Thu, 14 Jul 2016 10:13:53 +0000 (12:13 +0200)]
lavc: set sw_pix_fmt for hwaccel encoding

8 years agolavc: initialize AVCodecContext.sw_pix_fmt properly
Anton Khirnov [Thu, 14 Jul 2016 10:16:17 +0000 (12:16 +0200)]
lavc: initialize AVCodecContext.sw_pix_fmt properly

Currently it's memset to 0, which is YUV420P. It should be initialized
to none.

8 years agoavconv_qsv: use the actual pixel format provided by lavc
Anton Khirnov [Wed, 13 Jul 2016 07:16:35 +0000 (09:16 +0200)]
avconv_qsv: use the actual pixel format provided by lavc

Do not hardcode NV12. This allows 10bit decoding with -hwaccel qsv.

8 years agoavconv_qsv: align the surface size to 32
Anton Khirnov [Wed, 13 Jul 2016 07:15:56 +0000 (09:15 +0200)]
avconv_qsv: align the surface size to 32

This is required e.g. by HEVC.

8 years agoavconv: stop using setpts for input framerate forced with -r
Anton Khirnov [Fri, 15 Jul 2016 04:50:47 +0000 (06:50 +0200)]
avconv: stop using setpts for input framerate forced with -r

The setpts filter does not signal to the rest of the filtergraph that
the stream is CFR. Just generate the timestamps manually instead.

8 years agocheckasm: add HEVC test for testing IDCT DC
Alexandra Hájková [Thu, 21 Jul 2016 14:32:50 +0000 (16:32 +0200)]
checkasm: add HEVC test for testing IDCT DC

Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agoriff: don't overwrite bps from WAVEFORMATEX if EXTENSIBLE doesn't contain that data.
Hendrik Leppkes [Wed, 2 May 2012 14:34:45 +0000 (16:34 +0200)]
riff: don't overwrite bps from WAVEFORMATEX if EXTENSIBLE doesn't contain that data.

According to the specification on the MSDN [1], 0 is valid for that
particular field, and it should be ignored in that case.

[1]: http://msdn.microsoft.com/en-us/library/windows/desktop/dd757714(v=vs.85).aspx

Bug-Id: 950

Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agoRevert "avprobe: Zero the allocated avio buffer memory"
Vittorio Giovara [Thu, 21 Jul 2016 19:45:25 +0000 (21:45 +0200)]
Revert "avprobe: Zero the allocated avio buffer memory"

This reverts commit 0e0538aefc75958ded49f5d075c99a81cf6b2bbb.

The valgrind warning was a false positive due to OSX implementation of
printf (invoking a strnlen), while this code is actually fine, since the
format specifier %.*s guarantes that no more than buf_size bytes from
buf will be read.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
8 years agolibavutil: Always use some GCC style attributes on clang
Martin Storsjö [Mon, 18 Jul 2016 20:25:11 +0000 (23:25 +0300)]
libavutil: Always use some GCC style attributes on clang

Clang normally disguises as GCC (defining __GNUC__), and thus get
all the normal GCC specific attributes.

Clang can also work as a drop-in replacement for MSVC, and in these
cases, it doesn't define __GNUC__, but defines _MSC_VER instead.

Even in these setups, it still supports the GCC style attributes,
thus use them, especially where there isn't any MSVC specific
version, or where the MSVC specific version doesn't work on clang
(for DECLARE_ASM_CONST).

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agoarm: Check for support for the .fpu directive
Martin Storsjö [Mon, 18 Jul 2016 20:23:50 +0000 (23:23 +0300)]
arm: Check for support for the .fpu directive

When targeting COFF (windows), clang doesn't support this
directive (while binutils supports it for all targets).

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agomov: Rework the check for invalid indexes in stsc
Vittorio Giovara [Wed, 13 Jul 2016 19:02:41 +0000 (15:02 -0400)]
mov: Rework the check for invalid indexes in stsc

There are samples with invalid stsc that may work fine as is and
do not need extradata change. So ignore any out of range index, and
error out only when explode is set.

Found-by: Matthieu Bouron <matthieu.bouron@stupeflix.com>
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
8 years agomov: Wrap stsc index and count compare in a separate function
Vittorio Giovara [Wed, 20 Jul 2016 16:48:09 +0000 (18:48 +0200)]
mov: Wrap stsc index and count compare in a separate function

8 years agomov: Fix stsc_count comparison
Matthieu Bouron [Wed, 20 Jul 2016 16:48:08 +0000 (18:48 +0200)]
mov: Fix stsc_count comparison

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
8 years agoratecontrol: Reorder functions to avoid forward declarations
Vittorio Giovara [Wed, 20 Jul 2016 14:12:34 +0000 (16:12 +0200)]
ratecontrol: Reorder functions to avoid forward declarations

8 years agoratecontrol: Move Xvid-related functions to the place they are actually used
Vittorio Giovara [Wed, 20 Jul 2016 16:02:23 +0000 (18:02 +0200)]
ratecontrol: Move Xvid-related functions to the place they are actually used

This will simplify the de-MpegEncContextualization.

8 years agoratecontrol: Move mpegenc-only function where it is used
Vittorio Giovara [Wed, 20 Jul 2016 14:12:33 +0000 (16:12 +0200)]
ratecontrol: Move mpegenc-only function where it is used

8 years agoratecontrol: Drop commented out cruft
Vittorio Giovara [Wed, 20 Jul 2016 14:12:31 +0000 (16:12 +0200)]
ratecontrol: Drop commented out cruft

8 years agox86: huffyuv: Use EXTERNAL_SSSE3_FAST convenience macro where appropriate
Diego Biurrun [Mon, 18 Jan 2016 09:52:21 +0000 (10:52 +0100)]
x86: huffyuv: Use EXTERNAL_SSSE3_FAST convenience macro where appropriate

8 years agox86: cpu: Detect Conroe CPUs and their slow shuffle unit
Fiona Glaser [Thu, 14 Jan 2016 09:54:27 +0000 (10:54 +0100)]
x86: cpu: Detect Conroe CPUs and their slow shuffle unit

8 years agox86: Add SSSE3_SLOW CPU flag and related convenience macros
Diego Biurrun [Thu, 14 Jan 2016 10:37:34 +0000 (11:37 +0100)]
x86: Add SSSE3_SLOW CPU flag and related convenience macros

8 years agox86: Use *_FAST/*_SLOW CPU feature detection macros where appropriate
Diego Biurrun [Thu, 14 Jan 2016 09:57:41 +0000 (10:57 +0100)]
x86: Use *_FAST/*_SLOW CPU feature detection macros where appropriate

8 years agox86: hpeldsp: Don't check for bitexact flag when initializing VP3-specific code
Diego Biurrun [Tue, 19 Jan 2016 16:55:59 +0000 (17:55 +0100)]
x86: hpeldsp: Don't check for bitexact flag when initializing VP3-specific code

That code is only ever initialized with that flag set.

8 years agox86: hpeldsp: Drop unused function parameters
Diego Biurrun [Mon, 11 Jan 2016 15:06:33 +0000 (16:06 +0100)]
x86: hpeldsp: Drop unused function parameters

8 years agox86: hpeldsp: Use EXTERNAL_SSE2_FAST where appropriate
Diego Biurrun [Mon, 11 Jan 2016 15:04:17 +0000 (16:04 +0100)]
x86: hpeldsp: Use EXTERNAL_SSE2_FAST where appropriate

8 years agox86: hpeldsp: Split off VP3-specific bits into a separate file
Diego Biurrun [Mon, 11 Jan 2016 14:53:41 +0000 (15:53 +0100)]
x86: hpeldsp: Split off VP3-specific bits into a separate file

8 years agoexamples: Properly free AVCodecContext
Vittorio Giovara [Wed, 20 Jul 2016 14:10:17 +0000 (16:10 +0200)]
examples: Properly free AVCodecContext

8 years agoavprobe: Zero the allocated avio buffer memory
Vittorio Giovara [Wed, 20 Jul 2016 13:44:10 +0000 (15:44 +0200)]
avprobe: Zero the allocated avio buffer memory

Fixes valgrind warning "Conditional jump or move depends on
uninitialised value(s)." from avio_flush().

8 years agolibdc1394: Fill in packet data directly
Vittorio Giovara [Wed, 13 Jul 2016 16:56:51 +0000 (12:56 -0400)]
libdc1394: Fill in packet data directly

Drop the packet embedded in the context.

8 years agoh264dec: do not call finish_setup() if we have not started a frame
Anton Khirnov [Wed, 20 Jul 2016 07:41:35 +0000 (09:41 +0200)]
h264dec: do not call finish_setup() if we have not started a frame

Found-By: Jan Ruge <jan.s.ruge@gmail.com>
Bug-Id: 952

8 years agoh264dec: handle zero-sized NAL units in get_last_needed_nal()
Anton Khirnov [Wed, 20 Jul 2016 06:31:38 +0000 (08:31 +0200)]
h264dec: handle zero-sized NAL units in get_last_needed_nal()

The current code will ignore the init_get_bits() failure and do an
invalid read from the uninitialized GetBitContext.

Found-By: Jan Ruge <jan.s.ruge@gmail.com>
Bug-Id: 952

8 years agoh264dec: make sure not to call finish_setup() more than once per frame
Anton Khirnov [Wed, 20 Jul 2016 07:59:45 +0000 (09:59 +0200)]
h264dec: make sure not to call finish_setup() more than once per frame

It does not break anything currently, but should not be done anyway.

8 years agoavconv_dxva2: add a profile check for hevc
Hendrik Leppkes [Sat, 30 Jan 2016 16:11:13 +0000 (17:11 +0100)]
avconv_dxva2: add a profile check for hevc

Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agohevc: set profile based on the profile compatibility flags if needed
Hendrik Leppkes [Sat, 30 Jan 2016 16:44:34 +0000 (17:44 +0100)]
hevc: set profile based on the profile compatibility flags if needed

This fixes retrieving a valid profile for many of the FATE conformance samples,
allowing them to be properly decoded by the HWAccel after adding a profile check.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agohevc: Add AVX2 DC IDCT
James Almer [Wed, 29 Jun 2016 09:56:42 +0000 (11:56 +0200)]
hevc: Add AVX2 DC IDCT

Originally written by Pierre Edouard Lepere <pierre-edouard.lepere@insa-rennes.fr>.
Integrated to Libav by Josh de Kock <josh@itanimul.li>.

Signed-off-by: Alexandra Hájková <alexandra@khirnov.net>
8 years agohevc: Add coefficient limiting to speed up IDCT
Mickaël Raulet [Tue, 5 Jul 2016 16:52:38 +0000 (18:52 +0200)]
hevc: Add coefficient limiting to speed up IDCT

Integrated to libav by Josh de Kock <josh@itanimul.li>.

Signed-off-by: Alexandra Hájková <alexandra@khirnov.net>
8 years agohevc: Add DC IDCT
Mickaël Raulet [Mon, 4 Jul 2016 13:37:52 +0000 (15:37 +0200)]
hevc: Add DC IDCT

Integrated to Libav by Josh de Kock <josh@itanimul.li>.

Signed-off-by: Alexandra Hájková <alexandra@khirnov.net>
8 years agohevcdsp_template: Templatize IDCT
Mickaël Raulet [Mon, 4 Jul 2016 13:31:16 +0000 (15:31 +0200)]
hevcdsp_template: Templatize IDCT

Integrated to Libav by Josh de Kock <josh@itanimul.li>.

Signed-off-by: Alexandra Hájková <alexandra@khirnov.net>
8 years agohevc: Separate adding residual to prediction from IDCT
Alexandra Hájková [Sun, 3 Jul 2016 15:38:56 +0000 (17:38 +0200)]
hevc: Separate adding residual to prediction from IDCT

Based on patch 250430bf28118cf843df887e8c8b345f1c60c82d
by Mickaël Raulet <mraulet@insa-rennes.fr>, integrated
to Libav by Josh de Kock <josh@itanimul.li>.

Signed-off-by: Alexandra Hájková <alexandra@khirnov.net>
8 years agox86util: Extend SPLATW for avx2
James Almer [Tue, 28 Jun 2016 11:22:40 +0000 (13:22 +0200)]
x86util: Extend SPLATW for avx2

Integration to Libav by Josh de Kock <josh@itanimul.li>.

Signed-off-by: Alexandra Hájková <alexandra@khirnov.net>
8 years agocheckasm: arm: Ignore changes to bits 0-4 and 7 of FPSCR
Martin Storsjö [Sun, 17 Jul 2016 10:31:06 +0000 (13:31 +0300)]
checkasm: arm: Ignore changes to bits 0-4 and 7 of FPSCR

These bits are set by exceptions in NEON instructions.

Also print the differing bits when FPSCR is clobbered,
and use bic instead of lsl, for clearing the topmost bits.

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agocheackasm/arm: remove NEON instructions from checkasm_checked_call_vfp
Janne Grunau [Sun, 17 Jul 2016 08:43:10 +0000 (10:43 +0200)]
cheackasm/arm: remove NEON instructions from checkasm_checked_call_vfp

Fixes AS error on non NEON builds introduced in 71a04721145. Also
set the fpu directly to vfp in checkasm.S to cause build errors on NEON
builds.

8 years agocheckasm: arm: Don't start new const blocks for each string
Martin Storsjö [Sat, 16 Jul 2016 19:31:02 +0000 (22:31 +0300)]
checkasm: arm: Don't start new const blocks for each string

Each const block needs to be terminated by one endconst
invocation so either call endconst after each, or just
declare plain labels to the later strings.

This fixes errors such as this, on some binutils versions:

checkasm.S:38: Error: Macro `endconst' was already defined

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agoapichanges: Fill in missing hashes and dates
Diego Biurrun [Mon, 4 Jul 2016 18:50:43 +0000 (20:50 +0200)]
apichanges: Fill in missing hashes and dates

8 years agoswscale: Add proper ff_ prefix to init functions
Diego Biurrun [Wed, 13 Jul 2016 18:14:38 +0000 (20:14 +0200)]
swscale: Add proper ff_ prefix to init functions

They are internal symbols that should not be exported.

based on a patch by Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>

Signed-off-by: Diego Biurrun <diego@biurrun.de>
8 years agoswscale: Rename sws_context_class to ff_sws_context_class
Andreas Cadhalpun [Tue, 27 Oct 2015 21:56:53 +0000 (22:56 +0100)]
swscale: Rename sws_context_class to ff_sws_context_class

It is an internal swscale symbol and thus should not be exported.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Diego Biurrun <diego@biurrun.de>
8 years agocheckasm: arm: report the first clobbered register in checkasm_checked_call
Janne Grunau [Thu, 14 Jul 2016 21:16:14 +0000 (23:16 +0200)]
checkasm: arm: report the first clobbered register in checkasm_checked_call

8 years agoavconv_dxva2: support HEVC Main10 decoding
Hendrik Leppkes [Tue, 28 Jun 2016 17:20:40 +0000 (19:20 +0200)]
avconv_dxva2: support HEVC Main10 decoding

Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agohevc: offer DXVA2 for 10bit 420
Anton Khirnov [Wed, 29 Jun 2016 07:33:57 +0000 (09:33 +0200)]
hevc: offer DXVA2 for 10bit 420

8 years agoFATE: add a test for H.264 with two fields per packet
Anton Khirnov [Wed, 15 Jun 2016 09:11:32 +0000 (11:11 +0200)]
FATE: add a test for H.264 with two fields per packet

8 years agoh264: fix decoding multiple fields per packet with slice threads
Anton Khirnov [Sun, 12 Jun 2016 12:22:50 +0000 (14:22 +0200)]
h264: fix decoding multiple fields per packet with slice threads

Since we only know whether a NAL unit corresponds to a new field after
parsing the slice header, this requires reorganizing the calls to slice
parsing, per-slice/field/frame init and actual decoding.

In the previous code, the function for slice header decoding also
immediately started a new field/frame as necessary, so any slices
already queued for decoding would no longer be decodable.

After this patch, we first parse the slice header, and if we determine
that a new field needs to be started we decode all the queued slices.

8 years agoh264: eliminate decode_postinit()
Anton Khirnov [Thu, 9 Jun 2016 14:32:12 +0000 (16:32 +0200)]
h264: eliminate decode_postinit()

This function's purpose is not very well defined. Currently it does two
(only marginally related) things: selecting the next output frame and
calling ff_thread_finish_setup() for frame threading. The first of those
more properly belongs under field_start(), while the second can be
called directly from decode_nal_units().

8 years agoFATE: add a test of H.264 SEI recovery in an intra refresh stream
Anton Khirnov [Wed, 15 Jun 2016 08:39:08 +0000 (10:39 +0200)]
FATE: add a test of H.264 SEI recovery in an intra refresh stream

8 years agomp3enc: write trailing padding
Anton Khirnov [Fri, 1 Jul 2016 08:49:33 +0000 (10:49 +0200)]
mp3enc: write trailing padding

8 years agomp3dec: read the initial/trailing padding from the LAME tag
Anton Khirnov [Fri, 1 Jul 2016 08:44:41 +0000 (10:44 +0200)]
mp3dec: read the initial/trailing padding from the LAME tag

8 years agolibopenh264enc: Simplify init by setting FF_CODEC_CAP_INIT_CLEANUP
Martin Storsjö [Thu, 14 Jul 2016 19:24:55 +0000 (22:24 +0300)]
libopenh264enc: Simplify init by setting FF_CODEC_CAP_INIT_CLEANUP

Also set FF_CODEC_CAP_INIT_THREADSAFE while adding internal capabilities.

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agolibopenh264enc: Return a more sensible error code in some init failure paths
Martin Storsjö [Thu, 14 Jul 2016 19:21:50 +0000 (22:21 +0300)]
libopenh264enc: Return a more sensible error code in some init failure paths

Previously they returned the default AVERROR_UNKNOWN.

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agolibopenh264dec: Simplify the init thanks to FF_CODEC_CAP_INIT_CLEANUP being set
Martin Storsjö [Thu, 14 Jul 2016 19:20:25 +0000 (22:20 +0300)]
libopenh264dec: Simplify the init thanks to FF_CODEC_CAP_INIT_CLEANUP being set

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agolibopenh264dec: Fix cleanup if the init failed early
Martin Storsjö [Thu, 14 Jul 2016 19:03:16 +0000 (22:03 +0300)]
libopenh264dec: Fix cleanup if the init failed early

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agomov: fix stream extradata_size allocation
Matthieu Bouron [Fri, 15 Jul 2016 08:00:34 +0000 (10:00 +0200)]
mov: fix stream extradata_size allocation

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agolavd: Drop unneeded av_init_packet()s
Vittorio Giovara [Wed, 13 Jul 2016 15:41:35 +0000 (11:41 -0400)]
lavd: Drop unneeded av_init_packet()s

The input packet is already unref'd by the calling function.

8 years agofate: Add a mixed NAL coding sample
Vittorio Giovara [Mon, 11 Jul 2016 20:36:20 +0000 (16:36 -0400)]
fate: Add a mixed NAL coding sample

See 17c99b6158f2c6720af74e81ee727ee50d2e7e96.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
8 years agofate: Restore order of h264 entries
Vittorio Giovara [Mon, 11 Jul 2016 20:36:19 +0000 (16:36 -0400)]
fate: Restore order of h264 entries

8 years agoh264: Log more information about invalid NALu size
Vittorio Giovara [Tue, 5 Jul 2016 20:22:08 +0000 (16:22 -0400)]
h264: Log more information about invalid NALu size

8 years agocheckasm/arm: preserve the stack alignment checkasm_checked_call
Janne Grunau [Tue, 12 Jul 2016 20:46:43 +0000 (22:46 +0200)]
checkasm/arm: preserve the stack alignment checkasm_checked_call

The stack used by checkasm_checked_call_vfp was a multiple of 4 when the
checked function is called. AAPCS requires a double word (8 byte)
aligned stack public interfaces. Since both calls are public interfaces
the stack is misaligned when the checked is called.

Might fix the SIGBUS error in the armv7-linux-clang-3.7 fate config.

8 years agocheckasm: vp8.mc: initialize the full src buffer after ec32574209f
Janne Grunau [Tue, 12 Jul 2016 19:31:57 +0000 (21:31 +0200)]
checkasm: vp8.mc: initialize the full src buffer after ec32574209f

Fixes "Use of uninitialised value" valgrind warnings in checkasm.

8 years agoh2645_parse: handle embedded Annex B NAL units in size prefixed NAL units
Janne Grunau [Thu, 7 Jul 2016 18:33:01 +0000 (20:33 +0200)]
h2645_parse: handle embedded Annex B NAL units in size prefixed NAL units

Fixes a regression in ca2f19b9cc3 with some mov/mp4 files. The files have
several NAL units in the supposed single NAL unit after the size field.
Annex B start code prefixes are used to separate them. The first NAL unit
is correctly parsed but the buffer does not point to the next size field.
Instead semi random data (it seems to be the rbsp_stop_one_bit and the
start code prefix) is then parsed as length and will exceed the
remaining length of the buffer.

Patch based on the code in h264's decode_nal_units() and a similar
patch by Hendrik Leppkes in FFmpeg (a9bb4cf87d1).

Bug-Id: ffmpeg/trac5529
Reported-By: Vittorio Giovara
8 years agoh264_ps: export actual height in MBs as SPS.mb_height
Anton Khirnov [Sat, 2 Jul 2016 14:48:26 +0000 (16:48 +0200)]
h264_ps: export actual height in MBs as SPS.mb_height

Currently, SPS.mb_height is actually what the spec calls
PicHeightInMapUnits, which is half the frame height when interlacing is
allowed. Calling this 'mb_height' is quite confusing, and there are at
least two associated bugs where this field is treated as the actual
frame height - in the h264 parser and in the code computing maximum
reordering buffer size for a given level.

Fix those issues (and avoid possible future ones) by exporting the real
frame height in this field.

8 years agod3d11va: don't keep the context lock while waiting for a frame
Steve Lhomme [Wed, 15 Jun 2016 07:25:19 +0000 (09:25 +0200)]
d3d11va: don't keep the context lock while waiting for a frame

also fixes a deadlock found by Денис Кулаков <kudesnik33ra@gmail.com>

Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agovp8dsp: Remove the comment saying that the height is equal to the width
Martin Storsjö [Sun, 10 Jul 2016 10:19:24 +0000 (13:19 +0300)]
vp8dsp: Remove the comment saying that the height is equal to the width

This comment isn't true, the height can be different from the width
for these functions (which is why the height is passed as a parameter
to them).

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agocheckasm/arm: align the clobber check data properly for ldrd
Janne Grunau [Sun, 10 Jul 2016 11:23:13 +0000 (13:23 +0200)]
checkasm/arm: align the clobber check data properly for ldrd

Should fix the SIGBUS in the armv7-linux-clang-3.7 fate target.

8 years agocheckasm: vp8: mc: test unequal width/height for partitions
Janne Grunau [Sat, 9 Jul 2016 22:32:12 +0000 (00:32 +0200)]
checkasm: vp8: mc: test unequal width/height for partitions

8 years agovp8/armv6: mc: avoid boolean expression in calculation
Janne Grunau [Sat, 9 Jul 2016 13:30:34 +0000 (15:30 +0200)]
vp8/armv6: mc: avoid boolean expression in calculation

GNU as evaluates true as '-1' while Apple's variant and llvm's internal
assembler evaluate it as '1'. The best way to avoid this madness is to
eliminate boolean expressions instead of trying to fix it with
preprocessor directives. Use a direct formula to calculate the
required temporary space on the stack in
ff_put_vp8_{epel,bilin}{4,8,16}_h[246]v[246]_armv6().

Fixes a checkasm segfault in vp8dsp.mc when using llvm's internal
assembler for a non-Apple target.