Commits · 73bed07373f2672275e33851ad31e447b73b08f9 · Linshizhi / ffmpeg.wasm-core

31 Aug, 2017 10 commits

avocdec/libopus: fix typo · 73bed073
pkviet authored Aug 31, 2017
```
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
```
73bed073

avformat/mov: prevent duplication of first fragment's ctts_data · feb1dbc7

Daniel Glöckner authored Aug 06, 2017

MP4 files with fragments might have the first moof box that is mentioned
in a fragment index before the first mdat box. Since it is then already
parsed by mov_read_header, we have to make sure that mov_switch_root
will not parse it again when seeking by setting the headers_read flag in
the index. Parsing it a second time would cause the ctts_data array to
receive a second copy of the information from the trun box, leading to
wrong PTS values for the second and following fragments in presence of
B-frames.

Fixes ticket 6560.
Signed-off-by: Daniel Glöckner <daniel-gl@gmx.net>
Reviewed-by: Dale Curtis <dalecurtis@chromium.org>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

feb1dbc7

avformat/mov: Bail when invalid sample data is present. · f1e47f87

Dale Curtis authored Jul 31, 2017

ctts data in ffmpeg relies on the index entries array to be 1:1
with samples... yet sc->sample_count can be read directly from
the 'stsz' box and index entries are only generated if a chunk
count has been read from 'stco' box.

Ensure that if sc->sample_count > 0, sc->chunk_count is too as
a basic sanity check. Additionally we need to check that after
the index is built we have the right number of entries, so we
also check in mov_read_trun() that sc->sample_count ==
st->nb_index_entries.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

f1e47f87

avformat/concatdec: add fallback for calculating file duration · 1a0d9b50

Justin Ruggles authored Aug 29, 2017

If a file does not have a known duration, this leads to the timestamps
starting over for the next file, causing non-monotonic timestamps.
To prevent this, track the duration during demuxing and use it to
determine the current file duration before opening the next file.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

1a0d9b50

avcodec/fits: add missing header includes · 1291a6d0
James Almer authored Aug 31, 2017
```
Fixes checkheaders.
Signed-off-by: James Almer <jamrial@gmail.com>
```
1291a6d0

fate: add tests for some video source filters · b7101151

Tobias Rapp authored Aug 17, 2017

Adds FATE tests for the previously untested allrgb, allyuv, rgbtestsrc,
smptebars, smptehdbars and yuvtestsrc filters.

Also adds a test for testsrc2 filter with rgb+alpha.
Tested-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Tobias Rapp <t.rapp@noa-archive.com>

b7101151

fate/flvenc: set bitexact output format flag explicitly · b34c16a3

James Almer authored Aug 31, 2017

Using the encoder flags to set the muxer in bitexact mode is deprecated.
Signed-off-by: James Almer <jamrial@gmail.com>

b34c16a3

ffmpeg_opt: add proper deprecation guards to lowres code · 6e131a7c
James Almer authored Aug 31, 2017
```
Signed-off-by: James Almer <jamrial@gmail.com>
```
6e131a7c
fate/pixlet : add test for rgb · 2fcf47e2
Martin Vignali authored Apr 02, 2017
```
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
```
2fcf47e2
avfilter/vf_mcdeint: remove usage of deprecated AVCodecContext.me_method · 027c682f
James Almer authored Aug 28, 2017
```
Signed-off-by: James Almer <jamrial@gmail.com>
```
027c682f

30 Aug, 2017 17 commits
- avfilter/af_adelay: remove requirement that at least one delay should be provided · 6ccd32c3
  Paul B Mahol authored Aug 30, 2017
```
Such requirement is not necessary and code works without it just fine.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
```
  6ccd32c3
- postproc: remove usage of deprecated QP_STORE_T define · 2b7da70a
  James Almer authored Aug 30, 2017
```
Signed-off-by: James Almer <jamrial@gmail.com>
```
  2b7da70a
- avfilter/vf_mcdeint: free the AVCodecContext struct properly · f7d4c60a
  James Almer authored Aug 30, 2017
```
Signed-off-by: James Almer <jamrial@gmail.com>
```
  f7d4c60a
- fate: stop using deprecated filter syntax in hls tests · ec07574a
  James Almer authored Aug 30, 2017
```
Signed-off-by: James Almer <jamrial@gmail.com>
```
  ec07574a
- fate: remove usage of deprecated AVCodecContext.me_method in vsynth snow tests · 350dc01d
  James Almer authored Aug 30, 2017
```
Signed-off-by: James Almer <jamrial@gmail.com>
```
  350dc01d
- configure: require pkg-config for libvmaf · 1dc33c12
  Ashish Singh authored Aug 01, 2017
```
This patch makes the libvmaf filter use pkg-config to detect
and link to libvmaf.
Signed-off-by: Ashish Singh <ashk43712@gmail.com>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
```
  1dc33c12
- avfilter/vf_libvmaf: fix pre convert to framesync2 bugs · 2a4a26fa
  Ashish Singh authored Aug 03, 2017
```
Hi, it fixes the errors while converting to framesync2.
libvmaf was changed recently, double *score variable is removed in the new
version since it's not used anywhere. This patch fixes all the warnings and
segmentation faults.
Signed-off-by: Ashish Singh <ashk43712@gmail.com>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
```
  2a4a26fa
- avcodec/codec_desc: make FITS description longer · 2b9fd157
  Paul B Mahol authored Aug 30, 2017
```
Signed-off-by: Paul B Mahol <onemda@gmail.com>
```
  2b9fd157
- avfilter/vf_lut2: add framesync options · a4d18a3f
  Paul B Mahol authored Aug 30, 2017
```
Also stop leaking memory.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
```
  a4d18a3f
- FATE: Add FITS tests · 9d99f0af
  Paras Chadha authored Aug 29, 2017
```
Signed-off-by: Paras Chadha <paraschadha18@gmail.com>
```
  9d99f0af
- Add FITS Muxer · df475db9
  Paras Chadha authored Aug 29, 2017
```
Signed-off-by: Paras Chadha <paraschadha18@gmail.com>
```
  df475db9
- Add FITS Encoder · 6e02f66f
  Paras Chadha authored Aug 29, 2017
```
Signed-off-by: Paras Chadha <paraschadha18@gmail.com>
```
  6e02f66f
- Add FITS Demuxer · 207f0cff
  Paras Chadha authored Aug 29, 2017
```
Signed-off-by: Paras Chadha <paraschadha18@gmail.com>
```
  207f0cff
- Add FITS Decoder · 61e4db4b
  Paras Chadha authored Aug 29, 2017
```
Signed-off-by: Paras Chadha <paraschadha18@gmail.com>
```
  61e4db4b
- compat/cuda/ptx2c: strip CR from each line · 7fbc0825
  Ricardo Constantino authored Aug 29, 2017
```
Windows nvcc + cl.exe produce a .ctx file with CR+LF newlines which
need to be stripped to work with gcc.
Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org>
```
  7fbc0825
- configure: add support for libnpp* from cuda sdk 9 · 1ac03c8d
  Timo Rothenpieler authored Aug 29, 2017
```
Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org>
```
  1ac03c8d
- avformat/mxfenc: Replace literal numbers by named enum values. · f762555a
  Michael Niedermayer authored Aug 29, 2017
```
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
```
  f762555a
29 Aug, 2017 13 commits

avcodec/snowdec: Fix integer overflow in decode_subband_slice_buffered() · 732f9764

Michael Niedermayer authored Aug 27, 2017

Fixes: runtime error: signed integer overflow: 267 * 8388608 cannot be represented in type 'int'
Fixes: 2743/clusterfuzz-testcase-minimized-5820652076400640

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpegSigned-off-by: Michael Niedermayer <michael@niedermayer.cc>

732f9764

avcodec/hevc_ps: Fix undefined shift in pcm code · 2a83866c

Michael Niedermayer authored Aug 27, 2017

Fixes: runtime error: shift exponent -1 is negative
Fixes: 3091/clusterfuzz-testcase-minimized-6229767969832960

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpegSigned-off-by: Michael Niedermayer <michael@niedermayer.cc>

2a83866c

avcodec/h264idct_template: Fix integer overflow in ff_h264_idct8_add() · 6def8b8d

Michael Niedermayer authored Aug 16, 2017

Fixes: 2891/clusterfuzz-testcase-minimized-5881795457318912
Fixes: runtime error: signed integer overflow: 1551827968 - -775913984 cannot be represented in type 'int'

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpegSigned-off-by: Michael Niedermayer <michael@niedermayer.cc>

6def8b8d

avformat/mxfenc: Check that the video codec in D-10 is MPEG-2 · 429f3266

Michael Niedermayer authored Aug 29, 2017

Others do not work, but nothing rejects them prior to this patch if the
parameters otherwise match
Reviewed-by: Matthieu Bouron <matthieu.bouron@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

429f3266

lavfi: bump minor version after change in options. · 7302d5e3
Nicolas George authored Aug 29, 2017

7302d5e3
doc/filters: document framesync options. · 844bc0d8
Nicolas George authored Aug 10, 2017

844bc0d8
lavfi: remove dualinput. · 607900c9
Nicolas George authored Jul 31, 2017

607900c9
vf_ssim: convert to framesync2. · ef217647
Nicolas George authored Jul 31, 2017

ef217647
lavfi/vf_psnr: convert to framesync2. · 3bd11df4
Nicolas George authored Jul 31, 2017

3bd11df4
lavfi/vf_paletteuse: convert to framesync2. · 23000c3d
Nicolas George authored Jul 31, 2017

23000c3d
lavfi/vf_lut3d: convert to framesync2. · eacb3ec9
Nicolas George authored Jul 31, 2017

eacb3ec9

lavfi/vf_libvmaf: convert to framesync2. · a8ab52fa

Nicolas George authored Jul 31, 2017

After this commit, the code compiles, but on my setup it
segfaults before and after. It also prints the very worrying
warning:

src/libavfilter/vf_libvmaf.c:161:66: warning: passing argument 4 of ‘compute_vmaf’ from incompatible pointer type [-Wincompatible-pointer-types]
/tmp/i/include/libvmaf.h:26:8: note: expected ‘int (*)(float *, float *, float *, int,  void *)’ but argument is of type ‘int (*)(float *, float *, float *, int,  double *, void *)’

==12116== Thread 6:
==12116== Conditional jump or move depends on uninitialised value(s)
==12116==    at 0x526D432: cons_ (ocval.h:1188)
==12116==    by 0x526D432: GenericIT (ocval.h:1119)
==12116==    by 0x526D432: OC::TranslateForNumPyClassesToArray(OC::Val&) (pickleloader.h:92)
==12116==    by 0x5211F5D: loads (pickleloader.h:566)
==12116==    by 0x5211F5D: LoadValFromArray (chooseser.h:290)
==12116==    by 0x5211F5D: LoadValFromFile (chooseser.h:405)
==12116==    by 0x5211F5D: _read_and_assert_model(char const*, OC::Val&, OC::Val&, OC::Val&, OC::Val&, OC::Val&, OC::Val&) (vmaf.cpp:77)
==12116==    by 0x5212B0F: VmafRunner::run(Asset, int (*)(float*, float*, float*, int, void*), void*, bool, bool, bool, bool, bool) (vmaf.cpp:149)
==12116==    by 0x52165B6: RunVmaf(char const*, int, int, int (*)(float*, float*, float*, int, void*), void*, char const*, char const*, char const*, bool, bool, bool, bool, bool, char const*) (vmaf.cpp:645)
==12116==    by 0x518AFFF: compute_vmaf_score (vf_libvmaf.c:161)
==12116==    by 0x518AFFF: call_vmaf (vf_libvmaf.c:170)
==12116==    by 0x7967493: start_thread (pthread_create.c:333)
==12116==    by 0x7F69A8E: clone (clone.S:97)
==12116==
==12116== Conditional jump or move depends on uninitialised value(s)
==12116==    at 0x526D432: cons_ (ocval.h:1188)
==12116==    by 0x526D432: GenericIT (ocval.h:1119)
==12116==    by 0x526D432: OC::TranslateForNumPyClassesToArray(OC::Val&) (pickleloader.h:92)
==12116==    by 0x526D50D: OC::TranslateForNumPyClassesToArray(OC::Val&) (pickleloader.h:94)
==12116==    by 0x5211F5D: loads (pickleloader.h:566)
==12116==    by 0x5211F5D: LoadValFromArray (chooseser.h:290)
==12116==    by 0x5211F5D: LoadValFromFile (chooseser.h:405)
==12116==    by 0x5211F5D: _read_and_assert_model(char const*, OC::Val&, OC::Val&, OC::Val&, OC::Val&, OC::Val&, OC::Val&) (vmaf.cpp:77)
==12116==    by 0x5212B0F: VmafRunner::run(Asset, int (*)(float*, float*, float*, int, void*), void*, bool, bool, bool, bool, bool) (vmaf.cpp:149)
==12116==    by 0x52165B6: RunVmaf(char const*, int, int, int (*)(float*, float*, float*, int, void*), void*, char const*, char const*, char const*, bool, bool, bool, bool, bool, char const*) (vmaf.cpp:645)
==12116==    by 0x518AFFF: compute_vmaf_score (vf_libvmaf.c:161)
==12116==    by 0x518AFFF: call_vmaf (vf_libvmaf.c:170)
==12116==    by 0x7967493: start_thread (pthread_create.c:333)
==12116==    by 0x7F69A8E: clone (clone.S:97)
==12116==
==12116== Conditional jump or move depends on uninitialised value(s)
==12116==    at 0x526D432: cons_ (ocval.h:1188)
==12116==    by 0x526D432: GenericIT (ocval.h:1119)
==12116==    by 0x526D432: OC::TranslateForNumPyClassesToArray(OC::Val&) (pickleloader.h:92)
==12116==    by 0x526D50D: OC::TranslateForNumPyClassesToArray(OC::Val&) (pickleloader.h:94)
==12116==    by 0x526D50D: OC::TranslateForNumPyClassesToArray(OC::Val&) (pickleloader.h:94)
==12116==    by 0x5211F5D: loads (pickleloader.h:566)
==12116==    by 0x5211F5D: LoadValFromArray (chooseser.h:290)
==12116==    by 0x5211F5D: LoadValFromFile (chooseser.h:405)
==12116==    by 0x5211F5D: _read_and_assert_model(char const*, OC::Val&, OC::Val&, OC::Val&, OC::Val&, OC::Val&, OC::Val&) (vmaf.cpp:77)
==12116==    by 0x5212B0F: VmafRunner::run(Asset, int (*)(float*, float*, float*, int, void*), void*, bool, bool, bool, bool, bool) (vmaf.cpp:149)
==12116==    by 0x52165B6: RunVmaf(char const*, int, int, int (*)(float*, float*, float*, int, void*), void*, char const*, char const*, char const*, bool, bool, bool, bool, bool, char const*) (vmaf.cpp:645)
==12116==    by 0x518AFFF: compute_vmaf_score (vf_libvmaf.c:161)
==12116==    by 0x518AFFF: call_vmaf (vf_libvmaf.c:170)
==12116==    by 0x7967493: start_thread (pthread_create.c:333)
==12116==    by 0x7F69A8E: clone (clone.S:97)
==12116==
==12116== Use of uninitialised value of size 8
==12116==    at 0x518AC79: read_frame_8bit (vf_libvmaf.c:147)
==12116==    by 0x52AB5E8: combo (combo.c:149)
==12116==    by 0x5212E95: VmafRunner::run(Asset, int (*)(float*, float*, float*, int, void*), void*, bool, bool, bool, bool, bool) (vmaf.cpp:278)
==12116==    by 0x52165B6: RunVmaf(char const*, int, int, int (*)(float*, float*, float*, int, void*), void*, char const*, char const*, char const*, bool, bool, bool, bool, bool, char const*) (vmaf.cpp:645)
==12116==    by 0x518AFFF: compute_vmaf_score (vf_libvmaf.c:161)
==12116==    by 0x518AFFF: call_vmaf (vf_libvmaf.c:170)
==12116==    by 0x7967493: start_thread (pthread_create.c:333)
==12116==    by 0x7F69A8E: clone (clone.S:97)
==12116==
==12116== Invalid read of size 4
==12116==    at 0x518AC79: read_frame_8bit (vf_libvmaf.c:147)
==12116==    by 0x52AB5E8: combo (combo.c:149)
==12116==    by 0x5212E95: VmafRunner::run(Asset, int (*)(float*, float*, float*, int, void*), void*, bool, bool, bool, bool, bool) (vmaf.cpp:278)
==12116==    by 0x52165B6: RunVmaf(char const*, int, int, int (*)(float*, float*, float*, int, void*), void*, char const*, char const*, char const*, bool, bool, bool, bool, bool, char const*) (vmaf.cpp:645)
==12116==    by 0x518AFFF: compute_vmaf_score (vf_libvmaf.c:161)
==12116==    by 0x518AFFF: call_vmaf (vf_libvmaf.c:170)
==12116==    by 0x7967493: start_thread (pthread_create.c:333)
==12116==    by 0x7F69A8E: clone (clone.S:97)
==12116==  Address 0x40 is not stack'd, malloc'd or (recently) free'd
==12116==
==12116==
==12116== Process terminating with default action of signal 11 (SIGSEGV)
==12116==  Access not within mapped region at address 0x40
==12116==    at 0x518AC79: read_frame_8bit (vf_libvmaf.c:147)
==12116==    by 0x52AB5E8: combo (combo.c:149)
==12116==    by 0x5212E95: VmafRunner::run(Asset, int (*)(float*, float*, float*, int, void*), void*, bool, bool, bool, bool, bool) (vmaf.cpp:278)
==12116==    by 0x52165B6: RunVmaf(char const*, int, int, int (*)(float*, float*, float*, int, void*), void*, char const*, char const*, char const*, bool, bool, bool, bool, bool, char const*) (vmaf.cpp:645)
==12116==    by 0x518AFFF: compute_vmaf_score (vf_libvmaf.c:161)
==12116==    by 0x518AFFF: call_vmaf (vf_libvmaf.c:170)
==12116==    by 0x7967493: start_thread (pthread_create.c:333)
==12116==    by 0x7F69A8E: clone (clone.S:97)

a8ab52fa

lavfi/vf_blend: convert to framesync2. · c1d8d33a
Nicolas George authored Jul 31, 2017

c1d8d33a