]> git.sesse.net Git - ffmpeg/log
ffmpeg
8 years agoavformat/svag: extend format long description
Paul B Mahol [Fri, 23 Oct 2015 17:12:32 +0000 (19:12 +0200)]
avformat/svag: extend format long description

Signed-off-by: Paul B Mahol <onemda@gmail.com>
8 years agoavcodec: extend long decription for adpcm psx codec
Paul B Mahol [Fri, 23 Oct 2015 17:07:37 +0000 (19:07 +0200)]
avcodec: extend long decription for adpcm psx codec

Signed-off-by: Paul B Mahol <onemda@gmail.com>
8 years agoavformat/msf: extend format long description
Paul B Mahol [Fri, 23 Oct 2015 17:06:14 +0000 (19:06 +0200)]
avformat/msf: extend format long description

Signed-off-by: Paul B Mahol <onemda@gmail.com>
8 years agoAdd myself as maintainer for Hap
Tom Butterworth [Fri, 23 Oct 2015 11:04:56 +0000 (12:04 +0100)]
Add myself as maintainer for Hap

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
8 years agoRevert "configure: add -Wstrict-prototypes when available"
Ganesh Ajjanagadde [Fri, 23 Oct 2015 13:10:01 +0000 (09:10 -0400)]
Revert "configure: add -Wstrict-prototypes when available"

This reverts commit e6a93e59adeea1c140f2ef63e4055a15823bfeda,
Wstrict-prototypes is already enabled.

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
8 years agoconfigure: add -Wstrict-prototypes when available
Ganesh Ajjanagadde [Thu, 22 Oct 2015 18:37:31 +0000 (14:37 -0400)]
configure: add -Wstrict-prototypes when available

GCC (and Clang) have this useful warning that is not enabled by -Wall or
-Wextra. This will ensure that issues like those fixed in
4da52e3630343e8d3a79aef2cafcb6bf0b71e8da
will trigger warnings.

Reviewed-by: Hendrik Leppkes <h.leppkes@gmail.com>
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
8 years agoavutil/qsort: use the do while form for AV_QSORT, AV_MSORT
Ganesh Ajjanagadde [Fri, 23 Oct 2015 02:52:11 +0000 (22:52 -0400)]
avutil/qsort: use the do while form for AV_QSORT, AV_MSORT

Reviewed-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
8 years agovf_psnr/ssim: don't crash if stats_file is NULL.
Ronald S. Bultje [Thu, 22 Oct 2015 22:00:40 +0000 (18:00 -0400)]
vf_psnr/ssim: don't crash if stats_file is NULL.

8 years agoavcodec/hap: set bits_per_coded_sample
Tom Butterworth [Thu, 22 Oct 2015 22:40:41 +0000 (23:40 +0100)]
avcodec/hap: set bits_per_coded_sample

fixes issue where alpha is ignored in some players

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
8 years agoavfilter: add shuffleframes filter
Paul B Mahol [Tue, 20 Oct 2015 08:26:54 +0000 (10:26 +0200)]
avfilter: add shuffleframes filter

Signed-off-by: Paul B Mahol <onemda@gmail.com>
8 years agoavformat/mov: Autodetect mp3s which need parsing
Michael Niedermayer [Fri, 23 Oct 2015 01:22:43 +0000 (03:22 +0200)]
avformat/mov: Autodetect mp3s which need parsing

mp3 packets all have the same duration and number of samples
if their duration indicated in the container varies then thats an
indication that they are not 1 mp3 packet each.
If this autodetection fails for some case then please contact us
and provide a testcase.

Fixes Ticket4938

8 years agoavdevice/pulse_audio_common: add av_warn_unused_result
Ganesh Ajjanagadde [Fri, 16 Oct 2015 01:52:01 +0000 (21:52 -0400)]
avdevice/pulse_audio_common: add av_warn_unused_result

This does not trigger any warnings, but adds robustness.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
8 years agovf_ssim: print per-channel dB values.
Ronald S. Bultje [Thu, 22 Oct 2015 18:51:11 +0000 (14:51 -0400)]
vf_ssim: print per-channel dB values.

8 years agovf_psnr: remove %0.2f format specifiers for stream summary line.
Ronald S. Bultje [Thu, 22 Oct 2015 19:25:38 +0000 (15:25 -0400)]
vf_psnr: remove %0.2f format specifiers for stream summary line.

This makes output equally precise as vf_ssim.

8 years agoavcodec/libzvbi-teletextdec: Add variable to fix build
Michael Niedermayer [Thu, 22 Oct 2015 21:00:02 +0000 (23:00 +0200)]
avcodec/libzvbi-teletextdec: Add variable to fix build

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
8 years agoavfilter,swresample,swscale: use fabs, fabsf instead of FFABS
Ganesh Ajjanagadde [Mon, 12 Oct 2015 05:30:22 +0000 (01:30 -0400)]
avfilter,swresample,swscale: use fabs, fabsf instead of FFABS

It is well known that fabs and fabsf are at least as fast and sometimes
faster than the FFABS macro, at least on the gcc+glibc combination.
For instance, see the reference:
http://patchwork.sourceware.org/patch/6735/.
This was a patch to glibc in order to remove their usages of a macro.

The reason essentially boils down to fabs using the __builtin_fabs of
the compiler, while FFABS needs to infer to not use a branch and to
simply change the sign bit. Usually the inference works, but sometimes
it does not. This may be easily checked by looking at the asm.

This also has the added benefit of reducing macro usage, which has
problems with side-effects.

Note that avcodec is not handled here, as it is huge and
most things there are integer arithmetic anyway.

Tested with FATE.

Reviewed-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
8 years agoMerge commit '3ee2c60cc296eee3f63d7b5fee9b4332eeeac9fa'
Hendrik Leppkes [Thu, 22 Oct 2015 19:46:56 +0000 (21:46 +0200)]
Merge commit '3ee2c60cc296eee3f63d7b5fee9b4332eeeac9fa'

* commit '3ee2c60cc296eee3f63d7b5fee9b4332eeeac9fa':
  utils: Use data buffers directly instead of an AVPicture

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
8 years agoMerge commit 'ff7956fcbf8e59b21654b95038de3ed88a850a9e'
Hendrik Leppkes [Thu, 22 Oct 2015 19:45:49 +0000 (21:45 +0200)]
Merge commit 'ff7956fcbf8e59b21654b95038de3ed88a850a9e'

* commit 'ff7956fcbf8e59b21654b95038de3ed88a850a9e':
  avplay: Replace avpicture functions with imgutils

avplay and ffplay have diverged quite a bit, and ffplay should be updated
independently.

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
8 years agoavcodec/libzvbi: Update for AVSubtitleRect changes
Hendrik Leppkes [Thu, 22 Oct 2015 19:43:15 +0000 (21:43 +0200)]
avcodec/libzvbi: Update for AVSubtitleRect changes

8 years agoMerge commit 'a17a7661906ba295d67afd80ac0770422e1b02b3'
Hendrik Leppkes [Thu, 22 Oct 2015 19:18:03 +0000 (21:18 +0200)]
Merge commit 'a17a7661906ba295d67afd80ac0770422e1b02b3'

* commit 'a17a7661906ba295d67afd80ac0770422e1b02b3':
  lavc: Add data and linesize to AVSubtitleRect

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
8 years agoavcodec/nuv: Fix 'libavcodec/nuv.c:83:19: warning: passing argument 3 of av_image_cop...
Michael Niedermayer [Thu, 22 Oct 2015 18:56:32 +0000 (20:56 +0200)]
avcodec/nuv: Fix 'libavcodec/nuv.c:83:19: warning: passing argument 3 of av_image_copy from incompatible pointer type'

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
8 years agoavcodec/x86/vc1dsp: Remove unused macro
Michael Niedermayer [Thu, 22 Oct 2015 19:13:42 +0000 (21:13 +0200)]
avcodec/x86/vc1dsp: Remove unused macro

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
8 years agoMerge commit 'f890677d05bc4e8b494a73373ab4cc19791bf884'
Hendrik Leppkes [Thu, 22 Oct 2015 18:42:28 +0000 (20:42 +0200)]
Merge commit 'f890677d05bc4e8b494a73373ab4cc19791bf884'

* commit 'f890677d05bc4e8b494a73373ab4cc19791bf884':
  Replace any remaining avpicture function with imgutils

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
8 years agoavfilter/vf_zscale: fix typo
Lou Logan [Thu, 22 Oct 2015 18:39:57 +0000 (10:39 -0800)]
avfilter/vf_zscale: fix typo

Fixes #4958 as found by nicol.

Signed-off-by: Lou Logan <lou@lrcd.com>
8 years agoMerge commit '13bddab7de10aebf6efb98aa6d7ff0c51bb0e364'
Hendrik Leppkes [Thu, 22 Oct 2015 18:32:07 +0000 (20:32 +0200)]
Merge commit '13bddab7de10aebf6efb98aa6d7ff0c51bb0e364'

* commit '13bddab7de10aebf6efb98aa6d7ff0c51bb0e364':
  nuv: Replace avpicture functions with imgutils

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
8 years agoMerge commit '48c06386831604921bdaf4fb77ea02766cd615f4'
Hendrik Leppkes [Thu, 22 Oct 2015 18:31:09 +0000 (20:31 +0200)]
Merge commit '48c06386831604921bdaf4fb77ea02766cd615f4'

* commit '48c06386831604921bdaf4fb77ea02766cd615f4':
  dpx: Replace avpicture functions with imgutils

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
8 years agoroqvideodec: use av_frame_copy
Hendrik Leppkes [Thu, 22 Oct 2015 18:18:00 +0000 (20:18 +0200)]
roqvideodec: use av_frame_copy

8 years agoMerge commit 'f0a106578d759de6183eea3c75f8373b6d3153c1'
Hendrik Leppkes [Thu, 22 Oct 2015 18:11:21 +0000 (20:11 +0200)]
Merge commit 'f0a106578d759de6183eea3c75f8373b6d3153c1'

* commit 'f0a106578d759de6183eea3c75f8373b6d3153c1':
  roqvideodec: Replace avpicture functions with imgutils

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
8 years agoMerge commit 'ef3a3519c10620c4206738595bf03fc0bed71802'
Hendrik Leppkes [Thu, 22 Oct 2015 18:08:26 +0000 (20:08 +0200)]
Merge commit 'ef3a3519c10620c4206738595bf03fc0bed71802'

* commit 'ef3a3519c10620c4206738595bf03fc0bed71802':
  rawdec: Replace avpicture functions with imgutils

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
8 years agoMerge commit 'fcc1280acb6e6f682b34c2101b075b82f83d71ba'
Hendrik Leppkes [Thu, 22 Oct 2015 18:02:33 +0000 (20:02 +0200)]
Merge commit 'fcc1280acb6e6f682b34c2101b075b82f83d71ba'

* commit 'fcc1280acb6e6f682b34c2101b075b82f83d71ba':
  rawenc: Replace avpicture functions with imgutils

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
8 years agoMerge commit '3496cec43304ac040d6d05f9d500a6f93cc049e7'
Hendrik Leppkes [Thu, 22 Oct 2015 17:42:29 +0000 (19:42 +0200)]
Merge commit '3496cec43304ac040d6d05f9d500a6f93cc049e7'

* commit '3496cec43304ac040d6d05f9d500a6f93cc049e7':
  msrle: Use AVFrame instead of AVPicture

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
8 years agoMerge commit 'ac981d16415e7fd99683e10297781c7d9ec1a8cd'
Hendrik Leppkes [Thu, 22 Oct 2015 17:41:52 +0000 (19:41 +0200)]
Merge commit 'ac981d16415e7fd99683e10297781c7d9ec1a8cd'

* commit 'ac981d16415e7fd99683e10297781c7d9ec1a8cd':
  APIchanges: Fill in missing dates and hashes

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
8 years agoffmpeg: add abort_on option to allow aborting on empty output
Marton Balint [Sat, 17 Oct 2015 21:46:09 +0000 (23:46 +0200)]
ffmpeg: add abort_on option to allow aborting on empty output

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Marton Balint <cus@passwd.hu>
8 years agoffmpeg: fix ffmpeg.h trailing whitespace
Marton Balint [Thu, 22 Oct 2015 03:26:46 +0000 (05:26 +0200)]
ffmpeg: fix ffmpeg.h trailing whitespace

How this passed through the commit hook?

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Marton Balint <cus@passwd.hu>
8 years agoqsvdec: fix get_format and hwaccel_context handling
Hendrik Leppkes [Thu, 22 Oct 2015 15:00:49 +0000 (17:00 +0200)]
qsvdec: fix get_format and hwaccel_context handling

This enables the qsv transcoder to actually get activated

8 years agoMerge commit 'fb472e1a11a4e0caed2c3c91da01ea8e35d9e3f8'
Hendrik Leppkes [Thu, 22 Oct 2015 14:18:02 +0000 (16:18 +0200)]
Merge commit 'fb472e1a11a4e0caed2c3c91da01ea8e35d9e3f8'

* commit 'fb472e1a11a4e0caed2c3c91da01ea8e35d9e3f8':
  avconv: add support for Intel QSV-accelerated transcoding

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
8 years agoMerge commit 'dc923bc23b3efd949d0bf67ff1abdb95059e5843'
Hendrik Leppkes [Thu, 22 Oct 2015 13:54:14 +0000 (15:54 +0200)]
Merge commit 'dc923bc23b3efd949d0bf67ff1abdb95059e5843'

* commit 'dc923bc23b3efd949d0bf67ff1abdb95059e5843':
  qsvenc: add an API for allocating opaque surfaces

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
8 years agoMerge commit '2ec96b6bd5bf7b22978711bcf2cee702bee89c6f'
Hendrik Leppkes [Thu, 22 Oct 2015 13:49:26 +0000 (15:49 +0200)]
Merge commit '2ec96b6bd5bf7b22978711bcf2cee702bee89c6f'

* commit '2ec96b6bd5bf7b22978711bcf2cee702bee89c6f':
  qsvenc: cosmetics, reindent

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
8 years agoMerge commit 'f6f32fc93d39caf329869c1bff8ad024ccab1d42'
Hendrik Leppkes [Thu, 22 Oct 2015 13:48:11 +0000 (15:48 +0200)]
Merge commit 'f6f32fc93d39caf329869c1bff8ad024ccab1d42'

* commit 'f6f32fc93d39caf329869c1bff8ad024ccab1d42':
  qsvenc: set the timestamp for PIX_FMT_QSV frames as well

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
8 years agoMerge commit '772c87c5a658f36d7c0612f5da583fc2bfa54f79'
Hendrik Leppkes [Thu, 22 Oct 2015 13:46:52 +0000 (15:46 +0200)]
Merge commit '772c87c5a658f36d7c0612f5da583fc2bfa54f79'

* commit '772c87c5a658f36d7c0612f5da583fc2bfa54f79':
  qsvenc: support passing arbitrary external buffers to the encoder

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
8 years agoavutil/intmath: fix undefined behavior in ff_ctzll_c()
Michael Niedermayer [Thu, 22 Oct 2015 12:10:10 +0000 (14:10 +0200)]
avutil/intmath: fix undefined behavior in ff_ctzll_c()

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
8 years agoutils: Use data buffers directly instead of an AVPicture
Vittorio Giovara [Wed, 14 Oct 2015 09:33:27 +0000 (11:33 +0200)]
utils: Use data buffers directly instead of an AVPicture

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
8 years agolibavformat/electronicarts: also demux mpeg audio layer 2
Peter Ross [Thu, 22 Oct 2015 02:46:25 +0000 (13:46 +1100)]
libavformat/electronicarts: also demux mpeg audio layer 2

Signed-off-by: Peter Ross <pross@xvid.org>
http://wiki.multimedia.cx/index.php?title=Electronic_Arts_SCxl
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
8 years agolavc/x86/vc1dsp_init: Fix compilation with --disable-yasm.
Carl Eugen Hoyos [Thu, 22 Oct 2015 09:37:42 +0000 (11:37 +0200)]
lavc/x86/vc1dsp_init: Fix compilation with --disable-yasm.

8 years agolavf/mpjpegdec: Return 0 if an allocation inside the probe function fails.
Carl Eugen Hoyos [Thu, 22 Oct 2015 09:19:45 +0000 (11:19 +0200)]
lavf/mpjpegdec: Return 0 if an allocation inside the probe function fails.

8 years agoavformat/electronicarts: fix demuxing of certain eam files
Paul B Mahol [Thu, 22 Oct 2015 08:35:09 +0000 (10:35 +0200)]
avformat/electronicarts: fix demuxing of certain eam files

Such files have gaps between header chunks.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
8 years agoavformat/electronicarts: support ADPCM PSX
Paul B Mahol [Wed, 21 Oct 2015 20:59:08 +0000 (22:59 +0200)]
avformat/electronicarts: support ADPCM PSX

Signed-off-by: Paul B Mahol <onemda@gmail.com>
8 years agommaldec: Add mpeg2 decoding support
Julian Scheel [Wed, 21 Oct 2015 15:10:48 +0000 (17:10 +0200)]
mmaldec: Add mpeg2 decoding support

Register mmaldec as mpeg2 decoder. Supporting mpeg2 in mmaldec is just a
matter of setting the correct MMAL_ENCODING on the input port. To ease the
addition of further supported mmal codecs a macro is introduced to generate
the decoder and decoder class structs.

Signed-off-by: Julian Scheel <julian@jusst.de>
Signed-off-by: wm4 <nfxjfg@googlemail.com>
8 years agox86/Makefile: move decoder/encoder objects out of the subsystems section
James Almer [Thu, 22 Oct 2015 06:55:18 +0000 (03:55 -0300)]
x86/Makefile: move decoder/encoder objects out of the subsystems section

Signed-off-by: James Almer <jamrial@gmail.com>
8 years agoffmpeg: exit on corrupt packets or decoded frames if exit_on_error flag is present
Marton Balint [Wed, 14 Oct 2015 22:48:24 +0000 (00:48 +0200)]
ffmpeg: exit on corrupt packets or decoded frames if exit_on_error flag is present

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Marton Balint <cus@passwd.hu>
8 years agoffmpeg: factorize checking decoder result
Marton Balint [Wed, 14 Oct 2015 22:36:38 +0000 (00:36 +0200)]
ffmpeg: factorize checking decoder result

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Marton Balint <cus@passwd.hu>
8 years agoffmpeg: exit on av_write_trailer failure if exit_on_error is set
Marton Balint [Wed, 14 Oct 2015 22:08:43 +0000 (00:08 +0200)]
ffmpeg: exit on av_write_trailer failure if exit_on_error is set

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Marton Balint <cus@passwd.hu>
8 years agoffmpeg: log failed av_write_trailer
Marton Balint [Wed, 14 Oct 2015 22:06:12 +0000 (00:06 +0200)]
ffmpeg: log failed av_write_trailer

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Marton Balint <cus@passwd.hu>
8 years agovc1dsp: Port ff_vc1_put_ver_16b_shift2_mmx to yasm
Timothy Gu [Sat, 17 Oct 2015 23:39:50 +0000 (16:39 -0700)]
vc1dsp: Port ff_vc1_put_ver_16b_shift2_mmx to yasm

This function is only used within other inline asm functions, hence the
HAVE_MMX_INLINE guard. Per recent discussions, we should not worry about
the performance of inline asm-only builds.

8 years agolibavformat/mxfdec.c: Report dark metadata keys only when they match no parser at...
Alexis Ballier [Wed, 21 Oct 2015 16:00:57 +0000 (18:00 +0200)]
libavformat/mxfdec.c: Report dark metadata keys only when they match no parser at all, not everytime they fail to match one.

Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
8 years agolibavformat/mxfdec.c: cosmetics: Add missing space after '?' in log message.
Alexis Ballier [Wed, 21 Oct 2015 16:00:56 +0000 (18:00 +0200)]
libavformat/mxfdec.c: cosmetics: Add missing space after '?' in log message.

Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
8 years agoavcodec: rename avpriv_color_frame to ff_color_frame
Andreas Cadhalpun [Tue, 13 Oct 2015 23:42:10 +0000 (01:42 +0200)]
avcodec: rename avpriv_color_frame to ff_color_frame

It is only used inside libavcodec.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
8 years agoavcodec: drop 2 suffix from avpriv_ac3_parse_header2
Andreas Cadhalpun [Fri, 16 Oct 2015 22:23:32 +0000 (00:23 +0200)]
avcodec: drop 2 suffix from avpriv_ac3_parse_header2

avpriv_ac3_parse_header was removed in commit 3dfb643.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
8 years agoavfilter/vf_ssim: Add support for writing stats to stdout
Tobias Rapp [Tue, 20 Oct 2015 13:34:36 +0000 (15:34 +0200)]
avfilter/vf_ssim: Add support for writing stats to stdout

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
8 years agohuffyuvencdsp: Cherry pick changes left out in the last commit
Timothy Gu [Mon, 19 Oct 2015 01:25:11 +0000 (02:25 +0100)]
huffyuvencdsp: Cherry pick changes left out in the last commit

Oops.

8 years agohuffyuvencdsp: Add ff_diff_bytes_{sse2,avx2}
Timothy Gu [Mon, 19 Oct 2015 01:25:11 +0000 (02:25 +0100)]
huffyuvencdsp: Add ff_diff_bytes_{sse2,avx2}

SSE2 version 4%-35% faster than MMX depending on the width.
AVX2 version 1%-13% faster than SSE2 depending on the width.

8 years agommaldec: Fix avpriv_atomic_get usage
Julian Scheel [Wed, 21 Oct 2015 07:00:33 +0000 (09:00 +0200)]
mmaldec: Fix avpriv_atomic_get usage

There is no avpriv_atomic_get, instead avpriv_atomic_int_get is to be used for
integers. This fixes building mmaldec.

Signed-off-by: Julian Scheel <julian@jusst.de>
Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
8 years agoaacdec: fix strict prototype warning
Hendrik Leppkes [Wed, 21 Oct 2015 10:50:44 +0000 (12:50 +0200)]
aacdec: fix strict prototype warning

Function protoypes without arguments require a void argument in C,
instead of an empty list.

8 years agoavplay: Replace avpicture functions with imgutils
Vittorio Giovara [Wed, 14 Oct 2015 09:33:26 +0000 (11:33 +0200)]
avplay: Replace avpicture functions with imgutils

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
8 years agolavc: Add data and linesize to AVSubtitleRect
Vittorio Giovara [Wed, 14 Oct 2015 09:33:25 +0000 (11:33 +0200)]
lavc: Add data and linesize to AVSubtitleRect

Use the new fields directly instead of the ones from AVPicture.
This removes a layer of indirection which serves no pratical purpose
whatsoever, and will help in removing AVPicture structure completely
later.

Every subtitle encoder/decoder seamlessly points to the new arrays,
so it is possible to deprecate AVSubtitleRect.pict.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
8 years agoReplace any remaining avpicture function with imgutils
Vittorio Giovara [Wed, 14 Oct 2015 09:33:24 +0000 (11:33 +0200)]
Replace any remaining avpicture function with imgutils

avpicture_get_size() -> av_image_get_buffer_size()

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
8 years agonuv: Replace avpicture functions with imgutils
Vittorio Giovara [Wed, 14 Oct 2015 09:33:23 +0000 (11:33 +0200)]
nuv: Replace avpicture functions with imgutils

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
8 years agodpx: Replace avpicture functions with imgutils
Vittorio Giovara [Wed, 14 Oct 2015 09:33:22 +0000 (11:33 +0200)]
dpx: Replace avpicture functions with imgutils

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
8 years agoroqvideodec: Replace avpicture functions with imgutils
Vittorio Giovara [Wed, 14 Oct 2015 09:33:21 +0000 (11:33 +0200)]
roqvideodec: Replace avpicture functions with imgutils

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
8 years agorawdec: Replace avpicture functions with imgutils
Luca Barbato [Wed, 14 Oct 2015 09:33:20 +0000 (11:33 +0200)]
rawdec: Replace avpicture functions with imgutils

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
8 years agorawenc: Replace avpicture functions with imgutils
Luca Barbato [Wed, 14 Oct 2015 09:33:19 +0000 (11:33 +0200)]
rawenc: Replace avpicture functions with imgutils

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
8 years agomsrle: Use AVFrame instead of AVPicture
Vittorio Giovara [Wed, 14 Oct 2015 09:33:18 +0000 (11:33 +0200)]
msrle: Use AVFrame instead of AVPicture

Callers always use a frame and cast it to AVPicture, change
ff_msrle_decode() to accept an AVFrame directly instead.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
8 years agolavf: add oggparsedaala and bump micro
Rostislav Pehlivanov [Wed, 21 Oct 2015 04:56:21 +0000 (05:56 +0100)]
lavf: add oggparsedaala and bump micro

This commit introduces a parser for the current bitstream produced by
Daala. It currently bears a large similarity with Theora, another
codec produced by Xiph. While likely to change in the future, its basic
format of packet parsing should remain fairly identical with its current
structure.
Once the bitstream freezes, there are a few probable simplifications
that could be made. Also, the current version (major, minor and micro)
is stuck at zero so it's unusable as a way to warn about possible
incompatibilities. This will change once the bitstream freezes,
however until then this file is strictly targeting the current git
master of the reference encoder, libdaala.

This file was developed independently at the same time by both myself
and Vittorio Giovara, who used libav as a starting point. For fairness,
and to prevent confusion and allegations, his name has been added to the
copyright in the license header as well, and vice versa.

8 years agolavc: add AV_CODEC_ID_DAALA to the list of codec IDs and bump minor
Rostislav Pehlivanov [Wed, 21 Oct 2015 03:44:35 +0000 (04:44 +0100)]
lavc: add AV_CODEC_ID_DAALA to the list of codec IDs and bump minor

This commit shall introduce the first step of adding support for the
Daala next generation video codec to FFmpeg. Although still in
development, the codec is showing good progress and exchanging work
through IETF drafts. The companies behind Daala are also participating
in the Alliance for Open Media, so it's likely that whatever the result
any of these collaborations produce it's probable that elements from
Daala could be used in them, or perhaps this codec itself could be the
result.

8 years agolibvpxenc: remove some unused ctrl id mappings
James Zern [Tue, 20 Oct 2015 05:44:11 +0000 (22:44 -0700)]
libvpxenc: remove some unused ctrl id mappings

VP8E_UPD_ENTROPY, VP8E_UPD_REFERENCE, VP8E_USE_REFERENCE were removed
from libvpx and the remaining values were never used here

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Zern <jzern@google.com>
8 years agohuffyuvencdsp: Convert ff_diff_bytes_mmx to yasm
Timothy Gu [Mon, 19 Oct 2015 01:25:11 +0000 (02:25 +0100)]
huffyuvencdsp: Convert ff_diff_bytes_mmx to yasm

Heavily based upon ff_add_bytes by Christophe Gisquet.

Reviewed-by: James Almer <jamrial@gmail.com>
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
8 years agoavfilter/vf_psnr: Add support for writing stats to stdout
Tobias Rapp [Tue, 20 Oct 2015 13:02:21 +0000 (15:02 +0200)]
avfilter/vf_psnr: Add support for writing stats to stdout

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
8 years agoavutil: merge avpriv_float_dsp_init into avpriv_float_dsp_alloc
Andreas Cadhalpun [Tue, 13 Oct 2015 23:42:14 +0000 (01:42 +0200)]
avutil: merge avpriv_float_dsp_init into avpriv_float_dsp_alloc

Also replace the last two usages of avpriv_float_dsp_init with
avpriv_float_dsp_alloc.

Reviewed-by: James Almer <jamrial@gmail.com>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
8 years agoavcodec: remove unused avpriv_ac3_parse_header
Andreas Cadhalpun [Tue, 13 Oct 2015 23:42:06 +0000 (01:42 +0200)]
avcodec: remove unused avpriv_ac3_parse_header

It was replaced by avpriv_ac3_parse_header2.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
8 years agoavutil: install des.h, rc4.h and tree.h as public headers
Andreas Cadhalpun [Tue, 13 Oct 2015 22:31:02 +0000 (00:31 +0200)]
avutil: install des.h, rc4.h and tree.h as public headers

These headers contain functions supposed to be public.

libavutil/des.h:
 av_des_alloc
 av_des_crypt
 av_des_init
 av_des_mac
libavutil/rc4.h:
 av_rc4_alloc
 av_rc4_crypt
 av_rc4_init
libavutil/tree.h
 av_tree_destroy
 av_tree_enumerate
 av_tree_find
 av_tree_insert
 av_tree_node_alloc
 av_tree_node_size

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
8 years agodnxhdenc: Optimize get_pixels_8x4_sym for 10-bit
Timothy Gu [Tue, 29 Sep 2015 23:50:02 +0000 (16:50 -0700)]
dnxhdenc: Optimize get_pixels_8x4_sym for 10-bit

This reverts commit 628e6d0164febc8e69b0f10dfa487e8a2dd1a28a and uses
a better fix.

Before:
4483 decicycles in get_pixels_8x4_sym,  131032 runs,     40 skips

After:
2569 decicycles in get_pixels_8x4_sym,  131054 runs,     18 skips

8 years agodca_parser: don't overwrite the sample rate, it may not be correct
Hendrik Leppkes [Wed, 30 Sep 2015 11:09:01 +0000 (13:09 +0200)]
dca_parser: don't overwrite the sample rate, it may not be correct

The parser only reads the dca core sample rate, which is limited to a
maximum of 48000 Hz, while X96 and HD extensions can increase the sample
rate up to 192000 Hz.

This change prevents the parser and decoder fighting over the sample rate,
potentially confusing user applications. This also fixes sample rate
display of >48000Hz files with ffmpeg/ffprobe when using libdcadec.

Fixes ticket #4397

8 years agoavformat/mp3dec: improve junk skipping heuristic
wm4 [Tue, 20 Oct 2015 10:17:21 +0000 (12:17 +0200)]
avformat/mp3dec: improve junk skipping heuristic

Commit 2b3e9bbfb529e6bde238aeb511b55ebe461664c8 caused problems for a
certain API user:

https://code.google.com/p/chromium/issues/detail?id=537725
https://code.google.com/p/chromium/issues/detail?id=542032

The problem seems rather arbitrary, because if there's junk, anything
can happen. In this case, the imperfect junk skipping just caused it to
read different junk, from what I can see.

We can improve the accuracy of junk detection by a lot by checking if 2
consecutive frames use the same configuration. While in theory it might
be completely fine for the 1st frame to have a different format than the
2nd frame, it's exceedingly unlikely, and I can't think of a legitimate
use-case.

This is approximately the same mpg123 does for junk skipping. The
set of compared header bits is the same as the libavcodec mp3 parser
uses for similar purposes.

8 years agoavformat: add wve demuxer
Paul B Mahol [Sun, 18 Oct 2015 22:03:10 +0000 (00:03 +0200)]
avformat: add wve demuxer

Signed-off-by: Paul B Mahol <onemda@gmail.com>
8 years agoavformat: add msf demuxer
Paul B Mahol [Sat, 17 Oct 2015 19:41:18 +0000 (21:41 +0200)]
avformat: add msf demuxer

Signed-off-by: Paul B Mahol <onemda@gmail.com>
8 years agocompat/solaris/make_sunver.pl: Use /usr/bin/env perl instead of /usr/bin/perl
Michael Niedermayer [Sun, 18 Oct 2015 00:20:32 +0000 (02:20 +0200)]
compat/solaris/make_sunver.pl: Use /usr/bin/env perl instead of /usr/bin/perl

This is how the other perl scripts in git call perl

Reviewed-by: Ganesh Ajjanagadde <gajjanag@mit.edu>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
8 years agohuffyuvencdsp: Use intptr_t for width
Timothy Gu [Mon, 19 Oct 2015 01:12:28 +0000 (02:12 +0100)]
huffyuvencdsp: Use intptr_t for width

It is done this way in huffyuvdsp as well.

8 years agox86: vc1dsp_mmx: Move yasm initiation steps to vc1dsp_init
Timothy Gu [Sat, 17 Oct 2015 23:38:00 +0000 (16:38 -0700)]
x86: vc1dsp_mmx: Move yasm initiation steps to vc1dsp_init

That's where all yasm initiation steps are. Also removes the overlap
between the two files.

8 years agox86: fpel: Remove erroneous ff_put_pixels8_mmxext prototype
Timothy Gu [Sat, 17 Oct 2015 23:34:07 +0000 (16:34 -0700)]
x86: fpel: Remove erroneous ff_put_pixels8_mmxext prototype

This function does not exist.

8 years agox86: fpel: Move prototypes for 4-px block functions
Timothy Gu [Sat, 17 Oct 2015 23:32:08 +0000 (16:32 -0700)]
x86: fpel: Move prototypes for 4-px block functions

8 years agoavcodec/mpegaudio_parser: Update comment to match code
Michael Niedermayer [Mon, 19 Oct 2015 20:14:10 +0000 (22:14 +0200)]
avcodec/mpegaudio_parser: Update comment to match code

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
8 years agovp9_parser: fix endless loop w/0-sized frame
James Zern [Fri, 16 Oct 2015 22:28:55 +0000 (15:28 -0700)]
vp9_parser: fix endless loop w/0-sized frame

treat this the same as an over-sized superframe packet to break out of
the parser loop and allow the decoder to fail.

Reviewed-by: Ronald S. Bultje <rsbultje@gmail.com>
Signed-off-by: James Zern <jzern@google.com>
8 years agoAPIchanges: Fill in missing dates and hashes
Vittorio Giovara [Wed, 14 Oct 2015 13:17:41 +0000 (15:17 +0200)]
APIchanges: Fill in missing dates and hashes

8 years agolavu/intmath.h: Move x86 only msvc/icl functions to x86 specific header.
Matt Oliver [Fri, 16 Oct 2015 06:00:13 +0000 (17:00 +1100)]
lavu/intmath.h: Move x86 only msvc/icl functions to x86 specific header.

Signed-off-by: Matt Oliver <protogonoi@gmail.com>
8 years agolavu/intmath.h: Add msvc/icl ctzll optimisations.
Matt Oliver [Fri, 16 Oct 2015 05:58:43 +0000 (16:58 +1100)]
lavu/intmath.h: Add msvc/icl ctzll optimisations.

Signed-off-by: Matt Oliver <protogonoi@gmail.com>
8 years agoavutil/opt: display a better default value for int/int64 options
Clément Bœsch [Sat, 17 Oct 2015 12:54:31 +0000 (14:54 +0200)]
avutil/opt: display a better default value for int/int64 options

Example:

% ./ffmpeg -h encoder=aac
  -aac_coder         <int>        E...A... Coding algorithm (from -1 to 3) (default twoloop)
     faac                         E...A... FAAC-inspired method
     anmr                         E...A... ANMR method
     twoloop                      E...A... Two loop searching method
     fast                         E...A... Constant quantizer
[...]

8 years agoavfilter/af_flanger: free frame on ENOMEM
Kyle Swanson [Thu, 15 Oct 2015 15:08:36 +0000 (10:08 -0500)]
avfilter/af_flanger: free frame on ENOMEM

Signed-off-by: Kyle Swanson <k@ylo.ph>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
8 years agoavutil: use EINVAL instead of -1 for the return code of crypto related init functions
Ganesh Ajjanagadde [Thu, 15 Oct 2015 23:36:22 +0000 (19:36 -0400)]
avutil: use EINVAL instead of -1 for the return code of crypto related init functions

These functions return an error typically when the key size is an
incorrect number. AVERROR(EINVAL) is more specific than -1.

Reviewed-by: Ronald S. Bultje <rsbultje@gmail.com>
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
8 years agoavformat/vag: Remove unused variable pos
Michael Niedermayer [Sat, 17 Oct 2015 21:35:29 +0000 (23:35 +0200)]
avformat/vag: Remove unused variable pos

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
8 years agoavfilter: add zscale filter
Paul B Mahol [Mon, 21 Sep 2015 13:34:15 +0000 (15:34 +0200)]
avfilter: add zscale filter

Signed-off-by: Paul B Mahol <onemda@gmail.com>