Commits · 9b471735459d7274f6d7cc646f1d01011f844862 · Linshizhi / ffmpeg.wasm-core

08 Oct, 2011 5 commits

Merge remote-tracking branch 'qatar/master' · 9b471735

Michael Niedermayer authored Oct 08, 2011

* qatar/master: (24 commits)
  mpegps: Use av_get_packet() instead of poorly emulating it.
  motionpixels: decode only the 111 complete frames for fate
  mpc8: Check out of bound bands limit
  xan: Prevent NULL dereference with missing palette
  xan: Check for out of bound reads in xan_huffman_decode()
  xan: Fixed out of bound accesses in xan_unpack()
  motionpixels: Prevent calling init_vlc() with invalid parameters
  shorten: Fix out of bound writes in fix_bitshift()
  dsicinav: Check for out of bounds writes
  tiertexseqv: Check for out of bound reads
  quickdraw: Check for out of bound reads
  dsicinav: Check for out of bounds reads
  motionpixels: Fix the size of workspace buffers
  motionpixels: Clear FF_INPUT_BUFFER_PADDING_SIZE bytes at the end of the temporary buffer
  wmavoice: Check for corrupted extra data
  wmavoice: Check for out of bound writes
  xan: Prevent NULL dereferences with missing reference frame
  bink: Prevent NULL dereferences with missing reference frame
  wavpack: Reset internal state on corrupted blocks
  wmapro: Validate the number of audio channels before using it
  ...

Conflicts:
	libavcodec/h264.c
	libavcodec/xan.c
	tests/ref/fate/motionpixels
Merged-by: Michael Niedermayer <michaelni@gmx.at>

9b471735

eval: add random() · ac7cda9e
Michael Niedermayer authored Oct 08, 2011
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
ac7cda9e
eval: make variables persistent so they can be used between evaluations. · 8fd56f7b
Michael Niedermayer authored Oct 08, 2011
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
8fd56f7b
H264: set colorspace and full range to values indicating unspecified by default · 74f77eb0
Michael Niedermayer authored Oct 07, 2011
```
Code based on ffdshow
Author unknown
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
74f77eb0
mpegps: Use av_get_packet() instead of poorly emulating it. · 98ef887a
Alex Converse authored Oct 08, 2011

98ef887a

07 Oct, 2011 35 commits

bintext: reset x and y pos after each frame decode. · 3775af0f
Clément Bœsch authored Oct 07, 2011
```
This makes successive frames decode possible.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
3775af0f
return error code if error happens · 4052bf69
Maksym Veremeyenko authored Oct 03, 2011
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
4052bf69
motionpixels: decode only the 111 complete frames for fate · c2f2dfb3
Janne Grunau authored Oct 07, 2011
```
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
```
c2f2dfb3
mpc8: Check out of bound bands limit · 9bd854b1
Laurent Aimar authored Sep 25, 2011
```
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
```
9bd854b1
xan: Prevent NULL dereference with missing palette · 7d17a794
Laurent Aimar authored Sep 29, 2011
```
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
```
7d17a794
xan: Check for out of bound reads in xan_huffman_decode() · 3db3fdf4
Laurent Aimar authored Sep 29, 2011
```
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
```
3db3fdf4
xan: Fixed out of bound accesses in xan_unpack() · 3e0757c2
Laurent Aimar authored Sep 29, 2011
```
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
```
3e0757c2
motionpixels: Prevent calling init_vlc() with invalid parameters · 1cd0a551
Laurent Aimar authored Sep 29, 2011
```
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
```
1cd0a551

shorten: Fix out of bound writes in fix_bitshift() · 5f05cf4e

Laurent Aimar authored Sep 30, 2011

The data pointers s->decoded[*] already take into account s->nwrap.
Signed-off-by: Janne Grunau <janne-libav@jannau.net>

5f05cf4e

dsicinav: Check for out of bounds writes · 17206032
Laurent Aimar authored Sep 29, 2011
```
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
```
17206032
tiertexseqv: Check for out of bound reads · 64263dd5
Laurent Aimar authored Sep 29, 2011
```
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
```
64263dd5
quickdraw: Check for out of bound reads · 4fd56f84
Laurent Aimar authored Sep 29, 2011
```
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
```
4fd56f84
dsicinav: Check for out of bounds reads · e3ca9b93
Laurent Aimar authored Sep 29, 2011
```
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
```
e3ca9b93

motionpixels: Fix the size of workspace buffers · 210c8033

Laurent Aimar authored Sep 29, 2011

Some buffers must be mod 4 in width and/or height.
Signed-off-by: Janne Grunau <janne-libav@jannau.net>

210c8033

motionpixels: Clear FF_INPUT_BUFFER_PADDING_SIZE bytes at the end of the temporary buffer · d337dd3a
Laurent Aimar authored Sep 29, 2011
```
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
```
d337dd3a
wmavoice: Check for corrupted extra data · d99427cb
Laurent Aimar authored Sep 27, 2011
```
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
```
d99427cb
wmavoice: Check for out of bound writes · 1c1449b5
Laurent Aimar authored Sep 27, 2011
```
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
```
1c1449b5
xan: Prevent NULL dereferences with missing reference frame · 06be075c
Laurent Aimar authored Sep 27, 2011
```
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
```
06be075c
bink: Prevent NULL dereferences with missing reference frame · c7e63198
Laurent Aimar authored Sep 27, 2011
```
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
```
c7e63198

wavpack: Reset internal state on corrupted blocks · 2c6cf139

Laurent Aimar authored Sep 26, 2011

wavpack_decode_block() supposes that it is called back with the exact
same buffer unless it has returned with an error. With multi-channels
files, wavpack_decode_frame() was breaking this assumption.
Signed-off-by: Janne Grunau <janne-libav@jannau.net>

2c6cf139

wmapro: Validate the number of audio channels before using it · 2c1ba799
Laurent Aimar authored Sep 26, 2011
```
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
```
2c1ba799
mpc8: Fix return value on EOF · 1e3336de
Laurent Aimar authored Sep 25, 2011
```
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
```
1e3336de
shorten: Prevent block size from increasing · 95010d18
Laurent Aimar authored Oct 02, 2011
```
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
```
95010d18
xan: Prevent out of bound accesses · 124a16f6
Laurent Aimar authored Sep 27, 2011
```
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
```
124a16f6

Merge remote-tracking branch 'hexene/stagefright' · f22bc68d

Michael Niedermayer authored Oct 07, 2011

* hexene/stagefright:
  libstagefright: start decode_thread() only after decode_frame() is called at least once.
  libstagefright: mark the dummy frame as keyframe.
  libstagefright: limit the output queue size
  libstagefright: return EOS if CustomSource::read() is called after decode_thread() returns
  libstagefright: set the correct frame size
Merged-by: Michael Niedermayer <michaelni@gmx.at>

f22bc68d

libstagefright: start decode_thread() only after decode_frame() is called at least once. · a85996d8
Mohamed Naufal authored Oct 07, 2011
```
This prevents the situation where EOS is passed as the first frame to the
h/w decoder and thus avoids a potential crash.
```
a85996d8
libstagefright: mark the dummy frame as keyframe. · fedbf917
Mohamed Naufal authored Oct 07, 2011
```
This makes sure decoder->read() returns if it is the first frame fed.
```
fedbf917
libstagefright: limit the output queue size · 295f1395
Mohamed Naufal authored Oct 07, 2011

295f1395
libstagefright: return EOS if CustomSource::read() is called after decode_thread() returns · 23ea48f2
Mohamed Naufal authored Oct 07, 2011

23ea48f2
libstagefright: set the correct frame size · 09a49e89
Mohamed Naufal authored Oct 07, 2011

09a49e89

H264: Only wait before triggering ff_thread_setup_complete() until the next... · 14c21c1f

Michael Niedermayer authored Oct 03, 2011

H264: Only wait before triggering ff_thread_setup_complete() until the next slice that contains a start-of-field/frame macroblock

This allows concurrent decoding of the last field/frame, rather than
only the last slice, of data packets with multiple NAL units packed
together.

This will fix the slowdown reported in e.g. bug 52.
Signed-off-by: Anton Khirnov <anton@khirnov.net>

14c21c1f

swresample/rematrix: show matrix with debug log level · 355cc1a0
Michael Niedermayer authored Oct 07, 2011
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
355cc1a0

Merge remote-tracking branch 'qatar/master' · 86602d1c

Michael Niedermayer authored Oct 07, 2011

* qatar/master:
  vp6: Reset the internal state when aborting key frames header parsing
  vp56: Release old pictures after a resolution changes
  vp6: Check for huffman tree build errors
  vp56: Check for missing reference frame data
  cinepak: Fix invalid read access on extra data
  vmd: fix segfaults on corruped streams
  cook: Fix js_vlc_bits value validation for joint stereo
  segafilm: Check for memory allocation failures in segafilm demuxer.
  segafilm: Fix potential division by 0 on corrupted streams in the demuxer
  Fixed segfault on corrupted sega streams in the demuxer.
  Fixed deference of NULL pointer in motionpixels decoder.
  libx264: support 9- and 10-bit output.
  h264: correct implicit_weight for field-interlaced pictures.
  mpegvideo: set correct offset for edge emulation buffer.
  mpegvideo: fix position of bottom edge.

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

86602d1c

swresample: use av_get_default_channel_layout instead of guess_layout · 177ed7e8
Marton Balint authored Oct 06, 2011
```
Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
177ed7e8

avutil: bump minor version because of av_get_default_channel_layout type fix · cbfca622

Marton Balint authored Oct 06, 2011

Well, probably an ABI breakage at least for 32bit, but hopefully it will go
unnoticed because the fix happened realtively soon.
Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

cbfca622