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

28 Feb, 2015 40 commits

Michael Niedermayer authored Feb 28, 2015

* commit '12b34599':
  rtpenc_amr: Use s->num_frames instead of s->buf_ptr - s->buf
Merged-by: Michael Niedermayer <michaelni@gmx.at>

6f0a8296

Merge commit '' · f6f1e1a7

Michael Niedermayer authored Feb 28, 2015

* commit '98563953':
  rtpenc_aac: Fix sending fragmented frames
Merged-by: Michael Niedermayer <michaelni@gmx.at>

f6f1e1a7

Merge commit '' · e73b3dba

Michael Niedermayer authored Feb 28, 2015

* commit '990e4a66':
  Add a QSV decoding example.

Conflicts:
	configure
	doc/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>

e73b3dba

Merge commit '' · 2ab3088d

Michael Niedermayer authored Feb 28, 2015

* commit 'ea1d0b7e':
  avcodec/utils: use correct printf specifier in ff_set_sar

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

2ab3088d

Merge commit '' · 8a776726

Michael Niedermayer authored Feb 28, 2015

* commit '802987f8':
  x11grab: Unbreak building

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

8a776726

Merge commit '' · 7fce8c75

Michael Niedermayer authored Feb 28, 2015

* commit '71f1ad37':
  lavc: do not compile fmtconvert unconditionally

Conflicts:
	configure
	libavcodec/ppc/Makefile
	libavcodec/x86/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>

7fce8c75

Merge commit '' · 5c17377e

Michael Niedermayer authored Feb 28, 2015

* commit 'd74a8cb7':
  fmtconvert: drop unused functions

Conflicts:
	libavcodec/arm/fmtconvert_vfp_armv6.S
	libavcodec/x86/fmtconvert.asm
	libavcodec/x86/fmtconvert_init.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

5c17377e

Merge commit '' · e82b0e61

Michael Niedermayer authored Feb 28, 2015

* commit 'ee964145':
  lavc: remove unused traces of fmtconvert usage

Conflicts:
	libavcodec/aac.h
	libavcodec/aacdec.c
	libavcodec/atrac3.c
	libavcodec/vorbisdec.c
	libavcodec/wma.c
	libavcodec/wma.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

e82b0e61

Merge commit '' · ca6fee76

Michael Niedermayer authored Feb 28, 2015

* commit 'b9d2d684':
  tls: Pass AVOptions dictionaries through to the chained protocol

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

ca6fee76

Merge commit '' · c5c4e583

Michael Niedermayer authored Feb 28, 2015

* commit 'e14f98c6':
  tcp: Clarify the units for the timeout avoptions

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

c5c4e583

Merge commit '' · 1fb36423

Michael Niedermayer authored Feb 28, 2015

* commit 'c86d8aed':
  avio: Rename avclass symbols relating to avio
Merged-by: Michael Niedermayer <michaelni@gmx.at>

1fb36423

avformat/flvenc: check that the codec_tag fits in the available bits · e8565d21

Andreas Cadhalpun authored Feb 28, 2015

flags is later written with avio_w8 and if it doesn't fit in one byte it
triggers an av_assert2.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

e8565d21

avcodec/utils: use correct printf specifier in ff_set_sar · 732c3ebf

Andreas Cadhalpun authored Feb 28, 2015

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

732c3ebf

avutil/imgutils: correctly check for negative SAR components · 5705dc52

Michael Niedermayer authored Feb 28, 2015

These could trigger assert failures previously
Found-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

5705dc52

rtpenc_amr: Use s->num_frames instead of s->buf_ptr - s->buf · 12b34599

Martin Storsjö authored Feb 27, 2015

This doesn't fix any bug, but makes the code simpler for later
patches, and more straightforward to read as is.
Signed-off-by: Martin Storsjö <martin@martin.st>

12b34599

rtpenc_aac: Fix sending fragmented frames · 98563953

Martin Storsjö authored Feb 25, 2015

After sending a fragmented frame, len (s->buf_ptr - s->buf) isn't
zero, while s->num_frames is zero as intended. Using s->num_frames
makes it work as intended, and is less convoluted than keeping track
of (resetting) s->buf_ptr.

This avoids sending stray data after sending a fragmented aac packet.

CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>

98563953

Add a QSV decoding example. · 990e4a66
Anton Khirnov authored Feb 11, 2015

990e4a66

avcodec/utils: use correct printf specifier in ff_set_sar · ea1d0b7e

Andreas Cadhalpun authored Feb 28, 2015

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>

ea1d0b7e

x11grab: Unbreak building · 802987f8

Christian Hujer authored Feb 27, 2015

The correct macro is DEC not D. Broken in
b31328d0Signed-off-by: Anton Khirnov <anton@khirnov.net>

802987f8

lavc: do not compile fmtconvert unconditionally · 71f1ad37
Anton Khirnov authored Feb 21, 2015
```
Only ac3dec and dcadec use it.
```
71f1ad37
fmtconvert: drop unused functions · d74a8cb7
Anton Khirnov authored Feb 21, 2015

d74a8cb7
lavc: remove unused traces of fmtconvert usage · ee964145
Anton Khirnov authored Feb 21, 2015
```
Those decoders have been switched to float output and so do not use
fmtconvert anymore.
```
ee964145
tls: Pass AVOptions dictionaries through to the chained protocol · b9d2d684
Martin Storsjö authored Feb 28, 2015
```
Signed-off-by: Martin Storsjö <martin@martin.st>
```
b9d2d684
tcp: Clarify the units for the timeout avoptions · e14f98c6
Martin Storsjö authored Feb 27, 2015
```
Signed-off-by: Martin Storsjö <martin@martin.st>
```
e14f98c6

avio: Rename avclass symbols relating to avio · c86d8aed

Martin Storsjö authored Feb 27, 2015

Don't prefix them ffio_url, which is misleading, sounding too
much like the urlprotocol layer (like ffurl_*).
Signed-off-by: Martin Storsjö <martin@martin.st>

c86d8aed

avcodec/ppc/fdctdsp: fix const warning · 5f1ea0bf
Michael Niedermayer authored Feb 27, 2015
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
5f1ea0bf

avcodec/vc1_block: Optimize vc1_decode_i_block_adv() · 94f5ac93

zhaoxiu.zeng authored Feb 24, 2015

9127 -> 8936 decicycles (fate-suite/vc1/SA10143.vc1)
13855 -> 10976 decicycles  (fate-suite/vc1/SA20021.vc1)
tests done by the author over this function but with the whole
patchset applied not just this commit
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

94f5ac93

avcodec/vc1_block: Optimize vc1_decode_i_block() · 21581182
zhaoxiu.zeng authored Feb 24, 2015
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
21581182
avcodec/vc1_block: cosmetics · 80a0daa0
zhaoxiu.zeng authored Feb 24, 2015
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
80a0daa0
avcodec/vc1_block: move early exit code up in ff_vc1_pred_dc() · 137fbab1
zhaoxiu.zeng authored Feb 24, 2015
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
137fbab1
avcodec/vc1_block: Use av_clip_uintp2() · 99145022
zhaoxiu.zeng authored Feb 24, 2015
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
99145022

avcodec/vc1_block: Optimize vc1_decode_ac_coeff() · ec908ce4

zhaoxiu.zeng authored Feb 24, 2015

Avoid branches in sign handling
Move local variables to where they are used
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

ec908ce4

avcodec/vc1_block: Simplify dcdiff initialization · ccad34e3
zhaoxiu.zeng authored Feb 24, 2015
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
ccad34e3
avcodec/vc1_block: Simplify dir_ptr / pred initialization · bd55f01c
zhaoxiu.zeng authored Feb 24, 2015
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
bd55f01c
avcodec/vc1: Simplify pred/mc loops · f6b195cf
zhaoxiu.zeng authored Feb 24, 2015
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
f6b195cf
avcodec/vc1: Simplify dmv_y initialization · d8e030c3
zhaoxiu.zeng authored Feb 24, 2015
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
d8e030c3
avcodec/vc1: Simplify code setting and using extend_x/y · 751883c6
zhaoxiu.zeng authored Feb 24, 2015
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
751883c6
avcodec/vc1: Make init_block_index() inline · 71de5542
zhaoxiu.zeng authored Feb 24, 2015
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
71de5542
avcodec/vc1: use uint8_t for size_table · e2edb10f
zhaoxiu.zeng authored Feb 24, 2015
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
e2edb10f
avcodec/vc1: simplify offset table and access · 53cb0bab
zhaoxiu.zeng authored Feb 24, 2015
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
53cb0bab