generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
45,115 Commits 24 Branches 241 Tags
Commit Graph

280 Commits

Author SHA1 Message Date
Michael Niedermayer
739e236aed swr/rematrix: Fix handling of AV_CH_LAYOUT_STEREO_DOWNMIX output 
Fixes Ticket2859

Note, testcases related to the downmix channels are welcome.
(id like to make sure this is working correctly now, as obviously it didnt
 work before ...)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit c56d4dab039b352961cca298d753b04e2f2fd990)
 2013-08-20 18:47:27 +02:00
Michael Niedermayer
3f3993ac0a swr: clean layouts before checking sanity 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 6dfffe92004dfd8c79d18791f28a2b1c7e387845)
 2013-08-20 18:47:25 +02:00
Michael Niedermayer
2ad70f57a8 swresample/x86/audio_convert: add emms to CONV 
Fixes ticket #1874

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit ca2818b88155029bb6f989ee522e7f8e9e9f5927)
 2013-06-18 02:53:59 +02:00
Michael Niedermayer
e35da91b52 swr: check channel layouts before using them. 
Fixes out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 21cd905cd44a4bbafe8631bbaa6021d328413ce5)

Conflicts:

	libswresample/swresample.c
 2013-03-03 03:00:51 +01:00
Michael Niedermayer
bca27b0480 swr: fix handling of timestamps that cause multiple drops or silence injections 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit d676598f879ba01ddb62f9abe8e17b2e94cb91cd)
 2013-01-20 02:40:22 +01:00
Michael Niedermayer
18817d4b80 swr: use 64bit index/len for x86_64 mix 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit d23e8f53ad01fde6d0dd96644c2a594f8dd7537e)
 2012-12-03 19:36:15 +01:00
Mans Rullgard
7e3208a087 ARM: libswresample: NEON optimised generic fltp to s16 conversion 
Adapted to swr by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-24 23:19:32 +02:00
Michael Niedermayer
97599f8c6d swr: make sure the last data element is NULL so we can use it to detect the number of channels 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-24 23:19:32 +02:00
Mans Rullgard
5dc7363446 ARM: libswresample: NEON optimised stereo fltp to s16 conversion 
Adaption to swr by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-24 23:16:14 +02:00
Mans Rullgard
0eebde07a9 ARM: libswresample: NEON optimised flat float to s16 conversion 
Adapted to swr by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-24 23:16:14 +02:00
Michael Niedermayer
9d89d1d484 swr/resample: mark mm_flags as potentially unused 
They are unused when asm is disabled

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-13 19:31:02 +02:00
Michael Niedermayer
31a797eb28 swr: add av_cold to init/free functions 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-09 02:26:20 +02:00
Michael Niedermayer
0e78e575ed swr/auto_matrix: treat a single channel as mono instead of failing 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-08 21:32:24 +02:00
Michael Niedermayer
f8d74cbdc3 swr/auto_matrix: treat stereo downmix like stereo. 
Based on code by John Stebbins
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-08 21:12:40 +02:00
Michael Niedermayer
c8ffab06f4 swr/auto_matrix: add clean layout function 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-08 21:10:19 +02:00
Michael Niedermayer
ebc854e4e9 swr/auto_matrix: move layouts to local variables 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-08 20:58:57 +02:00
Michael Niedermayer
070b0e1c77 libswr: remove redundant ARCH_X86, MMX* implicates X86 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-07 22:31:37 +02:00
Derek Buitenhuis
5f256f9df2 swsresample: Fix unprotected inline asm 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-07 22:29:02 +02:00
Michael Niedermayer
c5278cb84f Add Dolby/DPLII downmix support to libswresample 
Based on code by John Stebbins <jstebbins.hb@gmail.com>

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-07 00:41:49 +02:00
Michael Niedermayer
2dd2e42951 swr: update rematrix coeffs to match AC-3 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-07 00:29:06 +02:00
Michael Niedermayer
323d912010 swr: update copyright years 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-07 00:29:06 +02:00
Michael Niedermayer
d46c1c72e4 Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9' 
* commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9':
  avopt: Store defaults for AV_OPT_TYPE_INT in the i64 union member

Conflicts:
	libavcodec/libopenjpegdec.c
	libavcodec/libopenjpegenc.c
	libavcodec/libx264.c
	libavcodec/mpeg12enc.c
	libavcodec/options_table.h
	libavcodec/snowenc.c
	libavcodec/tiffenc.c
	libavdevice/v4l2.c
	libavdevice/x11grab.c
	libavfilter/af_amix.c
	libavfilter/af_asyncts.c
	libavfilter/af_join.c
	libavfilter/buffersrc.c
	libavfilter/src_movie.c
	libavfilter/vf_delogo.c
	libavfilter/vf_drawtext.c
	libavformat/http.c
	libavformat/img2dec.c
	libavformat/img2enc.c
	libavformat/movenc.c
	libavformat/mpegenc.c
	libavformat/mpegtsenc.c
	libavformat/options_table.h
	libavformat/segment.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-05 14:33:32 +02:00
Michael Niedermayer
99de3df3d3 Merge commit 'd58dd4b5b5d31cfd4092e38a5f2c894eee2ab078' 
* commit 'd58dd4b5b5d31cfd4092e38a5f2c894eee2ab078':
  avopt: Store defaults for AV_OPT_TYPE_FLAGS in the i64 union member

Conflicts:
	libavcodec/libvpxenc.c
	libavcodec/options_table.h
	libavfilter/vf_drawtext.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-05 14:09:09 +02:00
Michael Niedermayer
d5f65e9d40 Merge commit '124134e42455763b28cc346fed1d07017a76e84e' 
* commit '124134e42455763b28cc346fed1d07017a76e84e':
  avopt: Store defaults for AV_OPT_TYPE_CONST in the i64 union member

Conflicts:
	libavcodec/aacenc.c
	libavcodec/libopenjpegenc.c
	libavcodec/options_table.h
	libavdevice/bktr.c
	libavdevice/v4l2.c
	libavdevice/x11grab.c
	libavfilter/af_amix.c
	libavfilter/vf_drawtext.c
	libavformat/movenc.c
	libavformat/options_table.h
	libavutil/opt.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-05 13:58:11 +02:00
Carl Eugen Hoyos
a26789cf9f Fix compilation with yasm-0.6.2. 2012-09-01 10:59:16 +02:00
Michael Niedermayer
4814326533 swr/resample: update SSSE3 flag to new name 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-01 01:29:36 +02:00
Carl Eugen Hoyos
52be5428c0 Add some missing _EXTERNAL suffixes to yasm source files. 2012-08-31 15:39:03 +02:00
Michael Niedermayer
15a0fb58a3 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  utvideodec: Fix single symbol mode decoding
  truespeech: drop useless casts
  libavcodec: drop bogus dependencies from mpc[78] and qdm2
  mpegaudio: move ff_mpa_enwindow to a separate file
  AVOptions: store defaults for INT64 options in int64 union member.

Conflicts:
	libavcodec/Makefile
	libavfilter/af_asyncts.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-08-24 15:00:39 +02:00
Michael Niedermayer
9f088a1ed4 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  mpegvideo: reduce excessive inlining of mpeg_motion()
  mpegvideo: convert mpegvideo_common.h to a .c file
  build: factor out mpegvideo.o dependencies to CONFIG_MPEGVIDEO
  Move MASK_ABS macro to libavcodec/mathops.h
  x86: move MANGLE() and related macros to libavutil/x86/asm.h
  x86: rename libavutil/x86_cpu.h to libavutil/x86/asm.h
  aacdec: Don't fall back to the old output configuration when no old configuration is present.
  rtmp: Add message tracking
  rtsp: Support mpegts in raw udp packets
  rtsp: Support receiving plain data over UDP without any RTP encapsulation
  rtpdec: Remove an unused include
  rtpenc: Remove an av_abort() that depends on user-supplied data
  vsrc_movie: discourage its use with avconv.
  avconv: allow no input files.
  avconv: prevent invalid reads in transcode_init()
  avconv: rename OutputStream.is_past_recording_time to finished.

Conflicts:
	configure
	doc/filters.texi
	ffmpeg.c
	ffmpeg.h
	libavcodec/Makefile
	libavcodec/aacdec.c
	libavcodec/mpegvideo.c
	libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-08-09 19:31:56 +02:00
Michael Niedermayer
4ec03d1386 bessel: check that the function terminates as expected by av_assert2(). 
A clear abort is better than wrong output and a possible crash.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-08-09 01:44:15 +02:00
Michael Niedermayer
b9df3f4f6c swr: fix 10l typo mixing in and out config. 
Fixes ticket1458

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-08-01 21:18:03 +02:00
Justin Ruggles
7e15df7551 swr: resampling: add filter type and Kaiser window beta to AVOptions 2012-07-23 19:23:39 +02:00
Nicolas George
1d903a5ee4 lswr: channel_map requires input conversion. 
channel_map is applied between in and postin.
Without this test, if the input format is an acceptable internal format,
the in->postin conversion is skipped. In the best case,
it ignores channel_map, in the worst case it causes an assert failure
if the number of channels is changed by the map.
 2012-07-17 09:50:36 +02:00
Michael Niedermayer
68712ce820 swr/x86: 16bit integer mix functions need SSE2 not SSE 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-07 20:52:34 +02:00
Paul B Mahol
1842b27564 lavu: 256 color support 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-07-07 01:41:55 +00:00
Michael Niedermayer
c88e60af76 swr/x86: 10l, missed some SSE2 instructions in code marked as SSE. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-05 15:28:10 +02:00
Michael Niedermayer
7309451d73 swr: fix warning: passing argument 2 of s->mix_any_f from incompatible pointer type 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-02 17:33:27 +02:00
Michael Niedermayer
338509c2e1 swr: fix warning: passing argument 1 of s->mix_any_f from incompatible pointer type 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-02 17:32:23 +02:00
Michael Niedermayer
087d067a99 swr: fix warning: passing argument 2 of ctx->simd_f from incompatible pointer type 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-02 17:31:16 +02:00
Michael Niedermayer
04b5eb47a6 swr: fix mix* related function pointer warnings 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-02 17:23:22 +02:00
Michael Niedermayer
51d2578348 swr: fix MMX resample code, add emms 
Fixes Ticket1495

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-30 21:27:39 +02:00
Clément Bœsch
ca612a27ae swr: fix make checkheaders. 2012-06-30 11:21:53 +02:00
Clément Bœsch
022cbb6791 swr: small align cosmetic. 2012-06-30 11:18:45 +02:00
Clément Bœsch
3491c2a909 swr: use __asm__ instead of __asm. 
For consistency only.
 2012-06-30 11:18:05 +02:00
Michael Niedermayer
782763ed2b swr: fix compilation with ancient toolchain that doesnt support SSSE3 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-28 11:13:19 +02:00
Michael Niedermayer
4ccf6e3971 swr: MMX2 & SSSE3 int16 resample core 
about 4 times faster

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-28 00:36:27 +02:00
Paul B Mahol
10d2a4028c swresample: make .class_name more descriptive 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-06-22 14:01:15 +00:00
Stefano Sabatini
065851ffac lswr/rematrix: specify explicitly the name of the unsupported channel layouts 
Help debugging.
 2012-06-21 12:47:47 +02:00
Michael Niedermayer
0c142e4cda swr: introduce filter_alloc in preparation of SIMD resample optimisations 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-19 03:09:24 +02:00
Michael Niedermayer
80e857c967 swr/resample: optimize C code for the most common case 
15% speedup

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-19 03:09:24 +02:00