generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
36,227 Commits 24 Branches 241 Tags 173 MiB
c1bc1967f3
Commit Graph

72 Commits

Author SHA1 Message Date
Michael Niedermayer
320b8d6335 swr: fix swresample_version() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-23 23:26:02 +01:00
Michael Niedermayer
ab6603b1d8 libswresample.v: add swresample* for cmdutils.c 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-22 04:47:52 +01:00
Michael Niedermayer
3339f87dbd swr: increase LIBSWRESAMPLE_VERSION_MICRO to 100 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-22 03:09:41 +01:00
Michael Niedermayer
4468ad827a swr: add swresample_version swresample_configuration and swresample_license 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-22 03:08:47 +01:00
Michael Niedermayer
aa1c590b29 swr: fix assert failure 
Bug found by: Oana Stratulat
GCI-id: 7211207

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-20 11:28:34 +01:00
Michael Niedermayer
3ba0bfe71f Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  ulti: Fix invalid reads
  lavf: dealloc private options in av_write_trailer
  yadif: support 10bit YUV
  vc1: mark with ER_MB_ERROR bits overconsumption
  lavc: introduce ER_MB_END and ER_MB_ERROR
  error_resilience: use the ER_ namespace
  build: move inclusion of subdir.mak to main subdir loop
  rv34: NEON optimised 4x4 dequant
  rv34: move 4x4 dequant to RV34DSPContext
  aacdec: Use intfloat.h rather than local punning union.

Conflicts:
	libavcodec/h264.c
	libavcodec/vc1dec.c
	libavfilter/vf_yadif.c
	libavformat/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-13 23:21:37 +01:00
Michael Niedermayer
12804348f5 swr-test: drop one const, silence most const qualifer warnings. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-03 00:46:46 +01:00
Michael Niedermayer
ebe4d5adc5 swr-test_: Fix mixed declaration and statements: 
swresample_test.c:123:21: warning: ISO C90 forbids mixed declarations and code [-Wdeclaration-after-statement]
swresample_test.c:127:25: warning: ISO C90 forbids mixed declarations and code [-Wdeclaration-after-statement]

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-03 00:40:15 +01:00
Clément Bœsch
81a65b82fb swr: handle correctly muted channel with u8 sample fmt. 2011-11-29 17:14:25 +01:00
Clément Bœsch
0232f788b6 swr: fix invalid sample format message. 
If the sample format is invalid, av_get_sample_fmt_name() will always
return NULL.
 2011-11-24 16:55:45 +01:00
Clément Bœsch
58205edcc6 swr: use native planar sample formats. 2011-11-24 16:55:45 +01:00
Clément Bœsch
afb0470a25 swr: fix test program. 
The number of used channels need to be reset to zero when
swr_alloc_set_opts() is called successive times.

This is a regression introduced in c8136ebd.
 2011-11-24 16:55:44 +01:00
Clément Bœsch
bdd22e3523 swr: change minimum I/O channel count to zero. 
This will silence the warning of av_set_opt_int() in swr for
input/output channels when the layout is not yet defined (or supported).
 2011-11-20 16:06:16 +01:00
Michael Niedermayer
4fef94c6d2 swr: doxument matrix fields. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-17 20:29:55 +01:00
Clément Bœsch
0bfc03df3a swr: move code to avoid resample forward declaration. 2011-11-17 18:30:03 +01:00
Clément Bœsch
eafa2b6005 swr: introduce a public function to customize the channel mapping. 2011-11-17 18:30:03 +01:00
Clément Bœsch
1dbd433f0d swr: use av_opt_set_int() instead of manual assignments in swr_alloc_set_opts(). 2011-11-17 17:57:20 +01:00
Clément Bœsch
f03afd5d54 swr: surround mixing is obviously used, fix comment. 2011-11-17 17:57:07 +01:00
Clément Bœsch
68d3144e89 swr: doxycomment public API. 2011-11-17 17:56:55 +01:00
Clément Bœsch
acd56efbeb swr: correctly raise rematrix AVERROR. 2011-11-17 17:56:52 +01:00
Clément Bœsch
7cdfce4f63 swr: fix "control reaches end of non-void function" compiler warning. 2011-11-17 10:16:08 +01:00
Clément Bœsch
809631af1a swr: bump minor version. 2011-11-17 10:16:07 +01:00
Clément Bœsch
af1eb298c1 swr: use int16_t instead of short for resampling. 2011-11-17 10:16:07 +01:00
Clément Bœsch
4c0bad513a swr: start doxycommenting the API. 2011-11-17 10:16:07 +01:00
Clément Bœsch
a768b9d825 swr: make swr_* functions match the prototypes. 2011-11-17 10:16:07 +01:00
Clément Bœsch
645c61fb2b swr: rename swr_alloc2() to swr_alloc_set_opts(). 2011-11-17 10:16:07 +01:00
Clément Bœsch
c4deb90cfa swr: use "swri_" prefix instead of "swr_" for the private API. 2011-11-17 10:16:07 +01:00
Clément Bœsch
64db5a1a57 swr: drop 'AV' prefix from ResampleContext. 
This type/struct is not part of the public API.
 2011-11-17 10:16:07 +01:00
Clément Bœsch
fc6351d019 swr: make audio convert code explicitely private. 
Only what's declared in libswresample/swresample.h is public.
 2011-11-17 10:16:07 +01:00
Clément Bœsch
3a5fc38574 swr: fix #endif comment ref. 2011-11-17 10:16:07 +01:00
Clément Bœsch
df72ae673f swr: replace deprecated av_set_int() with av_opt_set_int(). 2011-11-16 07:27:20 +01:00
Clément Bœsch
ad561b5707 swr: replace deprecated av_opt_set_defaults2() with av_opt_set_defaults(). 2011-11-16 07:27:20 +01:00
Clément Bœsch
180aa82c1d swr: replace deprecated av_get_bits_per_sample_fmt() with av_get_bytes_per_sample(). 2011-11-16 07:27:20 +01:00
Clément Bœsch
f9368466c4 swr: use designated initializers for the class. 2011-11-16 07:27:20 +01:00
Clément Bœsch
7e516a11ca swr: rename resample2 to resample. 2011-11-16 07:27:20 +01:00
Clément Bœsch
fc42550097 swr: move format convert code to dedicated functions. 
This should easier common case optimizations.
 2011-11-16 07:27:20 +01:00
Clément Bœsch
c8136ebd6a swr: set the default used_ch_count value to zero. 
This allows an appropriate behaviour when it is not specified (fallback
to the number of input channels).

Fixes Ticket523
 2011-11-14 22:11:28 +01:00
Clément Bœsch
f5cd136f2b ffmpeg: add -map_channel option. 
Based on an initial work by Baptiste Coudurier.
 2011-11-04 19:40:32 +01:00
Michael Niedermayer
5cd1580ff8 swr: document how flushing works and bump minor version. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-04 16:34:39 +01:00
Michael Niedermayer
813b20a39f swr-test: test flushing 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-04 16:32:31 +01:00
Michael Niedermayer
71f5712cb5 swr: Support flushing last samples out. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-04 16:31:51 +01:00
Michael Niedermayer
1b9ca38d9d resample2: fix potential overflow 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-27 14:34:45 +02:00
Michael Niedermayer
a67cb012e6 resample: Fix overflow 
Found-by: Jim Radford
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-27 14:31:53 +02:00
Michael Niedermayer
2f86566a31 rematrix: add parameter to tune volume 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-26 00:46:46 +02:00
Michael Niedermayer
b1470d7a60 rematrix: change type of integers from 16 to 32bit to allow increasing volume with it. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-26 00:46:46 +02:00
Michael Niedermayer
1e40b2c22b rematrix: add type for coefficients 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-26 00:46:46 +02:00
Michael Niedermayer
44a2bb75a7 swr: Fix swresample.c:293:5: warning: passing argument 2 of ‘fill_audiodata’ from incompatible pointer type 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-21 00:36:00 +02:00
Michael Niedermayer
36e5e51ae3 swr: remove unused variable. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-21 00:34:37 +02:00
Michael Niedermayer
a911177276 swr: Fix assignment discards qualifiers from pointer target type warning. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-21 00:33:04 +02:00
Michael Niedermayer
03e56a2ad9 resample2: Fix passing argument from incompatible pointer type warnings. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-21 00:31:20 +02:00