Commits · bfb488234525e17a84e84d6a0b6c00771caab7c2 · Linshizhi / ffmpeg.wasm-core

30 May, 2014 13 commits

Timothy Gu authored May 30, 2014

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

bfb48823

x86: huffyuvdsp: add_hfyu_left_pred_bgr32 · f743fa9c

Christophe Gisquet authored May 28, 2014

          C   MMX   SSE2
Cycles: 3092  1053  578
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

f743fa9c

avcodec/huffyuvdsp: Change w to intptr in add_hfyu_median_pred() and add_hfyu_left_pred() · 7be79c76
Michael Niedermayer authored May 30, 2014
```
This avoids potential issues with the high 32bits being random in x86-64 asm
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
7be79c76
x86: huffyuvdsp: add SSE2 median prediction · 884078d2
Christophe Gisquet authored May 27, 2014
```
From 5010c to 4566 on lagarith YUY2.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
884078d2

avformat/matroskadec: fix off by 1 error in matroska_read_seek() · b3dfebd6

Michael Niedermayer authored May 30, 2014

Fixes out of array read

Fixes: vp9-opus-crash.webm
Found-by: Dale Curtis <dalecurtis@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

b3dfebd6

avcodec/indeo4: Decode both parts of IP frames · 8bfb4d72

Dirk Ausserhaus authored May 29, 2014

Fixes part of Ticket845

av_frame_move_ref() idea by Anton Khirnov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

8bfb4d72

avcodec/indeo4: Move frametypes into common header. · d24673a2
Dirk Ausserhaus authored May 29, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
d24673a2
Do not overwrite the sample format with AV_SAMPLE_FMT_NONE in libspeex_decode_init(). · ca2ec98c
Carl Eugen Hoyos authored May 30, 2014
```
Fixes a regression since ef48ac65 when decoding speex in f4v, reported
by irc user massdos.
```
ca2ec98c
Improve frame size calculation in caf muxer to fix adpcm_ms remuxing. · 1acb5ca0
Carl Eugen Hoyos authored May 30, 2014
```
Fixes ticket #3645.
```
1acb5ca0

avcodec/qpeldsp: Restore author attribution · 772d46d3

Michael Niedermayer authored May 30, 2014

See: 368f5035
See:
similarity index 51%
copy from libavcodec/dsputil.c
copy to libavcodec/qpeldsp.c
index 6d41dfc..0beeab8 100644
--- a/libavcodec/dsputil.c
+++ b/libavcodec/qpeldsp.c
@@ -1,9 +1,5 @@
 /*
- * DSP utils
- * Copyright (c) 2000, 2001 Fabrice Bellard
- * Copyright (c) 2002-2004 Michael Niedermayer <michaelni@gmx.at>
- *
- * gmc & q-pel & 32/64 bit based MC by Michael Niedermayer <michaelni@gmx.at>
+ * quarterpel DSP functions
  *
  * This file is part of FFmpeg.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

772d46d3

avcodec/x86/qpeldsp_init: Restore author attribution · 8c891d90

Michael Niedermayer authored May 30, 2014

See: 368f5035
See: 44eb4951, and many others
See:
similarity index 83%
copy from libavcodec/x86/dsputil_init.c
copy to libavcodec/x86/qpeldsp_init.c
index ebbf97f..8f296a1 100644
--- a/libavcodec/x86/dsputil_init.c
+++ b/libavcodec/x86/qpeldsp_init.c
@@ -1,6 +1,5 @@
 /*
- * Copyright (c) 2000, 2001 Fabrice Bellard
- * Copyright (c) 2002-2004 Michael Niedermayer <michaelni@gmx.at>
+ * quarterpel DSP functions
  *
  * This file is part of FFmpeg.
  *
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

8c891d90

qpel_template: Restore author attribution · b15a3cc5

Michael Niedermayer authored May 30, 2014

See: 368f5035
See: 59fe111e
See:
similarity index 98%
rename from libavcodec/dsputil_template.c
rename to libavcodec/qpel_template.c
index 95d966e..500c75b 100644
--- a/libavcodec/dsputil_template.c
+++ b/libavcodec/qpel_template.c
@@ -1,9 +1,5 @@
 /*
- * DSP utils
- * Copyright (c) 2000, 2001 Fabrice Bellard
- * Copyright (c) 2002-2004 Michael Niedermayer <michaelni@gmx.at>
- *
- * gmc & q-pel & 32/64 bit based MC by Michael Niedermayer <michaelni@gmx.at>
+ * quarterpel DSP function templates
  *
  * This file is part of FFmpeg.
  *
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

b15a3cc5

Merge commit '' · 98a6806f

Michael Niedermayer authored May 30, 2014

* commit '368f5035':
  dsputil: Split off quarterpel bits into their own context

Conflicts:
	configure
	libavcodec/dsputil.c
	libavcodec/h263dec.c
	libavcodec/mpegvideo.c
	libavcodec/mpegvideo_enc.c
	libavcodec/vc1dec.c
	libavcodec/vc1dsp.c
	libavcodec/x86/dsputil_init.c
	libavcodec/x86/qpeldsp.asm
Merged-by: Michael Niedermayer <michaelni@gmx.at>

98a6806f

29 May, 2014 27 commits
- Merge commit 'cb52a17c' · d35899cc
  Michael Niedermayer authored May 29, 2014
```
* commit 'cb52a17c':
  dsputil: Move Bink-specific add_pixels8 to binkdsp

Conflicts:
	libavcodec/dsputil.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
```
  d35899cc
- Merge commit '054013a0' · 40f3a87c
  Michael Niedermayer authored May 29, 2014
```
* commit '054013a0':
  dsputil: Move APE-specific bits into apedsp

Conflicts:
	libavcodec/arm/int_neon.S
	libavcodec/x86/dsputil.asm
Merged-by: Michael Niedermayer <michaelni@gmx.at>
```
  40f3a87c
- Merge commit '256da077' · 5c6e94c4
  Michael Niedermayer authored May 29, 2014
```
* commit '256da077':
  dsputil: Move mspel_pixels_tab to the only place it is used

Conflicts:
	libavcodec/dsputil.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
```
  5c6e94c4
- Merge commit '3832a659' · a9a312d2
  Michael Niedermayer authored May 29, 2014
```
* commit '3832a659':
  dsputil: Move ff_alternate_*_scan tables to mpegvideo
Merged-by: Michael Niedermayer <michaelni@gmx.at>
```
  a9a312d2
- avcodec/x86/svq1enc_mmx: Add author attribution · c814a6c7
  Michael Niedermayer authored May 29, 2014
```
See: 59006372Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  c814a6c7
- Merge commit '65d5d586' · ea0931fb
  Michael Niedermayer authored May 29, 2014
```
* commit '65d5d586':
  dsputil: Move SVQ1 encoding specific bits into svq1enc

Conflicts:
	libavcodec/x86/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
```
  ea0931fb
- Merge commit '2ea2612d' · cb8763bd
  Michael Niedermayer authored May 29, 2014
```
* commit '2ea2612d':
  svq1enc: Rename SVQ1Context to SVQ1EncContext

Conflicts:
	libavcodec/svq1enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
```
  cb8763bd
- ffmpeg: fix check for muxing overhead being unknown · b3f46150
  Michael Niedermayer authored May 29, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  b3f46150
- x86/dsputilenc: add missing guards to ff_pix_sum16_xop · 02a3e327
  James Almer authored May 29, 2014
```
XOP support was added in Yasm 1.0.0 and Nasm 2.06, and we still
support older versions.
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  02a3e327
- x86: huffyuvdsp: port add_bytes to yasm · 99a319c4
  Christophe Gisquet authored May 28, 2014
```
          C   MMX  SSE2
Cycles: 2972  587  302
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  99a319c4
- x86: hpeldsp: better factorization · 22670039
  Christophe Gisquet authored May 26, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  22670039
- tests: allow passing dimensions to videogen · bf7e9cc8
  Christophe Gisquet authored May 29, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  bf7e9cc8
- rename add_hfyu_left_prediction_int16 to add_hfyu_left_pred_int16 · 7b4c4605
  Michael Niedermayer authored May 29, 2014
```
This makes the naming more consistent with the 8bit variant
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  7b4c4605
- rename add_hfyu_median_prediction_int16 to add_hfyu_median_pred_int16 · 550ae6c0
  Michael Niedermayer authored May 29, 2014
```
This makes the naming more consistent with the 8bit variant
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  550ae6c0
- rename sub_hfyu_median_prediction_int16 to sub_hfyu_median_pred_int16 · 40a4ab8b
  Michael Niedermayer authored May 29, 2014
```
This makes the naming more consistent with the 8bit variant
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  40a4ab8b
- x86/dsputilenc: implement XOP version of pix_sum16 · 05de4d30
  James Almer authored May 29, 2014
```
SSE2: 137 cycles
XOP:   87 cycles
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  05de4d30
- Merge commit '08cd9214' · 232959f1
  Michael Niedermayer authored May 29, 2014
```
* commit '08cd9214':
  aarch64: Use the correct syntax for relocations
Merged-by: Michael Niedermayer <michaelni@gmx.at>
```
  232959f1
- avcodec/dpx_parser: Allow frame size to be too small · fba0ac28
  Michael Niedermayer authored May 29, 2014
```
Fixes Ticket3402
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  fba0ac28
- avcodec/dpx_parser: fix flushing end out · 8df5d9aa
  Michael Niedermayer authored May 29, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  8df5d9aa
- avcodec/dpx_parser: reset index when finding a startcode, not after · f518fb33
  Michael Niedermayer authored May 29, 2014
```
This is simpler
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  f518fb33
- dsputil: Split off quarterpel bits into their own context · 368f5035
  Diego Biurrun authored Jan 08, 2014
  
  368f5035
- dsputil: Move Bink-specific add_pixels8 to binkdsp · cb52a17c
  Diego Biurrun authored Dec 29, 2013
  
  cb52a17c
- dsputil: Move APE-specific bits into apedsp · 054013a0
  Diego Biurrun authored Dec 29, 2013
  
  054013a0
- dsputil: Move mspel_pixels_tab to the only place it is used · 256da077
  Diego Biurrun authored Dec 27, 2013
  
  256da077
- dsputil: Move ff_alternate_*_scan tables to mpegvideo · 3832a659
  Diego Biurrun authored Dec 27, 2013
  
  3832a659
- dsputil: Move SVQ1 encoding specific bits into svq1enc · 65d5d586
  Diego Biurrun authored Dec 23, 2013
  
  65d5d586
- svq1enc: Rename SVQ1Context to SVQ1EncContext · 2ea2612d
  Diego Biurrun authored Dec 23, 2013
```
This allows making it visible without name clashes.
```
  2ea2612d