Commit Graph

22455 Commits

Author SHA1 Message Date
Reimar Döffinger 836fc77785 Move variable declaration to block where it is used and simplify code.
Avoids a (incorrect) "possibly used uninitialized" warning, no measurable
speed difference.

Originally committed as revision 21518 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-28 21:01:50 +00:00
Rafaël Carré dd0cd3d273 Export H264 profile and level in AVCodecContext.
Patch by Rafaël Carré, rafael D carre A gmail

Originally committed as revision 21517 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-28 20:57:29 +00:00
Reimar Döffinger 88517e9f9d Extract duplicated code into a separate function.
5% faster on Intel Atom with gcc 4.4.1 (performance is unchanged
if using av_always_inline).

Originally committed as revision 21516 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-28 20:15:19 +00:00
Måns Rullgård 604b2f5276 Append ECFLAGS to CFLAGS
This makes it easy to supply extra flags on the make command line
for testing purposes.

Originally committed as revision 21515 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-28 20:13:46 +00:00
Michael Niedermayer 34032e26ab factorize first filter call out, this makes the code somewhat
smaller without any speed loss.

Originally committed as revision 21514 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-28 19:44:13 +00:00
Jai Menon ecc544debd ffmpeg.c : Don't set AVFormatParameters::[audio|video]_codec_id
since it is no longer required.

Originally committed as revision 21513 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-28 16:17:52 +00:00
Ronald S. Bultje 45aa90807f Add RTP/H.263 depacketizer by Martin Storsjö <$firstname () $firstname st>.
Originally committed as revision 21512 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-28 16:08:13 +00:00
Jai Menon 90d0379f5e Avoid using deprecated AVFormatParameters::[audio|video]_codec_id field.
Originally committed as revision 21511 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-28 15:45:21 +00:00
Ronald S. Bultje 52ed8d0efe Simplify. See "[PATCH] simplify ff_set_fixed_vector()" thread on mailinglist.
Originally committed as revision 21510 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-28 14:29:53 +00:00
Måns Rullgård 4ae406856f Add --malloc-prefix to apply a prefix to malloc, free etc
This makes it easy to use a replacement allocator instead of the
system default one.

Originally committed as revision 21509 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-28 13:06:31 +00:00
Rafaël Carré e9ca315dd1 Initialize thread_context[0] with h264 parser context.
This allows freeing the parser memory in the thread_context freeing loop.

Patch by Rafaël Carré gmailify(rafael, carre)

Originally committed as revision 21508 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-28 13:04:25 +00:00
Michael Niedermayer 592e03a8da Change wraper functions to always inline, they are faster now that way.
1% faster MBAFF decoding overall, maybe ~0.1% faster for the cathedral sample.

Originally committed as revision 21507 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-28 11:37:35 +00:00
Michael Niedermayer 5364db2893 indent
Originally committed as revision 21506 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-28 11:18:06 +00:00
Michael Niedermayer 2cf0d46d4c Restructure check_mv()
~20 cpu cycles faster loopfilter

Originally committed as revision 21505 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-28 11:12:46 +00:00
Michael Niedermayer fabd704b37 Restructure if() in check_mv()
quite a bit faster

Originally committed as revision 21504 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-28 10:38:43 +00:00
Michael Niedermayer ca7c784fdf Unroll loops in check_mv()
~6% faster (slow path) loopfilter (should be ~2% overall)

Originally committed as revision 21503 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-28 10:34:06 +00:00
Michael Niedermayer e814817b74 Factor mv/ref compare code out.
This is a hair slower (0.15% maybe) but i really dont want to have the
identical code duplicated 3 times because gcc adds odd threaded jumps with
register reshuffling and register safe/restore.

Originally committed as revision 21502 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-28 10:10:02 +00:00
Daniel Kristjansson 31277aebd9 Use av_mallocz in url_open_protocol for URLContext.
Patch by Daniel Kristjansson: danielk cuymedia net

Originally committed as revision 21501 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-28 09:11:26 +00:00
Michael Niedermayer 12f1b1fec4 Remove last MAX_STREAMS from avienc.c
Originally committed as revision 21500 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-28 03:37:22 +00:00
Måns Rullgård 14ca9cd0b0 configure: consolidate compiler-specific optimisation settings
In the main per-compiler section, set speed_cflags and size_cflags
with suitable values.  Later one or the other is added to CFLAGS.

Originally committed as revision 21499 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-28 02:50:36 +00:00
Michael Niedermayer b4f0e04c99 Introduce AVIStream struct and move stream based variables to it.
This removes all but one MAX_STREAM from avienc.c.

Originally committed as revision 21498 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-28 02:45:17 +00:00
Michael Niedermayer 3b84924516 Simplify first edge filter condition.
Originally committed as revision 21497 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-28 02:41:52 +00:00
Michael Niedermayer b6302d0c55 Cosmetics, mostly indention, 2 or so new fixme comments that i was to lazy
to split out

Originally committed as revision 21496 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-28 02:20:31 +00:00
Michael Niedermayer 0a32508d90 Make the fast loop filter path work with unavailable left MBs.
This prevents the issue with having to switch between slow and
fast code paths in each row.
0.5% faster loopfilter for cathedral

Originally committed as revision 21495 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-28 02:15:25 +00:00
Michael Niedermayer b304767301 get rid of the start variable.
a few cycles faster

Originally committed as revision 21494 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-28 01:31:06 +00:00
Michael Niedermayer 980bcc554d Unroll main loop so the edge==0 case is seperate.
This allows many things to be simplified away.
h264 decoder is overall 1% faster with a mbaff sample and
0.1% slower with the cathedral sample, probably because the slow loop
filter code must be loaded into the code cache for each first MB of each
row but isnt used for the following MBs.

Originally committed as revision 21493 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-28 01:24:25 +00:00
Stefano Sabatini 695f7de6a4 Declare variable "version" in the PRINT_LIB_VERSION() macro if block,
slightly simpler and more robust.

Originally committed as revision 21492 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-27 23:08:43 +00:00
Carl Eugen Hoyos 39c6b3f54c Support demuxing Blu-ray subtitles in matroska files.
Patch sent to mailing list by Taylor Ralph, taylor D ralph A gmail

Originally committed as revision 21491 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-27 22:39:18 +00:00
Ronald S. Bultje 88248b76af Fix BSD compile (PF_UNSPEC is not a standard define, AF_UNSPEC is).
Originally committed as revision 21490 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-27 22:31:13 +00:00
Rafaël Carré 881b5b80da Fix svq3_* function declarations.
Patch by Rafaël Carré, rafael D carre A gmail

Originally committed as revision 21489 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-27 22:22:01 +00:00
Måns Rullgård e3d8807315 SVQ1: 4-byte-align codebook tables
These tables are accessed as uint32 so they must be suitably aligned.

Originally committed as revision 21488 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-27 21:31:19 +00:00
Reimar Döffinger 7e2ef1b9e1 Fix possible crashes in mlp parser, it tries to go back 7 bytes after
finding the 4-byte signature.
Add a check that ignores the signature if we do not have enough previous
data to go back at least 7 bytes.

Originally committed as revision 21487 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-27 20:04:19 +00:00
Reimar Döffinger d780511b94 Reduce log level of "Extracting .. channel downmix" to AV_LOG_DEBUG, the
message is pointless to ordinary users and is printed once per frame.

Originally committed as revision 21486 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-27 20:02:18 +00:00
Michael Niedermayer d30a8beb99 Fix duration calculation in the presence of a single wraping of the timeline.
Fixes issue1714.

Originally committed as revision 21485 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-27 19:37:52 +00:00
Jai Menon ad5cc780c0 Schedule an increase in the maximum number of streams
at next libavformat major version bump.

Originally committed as revision 21484 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-27 19:13:35 +00:00
Jai Menon 60402344af ffmpeg.c : Increase static limit on the maximum number of
input files.

Originally committed as revision 21483 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-27 19:11:31 +00:00
Måns Rullgård 87fec35d8d Add macro AV_JOIN() for joining two tokens into one
Originally committed as revision 21482 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-27 17:38:53 +00:00
Michael Niedermayer 9f72b23c5c Revert Revision: 21362
Log:
	Set CODEC_CAP_SUBFRAMES for adpcm decoders

	This makes ffmpeg stop printing millions of
	  Multiple frames in a packet from stream 0
	when decoding adpcm.
Reason: adpcm has no subframes, the flag does not belong there

Originally committed as revision 21481 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-27 13:30:05 +00:00
Michael Niedermayer 3ff0daf06d Print "Multiple frames in a packet" warning independant of CODEC_CAP_SUBFRAMES
because CODEC_CAP_SUBFRAMES is primarely misused to hide this warning otherwise
which renders the flag completely useless.

Originally committed as revision 21480 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-27 13:27:18 +00:00
Michael Niedermayer 8670f84cf9 Update comment.
Originally committed as revision 21479 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-27 13:18:08 +00:00
Michael Niedermayer 67b678bb40 Revert Revision: 21473
Log:
	Fix misc typos, patch by
	Fabian Greffrath base64_decode(PGZhYmlhbkBncmVmZnJhdGguY29tPg==).
This violates the spec.

Originally committed as revision 21478 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-27 13:03:53 +00:00
Måns Rullgård 5116571dcd Prettify PRINT_LIB_VERSION macro
Originally committed as revision 21477 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-27 12:58:26 +00:00
Måns Rullgård 58fe804a5a Get rid of ifdeffery for printing library versions and configurations
Originally committed as revision 21476 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-27 12:58:22 +00:00
Måns Rullgård dc4f5a1c3a Emit CONFIG_AVUTIL for completeness
Originally committed as revision 21475 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-27 12:58:19 +00:00
Michael Niedermayer e470ef7641 Use table to speedup access to non_zero_count in MBAFF with differing interlacing.
~4 cpu cycles speedup

Originally committed as revision 21474 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-27 11:14:29 +00:00
Stefano Sabatini e8a9d01846 Fix misc typos, patch by
Fabian Greffrath base64_decode(PGZhYmlhbkBncmVmZnJhdGguY29tPg==).

Originally committed as revision 21473 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-27 00:31:52 +00:00
Måns Rullgård 97d5fa38e0 10l: fix linking
Alphabetical order isn't always a good idea.

Originally committed as revision 21472 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-27 00:26:41 +00:00
Stefano Sabatini b51de6d8c7 Rename swscale-example to swscale-test, to better reflect the intended
use of the program.

Originally committed as revision 30439 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-01-27 00:25:23 +00:00
Stefano Sabatini d19a046ebb Document av_register_protocol(), not that it really needs to be
documented but it's nice to have everything documented.

Originally committed as revision 21471 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-27 00:21:28 +00:00
Michael Niedermayer 8652e44acd Simplify left_xy init
Originally committed as revision 21470 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-27 00:15:55 +00:00