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

19352 Commits

Author SHA1 Message Date
Michael Niedermayer
65efc66d8e pngenc: use av_assert
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-11 21:41:03 +02:00
Michael Niedermayer
7925f923a5 4xm: use av_assert()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-11 21:40:43 +02:00
Nedeljko Babic
3827a86eac Optimization of AMR NB and WB decoders for MIPS
AMR NB and WB decoders are optimized for MIPS architecture.
Appropriate Makefiles are changed accordingly.

Cnfigure script is changed in order to support optimizations.
 Optimizations are enabled by default when compiling is done for
  mips architecture.
 Appropriate cflags are automatically set.
 Support for several mips CPUs is added in configure script.

New ffmpeg options are added for disabling optimizations.

The FFMPEG option --disable-mipsfpu disables MIPS floating point
 optimizations.
The FFMPEG option --disable-mips32r2 disables MIPS32R2
 optimizations.
The FFMPEG option --disable-mipsdspr1 disables MIPS DSP ASE R1
 optimizations.
The FFMPEG option --disable-mipsdspr2 disables MIPS DSP ASE R2
 optimizations.

Signed-off-by: Nedeljko Babic <nbabic@mips.com>
Reviewed-by: Vitor Sessak <vitor1001@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-11 21:12:39 +02:00
Paul B Mahol
751dcd9243 Remove eightsvx_raw decoder line
Decoder have been renamed to pcm_s8_planar long ago.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-06-11 18:55:09 +00:00
Michael Niedermayer
709b54eae9 rv20enc: use av_assert
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-11 20:13:31 +02:00
Carl Eugen Hoyos
37f1a7d51d Make png-in-mov QuickTime-compatible for more colour-spaces.
Reported and tested by ami_stuff.

See ticket #1191.
2012-06-11 10:57:23 +02:00
James Zern
cb7f062286 libvpxenc: add support for forced key frames
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-11 02:06:43 +02:00
Michael Niedermayer
a5ca3203f0 rangecoder: use av_assert
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-10 23:36:22 +02:00
Michael Niedermayer
1248de53c1 amrnbdec: use av_assert
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-10 23:35:29 +02:00
Michael Niedermayer
4e3a5bc1f6 j2k: remove unreachable assert()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-10 23:27:17 +02:00
Michael Niedermayer
3630a07513 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  libmp3lame: add missing layout terminator
  avconv: multithreaded demuxing.
  Bump lavu minor and add an APIChanges entry for audioconvert functions.
  audioconvert: add a function for extracting the channel with the given index
  audioconvert: add a function for getting the name of a single channel.
  audioconvert: add a function for getting channel's index in layout
  audioconvert: use av_popcount64 in av_get_channel_layout_nb_channels
  vf_libopencv: add missing headers.
  iac: add missing dependency

Conflicts:
	configure
	doc/APIchanges
	ffmpeg.c
	libavcodec/libmp3lame.c
	libavutil/avutil.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-10 21:34:15 +02:00
Michael Niedermayer
9e724d7216 dct-test: fix alignment in ff_prores_idct_put_10_sse2()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-10 20:45:55 +02:00
Michael Niedermayer
1321e6eaa7 tiffenc: use av_assert()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-10 15:40:24 +02:00
Michael Niedermayer
bcbb30e2a0 libmp3lame: add missing layout terminator
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2012-06-10 14:06:50 +02:00
Michael Niedermayer
3b196bb737 libavcodec/x86/rv40dsp_init.c: add missing HAVE_YASM
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-10 03:26:24 +02:00
Michael Niedermayer
915ec91e6b libavcodec/x86/h264dsp_mmx.c: add forgotten HAVE_YASM
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-10 03:23:44 +02:00
Michael Niedermayer
63bfee8796 libavcodec/x86/dwt.c: move some missed things under HAVE_YASM
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-10 03:20:27 +02:00
Michael Niedermayer
b84c9cf7f7 dct-test: fix #if for ff_prores_idct_put_10_sse2()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-10 03:15:38 +02:00
Michael Niedermayer
dfaf2dd956 h264: use externally provided dimensions when they appear to be more correct.
This is based on:
	commit 30f515091c
	Author: Mans Rullgard <mans@mansr.com>
    		h264: allow cropping to AVCodecContext.width/height

The above commit is not taken as is as its buggy (incorrect handling of
the interlaced case) and didnt apply cleanly.

Fixes ticket156

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-10 02:24:25 +02:00
Paul B Mahol
3275981207 libopenjpegdec: make use of FF_ARRAY_ELEMS
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-06-09 23:34:15 +00:00
James Zern
695e85f189 libvpxenc: add VP8E_SET_MAX_INTRA_BITRATE_PCT mapping
defines 'max-intra-rate' in line with vpxenc param

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-10 01:18:42 +02:00
Paul B Mahol
1ef5561a66 libopenjpeg: YUVA422P and YUVA444P support
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-06-09 18:36:56 +00:00
Michael Niedermayer
75f8f70221 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  h264: allow cropping to AVCodecContext.width/height
  mov: set AVCodecContext.width/height for h264
  iac: generate codec tables as they are supposed to be
  indeo4: handle frame type 1 properly
  lavu: change versioning script to include all av* prefixed symbols

Conflicts:
	libavcodec/h264.c
	libavutil/libavutil.v

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-09 20:30:17 +02:00
Paul B Mahol
8554e21f79 ffv1enc: add yuva422p to .pix_fmts
This was forgotten in 4e4634aa16.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-06-09 18:15:50 +00:00
J. Bohl
2138bc16fd remove unreferenced table "dnxhd_1238_ac_index_flag" (empty curly braces did not compile with ICL12.1)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-09 20:09:43 +02:00
Paul B Mahol
a474403229 libopenjpegdec: unbreak yuva420p support
Regression introduced in b7a928b2d1.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-06-09 18:06:09 +00:00
Mans Rullgard
30f515091c h264: allow cropping to AVCodecContext.width/height
Override the frame size from the SPS with AVCodecContext values
if the latter specify a size smaller by less than one macroblock.
This is required for correct cropping of MOV files from Canon cameras.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2012-06-09 15:08:52 +01:00
Michael Niedermayer
1b7a4c93a9 lavc/bintext: check extradata size
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-09 15:04:12 +02:00
Paul B Mahol
c2dd01c16f binkaudio: prevent extradata overread
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-06-09 10:43:20 +00:00
Kostya Shishkov
cac4760bf4 iac: generate codec tables as they are supposed to be
Unlike its predecessor, Indeo Audio codec generates tables depending on
sampling rate. Previously decoder used pre-generated tables for 22050 Hz
which obviously doesn't work with other frequencies.

Many thanks to Maxim Poliakovsky for providing all needed information
for this.
2012-06-09 08:38:51 +02:00
Kostya Shishkov
e1a3fa5d3a indeo4: handle frame type 1 properly
It turns out that this frame type is actually intra and should be used as
a reference for interframes too.
2012-06-09 08:38:31 +02:00
Michael Niedermayer
7e22514d98 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  float_dsp: ppc: add a separate header for Altivec function prototypes
  ARM: fix float_dsp breakage from d5a7229
  Add a float DSP framework to libavutil
  PPC: Move types_altivec.h and util_altivec.h from libavcodec to libavutil
  ARM: Move asm.S from libavcodec to libavutil
  vc1dsp: mark put/avg_vc1_mspel_mc() always_inline

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-08 23:59:09 +02:00
Justin Ruggles
d5a7229ba4 Add a float DSP framework to libavutil
Move vector_fmul() from DSPContext to AVFloatDSPContext.
2012-06-08 13:14:38 -04:00
Justin Ruggles
98db4e2a4e PPC: Move types_altivec.h and util_altivec.h from libavcodec to libavutil
This will allow for easier implementation of Altivec functions in libraries
other than libavcodec.
2012-06-08 13:14:38 -04:00
Justin Ruggles
94d2b0d2fd ARM: Move asm.S from libavcodec to libavutil
This will allow for easier implementation of ARM-optimized functions in
libraries other than libavcodec.
2012-06-08 13:14:38 -04:00
Michael Niedermayer
718607be28 rv10: change assert() to av_assert()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-08 18:24:47 +02:00
Paul B Mahol
134d0f7119 Revert "Fix building libopencore_amrnb decoder without libopencore_amrnb encoder"
Reverting "Fix" because it disables amrwb decoder.

This reverts commit e11020a145.
2012-06-08 13:55:30 +00:00
Carl Eugen Hoyos
37a9cdfc2c Fix dirac decoder build dependencies.
Found, analysed and tested by trac user Jamal.

Fixes part of ticket #1428.
2012-06-08 15:29:24 +02:00
Carl Eugen Hoyos
b8fe9f08be Fix amv encoder dependencies.
Found, analysed and tested by trac user Jamal.

Fixes part of ticket #1428.
2012-06-08 15:29:23 +02:00
Paul B Mahol
e11020a145 Fix building libopencore_amrnb decoder without libopencore_amrnb encoder
Fixes #1210.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-06-08 13:03:10 +00:00
Michael Niedermayer
d5d30d56ed Revert "sinewin_tablegen: use av_assert"
using as_assert() in the table generator would make the generators
have to be linked to libavutil.

This reverts commit c3b6efa4cb.
2012-06-08 11:44:50 +02:00
Mans Rullgard
bc92214e27 vc1dsp: mark put/avg_vc1_mspel_mc() always_inline
This ensures that these functions are inlined into the per-position
entry points, allowing constant propagation as needed for proper
optimisation.

18% faster VC1 decoding on Cortex-A9.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2012-06-08 09:40:07 +01:00
Michael Niedermayer
b4d44367bc h261enc: use av_assert
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-07 21:32:32 +02:00
Michael Niedermayer
07732b4f09 h261dec: use av_assert
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-07 21:31:22 +02:00
Michael Niedermayer
4e3fc46828 h264_mvpred: use av_assert
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-07 21:07:17 +02:00
Michael Niedermayer
3422e7c395 lavc/rectangle: change assert to av_assert
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-07 20:51:07 +02:00
Michael Niedermayer
5ee638fd54 svq1enc: use av_assert
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-07 18:01:09 +02:00
Michael Niedermayer
eeba7c874b wmv2enc: use av_assert
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-06 21:18:47 +02:00
Michael Niedermayer
c3b6efa4cb sinewin_tablegen: use av_assert
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-06 21:18:33 +02:00
Michael Niedermayer
62eace231c put_bits: use av_assert
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-06 21:18:14 +02:00