1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Commit Graph

83344 Commits

Author SHA1 Message Date
Michael Niedermayer
8bdba1092f tools/target_dec_fuzzer: Only audio uses the return value to decode packets in pieces, correct the code to match that
Fixes: Timeout
Fixes: 483/fuzz-0-ffmpeg_VIDEO_AV_CODEC_ID_H263I_fuzzer

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-01-31 23:43:41 +01:00
James Almer
1df08cae82 Merge commit 'b4bb9593834460bbbe0e70823f2c503cb01ad052'
* commit 'b4bb9593834460bbbe0e70823f2c503cb01ad052':
  ratecontrol: Drop commented out cruft

Merged-by: James Almer <jamrial@gmail.com>
2017-01-31 15:50:56 -03:00
James Almer
ba5d089381 Merge commit 'd06dfaa5cbdd20acfd2364b16c0f4ae4ddb30a65'
* commit 'd06dfaa5cbdd20acfd2364b16c0f4ae4ddb30a65':
  x86: huffyuv: Use EXTERNAL_SSSE3_FAST convenience macro where appropriate

Merged-by: James Almer <jamrial@gmail.com>
2017-01-31 15:36:49 -03:00
James Almer
8d5df204d0 Merge commit '8e9cd81d291b1010c625b2766058aadf4affb537'
* commit '8e9cd81d291b1010c625b2766058aadf4affb537':
  x86: cpu: Detect Conroe CPUs and their slow shuffle unit

Merged-by: James Almer <jamrial@gmail.com>
2017-01-31 15:20:54 -03:00
James Almer
2eab48177d Merge commit '7d7355aa92bb36ca0765c49a569a999bcb96f332'
* commit '7d7355aa92bb36ca0765c49a569a999bcb96f332':
  x86: Add SSSE3_SLOW CPU flag and related convenience macros

Merged-by: James Almer <jamrial@gmail.com>
2017-01-31 15:17:19 -03:00
James Almer
ac774cfa57 Merge commit '4efab89332ea39a77145e8b15562b981d9dbde68'
* commit '4efab89332ea39a77145e8b15562b981d9dbde68':
  x86: Use *_FAST/*_SLOW CPU feature detection macros where appropriate

Merged-by: James Almer <jamrial@gmail.com>
2017-01-31 15:08:19 -03:00
James Almer
a956164e1e Merge commit '0a39c9ac0bfd7345fe676b4e2707d9cec3cbb553'
* commit '0a39c9ac0bfd7345fe676b4e2707d9cec3cbb553':
  x86: hpeldsp: Don't check for bitexact flag when initializing VP3-specific code

Merged-by: James Almer <jamrial@gmail.com>
2017-01-31 14:59:29 -03:00
James Almer
f6005907fd Merge commit '95c1df929b92d81454656c222a35ec5f7db576b4'
* commit '95c1df929b92d81454656c222a35ec5f7db576b4':
  x86: hpeldsp: Drop unused function parameters

Merged-by: James Almer <jamrial@gmail.com>
2017-01-31 14:56:11 -03:00
James Almer
4d0e89ce27 Merge commit 'c3e83ad3b7d75f3597f47ada2616ba4479665009'
* commit 'c3e83ad3b7d75f3597f47ada2616ba4479665009':
  x86: hpeldsp: Use EXTERNAL_SSE2_FAST where appropriate

Merged-by: James Almer <jamrial@gmail.com>
2017-01-31 14:53:27 -03:00
James Almer
ca8a3978e5 Merge commit '1dfc3cf89d0eb026af28be46294b85d79499ffb5'
* commit '1dfc3cf89d0eb026af28be46294b85d79499ffb5':
  x86: hpeldsp: Split off VP3-specific bits into a separate file

Merged-by: James Almer <jamrial@gmail.com>
2017-01-31 14:49:29 -03:00
Michael Niedermayer
4818840809 MAINTAINERS: Add myself for boadec.c
It seems ive written this thing though i cannot really remember

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-01-31 18:41:49 +01:00
Clément Bœsch
126e96533f Merge commit '9833a406d3d743d238e4cbee08ffcaa12e067dd2'
* commit '9833a406d3d743d238e4cbee08ffcaa12e067dd2':
  examples: Properly free AVCodecContext

Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-01-31 17:35:41 +01:00
Clément Bœsch
591cf8aa0e Merge commit '0e0538aefc75958ded49f5d075c99a81cf6b2bbb'
* commit '0e0538aefc75958ded49f5d075c99a81cf6b2bbb':
  avprobe: Zero the allocated avio buffer memory

This commit is a noop, no such thing exists in ffprobe.

Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-01-31 17:32:03 +01:00
Clément Bœsch
b9292a9698 Merge commit '5d0f85f1b2469b60d0838330aabe5353fdd9ef1d'
* commit '5d0f85f1b2469b60d0838330aabe5353fdd9ef1d':
  libdc1394: Fill in packet data directly

Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-01-31 17:27:46 +01:00
Clément Bœsch
fa02765886 Merge commit 'e344e65109f1a75ca82aff4cecec44e79197753c'
* commit 'e344e65109f1a75ca82aff4cecec44e79197753c':
  h264dec: do not call finish_setup() if we have not started a frame

This commit is a noop, see bdbbb8f11e

Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-01-31 17:26:26 +01:00
Clément Bœsch
4039076dc3 Merge commit '76f7e70aa04fc5dbef5242b11cbf8fe4499f61d4'
* commit '76f7e70aa04fc5dbef5242b11cbf8fe4499f61d4':
  h264dec: handle zero-sized NAL units in get_last_needed_nal()

See 641dccc2aa

Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-01-31 17:23:14 +01:00
Clément Bœsch
5f633c39cd Merge commit '1f7b4f9abc6bae94e576e710b8d10117ca3c8238'
* commit '1f7b4f9abc6bae94e576e710b8d10117ca3c8238':
  h264dec: make sure not to call finish_setup() more than once per frame

This commit is a noop, see bdbbb8f11e

Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-01-31 17:11:24 +01:00
Clément Bœsch
dc0ca508ea Merge commit 'da917fcf5183ed249ad1285b8edd330f421376c4'
* commit 'da917fcf5183ed249ad1285b8edd330f421376c4':
  avconv_dxva2: add a profile check for hevc

This commit is a noop, see a655bc8344

Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-01-31 17:06:49 +01:00
Clément Bœsch
7c300a8ed4 lavc/hevc: remove a few random spaces to reduce diff with libav 2017-01-31 17:02:24 +01:00
Clément Bœsch
bd370738ba Merge commit '1ecb63cd1c1a4ddc5efed4abbc3158b969d8c5e4'
* commit '1ecb63cd1c1a4ddc5efed4abbc3158b969d8c5e4':
  hevc: set profile based on the profile compatibility flags if needed

This commit is a noop, see f85cc3bf12

Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-01-31 16:57:18 +01:00
Clément Bœsch
78d16eb452 Merge commit 'fca3c3b61952aacc45e9ca54d86a762946c21942'
* commit 'fca3c3b61952aacc45e9ca54d86a762946c21942':
  hevc: Add AVX2 DC IDCT

Mostly noop as we already have that code.

In the ASM, code is merged with the exception of SECTION which is kept
uppercase for consistency with the rest of the codebase.

Still in the ASM, the prototype comment is fixed to honor the '_' added
from the original commit.

idct_dc_proto() is dropped as it's not used anymore here.

Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-01-31 16:53:37 +01:00
Clément Bœsch
05018c2cda Merge commit 'cc16da75c2f99d92f7a6461100f041352deb6d88'
* commit 'cc16da75c2f99d92f7a6461100f041352deb6d88':
  hevc: Add coefficient limiting to speed up IDCT

Noop again as we have these changes already, only random spacing
changes.

Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-01-31 16:05:06 +01:00
Clément Bœsch
a604115f72 Merge commit 'a92fd8a06256e71a0be87b03751ec3c2a4a8aa21'
* commit 'a92fd8a06256e71a0be87b03751ec3c2a4a8aa21':
  hevc: Add DC IDCT

Noop, only spacing adjusted.

Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-01-31 15:55:44 +01:00
Clément Bœsch
2456efcc0f Merge commit '4f247de3b797cdc9d243d26534412f81c306e5b5'
* commit '4f247de3b797cdc9d243d26534412f81c306e5b5':
  hevcdsp_template: Templatize IDCT

This commit is a noop as we already have that code from a previous
commits (see 92cccb7bcd).

Spacing is adjusted to reduce the diff.

Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-01-31 15:49:12 +01:00
Clément Bœsch
d0e132bab6 Merge commit '1bd890ad173d79e7906c5e1d06bf0a06cca4519d'
* commit '1bd890ad173d79e7906c5e1d06bf0a06cca4519d':
  hevc: Separate adding residual to prediction from IDCT

This commit should be a noop but isn't because of the following renames:

- transform_add  → add_residual
- transform_skip → dequant
- idct_4x4_luma  → transform_4x4_luma

Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-01-31 15:31:34 +01:00
Tobias Rapp
c778a9657d doc/muxers: add AVI muxer documentation
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Tobias Rapp <t.rapp@noa-archive.com>
2017-01-31 15:08:37 +01:00
Paul B Mahol
3405d6c7bc avfilter/overlay: add gbrp output format
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2017-01-31 10:54:03 +01:00
Carl Eugen Hoyos
12f7c091e8 lavc/alac: Export samplerate.
Fixes ticket #6096.
2017-01-31 10:49:40 +01:00
Moritz Barsnick
0478728db0 lavf/xwma: fix incorrect format specifier
Signed-off-by: Moritz Barsnick <barsnick@gmx.net>
2017-01-31 10:42:14 +01:00
Tobias Rapp
e65db4ce59 avformat/avienc: add reserve_index_space option
Allows the user to reserve space for the ODML master index. A sufficient
sized master index in the AVI header avoids storing follow-up master
indexes within the 'movi' data later. If the option is omitted or zero
the index size is estimated from output duration and bitrate.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Tobias Rapp <t.rapp@noa-archive.com>
2017-01-31 09:00:23 +01:00
Andreas Cadhalpun
3d673078a0 ircamdec: prevent overflow during block alignment calculation
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
2017-01-31 02:11:17 +01:00
Marton Balint
d25769555b avutil/frame: fix av_frame_copy for unknown layouts
I wonder how unknown layouts ever worked without this?

Reviewed-by: Nicolas George <george@nsup.org>
Reviewed-by: Hendrik Leppkes <h.leppkes@gmail.com>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Marton Balint <cus@passwd.hu>
2017-01-31 00:29:49 +01:00
Michael Niedermayer
06c143e505 avformat/mov: Fix integer truncation in mov_read_uuid()
Fixes Ticket6102

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-01-30 23:19:01 +01:00
Paul B Mahol
acf1dd5b74 avfilter: add threshold filter
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2017-01-30 18:44:08 +01:00
bnnm
ebb83e2dc0 avformat/msf: fix codec 4 (joint stereo ATRAC3) and align
Codec 4 (frame size 98) uses joint stereo per spec and examples.
Also removed an incorrect "align" var which wasn't used anyway (it was overwrittern).

Probably all/only .AT3 of frame size 98 are JS, too.

Signed-off-by: bnnm <bananaman255@gmail.com>
2017-01-30 13:01:07 +01:00
Tobias Rapp
ec33ade7d3 avformat/Makefile: fix compilation of testprogs when networking is disabled
Signed-off-by: Tobias Rapp <t.rapp@noa-archive.com>
2017-01-30 12:14:43 +01:00
Clément Bœsch
de2f9f4b71 doc/libav-merge: add unmerged hevc commits hashes 2017-01-30 12:03:30 +01:00
Clément Bœsch
3a3554871a lavc/hevcdsp: fix pretty printing mistake
"Issue" introduced in 83976e40e8.
2017-01-30 12:03:30 +01:00
Paul B Mahol
13564fc24d avutil/eval: add atan2 function
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2017-01-30 11:04:31 +01:00
Paul B Mahol
036e12b225 avformat: add SCC muxer
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2017-01-30 11:00:58 +01:00
Paul B Mahol
76331361a5 avformat/sccdec: simplify 2 sscanf calls
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2017-01-30 11:00:58 +01:00
Andreas Cadhalpun
cba4f0e97e xvag: prevent overflow during block alignment calculation
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
2017-01-30 01:40:48 +01:00
Andreas Cadhalpun
74bd17d316 epafdec: prevent overflow during block alignment calculation
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
2017-01-30 01:40:48 +01:00
Andreas Cadhalpun
5b0ae88ca6 genh: prevent overflow during block alignment calculation
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
2017-01-30 01:40:48 +01:00
Muhammad Faiz
c4a3526b57 avfilter/showcqt: make minimum timeclamp option lower
high basefreq does not require high timeclamp

Signed-off-by: Muhammad Faiz <mfcc64@gmail.com>
2017-01-30 05:41:49 +07:00
Matthieu Bouron
2ae8278832 lavc/mjpegdec: consume SOS data even if the frame is discarded
Speeds up next marker search when a SOS marker is found but the frame is
discarded (which happens in avformat_find_stream_info).
2017-01-29 21:54:16 +01:00
Nicolas George
383057f8e7 lavfi: make ff_framequeue_skip_samples() more useful.
Instead of just updating statistics and leaving the work to the
call site, have it actually do the work.

Also: skip the samples by updating the frame data pointers
instead of moving the samples. More efficient and avoid writing
into shared frames.
Found-By: Muhammad Faiz <mfcc64@gmail.com>
2017-01-29 18:53:11 +01:00
Rostislav Pehlivanov
e05d2dd86a doc/examples/decoder_targeted: move to tools/target_dec_fuzzer.c
Name and purpose are more appropriate there since the code isn't
an ideal example.

Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
2017-01-29 16:14:18 +00:00
Michael Niedermayer
bbd4d92304 doc/examples/decoder_targeted: Disable error concealment after 20 frames
This allows testing EC and non EC. Avoids spending most time in EC on
high res samples and reduces the likelyhood of hitting timeouts

Fixes: Timeout in 467/fuzz-2-ffmpeg_VIDEO_AV_CODEC_ID_H263_fuzzer

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-01-29 16:09:55 +01:00
Paul B Mahol
c6f7f33eec avfilter/vf_remap: add . at end of long description
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2017-01-29 13:29:33 +01:00