Commits · 57fa2fc69ff480b4cabf3d7c0c28435c2cde6594 · Linshizhi / ffmpeg.wasm-core

02 Oct, 2011 25 commits
- Merge remote-tracking branch 'cus/stable' · 57fa2fc6
  Michael Niedermayer authored Oct 02, 2011
```
* cus/stable:
  ffplay: use libswresample instead of av_audio_convert
  audioconvert: add av_get_default_channel_layout public function
  ffplay: use avctx->channels and avctx->freq before avcodec_open2 consistently
  ffplay: remove now unnecessary request_channels, we set it now with options
  ffplay: set request_channels to 2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
```
  57fa2fc6
- riff: map 0x0038 to amrnb, works on http://video.mopoto.com/4/40/407/40709.avi · 3ebab62f
  Compn authored Oct 02, 2011
  
  3ebab62f
- ffplay: use libswresample instead of av_audio_convert · 1dd3c473
  Marton Balint authored Aug 16, 2011
```
Previously ffplay expected SDL_AudioOpen to provide the requested sample rate
and channel number. This is no longer a requirement because this patch replaces
the audio convert function with libswresample's swr_convert which is capable of
handling different sample formats, sample rates and different number of
channels and different channel layouts.

The patch also removes the hardcoded 16bit samples assumption and uses
av_get_bytes_per_sample almost everywhere. The only exceptions are
the update_sample_display and video_audio_display functions, it
seemed too much of a headache to make them generic.

We also fix a tiny bug in sdl_audio_callback, we ensure that the number of
bytes when we put silence in the buffer is a multiple of the frame size.
```
  1dd3c473
- audioconvert: add av_get_default_channel_layout public function · 60aaf044
  Marton Balint authored Oct 02, 2011
  
  60aaf044
- ffplay: use avctx->channels and avctx->freq before avcodec_open2 consistently · 2446a8cc
  Marton Balint authored Oct 02, 2011
  
  2446a8cc
- ffplay: remove now unnecessary request_channels, we set it now with options · 1e7f7dc2
  Marton Balint authored Oct 02, 2011
  
  1e7f7dc2
- ffplay: set request_channels to 2 · 92dac3a9
  Michael Niedermayer authored Oct 01, 2011
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  92dac3a9
- h264: fix intra 16x16 mode check when using mbaff and constrained_intra_pred. · a4fd95b5
  Laurent Aimar authored Oct 02, 2011
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  a4fd95b5
- libvpxenc: cosmetics to make code more similar to lucas. · 6edce391
  Michael Niedermayer authored Oct 02, 2011
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  6edce391
- h264: check for invalid bit depth value. · c2b7f774
  Laurent Aimar authored Oct 02, 2011
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  c2b7f774
- h264: add entries for 11 and 12 bits in ff_h264_chroma_qp[][] · 27d3361e
  Laurent Aimar authored Oct 02, 2011
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  27d3361e
- h264: fix the check for invalid SPS:num_ref_frames. · bcf881a6
  Laurent Aimar authored Oct 02, 2011
```
This patch set the limit to 16.

For information, thoses previous commits:
41f7e2d1
5cbb0e70
assumed it was either 30 or 32.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  bcf881a6
- h264: do not let invalid values in h->ref_count on ff_h264_decode_ref_pic_list_reordering() errors. · 2428b53f
  Laurent Aimar authored Oct 02, 2011
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  2428b53f
- Reject video with non multiple of 16 width/height in the 4xm decoder. · db5b4875
  Laurent Aimar authored Oct 01, 2011
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  db5b4875
- vf_lut.c: fix wrong syntax in example · 2a9046c7
  Stefano Sabatini authored Oct 02, 2011
  
  2a9046c7
- lavfi: remove usage of deprecated av_opt_set_defaults2() function · 91492bd1
  Stefano Sabatini authored Oct 02, 2011
```
Prefer av_opt_set_defaults() instead.
```
  91492bd1
- Merge remote-tracking branch 'qatar/master' · f8a4075e
  Michael Niedermayer authored Oct 02, 2011
```
* qatar/master:
  lavc: add video/audio/encoding flags to global_quality option
  libvpxenc: use libvpx's own defaults for some parameters
  vpxenc: add private options

Conflicts:
	libavcodec/libvpxenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
```
  f8a4075e
- 4xm decoder: fix data size for i2 frames. · 0a19b4b0
  Michael Niedermayer authored Oct 02, 2011
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  0a19b4b0
- 4xm decoder: print some error messages in case of errors. · 1008f639
  Michael Niedermayer authored Oct 02, 2011
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  1008f639
- Check for out of bound accesses in the 4xm decoder. · 9c661e95
  Laurent Aimar authored Oct 01, 2011
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  9c661e95
- Prevent block size from inreasing in the shorten decoder. · b399cbfb
  Laurent Aimar authored Sep 30, 2011
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  b399cbfb
- Check for out of bound reads in PTX decoder. · 581898ae
  Laurent Aimar authored Oct 01, 2011
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  581898ae
- Fix the check for missing references in ff_er_frame_end() for H264. · e1d5bbeb
  Laurent Aimar authored Oct 01, 2011
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  e1d5bbeb
- Clear FF_INPUT_BUFFER_PADDING_SIZE bytes at the end of the temporary buffers used in 4xm decoder. · 90a69b2f
  Laurent Aimar authored Oct 01, 2011
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  90a69b2f
- Prevent NULL dereference when the huffman table is invalid in the 4xm decoder. · 4a8ff063
  Laurent Aimar authored Oct 01, 2011
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  4a8ff063
01 Oct, 2011 15 commits

Fix use of uninitialized memory in 4X Technologies demuxer. · a1876e00
Laurent Aimar authored Oct 01, 2011
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
a1876e00
h264: increase ref_poc size to 32 as it can be per field. · 8c851ef5
Michael Niedermayer authored Oct 01, 2011
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
8c851ef5
h264: set unused ref_counts to 0 as a precautionary meassure. · 3af2de76
Michael Niedermayer authored Oct 01, 2011
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
3af2de76
ff_dot_product(): change return value to int64_t · 78f08c06
Michael Niedermayer authored Oct 01, 2011
```
Idea-by: Vitor
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
78f08c06
g729dec: initialize bit reader with the correct buffer size · edf1a8e3
Vitor Sessak authored Oct 01, 2011
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
edf1a8e3
g723.1_data: remove unneeded L · 41597194
Michael Niedermayer authored Oct 01, 2011
```
Found-by: Vitor
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
41597194
h264: try reading SPS with wrong escaping, it sometimes works better · c9c7a776
Michael Niedermayer authored Oct 01, 2011
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
c9c7a776
lavc: add video/audio/encoding flags to global_quality option · b036a718
Anton Khirnov authored Sep 30, 2011

b036a718

libvpxenc: use libvpx's own defaults for some parameters · 6450f26c

Luca Barbato authored Sep 30, 2011

Specifically, qmin/qmax, gop_size and keyint_min.

Fixes bug 47.
Signed-off-by: Anton Khirnov <anton@khirnov.net>

6450f26c

vpxenc: add private options · e3eb015b

Luca Barbato authored Sep 26, 2011

Make libvpx support close to the libx264 one. Thanks to
Jan Gerber <j@v2v.cc> for the support.
Signed-off-by: Anton Khirnov <anton@khirnov.net>

e3eb015b

g729dec: prevent out of array access · fe70c1f4
Michael Niedermayer authored Oct 01, 2011
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
fe70c1f4
avienc: Add a limit on the number of skiped frames muxed in a row. · 9cb9e39c
Michael Niedermayer authored Oct 01, 2011
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
9cb9e39c
vf_scale.c: propagate error code · 8447703c
Michael Niedermayer authored Oct 01, 2011
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
8447703c

Merge remote-tracking branch 'qatar/master' · ef74ab20

Michael Niedermayer authored Oct 01, 2011

* qatar/master: (34 commits)
  dpcm: return error if packet is too small
  dpcm: use smaller data types for static tables
  dpcm: use sol_table_16 directly instead of through the DPCMContext.
  dpcm: replace short with int16_t
  dpcm: check to make sure channels is 1 or 2.
  dpcm: misc pretty-printing
  dpcm: remove unnecessary variable by using bytestream functions.
  dpcm: move codec-specific variable declarations to their corresponding decoding blocks.
  dpcm: consistently use the variable name 'n' for the next input byte.
  dpcm: output AV_SAMPLE_FMT_U8 for Sol DPCM subcodecs 1 and 2.
  dpcm: calculate and check actual output data size prior to decoding.
  dpcm: factor out the stereo flag calculation
  dpcm: cosmetics: rename channel_number to ch
  avserver: Fix a bug where the socket is IPv4, but IPv6 is autoselected for the loopback address.
  lavf: Avoid using av_malloc(0) in av_dump_format
  dxva2_h264: pass the correct 8x8 scaling lists
  dca: NEON optimised high freq VQ decoding
  avcodec: reject audio packets with NULL data and non-zero size
  dxva: Add ability to enable workaround for older ATI cards
  latmenc: Set latmBufferFullness to largest value to indicate it is not used
  ...

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

ef74ab20

Fix out of bound reads/writes in the TIFF decoder. · 5ca5d432
Laurent Aimar authored Sep 30, 2011
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
5ca5d432