1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-18 03:19:31 +02:00
Commit Graph

26483 Commits

Author SHA1 Message Date
Stefano Sabatini
e60c906a82 Set the default value of param0 and param1 to SWS_PARAM_DEFAULT.
Originally committed as revision 32414 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-09-29 22:06:40 +00:00
Stefano Sabatini
6d21d67b38 Set valid default values for the srcw, srch, dstw, dsth options in the
scale context. Prevent pointless warnings when using
av_opt_set_defaults() for setting the default values, as in a pending
patch.

Originally committed as revision 32413 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-09-29 22:06:36 +00:00
Stefano Sabatini
584b8edb99 Add missing case for FF_OPT_TYPE_DOUBLE in av_opt_set_defaults2().
Originally committed as revision 25265 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-29 21:42:03 +00:00
Baptiste Coudurier
826481ea91 Remove duplicate entries
Originally committed as revision 25264 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-29 21:35:52 +00:00
Baptiste Coudurier
3432c26319 Use new apple fourcc for mpeg-1 and mpeg-2 in mov, works natively on osx
Originally committed as revision 25263 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-29 21:34:31 +00:00
Ronald S. Bultje
a52ffc3f54 Move static inline function to a macro, so that constant propagation in
inline asm works for gcc-3.x also (hopefully). Should fix gcc-3.x FATE
breakage after r25254.

Originally committed as revision 25262 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-29 17:42:26 +00:00
Stefano Sabatini
fc7c40c2bd Cosmetics: put "if (...)" and "av_log(...)" in the same line for
improving vertical alignment and readability.

Originally committed as revision 32405 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-09-29 16:15:42 +00:00
Alexander Strange
1bb56bdb41 rawdec: Properly pass reordered_opaque through the decoder
Originally committed as revision 25261 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-29 15:43:37 +00:00
Ronald S. Bultje
3dedbeff7b Check return value of get_chunk_header(). Since enum can be unsigned, the
current code wouldn't always error out on errors.

Based on patch by Stephen d'Angelo <sdangelo evertz com>.

Originally committed as revision 25260 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-29 15:43:36 +00:00
Eli Friedman
329d689f75 Use sse2 variant of put_pixels16() for no_rnd also. Provides a minor speed
increase to e.g. vc1, snow and mpeg decoding.

Patch by Eli Friedman <eli dot friedman gmail com>.

Originally committed as revision 25259 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-29 15:34:43 +00:00
Michael Niedermayer
77336a5e12 Allow setting the impulse block bias for libvorbis through a private codec parameter.
First example and test of private codec parameters.

Originally committed as revision 25258 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-29 15:09:38 +00:00
Michael Niedermayer
dc51a72ba4 Move allocation and init to defaults of the private codec contexts to avcodec_get_context_defaults3().
That way the user app can set codec specific parameters in the private context
before opening it.

Originally committed as revision 25257 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-29 15:05:47 +00:00
Ronald S. Bultje
cd17285e6c Merge b_idx and edge variables, and optimize the ASM to directly load variables
from memory locations/offsets depending on b_idx plus constants, rather than
having gcc do this. This saves several lea calls and together saves about
10 cycles in h264_loop_filter_strength_mmx2().

Originally committed as revision 25256 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-29 14:04:39 +00:00
Ronald S. Bultje
0cc8a5d088 Remove mv_mask variable. Replace the related pand -1/0 instructions by either
a pxor, or remove the instruction alltogether. Altogether, this saves 1
instruction.

Originally committed as revision 25255 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-29 14:03:30 +00:00
Ronald S. Bultje
c0673f2cf4 Remove d_idx as a variable, and instead load it as a constant in the asm.
This has no measurable speed effect because the surrounding code doesn't
take advantage of this yet.

Originally committed as revision 25254 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-29 14:02:32 +00:00
Ronald S. Bultje
2c3135f6d3 Unroll inner bidir loop in h264_loop_filter_strength_mmx2(), which gets rid
of the d_idx variable and therefore allows for future optimizations. No speed
difference by this commit itself.

Originally committed as revision 25253 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-29 13:35:24 +00:00
Ronald S. Bultje
4b81511cab Unloop the outer loop in h264_loop_filter_strength_mmx2(), which allows
inlining various constants within the loop code. 20 cycles faster on
cathedral sample.

Originally committed as revision 25252 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-29 13:34:20 +00:00
Stefano Sabatini
d29e863e1d Put if (...) av_log() in the same line, more compact and increase
readibility.

Originally committed as revision 32404 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-09-29 13:02:31 +00:00
Stefano Sabatini
5abd626e20 Amend constraints for the src_format and dst_format options in the
SWScale context.

Originally committed as revision 32403 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-09-29 13:02:28 +00:00
Alexander Strange
5ba24e4982 Fix compile on Darwin (FATE). Compile error:
yadif.c:226: error: can't find a register in class 'GENERAL_REGS' while reloading 'asm'
yadif.c:220: error: 'asm' operand has impossible constraints

Patch by Alexander Strange <astrange ithinksw com>.

Originally committed as revision 25251 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-29 12:34:01 +00:00
Michael Niedermayer
655c36b22f Add AVClass for the private context, this will be used for codec specific options.
Originally committed as revision 25250 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-29 11:59:25 +00:00
Stefano Sabatini
c24b404ba6 Cosmetics: fix braces placement.
Originally committed as revision 32402 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-09-29 08:44:09 +00:00
Stefano Sabatini
0810a5846b Deprecate sws_getContext(), use sws_alloc_context() and
sws_init_context() instead.

Originally committed as revision 32401 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-09-28 22:23:58 +00:00
Stefano Sabatini
499287e0a5 Add documentation for the returned value of sws_init_context().
Originally committed as revision 32400 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-09-28 22:23:53 +00:00
Stefano Sabatini
c581279347 Add APIchanges entry for lsws change of r32368.
Originally committed as revision 25249 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-28 15:33:59 +00:00
Stefano Sabatini
c508ab6736 Bump minor version after the addition of sws_alloc_context() and
sws_init_context() of r32368.

Originally committed as revision 32396 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-09-28 15:29:23 +00:00
Stefano Sabatini
c10676aca3 Make init() return sensible error code rather than -1 in case of
invalid values.

Originally committed as revision 25248 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-28 14:59:09 +00:00
Stefano Sabatini
46daee6e4e Cosmetics: apply nits.
Originally committed as revision 25247 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-28 14:59:06 +00:00
Stefano Sabatini
f03f30d77a Make new doxy follows the agreed upon style and grammatical
conventions, for consistency with the rest of the documentation.

Originally committed as revision 25246 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-28 14:49:55 +00:00
Stefano Sabatini
2e5ff4d0e5 Group togheter filter dependency specifications.
Originally committed as revision 25245 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-28 13:44:10 +00:00
Stefano Sabatini
e40032e23a Add the drawbox filter from the soc libavfilter repo.
Pedagogically useful.

Originally committed as revision 25244 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-28 13:16:40 +00:00
Jason Garrett-Glaser
4dece8c7f8 Try to fix crashes introduced by r25218
r25218 made assumptions about the existence of past reference frames that
weren't necessarily true.

Originally committed as revision 25243 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-28 09:06:22 +00:00
Alexander Strange
01d461980e All else being equal, prefer PTS over DTS in timestamp correction
Because DTS values aren't passed through decoders, they tend to be
inaccurate if decoder delay doesn't match what was expected by the encoder.

In particular this improves timestamps for H.264 without num_reorder_frames
set and with -strict 1, which causes DTS to be up to 16 frames ahead of the
picture.

Note that this doesn't really improve any file with very broken PTS/DTS,
since PTS isn't much more accurate in these.

Originally committed as revision 25242 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-28 03:45:27 +00:00
Alexander Strange
7a8bfa5d67 Extract timestamp correction code from ffplay.c to cmdutils.c
Originally committed as revision 25241 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-28 02:05:12 +00:00
Baptiste Coudurier
6d19fd5c26 In mov demuxer, check that nb_streams is valid before using it in read_dac3
Originally committed as revision 25240 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-28 00:33:21 +00:00
Baptiste Coudurier
bd8154d0b3 100l fix if condition
Originally committed as revision 32395 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-09-27 23:47:54 +00:00
Baptiste Coudurier
df0743e01e Y400A (gray alpha) input support in libswscale
Originally committed as revision 32394 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-09-27 22:24:03 +00:00
Michael Chinen
59cb40b921 Fix index_entries pos:
It was being set wrong for files with data_offset > 0

Patch by Michael Chinen, mchinen gmail

Originally committed as revision 25239 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-27 22:17:58 +00:00
Stefano Sabatini
c6625ad541 Update APIchanges after r25236.
Originally committed as revision 25238 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-27 22:13:18 +00:00
Måns Rullgård
483480b5ae Fix out of tree builds with vf_yadif and mmx
Originally committed as revision 25237 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-27 22:10:39 +00:00
Stefano Sabatini
c85eef4ed8 Move av_set_options_string() from libavfilter to libavutil.
Originally committed as revision 25236 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-27 22:09:53 +00:00
Stefano Sabatini
486adc55c0 Use more expressive names for the avfilter_insert_filter() in and out
parameters.

Originally committed as revision 25235 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-27 21:57:16 +00:00
Aurelien Jacobs
fa6f4ebc08 use a Makefile in x86 subdir
Originally committed as revision 25234 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-27 21:50:26 +00:00
Aurelien Jacobs
236f79480b merge #if with if()
Originally committed as revision 25233 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-27 21:48:06 +00:00
Baptiste Coudurier
2a5db1aa58 In dv decoder, set sample aspect aspect ratio, fix issue #1612
Originally committed as revision 25232 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-27 21:31:29 +00:00
Baptiste Coudurier
348a3237cc In dv decoder, use the expected aspect ratio logic, like other decoders do,
following width/height = par/dar.

Originally committed as revision 25231 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-27 21:30:41 +00:00
Janne Grunau
9f694f0b3d swscale: clear SWS_CPU_CAPS_SSE2 in update_flags_cpu() missed in r32068
Originally committed as revision 32393 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-09-27 20:10:53 +00:00
Janne Grunau
829e5dafc2 cosmetics: break long line update_flags_cpu
Originally committed as revision 32392 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-09-27 20:09:29 +00:00
Janne Grunau
d04247a134 use strict_std_complience from avcodec_opts[AVMEDIA_TYPE_*]
Options are not yet set for video encoders and for codec specific
defaults it is desireable to set the codec options only after the codec
is known.

Originally committed as revision 25230 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-27 19:59:36 +00:00
Stefano Sabatini
db9dfa3cc3 Make avfilter_insert_filter() propagate an error code in case the
called avfilter_link() fails.

Originally committed as revision 25229 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-27 17:28:53 +00:00