Commits · e5d217f04899e00b5d6af11fa396242649e75cc1 · Linshizhi / ffmpeg.wasm-core

30 Nov, 2014 12 commits

libavformat/mxfdec.c: initial support for EssenceGroups · e5d217f0

Mark Reid authored Nov 30, 2014

Previous version reviewed-by: Tomas Härdin <tomas.hardin@codemill.se>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

e5d217f0

LICENSE.md: Add tests/reference.pnm · 21c0c0f9
Michael Niedermayer authored Nov 30, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
21c0c0f9

Merge commit '' · d828b081

Michael Niedermayer authored Nov 30, 2014

* commit '8895bf7b':
  Replace lena.pnm

Conflicts:
	tests/Makefile
	tests/ref/seek/vsynth2-asv1
	tests/ref/seek/vsynth2-asv2
	tests/ref/seek/vsynth2-ffv1
	tests/ref/seek/vsynth2-flashsv
	tests/ref/seek/vsynth2-flv
	tests/ref/seek/vsynth2-h261
	tests/ref/seek/vsynth2-h263
	tests/ref/seek/vsynth2-h263p
	tests/ref/seek/vsynth2-huffyuv
	tests/ref/seek/vsynth2-ljpeg
	tests/ref/seek/vsynth2-mjpeg
	tests/ref/seek/vsynth2-mpeg1
	tests/ref/seek/vsynth2-mpeg1b
	tests/ref/seek/vsynth2-mpeg2-422
	tests/ref/seek/vsynth2-mpeg2-idct-int
	tests/ref/seek/vsynth2-mpeg2-ilace
	tests/ref/seek/vsynth2-mpeg2-ivlc-qprd
	tests/ref/seek/vsynth2-mpeg2-thread
	tests/ref/seek/vsynth2-mpeg2-thread-ivlc
	tests/ref/seek/vsynth2-mpeg4
	tests/ref/seek/vsynth2-mpeg4-adap
	tests/ref/seek/vsynth2-mpeg4-error
	tests/ref/seek/vsynth2-mpeg4-nr
	tests/ref/seek/vsynth2-mpeg4-qpel
	tests/ref/seek/vsynth2-mpeg4-qprd
	tests/ref/seek/vsynth2-mpeg4-rc
	tests/ref/seek/vsynth2-mpeg4-thread
	tests/ref/seek/vsynth2-msmpeg4
	tests/ref/seek/vsynth2-msmpeg4v2
	tests/ref/seek/vsynth2-roqvideo
	tests/ref/seek/vsynth2-rv10
	tests/ref/seek/vsynth2-rv20
	tests/ref/seek/vsynth2-svq1
	tests/ref/seek/vsynth2-wmv1
	tests/ref/seek/vsynth2-wmv2
	tests/ref/vsynth/vsynth2-asv1
	tests/ref/vsynth/vsynth2-asv2
	tests/ref/vsynth/vsynth2-cljr
	tests/ref/vsynth/vsynth2-dnxhd-1080i
	tests/ref/vsynth/vsynth2-dnxhd-720p
	tests/ref/vsynth/vsynth2-dnxhd-720p-10bit
	tests/ref/vsynth/vsynth2-dnxhd-720p-rd
	tests/ref/vsynth/vsynth2-dv
	tests/ref/vsynth/vsynth2-dv-411
	tests/ref/vsynth/vsynth2-dv-50
	tests/ref/vsynth/vsynth2-ffv1
	tests/ref/vsynth/vsynth2-ffvhuff
	tests/ref/vsynth/vsynth2-flashsv
	tests/ref/vsynth/vsynth2-flv
	tests/ref/vsynth/vsynth2-h261
	tests/ref/vsynth/vsynth2-h263
	tests/ref/vsynth/vsynth2-h263-obmc
	tests/ref/vsynth/vsynth2-h263p
	tests/ref/vsynth/vsynth2-huffyuv
	tests/ref/vsynth/vsynth2-jpegls
	tests/ref/vsynth/vsynth2-ljpeg
	tests/ref/vsynth/vsynth2-mjpeg
	tests/ref/vsynth/vsynth2-mpeg1
	tests/ref/vsynth/vsynth2-mpeg1b
	tests/ref/vsynth/vsynth2-mpeg2
	tests/ref/vsynth/vsynth2-mpeg2-422
	tests/ref/vsynth/vsynth2-mpeg2-idct-int
	tests/ref/vsynth/vsynth2-mpeg2-ilace
	tests/ref/vsynth/vsynth2-mpeg2-ivlc-qprd
	tests/ref/vsynth/vsynth2-mpeg2-thread
	tests/ref/vsynth/vsynth2-mpeg2-thread-ivlc
	tests/ref/vsynth/vsynth2-mpeg4
	tests/ref/vsynth/vsynth2-mpeg4-adap
	tests/ref/vsynth/vsynth2-mpeg4-adv
	tests/ref/vsynth/vsynth2-mpeg4-error
	tests/ref/vsynth/vsynth2-mpeg4-nr
	tests/ref/vsynth/vsynth2-mpeg4-qpel
	tests/ref/vsynth/vsynth2-mpeg4-qprd
	tests/ref/vsynth/vsynth2-mpeg4-rc
	tests/ref/vsynth/vsynth2-mpeg4-thread
	tests/ref/vsynth/vsynth2-msmpeg4
	tests/ref/vsynth/vsynth2-msmpeg4v2
	tests/ref/vsynth/vsynth2-prores
	tests/ref/vsynth/vsynth2-qtrle
	tests/ref/vsynth/vsynth2-rgb
	tests/ref/vsynth/vsynth2-roqvideo
	tests/ref/vsynth/vsynth2-rv10
	tests/ref/vsynth/vsynth2-rv20
	tests/ref/vsynth/vsynth2-svq1
	tests/ref/vsynth/vsynth2-v210
	tests/ref/vsynth/vsynth2-wmv1
	tests/ref/vsynth/vsynth2-wmv2
	tests/ref/vsynth/vsynth2-yuv

See: c4abee73Merged-by: Michael Niedermayer <michaelni@gmx.at>

d828b081

Merge commit '' · 79440651

Michael Niedermayer authored Nov 30, 2014

* commit '0f257e29':
  Treat all '*.pnm' files as non-text file
Merged-by: Michael Niedermayer <michaelni@gmx.at>

79440651

ffmpeg: take bsf arguments from the command line · 4c592c39

Christophe Gisquet authored Nov 29, 2014

The format is now:
-bsf:X filter1[=opt1=str1/opt2=str2],filter2
ie the parameters are appended after the filter name using '='. As ','
has been reserved already for the list of filters, '/' is just an
example of token separation for now, but that could become part of the
API to avoid each bsf using its own tokenization.

The proper solution would be using AVOption, but this is overkill for now.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

4c592c39

avcodec/adxenc: fix rounding · 0b5adc35
Michael Niedermayer authored Nov 30, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
0b5adc35
avcodec/adxenc: match prediction used in the decoder · 6b0ab561
Michael Niedermayer authored Nov 30, 2014
```
The prediction used in the encoder was not correct
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
6b0ab561
avcodec/atrac3: Use avpriv_float_dsp_alloc() · 93f959b6
Michael Niedermayer authored Nov 30, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
93f959b6
avcodec/libmp3lame: Use avpriv_float_dsp_alloc() · 1aca990b
Michael Niedermayer authored Nov 30, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
1aca990b
avcodec/wma: Use avpriv_float_dsp_alloc() · 2fbb9e64
Michael Niedermayer authored Nov 30, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
2fbb9e64

h264_ps: move and export aspect_ratio · 6a2bfd52

Christophe Gisquet authored Nov 30, 2014

Needed for filters that may need it, like an SPS bsf.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

6a2bfd52

avformat/riffdec: ask for samples with wav header size < 14 · e74f2be1
Michael Niedermayer authored Nov 30, 2014
```
Based on commit by Hendrik Leppkes <h.leppkes@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
e74f2be1

29 Nov, 2014 11 commits

avfilter/vf_yadif: fix extra leading dup frame when deint=1 · e4788e9c

Neil Birkbeck authored Nov 29, 2014

Logic for handling single frame in yadif (0f9f24c9), caused deint=1 (e.g., yadif=0:-1:1) to output extra duplicate leading frame:

ffmpeg -i fate-suite/ffmpeg-synthetic/vsynth1/%02d.pgm  -vf yadif=0:-1:1,showinfo -f null -y /dev/null
 [Parsed_showinfo_1 @ 0x1d967d0] n:0 pts:0 pts_time:0 pos:-1 fmt:gray sar:0/1 s:352x432 i:P iskey:1 type:I checksum:E457EEA0 plane_checksum:[E457EEA0] mean:[126] stdev:[46.6]
 [Parsed_showinfo_1 @ 0x1d967d0] n:1 pts:0 pts_time:0 pos:-1 fmt:gray sar:0/1 s:352x432 i:P iskey:1 type:I checksum:E457EEA0 plane_checksum:[E457EEA0] mean:[126] stdev:[46.6]
(Outputs 51 frames)

After patch, vf "yadif=0:-1:1" behaves correctly (like "yadif=0:-1:0") and outputs 50 frames, first two:

[Parsed_showinfo_1 @ 0x1e307d0] n:0 pts:0 pts_time:0 pos:-1 fmt:gray sar:0/1 s:352x432 i:P iskey:1 type:I checksum:68E8D1EB plane_checksum:[68E8D1EB] mean:[126] stdev:[46.0]
[Parsed_showinfo_1 @ 0x1e307d0] n:1 pts:2 pts_time:0.04 pos:-1 fmt:gray sar:0/1 s:352x432 i:P iskey:1 type:I checksum:4E674BC7 plane_checksum:[4E674BC7] mean:[125] stdev:[46.0]
(Outputs 50 frames)
Signed-off-by: Neil Birkbeck <neil.birkbeck@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

e4788e9c

avcodec/twinvq: Use avpriv_float_dsp_alloc() · fc9ced41
Michael Niedermayer authored Nov 29, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
fc9ced41
avcodec/ra288: Use avpriv_float_dsp_alloc() · 2336c76d
Michael Niedermayer authored Nov 29, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
2336c76d
avcodec/on2avc: Use avpriv_float_dsp_alloc() · b0464212
Michael Niedermayer authored Nov 29, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
b0464212
avcodec/aacenc: Use avpriv_float_dsp_alloc() · 14285c33
Michael Niedermayer authored Nov 29, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
14285c33
avcodec/ac3enc: Use avpriv_float_dsp_alloc() · cae851c7
Michael Niedermayer authored Nov 29, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
cae851c7
avutil/ppc/util_altivec: add () to VEC_SPLAT16 macro · 5bf4cd8e
Michael Niedermayer authored Nov 29, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
5bf4cd8e
avutil/buffer: Move USE_ATOMICS to thread.h to avoid it becoming out of sync with it · c299b6fd
Michael Niedermayer authored Nov 29, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
c299b6fd
libavutil/threads.h: correct an include to be local · 32eadfe4
Dave Yeo authored Nov 29, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
32eadfe4
libavutil/thread.h: Support OS/2 threads · 090a7801
Dave Yeo authored Nov 29, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
090a7801

avutil/bprint: C++ compatible AVBPrint definition. · 2db29482

Vadim Kalinsky authored Nov 24, 2014

Previous version reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

2db29482

28 Nov, 2014 17 commits

lavu/opt: add escaping to av_opt_serialize · 0cb994df
Lukasz Marek authored Nov 25, 2014
```
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
```
0cb994df

Replace lena.pnm · 8895bf7b

Reinhard Tartler authored Nov 27, 2014

The new reference.pnm is a freely licensed replacement. The photo has
been taken by Reinhard Tartler on August 28 2014, and is licensed under
the expat license as stated at http://www.jclark.com/xml/copying.txt

8895bf7b

Treat all '*.pnm' files as non-text file · 0f257e29

Reinhard Tartler authored Nov 28, 2014

This convinces the pre-receive hook to not consider all *.pnm files as
text files to reduce the patch sizes and avoids triggering whitespace
checks,

Contains a correction by Janne Grunau <janne-libav@jannau.net>

0f257e29

avfilter/vf_idet: Fixing idet for single-frame inputs. · dd5d6179

Neil Birkbeck authored Nov 28, 2014

Handle single frame inputs similar to yadif (e.g., https://github.com/FFmpeg/FFmpeg/commit/0f9f24c9cfd291c7ece4d3bad64fdf06d107168a and https://github.com/FFmpeg/FFmpeg/commit/681e008d06d2241d50abe6316c908a184ddc5942)

Example:
  ffmpeg -r 1 -t 1 -i fate-suite/ffmpeg-synthetic/vsynth1/%02d.pgm  -vf idet,showinfo -f null -y /dev/null

Previously:
  Output file is empty, nothing was encoded (check -ss / -t / -frames parameters if used)
  [Parsed_idet_0 @ 0x36389d0] Repeated Fields: Neither:     0 Top:     0 Bottom:     0

After patch:
  [Parsed_showinfo_1 @ 0x1909810] n:0 pts:0 pts_time:0 pos:-1 fmt:gray sar:0/1 s:352x432 ...
  [Parsed_idet_0 @ 0x18f9bb0] Repeated Fields: Neither:     1 Top:     0 Bottom:     0

Fate looks good.
Signed-off-by: Neil Birkbeck <neil.birkbeck@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

dd5d6179

Merge commit '' · 27897d2e

Michael Niedermayer authored Nov 28, 2014

* commit '49180563':
  rtmpproto: Fix a typo in a comment
Merged-by: Michael Niedermayer <michaelni@gmx.at>

27897d2e

fix Makefile objects for pulseaudio support · cb58c771
Michael Stypa authored Nov 28, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
cb58c771
rtmpproto: Fix a typo in a comment · 49180563
Martin Storsjö authored Nov 28, 2014
```
Signed-off-by: Martin Storsjö <martin@martin.st>
```
49180563
avcodec/pngdec: apng: fix output buffer filling when no blending is needed. · ebf2052a
Benoit Fouet authored Nov 28, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
ebf2052a
avcodec/ppc/h264qpel_template: protect unistd.h by #if HAVE_UNISTD_H · 885a763c
Michael Niedermayer authored Nov 28, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
885a763c

avcodec/pngdec: allow for some code path optimizations. · af8804ac

Benoit Fouet authored Nov 28, 2014

Use 'if (CONFIG_APNG_DECODER)' where needed, so that the compiler can
optimize out some portion of code.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

af8804ac

avcodec/pngdec: do not blend on transparent black · aff50ae1

Benoit Fouet authored Nov 28, 2014

There is no need to memset the zlib output buffer, as there is no
blending happening there. Instead, do not blend when the dispose
operation is set to 'background' (tranparent black).
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

aff50ae1

avcodec/ppc/h264qpel: POWER LE support for put_pixels16_l2_altivec() and avg_pixels16_l2_altivec() · bd67d0ea
Rong Yan authored Nov 28, 2014
```
add put_unligned_store() and avg_unligned_store() macros
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
bd67d0ea

avcodec/ppc/h264qpel_template: POWER LE support for... · 8cc5a78e

Rong Yan authored Nov 28, 2014

avcodec/ppc/h264qpel_template: POWER LE support for PREFIX_h264_qpel16_h_lowpass_altivec() PREFIX_h264_qpel16_v_lowpass_altivec() PREFIX_h264_qpel16_hv_lowpass_altivec()

add load_alignment() macro
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

8cc5a78e

avcodec/ppc/h264chroma_template: POWER LE support for... · 89f3043c

Rong Yan authored Nov 28, 2014

avcodec/ppc/h264chroma_template: POWER LE support for PREFIX_h264_chroma_mc8_altivec() PREFIX_no_rnd_vc1_chroma_mc8_altivec() CHROMA_MC8_ALTIVEC_CORE_SIMPLE() CHROMA_MC8_ALTIVEC_CORE()

add marcos GET_VSRC1() GET_VSRC()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

89f3043c

avcodec/ppc/h264dsp: POWER LE support for h264_idct8_add_altivec()... · 57c89c50

Rong Yan authored Nov 28, 2014

avcodec/ppc/h264dsp: POWER LE support for h264_idct8_add_altivec() h264_idct_dc_add_internal() h264_loop_filter_luma_altivec() write16x4() VEC_1D_DCT() weight_h264_W_altivec() biweight_h264_W_altivec() VEC_LOAD_U8_ADD_S16_STORE_U8() ALTIVEC_STORE_SUM_CLIP()

add marcos GET_2PERM() dstv_load() vdst_load() dest_unligned_store()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

57c89c50

Merge commit '' · f001a2bd

Michael Niedermayer authored Nov 28, 2014

* commit 'fcae9f21':
  dashenc: Avoid a VLA-like construct
Merged-by: Michael Niedermayer <michaelni@gmx.at>

f001a2bd

Merge commit '' · 5ce070c1

Michael Niedermayer authored Nov 28, 2014

* commit 'a9d8d35e':
  dashenc: Add options to make segment names configurable

Conflicts:
	libavformat/dashenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

5ce070c1