ffmpeg.git
9 years agoSupport encoding RGB48 with libopenjpeg.
Carl Eugen Hoyos [Wed, 11 Jan 2012 22:58:43 +0000 (23:58 +0100)]
Support encoding RGB48 with libopenjpeg.

Reviewed-by: Michael Bradshaw
9 years agocabac: Try to disable problematic ASM for gcc-llvm 4.2.1
Michael Niedermayer [Wed, 11 Jan 2012 17:09:56 +0000 (18:09 +0100)]
cabac: Try to disable problematic ASM for gcc-llvm 4.2.1

This should fix compilation with gcc-llvm (see darwin fate box)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agosws: Remove unneeded YUV cliping from yuv2rgb_X_c_template()
Michael Niedermayer [Tue, 10 Jan 2012 19:18:06 +0000 (20:18 +0100)]
sws: Remove unneeded YUV cliping from yuv2rgb_X_c_template()

This should slightly improve speed.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agobmpenc: support for BGRA
Paul B Mahol [Wed, 11 Jan 2012 18:50:05 +0000 (18:50 +0000)]
bmpenc: support for BGRA

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoswscale: Force full horizontal chroma internally when the output has a odd size.
Michael Niedermayer [Sun, 8 Jan 2012 21:48:58 +0000 (22:48 +0100)]
swscale: Force full horizontal chroma internally when the output has a odd size.

This fixes a gray line on the right side due to 1 column of pixels being skiped.
Fixes Ticket891

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agolibmp3lame: It appears the buffer used is a bit too small.
Michael Niedermayer [Sun, 8 Jan 2012 17:36:17 +0000 (18:36 +0100)]
libmp3lame: It appears the buffer used is a bit too small.

Increase it by an arbitrary amount.
Fixes part of Ticket676

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agotimecode: support >24h timecode.
Clément Bœsch [Wed, 4 Jan 2012 16:30:03 +0000 (17:30 +0100)]
timecode: support >24h timecode.

9 years agotimecode: string representation can be negative.
Clément Bœsch [Wed, 4 Jan 2012 16:06:39 +0000 (17:06 +0100)]
timecode: string representation can be negative.

Timecode can be specified with a negative value in MOV...

9 years agotimecode: set a fixed buffer size of 16B for tc string.
Clément Bœsch [Wed, 11 Jan 2012 16:51:57 +0000 (17:51 +0100)]
timecode: set a fixed buffer size of 16B for tc string.

9 years agosws: Move yuv2rgb clipping into the tables.
Michael Niedermayer [Tue, 10 Jan 2012 19:56:15 +0000 (20:56 +0100)]
sws: Move yuv2rgb clipping into the tables.

This fixes some cases where the clipping was entirely missing.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Thanks (for the comments and review) -to: Reimar, beastd, Ronald

9 years agobmpdec: support various bitfields for 32 bit depth
Paul B Mahol [Wed, 11 Jan 2012 02:56:24 +0000 (02:56 +0000)]
bmpdec: support various bitfields for 32 bit depth

Fixes #740

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoRevert "v4l2: poll the file descriptor"
Michael Niedermayer [Wed, 11 Jan 2012 13:17:16 +0000 (14:17 +0100)]
Revert "v4l2: poll the file descriptor"

This reverts commit 0efd48dfd15273a5ac85f2fd42f19d419fafe90d.
Reason for the revert is that the code seems based on some
misunderstanding on how the code works.

Conflicts:

libavdevice/v4l2.c

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agotiffdec: notify user that tile support is missing
Paul B Mahol [Tue, 10 Jan 2012 18:45:44 +0000 (18:45 +0000)]
tiffdec: notify user that tile support is missing

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
9 years agoFix step_minus1 pixel descirption for RGB64.
Carl Eugen Hoyos [Wed, 11 Jan 2012 09:54:12 +0000 (10:54 +0100)]
Fix step_minus1 pixel descirption for RGB64.

9 years agoFixes wrong duration in .mov file. Issue 599
Oana Stratulat [Wed, 11 Jan 2012 01:33:25 +0000 (03:33 +0200)]
Fixes wrong duration in .mov file. Issue 599

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agosws: fix unscaled LE<->BE rgb<->bgr
Michael Niedermayer [Wed, 11 Jan 2012 03:07:02 +0000 (04:07 +0100)]
sws: fix unscaled LE<->BE rgb<->bgr

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agodoc: Fix stray references to libva
Michael Niedermayer [Wed, 11 Jan 2012 02:02:02 +0000 (03:02 +0100)]
doc: Fix stray references to libva
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 11 Jan 2012 01:23:55 +0000 (02:23 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master: (22 commits)
  rv34: frame-level multi-threading
  mpegvideo: claim ownership of referenced pictures
  aacsbr: prevent out of bounds memcpy().
  ipmovie: fix pts for CODEC_ID_INTERPLAY_DPCM
  sierravmd: fix audio pts
  bethsoftvideo: Use bytestream2 functions to prevent buffer overreads.
  bmpenc: support for PIX_FMT_RGB444
  swscale: fix crash in fast_bilinear code when compiled with -mred-zone.
  swscale: specify register type.
  rv34: use get_bits_left()
  avconv: reinitialize the filtergraph on resolution change.
  vsrc_buffer: error on changing frame parameters.
  avconv: fix -copyinkf.
  fate: Update file checksums after the mov muxer change in a78dbada55d6
  movenc: Don't store a nonzero creation time if nothing was set by the caller
  bmpdec: support for rgb444 with bitfields compression
  rgb2rgb: allow conversion for <15 bpp
  doc: fix stray reference to FFmpeg
  v4l2: use C99 struct initializer
  v4l2: poll the file descriptor
  ...

Conflicts:
avconv.c
libavcodec/aacsbr.c
libavcodec/bethsoftvideo.c
libavcodec/kmvc.c
libavdevice/v4l2.c
libavfilter/vsrc_buffer.c
libswscale/swscale_unscaled.c
libswscale/x86/input.asm
tests/ref/acodec/alac
tests/ref/acodec/pcm_s16be
tests/ref/acodec/pcm_s24be
tests/ref/acodec/pcm_s32be
tests/ref/acodec/pcm_s8
tests/ref/lavf/mov
tests/ref/vsynth1/dnxhd_1080i
tests/ref/vsynth1/mpeg4
tests/ref/vsynth1/qtrle
tests/ref/vsynth1/svq1
tests/ref/vsynth2/dnxhd_1080i
tests/ref/vsynth2/mpeg4
tests/ref/vsynth2/qtrle
tests/ref/vsynth2/svq1

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge remote-tracking branch 'richardpl/sws'
Michael Niedermayer [Tue, 10 Jan 2012 22:12:21 +0000 (23:12 +0100)]
Merge remote-tracking branch 'richardpl/sws'

* richardpl/sws:
  rgb2rgb: remove unused bgr8torgb8()
  rgb2rgb: rgb12tobgr12()
  rgb2rgb: allow conversion for <15 bpp
  bmpenc: support for PIX_FMT_RGB444
  bmpdec: support for rgb444 with bitfields compression

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agox86inc: remove duplicate movlhps
Michael Niedermayer [Tue, 10 Jan 2012 21:59:34 +0000 (22:59 +0100)]
x86inc: remove duplicate movlhps

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoljpegdec: Fix the left column of rgb24 decoding
Michael Niedermayer [Mon, 9 Jan 2012 19:12:33 +0000 (20:12 +0100)]
ljpegdec: Fix the left column of rgb24 decoding

Fixes Ticket894

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agorv34: frame-level multi-threading
Janne Grunau [Fri, 9 Sep 2011 12:26:32 +0000 (14:26 +0200)]
rv34: frame-level multi-threading

Statistics for bourne.rmvb -an -f null

1 thread:  37.12s user 0.03s system  99% cpu 37.174 total
2 threads: 47.63s user 0.24s system 185% cpu 25.807 total
4 threads: 41.21s user 0.30s system 327% cpu 12.674 total

9 years agompegvideo: claim ownership of referenced pictures
Janne Grunau [Tue, 10 Jan 2012 14:08:20 +0000 (15:08 +0100)]
mpegvideo: claim ownership of referenced pictures

Under certain conditions pictures could be released before they were
returned with frame-threading. Broken mv computation in the upcoming
rv34 frame-threading patch was caused by this.

To prevent contexts from running out of available pictures the loop
releasing "unused" pictures has to be run for B frames too.

9 years agoffprobe: use av_toupper() in upcase_string()
Stefano Sabatini [Tue, 10 Jan 2012 21:11:02 +0000 (22:11 +0100)]
ffprobe: use av_toupper() in upcase_string()

9 years agoaacsbr: prevent out of bounds memcpy().
Alex Converse [Tue, 10 Jan 2012 21:07:09 +0000 (13:07 -0800)]
aacsbr: prevent out of bounds memcpy().

Fixes Libav Bug 195.

This doesn't make the code handle sample rate or upsample/downsample
change properly but this is still a good sanity check.

Based on change by Michael Niedermayer.

Signed-off-by: Alex Converse <alex.converse@gmail.com>
9 years agoMerge remote-tracking branch 'hexene/stagefright'
Michael Niedermayer [Tue, 10 Jan 2012 19:59:36 +0000 (20:59 +0100)]
Merge remote-tracking branch 'hexene/stagefright'

* hexene/stagefright:
  libstagefright: fix build

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoipmovie: fix pts for CODEC_ID_INTERPLAY_DPCM
Justin Ruggles [Tue, 10 Jan 2012 13:48:23 +0000 (08:48 -0500)]
ipmovie: fix pts for CODEC_ID_INTERPLAY_DPCM

frame sample count calculation was incorrect

9 years agosierravmd: fix audio pts
Justin Ruggles [Tue, 10 Jan 2012 14:24:21 +0000 (09:24 -0500)]
sierravmd: fix audio pts

The duration of the first packet was being calculated incorrectly, leading to
an incorrect timestamp offset.

9 years agoRevert "swscale: fix integer overflows in RGB pixel writing."
Michael Niedermayer [Tue, 10 Jan 2012 16:24:14 +0000 (17:24 +0100)]
Revert "swscale: fix integer overflows in RGB pixel writing."

This reverts commit 77d88b872d8cbb42738ede2d4fc098c16f204236.

The revert fixes actual overflows and a segfault as the variables
are signed and can be negative.

Conflicts:

libswscale/swscale.c

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agobethsoftvideo: Use bytestream2 functions to prevent buffer overreads.
Aneesh Dogra [Tue, 10 Jan 2012 18:08:03 +0000 (23:38 +0530)]
bethsoftvideo: Use bytestream2 functions to prevent buffer overreads.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
9 years agorgb2rgb: remove unused bgr8torgb8()
Paul B Mahol [Tue, 10 Jan 2012 18:15:16 +0000 (18:15 +0000)]
rgb2rgb: remove unused bgr8torgb8()

RGB8 and BGR8 are paletted formats now.

9 years agoRELEASE: We're now at 0.9.1.git
Dominique Leuenberger [Tue, 10 Jan 2012 18:19:53 +0000 (19:19 +0100)]
RELEASE: We're now at 0.9.1.git

9 years agorgb2rgb: rgb12tobgr12()
Paul B Mahol [Tue, 10 Jan 2012 17:29:16 +0000 (17:29 +0000)]
rgb2rgb: rgb12tobgr12()

9 years agorgb2rgb: allow conversion for <15 bpp
Paul B Mahol [Tue, 10 Jan 2012 02:17:33 +0000 (02:17 +0000)]
rgb2rgb: allow conversion for <15 bpp

9 years agobmpenc: support for PIX_FMT_RGB444
Paul B Mahol [Tue, 10 Jan 2012 00:42:20 +0000 (00:42 +0000)]
bmpenc: support for PIX_FMT_RGB444

9 years agobmpdec: support for rgb444 with bitfields compression
Paul B Mahol [Mon, 9 Jan 2012 23:12:40 +0000 (23:12 +0000)]
bmpdec: support for rgb444 with bitfields compression

Do not display garbage for invalid/unsupported bitfields values.

9 years agobmpenc: support for PIX_FMT_RGB444
Paul B Mahol [Tue, 10 Jan 2012 16:06:02 +0000 (16:06 +0000)]
bmpenc: support for PIX_FMT_RGB444

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
9 years agoffprobe: add compact option to JSON writer
Stefano Sabatini [Mon, 9 Jan 2012 13:36:52 +0000 (14:36 +0100)]
ffprobe: add compact option to JSON writer

9 years agoffprobe: add -show_program_version and -show_library_versions options
Stefano Sabatini [Sun, 1 Jan 2012 16:19:58 +0000 (17:19 +0100)]
ffprobe: add -show_program_version and -show_library_versions options

9 years agoswscale: fix crash in fast_bilinear code when compiled with -mred-zone.
Ronald S. Bultje [Sun, 20 Nov 2011 23:54:15 +0000 (15:54 -0800)]
swscale: fix crash in fast_bilinear code when compiled with -mred-zone.

Additional comments from Måns Rullgard have been integrated
by Reinhard Tartler.

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
9 years agoffprobe: make upcase_string() ignore non-ASCII characters
Stefano Sabatini [Sun, 8 Jan 2012 10:10:06 +0000 (11:10 +0100)]
ffprobe: make upcase_string() ignore non-ASCII characters

This is required as some section names may contain non-ASCII characters
(e.g. '_').

9 years agoswscale: specify register type.
Oka Motofumi [Tue, 10 Jan 2012 14:39:04 +0000 (06:39 -0800)]
swscale: specify register type.

Fixes a compilation failure on win64.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
9 years agolibstagefright: fix build
Dmitry Monakhov [Sat, 7 Jan 2012 15:05:51 +0000 (15:05 +0000)]
libstagefright: fix build

- Use headers from gingerbread-release branch instead of the current default ice cream sandwich
- Fix path mistype

9 years agorv34: use get_bits_left()
Janne Grunau [Mon, 9 Jan 2012 01:06:59 +0000 (02:06 +0100)]
rv34: use get_bits_left()

It is not necessary to store the bit stream length in a RV34DecContext
field.

9 years agoavconv: reinitialize the filtergraph on resolution change.
Anton Khirnov [Mon, 2 Jan 2012 14:02:46 +0000 (15:02 +0100)]
avconv: reinitialize the filtergraph on resolution change.

This is a hopefully temporary solution until lavfi can properly deal
with resolution changes.

9 years agovsrc_buffer: error on changing frame parameters.
Anton Khirnov [Tue, 3 Jan 2012 10:18:00 +0000 (11:18 +0100)]
vsrc_buffer: error on changing frame parameters.

9 years agoavconv: fix -copyinkf.
Anton Khirnov [Tue, 10 Jan 2012 08:13:32 +0000 (09:13 +0100)]
avconv: fix -copyinkf.

This option only applies to streamcopy, but is currently processed only
when encoding.

9 years agofate: Update file checksums after the mov muxer change in a78dbada55d6
Martin Storsjö [Tue, 10 Jan 2012 14:37:40 +0000 (16:37 +0200)]
fate: Update file checksums after the mov muxer change in a78dbada55d6

Signed-off-by: Martin Storsjö <martin@martin.st>
9 years agomovenc: Don't store a nonzero creation time if nothing was set by the caller
Martin Storsjö [Mon, 9 Jan 2012 16:35:01 +0000 (18:35 +0200)]
movenc: Don't store a nonzero creation time if nothing was set by the caller

If the creation time is stored in the file as a zero, the
mov demuxer skips exporting the creation time. Currently,
files muxed without a creation time get demuxed with a
Jan 1st 1970 creation timestamp.

Signed-off-by: Martin Storsjö <martin@martin.st>
9 years agobmpdec: support for rgb444 with bitfields compression
Paul B Mahol [Mon, 9 Jan 2012 23:37:24 +0000 (23:37 +0000)]
bmpdec: support for rgb444 with bitfields compression

Do not display garbage for invalid/unsupported bitfields values.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
9 years agofate: Disable fate-wmv8-x8intra
Michael Niedermayer [Tue, 10 Jan 2012 06:15:18 +0000 (07:15 +0100)]
fate: Disable fate-wmv8-x8intra

This test does not work on all platforms and until it does
it just hides new failures, which is really bad.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agomjpeg: update whitespaces to qatar
anonymous [Tue, 10 Jan 2012 05:36:19 +0000 (06:36 +0100)]
mjpeg: update whitespaces to qatar

9 years agorgb2rgb: allow conversion for <15 bpp
Paul B Mahol [Tue, 10 Jan 2012 02:54:34 +0000 (02:54 +0000)]
rgb2rgb: allow conversion for <15 bpp

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
9 years agodoc: fix stray reference to FFmpeg
Luca Barbato [Sun, 8 Jan 2012 16:49:43 +0000 (17:49 +0100)]
doc: fix stray reference to FFmpeg

9 years agov4l2: use C99 struct initializer
Luca Barbato [Sat, 7 Jan 2012 09:59:35 +0000 (10:59 +0100)]
v4l2: use C99 struct initializer

Remove some unneeded memsets.

9 years agov4l2: poll the file descriptor
Luca Barbato [Thu, 5 Jan 2012 11:17:45 +0000 (12:17 +0100)]
v4l2: poll the file descriptor

Instead of busy waiting use poll();

9 years agov4l2: support compressed formats
Luca Barbato [Wed, 4 Jan 2012 14:06:10 +0000 (15:06 +0100)]
v4l2: support compressed formats

Let pass the codec name to -pixel_format and introduce -input_format.

9 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 10 Jan 2012 01:50:54 +0000 (02:50 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  fate: Add tests for more AAC features.
  aacps: Add missing newline in error message.
  fate: Add tests for vc1/wmapro in ism.
  aacdec: Add a fate test for 5.1 channel SBR.
  aacdec: Turn off PS for multichannel files that use PCE based configs.
  cabac: remove put_cabac_u/ueg from cabac-test.
  swscale: RGB4444 and BGR444 input
  FATE: add test for xWMA demuxer.
  FATE: add test for SMJPEG demuxer and associated IMA ADPCM audio decoder.
  mpegaudiodec: optimized iMDCT transform
  mpegaudiodec: change imdct window arrangment for better pointer alignment
  mpegaudiodec: move imdct and windowing function to mpegaudiodsp
  mpegaudiodec: interleave iMDCT buffer to simplify future SIMD implementations
  swscale: convert yuy2/uyvy/nv12/nv21ToY/UV from inline asm to yasm.
  FATE: test to exercise WTV demuxer.
  mjpegdec: K&R formatting cosmetics
  swscale: K&R formatting cosmetics for code examples
  swscale: K&R reformatting cosmetics for header files
  FATE test: cvid-grayscale; ensures that the grayscale Cinepak variant is exercised.

Conflicts:
libavcodec/cabac.c
libavcodec/mjpegdec.c
libavcodec/mpegaudiodec.c
libavcodec/mpegaudiodsp.c
libavcodec/mpegaudiodsp.h
libavcodec/mpegaudiodsp_template.c
libavcodec/x86/Makefile
libavcodec/x86/imdct36_sse.asm
libavcodec/x86/mpegaudiodec_mmx.c
libswscale/swscale-test.c
libswscale/swscale.c
libswscale/swscale_internal.h
libswscale/x86/swscale_template.c
tests/fate/demux.mak
tests/fate/microsoft.mak
tests/fate/video.mak
tests/fate/wma.mak
tests/ref/lavfi/pixfmts_scale

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agokmvc: Use bytestream2 functions to prevent buffer overreads.
Laurentiu Ion [Tue, 10 Jan 2012 01:21:17 +0000 (03:21 +0200)]
kmvc: Use bytestream2 functions to prevent buffer overreads.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
9 years agoMerge remote-tracking branch 'cus/stable'
Michael Niedermayer [Mon, 9 Jan 2012 23:27:56 +0000 (00:27 +0100)]
Merge remote-tracking branch 'cus/stable'

* cus/stable:
  ffplay: Exit on ctrl-c.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoffplay: Exit on ctrl-c.
Michael Niedermayer [Mon, 9 Jan 2012 06:03:55 +0000 (07:03 +0100)]
ffplay: Exit on ctrl-c.

This allows to get out of ffplay if it or SDL got stuck.
This for example happens when the audio driver is playing something
else and doesnt support mixing multiple sources.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Marton Balint <cus@passwd.hu>
9 years agoSupport decoding 1bpp and 4bpp palettized sunrast images.
Carl Eugen Hoyos [Mon, 9 Jan 2012 21:38:09 +0000 (22:38 +0100)]
Support decoding 1bpp and 4bpp palettized sunrast images.

Fixes ticket #864 and ticket #897.

9 years agolog: use a different color for debug (green).
Clément Bœsch [Thu, 5 Jan 2012 22:07:18 +0000 (23:07 +0100)]
log: use a different color for debug (green).

9 years agopngdec: show verbose message for unsupported files
Paul B Mahol [Mon, 9 Jan 2012 21:35:19 +0000 (22:35 +0100)]
pngdec: show verbose message for unsupported files

9 years agofate: Add tests for more AAC features.
Gaurav Narula [Thu, 29 Dec 2011 21:20:22 +0000 (02:50 +0530)]
fate: Add tests for more AAC features.

al15_44 uses independent coupling.
al18_44 uses PNS (perceptual noise substitution).
am05_44 uses main prediction and independent coupling.

Signed-off-by: Alex Converse <alex.converse@gmail.com>
9 years agoaacps: Add missing newline in error message.
Alex Converse [Fri, 6 Jan 2012 22:49:11 +0000 (14:49 -0800)]
aacps: Add missing newline in error message.

9 years agofate: Add tests for vc1/wmapro in ism.
Alex Converse [Fri, 6 Jan 2012 02:39:20 +0000 (18:39 -0800)]
fate: Add tests for vc1/wmapro in ism.

9 years agoaacdec: Add a fate test for 5.1 channel SBR.
Alex Converse [Sat, 7 Jan 2012 01:23:49 +0000 (17:23 -0800)]
aacdec: Add a fate test for 5.1 channel SBR.

9 years agoaacdec: Turn off PS for multichannel files that use PCE based configs.
Alex Converse [Sat, 7 Jan 2012 01:22:45 +0000 (17:22 -0800)]
aacdec: Turn off PS for multichannel files that use PCE based configs.

Fixes al_sbr_cm_48_5.1.mp4.

9 years agocabac: 3rd try at working around a compiler bug in clang.
Michael Niedermayer [Mon, 9 Jan 2012 15:02:11 +0000 (16:02 +0100)]
cabac: 3rd try at working around a compiler bug in clang.

Switch to a broader detection of versions.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agocabac: remove put_cabac_u/ueg from cabac-test.
Diego Biurrun [Sat, 7 Jan 2012 19:27:31 +0000 (20:27 +0100)]
cabac: remove put_cabac_u/ueg from cabac-test.

The functions are not used in any part of Libav, therefore testing them in the
cabac-test is unnecessary. Since this makes them unused, remove the functions.

9 years agoffprobe: change formatting logic in the JSON writer
Stefano Sabatini [Sun, 8 Jan 2012 00:44:02 +0000 (01:44 +0100)]
ffprobe: change formatting logic in the JSON writer

Print a "\n" at the end of each section, also print the section name in
the section print function, print the chapter name only in case the
chapter contains multiple entries.

Increase textual output readability - different sections can be
distinguished more easily.

9 years agoffprobe: implement generic reindent logic in the JSON writer
Stefano Sabatini [Sun, 8 Jan 2012 00:20:03 +0000 (01:20 +0100)]
ffprobe: implement generic reindent logic in the JSON writer

Clarify/generalize indent logic.

9 years agosgidec: make compiler optimize away memcpy call in inner loop.
Reimar Döffinger [Sun, 8 Jan 2012 11:19:48 +0000 (12:19 +0100)]
sgidec: make compiler optimize away memcpy call in inner loop.

Using an always_inline function makes the memcpy length a constant,
any reasonable compiler will replace it by a single mov instruction
without us having to duplicate the actual code.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
9 years agorawdec: use av_shrink_packet.
Reimar Döffinger [Sun, 8 Jan 2012 15:56:46 +0000 (16:56 +0100)]
rawdec: use av_shrink_packet.

This fixes reads of uninitialized data by the parser when running
FATE sample h264-conformance/SL1_SVA_B.264.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
9 years agoswscale: RGB4444 and BGR444 input
Paul B Mahol [Mon, 9 Jan 2012 01:24:33 +0000 (01:24 +0000)]
swscale: RGB4444 and BGR444 input

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
9 years agolibswresample: introduce int swr_set_compensation() instead of void swr_compensate()
Marton Balint [Mon, 9 Jan 2012 00:42:38 +0000 (01:42 +0100)]
libswresample: introduce int swr_set_compensation() instead of void swr_compensate()

The new version returns AVERROR(EINVAL) is the specified paramters are invalid,
and also creates the resampler if none was used so far.

Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agofate: add bitexact and idct to x8intra
Michael Niedermayer [Mon, 9 Jan 2012 01:59:10 +0000 (02:59 +0100)]
fate: add bitexact and idct to x8intra

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agocabac: Disable get_cabac_inline_x86() for clang 2.9 on x86_32
Michael Niedermayer [Mon, 9 Jan 2012 02:42:46 +0000 (03:42 +0100)]
cabac: Disable get_cabac_inline_x86() for clang 2.9 on x86_32

This should finally fix the compilation issue on darwin

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoFATE: add test for xWMA demuxer.
Mike Melanson [Sun, 8 Jan 2012 03:59:07 +0000 (19:59 -0800)]
FATE: add test for xWMA demuxer.

(Does not attempt to decode percetual audio data inside.)
Code coverage: libavformat/xwma.c: 3% -> 75%

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
9 years agoRevert "Revert commit 599b4c6efddaed33b1667c386b34b07729ba732b"
Michael Niedermayer [Mon, 9 Jan 2012 02:32:06 +0000 (03:32 +0100)]
Revert "Revert commit 599b4c6efddaed33b1667c386b34b07729ba732b"

This reverts commit c4f237a98175438e76da64c51cc6fe613f8d767e.
This didnt fix compilation on darwin with current clang.

9 years agoFATE: add test for SMJPEG demuxer and associated IMA ADPCM audio decoder.
Mike Melanson [Sun, 8 Jan 2012 03:59:08 +0000 (19:59 -0800)]
FATE: add test for SMJPEG demuxer and associated IMA ADPCM audio decoder.

(Don't attempt to decode JPEG data.)
Code coverage: libavformat/smjpeg.c: 0% -> 69%
libavcodec/adpcm.c: 0% -> 10% (fresh run); 92.4% -> 93% following a FATE run

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
9 years agompegaudiodec: optimized iMDCT transform
Vitor Sessak [Thu, 5 Jan 2012 19:26:33 +0000 (20:26 +0100)]
mpegaudiodec: optimized iMDCT transform

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
9 years agompegaudiodec: change imdct window arrangment for better pointer alignment
Vitor Sessak [Wed, 4 Jan 2012 20:43:47 +0000 (21:43 +0100)]
mpegaudiodec: change imdct window arrangment for better pointer alignment

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
9 years agompegaudiodec: move imdct and windowing function to mpegaudiodsp
Vitor Sessak [Wed, 4 Jan 2012 20:32:47 +0000 (21:32 +0100)]
mpegaudiodec: move imdct and windowing function to mpegaudiodsp

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
9 years agompegaudiodec: interleave iMDCT buffer to simplify future SIMD implementations
Vitor Sessak [Tue, 3 Jan 2012 20:40:57 +0000 (21:40 +0100)]
mpegaudiodec: interleave iMDCT buffer to simplify future SIMD implementations

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
9 years agoswscale: convert yuy2/uyvy/nv12/nv21ToY/UV from inline asm to yasm.
Ronald S. Bultje [Mon, 9 Jan 2012 00:37:43 +0000 (16:37 -0800)]
swscale: convert yuy2/uyvy/nv12/nv21ToY/UV from inline asm to yasm.

Also implement SSE2/AVX variants.

9 years agolavf: Add forgotten line from 212fd3a1f1121a9db20c478f1fccf15e8bb53c94
Michael Niedermayer [Mon, 9 Jan 2012 00:12:48 +0000 (01:12 +0100)]
lavf: Add forgotten line from 212fd3a1f1121a9db20c478f1fccf15e8bb53c94

This fixes a tiny memleak.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 8 Jan 2012 23:32:38 +0000 (00:32 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  bfi: Use bytestream2 functions to prevent buffer overreads.
  dpcm: Fix invalid writes
  utvideo: frame multithreading.
  vorbis: An additional defense in the Vorbis codec.
  vorbisdec: Fix decoding bug with channel handling

Conflicts:
libavcodec/dpcm.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoljpegdec: Support MCU in ljpeg_decode_yuv_scan()
Michael Niedermayer [Sat, 7 Jan 2012 19:17:50 +0000 (20:17 +0100)]
ljpegdec: Support MCU in ljpeg_decode_yuv_scan()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoFATE: test to exercise WTV demuxer.
Mike Melanson [Sun, 8 Jan 2012 03:59:09 +0000 (19:59 -0800)]
FATE: test to exercise WTV demuxer.

Does not attempt to decode perceptual codecs inside.
Code coverage: libavformat/wtv.c: 0% -> 71%

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
9 years agomjpegdec: K&R formatting cosmetics
Daniel Huang [Sun, 8 Jan 2012 19:14:37 +0000 (13:14 -0600)]
mjpegdec: K&R formatting cosmetics

Signed-off-by: Diego Biurrun <diego@biurrun.de>
9 years agoswscale: K&R formatting cosmetics for code examples
Diego Biurrun [Tue, 3 Jan 2012 11:20:59 +0000 (12:20 +0100)]
swscale: K&R formatting cosmetics for code examples

9 years agoswscale: K&R reformatting cosmetics for header files
Diego Biurrun [Fri, 30 Dec 2011 17:37:16 +0000 (18:37 +0100)]
swscale: K&R reformatting cosmetics for header files

9 years agoFATE test: cvid-grayscale; ensures that the grayscale Cinepak variant is exercised.
Mike Melanson [Sun, 8 Jan 2012 03:59:06 +0000 (19:59 -0800)]
FATE test: cvid-grayscale; ensures that the grayscale Cinepak variant is exercised.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
9 years agobfi: Use bytestream2 functions to prevent buffer overreads.
Aneesh Dogra [Sun, 8 Jan 2012 19:57:58 +0000 (01:27 +0530)]
bfi: Use bytestream2 functions to prevent buffer overreads.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
9 years agodpcm: Fix invalid writes
Laurentiu Ion [Sun, 8 Jan 2012 21:05:37 +0000 (23:05 +0200)]
dpcm: Fix invalid writes

Fixes bug: #152

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
9 years agoutvideo: frame multithreading.
Aneesh Dogra [Sun, 8 Jan 2012 19:19:46 +0000 (00:49 +0530)]
utvideo: frame multithreading.

>> time ./avconv -i file.avi -f null -
Before : real 0m7.784s
After  : real   0m3.662s

Tested on a Intel Core i3 Processor (2 cores, 4 threads).

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
9 years agoMerge remote-tracking branch 'dilaroga/master'
Michael Niedermayer [Sun, 8 Jan 2012 19:26:49 +0000 (20:26 +0100)]
Merge remote-tracking branch 'dilaroga/master'

* dilaroga/master:
  vda: cosmetic.
  vda: removes useless doxygen command.
  vda: uses pthreads directly.
  vda: convert 3 byte NAL sizes to 4 byte.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoipmovie: Fix passing resolution changes on.
Michael Niedermayer [Sun, 8 Jan 2012 17:37:19 +0000 (18:37 +0100)]
ipmovie: Fix passing resolution changes on.

Fixes Ticket676

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>