Commits · 6e67852881e4c8c3ef80dd6c3142c286bee6e272 · Linshizhi / ffmpeg.wasm-core

31 May, 2014 6 commits

Use rc_max_rate in av_find_best_stream() if bitrate == 0. · 6e678528
Carl Eugen Hoyos authored May 31, 2014
```
Fixes ticket #2042.
```
6e678528
libavformat: output cues for each subtitle block in MKV muxer · 925f7980
John Peebles authored May 22, 2014
```
Signed-off-by: John Peebles <johnpeeb@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
925f7980

Revert "avformat/movenchint: Fix movhinting with ff_rtp_chain_mux_open() from... · 9c22e909

Michael Niedermayer authored May 31, 2014

Revert "avformat/movenchint: Fix movhinting with ff_rtp_chain_mux_open() from abb810db"

This has become unneeded due to f797b134

This reverts commit 1fe40e1b.

9c22e909

Merge commit '' · 8c895ae7

Michael Niedermayer authored May 31, 2014

* commit 'f797b134':
  rtpenc_chain: Don't copy the time base to the source stream by default

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

8c895ae7

rtpenc_chain: Don't copy the time base to the source stream by default · f797b134

Martin Storsjö authored May 30, 2014

Only copy it manually in the muxers where it makes sense (rtspenc,
sapenc). Don't touch the original AVStream in movenchint, where
the original AVStream should be kept untouched.

This fixes the normal tracks in RTP hinted files after
abb810db - the hint tracks were ok while the normal media tracks
were broken, noticed by Michael Niedermayer.

This reverts abb810db but achieves the same effect for the other
muxers.
Signed-off-by: Martin Storsjö <martin@martin.st>

f797b134

huffyuv: increase VLC_BITS to 12 · 4ba85600

Christophe Gisquet authored May 30, 2014

May require a different tuning for arm chips?
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

4ba85600

30 May, 2014 31 commits

avformat/flvenc: fix assertion failure after 4h muxing · 2e532aa8
Michael Niedermayer authored May 30, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
2e532aa8

build: fix compilation of svq1enc_mmx.c with --disable-mmx · f128342d

James Almer authored May 30, 2014

It's needed for ff_svq1enc_init_x86() even if simd functions are disabled.

Alternatively, svq1enc_init.c could be made and the relevant code moved there.
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

f128342d

x86/huffyuvdsp: fix some prototypes · 4ac41a52

James Almer authored May 30, 2014

Remove duplicate prototypes and fix int -> intptr_t in another
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

4ac41a52

Merge commit '' · 83b8987d

Michael Niedermayer authored May 30, 2014

* commit 'd6d767d9':
  ppc: Fix compilation for ppc64le (ELFv2)

Conflicts:
	libavcodec/ppc/asm.S

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

83b8987d

avformat/movenchint: Fix movhinting with ff_rtp_chain_mux_open() from... · 1fe40e1b

Michael Niedermayer authored May 30, 2014

avformat/movenchint: Fix movhinting with ff_rtp_chain_mux_open() from abb810dbSigned-off-by: Michael Niedermayer <michaelni@gmx.at>

1fe40e1b

Merge commit '' · 69275706

Michael Niedermayer authored May 30, 2014

* commit 'abb810db':
  Revert "rtpenc_chain: Don't copy the time_base back to the caller"
Merged-by: Michael Niedermayer <michaelni@gmx.at>

69275706

ppc: Fix compilation for ppc64le (ELFv2) · d6d767d9
Thierry Fauck authored May 29, 2014
```
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
```
d6d767d9

Revert "rtpenc_chain: Don't copy the time_base back to the caller" · abb810db

Martin Storsjö authored May 29, 2014

While it strictly isn't necessary to copy the time base (since
any use of it is scaled in ff_write_chained), it still is better
to signal the actual time base to the caller, avoiding one
unnecessary rescaling. This also lets the caller know what the
actual internal time base is, in case that is useful info
for some caller.

This reverts commit 397ffde1.
Signed-off-by: Martin Storsjö <martin@martin.st>

abb810db

x86: huffyuvdsp: fewer functions for x86_64 · d136fe6f

Christophe Gisquet authored May 30, 2014

When there are 2 functions that are <= SSE2, only one is needed for x86_64.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

d136fe6f

avcodec/options: leave priv_data in avcodec_copy_context() intact · e0d07455

Michael Niedermayer authored May 30, 2014

previously it was freed but the pointer not cleared

Found-by: ruggles
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

e0d07455

avcodec/proresenc_anatoliy: simplify get() · 82efa24c
Michael Niedermayer authored May 30, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
82efa24c
avcodec/proresenc_anatoliy: load 4 samples at a time in get() · f6b1cd39
Michael Niedermayer authored May 30, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
f6b1cd39
avcodec/proresenc_anatoliy: Use fdct from DSPContext instead of direct call. · 63b4d6fe
Michael Niedermayer authored May 30, 2014
```
Based-on: a55546f4 by Diego Biurrun
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
63b4d6fe
avcodec/proresenc_anatoliy: Set bits_per_raw_sample · e263af30
Michael Niedermayer authored May 30, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
e263af30
avformat/nutenc: Suggest genpts if AV_NOPTS_VALUE · 8716605a
Michael Niedermayer authored May 30, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
8716605a
Fix VDPAU decoders, regression since f2f99f07 . · 3ea0d9c8
Carl Eugen Hoyos authored May 30, 2014

3ea0d9c8

x86: dsputilenc: convert ff_sse{8, 16}_mmx() to yasm · 154cee92

Timothy Gu authored May 30, 2014

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

154cee92

x86: dsputilenc: move all the function prototypes together · 0b6292b7

Timothy Gu authored May 30, 2014

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

0b6292b7

tests: Add MPEG4 nsse test · bfb48823

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 3 commits

Merge commit '' · 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 '' · 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 '' · 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