ffmpeg.git
8 years agoRefactor the 'fmt ' tag search and parsing
Tomas Härdin [Tue, 17 May 2011 17:46:08 +0000 (19:46 +0200)]
Refactor the 'fmt ' tag search and parsing

Moving the search and parsing of the 'fmt ' info the main loop of wav_read_header() allows tags that precede it to be parsed.
Creating wav_parse_fmt_tag() makes wav_read_header() easier to read.

8 years agoffmpeg: reset top_field_first in opt_input_file().
Michael Niedermayer [Tue, 17 May 2011 14:48:39 +0000 (16:48 +0200)]
ffmpeg: reset top_field_first in opt_input_file().

This allows seting tff for inputs without also setting it for the output
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoOgg demuxer: give meaningful error codes and warnings.
Nicolas George [Fri, 15 Apr 2011 15:08:12 +0000 (17:08 +0200)]
Ogg demuxer: give meaningful error codes and warnings.

Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
8 years agoMerge branch 'master' of git.videolan.org:ffmpeg
Compn [Tue, 17 May 2011 03:31:23 +0000 (23:31 -0400)]
Merge branch 'master' of git.videolan.org:ffmpeg

8 years agoupdate changelog with 9/10 bit H264 and FFV1 changes
Compn [Tue, 17 May 2011 03:30:41 +0000 (23:30 -0400)]
update changelog with 9/10 bit H264 and FFV1 changes

8 years agoMerge remote branch 'qatar/master'
Michael Niedermayer [Tue, 17 May 2011 02:47:05 +0000 (04:47 +0200)]
Merge remote branch 'qatar/master'

12 files changed, 36 insertions(+), 81 deletions(-)
yes thats 36 new lines in 14 commits

* qatar/master:
  ffmpeg: fix -aspect cli option
  Restructure video filter implementation in ffmpeg.c.
  ffplay: remove audio_write_get_buf_size() forward declaration
  lavfi: print key-frame and picture type information in ff_dlog_ref()
  mathops: remove ancient confusing comment
  cws2fws: Improve error message wording.
  tools: Check the return value of write().
  mpegaudio: move OUT_FMT macro to mpegaudiodec.c
  mpegaudio: remove OUT_MIN/MAX macros
  Add missing #includes to mp3_header_(de)compress bsf
  dct: fix indentation
  dct: bypass table allocation for DCT_II of size 32
  h264dsp_mmx: Add #ifdefs around some mmxext functions on x86_64.
  Remove unused header mpegaudio3.h.

Conflicts:
ffmpeg.c
libavcodec/mpegaudio.h
libavcodec/mpegaudio3.h
libavfilter/avfilter.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoAdd some forgotten const to function arguments in libavfilter & libavformat.
Michael Niedermayer [Mon, 16 May 2011 22:46:48 +0000 (00:46 +0200)]
Add some forgotten const to function arguments in libavfilter & libavformat.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoWrite channel_layout for multichannel aif files.
Carl Eugen Hoyos [Mon, 16 May 2011 23:56:01 +0000 (01:56 +0200)]
Write channel_layout for multichannel aif files.

8 years agoFix ff_mov_write_chan() so it can be used by other muxers.
Carl Eugen Hoyos [Mon, 16 May 2011 23:47:12 +0000 (01:47 +0200)]
Fix ff_mov_write_chan() so it can be used by other muxers.

8 years agoFix some mov files with little endian audio (tickets 201 - 203).
Carl Eugen Hoyos [Mon, 16 May 2011 23:17:27 +0000 (01:17 +0200)]
Fix some mov files with little endian audio (tickets 201 - 203).

8 years agoiff/8svx: redesign 8SVX demuxing and decoding for handling stereo samples correctly
Stefano Sabatini [Sun, 15 May 2011 11:24:46 +0000 (13:24 +0200)]
iff/8svx: redesign 8SVX demuxing and decoding for handling stereo samples correctly

Make the iff demuxer send the whole audio chunk to the decoder as a
single packet, move stereo interleaving from the iff demuxer to the
decoder, and introduce an 8svx_raw decoder which performs
stereo interleaving.

This is required for handling stereo data correctly, indeed samples
are stored like:
LLLLLL....RRRRRR

that is all left samples are at the beginning of the chunk, all right
samples at the end, so it is necessary to store and process the whole
buffer in order to decode each frame. Thus the decoder needs all the
audio chunk before it can return interleaved data.

Fix decoding of files 8svx_exp.iff and 8svx_fib.iff, fix trac issue #169.

8 years agoiff: compact code setting metadata tags
Stefano Sabatini [Fri, 13 May 2011 21:28:18 +0000 (23:28 +0200)]
iff: compact code setting metadata tags

Ease readability.

8 years agoiff: fix bitrate computation for compressed audio stream
Stefano Sabatini [Tue, 10 May 2011 13:40:03 +0000 (15:40 +0200)]
iff: fix bitrate computation for compressed audio stream

8 years agoiff: distinguish fields for audio and video compression
Stefano Sabatini [Tue, 10 May 2011 13:33:36 +0000 (15:33 +0200)]
iff: distinguish fields for audio and video compression

Create separate fields 8svx_compression (for audio compression), and
bitmap_compression (for video compression), and perform minor related
logging tweaks.

Improve clarity, also simplify the case when both types of compression
are employed in the same file.

8 years agoimgutils: introduce internal image_get_linesize() and use it
Stefano Sabatini [Sun, 15 May 2011 10:47:06 +0000 (12:47 +0200)]
imgutils: introduce internal image_get_linesize() and use it

Allow to factorize code between av_image_get_linesize() and
av_image_fill_linesizes(), and add missing checks.

Increase robustness.

8 years agoimgutils: make av_image_get_linesize() return AVERROR(EINVAL) for invalid pixel formats
Stefano Sabatini [Fri, 13 May 2011 14:27:35 +0000 (16:27 +0200)]
imgutils: make av_image_get_linesize() return AVERROR(EINVAL) for invalid pixel formats

8 years agodrawtext: specify union type for setting default options
Stefano Sabatini [Mon, 16 May 2011 21:44:35 +0000 (23:44 +0200)]
drawtext: specify union type for setting default options

Fix warnings of the type:
vf_drawtext.c:NNN: warning: missing braces around initializer
vf_drawtext.c:NNN: warning: (near initialization for ‘drawtext_options[X].default_val’)

8 years agodrawtext: reindent after the previous commit
Stefano Sabatini [Mon, 16 May 2011 21:48:00 +0000 (23:48 +0200)]
drawtext: reindent after the previous commit

8 years agodrawtext: fix strftime() text expansion
Stefano Sabatini [Mon, 16 May 2011 18:11:50 +0000 (20:11 +0200)]
drawtext: fix strftime() text expansion

The feature was dropped after the filter was partially rewritten and
recommitted.

Fix issue #207.

8 years agoffmpeg: fix -aspect cli option
Baptiste Coudurier [Fri, 1 Apr 2011 15:30:45 +0000 (17:30 +0200)]
ffmpeg: fix -aspect cli option

Redesign the way -aspect option is handled. This is done by making
ffmpeg read the sample aspect ratio set in the corresponding input
stream by default, and overriding it using the value specified by
-aspect.

If the output display aspect ratio is specified with -aspect, it is
set at the end of the filterchain, thus overriding the value set by
filters in the filterchain.

This implementation is more robust, since does not modify the
filterchain description (which was creating potential syntax errors).

(Cherry-pick abf8342aa94bdf06bb324f6723a6743dd628d5c6)

Another aspect ratio fix try. This leaves the setdar addition at the end
(preferred by people).

(Cherry-pick e7c7b0d000e81d24327602e04d8fed400dbb7193)

8 years agoRestructure video filter implementation in ffmpeg.c.
Michael Niedermayer [Mon, 14 Feb 2011 22:02:10 +0000 (23:02 +0100)]
Restructure video filter implementation in ffmpeg.c.

This fixes several bugs like multiple outputs and -aspect mixed with -vf

(cherry picked from commit 1762d9ced70ccc46c5d3e5d64e56a48d0fbbd4f7)
(cherry picked from commit 5c20c81bfa526b3a269db9c88b0c9007861f0917)
(cherry picked from commit a7844c580d83d8466c161a0e3979b3902d0d9100)

8 years agoffplay: remove audio_write_get_buf_size() forward declaration
Stefano Sabatini [Tue, 12 Apr 2011 10:06:49 +0000 (12:06 +0200)]
ffplay: remove audio_write_get_buf_size() forward declaration

Move up the definition of audio_write_get_buf_size(), so that it is
defined before it is used. Simplify.
(cherry picked from commit 8776f3d22e401e30d17856e341f6cabbbefa92f7)

8 years agolavfi: print key-frame and picture type information in ff_dlog_ref()
Stefano Sabatini [Sat, 23 Apr 2011 17:55:59 +0000 (19:55 +0200)]
lavfi: print key-frame and picture type information in ff_dlog_ref()

Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
(cherry picked from commit f7bdffb09da597c5d6afff5359523370470ad072)

8 years agomathops: remove ancient confusing comment
Mans Rullgard [Mon, 16 May 2011 20:31:06 +0000 (21:31 +0100)]
mathops: remove ancient confusing comment

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agorawdec: Allow overriding top field first.
Michael Niedermayer [Mon, 16 May 2011 19:52:35 +0000 (21:52 +0200)]
rawdec: Allow overriding top field first.

Iam not sure this is the best way to implement it, but its the simplest
and keeps the code seperate from the application. Keeping ffmpeg.c
simple and not requireing user apps to duplicate this code.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoffmpeg: initialize input_codec array earlier.
Michael Niedermayer [Mon, 16 May 2011 19:20:35 +0000 (21:20 +0200)]
ffmpeg: initialize input_codec array earlier.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agocmdutils: Allocate private decoder context if its not allocated yet.
Michael Niedermayer [Mon, 16 May 2011 19:00:06 +0000 (21:00 +0200)]
cmdutils: Allocate private decoder context if its not allocated yet.

This fixes and simplifies setting decoder private options.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agocws2fws: Improve error message wording.
Diego Biurrun [Sun, 15 May 2011 20:17:35 +0000 (22:17 +0200)]
cws2fws: Improve error message wording.

8 years agotools: Check the return value of write().
Diego Biurrun [Sun, 15 May 2011 16:34:11 +0000 (18:34 +0200)]
tools: Check the return value of write().

This fixes several warnings of the type:
warning: ignoring return value of ‘write’, declared with attribute warn_unused_result

8 years agompegaudio: move OUT_FMT macro to mpegaudiodec.c
Mans Rullgard [Mon, 16 May 2011 16:06:30 +0000 (17:06 +0100)]
mpegaudio: move OUT_FMT macro to mpegaudiodec.c

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agompegaudio: remove OUT_MIN/MAX macros
Mans Rullgard [Mon, 16 May 2011 16:13:23 +0000 (17:13 +0100)]
mpegaudio: remove OUT_MIN/MAX macros

These macros are no longer needed after the s32 output was removed.
Change the relevant code to use av_clip_int16() instead of using
explicit limits.

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agoAdd missing #includes to mp3_header_(de)compress bsf
Mans Rullgard [Mon, 16 May 2011 14:23:22 +0000 (15:23 +0100)]
Add missing #includes to mp3_header_(de)compress bsf

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agodct: fix indentation
Mans Rullgard [Mon, 16 May 2011 14:57:36 +0000 (15:57 +0100)]
dct: fix indentation

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agodct: bypass table allocation for DCT_II of size 32
Mans Rullgard [Mon, 16 May 2011 14:57:04 +0000 (15:57 +0100)]
dct: bypass table allocation for DCT_II of size 32

The size-32 DCT_II has a special implementation which doesn't use
the normal tables.  Skipping allocation of these in this case saves
some memory.

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agopngdec: relax condition for setting monoblack pixel format
Stefano Sabatini [Sun, 15 May 2011 23:51:04 +0000 (01:51 +0200)]
pngdec: relax condition for setting monoblack pixel format

Ignore color_type information for setting the monoblack pixel format,
only rely on bit_depth.

In particular: fix Test_1bpp_grayscale.png from issue #172.

This may work fine for some broken encoder, and not for others.

8 years agoh264dsp_mmx: Add #ifdefs around some mmxext functions on x86_64.
Gil Pedersen [Mon, 16 May 2011 12:40:56 +0000 (14:40 +0200)]
h264dsp_mmx: Add #ifdefs around some mmxext functions on x86_64.

This fixes linking errors due to undefined symbols on x86_64 OS X.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
8 years agoRemove unused header mpegaudio3.h.
Diego Biurrun [Mon, 16 May 2011 01:34:20 +0000 (03:34 +0200)]
Remove unused header mpegaudio3.h.

The header is a part of an MP3 encoder that never saw the light of day.

8 years agoSupport decoding of 1bpp rawvideo in avi (ticket 205).
ami_stuff [Mon, 16 May 2011 09:26:45 +0000 (11:26 +0200)]
Support decoding of 1bpp rawvideo in avi (ticket 205).

8 years agoSupport decoding of 2bpp rawvideo in avi (ticket 206).
ami_stuff [Mon, 16 May 2011 09:25:57 +0000 (11:25 +0200)]
Support decoding of 2bpp rawvideo in avi (ticket 206).

8 years agoBump minor after adding a caf muxer.
Carl Eugen Hoyos [Mon, 16 May 2011 09:24:23 +0000 (11:24 +0200)]
Bump minor after adding a caf muxer.

8 years agoMerge remote branch 'qatar/master'
Michael Niedermayer [Mon, 16 May 2011 03:01:24 +0000 (05:01 +0200)]
Merge remote branch 'qatar/master'

* qatar/master:
  aacdec: Use float instead of int16_t for ltp_state to avoid needless rounding.
  acelp: Remove unused gray_decode table.
  dfa: Remove unused variable.
  configure: Include AVX availability in summary output.
  configure: use same CPPFLAGS in kFreeBSD as Linux

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoconfigure: another try on fixing osx/mingw SDL
Hanspeter Niederstrasser [Mon, 16 May 2011 00:57:15 +0000 (02:57 +0200)]
configure: another try on fixing osx/mingw SDL

8 years agoaacdec: Use float instead of int16_t for ltp_state to avoid needless rounding.
Justin Ruggles [Sun, 15 May 2011 15:07:29 +0000 (11:07 -0400)]
aacdec: Use float instead of int16_t for ltp_state to avoid needless rounding.

8 years agoav_picture_crop(): Support simple cases with packed pixels too.
Michael Niedermayer [Sun, 15 May 2011 20:37:02 +0000 (22:37 +0200)]
av_picture_crop(): Support simple cases with packed pixels too.

This fixes a regression when linked to old ffmpeg.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoacelp: Remove unused gray_decode table.
Diego Biurrun [Fri, 29 Apr 2011 17:42:00 +0000 (19:42 +0200)]
acelp: Remove unused gray_decode table.

8 years agodfa: Remove unused variable.
Diego Biurrun [Sun, 15 May 2011 11:12:47 +0000 (13:12 +0200)]
dfa: Remove unused variable.

This fixes the warning:
libavcodec/dfa.c:189: warning: unused variable ‘frame_end’

8 years agoconfigure: Include AVX availability in summary output.
Diego Biurrun [Sun, 15 May 2011 09:46:18 +0000 (11:46 +0200)]
configure: Include AVX availability in summary output.

8 years agorawdec: propagate pict_type information to the output frame
Stefano Sabatini [Sat, 14 May 2011 17:47:55 +0000 (19:47 +0200)]
rawdec: propagate pict_type information to the output frame

8 years agoshowinfo: replace "CRC" by "checksum"
Stefano Sabatini [Sat, 14 May 2011 13:19:26 +0000 (15:19 +0200)]
showinfo: replace "CRC" by "checksum"

Indeed the Adler-32 checksum, which is computed by showinfo, is not
cyclic, so using the term "CRC" is wrong/confusing.

8 years agoshowinfo: fix vertical align nit
Stefano Sabatini [Sat, 14 May 2011 13:09:54 +0000 (15:09 +0200)]
showinfo: fix vertical align nit

8 years agoshowinfo: fix computation of Adler checksum
Stefano Sabatini [Sat, 14 May 2011 11:20:52 +0000 (13:20 +0200)]
showinfo: fix computation of Adler checksum

Previously the code was computing the checksum only for the first line
of each plane.

8 years agoimgutils: generalize linesize computation for bitstream formats
Stefano Sabatini [Fri, 13 May 2011 13:42:31 +0000 (15:42 +0200)]
imgutils: generalize linesize computation for bitstream formats

Make it a subcase of the general algorithm used for the non-bitstream
case. Simplify, and make av_image_get_linesize() and
av_image_fill_linesizes() correctly return the right value when plane
!= 0.

In particular fix a crash occurring with:
-vf format=monow,showinfo,format=monow.

8 years agoconfigure: use same CPPFLAGS in kFreeBSD as Linux
Reinhard Tartler [Sat, 14 May 2011 14:10:30 +0000 (16:10 +0200)]
configure: use same CPPFLAGS in kFreeBSD as Linux

046f081b46c8479820409cf8f530b988221bd15b reorganized the CPPFLAGS to no
longer add -D_POSIX_C_SOURCE unconditionally, but only on systems (e.g.,
glibc based ones) that require it.  As kFreeBSD uses glibc, it needs to
be treated similar.

Additionally, _BSD_SOURCE is turned on to enable some additional types
such as caddr_t, which are normally enabled on BSD but not with glibc.

8 years agoMerge remote branch 'qatar/master'
Michael Niedermayer [Sun, 15 May 2011 02:40:50 +0000 (04:40 +0200)]
Merge remote branch 'qatar/master'

* qatar/master:
  Fix FSF address copy paste error in some license headers.
  Add an aac sample which uses LTP to fate-aac.
DUPLICATE  [PATCH] Update pixdesc_be fate refs after adding 9/10bit YUV420P formats.
  arm: properly mark external symbol call

Conflicts:
libavcodec/x86/ac3dsp.asm
libavcodec/x86/deinterlace.asm
libavcodec/x86/dsputil_yasm.asm
libavcodec/x86/dsputilenc_yasm.asm
libavcodec/x86/fft_mmx.asm
libavcodec/x86/fmtconvert.asm
libavcodec/x86/h264_chromamc.asm
libavcodec/x86/h264_deblock.asm
libavcodec/x86/h264_idct.asm
libavcodec/x86/h264_intrapred.asm
libavcodec/x86/h264_weight.asm
libavcodec/x86/vc1dsp_yasm.asm
libavcodec/x86/vp3dsp.asm
libavcodec/x86/vp56dsp.asm
libavcodec/x86/vp8dsp.asm
libavcodec/x86/x86util.asm
libswscale/ppc/swscale_template.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoInitial caf muxer.
Carl Eugen Hoyos [Sun, 15 May 2011 01:25:27 +0000 (03:25 +0200)]
Initial caf muxer.

8 years agoSupport decoding of amr_nb and gsm in caf.
Carl Eugen Hoyos [Sun, 15 May 2011 00:42:58 +0000 (02:42 +0200)]
Support decoding of amr_nb and gsm in caf.

8 years agoFix decoding of msrle samples with 1bpp.
Carl Eugen Hoyos [Sun, 15 May 2011 00:38:02 +0000 (02:38 +0200)]
Fix decoding of msrle samples with 1bpp.

8 years agoudp: remove resource.h inclusion, it breaks mingw compilation.
Michael Niedermayer [Sat, 14 May 2011 23:48:17 +0000 (01:48 +0200)]
udp: remove resource.h inclusion, it breaks mingw compilation.

The header seems unneeded, if its needed we will put it back with appropriate #if
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoffmpeg: Allow seting and cycling through debug modes.
Michael Niedermayer [Sat, 14 May 2011 23:39:04 +0000 (01:39 +0200)]
ffmpeg: Allow seting and cycling through debug modes.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoFix FSF address copy paste error in some license headers.
Diego Biurrun [Sat, 14 May 2011 19:32:31 +0000 (21:32 +0200)]
Fix FSF address copy paste error in some license headers.

8 years agoAdd an aac sample which uses LTP to fate-aac.
Justin Ruggles [Tue, 26 Apr 2011 22:19:52 +0000 (18:19 -0400)]
Add an aac sample which uses LTP to fate-aac.

8 years agoffmpeg: Help for interactive keys.
Michael Niedermayer [Sat, 14 May 2011 13:51:47 +0000 (15:51 +0200)]
ffmpeg: Help for interactive keys.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoUDP: dont use thread_t as truth value.
Michael Niedermayer [Sat, 14 May 2011 11:34:08 +0000 (13:34 +0200)]
UDP: dont use thread_t as truth value.

Unbreak compile on mingw.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoswscale: fix compile on mingw32
Peter Belkner [Sat, 14 May 2011 11:22:46 +0000 (13:22 +0200)]
swscale: fix compile on mingw32

Compiling "swscale.c" breaks on MINGW32 because of multiple including
"libswscale_template.c"

8 years ago[PATCH] Update pixdesc_be fate refs after adding 9/10bit YUV420P formats.
Ronald S. Bultje [Fri, 13 May 2011 23:01:50 +0000 (19:01 -0400)]
[PATCH] Update pixdesc_be fate refs after adding 9/10bit YUV420P formats.

Also remove code that overwrites the C versions of functions in
sws_init_swScale_altivec(), so that it uses the C functions of files
if no altivec-optimized version exists.

8 years agoarm: properly mark external symbol call
Martin Aumüller [Sat, 14 May 2011 08:10:27 +0000 (10:10 +0200)]
arm: properly mark external symbol call

Surround memset and ff_vp8_dct_cat_prob by X() in order to fix iOS build

Includes patch by Luca Barbato <lu_zero@gentoo.org>.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
8 years agoffmpeg: Interactivity support. Try pressing +-hs.
Michael Niedermayer [Sat, 14 May 2011 00:54:28 +0000 (02:54 +0200)]
ffmpeg: Interactivity support. Try pressing +-hs.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoswscale: 10l forgot git add this change from ronald.
Ronald S. Bultje [Sat, 14 May 2011 00:47:14 +0000 (02:47 +0200)]
swscale: 10l forgot git add this change from ronald.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMerge remote branch 'qatar/master'
Michael Niedermayer [Sat, 14 May 2011 00:19:23 +0000 (02:19 +0200)]
Merge remote branch 'qatar/master'

* qatar/master:
  swscale: properly inline bits/endianness in yuv2yuvX16inC().
(We didnt pull the bug)  swscale: fix clipping of 9/10bit YUV420P.
  Add av_clip_uintp2() function
(our patch / duplicate)  dfa: fix buffer overflow checks to avoid integer overflows.
(our patch / duplicate)  movenc: always write esds descriptor length using 4 bytes.
(our patch / duplicate)  ffmpeg: use parse_number_and_die() when it makes sense
(No thanks)  ffmpeg: get rid of the 'q' key schizofrenia

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoAVFrame: only set parameters from AVCodecContext in decode_video*() when no frame...
Michael Niedermayer [Fri, 13 May 2011 22:11:10 +0000 (00:11 +0200)]
AVFrame: only set parameters from AVCodecContext in decode_video*() when no frame reordering is used.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoavcodec_default_get_buffer: init picture parameters.
Michael Niedermayer [Fri, 13 May 2011 21:23:30 +0000 (23:23 +0200)]
avcodec_default_get_buffer: init picture parameters.

Fixes multithreading regression introduced in 64c06615d2b99fb9f4ffd6226d0e5787b44a41e2
Fixes ticket197
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoswscale: properly inline bits/endianness in yuv2yuvX16inC().
Ronald S. Bultje [Fri, 13 May 2011 14:28:49 +0000 (10:28 -0400)]
swscale: properly inline bits/endianness in yuv2yuvX16inC().

8 years agoswscale: fix clipping of 9/10bit YUV420P.
Ronald S. Bultje [Fri, 13 May 2011 20:45:04 +0000 (16:45 -0400)]
swscale: fix clipping of 9/10bit YUV420P.

8 years agoAdd av_clip_uintp2() function
Mans Rullgard [Fri, 13 May 2011 15:39:17 +0000 (16:39 +0100)]
Add av_clip_uintp2() function

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agoSupport more QT 1bpp rawvideo files.
ami_stuff [Fri, 13 May 2011 16:10:33 +0000 (18:10 +0200)]
Support more QT 1bpp rawvideo files.

Fixes ticket #189.

8 years agoUDP: udp depends on pthreads now
Michael Niedermayer [Fri, 13 May 2011 15:49:00 +0000 (17:49 +0200)]
UDP: udp depends on pthreads now

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoudp: switch custom fifo to libavutil fifo.
Michael Niedermayer [Fri, 13 May 2011 15:16:15 +0000 (17:16 +0200)]
udp: switch custom fifo to libavutil fifo.

This also allows us to drop the semaphore as our fifo is lock free.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoudp: use FFMAX&FFMIN.
Michael Niedermayer [Fri, 13 May 2011 14:31:05 +0000 (16:31 +0200)]
udp: use FFMAX&FFMIN.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoudp: add a thread into udp.c for receiving data into a circular buffer, this stops...
JULIAN GARDNER [Fri, 13 May 2011 14:28:42 +0000 (16:28 +0200)]
udp: add a thread into udp.c for receiving data into a circular buffer, this stops the problem of live decoding/encoding giving errors.

Also added a buf_size which is the number of TS packets that to be allocated for the circular buffer.

8 years agotiffenc: set bpp table for monow/monob formats
Stefano Sabatini [Fri, 13 May 2011 00:07:09 +0000 (02:07 +0200)]
tiffenc: set bpp table for monow/monob formats

Also makes the bpp_tab non static const, as it needs to be changed in
this case.

Fix encoding of monow/monob images, fix trac issue #193.

8 years agotiffenc: factorize code for monow/monob case in encode_frame() switch
Stefano Sabatini [Fri, 13 May 2011 00:03:18 +0000 (02:03 +0200)]
tiffenc: factorize code for monow/monob case in encode_frame() switch

Reduce code duplication, increase robustness.

8 years agotiffenc: fix bpp value for monow/monob formats
Stefano Sabatini [Thu, 12 May 2011 23:49:15 +0000 (01:49 +0200)]
tiffenc: fix bpp value for monow/monob formats

8 years agotiff: fix linesize for mono-white/black formats
Stefano Sabatini [Mon, 9 May 2011 20:11:57 +0000 (22:11 +0200)]
tiff: fix linesize for mono-white/black formats

Fix decoding of file Test_1bpp.tif, fix trac issue #171.

8 years agotiff: print log in case of unknown / unsupported tag
Stefano Sabatini [Mon, 9 May 2011 19:26:39 +0000 (21:26 +0200)]
tiff: print log in case of unknown / unsupported tag

Helps debugging.

8 years agodfa: fix buffer overflow checks to avoid integer overflows.
Reimar Döffinger [Tue, 29 Mar 2011 19:14:55 +0000 (21:14 +0200)]
dfa: fix buffer overflow checks to avoid integer overflows.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agomovenc: always write esds descriptor length using 4 bytes.
Baptiste Coudurier [Wed, 30 Mar 2011 21:08:16 +0000 (14:08 -0700)]
movenc: always write esds descriptor length using 4 bytes.

ipod shuffle doesn't support anything else.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agoffmpeg: use parse_number_and_die() when it makes sense
Stefano Sabatini [Mon, 11 Apr 2011 11:16:07 +0000 (13:16 +0200)]
ffmpeg: use parse_number_and_die() when it makes sense

Prefer parse_number_or_die() over atoi()/atol() parsing for the options:
-pass, -top, -vc, and -qscale.

Improve input validation.

Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agoffmpeg: get rid of the 'q' key schizofrenia
Anton Khirnov [Thu, 12 May 2011 13:15:07 +0000 (15:15 +0200)]
ffmpeg: get rid of the 'q' key schizofrenia

SIGINT for quitting should be enough for everybody.

8 years agoAdd checksums specific to BE machines after last swscale update.
Michael Niedermayer [Fri, 13 May 2011 03:10:24 +0000 (05:10 +0200)]
Add checksums specific to BE machines after last swscale update.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMerge remote branch 'qatar/master'
Michael Niedermayer [Fri, 13 May 2011 02:40:40 +0000 (04:40 +0200)]
Merge remote branch 'qatar/master'

* qatar/master: (33 commits)
  rtpdec_qdm2: Don't try to parse data packet if no configuration is received
  ac3enc: put the counting of stereo rematrixing bits in the same place to make the code easier to understand.
  ac3enc: clean up count_frame_bits() and count_frame_bits_fixed()
  mpegvideo: make FF_DEBUG_DCT_COEFF output coeffs via av_log() instead of just via AVFrame.
  srtdec: make sure we don't write past the end of buffer
  wmaenc: improve channel count and bitrate error handling in encode_init()
  matroskaenc: make sure we don't produce invalid file with no codec ID
  matroskadec: check that pointers were initialized before accessing them
  lavf: fix function name in compute_pkt_fields2 av_dlog message
  lavf: fix av_find_best_stream when providing a wanted stream.
  lavf: fix av_find_best_stream when decoder_ret is given and using a related stream.
  ffmpeg: factorize quality calculation
  tiff: add support for SamplesPerPixel tag in tiff_decode_tag()
  tiff: Prefer enum TiffCompr over int for TiffContext.compr.
  mov: Support edit list atom version 1.
  configure: Enable libpostproc automatically if GPL code is enabled.
  Cosmetics: fix prototypes in oggdec
  oggdec: fix memleak with continuous streams.
  matroskaenc: add missing new line in av_log() call
  dnxhdenc: add AVClass in private context.
  ...

swscale changes largely rewritten by me or replaced by baptsites due to lots of bugs in ronalds code.
Above code is also just in case its not obvios to a large extended duplicates that where cherry picked
from ffmpeg.

Conflicts:
configure
ffmpeg.c
libavformat/matroskaenc.c
libavutil/pixfmt.h
libswscale/ppc/swscale_template.c
libswscale/swscale.c
libswscale/swscale_template.c
libswscale/utils.c
libswscale/x86/swscale_template.c
tests/fate/h264.mak
tests/ref/lavfi/pixdesc_le
tests/ref/lavfi/pixfmts_copy_le
tests/ref/lavfi/pixfmts_null_le
tests/ref/lavfi/pixfmts_scale_le
tests/ref/lavfi/pixfmts_vflip_le

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoSupport Digital Voodoo SD 8 Bit in mov (ticket 195).
Carl Eugen Hoyos [Thu, 12 May 2011 23:08:01 +0000 (01:08 +0200)]
Support Digital Voodoo SD 8 Bit in mov (ticket 195).

8 years agoSupport R10g in mov.
ami_stuff [Thu, 12 May 2011 22:49:29 +0000 (00:49 +0200)]
Support R10g in mov.

8 years agoAdd 5.1 plus stereo-downmix to mov_channel_layout array.
Carl Eugen Hoyos [Thu, 12 May 2011 22:23:30 +0000 (00:23 +0200)]
Add 5.1 plus stereo-downmix to mov_channel_layout array.

8 years agoSet channel_layout for S302M.
Carl Eugen Hoyos [Thu, 12 May 2011 22:23:00 +0000 (00:23 +0200)]
Set channel_layout for S302M.

8 years agoMap mlp surround channels to FFmpeg rear channels.
Carl Eugen Hoyos [Thu, 12 May 2011 22:22:05 +0000 (00:22 +0200)]
Map mlp surround channels to FFmpeg rear channels.

This allows more 3rd party applications to correctly read
the resulting wav files.

8 years agoSupport native DTS channel order when requested.
Alexandre Colucci [Thu, 12 May 2011 22:21:19 +0000 (00:21 +0200)]
Support native DTS channel order when requested.

8 years agortpdec_qdm2: Don't try to parse data packet if no configuration is received
Martin Storsjö [Thu, 12 May 2011 19:47:53 +0000 (22:47 +0300)]
rtpdec_qdm2: Don't try to parse data packet if no configuration is received

The later parsing of payload data depends on the configuration
being present. If it hasn't been configured properly yet,
parsing a data packet may lead to a crash.

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agopixfmt-Comment: Fix big/little typo
Michael Niedermayer [Thu, 12 May 2011 18:05:47 +0000 (20:05 +0200)]
pixfmt-Comment: Fix big/little typo

Found-by: kierank
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoac3enc: put the counting of stereo rematrixing bits in the same place to
Justin Ruggles [Sat, 30 Apr 2011 19:55:18 +0000 (15:55 -0400)]
ac3enc: put the counting of stereo rematrixing bits in the same place to
make the code easier to understand.

8 years agoac3enc: clean up count_frame_bits() and count_frame_bits_fixed()
Justin Ruggles [Sat, 30 Apr 2011 19:52:55 +0000 (15:52 -0400)]
ac3enc: clean up count_frame_bits() and count_frame_bits_fixed()