]>
git.sesse.net Git - ffmpeg/log
Clément Bœsch [Thu, 5 Mar 2015 21:25:10 +0000 (22:25 +0100)]
Drop outdated RELEASE_NOTES
A new RELEASE_NOTES specific to the release will be added.
Michael Niedermayer [Thu, 5 Mar 2015 19:55:56 +0000 (20:55 +0100)]
Merge commit '
ad786dd450f26ecfbd35bb26e8b149664ecde049 '
* commit '
ad786dd450f26ecfbd35bb26e8b149664ecde049 ':
h264: remove a now redundant error check
Conflicts:
libavcodec/h264_slice.c
See:
64591f8f86f2dfeac13ee6b4e971d069675ca814
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 5 Mar 2015 19:32:18 +0000 (20:32 +0100)]
Michael Niedermayer [Thu, 5 Mar 2015 19:24:27 +0000 (20:24 +0100)]
Merge commit '
bb4edddd9389cc1601db618ed3c1375b62628d04 '
* commit '
bb4edddd9389cc1601db618ed3c1375b62628d04 ':
rmenc: limit packet size
Conflicts:
libavformat/rmenc.c
See:
08728f400b8367dc8c983036cb2eff3a2891322b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 5 Mar 2015 18:51:43 +0000 (19:51 +0100)]
Merge commit '
4f2ee9daeedec636fb4fe953a1e0990a7102d5eb '
* commit '
4f2ee9daeedec636fb4fe953a1e0990a7102d5eb ':
webp: validate the distance prefix code
See:
5de2dab12b951b2fe121eb18503accfc91cd1565
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 5 Mar 2015 18:41:10 +0000 (19:41 +0100)]
Merge commit '
66624ed6319cb1a959256fe1a717fec5b748fbfa '
* commit '
66624ed6319cb1a959256fe1a717fec5b748fbfa ':
rv10: check size of s->mb_width * s->mb_height
Conflicts:
libavcodec/rv10enc.c
See:
2578a546183da09d49d5bba8ab5e982dece1dede
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 5 Mar 2015 18:31:56 +0000 (19:31 +0100)]
avformat/avidec: Check avio_read() return before using the results for meta-data
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 5 Mar 2015 17:29:50 +0000 (18:29 +0100)]
avformat/avidec: initialize header array
Fixes use of uninitialized memory in case read fails
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Anton Khirnov [Tue, 27 Jan 2015 11:31:24 +0000 (12:31 +0100)]
h264: remove a now redundant error check
It was only relevant when data partitioning was in use.
Clément Bœsch [Thu, 5 Mar 2015 15:04:20 +0000 (16:04 +0100)]
avfilter/vf_paletteuse: indent fix after
7ccc5848
Michael Niedermayer [Thu, 5 Mar 2015 14:52:00 +0000 (15:52 +0100)]
avfilter/vf_paletteuse: Use int where AVERROR can be returned
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Andreas Cadhalpun [Thu, 26 Feb 2015 00:06:57 +0000 (01:06 +0100)]
avformat/adxdec: set avctx->channels in adx_read_header
It is used in adx_read_packet, which currently depends on the
decoder/parser setting this value between reading the file header and
demuxing the first packet.
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Andreas Cadhalpun [Mon, 2 Mar 2015 15:52:26 +0000 (16:52 +0100)]
rmenc: limit packet size
The chunk size is limited to UINT16_MAX (written by avio_wb16), so make
sure that the packet size is not too large.
Such large frames need to be split into slices smaller than 64 kB, but
that is currently supported neither by the rv10/rv20 encoders nor the rm
muxer.
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Andreas Cadhalpun [Mon, 2 Mar 2015 19:47:57 +0000 (20:47 +0100)]
webp: validate the distance prefix code
According to the WebP Lossless Bitstream Specification the highest
allowed value for a prefix code is 39.
If prefix_code is too large, the calculated extra_bits has an invalid
value and triggers an assertion in get_bits.
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Andreas Cadhalpun [Tue, 3 Mar 2015 20:31:15 +0000 (21:31 +0100)]
rv10: check size of s->mb_width * s->mb_height
If it doesn't fit into 12 bits it triggers an assertion.
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Michael Niedermayer [Thu, 5 Mar 2015 12:50:22 +0000 (13:50 +0100)]
avutil/opt: Do not print inf in selftest
This fixes fate failures on windows
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 5 Mar 2015 12:12:48 +0000 (13:12 +0100)]
fate-aac-aref-encode: increase FUZZ to 5, needed for ppc64be
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Nedeljko Babic [Thu, 5 Mar 2015 11:23:59 +0000 (12:23 +0100)]
mips/float_dsp: fix a bug in vector_fmul_window_mips
Loop was unrolled eight times although in heder there is assumption
that len is multiple of 4.
This is fixed, and assembly code is rewritten to be more optimal and
to simplify clobber list.
Signed-off-by: Nedeljko Babic <nedeljko.babic@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Kevin Wheatley [Thu, 5 Mar 2015 10:40:13 +0000 (10:40 +0000)]
avformat/movenc: Add support for writing 'gama' atom to QuickTime .mov files.
As this is depricated it should not be on by default, it is only
supported for MOV containers, depends on avpriv_get_gamma_from_trc()
Enable by:
-movflags +write_gama
This will use the color_trc to supply a gamma value, if desired an
explicit value may be supplied using the -mov_gamma option supplying
a suitable floating point value, values <=1e-6 will not be written.
Signed-off-by: Kevin Wheatley <kevin.j.wheatley@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Kevin Wheatley [Thu, 5 Mar 2015 10:37:51 +0000 (10:37 +0000)]
avutil: Extract gamma determination from PNG encoder for future use. Adds private avpriv_get_gamma_from_trc() function to libavutil.
Signed-off-by: Kevin Wheatley <kevin.j.wheatley@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Thu, 5 Mar 2015 11:05:17 +0000 (12:05 +0100)]
doc/protocols/tcp: fix units of listen_timeout option value, from microseconds to milliseconds
s->listen_timeout is passed to ff_listen_bind(), which accepts a timeout
value expressed in milliseconds.
The unit was incorrectly set in
1b4da43ce02452843a1e9bb976da1a39e18a945c .
Vilius Grigaliūnas [Wed, 4 Mar 2015 22:36:50 +0000 (00:36 +0200)]
avformat/mxfdec: Detect XYZ pixel format for digital cinema files
While the native jpeg2000 decoder can determine pixel format correctly
from the codestream, libopenjpeg wrapper cannot. To make sure that
the output is correct when using libopenjpeg to decode digital
cinema files, we do detection from the metadata included in the MXF
wrapper.
If the container has "JPEG 2000 Coding Parameters" metadata element
with Rsiz value set to one of digital cinema profiles, we can safely
assume that the given input file is DCI compliant, therefore the
pixel format should be XYZ.
Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Timo Rothenpieler [Wed, 4 Mar 2015 21:48:43 +0000 (22:48 +0100)]
avformat/dashenc: Update extradata for mov muxer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 5 Mar 2015 09:10:23 +0000 (10:10 +0100)]
Merge commit '
9c09fbd8053292267cdc4b542913ceced43ea3a9 '
* commit '
9c09fbd8053292267cdc4b542913ceced43ea3a9 ':
rtpdec: experimental VP9 depacketizer (draft 0)
Conflicts:
libavformat/rtpdec.c
libavformat/rtpdec_vp9.c
libavformat/version.h
See:
e4a6486c17dd90b338450ac7e151ffbf5370948a
See:
f966ac2b6e3f08c41f3c45ab5efff768db62ac5a
See:
629a03a9128bd2e51286258e12183b1d06f509a7
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Thomas Volkert [Tue, 3 Mar 2015 23:33:31 +0000 (00:33 +0100)]
rtpdec: experimental VP9 depacketizer (draft 0)
The code was tested with live555 server.
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Thu, 5 Mar 2015 01:16:50 +0000 (02:16 +0100)]
Merge commit '
f3b74d944bdef9bbe81f7690f8d837d843ec13a6 '
* commit '
f3b74d944bdef9bbe81f7690f8d837d843ec13a6 ':
pcxenc: Return more meaningful error codes
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 5 Mar 2015 00:40:03 +0000 (01:40 +0100)]
Merge commit '
b72b212a4c43563f1b9fc3ce9a5ff91f89b857ac '
* commit '
b72b212a4c43563f1b9fc3ce9a5ff91f89b857ac ':
rdt: Use a separate variable to clarify the different value namespaces
Conflicts:
libavformat/rdt.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 5 Mar 2015 00:19:52 +0000 (01:19 +0100)]
Merge commit '
c13ab42a0a3979b2c292b2315487f5f5e14ba26b '
* commit '
c13ab42a0a3979b2c292b2315487f5f5e14ba26b ':
rtpdec_qt: Use a local variable instead of RTP_FLAG_KEY
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 5 Mar 2015 00:12:13 +0000 (01:12 +0100)]
Merge commit '
15621cbbe4ed88409ef40257afaf239487964e98 '
* commit '
15621cbbe4ed88409ef40257afaf239487964e98 ':
rtpdec_asf: Don't set RTP_FLAG_KEY
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Reimar Döffinger [Wed, 4 Mar 2015 22:13:35 +0000 (23:13 +0100)]
avformat/avformat: improve the text about headerless formats in avformat_flush()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
wm4 [Tue, 30 Sep 2014 16:46:49 +0000 (18:46 +0200)]
avformat: add avformat_flush()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Wed, 4 Mar 2015 22:54:10 +0000 (23:54 +0100)]
Allow AVFoundation compilation on OS X 10.7.
Fixes ticket #4238.
Reviewed-by: Thilo Borgmann
Carl Eugen Hoyos [Wed, 4 Mar 2015 22:48:41 +0000 (23:48 +0100)]
lavf/mxf: Support ProRes decoding.
Fixes ticket #4349.
Himangi Saraogi [Wed, 4 Mar 2015 15:44:04 +0000 (21:14 +0530)]
pcxenc: Return more meaningful error codes
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Martin Storsjö [Wed, 4 Mar 2015 08:00:08 +0000 (10:00 +0200)]
rdt: Use a separate variable to clarify the different value namespaces
The original flags variable contains rtpdec flags, while the
rmflags variable contains RM flag bits which have a completely
different definition.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Wed, 4 Mar 2015 07:57:02 +0000 (09:57 +0200)]
rtpdec_qt: Use a local variable instead of RTP_FLAG_KEY
The only case where RTP_FLAG_KEY actually is needed is
in RDT, where such a flag needs to be passed via the
rtpdec parse function's flags parameter.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Wed, 4 Mar 2015 07:52:33 +0000 (09:52 +0200)]
rtpdec_asf: Don't set RTP_FLAG_KEY
Nothing in the framework nor in the rest of the depacketizer actually
uses this flag - the chained demuxer sets the keyframe flag properly on
demuxed packets already.
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Wed, 4 Mar 2015 21:36:23 +0000 (22:36 +0100)]
avformat/movenc: mark write_colr as experimental
This way the flag can be flipped to a nowrite_colr, if people prefer that
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Peter Cordes [Thu, 29 Jan 2015 21:24:45 +0000 (17:24 -0400)]
libx264: update AQ options help for x264 build 144
Regular autovariance is no longer "experimental", and a version of it with
bias towards dark scenes is now in mainline x264.
Signed-off-by: Peter Cordes <peter@cordes.ca>
Peter Cordes [Thu, 29 Jan 2015 21:20:27 +0000 (17:20 -0400)]
pixelutils: Comment on (lack of) sad_8x8_sse2
Signed-off-by: Peter Cordes <peter@cordes.ca>
Peter Cordes [Thu, 29 Jan 2015 21:19:39 +0000 (17:19 -0400)]
pixelutils: indent comments in pixdesc.h to be clearer
Signed-off-by: Peter Cordes <peter@cordes.ca>
Peter Cordes [Thu, 15 Jan 2015 03:06:51 +0000 (23:06 -0400)]
vf_showinfo: minimum widths for some early fields
Depending on FPS, the pts_time string often changes length:
... pts_time:36.1 ...
... pts_time:36.1333 ...
etc.
The length changes make the output bounce around horribly, making it
hard to scan down a column farther right than pts_time.
The solution is to set minimum widths for n, pts, pts_time, and pos.
This patch doesn't touch any of the fields in mean / stddev.
The widths aren't intended to be wide enough that they're never
exceeded, but you'll see only an occasional ripple to a new alignment,
rather than bouncing. (Some fields, like pos, increase monotonically,
which is why I left the minimum width for the field be smaller than it
often gets to.)
Signed-off-by: Peter Cordes <peter@cordes.ca>
Michael Niedermayer [Wed, 4 Mar 2015 19:42:33 +0000 (20:42 +0100)]
Merge commit '
e767c9e8f2eaa116b61b8b6881b401b54bd320f5 '
* commit '
e767c9e8f2eaa116b61b8b6881b401b54bd320f5 ':
flv: Validate and reject unsupported codecs
Conflicts:
libavformat/flvenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 4 Mar 2015 18:48:28 +0000 (19:48 +0100)]
Merge commit '
87e85a133f3ce2f037b90e9c7bbca99951df6c15 '
* commit '
87e85a133f3ce2f037b90e9c7bbca99951df6c15 ':
aac: Relax reserved_bit validation
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 4 Mar 2015 18:24:12 +0000 (19:24 +0100)]
Merge commit '
25f613f8be3b51e4396b93cda131e4631ba54302 '
* commit '
25f613f8be3b51e4396b93cda131e4631ba54302 ':
dca: Move syncword definitions to a separate header
Conflicts:
libavcodec/dca_parser.c
libavformat/dtsdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 4 Mar 2015 18:14:45 +0000 (19:14 +0100)]
Merge commit '
1dc19729e92a96620000e09eba8e58cb458c9486 '
* commit '
1dc19729e92a96620000e09eba8e58cb458c9486 ':
rtpdec_asf: Don't free the payload context in the .close function
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 4 Mar 2015 18:05:28 +0000 (19:05 +0100)]
Merge commit '
62139b14e621f096d0f8ed90920d042b92867e40 '
* commit '
62139b14e621f096d0f8ed90920d042b92867e40 ':
fate: Specify the idct to use for the aic-oddsize test
Conflicts:
tests/fate/video.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Luca Barbato [Tue, 3 Mar 2015 13:39:26 +0000 (14:39 +0100)]
flv: Validate and reject unsupported codecs
And provide a more informative message in case of failure.
CC: libav-stable@libav.org
Vittorio Giovara [Tue, 3 Mar 2015 19:38:32 +0000 (19:38 +0000)]
aac: Relax reserved_bit validation
Although the specification mandates this bit to zero, it may happen
that software tools incorrectly flip it to one, invalidating a possibly
valid stream.
Relax this restriction, by failing only when AV_EF_BITSTREAM is set.
This behaviour is similar to aac decoders in Firefox and Quicktime.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Diego Biurrun [Wed, 25 Feb 2015 12:50:15 +0000 (13:50 +0100)]
dca: Move syncword definitions to a separate header
Mark Reid [Mon, 2 Mar 2015 02:33:10 +0000 (18:33 -0800)]
libavformat/mxfdec: refactor reading strong ref array
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Wed, 4 Mar 2015 07:50:44 +0000 (09:50 +0200)]
rtpdec_asf: Don't free the payload context in the .close function
This was missed in
bb4a310bb . This fixes a double free on close.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Wed, 4 Mar 2015 07:31:16 +0000 (09:31 +0200)]
fate: Specify the idct to use for the aic-oddsize test
This fixes fate on all architectures that have an optimized
but not bitexact idct available.
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Wed, 4 Mar 2015 10:15:05 +0000 (11:15 +0100)]
Merge commit '
2a66a580678dd9401f4d95e01e0958ca51864b6f '
* commit '
2a66a580678dd9401f4d95e01e0958ca51864b6f ':
rtpdec_mpa_robust: Fix incrementing split_pos
Conflicts:
libavformat/rtpdec_mpa_robust.c
See:
ebf1f512e9916040dd96fa9f789ed4be5a39c349
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Mon, 2 Mar 2015 12:46:30 +0000 (14:46 +0200)]
rtpdec_mpa_robust: Fix incrementing split_pos
This fixes an oversight in
96084251 , in a refactoring done on top
of Gilles' original patch.
Pointed out by Gilles Chanteperdrix.
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Mon, 2 Mar 2015 13:19:41 +0000 (14:19 +0100)]
ffplay: Switch to show waves mode if allocation/init of RDFT fails
Fixes null pointer dereference
Found-by: Paweł <pantrombka@gmail.com>
Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 4 Mar 2015 01:06:08 +0000 (02:06 +0100)]
avcodec/pngenc: Remove outer () from macro
The macro is implemented as a do{}while()
enclosing this is () appears to be a GNU extension (6.1 Statements and Declarations in Expressions)
the () is also unneeded and wrong as the macro returns no
value
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 4 Mar 2015 00:23:26 +0000 (01:23 +0100)]
Merge commit '
db5cc75f8b5620e7cd2d05762c3b087ab16d8c24 '
* commit '
db5cc75f8b5620e7cd2d05762c3b087ab16d8c24 ':
wma.h: #include "avcodec.h"
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Tobias Rapp [Tue, 3 Mar 2015 12:29:05 +0000 (13:29 +0100)]
libavformat/avienc: Fix duration of audio segment in OpenDML master index
Fixes the duration field of the OpenDML master index "indx" chunk to
contain the number of samples instead of the number of packets for
(linear/PCM) audio streams.
This matches the OpenDML V1.02 standard text which states that the
duration field shall contain "time span in stream ticks".
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Vilius Grigaliūnas [Tue, 3 Mar 2015 08:19:47 +0000 (10:19 +0200)]
acvodec/lipopenjpeg: Fix pixel value shift for 12-bit pixel formats
This fixes pixel values not being properly shifted in
libopenjpeg_copyto16 and libopenjpeg_copy_to_packed16 methods.
Pixel formats like xyz12le need to be shifted by AVComponentDescriptor::shift
to get the correct values.
Reviewed-by: Michael Bradshaw <mjbshaw@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Cowgill [Thu, 26 Feb 2015 13:42:53 +0000 (13:42 +0000)]
mips/aaccoder: use variables instead of using register names directly
On mips64, the registers t[4-7] do not exist. Instead of using a lot of #ifdef
or defines to handle differing register names, use variables and let GCC
allocate the registers automatically (like in the other mips assembly files).
In get_band_cost_ESC_mips, t4 and t5 were renamed to t6 and t7 to avoid a
variable name conflict.
Signed-off-by: James Cowgill <james410@cowgill.org.uk>
Reviewed-by: Nedeljko Babic <Nedeljko.Babic@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Cowgill [Thu, 26 Feb 2015 13:42:51 +0000 (13:42 +0000)]
mips: use float* to hold pointer instead of int
This is obviously needed for 64-bit support.
Signed-off-by: James Cowgill <james410@cowgill.org.uk>
Reviewed-by: Nedeljko Babic <Nedeljko.Babic@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 3 Mar 2015 20:16:31 +0000 (21:16 +0100)]
Merge commit '
0af3b65880573aa9b3375362eaab4f84140c7dde '
* commit '
0af3b65880573aa9b3375362eaab4f84140c7dde ':
asf: do not export XMP metadata by default
Conflicts:
libavformat/asfdec.c
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 3 Mar 2015 19:54:17 +0000 (20:54 +0100)]
Merge commit '
994d8f3095180ba1b2c6040a97718e931a782b34 '
* commit '
994d8f3095180ba1b2c6040a97718e931a782b34 ':
fate: Add AIC test with odd sizes
Conflicts:
tests/fate/video.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Anton Khirnov [Mon, 2 Mar 2015 20:51:02 +0000 (21:51 +0100)]
wma.h: #include "avcodec.h"
It's required for at least AVCodecContext.
Fixes make checkheaders.
Michael Niedermayer [Tue, 3 Mar 2015 19:20:49 +0000 (20:20 +0100)]
Merge commit '
e878ec0d47cd6228c367b2f3128b76d7523f7255 '
* commit '
e878ec0d47cd6228c367b2f3128b76d7523f7255 ':
aic: Fix decoding files with odd dimensions
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Tue, 3 Mar 2015 19:24:41 +0000 (20:24 +0100)]
Mark Reid [Tue, 3 Mar 2015 04:06:13 +0000 (20:06 -0800)]
libavformat/avio: added avio_put_str16be
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Vittorio Giovara [Mon, 2 Mar 2015 18:04:03 +0000 (18:04 +0000)]
asf: do not export XMP metadata by default
Similarly to what has been done for MOV, display XMP metadata only when
users explicitly require it.
The Extensible Metadata Platform tag can contain various kind of data
which are not strictly related to the video file, such as history of
edits and saves from the project file.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Vittorio Giovara [Mon, 2 Mar 2015 13:03:39 +0000 (13:03 +0000)]
fate: Add AIC test with odd sizes
Vittorio Giovara [Fri, 27 Feb 2015 19:00:25 +0000 (19:00 +0000)]
aic: Fix decoding files with odd dimensions
Normally the aic decoder finds the proper slice combination (multiple of
some number less than 32) but in case of odd width, it resorts to the
default values, which were actually swapped.
The number of slices is modified to account for such odd width cases.
CC: libav-stable@libav.org
Claudio Freire [Tue, 3 Mar 2015 06:43:06 +0000 (03:43 -0300)]
AAC: Fix M/S stereo encoding
This patch fixes a pointer arithmetic bug in adjust_frame_information that resulted in heavily corrupted audio when using M/S encoding. Also, a backup copy of untransformed coefficients has to be kept around or attempts at re-processing the frame (which happens when hevavily overspending bits during transients) will result in re-encoding of the coefficients and subsequent corruption of the resulting stream.
A/B testing shows the bug as corrected, but still cannot prove that M/S coding is a win at least in numbers. Limited listening tests do show improvement on M/S encoded samples in lower bitrates, but they're hidden among the other artifacts that remain to be corrected in the encoder.
Some of the regressions flagged in the report do show poor stereo image (but not buggy), so M/S encoding is clearly not good enough yet to be defaulted to auto.
In numbers, Patched against Unpatched, stereo_mode auto:
Files: 114
Bitrates: 6
Tests: 683
Serious Regressions: 0 (0%)
Regressions: 0 (0%)
Improvements: 227 (33%)
Big improvements: 92 (13%)
Worst regression - mybloodrusts.wv - 256k
- StdDev: 28.61 pSNR: -0.43 maxdiff: 1372.00
Best improvement - 60.wv - 384k
- StdDev: -369.57 pSNR: 45.02 maxdiff: -13322.00
Average - StdDev: -80.56 pSNR: 2.49 maxdiff: -8858.00
Patched against Unpatched stereo_mode ms_off shows no difference.
Patched stereo_mode auto vs Unpatched stereo_mode ms_off shows a small average improvement, just not too significant:
Serious Regressions: 0 (0%)
Regressions: 10 (1%)
Improvements: 45 (6%)
Big improvements: 2 (0%)
Worst regression - Illinois.wv - 256k
- StdDev: 33.20 pSNR: -2.03 maxdiff: 477.00
Best improvement - song_of_circomstances.flac - 384k
- StdDev: -3.97 pSNR: 7.61 maxdiff: -826.00
Average - StdDev: -10.25 pSNR: 0.20 maxdiff: -281.00
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Steve Lhomme [Tue, 3 Mar 2015 11:06:40 +0000 (12:06 +0100)]
fix VP9 packet decoder returning 0 instead of the used data size
See https://trac.videolan.org/vlc/ticket/14022#comment:6
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Andreas Cadhalpun [Mon, 2 Mar 2015 19:27:26 +0000 (20:27 +0100)]
avcodec/rv10: check size of s->mb_width * s->mb_height
If it doesn't fit into 12 bits it triggers an assertion.
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Robert Krüger [Sun, 1 Mar 2015 12:02:20 +0000 (13:02 +0100)]
avformat/mxfenc: adjust product name when opatom muxer is used
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Andreas Cadhalpun [Mon, 2 Mar 2015 19:47:57 +0000 (20:47 +0100)]
avcodec/webp: validate the distance prefix code
According to the WebP Lossless Bitstream Specification the highest
allowed value for a prefix code is 39.
If prefix_code is too large, the calculated extra_bits has an invalid
value and triggers an assertion in get_bits.
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Mon, 2 Mar 2015 19:55:16 +0000 (20:55 +0100)]
avcodec/proresenc_kostya: fix coded_frame handling
Michael Niedermayer [Mon, 2 Mar 2015 20:52:57 +0000 (21:52 +0100)]
Merge commit '
33d412eb4a2a083c1514ddbe69295b37e1918a8c '
* commit '
33d412eb4a2a083c1514ddbe69295b37e1918a8c ':
dashenc: Simplify code by using a local variable
Conflicts:
libavformat/dashenc.c
See:
b86af8da3100a7eef3247747cd469b988f134e0d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Timo Rothenpieler [Sun, 1 Mar 2015 21:59:55 +0000 (22:59 +0100)]
avformat/dashenc: Update codec_str on extradata_size change
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Timo Rothenpieler [Sun, 1 Mar 2015 21:59:55 +0000 (22:59 +0100)]
avformat/dashenc: Use local variable instead of duplicated dereferences
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Sat, 28 Feb 2015 09:37:36 +0000 (10:37 +0100)]
avfilter/vf_tblend: use av_frame_free for freeing an AVFrame
Clément Bœsch [Sat, 28 Feb 2015 09:37:23 +0000 (10:37 +0100)]
avfilter/lavfutils: use av_frame_free for freeing an AVFrame
Clément Bœsch [Sat, 28 Feb 2015 09:36:16 +0000 (10:36 +0100)]
avcodec: use av_frame_free() for coded_frame
Michael Niedermayer [Mon, 2 Mar 2015 19:52:34 +0000 (20:52 +0100)]
Merge commit '
91eee2af87278b3c2008f7a86d2cdfe6934e9f42 '
* commit '
91eee2af87278b3c2008f7a86d2cdfe6934e9f42 ':
Revert "mov: Change DTS-based seek into CTS-based seek."
Conflicts:
libavformat/mov.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 2 Mar 2015 19:43:32 +0000 (20:43 +0100)]
Revert "avformat/mov: Bypass av_add_index_entry()"
Next commit will revert the PTS seeking so this is not needed anymore
This reverts commit
38e641a060e0c00930851a8053ca96250b3ecccc .
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 2 Mar 2015 19:30:54 +0000 (20:30 +0100)]
Merge commit '
9a26ba971387a348e14f363ddcdcb5bba0b413d1 '
* commit '
9a26ba971387a348e14f363ddcdcb5bba0b413d1 ':
v4l2: Add support for h264
Conflicts:
libavdevice/v4l2.c
See:
0fb79f30db138e3686fbfcf88ba58ea7c1e61bfc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 2 Mar 2015 19:16:22 +0000 (20:16 +0100)]
Merge commit '
619d5e7db88941cadb8136f805564e885c6c6434 '
* commit '
619d5e7db88941cadb8136f805564e885c6c6434 ':
v4l2: Use the codec descriptor facility
Conflicts:
libavdevice/v4l2.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 2 Mar 2015 19:00:43 +0000 (20:00 +0100)]
Merge commit '
dbc1163b203b175d246b7454c32ac176f84006d1 '
* commit '
dbc1163b203b175d246b7454c32ac176f84006d1 ':
prores: Extend the padding check to 16bit
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Mon, 2 Mar 2015 12:10:22 +0000 (14:10 +0200)]
dashenc: Simplify code by using a local variable
Signed-off-by: Martin Storsjö <martin@martin.st>
Christophe Gisquet [Mon, 2 Mar 2015 17:17:28 +0000 (18:17 +0100)]
hevc/sao: use unaligned copy
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Andreas Cadhalpun [Mon, 2 Mar 2015 14:46:44 +0000 (15:46 +0100)]
avformat/rm: limit packet size
The chunk size is limited to 0xFFFF (written by avio_wb16), so make
sure that the packet size is not too large.
Such large frames need to be split into slices smaller than 64 kB, but
that is currently supported neither by the rv10/rv20 encoders nor the rm
muxer.
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
See Ticket244
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 2 Mar 2015 13:54:31 +0000 (14:54 +0100)]
avcodec/pngenc: replace round by lrint()
Avoids passing double to AV_WB32()
Suggested-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Mon, 2 Mar 2015 13:56:05 +0000 (14:56 +0100)]
configure/help: consistently use "autodetect"
Claudio Freire [Sun, 1 Mar 2015 23:11:12 +0000 (20:11 -0300)]
avcodec/aacpsy: Fix AAC Psy PE reduction calculation when multiple iterations are required
This is a small change, but it does have a big impact on bit allocation.
all the regressions marked in the report have no audible
difference (I didn't check them all though), but the improvements can
be heard.
This affects mostly high bit rates. It's related to issue #2686.
In the report, A is the patched version, B is unpatched, all
comparisons show deltas in the form (A-B), so a positive pSNR delta
means a better quality in the patched version, and negative a
regression. Regressions are only considered for pSNR deltas below
-1db, they're considered serious below -6db.
All measurements were done with tiny_psnr.
The summary of the report inline for quick reading:
Files: 58
Bitrates: 6
Tests: 347
Serious Regressions: 0 (0%)
Regressions: 10 (2%)
Improvements: 54 (15%)
Big improvements: 26 (7%)
Worst regression - sine_tester.flac - 384k
- StdDev: 1.68 pSNR: -3.05 maxdiff: -178.00
Best improvement - 07 - Bound.flac - 384k
- StdDev: -1700.05 pSNR: 20.64 maxdiff: -29595.00
Average - StdDev: -55.67 pSNR: 1.20 maxdiff: -1593.00
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Sat, 28 Feb 2015 21:51:16 +0000 (23:51 +0200)]
Revert "mov: Change DTS-based seek into CTS-based seek."
This reverts commit
4abfa387b8234736f6e0e541951e3d5eb60eb843 .
This commit broke playback of fragmented mp4 files with b-frames.
While investigating this, it turned out that the general framework
isn't ready for a PTS-based index yet. Revert this change until
a better thought out solution is in place.
Signed-off-by: Martin Storsjö <martin@martin.st>
Luca Barbato [Fri, 27 Feb 2015 00:34:52 +0000 (01:34 +0100)]
v4l2: Add support for h264
Gilles Chanteperdrix [Mon, 2 Mar 2015 10:00:17 +0000 (11:00 +0100)]
MAINTAINERS: add myself as rtpdec_mpa_robust maintainer
Signed-off-by: Gilles Chanteperdrix <gilles.chanteperdrix@xenomai.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Gilles Chanteperdrix [Mon, 2 Mar 2015 10:00:16 +0000 (11:00 +0100)]
avformat/rtpdec_mpa_robust: fix commit
96084251e57d1738fde02a2b0d37ca609d9efd71
Commit
96084251e57d1738fde02a2b0d37ca609d9efd71 introduced a change in
the parser implementation which broke it. Restore the original
implementation.
Signed-off-by: Gilles Chanteperdrix <gilles.chanteperdrix@xenomai.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Luca Barbato [Fri, 27 Feb 2015 01:12:33 +0000 (02:12 +0100)]
v4l2: Use the codec descriptor facility
The encoder or decoder might be disabled but the format would be
supported for at least remuxing.
Luca Barbato [Wed, 25 Feb 2015 14:29:15 +0000 (15:29 +0100)]
prores: Extend the padding check to 16bit
Some files produced by the official encoder have up to 16bit of
padding instead of the expected padding to the byte.
Use a self-explanatory macro instead of a simple number.
CC: libav-stable@libav.org
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>