Commits · fbeb634e4dda69cd1b8554d20030b6946d52be02 · Linshizhi / ffmpeg.wasm-core

27 Jul, 2014 11 commits
- avcodec/ppc/idctdsp: Only select non bitexact IDCTs by default when bitexact is not set · fbeb634e
  Michael Niedermayer authored Jul 27, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  fbeb634e
- avcodec/arm/idctdsp_init_arm*: Only select non bitexact IDCTs by default when bitexact is not set · b051a1bb
  Michael Niedermayer authored Jul 27, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  b051a1bb
- Merge commit '541427ab' · c2ef844a
  Michael Niedermayer authored Jul 27, 2014
```
* commit '541427ab':
  eamad: use the bytestream2 API instead of AV_RL

Conflicts:
	libavcodec/eamad.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
```
  c2ef844a
- doc/examples/muxing: Exchange tmp_frame and frame · c437765b
  Michael Niedermayer authored Jul 27, 2014
```
Reduces difference to 56f98e34Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  c437765b
- eamad: use the bytestream2 API instead of AV_RL · 541427ab
  Anton Khirnov authored Jul 20, 2014
```
This is safer and possibly fixes invalid reads on truncated data.

CC:libav-stable@libav.org
```
  541427ab
- $Chris \"Koying\" Browet's avatar$
  
  avcodec/h264_mp4toannexb_bsf: fix issue when sps/pps are already in the bistream · ad91bf85
  Chris \"Koying\" Browet authored Jul 26, 2014
  
  ad91bf85
- fate/hevc: adding CONFWIN_A conformance test · e97f5bef
  Mickaël Raulet authored Jul 26, 2014
```
cherry picked from commit 3b69a2dc469160ee87367191e630e8398e832227
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  e97f5bef
- fate/hevc: add flags unaligned · 7bb3e70c
  Mickaël Raulet authored Jul 26, 2014
```
cherry picked from commit 3b69a2dc469160ee87367191e630e8398e832227
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  7bb3e70c
- fate/hevc: add BUMPING bitstream test · 29228dbd
  Mickaël Raulet authored Jul 25, 2014
```
cherry picked from commit d4d61a071f087db2a4bc2b49559d40dd350a841e
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  29228dbd
- Merge commit '7215fcf8' · 57e7d9d9
  Michael Niedermayer authored Jul 27, 2014
```
* commit '7215fcf8':
  avformat: Mark AVOutputFormat argument in avformat_query_codec as const
Merged-by: Michael Niedermayer <michaelni@gmx.at>
```
  57e7d9d9
- Merge commit 'ec4f04da' · 6542e557
  Michael Niedermayer authored Jul 27, 2014
```
* commit 'ec4f04da':
  avformat: Mark argument in av_{i|o}format_next/ffurl_protocol_next as const

Conflicts:
	libavformat/format.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
```
  6542e557
26 Jul, 2014 29 commits

Michael Niedermayer authored Jul 26, 2014

* commit '53abe324':
  avcodec: Mark argument in av_{parser|hwaccel|bitstream_filter}_next as const

Conflicts:
	libavcodec/avcodec.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

0a7f3af2

doc/examples/muxing: mark correct frame as writeable · d1ce43a3
Michael Niedermayer authored Jul 26, 2014
```
Bug found from comparing 56f98e34 to HEAD
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
d1ce43a3
doc/examples/muxing: Always use swr, simplifies code slightly · fbd46e2f
Michael Niedermayer authored Jul 26, 2014
```
Idea-from: 56f98e34Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
fbd46e2f
doc/examples/muxing: add alloc_audio_frame() and use it to simplify code. · 22e9fe06
Anton Khirnov authored Jul 26, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
22e9fe06
doc/examples/muxing: Move samples_count to OutputStream · a98cadef
Michael Niedermayer authored Jul 26, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
a98cadef
doc/examples/muxing: free swr context at the end · 8b1d54ba
Michael Niedermayer authored Jul 26, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
8b1d54ba

x86/hevc_idct: add 12bit idct_dc · bfb3b2b7

James Almer authored Jul 26, 2014

Signed-off-by: James Almer <jamrial@gmail.com>
Reviewed-by: Mickaël Raulet <mraulet@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

bfb3b2b7

avcodec/x86/hevcdsp_init: make license header consistent · d4a9e89b
Michael Niedermayer authored Jul 26, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
d4a9e89b

Merge commit '' · 706f81a2

Michael Niedermayer authored Jul 26, 2014

* commit '1a880b2f':
  hevc: SSE2 and SSSE3 loop filters

Conflicts:
	libavcodec/hevcdsp.c
	libavcodec/hevcdsp.h
	libavcodec/x86/Makefile
	libavcodec/x86/hevc_deblock.asm
	libavcodec/x86/hevcdsp_init.c

See: de7b89fd and several others
Merged-by: Michael Niedermayer <michaelni@gmx.at>

706f81a2

Merge commit '' · 226b290f

Michael Niedermayer authored Jul 26, 2014

* commit '73bb8f61':
  hevcdsp: remove an unneeded variable in the loop filter

Conflicts:
	libavcodec/hevc_filter.c

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

226b290f

avformat: Mark AVOutputFormat argument in avformat_query_codec as const · 7215fcf8
Diego Biurrun authored Jul 26, 2014

7215fcf8
avformat: Mark argument in av_{i|o}format_next/ffurl_protocol_next as const · ec4f04da
Diego Biurrun authored Jul 26, 2014

ec4f04da
avcodec: Mark argument in av_{parser|hwaccel|bitstream_filter}_next as const · 53abe324
Diego Biurrun authored Jul 26, 2014

53abe324

Merge commit '' · 371cb964

Michael Niedermayer authored Jul 26, 2014

* commit '56f98e34':
  output example: convert audio to the format supported by the encoder

Conflicts:
	doc/examples/muxing.c

Not merged as our example code already does that for what is needed
and we generate matching data for the rest. generating fixed data
and converting all parameters could be done of course.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

371cb964

doc/examples/muxing: Support setting flags, for example for setting bitexact · 7cf08655
Michael Niedermayer authored Jul 26, 2014
```
This would allow the example to be used in regression tests
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
7cf08655
doc/examples/muxing: select a supported sample rate for the encoder, favor 44100 · 5d2cf1ae
Michael Niedermayer authored Jul 26, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
5d2cf1ae
doc/examples/muxing: pick a supported channel layout if stereo isnt supported by the encoder · ead22f42
Michael Niedermayer authored Jul 26, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
ead22f42
doc/examples/muxing: move swr context to OutputStream · 9ccb9c8d
Michael Niedermayer authored Jul 26, 2014
```
Idea from: 56f98e34Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
9ccb9c8d

Merge commit '' · 1c0c19f8

Michael Niedermayer authored Jul 26, 2014

* commit '884f7c97':
  output example: set the stream timebase

Conflicts:
	doc/examples/muxing.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

1c0c19f8

x86/hevc_idct: replace old and unused idct functions · 1ace9573

James Almer authored Jul 26, 2014

Only 8-bit and 10-bit idct_dc() functions are included (adding others should be trivial).

Benchmarks on an Intel Core i5-4200U:

idct8x8_dc
       SSE2   MMXEXT  C
cycles 22     26      57

idct16x16_dc
       AVX2   SSE2    C
cycles 27     32      249

idct32x32_dc
       AVX2   SSE2    C
cycles 62     126     1375
Signed-off-by: James Almer <jamrial@gmail.com>
Reviewed-by: Mickaël Raulet <mraulet@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

1ace9573

hevc: SSE2 and SSSE3 loop filters · 1a880b2f

Pierre Edouard Lepere authored Jun 18, 2014

Additional contributions by James Almer <jamrial@gmail.com>,
Carl Eugen Hoyos <cehoyos@ag.or.at>, Fiona Glaser <fiona@x264.com> and
Anton Khirnov <anton@khirnov.net>
Signed-off-by: Anton Khirnov <anton@khirnov.net>

1a880b2f

hevcdsp: remove an unneeded variable in the loop filter · 73bb8f61
Anton Khirnov authored Jul 12, 2014
```
beta0 and beta1 will always be the same
```
73bb8f61
output example: convert audio to the format supported by the encoder · 56f98e34
Anton Khirnov authored Jul 24, 2014

56f98e34
output example: set the stream timebase · 884f7c97
Anton Khirnov authored Jul 23, 2014
```
This is required by the new API.
```
884f7c97

hevc: add support for bumping process · 23480da0

Mickaël Raulet authored Jul 26, 2014

cherry picked from commit 8aa2fb7df3cffc67a3fd03a3a7eb49dbed4094c7
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

23480da0

reintroduce avpriv_dsputil_init() to maintain ABI until next soname bump · c0a586d9
Michael Niedermayer authored Jul 25, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
c0a586d9

configure: replace pulse-simple with pulse · 9a6ca20e

Lukasz Marek authored Jul 26, 2014

pulse-simple is additional library built on top of PulseAudio.
It causes ffmpeg to link to library which is not needed anymore.
This commit removes that redundant dependency.
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

9a6ca20e

x86: hevc_mc: replace simple leas by adds · 036f11bd

Christophe Gisquet authored Jul 24, 2014

lea is detrimental for those simple cases. No impact overall to
the change though.

Before:
15017 decicycles in q, 1016152 runs, 32424 skips
15382 decicycles in q_bi, 1013673 runs, 34903 skips
3713 decicycles in e, 2074534 runs, 22618 skips
3901 decicycles in e_bi, 2065509 runs, 31643 skips
7852 decicycles in q_uni, 520165 runs, 4123 skips
2398 decicycles in e_uni, 1043339 runs, 5237 skips

After:
14898 decicycles in q, 1016295 runs, 32281 skips
15119 decicycles in q_bi, 1015392 runs, 33184 skips
3682 decicycles in e, 20732246 runs, 23928 skips
3720 decicycles in e_bi, 2065043 runs, 32109 skips
7643 decicycles in q_uni, 520280 runs, 4008 skips
2363 decicycles in e_uni, 1043780 runs, 4796 skips
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

036f11bd

Merge commit '' · 7295ee7f

Michael Niedermayer authored Jul 26, 2014

* commit 'd8520d3e':
  mpegvideo: Move QMAT_SHIFT* defines to the only place they are used

Conflicts:
	libavcodec/mpegvideo.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

7295ee7f