virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity
60,672 Commits 37 Branches 400 Tags 458 MiB
1db87da351
Commit Graph

60672 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexandra Khirnova
28e508a946 dnxhddec: return proper error code 
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2014-02-09 18:36:16 +01:00
Andrew Kelley
b0c2c097e4 lavf: default .ogg audio to libvorbis if we can 
Since 2007, the Xiph.org Foundation recommends that .ogg only be used
for Ogg Vorbis audio files.

Source: http://wiki.xiph.org/index.php/MIME_Types_and_File_Extensions

However we only do it if we have libvorbis available because the
built in vorbis encoder is not as good.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2014-02-09 18:36:15 +01:00
Ronald S. Bultje
0d4d223353 vp9: invert order in l[] intra prediction array. 
The directional intra predictors either don't care about order (dc, h,
dc_left, tm), or they prefer inverted order (vr, dr, hd). This allows
more efficient SIMD implementations.
 2014-02-09 18:07:15 +01:00
Ronald S. Bultje
37c6eac296 vp9: remove memset in loopfilter level setting loop. 
Use same function for segmentation map writing also.
 2014-02-09 18:07:14 +01:00
Ronald S. Bultje
45245e202e vp9: coef decoding context-splat speedup. 2014-02-09 18:07:14 +01:00
Ronald S. Bultje
fccd7d81b6 vp9: decode_mode context optimizations. 2014-02-09 18:07:14 +01:00
Ronald S. Bultje
1dc8559e25 vp9: more aligned zeroes. 2014-02-09 18:07:14 +01:00
Ronald S. Bultje
0c30c8ddc1 vp9: faster skip-block coefficient blanking. 2014-02-09 18:07:14 +01:00
Ronald S. Bultje
cdfcd06126 vp9: coef context reading optimization. 2014-02-09 18:07:14 +01:00
Ronald S. Bultje
9aeca1c572 vp9: just disallow temporal or no-update segmentation on size-change. 
The spec doesn't describe how it should be decoded so this is probably
the safest thing to do. Fixes valgrind errors on fuzzed11.ivf and fixes
valgrind errors on fuzzed10.ivf differently.
 2014-02-09 18:07:14 +01:00
Ramiro Polla
5965adeb20 lavd: add decklink output device 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-09 17:15:19 +01:00
mrlika
36a6297953 avcodec/dvbsubdec: DVB subtitles decoder: support of 5 bytes extradata format 
Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-09 17:14:57 +01:00
Maxim Poliakovski
bc3f03567a g2meet: rename FRAME_INFO to more appropriate DISPLAY_INFO 
Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
 2014-02-09 16:13:23 +01:00
Derek Buitenhuis
ef5d32b9c5 Add raw HEVC muxer 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2014-02-09 14:29:07 +00:00
Derek Buitenhuis
722554788b Add raw HEVC muxer 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2014-02-09 14:15:44 +00:00
Michael Niedermayer
4040b56f5a Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  mlp_parser: fix request_channel_layout behavior.

Conflicts:
	libavcodec/mlp_parser.c

See: bd35d58463
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-09 02:37:17 +01:00
Michael Niedermayer
73be2ebe96 Merge commit 'f90a4bfc43c9192e89d9b4c81d80789cd9b38a2f' 
* commit 'f90a4bfc43c9192e89d9b4c81d80789cd9b38a2f':
  mlpdec: fix request_channel_layout behavior.

See: 1a8050ad61
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-09 01:32:17 +01:00
Maxim Poliakovski
ae95b2f810 g2meet: Validate bpp and bitmasks in the display info 
That prevents processing of media files with
incompatible or unsupported settings.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-08 23:30:02 +01:00
Maxim Poliakovski
3f826039dd g2meet: factor out chunk seeking 
This version requires fewer code and is safer.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-08 23:09:57 +01:00
Maxim Poliakovski
cb2162adba g2meet: Rename FRAME_INFO to more appropriate DISPLAY_INFO 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-08 23:01:14 +01:00
Ronald S. Bultje
0c67864a37 vp9: don't allow retaining old segmentation maps after a size change. 
Fixes valgrind warnings on fuzzed10.ivf.
 2014-02-08 22:08:20 +01:00
Tim Walker
c1e7de8f62 mlp_parser: fix request_channel_layout behavior. 
When request_channel_layout is 0,
all substreams should be decoded.

Thanks to Michael Niedermayer for spotting.

Also fix a mismatch between the parser and
decoder when request_channel_layout is a
subset of Stereo.
 2014-02-08 20:10:51 +01:00
Michael Niedermayer
f90a4bfc43 mlpdec: fix request_channel_layout behavior. 
When request_channel_layout is 0,
all substreams should be decoded.

Signed-off-by: Tim Walker <tdskywalker@gmail.com>
 2014-02-08 20:10:35 +01:00
Michael Niedermayer
0c4bf87b29 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  Mirillis FIC video decoder

Conflicts:
	Changelog
	configure
	libavcodec/Makefile
	libavcodec/avcodec.h
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-08 19:02:46 +01:00
Michael Niedermayer
b08f554fdc Merge commit '76a75c523cd3c63560185394a0a5cd7249db962a' 
* commit '76a75c523cd3c63560185394a0a5cd7249db962a':
  lavr: mix front center channel as indicated in the ATSC A/52 specification.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-08 18:38:17 +01:00
Ronald S. Bultje
7f0f47b3df vp9: some variable re-arrangements for alignment. 2014-02-08 18:30:17 +01:00
Ronald S. Bultje
af63ea7078 vp9: re-allocate block buffers on uses_2pass change w/o size change. 
Fixes valgrind errors and crashes in fuzzed9.ivf.
 2014-02-08 18:30:17 +01:00
Michael Niedermayer
bd35d58463 avcodec/mlp_parser: fix multichannel 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-08 18:13:34 +01:00
Michael Niedermayer
1a8050ad61 avcodec/mlpdec: fix mulichannel output 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-08 18:08:01 +01:00
Michael Niedermayer
aedc10137d Merge commit 'c0c45188e56cfa3050bb39f8299025345b8a204c' 
* commit 'c0c45188e56cfa3050bb39f8299025345b8a204c':
  mlp: improve request_channel_layout behavior.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-08 17:31:30 +01:00
Michael Niedermayer
df98b36aa6 Merge commit '5c1c6e82261b856214499b9fef3a08bf3ff6e0ae' 
* commit '5c1c6e82261b856214499b9fef3a08bf3ff6e0ae':
  dca: include dcadsp.h in {arm,x86}/dca.h for checkheaders

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-08 17:25:31 +01:00
Michael Niedermayer
3a0e4f6c90 Merge commit '6398d8fd813490fc3900baf8c788f803d8e17b73' 
* commit '6398d8fd813490fc3900baf8c788f803d8e17b73':
  configure: clang: add -Qunused-arguments to as|ld_flags as well

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-08 17:15:36 +01:00
Michael Niedermayer
4df9d9ca4f Merge commit 'b141c7b37eb52aca41ac83738f159b63b9c09d5c' 
* commit 'b141c7b37eb52aca41ac83738f159b63b9c09d5c':
  h264: give numbers to nalus

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-08 17:09:39 +01:00
Michael Niedermayer
dd2b330347 Merge commit '0cffd6fff59f192120dc93aa6c3cb8180f5506e3' 
* commit '0cffd6fff59f192120dc93aa6c3cb8180f5506e3':
  x86: use the inline int8x8_fmul_int32 only if inline SSE2 is availbale

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-08 17:06:57 +01:00
Kostya Shishkov
cde7df25ef Mirillis FIC video decoder 
Does not contain cursor rendering yet.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2014-02-08 15:04:13 +00:00
Tim Walker
76a75c523c lavr: mix front center channel as indicated in the ATSC A/52 specification. 
When mixing 3 front channels into 2, the center channel is mixed into left and right with the center mix level, not -3dB.
 2014-02-08 13:42:55 +01:00
Tim Walker
c0c45188e5 mlp: improve request_channel_layout behavior. 
Don't decode further substreams if request_channel_layout
is a subset of the current substream's channel_layout.

Before, we would only discard further substreams if
request_channel_layout matched the substream's
channel_layout extactly, thus decoding additional
channels which the caller would probably end up downmixing.
 2014-02-08 13:39:37 +01:00
Janne Grunau
5c1c6e8226 dca: include dcadsp.h in {arm,x86}/dca.h for checkheaders 2014-02-08 13:38:36 +01:00
Janne Grunau
6398d8fd81 configure: clang: add -Qunused-arguments to as|ld_flags as well 2014-02-08 13:38:36 +01:00
Vittorio Giovara
b141c7b37e h264: give numbers to nalus 
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
 2014-02-08 13:38:31 +01:00
Ronald S. Bultje
c72f587353 vp9/parser: change size type to unsigned. 
Fixes valgrind errors in fuzzed8.ivf because size >= 0x80000000.
 2014-02-08 12:53:59 +01:00
Michael Niedermayer
3b6655ebff avcodec/hevc: remove FFUMOD() in slice qp_y init 
This has become redundant

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-08 12:27:00 +01:00
Michael Niedermayer
1e263133cc avcodec/hevc: remove unused variables 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-08 12:27:00 +01:00
Lukasz Marek
20fe316e47 lavd/sdl: reset context variables after destroy 
SDL device reports double free or hangs when quiting.
Reseting variables solves the issue.

The issue is caused by double call of write_trailer callback.
It is called for the first time in write_packet when quit flag is set.
Second call comes from ffmpeg.c or may come from other client application.

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-08 12:27:00 +01:00
Lukasz Marek
18c3313e65 lavd/sdl: make waiting spurious wakeup aware 
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-08 12:27:00 +01:00
Janne Grunau
0cffd6fff5 x86: use the inline int8x8_fmul_int32 only if inline SSE2 is availbale 
Fixes compilation with MSVC. Also does not rely on on earlier config.h
include but include it directly.
 2014-02-08 12:10:56 +01:00
Carl Eugen Hoyos
4bcc6febcf Fix compilation with --disable-everything --enable-encoder=flac. 2014-02-08 12:06:49 +01:00
Ronald S. Bultje
bbc3425fa2 vp9: fix mix-up of last-frame/cur-frame in frame size checks. 
Fixes invalid reads in fuzzed7.ivf.
 2014-02-08 11:18:37 +01:00
Clément Bœsch
669d4f9053 x86/vp9lpf: simplify 2nd transpose in 44/48/88/84. 
For non-avx optims, this saves 8 movs.

before:
  1785 decicycles in ff_vp9_loop_filter_h_44_16_ssse3, 524129 runs, 159 skips
  3327 decicycles in ff_vp9_loop_filter_h_48_16_ssse3, 262116 runs, 28 skips
  2712 decicycles in ff_vp9_loop_filter_h_88_16_ssse3, 4193729 runs, 575 skips
  3237 decicycles in ff_vp9_loop_filter_h_84_16_ssse3, 524061 runs, 227 skips

after:
  1768 decicycles in ff_vp9_loop_filter_h_44_16_ssse3, 524062 runs, 226 skips
  3310 decicycles in ff_vp9_loop_filter_h_48_16_ssse3, 262107 runs, 37 skips
  2719 decicycles in ff_vp9_loop_filter_h_88_16_ssse3, 4193954 runs, 350 skips
  3184 decicycles in ff_vp9_loop_filter_h_84_16_ssse3, 524236 runs, 52 skips
 2014-02-08 11:10:23 +01:00
Reynaldo H. Verdejo Pinochet
958d98cc1c ffserver: drop unneeded delay1 var 
Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com>
 2014-02-08 00:30:29 -03:00