ffmpeg.git
5 years agodoc: Add more information in the README
Luca Barbato [Tue, 12 Aug 2014 17:34:47 +0000 (19:34 +0200)]
doc: Add more information in the README

And convert it to Markdown.

5 years agocosmetics: Write NULL pointer inequality checks more compactly
Gabriel Dume [Thu, 14 Aug 2014 20:31:25 +0000 (16:31 -0400)]
cosmetics: Write NULL pointer inequality checks more compactly

Signed-off-by: Diego Biurrun <diego@biurrun.de>
5 years agocosmetics: Write NULL pointer equality checks more compactly
Gabriel Dume [Thu, 14 Aug 2014 20:31:24 +0000 (16:31 -0400)]
cosmetics: Write NULL pointer equality checks more compactly

Signed-off-by: Diego Biurrun <diego@biurrun.de>
5 years agobuild: Add explanatory comments to (optimization) blocks in the Makefiles
Diego Biurrun [Thu, 31 Jul 2014 11:52:24 +0000 (04:52 -0700)]
build: Add explanatory comments to (optimization) blocks in the Makefiles

5 years agompegvideo: cosmetics: Lowercase ugly uppercase MPV_ function name prefixes
Diego Biurrun [Sun, 10 Aug 2014 15:25:12 +0000 (08:25 -0700)]
mpegvideo: cosmetics: Lowercase ugly uppercase MPV_ function name prefixes

5 years agovfwcap: Replace deprecated av_destruct_packet() by av_free_packet()
Diego Biurrun [Thu, 14 Aug 2014 18:56:32 +0000 (20:56 +0200)]
vfwcap: Replace deprecated av_destruct_packet() by av_free_packet()

5 years agoatomic_win32: Drop unnecessary atomic.h #include
Diego Biurrun [Thu, 14 Aug 2014 18:55:15 +0000 (20:55 +0200)]
atomic_win32: Drop unnecessary atomic.h #include

The file does not require atomic.h. Also kills function redefinition warnings.

5 years agow32pthreads: Mark functions in compatibility wrapper as av_unused
Diego Biurrun [Thu, 14 Aug 2014 12:40:19 +0000 (14:40 +0200)]
w32pthreads: Mark functions in compatibility wrapper as av_unused

This avoids annoying warnings about unused functions. The compatibility
wrapper is designed to provide a complete (stub) API, so some functions
being unused by some files is natural and no reason for a warning.

5 years agohttp: Reduce scope of a variable in parse_content_encoding()
Diego Biurrun [Wed, 13 Aug 2014 19:33:27 +0000 (21:33 +0200)]
http: Reduce scope of a variable in parse_content_encoding()

Also fixes an unused variable warning with zlib disabled.

5 years agoh261dec: Fix order of initialization
John Stebbins [Fri, 8 Aug 2014 15:55:48 +0000 (08:55 -0700)]
h261dec: Fix order of initialization

ff_MPV_common_init requires the frame dimensions which get parsed in
h261_decode_picture_header.

5 years agoh263dec: Fix order of initialization
John Stebbins [Fri, 8 Aug 2014 15:21:02 +0000 (08:21 -0700)]
h263dec: Fix order of initialization

ff_MPV_common_init requires the frame dimensions which get parsed in
*_decode_picture_header.

5 years agoidct: remove call to ff_idctdsp_init from ff_MPV_common_init
John Stebbins [Fri, 8 Aug 2014 15:11:20 +0000 (08:11 -0700)]
idct: remove call to ff_idctdsp_init from ff_MPV_common_init

One step in untangling the mpegvideo code and fixing some problems in
the order that initialization is being done in h263dec and h261dec.

5 years agompeg4video: Fix doxygen comment syntax to document correct struct member
Nidhi Makhijani [Tue, 12 Aug 2014 12:28:17 +0000 (17:58 +0530)]
mpeg4video: Fix doxygen comment syntax to document correct struct member

Also fix some comment typos.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
5 years agoa64: Return correct error code on invalid data stream
Nidhi Makhijani [Wed, 13 Aug 2014 12:24:55 +0000 (17:54 +0530)]
a64: Return correct error code on invalid data stream

Signed-off-by: Diego Biurrun <diego@biurrun.de>
5 years agoframe: Remove some FF_API_AVFRAME_COLORSPACE leftovers
Diego Biurrun [Wed, 13 Aug 2014 20:35:47 +0000 (22:35 +0200)]
frame: Remove some FF_API_AVFRAME_COLORSPACE leftovers

5 years agovaapi: set the scaling list correctly.
Edgar Hucek [Sun, 11 Sep 2011 10:53:17 +0000 (12:53 +0200)]
vaapi: set the scaling list correctly.

Fixes VAAPI decoding artefacts.

CC:libav-stable@libav.org

Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agompegts: Do not try to write a PMT larger than SECTION_SIZE
Luca Barbato [Tue, 12 Aug 2014 18:21:12 +0000 (20:21 +0200)]
mpegts: Do not try to write a PMT larger than SECTION_SIZE

Prevent out of array writes.

Similar to what Michael Niedermayer did to address the same issue.

Bug-Id: CVE-2014-2263
CC: libav-stable@libav.org
Signed-off-by: Diego Biurrun <diego@biurrun.de>
5 years agocpu-test: Add unistd.h #include for getopt()
Diego Biurrun [Wed, 13 Aug 2014 15:17:54 +0000 (17:17 +0200)]
cpu-test: Add unistd.h #include for getopt()

5 years agolavf: eliminate ff_get_audio_frame_size()
Anton Khirnov [Mon, 28 Jul 2014 13:27:57 +0000 (13:27 +0000)]
lavf: eliminate ff_get_audio_frame_size()

It is basically a wrapper around av_get_audio_frame_duration(), with a
fallback to AVCodecContext.frame_size. However, that field is set only
when the stream codec context is actually used for encoding or decoding,
which is discouraged.

For muxing, it is generally the responsibility of the caller to set the
packet duration.
For demuxing, if the duration is not stored at the container level, it
should be set by the parser.

Therefore, removing the frame_size fallback should not break any
important case.

5 years agocmdutils: allow matching by metadata in stream specifiers
Anton Khirnov [Tue, 12 Aug 2014 16:51:28 +0000 (16:51 +0000)]
cmdutils: allow matching by metadata in stream specifiers

5 years agomem: add av_strndup() for duplicating substrings
Anton Khirnov [Tue, 12 Aug 2014 16:24:19 +0000 (16:24 +0000)]
mem: add av_strndup() for duplicating substrings

5 years agoavconv: rename output_packet() to process_input_packet()
Anton Khirnov [Mon, 25 Nov 2013 08:57:54 +0000 (09:57 +0100)]
avconv: rename output_packet() to process_input_packet()

It more accurately describes what this function does

5 years agostereo3d: initialize AVStereo3D to zero
Felix Abecassis [Tue, 12 Aug 2014 12:56:35 +0000 (14:56 +0200)]
stereo3d: initialize AVStereo3D to zero

Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agohttp: Fix authentication, broken since 6a463e7fb
Martin Storsjö [Wed, 13 Aug 2014 11:32:52 +0000 (14:32 +0300)]
http: Fix authentication, broken since 6a463e7fb

The cur_*auth_type variables were set before the http_connect call
prior to 6a463e7fb - their sole purpose is to record the
authentication type used to do the latest request, since parsing
the http response sets the new type in the auth state.

CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agoogg: update event_flags with STREAM_/METADATA_UPDATED whenever metadata changes.
Andrew Stone [Tue, 12 Aug 2014 21:03:55 +0000 (17:03 -0400)]
ogg: update event_flags with STREAM_/METADATA_UPDATED whenever metadata changes.

Originally, AVFormatContext and a metadata dict were provided to ff_vorbis_comment(),
but this presented issues if an AVStream was being updated or the metadata on
AVFormatContext wasn't actually being updated. To remedy this, ff_vorbis_stream_comment()
explicitly updates a stream's metadata and sets any necessary flags.

ff_vorbis_comment() does not modify any flags, and any calls to it that update
AVFormatContext's metadata (just a single call) must also update
AVFormatContext.event_flags after detecting any metadata changes to the provided
dictionary, as signaled by a positive return value.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agomov: update AVFormatContext.event_flags with METADATA_UPDATED whenever metadata changes.
Andrew Stone [Tue, 12 Aug 2014 21:03:54 +0000 (17:03 -0400)]
mov: update AVFormatContext.event_flags with METADATA_UPDATED whenever metadata changes.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agonutdec: update AVFormatContext.event_flags with STREAM_/METADATA_UPDATED whenever...
Andrew Stone [Tue, 12 Aug 2014 21:03:53 +0000 (17:03 -0400)]
nutdec: update AVFormatContext.event_flags with STREAM_/METADATA_UPDATED whenever metadata changes.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agoflvdec: update AVFormatContext.event_flags with METADATA_UPDATED whenever metadata...
Andrew Stone [Tue, 12 Aug 2014 21:03:52 +0000 (17:03 -0400)]
flvdec: update AVFormatContext.event_flags with METADATA_UPDATED whenever metadata changes.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agoExpose metadata found in onCuePoint events in .flv files.
Andrew Stone [Mon, 11 Aug 2014 17:35:09 +0000 (13:35 -0400)]
Expose metadata found in onCuePoint events in .flv files.

Currently, only onMetaData is used, but some providers (wrongly)
put metadata into onCuePoint events, and it's still nice to be
able to use that data.

onCuePoint events also present metadata slightly differently than
onMetaData events: all metadata is found inside an object called
"parameters". In order to extract this metadata, it's easiest to
recurse through the object tree and pull out anything found in
child objects and put it in the top-level metadata.

Reference: http://help.adobe.com/en_US/FlashPlatform/reference/actionscript/2/help.html?content=00001404.html

Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agoSet protocol-level metadata in AVFormatContext any time a packet is read.
Andrew Stone [Thu, 31 Jul 2014 23:56:37 +0000 (19:56 -0400)]
Set protocol-level metadata in AVFormatContext any time a packet is read.

If any option named "metadata" is set inside the context, it is pulled up to
the context and then the option is cleared.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agohttp: enable icy metadata by default.
Andrew Stone [Thu, 31 Jul 2014 23:56:36 +0000 (19:56 -0400)]
http: enable icy metadata by default.

It won't hurt servers that don't care about the header,
and those that do will include it by default.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agohttp: export icecast metadata as an option with name "metadata".
Andrew Stone [Thu, 31 Jul 2014 23:56:35 +0000 (19:56 -0400)]
http: export icecast metadata as an option with name "metadata".

Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agoAVOption: add support for dictionary types.
Andrew Stone [Thu, 31 Jul 2014 23:56:34 +0000 (19:56 -0400)]
AVOption: add support for dictionary types.

In order to support metadata being set as an option, it's necessary to be able
to set dictionaries as values.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agolavf: add AVFormatContext/AVStream fields for signaling to the user when events happen.
Andrew Stone [Fri, 8 Aug 2014 17:09:23 +0000 (13:09 -0400)]
lavf: add AVFormatContext/AVStream fields for signaling to the user when events happen.

The only flags, for now, indicate if metadata was updated and are set after each call to
av_read_frame(). This comes with the caveat that, on stream start, it might not be set properly
as packets might be buffered in AVFormatContext.packet_buffer before being given to the user
in av_read_frame().

Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agoconfigure: Check for nanosleep in headers as well, not only in libs
Martin Storsjö [Mon, 11 Aug 2014 12:02:28 +0000 (15:02 +0300)]
configure: Check for nanosleep in headers as well, not only in libs

On mingw64 with c++11 support, the link libraries do contain a
nanosleep function, while it isn't exposed via the headers. Using
check_func_headers instead of a plain check_func fixes this
misdetection.

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agow32threads: Use newer thread synchronization functions when targeting Vista
Martin Storsjö [Wed, 6 Aug 2014 06:52:38 +0000 (09:52 +0300)]
w32threads: Use newer thread synchronization functions when targeting Vista

When explicitly targeting Vista or newer (which only happens if the
caller explicitly sets _WIN32_WINNT to a high enough value via the
extra cflags option - otherwise configure script sets
-D_WIN32_WINNT=0x0502), we already unconditionally link to the
ConditionVariable functions, since 4622f11f9.

Similarly use the newer -Ex versions of CreateEvent, CreateSemaphore,
InitializeCriticalSection and WaitForSingleObject, that all appeared
in Vista. When building Windows Store applications, the older versions
of these functions aren't available, only the -Ex functions. When
doing such a build, the user can set -D_WIN32_WINNT=0x0600 to
forcibly use the newer functions instead.

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agohttp: Stop reading after receiving the whole file for non-chunked transfers
Martin Storsjö [Mon, 11 Aug 2014 07:18:28 +0000 (10:18 +0300)]
http: Stop reading after receiving the whole file for non-chunked transfers

Previously this logic was only used if the server didn't
respond with Connection: close, but use it even for that case,
if the server response is non-chunked.

Originally the http code has relied on Connection: close to close
the socket when the file/stream is received - the http protocol
code just kept reading from the socket until the socket was closed.
In f240ed18 we added a check for the file size, because some
http servers didn't respond with Connection: close (and wouldn't
close the socket) even though we requested it, which meant that the
http protocol blocked for a long time at the end of files, waiting
for a socket level timeout.

When reading over tls, trying to read at the end of the connection,
when the peer has closed the connection, can produce spurious (but
harmless) warnings. Therefore always voluntarily stop reading when
the specified file size has been received, if not using a chunked
transfer encoding. (For chunked transfers, we already return 0
as soon as we get the chunk header indicating end of stream.)

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agoffv1dec: check that global parameters do not change in version 0/1
Michael Niedermayer [Fri, 30 Aug 2013 02:51:09 +0000 (04:51 +0200)]
ffv1dec: check that global parameters do not change in version 0/1

Such changes are neither allowed nor supported

Found-by: ami_stuff
Bug-Id: CVE-2013-7020
CC: libav-stable@libav.org
Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agohevc_mvs: avoid deriving tmvp in amvp
Christophe Gisquet [Fri, 8 Aug 2014 18:21:04 +0000 (18:21 +0000)]
hevc_mvs: avoid deriving tmvp in amvp

Reduces the number of calls to tmvp derivation from 933685 to 586271 on
a sequence.

Reviewed-by: Mickaël Raulet <mraulet@insa-rennes.fr>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agohevc: wait proper position for tmvp
Christophe Gisquet [Sun, 20 Jul 2014 07:34:58 +0000 (09:34 +0200)]
hevc: wait proper position for tmvp

The position is either rounded or not checked, so delay the wait to
check the proper value.

Reviewed-by: Mickaël Raulet <mraulet@insa-rennes.fr>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agohevc: use intreadwrite
Christophe Gisquet [Fri, 8 Aug 2014 18:21:02 +0000 (18:21 +0000)]
hevc: use intreadwrite

When dealing with MVs, both components may be processed at a time.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agohevc: derive partial merge list
Christophe Gisquet [Fri, 8 Aug 2014 18:21:01 +0000 (18:21 +0000)]
hevc: derive partial merge list

The merge list only needs to be derived up to the merge index.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agohevc: derive partially amvp list
Christophe Gisquet [Fri, 8 Aug 2014 18:21:00 +0000 (18:21 +0000)]
hevc: derive partially amvp list

When the candidate has been found, no need to derive others.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agohevc: simplify rounding
Christophe Gisquet [Thu, 10 Jul 2014 06:47:55 +0000 (06:47 +0000)]
hevc: simplify rounding

Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agohevc: reorder loops
Christophe Gisquet [Fri, 8 Aug 2014 18:20:58 +0000 (18:20 +0000)]
hevc: reorder loops

iterate over memory in a more continuous order

Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agoconfigure: Don't pass MSVC compiler options -M[TD] to armasm
Martin Storsjö [Sun, 10 Aug 2014 11:40:09 +0000 (14:40 +0300)]
configure: Don't pass MSVC compiler options -M[TD] to armasm

The -MD option (for enabling a dynamically linked crt) gets interpreted
as a cpp option for generating dependency information (into a file named
'-.d', when preprocessing to a pipe). We shouldn't be passing
any and all C compiler flags to armasm (which is a plain assembler,
only with cpp bolted on via gas-preprocessor), but these are the
main conflicting ones.

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agoavcodec: Postpone FF_IDCT_XVIDMMX removal until the next version bump
Diego Biurrun [Sun, 10 Aug 2014 13:44:03 +0000 (06:44 -0700)]
avcodec: Postpone FF_IDCT_XVIDMMX removal until the next version bump

5 years agolavc: drop the av_fast_{re,m}alloc compatibility wrappers
Anton Khirnov [Sun, 10 Aug 2014 10:13:30 +0000 (10:13 +0000)]
lavc: drop the av_fast_{re,m}alloc compatibility wrappers

They were only needed until the bump.

5 years agompegts: Return proper error code on invalid input data
Nidhi Makhijani [Sat, 9 Aug 2014 18:19:12 +0000 (23:49 +0530)]
mpegts: Return proper error code on invalid input data

Signed-off-by: Diego Biurrun <diego@biurrun.de>
5 years agoPrepare for 11_alpha2 Release
Reinhard Tartler [Sun, 10 Aug 2014 14:07:55 +0000 (10:07 -0400)]
Prepare for 11_alpha2 Release

5 years agoconfigure: Suggest upgrading gas-preprocessor instead of just installing
Martin Storsjö [Sun, 10 Aug 2014 13:05:41 +0000 (16:05 +0300)]
configure: Suggest upgrading gas-preprocessor instead of just installing

Older versions don't support all the features we test for now.

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agoconfigure: Enable gas-preprocessor on all OSes but only if available
Diego Biurrun [Sat, 9 Aug 2014 15:06:12 +0000 (08:06 -0700)]
configure: Enable gas-preprocessor on all OSes but only if available

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agoconfigure: Add probe identification of MS armasm
Martin Storsjö [Sat, 9 Aug 2014 19:25:44 +0000 (22:25 +0300)]
configure: Add probe identification of MS armasm

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agotiff: Improve grayscale support
Diego Elio Pettenò [Sat, 9 Aug 2014 13:19:45 +0000 (14:19 +0100)]
tiff: Improve grayscale support

Only use PAL8 if palette is present, else use GRAY8 for pixfmt.

Instead of simulating a grayscale palette, use real grayscale pixels, if no
palette is actually defined.

Signed-off-by: Diego Elio Pettenò <flameeyes@flameeyes.eu>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
5 years agoavresample: Introduce AVFrame-based API
Luca Barbato [Sun, 25 May 2014 15:49:15 +0000 (17:49 +0200)]
avresample: Introduce AVFrame-based API

5 years agompeg: Suppress a compiler warning on callback type
Luca Barbato [Wed, 6 Aug 2014 01:31:58 +0000 (03:31 +0200)]
mpeg: Suppress a compiler warning on callback type

5 years agolavc: remove obsolete and disabled avpriv functions
Anton Khirnov [Wed, 6 Aug 2014 20:02:11 +0000 (20:02 +0000)]
lavc: remove obsolete and disabled avpriv functions

5 years agoRemove obsolete FF_API_REFERENCE_DTS cruft.
Anton Khirnov [Wed, 6 Aug 2014 19:58:57 +0000 (19:58 +0000)]
Remove obsolete FF_API_REFERENCE_DTS cruft.

5 years agoRemove obsolete FF_API_PROBE_MIME cruft.
Anton Khirnov [Wed, 6 Aug 2014 19:58:57 +0000 (19:58 +0000)]
Remove obsolete FF_API_PROBE_MIME cruft.

5 years agoRemove obsolete FF_API_AVFRAME_COLORSPACE cruft.
Anton Khirnov [Wed, 6 Aug 2014 19:58:57 +0000 (19:58 +0000)]
Remove obsolete FF_API_AVFRAME_COLORSPACE cruft.

5 years agoBump major versions of all libraries.
Anton Khirnov [Wed, 6 Aug 2014 19:57:14 +0000 (19:57 +0000)]
Bump major versions of all libraries.

5 years agoPostpone API-incompatible changes until the next bump.
Anton Khirnov [Wed, 6 Aug 2014 19:47:54 +0000 (19:47 +0000)]
Postpone API-incompatible changes until the next bump.

5 years agohevc_filter: avoid excessive calls to ff_hevc_get_ref_list()
Anton Khirnov [Sun, 27 Jul 2014 19:40:20 +0000 (19:40 +0000)]
hevc_filter: avoid excessive calls to ff_hevc_get_ref_list()

1) each of the loops run within a single CTB, so the relevant reference
list is constant
2) when that CTB is, or lies on the same slice as, the current one, we
can use a simple access instead of a relatively expensive call to
ff_hevc_get_ref_list()

5 years agohevc_refs: drop the handling of negative coordinates in ff_hevc_get_ref_list()
Anton Khirnov [Sun, 27 Jul 2014 18:52:12 +0000 (18:52 +0000)]
hevc_refs: drop the handling of negative coordinates in ff_hevc_get_ref_list()

It makes no sense and cannot happen in any place from which this
function is called.

5 years agohevc_filter: move some conditions out of loops
Anton Khirnov [Sun, 27 Jul 2014 18:12:24 +0000 (18:12 +0000)]
hevc_filter: move some conditions out of loops

5 years agohevc: deobfuscate slice/tile boundary handling for DBF
Anton Khirnov [Sun, 27 Jul 2014 17:49:09 +0000 (17:49 +0000)]
hevc: deobfuscate slice/tile boundary handling for DBF

Use named constants instead of magic numbers, avoid using variables with
inverse meaning from what their name implies.

5 years agohevc_filter: drop more redundant checks
Anton Khirnov [Sun, 27 Jul 2014 17:10:04 +0000 (17:10 +0000)]
hevc_filter: drop more redundant checks

The if() around those loops ensures this condition is always false.

5 years agohevc_filter: drop redundant checks
Anton Khirnov [Sun, 27 Jul 2014 17:06:19 +0000 (17:06 +0000)]
hevc_filter: drop redundant checks

ff_hevc_deblocking_boundary_strengths() is never called if the
deblocking filter is disabled for the slice.

5 years agohevc: calculate the dbf strength in hls_pcm_sample() only if dbf is enabled
Anton Khirnov [Sun, 27 Jul 2014 17:01:53 +0000 (17:01 +0000)]
hevc: calculate the dbf strength in hls_pcm_sample() only if dbf is enabled

5 years agoavcodec: Rename xvidmmx IDCT to xvid
Diego Biurrun [Wed, 6 Aug 2014 13:19:15 +0000 (06:19 -0700)]
avcodec: Rename xvidmmx IDCT to xvid

The Xvid IDCT is not MMX-specific.

5 years agoxvididct: Ensure that the scantable permutation is always set correctly
Diego Biurrun [Fri, 8 Aug 2014 10:10:05 +0000 (03:10 -0700)]
xvididct: Ensure that the scantable permutation is always set correctly

This fixes cases where the scantable permuation would get overwritten by
the general idctdsp initialization.

5 years agoidct: cosmetics: Drop one unnecessary if-block level
Diego Biurrun [Thu, 7 Aug 2014 22:04:39 +0000 (15:04 -0700)]
idct: cosmetics: Drop one unnecessary if-block level

5 years agoconfigure: Only run gas checks on ARM and PowerPC
Diego Biurrun [Wed, 6 Aug 2014 12:55:33 +0000 (05:55 -0700)]
configure: Only run gas checks on ARM and PowerPC

Standalone GNU assembly is not used on x86.

5 years agoconfigure: Die if gas is unavailable under aarch64 as well as ARM
Diego Biurrun [Wed, 6 Aug 2014 12:38:43 +0000 (05:38 -0700)]
configure: Die if gas is unavailable under aarch64 as well as ARM

5 years agompeg: K&R formatting cosmetics
Luca Barbato [Wed, 6 Aug 2014 03:01:15 +0000 (05:01 +0200)]
mpeg: K&R formatting cosmetics

Signed-off-by: Diego Biurrun <diego@biurrun.de>
5 years agompegts: Use av_free() to free memory allocated by av_strdup()
Diego Biurrun [Fri, 8 Aug 2014 09:46:21 +0000 (02:46 -0700)]
mpegts: Use av_free() to free memory allocated by av_strdup()

5 years agompegts: Fix memory leaks and related crashes in mpegs_write_header()
Diego Biurrun [Wed, 6 Aug 2014 11:08:50 +0000 (04:08 -0700)]
mpegts: Fix memory leaks and related crashes in mpegs_write_header()

5 years agompegts: Avoid unnecessary variable shadowing
Diego Biurrun [Wed, 6 Aug 2014 10:28:06 +0000 (03:28 -0700)]
mpegts: Avoid unnecessary variable shadowing

5 years agompegts: Drop some unnecessary parentheses
Diego Biurrun [Wed, 6 Aug 2014 11:39:24 +0000 (04:39 -0700)]
mpegts: Drop some unnecessary parentheses

5 years agompegts: K&R formatting cosmetics
Diego Biurrun [Wed, 6 Aug 2014 01:02:18 +0000 (18:02 -0700)]
mpegts: K&R formatting cosmetics

5 years agoswscale: Undeprecate sws_getContext()
Diego Biurrun [Mon, 4 Aug 2014 17:34:30 +0000 (10:34 -0700)]
swscale: Undeprecate sws_getContext()

sws_getCachedContext is not a full replacement for the function.

5 years agoavcodec: Undeprecate reordered_opaque
Diego Biurrun [Mon, 4 Aug 2014 17:28:10 +0000 (10:28 -0700)]
avcodec: Undeprecate reordered_opaque

It allows attaching other external, opaque data to the frame and passing it
through the reordering process, for cases when the caller wants other data
than just the plain packet pts.  There is no way to cleanly achieve this
without the field.

5 years agoh264: fix interpretation of interleved stereo modes
Felix Abecassis [Thu, 7 Aug 2014 09:42:36 +0000 (11:42 +0200)]
h264: fix interpretation of interleved stereo modes

Column and row frame packing arrangements were inverted.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
5 years agomovenc: fix QT chapter track character encoding
John Stebbins [Thu, 31 Jul 2014 18:51:40 +0000 (11:51 -0700)]
movenc: fix QT chapter track character encoding

An encoding ("encd") box is required to tell QT that the string is UTF8

5 years agomovenc: add track title to tracks
John Stebbins [Thu, 31 Jul 2014 17:00:05 +0000 (10:00 -0700)]
movenc: add track title to tracks

5 years agomovenc: remove pointless loop around BITEXACT test
John Stebbins [Wed, 6 Aug 2014 14:42:18 +0000 (07:42 -0700)]
movenc: remove pointless loop around BITEXACT test

5 years agosvq1: do not modify the input packet
Anton Khirnov [Sun, 3 Aug 2014 08:14:48 +0000 (10:14 +0200)]
svq1: do not modify the input packet

The input data must remain constant, make a copy instead. This is in
theory a performance hit, but since I failed to find any samples
using this feature, this should not matter in practice.

Also, check the size of the header, avoiding invalid reads on truncated
data.

CC:libav-stable@libav.org

5 years agocdgraphics: do not return 0 from the decode function
Anton Khirnov [Wed, 6 Aug 2014 10:56:34 +0000 (10:56 +0000)]
cdgraphics: do not return 0 from the decode function

0 means no data consumed, so it can trigger an infinite loop in the
caller.

CC:libav-stable@libav.org

5 years agocdgraphics: switch to bytestream2
Anton Khirnov [Wed, 6 Aug 2014 10:46:50 +0000 (10:46 +0000)]
cdgraphics: switch to bytestream2

Fixes possible invalid memory accesses on corrupted data.

CC:libav-stable@libav.org
Bug-ID: CVE-2013-3674

5 years agoconfigure: Include the armcc build number in the compiler identification
Martin Storsjö [Mon, 28 Jul 2014 08:51:29 +0000 (11:51 +0300)]
configure: Include the armcc build number in the compiler identification

This tries to find the most expressive part of the output of
armcc --vsn to include, giving a compiler identification of
"ARM Compiler 5.04 update 2 (build 82)" instead of just
"ARM Compiler 5.04" for armcc 5.0.

4.x versions of armcc output the following, for "armcc --vsn":
ARM C/C++ Compiler, RVCT4.0 [Build 925]
For evaluation purposes only
Software supplied by: ARM Limited

ARM C/C++ Compiler, 4.1 [Build 894]
For evaluation purposes only
Software supplied by: ARM Limited

5.0 versions output this:
Product: ARM Compiler 5.04
Component: ARM Compiler 5.04 update 2 (build 82)
Tool: armcc [5040081]
For evaluation purposes only
Software supplied by: ARM Limited

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agojpeg2000: enable 4 component pixel formats
Vittorio Giovara [Wed, 6 Aug 2014 10:07:08 +0000 (11:07 +0100)]
jpeg2000: enable 4 component pixel formats

Bug-Id: 721
CC: libav-stable@libav.org
Sample-Id: 31230.mov

5 years agohuffyuvdec: check width size for yuv422p
Michael Niedermayer [Sat, 2 Aug 2014 23:54:33 +0000 (00:54 +0100)]
huffyuvdec: check width size for yuv422p

Avoid out of array accesses.

CC: libav-stable@libav.org
Bug-Id: CVE-2013-0848
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agommvideo: check horizontal coordinate too
Michael Niedermayer [Sun, 3 Aug 2014 18:24:18 +0000 (19:24 +0100)]
mmvideo: check horizontal coordinate too

Fixes out of array accesses.

Bug-Id: CVE-2013-3672
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agowmalosslessdec: fix mclms_coeffs* array size
Michael Niedermayer [Fri, 7 Feb 2014 14:07:23 +0000 (15:07 +0100)]
wmalosslessdec: fix mclms_coeffs* array size

Fixes corruption of context

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org
Bug-Id: CVE-2014-2098
Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agoconfigure: check $as first before using $gas as GNU as
Janne Grunau [Tue, 5 Aug 2014 10:08:09 +0000 (12:08 +0200)]
configure: check $as first before using $gas as GNU as

llvm's integrated assembler supports the AArch64 asm on darwin since
August 2014. So check $as first before using gas-preprocessor.pl via
$gas. Makes the checks specific for that the architecture specific asm
needs. PPC Altivec and AArch64 needs on ':vararg' for macro arguments.
Arm needs in addition the '.altmacro' directive.

5 years agofate: generate tests/pixfmts.mak for all targets requiring it
Janne Grunau [Tue, 5 Aug 2014 07:39:00 +0000 (09:39 +0200)]
fate: generate tests/pixfmts.mak for all targets requiring it

All subtargets which should run the fate-filter-pixdesc% need to
generate and include tests/pixfmts.mak. Most noteable missing target was
fate itself.

5 years agomovenc: Add option to disable nero chapters
John Stebbins [Mon, 4 Aug 2014 20:13:44 +0000 (13:13 -0700)]
movenc: Add option to disable nero chapters

And add flag to muxer documentation.
Nero chapters break some taggers (mp3tag and iTunes).

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
5 years agompegts: Add HEVC definitions
Femi Adeyemi-Ejeye [Wed, 30 Apr 2014 15:58:09 +0000 (16:58 +0100)]
mpegts: Add HEVC definitions

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
5 years agompegts: Define the section length with a constant
Luca Barbato [Sun, 3 Aug 2014 17:27:07 +0000 (19:27 +0200)]
mpegts: Define the section length with a constant

The specification says the value is expressed in 10 bits including
the 4-byte CRC.

5 years agovc-1: Optimise parser (with special attention to ARM)
Ben Avison [Mon, 21 Jul 2014 13:53:09 +0000 (14:53 +0100)]
vc-1: Optimise parser (with special attention to ARM)

The previous implementation of the parser made four passes over each input
buffer (reduced to two if the container format already guaranteed the input
buffer corresponded to frames, such as with MKV). But these buffers are
often 200K in size, certainly enough to flush the data out of L1 cache, and
for many CPUs, all the way out to main memory. The passes were:

1) locate frame boundaries (not needed for MKV etc)
2) copy the data into a contiguous block (not needed for MKV etc)
3) locate the start codes within each frame
4) unescape the data between start codes

After this, the unescaped data was parsed to extract certain header fields,
but because the unescape operation was so large, this was usually also
effectively operating on uncached memory. Most of the unescaped data was
simply thrown away and never processed further. Only step 2 - because it
used memcpy - was using prefetch, making things even worse.

This patch reorganises these steps so that, aside from the copying, the
operations are performed in parallel, maximising cache utilisation. No more
than the worst-case number of bytes needed for header parsing is unescaped.
Most of the data is, in practice, only read in order to search for a start
code, for which optimised implementations already existed in the H264 codec
(notably the ARM version uses prefetch, so we end up doing both remaining
passes at maximum speed). For MKV files, we know when we've found the last
start code of interest in a given frame, so we are able to avoid doing even
that one remaining pass for most of the buffer.

In some use-cases (such as the Raspberry Pi) video decode is handled by the
GPU, but the entire elementary stream is still fed through the parser to
pick out certain elements of the header which are necessary to manage the
decode process. As you might expect, in these cases, the performance of the
parser is significant.

To measure parser performance, I used the same VC-1 elementary stream in
either an MPEG-2 transport stream or a MKV file, and fed it through avconv
with -c:v copy -c:a copy -f null. These are the gperftools counts for
those streams, both filtered to only include vc1_parse() and its callees,
and unfiltered (to include the whole binary). Lower numbers are better:

                Before          After
File  Filtered  Mean   StdDev   Mean   StdDev  Confidence  Change
M2TS  No        861.7  8.2      650.5  8.1     100.0%      +32.5%
MKV   No        868.9  7.4      731.7  9.0     100.0%      +18.8%
M2TS  Yes       250.0  11.2     27.2   3.4     100.0%      +817.9%
MKV   Yes       149.0  12.8     1.7    0.8     100.0%      +8526.3%

Yes, that last case shows vc1_parse() running 86 times faster! The M2TS
case does show a larger absolute improvement though, since it was worse
to begin with.

This patch has been tested with the FATE suite (albeit on x86 for speed).

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>