1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Commit Graph

34401 Commits

Author SHA1 Message Date
Justin Ruggles
7abb73d4ba g726: wrap the decoder functions with a CONFIG_ADPCM_G726_DECODER check 2011-11-01 21:23:04 -04:00
Justin Ruggles
437c11ca16 g726: group the g726_encoder AVCodec with the other encoding functions 2011-11-01 21:23:04 -04:00
Justin Ruggles
50969c0f46 g726: return AVERROR(EINVAL) instead of -1 for invalid channel count 2011-11-01 21:23:03 -04:00
Justin Ruggles
50c466d609 g726enc: use av_assert0() for sample_rate validation
This should never happen, but the check avoids a divide-by-zero.
2011-11-01 21:23:03 -04:00
Justin Ruggles
9e78d8cfdf g726: treat sample rates other than 8kHz as unofficial. 2011-11-01 21:23:03 -04:00
Justin Ruggles
6e8d4a7afb g726dec: remove the sample_rate validation 2011-11-01 21:23:03 -04:00
Justin Ruggles
6ac34eed54 g726: use bits_per_coded_sample instead of bitrate to determine mode
This requires some workarounds in the WAV muxer and demuxer. We need to write
the correct bits_per_coded_sample and block_align in the muxer. In the
demuxer, we cannot rely on the bits_per_coded_sample value, so we use the bit
rate and sample rate to determine the value.

This avoids having the decoder rely on AVCodecContext.bit_rate, which is not
required to be set by the user for decoding according to our API.
2011-11-01 21:23:03 -04:00
Justin Ruggles
d405237bae g726: split the init function for the encoder and decoder
This also allows for not having a decoder close function.
2011-11-01 21:23:03 -04:00
Justin Ruggles
c8d36d254e g726: pre-calculate the number of output samples.
Allows for checking output buffer size and simplification of decoding loop.
2011-11-01 21:23:03 -04:00
Justin Ruggles
e61a670b53 g726: use int16_t instead of short 2011-11-01 21:23:02 -04:00
Michael Niedermayer
3638f56dca Merge remote-tracking branch 'qatar/master'
* qatar/master:
  Enable w32threads automatically unless explicitly disabled

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-02 00:07:51 +01:00
Michael Niedermayer
3fd0f6ed25 vf_transpose: remove pix_fmts which can currently not be supported.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-01 23:45:28 +01:00
Michael Niedermayer
bd2bcf97fa dirac: drop unused END_HORIZONTAL
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-01 22:01:11 +01:00
Michael Niedermayer
e985d71926 dirac: fix horizontal_compose_dd97i_ssse3
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-01 22:01:11 +01:00
Michael Niedermayer
754539a409 dirac: Fix mmx/sse haar wavelet compose
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-01 22:01:11 +01:00
Lou Logan
0dc22e92f4 MAINTAINERS: add myself as mailinglists maintainer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-01 19:30:50 +01:00
Matthieu Bouron
2264afa1c2 gxf: add timecode information to metadata
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2011-11-01 18:41:46 +01:00
Michael Niedermayer
078811d9e4 configure: fix arch x86_32
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-01 15:52:10 +01:00
Martin Storsjö
7b7b220cf7 Enable w32threads automatically unless explicitly disabled
Signed-off-by: Martin Storsjö <martin@martin.st>
2011-11-01 16:48:15 +02:00
Carl Eugen Hoyos
ee93363f8f Fix compilation of dct-test on ia32. 2011-11-01 15:48:03 +01:00
Vladimir Voroshilov
f0506a8993 Two extra samples are required before top of the in buffer rather than out
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-01 13:08:41 +01:00
Michael Niedermayer
26b64550d6 mmsh: add return value for mmsh_open()
Found-by: cptspiff
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-01 12:59:15 +01:00
Michael Niedermayer
5ecb6f4332 MAINTAINERS: add libstagefright
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-01 12:59:15 +01:00
Michael Niedermayer
0c339897e4 MAINTAINERS: update project server
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-01 12:57:51 +01:00
Michael Niedermayer
f955fdc7c6 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  cmdutils: Rename read_file to cmdutils_read_file

Conflicts:
	ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-01 02:02:20 +01:00
Michael Niedermayer
3e5ea9e471 dirac: disable ff_horizontal_compose_haar0i_sse2() the function is not bitexact
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-01 00:47:25 +01:00
Michael Niedermayer
8af4ac5272 mmsh: do not try to seek to negative tiimestamps, it does not work
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-01 00:47:25 +01:00
Tobias Rapp
0f39fa0279 mp3enc: avoid truncating id3v1 tags by one byte
Avoid writing the trailing null-byte for id3v1 tags if length reaches max length.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-01 00:46:41 +01:00
Michael Niedermayer
33789862aa mmsh_read_seek: skip header
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-31 22:59:56 +01:00
Michael Niedermayer
237bcaa275 mmsh:_implement a minimal mmsh_seek() so the stream position can be found out.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-31 22:43:38 +01:00
Michael Niedermayer
60fcc19bff asfdec: Check packet_replic_size earlier
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-31 22:42:45 +01:00
Michael Niedermayer
8475ec190c mmsh: mmsh_read_seek()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-31 20:50:04 +01:00
Michael Niedermayer
86a4e55e66 mmsh: split out mmsh_open_internal()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-31 20:49:23 +01:00
Michael Niedermayer
aedb87c57e mmsh: move location storage into context
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-31 20:45:12 +01:00
Michael Niedermayer
df98446ba3 Revert "Remove detection of mmsh protocol in ffplay."
This reverts commit 2f64239338.
2011-10-31 18:04:39 +01:00
Michael Niedermayer
d2ea38ddb7 dirac: alignment for dirac_hpel_filter_v has been fixed
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-31 17:03:03 +01:00
Michael Niedermayer
18f2ae3b77 dirac: alignment for add_dirac_obmc has been fixed
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-31 17:00:59 +01:00
Michael Niedermayer
4debdee6ce dirac: alignment for add_rect_clamped has been fixed
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-31 17:00:40 +01:00
Michael Niedermayer
66b6d7bcd7 dirac: alignment for put_signed_rect_clamped has been fixed
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-31 17:00:03 +01:00
Michael Niedermayer
2eecf63086 dirac: alignment for dirac_hpel_filter_v() has been fixed
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-31 16:59:23 +01:00
Michael Niedermayer
08bef053a0 dirac: fix stride alignment
This code was already added by Yuvi in c82cbea68273c6f08c4d0e94fc9fd50bfdea4e2b
It was subsequently lost somehow

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-31 16:46:50 +01:00
Michael Niedermayer
a14a0d7c2c dirac: fix segfault in horizontal_compose_haar
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-31 16:34:26 +01:00
Martin Storsjö
02170990fd cmdutils: Rename read_file to cmdutils_read_file
This symbol name clashes with a symbol in gnutls, if linking
statically to that library.

Signed-off-by: Martin Storsjö <martin@martin.st>
2011-10-31 16:29:29 +02:00
Stefano Sabatini
30647fb45a lavfi: bump micro after recent changes in the overlay filter 2011-10-31 11:19:53 +01:00
Stefano Sabatini
2f7c8aefa8 vf_overlay: add support to alpha pre-multiplication in the RGBA path
Based on the work of Mark Himsley <mark@mdsh.com>.

See thread:
Subject: [FFmpeg-devel] libavfilter: extending overlay filter
Date: Sun, 13 Mar 2011 14:18:42 +0000
2011-10-31 11:06:31 +01:00
Stefano Sabatini
3013bfa81e vf_overlay: enable RGB path
Add option rgb which forces the RGB path.
2011-10-31 11:06:19 +01:00
Michael Niedermayer
c0dbab964d dirac: ff_diracdsp_init_mmx() is only compiled when yasm is available
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-31 02:47:23 +01:00
Michael Niedermayer
0489af478e Merge remote-tracking branch 'qatar/master'
* qatar/master:
  libdirac/libschroedinger: Drop unnecessary symbol prefixes.
  cmdutils: check fread() return value

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-31 02:26:47 +01:00
Michael Niedermayer
e484b64ce3 sws: fallback to mmx2 when yuv2yuvX_sse3() cannot be used.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-31 01:53:37 +01:00
Michael Niedermayer
f44ad92c3f sws: print a warning on unaligned input on SSE2+
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-31 01:53:37 +01:00