]>
git.sesse.net Git - ffmpeg/log
Paul B Mahol [Mon, 24 Aug 2015 20:00:59 +0000 (20:00 +0000)]
avfilter: add hstack & vstack filter
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Sat, 5 Oct 2013 20:19:23 +0000 (20:19 +0000)]
avfilter/framesync: allocate FFFrameSyncIn internally
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Wed, 26 Aug 2015 11:02:50 +0000 (11:02 +0000)]
avfilter/vf_histogram: fix bug in checking pixel format flags
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Wed, 26 Aug 2015 11:01:03 +0000 (11:01 +0000)]
avfilter/vf_vectorscope: fix bug in checking pixel format flags
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Ganesh Ajjanagadde [Wed, 26 Aug 2015 03:22:49 +0000 (23:22 -0400)]
configure: do not fork off grep subprocess while testing for whitespace
grep is not necessary for the functionality.
This avoids an unnecessary fork.
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Paul B Mahol [Wed, 26 Aug 2015 09:49:02 +0000 (09:49 +0000)]
avfilter/af_aphaser: use the name 's' for the pointer to the private context
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Tue, 25 Aug 2015 17:00:03 +0000 (17:00 +0000)]
avfilter/vf_blend: use the name 's' for the pointer to the private context
Signed-off-by: Paul B Mahol <onemda@gmail.com>
James Almer [Tue, 25 Aug 2015 02:52:43 +0000 (23:52 -0300)]
avcodec/vdpau: fix compilation of mpeg1/mpeg4/vc1 decoders when h264 is disabled
Tested-by: wm4 <nfxjfg@googlemail.com>
Tested-by: Philip Langdale <philipl@overt.org>
Signed-off-by: James Almer <jamrial@gmail.com>
Michael Niedermayer [Wed, 26 Aug 2015 01:30:45 +0000 (03:30 +0200)]
avformat/segment: Do not free the filename twice
Bug introduced in
83a508cda5115c61b456aeb227bf770d61010961
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Timothy Gu [Wed, 26 Aug 2015 00:40:06 +0000 (17:40 -0700)]
swscale: Silence an unused variable warning
Also remove a pair of extraneous ifdeffery.
Timothy Gu [Tue, 25 Aug 2015 23:48:52 +0000 (16:48 -0700)]
ffmpeg_opt: Add missing comma
Timothy Gu [Tue, 25 Aug 2015 23:03:23 +0000 (16:03 -0700)]
matroskaenc: Fix indentation
Found-by: Hendrik Leppkes <h.leppkes@gmail.com>
Stephan Holljes [Thu, 20 Aug 2015 16:01:56 +0000 (18:01 +0200)]
lavf/http: Fix parsing http request data to not read over '\0'.
Signed-off-by: Stephan Holljes <klaxa1337@googlemail.com>
wm4 [Tue, 25 Aug 2015 16:54:39 +0000 (18:54 +0200)]
configure: aac encoder requires lpc
Fixes compilation with --disable-encoders --enable-encoder=aac
Henrik Gramner [Mon, 24 Aug 2015 20:52:02 +0000 (22:52 +0200)]
checkasm: Fix floating point arguments on 64-bit Windows
Vesselin Bontchev [Tue, 25 Aug 2015 12:37:02 +0000 (12:37 +0000)]
avformat/aa: use correct format specifier in sscanf
This demuxer was broken on a large number of platforms due to usage of wrong
format specifier in sscanf. This patch fixes the problem, and also adds some
debug logging to reduce future debugging pain.
Carl Eugen Hoyos [Tue, 25 Aug 2015 11:36:24 +0000 (13:36 +0200)]
lavf/segment: Fix memleak.
Reviewed-by: Stefano Sabatini
Reviewed-by: Ganesh Ajjanagadde
Michael Niedermayer [Tue, 25 Aug 2015 10:48:12 +0000 (12:48 +0200)]
avformat/file: Check for lstat() instead of dirent.h
Fixes build on mingw
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Paul B Mahol [Mon, 24 Aug 2015 07:43:04 +0000 (07:43 +0000)]
fate: add tests for vectorscope filter
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Carl Eugen Hoyos [Tue, 25 Aug 2015 10:06:54 +0000 (12:06 +0200)]
lavf/dnxhd: Autodetect more valid files.
Mariusz Szczepańczyk [Sun, 28 Jun 2015 22:13:43 +0000 (00:13 +0200)]
lavf/file: check for dirent.h support
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Lukasz Marek [Sun, 21 Jun 2015 22:01:32 +0000 (00:01 +0200)]
lavf/file: implement directory listing callbacks
Signed-off-by: Lukasz Marek <lukasz.m.luki2 at gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Ganesh Ajjanagadde [Mon, 24 Aug 2015 19:38:18 +0000 (15:38 -0400)]
configure: do not fork off grep subprocess in probe_cc
grep is not required for the functionality in this instance.
This avoids an unnecessary fork, and also avoids a duplicated dumpversion call.
Furthermore, it also corrects behavior when no minor version number is present, see e.g
https://github.com/joyent/node/pull/25671.
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Mon, 24 Aug 2015 17:19:37 +0000 (19:19 +0200)]
avcodec/mjpegdec: Remove message asking for a non mod 16 AMV sample
Ticket4770 contains such a sample and it decodes fine
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Paul B Mahol [Mon, 24 Aug 2015 14:21:26 +0000 (14:21 +0000)]
avfilter/vf_vectorscope: add options with shorter name
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Sun, 23 Aug 2015 11:54:16 +0000 (11:54 +0000)]
avfilter/vf_vectorscope: make intensity user configurable
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Mon, 24 Aug 2015 11:04:38 +0000 (13:04 +0200)]
avformat/hevc: Check num_long_term_ref_pics_sps to avoid potentially long loops
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Arthur Grant [Mon, 24 Aug 2015 10:19:03 +0000 (12:19 +0200)]
avformat/hevc: Fix parsing errors
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Hendrik Leppkes [Mon, 24 Aug 2015 08:40:24 +0000 (10:40 +0200)]
Merge commit '
e23f84d9652474353d8bbc42787a56ec1991908f '
* commit '
e23f84d9652474353d8bbc42787a56ec1991908f ':
channel_layout: Add a 16channel default layout
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Mon, 24 Aug 2015 08:39:08 +0000 (10:39 +0200)]
Merge commit '
d5eab59a5373b22aa52d6053a8e853e95a6e131e '
* commit '
d5eab59a5373b22aa52d6053a8e853e95a6e131e ':
aac: Make sure to set err on the failure path
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Mon, 24 Aug 2015 08:37:50 +0000 (10:37 +0200)]
Merge commit '
167ea1fbf15ecefa30729f9b8d091ed431bf43bd '
* commit '
167ea1fbf15ecefa30729f9b8d091ed431bf43bd ':
xavs: Do not try to set the bitrate tolerance without a bitrate
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Mon, 24 Aug 2015 08:36:27 +0000 (10:36 +0200)]
Merge commit '
61d8fa2a1ab76f0f3ac1442faa104ace4b29decc '
* commit '
61d8fa2a1ab76f0f3ac1442faa104ace4b29decc ':
h264: Fix faulty call to avpriv_request_sample
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Mon, 24 Aug 2015 08:36:07 +0000 (10:36 +0200)]
Merge commit '
f9ab4fe1f7c1e9d410ca5ee2c9ff8d2892aad068 '
* commit '
f9ab4fe1f7c1e9d410ca5ee2c9ff8d2892aad068 ':
h264: Discard currently unsupported registered sei
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Mon, 24 Aug 2015 08:34:38 +0000 (10:34 +0200)]
Merge commit '
47b447aaff1bc30ba986ca757346a2c5c95b786a '
* commit '
47b447aaff1bc30ba986ca757346a2c5c95b786a ':
imgutils: Fix a typo in avcodec_get_pix_fmt_loss
Not merged, this code was refactored and moved to avutil.
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Mon, 24 Aug 2015 08:32:34 +0000 (10:32 +0200)]
Merge commit '
d8ebb6157d12183ed3fc987cd2ba18b404758828 '
* commit '
d8ebb6157d12183ed3fc987cd2ba18b404758828 ':
hevcdsp: fix a function name
Not merged, ffmpeg has no function of this name anymore.
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Mon, 24 Aug 2015 08:29:26 +0000 (10:29 +0200)]
Merge commit '
a1926a29fb4325afa46842883f197c74d4535c36 '
* commit '
a1926a29fb4325afa46842883f197c74d4535c36 ':
hevc: avoid invalid shifts of negative values
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Mon, 24 Aug 2015 08:27:39 +0000 (10:27 +0200)]
Merge commit '
515b69f8f8e9a24cfaee95d8c1f63f265d8582fe '
* commit '
515b69f8f8e9a24cfaee95d8c1f63f265d8582fe ':
checkasm: Explicitly declare function prototypes
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Mon, 24 Aug 2015 08:26:29 +0000 (10:26 +0200)]
Merge commit '
e13da244f41610ee073b2f72bcf62b60fa402bb5 '
* commit '
e13da244f41610ee073b2f72bcf62b60fa402bb5 ':
checkasm: x86: properly save rdx/edx in checked_call()
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Mon, 24 Aug 2015 08:25:41 +0000 (10:25 +0200)]
Merge commit '
faa3f17a76333b672ce4a40cf80f678ab68bdbae '
* commit '
faa3f17a76333b672ce4a40cf80f678ab68bdbae ':
fate: test only demuxing in asf-repldata
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Paul B Mahol [Sat, 22 Aug 2015 21:16:56 +0000 (21:16 +0000)]
fate: add tests for waveform filter
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Ludmila Glinskih [Mon, 24 Aug 2015 00:11:45 +0000 (03:11 +0300)]
fate: add api-band-test
Works only for flv, h263 and huffyuv decoders.
Makes only one pass through the file (this should be changed to two passes)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Andreas Cadhalpun [Sun, 23 Aug 2015 09:53:09 +0000 (11:53 +0200)]
rtpenc_chain: also copy AVFMT_FLAG_BITEXACT to new AVFormatContext
Otherwise it is impossible to make '-movflags +rtphint' bitexact after
FF_API_LAVF_BITEXACT has been disabled.
Reviewed-by: Ronald S. Bultje <rsbultje@gmail.com>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Andreas Cadhalpun [Sun, 23 Aug 2015 09:16:10 +0000 (11:16 +0200)]
options_table: fix compatibility with MSVC
Including libavutil/internal.h breaks compilation of doc/print_options.c
with MSVC due to linking avpriv_strtod/avpriv_snprintf.
This reverts part of commit
095347f .
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Andreas Cadhalpun [Fri, 21 Aug 2015 21:58:56 +0000 (23:58 +0200)]
avcodec: remove FF_API_LOWRES around max_lowres
Reviewed-by: wm4 <nfxjfg@googlemail.com>
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Ganesh Ajjanagadde [Sun, 23 Aug 2015 20:31:12 +0000 (16:31 -0400)]
swresample/dither: use integer arithmetic
This fixes a -Wabsolute-value reported by clang 3.5+ complaining about misuse of fabs() for integer absolute value.
An additional benefit is the removal of floating point calculations.
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Luca Barbato [Fri, 21 Aug 2015 07:02:04 +0000 (09:02 +0200)]
channel_layout: Add a 16channel default layout
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Luca Barbato [Sun, 23 Aug 2015 09:58:47 +0000 (11:58 +0200)]
aac: Make sure to set err on the failure path
Bug-Id: CID
1308153
Luca Barbato [Sun, 23 Aug 2015 15:57:21 +0000 (17:57 +0200)]
xavs: Do not try to set the bitrate tolerance without a bitrate
Avoid a division by zero.
Bug-Id: CID
1257655
Ganesh Ajjanagadde [Sun, 23 Aug 2015 03:24:38 +0000 (23:24 -0400)]
avdevice/lavfi: fix self assignment warning
FAIL(ret) expands to statements including a silly ret=ret.
This triggers a -Wself-assign on confirmed clang 3.6, and so we fix it.
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Paul B Mahol [Sun, 23 Aug 2015 10:10:34 +0000 (10:10 +0000)]
avfilter/vf_histogram: levels: support more input pixel formats
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Mon, 17 Aug 2015 14:30:16 +0000 (16:30 +0200)]
avformat: Remove use of AVFrac and AVStream->pts
Move field to internal part of AVStream and struct to internal.h
Reviewed-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Ganesh Ajjanagadde [Fri, 21 Aug 2015 17:43:43 +0000 (13:43 -0400)]
avcodec/x86/mpegaudiodsp: correct asm guards
Fixes -Wunused-function warnings when compiling with --disable-yasm on x86.
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Rostislav Pehlivanov [Sun, 23 Aug 2015 00:04:06 +0000 (01:04 +0100)]
fate: temporarily disable AAC TNS test
Fixing it will take a bit longer, so just suspend the test.
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
Rostislav Pehlivanov [Sat, 22 Aug 2015 22:49:59 +0000 (23:49 +0100)]
aacenc_tns: temporarily disable
Due to segfaults on some platforms, fix will take a bit longer.
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
Ganesh Ajjanagadde [Sat, 22 Aug 2015 02:34:16 +0000 (22:34 -0400)]
swscale/alphablend: fix pointer cast
Commit
7c72a4bbd3a0ca421c7419abad2fb65aa713dd8b was slightly wrong
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Paul B Mahol [Sun, 16 Aug 2015 11:01:53 +0000 (13:01 +0200)]
avfilter: add waveform monitor filter
Paul B Mahol [Sat, 22 Aug 2015 17:30:48 +0000 (17:30 +0000)]
avfilter/vf_vectorscope: add more pixel formats
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Andreas Cadhalpun [Sat, 8 Aug 2015 08:41:33 +0000 (10:41 +0200)]
disable deprecation warnings in deprecated code
Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Andreas Cadhalpun [Sat, 8 Aug 2015 08:41:32 +0000 (10:41 +0200)]
fate: replace deprecated request_channels with request_channel_layout
This fixes fate with FF_API_REQUEST_CHANNELS disabled.
Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Andreas Cadhalpun [Sat, 8 Aug 2015 08:41:31 +0000 (10:41 +0200)]
openal-dec: replace av_destruct_packet with av_free_packet
Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Andreas Cadhalpun [Sat, 8 Aug 2015 08:41:30 +0000 (10:41 +0200)]
add missing FF_API_DESTRUCT_PACKET guards
Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Timothy Gu [Sat, 22 Aug 2015 17:14:17 +0000 (10:14 -0700)]
avcodec: Fix `make checkheaders`
Timothy Gu [Sat, 22 Aug 2015 16:32:43 +0000 (09:32 -0700)]
doxygen: Remove lavu_internal group
There is no use in an internal group for a public API documentation.
Timothy Gu [Sat, 22 Aug 2015 16:16:20 +0000 (09:16 -0700)]
git-howto: Various copy edits
Timothy Gu [Sat, 22 Aug 2015 01:14:12 +0000 (18:14 -0700)]
ffv1: Add missing ff_ prefixes
Timothy Gu [Sat, 22 Aug 2015 00:50:19 +0000 (17:50 -0700)]
vp9dsp: Add missing ff_ prefixes
Timothy Gu [Sat, 22 Aug 2015 01:08:18 +0000 (18:08 -0700)]
aacsbr_fixed: Make fixed_{exp,log}_table static const
Timothy Gu [Sat, 22 Aug 2015 00:51:26 +0000 (17:51 -0700)]
aacdec_fixed: Make exp2tab static const
Timothy Gu [Sat, 22 Aug 2015 01:09:59 +0000 (18:09 -0700)]
fmtconvert: Remove float_interleave*
They were not public or used anywhere.
Timothy Gu [Sat, 22 Aug 2015 05:40:39 +0000 (22:40 -0700)]
version: Fix two more typos
Same as
cafba99b5146cf10d60ceed4257f6e82380a020e but applied to
lavf and lavu.
Rostislav Pehlivanov [Sat, 22 Aug 2015 07:50:41 +0000 (08:50 +0100)]
aacenc_quantization: replace copysign() with a ternary operator
This commit removes the last thing a Windows environment can
complain about the AAC encoder code. Leftover from an old revision.
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
Rostislav Pehlivanov [Sat, 22 Aug 2015 07:12:20 +0000 (08:12 +0100)]
fate: added PNS, TNS and IS tests for the AAC encoder
This commit adds tests for the PNS, TNS and IS functionality
of the encoder.
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
Rostislav Pehlivanov [Sat, 22 Aug 2015 05:47:14 +0000 (06:47 +0100)]
aacenc_is: rename struct to follow guidelines
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
Timothy Gu [Sat, 22 Aug 2015 05:16:31 +0000 (06:16 +0100)]
acenctab: Fix merge conflict
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
Timothy Gu [Sat, 22 Aug 2015 05:11:23 +0000 (06:11 +0100)]
aacenc: Add missing ff_ prefixes
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
Reviewed-by: Ganesh Ajjanagadde <gajjanag@mit.edu>
Timothy Gu [Sat, 22 Aug 2015 03:56:36 +0000 (04:56 +0100)]
aacenc: Harmonize multiple inclusion guards
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
Reviewed-by: Ganesh Ajjanagadde <gajjanag@mit.edu>
Timothy Gu [Sat, 22 Aug 2015 03:30:15 +0000 (04:30 +0100)]
aacenctab: Add missing ff_ prefixes
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
Reviewed-by: Ganesh Ajjanagadde <gajjanag@mit.edu>
Timothy Gu [Sat, 22 Aug 2015 03:07:09 +0000 (04:07 +0100)]
aacenctab: Use FF_ARRAY_ELEMS
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
Reviewed-by: Ganesh Ajjanagadde <gajjanag@mit.edu>
Ganesh Ajjanagadde [Fri, 21 Aug 2015 18:17:46 +0000 (14:17 -0400)]
avutil/x86/asm: rename REG_SP to REG_sp
REG_SP is defined by Solaris system headers.
This fixes a sea of warnings while building on Solaris:
http://fate.ffmpeg.org/report.cgi?time=
20150820233505 &slot=x86-opensolaris-gcc4.3
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Luca Barbato [Fri, 21 Aug 2015 23:42:19 +0000 (01:42 +0200)]
h264: Fix faulty call to avpriv_request_sample
Broken in
f9ab4fe1f7c1e9d410ca5ee2c9ff8d2892aad068
Rostislav Pehlivanov [Fri, 21 Aug 2015 22:36:09 +0000 (23:36 +0100)]
aacenc_tns: remove unused header
Thanks to @nevcairiel for pointing this one out.
Another thing which stopped msvc from compiling.
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
Clément Bœsch [Fri, 21 Aug 2015 22:24:18 +0000 (00:24 +0200)]
avcodec/version: fix 2 recently introduced typo
Rostislav Pehlivanov [Fri, 21 Aug 2015 20:36:06 +0000 (21:36 +0100)]
aacenc_tns: re-enable coefficient compression
This time in a platform/compiler-generic way.
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
Rostislav Pehlivanov [Fri, 21 Aug 2015 20:28:20 +0000 (21:28 +0100)]
aacenc: treat unknown profile as AAC-LC
When the encoder is ran without specifying -profile:a
the default avctx->profile value is -99 (FF_PROFILE_UKNOWN),
which used to be treated as AAC-LC.
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
Rostislav Pehlivanov [Fri, 21 Aug 2015 19:55:46 +0000 (20:55 +0100)]
aacenc_tns: temporarily disable coefficient compression
Hotfix to deal with msvc. Sane compilers lack POSIX ffs().
It only saves a single bit or so and isn't worth it that much.
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
Rostislav Pehlivanov [Fri, 21 Aug 2015 18:44:15 +0000 (19:44 +0100)]
MAINTAINERS: add myself as an AAC encoder maintainer
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
Rostislav Pehlivanov [Fri, 21 Aug 2015 18:38:05 +0000 (19:38 +0100)]
aacenc: implement the complete AAC-Main profile
This commit finalizes AAC-Main profile encoding support
by implementing all mandatory and optional tools available
in the specifications and current decoders.
The AAC-Main profile reqires that prediction support be
present (although decoders don't require it to be enabled)
for an encoder to be deemed capable of AAC-Main encoding,
as well as TNS, PNS and IS, all of which were implemented
with previous commits or earlier of this year.
Users are encouraged to test the new functionality using either
-profile:a aac_main or -aac_pred 1, the former of which will enable
the prediction option by default and the latter will change the
profile to AAC-Main. No other options shall be changed by enabling
either, it's currently up to the users to decide what's best.
The current implementation works best using M/S and/or IS,
so users are also welcome to enable both options and any
other options (TNS, PNS) for maximum quality.
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
Rostislav Pehlivanov [Fri, 21 Aug 2015 18:27:38 +0000 (19:27 +0100)]
aacenc_tns: implement temporal noise shaping
This commit implements temporal noise shaping support in the
encoder, along with an -aac_tns option to toggle it on or off
(off by default for now). TNS will increase audio quality
and reduce quantization noise by applying a multitap FIR filter
across allowed coefficients and transmit side information to the
decoder so it could create an inverse filter.
Users are encouraged to test the new functionality by enabling
-aac_tns 1 during encoding.
No major bugs are observable at this time so after a while if no
new problems appear and if the current implementation is deemed
of high enough quality and stability it will be enabled by default,
possibly at the same time the encoder has its experimental flag
removed and becomes the standard aac encoder in ffmpeg.
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
Rostislav Pehlivanov [Fri, 21 Aug 2015 18:20:22 +0000 (19:20 +0100)]
aacenc: do not reject AAC-Main profile
This commit permits for the use of the Main profile
in encoding. The functionality of that profile will
be added in the commits following. By itself, this
commit does not alter anything.
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
Rostislav Pehlivanov [Fri, 21 Aug 2015 18:13:26 +0000 (19:13 +0100)]
aaccoder: move the Intensity Stereo implementation out
This commit moves the intensity stereo implementation
out from aaccoder and into a separate file. This was
possible using the previous commits.
This commit also drastically improves the IS implementation
by making it phase invariant e.g. it will always choose the
best possible phase regardless of whether M/S coding is on
or most of the coefficients have identical phases.
This also increases the quality and reduces any distortions
introduced by enablind intensity stereo.
Users are encouraged to test it out using the -aac_is 1
parameter as it has always been.
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
Rostislav Pehlivanov [Fri, 21 Aug 2015 18:00:15 +0000 (19:00 +0100)]
aaccoder_mips: update function definitions
This commit updates the function definitions in the aaccoder_mips.c
file. This was broken around a month or so ago with the addition
of the rounding argument.
The previous commit in this series also introduced a separate array
to put the quantization error in, this also needed to be updated,
albeit non-functional, in the MIPS optimized aaccoder file.
Credits for the rounding goes to Claudio Freire.
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
Rostislav Pehlivanov [Fri, 21 Aug 2015 17:53:14 +0000 (18:53 +0100)]
aaccoder: move the quantization functions to a separate file
This commit moves the quantizer to a separate header file.
This allows the quantizer to be used from a separate files outside
of aaccoder without having to put another function pointer and will
result in a slight speedup as the compiler can do more optimizations.
This is required for commits following.
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
Rostislav Pehlivanov [Fri, 21 Aug 2015 17:43:09 +0000 (18:43 +0100)]
aacenc: create and initialize an LTP context
This commit only creates and initializes an LTP
context which is needed for upcoming commits (TNS).
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
Rostislav Pehlivanov [Fri, 21 Aug 2015 17:40:44 +0000 (18:40 +0100)]
aacenc: populate the sce->ics.swb_offset table pointer
This commit simply populates the table pointer which is needed
for upcoming commits (TNS, prediction, etc.). Copied from
the decoder.
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
Rostislav Pehlivanov [Fri, 21 Aug 2015 17:36:09 +0000 (18:36 +0100)]
aacenc: reset special bands in the main frame encoding function
This commit moves the resetting of special bands (above RESERVED_BT)
to the main frame encoding function rather than the way it was done
previously in their corresponding search_for_... functions.
The reason why special bands need to be reset is that while normal
bands get chosen for every frame by the coder (twoloop by default)
the coders do not touch any special sfbs and will therefore
make them persist throughout the file.
If we zero them out any bands left unmarked will be chosen by
the second part of the coder (the trellis function in aaccoder.c).
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
Rostislav Pehlivanov [Fri, 21 Aug 2015 17:30:51 +0000 (18:30 +0100)]
aacenc: coding style changes
This commit only changes the coding style to a saner way
of accessing coefficients (makes more sense to get the
memory address of a coefficients and start from there
rather than adding arbitrary numbers to offset a pointer).
Some compilers might detect an out of bounds access easier.
Also the way M/S and IS coefficients are calculated has been
changed, but should still have the same result (with the exception
that IS now applies from the normal coefficients rather than the
pristine ones, this is needed for upcoming commits).
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
Ganesh Ajjanagadde [Fri, 21 Aug 2015 13:57:50 +0000 (09:57 -0400)]
avcodec/x86/v210-init: fix unused variable warning
Fixes a -Wunused-variable while compiling with --disable-yasm on x86
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Ganesh Ajjanagadde [Fri, 21 Aug 2015 02:12:40 +0000 (22:12 -0400)]
ffserver: cast PID to int64_t before printing
Unfortunately, there is no portable format specifier for PID's.
Furthermore, it is not safe to assume pid_t <= 32 bit in size,
see e.g http://unix.derkeiler.com/Mailing-Lists/AIX-L/2010-08/msg00008.html.
Right now, it is ok to assume pid_t <= 32 bit in size, but this may change in the future.
Also, this patch fixes warning due to lack of an appropriate cast from
http://fate.ffmpeg.org/report.cgi?time=
20150820233505 &slot=x86-opensolaris-gcc4.3.
Note that this method of handling pid_t is in line with what nginx does.
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Ganesh Ajjanagadde [Thu, 20 Aug 2015 23:27:24 +0000 (19:27 -0400)]
avformat/hls: correct comment for ensure_playlist()
Comment was previously slightly incorrect.
Also, it was placed in the wrong location.
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Fri, 21 Aug 2015 11:16:34 +0000 (13:16 +0200)]
avfilter/vf_vectorscope: Fix ;;
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>